You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2014/06/27 13:23:29 UTC
[01/50] git commit: [maven-release-plugin] prepare release
STRUTS_2_3_16_3
Repository: struts
Updated Branches:
refs/heads/feature/WW-4295-localization d67fce1f2 -> d20c2f10b
[maven-release-plugin] prepare release STRUTS_2_3_16_3
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e03ff728
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e03ff728
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e03ff728
Branch: refs/heads/feature/WW-4295-localization
Commit: e03ff728618f5bf551083fc3a52d43c07434bbc9
Parents: 0761909
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri May 2 17:10:41 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri May 2 17:10:41 2014 +0200
----------------------------------------------------------------------
apps/blank/pom.xml | 2 +-
apps/jboss-blank/pom.xml | 2 +-
apps/mailreader/pom.xml | 2 +-
apps/pom.xml | 2 +-
apps/portlet/pom.xml | 2 +-
apps/rest-showcase/pom.xml | 4 ++--
apps/showcase/pom.xml | 2 +-
archetypes/pom.xml | 2 +-
archetypes/struts2-archetype-angularjs/pom.xml | 4 ++--
archetypes/struts2-archetype-blank/pom.xml | 4 ++--
archetypes/struts2-archetype-convention/pom.xml | 4 ++--
archetypes/struts2-archetype-dbportlet/pom.xml | 4 ++--
archetypes/struts2-archetype-plugin/pom.xml | 4 ++--
archetypes/struts2-archetype-portlet/pom.xml | 4 ++--
archetypes/struts2-archetype-starter/pom.xml | 4 ++--
assembly/pom.xml | 2 +-
bundles/admin/pom.xml | 2 +-
bundles/demo/pom.xml | 2 +-
bundles/pom.xml | 2 +-
core/pom.xml | 2 +-
plugins/cdi/pom.xml | 2 +-
plugins/codebehind/pom.xml | 2 +-
plugins/config-browser/pom.xml | 2 +-
plugins/convention/pom.xml | 2 +-
plugins/dojo/pom.xml | 2 +-
plugins/dwr/pom.xml | 2 +-
plugins/embeddedjsp/pom.xml | 2 +-
plugins/gxp/pom.xml | 2 +-
plugins/jasperreports/pom.xml | 2 +-
plugins/javatemplates/pom.xml | 2 +-
plugins/jfreechart/pom.xml | 2 +-
plugins/jsf/pom.xml | 2 +-
plugins/json/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
plugins/osgi/pom.xml | 2 +-
plugins/oval/pom.xml | 2 +-
plugins/pell-multipart/pom.xml | 2 +-
plugins/plexus/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/portlet-tiles/pom.xml | 2 +-
plugins/portlet/pom.xml | 2 +-
plugins/rest/pom.xml | 4 ++--
plugins/sitegraph/pom.xml | 2 +-
plugins/sitemesh/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/struts1/pom.xml | 2 +-
plugins/testng/pom.xml | 2 +-
plugins/tiles/pom.xml | 2 +-
plugins/tiles3/pom.xml | 2 +-
pom.xml | 4 ++--
xwork-core/pom.xml | 2 +-
51 files changed, 61 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/apps/blank/pom.xml
----------------------------------------------------------------------
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index 81a88d5..b7343c6 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-blank</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/apps/jboss-blank/pom.xml
----------------------------------------------------------------------
diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
index b77c977..62c6803 100644
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-jboss-blank</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/apps/mailreader/pom.xml
----------------------------------------------------------------------
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index bb7ae7c..c41bb76 100644
--- a/apps/mailreader/pom.xml
+++ b/apps/mailreader/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-mailreader</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index 3444414..c89f4cc 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/apps/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
index e105aab..5100b4e 100644
--- a/apps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-portlet</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/apps/rest-showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index 55d5d5f..fdd6c8b 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -26,12 +26,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-rest-showcase</artifactId>
<packaging>war</packaging>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
<name>Struts 2 Rest Showcase Example</name>
<description>Struts 2 Rest Showcase Example</description>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/apps/showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 9d52e4b..68ca565 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-showcase</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index fcf351b..02083e0 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/archetypes/struts2-archetype-angularjs/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-angularjs/pom.xml b/archetypes/struts2-archetype-angularjs/pom.xml
index 3f40657..2235e44 100644
--- a/archetypes/struts2-archetype-angularjs/pom.xml
+++ b/archetypes/struts2-archetype-angularjs/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-angularjs</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Angular JS</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/archetypes/struts2-archetype-blank/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-blank/pom.xml b/archetypes/struts2-archetype-blank/pom.xml
index 00a6f4b..c6473bd 100644
--- a/archetypes/struts2-archetype-blank/pom.xml
+++ b/archetypes/struts2-archetype-blank/pom.xml
@@ -3,12 +3,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-blank</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Blank</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/archetypes/struts2-archetype-convention/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-convention/pom.xml b/archetypes/struts2-archetype-convention/pom.xml
index fca83b0..b6c34d0 100644
--- a/archetypes/struts2-archetype-convention/pom.xml
+++ b/archetypes/struts2-archetype-convention/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-convention</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Blank Convention</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/archetypes/struts2-archetype-dbportlet/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-dbportlet/pom.xml b/archetypes/struts2-archetype-dbportlet/pom.xml
index 15a48ed..d918d13 100644
--- a/archetypes/struts2-archetype-dbportlet/pom.xml
+++ b/archetypes/struts2-archetype-dbportlet/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-dbportlet</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Database Portlet</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/archetypes/struts2-archetype-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-plugin/pom.xml b/archetypes/struts2-archetype-plugin/pom.xml
index bdb702f..8c47dbf 100644
--- a/archetypes/struts2-archetype-plugin/pom.xml
+++ b/archetypes/struts2-archetype-plugin/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-plugin</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Plugin</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/archetypes/struts2-archetype-portlet/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-portlet/pom.xml b/archetypes/struts2-archetype-portlet/pom.xml
index 1bc6d9f..a6be6f7 100644
--- a/archetypes/struts2-archetype-portlet/pom.xml
+++ b/archetypes/struts2-archetype-portlet/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-portlet</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Portlet</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/archetypes/struts2-archetype-starter/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-starter/pom.xml b/archetypes/struts2-archetype-starter/pom.xml
index 935b471..742e0b9 100644
--- a/archetypes/struts2-archetype-starter/pom.xml
+++ b/archetypes/struts2-archetype-starter/pom.xml
@@ -4,12 +4,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-starter</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Starter</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 95b3a0c..1c3c55f 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-assembly</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/bundles/admin/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
index 5ea89c4..5713461 100644
--- a/bundles/admin/pom.xml
+++ b/bundles/admin/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-osgi-admin-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/bundles/demo/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml
index 0f67c7d..145034a 100644
--- a/bundles/demo/pom.xml
+++ b/bundles/demo/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-osgi-demo-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/bundles/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/pom.xml b/bundles/pom.xml
index f896c0c..b87e697 100755
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-osgi-bundles</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 6404358..c53059c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/plugins/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml
index ba6bbf2..1757de6 100644
--- a/plugins/cdi/pom.xml
+++ b/plugins/cdi/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-cdi-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/plugins/codebehind/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml
index 78701b2..ab09d6d 100644
--- a/plugins/codebehind/pom.xml
+++ b/plugins/codebehind/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-codebehind-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/plugins/config-browser/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml
index 7a9016b..2a1dace 100644
--- a/plugins/config-browser/pom.xml
+++ b/plugins/config-browser/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-config-browser-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/plugins/convention/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml
index 54346ba..137aed5 100644
--- a/plugins/convention/pom.xml
+++ b/plugins/convention/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-convention-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/plugins/dojo/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml
index f0f950d..88606e4 100644
--- a/plugins/dojo/pom.xml
+++ b/plugins/dojo/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>struts2-plugins</artifactId>
<groupId>org.apache.struts</groupId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/plugins/dwr/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml
index 76259d2..19033d2 100644
--- a/plugins/dwr/pom.xml
+++ b/plugins/dwr/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-dwr-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/plugins/embeddedjsp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml
index 19b85fc..604a876 100644
--- a/plugins/embeddedjsp/pom.xml
+++ b/plugins/embeddedjsp/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-embeddedjsp-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/plugins/gxp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml
index d984aca..cd9c826 100644
--- a/plugins/gxp/pom.xml
+++ b/plugins/gxp/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-gxp-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/plugins/jasperreports/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml
index 45d22b2..605b92c 100644
--- a/plugins/jasperreports/pom.xml
+++ b/plugins/jasperreports/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-jasperreports-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/plugins/javatemplates/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml
index 6d3ff2d..611f421 100644
--- a/plugins/javatemplates/pom.xml
+++ b/plugins/javatemplates/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-javatemplates-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/plugins/jfreechart/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml
index bb888b9..395b415 100644
--- a/plugins/jfreechart/pom.xml
+++ b/plugins/jfreechart/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-jfreechart-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/plugins/jsf/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jsf/pom.xml b/plugins/jsf/pom.xml
index 3f284ab..6720597 100644
--- a/plugins/jsf/pom.xml
+++ b/plugins/jsf/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-jsf-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/plugins/json/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml
index f77b226..9daa09c 100644
--- a/plugins/json/pom.xml
+++ b/plugins/json/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-json-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/plugins/junit/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 6d02695..7baff8c 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/plugins/osgi/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml
index 2762bfa..e89c417 100644
--- a/plugins/osgi/pom.xml
+++ b/plugins/osgi/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-osgi-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/plugins/oval/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml
index 997b2a7..6305065 100644
--- a/plugins/oval/pom.xml
+++ b/plugins/oval/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-oval-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/plugins/pell-multipart/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml
index 307fc05..54fa305 100644
--- a/plugins/pell-multipart/pom.xml
+++ b/plugins/pell-multipart/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-pell-multipart-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/plugins/plexus/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml
index 79ce6af..841032b 100644
--- a/plugins/plexus/pom.xml
+++ b/plugins/plexus/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-plexus-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 0d764e6..7a63dd3 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-plugins</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/plugins/portlet-tiles/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml
index a937e7c..8bf28d3 100644
--- a/plugins/portlet-tiles/pom.xml
+++ b/plugins/portlet-tiles/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-portlet-tiles-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/plugins/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index 4bea2e7..e5c1057 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-portlet-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/plugins/rest/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml
index 3c416a4..62f4e77 100644
--- a/plugins/rest/pom.xml
+++ b/plugins/rest/pom.xml
@@ -26,11 +26,11 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-rest-plugin</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
<name>Struts 2 REST Plugin</name>
<properties>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/plugins/sitegraph/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml
index 829f883..b3aaf14 100644
--- a/plugins/sitegraph/pom.xml
+++ b/plugins/sitegraph/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-sitegraph-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/plugins/sitemesh/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml
index 717c2bf..f5a4569 100644
--- a/plugins/sitemesh/pom.xml
+++ b/plugins/sitemesh/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-sitemesh-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/plugins/spring/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index c5bf45b..0803160 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/plugins/struts1/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/struts1/pom.xml b/plugins/struts1/pom.xml
index fbbd4f1..f59047f 100644
--- a/plugins/struts1/pom.xml
+++ b/plugins/struts1/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-struts1-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/plugins/testng/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml
index 6879f54..5f23c4e 100644
--- a/plugins/testng/pom.xml
+++ b/plugins/testng/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-testng-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/plugins/tiles/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index f3fa2b6..b6dc526 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-tiles-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/plugins/tiles3/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles3/pom.xml b/plugins/tiles3/pom.xml
index 2204fcf..3361d1c 100644
--- a/plugins/tiles3/pom.xml
+++ b/plugins/tiles3/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-tiles3-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 638a5bd..1d2b7e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>http://struts.apache.org/</url>
@@ -31,7 +31,7 @@
<connection>scm:git:git://git.apache.org/struts.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/struts.git</developerConnection>
<url>http://git.apache.org/struts.git</url>
- <tag>STRUTS_2_3_16_2</tag>
+ <tag>STRUTS_2_3_16_3</tag>
</scm>
<issueManagement>
http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/xwork-core/pom.xml
----------------------------------------------------------------------
diff --git a/xwork-core/pom.xml b/xwork-core/pom.xml
index 9d1c34c..710f635 100644
--- a/xwork-core/pom.xml
+++ b/xwork-core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<groupId>org.apache.struts.xwork</groupId>
[45/50] git commit: Adds additional default exclude patterns to avoid
access to #context
Posted by lu...@apache.org.
Adds additional default exclude patterns to avoid access to #context
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/eb8aae87
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/eb8aae87
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/eb8aae87
Branch: refs/heads/feature/WW-4295-localization
Commit: eb8aae87521e627d3cd333e4dc351390bf1e80dc
Parents: 5ebc064
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu Jun 5 08:25:24 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu Jun 5 08:25:24 2014 +0200
----------------------------------------------------------------------
.../xwork2/security/DefaultExcludedPatternsChecker.java | 4 +++-
.../xwork2/interceptor/ParametersInterceptorTest.java | 6 ++----
.../xwork2/security/DefaultExcludedPatternsCheckerTest.java | 4 ++++
3 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/eb8aae87/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java b/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
index f0a3d62..983ce63 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
@@ -23,7 +23,9 @@ public class DefaultExcludedPatternsChecker implements ExcludedPatternsChecker {
"(^|.*#)request(\\.|\\[).*",
"(^|.*#)application(\\.|\\[).*",
"(^|.*#)servlet(Request|Response)(\\.|\\[).*",
- "(^|.*#)parameters(\\.|\\[).*"
+ "(^|.*#)parameters(\\.|\\[).*",
+ "(^|.*#)context(\\.|\\[).*",
+ "(^|.*#)_memberAccess(\\.|\\[).*"
};
private Set<Pattern> excludedPatterns;
http://git-wip-us.apache.org/repos/asf/struts/blob/eb8aae87/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
index ce86051..d6fc7c5 100644
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
@@ -110,13 +110,11 @@ public class ParametersInterceptorTest extends XWorkTestCase {
pi.setParameters(action, vs, params);
// then
- assertEquals(2, action.getActionMessages().size());
+ assertEquals(1, action.getActionMessages().size());
String msg1 = action.getActionMessage(0);
- String msg2 = action.getActionMessage(1);
- assertTrue(msg1.contains("Error setting expression 'name' with value '(#context[\"xwork.MethodAccessor.denyMethodExecution\"]= new java.lang.Boolean(false), #_memberAccess[\"allowStaticMethodAccess\"]= new java.lang.Boolean(true), @java.lang.Runtime@getRuntime().exec('mkdir /tmp/PWNAGE'))(meh)'"));
- assertTrue(msg2.contains("Error setting expression 'top['name'](0)' with value 'true'"));
+ assertTrue(msg1.contains("Error setting expression 'top['name'](0)' with value 'true'"));
assertNull(action.getName());
}
http://git-wip-us.apache.org/repos/asf/struts/blob/eb8aae87/xwork-core/src/test/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsCheckerTest.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsCheckerTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsCheckerTest.java
index 32121b9..6125521 100644
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsCheckerTest.java
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsCheckerTest.java
@@ -39,6 +39,10 @@ public class DefaultExcludedPatternsCheckerTest extends XWorkTestCase {
add("%{#parameters.test}");
add("%{#Parameters['test']}");
add("%{#Parameters.test}");
+ add("#context.get('com.opensymphony.xwork2.dispatcher.HttpServletResponse')");
+ add("%{#context.get('com.opensymphony.xwork2.dispatcher.HttpServletResponse')}");
+ add("#_memberAccess[\"allowStaticMethodAccess\"]= new java.lang.Boolean(true)");
+ add("%{#_memberAccess[\"allowStaticMethodAccess\"]= new java.lang.Boolean(true)}");
}
};
[10/50] git commit: Defines excluded classes
Posted by lu...@apache.org.
Defines excluded classes
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/f84efa5f
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/f84efa5f
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/f84efa5f
Branch: refs/heads/feature/WW-4295-localization
Commit: f84efa5f42a31ecbcbe3eba28653a57829e598b8
Parents: cdfb94d
Author: Lukasz Lenart <lu...@apache.org>
Authored: Sat May 3 20:18:44 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Sat May 3 20:18:44 2014 +0200
----------------------------------------------------------------------
core/src/main/resources/struts-default.xml | 2 +-
xwork-core/src/test/resources/xwork-param-test.xml | 2 +-
xwork-core/src/test/resources/xwork-test-beans.xml | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/f84efa5f/core/src/main/resources/struts-default.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
index 7cb687e..0e4c419 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -38,7 +38,7 @@
<struts>
- <constant name="struts.excludedProperties" value="getClass,class,hashCode,toString,clone,equals,finalize,notify,notifyAll,wait" />
+ <constant name="struts.excludedClasses" value="java.lang.Object,java.lang.Runtime,ognl.OgnlContext,ognl.MemberAccess,ognl.ClassResolver,ognl.TypeConverter" />
<bean class="com.opensymphony.xwork2.ObjectFactory" name="struts"/>
<bean type="com.opensymphony.xwork2.factory.ResultFactory" name="struts" class="org.apache.struts2.factory.StrutsResultFactory" />
http://git-wip-us.apache.org/repos/asf/struts/blob/f84efa5f/xwork-core/src/test/resources/xwork-param-test.xml
----------------------------------------------------------------------
diff --git a/xwork-core/src/test/resources/xwork-param-test.xml b/xwork-core/src/test/resources/xwork-param-test.xml
index 3ca616a..01787f7 100644
--- a/xwork-core/src/test/resources/xwork-param-test.xml
+++ b/xwork-core/src/test/resources/xwork-param-test.xml
@@ -4,5 +4,5 @@
<xwork>
<constant name="devMode" value="true" />
- <constant name="ognlExcludedProperties" value="getClass,class,hashCode,toString,clone,equals,finalize,notify,notifyAll,wait" />
+ <constant name="ognlExcludedClasses" value="java.lang.Object,java.lang.Runtime" />
</xwork>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/struts/blob/f84efa5f/xwork-core/src/test/resources/xwork-test-beans.xml
----------------------------------------------------------------------
diff --git a/xwork-core/src/test/resources/xwork-test-beans.xml b/xwork-core/src/test/resources/xwork-test-beans.xml
index 3fa5b28..7268ef7 100644
--- a/xwork-core/src/test/resources/xwork-test-beans.xml
+++ b/xwork-core/src/test/resources/xwork-test-beans.xml
@@ -3,11 +3,11 @@
"http://struts.apache.org/dtds/xwork-2.0.dtd">
<xwork>
-<!--
+<!--
<bean class="com.opensymphony.xwork2.ObjectFactory" name="default" />
<bean type="com.opensymphony.xwork2.ActionProxyFactory" name="default" class="com.opensymphony.xwork2.DefaultActionProxyFactory"/>
<constant name="devMode" value="false" />
-
+
<bean type="com.opensymphony.xwork2.util.ValueStackFactory"
class="com.opensymphony.xwork2.ognl.OgnlValueStackFactory" />
<bean type="com.opensymphony.xwork2.util.reflection.ReflectionProvider"
@@ -15,11 +15,11 @@
<bean type="com.opensymphony.xwork2.util.reflection.ReflectionContextFactory"
class="com.opensymphony.xwork2.ognl.OgnlReflectionContextFactory" />
<bean class="com.opensymphony.xwork2.conversion.impl.XWorkConverter" />
- <bean type="com.opensymphony.xwork2.conversion.ObjectTypeDeterminer"
+ <bean type="com.opensymphony.xwork2.conversion.ObjectTypeDeterminer"
class="com.opensymphony.xwork2.conversion.impl.DefaultObjectTypeDeterminer" />
-->
<!-- static injections -->
- <!--
+ <!--
<bean class="com.opensymphony.xwork2.ognl.OgnlValueStack" static="true"/>
<bean class="com.opensymphony.xwork2.conversion.impl.XWorkConverter" static="true"/>
<bean class="com.opensymphony.xwork2.util.reflection.ReflectionProviderFactory" static="true" />
[06/50] git commit: Sets excluded classes during injecting OgnlUtil
Posted by lu...@apache.org.
Sets excluded classes during injecting OgnlUtil
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/2180b06f
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/2180b06f
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/2180b06f
Branch: refs/heads/feature/WW-4295-localization
Commit: 2180b06f7d1d38e7701e72123e57208feb4cb444
Parents: 2798057
Author: Lukasz Lenart <lu...@apache.org>
Authored: Sat May 3 20:16:33 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Sat May 3 20:16:33 2014 +0200
----------------------------------------------------------------------
.../main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/2180b06f/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
index 76f0d3f..83be3ed 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
@@ -79,6 +79,7 @@ public class OgnlValueStack implements Serializable, ValueStack, ClearableValueS
@Inject
public void setOgnlUtil(OgnlUtil ognlUtil) {
this.ognlUtil = ognlUtil;
+ securityMemberAccess.setExcludedClasses(ognlUtil.getExcludedClasses());
}
protected void setRoot(XWorkConverter xworkConverter, CompoundRootAccessor accessor, CompoundRoot compoundRoot,
@@ -446,7 +447,7 @@ public class OgnlValueStack implements Serializable, ValueStack, ClearableValueS
XWorkConverter xworkConverter = cont.getInstance(XWorkConverter.class);
CompoundRootAccessor accessor = (CompoundRootAccessor) cont.getInstance(PropertyAccessor.class, CompoundRoot.class.getName());
TextProvider prov = cont.getInstance(TextProvider.class, "system");
- boolean allow = "true".equals(cont.getInstance(String.class, "allowStaticMethodAccess"));
+ boolean allow = "true".equals(cont.getInstance(String.class, XWorkConstants.ALLOW_STATIC_METHOD_ACCESS));
OgnlValueStack aStack = new OgnlValueStack(xworkConverter, accessor, prov, allow);
aStack.setOgnlUtil(cont.getInstance(OgnlUtil.class));
aStack.setRoot(xworkConverter, accessor, this.root, allow);
[42/50] git commit: Adds javax.* to excluded packages
Posted by lu...@apache.org.
Adds javax.* to excluded packages
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/2df72b94
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/2df72b94
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/2df72b94
Branch: refs/heads/feature/WW-4295-localization
Commit: 2df72b941186b9c0a2a7fdc84cbf6d3001ec30e9
Parents: 5a5af1b
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri May 23 17:36:45 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri May 23 17:36:45 2014 +0200
----------------------------------------------------------------------
core/src/main/resources/struts-default.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/2df72b94/core/src/main/resources/struts-default.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
index 0275a48..0fe8e68 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -40,7 +40,7 @@
<constant name="struts.excludedClasses" value="java.lang.Object,java.lang.Runtime,ognl.OgnlContext,ognl.MemberAccess,ognl.ClassResolver,ognl.TypeConverter" />
<!-- this must be valid regex, each '.' in package name must be escaped! -->
- <constant name="struts.excludedPackageNamePatterns" value="^java\.lang.*,^ognl.*" />
+ <constant name="struts.excludedPackageNamePatterns" value="^java\.lang.*,^ognl.*,^javax.*" />
<bean class="com.opensymphony.xwork2.ObjectFactory" name="struts"/>
<bean type="com.opensymphony.xwork2.factory.ResultFactory" name="struts" class="org.apache.struts2.factory.StrutsResultFactory" />
[15/50] git commit: Merge branch 'develop' into
feature/exclude-object-class
Posted by lu...@apache.org.
Merge branch 'develop' into feature/exclude-object-class
Conflicts:
xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/a5946d08
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/a5946d08
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/a5946d08
Branch: refs/heads/feature/WW-4295-localization
Commit: a5946d0814b6245f1e83e4ff8e5f337b045991ae
Parents: ba0ac0d 086c0a0
Author: Lukasz Lenart <lu...@apache.org>
Authored: Mon May 5 06:43:31 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Mon May 5 06:43:31 2014 +0200
----------------------------------------------------------------------
.../struts2/interceptor/CookieInterceptor.java | 74 +++++++++++++++++++-
core/src/main/resources/struts-default.xml | 8 +--
.../interceptor/CookieInterceptorTest.java | 66 +++++++++++++++++
plugins/rest/pom.xml | 2 +-
pom.xml | 3 +-
src/site/resources/archetype-catalog.xml | 12 ++--
.../opensymphony/xwork2/ExcludedPatterns.java | 22 ++++++
.../interceptor/ParametersInterceptor.java | 2 +-
.../opensymphony/xwork2/mock/MockResult.java | 2 +
.../interceptor/ParametersInterceptorTest.java | 68 ++++++++++++++++++
10 files changed, 242 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/a5946d08/core/src/main/resources/struts-default.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/a5946d08/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
----------------------------------------------------------------------
diff --cc xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
index e09ab54,c73b057..6de6aad
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
@@@ -485,9 -507,8 +485,9 @@@ public class ParametersInterceptor exte
public void setExcludeParams(String commaDelim) {
Collection<String> excludePatterns = ArrayUtils.asCollection(commaDelim);
if (excludePatterns != null) {
+ excludeParams = new HashSet<Pattern>();
for (String pattern : excludePatterns) {
- excludeParams.add(Pattern.compile(pattern));
+ excludeParams.add(Pattern.compile(pattern, Pattern.CASE_INSENSITIVE));
}
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/a5946d08/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
----------------------------------------------------------------------
[21/50] git commit: Merge branch 'develop' into
feature/exclude-object-class
Posted by lu...@apache.org.
Merge branch 'develop' into feature/exclude-object-class
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/08b44fda
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/08b44fda
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/08b44fda
Branch: refs/heads/feature/WW-4295-localization
Commit: 08b44fdad666c78e4a7a96c57bbe896eff896829
Parents: 7857b86 63897e8
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu May 8 22:07:22 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu May 8 22:07:22 2014 +0200
----------------------------------------------------------------------
.../struts2/interceptor/CookieInterceptor.java | 45 +++++++++++------
.../interceptor/CookieInterceptorTest.java | 53 ++++++++++++++++++++
2 files changed, 82 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
[48/50] git commit: Merge branch 'feature/exclude-object-class' into
develop This adds new security mechanism to prevent access particular classes
and packages
Posted by lu...@apache.org.
Merge branch 'feature/exclude-object-class' into develop
This adds new security mechanism to prevent access particular classes and packages
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/21ef4e34
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/21ef4e34
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/21ef4e34
Branch: refs/heads/feature/WW-4295-localization
Commit: 21ef4e3487f5dbf46f9b6bdff7eceb057da28bdd
Parents: 63897e8 9654287
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Jun 18 08:48:22 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Jun 18 08:48:22 2014 +0200
----------------------------------------------------------------------
.../org/apache/struts2/StrutsConstants.java | 16 ++
.../config/DefaultBeanSelectionProvider.java | 22 +-
.../struts2/interceptor/CookieInterceptor.java | 48 ++--
core/src/main/resources/struts-default.xml | 20 ++
.../struts2/TestConfigurationProvider.java | 5 +
.../interceptor/CookieInterceptorTest.java | 11 +
.../ExecuteAndWaitInterceptorTest.java | 2 +
.../struts2/views/jsp/PropertyTagTest.java | 30 ++-
.../apache/struts2/views/jsp/ui/SelectTest.java | 2 +-
.../struts2/rest/RestActionInvocationTest.java | 2 +
.../xwork2/DefaultActionInvocation.java | 54 ++---
.../opensymphony/xwork2/ExcludedPatterns.java | 22 --
.../com/opensymphony/xwork2/XWorkConstants.java | 10 +
.../providers/XWorkConfigurationProvider.java | 11 +-
.../interceptor/ParametersInterceptor.java | 138 +++++------
.../com/opensymphony/xwork2/ognl/OgnlUtil.java | 77 +++++-
.../xwork2/ognl/OgnlValueStack.java | 6 +-
.../xwork2/ognl/SecurityMemberAccess.java | 50 +++-
.../security/AcceptedPatternsChecker.java | 82 +++++++
.../DefaultAcceptedPatternsChecker.java | 86 +++++++
.../DefaultExcludedPatternsChecker.java | 95 ++++++++
.../security/ExcludedPatternsChecker.java | 82 +++++++
.../xwork2/DefaultActionInvocationTest.java | 8 +
.../impl/AnnotationXWorkConverterTest.java | 10 +-
.../interceptor/ParametersInterceptorTest.java | 47 ++--
.../opensymphony/xwork2/ognl/OgnlUtilTest.java | 164 +++++++++++--
.../xwork2/ognl/OgnlValueStackTest.java | 1 +
.../xwork2/ognl/SecurityMemberAccessTest.java | 236 +++++++++++++++++++
.../DefaultAcceptedPatternsCheckerTest.java | 56 +++++
.../DefaultExcludedPatternsCheckerTest.java | 60 +++++
.../test/resources/xwork-class-param-test.xml | 11 +
.../src/test/resources/xwork-param-test.xml | 1 +
.../src/test/resources/xwork-test-beans.xml | 24 +-
33 files changed, 1226 insertions(+), 263 deletions(-)
----------------------------------------------------------------------
[08/50] git commit: Uses excluded classes to
Posted by lu...@apache.org.
Uses excluded classes to
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/afb5af1c
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/afb5af1c
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/afb5af1c
Branch: refs/heads/feature/WW-4295-localization
Commit: afb5af1cc45aed1ee0404541279cb7f7853fc98b
Parents: f0799fd
Author: Lukasz Lenart <lu...@apache.org>
Authored: Sat May 3 20:17:05 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Sat May 3 20:17:05 2014 +0200
----------------------------------------------------------------------
core/src/main/java/org/apache/struts2/StrutsConstants.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/afb5af1c/core/src/main/java/org/apache/struts2/StrutsConstants.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/StrutsConstants.java b/core/src/main/java/org/apache/struts2/StrutsConstants.java
index 6be58ad..d508373 100644
--- a/core/src/main/java/org/apache/struts2/StrutsConstants.java
+++ b/core/src/main/java/org/apache/struts2/StrutsConstants.java
@@ -282,7 +282,7 @@ public final class StrutsConstants {
/** Allows override default DispatcherErrorHandler **/
public static final String STRUTS_DISPATCHER_ERROR_HANDLER = "struts.dispatcher.errorHandler";
- /** Comma delimited set of excluded properties which cannot be accessed via expressions **/
- public static final String STRUTS_EXCLUDED_PROPERTIES = "struts.excludedProperties";
+ /** Comma delimited set of excluded classes which cannot be accessed via expressions **/
+ public static final String STRUTS_EXCLUDED_CLASSES = "struts.excludedClasses";
}
[40/50] git commit: Ties excluding packages into Struts DI mechanism
Posted by lu...@apache.org.
Ties excluding packages into Struts DI mechanism
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/4ee18f96
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/4ee18f96
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/4ee18f96
Branch: refs/heads/feature/WW-4295-localization
Commit: 4ee18f96bc2d401f9007c5fd458c47b7ae4ff35d
Parents: dba9da3
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri May 23 09:58:33 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri May 23 09:58:33 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/struts2/StrutsConstants.java | 3 ++-
.../config/DefaultBeanSelectionProvider.java | 3 +++
core/src/main/resources/struts-default.xml | 2 ++
.../com/opensymphony/xwork2/XWorkConstants.java | 2 ++
.../com/opensymphony/xwork2/ognl/OgnlUtil.java | 17 ++++++++++++++++-
.../opensymphony/xwork2/ognl/OgnlValueStack.java | 1 +
6 files changed, 26 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/4ee18f96/core/src/main/java/org/apache/struts2/StrutsConstants.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/StrutsConstants.java b/core/src/main/java/org/apache/struts2/StrutsConstants.java
index 8c0c5ce..dd08993 100644
--- a/core/src/main/java/org/apache/struts2/StrutsConstants.java
+++ b/core/src/main/java/org/apache/struts2/StrutsConstants.java
@@ -282,8 +282,9 @@ public final class StrutsConstants {
/** Allows override default DispatcherErrorHandler **/
public static final String STRUTS_DISPATCHER_ERROR_HANDLER = "struts.dispatcher.errorHandler";
- /** Comma delimited set of excluded classes which cannot be accessed via expressions **/
+ /** Comma delimited set of excluded classes and package names which cannot be accessed via expressions **/
public static final String STRUTS_EXCLUDED_CLASSES = "struts.excludedClasses";
+ public static final String STRUTS_EXCLUDED_PACKAGE_NAME_PATTERNS = "struts.excludedPackageNamePatterns";
/** Dedicated services to check if passed string is excluded/accepted **/
public static final String STRUTS_EXCLUDED_PATTERNS_CHECKER = "struts.excludedPatterns.checker";
http://git-wip-us.apache.org/repos/asf/struts/blob/4ee18f96/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
index 4334d3c..a671133 100644
--- a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
+++ b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
@@ -403,7 +403,10 @@ public class DefaultBeanSelectionProvider extends AbstractBeanSelectionProvider
convertIfExist(props, StrutsConstants.STRUTS_ENABLE_OGNL_EVAL_EXPRESSION, XWorkConstants.ENABLE_OGNL_EVAL_EXPRESSION);
convertIfExist(props, StrutsConstants.STRUTS_ALLOW_STATIC_METHOD_ACCESS, XWorkConstants.ALLOW_STATIC_METHOD_ACCESS);
convertIfExist(props, StrutsConstants.STRUTS_CONFIGURATION_XML_RELOAD, XWorkConstants.RELOAD_XML_CONFIGURATION);
+
convertIfExist(props, StrutsConstants.STRUTS_EXCLUDED_CLASSES, XWorkConstants.OGNL_EXCLUDED_CLASSES);
+ convertIfExist(props, StrutsConstants.STRUTS_EXCLUDED_PACKAGE_NAME_PATTERNS, XWorkConstants.OGNL_EXCLUDED_PACKAGE_NAME_PATTERNS);
+
convertIfExist(props, StrutsConstants.STRUTS_OVERRIDE_EXCLUDED_PATTERNS, XWorkConstants.OVERRIDE_EXCLUDED_PATTERNS);
convertIfExist(props, StrutsConstants.STRUTS_OVERRIDE_ACCEPTED_PATTERNS, XWorkConstants.OVERRIDE_ACCEPTED_PATTERNS);
http://git-wip-us.apache.org/repos/asf/struts/blob/4ee18f96/core/src/main/resources/struts-default.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
index a1aa63f..0275a48 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -39,6 +39,8 @@
<struts>
<constant name="struts.excludedClasses" value="java.lang.Object,java.lang.Runtime,ognl.OgnlContext,ognl.MemberAccess,ognl.ClassResolver,ognl.TypeConverter" />
+ <!-- this must be valid regex, each '.' in package name must be escaped! -->
+ <constant name="struts.excludedPackageNamePatterns" value="^java\.lang.*,^ognl.*" />
<bean class="com.opensymphony.xwork2.ObjectFactory" name="struts"/>
<bean type="com.opensymphony.xwork2.factory.ResultFactory" name="struts" class="org.apache.struts2.factory.StrutsResultFactory" />
http://git-wip-us.apache.org/repos/asf/struts/blob/4ee18f96/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java b/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
index b846ac0..830df78 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
@@ -17,7 +17,9 @@ public final class XWorkConstants {
public static final String RELOAD_XML_CONFIGURATION = "reloadXmlConfiguration";
public static final String ALLOW_STATIC_METHOD_ACCESS = "allowStaticMethodAccess";
public static final String XWORK_LOGGER_FACTORY = "xwork.loggerFactory";
+
public static final String OGNL_EXCLUDED_CLASSES = "ognlExcludedClasses";
+ public static final String OGNL_EXCLUDED_PACKAGE_NAME_PATTERNS = "ognlExcludedPackageNamePatterns";
public static final String OVERRIDE_EXCLUDED_PATTERNS = "overrideExcludedPatterns";
public static final String OVERRIDE_ACCEPTED_PATTERNS = "overrideAcceptedPatterns";
http://git-wip-us.apache.org/repos/asf/struts/blob/4ee18f96/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
index 1c17eca..b0345fc 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
@@ -16,7 +16,6 @@
package com.opensymphony.xwork2.ognl;
import com.opensymphony.xwork2.XWorkConstants;
-import com.opensymphony.xwork2.XWorkException;
import com.opensymphony.xwork2.config.ConfigurationException;
import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
import com.opensymphony.xwork2.inject.Container;
@@ -47,6 +46,7 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import java.util.regex.Pattern;
/**
@@ -67,6 +67,8 @@ public class OgnlUtil {
private boolean enableEvalExpression;
private Set<Class<?>> excludedClasses = new HashSet<Class<?>>();
+ private Set<Pattern> excludedPackageNamePatterns = new HashSet<Pattern>();
+
private Container container;
private boolean allowStaticMethodAccess;
@@ -106,10 +108,22 @@ public class OgnlUtil {
}
}
+ @Inject(value = XWorkConstants.OGNL_EXCLUDED_PACKAGE_NAME_PATTERNS, required = false)
+ public void setExcludedPackageName(String commaDelimitedPackagePatterns) {
+ Set<String> packagePatterns = TextParseUtil.commaDelimitedStringToSet(commaDelimitedPackagePatterns);
+ for (String pattern : packagePatterns) {
+ excludedPackageNamePatterns.add(Pattern.compile(pattern));
+ }
+ }
+
public Set<Class<?>> getExcludedClasses() {
return excludedClasses;
}
+ public Set<Pattern> getExcludedPackageNamePatterns() {
+ return excludedPackageNamePatterns;
+ }
+
@Inject
public void setContainer(Container container) {
this.container = container;
@@ -568,6 +582,7 @@ public class OgnlUtil {
SecurityMemberAccess memberAccess = new SecurityMemberAccess(allowStaticMethodAccess);
memberAccess.setExcludedClasses(excludedClasses);
+ memberAccess.setExcludedPackageNamePatterns(excludedPackageNamePatterns);
return Ognl.createDefaultContext(root, resolver, defaultConverter, memberAccess);
}
http://git-wip-us.apache.org/repos/asf/struts/blob/4ee18f96/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
index 1e4a576..acf54c4 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
@@ -80,6 +80,7 @@ public class OgnlValueStack implements Serializable, ValueStack, ClearableValueS
public void setOgnlUtil(OgnlUtil ognlUtil) {
this.ognlUtil = ognlUtil;
securityMemberAccess.setExcludedClasses(ognlUtil.getExcludedClasses());
+ securityMemberAccess.setExcludedPackageNamePatterns(ognlUtil.getExcludedPackageNamePatterns());
}
protected void setRoot(XWorkConverter xworkConverter, CompoundRootAccessor accessor, CompoundRoot compoundRoot,
[50/50] git commit: Merge branch 'develop' into
feature/WW-4295-localization
Posted by lu...@apache.org.
Merge branch 'develop' into feature/WW-4295-localization
Conflicts:
core/src/site/resources/tags/checkboxlist.html
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d20c2f10
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d20c2f10
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d20c2f10
Branch: refs/heads/feature/WW-4295-localization
Commit: d20c2f10b7ccb2830eb255062b45941684b55336
Parents: d67fce1 63de773
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri Jun 27 13:15:10 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri Jun 27 13:15:10 2014 +0200
----------------------------------------------------------------------
apps/blank/pom.xml | 2 +-
apps/jboss-blank/pom.xml | 2 +-
apps/mailreader/pom.xml | 2 +-
apps/pom.xml | 2 +-
apps/portlet/pom.xml | 2 +-
apps/rest-showcase/pom.xml | 4 +-
apps/showcase/pom.xml | 2 +-
archetypes/pom.xml | 2 +-
archetypes/struts2-archetype-angularjs/pom.xml | 2 +-
archetypes/struts2-archetype-blank/pom.xml | 2 +-
.../src/main/resources/example.xml | 6 +-
.../main/webapp/WEB-INF/example/HelloWorld.jsp | 28 ++
.../src/main/webapp/WEB-INF/example/Login.jsp | 15 +
.../src/main/webapp/WEB-INF/example/Menu.jsp | 3 +
.../src/main/webapp/WEB-INF/example/Missing.jsp | 11 +
.../main/webapp/WEB-INF/example/Register.jsp | 3 +
.../src/main/webapp/WEB-INF/example/Welcome.jsp | 18 +
.../src/main/webapp/example/HelloWorld.jsp | 28 --
.../src/main/webapp/example/Login.jsp | 15 -
.../src/main/webapp/example/Menu.jsp | 3 -
.../src/main/webapp/example/Missing.jsp | 11 -
.../src/main/webapp/example/Register.jsp | 3 -
.../src/main/webapp/example/Welcome.jsp | 18 -
archetypes/struts2-archetype-convention/pom.xml | 2 +-
archetypes/struts2-archetype-dbportlet/pom.xml | 2 +-
archetypes/struts2-archetype-plugin/pom.xml | 2 +-
archetypes/struts2-archetype-portlet/pom.xml | 2 +-
archetypes/struts2-archetype-starter/pom.xml | 2 +-
.../src/main/resources/struts.xml | 4 +-
.../src/main/webapp/WEB-INF/jsp/helloWorld.jsp | 16 +
.../src/main/webapp/WEB-INF/jsp/index.jsp | 20 +
.../src/main/webapp/jsp/helloWorld.jsp | 16 -
.../src/main/webapp/jsp/index.jsp | 20 -
assembly/pom.xml | 88 ++---
assembly/src/main/assembly/all.xml | 12 +-
assembly/src/main/assembly/docs.xml | 2 +-
bundles/admin/pom.xml | 2 +-
bundles/demo/pom.xml | 2 +-
bundles/pom.xml | 2 +-
core/pom.xml | 2 +-
.../org/apache/struts2/StrutsConstants.java | 16 +
.../struts2/components/DateTextField.java | 51 +++
.../struts2/components/GenericUIBean.java | 5 +-
.../org/apache/struts2/components/UIBean.java | 9 +-
.../config/DefaultBeanSelectionProvider.java | 22 +-
.../dispatcher/ServletRedirectResult.java | 48 ++-
.../struts2/dispatcher/StrutsResultSupport.java | 75 +++-
.../struts2/interceptor/CookieInterceptor.java | 75 +++-
.../interceptor/DateTextFieldInterceptor.java | 128 +++++++
.../views/freemarker/FreemarkerResult.java | 18 +-
.../struts2/views/jsp/ui/DateTextFieldTag.java | 35 ++
.../org/apache/struts2/default.properties | 6 +-
.../struts2/interceptor/debugging/browser.ftl | 21 +-
.../struts2/interceptor/debugging/console.ftl | 4 +-
.../interceptor/debugging/webconsole.html | 30 +-
.../struts2/interceptor/debugging/webconsole.js | 99 +++--
core/src/main/resources/struts-default.xml | 32 +-
.../resources/template/css_xhtml/checkbox.ftl | 17 +-
.../template/css_xhtml/controlfooter.ftl | 7 +-
.../template/css_xhtml/controlheader-core.ftl | 9 +-
.../template/css_xhtml/controlheader.ftl | 7 +-
.../main/resources/template/css_xhtml/reset.ftl | 9 +-
.../template/css_xhtml/submit-close.ftl | 7 +-
.../resources/template/css_xhtml/submit.ftl | 7 +-
.../resources/template/simple/checkboxlist.ftl | 14 +-
.../main/resources/template/simple/radiomap.ftl | 8 -
.../main/resources/template/xhtml/checkbox.ftl | 15 +-
.../template/xhtml/controlheader-core.ftl | 9 +-
core/src/site/resources/tags/datetextfield.html | 376 +++++++++++++++++++
.../struts2/TestConfigurationProvider.java | 5 +
.../dispatcher/ServletRedirectResultTest.java | 109 ++++--
.../dispatcher/StrutsResultSupportTest.java | 31 ++
.../interceptor/CookieInterceptorTest.java | 130 +++++++
.../DateTextFieldInterceptorTest.java | 58 +++
.../ExecuteAndWaitInterceptorTest.java | 2 +
.../views/freemarker/FreeMarkerResultTest.java | 3 +
.../struts2/views/jsp/PropertyTagTest.java | 30 +-
.../struts2/views/jsp/ui/FormTagTest.java | 82 ++++
.../apache/struts2/views/jsp/ui/SelectTest.java | 2 +-
.../apache/struts2/views/jsp/ui/Formtag-27.txt | 10 +
.../apache/struts2/views/jsp/ui/Formtag-28.txt | 10 +
plugins/cdi/pom.xml | 2 +-
plugins/codebehind/pom.xml | 2 +-
plugins/config-browser/pom.xml | 2 +-
plugins/convention/pom.xml | 2 +-
plugins/dojo/pom.xml | 2 +-
plugins/dwr/pom.xml | 2 +-
plugins/embeddedjsp/pom.xml | 2 +-
plugins/gxp/pom.xml | 2 +-
plugins/jasperreports/pom.xml | 2 +-
plugins/javatemplates/pom.xml | 2 +-
.../apache/struts2/views/java/DefaultTheme.java | 6 +-
.../views/java/simple/DateTextFieldHandler.java | 91 +++++
.../struts2/views/java/simple/SimpleTheme.java | 1 +
.../views/java/simple/DateTextFieldTest.java | 51 +++
plugins/jfreechart/pom.xml | 2 +-
plugins/jsf/pom.xml | 2 +-
plugins/json/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
plugins/osgi/pom.xml | 2 +-
plugins/oval/pom.xml | 2 +-
plugins/pell-multipart/pom.xml | 2 +-
plugins/plexus/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/portlet-tiles/pom.xml | 2 +-
plugins/portlet/pom.xml | 2 +-
plugins/rest/pom.xml | 4 +-
.../struts2/rest/RestActionInvocationTest.java | 2 +
plugins/sitegraph/pom.xml | 2 +-
plugins/sitemesh/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/struts1/pom.xml | 2 +-
plugins/testng/pom.xml | 2 +-
plugins/tiles/pom.xml | 2 +-
plugins/tiles3/pom.xml | 2 +-
pom.xml | 14 +-
src/site/resources/archetype-catalog.xml | 12 +-
xwork-core/pom.xml | 2 +-
.../xwork2/DefaultActionInvocation.java | 54 +--
.../com/opensymphony/xwork2/XWorkConstants.java | 10 +
.../xwork2/config/entities/ActionConfig.java | 1 +
.../config/entities/ExceptionMappingConfig.java | 1 +
.../config/entities/InterceptorConfig.java | 1 +
.../config/entities/InterceptorStackConfig.java | 1 +
.../xwork2/config/entities/PackageConfig.java | 1 +
.../xwork2/config/entities/ResultConfig.java | 1 +
.../config/entities/ResultTypeConfig.java | 1 +
.../config/entities/UnknownHandlerConfig.java | 8 +-
.../config/impl/DefaultConfiguration.java | 7 +
.../providers/XWorkConfigurationProvider.java | 11 +-
.../providers/XmlConfigurationProvider.java | 5 +-
.../conversion/impl/DefaultTypeConverter.java | 4 +-
.../xwork2/interceptor/I18nInterceptor.java | 2 +-
.../interceptor/ParametersInterceptor.java | 127 ++++---
.../opensymphony/xwork2/mock/MockResult.java | 2 +
.../com/opensymphony/xwork2/ognl/OgnlUtil.java | 158 ++++++--
.../xwork2/ognl/OgnlValueStack.java | 6 +-
.../xwork2/ognl/SecurityMemberAccess.java | 50 ++-
.../ognl/accessor/CompoundRootAccessor.java | 27 +-
.../security/AcceptedPatternsChecker.java | 82 ++++
.../DefaultAcceptedPatternsChecker.java | 86 +++++
.../DefaultExcludedPatternsChecker.java | 95 +++++
.../security/ExcludedPatternsChecker.java | 82 ++++
.../xwork2/spring/SpringObjectFactory.java | 2 +-
.../opensymphony/xwork2/util/TextParseUtil.java | 87 +++++
.../xwork2/util/logging/Logger.java | 4 +
.../util/logging/commons/CommonsLogger.java | 4 +
.../xwork2/util/logging/jdk/JdkLogger.java | 4 +
.../xwork2/util/logging/slf4j/Slf4jLogger.java | 4 +
.../validator/DelegatingValidatorContext.java | 21 +-
.../xwork2/DefaultActionInvocationTest.java | 8 +
.../impl/AnnotationXWorkConverterTest.java | 10 +-
.../interceptor/ParametersInterceptorTest.java | 168 ++++++++-
.../opensymphony/xwork2/ognl/OgnlUtilTest.java | 164 +++++++-
.../xwork2/ognl/OgnlValueStackTest.java | 1 +
.../xwork2/ognl/SecurityMemberAccessTest.java | 236 ++++++++++++
.../DefaultAcceptedPatternsCheckerTest.java | 56 +++
.../DefaultExcludedPatternsCheckerTest.java | 60 +++
.../xwork2/util/TextParseUtilTest.java | 45 ++-
.../validator/VisitorFieldValidatorTest.java | 2 +-
.../xwork2/AnnotatedTestBean.properties | 5 -
.../TestBean-beanMessageBundle-validation.xml | 2 +-
.../test/resources/xwork-class-param-test.xml | 11 +
.../src/test/resources/xwork-param-test.xml | 1 +
.../src/test/resources/xwork-test-beans.xml | 24 +-
165 files changed, 3335 insertions(+), 657 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/d20c2f10/core/src/main/resources/template/simple/checkboxlist.ftl
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/d20c2f10/core/src/main/resources/template/simple/radiomap.ftl
----------------------------------------------------------------------
[25/50] git commit: Uses newly defined Struts bean instead
duplicating logic
Posted by lu...@apache.org.
Uses newly defined Struts bean instead duplicating logic
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/735fd961
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/735fd961
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/735fd961
Branch: refs/heads/feature/WW-4295-localization
Commit: 735fd96114413181defb17cd49aa75da232a7040
Parents: 9884c49
Author: Lukasz Lenart <lu...@apache.org>
Authored: Mon May 12 08:27:30 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Mon May 12 08:27:30 2014 +0200
----------------------------------------------------------------------
.../struts2/interceptor/CookieInterceptor.java | 49 ++++++++------------
.../interceptor/CookieInterceptorTest.java | 11 +++++
2 files changed, 30 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/735fd961/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
index 340b57f..8998c5c 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
@@ -23,17 +23,18 @@ package org.apache.struts2.interceptor;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
-import com.opensymphony.xwork2.ExcludedPatterns;
+import com.opensymphony.xwork2.ExcludedPatternsChecker;
import com.opensymphony.xwork2.util.TextParseUtil;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.StrutsConstants;
import javax.servlet.http.Cookie;
import java.util.Collections;
-import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
@@ -176,12 +177,12 @@ public class CookieInterceptor extends AbstractInterceptor {
// Allowed names of cookies
private Pattern acceptedPattern = Pattern.compile(ACCEPTED_PATTERN, Pattern.CASE_INSENSITIVE);
- private Set<Pattern> excludedPatterns = new HashSet<Pattern>();
- public CookieInterceptor() {
- for (String pattern : ExcludedPatterns.EXCLUDED_PATTERNS) {
- excludedPatterns.add(Pattern.compile(pattern, Pattern.CASE_INSENSITIVE));
- }
+ private ExcludedPatternsChecker excludedPatternsChecker;
+
+ @Inject(StrutsConstants.STRUTS_EXCLUDED_PATTERNS_CHECKER)
+ public void setExcludedPatternsChecker(ExcludedPatternsChecker excludedPatternsChecker) {
+ this.excludedPatternsChecker = excludedPatternsChecker;
}
/**
@@ -260,16 +261,7 @@ public class CookieInterceptor extends AbstractInterceptor {
* @return true|false
*/
protected boolean isAcceptableValue(String value) {
- for (Pattern excludedPattern : excludedPatterns) {
- boolean matches = !excludedPattern.matcher(value).matches();
- if (!matches) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Cookie value [#0] matches excludedPattern [#1]", value, excludedPattern.toString());
- }
- return false;
- }
- }
- return true;
+ return !isExcluded(value) && isAccepted(value);
}
/**
@@ -283,7 +275,7 @@ public class CookieInterceptor extends AbstractInterceptor {
}
/**
- * Checks if name of Cookie match {@link #acceptedPattern}
+ * Checks if name/value of Cookie is acceptable
*
* @param name of Cookie
* @return true|false
@@ -303,24 +295,21 @@ public class CookieInterceptor extends AbstractInterceptor {
}
/**
- * Checks if name of Cookie match {@link #excludedPatterns}
+ * Checks if name/value of Cookie is excluded
*
* @param name of Cookie
* @return true|false
*/
protected boolean isExcluded(String name) {
- for (Pattern excludedPattern : excludedPatterns) {
- boolean matches = excludedPattern.matcher(name).matches();
- if (matches) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Cookie [#0] matches excludedPattern [#1]", name, excludedPattern.toString());
- }
- return true;
- } else {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Cookie [#0] doesn't match excludedPattern [#1]", name, excludedPattern.toString());
- }
+ ExcludedPatternsChecker.IsExcluded excluded = excludedPatternsChecker.isExcluded(name);
+ if (excluded.isExcluded()) {
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Cookie [#0] matches excludedPattern [#1]", name, excluded.getExcludedPattern());
}
+ return true;
+ }
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Cookie [#0] doesn't match excludedPattern [#1]", name, excluded.getExcludedPattern());
}
return false;
}
http://git-wip-us.apache.org/repos/asf/struts/blob/735fd961/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
index 99ba151..2bbaef9 100644
--- a/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
+++ b/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
@@ -27,6 +27,7 @@ import java.util.Map;
import javax.servlet.http.Cookie;
+import com.opensymphony.xwork2.ExcludedPatternsChecker;
import com.opensymphony.xwork2.mock.MockActionInvocation;
import org.easymock.MockControl;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -65,6 +66,8 @@ public class CookieInterceptorTest extends StrutsInternalTestCase {
// by default the interceptor doesn't accept any cookies
CookieInterceptor interceptor = new CookieInterceptor();
+ interceptor.setExcludedPatternsChecker(new ExcludedPatternsChecker());
+
interceptor.intercept(invocation);
assertTrue(action.getCookiesMap().isEmpty());
@@ -99,6 +102,7 @@ public class CookieInterceptorTest extends StrutsInternalTestCase {
actionInvocationControl.replay();
CookieInterceptor interceptor = new CookieInterceptor();
+ interceptor.setExcludedPatternsChecker(new ExcludedPatternsChecker());
interceptor.setCookiesName("*");
interceptor.setCookiesValue("*");
interceptor.intercept(invocation);
@@ -140,6 +144,7 @@ public class CookieInterceptorTest extends StrutsInternalTestCase {
actionInvocationControl.replay();
CookieInterceptor interceptor = new CookieInterceptor();
+ interceptor.setExcludedPatternsChecker(new ExcludedPatternsChecker());
interceptor.setCookiesName("cookie1, cookie2, cookie3");
interceptor.setCookiesValue("cookie1value, cookie2value, cookie3value");
interceptor.intercept(invocation);
@@ -180,6 +185,7 @@ public class CookieInterceptorTest extends StrutsInternalTestCase {
actionInvocationControl.replay();
CookieInterceptor interceptor = new CookieInterceptor();
+ interceptor.setExcludedPatternsChecker(new ExcludedPatternsChecker());
interceptor.setCookiesName("cookie1, cookie3");
interceptor.setCookiesValue("cookie1value, cookie2value, cookie3value");
interceptor.intercept(invocation);
@@ -220,6 +226,7 @@ public class CookieInterceptorTest extends StrutsInternalTestCase {
actionInvocationControl.replay();
CookieInterceptor interceptor = new CookieInterceptor();
+ interceptor.setExcludedPatternsChecker(new ExcludedPatternsChecker());
interceptor.setCookiesName("cookie1, cookie3");
interceptor.setCookiesValue("*");
interceptor.intercept(invocation);
@@ -260,6 +267,7 @@ public class CookieInterceptorTest extends StrutsInternalTestCase {
actionInvocationControl.replay();
CookieInterceptor interceptor = new CookieInterceptor();
+ interceptor.setExcludedPatternsChecker(new ExcludedPatternsChecker());
interceptor.setCookiesName("cookie1, cookie3");
interceptor.setCookiesValue("");
interceptor.intercept(invocation);
@@ -301,6 +309,7 @@ public class CookieInterceptorTest extends StrutsInternalTestCase {
actionInvocationControl.replay();
CookieInterceptor interceptor = new CookieInterceptor();
+ interceptor.setExcludedPatternsChecker(new ExcludedPatternsChecker());
interceptor.setCookiesName("cookie1, cookie3");
interceptor.setCookiesValue("cookie1value");
interceptor.intercept(invocation);
@@ -361,6 +370,7 @@ public class CookieInterceptorTest extends StrutsInternalTestCase {
return accepted;
}
};
+ interceptor.setExcludedPatternsChecker(new ExcludedPatternsChecker());
interceptor.setCookiesName("*");
MockActionInvocation invocation = new MockActionInvocation();
@@ -420,6 +430,7 @@ public class CookieInterceptorTest extends StrutsInternalTestCase {
return accepted;
}
};
+ interceptor.setExcludedPatternsChecker(new ExcludedPatternsChecker());
interceptor.setCookiesName("*");
MockActionInvocation invocation = new MockActionInvocation();
[38/50] git commit: Uses new service to check if param matches
accepted patterns
Posted by lu...@apache.org.
Uses new service to check if param matches accepted patterns
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/8a93df10
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/8a93df10
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/8a93df10
Branch: refs/heads/feature/WW-4295-localization
Commit: 8a93df10c4f5f3f22f1837c47b4ca9b4facc4f94
Parents: b140faa
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed May 21 09:03:51 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed May 21 09:03:51 2014 +0200
----------------------------------------------------------------------
.../org/apache/struts2/StrutsConstants.java | 4 +-
.../config/DefaultBeanSelectionProvider.java | 3 ++
core/src/main/resources/struts-default.xml | 1 +
.../providers/XWorkConfigurationProvider.java | 3 ++
.../interceptor/ParametersInterceptor.java | 56 +++++++++-----------
.../interceptor/ParametersInterceptorTest.java | 11 +---
6 files changed, 37 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/8a93df10/core/src/main/java/org/apache/struts2/StrutsConstants.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/StrutsConstants.java b/core/src/main/java/org/apache/struts2/StrutsConstants.java
index d173add..8c0c5ce 100644
--- a/core/src/main/java/org/apache/struts2/StrutsConstants.java
+++ b/core/src/main/java/org/apache/struts2/StrutsConstants.java
@@ -285,10 +285,12 @@ public final class StrutsConstants {
/** Comma delimited set of excluded classes which cannot be accessed via expressions **/
public static final String STRUTS_EXCLUDED_CLASSES = "struts.excludedClasses";
- /** Dedicated service to check if passed string is excluded or not **/
+ /** Dedicated services to check if passed string is excluded/accepted **/
public static final String STRUTS_EXCLUDED_PATTERNS_CHECKER = "struts.excludedPatterns.checker";
+ public static final String STRUTS_ACCEPTED_PATTERNS_CHECKER = "struts.acceptedPatterns.checker";
/** Constant is used to override framework's default excluded patterns **/
public static final String STRUTS_OVERRIDE_EXCLUDED_PATTERNS = "struts.override.excludedPatterns";
+ public static final String STRUTS_OVERRIDE_ACCEPTED_PATTERNS = "struts.override.acceptedPatterns";
}
http://git-wip-us.apache.org/repos/asf/struts/blob/8a93df10/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
index be4fa82..4334d3c 100644
--- a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
+++ b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
@@ -22,6 +22,7 @@
package org.apache.struts2.config;
import com.opensymphony.xwork2.ActionProxyFactory;
+import com.opensymphony.xwork2.security.AcceptedPatternsChecker;
import com.opensymphony.xwork2.security.ExcludedPatternsChecker;
import com.opensymphony.xwork2.FileManager;
import com.opensymphony.xwork2.FileManagerFactory;
@@ -392,6 +393,7 @@ public class DefaultBeanSelectionProvider extends AbstractBeanSelectionProvider
/** Checker is used mostly in interceptors, so there be one instance of checker per interceptor with Scope.DEFAULT **/
alias(ExcludedPatternsChecker.class, StrutsConstants.STRUTS_EXCLUDED_PATTERNS_CHECKER, builder, props, Scope.DEFAULT);
+ alias(AcceptedPatternsChecker.class, StrutsConstants.STRUTS_ACCEPTED_PATTERNS_CHECKER, builder, props, Scope.DEFAULT);
switchDevMode(props);
@@ -403,6 +405,7 @@ public class DefaultBeanSelectionProvider extends AbstractBeanSelectionProvider
convertIfExist(props, StrutsConstants.STRUTS_CONFIGURATION_XML_RELOAD, XWorkConstants.RELOAD_XML_CONFIGURATION);
convertIfExist(props, StrutsConstants.STRUTS_EXCLUDED_CLASSES, XWorkConstants.OGNL_EXCLUDED_CLASSES);
convertIfExist(props, StrutsConstants.STRUTS_OVERRIDE_EXCLUDED_PATTERNS, XWorkConstants.OVERRIDE_EXCLUDED_PATTERNS);
+ convertIfExist(props, StrutsConstants.STRUTS_OVERRIDE_ACCEPTED_PATTERNS, XWorkConstants.OVERRIDE_ACCEPTED_PATTERNS);
LocalizedTextUtil.addDefaultResourceBundle("org/apache/struts2/struts-messages");
loadCustomResourceBundles(props);
http://git-wip-us.apache.org/repos/asf/struts/blob/8a93df10/core/src/main/resources/struts-default.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
index 2fc16c9..a1aa63f 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -145,6 +145,7 @@
<bean type="ognl.PropertyAccessor" name="java.util.HashMap" class="com.opensymphony.xwork2.ognl.accessor.XWorkMapPropertyAccessor" />
<bean type="com.opensymphony.xwork2.security.ExcludedPatternsChecker" name="struts" class="com.opensymphony.xwork2.security.DefaultExcludedPatternsChecker" />
+ <bean type="com.opensymphony.xwork2.security.AcceptedPatternsChecker" name="struts" class="com.opensymphony.xwork2.security.DefaultAcceptedPatternsChecker" />
<package name="struts-default" abstract="true">
<result-types>
http://git-wip-us.apache.org/repos/asf/struts/blob/8a93df10/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java b/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
index 9f28334..19e8e76 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
@@ -2,6 +2,8 @@ package com.opensymphony.xwork2.config.providers;
import com.opensymphony.xwork2.ActionProxyFactory;
import com.opensymphony.xwork2.DefaultActionProxyFactory;
+import com.opensymphony.xwork2.security.AcceptedPatternsChecker;
+import com.opensymphony.xwork2.security.DefaultAcceptedPatternsChecker;
import com.opensymphony.xwork2.security.DefaultExcludedPatternsChecker;
import com.opensymphony.xwork2.DefaultLocaleProvider;
import com.opensymphony.xwork2.DefaultTextProvider;
@@ -173,6 +175,7 @@ public class XWorkConfigurationProvider implements ConfigurationProvider {
.factory(StringConverter.class, Scope.SINGLETON)
.factory(ExcludedPatternsChecker.class, DefaultExcludedPatternsChecker.class, Scope.DEFAULT)
+ .factory(AcceptedPatternsChecker.class, DefaultAcceptedPatternsChecker.class, Scope.DEFAULT)
;
props.setProperty(XWorkConstants.DEV_MODE, Boolean.FALSE.toString());
http://git-wip-us.apache.org/repos/asf/struts/blob/8a93df10/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
index f1906b0..c1b2f3d 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
@@ -17,6 +17,7 @@ package com.opensymphony.xwork2.interceptor;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.security.AcceptedPatternsChecker;
import com.opensymphony.xwork2.security.ExcludedPatternsChecker;
import com.opensymphony.xwork2.ValidationAware;
import com.opensymphony.xwork2.XWorkConstants;
@@ -151,9 +152,8 @@ public class ParametersInterceptor extends MethodFilterInterceptor {
protected boolean ordered = false;
- protected Set<Pattern> acceptParams = Collections.emptySet();
-
private ValueStackFactory valueStackFactory;
+ private AcceptedPatternsChecker acceptedPatterns;
@Inject
public void setValueStackFactory(ValueStackFactory valueStackFactory) {
@@ -170,23 +170,9 @@ public class ParametersInterceptor extends MethodFilterInterceptor {
this.excludedPatterns = excludedPatterns;
}
- /**
- * Sets a comma-delimited list of regular expressions to match
- * parameters that are allowed in the parameter map (aka whitelist).
- * <p/>
- * Don't change the default unless you know what you are doing in terms
- * of security implications.
- *
- * @param commaDelim A comma-delimited list of regular expressions
- */
- public void setAcceptParamNames(String commaDelim) {
- Collection<String> acceptPatterns = ArrayUtils.asCollection(commaDelim);
- if (acceptPatterns != null) {
- acceptParams = new HashSet<Pattern>();
- for (String pattern : acceptPatterns) {
- acceptParams.add(Pattern.compile(pattern));
- }
- }
+ @Inject
+ public void setAcceptedPatterns(AcceptedPatternsChecker acceptedPatterns) {
+ this.acceptedPatterns = acceptedPatterns;
}
/**
@@ -312,7 +298,7 @@ public class ParametersInterceptor extends MethodFilterInterceptor {
//block or allow access to properties
//see WW-2761 for more details
MemberAccessValueStack accessValueStack = (MemberAccessValueStack) newStack;
- accessValueStack.setAcceptProperties(acceptParams);
+ accessValueStack.setAcceptProperties(acceptedPatterns.getAcceptedPatterns());
accessValueStack.setExcludeProperties(excludedPatterns.getExcludedPatterns());
}
@@ -419,23 +405,18 @@ public class ParametersInterceptor extends MethodFilterInterceptor {
}
protected boolean isAccepted(String paramName) {
- if (!this.acceptParams.isEmpty()) {
- for (Pattern pattern : acceptParams) {
- Matcher matcher = pattern.matcher(paramName);
- if (matcher.matches()) {
- return true;
- }
- }
- notifyDeveloper("Parameter [#0] didn't match acceptParams list of patterns!", paramName);
- return false;
+ AcceptedPatternsChecker.IsAccepted result = acceptedPatterns.isAccepted(paramName);
+ if (result.isAccepted()) {
+ return true;
}
- return true;
+ notifyDeveloper("Parameter [#0] didn't match accepted pattern [#1]!", paramName, String.valueOf(result.getAcceptedPattern()));
+ return false;
}
protected boolean isExcluded(String paramName) {
ExcludedPatternsChecker.IsExcluded result = excludedPatterns.isExcluded(paramName);
if (result.isExcluded()) {
- notifyDeveloper("Parameter [#0] is on the excludeParams list of patterns!", paramName);
+ notifyDeveloper("Parameter [#0] matches excluded pattern [#1]!", paramName, String.valueOf(result.getExcludedPattern()));
return true;
}
return false;
@@ -471,6 +452,19 @@ public class ParametersInterceptor extends MethodFilterInterceptor {
/**
* Sets a comma-delimited list of regular expressions to match
+ * parameters that are allowed in the parameter map (aka whitelist).
+ * <p/>
+ * Don't change the default unless you know what you are doing in terms
+ * of security implications.
+ *
+ * @param commaDelim A comma-delimited list of regular expressions
+ */
+ public void setAcceptParamNames(String commaDelim) {
+ acceptedPatterns.addAcceptedPatterns(commaDelim);
+ }
+
+ /**
+ * Sets a comma-delimited list of regular expressions to match
* parameters that should be removed from the parameter map.
*
* @param commaDelim A comma-delimited list of regular expressions
http://git-wip-us.apache.org/repos/asf/struts/blob/8a93df10/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
index 156c012..ce86051 100644
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
@@ -373,7 +373,7 @@ public class ParametersInterceptorTest extends XWorkTestCase {
ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.PARAM_INTERCEPTOR_ACTION_NAME, null, extraContext);
proxy.execute();
Map<String, String> existingMap = ((SimpleAction) proxy.getAction()).getTheProtectedMap();
- assertEquals(4, existingMap.size());
+ assertEquals(0, existingMap.size());
}
public void testParametersWithChineseInTheName() throws Exception {
@@ -479,7 +479,7 @@ public class ParametersInterceptorTest extends XWorkTestCase {
proxy.execute();
SimpleAction action = (SimpleAction) proxy.getAction();
- assertNull(action.getName());
+ assertEquals("try_1", action.getName());
assertEquals("This is blah", (action).getBlah());
assertEquals(123, action.getBaz());
}
@@ -700,13 +700,6 @@ public class ParametersInterceptorTest extends XWorkTestCase {
final Map<String, Object> expected = new HashMap<String, Object>() {
{
put("ordinary.bean", "value");
- put("#some.internal.object", "true");
- put("(bla)#some.internal.object", "true");
- put("#some.internal.object(bla)#some.internal.object", "true");
- put("#_some.internal.object", "true");
- put("\u0023_some.internal.object", "true");
- put("\u0023_some.internal.object,[dfd],bla(\u0023_some.internal.object)", "true");
- put("\\u0023_some.internal.object", "true");
}
};
[26/50] git commit: Adds description about new extension point
Posted by lu...@apache.org.
Adds description about new extension point
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/ba1850a1
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ba1850a1
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ba1850a1
Branch: refs/heads/feature/WW-4295-localization
Commit: ba1850a1382765eb51c58103a8c5ee7c0d9417f4
Parents: 735fd96
Author: Lukasz Lenart <lu...@apache.org>
Authored: Tue May 13 20:28:26 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Tue May 13 20:28:26 2014 +0200
----------------------------------------------------------------------
.../apache/struts2/config/DefaultBeanSelectionProvider.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/ba1850a1/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
index 5304910..5296b41 100644
--- a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
+++ b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
@@ -313,6 +313,12 @@ import java.util.StringTokenizer;
* <td>Used to parse expressions like ${foo.bar} or %{bar.foo} but it is up tp the TextParser's
* implementation what kind of opening char to use (#, $, %, etc)</td>
* </tr>
+ * <tr>
+ * <td>com.opensymphony.xwork2.ExcludedPatternsChecker</td>
+ * <td>struts.excludedPatterns.checker</td>
+ * <td>request</td>
+ * <td>Used across different interceptors to check if given string matches one of the excluded patterns</td>
+ * </tr>
* </table>
*
* <!-- END SNIPPET: extensionPoints -->
[43/50] git commit: Adds option to define additional
accepted/excluded patterns Also all patterns are by default case insensitive
Posted by lu...@apache.org.
Adds option to define additional accepted/excluded patterns
Also all patterns are by default case insensitive
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/89cbe138
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/89cbe138
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/89cbe138
Branch: refs/heads/feature/WW-4295-localization
Commit: 89cbe13853a849340d740d45685e6fd14da93d9b
Parents: 2df72b9
Author: Lukasz Lenart <lu...@apache.org>
Authored: Sun Jun 1 10:33:39 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Sun Jun 1 10:33:39 2014 +0200
----------------------------------------------------------------------
.../org/apache/struts2/StrutsConstants.java | 3 ++
.../config/DefaultBeanSelectionProvider.java | 2 +
.../com/opensymphony/xwork2/XWorkConstants.java | 3 ++
.../DefaultAcceptedPatternsChecker.java | 18 +++----
.../DefaultExcludedPatternsChecker.java | 28 ++++++----
.../DefaultAcceptedPatternsCheckerTest.java | 56 ++++++++++++++++++++
.../DefaultExcludedPatternsCheckerTest.java | 56 ++++++++++++++++++++
7 files changed, 147 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/89cbe138/core/src/main/java/org/apache/struts2/StrutsConstants.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/StrutsConstants.java b/core/src/main/java/org/apache/struts2/StrutsConstants.java
index dd08993..918f91b 100644
--- a/core/src/main/java/org/apache/struts2/StrutsConstants.java
+++ b/core/src/main/java/org/apache/struts2/StrutsConstants.java
@@ -294,4 +294,7 @@ public final class StrutsConstants {
public static final String STRUTS_OVERRIDE_EXCLUDED_PATTERNS = "struts.override.excludedPatterns";
public static final String STRUTS_OVERRIDE_ACCEPTED_PATTERNS = "struts.override.acceptedPatterns";
+ public static final String STRUTS_ADDITIONAL_EXCLUDED_PATTERNS = "struts.additional.excludedPatterns";
+ public static final String STRUTS_ADDITIONAL_ACCEPTED_PATTERNS = "struts.additional.acceptedPatterns";
+
}
http://git-wip-us.apache.org/repos/asf/struts/blob/89cbe138/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
index a671133..06b7302 100644
--- a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
+++ b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
@@ -407,6 +407,8 @@ public class DefaultBeanSelectionProvider extends AbstractBeanSelectionProvider
convertIfExist(props, StrutsConstants.STRUTS_EXCLUDED_CLASSES, XWorkConstants.OGNL_EXCLUDED_CLASSES);
convertIfExist(props, StrutsConstants.STRUTS_EXCLUDED_PACKAGE_NAME_PATTERNS, XWorkConstants.OGNL_EXCLUDED_PACKAGE_NAME_PATTERNS);
+ convertIfExist(props, StrutsConstants.STRUTS_ADDITIONAL_EXCLUDED_PATTERNS, XWorkConstants.ADDITIONAL_EXCLUDED_PATTERNS);
+ convertIfExist(props, StrutsConstants.STRUTS_ADDITIONAL_ACCEPTED_PATTERNS, XWorkConstants.ADDITIONAL_ACCEPTED_PATTERNS);
convertIfExist(props, StrutsConstants.STRUTS_OVERRIDE_EXCLUDED_PATTERNS, XWorkConstants.OVERRIDE_EXCLUDED_PATTERNS);
convertIfExist(props, StrutsConstants.STRUTS_OVERRIDE_ACCEPTED_PATTERNS, XWorkConstants.OVERRIDE_ACCEPTED_PATTERNS);
http://git-wip-us.apache.org/repos/asf/struts/blob/89cbe138/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java b/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
index 830df78..433b005 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
@@ -21,6 +21,9 @@ public final class XWorkConstants {
public static final String OGNL_EXCLUDED_CLASSES = "ognlExcludedClasses";
public static final String OGNL_EXCLUDED_PACKAGE_NAME_PATTERNS = "ognlExcludedPackageNamePatterns";
+ public static final String ADDITIONAL_EXCLUDED_PATTERNS = "additionalExcludedPatterns";
+ public static final String ADDITIONAL_ACCEPTED_PATTERNS = "additionalAcceptedPatterns";
+
public static final String OVERRIDE_EXCLUDED_PATTERNS = "overrideExcludedPatterns";
public static final String OVERRIDE_ACCEPTED_PATTERNS = "overrideAcceptedPatterns";
http://git-wip-us.apache.org/repos/asf/struts/blob/89cbe138/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java b/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java
index fa1b8e1..970a52c 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java
@@ -24,7 +24,7 @@ public class DefaultAcceptedPatternsChecker implements AcceptedPatternsChecker {
public DefaultAcceptedPatternsChecker() {
acceptedPatterns = new HashSet<Pattern>();
for (String pattern : ACCEPTED_PATTERNS) {
- acceptedPatterns.add(Pattern.compile(pattern));
+ acceptedPatterns.add(Pattern.compile(pattern, Pattern.CASE_INSENSITIVE));
}
}
@@ -36,19 +36,17 @@ public class DefaultAcceptedPatternsChecker implements AcceptedPatternsChecker {
}
acceptedPatterns = new HashSet<Pattern>();
for (String pattern : TextParseUtil.commaDelimitedStringToSet(acceptablePatterns)) {
- acceptedPatterns.add(Pattern.compile(pattern));
+ acceptedPatterns.add(Pattern.compile(pattern, Pattern.CASE_INSENSITIVE));
}
}
- @Inject(value = XWorkConstants.OVERRIDE_ACCEPTED_PATTERNS, required = false)
- public void setOverrideExcludePatterns(String acceptPatterns) {
- if (LOG.isWarnEnabled()) {
- LOG.warn("Overriding [#0] with [#1], be aware that this can affect safety of your application!",
- XWorkConstants.OVERRIDE_ACCEPTED_PATTERNS, acceptedPatterns);
+ @Inject(value = XWorkConstants.ADDITIONAL_ACCEPTED_PATTERNS, required = false)
+ public void setAdditionalAcceptedPatterns(String acceptablePatterns) {
+ if (LOG.isDebugEnabled()) {
+ LOG.warn("Adding additional patterns [#0] to accepted patterns!", acceptablePatterns);
}
- acceptedPatterns = new HashSet<Pattern>();
- for (String pattern : TextParseUtil.commaDelimitedStringToSet(acceptPatterns)) {
- acceptedPatterns.add(Pattern.compile(pattern));
+ for (String pattern : TextParseUtil.commaDelimitedStringToSet(acceptablePatterns)) {
+ acceptedPatterns.add(Pattern.compile(pattern, Pattern.CASE_INSENSITIVE));
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/89cbe138/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java b/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
index 53854d3..f0a3d62 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
@@ -17,13 +17,13 @@ public class DefaultExcludedPatternsChecker implements ExcludedPatternsChecker {
public static final String[] EXCLUDED_PATTERNS = {
"(.*\\.|^|.*|\\[('|\"))class(\\.|('|\")]|\\[).*",
- "^dojo\\..*",
- "^struts\\..*",
- "^session\\..*",
- "^request\\..*",
- "^application\\..*",
- "^servlet(Request|Response)\\..*",
- "^parameters\\..*"
+ "(^|.*#)dojo(\\.|\\[).*",
+ "(^|.*#)struts(\\.|\\[).*",
+ "(^|.*#)session(\\.|\\[).*",
+ "(^|.*#)request(\\.|\\[).*",
+ "(^|.*#)application(\\.|\\[).*",
+ "(^|.*#)servlet(Request|Response)(\\.|\\[).*",
+ "(^|.*#)parameters(\\.|\\[).*"
};
private Set<Pattern> excludedPatterns;
@@ -31,7 +31,7 @@ public class DefaultExcludedPatternsChecker implements ExcludedPatternsChecker {
public DefaultExcludedPatternsChecker() {
excludedPatterns = new HashSet<Pattern>();
for (String pattern : EXCLUDED_PATTERNS) {
- excludedPatterns.add(Pattern.compile(pattern));
+ excludedPatterns.add(Pattern.compile(pattern, Pattern.CASE_INSENSITIVE));
}
}
@@ -43,7 +43,17 @@ public class DefaultExcludedPatternsChecker implements ExcludedPatternsChecker {
}
excludedPatterns = new HashSet<Pattern>();
for (String pattern : TextParseUtil.commaDelimitedStringToSet(excludePatterns)) {
- excludedPatterns.add(Pattern.compile(pattern));
+ excludedPatterns.add(Pattern.compile(pattern, Pattern.CASE_INSENSITIVE));
+ }
+ }
+
+ @Inject(value = XWorkConstants.ADDITIONAL_EXCLUDED_PATTERNS, required = false)
+ public void setAdditionalExcludePatterns(String excludePatterns) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Adding additional patterns [#0] to excluded patterns!", excludePatterns);
+ }
+ for (String pattern : TextParseUtil.commaDelimitedStringToSet(excludePatterns)) {
+ excludedPatterns.add(Pattern.compile(pattern, Pattern.CASE_INSENSITIVE));
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/89cbe138/xwork-core/src/test/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsCheckerTest.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsCheckerTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsCheckerTest.java
new file mode 100644
index 0000000..c2c079b
--- /dev/null
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsCheckerTest.java
@@ -0,0 +1,56 @@
+package com.opensymphony.xwork2.security;
+
+import com.opensymphony.xwork2.XWorkTestCase;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DefaultAcceptedPatternsCheckerTest extends XWorkTestCase {
+
+ public void testHardcodedAcceptedPatterns() throws Exception {
+ // given
+ List<String> params = new ArrayList<String>() {
+ {
+ add("%{#application['test']}");
+ add("%{#application.test}");
+ add("%{#Application['test']}");
+ add("%{#Application.test}");
+ add("%{#session['test']}");
+ add("%{#session.test}");
+ add("%{#Session['test']}");
+ add("%{#Session.test}");
+ add("%{#struts['test']}");
+ add("%{#struts.test}");
+ add("%{#Struts['test']}");
+ add("%{#Struts.test}");
+ add("%{#request['test']}");
+ add("%{#request.test}");
+ add("%{#Request['test']}");
+ add("%{#Request.test}");
+ add("%{#servletRequest['test']}");
+ add("%{#servletRequest.test}");
+ add("%{#ServletRequest['test']}");
+ add("%{#ServletRequest.test}");
+ add("%{#servletResponse['test']}");
+ add("%{#servletResponse.test}");
+ add("%{#ServletResponse['test']}");
+ add("%{#ServletResponse.test}");
+ add("%{#parameters['test']}");
+ add("%{#parameters.test}");
+ add("%{#Parameters['test']}");
+ add("%{#Parameters.test}");
+ }
+ };
+
+ AcceptedPatternsChecker checker = new DefaultAcceptedPatternsChecker();
+
+ for (String param : params) {
+ // when
+ AcceptedPatternsChecker.IsAccepted actual = checker.isAccepted(param);
+
+ // then
+ assertFalse("Access to " + param + " is possible!", actual.isAccepted());
+ }
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/struts/blob/89cbe138/xwork-core/src/test/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsCheckerTest.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsCheckerTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsCheckerTest.java
new file mode 100644
index 0000000..32121b9
--- /dev/null
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsCheckerTest.java
@@ -0,0 +1,56 @@
+package com.opensymphony.xwork2.security;
+
+import com.opensymphony.xwork2.XWorkTestCase;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DefaultExcludedPatternsCheckerTest extends XWorkTestCase {
+
+ public void testHardcodedPatterns() throws Exception {
+ // given
+ List<String> params = new ArrayList<String>() {
+ {
+ add("%{#application['test']}");
+ add("%{#application.test}");
+ add("%{#Application['test']}");
+ add("%{#Application.test}");
+ add("%{#session['test']}");
+ add("%{#session.test}");
+ add("%{#Session['test']}");
+ add("%{#Session.test}");
+ add("%{#struts['test']}");
+ add("%{#struts.test}");
+ add("%{#Struts['test']}");
+ add("%{#Struts.test}");
+ add("%{#request['test']}");
+ add("%{#request.test}");
+ add("%{#Request['test']}");
+ add("%{#Request.test}");
+ add("%{#servletRequest['test']}");
+ add("%{#servletRequest.test}");
+ add("%{#ServletRequest['test']}");
+ add("%{#ServletRequest.test}");
+ add("%{#servletResponse['test']}");
+ add("%{#servletResponse.test}");
+ add("%{#ServletResponse['test']}");
+ add("%{#ServletResponse.test}");
+ add("%{#parameters['test']}");
+ add("%{#parameters.test}");
+ add("%{#Parameters['test']}");
+ add("%{#Parameters.test}");
+ }
+ };
+
+ ExcludedPatternsChecker checker = new DefaultExcludedPatternsChecker();
+
+ for (String param : params) {
+ // when
+ ExcludedPatternsChecker.IsExcluded actual = checker.isExcluded(param);
+
+ // then
+ assertTrue("Access to " + param + " is possible!", actual.isExcluded());
+ }
+ }
+
+}
\ No newline at end of file
[47/50] git commit: Adds additional classes to be excluded
Posted by lu...@apache.org.
Adds additional classes to be excluded
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/96542871
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/96542871
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/96542871
Branch: refs/heads/feature/WW-4295-localization
Commit: 965428711572ad52d3713b3432ff38e1dd3e9dae
Parents: bbcc601
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Jun 18 08:45:56 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Jun 18 08:45:56 2014 +0200
----------------------------------------------------------------------
core/src/main/resources/struts-default.xml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/96542871/core/src/main/resources/struts-default.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
index 49eba90..ea2a631 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -42,13 +42,17 @@
value="
java.lang.Object,
java.lang.Runtime,
+ java.lang.System,
+ java.lang.Class,
+ java.lang.ClassLoader,
+ java.lang.Shutdown,
ognl.OgnlContext,
ognl.MemberAccess,
ognl.ClassResolver,
ognl.TypeConverter,
com.opensymphony.xwork2.ActionContext" />
<!-- this must be valid regex, each '.' in package name must be escaped! -->
- <constant name="struts.excludedPackageNamePatterns" value="^java\.lang.*,^ognl.*,^javax.*" />
+ <constant name="struts.excludedPackageNamePatterns" value="^java\.lang\..*,^ognl.*,^javax.*" />
<bean class="com.opensymphony.xwork2.ObjectFactory" name="struts"/>
<bean type="com.opensymphony.xwork2.factory.ResultFactory" name="struts" class="org.apache.struts2.factory.StrutsResultFactory" />
[19/50] git commit: Sets correct version in poms to match actually
released version
Posted by lu...@apache.org.
Sets correct version in poms to match actually released version
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d2663ced
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d2663ced
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d2663ced
Branch: refs/heads/feature/WW-4295-localization
Commit: d2663cedd264a5b26bc1b12035aff7b32e138f78
Parents: 38a3f8b
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu May 8 21:57:25 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu May 8 21:57:25 2014 +0200
----------------------------------------------------------------------
apps/blank/pom.xml | 2 +-
apps/jboss-blank/pom.xml | 2 +-
apps/mailreader/pom.xml | 2 +-
apps/pom.xml | 2 +-
apps/portlet/pom.xml | 2 +-
apps/rest-showcase/pom.xml | 4 ++--
apps/showcase/pom.xml | 2 +-
archetypes/pom.xml | 2 +-
archetypes/struts2-archetype-angularjs/pom.xml | 4 ++--
archetypes/struts2-archetype-blank/pom.xml | 4 ++--
archetypes/struts2-archetype-convention/pom.xml | 4 ++--
archetypes/struts2-archetype-dbportlet/pom.xml | 4 ++--
archetypes/struts2-archetype-plugin/pom.xml | 4 ++--
archetypes/struts2-archetype-portlet/pom.xml | 4 ++--
archetypes/struts2-archetype-starter/pom.xml | 4 ++--
assembly/pom.xml | 2 +-
bundles/admin/pom.xml | 2 +-
bundles/demo/pom.xml | 2 +-
bundles/pom.xml | 2 +-
core/pom.xml | 2 +-
plugins/cdi/pom.xml | 2 +-
plugins/codebehind/pom.xml | 2 +-
plugins/config-browser/pom.xml | 2 +-
plugins/convention/pom.xml | 2 +-
plugins/dojo/pom.xml | 2 +-
plugins/dwr/pom.xml | 2 +-
plugins/embeddedjsp/pom.xml | 2 +-
plugins/gxp/pom.xml | 2 +-
plugins/jasperreports/pom.xml | 2 +-
plugins/javatemplates/pom.xml | 2 +-
plugins/jfreechart/pom.xml | 2 +-
plugins/jsf/pom.xml | 2 +-
plugins/json/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
plugins/osgi/pom.xml | 2 +-
plugins/oval/pom.xml | 2 +-
plugins/pell-multipart/pom.xml | 2 +-
plugins/plexus/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/portlet-tiles/pom.xml | 2 +-
plugins/portlet/pom.xml | 2 +-
plugins/rest/pom.xml | 4 ++--
plugins/sitegraph/pom.xml | 2 +-
plugins/sitemesh/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/struts1/pom.xml | 2 +-
plugins/testng/pom.xml | 2 +-
plugins/tiles/pom.xml | 2 +-
plugins/tiles3/pom.xml | 2 +-
pom.xml | 2 +-
xwork-core/pom.xml | 2 +-
51 files changed, 60 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/apps/blank/pom.xml
----------------------------------------------------------------------
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index 99de588..f56bf90 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-blank</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/apps/jboss-blank/pom.xml
----------------------------------------------------------------------
diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
index 283ccb4..f9e0b8c 100644
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-jboss-blank</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/apps/mailreader/pom.xml
----------------------------------------------------------------------
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index fc1307a..b6281b1 100644
--- a/apps/mailreader/pom.xml
+++ b/apps/mailreader/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-mailreader</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index 5860c18..2da20fc 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-apps</artifactId>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/apps/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
index 89af6b6..50f317b 100644
--- a/apps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-portlet</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/apps/rest-showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index feb3290..ed5af29 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -26,12 +26,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-rest-showcase</artifactId>
<packaging>war</packaging>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
<name>Struts 2 Rest Showcase Webapp</name>
<description>Struts 2 Rest Showcase Example</description>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/apps/showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 3da8de1..1593d9f 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-showcase</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index ac90bcb..bd6f1ae 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-archetypes</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/archetypes/struts2-archetype-angularjs/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-angularjs/pom.xml b/archetypes/struts2-archetype-angularjs/pom.xml
index 95fc42a..2235e44 100644
--- a/archetypes/struts2-archetype-angularjs/pom.xml
+++ b/archetypes/struts2-archetype-angularjs/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-angularjs</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Angular JS</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/archetypes/struts2-archetype-blank/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-blank/pom.xml b/archetypes/struts2-archetype-blank/pom.xml
index 0bb4321..c6473bd 100644
--- a/archetypes/struts2-archetype-blank/pom.xml
+++ b/archetypes/struts2-archetype-blank/pom.xml
@@ -3,12 +3,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-blank</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Blank</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/archetypes/struts2-archetype-convention/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-convention/pom.xml b/archetypes/struts2-archetype-convention/pom.xml
index e6c912b..b6c34d0 100644
--- a/archetypes/struts2-archetype-convention/pom.xml
+++ b/archetypes/struts2-archetype-convention/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-convention</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Blank Convention</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/archetypes/struts2-archetype-dbportlet/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-dbportlet/pom.xml b/archetypes/struts2-archetype-dbportlet/pom.xml
index a25f8d0..d918d13 100644
--- a/archetypes/struts2-archetype-dbportlet/pom.xml
+++ b/archetypes/struts2-archetype-dbportlet/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-dbportlet</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Database Portlet</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/archetypes/struts2-archetype-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-plugin/pom.xml b/archetypes/struts2-archetype-plugin/pom.xml
index 0bcbaf9..8c47dbf 100644
--- a/archetypes/struts2-archetype-plugin/pom.xml
+++ b/archetypes/struts2-archetype-plugin/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-plugin</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Plugin</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/archetypes/struts2-archetype-portlet/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-portlet/pom.xml b/archetypes/struts2-archetype-portlet/pom.xml
index e2a5694..a6be6f7 100644
--- a/archetypes/struts2-archetype-portlet/pom.xml
+++ b/archetypes/struts2-archetype-portlet/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-portlet</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Portlet</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/archetypes/struts2-archetype-starter/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-starter/pom.xml b/archetypes/struts2-archetype-starter/pom.xml
index c1ca6fa..742e0b9 100644
--- a/archetypes/struts2-archetype-starter/pom.xml
+++ b/archetypes/struts2-archetype-starter/pom.xml
@@ -4,12 +4,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-starter</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Starter</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 81d6d6a..1c3c55f 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-assembly</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/bundles/admin/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
index 388cc90..5713461 100644
--- a/bundles/admin/pom.xml
+++ b/bundles/admin/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-osgi-admin-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/bundles/demo/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml
index 2ff5746..145034a 100644
--- a/bundles/demo/pom.xml
+++ b/bundles/demo/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-osgi-demo-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/bundles/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/pom.xml b/bundles/pom.xml
index d88d601..b87e697 100755
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-osgi-bundles</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 030612d..c53059c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/plugins/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml
index 3446030..1757de6 100644
--- a/plugins/cdi/pom.xml
+++ b/plugins/cdi/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-cdi-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/plugins/codebehind/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml
index 0991032..ab09d6d 100644
--- a/plugins/codebehind/pom.xml
+++ b/plugins/codebehind/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-codebehind-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/plugins/config-browser/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml
index 7860ee3..2a1dace 100644
--- a/plugins/config-browser/pom.xml
+++ b/plugins/config-browser/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-config-browser-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/plugins/convention/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml
index 792713e..137aed5 100644
--- a/plugins/convention/pom.xml
+++ b/plugins/convention/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-convention-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/plugins/dojo/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml
index dfe0bd8..88606e4 100644
--- a/plugins/dojo/pom.xml
+++ b/plugins/dojo/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>struts2-plugins</artifactId>
<groupId>org.apache.struts</groupId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/plugins/dwr/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml
index bc6778b..19033d2 100644
--- a/plugins/dwr/pom.xml
+++ b/plugins/dwr/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-dwr-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/plugins/embeddedjsp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml
index 4854acc..604a876 100644
--- a/plugins/embeddedjsp/pom.xml
+++ b/plugins/embeddedjsp/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-embeddedjsp-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/plugins/gxp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml
index aaa2988..cd9c826 100644
--- a/plugins/gxp/pom.xml
+++ b/plugins/gxp/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-gxp-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/plugins/jasperreports/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml
index 3418200..605b92c 100644
--- a/plugins/jasperreports/pom.xml
+++ b/plugins/jasperreports/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-jasperreports-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/plugins/javatemplates/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml
index 0291187..611f421 100644
--- a/plugins/javatemplates/pom.xml
+++ b/plugins/javatemplates/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-javatemplates-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/plugins/jfreechart/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml
index 34a040e..395b415 100644
--- a/plugins/jfreechart/pom.xml
+++ b/plugins/jfreechart/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-jfreechart-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/plugins/jsf/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jsf/pom.xml b/plugins/jsf/pom.xml
index 6c2e6ee..6720597 100644
--- a/plugins/jsf/pom.xml
+++ b/plugins/jsf/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-jsf-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/plugins/json/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml
index 6bddf81..9daa09c 100644
--- a/plugins/json/pom.xml
+++ b/plugins/json/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-json-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/plugins/junit/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 50d359a..7baff8c 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/plugins/osgi/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml
index b755e65..e89c417 100644
--- a/plugins/osgi/pom.xml
+++ b/plugins/osgi/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-osgi-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/plugins/oval/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml
index 8b14fe5..6305065 100644
--- a/plugins/oval/pom.xml
+++ b/plugins/oval/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-oval-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/plugins/pell-multipart/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml
index 73ae9c4..54fa305 100644
--- a/plugins/pell-multipart/pom.xml
+++ b/plugins/pell-multipart/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-pell-multipart-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/plugins/plexus/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml
index 4528454..841032b 100644
--- a/plugins/plexus/pom.xml
+++ b/plugins/plexus/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-plexus-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index b15d61a..7a63dd3 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-plugins</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/plugins/portlet-tiles/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml
index a6df909..8bf28d3 100644
--- a/plugins/portlet-tiles/pom.xml
+++ b/plugins/portlet-tiles/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-portlet-tiles-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/plugins/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index 825cc6c..e5c1057 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-portlet-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/plugins/rest/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml
index 863cef4..62f4e77 100644
--- a/plugins/rest/pom.xml
+++ b/plugins/rest/pom.xml
@@ -26,11 +26,11 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-rest-plugin</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
<name>Struts 2 REST Plugin</name>
<properties>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/plugins/sitegraph/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml
index 9a5aaaf..b3aaf14 100644
--- a/plugins/sitegraph/pom.xml
+++ b/plugins/sitegraph/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-sitegraph-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/plugins/sitemesh/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml
index 99dedb6..f5a4569 100644
--- a/plugins/sitemesh/pom.xml
+++ b/plugins/sitemesh/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-sitemesh-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/plugins/spring/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 6befe4f..0803160 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/plugins/struts1/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/struts1/pom.xml b/plugins/struts1/pom.xml
index 9bf91e0..f59047f 100644
--- a/plugins/struts1/pom.xml
+++ b/plugins/struts1/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-struts1-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/plugins/testng/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml
index 8740e8d..5f23c4e 100644
--- a/plugins/testng/pom.xml
+++ b/plugins/testng/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-testng-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/plugins/tiles/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index a7bdfbe..b6dc526 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-tiles-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/plugins/tiles3/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles3/pom.xml b/plugins/tiles3/pom.xml
index b612dff..3361d1c 100644
--- a/plugins/tiles3/pom.xml
+++ b/plugins/tiles3/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<artifactId>struts2-tiles3-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3324239..e0af6d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>http://struts.apache.org/</url>
http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/xwork-core/pom.xml
----------------------------------------------------------------------
diff --git a/xwork-core/pom.xml b/xwork-core/pom.xml
index d2a380d..710f635 100644
--- a/xwork-core/pom.xml
+++ b/xwork-core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.4-SNAPSHOT</version>
+ <version>2.3.16.3</version>
</parent>
<groupId>org.apache.struts.xwork</groupId>
[24/50] git commit: Cleans up imports
Posted by lu...@apache.org.
Cleans up imports
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/9884c49f
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/9884c49f
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/9884c49f
Branch: refs/heads/feature/WW-4295-localization
Commit: 9884c49fd0d4683d3376070bc75d88a4afcb6a25
Parents: 4577e5e
Author: Lukasz Lenart <lu...@apache.org>
Authored: Mon May 12 08:26:50 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Mon May 12 08:26:50 2014 +0200
----------------------------------------------------------------------
.../xwork2/interceptor/ParametersInterceptorTest.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/9884c49f/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
index 359618f..a2aa92b 100644
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
@@ -18,7 +18,6 @@ package com.opensymphony.xwork2.interceptor;
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.ExcludedPatterns;
import com.opensymphony.xwork2.ModelDrivenAction;
import com.opensymphony.xwork2.SimpleAction;
import com.opensymphony.xwork2.TestBean;
@@ -47,12 +46,10 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.regex.Pattern;
/**
[32/50] git commit: Adds new dependency to allow tests pass
Posted by lu...@apache.org.
Adds new dependency to allow tests pass
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d1d81f8a
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d1d81f8a
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d1d81f8a
Branch: refs/heads/feature/WW-4295-localization
Commit: d1d81f8a77e05ade18d67571816510d6655cee1e
Parents: 5ec47b1
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed May 14 08:26:27 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed May 14 08:26:27 2014 +0200
----------------------------------------------------------------------
.../xwork2/config/providers/XWorkConfigurationProvider.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/d1d81f8a/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java b/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
index 0d48999..c341d98 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
@@ -2,9 +2,11 @@ package com.opensymphony.xwork2.config.providers;
import com.opensymphony.xwork2.ActionProxyFactory;
import com.opensymphony.xwork2.DefaultActionProxyFactory;
+import com.opensymphony.xwork2.DefaultExcludedPatternsChecker;
import com.opensymphony.xwork2.DefaultLocaleProvider;
import com.opensymphony.xwork2.DefaultTextProvider;
import com.opensymphony.xwork2.DefaultUnknownHandlerManager;
+import com.opensymphony.xwork2.ExcludedPatternsChecker;
import com.opensymphony.xwork2.FileManager;
import com.opensymphony.xwork2.FileManagerFactory;
import com.opensymphony.xwork2.LocaleProvider;
@@ -168,7 +170,11 @@ public class XWorkConfigurationProvider implements ConfigurationProvider {
.factory(ArrayConverter.class, Scope.SINGLETON)
.factory(DateConverter.class, Scope.SINGLETON)
.factory(NumberConverter.class, Scope.SINGLETON)
- .factory(StringConverter.class, Scope.SINGLETON);
+ .factory(StringConverter.class, Scope.SINGLETON)
+
+ .factory(ExcludedPatternsChecker.class, DefaultExcludedPatternsChecker.class, Scope.DEFAULT)
+ ;
+
props.setProperty(XWorkConstants.DEV_MODE, Boolean.FALSE.toString());
props.setProperty(XWorkConstants.LOG_MISSING_PROPERTIES, Boolean.FALSE.toString());
props.setProperty(XWorkConstants.ENABLE_OGNL_EXPRESSION_CACHE, Boolean.TRUE.toString());
[20/50] git commit: Merge branch 'master' into develop
Posted by lu...@apache.org.
Merge branch 'master' into develop
Conflicts:
apps/blank/pom.xml
apps/jboss-blank/pom.xml
apps/mailreader/pom.xml
apps/pom.xml
apps/portlet/pom.xml
apps/rest-showcase/pom.xml
apps/showcase/pom.xml
archetypes/pom.xml
archetypes/struts2-archetype-angularjs/pom.xml
archetypes/struts2-archetype-blank/pom.xml
archetypes/struts2-archetype-convention/pom.xml
archetypes/struts2-archetype-dbportlet/pom.xml
archetypes/struts2-archetype-plugin/pom.xml
archetypes/struts2-archetype-portlet/pom.xml
archetypes/struts2-archetype-starter/pom.xml
assembly/pom.xml
bundles/admin/pom.xml
bundles/demo/pom.xml
bundles/pom.xml
core/pom.xml
plugins/cdi/pom.xml
plugins/codebehind/pom.xml
plugins/config-browser/pom.xml
plugins/convention/pom.xml
plugins/dojo/pom.xml
plugins/dwr/pom.xml
plugins/embeddedjsp/pom.xml
plugins/gxp/pom.xml
plugins/jasperreports/pom.xml
plugins/javatemplates/pom.xml
plugins/jfreechart/pom.xml
plugins/jsf/pom.xml
plugins/json/pom.xml
plugins/junit/pom.xml
plugins/osgi/pom.xml
plugins/oval/pom.xml
plugins/pell-multipart/pom.xml
plugins/plexus/pom.xml
plugins/pom.xml
plugins/portlet-tiles/pom.xml
plugins/portlet/pom.xml
plugins/rest/pom.xml
plugins/sitegraph/pom.xml
plugins/sitemesh/pom.xml
plugins/spring/pom.xml
plugins/struts1/pom.xml
plugins/testng/pom.xml
plugins/tiles/pom.xml
plugins/tiles3/pom.xml
pom.xml
xwork-core/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/63897e83
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/63897e83
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/63897e83
Branch: refs/heads/feature/WW-4295-localization
Commit: 63897e83d98b4844982c2d96c3d20b4216ece28a
Parents: 086c0a0 d2663ce
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu May 8 22:06:00 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu May 8 22:06:00 2014 +0200
----------------------------------------------------------------------
.../struts2/interceptor/CookieInterceptor.java | 45 +++++++++++------
.../interceptor/CookieInterceptorTest.java | 53 ++++++++++++++++++++
2 files changed, 82 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
[13/50] git commit: Adds more use cases
Posted by lu...@apache.org.
Adds more use cases
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/ba0ac0df
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ba0ac0df
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ba0ac0df
Branch: refs/heads/feature/WW-4295-localization
Commit: ba0ac0dfd47c768661fcd5fa12bb00af851eb548
Parents: b3ca9ea
Author: Lukasz Lenart <lu...@apache.org>
Authored: Sun May 4 11:58:08 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Sun May 4 11:58:08 2014 +0200
----------------------------------------------------------------------
.../xwork2/ognl/SecurityMemberAccess.java | 4 +-
.../xwork2/ognl/SecurityMemberAccessTest.java | 84 +++++++++++++++++++-
2 files changed, 83 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/ba0ac0df/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
index 7fe77c3..a35f68b 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
@@ -49,10 +49,10 @@ public class SecurityMemberAccess extends DefaultMemberAccess {
@Override
public boolean isAccessible(Map context, Object target, Member member, String propertyName) {
-
if (isClassExcluded(target.getClass(), member.getDeclaringClass())) {
return false;
}
+
boolean allow = true;
int modifiers = member.getModifiers();
if (Modifier.isStatic(modifiers)) {
@@ -83,7 +83,7 @@ public class SecurityMemberAccess extends DefaultMemberAccess {
return true;
}
for (Class<?> excludedClass : excludedClasses) {
- if (excludedClass.isAssignableFrom(targetClass) || declaringClass.isAssignableFrom(excludedClass)) {
+ if (targetClass.isAssignableFrom(excludedClass) || declaringClass.isAssignableFrom(excludedClass)) {
return true;
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/ba0ac0df/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
index 4ccc831..1c14cb2 100644
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
@@ -84,7 +84,7 @@ public class SecurityMemberAccessTest extends TestCase {
SecurityMemberAccess sma = new SecurityMemberAccess(false);
String propertyName = "barLogic";
- Member member = FooBar.class.getMethod("barLogic");
+ Member member = BarInterface.class.getMethod(propertyName);
Set<Class<?>> excluded = new HashSet<Class<?>>();
excluded.add(BarInterface.class);
@@ -97,9 +97,83 @@ public class SecurityMemberAccessTest extends TestCase {
assertFalse("barLogic() from BarInterface is accessible!!!", accessible);
}
+ public void testMiddleOfInheritanceExclusion1() throws Exception {
+ // given
+ SecurityMemberAccess sma = new SecurityMemberAccess(false);
+
+ String propertyName = "fooLogic";
+ Member member = FooBar.class.getMethod(propertyName);
+
+ Set<Class<?>> excluded = new HashSet<Class<?>>();
+ excluded.add(BarInterface.class);
+ sma.setExcludedClasses(excluded);
+
+ // when
+ boolean accessible = sma.isAccessible(context, target, member, propertyName);
+
+ // then
+ assertTrue("fooLogic() from FooInterface isn't accessible!!!", accessible);
+ }
+
+ public void testMiddleOfInheritanceExclusion2() throws Exception {
+ // given
+ SecurityMemberAccess sma = new SecurityMemberAccess(false);
+
+ String propertyName = "barLogic";
+ Member member = BarInterface.class.getMethod(propertyName);
+
+ Set<Class<?>> excluded = new HashSet<Class<?>>();
+ excluded.add(BarInterface.class);
+ sma.setExcludedClasses(excluded);
+
+ // when
+ boolean accessible = sma.isAccessible(context, target, member, propertyName);
+
+ // then
+ assertFalse("barLogic() from BarInterface is accessible!!!", accessible);
+ }
+
+ public void testMiddleOfInheritanceExclusion3() throws Exception {
+ // given
+ SecurityMemberAccess sma = new SecurityMemberAccess(false);
+
+ String propertyName = "barLogic";
+ Member member = BarInterface.class.getMethod(propertyName);
+
+/*
+ Set<Class<?>> excluded = new HashSet<Class<?>>();
+ excluded.add(BarInterface.class);
+ sma.setExcludedClasses(excluded);
+*/
+
+ // when
+ boolean accessible = sma.isAccessible(context, target, member, propertyName);
+
+ // then
+ assertTrue("barLogic() from BarInterface isn't accessible!!!", accessible);
+ }
+
+ public void testMiddleOfInheritanceExclusion4() throws Exception {
+ // given
+ SecurityMemberAccess sma = new SecurityMemberAccess(false);
+
+ String propertyName = "barLogic";
+ Member member = BarInterface.class.getMethod(propertyName);
+
+ Set<Class<?>> excluded = new HashSet<Class<?>>();
+ excluded.add(FooBarInterface.class);
+ sma.setExcludedClasses(excluded);
+
+ // when
+ boolean accessible = sma.isAccessible(context, target, member, propertyName);
+
+ // then
+ assertFalse("barLogic() from BarInterface is accessible!!!", accessible);
+ }
+
}
-class FooBar implements FooInterface {
+class FooBar implements FooBarInterface {
private String stringField;
@@ -126,7 +200,7 @@ class FooBar implements FooInterface {
}
-interface FooInterface extends BarInterface {
+interface FooInterface {
String fooLogic();
@@ -137,3 +211,7 @@ interface BarInterface {
String barLogic();
}
+
+interface FooBarInterface extends FooInterface, BarInterface {
+
+}
\ No newline at end of file
[36/50] git commit: Cleans up after moving to package
Posted by lu...@apache.org.
Cleans up after moving to package
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/97ef7b50
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/97ef7b50
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/97ef7b50
Branch: refs/heads/feature/WW-4295-localization
Commit: 97ef7b50bbf12dcc3e4127c71487ec37f5b7132d
Parents: ec98c8a
Author: Lukasz Lenart <lu...@apache.org>
Authored: Mon May 19 10:58:45 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Mon May 19 10:58:45 2014 +0200
----------------------------------------------------------------------
.../org/apache/struts2/config/DefaultBeanSelectionProvider.java | 2 +-
.../java/org/apache/struts2/interceptor/CookieInterceptor.java | 3 +--
core/src/main/resources/struts-default.xml | 2 +-
.../test/java/org/apache/struts2/TestConfigurationProvider.java | 2 +-
.../src/main/java/com/opensymphony/xwork2/XWorkConstants.java | 2 ++
.../xwork2/config/providers/XWorkConfigurationProvider.java | 2 +-
.../opensymphony/xwork2/interceptor/ParametersInterceptor.java | 2 +-
7 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/97ef7b50/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
index 5c29e78..be4fa82 100644
--- a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
+++ b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
@@ -22,7 +22,7 @@
package org.apache.struts2.config;
import com.opensymphony.xwork2.ActionProxyFactory;
-import com.opensymphony.xwork2.ExcludedPatternsChecker;
+import com.opensymphony.xwork2.security.ExcludedPatternsChecker;
import com.opensymphony.xwork2.FileManager;
import com.opensymphony.xwork2.FileManagerFactory;
import com.opensymphony.xwork2.LocaleProvider;
http://git-wip-us.apache.org/repos/asf/struts/blob/97ef7b50/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
index dbe47ce..ca195fa 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
@@ -25,13 +25,12 @@ import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
-import com.opensymphony.xwork2.ExcludedPatternsChecker;
+import com.opensymphony.xwork2.security.ExcludedPatternsChecker;
import com.opensymphony.xwork2.util.TextParseUtil;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.StrutsConstants;
import javax.servlet.http.Cookie;
import java.util.Collections;
http://git-wip-us.apache.org/repos/asf/struts/blob/97ef7b50/core/src/main/resources/struts-default.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
index ecfa5cf..2fc16c9 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -144,7 +144,7 @@
<bean type="ognl.PropertyAccessor" name="java.util.HashSet" class="com.opensymphony.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor" />
<bean type="ognl.PropertyAccessor" name="java.util.HashMap" class="com.opensymphony.xwork2.ognl.accessor.XWorkMapPropertyAccessor" />
- <bean type="com.opensymphony.xwork2.ExcludedPatternsChecker" name="struts" class="com.opensymphony.xwork2.security.DefaultExcludedPatternsChecker" />
+ <bean type="com.opensymphony.xwork2.security.ExcludedPatternsChecker" name="struts" class="com.opensymphony.xwork2.security.DefaultExcludedPatternsChecker" />
<package name="struts-default" abstract="true">
<result-types>
http://git-wip-us.apache.org/repos/asf/struts/blob/97ef7b50/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java b/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
index d9da6c4..f9eb4c7 100644
--- a/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
+++ b/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
@@ -25,7 +25,7 @@ import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionProxyFactory;
import com.opensymphony.xwork2.DefaultActionProxyFactory;
import com.opensymphony.xwork2.security.DefaultExcludedPatternsChecker;
-import com.opensymphony.xwork2.ExcludedPatternsChecker;
+import com.opensymphony.xwork2.security.ExcludedPatternsChecker;
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.config.Configuration;
import com.opensymphony.xwork2.config.ConfigurationException;
http://git-wip-us.apache.org/repos/asf/struts/blob/97ef7b50/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java b/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
index f2f03e7..b846ac0 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
@@ -18,6 +18,8 @@ public final class XWorkConstants {
public static final String ALLOW_STATIC_METHOD_ACCESS = "allowStaticMethodAccess";
public static final String XWORK_LOGGER_FACTORY = "xwork.loggerFactory";
public static final String OGNL_EXCLUDED_CLASSES = "ognlExcludedClasses";
+
public static final String OVERRIDE_EXCLUDED_PATTERNS = "overrideExcludedPatterns";
+ public static final String OVERRIDE_ACCEPTED_PATTERNS = "overrideAcceptedPatterns";
}
http://git-wip-us.apache.org/repos/asf/struts/blob/97ef7b50/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java b/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
index 1a72206..9f28334 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
@@ -6,7 +6,7 @@ import com.opensymphony.xwork2.security.DefaultExcludedPatternsChecker;
import com.opensymphony.xwork2.DefaultLocaleProvider;
import com.opensymphony.xwork2.DefaultTextProvider;
import com.opensymphony.xwork2.DefaultUnknownHandlerManager;
-import com.opensymphony.xwork2.ExcludedPatternsChecker;
+import com.opensymphony.xwork2.security.ExcludedPatternsChecker;
import com.opensymphony.xwork2.FileManager;
import com.opensymphony.xwork2.FileManagerFactory;
import com.opensymphony.xwork2.LocaleProvider;
http://git-wip-us.apache.org/repos/asf/struts/blob/97ef7b50/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
index 460aae2..f1906b0 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
@@ -17,7 +17,7 @@ package com.opensymphony.xwork2.interceptor;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.ExcludedPatternsChecker;
+import com.opensymphony.xwork2.security.ExcludedPatternsChecker;
import com.opensymphony.xwork2.ValidationAware;
import com.opensymphony.xwork2.XWorkConstants;
import com.opensymphony.xwork2.conversion.impl.InstantiatingNullHandler;
[29/50] git commit: Cleans up new extension point
Posted by lu...@apache.org.
Cleans up new extension point
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e8e5b51b
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e8e5b51b
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e8e5b51b
Branch: refs/heads/feature/WW-4295-localization
Commit: e8e5b51bc64e71cc7645c1083b33e1942bf4a03d
Parents: 833a07e
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed May 14 08:25:00 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed May 14 08:25:00 2014 +0200
----------------------------------------------------------------------
.../org/apache/struts2/config/DefaultBeanSelectionProvider.java | 4 ++--
.../java/org/apache/struts2/interceptor/CookieInterceptor.java | 2 +-
core/src/main/resources/struts-default.xml | 4 +---
3 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/e8e5b51b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
index 5296b41..5c29e78 100644
--- a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
+++ b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
@@ -390,8 +390,8 @@ public class DefaultBeanSelectionProvider extends AbstractBeanSelectionProvider
alias(DispatcherErrorHandler.class, StrutsConstants.STRUTS_DISPATCHER_ERROR_HANDLER, builder, props);
- /** Checker is used mostly in interceptors, so there be one instance of checker per interceptor with Scope.REQUEST **/
- alias(ExcludedPatternsChecker.class, StrutsConstants.STRUTS_EXCLUDED_PATTERNS_CHECKER, builder, props, Scope.REQUEST);
+ /** Checker is used mostly in interceptors, so there be one instance of checker per interceptor with Scope.DEFAULT **/
+ alias(ExcludedPatternsChecker.class, StrutsConstants.STRUTS_EXCLUDED_PATTERNS_CHECKER, builder, props, Scope.DEFAULT);
switchDevMode(props);
http://git-wip-us.apache.org/repos/asf/struts/blob/e8e5b51b/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
index 8998c5c..dbe47ce 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
@@ -180,7 +180,7 @@ public class CookieInterceptor extends AbstractInterceptor {
private ExcludedPatternsChecker excludedPatternsChecker;
- @Inject(StrutsConstants.STRUTS_EXCLUDED_PATTERNS_CHECKER)
+ @Inject
public void setExcludedPatternsChecker(ExcludedPatternsChecker excludedPatternsChecker) {
this.excludedPatternsChecker = excludedPatternsChecker;
}
http://git-wip-us.apache.org/repos/asf/struts/blob/e8e5b51b/core/src/main/resources/struts-default.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
index f2fb922..2d74b4f 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -144,9 +144,7 @@
<bean type="ognl.PropertyAccessor" name="java.util.HashSet" class="com.opensymphony.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor" />
<bean type="ognl.PropertyAccessor" name="java.util.HashMap" class="com.opensymphony.xwork2.ognl.accessor.XWorkMapPropertyAccessor" />
- <bean type="com.opensymphony.xwork2.ExcludedPatternsChecker" name="struts" class="com.opensymphony.xwork2.DefaultExcludedPatternsChecker" scope="request"/>
-
- <constant name="struts.excludedPatterns.checker" value="struts"/>
+ <bean type="com.opensymphony.xwork2.ExcludedPatternsChecker" name="struts" class="com.opensymphony.xwork2.DefaultExcludedPatternsChecker" />
<package name="struts-default" abstract="true">
<result-types>
[07/50] git commit: Adds mapping of excluded classes key
Posted by lu...@apache.org.
Adds mapping of excluded classes key
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/f0799fd9
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/f0799fd9
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/f0799fd9
Branch: refs/heads/feature/WW-4295-localization
Commit: f0799fd99bff78f0c984922ac358d7cf3eede0ba
Parents: 2180b06
Author: Lukasz Lenart <lu...@apache.org>
Authored: Sat May 3 20:16:58 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Sat May 3 20:16:58 2014 +0200
----------------------------------------------------------------------
.../org/apache/struts2/config/DefaultBeanSelectionProvider.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/f0799fd9/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
index 4cc2d61..dedbce5 100644
--- a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
+++ b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
@@ -391,7 +391,7 @@ public class DefaultBeanSelectionProvider extends AbstractBeanSelectionProvider
convertIfExist(props, StrutsConstants.STRUTS_ENABLE_OGNL_EVAL_EXPRESSION, XWorkConstants.ENABLE_OGNL_EVAL_EXPRESSION);
convertIfExist(props, StrutsConstants.STRUTS_ALLOW_STATIC_METHOD_ACCESS, XWorkConstants.ALLOW_STATIC_METHOD_ACCESS);
convertIfExist(props, StrutsConstants.STRUTS_CONFIGURATION_XML_RELOAD, XWorkConstants.RELOAD_XML_CONFIGURATION);
- convertIfExist(props, StrutsConstants.STRUTS_EXCLUDED_PROPERTIES, XWorkConstants.OGNL_EXCLUDED_PROPERTIES);
+ convertIfExist(props, StrutsConstants.STRUTS_EXCLUDED_CLASSES, XWorkConstants.OGNL_EXCLUDED_CLASSES);
LocalizedTextUtil.addDefaultResourceBundle("org/apache/struts2/struts-messages");
loadCustomResourceBundles(props);
[46/50] git commit: Excludes ActionContext from Ognl evaluation
Posted by lu...@apache.org.
Excludes ActionContext from Ognl evaluation
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/bbcc6014
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/bbcc6014
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/bbcc6014
Branch: refs/heads/feature/WW-4295-localization
Commit: bbcc6014f61e4d751114051605e8041474e5b496
Parents: eb8aae8
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu Jun 5 08:25:44 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu Jun 5 08:25:44 2014 +0200
----------------------------------------------------------------------
core/src/main/resources/struts-default.xml | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/bbcc6014/core/src/main/resources/struts-default.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
index 0fe8e68..49eba90 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -38,7 +38,15 @@
<struts>
- <constant name="struts.excludedClasses" value="java.lang.Object,java.lang.Runtime,ognl.OgnlContext,ognl.MemberAccess,ognl.ClassResolver,ognl.TypeConverter" />
+ <constant name="struts.excludedClasses"
+ value="
+ java.lang.Object,
+ java.lang.Runtime,
+ ognl.OgnlContext,
+ ognl.MemberAccess,
+ ognl.ClassResolver,
+ ognl.TypeConverter,
+ com.opensymphony.xwork2.ActionContext" />
<!-- this must be valid regex, each '.' in package name must be escaped! -->
<constant name="struts.excludedPackageNamePatterns" value="^java\.lang.*,^ognl.*,^javax.*" />
[23/50] git commit: Defines new extension point
Posted by lu...@apache.org.
Defines new extension point
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/4577e5ee
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/4577e5ee
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/4577e5ee
Branch: refs/heads/feature/WW-4295-localization
Commit: 4577e5eefb057e80bbdd740b0c56120c15469827
Parents: 65c023b
Author: Lukasz Lenart <lu...@apache.org>
Authored: Mon May 12 08:26:33 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Mon May 12 08:26:33 2014 +0200
----------------------------------------------------------------------
core/src/main/java/org/apache/struts2/StrutsConstants.java | 6 ++++++
.../apache/struts2/config/DefaultBeanSelectionProvider.java | 7 ++++++-
.../src/main/java/com/opensymphony/xwork2/XWorkConstants.java | 1 +
3 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/4577e5ee/core/src/main/java/org/apache/struts2/StrutsConstants.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/StrutsConstants.java b/core/src/main/java/org/apache/struts2/StrutsConstants.java
index d508373..d173add 100644
--- a/core/src/main/java/org/apache/struts2/StrutsConstants.java
+++ b/core/src/main/java/org/apache/struts2/StrutsConstants.java
@@ -285,4 +285,10 @@ public final class StrutsConstants {
/** Comma delimited set of excluded classes which cannot be accessed via expressions **/
public static final String STRUTS_EXCLUDED_CLASSES = "struts.excludedClasses";
+ /** Dedicated service to check if passed string is excluded or not **/
+ public static final String STRUTS_EXCLUDED_PATTERNS_CHECKER = "struts.excludedPatterns.checker";
+
+ /** Constant is used to override framework's default excluded patterns **/
+ public static final String STRUTS_OVERRIDE_EXCLUDED_PATTERNS = "struts.override.excludedPatterns";
+
}
http://git-wip-us.apache.org/repos/asf/struts/blob/4577e5ee/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
index dedbce5..5304910 100644
--- a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
+++ b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
@@ -22,6 +22,7 @@
package org.apache.struts2.config;
import com.opensymphony.xwork2.ActionProxyFactory;
+import com.opensymphony.xwork2.ExcludedPatternsChecker;
import com.opensymphony.xwork2.FileManager;
import com.opensymphony.xwork2.FileManagerFactory;
import com.opensymphony.xwork2.LocaleProvider;
@@ -343,7 +344,7 @@ public class DefaultBeanSelectionProvider extends AbstractBeanSelectionProvider
alias(ResultFactory.class, StrutsConstants.STRUTS_OBJECTFACTORY_RESULTFACTORY, builder, props);
alias(ConverterFactory.class, StrutsConstants.STRUTS_OBJECTFACTORY_CONVERTERFACTORY, builder, props);
alias(InterceptorFactory.class, StrutsConstants.STRUTS_OBJECTFACTORY_INTERCEPTORFACTORY, builder, props);
- alias(ValidatorFactory.class, StrutsConstants.STRUTS_OBJECTFACTORY_INTERCEPTORFACTORY, builder, props);
+ alias(ValidatorFactory.class, StrutsConstants.STRUTS_OBJECTFACTORY_VALIDATORFACTORY, builder, props);
alias(FileManagerFactory.class, StrutsConstants.STRUTS_FILE_MANAGER_FACTORY, builder, props, Scope.SINGLETON);
@@ -383,6 +384,9 @@ public class DefaultBeanSelectionProvider extends AbstractBeanSelectionProvider
alias(DispatcherErrorHandler.class, StrutsConstants.STRUTS_DISPATCHER_ERROR_HANDLER, builder, props);
+ /** Checker is used mostly in interceptors, so there be one instance of checker per interceptor with Scope.REQUEST **/
+ alias(ExcludedPatternsChecker.class, StrutsConstants.STRUTS_EXCLUDED_PATTERNS_CHECKER, builder, props, Scope.REQUEST);
+
switchDevMode(props);
// Convert Struts properties into XWork properties
@@ -392,6 +396,7 @@ public class DefaultBeanSelectionProvider extends AbstractBeanSelectionProvider
convertIfExist(props, StrutsConstants.STRUTS_ALLOW_STATIC_METHOD_ACCESS, XWorkConstants.ALLOW_STATIC_METHOD_ACCESS);
convertIfExist(props, StrutsConstants.STRUTS_CONFIGURATION_XML_RELOAD, XWorkConstants.RELOAD_XML_CONFIGURATION);
convertIfExist(props, StrutsConstants.STRUTS_EXCLUDED_CLASSES, XWorkConstants.OGNL_EXCLUDED_CLASSES);
+ convertIfExist(props, StrutsConstants.STRUTS_OVERRIDE_EXCLUDED_PATTERNS, XWorkConstants.OVERRIDE_EXCLUDED_PATTERNS);
LocalizedTextUtil.addDefaultResourceBundle("org/apache/struts2/struts-messages");
loadCustomResourceBundles(props);
http://git-wip-us.apache.org/repos/asf/struts/blob/4577e5ee/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java b/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
index dfbf6d5..f2f03e7 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
@@ -18,5 +18,6 @@ public final class XWorkConstants {
public static final String ALLOW_STATIC_METHOD_ACCESS = "allowStaticMethodAccess";
public static final String XWORK_LOGGER_FACTORY = "xwork.loggerFactory";
public static final String OGNL_EXCLUDED_CLASSES = "ognlExcludedClasses";
+ public static final String OVERRIDE_EXCLUDED_PATTERNS = "overrideExcludedPatterns";
}
[11/50] git commit: Removes hardcoded excluded params
Posted by lu...@apache.org.
Removes hardcoded excluded params
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/cb590742
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/cb590742
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/cb590742
Branch: refs/heads/feature/WW-4295-localization
Commit: cb590742892c39dc6abb84f6a85d87235d555f32
Parents: f84efa5
Author: Lukasz Lenart <lu...@apache.org>
Authored: Sun May 4 10:48:09 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Sun May 4 10:48:09 2014 +0200
----------------------------------------------------------------------
.../interceptor/ParametersInterceptor.java | 16 +++-----------
.../interceptor/ParametersInterceptorTest.java | 16 ++++++++++----
.../src/test/resources/xwork-test-beans.xml | 22 ++------------------
3 files changed, 17 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/cb590742/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
index cb38d57..e09ab54 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
@@ -141,21 +141,16 @@ public class ParametersInterceptor extends MethodFilterInterceptor {
private static final Logger LOG = LoggerFactory.getLogger(ParametersInterceptor.class);
- public static final String ACCEPTED_PARAM_NAMES = "\\w+((\\.\\w+)|(\\[\\d+\\])|(\\(\\d+\\))|(\\['(\\w|[\\u4e00-\\u9fa5])+'\\])|(\\('(\\w|[\\u4e00-\\u9fa5])+'\\)))*";
-
protected static final int PARAM_NAME_MAX_LENGTH = 100;
private int paramNameMaxLength = PARAM_NAME_MAX_LENGTH;
+ private boolean devMode = false;
protected boolean ordered = false;
+
protected Set<Pattern> excludeParams = Collections.emptySet();
protected Set<Pattern> acceptParams = Collections.emptySet();
- private boolean devMode = false;
-
- // Allowed names of parameters
- private Pattern acceptedPattern = Pattern.compile(ACCEPTED_PARAM_NAMES);
-
private ValueStackFactory valueStackFactory;
@Inject
@@ -426,13 +421,8 @@ public class ParametersInterceptor extends MethodFilterInterceptor {
}
notifyDeveloper("Parameter [#0] didn't match acceptParams list of patterns!", paramName);
return false;
- } else {
- boolean matches = acceptedPattern.matcher(paramName).matches();
- if (!matches) {
- notifyDeveloper("Parameter [#0] didn't match acceptedPattern pattern!", paramName);
- }
- return matches;
}
+ return true;
}
protected boolean isExcluded(String paramName) {
http://git-wip-us.apache.org/repos/asf/struts/blob/cb590742/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
index f0adf02..79f46e6 100644
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
@@ -32,11 +32,13 @@ import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
import com.opensymphony.xwork2.mock.MockActionInvocation;
import com.opensymphony.xwork2.ognl.OgnlValueStack;
import com.opensymphony.xwork2.ognl.OgnlValueStackFactory;
+import com.opensymphony.xwork2.ognl.SecurityMemberAccess;
import com.opensymphony.xwork2.ognl.accessor.CompoundRootAccessor;
import com.opensymphony.xwork2.util.CompoundRoot;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
import junit.framework.Assert;
+import ognl.OgnlContext;
import ognl.PropertyAccessor;
import java.io.File;
@@ -293,9 +295,8 @@ public class ParametersInterceptorTest extends XWorkTestCase {
//then
assertEquals("This is blah", ((SimpleAction) proxy.getAction()).getBlah());
- Object allowMethodAccess = stack.findValue("\u0023_memberAccess['allowStaticMethodAccess']");
- assertNotNull(allowMethodAccess);
- assertEquals(Boolean.FALSE, allowMethodAccess);
+ boolean allowMethodAccess = ((SecurityMemberAccess) ((OgnlContext) stack.getContext()).getMemberAccess()).getAllowStaticMethodAccess();
+ assertFalse(allowMethodAccess);
}
public void testParameters() throws Exception {
@@ -323,7 +324,7 @@ public class ParametersInterceptorTest extends XWorkTestCase {
ActionProxy proxy = actionProxyFactory.createActionProxy("", MockConfigurationProvider.PARAM_INTERCEPTOR_ACTION_NAME, null, extraContext);
proxy.execute();
Map<String, String> existingMap = ((SimpleAction) proxy.getAction()).getTheProtectedMap();
- assertEquals(0, existingMap.size());
+ assertEquals(4, existingMap.size());
}
public void testParametersWithChineseInTheName() throws Exception {
@@ -650,6 +651,13 @@ public class ParametersInterceptorTest extends XWorkTestCase {
final Map<String, Object> expected = new HashMap<String, Object>() {
{
put("ordinary.bean", "value");
+ put("#some.internal.object", "true");
+ put("(bla)#some.internal.object", "true");
+ put("#some.internal.object(bla)#some.internal.object", "true");
+ put("#_some.internal.object", "true");
+ put("\u0023_some.internal.object", "true");
+ put("\u0023_some.internal.object,[dfd],bla(\u0023_some.internal.object)", "true");
+ put("\\u0023_some.internal.object", "true");
}
};
http://git-wip-us.apache.org/repos/asf/struts/blob/cb590742/xwork-core/src/test/resources/xwork-test-beans.xml
----------------------------------------------------------------------
diff --git a/xwork-core/src/test/resources/xwork-test-beans.xml b/xwork-core/src/test/resources/xwork-test-beans.xml
index 7268ef7..1606f1d 100644
--- a/xwork-core/src/test/resources/xwork-test-beans.xml
+++ b/xwork-core/src/test/resources/xwork-test-beans.xml
@@ -3,25 +3,7 @@
"http://struts.apache.org/dtds/xwork-2.0.dtd">
<xwork>
-<!--
- <bean class="com.opensymphony.xwork2.ObjectFactory" name="default" />
- <bean type="com.opensymphony.xwork2.ActionProxyFactory" name="default" class="com.opensymphony.xwork2.DefaultActionProxyFactory"/>
- <constant name="devMode" value="false" />
- <bean type="com.opensymphony.xwork2.util.ValueStackFactory"
- class="com.opensymphony.xwork2.ognl.OgnlValueStackFactory" />
- <bean type="com.opensymphony.xwork2.util.reflection.ReflectionProvider"
- class="com.opensymphony.xwork2.ognl.OgnlReflectionProvider" />
- <bean type="com.opensymphony.xwork2.util.reflection.ReflectionContextFactory"
- class="com.opensymphony.xwork2.ognl.OgnlReflectionContextFactory" />
- <bean class="com.opensymphony.xwork2.conversion.impl.XWorkConverter" />
- <bean type="com.opensymphony.xwork2.conversion.ObjectTypeDeterminer"
- class="com.opensymphony.xwork2.conversion.impl.DefaultObjectTypeDeterminer" />
--->
- <!-- static injections -->
- <!--
- <bean class="com.opensymphony.xwork2.ognl.OgnlValueStack" static="true"/>
- <bean class="com.opensymphony.xwork2.conversion.impl.XWorkConverter" static="true"/>
- <bean class="com.opensymphony.xwork2.util.reflection.ReflectionProviderFactory" static="true" />
- -->
+ <constant name="ognlExcludedClasses" value="java.lang.Object,java.lang.Runtime,ognl.OgnlContext,ognl.MemberAccess,ognl.ClassResolver,ognl.TypeConverter,com.opensymphony.xwork2.ognl.SecurityMemberAccess" />
+
</xwork>
\ No newline at end of file
[37/50] git commit: Defines new service to check accepted patterns
Posted by lu...@apache.org.
Defines new service to check accepted patterns
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b140faad
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b140faad
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b140faad
Branch: refs/heads/feature/WW-4295-localization
Commit: b140faad2813809c132ef75e4459f6dbbee664b8
Parents: 97ef7b5
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed May 21 09:03:30 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed May 21 09:03:30 2014 +0200
----------------------------------------------------------------------
.../security/AcceptedPatternsChecker.java | 82 ++++++++++++++++++
.../DefaultAcceptedPatternsChecker.java | 88 ++++++++++++++++++++
2 files changed, 170 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/b140faad/xwork-core/src/main/java/com/opensymphony/xwork2/security/AcceptedPatternsChecker.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/security/AcceptedPatternsChecker.java b/xwork-core/src/main/java/com/opensymphony/xwork2/security/AcceptedPatternsChecker.java
new file mode 100644
index 0000000..6ea9ec9
--- /dev/null
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/security/AcceptedPatternsChecker.java
@@ -0,0 +1,82 @@
+package com.opensymphony.xwork2.security;
+
+import java.util.Set;
+import java.util.regex.Pattern;
+
+/**
+ * Used across different interceptors to check if given string matches one of the excluded patterns.
+ */
+public interface AcceptedPatternsChecker {
+
+ /**
+ * Checks if value matches any of patterns on exclude list
+ *
+ * @param value to check
+ * @return object containing result of matched pattern and pattern itself
+ */
+ public IsAccepted isAccepted(String value);
+
+ /**
+ * Allows add additional excluded patterns during runtime
+ *
+ * @param commaDelimitedPatterns comma delimited string with patterns
+ */
+ public void addAcceptedPatterns(String commaDelimitedPatterns);
+
+ /**
+ * Allows add additional excluded patterns during runtime
+ *
+ * @param additionalPatterns array of additional excluded patterns
+ */
+ public void addAcceptedPatterns(String[] additionalPatterns);
+
+ /**
+ * Allows add additional excluded patterns during runtime
+ *
+ * @param additionalPatterns set of additional patterns
+ */
+ public void addAcceptedPatterns(Set<String> additionalPatterns);
+
+ /**
+ * Allow access list of all defined excluded patterns
+ *
+ * @return set of excluded patterns
+ */
+ public Set<Pattern> getAcceptedPatterns();
+
+ public final static class IsAccepted {
+
+ private final boolean accepted;
+ private final Pattern acceptedPattern;
+
+ public static IsAccepted yes(Pattern acceptedPattern) {
+ return new IsAccepted(true, acceptedPattern);
+ }
+
+ public static IsAccepted no() {
+ return new IsAccepted(false, null);
+ }
+
+ private IsAccepted(boolean accepted, Pattern acceptedPattern) {
+ this.accepted = accepted;
+ this.acceptedPattern = acceptedPattern;
+ }
+
+ public boolean isAccepted() {
+ return accepted;
+ }
+
+ public Pattern getAcceptedPattern() {
+ return acceptedPattern;
+ }
+
+ @Override
+ public String toString() {
+ return "IsAccepted {" +
+ "accepted=" + accepted +
+ ", acceptedPattern=" + acceptedPattern +
+ " }";
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/struts/blob/b140faad/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java b/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java
new file mode 100644
index 0000000..fa1b8e1
--- /dev/null
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java
@@ -0,0 +1,88 @@
+package com.opensymphony.xwork2.security;
+
+import com.opensymphony.xwork2.XWorkConstants;
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.TextParseUtil;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+public class DefaultAcceptedPatternsChecker implements AcceptedPatternsChecker {
+
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultAcceptedPatternsChecker.class);
+
+ public static final String[] ACCEPTED_PATTERNS = {
+ "\\w+((\\.\\w+)|(\\[\\d+\\])|(\\(\\d+\\))|(\\['(\\w|[\\u4e00-\\u9fa5])+'\\])|(\\('(\\w|[\\u4e00-\\u9fa5])+'\\)))*"
+ };
+
+ private Set<Pattern> acceptedPatterns;
+
+ public DefaultAcceptedPatternsChecker() {
+ acceptedPatterns = new HashSet<Pattern>();
+ for (String pattern : ACCEPTED_PATTERNS) {
+ acceptedPatterns.add(Pattern.compile(pattern));
+ }
+ }
+
+ @Inject(value = XWorkConstants.OVERRIDE_ACCEPTED_PATTERNS, required = false)
+ public void setOverrideAcceptedPatterns(String acceptablePatterns) {
+ if (LOG.isWarnEnabled()) {
+ LOG.warn("Overriding [#0] with [#1], be aware that this can affect safety of your application!",
+ XWorkConstants.OVERRIDE_ACCEPTED_PATTERNS, acceptablePatterns);
+ }
+ acceptedPatterns = new HashSet<Pattern>();
+ for (String pattern : TextParseUtil.commaDelimitedStringToSet(acceptablePatterns)) {
+ acceptedPatterns.add(Pattern.compile(pattern));
+ }
+ }
+
+ @Inject(value = XWorkConstants.OVERRIDE_ACCEPTED_PATTERNS, required = false)
+ public void setOverrideExcludePatterns(String acceptPatterns) {
+ if (LOG.isWarnEnabled()) {
+ LOG.warn("Overriding [#0] with [#1], be aware that this can affect safety of your application!",
+ XWorkConstants.OVERRIDE_ACCEPTED_PATTERNS, acceptedPatterns);
+ }
+ acceptedPatterns = new HashSet<Pattern>();
+ for (String pattern : TextParseUtil.commaDelimitedStringToSet(acceptPatterns)) {
+ acceptedPatterns.add(Pattern.compile(pattern));
+ }
+ }
+
+ public void addAcceptedPatterns(String commaDelimitedPatterns) {
+ addAcceptedPatterns(TextParseUtil.commaDelimitedStringToSet(commaDelimitedPatterns));
+ }
+
+ public void addAcceptedPatterns(String[] additionalPatterns) {
+ addAcceptedPatterns(new HashSet<String>(Arrays.asList(additionalPatterns)));
+ }
+
+ public void addAcceptedPatterns(Set<String> additionalPatterns) {
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Adding additional excluded patterns [#0]", additionalPatterns);
+ }
+ for (String pattern : additionalPatterns) {
+ acceptedPatterns.add(Pattern.compile(pattern));
+ }
+ }
+
+ public IsAccepted isAccepted(String value) {
+ for (Pattern acceptedPattern : acceptedPatterns) {
+ if (acceptedPattern.matcher(value).matches()) {
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("[#0] matches accepted pattern [#1]", value, acceptedPattern);
+ }
+ return IsAccepted.yes(acceptedPattern);
+ }
+ }
+ return IsAccepted.no();
+ }
+
+ public Set<Pattern> getAcceptedPatterns() {
+ return acceptedPatterns;
+ }
+
+}
[09/50] git commit: Updates test to use new excluded classes
Posted by lu...@apache.org.
Updates test to use new excluded classes
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/cdfb94d7
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/cdfb94d7
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/cdfb94d7
Branch: refs/heads/feature/WW-4295-localization
Commit: cdfb94d712e2b71bcf42f87f6c1b7d02d784dd87
Parents: afb5af1
Author: Lukasz Lenart <lu...@apache.org>
Authored: Sat May 3 20:17:19 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Sat May 3 20:17:19 2014 +0200
----------------------------------------------------------------------
.../impl/AnnotationXWorkConverterTest.java | 10 +-
.../opensymphony/xwork2/ognl/OgnlUtilTest.java | 115 ++++++++-----------
.../xwork2/ognl/OgnlValueStackTest.java | 1 +
3 files changed, 54 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/cdfb94d7/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/AnnotationXWorkConverterTest.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/AnnotationXWorkConverterTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/AnnotationXWorkConverterTest.java
index 4a7f517..14d9be1 100644
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/AnnotationXWorkConverterTest.java
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/AnnotationXWorkConverterTest.java
@@ -374,8 +374,8 @@ public class AnnotationXWorkConverterTest extends XWorkTestCase {
stack.setValue("genericMap[456.12]", "42");
assertEquals(2, gb.getGenericMap().size());
- assertEquals(Integer.class, stack.findValue("genericMap.get(123.12).class"));
- assertEquals(Integer.class, stack.findValue("genericMap.get(456.12).class"));
+ assertEquals("66", stack.findValue("genericMap.get(123.12).toString()"));
+ assertEquals("42", stack.findValue("genericMap.get(456.12).toString()"));
assertEquals(66, stack.findValue("genericMap.get(123.12)"));
assertEquals(42, stack.findValue("genericMap.get(456.12)"));
assertEquals(true, stack.findValue("genericMap.containsValue(66)"));
@@ -393,8 +393,8 @@ public class AnnotationXWorkConverterTest extends XWorkTestCase {
stack.setValue("genericMap[456.12]", "42");
assertEquals(2, gb.getGenericMap().size());
- assertEquals(Integer.class, stack.findValue("genericMap.get(123.12).class"));
- assertEquals(Integer.class, stack.findValue("genericMap.get(456.12).class"));
+ assertEquals("66", stack.findValue("genericMap.get(123.12).toString()"));
+ assertEquals("42", stack.findValue("genericMap.get(456.12).toString()"));
assertEquals(66, stack.findValue("genericMap.get(123.12)"));
assertEquals(42, stack.findValue("genericMap.get(456.12)"));
assertEquals(true, stack.findValue("genericMap.containsValue(66)"));
@@ -409,7 +409,7 @@ public class AnnotationXWorkConverterTest extends XWorkTestCase {
stack.push(gb);
assertEquals(1, gb.getGetterList().size());
- assertEquals(Double.class, stack.findValue("getterList.get(0).class"));
+ assertEquals("42.42", stack.findValue("getterList.get(0).toString()"));
assertEquals(new Double(42.42), stack.findValue("getterList.get(0)"));
assertEquals(new Double(42.42), gb.getGetterList().get(0));
http://git-wip-us.apache.org/repos/asf/struts/blob/cdfb94d7/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
index 98ff671..e8733d6 100644
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
@@ -82,7 +82,7 @@ public class OgnlUtilTest extends XWorkTestCase {
});
Owner owner = new Owner();
- Map context = Ognl.createDefaultContext(owner);
+ Map context = ognlUtil.createDefaultContext(owner);
Map props = new HashMap();
props.put("dog.name", dogName);
@@ -107,7 +107,7 @@ public class OgnlUtilTest extends XWorkTestCase {
public void testCanSetDependentObjectArray() {
EmailAction action = new EmailAction();
- Map<String, Object> context = Ognl.createDefaultContext(action);
+ Map<String, Object> context = ognlUtil.createDefaultContext(action);
Map<String, Object> props = new HashMap<String, Object>();
props.put("email[0].address", "addr1");
@@ -125,7 +125,7 @@ public class OgnlUtilTest extends XWorkTestCase {
Foo foo1 = new Foo();
Foo foo2 = new Foo();
- Map context = Ognl.createDefaultContext(foo1);
+ Map context = ognlUtil.createDefaultContext(foo1);
Calendar cal = Calendar.getInstance();
cal.clear();
@@ -171,7 +171,7 @@ public class OgnlUtilTest extends XWorkTestCase {
foo2.setTitle("foo2 title");
foo2.setNumber(2);
- Map<String, Object> context = Ognl.createDefaultContext(foo1);
+ Map<String, Object> context = ognlUtil.createDefaultContext(foo1);
List<String> excludes = new ArrayList<String>();
excludes.add("title");
@@ -200,7 +200,7 @@ public class OgnlUtilTest extends XWorkTestCase {
b2.setTitle("");
b2.setId(new Long(2));
- context = Ognl.createDefaultContext(b1);
+ context = ognlUtil.createDefaultContext(b1);
List<String> includes = new ArrayList<String>();
includes.add("title");
includes.add("somethingElse");
@@ -220,7 +220,7 @@ public class OgnlUtilTest extends XWorkTestCase {
Foo foo = new Foo();
Bar bar = new Bar();
- Map<String, Object> context = Ognl.createDefaultContext(foo);
+ Map<String, Object> context = ognlUtil.createDefaultContext(foo);
Calendar cal = Calendar.getInstance();
cal.clear();
@@ -244,7 +244,7 @@ public class OgnlUtilTest extends XWorkTestCase {
Foo foo = new Foo();
foo.setBar(new Bar());
- Map<String, Object> context = Ognl.createDefaultContext(foo);
+ Map<String, Object> context = ognlUtil.createDefaultContext(foo);
Map<String, Object> props = new HashMap();
props.put("bar.title", "i am barbaz");
@@ -280,7 +280,7 @@ public class OgnlUtilTest extends XWorkTestCase {
public void testOgnlHandlesCrapAtTheEndOfANumber() {
Foo foo = new Foo();
- Map<String, Object> context = Ognl.createDefaultContext(foo);
+ Map<String, Object> context = ognlUtil.createDefaultContext(foo);
Map<String, Object> props = new HashMap<String, Object>();
props.put("aLong", "123a");
@@ -317,7 +317,7 @@ public class OgnlUtilTest extends XWorkTestCase {
public void testSetPropertiesBoolean() {
Foo foo = new Foo();
- Map context = Ognl.createDefaultContext(foo);
+ Map context = ognlUtil.createDefaultContext(foo);
Map props = new HashMap();
props.put("useful", "true");
@@ -338,7 +338,7 @@ public class OgnlUtilTest extends XWorkTestCase {
Foo foo = new Foo();
- Map context = Ognl.createDefaultContext(foo);
+ Map context = ognlUtil.createDefaultContext(foo);
Map props = new HashMap();
props.put("birthday", "02/12/1982");
@@ -408,7 +408,7 @@ public class OgnlUtilTest extends XWorkTestCase {
public void testSetPropertiesInt() {
Foo foo = new Foo();
- Map context = Ognl.createDefaultContext(foo);
+ Map context = ognlUtil.createDefaultContext(foo);
Map props = new HashMap();
props.put("number", "2");
@@ -420,7 +420,7 @@ public class OgnlUtilTest extends XWorkTestCase {
public void testSetPropertiesLongArray() {
Foo foo = new Foo();
- Map context = Ognl.createDefaultContext(foo);
+ Map context = ognlUtil.createDefaultContext(foo);
Map props = new HashMap();
props.put("points", new String[]{"1", "2"});
@@ -435,7 +435,7 @@ public class OgnlUtilTest extends XWorkTestCase {
public void testSetPropertiesString() {
Foo foo = new Foo();
- Map context = Ognl.createDefaultContext(foo);
+ Map context = ognlUtil.createDefaultContext(foo);
Map props = new HashMap();
props.put("title", "this is a title");
@@ -446,7 +446,7 @@ public class OgnlUtilTest extends XWorkTestCase {
public void testSetProperty() {
Foo foo = new Foo();
- Map context = Ognl.createDefaultContext(foo);
+ Map context = ognlUtil.createDefaultContext(foo);
assertFalse(123456 == foo.getNumber());
ognlUtil.setProperty("number", "123456", foo, context);
assertEquals(123456, foo.getNumber());
@@ -457,7 +457,7 @@ public class OgnlUtilTest extends XWorkTestCase {
ChainingInterceptor foo = new ChainingInterceptor();
ChainingInterceptor foo2 = new ChainingInterceptor();
- OgnlContext context = (OgnlContext) Ognl.createDefaultContext(null);
+ OgnlContext context = (OgnlContext) ognlUtil.createDefaultContext(null);
SimpleNode expression = (SimpleNode) Ognl.parseExpression("{'a','ruby','b','tom'}");
@@ -499,7 +499,7 @@ public class OgnlUtilTest extends XWorkTestCase {
public void testStringToLong() {
Foo foo = new Foo();
- Map context = Ognl.createDefaultContext(foo);
+ Map context = ognlUtil.createDefaultContext(foo);
Map props = new HashMap();
props.put("aLong", "123");
@@ -518,7 +518,7 @@ public class OgnlUtilTest extends XWorkTestCase {
Foo foo = new Foo();
foo.setALong(88);
- Map context = Ognl.createDefaultContext(foo);
+ Map context = ognlUtil.createDefaultContext(foo);
ognlUtil.setProperties(null, foo, context);
assertEquals(88, foo.getALong());
@@ -531,7 +531,7 @@ public class OgnlUtilTest extends XWorkTestCase {
public void testCopyNull() {
Foo foo = new Foo();
- Map context = Ognl.createDefaultContext(foo);
+ Map context = ognlUtil.createDefaultContext(foo);
ognlUtil.copy(null, null, context);
ognlUtil.copy(foo, null, context);
@@ -540,7 +540,7 @@ public class OgnlUtilTest extends XWorkTestCase {
public void testGetTopTarget() throws Exception {
Foo foo = new Foo();
- Map context = Ognl.createDefaultContext(foo);
+ Map context = ognlUtil.createDefaultContext(foo);
CompoundRoot root = new CompoundRoot();
Object top = ognlUtil.getRealTarget("top", context, root);
@@ -633,146 +633,127 @@ public class OgnlUtilTest extends XWorkTestCase {
public void testAvoidCallingMethodsOnObjectClass() throws Exception {
Foo foo = new Foo();
- OgnlUtil util = new OgnlUtil();
- util.setEnableExpressionCache("false");
- util.setExcludedProperties("class");
Exception expected = null;
try {
- util.setValue("class.classLoader.defaultAssertionStatus", ActionContext.getContext().getContextMap(), foo, true);
+ ognlUtil.setExcludedClasses(Object.class.getName());
+ ognlUtil.setValue("class.classLoader.defaultAssertionStatus", ognlUtil.createDefaultContext(foo), foo, true);
fail();
} catch (OgnlException e) {
expected = e;
}
assertNotNull(expected);
- assertSame(expected.getClass(), OgnlException.class);
- assertEquals(expected.getMessage(), "Tree [class.classLoader.defaultAssertionStatus] trying access excluded pattern [class]");
+ assertSame(NoSuchPropertyException.class, expected.getClass());
+ assertEquals("com.opensymphony.xwork2.util.Foo.class", expected.getMessage());
}
public void testAvoidCallingMethodsOnObjectClassUpperCased() throws Exception {
Foo foo = new Foo();
- OgnlUtil util = new OgnlUtil();
- util.setEnableExpressionCache("false");
- util.setExcludedProperties("class");
Exception expected = null;
try {
- util.setValue("Class.ClassLoader.DefaultAssertionStatus", ActionContext.getContext().getContextMap(), foo, true);
+ ognlUtil.setExcludedClasses(Object.class.getName());
+ ognlUtil.setValue("Class.ClassLoader.DefaultAssertionStatus", ognlUtil.createDefaultContext(foo), foo, true);
fail();
} catch (OgnlException e) {
expected = e;
}
assertNotNull(expected);
- assertSame(expected.getClass(), OgnlException.class);
- assertEquals(expected.getMessage(), "Tree [Class.ClassLoader.DefaultAssertionStatus] trying access excluded pattern [class]");
+ assertSame(NoSuchPropertyException.class, expected.getClass());
+ assertEquals("com.opensymphony.xwork2.util.Foo.Class", expected.getMessage());
}
public void testAvoidCallingMethodsOnObjectClassAsMap() throws Exception {
Foo foo = new Foo();
- OgnlUtil util = new OgnlUtil();
- util.setEnableExpressionCache("false");
- util.setExcludedProperties("class");
Exception expected = null;
try {
- util.setValue("class['classLoader']['defaultAssertionStatus']", ActionContext.getContext().getContextMap(), foo, true);
+ ognlUtil.setExcludedClasses(Object.class.getName());
+ ognlUtil.setValue("class['classLoader']['defaultAssertionStatus']", ognlUtil.createDefaultContext(foo), foo, true);
fail();
} catch (OgnlException e) {
expected = e;
}
assertNotNull(expected);
- assertSame(expected.getClass(), OgnlException.class);
- assertEquals(expected.getMessage(), "Tree [class[\"classLoader\"][\"defaultAssertionStatus\"]] trying access excluded pattern [class]");
+ assertSame(NoSuchPropertyException.class, expected.getClass());
+ assertEquals("com.opensymphony.xwork2.util.Foo.class", expected.getMessage());
}
public void testAvoidCallingMethodsOnObjectClassAsMap2() throws Exception {
Foo foo = new Foo();
- OgnlUtil util = new OgnlUtil();
- util.setEnableExpressionCache("false");
- util.setExcludedProperties("class");
Exception expected = null;
try {
- util.setValue("model['class']['classLoader']['defaultAssertionStatus']", ActionContext.getContext().getContextMap(), foo, true);
+ ognlUtil.setValue("foo['class']['classLoader']['defaultAssertionStatus']", ognlUtil.createDefaultContext(foo), foo, true);
fail();
} catch (OgnlException e) {
expected = e;
}
assertNotNull(expected);
- assertSame(expected.getClass(), OgnlException.class);
- assertEquals(expected.getMessage(), "Tree [class[\"classLoader\"][\"defaultAssertionStatus\"]] trying access excluded pattern [class]");
+ assertSame(NoSuchPropertyException.class, expected.getClass());
+ assertEquals("com.opensymphony.xwork2.util.Foo.foo", expected.getMessage());
}
public void testAvoidCallingMethodsOnObjectClassAsMapWithQuotes() throws Exception {
Foo foo = new Foo();
- OgnlUtil util = new OgnlUtil();
- util.setEnableExpressionCache("false");
- util.setExcludedProperties("class");
Exception expected = null;
try {
- util.setValue("class[\"classLoader\"]['defaultAssertionStatus']", ActionContext.getContext().getContextMap(), foo, true);
+ ognlUtil.setExcludedClasses(Object.class.getName());
+ ognlUtil.setValue("class[\"classLoader\"]['defaultAssertionStatus']", ognlUtil.createDefaultContext(foo), foo, true);
fail();
} catch (OgnlException e) {
expected = e;
}
assertNotNull(expected);
- assertSame(expected.getClass(), OgnlException.class);
- assertEquals(expected.getMessage(), "Tree [class[\"classLoader\"][\"defaultAssertionStatus\"]] trying access excluded pattern [class]");
+ assertSame(NoSuchPropertyException.class, expected.getClass());
+ assertEquals("com.opensymphony.xwork2.util.Foo.class", expected.getMessage());
}
public void testAvoidCallingToString() throws Exception {
Foo foo = new Foo();
- OgnlUtil util = new OgnlUtil();
- util.setEnableExpressionCache("false");
- util.setExcludedProperties("toString");
Exception expected = null;
try {
- util.setValue("toString", ActionContext.getContext().getContextMap(), foo, true);
+ ognlUtil.setValue("toString", ognlUtil.createDefaultContext(foo), foo, null);
fail();
} catch (OgnlException e) {
expected = e;
}
assertNotNull(expected);
- assertSame(expected.getClass(), OgnlException.class);
- assertEquals(expected.getMessage(), "Tree [toString] trying access excluded pattern [toString]");
+ assertSame(OgnlException.class, expected.getClass());
+ assertEquals("toString", expected.getMessage());
}
public void testAvoidCallingMethodsWithBraces() throws Exception {
Foo foo = new Foo();
- OgnlUtil util = new OgnlUtil();
- util.setEnableExpressionCache("false");
- util.setExcludedProperties("toString");
Exception expected = null;
try {
- util.setValue("toString()", ActionContext.getContext().getContextMap(), foo, true);
+ ognlUtil.setValue("toString()", ognlUtil.createDefaultContext(foo), foo, true);
fail();
} catch (OgnlException e) {
expected = e;
}
assertNotNull(expected);
- assertSame(expected.getClass(), OgnlException.class);
- assertEquals(expected.getMessage(), "Tree [toString()] trying access excluded pattern [toString()]");
+ assertSame(InappropriateExpressionException.class, expected.getClass());
+ assertEquals(expected.getMessage(), "Inappropriate OGNL expression: toString()");
}
public void testAvoidCallingSomeClasses() throws Exception {
Foo foo = new Foo();
- OgnlUtil util = new OgnlUtil();
- util.setEnableExpressionCache("false");
- util.setExcludedProperties("Runtime");
Exception expected = null;
try {
- util.setValue("@java.lang.Runtime@getRuntime().exec('mate')", ActionContext.getContext().getContextMap(), foo, true);
+ ognlUtil.setExcludedClasses(Runtime.class.getName());
+ ognlUtil.setValue("@java.lang.Runtime@getRuntime().exec('mate')", ognlUtil.createDefaultContext(foo), foo, true);
fail();
} catch (OgnlException e) {
expected = e;
}
assertNotNull(expected);
- assertSame(expected.getClass(), OgnlException.class);
- assertEquals(expected.getMessage(), "Tree [toString()] trying access excluded pattern [toString()]");
+ assertSame(MethodFailedException.class, expected.getClass());
+ assertEquals(expected.getMessage(), "Method \"getRuntime\" failed for object class java.lang.Runtime");
}
public static class Email {
http://git-wip-us.apache.org/repos/asf/struts/blob/cdfb94d7/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java
index a4a153a..cb71081 100644
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java
@@ -58,6 +58,7 @@ public class OgnlValueStackTest extends XWorkTestCase {
(CompoundRootAccessor) container.getInstance(PropertyAccessor.class, CompoundRoot.class.getName()),
container.getInstance(TextProvider.class, "system"), allowStaticMethodAccess);
container.inject(stack);
+ ognlUtil.setAllowStaticMethodAccess(Boolean.toString(allowStaticMethodAccess));
return stack;
}
[22/50] git commit: Converts class with patterns into Struts bean
Posted by lu...@apache.org.
Converts class with patterns into Struts bean
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/65c023b6
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/65c023b6
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/65c023b6
Branch: refs/heads/feature/WW-4295-localization
Commit: 65c023b6f3e848fae13135ee90c101a0d0e2f262
Parents: 08b44fd
Author: Lukasz Lenart <lu...@apache.org>
Authored: Mon May 12 08:26:12 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Mon May 12 08:26:12 2014 +0200
----------------------------------------------------------------------
core/src/main/resources/struts-default.xml | 4 +
.../opensymphony/xwork2/ExcludedPatterns.java | 22 ---
.../xwork2/ExcludedPatternsChecker.java | 135 +++++++++++++++++++
3 files changed, 139 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/65c023b6/core/src/main/resources/struts-default.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
index 1f37ea2..554a8ba 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -144,6 +144,10 @@
<bean type="ognl.PropertyAccessor" name="java.util.HashSet" class="com.opensymphony.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor" />
<bean type="ognl.PropertyAccessor" name="java.util.HashMap" class="com.opensymphony.xwork2.ognl.accessor.XWorkMapPropertyAccessor" />
+ <bean type="com.opensymphony.xwork2.ExcludedPatternsChecker" name="struts" class="com.opensymphony.xwork2.ExcludedPatternsChecker" scope="request"/>
+
+ <constant name="struts.excludedPatterns.checker" value="struts"/>
+
<package name="struts-default" abstract="true">
<result-types>
<result-type name="chain" class="com.opensymphony.xwork2.ActionChainResult"/>
http://git-wip-us.apache.org/repos/asf/struts/blob/65c023b6/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatterns.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatterns.java b/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatterns.java
deleted file mode 100644
index b618a52..0000000
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatterns.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.opensymphony.xwork2;
-
-/**
- * ExcludedPatterns contains hard-coded patterns that must be rejected by {@link com.opensymphony.xwork2.interceptor.ParametersInterceptor}
- * and partially in CookInterceptor
- */
-public class ExcludedPatterns {
-
- public static final String CLASS_ACCESS_PATTERN = "(.*\\.|^|.*|\\[('|\"))class(\\.|('|\")]|\\[).*";
-
- public static final String[] EXCLUDED_PATTERNS = {
- CLASS_ACCESS_PATTERN,
- "^dojo\\..*",
- "^struts\\..*",
- "^session\\..*",
- "^request\\..*",
- "^application\\..*",
- "^servlet(Request|Response)\\..*",
- "^parameters\\..*"
- };
-
-}
http://git-wip-us.apache.org/repos/asf/struts/blob/65c023b6/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatternsChecker.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatternsChecker.java b/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatternsChecker.java
new file mode 100644
index 0000000..ee3eea6
--- /dev/null
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatternsChecker.java
@@ -0,0 +1,135 @@
+package com.opensymphony.xwork2;
+
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.TextParseUtil;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+/**
+ * Used across different interceptors to check if given string matches one of the excluded patterns.
+ * User has two options to change its behaviour:
+ * - define new set of patterns with <constant name="struts.override.excludedPatterns" value=".."/>
+ * - override this class and use then extension point <constant name="struts.excludedPatterns.checker" value="myChecker"/>
+ * to inject it in appropriated places
+ */
+public class ExcludedPatternsChecker {
+
+ private static final Logger LOG = LoggerFactory.getLogger(ExcludedPatternsChecker.class);
+
+ public static final String[] EXCLUDED_PATTERNS = {
+ "(.*\\.|^|.*|\\[('|\"))class(\\.|('|\")]|\\[).*",
+ "^dojo\\..*",
+ "^struts\\..*",
+ "^session\\..*",
+ "^request\\..*",
+ "^application\\..*",
+ "^servlet(Request|Response)\\..*",
+ "^parameters\\..*"
+ };
+
+ private Set<Pattern> excludedPatterns;
+
+ public ExcludedPatternsChecker() {
+ excludedPatterns = new HashSet<Pattern>();
+ for (String pattern : EXCLUDED_PATTERNS) {
+ excludedPatterns.add(Pattern.compile(pattern));
+ }
+ }
+
+ @Inject(value = XWorkConstants.OVERRIDE_EXCLUDED_PATTERNS, required = false)
+ public void setOverrideExcludePatterns(String excludePatterns) {
+ if (LOG.isWarnEnabled()) {
+ LOG.warn("Overriding [#0] with [#1], be aware that this can affect safety of your application!",
+ XWorkConstants.OVERRIDE_EXCLUDED_PATTERNS, excludePatterns);
+ }
+ excludedPatterns = new HashSet<Pattern>();
+ for (String pattern : TextParseUtil.commaDelimitedStringToSet(excludePatterns)) {
+ excludedPatterns.add(Pattern.compile(pattern));
+ }
+ }
+
+ /**
+ * Allows add additional excluded patterns during runtime
+ *
+ * @param commaDelimitedPatterns comma delimited string with patterns
+ */
+ public void addExcludedPatterns(String commaDelimitedPatterns) {
+ addExcludedPatterns(TextParseUtil.commaDelimitedStringToSet(commaDelimitedPatterns));
+ }
+
+ /**
+ * Allows add additional excluded patterns during runtime
+ *
+ * @param additionalPatterns array of additional excluded patterns
+ */
+ public void addExcludedPatterns(String[] additionalPatterns) {
+ addExcludedPatterns(new HashSet<String>(Arrays.asList(additionalPatterns)));
+ }
+
+ /**
+ * Allows add additional excluded patterns during runtime
+ *
+ * @param additionalPatterns set of additional patterns
+ */
+ public void addExcludedPatterns(Set<String> additionalPatterns) {
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Adding additional excluded patterns [#0]", additionalPatterns);
+ }
+ for (String pattern : additionalPatterns) {
+ excludedPatterns.add(Pattern.compile(pattern));
+ }
+ }
+
+ public IsExcluded isExcluded(String value) {
+ for (Pattern excludedPattern : excludedPatterns) {
+ if (excludedPattern.matcher(value).matches()) {
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("[#0] matches excluded pattern [#1]", value, excludedPattern);
+ }
+ return IsExcluded.yes(excludedPattern);
+ }
+ }
+ return IsExcluded.no();
+ }
+
+ public final static class IsExcluded {
+
+ private final boolean excluded;
+ private final Pattern excludedPattern;
+
+ public static IsExcluded yes(Pattern excludedPattern) {
+ return new IsExcluded(true, excludedPattern);
+ }
+
+ public static IsExcluded no() {
+ return new IsExcluded(false, null);
+ }
+
+ private IsExcluded(boolean excluded, Pattern excludedPattern) {
+ this.excluded = excluded;
+ this.excludedPattern = excludedPattern;
+ }
+
+ public boolean isExcluded() {
+ return excluded;
+ }
+
+ public Pattern getExcludedPattern() {
+ return excludedPattern;
+ }
+
+ @Override
+ public String toString() {
+ return "IsExcluded { " +
+ "excluded=" + excluded +
+ ", excludedPattern=" + excludedPattern +
+ " }";
+ }
+ }
+
+}
[04/50] git commit: Renames excluded properties to excluded classes
Posted by lu...@apache.org.
Renames excluded properties to excluded classes
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d5bd607c
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d5bd607c
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d5bd607c
Branch: refs/heads/feature/WW-4295-localization
Commit: d5bd607c6fd0cbbf12e75492e7333439758446ea
Parents: c778297
Author: Lukasz Lenart <lu...@apache.org>
Authored: Sat May 3 20:13:10 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Sat May 3 20:13:10 2014 +0200
----------------------------------------------------------------------
.../src/main/java/com/opensymphony/xwork2/XWorkConstants.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/d5bd607c/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java b/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
index 1894372..dfbf6d5 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java
@@ -17,6 +17,6 @@ public final class XWorkConstants {
public static final String RELOAD_XML_CONFIGURATION = "reloadXmlConfiguration";
public static final String ALLOW_STATIC_METHOD_ACCESS = "allowStaticMethodAccess";
public static final String XWORK_LOGGER_FACTORY = "xwork.loggerFactory";
- public static final String OGNL_EXCLUDED_PROPERTIES = "ognlExcludedProperties";
+ public static final String OGNL_EXCLUDED_CLASSES = "ognlExcludedClasses";
}
[17/50] git commit: Removes override which isn't used anymore
Posted by lu...@apache.org.
Removes override which isn't used anymore
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/7857b869
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/7857b869
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/7857b869
Branch: refs/heads/feature/WW-4295-localization
Commit: 7857b869a05b12779e35bfe8751828dfbf328fff
Parents: 62ee6b1
Author: Lukasz Lenart <lu...@apache.org>
Authored: Mon May 5 21:33:44 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Mon May 5 21:33:44 2014 +0200
----------------------------------------------------------------------
.../xwork2/interceptor/ParametersInterceptorTest.java | 14 --------------
1 file changed, 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/7857b869/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
index 6ffb3ff..359618f 100644
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
@@ -187,10 +187,6 @@ public class ParametersInterceptorTest extends XWorkTestCase {
return result;
}
- @Override
- protected void initializeHardCodedExcludePatterns() {
- excludeParams = new HashSet<Pattern>();
- }
};
container.inject(pi);
@@ -307,11 +303,6 @@ public class ParametersInterceptorTest extends XWorkTestCase {
ParametersInterceptor pi = new ParametersInterceptor() {
@Override
- protected void initializeHardCodedExcludePatterns() {
- this.excludeParams = new HashSet<Pattern>();
- }
-
- @Override
protected boolean isExcluded(String paramName) {
boolean result = super.isExcluded(paramName);
excluded.put(paramName, result);
@@ -744,11 +735,6 @@ public class ParametersInterceptorTest extends XWorkTestCase {
assertEquals(expected, actual);
}
- public void testExcludedPatternsGetInitialized() throws Exception {
- ParametersInterceptor parametersInterceptor = new ParametersInterceptor();
- assertEquals(ExcludedPatterns.EXCLUDED_PATTERNS.length, parametersInterceptor.excludeParams.size());
- }
-
private ValueStack injectValueStack(Map<String, Object> actual) {
ValueStack stack = createStubValueStack(actual);
container.inject(stack);
[34/50] git commit: Moves security related classes to security package
Posted by lu...@apache.org.
Moves security related classes to security package
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/7faf91ab
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/7faf91ab
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/7faf91ab
Branch: refs/heads/feature/WW-4295-localization
Commit: 7faf91abe1987aa812655860b4e7ef1ad2f93644
Parents: 83b76b0
Author: Lukasz Lenart <lu...@apache.org>
Authored: Mon May 19 09:59:23 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Mon May 19 09:59:23 2014 +0200
----------------------------------------------------------------------
core/src/main/resources/struts-default.xml | 2 +-
.../struts2/TestConfigurationProvider.java | 2 +-
.../interceptor/CookieInterceptorTest.java | 2 +-
.../xwork2/DefaultExcludedPatternsChecker.java | 82 -------------------
.../providers/XWorkConfigurationProvider.java | 2 +-
.../DefaultExcludedPatternsChecker.java | 83 ++++++++++++++++++++
.../security/ExcludedPatternsChecker.java | 82 +++++++++++++++++++
7 files changed, 169 insertions(+), 86 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/7faf91ab/core/src/main/resources/struts-default.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
index 2d74b4f..ecfa5cf 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -144,7 +144,7 @@
<bean type="ognl.PropertyAccessor" name="java.util.HashSet" class="com.opensymphony.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor" />
<bean type="ognl.PropertyAccessor" name="java.util.HashMap" class="com.opensymphony.xwork2.ognl.accessor.XWorkMapPropertyAccessor" />
- <bean type="com.opensymphony.xwork2.ExcludedPatternsChecker" name="struts" class="com.opensymphony.xwork2.DefaultExcludedPatternsChecker" />
+ <bean type="com.opensymphony.xwork2.ExcludedPatternsChecker" name="struts" class="com.opensymphony.xwork2.security.DefaultExcludedPatternsChecker" />
<package name="struts-default" abstract="true">
<result-types>
http://git-wip-us.apache.org/repos/asf/struts/blob/7faf91ab/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java b/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
index 9323f02..d9da6c4 100644
--- a/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
+++ b/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
@@ -24,7 +24,7 @@ package org.apache.struts2;
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionProxyFactory;
import com.opensymphony.xwork2.DefaultActionProxyFactory;
-import com.opensymphony.xwork2.DefaultExcludedPatternsChecker;
+import com.opensymphony.xwork2.security.DefaultExcludedPatternsChecker;
import com.opensymphony.xwork2.ExcludedPatternsChecker;
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.config.Configuration;
http://git-wip-us.apache.org/repos/asf/struts/blob/7faf91ab/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
index 1f642f5..a531a69 100644
--- a/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
+++ b/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
@@ -27,7 +27,7 @@ import java.util.Map;
import javax.servlet.http.Cookie;
-import com.opensymphony.xwork2.DefaultExcludedPatternsChecker;
+import com.opensymphony.xwork2.security.DefaultExcludedPatternsChecker;
import com.opensymphony.xwork2.mock.MockActionInvocation;
import org.easymock.MockControl;
import org.springframework.mock.web.MockHttpServletRequest;
http://git-wip-us.apache.org/repos/asf/struts/blob/7faf91ab/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultExcludedPatternsChecker.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultExcludedPatternsChecker.java b/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultExcludedPatternsChecker.java
deleted file mode 100644
index eabd621..0000000
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultExcludedPatternsChecker.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.opensymphony.xwork2;
-
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.TextParseUtil;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-public class DefaultExcludedPatternsChecker implements ExcludedPatternsChecker {
-
- private static final Logger LOG = LoggerFactory.getLogger(DefaultExcludedPatternsChecker.class);
-
- public static final String[] EXCLUDED_PATTERNS = {
- "(.*\\.|^|.*|\\[('|\"))class(\\.|('|\")]|\\[).*",
- "^dojo\\..*",
- "^struts\\..*",
- "^session\\..*",
- "^request\\..*",
- "^application\\..*",
- "^servlet(Request|Response)\\..*",
- "^parameters\\..*"
- };
-
- private Set<Pattern> excludedPatterns;
-
- public DefaultExcludedPatternsChecker() {
- excludedPatterns = new HashSet<Pattern>();
- for (String pattern : EXCLUDED_PATTERNS) {
- excludedPatterns.add(Pattern.compile(pattern));
- }
- }
-
- @Inject(value = XWorkConstants.OVERRIDE_EXCLUDED_PATTERNS, required = false)
- public void setOverrideExcludePatterns(String excludePatterns) {
- if (LOG.isWarnEnabled()) {
- LOG.warn("Overriding [#0] with [#1], be aware that this can affect safety of your application!",
- XWorkConstants.OVERRIDE_EXCLUDED_PATTERNS, excludePatterns);
- }
- excludedPatterns = new HashSet<Pattern>();
- for (String pattern : TextParseUtil.commaDelimitedStringToSet(excludePatterns)) {
- excludedPatterns.add(Pattern.compile(pattern));
- }
- }
-
- public void addExcludedPatterns(String commaDelimitedPatterns) {
- addExcludedPatterns(TextParseUtil.commaDelimitedStringToSet(commaDelimitedPatterns));
- }
-
- public void addExcludedPatterns(String[] additionalPatterns) {
- addExcludedPatterns(new HashSet<String>(Arrays.asList(additionalPatterns)));
- }
-
- public void addExcludedPatterns(Set<String> additionalPatterns) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Adding additional excluded patterns [#0]", additionalPatterns);
- }
- for (String pattern : additionalPatterns) {
- excludedPatterns.add(Pattern.compile(pattern));
- }
- }
-
- public IsExcluded isExcluded(String value) {
- for (Pattern excludedPattern : excludedPatterns) {
- if (excludedPattern.matcher(value).matches()) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("[#0] matches excluded pattern [#1]", value, excludedPattern);
- }
- return IsExcluded.yes(excludedPattern);
- }
- }
- return IsExcluded.no();
- }
-
- public Set<Pattern> getExcludedPatterns() {
- return excludedPatterns;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/struts/blob/7faf91ab/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java b/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
index c341d98..1a72206 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
@@ -2,7 +2,7 @@ package com.opensymphony.xwork2.config.providers;
import com.opensymphony.xwork2.ActionProxyFactory;
import com.opensymphony.xwork2.DefaultActionProxyFactory;
-import com.opensymphony.xwork2.DefaultExcludedPatternsChecker;
+import com.opensymphony.xwork2.security.DefaultExcludedPatternsChecker;
import com.opensymphony.xwork2.DefaultLocaleProvider;
import com.opensymphony.xwork2.DefaultTextProvider;
import com.opensymphony.xwork2.DefaultUnknownHandlerManager;
http://git-wip-us.apache.org/repos/asf/struts/blob/7faf91ab/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java b/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
new file mode 100644
index 0000000..f2abed6
--- /dev/null
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
@@ -0,0 +1,83 @@
+package com.opensymphony.xwork2.security;
+
+import com.opensymphony.xwork2.*;
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.TextParseUtil;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+public class DefaultExcludedPatternsChecker implements com.opensymphony.xwork2.ExcludedPatternsChecker {
+
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultExcludedPatternsChecker.class);
+
+ public static final String[] EXCLUDED_PATTERNS = {
+ "(.*\\.|^|.*|\\[('|\"))class(\\.|('|\")]|\\[).*",
+ "^dojo\\..*",
+ "^struts\\..*",
+ "^session\\..*",
+ "^request\\..*",
+ "^application\\..*",
+ "^servlet(Request|Response)\\..*",
+ "^parameters\\..*"
+ };
+
+ private Set<Pattern> excludedPatterns;
+
+ public DefaultExcludedPatternsChecker() {
+ excludedPatterns = new HashSet<Pattern>();
+ for (String pattern : EXCLUDED_PATTERNS) {
+ excludedPatterns.add(Pattern.compile(pattern));
+ }
+ }
+
+ @Inject(value = XWorkConstants.OVERRIDE_EXCLUDED_PATTERNS, required = false)
+ public void setOverrideExcludePatterns(String excludePatterns) {
+ if (LOG.isWarnEnabled()) {
+ LOG.warn("Overriding [#0] with [#1], be aware that this can affect safety of your application!",
+ XWorkConstants.OVERRIDE_EXCLUDED_PATTERNS, excludePatterns);
+ }
+ excludedPatterns = new HashSet<Pattern>();
+ for (String pattern : TextParseUtil.commaDelimitedStringToSet(excludePatterns)) {
+ excludedPatterns.add(Pattern.compile(pattern));
+ }
+ }
+
+ public void addExcludedPatterns(String commaDelimitedPatterns) {
+ addExcludedPatterns(TextParseUtil.commaDelimitedStringToSet(commaDelimitedPatterns));
+ }
+
+ public void addExcludedPatterns(String[] additionalPatterns) {
+ addExcludedPatterns(new HashSet<String>(Arrays.asList(additionalPatterns)));
+ }
+
+ public void addExcludedPatterns(Set<String> additionalPatterns) {
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Adding additional excluded patterns [#0]", additionalPatterns);
+ }
+ for (String pattern : additionalPatterns) {
+ excludedPatterns.add(Pattern.compile(pattern));
+ }
+ }
+
+ public IsExcluded isExcluded(String value) {
+ for (Pattern excludedPattern : excludedPatterns) {
+ if (excludedPattern.matcher(value).matches()) {
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("[#0] matches excluded pattern [#1]", value, excludedPattern);
+ }
+ return IsExcluded.yes(excludedPattern);
+ }
+ }
+ return IsExcluded.no();
+ }
+
+ public Set<Pattern> getExcludedPatterns() {
+ return excludedPatterns;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/struts/blob/7faf91ab/xwork-core/src/main/java/com/opensymphony/xwork2/security/ExcludedPatternsChecker.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/security/ExcludedPatternsChecker.java b/xwork-core/src/main/java/com/opensymphony/xwork2/security/ExcludedPatternsChecker.java
new file mode 100644
index 0000000..51751e9
--- /dev/null
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/security/ExcludedPatternsChecker.java
@@ -0,0 +1,82 @@
+package com.opensymphony.xwork2.security;
+
+import java.util.Set;
+import java.util.regex.Pattern;
+
+/**
+ * Used across different interceptors to check if given string matches one of the excluded patterns.
+ */
+public interface ExcludedPatternsChecker {
+
+ /**
+ * Checks if value matches any of patterns on exclude list
+ *
+ * @param value to check
+ * @return object containing result of matched pattern and pattern itself
+ */
+ public IsExcluded isExcluded(String value);
+
+ /**
+ * Allows add additional excluded patterns during runtime
+ *
+ * @param commaDelimitedPatterns comma delimited string with patterns
+ */
+ public void addExcludedPatterns(String commaDelimitedPatterns);
+
+ /**
+ * Allows add additional excluded patterns during runtime
+ *
+ * @param additionalPatterns array of additional excluded patterns
+ */
+ public void addExcludedPatterns(String[] additionalPatterns);
+
+ /**
+ * Allows add additional excluded patterns during runtime
+ *
+ * @param additionalPatterns set of additional patterns
+ */
+ public void addExcludedPatterns(Set<String> additionalPatterns);
+
+ /**
+ * Allow access list of all defined excluded patterns
+ *
+ * @return set of excluded patterns
+ */
+ public Set<Pattern> getExcludedPatterns();
+
+ public final static class IsExcluded {
+
+ private final boolean excluded;
+ private final Pattern excludedPattern;
+
+ public static IsExcluded yes(Pattern excludedPattern) {
+ return new IsExcluded(true, excludedPattern);
+ }
+
+ public static IsExcluded no() {
+ return new IsExcluded(false, null);
+ }
+
+ private IsExcluded(boolean excluded, Pattern excludedPattern) {
+ this.excluded = excluded;
+ this.excludedPattern = excludedPattern;
+ }
+
+ public boolean isExcluded() {
+ return excluded;
+ }
+
+ public Pattern getExcludedPattern() {
+ return excludedPattern;
+ }
+
+ @Override
+ public String toString() {
+ return "IsExcluded { " +
+ "excluded=" + excluded +
+ ", excludedPattern=" + excludedPattern +
+ " }";
+ }
+ }
+
+}
[02/50] git commit: [maven-release-plugin] prepare for next
development iteration
Posted by lu...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/bcffc256
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/bcffc256
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/bcffc256
Branch: refs/heads/feature/WW-4295-localization
Commit: bcffc256fa27506588628a4df51977677c8d24aa
Parents: e03ff72
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri May 2 17:10:54 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri May 2 17:10:54 2014 +0200
----------------------------------------------------------------------
apps/blank/pom.xml | 2 +-
apps/jboss-blank/pom.xml | 2 +-
apps/mailreader/pom.xml | 2 +-
apps/pom.xml | 2 +-
apps/portlet/pom.xml | 2 +-
apps/rest-showcase/pom.xml | 4 ++--
apps/showcase/pom.xml | 2 +-
archetypes/pom.xml | 2 +-
archetypes/struts2-archetype-angularjs/pom.xml | 4 ++--
archetypes/struts2-archetype-blank/pom.xml | 4 ++--
archetypes/struts2-archetype-convention/pom.xml | 4 ++--
archetypes/struts2-archetype-dbportlet/pom.xml | 4 ++--
archetypes/struts2-archetype-plugin/pom.xml | 4 ++--
archetypes/struts2-archetype-portlet/pom.xml | 4 ++--
archetypes/struts2-archetype-starter/pom.xml | 4 ++--
assembly/pom.xml | 2 +-
bundles/admin/pom.xml | 2 +-
bundles/demo/pom.xml | 2 +-
bundles/pom.xml | 2 +-
core/pom.xml | 2 +-
plugins/cdi/pom.xml | 2 +-
plugins/codebehind/pom.xml | 2 +-
plugins/config-browser/pom.xml | 2 +-
plugins/convention/pom.xml | 2 +-
plugins/dojo/pom.xml | 2 +-
plugins/dwr/pom.xml | 2 +-
plugins/embeddedjsp/pom.xml | 2 +-
plugins/gxp/pom.xml | 2 +-
plugins/jasperreports/pom.xml | 2 +-
plugins/javatemplates/pom.xml | 2 +-
plugins/jfreechart/pom.xml | 2 +-
plugins/jsf/pom.xml | 2 +-
plugins/json/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
plugins/osgi/pom.xml | 2 +-
plugins/oval/pom.xml | 2 +-
plugins/pell-multipart/pom.xml | 2 +-
plugins/plexus/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/portlet-tiles/pom.xml | 2 +-
plugins/portlet/pom.xml | 2 +-
plugins/rest/pom.xml | 4 ++--
plugins/sitegraph/pom.xml | 2 +-
plugins/sitemesh/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/struts1/pom.xml | 2 +-
plugins/testng/pom.xml | 2 +-
plugins/tiles/pom.xml | 2 +-
plugins/tiles3/pom.xml | 2 +-
pom.xml | 4 ++--
xwork-core/pom.xml | 2 +-
51 files changed, 61 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/apps/blank/pom.xml
----------------------------------------------------------------------
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index b7343c6..317a2b4 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-blank</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/apps/jboss-blank/pom.xml
----------------------------------------------------------------------
diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
index 62c6803..1454f7b 100644
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-jboss-blank</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/apps/mailreader/pom.xml
----------------------------------------------------------------------
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index c41bb76..7814520 100644
--- a/apps/mailreader/pom.xml
+++ b/apps/mailreader/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-mailreader</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index c89f4cc..d0a24d0 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/apps/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
index 5100b4e..3698ac4 100644
--- a/apps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/apps/rest-showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index fdd6c8b..fe2d3be 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -26,12 +26,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-rest-showcase</artifactId>
<packaging>war</packaging>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
<name>Struts 2 Rest Showcase Example</name>
<description>Struts 2 Rest Showcase Example</description>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/apps/showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 68ca565..6a0c317 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-showcase</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index 02083e0..c7ca432 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/archetypes/struts2-archetype-angularjs/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-angularjs/pom.xml b/archetypes/struts2-archetype-angularjs/pom.xml
index 2235e44..95fc42a 100644
--- a/archetypes/struts2-archetype-angularjs/pom.xml
+++ b/archetypes/struts2-archetype-angularjs/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-angularjs</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Angular JS</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/archetypes/struts2-archetype-blank/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-blank/pom.xml b/archetypes/struts2-archetype-blank/pom.xml
index c6473bd..0bb4321 100644
--- a/archetypes/struts2-archetype-blank/pom.xml
+++ b/archetypes/struts2-archetype-blank/pom.xml
@@ -3,12 +3,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-blank</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Blank</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/archetypes/struts2-archetype-convention/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-convention/pom.xml b/archetypes/struts2-archetype-convention/pom.xml
index b6c34d0..e6c912b 100644
--- a/archetypes/struts2-archetype-convention/pom.xml
+++ b/archetypes/struts2-archetype-convention/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-convention</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Blank Convention</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/archetypes/struts2-archetype-dbportlet/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-dbportlet/pom.xml b/archetypes/struts2-archetype-dbportlet/pom.xml
index d918d13..a25f8d0 100644
--- a/archetypes/struts2-archetype-dbportlet/pom.xml
+++ b/archetypes/struts2-archetype-dbportlet/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-dbportlet</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Database Portlet</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/archetypes/struts2-archetype-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-plugin/pom.xml b/archetypes/struts2-archetype-plugin/pom.xml
index 8c47dbf..0bcbaf9 100644
--- a/archetypes/struts2-archetype-plugin/pom.xml
+++ b/archetypes/struts2-archetype-plugin/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-plugin</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Plugin</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/archetypes/struts2-archetype-portlet/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-portlet/pom.xml b/archetypes/struts2-archetype-portlet/pom.xml
index a6be6f7..e2a5694 100644
--- a/archetypes/struts2-archetype-portlet/pom.xml
+++ b/archetypes/struts2-archetype-portlet/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-portlet</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Portlet</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/archetypes/struts2-archetype-starter/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-starter/pom.xml b/archetypes/struts2-archetype-starter/pom.xml
index 742e0b9..c1ca6fa 100644
--- a/archetypes/struts2-archetype-starter/pom.xml
+++ b/archetypes/struts2-archetype-starter/pom.xml
@@ -4,12 +4,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-starter</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Starter</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 1c3c55f..81d6d6a 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-assembly</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/bundles/admin/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
index 5713461..388cc90 100644
--- a/bundles/admin/pom.xml
+++ b/bundles/admin/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-admin-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/bundles/demo/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml
index 145034a..2ff5746 100644
--- a/bundles/demo/pom.xml
+++ b/bundles/demo/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-demo-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/bundles/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/pom.xml b/bundles/pom.xml
index b87e697..d88d601 100755
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-bundles</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index c53059c..030612d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/plugins/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml
index 1757de6..3446030 100644
--- a/plugins/cdi/pom.xml
+++ b/plugins/cdi/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-cdi-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/plugins/codebehind/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml
index ab09d6d..0991032 100644
--- a/plugins/codebehind/pom.xml
+++ b/plugins/codebehind/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-codebehind-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/plugins/config-browser/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml
index 2a1dace..7860ee3 100644
--- a/plugins/config-browser/pom.xml
+++ b/plugins/config-browser/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-config-browser-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/plugins/convention/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml
index 137aed5..792713e 100644
--- a/plugins/convention/pom.xml
+++ b/plugins/convention/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-convention-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/plugins/dojo/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml
index 88606e4..dfe0bd8 100644
--- a/plugins/dojo/pom.xml
+++ b/plugins/dojo/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>struts2-plugins</artifactId>
<groupId>org.apache.struts</groupId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/plugins/dwr/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml
index 19033d2..bc6778b 100644
--- a/plugins/dwr/pom.xml
+++ b/plugins/dwr/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-dwr-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/plugins/embeddedjsp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml
index 604a876..4854acc 100644
--- a/plugins/embeddedjsp/pom.xml
+++ b/plugins/embeddedjsp/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-embeddedjsp-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/plugins/gxp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml
index cd9c826..aaa2988 100644
--- a/plugins/gxp/pom.xml
+++ b/plugins/gxp/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-gxp-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/plugins/jasperreports/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml
index 605b92c..3418200 100644
--- a/plugins/jasperreports/pom.xml
+++ b/plugins/jasperreports/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-jasperreports-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/plugins/javatemplates/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml
index 611f421..0291187 100644
--- a/plugins/javatemplates/pom.xml
+++ b/plugins/javatemplates/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-javatemplates-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/plugins/jfreechart/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml
index 395b415..34a040e 100644
--- a/plugins/jfreechart/pom.xml
+++ b/plugins/jfreechart/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-jfreechart-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/plugins/jsf/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jsf/pom.xml b/plugins/jsf/pom.xml
index 6720597..6c2e6ee 100644
--- a/plugins/jsf/pom.xml
+++ b/plugins/jsf/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-jsf-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/plugins/json/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml
index 9daa09c..6bddf81 100644
--- a/plugins/json/pom.xml
+++ b/plugins/json/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-json-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/plugins/junit/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 7baff8c..50d359a 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/plugins/osgi/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml
index e89c417..b755e65 100644
--- a/plugins/osgi/pom.xml
+++ b/plugins/osgi/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/plugins/oval/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml
index 6305065..8b14fe5 100644
--- a/plugins/oval/pom.xml
+++ b/plugins/oval/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-oval-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/plugins/pell-multipart/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml
index 54fa305..73ae9c4 100644
--- a/plugins/pell-multipart/pom.xml
+++ b/plugins/pell-multipart/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-pell-multipart-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/plugins/plexus/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml
index 841032b..4528454 100644
--- a/plugins/plexus/pom.xml
+++ b/plugins/plexus/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-plexus-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 7a63dd3..b15d61a 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-plugins</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/plugins/portlet-tiles/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml
index 8bf28d3..a6df909 100644
--- a/plugins/portlet-tiles/pom.xml
+++ b/plugins/portlet-tiles/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet-tiles-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/plugins/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index e5c1057..825cc6c 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/plugins/rest/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml
index 62f4e77..863cef4 100644
--- a/plugins/rest/pom.xml
+++ b/plugins/rest/pom.xml
@@ -26,11 +26,11 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-rest-plugin</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
<name>Struts 2 REST Plugin</name>
<properties>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/plugins/sitegraph/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml
index b3aaf14..9a5aaaf 100644
--- a/plugins/sitegraph/pom.xml
+++ b/plugins/sitegraph/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-sitegraph-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/plugins/sitemesh/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml
index f5a4569..99dedb6 100644
--- a/plugins/sitemesh/pom.xml
+++ b/plugins/sitemesh/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-sitemesh-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/plugins/spring/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 0803160..6befe4f 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/plugins/struts1/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/struts1/pom.xml b/plugins/struts1/pom.xml
index f59047f..9bf91e0 100644
--- a/plugins/struts1/pom.xml
+++ b/plugins/struts1/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-struts1-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/plugins/testng/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml
index 5f23c4e..8740e8d 100644
--- a/plugins/testng/pom.xml
+++ b/plugins/testng/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-testng-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/plugins/tiles/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index b6dc526..a7bdfbe 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-tiles-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/plugins/tiles3/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles3/pom.xml b/plugins/tiles3/pom.xml
index 3361d1c..b612dff 100644
--- a/plugins/tiles3/pom.xml
+++ b/plugins/tiles3/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<artifactId>struts2-tiles3-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1d2b7e5..c5fdced 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>http://struts.apache.org/</url>
@@ -31,7 +31,7 @@
<connection>scm:git:git://git.apache.org/struts.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/struts.git</developerConnection>
<url>http://git.apache.org/struts.git</url>
- <tag>STRUTS_2_3_16_3</tag>
+ <tag>STRUTS_2_3_16_2</tag>
</scm>
<issueManagement>
http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/xwork-core/pom.xml
----------------------------------------------------------------------
diff --git a/xwork-core/pom.xml b/xwork-core/pom.xml
index 710f635..d2a380d 100644
--- a/xwork-core/pom.xml
+++ b/xwork-core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.3</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts.xwork</groupId>
[33/50] git commit: Updates tests to match new requirements
Posted by lu...@apache.org.
Updates tests to match new requirements
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/83b76b0f
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/83b76b0f
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/83b76b0f
Branch: refs/heads/feature/WW-4295-localization
Commit: 83b76b0fe83411d93dc2c534c8c47dc53f0dca82
Parents: d1d81f8
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed May 14 08:26:43 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed May 14 08:26:43 2014 +0200
----------------------------------------------------------------------
.../org/apache/struts2/TestConfigurationProvider.java | 5 +++++
xwork-core/src/test/resources/xwork-class-param-test.xml | 11 +++++++++++
2 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/83b76b0f/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java b/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
index cd42ed5..9323f02 100644
--- a/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
+++ b/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
@@ -24,6 +24,8 @@ package org.apache.struts2;
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionProxyFactory;
import com.opensymphony.xwork2.DefaultActionProxyFactory;
+import com.opensymphony.xwork2.DefaultExcludedPatternsChecker;
+import com.opensymphony.xwork2.ExcludedPatternsChecker;
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.config.Configuration;
import com.opensymphony.xwork2.config.ConfigurationException;
@@ -164,5 +166,8 @@ public class TestConfigurationProvider implements ConfigurationProvider {
if (!builder.contains(ActionProxyFactory.class)) {
builder.factory(ActionProxyFactory.class, DefaultActionProxyFactory.class);
}
+ if (!builder.contains(ExcludedPatternsChecker.class)) {
+ builder.factory(ExcludedPatternsChecker.class, DefaultExcludedPatternsChecker.class);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/83b76b0f/xwork-core/src/test/resources/xwork-class-param-test.xml
----------------------------------------------------------------------
diff --git a/xwork-core/src/test/resources/xwork-class-param-test.xml b/xwork-core/src/test/resources/xwork-class-param-test.xml
new file mode 100644
index 0000000..f12c083
--- /dev/null
+++ b/xwork-core/src/test/resources/xwork-class-param-test.xml
@@ -0,0 +1,11 @@
+<!DOCTYPE xwork PUBLIC
+ "-//Apache Struts//XWork 2.0//EN"
+ "http://struts.apache.org/dtds/xwork-2.0.dtd">
+
+<xwork>
+
+ <constant name="devMode" value="true" />
+ <constant name="ognlExcludedClasses" value="java.lang.Object,java.lang.Runtime" />
+ <constant name="overrideExcludedPatterns" value="not-existing-pattern"/>
+
+</xwork>
\ No newline at end of file
[27/50] git commit: Extracts interface to simplify implementation by
users
Posted by lu...@apache.org.
Extracts interface to simplify implementation by users
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/bfbc4c04
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/bfbc4c04
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/bfbc4c04
Branch: refs/heads/feature/WW-4295-localization
Commit: bfbc4c04e007393986f374a02dfb7ded23bc9a05
Parents: ba1850a
Author: Lukasz Lenart <lu...@apache.org>
Authored: Tue May 13 20:29:21 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Tue May 13 20:29:21 2014 +0200
----------------------------------------------------------------------
core/src/main/resources/struts-default.xml | 2 +-
.../interceptor/CookieInterceptorTest.java | 20 ++---
.../xwork2/DefaultExcludedPatternsChecker.java | 93 ++++++++++++++++++++
.../xwork2/ExcludedPatternsChecker.java | 92 +------------------
4 files changed, 106 insertions(+), 101 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/bfbc4c04/core/src/main/resources/struts-default.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
index 554a8ba..f2fb922 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -144,7 +144,7 @@
<bean type="ognl.PropertyAccessor" name="java.util.HashSet" class="com.opensymphony.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor" />
<bean type="ognl.PropertyAccessor" name="java.util.HashMap" class="com.opensymphony.xwork2.ognl.accessor.XWorkMapPropertyAccessor" />
- <bean type="com.opensymphony.xwork2.ExcludedPatternsChecker" name="struts" class="com.opensymphony.xwork2.ExcludedPatternsChecker" scope="request"/>
+ <bean type="com.opensymphony.xwork2.ExcludedPatternsChecker" name="struts" class="com.opensymphony.xwork2.DefaultExcludedPatternsChecker" scope="request"/>
<constant name="struts.excludedPatterns.checker" value="struts"/>
http://git-wip-us.apache.org/repos/asf/struts/blob/bfbc4c04/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
index 2bbaef9..1f642f5 100644
--- a/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
+++ b/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
@@ -27,7 +27,7 @@ import java.util.Map;
import javax.servlet.http.Cookie;
-import com.opensymphony.xwork2.ExcludedPatternsChecker;
+import com.opensymphony.xwork2.DefaultExcludedPatternsChecker;
import com.opensymphony.xwork2.mock.MockActionInvocation;
import org.easymock.MockControl;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -66,7 +66,7 @@ public class CookieInterceptorTest extends StrutsInternalTestCase {
// by default the interceptor doesn't accept any cookies
CookieInterceptor interceptor = new CookieInterceptor();
- interceptor.setExcludedPatternsChecker(new ExcludedPatternsChecker());
+ interceptor.setExcludedPatternsChecker(new DefaultExcludedPatternsChecker());
interceptor.intercept(invocation);
@@ -102,7 +102,7 @@ public class CookieInterceptorTest extends StrutsInternalTestCase {
actionInvocationControl.replay();
CookieInterceptor interceptor = new CookieInterceptor();
- interceptor.setExcludedPatternsChecker(new ExcludedPatternsChecker());
+ interceptor.setExcludedPatternsChecker(new DefaultExcludedPatternsChecker());
interceptor.setCookiesName("*");
interceptor.setCookiesValue("*");
interceptor.intercept(invocation);
@@ -144,7 +144,7 @@ public class CookieInterceptorTest extends StrutsInternalTestCase {
actionInvocationControl.replay();
CookieInterceptor interceptor = new CookieInterceptor();
- interceptor.setExcludedPatternsChecker(new ExcludedPatternsChecker());
+ interceptor.setExcludedPatternsChecker(new DefaultExcludedPatternsChecker());
interceptor.setCookiesName("cookie1, cookie2, cookie3");
interceptor.setCookiesValue("cookie1value, cookie2value, cookie3value");
interceptor.intercept(invocation);
@@ -185,7 +185,7 @@ public class CookieInterceptorTest extends StrutsInternalTestCase {
actionInvocationControl.replay();
CookieInterceptor interceptor = new CookieInterceptor();
- interceptor.setExcludedPatternsChecker(new ExcludedPatternsChecker());
+ interceptor.setExcludedPatternsChecker(new DefaultExcludedPatternsChecker());
interceptor.setCookiesName("cookie1, cookie3");
interceptor.setCookiesValue("cookie1value, cookie2value, cookie3value");
interceptor.intercept(invocation);
@@ -226,7 +226,7 @@ public class CookieInterceptorTest extends StrutsInternalTestCase {
actionInvocationControl.replay();
CookieInterceptor interceptor = new CookieInterceptor();
- interceptor.setExcludedPatternsChecker(new ExcludedPatternsChecker());
+ interceptor.setExcludedPatternsChecker(new DefaultExcludedPatternsChecker());
interceptor.setCookiesName("cookie1, cookie3");
interceptor.setCookiesValue("*");
interceptor.intercept(invocation);
@@ -267,7 +267,7 @@ public class CookieInterceptorTest extends StrutsInternalTestCase {
actionInvocationControl.replay();
CookieInterceptor interceptor = new CookieInterceptor();
- interceptor.setExcludedPatternsChecker(new ExcludedPatternsChecker());
+ interceptor.setExcludedPatternsChecker(new DefaultExcludedPatternsChecker());
interceptor.setCookiesName("cookie1, cookie3");
interceptor.setCookiesValue("");
interceptor.intercept(invocation);
@@ -309,7 +309,7 @@ public class CookieInterceptorTest extends StrutsInternalTestCase {
actionInvocationControl.replay();
CookieInterceptor interceptor = new CookieInterceptor();
- interceptor.setExcludedPatternsChecker(new ExcludedPatternsChecker());
+ interceptor.setExcludedPatternsChecker(new DefaultExcludedPatternsChecker());
interceptor.setCookiesName("cookie1, cookie3");
interceptor.setCookiesValue("cookie1value");
interceptor.intercept(invocation);
@@ -370,7 +370,7 @@ public class CookieInterceptorTest extends StrutsInternalTestCase {
return accepted;
}
};
- interceptor.setExcludedPatternsChecker(new ExcludedPatternsChecker());
+ interceptor.setExcludedPatternsChecker(new DefaultExcludedPatternsChecker());
interceptor.setCookiesName("*");
MockActionInvocation invocation = new MockActionInvocation();
@@ -430,7 +430,7 @@ public class CookieInterceptorTest extends StrutsInternalTestCase {
return accepted;
}
};
- interceptor.setExcludedPatternsChecker(new ExcludedPatternsChecker());
+ interceptor.setExcludedPatternsChecker(new DefaultExcludedPatternsChecker());
interceptor.setCookiesName("*");
MockActionInvocation invocation = new MockActionInvocation();
http://git-wip-us.apache.org/repos/asf/struts/blob/bfbc4c04/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultExcludedPatternsChecker.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultExcludedPatternsChecker.java b/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultExcludedPatternsChecker.java
new file mode 100644
index 0000000..3860e57
--- /dev/null
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultExcludedPatternsChecker.java
@@ -0,0 +1,93 @@
+package com.opensymphony.xwork2;
+
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.TextParseUtil;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+public class DefaultExcludedPatternsChecker implements ExcludedPatternsChecker {
+
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultExcludedPatternsChecker.class);
+
+ public static final String[] EXCLUDED_PATTERNS = {
+ "(.*\\.|^|.*|\\[('|\"))class(\\.|('|\")]|\\[).*",
+ "^dojo\\..*",
+ "^struts\\..*",
+ "^session\\..*",
+ "^request\\..*",
+ "^application\\..*",
+ "^servlet(Request|Response)\\..*",
+ "^parameters\\..*"
+ };
+
+ private Set<Pattern> excludedPatterns;
+
+ public DefaultExcludedPatternsChecker() {
+ excludedPatterns = new HashSet<Pattern>();
+ for (String pattern : EXCLUDED_PATTERNS) {
+ excludedPatterns.add(Pattern.compile(pattern));
+ }
+ }
+
+ @Inject(value = XWorkConstants.OVERRIDE_EXCLUDED_PATTERNS, required = false)
+ public void setOverrideExcludePatterns(String excludePatterns) {
+ if (LOG.isWarnEnabled()) {
+ LOG.warn("Overriding [#0] with [#1], be aware that this can affect safety of your application!",
+ XWorkConstants.OVERRIDE_EXCLUDED_PATTERNS, excludePatterns);
+ }
+ excludedPatterns = new HashSet<Pattern>();
+ for (String pattern : TextParseUtil.commaDelimitedStringToSet(excludePatterns)) {
+ excludedPatterns.add(Pattern.compile(pattern));
+ }
+ }
+
+ /**
+ * Allows add additional excluded patterns during runtime
+ *
+ * @param commaDelimitedPatterns comma delimited string with patterns
+ */
+ public void addExcludedPatterns(String commaDelimitedPatterns) {
+ addExcludedPatterns(TextParseUtil.commaDelimitedStringToSet(commaDelimitedPatterns));
+ }
+
+ /**
+ * Allows add additional excluded patterns during runtime
+ *
+ * @param additionalPatterns array of additional excluded patterns
+ */
+ public void addExcludedPatterns(String[] additionalPatterns) {
+ addExcludedPatterns(new HashSet<String>(Arrays.asList(additionalPatterns)));
+ }
+
+ /**
+ * Allows add additional excluded patterns during runtime
+ *
+ * @param additionalPatterns set of additional patterns
+ */
+ public void addExcludedPatterns(Set<String> additionalPatterns) {
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Adding additional excluded patterns [#0]", additionalPatterns);
+ }
+ for (String pattern : additionalPatterns) {
+ excludedPatterns.add(Pattern.compile(pattern));
+ }
+ }
+
+ public IsExcluded isExcluded(String value) {
+ for (Pattern excludedPattern : excludedPatterns) {
+ if (excludedPattern.matcher(value).matches()) {
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("[#0] matches excluded pattern [#1]", value, excludedPattern);
+ }
+ return IsExcluded.yes(excludedPattern);
+ }
+ }
+ return IsExcluded.no();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/struts/blob/bfbc4c04/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatternsChecker.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatternsChecker.java b/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatternsChecker.java
index ee3eea6..c4730ea 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatternsChecker.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatternsChecker.java
@@ -1,101 +1,13 @@
package com.opensymphony.xwork2;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.TextParseUtil;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
import java.util.regex.Pattern;
/**
* Used across different interceptors to check if given string matches one of the excluded patterns.
- * User has two options to change its behaviour:
- * - define new set of patterns with <constant name="struts.override.excludedPatterns" value=".."/>
- * - override this class and use then extension point <constant name="struts.excludedPatterns.checker" value="myChecker"/>
- * to inject it in appropriated places
*/
-public class ExcludedPatternsChecker {
-
- private static final Logger LOG = LoggerFactory.getLogger(ExcludedPatternsChecker.class);
-
- public static final String[] EXCLUDED_PATTERNS = {
- "(.*\\.|^|.*|\\[('|\"))class(\\.|('|\")]|\\[).*",
- "^dojo\\..*",
- "^struts\\..*",
- "^session\\..*",
- "^request\\..*",
- "^application\\..*",
- "^servlet(Request|Response)\\..*",
- "^parameters\\..*"
- };
-
- private Set<Pattern> excludedPatterns;
-
- public ExcludedPatternsChecker() {
- excludedPatterns = new HashSet<Pattern>();
- for (String pattern : EXCLUDED_PATTERNS) {
- excludedPatterns.add(Pattern.compile(pattern));
- }
- }
-
- @Inject(value = XWorkConstants.OVERRIDE_EXCLUDED_PATTERNS, required = false)
- public void setOverrideExcludePatterns(String excludePatterns) {
- if (LOG.isWarnEnabled()) {
- LOG.warn("Overriding [#0] with [#1], be aware that this can affect safety of your application!",
- XWorkConstants.OVERRIDE_EXCLUDED_PATTERNS, excludePatterns);
- }
- excludedPatterns = new HashSet<Pattern>();
- for (String pattern : TextParseUtil.commaDelimitedStringToSet(excludePatterns)) {
- excludedPatterns.add(Pattern.compile(pattern));
- }
- }
+public interface ExcludedPatternsChecker {
- /**
- * Allows add additional excluded patterns during runtime
- *
- * @param commaDelimitedPatterns comma delimited string with patterns
- */
- public void addExcludedPatterns(String commaDelimitedPatterns) {
- addExcludedPatterns(TextParseUtil.commaDelimitedStringToSet(commaDelimitedPatterns));
- }
-
- /**
- * Allows add additional excluded patterns during runtime
- *
- * @param additionalPatterns array of additional excluded patterns
- */
- public void addExcludedPatterns(String[] additionalPatterns) {
- addExcludedPatterns(new HashSet<String>(Arrays.asList(additionalPatterns)));
- }
-
- /**
- * Allows add additional excluded patterns during runtime
- *
- * @param additionalPatterns set of additional patterns
- */
- public void addExcludedPatterns(Set<String> additionalPatterns) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Adding additional excluded patterns [#0]", additionalPatterns);
- }
- for (String pattern : additionalPatterns) {
- excludedPatterns.add(Pattern.compile(pattern));
- }
- }
-
- public IsExcluded isExcluded(String value) {
- for (Pattern excludedPattern : excludedPatterns) {
- if (excludedPattern.matcher(value).matches()) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("[#0] matches excluded pattern [#1]", value, excludedPattern);
- }
- return IsExcluded.yes(excludedPattern);
- }
- }
- return IsExcluded.no();
- }
+ public IsExcluded isExcluded(String value);
public final static class IsExcluded {
[16/50] git commit: Adds logging of excluded classes
Posted by lu...@apache.org.
Adds logging of excluded classes
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/62ee6b10
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/62ee6b10
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/62ee6b10
Branch: refs/heads/feature/WW-4295-localization
Commit: 62ee6b104ae871807ff073eb206b5f3ec549a302
Parents: a5946d0
Author: Lukasz Lenart <lu...@apache.org>
Authored: Mon May 5 21:33:16 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Mon May 5 21:33:16 2014 +0200
----------------------------------------------------------------------
.../com/opensymphony/xwork2/ognl/SecurityMemberAccess.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/62ee6b10/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
index a35f68b..c14d8b9 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
@@ -15,13 +15,14 @@
*/
package com.opensymphony.xwork2.ognl;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
import ognl.DefaultMemberAccess;
import java.lang.reflect.Member;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.Collections;
-import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.regex.Matcher;
@@ -33,6 +34,8 @@ import java.util.regex.Pattern;
*/
public class SecurityMemberAccess extends DefaultMemberAccess {
+ private static final Logger LOG = LoggerFactory.getLogger(SecurityMemberAccess.class);
+
private final boolean allowStaticMethodAccess;
private Set<Pattern> excludeProperties = Collections.emptySet();
private Set<Pattern> acceptProperties = Collections.emptySet();
@@ -50,6 +53,9 @@ public class SecurityMemberAccess extends DefaultMemberAccess {
@Override
public boolean isAccessible(Map context, Object target, Member member, String propertyName) {
if (isClassExcluded(target.getClass(), member.getDeclaringClass())) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Target class [#0] and member type [#1] are excluded!", target, member);
+ }
return false;
}
[12/50] git commit: Adds special treatment of Object class and unit
test
Posted by lu...@apache.org.
Adds special treatment of Object class and unit test
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b3ca9ea5
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b3ca9ea5
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b3ca9ea5
Branch: refs/heads/feature/WW-4295-localization
Commit: b3ca9ea5e31fc9b6c0a5e644e833874bb7cc62fa
Parents: cb59074
Author: Lukasz Lenart <lu...@apache.org>
Authored: Sun May 4 11:18:00 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Sun May 4 11:18:00 2014 +0200
----------------------------------------------------------------------
.../xwork2/ognl/SecurityMemberAccess.java | 11 +-
.../xwork2/ognl/SecurityMemberAccessTest.java | 139 +++++++++++++++++++
2 files changed, 146 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/b3ca9ea5/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
index 9d84702..7fe77c3 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
@@ -21,6 +21,7 @@ import java.lang.reflect.Member;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.Collections;
+import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.regex.Matcher;
@@ -47,8 +48,7 @@ public class SecurityMemberAccess extends DefaultMemberAccess {
}
@Override
- public boolean isAccessible(Map context, Object target, Member member,
- String propertyName) {
+ public boolean isAccessible(Map context, Object target, Member member, String propertyName) {
if (isClassExcluded(target.getClass(), member.getDeclaringClass())) {
return false;
@@ -79,8 +79,11 @@ public class SecurityMemberAccess extends DefaultMemberAccess {
}
protected boolean isClassExcluded(Class<?> targetClass, Class<?> declaringClass) {
- for (Class excludedClass : excludedClasses) {
- if (targetClass.isAssignableFrom(excludedClass) || declaringClass.isAssignableFrom(excludedClass)) {
+ if (targetClass == Object.class || declaringClass == Object.class) {
+ return true;
+ }
+ for (Class<?> excludedClass : excludedClasses) {
+ if (excludedClass.isAssignableFrom(targetClass) || declaringClass.isAssignableFrom(excludedClass)) {
return true;
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/b3ca9ea5/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
new file mode 100644
index 0000000..4ccc831
--- /dev/null
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
@@ -0,0 +1,139 @@
+package com.opensymphony.xwork2.ognl;
+
+import junit.framework.TestCase;
+
+import java.lang.reflect.Member;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+public class SecurityMemberAccessTest extends TestCase {
+
+ private Map context;
+ private FooBar target;
+
+ @Override
+ public void setUp() throws Exception {
+ context = new HashMap();
+ target = new FooBar();
+ }
+
+ public void testWithoutClassExclusion() throws Exception {
+ // given
+ SecurityMemberAccess sma = new SecurityMemberAccess(false);
+
+ String propertyName = "stringField";
+ Member member = FooBar.class.getMethod("get" + propertyName.substring(0, 1).toUpperCase() + propertyName.substring(1));
+
+ // when
+ boolean accessible = sma.isAccessible(context, target, member, propertyName);
+
+ // then
+ assertTrue(accessible);
+ }
+
+ public void testClassExclusion() throws Exception {
+ // given
+ SecurityMemberAccess sma = new SecurityMemberAccess(false);
+
+ String propertyName = "stringField";
+ Member member = FooBar.class.getDeclaredMethod("get" + propertyName.substring(0, 1).toUpperCase() + propertyName.substring(1));
+
+ Set<Class<?>> excluded = new HashSet<Class<?>>();
+ excluded.add(FooBar.class);
+ sma.setExcludedClasses(excluded);
+
+ // when
+ boolean accessible = sma.isAccessible(context, target, member, propertyName);
+
+ // then
+ assertFalse(accessible);
+ }
+
+ public void testObjectClassExclusion() throws Exception {
+ // given
+ SecurityMemberAccess sma = new SecurityMemberAccess(false);
+
+ String propertyName = "toString";
+ Member member = FooBar.class.getMethod(propertyName);
+
+ // when
+ boolean accessible = sma.isAccessible(context, target, member, propertyName);
+
+ // then
+ assertFalse("toString() from Object is accessible!!!", accessible);
+ }
+
+ public void testObjectOverwrittenMethodsExclusion() throws Exception {
+ // given
+ SecurityMemberAccess sma = new SecurityMemberAccess(false);
+
+ String propertyName = "hashCode";
+ Member member = FooBar.class.getMethod(propertyName);
+
+ // when
+ boolean accessible = sma.isAccessible(context, target, member, propertyName);
+
+ // then
+ assertTrue("hashCode() from FooBar isn't accessible!!!", accessible);
+ }
+
+ public void testInterfaceInheritanceExclusion() throws Exception {
+ // given
+ SecurityMemberAccess sma = new SecurityMemberAccess(false);
+
+ String propertyName = "barLogic";
+ Member member = FooBar.class.getMethod("barLogic");
+
+ Set<Class<?>> excluded = new HashSet<Class<?>>();
+ excluded.add(BarInterface.class);
+ sma.setExcludedClasses(excluded);
+
+ // when
+ boolean accessible = sma.isAccessible(context, target, member, propertyName);
+
+ // then
+ assertFalse("barLogic() from BarInterface is accessible!!!", accessible);
+ }
+
+}
+
+class FooBar implements FooInterface {
+
+ private String stringField;
+
+ public String getStringField() {
+ return stringField;
+ }
+
+ public void setStringField(String stringField) {
+ this.stringField = stringField;
+ }
+
+ public String fooLogic() {
+ return "fooLogic";
+ }
+
+ public String barLogic() {
+ return "barLogic";
+ }
+
+ @Override
+ public int hashCode() {
+ return 1;
+ }
+
+}
+
+interface FooInterface extends BarInterface {
+
+ String fooLogic();
+
+}
+
+interface BarInterface {
+
+ String barLogic();
+
+}
[31/50] git commit: Uses checker instead set of patterns to check if
param is excluded
Posted by lu...@apache.org.
Uses checker instead set of patterns to check if param is excluded
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/5ec47b1e
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/5ec47b1e
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/5ec47b1e
Branch: refs/heads/feature/WW-4295-localization
Commit: 5ec47b1e6df6c59ff3fa466d20f28fda46b60254
Parents: 3d77c34
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed May 14 08:25:50 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed May 14 08:25:50 2014 +0200
----------------------------------------------------------------------
.../interceptor/ParametersInterceptor.java | 43 +++++++-------------
.../interceptor/ParametersInterceptorTest.java | 4 +-
2 files changed, 16 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/5ec47b1e/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
index 6de6aad..460aae2 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
@@ -17,6 +17,7 @@ package com.opensymphony.xwork2.interceptor;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.ExcludedPatternsChecker;
import com.opensymphony.xwork2.ValidationAware;
import com.opensymphony.xwork2.XWorkConstants;
import com.opensymphony.xwork2.conversion.impl.InstantiatingNullHandler;
@@ -143,12 +144,13 @@ public class ParametersInterceptor extends MethodFilterInterceptor {
protected static final int PARAM_NAME_MAX_LENGTH = 100;
+ private ExcludedPatternsChecker excludedPatterns;
+
private int paramNameMaxLength = PARAM_NAME_MAX_LENGTH;
private boolean devMode = false;
protected boolean ordered = false;
- protected Set<Pattern> excludeParams = Collections.emptySet();
protected Set<Pattern> acceptParams = Collections.emptySet();
private ValueStackFactory valueStackFactory;
@@ -163,7 +165,12 @@ public class ParametersInterceptor extends MethodFilterInterceptor {
devMode = "true".equalsIgnoreCase(mode);
}
- /**
+ @Inject
+ public void setExcludedPatterns(ExcludedPatternsChecker excludedPatterns) {
+ this.excludedPatterns = excludedPatterns;
+ }
+
+ /**
* Sets a comma-delimited list of regular expressions to match
* parameters that are allowed in the parameter map (aka whitelist).
* <p/>
@@ -306,7 +313,7 @@ public class ParametersInterceptor extends MethodFilterInterceptor {
//see WW-2761 for more details
MemberAccessValueStack accessValueStack = (MemberAccessValueStack) newStack;
accessValueStack.setAcceptProperties(acceptParams);
- accessValueStack.setExcludeProperties(excludeParams);
+ accessValueStack.setExcludeProperties(excludedPatterns.getExcludedPatterns());
}
for (Map.Entry<String, Object> entry : acceptableParameters.entrySet()) {
@@ -426,14 +433,10 @@ public class ParametersInterceptor extends MethodFilterInterceptor {
}
protected boolean isExcluded(String paramName) {
- if (!this.excludeParams.isEmpty()) {
- for (Pattern pattern : excludeParams) {
- Matcher matcher = pattern.matcher(paramName);
- if (matcher.matches()) {
- notifyDeveloper("Parameter [#0] is on the excludeParams list of patterns!", paramName);
- return true;
- }
- }
+ ExcludedPatternsChecker.IsExcluded result = excludedPatterns.isExcluded(paramName);
+ if (result.isExcluded()) {
+ notifyDeveloper("Parameter [#0] is on the excludeParams list of patterns!", paramName);
+ return true;
}
return false;
}
@@ -467,29 +470,13 @@ public class ParametersInterceptor extends MethodFilterInterceptor {
}
/**
- * Gets a set of regular expressions of parameters to remove
- * from the parameter map
- *
- * @return A set of compiled regular expression patterns
- */
- protected Set getExcludeParamsSet() {
- return excludeParams;
- }
-
- /**
* Sets a comma-delimited list of regular expressions to match
* parameters that should be removed from the parameter map.
*
* @param commaDelim A comma-delimited list of regular expressions
*/
public void setExcludeParams(String commaDelim) {
- Collection<String> excludePatterns = ArrayUtils.asCollection(commaDelim);
- if (excludePatterns != null) {
- excludeParams = new HashSet<Pattern>();
- for (String pattern : excludePatterns) {
- excludeParams.add(Pattern.compile(pattern, Pattern.CASE_INSENSITIVE));
- }
- }
+ excludedPatterns.addExcludedPatterns(commaDelim);
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/5ec47b1e/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
index a2aa92b..156c012 100644
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
@@ -145,7 +145,6 @@ public class ParametersInterceptorTest extends XWorkTestCase {
};
- pi.setExcludeParams("(.*\\.|^)class\\..*");
container.inject(pi);
ValueStack vs = ActionContext.getContext().getValueStack();
@@ -165,7 +164,7 @@ public class ParametersInterceptorTest extends XWorkTestCase {
final String pollution2 = "model.class.classLoader.jarPath";
final String pollution3 = "class.classLoader.defaultAssertionStatus";
- loadConfigurationProviders(new XWorkConfigurationProvider(), new XmlConfigurationProvider("xwork-param-test.xml"));
+ loadConfigurationProviders(new XWorkConfigurationProvider(), new XmlConfigurationProvider("xwork-class-param-test.xml"));
final Map<String, Object> params = new HashMap<String, Object>() {
{
put(pollution1, "bad");
@@ -308,7 +307,6 @@ public class ParametersInterceptorTest extends XWorkTestCase {
};
- pi.setExcludeParams("(.*\\.|^|.*|\\[('|\"))class(\\.|('|\")]|\\[).*");
container.inject(pi);
ValueStack vs = ActionContext.getContext().getValueStack();
[03/50] git commit: Extends SecurityMemberAccess to included excluded
classes
Posted by lu...@apache.org.
Extends SecurityMemberAccess to included excluded classes
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/c778297e
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/c778297e
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/c778297e
Branch: refs/heads/feature/WW-4295-localization
Commit: c778297e80e19c7e16389e5c5bb3487512695c0a
Parents: ee3c8d5
Author: Lukasz Lenart <lu...@apache.org>
Authored: Sat May 3 20:12:14 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Sat May 3 20:12:14 2014 +0200
----------------------------------------------------------------------
.../xwork2/ognl/SecurityMemberAccess.java | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/c778297e/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
index 7bbcbda..9d84702 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
@@ -35,6 +35,7 @@ public class SecurityMemberAccess extends DefaultMemberAccess {
private final boolean allowStaticMethodAccess;
private Set<Pattern> excludeProperties = Collections.emptySet();
private Set<Pattern> acceptProperties = Collections.emptySet();
+ private Set<Class<?>> excludedClasses = Collections.emptySet();
public SecurityMemberAccess(boolean method) {
super(false);
@@ -49,6 +50,9 @@ public class SecurityMemberAccess extends DefaultMemberAccess {
public boolean isAccessible(Map context, Object target, Member member,
String propertyName) {
+ if (isClassExcluded(target.getClass(), member.getDeclaringClass())) {
+ return false;
+ }
boolean allow = true;
int modifiers = member.getModifiers();
if (Modifier.isStatic(modifiers)) {
@@ -74,6 +78,15 @@ public class SecurityMemberAccess extends DefaultMemberAccess {
return isAcceptableProperty(propertyName);
}
+ protected boolean isClassExcluded(Class<?> targetClass, Class<?> declaringClass) {
+ for (Class excludedClass : excludedClasses) {
+ if (targetClass.isAssignableFrom(excludedClass) || declaringClass.isAssignableFrom(excludedClass)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
protected boolean isAcceptableProperty(String name) {
return name == null || ((!isExcluded(name)) && isAccepted(name));
}
@@ -115,4 +128,8 @@ public class SecurityMemberAccess extends DefaultMemberAccess {
this.acceptProperties = acceptedProperties;
}
+ public void setExcludedClasses(Set<Class<?>> excludedClasses) {
+ this.excludedClasses = excludedClasses;
+ }
+
}
[44/50] git commit: Adds additional method to check if value of param
isn't excluded
Posted by lu...@apache.org.
Adds additional method to check if value of param isn't excluded
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/5ebc0643
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/5ebc0643
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/5ebc0643
Branch: refs/heads/feature/WW-4295-localization
Commit: 5ebc0643b55d728a6713a82559a594d875452cd8
Parents: 89cbe13
Author: Lukasz Lenart <lu...@apache.org>
Authored: Sun Jun 1 10:49:20 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Sun Jun 1 10:49:20 2014 +0200
----------------------------------------------------------------------
.../interceptor/ParametersInterceptor.java | 30 +++++++++++++++++++-
1 file changed, 29 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/5ebc0643/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
index c1b2f3d..d95c2a7 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
@@ -273,7 +273,8 @@ public class ParametersInterceptor extends MethodFilterInterceptor {
for (Map.Entry<String, Object> entry : params.entrySet()) {
String name = entry.getKey();
- if (isAcceptableParameter(name, action)) {
+ Object value = entry.getValue();
+ if (isAcceptableParameter(name, action) && isAcceptableValue(value)) {
acceptableParameters.put(name, entry.getValue());
}
}
@@ -349,6 +350,33 @@ public class ParametersInterceptor extends MethodFilterInterceptor {
}
/**
+ * Checks if given value doesn't match global excluded patterns to avoid passing malicious code
+ *
+ * @param value incoming parameter's value
+ * @return true if value is safe
+ *
+ * FIXME: can be removed when parameters won't be represented as simple Strings
+ */
+ protected boolean isAcceptableValue(Object value) {
+ if (value == null) {
+ return true;
+ }
+ Object[] values;
+ if (value.getClass().isArray()) {
+ values = (Object[]) value;
+ } else {
+ values = new Object[] { value };
+ }
+ boolean result = true;
+ for (Object obj : values) {
+ if (isExcluded(obj.toString())) {
+ result = false;
+ }
+ }
+ return result;
+ }
+
+ /**
* Gets an instance of the comparator to use for the ordered sorting. Override this
* method to customize the ordering of the parameters as they are set to the
* action.
[35/50] git commit: Cleans up after moving to package
Posted by lu...@apache.org.
Cleans up after moving to package
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/ec98c8a9
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ec98c8a9
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ec98c8a9
Branch: refs/heads/feature/WW-4295-localization
Commit: ec98c8a95beb58fface26371b5ae3829493259f5
Parents: 7faf91a
Author: Lukasz Lenart <lu...@apache.org>
Authored: Mon May 19 10:08:30 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Mon May 19 10:08:30 2014 +0200
----------------------------------------------------------------------
.../xwork2/ExcludedPatternsChecker.java | 82 --------------------
.../DefaultExcludedPatternsChecker.java | 2 +-
2 files changed, 1 insertion(+), 83 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/ec98c8a9/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatternsChecker.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatternsChecker.java b/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatternsChecker.java
deleted file mode 100644
index ac0ff6e..0000000
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatternsChecker.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.opensymphony.xwork2;
-
-import java.util.Set;
-import java.util.regex.Pattern;
-
-/**
- * Used across different interceptors to check if given string matches one of the excluded patterns.
- */
-public interface ExcludedPatternsChecker {
-
- /**
- * Checks if value matches any of patterns on exclude list
- *
- * @param value to check
- * @return object containing result of matched pattern and pattern itself
- */
- public IsExcluded isExcluded(String value);
-
- /**
- * Allows add additional excluded patterns during runtime
- *
- * @param commaDelimitedPatterns comma delimited string with patterns
- */
- public void addExcludedPatterns(String commaDelimitedPatterns);
-
- /**
- * Allows add additional excluded patterns during runtime
- *
- * @param additionalPatterns array of additional excluded patterns
- */
- public void addExcludedPatterns(String[] additionalPatterns);
-
- /**
- * Allows add additional excluded patterns during runtime
- *
- * @param additionalPatterns set of additional patterns
- */
- public void addExcludedPatterns(Set<String> additionalPatterns);
-
- /**
- * Allow access list of all defined excluded patterns
- *
- * @return set of excluded patterns
- */
- public Set<Pattern> getExcludedPatterns();
-
- public final static class IsExcluded {
-
- private final boolean excluded;
- private final Pattern excludedPattern;
-
- public static IsExcluded yes(Pattern excludedPattern) {
- return new IsExcluded(true, excludedPattern);
- }
-
- public static IsExcluded no() {
- return new IsExcluded(false, null);
- }
-
- private IsExcluded(boolean excluded, Pattern excludedPattern) {
- this.excluded = excluded;
- this.excludedPattern = excludedPattern;
- }
-
- public boolean isExcluded() {
- return excluded;
- }
-
- public Pattern getExcludedPattern() {
- return excludedPattern;
- }
-
- @Override
- public String toString() {
- return "IsExcluded { " +
- "excluded=" + excluded +
- ", excludedPattern=" + excludedPattern +
- " }";
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/struts/blob/ec98c8a9/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java b/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
index f2abed6..53854d3 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
@@ -11,7 +11,7 @@ import java.util.HashSet;
import java.util.Set;
import java.util.regex.Pattern;
-public class DefaultExcludedPatternsChecker implements com.opensymphony.xwork2.ExcludedPatternsChecker {
+public class DefaultExcludedPatternsChecker implements ExcludedPatternsChecker {
private static final Logger LOG = LoggerFactory.getLogger(DefaultExcludedPatternsChecker.class);
[30/50] git commit: Adds additional methods needed by
ParametersInterceptor
Posted by lu...@apache.org.
Adds additional methods needed by ParametersInterceptor
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/3d77c348
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/3d77c348
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/3d77c348
Branch: refs/heads/feature/WW-4295-localization
Commit: 3d77c348b15f438c5dcab9790daacfd4d43cd02b
Parents: e8e5b51
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed May 14 08:25:22 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed May 14 08:25:22 2014 +0200
----------------------------------------------------------------------
.../xwork2/DefaultExcludedPatternsChecker.java | 19 +++--------
.../xwork2/ExcludedPatternsChecker.java | 35 ++++++++++++++++++++
2 files changed, 39 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/3d77c348/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultExcludedPatternsChecker.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultExcludedPatternsChecker.java b/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultExcludedPatternsChecker.java
index 3860e57..eabd621 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultExcludedPatternsChecker.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultExcludedPatternsChecker.java
@@ -46,29 +46,14 @@ public class DefaultExcludedPatternsChecker implements ExcludedPatternsChecker {
}
}
- /**
- * Allows add additional excluded patterns during runtime
- *
- * @param commaDelimitedPatterns comma delimited string with patterns
- */
public void addExcludedPatterns(String commaDelimitedPatterns) {
addExcludedPatterns(TextParseUtil.commaDelimitedStringToSet(commaDelimitedPatterns));
}
- /**
- * Allows add additional excluded patterns during runtime
- *
- * @param additionalPatterns array of additional excluded patterns
- */
public void addExcludedPatterns(String[] additionalPatterns) {
addExcludedPatterns(new HashSet<String>(Arrays.asList(additionalPatterns)));
}
- /**
- * Allows add additional excluded patterns during runtime
- *
- * @param additionalPatterns set of additional patterns
- */
public void addExcludedPatterns(Set<String> additionalPatterns) {
if (LOG.isTraceEnabled()) {
LOG.trace("Adding additional excluded patterns [#0]", additionalPatterns);
@@ -90,4 +75,8 @@ public class DefaultExcludedPatternsChecker implements ExcludedPatternsChecker {
return IsExcluded.no();
}
+ public Set<Pattern> getExcludedPatterns() {
+ return excludedPatterns;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/struts/blob/3d77c348/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatternsChecker.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatternsChecker.java b/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatternsChecker.java
index c4730ea..ac0ff6e 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatternsChecker.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatternsChecker.java
@@ -1,5 +1,6 @@
package com.opensymphony.xwork2;
+import java.util.Set;
import java.util.regex.Pattern;
/**
@@ -7,8 +8,42 @@ import java.util.regex.Pattern;
*/
public interface ExcludedPatternsChecker {
+ /**
+ * Checks if value matches any of patterns on exclude list
+ *
+ * @param value to check
+ * @return object containing result of matched pattern and pattern itself
+ */
public IsExcluded isExcluded(String value);
+ /**
+ * Allows add additional excluded patterns during runtime
+ *
+ * @param commaDelimitedPatterns comma delimited string with patterns
+ */
+ public void addExcludedPatterns(String commaDelimitedPatterns);
+
+ /**
+ * Allows add additional excluded patterns during runtime
+ *
+ * @param additionalPatterns array of additional excluded patterns
+ */
+ public void addExcludedPatterns(String[] additionalPatterns);
+
+ /**
+ * Allows add additional excluded patterns during runtime
+ *
+ * @param additionalPatterns set of additional patterns
+ */
+ public void addExcludedPatterns(Set<String> additionalPatterns);
+
+ /**
+ * Allow access list of all defined excluded patterns
+ *
+ * @return set of excluded patterns
+ */
+ public Set<Pattern> getExcludedPatterns();
+
public final static class IsExcluded {
private final boolean excluded;
[18/50] git commit: Merge branch 'hotfix/2.3.16.3'
Posted by lu...@apache.org.
Merge branch 'hotfix/2.3.16.3'
Conflicts:
apps/rest-showcase/pom.xml
archetypes/struts2-archetype-angularjs/pom.xml
archetypes/struts2-archetype-blank/pom.xml
archetypes/struts2-archetype-convention/pom.xml
archetypes/struts2-archetype-dbportlet/pom.xml
archetypes/struts2-archetype-plugin/pom.xml
archetypes/struts2-archetype-portlet/pom.xml
archetypes/struts2-archetype-starter/pom.xml
assembly/src/main/assembly/docs.xml
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/38a3f8bf
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/38a3f8bf
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/38a3f8bf
Branch: refs/heads/feature/WW-4295-localization
Commit: 38a3f8bfb6b226db3adb44a8fc4ad0850feee54f
Parents: c9fd44f bcffc25
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu May 8 21:55:35 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu May 8 21:55:35 2014 +0200
----------------------------------------------------------------------
apps/blank/pom.xml | 2 +-
apps/jboss-blank/pom.xml | 2 +-
apps/mailreader/pom.xml | 2 +-
apps/pom.xml | 2 +-
apps/portlet/pom.xml | 2 +-
apps/rest-showcase/pom.xml | 4 +-
apps/showcase/pom.xml | 2 +-
archetypes/pom.xml | 2 +-
archetypes/struts2-archetype-angularjs/pom.xml | 3 +-
archetypes/struts2-archetype-blank/pom.xml | 3 +-
archetypes/struts2-archetype-convention/pom.xml | 3 +-
archetypes/struts2-archetype-dbportlet/pom.xml | 3 +-
archetypes/struts2-archetype-plugin/pom.xml | 3 +-
archetypes/struts2-archetype-portlet/pom.xml | 3 +-
archetypes/struts2-archetype-starter/pom.xml | 3 +-
assembly/pom.xml | 2 +-
bundles/admin/pom.xml | 2 +-
bundles/demo/pom.xml | 2 +-
bundles/pom.xml | 2 +-
core/pom.xml | 2 +-
.../struts2/interceptor/CookieInterceptor.java | 45 +++++++++++------
.../interceptor/CookieInterceptorTest.java | 53 ++++++++++++++++++++
plugins/cdi/pom.xml | 2 +-
plugins/codebehind/pom.xml | 2 +-
plugins/config-browser/pom.xml | 2 +-
plugins/convention/pom.xml | 2 +-
plugins/dojo/pom.xml | 2 +-
plugins/dwr/pom.xml | 2 +-
plugins/embeddedjsp/pom.xml | 2 +-
plugins/gxp/pom.xml | 2 +-
plugins/jasperreports/pom.xml | 2 +-
plugins/javatemplates/pom.xml | 2 +-
plugins/jfreechart/pom.xml | 2 +-
plugins/jsf/pom.xml | 2 +-
plugins/json/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
plugins/osgi/pom.xml | 2 +-
plugins/oval/pom.xml | 2 +-
plugins/pell-multipart/pom.xml | 2 +-
plugins/plexus/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/portlet-tiles/pom.xml | 2 +-
plugins/portlet/pom.xml | 2 +-
plugins/rest/pom.xml | 4 +-
plugins/sitegraph/pom.xml | 2 +-
plugins/sitemesh/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/struts1/pom.xml | 2 +-
plugins/testng/pom.xml | 2 +-
plugins/tiles/pom.xml | 2 +-
plugins/tiles3/pom.xml | 2 +-
pom.xml | 2 +-
xwork-core/pom.xml | 2 +-
53 files changed, 142 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/38a3f8bf/apps/blank/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/38a3f8bf/apps/jboss-blank/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/38a3f8bf/apps/mailreader/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/38a3f8bf/apps/pom.xml
----------------------------------------------------------------------
diff --cc apps/pom.xml
index ac06753,d0a24d0..5860c18
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@@ -26,11 -26,12 +26,11 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
- <groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
<packaging>pom</packaging>
- <name>Webapps</name>
+ <name>Struts 2 Webapps</name>
<modules>
<module>blank</module>
<module>jboss-blank</module>
http://git-wip-us.apache.org/repos/asf/struts/blob/38a3f8bf/apps/portlet/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/38a3f8bf/apps/rest-showcase/pom.xml
----------------------------------------------------------------------
diff --cc apps/rest-showcase/pom.xml
index 270f5e6,fe2d3be..feb3290
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@@ -31,8 -31,8 +31,8 @@@
<artifactId>struts2-rest-showcase</artifactId>
<packaging>war</packaging>
- <version>2.3.16.2</version>
+ <version>2.3.16.4-SNAPSHOT</version>
- <name>Struts 2 Rest Showcase Example</name>
+ <name>Struts 2 Rest Showcase Webapp</name>
<description>Struts 2 Rest Showcase Example</description>
<dependencies>
http://git-wip-us.apache.org/repos/asf/struts/blob/38a3f8bf/apps/showcase/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/38a3f8bf/archetypes/pom.xml
----------------------------------------------------------------------
diff --cc archetypes/pom.xml
index 5ea2556,c7ca432..ac90bcb
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@@ -26,9 -26,9 +26,9 @@@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.4-SNAPSHOT</version>
</parent>
- <groupId>org.apache.struts</groupId>
+
<artifactId>struts2-archetypes</artifactId>
<packaging>pom</packaging>
<name>Struts 2 Maven Archetypes</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/38a3f8bf/pom.xml
----------------------------------------------------------------------
[41/50] git commit: Uses WARN to report if package or class is
excluded
Posted by lu...@apache.org.
Uses WARN to report if package or class is excluded
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/5a5af1b5
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/5a5af1b5
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/5a5af1b5
Branch: refs/heads/feature/WW-4295-localization
Commit: 5a5af1b5879a9865aca03c70ae5bd6f7a3473f7b
Parents: 4ee18f9
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri May 23 09:58:52 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri May 23 09:58:52 2014 +0200
----------------------------------------------------------------------
.../com/opensymphony/xwork2/ognl/SecurityMemberAccess.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/5a5af1b5/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
index 39f882a..d0862e7 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
@@ -54,15 +54,15 @@ public class SecurityMemberAccess extends DefaultMemberAccess {
@Override
public boolean isAccessible(Map context, Object target, Member member, String propertyName) {
if (isPackageExcluded(target.getClass().getPackage(), member.getDeclaringClass().getPackage())) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Target package [#0] and member package [#1] are excluded!", target, member);
+ if (LOG.isWarnEnabled()) {
+ LOG.warn("Package of target [#0] or package of member [#1] are excluded!", target, member);
}
return false;
}
if (isClassExcluded(target.getClass(), member.getDeclaringClass())) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Target class [#0] and member type [#1] are excluded!", target, member);
+ if (LOG.isWarnEnabled()) {
+ LOG.warn("Target class [#0] or declaring class of member type [#1] are excluded!", target, member);
}
return false;
}
[49/50] git commit: WW-4146 caches only valid OGNL expressions,
closes #12
Posted by lu...@apache.org.
WW-4146 caches only valid OGNL expressions, closes #12
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/63de7730
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/63de7730
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/63de7730
Branch: refs/heads/feature/WW-4295-localization
Commit: 63de7730ee2be146e90227ed067ed108f4a2a534
Parents: 21ef4e3
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Jun 18 10:33:21 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Jun 18 10:33:21 2014 +0200
----------------------------------------------------------------------
.../src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/63de7730/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
index b0345fc..63c45fe 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
@@ -331,17 +331,17 @@ public class OgnlUtil {
if (tree == null) {
tree = Ognl.parseExpression(expression);
checkEnableEvalExpression(tree, context);
- expressions.putIfAbsent(expression, tree);
}
} else {
tree = Ognl.parseExpression(expression);
checkEnableEvalExpression(tree, context);
}
-
final T exec = task.execute(tree);
- if(enableExpressionCache)
+ // if cache is enabled and it's a valid expression, puts it in
+ if(enableExpressionCache) {
expressions.putIfAbsent(expression, tree);
+ }
return exec;
}
[39/50] git commit: Adds ability to exclude whole packages based on
regex
Posted by lu...@apache.org.
Adds ability to exclude whole packages based on regex
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/dba9da3a
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/dba9da3a
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/dba9da3a
Branch: refs/heads/feature/WW-4295-localization
Commit: dba9da3abf1b5e6f59251b5a6d948c5bc502c9af
Parents: 8a93df1
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri May 23 09:20:07 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri May 23 09:20:07 2014 +0200
----------------------------------------------------------------------
.../xwork2/ognl/SecurityMemberAccess.java | 20 ++++++++++++++++++++
.../xwork2/ognl/SecurityMemberAccessTest.java | 19 +++++++++++++++++++
2 files changed, 39 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/dba9da3a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
index c14d8b9..39f882a 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
@@ -40,6 +40,7 @@ public class SecurityMemberAccess extends DefaultMemberAccess {
private Set<Pattern> excludeProperties = Collections.emptySet();
private Set<Pattern> acceptProperties = Collections.emptySet();
private Set<Class<?>> excludedClasses = Collections.emptySet();
+ private Set<Pattern> excludedPackageNamePatterns = Collections.emptySet();
public SecurityMemberAccess(boolean method) {
super(false);
@@ -52,6 +53,13 @@ public class SecurityMemberAccess extends DefaultMemberAccess {
@Override
public boolean isAccessible(Map context, Object target, Member member, String propertyName) {
+ if (isPackageExcluded(target.getClass().getPackage(), member.getDeclaringClass().getPackage())) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Target package [#0] and member package [#1] are excluded!", target, member);
+ }
+ return false;
+ }
+
if (isClassExcluded(target.getClass(), member.getDeclaringClass())) {
if (LOG.isDebugEnabled()) {
LOG.debug("Target class [#0] and member type [#1] are excluded!", target, member);
@@ -84,6 +92,15 @@ public class SecurityMemberAccess extends DefaultMemberAccess {
return isAcceptableProperty(propertyName);
}
+ protected boolean isPackageExcluded(Package targetPackage, Package memberPackage) {
+ for (Pattern pattern : excludedPackageNamePatterns) {
+ if (pattern.matcher(targetPackage.getName()).matches() || pattern.matcher(memberPackage.getName()).matches()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
protected boolean isClassExcluded(Class<?> targetClass, Class<?> declaringClass) {
if (targetClass == Object.class || declaringClass == Object.class) {
return true;
@@ -141,4 +158,7 @@ public class SecurityMemberAccess extends DefaultMemberAccess {
this.excludedClasses = excludedClasses;
}
+ public void setExcludedPackageNamePatterns(Set<Pattern> excludedPackageNamePatterns) {
+ this.excludedPackageNamePatterns = excludedPackageNamePatterns;
+ }
}
http://git-wip-us.apache.org/repos/asf/struts/blob/dba9da3a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
index 1c14cb2..748d5a9 100644
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
@@ -7,6 +7,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import java.util.regex.Pattern;
public class SecurityMemberAccessTest extends TestCase {
@@ -171,6 +172,24 @@ public class SecurityMemberAccessTest extends TestCase {
assertFalse("barLogic() from BarInterface is accessible!!!", accessible);
}
+ public void testPackageExclusion() throws Exception {
+ // given
+ SecurityMemberAccess sma = new SecurityMemberAccess(false);
+
+ Set<Pattern> excluded = new HashSet<Pattern>();
+ excluded.add(Pattern.compile("^" + FooBar.class.getPackage().getName().replaceAll("\\.", "\\\\.") + ".*"));
+ sma.setExcludedPackageNamePatterns(excluded);
+
+ String propertyName = "stringField";
+ Member member = FooBar.class.getMethod("get" + propertyName.substring(0, 1).toUpperCase() + propertyName.substring(1));
+
+ // when
+ boolean actual = sma.isAccessible(context, target, member, propertyName);
+
+ // then
+ assertFalse("stringField is accessible!", actual);
+ }
+
}
class FooBar implements FooBarInterface {
[05/50] git commit: Creates default context with excluded classes
Posted by lu...@apache.org.
Creates default context with excluded classes
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/27980572
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/27980572
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/27980572
Branch: refs/heads/feature/WW-4295-localization
Commit: 279805721d6223673b5cb93e29fa91a4bbe0ea90
Parents: d5bd607
Author: Lukasz Lenart <lu...@apache.org>
Authored: Sat May 3 20:15:53 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Sat May 3 20:15:53 2014 +0200
----------------------------------------------------------------------
.../com/opensymphony/xwork2/ognl/OgnlUtil.java | 78 +++++++++++++-------
1 file changed, 51 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/27980572/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
index 5e06977..1c17eca 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
@@ -16,13 +16,18 @@
package com.opensymphony.xwork2.ognl;
import com.opensymphony.xwork2.XWorkConstants;
+import com.opensymphony.xwork2.XWorkException;
+import com.opensymphony.xwork2.config.ConfigurationException;
import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
+import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.ognl.accessor.CompoundRootAccessor;
import com.opensymphony.xwork2.util.CompoundRoot;
import com.opensymphony.xwork2.util.TextParseUtil;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import com.opensymphony.xwork2.util.reflection.ReflectionException;
+import ognl.ClassResolver;
import ognl.Ognl;
import ognl.OgnlContext;
import ognl.OgnlException;
@@ -61,7 +66,9 @@ public class OgnlUtil {
private boolean enableExpressionCache = true;
private boolean enableEvalExpression;
- private Set<String> excludedProperties = new HashSet<String>();
+ private Set<Class<?>> excludedClasses = new HashSet<Class<?>>();
+ private Container container;
+ private boolean allowStaticMethodAccess;
@Inject
public void setXWorkConverter(XWorkConverter conv) {
@@ -87,15 +94,32 @@ public class OgnlUtil {
}
}
- @Inject(value = XWorkConstants.OGNL_EXCLUDED_PROPERTIES, required = false)
- public void setExcludedProperties(String commaDelimitedProperties) {
- Set<String> props = TextParseUtil.commaDelimitedStringToSet(commaDelimitedProperties);
- for (String prop : props) {
- excludedProperties.add(prop);
- excludedProperties.add(prop + "()");
+ @Inject(value = XWorkConstants.OGNL_EXCLUDED_CLASSES, required = false)
+ public void setExcludedClasses(String commaDelimitedClasses) {
+ Set<String> classes = TextParseUtil.commaDelimitedStringToSet(commaDelimitedClasses);
+ for (String className : classes) {
+ try {
+ excludedClasses.add(Class.forName(className));
+ } catch (ClassNotFoundException e) {
+ throw new ConfigurationException("Cannot load excluded class: " + className, e);
+ }
}
}
+ public Set<Class<?>> getExcludedClasses() {
+ return excludedClasses;
+ }
+
+ @Inject
+ public void setContainer(Container container) {
+ this.container = container;
+ }
+
+ @Inject(value = XWorkConstants.ALLOW_STATIC_METHOD_ACCESS, required = false)
+ public void setAllowStaticMethodAccess(String allowStaticMethodAccess) {
+ this.allowStaticMethodAccess = Boolean.parseBoolean(allowStaticMethodAccess);
+ }
+
/**
* Sets the object's properties using the default type converter, defaulting to not throw
* exceptions for problems setting the properties.
@@ -155,7 +179,7 @@ public class OgnlUtil {
* problems setting the properties
*/
public void setProperties(Map<String, ?> properties, Object o, boolean throwPropertyExceptions) {
- Map context = Ognl.createDefaultContext(o);
+ Map context = createDefaultContext(o, null);
setProperties(properties, o, context, throwPropertyExceptions);
}
@@ -293,13 +317,11 @@ public class OgnlUtil {
if (tree == null) {
tree = Ognl.parseExpression(expression);
checkEnableEvalExpression(tree, context);
- checkExcludedPropertiesAccess(tree, null);
expressions.putIfAbsent(expression, tree);
}
} else {
tree = Ognl.parseExpression(expression);
checkEnableEvalExpression(tree, context);
- checkExcludedPropertiesAccess(tree, null);
}
@@ -309,20 +331,6 @@ public class OgnlUtil {
return exec;
}
- private void checkExcludedPropertiesAccess(Object tree, SimpleNode parent) throws OgnlException {
- if (tree instanceof SimpleNode) {
- SimpleNode node = (SimpleNode) tree;
- for (String excludedPattern : excludedProperties) {
- if (excludedPattern.equalsIgnoreCase(node.toString())) {
- throw new OgnlException("Tree [" + (parent != null ? parent : tree) + "] trying access excluded pattern [" + excludedPattern + "]");
- }
- for (int i = 0; i < node.jjtGetNumChildren(); i++) {
- checkExcludedPropertiesAccess(node.jjtGetChild(i), node);
- }
- }
- }
- }
-
public Object compile(String expression, Map<String, Object> context) throws OgnlException {
return compileAndExecute(expression,context,new OgnlTask<Object>() {
public Object execute(Object tree) throws OgnlException {
@@ -359,9 +367,9 @@ public class OgnlUtil {
}
TypeConverter conv = getTypeConverterFromContext(context);
- final Map contextFrom = Ognl.createDefaultContext(from);
+ final Map contextFrom = createDefaultContext(from, null);
Ognl.setTypeConverter(contextFrom, conv);
- final Map contextTo = Ognl.createDefaultContext(to);
+ final Map contextTo = createDefaultContext(to, null);
Ognl.setTypeConverter(contextTo, conv);
PropertyDescriptor[] fromPds;
@@ -470,7 +478,7 @@ public class OgnlUtil {
*/
public Map<String, Object> getBeanMap(final Object source) throws IntrospectionException, OgnlException {
Map<String, Object> beanMap = new HashMap<String, Object>();
- final Map sourceMap = Ognl.createDefaultContext(source);
+ final Map sourceMap = createDefaultContext(source, null);
PropertyDescriptor[] propertyDescriptors = getPropertyDescriptors(source);
for (PropertyDescriptor propertyDescriptor : propertyDescriptors) {
final String propertyName = propertyDescriptor.getDisplayName();
@@ -548,6 +556,22 @@ public class OgnlUtil {
return defaultConverter;
}
+ protected Map createDefaultContext(Object root) {
+ return createDefaultContext(root, null);
+ }
+
+ protected Map createDefaultContext(Object root, ClassResolver classResolver) {
+ ClassResolver resolver = classResolver;
+ if (resolver == null) {
+ resolver = container.getInstance(CompoundRootAccessor.class);
+ }
+
+ SecurityMemberAccess memberAccess = new SecurityMemberAccess(allowStaticMethodAccess);
+ memberAccess.setExcludedClasses(excludedClasses);
+
+ return Ognl.createDefaultContext(root, resolver, defaultConverter, memberAccess);
+ }
+
private interface OgnlTask<T> {
T execute(Object tree) throws OgnlException;
}
[28/50] git commit: Extends logging with more information
Posted by lu...@apache.org.
Extends logging with more information
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/833a07e7
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/833a07e7
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/833a07e7
Branch: refs/heads/feature/WW-4295-localization
Commit: 833a07e7fa1143f2a09786d561da70f144954c60
Parents: bfbc4c0
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed May 14 08:24:03 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed May 14 08:24:03 2014 +0200
----------------------------------------------------------------------
.../src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/833a07e7/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
index 83be3ed..1e4a576 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
@@ -198,7 +198,7 @@ public class OgnlValueStack implements Serializable, ValueStack, ClearableValueS
throw new XWorkException(message, re);
} else {
if (LOG.isWarnEnabled()) {
- LOG.warn("Error setting value", re);
+ LOG.warn("Error setting value [#0] with expression [#1]", re, value.toString(), expr);
}
}
}
[14/50] git commit: Adds default param to reduce noise in the logs
during building
Posted by lu...@apache.org.
Adds default param to reduce noise in the logs during building
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/086c0a0d
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/086c0a0d
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/086c0a0d
Branch: refs/heads/feature/WW-4295-localization
Commit: 086c0a0d5200acb04fe62eb86f5462d23d5891ba
Parents: d35072c
Author: Lukasz Lenart <lu...@apache.org>
Authored: Mon May 5 06:41:07 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Mon May 5 06:41:07 2014 +0200
----------------------------------------------------------------------
.../src/main/java/com/opensymphony/xwork2/mock/MockResult.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/086c0a0d/xwork-core/src/main/java/com/opensymphony/xwork2/mock/MockResult.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/mock/MockResult.java b/xwork-core/src/main/java/com/opensymphony/xwork2/mock/MockResult.java
index 53eac63..d988df5 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/mock/MockResult.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/mock/MockResult.java
@@ -26,6 +26,8 @@ import com.opensymphony.xwork2.Result;
*/
public class MockResult implements Result {
+ public static final String DEFAULT_PARAM = null;
+
@Override
public boolean equals(Object o) {
if (this == o) {