X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FHomeRepository.java;h=aa0f1fc3f53d287e5a1c1b946c6184f8fa84dce9;hb=eb3116df3624b3d32793548b79e137e2dad429cb;hp=574470398c451e5754233996caad58d28654fada;hpb=f06ad11d9b3c77604dbf439a7047a71b47abf06f;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 574470398..aa0f1fc3f 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; @@ -27,51 +29,60 @@ 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 usersBasePath = KernelConstants.DEFAULT_USERS_BASE_PATH; private String groupsBasePath = KernelConstants.DEFAULT_GROUPS_BASE_PATH; private Set checkedUsers = new HashSet(); - public HomeRepository(Repository repository) { + private SimpleDateFormat usersDatePath = new SimpleDateFormat("YYYY/MM"); + + 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() { - - @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() { + + @Override + public Void run() { + try { + Session adminSession = getDefaultRepository().login(); + initJcr(adminSession); + } catch (RepositoryException e) { + throw new CmsException("Cannot init JCR home", e); + } + return null; + } - }); + }); + } } @Override - protected void processNewSession(Session session) { + protected void processNewSession(Session session, String workspaceName) { String username = session.getUserID(); - if (username == null) + if (username == null || username.toString().equals("")) return; if (session.getUserID().equals(NodeConstants.ROLE_ANONYMOUS)) return; if (checkedUsers.contains(username)) return; - Session adminSession = KernelUtils.openAdminSession(getRepository(), session.getWorkspace().getName()); + Session adminSession = KernelUtils.openAdminSession(getRepository(workspaceName), workspaceName); try { - syncJcr(adminSession, username); + syncJcr(adminSession, username, workspaceName); checkedUsers.add(username); } finally { JcrUtils.logoutQuietly(adminSession); @@ -92,39 +103,47 @@ 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); } } - 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(homeBasePath, username); - if (session.itemExists(homePath))// duplicate user id - userHome = session.getNode(homePath).getParent().addNode(JcrUtils.lastPathElement(homePath)); + String homePath = generateUserPath(username); + 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); } } /** 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); @@ -133,15 +152,20 @@ 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 void createWorkgroup(LdapName dn) { @@ -154,9 +178,11 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants { } try { // TODO enhance transformation of cn to a valid node name - String relPath = cn.replaceAll("[^a-zA-Z0-9]", "_"); + // 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.addMixin(NodeType.MIX_CREATED); newWorkgroup.setProperty(NodeNames.LDAP_CN, cn); adminSession.save(); JcrUtils.addPrivilege(adminSession, newWorkgroup.getPath(), dn.toString(), Privilege.JCR_ALL); @@ -169,4 +195,8 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants { } + public boolean isRemote() { + return remote; + } + }