inteligr8/alfresco-keycloak
1
0
Fork 0
mirror of https://github.com/bmlong137/alfresco-keycloak.git synced 2025-05-26 21:44:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deal with spurious Share errors in last RC

Browse Source
This commit is contained in:
AFaust 2020-11-30 19:33:34 +01:00
parent a3e3d9cac9
commit 6f9578ca63
5 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -26,7 +26,7 @@
<groupId>de.acosix.alfresco.keycloak</groupId> <groupId>de.acosix.alfresco.keycloak</groupId>
<artifactId>de.acosix.alfresco.keycloak.parent</artifactId> <artifactId>de.acosix.alfresco.keycloak.parent</artifactId>
<version>1.1.0-rc5</version> <version>1.1.0-rc6-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Acosix Alfresco Keycloak - Parent</name> <name>Acosix Alfresco Keycloak - Parent</name>

2
repository/pom.xml
View File

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

2
share/pom.xml
View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>de.acosix.alfresco.keycloak</groupId> <groupId>de.acosix.alfresco.keycloak</groupId>
<artifactId>de.acosix.alfresco.keycloak.parent</artifactId> <artifactId>de.acosix.alfresco.keycloak.parent</artifactId>
<version>1.1.0-rc5</version> <version>1.1.0-rc6-SNAPSHOT</version>
</parent> </parent>
<artifactId>de.acosix.alfresco.keycloak.share</artifactId> <artifactId>de.acosix.alfresco.keycloak.share</artifactId>

14
share/src/main/java/de/acosix/alfresco/keycloak/share/web/PopulatingRequestContextInterceptor.java
View File

@ -15,8 +15,11 @@
*/ */
package de.acosix.alfresco.keycloak.share.web; package de.acosix.alfresco.keycloak.share.web;
import javax.servlet.http.HttpServletRequest;
import org.springframework.extensions.surf.RequestContext; import org.springframework.extensions.surf.RequestContext;
import org.springframework.extensions.surf.RequestContextUtil; import org.springframework.extensions.surf.RequestContextUtil;
import org.springframework.extensions.surf.ServletUtil;
import org.springframework.extensions.surf.mvc.RequestContextInterceptor; import org.springframework.extensions.surf.mvc.RequestContextInterceptor;
import org.springframework.extensions.surf.support.ThreadLocalRequestContext; import org.springframework.extensions.surf.support.ThreadLocalRequestContext;
import org.springframework.web.context.request.ServletWebRequest; import org.springframework.web.context.request.ServletWebRequest;
@ -42,6 +45,15 @@ public class PopulatingRequestContextInterceptor extends RequestContextIntercept
super.preHandle(request); super.preHandle(request);
final RequestContext context = ThreadLocalRequestContext.getRequestContext(); final RequestContext context = ThreadLocalRequestContext.getRequestContext();
RequestContextUtil.populateRequestContext(context, ((ServletWebRequest) request).getRequest()); final HttpServletRequest servletRequest = ((ServletWebRequest) request).getRequest();
// just to be safe - can apparently not always be guaranteed
// (despite our call to RequestContextUtil.initRequestContext in KeycloakAuthenticationFilter#doFilter)
// without this, UserFactory may fail to obtain Connector due to missing session (indirectly retrieved via request)
if (ServletUtil.getRequest() == null)
{
ServletUtil.setRequest(servletRequest);
}
RequestContextUtil.populateRequestContext(context, servletRequest);
} }
} }

15
share/src/main/resources/META-INF/web-fragment.xml
View File

@ -37,8 +37,21 @@
</init-param> </init-param>
</filter> </filter>
<!-- limited to any URLs in which access to user groups may be relevant for processing -->
<filter-mapping> <filter-mapping>
<filter-name>${moduleId}.UserGroupsLoadFilter</filter-name> <filter-name>${moduleId}.UserGroupsLoadFilter</filter-name>
<url-pattern>/*</url-pattern> <url-pattern>/page/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>${moduleId}.UserGroupsLoadFilter</filter-name>
<url-pattern>/p/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>${moduleId}.UserGroupsLoadFilter</filter-name>
<url-pattern>/proxy/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>${moduleId}.UserGroupsLoadFilter</filter-name>
<url-pattern>/service/*</url-pattern>
</filter-mapping> </filter-mapping>
</web-fragment> </web-fragment>