Author: jleroux
Date: Mon Aug 21 20:46:28 2017
New Revision: 1805677

URL: http://svn.apache.org/viewvc?rev=1805677&view=rev
Log:
Fixed: Ecommerce login/logout don't work properly for trunk and stable 
(OFBIZ-9240)

ecomseo trunk and stable (R16)

    Get to https://demo-trunk.ofbiz.apache.org/ecomseo/ 
        or https://demo-stable.ofbiz.apache.org/ecomseo/
    login => main page logged in
    logout => main page, not logged in
    login => main page logged in
    Use the "Not you" link => 404
    Refresh (F5 key) get you to the main page, not logged in

So it works almost correctly but you need a refresh (F5 key) for the "Not you" 
link, not sure why yet. 
It"s the same locally with OFBIZ-9206 fixed*, w/ or w/o portoffset ecommerce 
trunk and stable (R16)

    Get to https://ofbiz-vm2.apache.org:8443/ecommerce 
        or https://ofbiz-vm2.apache.org:18443/ecommerce
    login => blank page (no 404 in access log)
    Refresh (F5 key) get you to the main page, logged in
    logout => blank page (no 404 in access log)
    Refresh (F5 key) get you to the main page, not logged in
    login => blank page (no 404 in access log)
    Refresh (F5 key) get you to the main page, logged in
    use the "Not you" link => blank page (no 404 in access log)
    Refresh (F5 key) get you to the main page, not logged in

So it works almost correctly but you need a refresh (F5 key) between in the 
3 cases, not sure why yet. 
It's the same locally with OFBIZ-9206 fixed, w/ or w/o portoffset

Rohit:
The sequencing order of ControlFilter and ContextFilter is causing this problem.
I tried to swap the order in case ecommerce but changing the sequence will not 
work because other filters(like ContentUrlFilter, CatalogUrlFilter) depends on 
the context prepared by ContextFilter.

The issue is like when we are doing chaining of request using request-redirect 
than one request attribute(FORWARDED_FROM_SERVLET) set to TRUE from 
ControlServlet. In case of ecommerce ContextFilter run before ControlFilter 
which copies all the attribute from parent request to redirect request and 
when execution reaches the ControlFilter for the redirect request than request 
will fail to hit the servlet due to the code present 
at line 126(ControlFilter.java).

To fix this problem I removed the code which copies all the attribute from 
parent request to redirect request because this thing is already taken care in 
the RequestHandler.

Thanks: Rohit and Jacopo for the analysis and the fix

Modified:
    
ofbiz/branches/release16.11/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ContextFilter.java
    
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ContextFilter.java

Modified: 
ofbiz/branches/release16.11/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ContextFilter.java
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release16.11/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ContextFilter.java?rev=1805677&r1=1805676&r2=1805677&view=diff
==============================================================================
--- 
ofbiz/branches/release16.11/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ContextFilter.java
 (original)
+++ 
ofbiz/branches/release16.11/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ContextFilter.java
 Mon Aug 21 20:46:28 2017
@@ -115,19 +115,6 @@ public class ContextFilter implements Fi
         // set the server root url
         httpRequest.setAttribute("_SERVER_ROOT_URL_", 
UtilHttp.getServerRootUrl(httpRequest));
 
-        // request attributes from redirect call
-        String reqAttrMapHex = (String) 
httpRequest.getSession().getAttribute("_REQ_ATTR_MAP_");
-        if (UtilValidate.isNotEmpty(reqAttrMapHex)) {
-            byte[] reqAttrMapBytes = StringUtil.fromHexString(reqAttrMapHex);
-            Map<String, Object> reqAttrMap = 
checkMap(UtilObject.getObject(reqAttrMapBytes), String.class, Object.class);
-            if (reqAttrMap != null) {
-                for (Map.Entry<String, Object> entry: reqAttrMap.entrySet()) {
-                    httpRequest.setAttribute(entry.getKey(), entry.getValue());
-                }
-            }
-            httpRequest.getSession().removeAttribute("_REQ_ATTR_MAP_");
-        }
-
         if (request.getCharacterEncoding() == null) {
             request.setCharacterEncoding(defaultCharacterEncoding);
         }

Modified: 
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ContextFilter.java
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ContextFilter.java?rev=1805677&r1=1805676&r2=1805677&view=diff
==============================================================================
--- 
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ContextFilter.java
 (original)
+++ 
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ContextFilter.java
 Mon Aug 21 20:46:28 2017
@@ -115,19 +115,6 @@ public class ContextFilter implements Fi
         // set the server root url
         httpRequest.setAttribute("_SERVER_ROOT_URL_", 
UtilHttp.getServerRootUrl(httpRequest));
 
-        // request attributes from redirect call
-        String reqAttrMapHex = (String) 
httpRequest.getSession().getAttribute("_REQ_ATTR_MAP_");
-        if (UtilValidate.isNotEmpty(reqAttrMapHex)) {
-            byte[] reqAttrMapBytes = StringUtil.fromHexString(reqAttrMapHex);
-            Map<String, Object> reqAttrMap = 
checkMap(UtilObject.getObject(reqAttrMapBytes), String.class, Object.class);
-            if (reqAttrMap != null) {
-                for (Map.Entry<String, Object> entry: reqAttrMap.entrySet()) {
-                    httpRequest.setAttribute(entry.getKey(), entry.getValue());
-                }
-            }
-            httpRequest.getSession().removeAttribute("_REQ_ATTR_MAP_");
-        }
-
         if (request.getCharacterEncoding() == null) {
             request.setCharacterEncoding(defaultCharacterEncoding);
         }


Reply via email to