Changeset 34479

Timestamp:

2020-10-19T16:08:30+13:00 (4 years ago)

Author:

davidb

Message:

Change made after testing with Greenstone3 install on atea.space, where it operates proxied through Apache2 https; problem encountered was that the redirect_url would be set to ​http://localhost:8383/greenstone3/library when looking to access a restricted document in a collection. This change brings the two places that call generateLoginPage() manipulate the requestURL/URI the same way

File:

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

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

@@ -1002 +1002 @@
         {
             //The user entered in either the wrong username or the wrong password
-            String redirect_url_string = library_name;
-            if (request.getQueryString() != null) //  && request.getQueryString().length() > 0)
+        
+            HttpSession session = request.getSession();
+            ServletContext context = session.getServletContext();
+            String redirect_url_string = request.getRequestURI().replaceFirst(context.getContextPath() + "/", "");
+
+            if ((request.getQueryString() != null) && (request.getQueryString().length() > 0))
             {
             redirect_url_string += "?" + request.getQueryString().replace("&", "&");
@@ -1107 +1111 @@
             error_message = getTextString("auth.error.incorrect_login", lang);
         }
-        String redirect_url_string = request.getRequestURL().toString();
+        
+        HttpSession session = request.getSession();
+        ServletContext context = session.getServletContext();
+        String redirect_url_string = request.getRequestURI().replaceFirst(context.getContextPath() + "/", "");
+
         if (request.getQueryString() != null && request.getQueryString().length() > 0)
         {
             redirect_url_string += "?" + request.getQueryString().replace("&", "&");
         }
-        
+
         generateLoginPage(redirect_url_string, error_message, userContext, out, baseURL, output);
         return false;