Changeset 29049 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/Collection.java

Timestamp:

2014-05-12T14:11:08+12:00 (10 years ago)

Author:

kjdon

Message:

allow an exception with no sets for document level security. This can be used to set the group for all docs when default access is private

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/Collection.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/Collection.java

@@ -512 +512 @@
             {
                 boolean inSet = false;
-                for (HashMap<String, ArrayList<String>> exception : _securityExceptions)
-                {
-                    for (String setName : exception.get("sets"))
+                for (HashMap<String, ArrayList<String>> exception : _securityExceptions) {
+                  
+                  ArrayList<String> exceptionSets = exception.get("sets");
+                   if (exceptionSets.size() == 0) {
+                    inSet = true;
+                    for (String group : exception.get("groups"))
+                      {
+                    groups.add(group);
+                      }
+                   }
+                   else {
+                      for (String setName : exception.get("sets"))
                     {
-                        if (documentIsInSet(oid, setName))
+                      if (documentIsInSet(oid, setName))
+                        {
+                          inSet = true;
+                          for (String group : exception.get("groups"))
                         {
-                            inSet = true;
-                            for (String group : exception.get("groups"))
-                            {
-                                groups.add(group);
-                            }
+                          groups.add(group);
                         }
+                          break;
+                        }
                     }
-                }
-
+                   }
+                }
+            
+            
+                  
                 if (!inSet && _publicAccess)
-                {
+                  {// our doc was not part of any exception, so it must be public
                     groups.add("");
                 }
             }
-            else
+            else // if we are not doing a request with an oid, then free to access
             {
                 groups.add("");