X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2FAbstractCmsEntryPoint.java;h=6722d7b86291051c61b39fc286f88d136ebc3a55;hb=0a63088e055dcd5ff397ce4e98d008c62c84dc98;hp=6043980e90f8b58a927e45da360027dab298cad2;hpb=f26fa850fab8c3666e6cc27683991f2d11378e5b;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java b/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java
index 6043980e9..6722d7b86 100644
--- a/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java
+++ b/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java
@@ -19,12 +19,14 @@ import org.eclipse.rap.rwt.client.service.BrowserNavigationEvent;
 import org.eclipse.rap.rwt.client.service.BrowserNavigationListener;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
+import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 /** Manages history and navigation */
 public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint
 		implements CmsSession {
 	private final Log log = LogFactory.getLog(AbstractCmsEntryPoint.class);
+	private static final String SPRING_SECURITY_CONTEXT_KEY = "SPRING_SECURITY_CONTEXT";
 
 	private Repository repository;
 	private String workspace;
@@ -39,8 +41,15 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint
 	private BrowserNavigation history;
 
 	public AbstractCmsEntryPoint(Repository repository, String workspace) {
-		if (SecurityContextHolder.getContext().getAuthentication() == null)
-			logAsAnonymous();
+		if (SecurityContextHolder.getContext().getAuthentication() == null) {
+			SecurityContext contextFromSessionObject = (SecurityContext) RWT
+					.getRequest().getSession()
+					.getAttribute(SPRING_SECURITY_CONTEXT_KEY);
+			if (contextFromSessionObject != null)
+				SecurityContextHolder.setContext(contextFromSessionObject);
+			else
+				logAsAnonymous();
+		}
 
 		this.repository = repository;
 		this.workspace = workspace;