svn commit: r1851200 - in /ofbiz/ofbiz-framework/trunk/framework: base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java

[jleroux]

Author: jleroux
Date: Sun Jan 13 13:31:13 2019
New Revision: 1851200

URL: http://svn.apache.org/viewvc?rev=1851200&view=rev
Log:
Reverted: Impossible secure and autologin cookie names when mountpoint contains 
a slash inside its name
(OFBIZ-10766)

In my previous commit I reverted the initial change. As I said in the Jira
I had a second look and it's better to fix the problem at the root as I did 
initially. 

I wrote in my previous commit: "This method is used in other places where the 
name should not be changed." I checked there are no issues changing slashes to
underscores in the cookies names anywhere.

Modified:
    
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
    
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java

Modified: 
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java?rev=1851200&r1=1851199&r2=1851200&view=diff
==============================================================================
--- 
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
 (original)
+++ 
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
 Sun Jan 13 13:31:13 2019
@@ -668,7 +668,7 @@ public final class UtilHttp {
         if (request.getContextPath().length() > 1) {
             appName = request.getContextPath().substring(1);
         }
-        return appName;
+        return appName.replaceAll("/","_");
     }
 
     public static void setInitialRequestInfo(HttpServletRequest request) {

Modified: 
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java?rev=1851200&r1=1851199&r2=1851200&view=diff
==============================================================================
--- 
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
 (original)
+++ 
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
 Sun Jan 13 13:31:13 2019
@@ -932,7 +932,7 @@ public class LoginWorker {
             Cookie autoLoginCookie = new 
Cookie(getAutoLoginCookieName(request), userLogin.getString("userLoginId"));
             autoLoginCookie.setMaxAge(60 * 60 * 24 * 365);
             
autoLoginCookie.setDomain(EntityUtilProperties.getPropertyValue("url", 
"cookie.domain", delegator));
-            autoLoginCookie.setPath("/" + applicationName.replaceAll("/","_"));
+            autoLoginCookie.setPath("/" + applicationName);
             autoLoginCookie.setSecure(true);
             autoLoginCookie.setHttpOnly(true);
             response.addCookie(autoLoginCookie);
@@ -952,7 +952,7 @@ public class LoginWorker {
             Cookie securedLoginIdCookie = new 
Cookie(getSecuredLoginIdCookieName(request), 
userLogin.getString("userLoginId"));
             securedLoginIdCookie.setMaxAge(-1);
             
securedLoginIdCookie.setDomain(EntityUtilProperties.getPropertyValue("url", 
"cookie.domain", delegator));
-            securedLoginIdCookie.setPath("/" + 
UtilHttp.getApplicationName(request).replaceAll("/","_"));
+            securedLoginIdCookie.setPath("/" + 
UtilHttp.getApplicationName(request));
             securedLoginIdCookie.setSecure(true);
             securedLoginIdCookie.setHttpOnly(true);
             response.addCookie(securedLoginIdCookie);