diff --git a/src/main/java/org/gcube/portal/threadlocalexec/SmartGearsPortalValve.java b/src/main/java/org/gcube/portal/threadlocalexec/SmartGearsPortalValve.java index 08171dc..ae2c1aa 100644 --- a/src/main/java/org/gcube/portal/threadlocalexec/SmartGearsPortalValve.java +++ b/src/main/java/org/gcube/portal/threadlocalexec/SmartGearsPortalValve.java @@ -33,8 +33,11 @@ import org.gcube.portal.oidc.lr62.LiferayOpenIdConnectConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.liferay.portal.kernel.exception.PortalException; +import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.model.User; import com.liferay.portal.service.UserLocalServiceUtil; +import com.liferay.portal.util.PortalUtil; /** * @@ -95,56 +98,177 @@ public class SmartGearsPortalValve extends ValveBase { private void checkUMATicket(HttpServletRequest request, HttpServletResponse response, String scope) { _log.debug("Getting current user"); User user = getCurrentUser(request); + User purUser = null; + try { + purUser = PortalUtil.getUser(request); + } catch (PortalException | SystemException e) { + _log.debug("Cannot get user via portal util: {}", e.getMessage()); + } if (user == null) { - // Almost impossible _log.error("Current user not found, cannot continue"); return; + } else { + _log.debug("Current user is: {} [{}]", user.getScreenName(), user.getEmailAddress()); + if (purUser != null) { + _log.debug("Current PURet user is: {} [{}]", purUser.getScreenName(), purUser.getEmailAddress()); + } else { + _log.debug("Current PURet user null"); + } } HttpSession session = request.getSession(false); if (session == null) { _log.debug("Session is null, cannot continue"); return; + } else { + _log.debug("Current session ID is {} and class instance is [{}]", session.getId(), + Integer.toHexString(session.hashCode())); } - synchronized (session) { - String urlEncodedScope = null; - try { - urlEncodedScope = URLEncoder.encode(scope, "UTF-8"); - } catch (UnsupportedEncodingException e) { - // Almost impossible - _log.error("Cannot URL encode scope", e); - return; - } - _log.debug("URL encoded scope is: {}", urlEncodedScope); + String urlEncodedScope = null; + try { + urlEncodedScope = URLEncoder.encode(scope, "UTF-8"); + } catch (UnsupportedEncodingException e) { + // Almost impossible + _log.error("Cannot URL encode scope", e); + return; + } + _log.debug("URL encoded scope is: {}", urlEncodedScope); + + _log.trace("Getting UMA token from session {} [{}]", session.getId(), Integer.toHexString(session.hashCode())); + JWTToken umaToken = JWTTokenUtil.getUMAFromSession(session); + if (umaToken == null) { + _log.debug("UMA token not found in session. Trying to get it from cache proxy"); + umaToken = JWTCacheProxy.getInstance().getUMAToken(user, session); + } + if (umaToken != null && !umaToken.isExpired() && umaToken.getAud().contains(urlEncodedScope)) { + _log.trace("Current UMA token is OK [{}]", umaToken.getTokenEssentials()); + if (JWTTokenUtil.getUMAFromSession(session) == null) { + _log.debug("Setting UMA token also in current session {} [{}]", session.getId(), + Integer.toHexString(session.hashCode())); - _log.trace("Getting UMA token from session: {}", session); - JWTToken umaToken = JWTTokenUtil.getUMAFromSession(session); - if (umaToken == null) { - _log.debug("UMA token not found in session. Trying to get it from cache proxy"); - umaToken = JWTCacheProxy.getInstance().getUMAToken(user, session); - } - if (umaToken != null && !umaToken.isExpired() && umaToken.getAud().contains(urlEncodedScope)) { - _log.trace("Current UMA token is OK"); - if (JWTTokenUtil.getUMAFromSession(session) == null) { - _log.debug("Setting UMA token also in current session"); - JWTTokenUtil.putUMAInSession(umaToken, session); - } - } else if (JWTCacheProxy.getInstance().getUMAToken(user, session) != null - && !JWTCacheProxy.getInstance().getUMAToken(user, session).isExpired() - && JWTCacheProxy.getInstance().getUMAToken(user, session).getAud().contains(urlEncodedScope)) { - - _log.debug("Cache proxy already contains the suitable UMA token. Putting it also in session and using it"); - umaToken = JWTCacheProxy.getInstance().getUMAToken(user, session); JWTTokenUtil.putUMAInSession(umaToken, session); - } else { - if (umaToken != null && umaToken.getAud().contains(urlEncodedScope) && umaToken.isExpired()) { - _log.debug("UMA token is expired, trying to refresh it"); - OpenIdConnectConfiguration configuration = LiferayOpenIdConnectConfiguration.getConfiguration(request); + } + } else if (JWTCacheProxy.getInstance().getUMAToken(user, session) != null + && !JWTCacheProxy.getInstance().getUMAToken(user, session).isExpired() + && JWTCacheProxy.getInstance().getUMAToken(user, session).getAud().contains(urlEncodedScope)) { + + _log.debug("Cache proxy already contains the suitable UMA token: {}", umaToken.getTokenEssentials()); + _log.debug("Putting it also in session {} [{}] and using it", session.getId(), + Integer.toHexString(session.hashCode())); + + umaToken = JWTCacheProxy.getInstance().getUMAToken(user, session); + JWTTokenUtil.putUMAInSession(umaToken, session); + } else { + if (umaToken != null && umaToken.getAud().contains(urlEncodedScope) && umaToken.isExpired()) { + _log.debug("UMA token is expired, trying to refresh it [{}]", umaToken.getTokenEssentials()); + OpenIdConnectConfiguration configuration = LiferayOpenIdConnectConfiguration + .getConfiguration(request); + try { + umaToken = OpenIdConnectRESTHelper.refreshToken(configuration.getTokenURL(), umaToken); + _log.debug("Setting refreshed UMA token in cache proxy [{}]", umaToken.getTokenEssentials()); + JWTCacheProxy.getInstance().setUMAToken(getCurrentUser(request), session, umaToken); + _log.debug("Setting refreshed UMA token in session {} [{}]", session.getId(), + Integer.toHexString(session.hashCode())); + + JWTTokenUtil.putUMAInSession(umaToken, session); + } catch (OpenIdConnectRESTHelperException e) { + if (e.hasJSONPayload()) { + if (OpenIdConnectRESTHelper.isInvalidBearerTokenError(e.getResponseString())) { + if (FORCE_LOGOUT_ON_INVALID_OIDC) { + _log.warn("OIDC token is become invalid, forcing redirect to logout URI"); + forceLogout(session, response); + } else { + _log.warn("OIDC token is become invalid, cannot continue"); + } + return; + } else if (OpenIdConnectRESTHelper.isTokenNotActiveError(e.getResponseString())) { + _log.info("UMA token is no more active, get new one"); + } + } else { + _log.error("Refreshing UMA token on server [" + umaToken.getTokenEssentials() + "]", e); + } + umaToken = null; + _log.info("Removing probably inactive OIDC token from session {} [{}}", session.getId(), + Integer.toHexString(session.hashCode())); + + JWTTokenUtil.removeOIDCFromSession(session); + _log.info("Removing all inactive UMA token from session {} [{}] and from cache proxy if present", + session.getId(), Integer.toHexString(session.hashCode())); + + JWTTokenUtil.removeUMAFromSession(session); + JWTCacheProxy.getInstance().removeUMAToken(user, session); + } + } + if (umaToken == null || !umaToken.getAud().contains(urlEncodedScope)) { + boolean scopeIsChanged = false; + if (umaToken == null) { + _log.debug("Getting new UMA token for scope {}", urlEncodedScope); + } else if (!umaToken.getAud().contains(urlEncodedScope)) { + scopeIsChanged = true; + _log.info("Getting new UMA for scope {} since it has been issued for another scope [{}]", + urlEncodedScope, umaToken.getTokenEssentials()); + } + _log.debug("Getting OIDC token from session {} [{}]", session.getId(), + Integer.toHexString(session.hashCode())); + + JWTToken authToken = JWTTokenUtil.getOIDCFromSession(session); + if (authToken == null) { + _log.debug("OIDC token not found in session. Trying to get it from cache proxy"); + authToken = JWTCacheProxy.getInstance().getOIDCToken(user, session); + if (authToken == null) { + _log.info("OIDC token is null also in cache proxy"); + if (FORCE_LOGOUT_ON_MISSING_OIDC) { + _log.warn("OIDC token is null also in cache proxy, force redirecting to logut URI"); + forceLogout(session, response); + } else { + _log.error("OIDC token is null also in cache proxy, cannot continue!"); + } + return; + } else { + _log.debug("Setting OIDC token took from cache proxy in session {} [{}}", session.getId(), + Integer.toHexString(session.hashCode())); + + JWTTokenUtil.putOIDCInSession(authToken, session); + } + } + OpenIdConnectConfiguration configuration = LiferayOpenIdConnectConfiguration.getConfiguration(request); + boolean isNotAuthorized = false; + int authorizationAttempts = 0; + do { try { - umaToken = OpenIdConnectRESTHelper.refreshToken(configuration.getTokenURL(), umaToken); - _log.debug("Setting refreshed UMA token in cache proxy"); - JWTCacheProxy.getInstance().setUMAToken(getCurrentUser(request), session, umaToken); - _log.debug("Setting refreshed UMA token in session"); - JWTTokenUtil.putUMAInSession(umaToken, session); + if (isNotAuthorized || scopeIsChanged || authToken.isExpired()) { + if (isNotAuthorized) { + _log.info( + "UMA token is not authorized with current OIDC token, " + + "refreshing it to be sure that new grants are present. " + + "[attempts: {}]", + authorizationAttempts); + } else if (scopeIsChanged) { + _log.info( + "Scope is changed, refreshing token to be sure that new grants are present"); + } else if (authToken.isExpired()) { + _log.debug("OIDC token is expired, trying to refresh it [{}]", + authToken.getTokenEssentials()); + } + try { + authToken = OpenIdConnectRESTHelper.refreshToken(configuration.getTokenURL(), + authToken); + } catch (OpenIdConnectRESTHelperException e) { + if (FORCE_LOGOUT_ON_OIDC_REFRESH_ERROR) { + _log.warn("Error refreshing OIDC token, force redirecting to logut URI"); + forceLogout(session, response); + } else { + _log.error("Refreshing OIDC token on server", e); + } + return; + } + _log.debug("Setting refreshed OIDC token in cache proxy and session"); + JWTCacheProxy.getInstance().setOIDCToken(user, session, authToken); + JWTTokenUtil.putOIDCInSession(authToken, session); + } + _log.info("Getting UMA token from OIDC endpoint for scope: " + urlEncodedScope); + umaToken = OpenIdConnectRESTHelper.queryUMAToken(configuration.getTokenURL(), + authToken.getAccessTokenAsBearer(), urlEncodedScope, null); + } catch (OpenIdConnectRESTHelperException e) { if (e.hasJSONPayload()) { if (OpenIdConnectRESTHelper.isInvalidBearerTokenError(e.getResponseString())) { @@ -152,142 +276,55 @@ public class SmartGearsPortalValve extends ValveBase { _log.warn("OIDC token is become invalid, forcing redirect to logout URI"); forceLogout(session, response); } else { - _log.warn("OIDC token is become invalid, cannot continue"); + _log.error("OIDC token is become invalid, cannot continue"); } return; - } else if (OpenIdConnectRESTHelper.isTokenNotActiveError(e.getResponseString())) { - _log.info("UMA token is no more active, get new one"); - } - } else { - _log.error("Refreshing UMA token on server", e); - } - umaToken = null; - _log.info("Removing probably inactive OIDC token from session"); - JWTTokenUtil.removeOIDCFromSession(session); - _log.info("Removing all inactive UMA token from session and from cache proxy if present"); - JWTTokenUtil.removeUMAFromSession(session); - JWTCacheProxy.getInstance().removeUMAToken(user, session); - } - } - if (umaToken == null || !umaToken.getAud().contains(urlEncodedScope)) { - boolean scopeIsChanged = false; - if (umaToken == null) { - _log.debug("Getting new UMA token for scope {}", urlEncodedScope); - } else if (!umaToken.getAud().contains(urlEncodedScope)) { - scopeIsChanged = true; - _log.info("UMA token has been issued for another scope ({}). Getting new one for scope: {}", - umaToken.getAud(), urlEncodedScope); - } - _log.debug("Getting OIDC token from session"); - JWTToken authToken = JWTTokenUtil.getOIDCFromSession(session); - if (authToken == null) { - _log.debug("OIDC token not found in session. Trying to get it from cache proxy"); - authToken = JWTCacheProxy.getInstance().getOIDCToken(user, session); - if (authToken == null) { - _log.info("OIDC token is null also in cache proxy"); - if (FORCE_LOGOUT_ON_MISSING_OIDC) { - _log.warn("OIDC token is null also in cache proxy, force redirecting to logut URI"); - forceLogout(session, response); - return; - } else { - _log.error("OIDC token is null also in cache proxy, cannot continue!"); - return; - } - } else { - _log.debug("Setting OIDC token took from cache proxy in session"); - JWTTokenUtil.putOIDCInSession(authToken, session); - } - } - OpenIdConnectConfiguration configuration = LiferayOpenIdConnectConfiguration.getConfiguration(request); - boolean OK = false; - boolean isNotAuthorized = false; - int authorizationAttempts = 0; - while (!OK) { - try { - if (isNotAuthorized || scopeIsChanged || authToken.isExpired()) { - if (isNotAuthorized) { - _log.info( - "UMA token is not authorized with current OIDC token, " - + "refreshing it to be sure that new grants are present. " - + "[attempts: {}]", - authorizationAttempts); - } else if (scopeIsChanged) { - _log.info("Scope is changed, refreshing token to be sure that new grants are present"); - } else if (authToken.isExpired()) { - _log.debug("OIDC token is expired, trying to refresh it"); - } - try { - authToken = OpenIdConnectRESTHelper.refreshToken(configuration.getTokenURL(), - authToken); - } catch (OpenIdConnectRESTHelperException e) { - if (FORCE_LOGOUT_ON_OIDC_REFRESH_ERROR) { - _log.warn("Error refreshing OIDC token, force redirecting to logut URI"); - forceLogout(session, response); - } else { - _log.error("Refreshing OIDC token on server", e); - } - return; - } - _log.debug("Setting refreshed OIDC token in cache proxy and session"); - JWTCacheProxy.getInstance().setOIDCToken(user, session, authToken); - JWTTokenUtil.putOIDCInSession(authToken, session); - } - _log.info("Getting UMA token from OIDC endpoint for scope: " + urlEncodedScope); - umaToken = OpenIdConnectRESTHelper.queryUMAToken(configuration.getTokenURL(), - authToken.getAccessTokenAsBearer(), urlEncodedScope, null); - - OK = true; - } catch (OpenIdConnectRESTHelperException e) { - if (e.hasJSONPayload()) { - if (OpenIdConnectRESTHelper.isInvalidBearerTokenError(e.getResponseString())) { - if (FORCE_LOGOUT_ON_INVALID_OIDC) { - _log.warn("OIDC token is become invalid, forcing redirect to logout URI"); - forceLogout(session, response); - } else { - _log.error("OIDC token is become invalid, cannot continue"); - } - return; - } else if (OpenIdConnectRESTHelper - .isAccessDeniedNotAuthorizedError(e.getResponseString())) { - _log.info("UMA token is" + (isNotAuthorized ? " still" : "") - + " not authorized with actual OIDC token"); - - isNotAuthorized = true; - authorizationAttempts += 1; - if (authorizationAttempts <= MAX_AUTHORIZATION_RETRY_ATTEMPTS) { - _log.debug("Sleeping " + AUTHORIZATION_RETRY_ATTEMPTS_DELAY - + " ms and refreshing the OIDC"); - try { - Thread.sleep(AUTHORIZATION_RETRY_ATTEMPTS_DELAY); - } catch (InterruptedException ie) { - ie.printStackTrace(); - } - } else { - _log.warn("OIDC token refresh attempts exhausted"); - return; - } - } - } else { - _log.error("Getting UMA token from server", e); - return; - } - } - } - } - _log.debug("Setting UMA token in cache proxy and in session"); - JWTCacheProxy.getInstance().setUMAToken(user, session, umaToken); - JWTTokenUtil.putUMAInSession(umaToken, session); - } - _log.trace("Current UMA token audience is: {}", umaToken.getAud()); + } else if (OpenIdConnectRESTHelper + .isAccessDeniedNotAuthorizedError(e.getResponseString())) { + _log.info("UMA token is" + (isNotAuthorized ? " still" : "") + + " not authorized with actual OIDC token"); - _log.debug("Setting UMA token in UMA JWT provider"); - UmaJWTProvider.instance.set(umaToken.getRaw()); + isNotAuthorized = true; + authorizationAttempts += 1; + if (authorizationAttempts <= MAX_AUTHORIZATION_RETRY_ATTEMPTS) { + _log.debug("Sleeping " + AUTHORIZATION_RETRY_ATTEMPTS_DELAY + + " ms and refreshing the OIDC"); + try { + Thread.sleep(AUTHORIZATION_RETRY_ATTEMPTS_DELAY); + } catch (InterruptedException ie) { + ie.printStackTrace(); + } + } else { + _log.warn("OIDC token refresh attempts exhausted"); + return; + } + } + } else { + _log.error("Getting UMA token from server", e); + return; + } + } + } while (isNotAuthorized); + } + _log.debug("Setting UMA token in cache proxy and in session {} [{}]", session.getId(), + Integer.toHexString(session.hashCode())); + + JWTCacheProxy.getInstance().setUMAToken(user, session, umaToken); + JWTTokenUtil.putUMAInSession(umaToken, session); } + _log.trace("Current UMA token in use is: {}", umaToken.getTokenEssentials()); + + _log.debug("Setting UMA token in UMA JWT provider"); + UmaJWTProvider.instance.set(umaToken.getRaw()); } protected void forceLogout(HttpSession session, HttpServletResponse response) { try { - response.sendRedirect(LOGOUT_URI); + if (!response.isCommitted()) { + response.sendRedirect(LOGOUT_URI); + } else { + _log.warn("Cannot redirect to logout URI since the response is already commited"); + } } catch (IOException e) { _log.error("Cannot redirect to logout URI: " + LOGOUT_URI, e); }