You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2015/06/16 14:43:24 UTC

svn commit: r1685806 - in /jackrabbit/oak/trunk: oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/Permissions.java oak-doc/src/site/markdown/security/permission.md

Author: angela
Date: Tue Jun 16 12:43:24 2015
New Revision: 1685806

URL: http://svn.apache.org/r1685806
Log:
OAK-2983 : Permissions lack WRITE

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/Permissions.java
    jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/permission.md

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/Permissions.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/Permissions.java?rev=1685806&r1=1685805&r2=1685806&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/Permissions.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/Permissions.java Tue Jun 16 12:43:24 2015
@@ -116,6 +116,8 @@ public final class Permissions {
 
     public static final long SET_PROPERTY = ADD_PROPERTY | MODIFY_PROPERTY | REMOVE_PROPERTY;
 
+    public static final long WRITE = ADD_NODE | REMOVE_NODE | SET_PROPERTY;
+
     public static final long ALL = (READ
             | SET_PROPERTY
             | ADD_NODE | REMOVE_NODE
@@ -170,6 +172,7 @@ public final class Permissions {
         PERMISSION_NAMES.put(ADD_NODE, "ADD_NODE");
         PERMISSION_NAMES.put(REMOVE_NODE, "REMOVE_NODE");
         PERMISSION_NAMES.put(REMOVE, "REMOVE");
+        PERMISSION_NAMES.put(WRITE, "WRITE");
         PERMISSION_NAMES.put(MODIFY_CHILD_NODE_COLLECTION, "MODIFY_CHILD_NODE_COLLECTION");
         PERMISSION_NAMES.put(READ_ACCESS_CONTROL, "READ_ACCESS_CONTROL");
         PERMISSION_NAMES.put(MODIFY_ACCESS_CONTROL, "MODIFY_ACCESS_CONTROL");
@@ -199,6 +202,7 @@ public final class Permissions {
             PERMISSION_LOOKUP.put("ADD_NODE", ADD_NODE);
             PERMISSION_LOOKUP.put("REMOVE_NODE", REMOVE_NODE);
             PERMISSION_LOOKUP.put("REMOVE", REMOVE);
+            PERMISSION_LOOKUP.put("WRITE", WRITE);
             PERMISSION_LOOKUP.put("MODIFY_CHILD_NODE_COLLECTION", MODIFY_CHILD_NODE_COLLECTION);
             PERMISSION_LOOKUP.put("READ_ACCESS_CONTROL", READ_ACCESS_CONTROL);
             PERMISSION_LOOKUP.put("MODIFY_ACCESS_CONTROL", MODIFY_ACCESS_CONTROL);

Modified: jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/permission.md
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/permission.md?rev=1685806&r1=1685805&r2=1685806&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/permission.md (original)
+++ jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/permission.md Tue Jun 16 12:43:24 2015
@@ -120,6 +120,7 @@ Not used in Oak 1.0:
 - `READ`: aggregates `READ_NODE` and `READ_PROPERTY`
 - `REMOVE`: aggregates `REMOVE_NODE` and `REMOVE_PROPERTY`
 - `SET_PROPERTY`: aggregates `ADD_PROPERTY`, `MODIFY_PROPERTY` and `REMOVE_PROPERTY`
+- `WRITE`: aggregates `ADD_NODE`, `REMOVE_NODE` and `SET_PROPERTY`
 - `ALL`: aggregates all permissions
 
 #### Mapping of JCR Actions to Oak Permissions