Changeset 38256 for main

Timestamp:

2023-09-29T20:52:00+13:00 (9 months ago)

Author:

anupama

Message:

Untested. Committing changes for bypassing webswing authentication when already logged in to greenstone.

Location:

main/trunk

Files:

• gli/src/org/greenstone/gatherer/Gatherer.java (modified) (7 diffs)
• gli/src/org/greenstone/gatherer/GetOpt.java (modified) (2 diffs)
• gli/src/org/greenstone/gatherer/util/StaticStrings.java (modified) (1 diff)
• greenstone3/web/interfaces/default/js/javascript-global-functions.js (modified) (1 diff)
• greenstone3/web/interfaces/default/transform/javascript-global-setup.xsl (modified) (2 diffs)
• greenstone3/web/interfaces/default/transform/pages/webswing-gli.xsl (modified) (1 diff)

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

@@ -252 +252 @@
             Configuration.template_config_xml = Configuration.TEMPLATE_CONFIG_PREFIX +  Configuration.CONFIG_WEBSWING_XML; 
             Configuration.config_xml = Configuration.CONFIG_WEBSWING_XML;
+
+            
+            if(go.userJSessionID != null) {
+            webswingAuthenticator = new WebswingAuthenticator(go.username, go.usergroups, go.userJSessionID);
+            }
         }
         else {      
@@ -291 +296 @@
         }
         // we need to authenticate the user
-        webswingAuthenticator = new WebswingAuthenticator();
+        //if(webswingAuthenticator == null || webswingAuthenticator.getUserName() == null) {
+        if(webswingAuthenticator == null) {
+            webswingAuthenticator = new WebswingAuthenticator();
+        }
         if (!webswingAuthenticator.authenticate(library_url_string)) {
             System.err.println("Authentication error, quitting GLI");
             System.exit(0);
         }
-
+        
         String username = webswingAuthenticator.getUsername();
 
@@ -2115 +2123 @@
         static protected String username;
         static protected HashSet<String> groups;
+        static protected String userJSessionID;
+        static protected String rawgroups;
 
         protected void displayError(String error_message) {
@@ -2124 +2134 @@
         }
 
+        public WebswingAuthenticator() {}
+
+        public WebswingAuthenticator(String username, String usergroups, String sessionID) {
+        this.username = username;
+        this.rawgroups = usergroups;
+        this.userJSessionID = sessionID;
+        }
+
         public String getUsername() {
         return username;
@@ -2130 +2148 @@
 
         public boolean authenticate(String library_url_string) {
+          if(username == null) {
         PasswordAuthentication pa = getPasswordAuthentication();
         if (pa == null) {
@@ -2171 +2190 @@
             return false;
         }
+          } else {
+          result = rawgroups;
+          }
         groups = new HashSet<String>();
         String[] contents = result.split(",");
@@ -2182 +2204 @@
             System.err.println("User not in any collection editing groups");
             displayError(Dictionary.get("WebswingAuthenticationError.NoPermissions"));
-            return false; // user has no editing priveleges
+            return false; // user has no editing privileges
         }
         return true;

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

@@ -59 +59 @@
 
     protected FedoraInfo fedora_info = null;
+
+    public String userJSessionID = null;
+    public String username = null;
+    public String usergroups = null;
     
     public GetOpt(String[] args)
@@ -224 +228 @@
             no_load = false;
             }
+            // If logged in userdata specified: -username <user> -groups <grps> -uid JSESSIONID
+            else if(argument_name.equals(StaticStrings.USERNAME_ARGUMENT)) {
+            username = argument_value;
+            }
+            else if(argument_name.equals(StaticStrings.USERGROUPS_ARGUMENT)) {
+            usergroups = argument_value;
+            }
+            else if(argument_name.equals(StaticStrings.USERID_ARGUMENT)) {
+            userJSessionID = argument_value;
+            }
             // Parse the file path of the local library server
             else if (argument_name.equals(StaticStrings.LOCAL_LIBRARY_ARGUMENT)) {

main/trunk/gli/src/org/greenstone/gatherer/util/StaticStrings.java

@@ -288 +288 @@
     static final public String USE_METADATA_FILES_ARGUMENT = "use_metadata_files";
     static final public String USE_REMOTE_GREENSTONE_ARGUMENT = "-use_remote_greenstone";
-    static final public String WEBSWING_ARGUMENT = "-webswing";
+    static final public String USERNAME_ARGUMENT = "-username";
+    static final public String USERGROUPS_ARGUMENT = "-groups";
+    static final public String USERID_ARGUMENT = "-uid";
+    static final public String WEBSWING_ARGUMENT = "-webswing";    
     static final public String URL_SEPARATOR_CHARACTER = "/";
     static final public String VALUE_ATTRIBUTE = "value";

main/trunk/greenstone3/web/interfaces/default/js/javascript-global-functions.js

@@ -616 +616 @@
 }
 
+
+gs.funcions.getLoggedInUser = function()
+{
+    var baseURL = gs.xsltParams.library_name + "?a=g&rt=r&ro=1&s=CurrentUser&";
+}
+
 // Prepare the payload (data package) to transmit to metadataserver.pl over AJAX.
 // These next 2 functions prepare both the URL version of the payload and the data object version 

main/trunk/greenstone3/web/interfaces/default/transform/javascript-global-setup.xsl

@@ -161 +161 @@
             </script>
         </xsl:if>
+        <!-- check if we have a JSessionID and fill in any user details we haven't captured in JS vars yet as well as JSessionID -->
+        <xsl:if test="/page/pageRequest/userContext/@uid">
+          <script type="text/javascript">
+            <xsl:text disable-output-escaping="yes">
+              if (typeof gs.userInformation === "undefined") {
+                gs.userInformation={};
+            gs.userInformation.username = "</xsl:text><xsl:value-of select="/page/pageRequest/userContext/@username"/><xsl:text disable-output-escaping="yes">";
+            gs.userInformation.groups = "</xsl:text><xsl:value-of select="/page/pageRequest/userContext/@groups"/><xsl:text disable-output-escaping="yes">";
+              }
+              gs.userInformation.uid = "</xsl:text><xsl:value-of select="/page/pageRequest/userContext/@uid"/><xsl:text disable-output-escaping="yes">";              
+            </xsl:text>
+          </script>
+        </xsl:if>
     </xsl:template>
     
@@ -167 +180 @@
         <script type="text/javascript" src="interfaces/{$interface_name}/js/GSMetadata.js"><xsl:text> </xsl:text></script>
         <script type="text/javascript" src="interfaces/{$interface_name}/js/utility_scripts.js"><xsl:text> </xsl:text></script>
-
     </xsl:template>
 </xsl:stylesheet>

main/trunk/greenstone3/web/interfaces/default/transform/pages/webswing-gli.xsl

@@ -132 +132 @@
        webswingInstance0.options.args = "-load " + gs.cgiParams.c + "/gli.col";
        }
+       if(gs.userInformation.uid) {
+         webswingInstance0.options.args = " -username " + gs.userInformation.username;
+         webswingInstance0.options.args = " -groups " + gs.userInformation.groups.replace(/\s/g, '');
+         webswingInstance0.options.args = " -uid " + gs.userInformation.uid;
+       }
     function getParam(name) {
         name = name.replace(/[\[]/, "\\\[").replace(/[\]]/, "\\\]");