Changeset 36096 for main

Timestamp:

2022-03-10T19:01:59+13:00 (2 years ago)

Author:

kjdon

Message:

now allow for getting defaultservlet from gsdl3site.cfg - we may not have localsite and library, so don't assume that. used for remote gli in gs3.

Location:

main/trunk/greenstone2/common-src/cgi-bin

Files:

• gliserver.pl (modified) (13 diffs)
• gsdlCGI.pm (modified) (3 diffs)

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

@@ -112 +112 @@
     return;
     }
-
     if ($cmd eq "get-site-names" && $gsdl_cgi->greenstone_version() == 3) {
     &get_site_names($gsdl_cgi);
     return;
     }
+
+    if ($cmd eq "get-default-servlet-path" && $gsdl_cgi->greenstone_version() == 3) {
+    &get_default_servlet_path($gsdl_cgi);
+    return;
+    }
+
     # I assume this is so we can check handling of a time out
     if ($cmd eq "timeout-test") {
     while (1) { }
     }
- 
+
     # All other commands require a username, for locking and authentication
     my $username = $gsdl_cgi->clean_param("un");
@@ -136 +141 @@
     $gsdl_cgi->delete("ts");
 
+    # these gs3 commands don't need site 
+    if ($gsdl_cgi->greenstone_version() != 2) {     
+    if ($cmd eq "download-web-xml-file") {
+        &download_web_xml_file($gsdl_cgi, $username, $timestamp);
+        return;
+    } 
+    if ($cmd eq "user-validation") {
+        &user_validation($gsdl_cgi, $username, $timestamp);
+        return;
+    }
+    }
+
     my $site; # undefined on declaration, see http://perldoc.perl.org/perlsyn.html
 
@@ -147 +164 @@
     }
 
-
     if ($cmd eq "delete-collection") {
     &delete_collection($gsdl_cgi, $username, $timestamp, $site);
@@ -196 +212 @@
     &file_exists($gsdl_cgi, $site);
     return;
-    }
-    # cmds not in Greenstone 2:
-    if ($gsdl_cgi->greenstone_version() != 2) {     
-    if ($cmd eq "download-web-xml-file") {
-        &download_web_xml_file($gsdl_cgi, $username, $timestamp, $site);
-        return;
-    } 
-    if ($cmd eq "user-validation") {
-        &user_validation($gsdl_cgi, $username, $timestamp, $site);
-        return;
-    }
     }
     
@@ -318 +323 @@
     # this is the only subroutine here that uses library servlet name param
     my $library_servlet_name = $gsdl_cgi->clean_param("servlet");   
+    if (!defined $library_servlet_name) {
+    # try config default
+    $library_servlet_name = $gsdl_cgi->get_default_servlet(); # might be null
+    }
     #if (!defined $library_servlet_name) {
     #$library_servlet_name = "library";
     #}
+
     $gsdl_cgi->delete("servlet");
 
@@ -345 +355 @@
     }
     $gsdl_cgi->checked_chdir($gsdl3home);   
-    my $java_command="\"$java\" -classpath \"$java_classpath\" org.greenstone.gsdl3.util.ServletRealmCheck $java_args 2>&1"; 
+    my $java_command="\"$java\" -classpath \"$java_classpath\" org.greenstone.gsdl3.util.ServletRealmCheck $java_args 2>&1";
+
     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"
+    $gsdl_cgi->generate_error($java_output . "\nJAVA_COMMAND: $java_command\n");
     }
     # TODO check for errors with running the java command
@@ -428 +439 @@
 # This routine, which uses the variable site, won't get called by GS2, 
 sub user_validation{
-    my ($gsdl_cgi, $username, $timestamp, $site) = @_;
+    my ($gsdl_cgi, $username, $timestamp) = @_;
    
     # Users can be in any group to perform this action
-    my $user_err = &authenticate_user($gsdl_cgi, $username, "", $site);
+    my $user_err = &authenticate_user($gsdl_cgi, $username, "");
      if (defined $user_err && $user_err!~ m/ERROR/){
      if ($user_err!~ m/ERROR/){
@@ -844 +855 @@
 sub download_web_xml_file
 {
-    my ($gsdl_cgi, $username, $timestamp, $site) = @_;
-
+    my ($gsdl_cgi, $username, $timestamp) = @_;
+ 
     # Users can be in any group to perform this action
-    my $user_groups = &authenticate_user($gsdl_cgi, $username, "", $site);
-
+    my $user_groups = &authenticate_user($gsdl_cgi, $username, "");
+ 
     # language and region Environment Variable setting on the client side that was used to zip files.
     my $lang_env = $gsdl_cgi->clean_param("lr") || "";
@@ -891 +902 @@
 
     &put_file($gsdl_cgi, $zip_file_path, "application/zip");
-
     unlink("$zip_file_path") unless $debugging_enabled;
 }
@@ -899 +909 @@
 {
     my ($gsdl_cgi, $username, $timestamp, $site) = @_;
-
-    my $script = $gsdl_cgi->clean_param("script");
+      my $script = $gsdl_cgi->clean_param("script");
     if ((!defined $script) || ($script =~ m/^\s*$/)) {
     $gsdl_cgi->generate_error("No script specified.");
     }
     $gsdl_cgi->delete("script");
-
+  
     # Users can be in any group to perform this action
     &authenticate_user($gsdl_cgi, $username, "", $site);
     $gsdl_cgi->delete("ts"); ## two lines from GS3 version, doesn't seem to harm GS2
     $gsdl_cgi->delete("pw"); 
-    
+  
 
     my $perl_args = "";
@@ -972 +981 @@
 sub get_site_names
 {
-    my ($gsdl_cgi, $username, $timestamp, $site) = @_;
+    my ($gsdl_cgi) = @_;
     my $sites_directory = &util::filename_cat($ENV{'GSDL3HOME'}, "sites");
 
@@ -1009 +1018 @@
 }
 
+sub get_default_servlet_path
+{
+    my ($gsdl_cgi) = @_;
+    my $default_servlet = $gsdl_cgi->get_default_servlet();
+    if ($default_servlet !~ /^\//) {
+        $default_servlet = "/".$default_servlet;
+    }
+    print STDOUT "Content-type:text/plain\n\n";
+    print STDOUT "$default_servlet\n";
+}
+
+
 sub move_collection_file
 {
@@ -1306 +1327 @@
         $gsdl_cgi->generate_error("ERROR. Filehandle undefined. No file uploaded (GS3 server).");
     } else {
+            
         while ($bread=read($fh, $buf, 1024)) {
         print FOUT $buf;
         }
     }
+
     }
     close(FOUT);

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

@@ -242 +242 @@
 
 
-
+# Note, this can only be called while we are still in the cgi directory, not after chdir to gsdl.
 sub get_config_info {
     my $self = shift @_;
     my ($infotype, $optional) = @_;
 
-    my $site_filename = $self->{'site_filename'};
-    open (FILEIN, "<$site_filename") 
-    || $self->generate_error("Could not open $site_filename");
-
-    my $config_content = "";
-    while(defined (my $line = <FILEIN>)) {
-    $config_content .= $line;
-    }
-    close(FILEIN);
-
-    my ($loc) = ($config_content =~ m/^$infotype\s+((\".+\")|(\S+))\s*\n/m);
+    if (! defined $self->{'config_file_content'}) {
+    my $site_filename = $self->{'site_filename'};
+    open (FILEIN, "<$site_filename") 
+        || $self->generate_error("Could not open $site_filename, to read $infotype");
+    
+    my $config_content = "";
+    while(defined (my $line = <FILEIN>)) {
+        $config_content .= $line;
+    }
+    close(FILEIN);
+    $self->{'config_file_content'} = $config_content;
+    }
+    
+#    my ($loc) = ($config_content =~ m/^$infotype\s+((\".+\")|(\S+))\s*\n/m);
+     my ($loc) = ($self->{'config_file_content'} =~ m/^$infotype\s+((\".+\")|(\S+))\s*\n/m);
     $loc =~ s/\"//g if defined $loc;
 
     if ((!defined $loc) || ($loc =~ m/^\s*$/)) {
     if((!defined $optional) || (!$optional)) {
-        $self->generate_error("$infotype is not set in $site_filename");
+        $self->generate_error("$infotype is not set in $self->{'site_filename'}");
     }
     }
@@ -400 +404 @@
 }
 
+sub get_default_servlet {
+    my $self = shift @_;
+
+    if (defined $self->{'default_servlet'} ){
+    return $self->{'default_servlet'};
+    }
+
+    my $optional = 1; # allows for absence of the field
+    $self->{'default_servlet'} = $self->get_config_info("defaultservlet", $optional);
+    if (!defined $self->{'default_servlet'}) # there was no config param
+    {
+    $self->{'default_servlet'} = ""; # so we don't need to look it up from the file next time
+    }
+    return $self->{'default_servlet'};
+}
 sub setup_fedora_homes {
     my $self = shift @_;
@@ -517 +536 @@
     } 
     $ENV{'GSDL3HOME'} = $gsdl3home;
+
     }