You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2015/12/31 10:31:17 UTC

svn commit: r1722431 - /sling/trunk/contrib/extensions/acldef/oak-jcr/src/main/java/org/apache/sling/acldef/jcr/AclUtil.java

Author: bdelacretaz
Date: Thu Dec 31 09:31:17 2015
New Revision: 1722431

URL: http://svn.apache.org/viewvc?rev=1722431&view=rev
Log:
SLING-5355 - fail if Principal not found

Modified:
    sling/trunk/contrib/extensions/acldef/oak-jcr/src/main/java/org/apache/sling/acldef/jcr/AclUtil.java

Modified: sling/trunk/contrib/extensions/acldef/oak-jcr/src/main/java/org/apache/sling/acldef/jcr/AclUtil.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/acldef/oak-jcr/src/main/java/org/apache/sling/acldef/jcr/AclUtil.java?rev=1722431&r1=1722430&r2=1722431&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/acldef/oak-jcr/src/main/java/org/apache/sling/acldef/jcr/AclUtil.java (original)
+++ sling/trunk/contrib/extensions/acldef/oak-jcr/src/main/java/org/apache/sling/acldef/jcr/AclUtil.java Thu Dec 31 09:31:17 2015
@@ -28,6 +28,7 @@ import javax.jcr.security.Privilege;
 
 import org.apache.jackrabbit.api.security.JackrabbitAccessControlList;
 import org.apache.jackrabbit.api.security.JackrabbitAccessControlManager;
+import org.apache.jackrabbit.api.security.user.Authorizable;
 import org.apache.jackrabbit.commons.jackrabbit.authorization.AccessControlUtils;
 
 /** Utilities for ACL management */
@@ -56,7 +57,11 @@ public class AclUtil {
             }
             JackrabbitAccessControlList acl = AccessControlUtils.getAccessControlList(s, path);
             for(String principal : principals) {
-                final Principal p = ServiceUserUtil.getAuthorizable(s, principal).getPrincipal(); 
+                final Authorizable a = ServiceUserUtil.getAuthorizable(s, principal);
+                if(a == null) {
+                    throw new IllegalStateException("Principal not found:" + principal);
+                }
+                final Principal p = a.getPrincipal(); 
                 acl.addEntry(p, jcrPriv, isAllow);
             }
             getJACM(s).setPolicy(path, acl);