X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jackrabbit%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjackrabbit%2Fremote%2FSimpleSessionProvider.java;h=1d438d5044561218e0dd6258f4656495d3794c53;hb=3a3d316af102ba410d1d9e6de349d0c8f7ac044f;hp=ebd111c0ba7a921bde551e4853d90cd7046f0fb5;hpb=2ba7cb08946a79978e74b8e1c1d04fe607450505;p=lgpl%2Fargeo-commons.git diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/SimpleSessionProvider.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/SimpleSessionProvider.java index ebd111c0b..1d438d504 100644 --- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/SimpleSessionProvider.java +++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/SimpleSessionProvider.java @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2007-2012 Argeo GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.argeo.jackrabbit.remote; import java.io.Serializable; @@ -27,11 +42,16 @@ import org.apache.jackrabbit.server.SessionProvider; import org.argeo.ArgeoException; import org.argeo.jcr.ArgeoNames; import org.argeo.jcr.JcrUtils; +import org.argeo.jcr.UserJcrUtils; /** * Implements an open session in view patter: a new JCR session is created for * each request + * + * @deprecated use {@link ScopedSessionProvider} or + * {@link OpenInViewSessionProvider} */ +@Deprecated public class SimpleSessionProvider implements SessionProvider, Serializable { private static final long serialVersionUID = 2270957712453841368L; @@ -42,19 +62,27 @@ public class SimpleSessionProvider implements SessionProvider, Serializable { private Boolean openSessionInView = true; - private String securityWorkspace = "security"; + private String defaultWorkspace = "default"; + + private String webSessionId = null; public Session getSession(HttpServletRequest request, Repository rep, String workspace) throws LoginException, ServletException, RepositoryException { if (openSessionInView) { - JackrabbitSession session = (JackrabbitSession) rep - .login(workspace); - if (session.getWorkspace().getName().equals(securityWorkspace)) + JackrabbitSession session = (JackrabbitSession) login(request, rep, + workspace); + if (session.getWorkspace().getName().equals(defaultWorkspace)) writeRemoteRoles(session); return session; } else { + if (webSessionId != null + && !webSessionId.equals(request.getSession().getId())) + throw new ArgeoException( + "Only session scope is supported in this mode"); + webSessionId = request.getSession().getId(); + // since sessions is transient it can't be restored from the session if (sessions == null) sessions = Collections @@ -62,10 +90,13 @@ public class SimpleSessionProvider implements SessionProvider, Serializable { if (!sessions.containsKey(workspace)) { try { - JackrabbitSession session = (JackrabbitSession) rep.login( - null, workspace); + // JackrabbitSession session = (JackrabbitSession) + // rep.login( + // null, workspace); + JackrabbitSession session = (JackrabbitSession) login( + request, rep, workspace); if (session.getWorkspace().getName() - .equals(securityWorkspace)) + .equals(defaultWorkspace)) writeRemoteRoles(session); if (log.isTraceEnabled()) log.trace("User " + session.getUserID() @@ -79,7 +110,7 @@ public class SimpleSessionProvider implements SessionProvider, Serializable { Session session = sessions.get(workspace); if (!session.isLive()) { sessions.remove(workspace); - session = rep.login(null, workspace); + session = login(request, rep, workspace); sessions.put(workspace, session); } return session; @@ -87,8 +118,19 @@ public class SimpleSessionProvider implements SessionProvider, Serializable { } } + protected Session login(HttpServletRequest request, Repository repository, + String workspace) throws RepositoryException { + if (log.isDebugEnabled()) + log.debug("Login to workspace " + + (workspace == null ? "" : workspace) + + " in web session " + request.getSession().getId()); + return repository.login(workspace); + } + protected void writeRemoteRoles(JackrabbitSession session) throws RepositoryException { + // FIXME better deal w/ non node repo + // retrieve roles String userId = session.getUserID(); UserManager userManager = session.getUserManager(); @@ -103,12 +145,11 @@ public class SimpleSessionProvider implements SessionProvider, Serializable { userGroupIds.add(it.next().getID()); // write roles if needed - Node userProfile = JcrUtils.getUserHome(session).getNode( - ArgeoNames.ARGEO_PROFILE); + Node userHome = UserJcrUtils.getUserHome(session); boolean writeRoles = false; - if (userProfile.hasProperty(ArgeoNames.ARGEO_REMOTE_ROLES)) { - Value[] roles = userProfile.getProperty( - ArgeoNames.ARGEO_REMOTE_ROLES).getValues(); + if (userHome.hasProperty(ArgeoNames.ARGEO_REMOTE_ROLES)) { + Value[] roles = userHome.getProperty(ArgeoNames.ARGEO_REMOTE_ROLES) + .getValues(); if (roles.length != userGroupIds.size()) writeRoles = true; else @@ -120,14 +161,14 @@ public class SimpleSessionProvider implements SessionProvider, Serializable { if (writeRoles) { session.getWorkspace().getVersionManager() - .checkout(userProfile.getPath()); + .checkout(userHome.getPath()); String[] roleIds = userGroupIds.toArray(new String[userGroupIds .size()]); - userProfile.setProperty(ArgeoNames.ARGEO_REMOTE_ROLES, roleIds); - JcrUtils.updateLastModified(userProfile); + userHome.setProperty(ArgeoNames.ARGEO_REMOTE_ROLES, roleIds); + JcrUtils.updateLastModified(userHome); session.save(); session.getWorkspace().getVersionManager() - .checkin(userProfile.getPath()); + .checkin(userHome.getPath()); } } @@ -136,26 +177,26 @@ public class SimpleSessionProvider implements SessionProvider, Serializable { if (log.isTraceEnabled()) log.trace("Releasing JCR session " + session); if (openSessionInView) { - if (session.isLive()) { - session.logout(); - if (log.isTraceEnabled()) - log.trace("Logged out remote JCR session " + session); - } + JcrUtils.logoutQuietly(session); + if (log.isDebugEnabled()) + log.debug("Logged out remote JCR session " + session); } } public void init() { + if (log.isDebugEnabled()) + log.debug("Init session provider for web session " + webSessionId); } public void destroy() { + if (log.isDebugEnabled()) + log.debug("Destroy session provider for web session " + + webSessionId); + if (sessions != null) for (String workspace : sessions.keySet()) { Session session = sessions.get(workspace); - if (session.isLive()) { - session.logout(); - if (log.isDebugEnabled()) - log.debug("Logged out remote JCR session " + session); - } + JcrUtils.logoutQuietly(session); } } @@ -169,7 +210,7 @@ public class SimpleSessionProvider implements SessionProvider, Serializable { } public void setSecurityWorkspace(String securityWorkspace) { - this.securityWorkspace = securityWorkspace; + this.defaultWorkspace = securityWorkspace; } }