Add created mixin to home and group directories

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / kernel / HomeRepository.java

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 1546a0b6786be387df8e4311c7225f86f77cafdd..1b50023e650359130c656f9c8cbacc888a59467f 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
@@ -39,36 +39,41 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
 
        private SimpleDateFormat usersDatePath = new SimpleDateFormat("YYYY/MM");
 
-       public HomeRepository(Repository repository) {
+       private final boolean remote;
+
+       public HomeRepository(Repository repository, boolean remote) {
                super(repository);
+               this.remote = remote;
                putDescriptor(NodeConstants.CN, NodeConstants.HOME);
-               LoginContext lc;
-               try {
-                       lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_DATA_ADMIN);
-                       lc.login();
-               } catch (javax.security.auth.login.LoginException e1) {
-                       throw new CmsException("Cannot login as systrem", e1);
-               }
-               Subject.doAs(lc.getSubject(), new PrivilegedAction<Void>() {
-
-                       @Override
-                       public Void run() {
-                               try {
-                                       Session adminSession = getRepository().login();
-                                       initJcr(adminSession);
-                               } catch (RepositoryException e) {
-                                       throw new CmsException("Cannot init JCR home", e);
-                               }
-                               return null;
+               if (!remote) {
+                       LoginContext lc;
+                       try {
+                               lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_DATA_ADMIN);
+                               lc.login();
+                       } catch (javax.security.auth.login.LoginException e1) {
+                               throw new CmsException("Cannot login as systrem", e1);
                        }
+                       Subject.doAs(lc.getSubject(), new PrivilegedAction<Void>() {
+
+                               @Override
+                               public Void run() {
+                                       try {
+                                               Session adminSession = getRepository().login();
+                                               initJcr(adminSession);
+                                       } catch (RepositoryException e) {
+                                               throw new CmsException("Cannot init JCR home", e);
+                                       }
+                                       return null;
+                               }
 
-               });
+                       });
+               }
        }
 
        @Override
        protected void processNewSession(Session session) {
                String username = session.getUserID();
-               if (username == null)
+               if (username == null || username.toString().equals(""))
                        return;
                if (session.getUserID().equals(NodeConstants.ROLE_ANONYMOUS))
                        return;
@@ -98,7 +103,7 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
                        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);
+                       throw new CmsException("Cannot initialize home repository", e);
                } finally {
                        JcrUtils.logoutQuietly(adminSession);
                }
@@ -115,6 +120,7 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
                                        userHome = JcrUtils.mkdirs(session, 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();
 
@@ -169,9 +175,10 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants {
                        String relPath = JcrUtils.replaceInvalidChars(cn);
                        newWorkgroup = JcrUtils.mkdirs(adminSession.getNode(groupsBasePath), relPath, NodeType.NT_UNSTRUCTURED);
                        newWorkgroup.addMixin(NodeTypes.NODE_GROUP_HOME);
+                       newWorkgroup.addMixin(NodeType.MIX_CREATED);
                        newWorkgroup.setProperty(NodeNames.LDAP_CN, cn);
                        adminSession.save();
-                       JcrUtils.addPrivilege(adminSession, newWorkgroup.getPath(), dn.toString(), Privilege.JCR_READ);
+                       JcrUtils.addPrivilege(adminSession, newWorkgroup.getPath(), dn.toString(), Privilege.JCR_ALL);
                        adminSession.save();
                } catch (RepositoryException e) {
                        throw new CmsException("Cannot create workgroup", e);