X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2FAbstractCmsEntryPoint.java;h=2d83f8ded0ab2c60f80fcb9641c2f09e53b8edbc;hb=d66d81530f1da58e2e2c5d25e0a5dc30ad32b848;hp=a5fa5ef6517c42ae61d0415ad6811c497abab8e1;hpb=5857e869a5760aeb6de2c32d32ed4de3e28b42b6;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/AbstractCmsEntryPoint.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/AbstractCmsEntryPoint.java
index a5fa5ef65..2d83f8ded 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/ui/AbstractCmsEntryPoint.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/AbstractCmsEntryPoint.java
@@ -12,7 +12,6 @@ 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 javax.servlet.http.HttpServletRequest;
@@ -20,11 +19,11 @@ import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsException;
-import org.argeo.cms.auth.AuthConstants;
+import org.argeo.cms.auth.CurrentUser;
 import org.argeo.cms.auth.HttpRequestCallbackHandler;
 import org.argeo.eclipse.ui.specific.UiContext;
 import org.argeo.jcr.JcrUtils;
-import org.argeo.node.NodeAuthenticated;
+import org.argeo.node.NodeConstants;
 import org.eclipse.rap.rwt.RWT;
 import org.eclipse.rap.rwt.application.AbstractEntryPoint;
 import org.eclipse.rap.rwt.client.WebClient;
@@ -42,7 +41,7 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implement
 
 	private final Log log = LogFactory.getLog(AbstractCmsEntryPoint.class);
 
-	private final Subject subject;
+	// private final Subject subject;
 	private LoginContext loginContext;
 
 	private final Repository repository;
@@ -68,24 +67,23 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implement
 		this.workspace = workspace;
 		this.defaultPath = defaultPath;
 		this.factoryProperties = new HashMap<String, String>(factoryProperties);
-		subject = new Subject();
+		// subject = new Subject();
 
 		// Initial login
+		LoginContext lc;
 		try {
-			loginContext = new LoginContext(AuthConstants.LOGIN_CONTEXT_USER, subject,
-					new HttpRequestCallbackHandler(UiContext.getHttpRequest()));
-			loginContext.login();
-		} catch (CredentialNotFoundException e) {
+			lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER,
+					new HttpRequestCallbackHandler(UiContext.getHttpRequest(), UiContext.getHttpResponse()));
+			lc.login();
+		} catch (LoginException e) {
 			try {
-				loginContext = new LoginContext(AuthConstants.LOGIN_CONTEXT_ANONYMOUS, subject);
-				loginContext.login();
+				lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_ANONYMOUS);
+				lc.login();
 			} catch (LoginException e1) {
-				throw new CmsException("Cannot log as anonymous", e);
+				throw new CmsException("Cannot log in as anonymous", e1);
 			}
-		} catch (LoginException e) {
-			throw new CmsException("Cannot initialize subject", e);
 		}
-		authChange(loginContext);
+		authChange(lc);
 
 		jsExecutor = RWT.getClient().getService(JavaScriptExecutor.class);
 		browserNavigation = RWT.getClient().getService(BrowserNavigation.class);
@@ -111,8 +109,8 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implement
 
 	@Override
 	protected final void createContents(final Composite parent) {
-		UiContext.setData(NodeAuthenticated.KEY, this);
-		Subject.doAs(subject, new PrivilegedAction<Void>() {
+		UiContext.setData(CmsView.KEY, this);
+		Subject.doAs(getSubject(), new PrivilegedAction<Void>() {
 			@Override
 			public Void run() {
 				try {
@@ -137,7 +135,8 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implement
 	 */
 	protected Node getDefaultNode(Session session) throws RepositoryException {
 		if (!session.hasPermission(defaultPath, "read")) {
-			if (session.getUserID().equals(AuthConstants.ROLE_ANONYMOUS))
+			String userId = session.getUserID();
+			if (userId.equals(NodeConstants.ROLE_ANONYMOUS))
 				// TODO throw a special exception
 				throw new CmsException("Login required");
 			else
@@ -158,9 +157,22 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implement
 			browserNavigation.pushState(state, title);
 	}
 
+	// @Override
+	// public synchronized Subject getSubject() {
+	// return subject;
+	// }
+
+	// @Override
+	// public LoginContext getLoginContext() {
+	// return loginContext;
+	// }
+	protected Subject getSubject() {
+		return loginContext.getSubject();
+	}
+
 	@Override
-	public synchronized Subject getSubject() {
-		return subject;
+	public boolean isAnonymous() {
+		return CurrentUser.isAnonymous(getSubject());
 	}
 
 	@Override
@@ -168,21 +180,29 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implement
 		if (loginContext == null)
 			throw new CmsException("Login context should not be null");
 		try {
+			CurrentUser.logoutCmsSession(loginContext.getSubject());
 			loginContext.logout();
-			LoginContext anonymousLc = new LoginContext(AuthConstants.LOGIN_CONTEXT_ANONYMOUS, subject);
+			LoginContext anonymousLc = new LoginContext(NodeConstants.LOGIN_CONTEXT_ANONYMOUS);
 			anonymousLc.login();
 			authChange(anonymousLc);
 		} catch (LoginException e) {
-			throw new CmsException("Cannot logout", e);
+			log.error("Cannot logout", e);
 		}
 	}
 
 	@Override
-	public synchronized void authChange(LoginContext loginContext) {
-		if (loginContext == null)
+	public synchronized void authChange(LoginContext lc) {
+		if (lc == null)
 			throw new CmsException("Login context cannot be null");
-		this.loginContext = loginContext;
-		Subject.doAs(loginContext.getSubject(), new PrivilegedAction<Void>() {
+		// logout previous login context
+		if (this.loginContext != null)
+			try {
+				this.loginContext.logout();
+			} catch (LoginException e1) {
+				log.warn("Could not log out: " + e1);
+			}
+		this.loginContext = lc;
+		Subject.doAs(getSubject(), new PrivilegedAction<Void>() {
 
 			@Override
 			public Void run() {
@@ -205,7 +225,6 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implement
 			}
 
 		});
-
 	}
 
 	@Override
@@ -216,7 +235,7 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implement
 	}
 
 	protected synchronized void doRefresh() {
-		Subject.doAs(subject, new PrivilegedAction<Void>() {
+		Subject.doAs(getSubject(), new PrivilegedAction<Void>() {
 			@Override
 			public Void run() {
 				refresh();
@@ -326,7 +345,7 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implement
 		@Override
 		public void navigated(BrowserNavigationEvent event) {
 			setState(event.getState());
-			refresh();
+			doRefresh();
 		}
 	}
 }
\ No newline at end of file