X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FHomeRepository.java;h=e5164b6c3fc6424e7dc14e234c25a33c8f3021fd;hb=1f4ff4da0e5d85821b005267dfa9eece9f8ca9bb;hp=6900be3addf85f1a9015e20f00c78599ec0afb37;hpb=3a0d866fbeea3f78c293212f4b4fbaeba7dfe2bd;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 6900be3ad..e5164b6c3 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,98 +10,79 @@ 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; import javax.security.auth.Subject; import javax.security.auth.login.LoginContext; -import org.apache.jackrabbit.core.security.SecurityConstants; import org.argeo.cms.CmsException; -import org.argeo.cms.auth.AuthConstants; -import org.argeo.jcr.ArgeoJcrConstants; -import org.argeo.jcr.ArgeoNames; -import org.argeo.jcr.ArgeoTypes; import org.argeo.jcr.JcrRepositoryWrapper; import org.argeo.jcr.JcrUtils; -import org.argeo.jcr.UserJcrUtils; +import org.argeo.node.NodeConstants; +import org.argeo.node.NodeNames; +import org.argeo.node.NodeTypes; +import org.argeo.node.NodeUtils; /** * Make sure each user has a home directory available in the default workspace. */ -class HomeRepository extends JcrRepositoryWrapper implements KernelConstants, ArgeoJcrConstants { - // private final Kernel kernel; +class HomeRepository extends JcrRepositoryWrapper implements KernelConstants { /** The home base path. */ - private String homeBasePath = "/home"; - private String peopleBasePath = ArgeoJcrConstants.PEOPLE_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) { - // this.kernel = kernel; - setRepository(repository); - LoginContext lc; - try { - lc = new LoginContext(AuthConstants.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 { - initJcr(getRepository().login()); - } catch (RepositoryException e) { - throw new CmsException("Cannot init JCR home", e); - } - return null; + 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); + 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 = getRepository().login(); + initJcr(adminSession); + } catch (RepositoryException e) { + throw new CmsException("Cannot init JCR home", e); + } + return null; + } - }); + }); + } } - // @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) { + protected void processNewSession(Session session, String workspaceName) { String username = session.getUserID(); - if (username == null) - return; - if (session.getUserID().equals(AuthConstants.ROLE_ANONYMOUS)) - return; - if (session.getUserID().equals(AuthConstants.ROLE_KERNEL)) + if (username == null || username.toString().equals("")) return; - if (session.getUserID().equals(SecurityConstants.ADMIN_ID)) + if (session.getUserID().equals(NodeConstants.ROLE_ANONYMOUS)) return; if (checkedUsers.contains(username)) return; Session adminSession = KernelUtils.openAdminSession(getRepository(), session.getWorkspace().getName()); try { - syncJcr(adminSession, username); + syncJcr(adminSession, username, workspaceName); checkedUsers.add(username); } finally { JcrUtils.logoutQuietly(adminSession); @@ -113,77 +96,54 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants, Ar private void initJcr(Session adminSession) { try { JcrUtils.mkdirs(adminSession, homeBasePath); - JcrUtils.mkdirs(adminSession, peopleBasePath); + JcrUtils.mkdirs(adminSession, groupsBasePath); adminSession.save(); - JcrUtils.addPrivilege(adminSession, homeBasePath, AuthConstants.ROLE_USER_ADMIN, Privilege.JCR_READ); - JcrUtils.addPrivilege(adminSession, peopleBasePath, AuthConstants.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); + throw new CmsException("Cannot initialize home repository", e); } finally { JcrUtils.logoutQuietly(adminSession); } } - private Node 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 = UserJcrUtils.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(ArgeoTypes.ARGEO_USER_HOME); - userHome.setProperty(ArgeoNames.ARGEO_USER_ID, username); - session.save(); + userHome.addMixin(NodeTypes.NODE_USER_HOME); + userHome.addMixin(NodeType.MIX_CREATED); + userHome.setProperty(NodeNames.LDAP_UID, username); + 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); } - - Node userProfile = UserJcrUtils.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; + 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); @@ -192,16 +152,51 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants, Ar } 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 + '/' + JcrUtils.firstCharsToPath(domain, 2) + '/' + domain + '/' - + JcrUtils.firstCharsToPath(name, 2) + '/' + name; - } else if (atIndex == 0 || atIndex == (userId.length() - 1)) { - throw new CmsException("Unsupported username " + userId); + if (atIndex < 0) { + return homeBasePath + '/' + userId; } else { - return base + '/' + JcrUtils.firstCharsToPath(userId, 2) + '/' + 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) { + 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.addMixin(NodeType.MIX_CREATED); + 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 boolean isRemote() { + return remote; } }