svn commit: r1665630 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidator.java test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidatorTest.java

[an...@apache.org]

Author: angela
Date: Tue Mar 10 17:34:07 2015
New Revision: 1665630

URL: http://svn.apache.org/r1665630
Log:
OAK-2413: Clarify Editor.childNodeChanged() (fix PrivilegeValidator)

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

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidator.java?rev=1665630&r1=1665629&r2=1665630&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidator.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidator.java Tue Mar 10 17:34:07 2015
@@ -105,7 +105,7 @@ class PrivilegeValidator extends Default
 
     @Override
     public Validator childNodeChanged(String name, NodeState before, NodeState after) throws CommitFailedException {
-        if (isPrivilegeDefinition(before)) {
+        if (isPrivilegeDefinition(before) && !before.equals(after)) {
             throw new CommitFailedException(CONSTRAINT, 41, "Attempt to modify existing privilege definition " + name);
         } else {
             // not handled by this validator

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidatorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidatorTest.java?rev=1665630&r1=1665629&r2=1665630&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidatorTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidatorTest.java Tue Mar 10 17:34:07 2015
@@ -25,16 +25,24 @@ import org.apache.jackrabbit.oak.Abstrac
 import org.apache.jackrabbit.oak.api.CommitFailedException;
 import org.apache.jackrabbit.oak.api.Tree;
 import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState;
 import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
+import org.apache.jackrabbit.oak.plugins.tree.TreeFactory;
+import org.apache.jackrabbit.oak.plugins.tree.impl.AbstractTree;
+import org.apache.jackrabbit.oak.plugins.tree.impl.ImmutableTree;
 import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeBits;
 import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeBitsProvider;
 import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
+import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
 import org.junit.Before;
 import org.junit.Test;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static junit.framework.Assert.assertTrue;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
 
 public class PrivilegeValidatorTest extends AbstractSecurityTest implements PrivilegeConstants {
@@ -154,4 +162,37 @@ public class PrivilegeValidatorTest exte
             root.refresh();
         }
     }
+
+    /**
+     * @see <a href="https://issues.apache.org/jira/browse/OAK-2413">OAK-2413</a>
+     */
+    @Test
+    public void testChildNodeChangedWithChanges() throws CommitFailedException {
+        NodeBuilder nb = EmptyNodeState.EMPTY_NODE.builder();
+        nb.setProperty(JcrConstants.JCR_PRIMARYTYPE, NT_REP_PRIVILEGE, Type.NAME);
+
+        NodeState privilegeDefinition = nb.getNodeState();
+        assertTrue(NT_REP_PRIVILEGE.equals(NodeStateUtils.getPrimaryTypeName(privilegeDefinition)));
+
+        PrivilegeValidator pv = new PrivilegeValidator(root, root);
+        try {
+            pv.childNodeChanged("test", privilegeDefinition, EmptyNodeState.EMPTY_NODE);
+        } catch (CommitFailedException e) {
+            assertEquals(41, e.getCode());
+        }
+    }
+    /**
+     * @see <a href="https://issues.apache.org/jira/browse/OAK-2413">OAK-2413</a>
+     */
+    @Test
+    public void testChildNodeChangedWithoutChanges() throws CommitFailedException {
+        NodeBuilder nb = EmptyNodeState.EMPTY_NODE.builder();
+        nb.setProperty(JcrConstants.JCR_PRIMARYTYPE, NT_REP_PRIVILEGE, Type.NAME);
+
+        NodeState privilegeDefinition = nb.getNodeState();
+        assertTrue(NT_REP_PRIVILEGE.equals(NodeStateUtils.getPrimaryTypeName(privilegeDefinition)));
+
+        PrivilegeValidator pv = new PrivilegeValidator(root, root);
+        assertNull(pv.childNodeChanged("test", privilegeDefinition, privilegeDefinition));
+    }
 }
\ No newline at end of file