Changeset 26206 for main

Timestamp:

2012-09-18T18:10:37+12:00 (12 years ago)

Author:

ak19

Message:

Fixes to get Remote Greenstone 3 working with client-gli: 1. client-GLI should not start the local GS3 server, since client-GLI will be running against a remote server. 2. The encryption process for authentication had been changed for GS3, so now Authentication.java has a main function which is invoked by gliserver's gsdlCGI.pm to encrypt the password. 4. UsersDB when converted to txt for parsing by gliserver.pl has a different structure, so gliserver.pl needs to take that into account. 5. util.pm's functions for prepending and appending to environment variables needs to use an OS dependant path separator. This was not noticed when testing the remote GS server on 32 bit linux so far, but the windows style path separator (semicolon) used so far didn't work on the 64 bit linux test machine.

Location:

main/trunk

Files:

• gli/src/org/greenstone/gatherer/Gatherer.java (modified) (1 diff)
• greenstone2/common-src/cgi-bin/gliserver.pl (modified) (3 diffs)
• greenstone2/common-src/cgi-bin/gsdlCGI.pm (modified) (4 diffs)
• greenstone2/perllib/util.pm (modified) (4 diffs)
• greenstone3/src/java/org/greenstone/gsdl3/service/Authentication.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -372 +372 @@
                     isLocalLibrary = LocalLibraryServer.start(gsdl_path, local_library_path);
                 }
-                else {
+                else if (!isGsdlRemote) { // local GS3, start the local tomcat
                     GS3ServerThread thread = new GS3ServerThread(gsdl3_src_path, "restart");
                     thread.start();

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

@@ -230 +230 @@
     # Get the user account information from the usersDB database
     my %users_db_data = ();
-    foreach my $users_db_entry (split(/-{70}/, $users_db_content)) {
-    if ($users_db_entry =~ m/\n?\[(.+)\]\n/) {
+
+    # 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}/;
+    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
         $users_db_data{$1} = $users_db_entry;
     }
@@ -243 +246 @@
 
     # Check password
-    my ($valid_user_password) = ($user_data =~ m/\<password\>(.*)/);
+    my $pwdLine = ($gsdl_cgi->greenstone_version() == 2) ? q/\<password\>(.*)/ : q/\n?PASSWORD = (.*)\n/;
+    my ($valid_user_password) = ($user_data =~ m/$pwdLine/);
     if ($user_password ne $valid_user_password) {
     $gsdl_cgi->generate_error("Authentication failed: incorrect password.");
@@ -249 +253 @@
 
     # Check group
-    my ($user_groups) = ($user_data =~ m/\<groups\>(.*)/);
+    my $groupLine = ($gsdl_cgi->greenstone_version() == 2) ? q/\<groups\>(.*)/ : q/\n?GROUPS = (.*)\n/;
+    my ($user_groups) = ($user_data =~ m/$groupLine/);
 
     if ($collection eq "") {

main/trunk/greenstone2/common-src/cgi-bin/gsdlCGI.pm

@@ -517 +517 @@
     } 
     $ENV{'GSDL3HOME'} = $gsdl3home;
-    } 
-   
+    }
     
     my $gsdl_bin_script = &util::filename_cat($gsdlhome,"bin","script");
@@ -751 +750 @@
 }
 
+# used with old GS3 authentication
 sub rot13()
 {
@@ -775 +775 @@
 }
 
+# used along with new GS3 authentication
+sub hash_pwd()
+{
+    my $self = shift @_;
+    my ($password)=@_;
+
+    my $gsdl3srchome = $ENV{'GSDL3SRCHOME'};
+    
+    my $java = get_java_path();
+    my $java_gsdl3_classpath = &util::filename_cat($gsdl3srchome, "web", "WEB-INF", "lib", "gsdl3.jar");
+    my $java_remaining_classpath = &util::filename_cat($gsdl3srchome, "web", "WEB-INF", "lib", "*"); # log4j etc
+    my $java_classpath;
+    my $gsdlos = $ENV{'GSDLOS'};
+    if ($gsdlos !~ m/windows/){
+    $java_classpath = $java_gsdl3_classpath . ":" . $java_remaining_classpath;
+    }else{
+    $java_classpath = $java_gsdl3_classpath . ";" . $java_remaining_classpath;
+    }
+    
+    my $java_command="\"$java\" -classpath \"$java_classpath\" org.greenstone.gsdl3.service.Authentication \"$password\""; # 2>&1";
+    my $hashedpwd = `$java_command`;
+
+    return $hashedpwd;
+}
+
 sub encrypt_password
 {
@@ -781 +806 @@
     if (defined $self->param("pw")) { ##
     if ($self->{'greenstone_version'} == 3) { # GS3 is in Java, so needs different encryption
-        $self->param('-name' => "pw", '-value' => $self->rot13($self->clean_param("pw")));
+        #$self->param('-name' => "pw", '-value' => $self->rot13($self->clean_param("pw"))); ## when using old GS3 authentication
+
+        my $hashedPwd = $self->hash_pwd($self->clean_param("pw")); # for GS3's new Authentication
+        $self->param('-name' => "pw", '-value' => $hashedPwd);
     }
     else { # GS2 (and versions of GS other than 3?)

main/trunk/greenstone2/perllib/util.pm

@@ -1017 +1017 @@
     return $OID;
 }
+
 sub envvar_prepend {
     my ($var,$val) = @_;
+
+    # 64 bit linux can't handle ";" as path separator, so make sure to set this to the right one for the OS
+    my $pathsep = (defined $ENV{'GSDLOS'} && $ENV{'GSDLOS'} !~ m/windows/) ? ":" : ";";
 
     # do not prepend any value/path that's already in the environment variable
@@ -1027 +1031 @@
     }
     elsif($ENV{$var} !~ m/$escaped_val/) { 
-    $ENV{$var} = "$val;".$ENV{$var};
+    $ENV{$var} = "$val".$pathsep.$ENV{$var};
     }
 }
@@ -1033 +1037 @@
 sub envvar_append {
     my ($var,$val) = @_;
+
+    # 64 bit linux can't handle ";" as path separator, so make sure to set this to the right one for the OS
+    my $pathsep = (defined $ENV{'GSDLOS'} && $ENV{'GSDLOS'} !~ m/windows/) ? ":" : ";";
     
     # do not append any value/path that's already in the environment variable
-    
+
     my $escaped_val = &filename_to_regex($val); # escape any backslashes and brackets for upcoming regex
     if (!defined($ENV{$var})) {
@@ -1041 +1048 @@
     }
     elsif($ENV{$var} !~ m/$escaped_val/) { 
-    $ENV{$var} .= ";$val";
+    $ENV{$var} = $ENV{$var}.$pathsep."$val";
     }
 }

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/Authentication.java

@@ -1037 +1037 @@
         return collect_list_node;
     }
+
+    // main() method - calls hashPassword() on any String argument, printing this to stdout
+    // This main() is invoked by gliserver.pl perl code to encrypt passwords identically to Java code.
+    public static void main(String[] args) {
+    if(args.length < 1) {
+        System.err.println("Usage: Authentication <string to encrypt>");
+        System.exit(-1);
+    }
+    // just hash the first argument
+    String hash = Authentication.hashPassword(args[0]);
+    System.out.println(hash);
+    }
 }