OAK-2983 : Permissions lack WRITE

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1685806 13f79535-47bb-0310-9956-ffa450edef68
rombert · Jun 16, 2015 · 2cda1b1 · 2cda1b1
1 parent 1bc49b1
commit 2cda1b1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/...ain/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/Permissions.java b/...ain/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/Permissions.java
@@ -116,6 +116,8 @@ private 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 @@ private 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 @@ private 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);

diff --git a/oak-doc/src/site/markdown/security/permission.md b/oak-doc/src/site/markdown/security/permission.md
@@ -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