tcdlpds
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Labels Milestones
New Pull Request

Fix sso login app creation payload and remove unused methods #20

Merged
tcdlpds merged 2 commits from improvement into apim420 1 year ago
Conversation 0 Commits 2 Files Changed 4
4 changed files with 28 additions and 198 deletions
Show Stats Download Patch File Download Diff File

3
components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/LoginHandler.java
Unescape View File

@ -86,7 +86,8 @@ public class LoginHandler extends HttpServlet {
apiRegEndpoint.setHeader(HttpHeaders.AUTHORIZATION, HandlerConstants.BASIC + Base64.getEncoder()
.encodeToString((username + HandlerConstants.COLON + password).getBytes()));
apiRegEndpoint.setHeader(HTTP.CONTENT_TYPE, ContentType.APPLICATION_JSON.toString());
apiRegEndpoint.setEntity(HandlerUtil.constructAppRegPayload(tags, HandlerConstants.PUBLISHER_APPLICATION_NAME, username, password));
apiRegEndpoint.setEntity(HandlerUtil.constructAppRegPayload(tags, HandlerConstants.PUBLISHER_APPLICATION_NAME,
username, password, null, null));
ProxyResponse clientAppResponse = HandlerUtil.execute(apiRegEndpoint);

210
components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/SsoLoginHandler.java
Unescape View File

@ -38,7 +38,6 @@ import org.apache.http.entity.ContentType;
import org.apache.http.entity.StringEntity;
import org.apache.http.protocol.HTTP;
import org.json.JSONArray;
import org.json.JSONObject;
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
@ -157,6 +156,8 @@ public class SsoLoginHandler extends HttpServlet {
JsonArray tags = uiConfigJsonObject.get("appRegistration").getAsJsonObject().get("tags").getAsJsonArray();
JsonArray scopes = uiConfigJsonObject.get("scopes").getAsJsonArray();
sessionTimeOut = Integer.parseInt(String.valueOf(uiConfigJsonObject.get("sessionTimeOut")));
JsonArray supportedGrantTypes = constructAppGrantTypeUpdateArray();
String callbackUrl = iotsCoreUrl + baseContextPath + HandlerConstants.SSO_LOGIN_CALLBACK;
// Register the client application
HttpPost apiRegEndpoint = new HttpPost(gatewayUrl + HandlerConstants.APP_REG_ENDPOINT);
@ -165,7 +166,8 @@ public class SsoLoginHandler extends HttpServlet {
apiRegEndpoint.setHeader(HttpHeaders.AUTHORIZATION, HandlerConstants.BASIC +
encodedAdminCredentials);
apiRegEndpoint.setHeader(HTTP.CONTENT_TYPE, ContentType.APPLICATION_JSON.toString());
apiRegEndpoint.setEntity(HandlerUtil.constructAppRegPayload(tags, applicationName, adminUsername, adminPassword));
apiRegEndpoint.setEntity(HandlerUtil.constructAppRegPayload(tags, applicationName, adminUsername, adminPassword,
callbackUrl, supportedGrantTypes));
ProxyResponse clientAppResponse = HandlerUtil.execute(apiRegEndpoint);
@ -201,87 +203,11 @@ public class SsoLoginHandler extends HttpServlet {
HandlerUtil.handleError(resp, null);
throw new LoginException(msg);
}
// Get the details of the registered application
// String getApplicationEndpointUrl = apiMgtUrl + HandlerConstants.APIM_APPLICATIONS_ENDPOINT +
// "?query=" + applicationName;
// HttpGet getApplicationEndpoint = new HttpGet(getApplicationEndpointUrl);
// getApplicationEndpoint.setHeader(HttpHeaders.AUTHORIZATION, HandlerConstants.BEARER +
// getAccessToken(resp, encodedClientApp));
//
// ProxyResponse getApplicationResponse = HandlerUtil.execute(getApplicationEndpoint);
//
// if (getApplicationResponse.getCode() == HttpStatus.SC_OK) {
// JsonParser jsonParser = new JsonParser();
// JsonElement jAppResult = jsonParser.parse(getApplicationResponse.getData());
// if (jAppResult.isJsonObject()) {
// JsonObject jClientAppResultAsJsonObject = jAppResult.getAsJsonObject();
// JsonArray appList = jClientAppResultAsJsonObject.getAsJsonArray("list");
// JsonObject app;
// for (JsonElement appJson : appList) {
// app = appJson.getAsJsonObject();
// if (app.get("name").getAsString().equals(applicationName)) {
// applicationId = app.get("applicationId").getAsString();
// break;
// }
// }
// }
// } else if (getApplicationResponse.getCode() == HttpStatus.SC_UNAUTHORIZED) {
// String msg = "Unauthorized attempt to get registered application data. " +
// "Application Name: " + applicationName + ". Response message: " + clientAppResponse.getData();
// log.error(msg);
// HandlerUtil.handleError(resp, getApplicationResponse);
// throw new LoginException(msg);
// } else {
// String msg = "Failed the process while getting the data of registered application. " +
// "Application Name: " + applicationName + ". Response Code: "
// + clientAppResponse.getCode() + ", Response message: " + clientAppResponse.getData();
// log.error(msg);
// HandlerUtil.handleError(resp, null);
// throw new LoginException(msg);
// }
// Update the grant types of the application
// String url = apiMgtUrl + HandlerConstants.APIM_APPLICATIONS_ENDPOINT + "/" + applicationId + "/keys/" +
// HandlerConstants.PRODUCTION_KEY;
// HttpPut updateApplicationGrantTypesEndpoint = new HttpPut(url);
// updateApplicationGrantTypesEndpoint.setHeader(HttpHeaders.AUTHORIZATION, HandlerConstants.BEARER +
// getAccessToken(resp, encodedClientApp));
// updateApplicationGrantTypesEndpoint.setHeader(HttpHeaders.CONTENT_TYPE, ContentType.APPLICATION_JSON.toString());
// updateApplicationGrantTypesEndpoint.setEntity(constructAppGrantTypeUpdatePayload());
//
// ProxyResponse updateApplicationGrantTypesEndpointResponse = HandlerUtil.execute(updateApplicationGrantTypesEndpoint);
//
// // Update app as a SaaS app
// this.updateSaasApp(applicationId);
//
// if (updateApplicationGrantTypesEndpointResponse.getCode() == HttpStatus.SC_UNAUTHORIZED) {
// String msg = "Unauthorized attempt to update the grant types of the application. " +
// "Application ID: " + applicationId + ". Response message: "
// + updateApplicationGrantTypesEndpointResponse.getData();
// log.error(msg);
// HandlerUtil.handleError(resp, updateApplicationGrantTypesEndpointResponse);
// throw new LoginException(msg);
// } else if (updateApplicationGrantTypesEndpointResponse.getCode() != HttpStatus.SC_OK) {
// String msg = "Failed the process while updating the grant types of the application. " +
// "Application ID: " + applicationId + ". Response Code: "
// + updateApplicationGrantTypesEndpointResponse.getCode() + ", Response message: "
// + updateApplicationGrantTypesEndpointResponse.getData();
// log.error(msg);
// HandlerUtil.handleError(resp, null);
// throw new LoginException(msg);
// }
} catch (IOException e) {
throw new LoginException("Error occurred while sending the response into the socket.", e);
} catch (JsonSyntaxException e) {
throw new LoginException("Error occurred while parsing the response.", e);
}
// catch (ParserConfigurationException e) {
// throw new LoginException("Error while creating the document builder.", e);
// }
// catch (SAXException e) {
// throw new LoginException("Error while parsing xml file.", e);
// }
}
/**
@ -325,21 +251,17 @@ public class SsoLoginHandler extends HttpServlet {
/***
* Generates payload for application grant_type update payload
*
* @return {@link StringEntity} of the payload to update application grant type
* @return {@link JsonArray} of the payload to update application grant type
*/
private StringEntity constructAppGrantTypeUpdatePayload() {
JSONObject jsonObject = new JSONObject();
jsonObject.put("supportedGrantTypes",
new JSONArray(new Object[]{
HandlerConstants.CODE_GRANT_TYPE,
HandlerConstants.REFRESH_TOKEN_GRANT_TYPE,
HandlerConstants.PASSWORD_GRANT_TYPE,
HandlerConstants.JWT_BEARER_GRANT_TYPE
})
);
jsonObject.put(HandlerConstants.CALLBACK_URL_KEY, iotsCoreUrl + baseContextPath + HandlerConstants.SSO_LOGIN_CALLBACK);
String payload = jsonObject.toString();
return new StringEntity(payload, ContentType.APPLICATION_JSON);
private JsonArray constructAppGrantTypeUpdateArray() {
JsonArray jsonArray = new JsonArray();
jsonArray.add(HandlerConstants.CODE_GRANT_TYPE);
jsonArray.add(HandlerConstants.REFRESH_TOKEN_GRANT_TYPE);
jsonArray.add(HandlerConstants.PASSWORD_GRANT_TYPE);
jsonArray.add(HandlerConstants.JWT_BEARER_GRANT_TYPE);
return jsonArray;
}
/***
@ -389,108 +311,4 @@ public class SsoLoginHandler extends HttpServlet {
JsonObject jTokenResultAsJsonObject = jTokenResult.getAsJsonObject();
return jTokenResultAsJsonObject.get("access_token").getAsString();
}
/***
* Updates Application
*
* @param appName - Application name
* @throws IOException IO exception throws if an error occurred when invoking token endpoint
* @throws ParserConfigurationException,SAXException throws if an error occurred when parsing xml
*/
private void updateSaasApp(String appName) throws ParserConfigurationException, IOException, SAXException {
File getAppRequestXmlFile = new File(HandlerConstants.PAYLOADS_DIR + "/get-app-request.xml");
String identityAppMgtUrl = apiMgtUrl + HandlerConstants.IDENTITY_APP_MGT_ENDPOINT;
HttpPost getApplicationEndpoint = new HttpPost(identityAppMgtUrl);
getApplicationEndpoint.setHeader(HttpHeaders.AUTHORIZATION, HandlerConstants.BASIC +
encodedAdminCredentials);
getApplicationEndpoint.setHeader(HttpHeaders.CONTENT_TYPE, ContentType.TEXT_XML.toString());
getApplicationEndpoint.setHeader(HandlerConstants.SOAP_ACTION_HEADER, "urn:getApplication");
String requestBodyString = HandlerUtil.xmlToString(getAppRequestXmlFile);
Map<String, String> data = new HashMap<>();
appName = adminUsername + HandlerConstants.UNDERSCORE + appName + HandlerConstants.UNDERSCORE +
HandlerConstants.PRODUCTION_KEY;
data.put("applicationName", appName);
requestBodyString = StrSubstitutor.replace(requestBodyString, data);
getApplicationEndpoint.setEntity(new StringEntity(requestBodyString, ContentType.TEXT_XML));
ProxyResponse getApplicationEndpointResponse = HandlerUtil.execute(getApplicationEndpoint);
Document doc = DocumentBuilderFactory.newInstance()
.newDocumentBuilder()
.parse(new InputSource(new StringReader(getApplicationEndpointResponse.getData())));
NodeList nodeList = doc.getElementsByTagName(HandlerConstants.AX_PREFIX + "inboundAuthenticationConfig");
NodeList childNodeList;
String nodeName;
data.clear();
data.put("applicationId", doc.getElementsByTagName(HandlerConstants.AX_PREFIX + "applicationID").item(0).getTextContent());
data.put("applicationName", doc.getElementsByTagName(HandlerConstants.AX_PREFIX + "applicationName").item(0).getTextContent());
data.put("description", doc.getElementsByTagName(HandlerConstants.AX_PREFIX + "description").item(0).getTextContent());
data.put("saasApp", "true");
for (int i = 0; i < nodeList.getLength(); i++) {
childNodeList = nodeList.item(i).getChildNodes();
for (int j = 0; j < childNodeList.getLength(); j++) {
if (childNodeList.item(j).getNodeName().equalsIgnoreCase(HandlerConstants.AX_PREFIX + "inboundAuthenticationRequestConfigs")) {
NodeList inboundAuthRequestConfigs = childNodeList.item(j).getChildNodes();
for (int k = 0; k < inboundAuthRequestConfigs.getLength(); k++) {
nodeName = inboundAuthRequestConfigs.item(k).getNodeName();
if (nodeName.equalsIgnoreCase(HandlerConstants.AX_PREFIX + "inboundAuthKey")) {
data.put("inboundAuthKey", inboundAuthRequestConfigs.item(k).getTextContent());
}
if (nodeName.equalsIgnoreCase(HandlerConstants.AX_PREFIX + "inboundAuthType")) {
data.put("inboundAuthType", inboundAuthRequestConfigs.item(k).getTextContent());
}
if (nodeName.equalsIgnoreCase(HandlerConstants.AX_PREFIX + "inboundConfigType")) {
data.put("inboundConfigType", inboundAuthRequestConfigs.item(k).getTextContent());
}
}
}
}
}
nodeList = doc.getElementsByTagName(HandlerConstants.AX_PREFIX + "owner");
for (int i = 0; i < nodeList.getLength(); i++) {
childNodeList = nodeList.item(i).getChildNodes();
for (int j = 0; j < childNodeList.getLength(); j++) {
switch (childNodeList.item(j).getNodeName()) {
case HandlerConstants.AX_PREFIX + "tenantDomain":
data.put("tenantDomain", childNodeList.item(j).getTextContent());
break;
case HandlerConstants.AX_PREFIX + "userName":
data.put("userName", childNodeList.item(j).getTextContent());
break;
case HandlerConstants.AX_PREFIX + "userStoreDomain":
data.put("userStoreDomain", childNodeList.item(j).getTextContent());
break;
}
}
}
nodeList = doc.getElementsByTagName(HandlerConstants.AX_PREFIX + "spProperties");
for (int k = 0; k < nodeList.getLength(); k++) {
childNodeList = nodeList.item(k).getChildNodes();
for (int l = 0; l < childNodeList.getLength(); l++) {
if (childNodeList.item(l).getNodeName().equalsIgnoreCase(HandlerConstants.AX_PREFIX + "value")) {
data.put("displayName", childNodeList.item(l).getTextContent());
}
}
}
File appUpdateRequest = new File(HandlerConstants.PAYLOADS_DIR + "/update-app-request.xml");
String docStr = HandlerUtil.xmlToString(appUpdateRequest);
requestBodyString = StrSubstitutor.replace(docStr, data);
HttpPost updateApplicationEndpoint = new HttpPost(identityAppMgtUrl);
updateApplicationEndpoint.setHeader(HttpHeaders.AUTHORIZATION, HandlerConstants.BASIC +
encodedAdminCredentials);
updateApplicationEndpoint.setHeader(HttpHeaders.CONTENT_TYPE, ContentType.TEXT_XML.toString());
updateApplicationEndpoint.setHeader(HandlerConstants.SOAP_ACTION_HEADER, "urn:updateApplication");
updateApplicationEndpoint.setEntity(new StringEntity(requestBodyString, ContentType.TEXT_XML));
HandlerUtil.execute(updateApplicationEndpoint);
}
}

1
components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/util/HandlerConstants.java
Unescape View File

@ -43,6 +43,7 @@ public class HandlerConstants {
public static final String SESSION_DEFAULT_AUTH_DATA_KEY = "defaultAuthInfo";
public static final String UI_CONFIG_KEY = "ui-config";
public static final String CALLBACK_URL_KEY = "callbackUrl";
public static final String GRANT_TYPE_KEY = "supportedGrantTypes";
public static final String IS_ALLOWED_TO_ALL_DOMAINS_KEY = "isAllowedToAllDomains";
public static final String JSESSIONID_KEY = "JSESSIONID";
public static final String COMMON_AUTH_ID_KEY = "commonAuthId";

12
components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/util/HandlerUtil.java
Unescape View File

@ -461,15 +461,25 @@ public class HandlerUtil {
* @param tags - tags which are retrieved by reading app manager configuration
* @param username - username provided from login form or admin username
* @param password - password provided from login form or admin password
* @param callbackUrl - callback url
* @param supportedGrantTypes - supported grant types
* @return {@link StringEntity} of the payload to create the client application
*/
public static StringEntity constructAppRegPayload(JsonArray tags, String appName, String username, String password) {
public static StringEntity constructAppRegPayload(JsonArray tags, String appName, String username, String password,
String callbackUrl, JsonArray supportedGrantTypes) {
JsonObject jsonObject = new JsonObject();
jsonObject.addProperty(HandlerConstants.APP_NAME_KEY, appName);
jsonObject.addProperty(HandlerConstants.USERNAME, username);
jsonObject.addProperty(HandlerConstants.PASSWORD, password);
jsonObject.addProperty(HandlerConstants.IS_ALLOWED_TO_ALL_DOMAINS_KEY, "false");
jsonObject.add(HandlerConstants.TAGS_KEY, tags);
if (callbackUrl != null) {
jsonObject.addProperty(HandlerConstants.CALLBACK_URL_KEY, callbackUrl);
}
if (supportedGrantTypes != null) {
jsonObject.add(HandlerConstants.GRANT_TYPE_KEY, supportedGrantTypes);
}
String payload = jsonObject.toString();
return new StringEntity(payload, ContentType.APPLICATION_JSON);
}

Write Preview
Loading…
Cancel
Save