You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2019/01/11 16:13:10 UTC
svn commit: r1851070 - in /ofbiz/ofbiz-framework/branches/release18.12: ./
applications/accounting/webapp/accounting/WEB-INF/
applications/accounting/webapp/ap/WEB-INF/
applications/accounting/webapp/ar/WEB-INF/
applications/commonext/webapp/ofbizsetup...
Author: jleroux
Date: Fri Jan 11 16:13:09 2019
New Revision: 1851070
URL: http://svn.apache.org/viewvc?rev=1851070&view=rev
Log:
"Applied fix from trunk for revision: 1851068 "
------------------------------------------------------------------------
r1851068 | jleroux | 2019-01-11 17:12:01 +0100 (ven. 11 janv. 2019) | 12 lignes
Fixed: Add session tracking mode and make cookie secure
(OFBIZ-6655)
Following "Session timeout for webapps" discussion on dev ML
https://markmail.org/message/p6fbiojjrwb2ybxd
We decided to put back the session-timeout value in web.xml files and to remove
the line
session.setMaxInactiveInterval(60*60); //in seconds
from ControlEventListener.java
Thanks: Deepak Nigam for report and Girish Vasmatkar for discussion
------------------------------------------------------------------------
Modified:
ofbiz/ofbiz-framework/branches/release18.12/ (props changed)
ofbiz/ofbiz-framework/branches/release18.12/applications/accounting/webapp/accounting/WEB-INF/web.xml
ofbiz/ofbiz-framework/branches/release18.12/applications/accounting/webapp/ap/WEB-INF/web.xml
ofbiz/ofbiz-framework/branches/release18.12/applications/accounting/webapp/ar/WEB-INF/web.xml
ofbiz/ofbiz-framework/branches/release18.12/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml
ofbiz/ofbiz-framework/branches/release18.12/applications/content/webapp/content/WEB-INF/web.xml
ofbiz/ofbiz-framework/branches/release18.12/applications/humanres/webapp/humanres/WEB-INF/web.xml
ofbiz/ofbiz-framework/branches/release18.12/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml
ofbiz/ofbiz-framework/branches/release18.12/applications/marketing/webapp/sfa/WEB-INF/web.xml
ofbiz/ofbiz-framework/branches/release18.12/applications/order/webapp/ordermgr/WEB-INF/web.xml
ofbiz/ofbiz-framework/branches/release18.12/applications/product/webapp/catalog/WEB-INF/web.xml
ofbiz/ofbiz-framework/branches/release18.12/applications/product/webapp/facility/WEB-INF/web.xml
ofbiz/ofbiz-framework/branches/release18.12/applications/workeffort/webapp/ical/WEB-INF/web.xml
ofbiz/ofbiz-framework/branches/release18.12/applications/workeffort/webapp/workeffort/WEB-INF/web.xml
ofbiz/ofbiz-framework/branches/release18.12/framework/resources/templates/web.xml
ofbiz/ofbiz-framework/branches/release18.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java
ofbiz/ofbiz-framework/branches/release18.12/framework/webtools/webapp/webtools/WEB-INF/web.xml
Propchange: ofbiz/ofbiz-framework/branches/release18.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 11 16:13:09 2019
@@ -10,4 +10,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850918,1850921,1850948,1850953,1851006,1851013
+/ofbiz/ofbiz-framework/trunk:1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850918,1850921,1850948,1850953,1851006,1851013,1851068
Modified: ofbiz/ofbiz-framework/branches/release18.12/applications/accounting/webapp/accounting/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/accounting/webapp/accounting/WEB-INF/web.xml?rev=1851070&r1=1851069&r2=1851070&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/applications/accounting/webapp/accounting/WEB-INF/web.xml (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/applications/accounting/webapp/accounting/WEB-INF/web.xml Fri Jan 11 16:13:09 2019
@@ -88,6 +88,9 @@ under the License.
<url-pattern>/control/*</url-pattern>
</servlet-mapping>
+ <session-config>
+ <session-timeout>60</session-timeout><!-- in minutes -->
+ </session-config>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
Modified: ofbiz/ofbiz-framework/branches/release18.12/applications/accounting/webapp/ap/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/accounting/webapp/ap/WEB-INF/web.xml?rev=1851070&r1=1851069&r2=1851070&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/applications/accounting/webapp/ap/WEB-INF/web.xml (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/applications/accounting/webapp/ap/WEB-INF/web.xml Fri Jan 11 16:13:09 2019
@@ -81,6 +81,11 @@ under the License.
<servlet-name>ControlServlet</servlet-name>
<url-pattern>/control/*</url-pattern>
</servlet-mapping>
+
+ <session-config>
+ <session-timeout>60</session-timeout><!-- in minutes -->
+ </session-config>
+
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
<welcome-file>index.html</welcome-file>
Modified: ofbiz/ofbiz-framework/branches/release18.12/applications/accounting/webapp/ar/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/accounting/webapp/ar/WEB-INF/web.xml?rev=1851070&r1=1851069&r2=1851070&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/applications/accounting/webapp/ar/WEB-INF/web.xml (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/applications/accounting/webapp/ar/WEB-INF/web.xml Fri Jan 11 16:13:09 2019
@@ -88,6 +88,9 @@ under the License.
<url-pattern>/control/*</url-pattern>
</servlet-mapping>
+ <session-config>
+ <session-timeout>60</session-timeout><!-- in minutes -->
+ </session-config>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
Modified: ofbiz/ofbiz-framework/branches/release18.12/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml?rev=1851070&r1=1851069&r2=1851070&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml Fri Jan 11 16:13:09 2019
@@ -80,8 +80,11 @@
<servlet-name>ControlServlet</servlet-name>
<url-pattern>/control/*</url-pattern>
</servlet-mapping>
-
-
+
+ <session-config>
+ <session-timeout>60</session-timeout><!-- in minutes -->
+ </session-config>
+
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
</welcome-file-list>
Modified: ofbiz/ofbiz-framework/branches/release18.12/applications/content/webapp/content/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/content/webapp/content/WEB-INF/web.xml?rev=1851070&r1=1851069&r2=1851070&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/applications/content/webapp/content/WEB-INF/web.xml (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/applications/content/webapp/content/WEB-INF/web.xml Fri Jan 11 16:13:09 2019
@@ -88,6 +88,9 @@ under the License.
<url-pattern>/control/*</url-pattern>
</servlet-mapping>
+ <session-config>
+ <session-timeout>60</session-timeout><!-- in minutes -->
+ </session-config>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
Modified: ofbiz/ofbiz-framework/branches/release18.12/applications/humanres/webapp/humanres/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/humanres/webapp/humanres/WEB-INF/web.xml?rev=1851070&r1=1851069&r2=1851070&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/applications/humanres/webapp/humanres/WEB-INF/web.xml (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/applications/humanres/webapp/humanres/WEB-INF/web.xml Fri Jan 11 16:13:09 2019
@@ -83,6 +83,9 @@ under the License.
<url-pattern>/control/*</url-pattern>
</servlet-mapping>
+ <session-config>
+ <session-timeout>60</session-timeout><!-- in minutes -->
+ </session-config>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
Modified: ofbiz/ofbiz-framework/branches/release18.12/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml?rev=1851070&r1=1851069&r2=1851070&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml Fri Jan 11 16:13:09 2019
@@ -88,6 +88,9 @@ under the License.
<url-pattern>/control/*</url-pattern>
</servlet-mapping>
+ <session-config>
+ <session-timeout>60</session-timeout><!-- in minutes -->
+ </session-config>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
Modified: ofbiz/ofbiz-framework/branches/release18.12/applications/marketing/webapp/sfa/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/marketing/webapp/sfa/WEB-INF/web.xml?rev=1851070&r1=1851069&r2=1851070&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/applications/marketing/webapp/sfa/WEB-INF/web.xml (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/applications/marketing/webapp/sfa/WEB-INF/web.xml Fri Jan 11 16:13:09 2019
@@ -83,6 +83,9 @@ under the License.
<url-pattern>/control/*</url-pattern>
</servlet-mapping>
+ <session-config>
+ <session-timeout>60</session-timeout><!-- in minutes -->
+ </session-config>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
Modified: ofbiz/ofbiz-framework/branches/release18.12/applications/order/webapp/ordermgr/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/order/webapp/ordermgr/WEB-INF/web.xml?rev=1851070&r1=1851069&r2=1851070&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/applications/order/webapp/ordermgr/WEB-INF/web.xml (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/applications/order/webapp/ordermgr/WEB-INF/web.xml Fri Jan 11 16:13:09 2019
@@ -95,6 +95,9 @@ under the License.
<url-pattern>/products/*</url-pattern>
</servlet-mapping>
+ <session-config>
+ <session-timeout>60</session-timeout><!-- in minutes -->
+ </session-config>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
Modified: ofbiz/ofbiz-framework/branches/release18.12/applications/product/webapp/catalog/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/product/webapp/catalog/WEB-INF/web.xml?rev=1851070&r1=1851069&r2=1851070&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/applications/product/webapp/catalog/WEB-INF/web.xml (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/applications/product/webapp/catalog/WEB-INF/web.xml Fri Jan 11 16:13:09 2019
@@ -96,6 +96,10 @@ under the License.
<servlet-name>ImageUrlServlet</servlet-name>
<url-pattern>/images/*</url-pattern>
</servlet-mapping>
+
+ <session-config>
+ <session-timeout>60</session-timeout><!-- in minutes -->
+ </session-config>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
Modified: ofbiz/ofbiz-framework/branches/release18.12/applications/product/webapp/facility/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/product/webapp/facility/WEB-INF/web.xml?rev=1851070&r1=1851069&r2=1851070&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/applications/product/webapp/facility/WEB-INF/web.xml (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/applications/product/webapp/facility/WEB-INF/web.xml Fri Jan 11 16:13:09 2019
@@ -99,6 +99,9 @@ under the License.
<url-pattern>/ShippingAPI.dll</url-pattern>
</servlet-mapping>
+ <session-config>
+ <session-timeout>60</session-timeout><!-- in minutes -->
+ </session-config>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
Modified: ofbiz/ofbiz-framework/branches/release18.12/applications/workeffort/webapp/ical/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/workeffort/webapp/ical/WEB-INF/web.xml?rev=1851070&r1=1851069&r2=1851070&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/applications/workeffort/webapp/ical/WEB-INF/web.xml (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/applications/workeffort/webapp/ical/WEB-INF/web.xml Fri Jan 11 16:13:09 2019
@@ -86,6 +86,10 @@ under the License.
<url-pattern>/*</url-pattern>
</servlet-mapping>
+ <session-config>
+ <session-timeout>60</session-timeout><!-- in minutes -->
+ </session-config>
+
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
</welcome-file-list>
Modified: ofbiz/ofbiz-framework/branches/release18.12/applications/workeffort/webapp/workeffort/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/workeffort/webapp/workeffort/WEB-INF/web.xml?rev=1851070&r1=1851069&r2=1851070&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/applications/workeffort/webapp/workeffort/WEB-INF/web.xml (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/applications/workeffort/webapp/workeffort/WEB-INF/web.xml Fri Jan 11 16:13:09 2019
@@ -89,6 +89,10 @@ under the License.
<url-pattern>/control/*</url-pattern>
</servlet-mapping>
+ <session-config>
+ <session-timeout>60</session-timeout><!-- in minutes -->
+ </session-config>
+
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
</welcome-file-list>
Modified: ofbiz/ofbiz-framework/branches/release18.12/framework/resources/templates/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/resources/templates/web.xml?rev=1851070&r1=1851069&r2=1851070&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/framework/resources/templates/web.xml (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/framework/resources/templates/web.xml Fri Jan 11 16:13:09 2019
@@ -78,6 +78,10 @@ under the License.
</servlet>
<servlet-mapping><servlet-name>ControlServlet</servlet-name><url-pattern>/control/*</url-pattern></servlet-mapping>
+ <session-config>
+ <session-timeout>60</session-timeout><!-- in minutes -->
+ </session-config>
+
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
<welcome-file>index.html</welcome-file>
Modified: ofbiz/ofbiz-framework/branches/release18.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java?rev=1851070&r1=1851069&r2=1851070&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java Fri Jan 11 16:13:09 2019
@@ -52,7 +52,6 @@ public class ControlEventListener implem
public void sessionCreated(HttpSessionEvent event) {
HttpSession session = event.getSession();
- session.setMaxInactiveInterval(60*60); //in seconds
// get/create the visit
// NOTE: don't create the visit here, just let the control servlet do it; GenericValue visit = VisitHandler.getVisit(session);
Modified: ofbiz/ofbiz-framework/branches/release18.12/framework/webtools/webapp/webtools/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/webtools/webapp/webtools/WEB-INF/web.xml?rev=1851070&r1=1851069&r2=1851070&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/framework/webtools/webapp/webtools/WEB-INF/web.xml (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/framework/webtools/webapp/webtools/WEB-INF/web.xml Fri Jan 11 16:13:09 2019
@@ -93,6 +93,10 @@ under the License.
<url-pattern>/control/*</url-pattern>
</servlet-mapping>
+ <session-config>
+ <session-timeout>60</session-timeout><!-- in minutes -->
+ </session-config>
+
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
</welcome-file-list>