From 0efe603f0843d9b7aa7c384f6a9de0a8213ae0f4 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 22 May 2012 11:43:21 +0000 Subject: [PATCH] Fix issues with authorizations git-svn-id: https://svn.argeo.org/commons/trunk@5311 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../src/main/java/org/argeo/jcr/JcrUtils.java | 3 +- .../argeo/jcr/security/JcrAuthorizations.java | 101 +++++++++--------- 2 files changed, 53 insertions(+), 51 deletions(-) diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java index 7b99f0272..4c0cbf39d 100644 --- a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java +++ b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java @@ -1546,7 +1546,7 @@ public class JcrUtils implements ArgeoJcrConstants { /** * Add privileges on a path to a {@link Principal}. The path must already - * exist. + * exist. Session is saved. */ public static void addPrivileges(Session session, String path, Principal principal, List privs) @@ -1582,6 +1582,7 @@ public class JcrUtils implements ArgeoJcrConstants { throw new ArgeoException("Don't know how to apply privileges " + privs + " to " + principal + " on " + path); } + session.save(); } } diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/security/JcrAuthorizations.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/security/JcrAuthorizations.java index c4144b2bd..ddccf5719 100644 --- a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/security/JcrAuthorizations.java +++ b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/security/JcrAuthorizations.java @@ -24,10 +24,7 @@ import java.util.Map; import javax.jcr.Repository; import javax.jcr.RepositoryException; import javax.jcr.Session; -import javax.jcr.security.AccessControlList; import javax.jcr.security.AccessControlManager; -import javax.jcr.security.AccessControlPolicy; -import javax.jcr.security.AccessControlPolicyIterator; import javax.jcr.security.Privilege; import org.apache.commons.logging.Log; @@ -94,10 +91,13 @@ public class JcrAuthorizations implements Runnable { for (String principalName : principalNames.split(",")) { Principal principal = getOrCreatePrincipal(session, principalName); - addPrivileges(session, principal, path, privs); + JcrUtils.addPrivileges(session, path, principal, privs); } } - session.save(); + + if (log.isDebugEnabled()) + log.debug("All authorizations applied on workspace " + + session.getWorkspace().getName()); } /** @@ -110,51 +110,52 @@ public class JcrAuthorizations implements Runnable { return new SimplePrincipal(principalName); } - public static void addPrivileges(Session session, Principal principal, - String path, List privs) throws RepositoryException { - AccessControlManager acm = session.getAccessControlManager(); - // search for an access control list - AccessControlList acl = null; - AccessControlPolicyIterator policyIterator = acm - .getApplicablePolicies(path); - if (policyIterator.hasNext()) { - while (policyIterator.hasNext()) { - AccessControlPolicy acp = policyIterator - .nextAccessControlPolicy(); - if (acp instanceof AccessControlList) - acl = ((AccessControlList) acp); - } - } else { - AccessControlPolicy[] existingPolicies = acm.getPolicies(path); - for (AccessControlPolicy acp : existingPolicies) { - if (acp instanceof AccessControlList) - acl = ((AccessControlList) acp); - } - } - - if (acl != null) { - acl.addAccessControlEntry(principal, - privs.toArray(new Privilege[privs.size()])); - acm.setPolicy(path, acl); - if (log.isDebugEnabled()) { - StringBuffer buf = new StringBuffer(""); - for (int i = 0; i < privs.size(); i++) { - if (i != 0) - buf.append(','); - buf.append(privs.get(i).getName()); - } - log.debug("Added privilege(s) '" + buf + "' to '" - + principal.getName() + "' on " + path - + " from workspace '" - + session.getWorkspace().getName() + "'"); - } - } else { - throw new ArgeoException("Don't know how to apply privileges " - + privs + " to " + principal + " on " + path - + " from workspace '" + session.getWorkspace().getName() - + "'"); - } - } + // public static void addPrivileges(Session session, Principal principal, + // String path, List privs) throws RepositoryException { + // AccessControlManager acm = session.getAccessControlManager(); + // // search for an access control list + // AccessControlList acl = null; + // AccessControlPolicyIterator policyIterator = acm + // .getApplicablePolicies(path); + // if (policyIterator.hasNext()) { + // while (policyIterator.hasNext()) { + // AccessControlPolicy acp = policyIterator + // .nextAccessControlPolicy(); + // if (acp instanceof AccessControlList) + // acl = ((AccessControlList) acp); + // } + // } else { + // AccessControlPolicy[] existingPolicies = acm.getPolicies(path); + // for (AccessControlPolicy acp : existingPolicies) { + // if (acp instanceof AccessControlList) + // acl = ((AccessControlList) acp); + // } + // } + // + // if (acl != null) { + // acl.addAccessControlEntry(principal, + // privs.toArray(new Privilege[privs.size()])); + // acm.setPolicy(path, acl); + // session.save(); + // if (log.isDebugEnabled()) { + // StringBuffer buf = new StringBuffer(""); + // for (int i = 0; i < privs.size(); i++) { + // if (i != 0) + // buf.append(','); + // buf.append(privs.get(i).getName()); + // } + // log.debug("Added privilege(s) '" + buf + "' to '" + // + principal.getName() + "' on " + path + // + " from workspace '" + // + session.getWorkspace().getName() + "'"); + // } + // } else { + // throw new ArgeoException("Don't know how to apply privileges " + // + privs + " to " + principal + " on " + path + // + " from workspace '" + session.getWorkspace().getName() + // + "'"); + // } + // } @Deprecated public void setGroupPrivileges(Map groupPrivileges) { -- 2.30.2