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

IOTS-292: Code refactoring

Browse Source
4.x.x
amalhub 8 years ago
parent 871970002a
commit 0bd298e6d7
1 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File

39
components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/main/java/org.wso2.carbon.apimgt.handlers/AuthenticationHandler.java
Unescape View File

@ -76,6 +76,7 @@ public class AuthenticationHandler implements Handler {
CoreUtils.debugLog(log, "Authentication handler invoked by: ", ctxPath); CoreUtils.debugLog(log, "Authentication handler invoked by: ", ctxPath);
Map<?, ?> headers = (Map<?, ?>) messageContext.getProperty(MessageContext.TRANSPORT_HEADERS); Map<?, ?> headers = (Map<?, ?>) messageContext.getProperty(MessageContext.TRANSPORT_HEADERS);
try { try {
RESTResponse response = null;
if (headers.containsKey(AuthConstants.MDM_SIGNATURE)) { if (headers.containsKey(AuthConstants.MDM_SIGNATURE)) {
String mdmSignature = headers.get(AuthConstants.MDM_SIGNATURE).toString(); String mdmSignature = headers.get(AuthConstants.MDM_SIGNATURE).toString();
@ -84,7 +85,7 @@ public class AuthenticationHandler implements Handler {
String accessToken = getAccessToken(); String accessToken = getAccessToken();
URI certVerifyUrl = new URI(AuthConstants.HTTPS + "://" + CoreUtils.getHost() + ":" + CoreUtils URI certVerifyUrl = new URI(AuthConstants.HTTPS + "://" + CoreUtils.getHost() + ":" + CoreUtils
.getHttpsPort() + "/api/certificate-mgt/v1.0/admin/certificates/verify/ios"); .getHttpsPort() + "/api/certificate-mgt/v1.0/admin/certificates/verify/ios");
Map<String, String> certVerifyHeaders = new HashMap<String, String>(); Map<String, String> certVerifyHeaders = new HashMap<>();
certVerifyHeaders.put("Authorization", "Bearer " + accessToken); certVerifyHeaders.put("Authorization", "Bearer " + accessToken);
certVerifyHeaders.put("Content-Type", "application/json"); certVerifyHeaders.put("Content-Type", "application/json");
String certVerifyContent = "{\n" + String certVerifyContent = "{\n" +
@ -93,24 +94,17 @@ public class AuthenticationHandler implements Handler {
"\"serial\":\"\"\n" + "\"serial\":\"\"\n" +
"}"; "}";
RESTResponse response = restInvoker.invokePOST(certVerifyUrl, certVerifyHeaders, null, response = restInvoker.invokePOST(certVerifyUrl, certVerifyHeaders, null,
null, certVerifyContent); null, certVerifyContent);
CoreUtils.debugLog(log, "Verify response:", response.getContent()); CoreUtils.debugLog(log, "Verify response:", response.getContent());
if (!response.getContent().contains("invalid")) {
return InvocationResponse.CONTINUE;
}
log.warn("Unauthorized request for api: " + ctxPath);
setFaultCodeAndThrowAxisFault(messageContext, new Exception("Unauthorized!"));
return InvocationResponse.SUSPEND;
} else if (headers.containsKey(AuthConstants.PROXY_MUTUAL_AUTH_HEADER)) { } else if (headers.containsKey(AuthConstants.PROXY_MUTUAL_AUTH_HEADER)) {
String subjectDN = headers.get(AuthConstants.PROXY_MUTUAL_AUTH_HEADER).toString(); String subjectDN = headers.get(AuthConstants.PROXY_MUTUAL_AUTH_HEADER).toString();
CoreUtils.debugLog(log, "Verify subject DN: ", subjectDN); CoreUtils.debugLog(log, "Verify subject DN: ", subjectDN);
String accessToken = getAccessToken(); String accessToken = getAccessToken();
URI certVerifyUrl = new URI(AuthConstants.HTTPS + "://" + CoreUtils.getHost() + ":" + CoreUtils URI certVerifyUrl = new URI(AuthConstants.HTTPS + "://" + CoreUtils.getHost() + ":" + CoreUtils
.getHttpsPort() + "/api/certificate-mgt/v1.0/admin/certificates/verify/android"); .getHttpsPort() + "/api/certificate-mgt/v1.0/admin/certificates/verify/android");
Map<String, String> certVerifyHeaders = new HashMap<String, String>(); Map<String, String> certVerifyHeaders = new HashMap<>();
certVerifyHeaders.put("Authorization", "Bearer " + accessToken); certVerifyHeaders.put("Authorization", "Bearer " + accessToken);
certVerifyHeaders.put("Content-Type", "application/json"); certVerifyHeaders.put("Content-Type", "application/json");
String certVerifyContent = "{\n" + String certVerifyContent = "{\n" +
@ -119,15 +113,9 @@ public class AuthenticationHandler implements Handler {
"\"serial\":\"" + AuthConstants.PROXY_MUTUAL_AUTH_HEADER + "\"\n" + "\"serial\":\"" + AuthConstants.PROXY_MUTUAL_AUTH_HEADER + "\"\n" +
"}"; "}";
RESTResponse response = restInvoker.invokePOST(certVerifyUrl, certVerifyHeaders, null, response = restInvoker.invokePOST(certVerifyUrl, certVerifyHeaders, null,
null, certVerifyContent); null, certVerifyContent);
CoreUtils.debugLog(log, "Verify response:", response.getContent()); CoreUtils.debugLog(log, "Verify response:", response.getContent());
if (!response.getContent().contains("invalid")) {
return InvocationResponse.CONTINUE;
}
log.warn("Unauthorized request for api: " + ctxPath);
setFaultCodeAndThrowAxisFault(messageContext, new Exception("Unauthorized!"));
return InvocationResponse.SUSPEND;
} else if (headers.containsKey(AuthConstants.ENCODED_PEM)) { } else if (headers.containsKey(AuthConstants.ENCODED_PEM)) {
String encodedPem = headers.get(AuthConstants.ENCODED_PEM).toString(); String encodedPem = headers.get(AuthConstants.ENCODED_PEM).toString();
@ -136,7 +124,7 @@ public class AuthenticationHandler implements Handler {
String accessToken = getAccessToken(); String accessToken = getAccessToken();
URI certVerifyUrl = new URI(AuthConstants.HTTPS + "://" + CoreUtils.getHost() + ":" + CoreUtils URI certVerifyUrl = new URI(AuthConstants.HTTPS + "://" + CoreUtils.getHost() + ":" + CoreUtils
.getHttpsPort() + "/api/certificate-mgt/v1.0/admin/certificates/verify/ios"); .getHttpsPort() + "/api/certificate-mgt/v1.0/admin/certificates/verify/ios");
Map<String, String> certVerifyHeaders = new HashMap<String, String>(); Map<String, String> certVerifyHeaders = new HashMap<>();
certVerifyHeaders.put("Authorization", "Bearer " + accessToken); certVerifyHeaders.put("Authorization", "Bearer " + accessToken);
certVerifyHeaders.put("Content-Type", "application/json"); certVerifyHeaders.put("Content-Type", "application/json");
String certVerifyContent = "{\n" + String certVerifyContent = "{\n" +
@ -145,21 +133,22 @@ public class AuthenticationHandler implements Handler {
"\"serial\":\"\"\n" + "\"serial\":\"\"\n" +
"}"; "}";
RESTResponse response = restInvoker.invokePOST(certVerifyUrl, certVerifyHeaders, null, response = restInvoker.invokePOST(certVerifyUrl, certVerifyHeaders, null,
null, certVerifyContent); null, certVerifyContent);
CoreUtils.debugLog(log, "Verify response:", response.getContent()); CoreUtils.debugLog(log, "Verify response:", response.getContent());
if (!response.getContent().contains("invalid")) {
return InvocationResponse.CONTINUE;
}
log.warn("Unauthorized request for api: " + ctxPath);
setFaultCodeAndThrowAxisFault(messageContext, new Exception("Unauthorized!"));
return InvocationResponse.SUSPEND;
} else { } else {
log.warn("Unauthorized request for api: " + ctxPath); log.warn("Unauthorized request for api: " + ctxPath);
setFaultCodeAndThrowAxisFault(messageContext, new Exception("SSL required")); setFaultCodeAndThrowAxisFault(messageContext, new Exception("SSL required"));
return InvocationResponse.SUSPEND; return InvocationResponse.SUSPEND;
} }
if (response != null && !response.getContent().contains("invalid")) {
return InvocationResponse.CONTINUE;
}
log.warn("Unauthorized request for api: " + ctxPath);
setFaultCodeAndThrowAxisFault(messageContext, new Exception("Unauthorized!"));
return InvocationResponse.SUSPEND;
} catch (Exception e) { } catch (Exception e) {
log.error("Error while processing certificate.", e); log.error("Error while processing certificate.", e);
setFaultCodeAndThrowAxisFault(messageContext, e); setFaultCodeAndThrowAxisFault(messageContext, e);

Write Preview
Loading…
Cancel
Save