Improved: Add session tracking mode and make cookie secure

(OFBIZ-6655) Programmatically replaces the web.xml <session-config> declarations and uses the @weblistener annotation to start the process. This avoid to duplicates things everywhere in web.xml files. Since the web.xml files have precedence on annotations, the setting can be easily overridden when necessary. Now that we also use HTTPS in ecommerce the ecommerce session cookie is also secured. I also noted that we had 8 weird <session-timeout> declarations: in solr component: <session-timeout>2</session-timeout> in themes: <session-timeout>1</session-timeout> Also in Rainbowstone we lacked the <cookie-config> and <tracking-mode> declarations. I think it's not good. I resolve these points by simply removing the <session-config> in web.xml files of themes and Solr. Thanks: Pradhan Yash Sharma for review git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1811041 13f79535-47bb-0310-9956-ffa450edef68
apache · Oct 4, 2017 · 3c70a28 · 3c70a28
1 parent e13f40b
commit 3c70a28
Show file tree

Hide file tree

Showing 25 changed files with 7 additions and 203 deletions.
diff --git a/assetmaint/webapp/assetmaint/WEB-INF/web.xml b/assetmaint/webapp/assetmaint/WEB-INF/web.xml
@@ -103,15 +103,6 @@
         <url-pattern>/control/*</url-pattern>
     </servlet-mapping>
 
-    <session-config>
-        <session-timeout>60</session-timeout> <!-- in minutes -->
-        <cookie-config>
-          <http-only>true</http-only>
-          <secure>true</secure>
-        </cookie-config>
-        <tracking-mode>COOKIE</tracking-mode>
-    </session-config>
-
     <welcome-file-list>
         <welcome-file>index.jsp</welcome-file>
         <welcome-file>index.html</welcome-file>

diff --git a/assetmaint/webapp/ismgr/WEB-INF/web.xml b/assetmaint/webapp/ismgr/WEB-INF/web.xml
@@ -98,15 +98,6 @@
         <url-pattern>/control/*</url-pattern>
     </servlet-mapping>
 
-    <session-config>
-        <session-timeout>60</session-timeout> <!-- in minutes -->
-        <cookie-config>
-          <http-only>true</http-only>
-          <secure>true</secure>
-        </cookie-config>
-        <tracking-mode>COOKIE</tracking-mode>
-    </session-config>
-
     <welcome-file-list>
         <welcome-file>index.jsp</welcome-file>
         <welcome-file>index.html</welcome-file>

diff --git a/bi/webapp/bi/WEB-INF/web.xml b/bi/webapp/bi/WEB-INF/web.xml
@@ -83,15 +83,6 @@
         <url-pattern>/control/*</url-pattern>
     </servlet-mapping>
 
-    <session-config>
-        <session-timeout>60</session-timeout> <!-- in minutes -->
-        <cookie-config>
-          <http-only>true</http-only>
-          <secure>true</secure>
-        </cookie-config>
-        <tracking-mode>COOKIE</tracking-mode>
-    </session-config>
-
     <welcome-file-list>
         <welcome-file>index.jsp</welcome-file>
         <welcome-file>index.html</welcome-file>

diff --git a/birt/webapp/accounting/WEB-INF/web.xml b/birt/webapp/accounting/WEB-INF/web.xml
@@ -89,15 +89,6 @@ under the License.
         <url-pattern>/control/*</url-pattern>
     </servlet-mapping>
 
-    <session-config>
-        <session-timeout>60</session-timeout> <!-- in minutes -->
-        <cookie-config>
-          <http-only>true</http-only>
-          <secure>true</secure>
-        </cookie-config>
-        <tracking-mode>COOKIE</tracking-mode>
-    </session-config>
-
     <welcome-file-list>
         <welcome-file>index.jsp</welcome-file>
         <welcome-file>index.html</welcome-file>

diff --git a/birt/webapp/birt/WEB-INF/web.xml b/birt/webapp/birt/WEB-INF/web.xml
@@ -142,14 +142,6 @@ under the License.
         <url-pattern>/extract</url-pattern>
     </servlet-mapping>
 
-    <session-config>
-        <session-timeout>60</session-timeout><!-- in minutes -->
-        <cookie-config>
-          <http-only>true</http-only>
-          <secure>true</secure>
-        </cookie-config>
-        <tracking-mode>COOKIE</tracking-mode>
-    </session-config>
 
     <welcome-file-list>
         <welcome-file>index.jsp</welcome-file>

diff --git a/birt/webapp/facility/WEB-INF/web.xml b/birt/webapp/facility/WEB-INF/web.xml
@@ -100,15 +100,6 @@ under the License.
         <url-pattern>/ShippingAPI.dll</url-pattern>
     </servlet-mapping>
 
-    <session-config>
-        <session-timeout>60</session-timeout> <!-- in minutes -->
-        <cookie-config>
-          <http-only>true</http-only>
-          <secure>true</secure>
-        </cookie-config>
-        <tracking-mode>COOKIE</tracking-mode>
-    </session-config>
-
     <welcome-file-list>
         <welcome-file>index.jsp</welcome-file>
         <welcome-file>index.html</welcome-file>

diff --git a/birt/webapp/ordermgr/WEB-INF/web.xml b/birt/webapp/ordermgr/WEB-INF/web.xml
@@ -96,15 +96,6 @@ under the License.
         <url-pattern>/products/*</url-pattern>
     </servlet-mapping>
 
-    <session-config>
-        <session-timeout>60</session-timeout> <!-- in minutes -->
-        <cookie-config>
-          <http-only>true</http-only>
-          <secure>true</secure>
-        </cookie-config>
-        <tracking-mode>COOKIE</tracking-mode>
-    </session-config>
-
     <welcome-file-list>
         <welcome-file>index.jsp</welcome-file>
         <welcome-file>index.html</welcome-file>

diff --git a/cmssite/webapp/cmssite/WEB-INF/web.xml b/cmssite/webapp/cmssite/WEB-INF/web.xml
@@ -75,13 +75,6 @@ under the License.
         <url-pattern>/*</url-pattern>
     </servlet-mapping>
 
-    <session-config>
-        <session-timeout>60</session-timeout>
-        <cookie-config>
-            <http-only>true</http-only>
-            <secure>true</secure>
-        </cookie-config>
-    </session-config>
 
     <welcome-file-list>
         <welcome-file>index.jsp</welcome-file>

diff --git a/ebay/webapp/ebay/WEB-INF/web.xml b/ebay/webapp/ebay/WEB-INF/web.xml
@@ -86,15 +86,6 @@ under the License.
         <url-pattern>/control/*</url-pattern>
     </servlet-mapping>
 
-    <session-config>
-        <session-timeout>60</session-timeout> <!-- in minutes -->
-        <cookie-config>
-          <http-only>true</http-only>
-          <secure>true</secure>
-        </cookie-config>
-        <tracking-mode>COOKIE</tracking-mode>
-    </session-config>
-
     <welcome-file-list>
         <welcome-file>index.jsp</welcome-file>
         <welcome-file>index.html</welcome-file>

diff --git a/ebaystore/webapp/ebaystore/WEB-INF/web.xml b/ebaystore/webapp/ebaystore/WEB-INF/web.xml
@@ -86,15 +86,6 @@ under the License.
         <url-pattern>/control/*</url-pattern>
     </servlet-mapping>
 
-    <session-config>
-        <session-timeout>60</session-timeout> <!-- in minutes -->
-        <cookie-config>
-          <http-only>true</http-only>
-          <secure>true</secure>
-        </cookie-config>
-        <tracking-mode>COOKIE</tracking-mode>
-    </session-config>
-
     <welcome-file-list>
         <welcome-file>index.jsp</welcome-file>
         <welcome-file>index.html</welcome-file>

diff --git a/ecommerce/webapp/ecommerce/WEB-INF/web.xml b/ecommerce/webapp/ecommerce/WEB-INF/web.xml
@@ -149,15 +149,6 @@ under the License.
         <url-pattern>/products/*</url-pattern>
     </servlet-mapping>
 
-    <session-config>
-        <session-timeout>60</session-timeout>
-        <cookie-config>
-          <http-only>true</http-only>
-          <secure>true</secure>
-        </cookie-config>
-        <tracking-mode>COOKIE</tracking-mode>
-    </session-config>
-
     <welcome-file-list>
         <welcome-file>index.jsp</welcome-file>
         <welcome-file>index.html</welcome-file>

diff --git a/ecommerce/webapp/ecomseo/WEB-INF/web.xml b/ecommerce/webapp/ecomseo/WEB-INF/web.xml
@@ -151,15 +151,6 @@ under the License.
         <url-pattern>/products/*</url-pattern>
     </servlet-mapping>
 
-    <session-config>
-        <session-timeout>60</session-timeout>
-        <cookie-config>
-          <http-only>true</http-only>
-          <secure>true</secure>
-        </cookie-config>
-        <tracking-mode>COOKIE</tracking-mode>
-    </session-config>
-
     <welcome-file-list>
         <welcome-file>index.jsp</welcome-file>
         <welcome-file>index.html</welcome-file>

diff --git a/example/entitydef/entitymodel_view.xml b/example/entitydef/entitymodel_view.xml
@@ -152,4 +152,11 @@ under the License.
         <alias entity-alias="EX" name="total" field="exampleId" function="count-distinct"/>
         <alias entity-alias="EX" name="exampleTypeId" group-by="true"/>
     </view-entity>
+
+<view-entity entity-name="ExampleTypeView" package-name="org.apache.ofbiz.example.example">
+        <member-entity entity-alias="EX" entity-name="Example"/>
+        <alias entity-alias="EX" name="exampleId" field="exampleId" />
+        <alias entity-alias="EX" name="exampleTypeId" group-by="true"/>
+    </view-entity>
+
 </entitymodel>
diff --git a/example/webapp/example/WEB-INF/web.xml b/example/webapp/example/WEB-INF/web.xml
@@ -83,14 +83,6 @@ 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 -->
-        <cookie-config>
-          <http-only>true</http-only>
-          <secure>true</secure>
-        </cookie-config>
-        <tracking-mode>COOKIE</tracking-mode>
-    </session-config>
 
     <welcome-file-list>
         <welcome-file>index.jsp</welcome-file>

diff --git a/exampleext/webapp/exampleext/WEB-INF/web.xml b/exampleext/webapp/exampleext/WEB-INF/web.xml
@@ -78,14 +78,6 @@ 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 -->
-        <cookie-config>
-          <http-only>true</http-only>
-          <secure>true</secure>
-        </cookie-config>
-        <tracking-mode>COOKIE</tracking-mode>
-    </session-config>
 
     <welcome-file-list>
         <welcome-file>index.jsp</welcome-file>

diff --git a/hhfacility/webapp/hhfacility/WEB-INF/web.xml b/hhfacility/webapp/hhfacility/WEB-INF/web.xml
@@ -89,15 +89,6 @@ under the License.
         <url-pattern>/control/*</url-pattern>
     </servlet-mapping>
 
-    <session-config>
-        <session-timeout>60</session-timeout> <!-- in minutes -->
-        <cookie-config>
-          <http-only>true</http-only>
-          <secure>true</secure>
-        </cookie-config>
-        <tracking-mode>COOKIE</tracking-mode>
-    </session-config>
-
     <welcome-file-list>
         <welcome-file>index.jsp</welcome-file>
         <welcome-file>index.html</welcome-file>

diff --git a/lucene/webapp/content/WEB-INF/web.xml b/lucene/webapp/content/WEB-INF/web.xml
@@ -93,14 +93,6 @@ 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 -->
-        <cookie-config>
-            <http-only>true</http-only>
-            <secure>true</secure>
-        </cookie-config>
-    </session-config>
-
     <welcome-file-list>
         <welcome-file>index.jsp</welcome-file>
         <welcome-file>index.html</welcome-file>

diff --git a/myportal/webapp/myportal/WEB-INF/web.xml b/myportal/webapp/myportal/WEB-INF/web.xml
@@ -83,15 +83,6 @@
         <url-pattern>/control/*</url-pattern>
     </servlet-mapping>
 
-    <session-config>
-        <session-timeout>60</session-timeout> <!-- in minutes -->
-        <cookie-config>
-          <http-only>true</http-only>
-          <secure>true</secure>
-        </cookie-config>
-        <tracking-mode>COOKIE</tracking-mode>
-    </session-config>
-
     <welcome-file-list>
         <welcome-file>index.jsp</welcome-file>
         <welcome-file>index.html</welcome-file>

diff --git a/pricat/webapp/pricat/WEB-INF/web.xml b/pricat/webapp/pricat/WEB-INF/web.xml
@@ -83,14 +83,6 @@ 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 -->
-        <cookie-config>
-          <http-only>true</http-only>
-          <secure>true</secure>
-        </cookie-config>
-        <tracking-mode>COOKIE</tracking-mode>
-    </session-config>
 
     <welcome-file-list>
         <welcome-file>index.jsp</welcome-file>

diff --git a/pricat/webapp/pricatdemo/WEB-INF/web.xml b/pricat/webapp/pricatdemo/WEB-INF/web.xml
@@ -83,14 +83,6 @@ 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 -->
-        <cookie-config>
-          <http-only>true</http-only>
-          <secure>true</secure>
-        </cookie-config>
-        <tracking-mode>COOKIE</tracking-mode>
-    </session-config>
 
     <welcome-file-list>
         <welcome-file>index.jsp</welcome-file>

diff --git a/projectmgr/webapp/projectmgr/WEB-INF/web.xml b/projectmgr/webapp/projectmgr/WEB-INF/web.xml
@@ -82,14 +82,6 @@
         <url-pattern>/control/*</url-pattern>
     </servlet-mapping>
 
-    <session-config>
-        <session-timeout>60</session-timeout> <!-- in minutes -->
-        <cookie-config>
-            <http-only>true</http-only>
-            <secure>true</secure>
-        </cookie-config>
-    </session-config>
-
     <welcome-file-list>
         <welcome-file>index.jsp</welcome-file>
         <welcome-file>index.html</welcome-file>

diff --git a/scrum/webapp/demotest/WEB-INF/web.xml b/scrum/webapp/demotest/WEB-INF/web.xml
@@ -111,14 +111,6 @@ under the License.
         <url-pattern>/control/*</url-pattern>
     </servlet-mapping>
 
-    <session-config>
-        <session-timeout>60</session-timeout><!-- in minutes -->
-        <cookie-config>
-          <http-only>true</http-only>
-          <secure>true</secure>
-        </cookie-config>
-        <tracking-mode>COOKIE</tracking-mode>
-    </session-config>
 
     <welcome-file-list>
         <welcome-file>index.jsp</welcome-file>

diff --git a/scrum/webapp/scrum/WEB-INF/web.xml b/scrum/webapp/scrum/WEB-INF/web.xml
@@ -86,14 +86,6 @@ 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 -->
-        <cookie-config>
-            <http-only>true</http-only>
-            <secure>true</secure>
-        </cookie-config>
-    </session-config>
-
     <welcome-file-list>
         <welcome-file>index.jsp</welcome-file>
         <welcome-file>index.html</welcome-file>

diff --git a/solr/webapp/solr/WEB-INF/web.xml b/solr/webapp/solr/WEB-INF/web.xml
@@ -182,15 +182,6 @@
         <url-pattern>/schema/*</url-pattern>
     </servlet-mapping>
 
-    <session-config>
-        <session-timeout>2</session-timeout>
-        <cookie-config>
-          <http-only>true</http-only>
-          <secure>true</secure>
-        </cookie-config>
-        <tracking-mode>COOKIE</tracking-mode>
-    </session-config>
-
     <mime-mapping>
         <extension>.xsl</extension>
         <!-- per http://www.w3.org/TR/2006/PR-xslt20-20061121/ -->

diff --git a/webpos/webapp/webpos/WEB-INF/web.xml b/webpos/webapp/webpos/WEB-INF/web.xml
@@ -101,13 +101,6 @@
         <servlet-name>CatalogUrlServlet</servlet-name>
         <url-pattern>/products/*</url-pattern>
     </servlet-mapping>
-    <session-config>
-        <session-timeout>60</session-timeout>
-        <cookie-config>
-            <http-only>true</http-only>
-            <secure>true</secure>
-        </cookie-config>
-    </session-config>
     <welcome-file-list>
         <welcome-file>index.jsp</welcome-file>
         <welcome-file>index.html</welcome-file>