Changeset 34160

Timestamp:

2020-06-13T06:50:06+12:00 (4 years ago)

Author:

ak19

Message:

Completing TODO from Kathy's commit message for 34116 for ServletRealmCheck: still todo - get servlet name from input args, can't assume library.

Location:

main/trunk

Files:

• gli/src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (1 diff)
• gli/src/org/greenstone/gatherer/remote/RemoteGreenstoneServer.java (modified) (1 diff)
• greenstone2/common-src/cgi-bin/gliserver.pl (modified) (2 diffs)
• greenstone3/src/java/org/greenstone/gsdl3/util/ServletRealmCheck.java (modified) (4 diffs)

main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -237 +237 @@
         command_parts_list.add("-library_name");
         String library_servlet_name = Configuration.servlet_path;
-        if(library_servlet_name.startsWith("/")) {
+        if(library_servlet_name.charAt(0) == '/') {
         library_servlet_name = library_servlet_name.substring(1);
         }

main/trunk/gli/src/org/greenstone/gatherer/remote/RemoteGreenstoneServer.java

@@ -605 +605 @@
     if (Gatherer.GS3){
         cgi_args += "&site=" + Configuration.site_name;
+        String library_servlet_name = Configuration.servlet_path;
+        if (library_servlet_name.charAt(0) == '/') {
+        library_servlet_name = library_servlet_name.substring(1);
+        }
+        cgi_args += "&servlet=" + library_servlet_name;
     }
 

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

@@ -315 +315 @@
     my $user_password = shift(@_);
     my $collection = shift(@_);
-    
+
+    # 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) {
+    #$library_servlet_name = "library";
+    #}
+    $gsdl_cgi->delete("servlet");
+
+        
     my $gsdl3home = $ENV{'GSDL3HOME'};
     my $java = $gsdl_cgi->get_java_path();
@@ -331 +339 @@
     my $java_args = "\"$gsdl3home\" \"$username\" \"$user_password\"";
     if ($collection ne "") {
-    $java_args .= " \"$collection\"";
-    }
-    
+    $java_args .= " -c \"$collection\"";
+    }
+    if (defined $library_servlet_name && $library_servlet_name !~ m/^\s*$/) {
+    $java_args .= " -s \"$library_servlet_name\"";
+    }
     $gsdl_cgi->checked_chdir($gsdl3home);   
     my $java_command="\"$java\" -classpath \"$java_classpath\" org.greenstone.gsdl3.util.ServletRealmCheck $java_args 2>&1"; 

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/ServletRealmCheck.java

@@ -39 +39 @@
  * to see if any of these allow the user to edit that collection.
  *
- * Run as java org.greenstone.gsdl3.util.ServletRealmCheck <GSDL3HOME> <un> <pwd> [colname]
+ * Run as java org.greenstone.gsdl3.util.ServletRealmCheck <GSDL3HOME> <un> <pwd> [-c colname] [-s servletname]
  *
  * >java -classpath "greenstone3\web\WEB-INF\lib\gsdl3.jar;greenstone3\web\WEB-INF\lib\gutil.jar" 
- *      org.greenstone.gsdl3.util.ServletRealmCheck "greenstone3\web" <un> <pw> [colname] 2>&1
+ *      org.greenstone.gsdl3.util.ServletRealmCheck "greenstone3\web" <un> <pw> [-c colname] [-s servlet-name] 2>&1
  *
- * Tries URL: http://hostname:port/context/library?a=s&sa=authenticated-ping&excerptid=gs_content&un=<un>&pw=<pw>[&col=colname] 
+ * Tries URL: http://hostname:port/context/servletname?a=s&sa=authenticated-ping&excerptid=gs_content&un=<un>&pw=<pw>[&col=colname] 
  * The &excerptid=gs_content in the URL will return just the <div id="gs_content" /> part of the 
  * page that we're interested in.
@@ -53 +53 @@
  * If a collection is specified, will only print user groups if the user has access to the collection.
  *
+ * -s <servletname> to specify a specific servlet-name if different from default of "library".
+ * This is probaly only meaningful if there is no library called "library" as all servlet-names
+ * I think would respond identically to the ping regarding the groups a user belongs to.
 */
 public class ServletRealmCheck
-{   
+{
+    private static void printUsageAndTerminate() {
+    System.out.println("Run with: <GSDL3HOME> <un> <pwd> [-c collection-name] [-s servlet-name]");
+    System.exit(0);
+    }
+    
     public static void main(String[] args) {
     
-    if (args.length < 3 || args.length > 4){
-        System.out.println("Run with: <GSDL3HOME> <un> <pwd> [collection-name]");       
-        System.exit(0);
+    if (args.length < 3 || args.length > 7){        
+        printUsageAndTerminate();
+    } else if(args.length % 2 == 0) { // for all args past the 3rd arg, need odd number of args:
+        // first 3 args + (2 args for each -flag-option value combination) = odd number of args
+        printUsageAndTerminate();
     }
     
@@ -66 +76 @@
     String username = args[1];
     String password = args[2];
-    String collection = (args.length > 3) ? args[3] : null;     
+    //String collection = (args.length > 3) ? args[3] : null;
+    String collection = null;   
+    String libservletname = "library"; // fallback to default library servlet
+    
+    for(int i = 3; i < args.length; i++) {      
+        if(args[i].equals("-c")) {
+        collection = args[++i];
+        }
+        else if(args[i].equals("-s")) {
+        libservletname = args[++i];
+        }
+    }
+
     
     //System.err.println("gsdl3srchome: " + gsdl3srchome);
@@ -96 +118 @@
         String context = globalProps.getProperty("tomcat.context");
         // Appending &excerptid=gs_content will get just the <div ... id="gs_content"/> from the final web page:
-        // TODO dynamically get library name
-        String urlSuffix = "/"+context+"/library?a=s&sa=authenticated-ping&excerptid=gs_content&un="+username+"&pw="+password;
+        String urlSuffix = "/"+context+"/"+libservletname+"?a=s&sa=authenticated-ping&excerptid=gs_content&un="+username+"&pw="+password;
         if(collection != null) {
             urlSuffix = urlSuffix + "&col="+collection;