Changeset 34116

Timestamp:

2020-05-20T14:44:53+12:00 (4 years ago)

Author:

kjdon

Message:

use global.properties, not build.properties. therefore call this with gsdl3home, not gsdl3srchome. get tomcat context from global.properties. still todo - get servlet name from input args, can't assume library.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/ServletRealmCheck.java (modified) (5 diffs)

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 <GS3SRCHOME> <un> <pwd> [colname]
+ * Run as java org.greenstone.gsdl3.util.ServletRealmCheck <GSDL3HOME> <un> <pwd> [colname]
  *
- * GS3\src\java>"C:\Program Files\Java\jdk1.6.0_22\bin\java" 
- *      -classpath "GS3\web\WEB-INF\lib\gsdl3.jar;GS3\web\WEB-INF\lib\derby.jar" 
- *      org.greenstone.gsdl3.util.ServletRealmCheck "GS3" admin <pw> 2>&1
+ * >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
  *
- * Tries URL: http://hostname:8383/greenstone3/library?a=s&sa=authenticated-ping&excerptid=gs_content&un=admin&pw=<pw>[&col=demo] 
+ * Tries URL: http://hostname:port/context/library?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.
@@ -51 +50 @@
  * Result: either prints out an error message ("Authentication failed...") or a positive result, 
  * which is the user's groups. For the admin user example: administrator,all-collections-editor.
+ * If no collection is specified, will print the user groups.
+ * If a collection is specified, will only print user groups if the user has access to the collection.
  *
 */
@@ -58 +59 @@
     
     if (args.length < 3 || args.length > 4){
-        System.out.println("Run with: <GSDL3SRCHOME> <un> <pwd> [collection-name]");        
+        System.out.println("Run with: <GSDL3HOME> <un> <pwd> [collection-name]");       
         System.exit(0);
     }
     
-    String gsdl3srchome = args[0];
+    String gsdl3home = args[0];
     String username = args[1];
     String password = args[2];
@@ -73 +74 @@
     
     
-    // Load the build.properties file, get the GS3 server URL and send authenticated-ping and print the return result
+    // Load the global.properties file, get the GS3 server URL and send authenticated-ping and print the return result
     
     //http://www.mkyong.com/java/java-properties-file-examples/
-    Properties buildProps = new Properties();
+    Properties globalProps = new Properties();
     InputStream input = null;
  
     try {
-        File buildPropsFile = new File(gsdl3srchome, "build.properties");
-        input = new FileInputStream(buildPropsFile);
+        File globalPropsFile = new File(gsdl3home, "WEB-INF" +File.separatorChar+ "classes"+ File.separatorChar+"global.properties");
+        input = new FileInputStream(globalPropsFile);
  
         // load a properties file
-        buildProps.load(input);
+        globalProps.load(input);
  
         // get the property value and print it out
-        String servername = buildProps.getProperty("tomcat.server");
-        ProtocolPortProperties protocolPortProps = new ProtocolPortProperties(buildProps); // can throw Exception
+        String servername = globalProps.getProperty("tomcat.server");
+        ProtocolPortProperties protocolPortProps = new ProtocolPortProperties(globalProps); // can throw Exception
         String protocol = protocolPortProps.getProtocol();
         String port = protocolPortProps.getPort();
         int portNum = Integer.parseInt(port);
         
+        String context = globalProps.getProperty("tomcat.context");
         // Appending &excerptid=gs_content will get just the <div ... id="gs_content"/> from the final web page:
-        String urlSuffix = "/greenstone3/library?a=s&sa=authenticated-ping&excerptid=gs_content&un="+username+"&pw="+password;
+        // TODO dynamically get library name
+        String urlSuffix = "/"+context+"/library?a=s&sa=authenticated-ping&excerptid=gs_content&un="+username+"&pw="+password;
         if(collection != null) {
             urlSuffix = urlSuffix + "&col="+collection;
@@ -122 +125 @@
         
         // Now we finally have what we actually want to print out for the caller to use
-        System.out.print(result); // don't add newline to end
+        System.out.print(result + ","); // don't add newline to end
         
     } catch (Exception ex) {
-        System.err.println("Got exception " + ex.getMessage());
-        ex.printStackTrace();
+        System.err.println("Authentication failed: Java error: " + ex.getMessage());
+        ex.printStackTrace();
     } finally {
         if (input != null) {