X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FHomeRepository.java;h=e5164b6c3fc6424e7dc14e234c25a33c8f3021fd;hb=1f4ff4da0e5d85821b005267dfa9eece9f8ca9bb;hp=fd432d11e4c85304f688e5ce550a4411f1480e6c;hpb=0d46a59c2e2a704b617c1a665fa5155bd4e40682;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/HomeRepository.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/HomeRepository.java
index fd432d11e..e5164b6c3 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/HomeRepository.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/HomeRepository.java
@@ -71,7 +71,7 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
 	}
 
 	@Override
-	protected void processNewSession(Session session) {
+	protected void processNewSession(Session session, String workspaceName) {
 		String username = session.getUserID();
 		if (username == null || username.toString().equals(""))
 			return;
@@ -82,7 +82,7 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
 			return;
 		Session adminSession = KernelUtils.openAdminSession(getRepository(), session.getWorkspace().getName());
 		try {
-			syncJcr(adminSession, username);
+			syncJcr(adminSession, username, workspaceName);
 			checkedUsers.add(username);
 		} finally {
 			JcrUtils.logoutQuietly(adminSession);
@@ -109,28 +109,35 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
 		}
 	}
 
-	private void syncJcr(Session session, String username) {
+	protected synchronized void syncJcr(Session adminSession, String username, String workspaceName) {
+		// only in the default workspace
+		if (workspaceName != null)
+			return;
+		// skip system users
+		if (username.endsWith(NodeConstants.ROLES_BASEDN))
+			return;
+
 		try {
-			Node userHome = NodeUtils.getUserHome(session, username);
+			Node userHome = NodeUtils.getUserHome(adminSession, username);
 			if (userHome == null) {
 				String homePath = generateUserPath(username);
-				if (session.itemExists(homePath))// duplicate user id
-					userHome = session.getNode(homePath).getParent().addNode(JcrUtils.lastPathElement(homePath));
+				if (adminSession.itemExists(homePath))// duplicate user id
+					userHome = adminSession.getNode(homePath).getParent().addNode(JcrUtils.lastPathElement(homePath));
 				else
-					userHome = JcrUtils.mkdirs(session, homePath);
+					userHome = JcrUtils.mkdirs(adminSession, homePath);
 				// userHome = JcrUtils.mkfolders(session, homePath);
 				userHome.addMixin(NodeTypes.NODE_USER_HOME);
 				userHome.addMixin(NodeType.MIX_CREATED);
 				userHome.setProperty(NodeNames.LDAP_UID, username);
-				session.save();
+				adminSession.save();
 
-				JcrUtils.clearAccessControList(session, homePath, username);
-				JcrUtils.addPrivilege(session, homePath, username, Privilege.JCR_ALL);
+				JcrUtils.clearAccessControList(adminSession, homePath, username);
+				JcrUtils.addPrivilege(adminSession, homePath, username, Privilege.JCR_ALL);
 			}
-			if (session.hasPendingChanges())
-				session.save();
+			if (adminSession.hasPendingChanges())
+				adminSession.save();
 		} catch (RepositoryException e) {
-			JcrUtils.discardQuietly(session);
+			JcrUtils.discardQuietly(adminSession);
 			throw new CmsException("Cannot sync node security model for " + username, e);
 		}
 	}