Changeset 20:715aa11d138b in AnnotationManagerN4J for src

Timestamp:

Sep 7, 2012, 4:09:49 PM (12 years ago)

Author:

casties

Branch:

default

Message:

fixes in permission handling: admin and delete default to creator.

Location:

src/main/java/de/mpiwg/itgroup/annotations

Files:

• Annotation.java (modified) (8 diffs)
• restlet/AnnotatorAnnotations.java (modified) (3 diffs)

src/main/java/de/mpiwg/itgroup/annotations/Annotation.java

@@ -4 +4 @@
 package de.mpiwg.itgroup.annotations;
 
-import java.util.List;
 import java.util.Set;
 
@@ -92 +91 @@
     
     /**
-     * Returns if the requested action is allowed on this annotation.
+     * Returns if the requested action is allowed for the given user on this annotation.
      * 
      * @param action
@@ -103 +102 @@
             Actor reader = getReadPermission();
             if (reader == null) {
+                // if not specified then everybody is allowed
                 return true;
             } else {
@@ -112 +112 @@
             Actor updater = getUpdatePermission();
             if (updater == null) {
+                // if not specified then everybody is allowed
                 return true;
             } else {
@@ -119 +120 @@
             // require at least an authenticated user
             if (user == null) return false;
-            Actor updater = getUpdatePermission();
-            if (updater == null) {
-                return true;
-            } else {
-                return updater.isEquivalentWith(user, store);
+            Actor deleter = getDeletePermission();
+            if (deleter == null) {
+                // if not specified then only creator is allowed
+                deleter = creator;
             }
+            return deleter.isEquivalentWith(user, store);
         } else if (action.equals("admin")) {
             // require at least an authenticated user
@@ -130 +131 @@
             Actor admin = getAdminPermission();
             if (admin == null) {
-                return true;
-            } else {
-                return admin.isEquivalentWith(user, store);
+                // if not specified then only creator is allowed
+                admin = creator;
             }
+            return admin.isEquivalentWith(user, store);
         }
         return false;
@@ -274 +275 @@
      */
     public Actor getAdminPermission() {
-        return adminPermission;
+        if (adminPermission != null) {
+            return adminPermission;
+        } else {
+            // if not specified then only creator is allowed
+            return this.creator;
+        }
     }
 
@@ -288 +294 @@
      */
     public Actor getDeletePermission() {
-        return deletePermission;
+        if (deletePermission != null) {
+            return deletePermission;
+        } else {
+            // if not specified then only creator is allowed
+            return this.creator;
+        }
     }
 

src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorAnnotations.java

@@ -74 +74 @@
 
     /**
-     * POST with JSON content-type.
+     * POST with JSON content-type. Creates a new Annotation.
      * 
      * @return
@@ -128 +128 @@
 
     /**
-     * PUT with JSON content-type.
+     * PUT with JSON content-type. Modifies an Annotation.
      * 
      * @param entity
@@ -191 +191 @@
 
     /**
-     * DELETE with JSON content-type.
+     * DELETE with JSON content-type. Deletes an Annotation.
      * 
      * @param entity