inteligr8/alfresco-keycloak
1
0
Fork 0
mirror of https://github.com/bmlong137/alfresco-keycloak.git synced 2025-09-10 14:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Share backend token handling + NPE fix

Browse Source
This commit is contained in:
AFaust
2020-07-25 00:29:57 +02:00
parent 65f2804734
commit f894d79c2e
10 changed files with 70 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
repository/module.properties
View File

@@ -5,4 +5,4 @@ module.version=${noSnapshotVersion}
module.repo.version.min=5
module.depends.acosix-utility=1.1.0-*
module.depends.acosix-utility=1.2.3-*

2
repository/pom.xml
View File

@@ -21,7 +21,7 @@
<parent>
<groupId>de.acosix.alfresco.keycloak</groupId>
<artifactId>de.acosix.alfresco.keycloak.parent</artifactId>
<version>1.1.0-rc3</version>
<version>1.1.0-rc4-SNAPSHOT</version>
</parent>
<artifactId>de.acosix.alfresco.keycloak.repo</artifactId>

16
repository/src/main/java/de/acosix/alfresco/keycloak/repo/authentication/KeycloakAuthenticationFilter.java
View File

@@ -693,7 +693,14 @@ public class KeycloakAuthenticationFilter extends BaseAuthenticationFilter
}
LOGGER.trace("Resetting session and state cookie before continueing with filter chain");
req.getSession().invalidate();
try
{
req.getSession().invalidate();
}
catch (final IllegalStateException ignore)
{
// Keycloak authenticator may have already invalidated it - no way to check and avoid exception
}
this.resetStateCookies(context, req, res);
@@ -723,13 +730,13 @@ public class KeycloakAuthenticationFilter extends BaseAuthenticationFilter
boolean skip = false;
final String authHeader = req.getHeader(HEADER_AUTHORIZATION);
final String noKeycloakLoginRedirectHeader = req.getHeader(this.noKeycloakHandlingHeaderName);
final String noKeycloakHandlingRedirectHeader = req.getHeader(this.noKeycloakHandlingHeaderName);
final String servletPath = req.getServletPath();
final String pathInfo = req.getPathInfo();
final String servletRequestUri = servletPath + (pathInfo != null ? pathInfo : "");
final SessionUser sessionUser = this.getSessionUser(context, req, res, true);
SessionUser sessionUser = this.getSessionUser(context, req, res, true);
HttpSession session = req.getSession();
final boolean publicRestApi = API_SERVLET_PATH.equals(servletPath);
@@ -743,6 +750,7 @@ public class KeycloakAuthenticationFilter extends BaseAuthenticationFilter
LOGGER.debug("Session {} for Keycloak-authenticated user {} was invalidated by back-channel logout", session.getId(),
AlfrescoCompatibilityUtil.maskUsername(sessionUser.getUserName()));
this.invalidateSession(req);
sessionUser = null;
session = req.getSession(false);
}
@@ -908,7 +916,7 @@ public class KeycloakAuthenticationFilter extends BaseAuthenticationFilter
"Skipping processKeycloakAuthenticationAndActions as filter higher up in chain determined authentication as not required");
skip = true;
}
else if (Boolean.parseBoolean(noKeycloakLoginRedirectHeader))
else if (Boolean.parseBoolean(noKeycloakHandlingRedirectHeader))
{
LOGGER.trace(
"Skipping processKeycloakAuthenticationAndActions as client provided custom 'no Keycloak handling' header {} with value that resolves to 'true'",