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

Upgrade with latest http client

Browse Source
apim420
tcdlpds 1 year ago
parent d4f9472e48
commit 2d9352a788
3 changed files with 166 additions and 103 deletions
Show Stats Download Patch File Download Diff File

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

@ -18,6 +18,10 @@
package io.entgra.device.mgt.core.ui.request.interceptor; package io.entgra.device.mgt.core.ui.request.interceptor;
import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.google.gson.JsonParser; import com.google.gson.JsonParser;
@ -31,11 +35,11 @@ import io.entgra.device.mgt.core.ui.request.interceptor.beans.AuthData;
import io.entgra.device.mgt.core.ui.request.interceptor.beans.ProxyResponse; import io.entgra.device.mgt.core.ui.request.interceptor.beans.ProxyResponse;
import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerConstants; import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerConstants;
import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerUtil; import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerUtil;
import org.apache.http.HttpHeaders; import org.apache.hc.client5.http.entity.UrlEncodedFormEntity;
import org.apache.http.HttpStatus; import org.apache.hc.core5.http.*;
import org.apache.http.client.methods.HttpPost; import org.apache.hc.core5.http.io.entity.HttpEntities;
import org.apache.http.entity.ContentType; import org.apache.hc.core5.http.io.support.ClassicRequestBuilder;
import org.apache.http.entity.StringEntity; import org.apache.hc.core5.http.message.BasicNameValuePair;
import javax.servlet.annotation.MultipartConfig; import javax.servlet.annotation.MultipartConfig;
import javax.servlet.annotation.WebServlet; import javax.servlet.annotation.WebServlet;
@ -44,7 +48,10 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.Base64; import java.util.Base64;
import java.util.List;
import java.util.Map;
@MultipartConfig @MultipartConfig
@WebServlet("/user") @WebServlet("/user")
@ -85,7 +92,22 @@ public class UserHandler extends HttpServlet {
StringEntity tokenEPPayload = new StringEntity("token=" + accessToken, StringEntity tokenEPPayload = new StringEntity("token=" + accessToken,
ContentType.APPLICATION_FORM_URLENCODED); ContentType.APPLICATION_FORM_URLENCODED);
tokenEndpoint.setEntity(tokenEPPayload); tokenEndpoint.setEntity(tokenEPPayload);
ProxyResponse tokenStatus = HandlerUtil.execute(tokenEndpoint);
JsonFactory jsonFactory = new JsonFactory();
ObjectMapper objectMapper = new ObjectMapper(jsonFactory);
List<NameValuePair> nvps = new ArrayList<>();
nvps.add(new BasicNameValuePair("token", accessToken));
// nvps.add(new BasicNameValuePair("password", "secret"));
ClassicHttpRequest httpPost = ClassicRequestBuilder.post(keymanagerUrl + HandlerConstants.INTROSPECT_ENDPOINT)
.setEntity(new UrlEncodedFormEntity(nvps))
.setHeader(HttpHeaders.CONTENT_TYPE, ContentType.APPLICATION_FORM_URLENCODED.toString())
.setHeader(HttpHeaders.AUTHORIZATION, HandlerConstants.BASIC + Base64.getEncoder().encodeToString((adminUsername + HandlerConstants.COLON + adminPassword).getBytes()))
.build();
ProxyResponse tokenStatus = HandlerUtil.execute(httpPost);
if (tokenStatus.getExecutorResponse().contains(HandlerConstants.EXECUTOR_EXCEPTION_PREFIX)) { if (tokenStatus.getExecutorResponse().contains(HandlerConstants.EXECUTOR_EXCEPTION_PREFIX)) {
if (tokenStatus.getCode() == HttpStatus.SC_UNAUTHORIZED) { if (tokenStatus.getCode() == HttpStatus.SC_UNAUTHORIZED) {
@ -100,29 +122,52 @@ public class UserHandler extends HttpServlet {
return; return;
} }
} }
String tokenData = tokenStatus.getData(); JsonNode tokenData = tokenStatus.getData();
if (tokenData == null) { if (tokenData == null) {
log.error("Invalid token data is received."); log.error("Invalid token data is received.");
HandlerUtil.handleError(resp, tokenStatus); HandlerUtil.handleError(resp, tokenStatus);
return; return;
} }
JsonParser jsonParser = new JsonParser();
JsonElement jTokenResult = jsonParser.parse(tokenData); if (!tokenData.get("active").asBoolean()) {
if (jTokenResult.isJsonObject()) {
JsonObject jTokenResultAsJsonObject = jTokenResult.getAsJsonObject();
if (!jTokenResultAsJsonObject.get("active").getAsBoolean()) {
HandlerUtil.sendUnAuthorizeResponse(resp); HandlerUtil.sendUnAuthorizeResponse(resp);
return; return;
} }
ProxyResponse proxyResponse = new ProxyResponse(); ProxyResponse proxyResponse = new ProxyResponse();
proxyResponse.setStatus(ProxyResponse.Status.SUCCESS); proxyResponse.setStatus(ProxyResponse.Status.SUCCESS);
proxyResponse.setCode(HttpStatus.SC_OK); proxyResponse.setCode(HttpStatus.SC_OK);
proxyResponse.setData( // proxyResponse.setData(
jTokenResultAsJsonObject.get("username").getAsString().replaceAll("@carbon.super", "")); // tokenData.get("username").textValue().replaceAll("@carbon.super", ""));
ObjectMapper mapper = new ObjectMapper();
Map<String, Object> nodeMap = mapper.convertValue(tokenData, new TypeReference<Map<String, Object>>(){});
nodeMap.put("username", tokenData.get("username").textValue().replaceAll("@carbon.super", ""));
proxyResponse.setData(mapper.convertValue(nodeMap, JsonNode.class));
// tokenData = ;
HandlerUtil.handleSuccess(resp, proxyResponse); HandlerUtil.handleSuccess(resp, proxyResponse);
httpSession.setAttribute(HandlerConstants.USERNAME_WITH_DOMAIN, jTokenResultAsJsonObject.get("username").getAsString()); httpSession.setAttribute(HandlerConstants.USERNAME_WITH_DOMAIN, jTokenResultAsJsonObject.get("username").getAsString());
log.info("Customer login", userLogContextBuilder.setUserName(proxyResponse.getData()).setUserRegistered(true).build()); log.info("Customer login", userLogContextBuilder.setUserName(proxyResponse.getData()).setUserRegistered(true).build());
}
// JsonParser jsonParser = new JsonParser();
// JsonElement jTokenResult = jsonParser.parse(tokenData);
// if (jTokenResult.isJsonObject()) {
// JsonObject jTokenResultAsJsonObject = jTokenResult.getAsJsonObject();
// if (!jTokenResultAsJsonObject.get("active").getAsBoolean()) {
// HandlerUtil.sendUnAuthorizeResponse(resp);
// return;
// }
// ProxyResponse proxyResponse = new ProxyResponse();
// proxyResponse.setStatus(ProxyResponse.Status.SUCCESS);
// proxyResponse.setCode(HttpStatus.SC_OK);
// proxyResponse.setData(
// jTokenResultAsJsonObject.get("username").getAsString().replaceAll("@carbon.super", ""));
// HandlerUtil.handleSuccess(resp, proxyResponse);
// httpSession.setAttribute(HandlerConstants.USERNAME_WITH_DOMAIN, jTokenResultAsJsonObject.get("username").getAsString());
// log.info("Customer login", userLogContextBuilder.setUserName(proxyResponse.getData()).setUserRegistered(true).build());
// }
} catch (IOException e) { } catch (IOException e) {
log.error("Error occurred while sending the response into the socket. ", e); log.error("Error occurred while sending the response into the socket. ", e);
} catch (JsonSyntaxException e) { } catch (JsonSyntaxException e) {

9
components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/beans/ProxyResponse.java
Unescape View File

@ -17,7 +17,8 @@
*/ */
package io.entgra.device.mgt.core.ui.request.interceptor.beans; package io.entgra.device.mgt.core.ui.request.interceptor.beans;
import org.apache.http.Header; import com.fasterxml.jackson.databind.JsonNode;
import org.apache.hc.core5.http.Header;
public class ProxyResponse { public class ProxyResponse {
@ -27,7 +28,7 @@ public class ProxyResponse {
} }
private int code; private int code;
private String data; private JsonNode data;
private String executorResponse; private String executorResponse;
private int status; private int status;
private Header[] headers; private Header[] headers;
@ -36,9 +37,9 @@ public class ProxyResponse {
public void setCode(int code) { this.code = code; } public void setCode(int code) { this.code = code; }
public String getData() { return data; } public JsonNode getData() { return data; }
public void setData(String data) { this.data = data; } public void setData(JsonNode data) { this.data = data; }
public String getExecutorResponse() { return executorResponse; } public String getExecutorResponse() { return executorResponse; }

149
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

@ -18,6 +18,9 @@
package io.entgra.device.mgt.core.ui.request.interceptor.util; package io.entgra.device.mgt.core.ui.request.interceptor.util;
import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.JsonArray; import com.google.gson.JsonArray;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
@ -32,27 +35,25 @@ import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.hc.client5.http.classic.methods.HttpGet;
import org.apache.hc.client5.http.classic.methods.HttpPost;
import org.apache.hc.client5.http.entity.mime.InputStreamBody;
import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder;
import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
import org.apache.hc.client5.http.impl.classic.HttpClients;
import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
import org.apache.hc.client5.http.ssl.NoopHostnameVerifier;
import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactoryBuilder;
import org.apache.hc.client5.http.ssl.TrustAllStrategy;
import org.apache.hc.core5.http.*;
import org.apache.hc.core5.http.io.entity.BufferedHttpEntity;
import org.apache.hc.core5.http.io.entity.InputStreamEntity;
import org.apache.hc.core5.http.io.entity.StringEntity;
import org.apache.hc.core5.ssl.SSLContextBuilder;
import org.apache.http.Consts; import org.apache.http.Consts;
import org.apache.http.Header;
import org.apache.http.HttpHeaders;
import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
import org.apache.http.client.methods.HttpEntityEnclosingRequestBase; import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.methods.HttpRequestBase; import org.apache.http.client.methods.HttpRequestBase;
import org.apache.http.conn.ssl.NoopHostnameVerifier;
import org.apache.http.conn.ssl.X509HostnameVerifier;
import org.apache.http.cookie.SM; import org.apache.http.cookie.SM;
import org.apache.http.entity.BufferedHttpEntity;
import org.apache.http.entity.ContentType;
import org.apache.http.entity.InputStreamEntity;
import org.apache.http.entity.StringEntity;
import org.apache.http.entity.mime.HttpMultipartMode;
import org.apache.http.entity.mime.MultipartEntityBuilder;
import org.apache.http.entity.mime.content.InputStreamBody;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.xml.serialize.OutputFormat; import org.apache.xml.serialize.OutputFormat;
import org.apache.xml.serialize.XMLSerializer; import org.apache.xml.serialize.XMLSerializer;
import org.json.JSONArray; import org.json.JSONArray;
@ -70,13 +71,11 @@ import javax.servlet.http.HttpSession;
import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.ParserConfigurationException;
import java.io.BufferedReader; import java.io.*;
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.math.BigInteger; import java.math.BigInteger;
import java.security.KeyManagementException;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom; import java.security.SecureRandom;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.List; import java.util.List;
@ -96,71 +95,75 @@ public class HandlerUtil {
* @return response as string * @return response as string
* @throws IOException IO exception returns if error occurs when executing the httpMethod * @throws IOException IO exception returns if error occurs when executing the httpMethod
*/ */
public static ProxyResponse execute(HttpRequestBase httpRequest) throws IOException { public static ProxyResponse execute(ClassicHttpRequest httpRequest) throws IOException {
try (CloseableHttpClient client = getHttpClient()) { try (CloseableHttpClient client = getHttpClient()) {
HttpResponse response = client.execute(httpRequest);
ProxyResponse proxyResponse = new ProxyResponse();
if (response == null) { JsonFactory jsonFactory = new JsonFactory();
log.error("Received null response for http request : " + httpRequest.getMethod() + " " + httpRequest ObjectMapper objectMapper = new ObjectMapper(jsonFactory);
.getURI().toString());
proxyResponse.setCode(HandlerConstants.INTERNAL_ERROR_CODE); return client.execute(httpRequest, response -> {
proxyResponse.setStatus(ProxyResponse.Status.ERROR); final HttpEntity responseEntity = response.getEntity();
proxyResponse.setExecutorResponse(HandlerConstants.EXECUTOR_EXCEPTION_PREFIX + getStatusKey( ProxyResponse handlerResponse = new ProxyResponse();
int statusCode = response.getCode();
if (responseEntity == null) {
log.error("Received null response for http request : " + httpRequest.getMethod() + " " + httpRequest.getRequestUri());
handlerResponse.setCode(HandlerConstants.INTERNAL_ERROR_CODE);
handlerResponse.setStatus(ProxyResponse.Status.ERROR);
handlerResponse.setExecutorResponse(HandlerConstants.EXECUTOR_EXCEPTION_PREFIX + getStatusKey(
HandlerConstants.INTERNAL_ERROR_CODE)); HandlerConstants.INTERNAL_ERROR_CODE));
return proxyResponse; return handlerResponse;
} else { }
int statusCode = response.getStatusLine().getStatusCode(); try (InputStream inputStream = responseEntity.getContent()) {
String jsonString = getResponseString(response); JsonNode responseData = objectMapper.readTree(inputStream);
if (statusCode == HttpStatus.SC_OK || statusCode == HttpStatus.SC_CREATED) { if (statusCode == HttpStatus.SC_OK || statusCode == HttpStatus.SC_CREATED) {
proxyResponse.setCode(statusCode); handlerResponse.setCode(statusCode);
proxyResponse.setData(jsonString); handlerResponse.setData(responseData);
proxyResponse.setStatus(ProxyResponse.Status.SUCCESS); handlerResponse.setStatus(ProxyResponse.Status.SUCCESS);
proxyResponse.setExecutorResponse("SUCCESS"); handlerResponse.setExecutorResponse("SUCCESS");
proxyResponse.setHeaders(response.getAllHeaders()); handlerResponse.setHeaders(response.getHeaders());
return proxyResponse; return handlerResponse;
} else if (statusCode == HttpStatus.SC_UNAUTHORIZED) { } else if (statusCode == HttpStatus.SC_UNAUTHORIZED) {
if (isTokenExpired(jsonString)) { if (isTokenExpired(responseData)) {
proxyResponse.setCode(statusCode); handlerResponse.setCode(statusCode);
proxyResponse.setStatus(ProxyResponse.Status.ERROR); handlerResponse.setStatus(ProxyResponse.Status.ERROR);
proxyResponse.setExecutorResponse(HandlerConstants.TOKEN_IS_EXPIRED); handlerResponse.setExecutorResponse(HandlerConstants.TOKEN_IS_EXPIRED);
} else { } else {
log.error( log.error(
"Received " + statusCode + " response for http request : " + httpRequest.getMethod() "Received " + statusCode + " response for http request : " + httpRequest.getMethod()
+ " " + httpRequest.getURI().toString() + ". Error message: " + jsonString); + " " + httpRequest.getRequestUri() + ". Error message: " + responseData.textValue());
proxyResponse.setCode(statusCode); handlerResponse.setCode(statusCode);
proxyResponse.setData(jsonString); handlerResponse.setData(responseData);
proxyResponse.setStatus(ProxyResponse.Status.ERROR); handlerResponse.setStatus(ProxyResponse.Status.ERROR);
proxyResponse.setExecutorResponse( handlerResponse.setExecutorResponse(
HandlerConstants.EXECUTOR_EXCEPTION_PREFIX + getStatusKey(statusCode)); HandlerConstants.EXECUTOR_EXCEPTION_PREFIX + getStatusKey(statusCode));
} }
return proxyResponse; return handlerResponse;
} }
log.error("Received " + statusCode + log.error("Received " + statusCode + " response for http request : " + httpRequest.getMethod()
" response for http request : " + httpRequest.getMethod() + " " + httpRequest.getURI() + " " + httpRequest.getRequestUri() + ". Error message: " + responseData.textValue());
.toString() + ". Error message: " + jsonString); handlerResponse.setCode(statusCode);
proxyResponse.setCode(statusCode); handlerResponse.setData(responseData);
proxyResponse.setData(jsonString); handlerResponse.setStatus(ProxyResponse.Status.ERROR);
proxyResponse.setStatus(ProxyResponse.Status.ERROR); handlerResponse
proxyResponse
.setExecutorResponse(HandlerConstants.EXECUTOR_EXCEPTION_PREFIX + getStatusKey(statusCode)); .setExecutorResponse(HandlerConstants.EXECUTOR_EXCEPTION_PREFIX + getStatusKey(statusCode));
return proxyResponse; return handlerResponse;
} }
});
} }
} }
public static boolean isTokenExpired(String jsonBody) { public static boolean isTokenExpired(JsonNode jsonBody) {
return jsonBody.contains("Access token expired") || jsonBody return jsonBody.textValue().contains("Access token expired") || jsonBody.textValue()
.contains("Invalid input. Access token validation failed"); .contains("Invalid input. Access token validation failed");
} }
public static String getMemeType(HttpResponse response) { public static String getMemeType(HttpResponse response) {
String memeType = "";
Header contentType = response.getEntity().getContentType(); Header contentType = response.getEntity().getContentType();
if (contentType != null) { if (contentType != null) {
memeType = contentType.getValue().split(";")[0].trim(); return contentType.getValue().split(";")[0].trim();
} }
return memeType; return "";
} }
/*** /***
@ -367,7 +370,21 @@ public class HandlerUtil {
boolean isIgnoreHostnameVerification = Boolean.parseBoolean(System. boolean isIgnoreHostnameVerification = Boolean.parseBoolean(System.
getProperty("org.wso2.ignoreHostnameVerification")); getProperty("org.wso2.ignoreHostnameVerification"));
if (isIgnoreHostnameVerification) { if (isIgnoreHostnameVerification) {
return HttpClients.custom().setHostnameVerifier((X509HostnameVerifier) NoopHostnameVerifier.INSTANCE).build(); try {
return HttpClients.custom()
.setConnectionManager(PoolingHttpClientConnectionManagerBuilder.create()
.setSSLSocketFactory(SSLConnectionSocketFactoryBuilder.create()
.setSslContext(SSLContextBuilder.create()
.loadTrustMaterial(TrustAllStrategy.INSTANCE)
.build())
.setHostnameVerifier(NoopHostnameVerifier.INSTANCE)
.build())
.build())
.build();
} catch (NoSuchAlgorithmException | KeyManagementException | KeyStoreException e) {
log.error("Error Occurred while creating the custom http client", e);
throw new RuntimeException(e);
}
} else { } else {
return HttpClients.createDefault(); return HttpClients.createDefault();
} }

Write Preview
Loading…
Cancel
Save