]> git.argeo.org Git - lgpl/argeo-commons.git/blobdiff - org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java
Simplify authentication
[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / AbstractCmsEntryPoint.java
index 951e177b2473f0d5b81b03b1e2532ed2837a2b85..d27ed006e6f282065264a4c2b57fa13db510b1dc 100644 (file)
@@ -2,9 +2,7 @@ package org.argeo.cms;
 
 import java.security.PrivilegedAction;
 import java.util.HashMap;
-import java.util.Locale;
 import java.util.Map;
-import java.util.ResourceBundle;
 
 import javax.jcr.Node;
 import javax.jcr.Property;
@@ -13,14 +11,16 @@ import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.nodetype.NodeType;
 import javax.security.auth.Subject;
+import javax.security.auth.login.CredentialNotFoundException;
+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.cms.auth.LoginRequiredException;
-import org.argeo.cms.i18n.Msg;
+import org.argeo.cms.auth.AuthConstants;
+import org.argeo.cms.auth.HttpRequestCallbackHandler;
+import org.argeo.eclipse.ui.specific.UiContext;
 import org.argeo.jcr.JcrUtils;
 import org.eclipse.rap.rwt.RWT;
 import org.eclipse.rap.rwt.application.AbstractEntryPoint;
@@ -35,10 +35,11 @@ import org.eclipse.swt.widgets.Shell;
 
 /** Manages history and navigation */
 public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint
-               implements CmsSession {
+               implements CmsView {
        private final Log log = LogFactory.getLog(AbstractCmsEntryPoint.class);
 
-       private final Subject subject = new Subject();
+       private final Subject subject;
+       private LoginContext loginContext;
 
        private final Repository repository;
        private final String workspace;
@@ -62,23 +63,26 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint
                this.workspace = workspace;
                this.defaultPath = defaultPath;
                this.factoryProperties = new HashMap<String, String>(factoryProperties);
+               subject = new Subject();
 
                // Initial login
                try {
-                       new ArgeoLoginContext(KernelHeader.LOGIN_CONTEXT_USER, subject)
-                                       .login();
-               } catch (LoginException e) {
-                       // if (log.isTraceEnabled())
-                       // log.trace("Cannot authenticate user", e);
+                       loginContext = new LoginContext(AuthConstants.LOGIN_CONTEXT_USER,
+                                       subject, new HttpRequestCallbackHandler(
+                                                       UiContext.getHttpRequest()));
+                       loginContext.login();
+               } catch (CredentialNotFoundException e) {
                        try {
-                               new ArgeoLoginContext(KernelHeader.LOGIN_CONTEXT_ANONYMOUS,
-                                               subject).login();
-                       } catch (LoginException eAnonymous) {
-                               throw new ArgeoException("Cannot initialize subject",
-                                               eAnonymous);
+                               loginContext = new LoginContext(
+                                               AuthConstants.LOGIN_CONTEXT_ANONYMOUS, subject);
+                               loginContext.login();
+                       } catch (LoginException e1) {
+                               throw new ArgeoException("Cannot log as anonymous", e);
                        }
+               } catch (LoginException e) {
+                       throw new ArgeoException("Cannot initialize subject", e);
                }
-               authChange();
+               authChange(loginContext);
 
                jsExecutor = RWT.getClient().getService(JavaScriptExecutor.class);
                browserNavigation = RWT.getClient().getService(BrowserNavigation.class);
@@ -105,12 +109,12 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint
 
        @Override
        protected final void createContents(final Composite parent) {
-               getShell().getDisplay().setData(CmsSession.KEY, this);
+               UiContext.setData(CmsView.KEY, this);
                Subject.doAs(subject, new PrivilegedAction<Void>() {
                        @Override
                        public Void run() {
                                try {
-                                       createUi(parent);
+                                       initUi(parent);
                                } catch (Exception e) {
                                        throw new CmsException("Cannot create entrypoint contents",
                                                        e);
@@ -121,7 +125,7 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint
        }
 
        /** Create UI */
-       protected abstract void createUi(Composite parent);
+       protected abstract void initUi(Composite parent);
 
        /** Recreate UI after navigation or auth change */
        protected abstract void refresh();
@@ -132,8 +136,9 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint
         */
        protected Node getDefaultNode(Session session) throws RepositoryException {
                if (!session.hasPermission(defaultPath, "read")) {
-                       if (session.getUserID().equals("anonymous"))
-                               throw new LoginRequiredException();
+                       if (session.getUserID().equals(AuthConstants.ROLE_ANONYMOUS))
+                               // TODO throw a special exception
+                               throw new CmsException("Login required");
                        else
                                throw new CmsException("Unauthorized");
                }
@@ -158,7 +163,25 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint
        }
 
        @Override
-       public void authChange() {
+       public void logout() {
+               if (loginContext == null)
+                       throw new CmsException("Login context should not be null");
+               try {
+                       loginContext.logout();
+                       LoginContext anonymousLc = new LoginContext(
+                                       AuthConstants.LOGIN_CONTEXT_ANONYMOUS, subject);
+                       anonymousLc.login();
+                       authChange(anonymousLc);
+               } catch (LoginException e) {
+                       throw new CmsException("Cannot logout", e);
+               }
+       }
+
+       @Override
+       public void authChange(LoginContext loginContext) {
+               if (loginContext == null)
+                       throw new CmsException("Login context cannot be null");
+               this.loginContext = loginContext;
                Subject.doAs(subject, new PrivilegedAction<Void>() {
 
                        @Override
@@ -174,19 +197,7 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint
                                                try {
                                                        node = session.getNode(currentPath);
                                                } catch (Exception e) {
-                                                       try {
-                                                               // TODO find a less hacky way to log out
-                                                               new ArgeoLoginContext(
-                                                                               KernelHeader.LOGIN_CONTEXT_ANONYMOUS,
-                                                                               subject).logout();
-                                                               new ArgeoLoginContext(
-                                                                               KernelHeader.LOGIN_CONTEXT_ANONYMOUS,
-                                                                               subject).login();
-                                                       } catch (LoginException eAnonymous) {
-                                                               throw new ArgeoException(
-                                                                               "Cannot reset to anonymous", eAnonymous);
-                                                       }
-                                                       JcrUtils.logoutQuietly(session);
+                                                       logout();
                                                        session = repository.login(workspace);
                                                        navigateTo("~");
                                                        throw e;
@@ -221,17 +232,17 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint
                });
        }
 
-       @Override
-       public Object local(Msg msg) {
-               String key = msg.getId();
-               int lastDot = key.lastIndexOf('.');
-               String className = key.substring(0, lastDot);
-               String fieldName = key.substring(lastDot + 1);
-               Locale locale = RWT.getLocale();
-               ResourceBundle rb = ResourceBundle.getBundle(className, locale,
-                               msg.getClassLoader());
-               return rb.getString(fieldName);
-       }
+       // @Override
+       // public Object local(Msg msg) {
+       // String key = msg.getId();
+       // int lastDot = key.lastIndexOf('.');
+       // String className = key.substring(0, lastDot);
+       // String fieldName = key.substring(lastDot + 1);
+       // Locale locale = RWT.getLocale();
+       // ResourceBundle rb = ResourceBundle.getBundle(className, locale,
+       // msg.getClassLoader());
+       // return rb.getString(fieldName);
+       // }
 
        /** Sets the state of the entry point and retrieve the related JCR node. */
        protected synchronized String setState(String newState) {