Changeset 11942

Timestamp:

2006-06-20T10:53:18+12:00 (18 years ago)

Author:

mdewsnip

Message:

ZipCollectionConfigurations now includes only those collections that the user has access to.

Location:

trunk

Files:

• gli/src/org/greenstone/gatherer/remote/ZipCollectionConfigurations.java (modified) (4 diffs)
• gsdl/cgi-bin/gliserver.pl (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/remote/ZipCollectionConfigurations.java

@@ -12 +12 @@
     static public void main(String[] args)
     {
-    if (args.length != 2) {
-        System.err.println("Usage: ZipCollectionConfigurations <zip-file> <collect-directory-path>");
+    if (args.length != 4) {
+        System.err.println("Usage: ZipCollectionConfigurations <zip-file> <collect-directory-path> <user-name> <user-groups>");
         return;
     }
@@ -19 +19 @@
     String zip_file_path = args[0];
     String collect_directory_path = args[1];
+    String user_name = args[2];
+    String user_groups = args[3];
 
     if (!collect_directory_path.endsWith(File.separator)) {
@@ -30 +32 @@
         ZipTools.ZipFilter collection_metadata_zip_filter = new CollectionMetadataZipFilter();
 
-        // Add the etc and metadata directories from each of the collections
+        // Add the etc and metadata directories from each of the collections the user has access to
         File[] collection_directories = collect_directory.listFiles();
         for (int i = 0; i < collection_directories.length; i++) {
         if (collection_directories[i].isDirectory()) {
-            String etc_relative_path = collection_directories[i].getName() + File.separator + "etc";
-            ZipTools.addFileToZip(zos, collect_directory_path, etc_relative_path, collection_etc_zip_filter);
-
-            String metadata_relative_path = collection_directories[i].getName() + File.separator + "metadata";
-            ZipTools.addFileToZip(zos, collect_directory_path, metadata_relative_path, collection_metadata_zip_filter);
+            String collection_name = collection_directories[i].getName();
+            if (checkAccess(collection_name, user_name, user_groups)) {
+            String etc_relative_path = collection_directories[i].getName() + File.separator + "etc";
+            ZipTools.addFileToZip(zos, collect_directory_path, etc_relative_path, collection_etc_zip_filter);
+            String metadata_relative_path = collection_directories[i].getName() + File.separator + "metadata";
+            ZipTools.addFileToZip(zos, collect_directory_path, metadata_relative_path, collection_metadata_zip_filter);
+            }
         }
         }
 
+        zos.putNextEntry(new ZipEntry(".gli"));
         zos.close();
     }
@@ -47 +52 @@
         exception.printStackTrace();
     }
+    }
+
+
+    static private boolean checkAccess(String collection_name, String user_name, String user_groups)
+    {
+    String[] user_groups_array = user_groups.split(",");
+    for (int i = 0; i < user_groups_array.length; i++) {
+        if (user_groups_array[i].equals("all-collections-editor")) {
+        return true;
+        }
+        if (user_groups_array[i].equals("personal-collections-editor") && collection_name.startsWith(user_name + "-")) {
+        return true;
+        }
+        if (user_groups_array[i].equals(collection_name + "-collection-editor")) {
+        return true;
+        }
+    }
+
+    return false;
     }
 

trunk/gsdl/cgi-bin/gliserver.pl

@@ -409 +409 @@
 
     # Users can be in any group to perform this action
-    &authenticate_user($gsdl_cgi, $username, "");
+    my $user_groups = &authenticate_user($gsdl_cgi, $username, "");
 
     my $gsdlhome = $ENV{'GSDLHOME'};
@@ -419 +419 @@
     my $java_classpath = &util::filename_cat($gsdlhome, "bin", "java", "GLIServer.jar");
     my $zip_file_path = &util::filename_cat($collect_directory, $username . "-" . "collection-configurations.zip");
-    my $java_args = "\"$zip_file_path\" \"$collect_directory\"";
+    my $java_args = "\"$zip_file_path\" \"$collect_directory\" \"$username\" \"$user_groups\"";
     my $java_command = "$java -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipCollectionConfigurations $java_args";