From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 9 Feb 2017 20:48:49 +0000 (+0100)
Subject: Add create workgroup
X-Git-Tag: argeo-commons-2.1.60~3^2
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=75a9e55a73ac2a274f329b2b425784c6a41714c7;p=lgpl%2Fargeo-commons.git

Add create workgroup
---

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsInstance.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsInstance.java
index 5fedd1d31..d040bdb1e 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsInstance.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsInstance.java
@@ -1,9 +1,11 @@
 package org.argeo.cms.internal.kernel;
 
 import javax.jcr.Repository;
+import javax.naming.ldap.LdapName;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.argeo.cms.CmsException;
 import org.argeo.node.NodeConstants;
 import org.argeo.node.NodeInstance;
 import org.osgi.framework.BundleContext;
@@ -15,6 +17,7 @@ public class CmsInstance implements NodeInstance {
 	private final Log log = LogFactory.getLog(getClass());
 	private final BundleContext bc = FrameworkUtil.getBundle(getClass()).getBundleContext();
 
+	private HomeRepository homeRepository;
 
 	public CmsInstance() {
 		initTrackers();
@@ -26,12 +29,20 @@ public class CmsInstance implements NodeInstance {
 			@Override
 			public Repository addingService(ServiceReference<Repository> reference) {
 				Object cn = reference.getProperty(NodeConstants.CN);
-				if (cn != null && cn.equals(NodeConstants.NODE)) {
+				if (cn != null && cn.equals(NodeConstants.HOME)) {
+					homeRepository = (HomeRepository) bc.getService(reference);
 					if (log.isDebugEnabled())
-						log.debug("Node repository is available");
+						log.debug("Home repository is available");
 				}
 				return super.addingService(reference);
 			}
+
+			@Override
+			public void removedService(ServiceReference<Repository> reference, Repository service) {
+				super.removedService(reference, service);
+				homeRepository = null;
+			}
+
 		}.open();
 	}
 
@@ -39,4 +50,12 @@ public class CmsInstance implements NodeInstance {
 
 	}
 
+	@Override
+	public void createWorkgroup(LdapName dn) {
+		if (homeRepository == null)
+			throw new CmsException("Home repository is not available");
+		// TODO add check that the group exists
+		homeRepository.createWorkgroup(dn);
+	}
+
 }
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..574470398 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
@@ -8,6 +8,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;
@@ -28,7 +29,7 @@ import org.argeo.node.NodeUtils;
 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 groupsBasePath = KernelConstants.DEFAULT_GROUPS_BASE_PATH;
 
 	private Set<String> checkedUsers = new HashSet<String>();
 
@@ -84,11 +85,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);
@@ -143,12 +144,29 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
 		}
 	}
 
-	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]", "_");
+			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;
-//	}
+	}
 
 }
diff --git a/org.argeo.node.api/src/org/argeo/node/NodeInstance.java b/org.argeo.node.api/src/org/argeo/node/NodeInstance.java
index e1e4bcdfa..3a39abd14 100644
--- a/org.argeo.node.api/src/org/argeo/node/NodeInstance.java
+++ b/org.argeo.node.api/src/org/argeo/node/NodeInstance.java
@@ -1,5 +1,9 @@
 package org.argeo.node;
 
-public interface NodeInstance {
+import javax.naming.ldap.LdapName;
 
+/** The structured data */
+public interface NodeInstance {
+	/** Mark this group as a workgroup */
+	void createWorkgroup(LdapName groupDn);
 }