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:29 UTC
svn commit: r1851071 - in /ofbiz/ofbiz-framework/branches/release17.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:29 2019
New Revision: 1851071
URL: http://svn.apache.org/viewvc?rev=1851071&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/release17.12/ (props changed)
ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/webapp/accounting/WEB-INF/web.xml
ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/webapp/ap/WEB-INF/web.xml
ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/webapp/ar/WEB-INF/web.xml
ofbiz/ofbiz-framework/branches/release17.12/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml
ofbiz/ofbiz-framework/branches/release17.12/applications/content/webapp/content/WEB-INF/web.xml
ofbiz/ofbiz-framework/branches/release17.12/applications/humanres/webapp/humanres/WEB-INF/web.xml
ofbiz/ofbiz-framework/branches/release17.12/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml
ofbiz/ofbiz-framework/branches/release17.12/applications/marketing/webapp/sfa/WEB-INF/web.xml
ofbiz/ofbiz-framework/branches/release17.12/applications/order/webapp/ordermgr/WEB-INF/web.xml
ofbiz/ofbiz-framework/branches/release17.12/applications/product/webapp/catalog/WEB-INF/web.xml
ofbiz/ofbiz-framework/branches/release17.12/applications/product/webapp/facility/WEB-INF/web.xml
ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/webapp/ical/WEB-INF/web.xml
ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/webapp/workeffort/WEB-INF/web.xml
ofbiz/ofbiz-framework/branches/release17.12/framework/resources/templates/web.xml
ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java
ofbiz/ofbiz-framework/branches/release17.12/framework/webtools/webapp/webtools/WEB-INF/web.xml
Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 11 16:13:29 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:1819499,1819598,1819800,1819805,1819811,1819947,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826780,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1844943,1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995,1846097,1846107,1846214,1846594,1846632,1847398,1847478,1847670,1847715,
1847890,1848263,1848336,1848386,1848398,1848441,1848444,1848447,1848449,1848467,1848469,1848745,1848849-1848850,1849021,1849191,1849193,1849275,1849467,1849528,1849540,1849567,1849693,1850015,1850023,1850530,1850647,1850685,1850694,1850918,1850948,1850953,1851006
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1819947,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826780,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1844943,1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995,1846097,1846107,1846214,1846594,1846632,1847398,1847478,1847670,1847715,
1847890,1848263,1848336,1848386,1848398,1848441,1848444,1848447,1848449,1848467,1848469,1848745,1848849-1848850,1849021,1849191,1849193,1849275,1849467,1849528,1849540,1849567,1849693,1850015,1850023,1850530,1850647,1850685,1850694,1850918,1850948,1850953,1851006,1851068
Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/webapp/accounting/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/webapp/accounting/WEB-INF/web.xml?rev=1851071&r1=1851070&r2=1851071&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/webapp/accounting/WEB-INF/web.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/webapp/accounting/WEB-INF/web.xml Fri Jan 11 16:13:29 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/release17.12/applications/accounting/webapp/ap/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/webapp/ap/WEB-INF/web.xml?rev=1851071&r1=1851070&r2=1851071&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/webapp/ap/WEB-INF/web.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/webapp/ap/WEB-INF/web.xml Fri Jan 11 16:13:29 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/release17.12/applications/accounting/webapp/ar/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/webapp/ar/WEB-INF/web.xml?rev=1851071&r1=1851070&r2=1851071&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/webapp/ar/WEB-INF/web.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/webapp/ar/WEB-INF/web.xml Fri Jan 11 16:13:29 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/release17.12/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml?rev=1851071&r1=1851070&r2=1851071&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml Fri Jan 11 16:13:29 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/release17.12/applications/content/webapp/content/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/content/webapp/content/WEB-INF/web.xml?rev=1851071&r1=1851070&r2=1851071&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/content/webapp/content/WEB-INF/web.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/content/webapp/content/WEB-INF/web.xml Fri Jan 11 16:13:29 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/release17.12/applications/humanres/webapp/humanres/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/humanres/webapp/humanres/WEB-INF/web.xml?rev=1851071&r1=1851070&r2=1851071&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/humanres/webapp/humanres/WEB-INF/web.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/humanres/webapp/humanres/WEB-INF/web.xml Fri Jan 11 16:13:29 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/release17.12/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml?rev=1851071&r1=1851070&r2=1851071&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml Fri Jan 11 16:13:29 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/release17.12/applications/marketing/webapp/sfa/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/marketing/webapp/sfa/WEB-INF/web.xml?rev=1851071&r1=1851070&r2=1851071&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/marketing/webapp/sfa/WEB-INF/web.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/marketing/webapp/sfa/WEB-INF/web.xml Fri Jan 11 16:13:29 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/release17.12/applications/order/webapp/ordermgr/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/order/webapp/ordermgr/WEB-INF/web.xml?rev=1851071&r1=1851070&r2=1851071&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/order/webapp/ordermgr/WEB-INF/web.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/order/webapp/ordermgr/WEB-INF/web.xml Fri Jan 11 16:13:29 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/release17.12/applications/product/webapp/catalog/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/product/webapp/catalog/WEB-INF/web.xml?rev=1851071&r1=1851070&r2=1851071&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/product/webapp/catalog/WEB-INF/web.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/product/webapp/catalog/WEB-INF/web.xml Fri Jan 11 16:13:29 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/release17.12/applications/product/webapp/facility/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/product/webapp/facility/WEB-INF/web.xml?rev=1851071&r1=1851070&r2=1851071&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/product/webapp/facility/WEB-INF/web.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/product/webapp/facility/WEB-INF/web.xml Fri Jan 11 16:13:29 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/release17.12/applications/workeffort/webapp/ical/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/webapp/ical/WEB-INF/web.xml?rev=1851071&r1=1851070&r2=1851071&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/webapp/ical/WEB-INF/web.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/webapp/ical/WEB-INF/web.xml Fri Jan 11 16:13:29 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/release17.12/applications/workeffort/webapp/workeffort/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/webapp/workeffort/WEB-INF/web.xml?rev=1851071&r1=1851070&r2=1851071&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/webapp/workeffort/WEB-INF/web.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/webapp/workeffort/WEB-INF/web.xml Fri Jan 11 16:13:29 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/release17.12/framework/resources/templates/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/framework/resources/templates/web.xml?rev=1851071&r1=1851070&r2=1851071&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/framework/resources/templates/web.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/framework/resources/templates/web.xml Fri Jan 11 16:13:29 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/release17.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java?rev=1851071&r1=1851070&r2=1851071&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java Fri Jan 11 16:13:29 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/release17.12/framework/webtools/webapp/webtools/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/framework/webtools/webapp/webtools/WEB-INF/web.xml?rev=1851071&r1=1851070&r2=1851071&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/framework/webtools/webapp/webtools/WEB-INF/web.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/framework/webtools/webapp/webtools/WEB-INF/web.xml Fri Jan 11 16:13:29 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>