X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FHomeRepository.java;h=9ab66ffb8f3314b8b727ef70afb3b89ac00e1d72;hb=35507e18257f2e9f59842ba5120fcd3f19c4cf4d;hp=14254c75b7533991f87e96ad371d534dc7876550;hpb=f63f7150c61e1a21d9130789df8b4169e32660b5;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 14254c75b..9ab66ffb8 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
@@ -1,6 +1,8 @@
 package org.argeo.cms.internal.kernel;
 
 import java.security.PrivilegedAction;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -8,6 +10,7 @@ import javax.jcr.Node;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
+import javax.jcr.nodetype.NodeType;
 import javax.jcr.security.Privilege;
 import javax.naming.InvalidNameException;
 import javax.naming.ldap.LdapName;
@@ -26,12 +29,16 @@ import org.argeo.node.NodeUtils;
  * Make sure each user has a home directory available in the default workspace.
  */
 class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
+
 	/** The home base path. */
 	private String homeBasePath = KernelConstants.DEFAULT_HOME_BASE_PATH;
-//	private String groupsBasePath = KernelConstants.DEFAULT_GROUPS_BASE_PATH;
+	private String usersBasePath = KernelConstants.DEFAULT_USERS_BASE_PATH;
+	private String groupsBasePath = KernelConstants.DEFAULT_GROUPS_BASE_PATH;
 
 	private Set<String> checkedUsers = new HashSet<String>();
 
+	private SimpleDateFormat usersDatePath = new SimpleDateFormat("YYYY/MM");
+
 	public HomeRepository(Repository repository) {
 		super(repository);
 		putDescriptor(NodeConstants.CN, NodeConstants.HOME);
@@ -84,11 +91,11 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
 	private void initJcr(Session adminSession) {
 		try {
 			JcrUtils.mkdirs(adminSession, homeBasePath);
-//			JcrUtils.mkdirs(adminSession, groupsBasePath);
+			JcrUtils.mkdirs(adminSession, groupsBasePath);
 			adminSession.save();
 
-			JcrUtils.addPrivilege(adminSession, homeBasePath, NodeConstants.ROLE_USER_ADMIN, Privilege.JCR_ALL);
-//			JcrUtils.addPrivilege(adminSession, groupsBasePath, NodeConstants.ROLE_USER_ADMIN, Privilege.JCR_ALL);
+			JcrUtils.addPrivilege(adminSession, homeBasePath, NodeConstants.ROLE_USER_ADMIN, Privilege.JCR_READ);
+			JcrUtils.addPrivilege(adminSession, groupsBasePath, NodeConstants.ROLE_USER_ADMIN, Privilege.JCR_READ);
 			adminSession.save();
 		} catch (RepositoryException e) {
 			throw new CmsException("Cannot initialize node user admin", e);
@@ -101,7 +108,7 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
 		try {
 			Node userHome = NodeUtils.getUserHome(session, username);
 			if (userHome == null) {
-				String homePath = generateUserPath(homeBasePath, username);
+				String homePath = generateUserPath(username);
 				if (session.itemExists(homePath))// duplicate user id
 					userHome = session.getNode(homePath).getParent().addNode(JcrUtils.lastPathElement(homePath));
 				else
@@ -123,7 +130,7 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
 	}
 
 	/** Generate path for a new user home */
-	private String generateUserPath(String base, String username) {
+	private String generateUserPath(String username) {
 		LdapName dn;
 		try {
 			dn = new LdapName(username);
@@ -132,23 +139,46 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
 		}
 		String userId = dn.getRdn(dn.size() - 1).getValue().toString();
 		int atIndex = userId.indexOf('@');
-		if (atIndex > 0) {
-			String domain = userId.substring(0, atIndex);
-			String name = userId.substring(atIndex + 1);
-			return base + '/' + domain + '/' + name;
-		} else if (atIndex == 0 || atIndex == (userId.length() - 1)) {
-			throw new CmsException("Unsupported username " + userId);
+		if (atIndex < 0) {
+			return homeBasePath + '/' + userId;
 		} else {
-			return base + '/' + userId;
+			return usersBasePath + '/' + usersDatePath.format(new Date()) + '/' + userId;
 		}
+		// if (atIndex > 0) {
+		// String domain = userId.substring(0, atIndex);
+		// String name = userId.substring(atIndex + 1);
+		// return base + '/' + domain + '/' + name;
+		// } else if (atIndex == 0 || atIndex == (userId.length() - 1)) {
+		// throw new CmsException("Unsupported username " + userId);
+		// } else {
+		// return base + '/' + userId;
+		// }
 	}
 
-	public String getHomeBasePath() {
-		return homeBasePath;
-	}
+	public void createWorkgroup(LdapName dn) {
+		Session adminSession = KernelUtils.openAdminSession(this);
+		String cn = dn.getRdn(dn.size() - 1).getValue().toString();
+		Node newWorkgroup = NodeUtils.getGroupHome(adminSession, cn);
+		if (newWorkgroup != null) {
+			JcrUtils.logoutQuietly(adminSession);
+			throw new CmsException("Workgroup " + newWorkgroup + " already exists for " + dn);
+		}
+		try {
+			// TODO enhance transformation of cn to a valid node name
+			// String relPath = cn.replaceAll("[^a-zA-Z0-9]", "_");
+			String relPath = JcrUtils.replaceInvalidChars(cn);
+			newWorkgroup = JcrUtils.mkdirs(adminSession.getNode(groupsBasePath), relPath, NodeType.NT_UNSTRUCTURED);
+			newWorkgroup.addMixin(NodeTypes.NODE_GROUP_HOME);
+			newWorkgroup.setProperty(NodeNames.LDAP_CN, cn);
+			adminSession.save();
+			JcrUtils.addPrivilege(adminSession, newWorkgroup.getPath(), dn.toString(), Privilege.JCR_ALL);
+			adminSession.save();
+		} catch (RepositoryException e) {
+			throw new CmsException("Cannot create workgroup", e);
+		} finally {
+			JcrUtils.logoutQuietly(adminSession);
+		}
 
-//	public String getGroupsBasePath() {
-//		return groupsBasePath;
-//	}
+	}
 
 }