Changeset 29310

Timestamp:

2014-09-18T12:47:48+12:00 (10 years ago)

Author:

kjdon

Message:

look for a disabled attribute for security block - easily turn off security for a collection. Used so we can put sample security statements in a config file without them being used. If the block is just commented out then GLI will delete it. If scope is collection, then ignore any exceptions which have document sets. otherwise, if have an exception with empty group name and a document set, and change the scope to colleciton, all will be visible as the empty group will be added to list of groups.

File:

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

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

@@ -303 +303 @@
         }
 
+        String disabled = securityBlock.getAttribute(GSXML.DISABLED_ATT);
+        if (!disabled.equals("")) {
+          // security block has been disabled.
+          logger.warn("Security block has been disabled. Not implementing any security for collection "+this.cluster_name);
+          return;
+        }
         String scope = securityBlock.getAttribute(GSXML.SCOPE_ATT);
         String defaultAccess = securityBlock.getAttribute(GSXML.DEFAULT_ACCESS_ATT);
@@ -374 +380 @@
                     exceptionSets.add(docSetName);
                 }
-
+                if (_securityScopeCollection) {
+                  // we don't add in any exceptions that have document sets
+                  if (!exceptionSets.isEmpty()) {
+                    continue;
+                  }
+                }
                 securityException.put("groups", exceptionGroups);
                 securityException.put("sets", exceptionSets);