From 85ced0e58ded00f296948b6dff51f84994855080 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 28 Apr 2015 08:19:32 +0000 Subject: [PATCH] - Improve CMS login (HTTP session now supported) - Deprecate CmsLogin class - Some refactoring (move classes between packages) git-svn-id: https://svn.argeo.org/commons/trunk@8078 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../org/argeo/cms/AbstractCmsEntryPoint.java | 46 +++++++----- .../src/org/argeo/cms/CmsApplication.java | 48 ++---------- org.argeo.cms/src/org/argeo/cms/CmsLogin.java | 74 +++++++++---------- .../argeo/cms/CmsLoginRequiredException.java | 19 ----- .../src/org/argeo/cms/CmsSession.java | 11 ++- .../org/argeo/cms/auth/ArgeoLoginContext.java | 5 +- .../cms/auth/LoginRequiredException.java | 21 ++++++ .../internal/auth/AbstractLoginModule.java | 39 ++++++---- .../cms/internal/auth/EndUserLoginModule.java | 3 + .../cms/{ => util}/BundleResourceLoader.java | 5 +- .../src/org/argeo/cms/util/OpenUserMenu.java | 12 ++- .../src/org/argeo/cms/util/UserMenu.java | 62 ++++++---------- 12 files changed, 168 insertions(+), 177 deletions(-) delete mode 100644 org.argeo.cms/src/org/argeo/cms/CmsLoginRequiredException.java create mode 100644 org.argeo.cms/src/org/argeo/cms/auth/LoginRequiredException.java rename org.argeo.cms/src/org/argeo/cms/{ => util}/BundleResourceLoader.java (87%) diff --git a/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java b/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java index cd7eae423..1e04bc050 100644 --- a/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java +++ b/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java @@ -8,9 +8,13 @@ import javax.jcr.Repository; import javax.jcr.RepositoryException; import javax.jcr.Session; import javax.jcr.nodetype.NodeType; +import javax.security.auth.Subject; +import javax.security.auth.login.LoginException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.ArgeoException; +import org.argeo.cms.auth.ArgeoLoginContext; import org.argeo.cms.i18n.Msg; import org.argeo.jcr.JcrUtils; import org.eclipse.rap.rwt.RWT; @@ -20,13 +24,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.SecurityContextHolder; /** Manages history and navigation */ abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implements CmsSession { private final Log log = LogFactory.getLog(AbstractCmsEntryPoint.class); + private Subject subject = new Subject(); + private Repository repository; private String workspace; private Session session; @@ -40,20 +45,25 @@ abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implements private BrowserNavigation history; public AbstractCmsEntryPoint(Repository repository, String workspace) { - // if (SecurityContextHolder.getContext().getAuthentication() == null) { - // HttpSession httpSession = RWT.getRequest().getSession(); - // // log.debug("Session: " + httpSession.getId()); - // SecurityContext contextFromSessionObject = (SecurityContext) - // httpSession - // .getAttribute(SPRING_SECURITY_CONTEXT_KEY); - // if (contextFromSessionObject != null) - // SecurityContextHolder.setContext(contextFromSessionObject); - // else - // logAsAnonymous(); - // } - this.repository = repository; this.workspace = workspace; + + // Initial login + Subject subject = new Subject(); + try { + new ArgeoLoginContext(KernelHeader.LOGIN_CONTEXT_USER, subject) + .login(); + } catch (LoginException e) { + if (log.isTraceEnabled()) + log.trace("Cannot authenticate user", e); + try { + new ArgeoLoginContext(KernelHeader.LOGIN_CONTEXT_ANONYMOUS, + subject).login(); + } catch (LoginException eAnonymous) { + throw new ArgeoException("Cannot initialize subject", + eAnonymous); + } + } authChange(); history = RWT.getClient().getService(BrowserNavigation.class); @@ -85,9 +95,6 @@ abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implements /** Recreate body UI */ protected abstract void refreshBody(); - /** Log as anonymous */ - protected abstract void logAsAnonymous(); - /** * The node to return when no node was found (for authenticated users and * anonymous) @@ -117,6 +124,11 @@ abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implements history.pushState(state, state); } + @Override + public Subject getSubject() { + return subject; + } + @Override public void authChange() { try { @@ -125,8 +137,6 @@ abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implements currentPath = node.getPath(); JcrUtils.logoutQuietly(session); - if (SecurityContextHolder.getContext().getAuthentication() == null) - logAsAnonymous(); session = repository.login(workspace); if (currentPath != null) node = session.getNode(currentPath); diff --git a/org.argeo.cms/src/org/argeo/cms/CmsApplication.java b/org.argeo.cms/src/org/argeo/cms/CmsApplication.java index d6341e5b3..9c7b5b344 100644 --- a/org.argeo.cms/src/org/argeo/cms/CmsApplication.java +++ b/org.argeo.cms/src/org/argeo/cms/CmsApplication.java @@ -21,7 +21,9 @@ import javax.jcr.version.VersionManager; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.cms.auth.LoginRequiredException; import org.argeo.cms.internal.ImageManagerImpl; +import org.argeo.cms.util.BundleResourceLoader; import org.argeo.cms.util.CmsUtils; import org.argeo.jcr.JcrUtils; import org.eclipse.gemini.blueprint.context.BundleContextAware; @@ -46,16 +48,13 @@ import org.osgi.framework.BundleContext; /** Configures an Argeo CMS RWT application. */ public class CmsApplication implements CmsConstants, ApplicationConfiguration, BundleContextAware { - final static Log log = LogFactory.getLog(CmsApplication.class); + private final static Log log = LogFactory.getLog(CmsApplication.class); - // private Map entryPoints = new HashMap(); private Map> branding = new HashMap>(); private Map> styleSheets = new HashMap>(); private List resources = new ArrayList(); - // private Bundle clientScriptingBundle; private BundleContext bundleContext; private Repository repository; @@ -64,8 +63,6 @@ public class CmsApplication implements CmsConstants, ApplicationConfiguration, private List roPrincipals = Arrays.asList("anonymous", "everyone"); private List rwPrincipals = Arrays.asList("everyone"); - private CmsLogin cmsLogin; - private CmsUiProvider header; private Map pages = new LinkedHashMap(); @@ -148,13 +145,6 @@ public class CmsApplication implements CmsConstants, ApplicationConfiguration, } public void init() throws RepositoryException { - // if (workspace == null) - // throw new CmsException( - // "Workspace must be set when calling initialization." - // + " Please make sure that read-only and read-write roles" - // + " have been properly configured:" - // + " the defaults are open."); - Session session = null; try { session = JcrUtils.loginOrCreateWorkspace(repository, workspace); @@ -210,8 +200,10 @@ public class CmsApplication implements CmsConstants, ApplicationConfiguration, this.workspace = workspace; } - public void setCmsLogin(CmsLogin cmsLogin) { - this.cmsLogin = cmsLogin; + public void setCmsLogin(@SuppressWarnings("deprecation") CmsLogin cmsLogin) { + // this.cmsLogin = cmsLogin; + log.warn("cmsLogin" + + " is deprecated and will be removed soon. Adapt your configuration ASAP."); } public void setHeader(CmsUiProvider header) { @@ -238,11 +230,6 @@ public class CmsApplication implements CmsConstants, ApplicationConfiguration, this.headerHeight = headerHeight; } - // public void setEntryPoints( - // Map entryPointFactories) { - // this.entryPoints = entryPointFactories; - // } - public void setBranding(Map> branding) { this.branding = branding; } @@ -376,20 +363,6 @@ public class CmsApplication implements CmsConstants, ApplicationConfiguration, if (state == null) throw new CmsException("State cannot be null"); uiProvider.createUi(bodyArea, getNode()); - // if (page == null) - // throw new CmsException("Page cannot be null"); - // // else if (state.length() == 0) - // // log.debug("empty state"); - // else if (pages.containsKey(page)) - // pages.get(page).createUi(bodyArea, getNode()); - // else { - // // try { - // // RWT.getResponse().sendError(404); - // // } catch (IOException e) { - // // log.error("Cannot send 404 code", e); - // // } - // throw new CmsException("Unsupported state " + state); - // } } catch (RepositoryException e) { throw new CmsException("Cannot refresh body", e); } @@ -397,17 +370,12 @@ public class CmsApplication implements CmsConstants, ApplicationConfiguration, bodyArea.layout(true, true); } - @Override - protected void logAsAnonymous() { - cmsLogin.logInAsAnonymous(); - } - @Override protected Node getDefaultNode(Session session) throws RepositoryException { if (!session.hasPermission(basePath, "read")) { if (session.getUserID().equals("anonymous")) - throw new CmsLoginRequiredException(); + throw new LoginRequiredException(); else throw new CmsException("Unauthorized"); } diff --git a/org.argeo.cms/src/org/argeo/cms/CmsLogin.java b/org.argeo.cms/src/org/argeo/cms/CmsLogin.java index eab83ee31..a9dd8255f 100644 --- a/org.argeo.cms/src/org/argeo/cms/CmsLogin.java +++ b/org.argeo.cms/src/org/argeo/cms/CmsLogin.java @@ -1,57 +1,49 @@ package org.argeo.cms; -import javax.security.auth.Subject; -import javax.security.auth.login.LoginContext; -import javax.security.auth.login.LoginException; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.ArgeoException; import org.argeo.cms.auth.ArgeoLoginContext; -import org.argeo.security.NodeAuthenticationToken; import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; -/** Gateway for user login, can also generate the related UI. */ +/** + * Gateway for user login, can also generate the related UI. + * + * @deprecated Use {@link ArgeoLoginContext} instead + */ +@Deprecated public class CmsLogin { private final static Log log = LogFactory.getLog(CmsLogin.class); - private AuthenticationManager authenticationManager; - - // private String systemKey = KernelConstants.DEFAULT_SECURITY_KEY; - public void logInAsAnonymous() { - Subject subject = new Subject(); - final LoginContext loginContext; - try { - loginContext = new ArgeoLoginContext( - KernelHeader.LOGIN_CONTEXT_ANONYMOUS, subject); - loginContext.login(); - } catch (LoginException e1) { - throw new ArgeoException("Cannot authenticate anonymous", e1); - } - } - - public void logInWithPassword(String username, char[] password) { - NodeAuthenticationToken token = new NodeAuthenticationToken(username, - password); - Authentication authentication = authenticationManager - .authenticate(token); - SecurityContextHolder.getContext().setAuthentication(authentication); - // HttpSession httpSession = RWT.getRequest().getSession(); - // httpSession.setAttribute(SPRING_SECURITY_CONTEXT_KEY, - // SecurityContextHolder.getContext()); - if (log.isDebugEnabled()) - log.debug("Authenticated as " + authentication); + public CmsLogin() { + log.warn("org.argeo.cms.CmsLogin is deprecated and will be removed soon."); } + // private AuthenticationManager authenticationManager; + // + // public void logInAsAnonymous() { + // Subject subject = new Subject(); + // final LoginContext loginContext; + // try { + // loginContext = new ArgeoLoginContext( + // KernelHeader.LOGIN_CONTEXT_ANONYMOUS, subject); + // loginContext.login(); + // } catch (LoginException e1) { + // throw new ArgeoException("Cannot authenticate anonymous", e1); + // } + // } + // + // public void logInWithPassword(String username, char[] password) { + // NodeAuthenticationToken token = new NodeAuthenticationToken(username, + // password); + // Authentication authentication = authenticationManager + // .authenticate(token); + // SecurityContextHolder.getContext().setAuthentication(authentication); + // if (log.isDebugEnabled()) + // log.debug("Authenticated as " + authentication); + // } + // public void setAuthenticationManager( AuthenticationManager authenticationManager) { - this.authenticationManager = authenticationManager; + // this.authenticationManager = authenticationManager; } - - // public void setSystemKey(String systemKey) { - // this.systemKey = systemKey; - // } - } diff --git a/org.argeo.cms/src/org/argeo/cms/CmsLoginRequiredException.java b/org.argeo.cms/src/org/argeo/cms/CmsLoginRequiredException.java deleted file mode 100644 index b9917e785..000000000 --- a/org.argeo.cms/src/org/argeo/cms/CmsLoginRequiredException.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.argeo.cms; - -/** Throwing this exception triggers redirection to a login page. */ -public class CmsLoginRequiredException extends CmsException { - private static final long serialVersionUID = 7009402894657958151L; - - public CmsLoginRequiredException() { - super("Login is required"); - } - - public CmsLoginRequiredException(String message, Throwable e) { - super(message, e); - } - - public CmsLoginRequiredException(String message) { - super(message); - } - -} diff --git a/org.argeo.cms/src/org/argeo/cms/CmsSession.java b/org.argeo.cms/src/org/argeo/cms/CmsSession.java index 38c2b6c99..566b2821e 100644 --- a/org.argeo.cms/src/org/argeo/cms/CmsSession.java +++ b/org.argeo.cms/src/org/argeo/cms/CmsSession.java @@ -1,5 +1,7 @@ package org.argeo.cms; +import javax.security.auth.Subject; + import org.argeo.cms.i18n.Msg; /** Provides interaction with the CMS system. UNSTABLE API at this stage. */ @@ -8,15 +10,20 @@ public interface CmsSession { final ThreadLocal current = new ThreadLocal(); + // NAVIGATION public void navigateTo(String state); + public String getState(); + + // SECURITY public void authChange(); + + public Subject getSubject(); + // SERVICES public void exception(Throwable e); public Object local(Msg msg); - public String getState(); - public CmsImageManager getImageManager(); } diff --git a/org.argeo.cms/src/org/argeo/cms/auth/ArgeoLoginContext.java b/org.argeo.cms/src/org/argeo/cms/auth/ArgeoLoginContext.java index 1a0648655..474cfcc0a 100644 --- a/org.argeo.cms/src/org/argeo/cms/auth/ArgeoLoginContext.java +++ b/org.argeo.cms/src/org/argeo/cms/auth/ArgeoLoginContext.java @@ -5,7 +5,10 @@ import javax.security.auth.callback.CallbackHandler; import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; -/** Integrates JAAS with the Argeo platform */ +/** + * Integrates JAAS with the Argeo platform, by using the Argeo CMS bundle + * classloader as context classloader. + */ public class ArgeoLoginContext extends LoginContext { private static ThreadLocal currentContextClassLoader = new ThreadLocal() { @Override diff --git a/org.argeo.cms/src/org/argeo/cms/auth/LoginRequiredException.java b/org.argeo.cms/src/org/argeo/cms/auth/LoginRequiredException.java new file mode 100644 index 000000000..8b082d054 --- /dev/null +++ b/org.argeo.cms/src/org/argeo/cms/auth/LoginRequiredException.java @@ -0,0 +1,21 @@ +package org.argeo.cms.auth; + +import org.argeo.cms.CmsException; + +/** Throwing this exception triggers redirection to a login page. */ +public class LoginRequiredException extends CmsException { + private static final long serialVersionUID = 7009402894657958151L; + + public LoginRequiredException() { + super("Login is required"); + } + + public LoginRequiredException(String message, Throwable e) { + super(message, e); + } + + public LoginRequiredException(String message) { + super(message); + } + +} diff --git a/org.argeo.cms/src/org/argeo/cms/internal/auth/AbstractLoginModule.java b/org.argeo.cms/src/org/argeo/cms/internal/auth/AbstractLoginModule.java index ede37933d..baf6b6317 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/auth/AbstractLoginModule.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/auth/AbstractLoginModule.java @@ -47,7 +47,6 @@ public abstract class AbstractLoginModule implements LoginModule { */ private final static String SPRING_SECURITY_CONTEXT_KEY = "SPRING_SECURITY_CONTEXT"; - @SuppressWarnings("unused") private final static Log log = LogFactory.getLog(AbstractLoginModule.class); private CallbackHandler callbackHandler; private Subject subject; @@ -78,17 +77,25 @@ public abstract class AbstractLoginModule implements LoginModule { Authentication currentAuth = SecurityContextHolder.getContext() .getAuthentication(); - if (currentAuth == null && Display.getCurrent() != null) { - // try to load authentication from session - HttpServletRequest httpRequest = RWT.getRequest(); - HttpSession httpSession = httpRequest.getSession(); - // log.debug(httpSession.getId()); - Object contextFromSessionObject = httpSession - .getAttribute(SPRING_SECURITY_CONTEXT_KEY); - if (contextFromSessionObject != null) { - currentAuth = (Authentication) contextFromSessionObject; - SecurityContextHolder.getContext().setAuthentication( - currentAuth); + if (currentAuth == null) { + // Pre-auth + // TODO Do it at Spring Security level? + try { + // try to load authentication from session + HttpServletRequest httpRequest = RWT.getRequest(); + HttpSession httpSession = httpRequest.getSession(); + // log.debug(httpSession.getId()); + Object contextFromSessionObject = httpSession + .getAttribute(SPRING_SECURITY_CONTEXT_KEY); + if (contextFromSessionObject != null) { + currentAuth = (Authentication) contextFromSessionObject; + SecurityContextHolder.getContext().setAuthentication( + currentAuth); + } + } catch (Exception e) { + if (log.isTraceEnabled()) + log.trace("Could not get session", e); + // silent } } @@ -119,12 +126,16 @@ public abstract class AbstractLoginModule implements LoginModule { SecurityContext securityContext = SecurityContextHolder .getContext(); securityContext.setAuthentication(authentication); - if (Display.getCurrent() != null) { + try { HttpServletRequest httpRequest = RWT.getRequest(); HttpSession httpSession = httpRequest.getSession(); if (httpSession.getAttribute(SPRING_SECURITY_CONTEXT_KEY) == null) httpSession.setAttribute(SPRING_SECURITY_CONTEXT_KEY, authentication); + } catch (Exception e) { + if (log.isTraceEnabled()) + log.trace("Could not add security context to session", + e); } return true; } else { @@ -153,6 +164,8 @@ public abstract class AbstractLoginModule implements LoginModule { HttpSession httpSession = httpRequest.getSession(); if (httpSession.getAttribute(SPRING_SECURITY_CONTEXT_KEY) != null) httpSession.setAttribute(SPRING_SECURITY_CONTEXT_KEY, null); + // expire session + httpSession.setMaxInactiveInterval(0); } return true; } diff --git a/org.argeo.cms/src/org/argeo/cms/internal/auth/EndUserLoginModule.java b/org.argeo.cms/src/org/argeo/cms/internal/auth/EndUserLoginModule.java index de2a007de..128dd7a36 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/auth/EndUserLoginModule.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/auth/EndUserLoginModule.java @@ -46,6 +46,9 @@ public class EndUserLoginModule extends AbstractLoginModule { protected Authentication processLogin(CallbackHandler callbackHandler) throws LoginException, UnsupportedCallbackException, IOException, InterruptedException { + if (callbackHandler == null) + return null; + // ask for username and password NameCallback nameCallback = new NameCallback("User"); PasswordCallback passwordCallback = new PasswordCallback("Password", diff --git a/org.argeo.cms/src/org/argeo/cms/BundleResourceLoader.java b/org.argeo.cms/src/org/argeo/cms/util/BundleResourceLoader.java similarity index 87% rename from org.argeo.cms/src/org/argeo/cms/BundleResourceLoader.java rename to org.argeo.cms/src/org/argeo/cms/util/BundleResourceLoader.java index 8740c0d26..387e02ed4 100644 --- a/org.argeo.cms/src/org/argeo/cms/BundleResourceLoader.java +++ b/org.argeo.cms/src/org/argeo/cms/util/BundleResourceLoader.java @@ -1,15 +1,16 @@ -package org.argeo.cms; +package org.argeo.cms.util; import java.io.IOException; import java.io.InputStream; import java.net.URL; +import org.argeo.cms.CmsException; import org.eclipse.rap.rwt.service.ResourceLoader; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; /** {@link ResourceLoader} implementation wrapping an {@link Bundle}. */ -class BundleResourceLoader implements ResourceLoader { +public class BundleResourceLoader implements ResourceLoader { private final BundleContext bundleContext; public BundleResourceLoader(BundleContext bundleContext) { diff --git a/org.argeo.cms/src/org/argeo/cms/util/OpenUserMenu.java b/org.argeo.cms/src/org/argeo/cms/util/OpenUserMenu.java index 4d4fe7508..8ad15bf9c 100644 --- a/org.argeo.cms/src/org/argeo/cms/util/OpenUserMenu.java +++ b/org.argeo.cms/src/org/argeo/cms/util/OpenUserMenu.java @@ -1,24 +1,30 @@ package org.argeo.cms.util; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.argeo.cms.CmsLogin; import org.eclipse.swt.events.MouseAdapter; import org.eclipse.swt.events.MouseEvent; import org.eclipse.swt.widgets.Control; /** Open the user menu when clicked */ +@SuppressWarnings("deprecation") public class OpenUserMenu extends MouseAdapter { private static final long serialVersionUID = 3634864186295639792L; - private CmsLogin cmsLogin; + + private final static Log log = LogFactory.getLog(OpenUserMenu.class); + + // private CmsLogin cmsLogin; @Override public void mouseDown(MouseEvent e) { if (e.button == 1) { - new UserMenu(cmsLogin, (Control) e.getSource()); + new UserMenu((Control) e.getSource()); } } public void setCmsLogin(CmsLogin cmsLogin) { - this.cmsLogin = cmsLogin; + log.warn("org.argeo.cms.CmsLogin is deprecated and will be removed soon"); } } \ No newline at end of file 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 622ce1c31..45fd4b3ad 100644 --- a/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java +++ b/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java @@ -12,7 +12,6 @@ import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; import org.argeo.ArgeoException; -import org.argeo.cms.CmsLogin; import org.argeo.cms.CmsMsg; import org.argeo.cms.CmsSession; import org.argeo.cms.CmsStyles; @@ -37,15 +36,10 @@ import org.springframework.security.core.context.SecurityContextHolder; /** The site-related user menu */ public class UserMenu extends Shell implements CmsStyles, CallbackHandler { private static final long serialVersionUID = -5788157651532106301L; - - private CmsLogin cmsLogin; - // private String username = null; private Text username, password; - public UserMenu(CmsLogin cmsLogin, Control source) { + public UserMenu(Control source) { super(source.getDisplay(), SWT.NO_TRIM | SWT.BORDER | SWT.ON_TOP); - this.cmsLogin = cmsLogin; - setData(RWT.CUSTOM_VARIANT, CMS_USER_MENU); String username = SecurityContextHolder.getContext() @@ -70,11 +64,8 @@ public class UserMenu extends Shell implements CmsStyles, CallbackHandler { close(); dispose(); } - }); - open(); - } protected void userUi() { @@ -89,8 +80,6 @@ public class UserMenu extends Shell implements CmsStyles, CallbackHandler { l.setLayoutData(CmsUtils.fillWidth()); l.setText("" + username + ""); - final CmsSession cmsSession = (CmsSession) getDisplay().getData( - CmsSession.KEY); l = new Label(this, SWT.NONE); l.setData(RWT.CUSTOM_VARIANT, CMS_USER_MENU_ITEM); l.setText(CmsMsg.logout.lead()); @@ -102,22 +91,7 @@ public class UserMenu extends Shell implements CmsStyles, CallbackHandler { private static final long serialVersionUID = 6444395812777413116L; public void mouseDown(MouseEvent e) { - Subject subject = new Subject(); - try { - new ArgeoLoginContext(KernelHeader.LOGIN_CONTEXT_USER, - subject).logout(); - new ArgeoLoginContext(KernelHeader.LOGIN_CONTEXT_ANONYMOUS, - subject).login(); - } catch (LoginException e1) { - throw new ArgeoException("Cannot authenticate anonymous", - e1); - } - // SecurityContextHolder.getContext().setAuthentication(null); - // HttpSession httpSession = RWT.getRequest().getSession(); - // httpSession.removeAttribute(SPRING_SECURITY_CONTEXT_KEY); - close(); - dispose(); - cmsSession.authChange(); + logout(); } }); } @@ -141,7 +115,6 @@ public class UserMenu extends Shell implements CmsStyles, CallbackHandler { gd.widthHint = textWidth; password.setLayoutData(gd); - // Listeners TraverseListener tl = new TraverseListener() { private static final long serialVersionUID = -1158892811534971856L; @@ -157,9 +130,11 @@ public class UserMenu extends Shell implements CmsStyles, CallbackHandler { protected void login() { CmsSession cmsSession = (CmsSession) getDisplay().getData( CmsSession.KEY); - Subject subject = new Subject(); try { + // + // LOGIN + // new ArgeoLoginContext(KernelHeader.LOGIN_CONTEXT_ANONYMOUS, subject) .logout(); LoginContext loginContext = new ArgeoLoginContext( @@ -168,11 +143,28 @@ public class UserMenu extends Shell implements CmsStyles, CallbackHandler { } catch (LoginException e1) { throw new ArgeoException("Cannot authenticate anonymous", e1); } + close(); + dispose(); + cmsSession.authChange(); + } - // cmsLogin.logInWithPassword(username, password); + protected void logout() { + final CmsSession cmsSession = (CmsSession) getDisplay().getData( + CmsSession.KEY); + Subject subject = new Subject(); + try { + // + // LOGOUT + // + new ArgeoLoginContext(KernelHeader.LOGIN_CONTEXT_USER, subject) + .logout(); + new ArgeoLoginContext(KernelHeader.LOGIN_CONTEXT_ANONYMOUS, subject) + .login(); + } catch (LoginException e1) { + throw new ArgeoException("Cannot authenticate anonymous", e1); + } close(); dispose(); - // refreshUi(source.getParent()); cmsSession.authChange(); } @@ -181,12 +173,6 @@ public class UserMenu extends Shell implements CmsStyles, CallbackHandler { UnsupportedCallbackException { ((NameCallback) callbacks[0]).setName(username.getText()); ((PasswordCallback) callbacks[1]).setPassword(password.getTextChars()); - // while (!isDisposed()) - // try { - // Thread.sleep(500); - // } catch (InterruptedException e) { - // // silent - // } } } -- 2.30.2