Changeset 34086

Timestamp:

2020-03-15T17:47:35+13:00 (4 years ago)

Author:

davidb

Message:

Refactoring code to have generateRedirect method needed some additional work to correctly handle setting RedirectURL in both cases where the method is called

File:

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

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java

@@ -465 +465 @@
     {
     baseURL = requestedURL.substring(0, requestedURL.indexOf(library_name));
+    
+    int protocol_boundary_pos = baseURL.indexOf("://");
+    if (protocol_boundary_pos>=1) {
+        baseURL = baseURL.substring(protocol_boundary_pos+1); // change things like http:// or https:// to //
+    }
+        
     }
     String fullURL;
@@ -917 +923 @@
     }
     
-    private void generateLoginPage(String query_string, String error_message, UserContext userContext, PrintWriter out, String baseURL, String output) {
+    private void generateLoginPage(String redirect_url_string, String error_message, UserContext userContext, PrintWriter out, String baseURL, String output) {
     
     Document loginPageDoc = XMLConverter.newDOM();
@@ -939 +945 @@
     Element urlParam = loginPageDoc.createElement(GSXML.PARAM_ELEM);
     urlParam.setAttribute(GSXML.NAME_ATT, REDIRECT_URL_PARAM);
-    urlParam.setAttribute(GSXML.VALUE_ATT, library_name + query_string);
+
+    if (redirect_url_string.matches("^[a-z]+://.*$")) {
+        int protocol_boundary_pos = redirect_url_string.indexOf("://");
+        redirect_url_string = redirect_url_string.substring(protocol_boundary_pos+1); // change things like http:// or https:// to //
+    }
+
+    urlParam.setAttribute(GSXML.VALUE_ATT, redirect_url_string);
     paramList.appendChild(urlParam);
     
     Node loginPageResponse = this.recept.process(loginPageMessage);
-    out.println(XMLConverter.getPrettyString(loginPageResponse));
-    
+    out.println(XMLConverter.getPrettyString(loginPageResponse));   
     }
     
@@ -991 +1002 @@
         {
             //The user entered in either the wrong username or the wrong password
-            String query_string = "";
-            if (request.getQueryString() != null)
+            String redirect_url_string = library_name;
+            if (request.getQueryString() != null) //  && request.getQueryString().length() > 0)
             {
-            query_string = "?" + request.getQueryString().replace("&", "&");
+            redirect_url_string += "?" + request.getQueryString().replace("&", "&");
             }
-        
-            generateLoginPage(query_string, getTextString("auth.error.un_or_pw_err", lang), userContext, out, baseURL, output);
+
+            generateLoginPage(redirect_url_string, getTextString("auth.error.un_or_pw_err", lang), userContext, out, baseURL, output);
             return false;
         }
@@ -1096 +1107 @@
             error_message = getTextString("auth.error.incorrect_login", lang);
         }
-        String query_string = "";
+        String redirect_url_string = request.getRequestURL().toString();
         if (request.getQueryString() != null && request.getQueryString().length() > 0)
         {
-            query_string = request.getRequestURL() + "?" + request.getQueryString().replace("&", "&");
+            redirect_url_string += "?" + request.getQueryString().replace("&", "&");
         }
-        else
-        {
-            query_string = request.getRequestURL().toString();
-        }
-        generateLoginPage(query_string, error_message, userContext, out, baseURL, output);
+        
+        generateLoginPage(redirect_url_string, error_message, userContext, out, baseURL, output);
         return false;
         }