inosh
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactoring

Browse Source
4.x.x
megala21 7 years ago
parent 75bb02ac4a
commit ab54dda56c
2 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File

36
components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/WebappAuthenticationValve.java
Unescape View File

@ -110,7 +110,7 @@ public class WebappAuthenticationValve extends CarbonTomcatValve {
if (uri == null) { if (uri == null) {
uri = ""; uri = "";
} }
if(!uri.endsWith("/")) { if (!uri.endsWith("/")) {
uri = uri + "/"; uri = uri + "/";
} }
String contextPath = request.getContextPath(); String contextPath = request.getContextPath();
@ -125,7 +125,7 @@ public class WebappAuthenticationValve extends CarbonTomcatValve {
while (tokenizer.hasMoreTokens()) { while (tokenizer.hasMoreTokens()) {
skippedEndPoint = tokenizer.nextToken(); skippedEndPoint = tokenizer.nextToken();
skippedEndPoint = skippedEndPoint.replace("\n", "").replace("\r", "").trim(); skippedEndPoint = skippedEndPoint.replace("\n", "").replace("\r", "").trim();
if(!skippedEndPoint.endsWith("/")) { if (!skippedEndPoint.endsWith("/")) {
skippedEndPoint = skippedEndPoint + "/"; skippedEndPoint = skippedEndPoint + "/";
} }
nonSecuredEndpoints.put(skippedEndPoint, "true"); nonSecuredEndpoints.put(skippedEndPoint, "true");
@ -138,23 +138,21 @@ public class WebappAuthenticationValve extends CarbonTomcatValve {
private void processRequest(Request request, Response response, CompositeValve compositeValve, private void processRequest(Request request, Response response, CompositeValve compositeValve,
AuthenticationInfo authenticationInfo) { AuthenticationInfo authenticationInfo) {
switch (authenticationInfo.getStatus()) { switch (authenticationInfo.getStatus()) {
case SUCCESS: case SUCCESS:
case CONTINUE: case CONTINUE:
this.getNext().invoke(request, response, compositeValve); this.getNext().invoke(request, response, compositeValve);
break; break;
case FAILURE: case FAILURE:
String msg = "Failed to authorize incoming request"; String msg = "Failed to authorize incoming request";
if (authenticationInfo.getMessage() != null && !authenticationInfo.getMessage().isEmpty()) { if (authenticationInfo.getMessage() != null && !authenticationInfo.getMessage().isEmpty()) {
msg = authenticationInfo.getMessage(); msg = authenticationInfo.getMessage();
response.setHeader("WWW-Authenticate", msg); response.setHeader("WWW-Authenticate", msg);
} }
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug(msg + " , API : " + Encode.forUriComponent(request.getRequestURI())); log.debug(msg + " , API : " + Encode.forUriComponent(request.getRequestURI()));
} }
AuthenticationFrameworkUtil. AuthenticationFrameworkUtil.handleResponse(request, response, HttpServletResponse.SC_UNAUTHORIZED, msg);
break;
handleResponse(request, response, HttpServletResponse.SC_UNAUTHORIZED, msg);
break;
} }
} }
} }

3
components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/test/java/org/wso2/carbon/webapp/authenticator/framework/WebappAuthenticationValveTest.java
Unescape View File

@ -63,7 +63,6 @@ public class WebappAuthenticationValveTest {
Mockito.doNothing().when(compositeValve).continueInvocation(Mockito.any(), Mockito.any()); Mockito.doNothing().when(compositeValve).continueInvocation(Mockito.any(), Mockito.any());
request.setContext(context); request.setContext(context);
webappAuthenticationValve.invoke(request, null, compositeValve); webappAuthenticationValve.invoke(request, null, compositeValve);
request = new TestRequest("", "test"); request = new TestRequest("", "test");
context = new StandardContext(); context = new StandardContext();
compositeValve = Mockito.mock(CompositeValve.class); compositeValve = Mockito.mock(CompositeValve.class);
@ -92,7 +91,6 @@ public class WebappAuthenticationValveTest {
String encodedString = new String(Base64.getEncoder().encode((ADMIN_USER + ":" + ADMIN_USER).getBytes())); String encodedString = new String(Base64.getEncoder().encode((ADMIN_USER + ":" + ADMIN_USER).getBytes()));
Request request = createRequest("basic " + encodedString); Request request = createRequest("basic " + encodedString);
webappAuthenticationValve.invoke(request, null, compositeValve); webappAuthenticationValve.invoke(request, null, compositeValve);
encodedString = new String(Base64.getEncoder().encode((ADMIN_USER + ":" + ADMIN_USER + "test").getBytes())); encodedString = new String(Base64.getEncoder().encode((ADMIN_USER + ":" + ADMIN_USER + "test").getBytes()));
request = createRequest("basic " + encodedString); request = createRequest("basic " + encodedString);
Response response = new Response(); Response response = new Response();
@ -135,7 +133,6 @@ public class WebappAuthenticationValveTest {
context.setPath("carbon1"); context.setPath("carbon1");
context.addParameter("doAuthentication", String.valueOf(true)); context.addParameter("doAuthentication", String.valueOf(true));
request.setContext(context); request.setContext(context);
MimeHeaders mimeHeaders = new MimeHeaders(); MimeHeaders mimeHeaders = new MimeHeaders();
MessageBytes bytes = mimeHeaders.addValue(BaseWebAppAuthenticatorFrameworkTest.AUTHORIZATION_HEADER); MessageBytes bytes = mimeHeaders.addValue(BaseWebAppAuthenticatorFrameworkTest.AUTHORIZATION_HEADER);
bytes.setString(authorizationHeader); bytes.setString(authorizationHeader);

Write Preview
Loading…
Cancel
Save