Merge branch 'master' of https://code.argeo.org/git/apache2/argeo-commons

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 5fedd1d314d2a3b6fe9aea5df884b897f8c58f3d..d040bdb1eddfe0405c8fe115919928efe90621e7 100644 (file)
--- 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 5c6f419969eed607856e092d66b5e583a256dd8b..574470398c451e5754233996caad58d28654fada 100644 (file)
--- 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;
@@ -27,8 +28,8 @@ import org.argeo.node.NodeUtils;
  */
 class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
        /** The home base path. */
-       private String homeBasePath = "/home";
-       // private String peopleBasePath = NodeConstants.PEOPLE_BASE_PATH;
+       private String homeBasePath = KernelConstants.DEFAULT_HOME_BASE_PATH;
+       private String groupsBasePath = KernelConstants.DEFAULT_GROUPS_BASE_PATH;
 
        private Set<String> checkedUsers = new HashSet<String>();
 
@@ -58,28 +59,6 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
                });
        }
 
-       // @Override
-       // public Session login() throws LoginException, RepositoryException {
-       // Session session = super.login();
-       // String username = session.getUserID();
-       // if (username == null)
-       // return session;
-       // if (session.getUserID().equals(AuthConstants.ROLE_ANONYMOUS))
-       // return session;
-       //
-       // if (checkedUsers.contains(username))
-       // return session;
-       // Session adminSession = KernelUtils.openAdminSession(getRepository(),
-       // session.getWorkspace().getName());
-       // try {
-       // syncJcr(adminSession, username);
-       // checkedUsers.add(username);
-       // } finally {
-       // JcrUtils.logoutQuietly(adminSession);
-       // }
-       // return session;
-       // }
-
        @Override
        protected void processNewSession(Session session) {
                String username = session.getUserID();
@@ -87,10 +66,6 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
                        return;
                if (session.getUserID().equals(NodeConstants.ROLE_ANONYMOUS))
                        return;
-               // if (session.getUserID().equals(AuthConstants.ROLE_KERNEL))
-               // return;
-               // if (session.getUserID().equals(SecurityConstants.ADMIN_ID))
-               // return;
 
                if (checkedUsers.contains(username))
                        return;
@@ -110,12 +85,11 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
        private void initJcr(Session adminSession) {
                try {
                        JcrUtils.mkdirs(adminSession, homeBasePath);
-                       // JcrUtils.mkdirs(adminSession, peopleBasePath);
+                       JcrUtils.mkdirs(adminSession, groupsBasePath);
                        adminSession.save();
 
                        JcrUtils.addPrivilege(adminSession, homeBasePath, NodeConstants.ROLE_USER_ADMIN, Privilege.JCR_READ);
-                       // JcrUtils.addPrivilege(adminSession, peopleBasePath,
-                       // NodeConstants.ROLE_USER_ADMIN, Privilege.JCR_ALL);
+                       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);
@@ -141,43 +115,8 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
                                JcrUtils.clearAccessControList(session, homePath, username);
                                JcrUtils.addPrivilege(session, homePath, username, Privilege.JCR_ALL);
                        }
-
-                       // Node userProfile = NodeUtils.getUserProfile(session, username);
-                       // // new user
-                       // if (userProfile == null) {
-                       // String personPath = generateUserPath(peopleBasePath, username);
-                       // Node personBase;
-                       // if (session.itemExists(personPath))// duplicate user id
-                       // personBase = session.getNode(personPath).getParent()
-                       // .addNode(JcrUtils.lastPathElement(personPath));
-                       // else
-                       // personBase = JcrUtils.mkdirs(session, personPath);
-                       // userProfile = personBase.addNode(ArgeoNames.ARGEO_PROFILE);
-                       // userProfile.addMixin(ArgeoTypes.ARGEO_USER_PROFILE);
-                       // userProfile.setProperty(ArgeoNames.ARGEO_USER_ID, username);
-                       // // userProfile.setProperty(ArgeoNames.ARGEO_ENABLED, true);
-                       // // userProfile.setProperty(ArgeoNames.ARGEO_ACCOUNT_NON_EXPIRED,
-                       // // true);
-                       // // userProfile.setProperty(ArgeoNames.ARGEO_ACCOUNT_NON_LOCKED,
-                       // // true);
-                       // //
-                       // userProfile.setProperty(ArgeoNames.ARGEO_CREDENTIALS_NON_EXPIRED,
-                       // // true);
-                       // session.save();
-                       //
-                       // JcrUtils.clearAccessControList(session, userProfile.getPath(),
-                       // username);
-                       // JcrUtils.addPrivilege(session, userProfile.getPath(), username,
-                       // Privilege.JCR_READ);
-                       // }
-
-                       // Remote roles
-                       // if (roles != null) {
-                       // writeRemoteRoles(userProfile, roles);
-                       // }
                        if (session.hasPendingChanges())
                                session.save();
-                       // return userProfile;
                } catch (RepositoryException e) {
                        JcrUtils.discardQuietly(session);
                        throw new CmsException("Cannot sync node security model for " + username, e);
@@ -205,4 +144,29 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
                }
        }
 
+       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);
+               }
+
+       }
+
 }

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelConstants.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelConstants.java
index 941fdb27540522611d81ffcabcd23f70a5b13a8f..f49d5d49504460f324a2ac499ae82d1eba1a665e 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelConstants.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelConstants.java
@@ -23,9 +23,13 @@ public interface KernelConstants {
        // Java
        String JAAS_CONFIG_PROP = "java.security.auth.login.config";
 
+       // DEFAULTS JCR PATH
+       String DEFAULT_HOME_BASE_PATH = "/home";
+       String DEFAULT_GROUPS_BASE_PATH = "/groups";
+
        // RWT / RAP
-       String PATH_WORKBENCH = "/ui";
-       String PATH_WORKBENCH_PUBLIC = PATH_WORKBENCH + "/public";
+       // String PATH_WORKBENCH = "/ui";
+       // String PATH_WORKBENCH_PUBLIC = PATH_WORKBENCH + "/public";
 
        String JETTY_FACTORY_PID = "org.eclipse.equinox.http.jetty.config";
        String WHITEBOARD_PATTERN_PROP = "osgi.http.whiteboard.servlet.pattern";

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 e1e4bcdfa98f47e522cf091bfa4000186062f8af..3a39abd147783476bdc50178e1aee80f57e6738d 100644 (file)
--- 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);
 }

diff --git a/org.argeo.node.api/src/org/argeo/node/NodeUtils.java b/org.argeo.node.api/src/org/argeo/node/NodeUtils.java
index 7dd2ceb69a971a922f2d4702b45d9dfa9ab4a80c..8edea1a73579989b095929475223321886bbb641 100644 (file)
--- a/org.argeo.node.api/src/org/argeo/node/NodeUtils.java
+++ b/org.argeo.node.api/src/org/argeo/node/NodeUtils.java
@@ -111,7 +111,7 @@ public class NodeUtils {
         *            a session with a different user ID than the one searched,
         *            typically when a system or admin session is used.
         * @param cn
-        *            the username of the user
+        *            the name of the group
         */
        public static Node getGroupHome(Session session, String cn) {
                try {