X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2FAbstractCmsEntryPoint.java;h=c101c021f134bc36602a0dc93b1a6da661ac4039;hb=2efce0621cf742d6ef077a1f13f8c76843c20ffb;hp=d3d4cbe90be035aa197e6e13e31a742d2c39f5c4;hpb=abce4463225c81fd06592143c7c43a4e4ea52893;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 d3d4cbe90..c101c021f 100644 --- a/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java +++ b/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java @@ -1,9 +1,8 @@ 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; @@ -12,13 +11,17 @@ 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.i18n.Msg; +import org.argeo.cms.auth.AuthConstants; +import org.argeo.cms.auth.HttpRequestCallbackHandler; +import org.argeo.cms.ui.UxContext; +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; @@ -27,22 +30,25 @@ import org.eclipse.rap.rwt.client.service.BrowserNavigation; import org.eclipse.rap.rwt.client.service.BrowserNavigationEvent; import org.eclipse.rap.rwt.client.service.BrowserNavigationListener; import org.eclipse.rap.rwt.client.service.JavaScriptExecutor; +import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; /** Manages history and navigation */ -abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implements - CmsSession { +public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint + implements CmsView { private final Log log = LogFactory.getLog(AbstractCmsEntryPoint.class); - private Subject subject = new Subject(); + private final Subject subject; + private LoginContext loginContext; - private Repository repository; - private String workspace; - private Session session; + private final Repository repository; + private final String workspace; + private final String defaultPath; private final Map factoryProperties; - // current state + // Current state + private Session session; private Node node; private String state; private String page; @@ -53,35 +59,37 @@ abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implements private final BrowserNavigation browserNavigation; public AbstractCmsEntryPoint(Repository repository, String workspace, - Map factoryProperties) { + String defaultPath, Map factoryProperties) { this.repository = repository; this.workspace = workspace; + this.defaultPath = defaultPath; this.factoryProperties = new HashMap(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); if (browserNavigation != null) browserNavigation .addBrowserNavigationListener(new CmsNavigationListener()); - - // RWT.setLocale(Locale.FRANCE); } @Override @@ -100,32 +108,43 @@ abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implements return shell; } - /** Recreate header UI */ - protected abstract void refreshHeader(); + @Override + protected final void createContents(final Composite parent) { + UiContext.setData(CmsView.KEY, this); + Subject.doAs(subject, new PrivilegedAction() { + @Override + public Void run() { + try { + initUi(parent); + } catch (Exception e) { + throw new CmsException("Cannot create entrypoint contents", + e); + } + return null; + } + }); + } - /** Recreate body UI */ - protected abstract void refreshBody(); + /** Create UI */ + protected abstract void initUi(Composite parent); + + /** Recreate UI after navigation or auth change */ + protected abstract void refresh(); /** * The node to return when no node was found (for authenticated users and * anonymous) */ - protected abstract Node getDefaultNode(Session session) - throws RepositoryException; - - /** - * Reasonable default since it is a nt:hierarchyNode and is thus compatible - * with the obvious default folder type, nt:folder, conceptual equivalent of - * an empty text file in an operating system. To be overridden. - */ - // protected String getDefaultNewNodeType() { - // return CmsTypes.CMS_TEXT; - // } - - /** Default new folder type (used in mkdirs) is nt:folder. To be overridden. */ - // protected String getDefaultNewFolderType() { - // return NodeType.NT_FOLDER; - // } + protected Node getDefaultNode(Session session) throws RepositoryException { + if (!session.hasPermission(defaultPath, "read")) { + if (session.getUserID().equals(AuthConstants.ROLE_ANONYMOUS)) + // TODO throw a special exception + throw new CmsException("Login required"); + else + throw new CmsException("Unauthorized"); + } + return session.getNode(defaultPath); + } protected String getBaseTitle() { return factoryProperties.get(WebClient.PAGE_TITLE); @@ -134,7 +153,7 @@ abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implements public void navigateTo(String state) { exception = null; String title = setState(state); - refreshBody(); + doRefresh(); if (browserNavigation != null) browserNavigation.pushState(state, title); } @@ -145,45 +164,87 @@ abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implements } @Override - public void authChange() { + public void logout() { + if (loginContext == null) + throw new CmsException("Login context should not be null"); try { - String currentPath = null; - if (node != null) - currentPath = node.getPath(); - JcrUtils.logoutQuietly(session); - - session = repository.login(workspace); - if (currentPath != null) - node = session.getNode(currentPath); - - // refresh UI - refreshHeader(); - refreshBody(); - } catch (RepositoryException e) { - throw new CmsException("Cannot perform auth change", e); + 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() { + + @Override + public Void run() { + try { + String currentPath = null; + if (node != null) + currentPath = node.getPath(); + JcrUtils.logoutQuietly(session); + + session = repository.login(workspace); + if (currentPath != null) + try { + node = session.getNode(currentPath); + } catch (Exception e) { + logout(); + session = repository.login(workspace); + navigateTo("~"); + throw e; + } + + // refresh UI + doRefresh(); + } catch (RepositoryException e) { + throw new CmsException("Cannot perform auth change", e); + } + return null; + } + + }); } @Override - public void exception(Throwable e) { - this.exception = e; + public void exception(final Throwable e) { + AbstractCmsEntryPoint.this.exception = e; log.error("Unexpected exception in CMS", e); - refreshBody(); + doRefresh(); } - @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); + protected void doRefresh() { + Subject.doAs(subject, new PrivilegedAction() { + @Override + public Void run() { + refresh(); + return null; + } + }); } + // @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) { String previousState = this.state; @@ -205,34 +266,10 @@ abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implements } else if (firstSlash > 0) { String prefix = state.substring(0, firstSlash); String path = state.substring(firstSlash); - // if (session.getWorkspace().getNodeTypeManager() - // .hasNodeType(prefix)) { - // String nodeType = prefix; - // if (!session.nodeExists(path)) - // node = addNode(session, path, nodeType); - // else { - // node = session.getNode(path); - // if (!node.isNodeType(nodeType)) - // throw new CmsException("Node " + path - // + " not of type " + nodeType); - // } - // } else if ("delete".equals(prefix)) { - // if (session.itemExists(path)) { - // Node nodeToDelete = session.getNode(path); - // // TODO "Are you sure?" - // nodeToDelete.remove(); - // session.save(); - // log.debug("Deleted " + path); - // navigateTo(previousState); - // } else - // throw new CmsException("Data " + path - // + " does not exist"); - // } else { if (session.nodeExists(path)) node = session.getNode(path); else throw new CmsException("Data " + path + " does not exist"); - // } page = prefix; } else { node = getDefaultNode(session); @@ -255,6 +292,7 @@ abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implements return title; } catch (Exception e) { + log.error("Cannot set state '" + state + "'", e); if (previousState.equals("")) previousState = "~"; navigateTo(previousState); @@ -263,13 +301,6 @@ abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implements } } - // protected Node addNode(Session session, String path, String nodeType) - // throws RepositoryException { - // return JcrUtils.mkdirs(session, path, nodeType != null ? nodeType - // : getDefaultNewNodeType(), getDefaultNewFolderType(), false); - // // not saved, so that the UI can discard it later on - // } - protected Node getNode() { return node; } @@ -278,10 +309,6 @@ abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implements return state; } - // String getPage() { - // return page; - // } - protected Throwable getException() { return exception; } @@ -300,8 +327,7 @@ abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implements @Override public void navigated(BrowserNavigationEvent event) { setState(event.getState()); - refreshBody(); + refresh(); } } - -} +} \ No newline at end of file