X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FHomeRepository.java;h=1b50023e650359130c656f9c8cbacc888a59467f;hb=5e34b63ecd7534daedeabb1804d043fc3ac3d947;hp=bfcb940c1d8336c1d74f8b7fb8c12f85609f1fed;hpb=1c25d6856f45fae563a7b6085bf7aa57c5b74793;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 bfcb940c1..1b50023e6 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 @@ -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() { - - @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 = 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(); @@ -165,9 +171,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);