Changeset 27295 for main/trunk/greenstone2/perllib/cgiactions/baseaction.pm

Timestamp:

2013-05-03T18:25:10+12:00 (11 years ago)

Author:

ak19

Message:

This commit contains bugfixes for authentication within metadata-server.pl and related perl code, and is committed separately before changes in gsajaxapi.js start to make use of it. Another important change is that for adding user comments, a user need not be in the collection's group, so checking the group shouldn't be performed. The bugfixes are to get the authentication to work and are in addition to an earlier commit that corrected the name of the authentication_enable variable in baseaction.pm. The bugfixes are: users.gdb instead of users.db, metadata-server.pl needs to call gsdlCGI's encrypt_password otherwise the password check will fail because it won't match with what's in the db. Also, the calls to authenticate_user had to be through the self variable, since its a method not a function and failed to work correctly otherwise.

File:

• main/trunk/greenstone2/perllib/cgiactions/baseaction.pm (modified) (4 diffs)

main/trunk/greenstone2/perllib/cgiactions/baseaction.pm

@@ -31 +31 @@
 use inexport;
 
-our $authentication_enabled = 0;
+our $authentication_enabled = 0; # debugging flag (can debug without authentication when set to 0)
 our $mail_enabled = 0;
 
@@ -237 +237 @@
     my $gsdlhome = $ENV{'GSDLHOME'};
     my $etc_directory = &util::filename_cat($gsdlhome, "etc");
-    my $users_db_file_path = &util::filename_cat($etc_directory, "users.db");
+    my $users_db_file_path = &util::filename_cat($etc_directory, "users.gdb");
 
     # Use db2txt to get the user accounts information
@@ -246 +246 @@
     }
 
-    # Get the user account information from the users.db database
+    # Get the user account information from the users.gdb database
     my %users_db_data = ();
     foreach my $users_db_entry (split(/-{70}/, $users_db_content)) {
@@ -266 +266 @@
     }
 
+    # The following code which tests whether the user is in the required group 
+    # seems to have been copied over from gliserver.pl.
+    # But for metadata-server.pl, when user comments are added through the set-metadata functions,
+    # the user doesn't need to be a specific collection's editor in order to add comments to that collection.
+    # So we no longer check the user is in the group here.
+
     # Check group
-    my ($user_groups) = ($user_data =~ /\<groups\>(.*)/);
-    if ($collection eq "") {
-    # If we're not editing a collection then the user doesn't need to be in a particular group
-    return $user_groups;  # Authentication successful
-    }
-    foreach my $user_group (split(/\,/, $user_groups)) {
+#    my ($user_groups) = ($user_data =~ /\<groups\>(.*)/);
+#    if ($collection eq "") {
+#   # If we're not editing a collection then the user doesn't need to be in a particular group
+#   return $user_groups;  # Authentication successful
+#    }
+#    foreach my $user_group (split(/\,/, $user_groups)) {
     # Does this user have access to all collections?
-    if ($user_group eq "all-collections-editor") {
-        return $user_groups;  # Authentication successful
-    }
+#   if ($user_group eq "all-collections-editor") {
+#       return $user_groups;  # Authentication successful
+#   }
     # Does this user have access to personal collections, and is this one?
-    if ($user_group eq "personal-collections-editor" && $collection =~ /^$username\-/) {
-        return $user_groups;  # Authentication successful
-    }
+#   if ($user_group eq "personal-collections-editor" && $collection =~ /^$username\-/) {
+#       return $user_groups;  # Authentication successful
+#   }
     # Does this user have access to this collection
-    if ($user_group eq "$collection-collection-editor") {
-        return $user_groups;  # Authentication successful
-    }
-    }
-
-    $gsdl_cgi->generate_error("Authentication failed: user is not in the required group.");
+#   if ($user_group eq "$collection-collection-editor") {
+#       return $user_groups;  # Authentication successful
+#   }
+#    }
+#
+#    $gsdl_cgi->generate_error("Authentication failed: user is not in the required group.");
 }