X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FHomeRepository.java;h=b4f65bef73a1dea2bd458d4936cf16d0be40fe0a;hb=c79f5f2275dbbeb7407befc0188344ac16a87a80;hp=1546a0b6786be387df8e4311c7225f86f77cafdd;hpb=36c14000ab482f558a9679f75ac7bfb0953171f4;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 1546a0b67..b4f65bef7 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); } @@ -171,7 +176,7 @@ class HomeRepository extends JcrRepositoryWrapper implements KernelConstants { newWorkgroup.addMixin(NodeTypes.NODE_GROUP_HOME); 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);