Changeset 28958 for main/trunk/greenstone2

Timestamp:

2014-04-03T17:34:44+13:00 (10 years ago)

Author:

davidb

Message:

Remote Greenstone user authenticaton stopped working, because the code working with the DerbyWrapper had changed, and now gliserver.pl could no longer instantiate another JVM that would access the Derby DB (via the users2DBtxt.java) when wanting to check if a user authenticates. Instead, a new GS3 service has been written, Authentication.remoteAuthentication(). This is called from the authentication-ping system action URL that the new ServletRealmCheck.java pings when it is called by gliserver.pl

File:

• main/trunk/greenstone2/common-src/cgi-bin/gliserver.pl (modified) (7 diffs)

main/trunk/greenstone2/common-src/cgi-bin/gliserver.pl

@@ -196 +196 @@
     }
 
-    my $users_db_content;
     if($gsdl_cgi->greenstone_version() == 2) {
+    my $users_db_content;
     my $etc_directory = &util::filename_cat($ENV{'GSDLHOME'}, "etc");
     my $users_db_file_path = &util::filename_cat($etc_directory, "users.gdb");
@@ -208 +208 @@
     }
     close(USERS_DB);
-    }
-    elsif($gsdl_cgi->greenstone_version() == 3) {
-    my $gsdl3srchome = $ENV{'GSDL3SRCHOME'};
-
-    my $java = $gsdl_cgi->get_java_path();
-    my $java_gsdl3_classpath = &util::filename_cat($gsdl3srchome, "web", "WEB-INF", "lib", "gsdl3.jar");
-    my $java_derby_classpath = &util::filename_cat($gsdl3srchome, "web", "WEB-INF", "lib", "derby.jar");
-    my $java_classpath;
-    my $gsdlos = $ENV{'GSDLOS'};
-    if ($gsdlos !~ m/windows/){
-        $java_classpath = $java_gsdl3_classpath . ":" . $java_derby_classpath;
-    }else{
-        $java_classpath = $java_gsdl3_classpath . ";" . $java_derby_classpath;
-    }
-    my $java_args = &util::filename_cat($gsdl3srchome, "web", "sites", $site, "etc", "usersDB");
-    $gsdl_cgi->checked_chdir($java_args);
-    my $java_command="\"$java\" -classpath \"$java_classpath\" org.greenstone.gsdl3.util.usersDB2txt \"$java_args\" 2>&1";
-    $users_db_content = `$java_command`;
-    }
     
     # Get the user account information from the usersDB database
@@ -232 +213 @@
 
     # a line dividing one user entry from another is made up of 70 hyphens for GS2 (37 hyphens for GS3)
-    my $horizontal_divider = ($gsdl_cgi->greenstone_version() == 2) ? q/-{70}/ : q/-{37}/;
+    my $horizontal_divider = q/-{70}/;
     foreach my $users_db_entry (split($horizontal_divider, $users_db_content)) {    
     if ($users_db_entry =~ m/\n?\[(.+)\]\n/ || $users_db_entry =~ m/\n?USERNAME = ([^\n]*)\n/) { # GS2 and GS3 formats
@@ -246 +227 @@
 
     # Check password
-    my $pwdLine = ($gsdl_cgi->greenstone_version() == 2) ? q/\<password\>(.*)/ : q/\n?PASSWORD = (.*)\n/;
+    my $pwdLine = q/\<password\>(.*)/;
     my ($valid_user_password) = ($user_data =~ m/$pwdLine/);
     if ($user_password ne $valid_user_password) {
@@ -253 +234 @@
 
     # Check group
-    my $groupLine = ($gsdl_cgi->greenstone_version() == 2) ? q/\<groups\>(.*)/ : q/\n?GROUPS = (.*)\n/;
+    my $groupLine = q/\<groups\>(.*)/;
     my ($user_groups) = ($user_data =~ m/$groupLine/);
 
@@ -276 +257 @@
     }
     $gsdl_cgi->generate_error("Authentication failed: user is not in the required group.");
+    }
+    
+    # "GS3\web\WEB-INF\lib\gsdl3.jar;GS3\web\WEB-INF\lib\derby.jar" 
+    # org.greenstone.gsdl3.util.usersDBRealm2txt "GSDL3SRCHOME" username pwd <col> 2>&1
+    elsif($gsdl_cgi->greenstone_version() == 3) {
+        my $gsdl3srchome = $ENV{'GSDL3SRCHOME'};
+
+        my $java = $gsdl_cgi->get_java_path();
+        my $java_gsdl3_classpath = &util::filename_cat($gsdl3srchome, "web", "WEB-INF", "lib", "gsdl3.jar");
+        my $java_derby_classpath = &util::filename_cat($gsdl3srchome, "web", "WEB-INF", "lib", "derby.jar");
+        my $java_classpath;
+        my $gsdlos = $ENV{'GSDLOS'};
+        if ($gsdlos !~ m/windows/){
+            $java_classpath = $java_gsdl3_classpath . ":" . $java_derby_classpath;
+        }else{
+            $java_classpath = $java_gsdl3_classpath . ";" . $java_derby_classpath;
+        }       
+        my $java_args = "\"$gsdl3srchome\" \"$username\" \"$user_password\"";
+        if ($collection ne "") {
+            $java_args += " \"$collection\"";
+        }
+        
+        $gsdl_cgi->checked_chdir($gsdl3srchome);    
+        my $java_command="\"$java\" -classpath \"$java_classpath\" org.greenstone.gsdl3.util.ServletRealmCheck $java_args 2>&1"; # call it ServletRealmCheck
+        my $java_output = `$java_command`;
+        if ($java_output =~ m/^Authentication failed:/) { # $java_output contains the error message
+            $gsdl_cgi->generate_error($java_output); # "\nJAVA_COMMAND: $java_command\n"
+        }
+        else { # success, $java_output is the user_groups list          
+            return $java_output; 
+        }
+    }
 }
 
@@ -898 +911 @@
     foreach $sites_dir(@sites_dir)
     {
-    if (!(($sites_dir eq ".") || ($sites_dir eq "..") || ($sites_dir eq "CVS") || ($sites_dir eq ".DS_Store")))
+    if (!(($sites_dir eq ".") || ($sites_dir eq "..") || ($sites_dir eq "CVS") || ($sites_dir eq ".DS_Store") || ($sites_dir eq "ADDING-A-SITE.txt")))
     {
         my $site_dir_path= &util::filename_cat($sites_directory,$sites_dir);