Session authentication working

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / util / UserMenu.java

diff --git a/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java b/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java
index ad47d1850b34fb3d767d5aaa60e804e629dcd454..3fef6792b610a4c48a0f66fd518ba2c73fbd6454 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java
@@ -1,6 +1,12 @@
 package org.argeo.cms.util;
 
+import static org.argeo.cms.KernelHeader.ACCESS_CONTROL_CONTEXT;
+import static org.argeo.cms.KernelHeader.LOGIN_CONTEXT_ANONYMOUS;
+import static org.argeo.cms.KernelHeader.LOGIN_CONTEXT_USER;
+
 import java.io.IOException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 
 import javax.security.auth.Subject;
 import javax.security.auth.callback.Callback;
@@ -10,6 +16,8 @@ import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
 import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 
 import org.argeo.cms.CmsException;
 import org.argeo.cms.CmsMsg;
@@ -32,8 +40,6 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
 
 /** The site-related user menu */
 public class UserMenu extends Shell implements CmsStyles, CallbackHandler {
@@ -44,13 +50,13 @@ public class UserMenu extends Shell implements CmsStyles, CallbackHandler {
                super(source.getDisplay(), SWT.NO_TRIM | SWT.BORDER | SWT.ON_TOP);
                setData(RWT.CUSTOM_VARIANT, CMS_USER_MENU);
 
-               Authentication authentication = SecurityContextHolder.getContext()
-                               .getAuthentication();
-               if (authentication == null)
-                       throw new CmsException("No authentication available");
+               // Authentication authentication = SecurityContextHolder.getContext()
+               // .getAuthentication();
+               // if (authentication == null)
+               // throw new CmsException("No authentication available");
 
-               String username = authentication.getName();
-               if (username.equals(KernelHeader.USERNAME_ANONYMOUS)) {
+               String username = CurrentUserUtils.getUsername();
+               if (username.equalsIgnoreCase(KernelHeader.ROLE_ANONYMOUS)) {
                        username = null;
                        anonymousUi();
                } else {
@@ -107,11 +113,11 @@ public class UserMenu extends Shell implements CmsStyles, CallbackHandler {
                });
        }
 
-       protected String getUsername() {
-               String username = SecurityContextHolder.getContext()
-                               .getAuthentication().getName();
-               return username;
-       }
+       // protected String getUsername() {
+       // // String username = SecurityContextHolder.getContext()
+       // // .getAuthentication().getName();
+       // return CurrentUserUtils.getUsername();
+       // }
 
        /** To be overridden */
        protected void specificUserUi(Composite parent) {
@@ -169,15 +175,25 @@ public class UserMenu extends Shell implements CmsStyles, CallbackHandler {
                        //
                        // LOGIN
                        //
-                       new ArgeoLoginContext(KernelHeader.LOGIN_CONTEXT_ANONYMOUS, subject)
-                                       .logout();
+                       new ArgeoLoginContext(LOGIN_CONTEXT_ANONYMOUS, subject).logout();
                        LoginContext loginContext = new ArgeoLoginContext(
-                                       KernelHeader.LOGIN_CONTEXT_USER, subject, this);
+                                       LOGIN_CONTEXT_USER, subject, this);
                        loginContext.login();
+
+                       // save context in session
+                       final HttpSession httpSession = RWT.getRequest().getSession();
+                       Subject.doAs(subject, new PrivilegedAction<Void>() {
+
+                               @Override
+                               public Void run() {
+                                       httpSession.setAttribute(ACCESS_CONTROL_CONTEXT,
+                                                       AccessController.getContext());
+                                       return null;
+                               }
+                       });
                } catch (LoginException e1) {
                        try {
-                               new ArgeoLoginContext(KernelHeader.LOGIN_CONTEXT_ANONYMOUS,
-                                               subject).login();
+                               new ArgeoLoginContext(LOGIN_CONTEXT_ANONYMOUS, subject).login();
                        } catch (LoginException e) {
                                throw new CmsException("Cannot authenticate anonymous", e1);
                        }
@@ -196,10 +212,12 @@ public class UserMenu extends Shell implements CmsStyles, CallbackHandler {
                        //
                        // LOGOUT
                        //
-                       new ArgeoLoginContext(KernelHeader.LOGIN_CONTEXT_USER, subject)
-                                       .logout();
-                       new ArgeoLoginContext(KernelHeader.LOGIN_CONTEXT_ANONYMOUS, subject)
-                                       .login();
+                       new ArgeoLoginContext(LOGIN_CONTEXT_USER, subject).logout();
+                       new ArgeoLoginContext(LOGIN_CONTEXT_ANONYMOUS, subject).login();
+
+                       HttpServletRequest httpRequest = RWT.getRequest();
+                       HttpSession httpSession = httpRequest.getSession();
+                       httpSession.setAttribute(ACCESS_CONTROL_CONTEXT, null);
                } catch (LoginException e1) {
                        throw new CmsException("Cannot authenticate anonymous", e1);
                }