|
|
@ -73,6 +73,7 @@ import java.io.PrintWriter;
|
|
|
|
import java.io.StringWriter;
|
|
|
|
import java.io.StringWriter;
|
|
|
|
import java.math.BigInteger;
|
|
|
|
import java.math.BigInteger;
|
|
|
|
import java.security.SecureRandom;
|
|
|
|
import java.security.SecureRandom;
|
|
|
|
|
|
|
|
import java.util.Base64;
|
|
|
|
import java.util.Enumeration;
|
|
|
|
import java.util.Enumeration;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.List;
|
|
|
|
|
|
|
|
|
|
|
@ -613,14 +614,15 @@ public class HandlerUtil {
|
|
|
|
* @throws IOException If an error occurs when try to retry the request.
|
|
|
|
* @throws IOException If an error occurs when try to retry the request.
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
public static ProxyResponse retryRequestWithRefreshedToken(HttpServletRequest req, HttpRequestBase httpRequest,
|
|
|
|
public static ProxyResponse retryRequestWithRefreshedToken(HttpServletRequest req, HttpRequestBase httpRequest,
|
|
|
|
String apiEndpoint) throws IOException {
|
|
|
|
String apiEndpoint, boolean isDefaultAuthToken) throws IOException {
|
|
|
|
ProxyResponse retryResponse = refreshToken(req, apiEndpoint);
|
|
|
|
ProxyResponse retryResponse = refreshToken(req, apiEndpoint, isDefaultAuthToken);
|
|
|
|
if (isResponseSuccessful(retryResponse)) {
|
|
|
|
if (isResponseSuccessful(retryResponse)) {
|
|
|
|
HttpSession session = req.getSession(false);
|
|
|
|
HttpSession session = req.getSession(false);
|
|
|
|
if (session == null) {
|
|
|
|
if (session == null) {
|
|
|
|
log.error("Unauthorized, You are not logged in. Please log in to the portal");
|
|
|
|
log.error("Unauthorized, You are not logged in. Please log in to the portal");
|
|
|
|
return constructProxyResponseByErrorCode(HttpStatus.SC_UNAUTHORIZED);
|
|
|
|
return constructProxyResponseByErrorCode(HttpStatus.SC_UNAUTHORIZED);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if(!isDefaultAuthToken){
|
|
|
|
httpRequest.setHeader(HttpHeaders.AUTHORIZATION, HandlerConstants.BEARER + authData.getAccessToken());
|
|
|
|
httpRequest.setHeader(HttpHeaders.AUTHORIZATION, HandlerConstants.BEARER + authData.getAccessToken());
|
|
|
|
ProxyResponse proxyResponse = HandlerUtil.execute(httpRequest);
|
|
|
|
ProxyResponse proxyResponse = HandlerUtil.execute(httpRequest);
|
|
|
|
if (proxyResponse.getExecutorResponse().contains(HandlerConstants.EXECUTOR_EXCEPTION_PREFIX)) {
|
|
|
|
if (proxyResponse.getExecutorResponse().contains(HandlerConstants.EXECUTOR_EXCEPTION_PREFIX)) {
|
|
|
@ -628,11 +630,16 @@ public class HandlerUtil {
|
|
|
|
return proxyResponse;
|
|
|
|
return proxyResponse;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return proxyResponse;
|
|
|
|
return proxyResponse;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return retryResponse;
|
|
|
|
return retryResponse;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public static ProxyResponse retryRequestWithRefreshedToken(HttpServletRequest req, HttpRequestBase httpRequest,
|
|
|
|
|
|
|
|
String apiEndpoint) throws IOException {
|
|
|
|
|
|
|
|
return retryRequestWithRefreshedToken(req, httpRequest, apiEndpoint, false);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***
|
|
|
|
/***
|
|
|
|
* This method is responsible to get the refresh token
|
|
|
|
* This method is responsible to get the refresh token
|
|
|
|
*
|
|
|
|
*
|
|
|
@ -640,7 +647,7 @@ public class HandlerUtil {
|
|
|
|
* @return If successfully renew tokens, returns TRUE otherwise return FALSE
|
|
|
|
* @return If successfully renew tokens, returns TRUE otherwise return FALSE
|
|
|
|
* @throws IOException If an error occurs while witting error response to client side or invoke token renewal API
|
|
|
|
* @throws IOException If an error occurs while witting error response to client side or invoke token renewal API
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
private static ProxyResponse refreshToken(HttpServletRequest req, String keymanagerUrl)
|
|
|
|
private static ProxyResponse refreshToken(HttpServletRequest req, String keymanagerUrl, boolean isDefaultAuthToken)
|
|
|
|
throws IOException {
|
|
|
|
throws IOException {
|
|
|
|
if (log.isDebugEnabled()) {
|
|
|
|
if (log.isDebugEnabled()) {
|
|
|
|
log.debug("refreshing the token");
|
|
|
|
log.debug("refreshing the token");
|
|
|
@ -653,8 +660,11 @@ public class HandlerUtil {
|
|
|
|
// handleError(resp, HttpStatus.SC_UNAUTHORIZED);
|
|
|
|
// handleError(resp, HttpStatus.SC_UNAUTHORIZED);
|
|
|
|
return tokenResultResponse;
|
|
|
|
return tokenResultResponse;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if(isDefaultAuthToken){
|
|
|
|
|
|
|
|
authData = (AuthData) session.getAttribute(HandlerConstants.SESSION_DEFAULT_AUTH_DATA_KEY);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
authData = (AuthData) session.getAttribute(HandlerConstants.SESSION_AUTH_DATA_KEY);
|
|
|
|
authData = (AuthData) session.getAttribute(HandlerConstants.SESSION_AUTH_DATA_KEY);
|
|
|
|
|
|
|
|
}
|
|
|
|
tokenResultResponse = getTokenResult(authData, keymanagerUrl);
|
|
|
|
tokenResultResponse = getTokenResult(authData, keymanagerUrl);
|
|
|
|
if (tokenResultResponse.getExecutorResponse().contains(HandlerConstants.EXECUTOR_EXCEPTION_PREFIX)) {
|
|
|
|
if (tokenResultResponse.getExecutorResponse().contains(HandlerConstants.EXECUTOR_EXCEPTION_PREFIX)) {
|
|
|
|
log.error("Error occurred while refreshing access token.");
|
|
|
|
log.error("Error occurred while refreshing access token.");
|
|
|
@ -666,7 +676,11 @@ public class HandlerUtil {
|
|
|
|
JsonElement jTokenResult = jsonParser.parse(tokenResultResponse.getData());
|
|
|
|
JsonElement jTokenResult = jsonParser.parse(tokenResultResponse.getData());
|
|
|
|
|
|
|
|
|
|
|
|
if (jTokenResult.isJsonObject()) {
|
|
|
|
if (jTokenResult.isJsonObject()) {
|
|
|
|
|
|
|
|
if(isDefaultAuthToken){
|
|
|
|
|
|
|
|
setNewDefaultAuthData(constructAuthDataFromTokenResult(jTokenResult, authData), session);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
setNewAuthData(constructAuthDataFromTokenResult(jTokenResult, authData), session);
|
|
|
|
setNewAuthData(constructAuthDataFromTokenResult(jTokenResult, authData), session);
|
|
|
|
|
|
|
|
}
|
|
|
|
return tokenResultResponse;
|
|
|
|
return tokenResultResponse;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -675,6 +689,11 @@ public class HandlerUtil {
|
|
|
|
// handleError(resp, HttpStatus.SC_INTERNAL_SERVER_ERROR);
|
|
|
|
// handleError(resp, HttpStatus.SC_INTERNAL_SERVER_ERROR);
|
|
|
|
return tokenResultResponse;
|
|
|
|
return tokenResultResponse;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private static ProxyResponse refreshToken(HttpServletRequest req, String keymanagerUrl) throws IOException {
|
|
|
|
|
|
|
|
return refreshToken(req, keymanagerUrl, false);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public static ProxyResponse getTokenResult(AuthData authData, String keymanagerUrl) throws IOException {
|
|
|
|
public static ProxyResponse getTokenResult(AuthData authData, String keymanagerUrl) throws IOException {
|
|
|
|
HttpPost tokenEndpoint = new HttpPost(keymanagerUrl + HandlerConstants.OAUTH2_TOKEN_ENDPOINT);
|
|
|
|
HttpPost tokenEndpoint = new HttpPost(keymanagerUrl + HandlerConstants.OAUTH2_TOKEN_ENDPOINT);
|
|
|
|
StringEntity tokenEndpointPayload = new StringEntity(
|
|
|
|
StringEntity tokenEndpointPayload = new StringEntity(
|
|
|
@ -683,6 +702,12 @@ public class HandlerUtil {
|
|
|
|
|
|
|
|
|
|
|
|
tokenEndpoint.setEntity(tokenEndpointPayload);
|
|
|
|
tokenEndpoint.setEntity(tokenEndpointPayload);
|
|
|
|
String encodedClientApp = authData.getEncodedClientApp();
|
|
|
|
String encodedClientApp = authData.getEncodedClientApp();
|
|
|
|
|
|
|
|
if(encodedClientApp == null){
|
|
|
|
|
|
|
|
String clientId = authData.getClientId();
|
|
|
|
|
|
|
|
String clientSecret = authData.getClientSecret();
|
|
|
|
|
|
|
|
String toEncode = clientId + ":" + clientSecret;
|
|
|
|
|
|
|
|
encodedClientApp = Base64.getEncoder().encodeToString(toEncode.getBytes());
|
|
|
|
|
|
|
|
}
|
|
|
|
tokenEndpoint.setHeader(HttpHeaders.AUTHORIZATION, HandlerConstants.BASIC +
|
|
|
|
tokenEndpoint.setHeader(HttpHeaders.AUTHORIZATION, HandlerConstants.BASIC +
|
|
|
|
encodedClientApp);
|
|
|
|
encodedClientApp);
|
|
|
|
tokenEndpoint.setHeader(HttpHeaders.CONTENT_TYPE, ContentType.APPLICATION_FORM_URLENCODED.toString());
|
|
|
|
tokenEndpoint.setHeader(HttpHeaders.CONTENT_TYPE, ContentType.APPLICATION_FORM_URLENCODED.toString());
|
|
|
@ -694,6 +719,11 @@ public class HandlerUtil {
|
|
|
|
session.setAttribute(HandlerConstants.SESSION_AUTH_DATA_KEY, newAuthData);
|
|
|
|
session.setAttribute(HandlerConstants.SESSION_AUTH_DATA_KEY, newAuthData);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public static void setNewDefaultAuthData(AuthData newAuthData, HttpSession session) {
|
|
|
|
|
|
|
|
authData = newAuthData;
|
|
|
|
|
|
|
|
session.setAttribute(HandlerConstants.SESSION_DEFAULT_AUTH_DATA_KEY, newAuthData);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public static AuthData constructAuthDataFromTokenResult(JsonElement tokenResult, AuthData authData) {
|
|
|
|
public static AuthData constructAuthDataFromTokenResult(JsonElement tokenResult, AuthData authData) {
|
|
|
|
JsonObject jTokenResultAsJsonObject = tokenResult.getAsJsonObject();
|
|
|
|
JsonObject jTokenResultAsJsonObject = tokenResult.getAsJsonObject();
|
|
|
|
AuthData newAuthData = new AuthData();
|
|
|
|
AuthData newAuthData = new AuthData();
|
|
|
|