svn commit: r1842080 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionWriter.java test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImplTest.java

[stillalex]

Author: stillalex
Date: Thu Sep 27 10:09:08 2018
New Revision: 1842080

URL: http://svn.apache.org/viewvc?rev=1842080&view=rev
Log:
OAK-7782 Clarify error on aggregate privilege registration with non existing 
privileges


Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionWriter.java
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImplTest.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionWriter.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionWriter.java?rev=1842080&r1=1842079&r2=1842080&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionWriter.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionWriter.java
 Thu Sep 27 10:09:08 2018
@@ -140,6 +140,9 @@ class PrivilegeDefinitionWriter implemen
             bits = PrivilegeBits.BUILT_IN.get(name);
         } else if (isAggregate) {
             bits = bitsMgr.getBits(declAggrNames);
+            if (bits.isEmpty()) {
+                throw new RepositoryException("Illegal aggregation of 
non-exising privileges on '" + name + "'.");
+            }
         } else {
             bits = next();
         }

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImplTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImplTest.java?rev=1842080&r1=1842079&r2=1842080&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImplTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImplTest.java
 Thu Sep 27 10:09:08 2018
@@ -53,6 +53,7 @@ public class PrivilegeManagerImplTest ex
     private PrivilegeManagerImpl privilegeManager;
 
     @Before
+    @Override
     public void before() throws Exception {
         super.before();
         privilegeManager = create(root);
@@ -169,6 +170,16 @@ public class PrivilegeManagerImplTest ex
         privilegeManager.registerPrivilege("jcr:customPrivilege", true, new 
String[]{"jcr:read", "jcr:write"});
     }
 
+    @Test
+    public void testRegisterAggregated() throws Exception {
+        privilegeManager.registerPrivilege("test:customPrivilege", false, new 
String[] { "jcr:read", "jcr:write" });
+    }
+
+    @Test(expected = RepositoryException.class)
+    public void testRegisterAggregatedNonExisting() throws Exception {
+        privilegeManager.registerPrivilege("test:customPrivilege", false, new 
String[] { "test:nan" });
+    }
+
     @Test(expected = RepositoryException.class)
     public void testRegisterPrivilegeReservedRemappedNamespace() throws 
Exception {
         NamePathMapper mapper = new NamePathMapperImpl(new 
LocalNameMapper(root, ImmutableMap.of("prefix", 
NamespaceRegistry.NAMESPACE_JCR)));