date:20160418

[struts] Git Push Summary

2016-04-18 Thread lukaszlenart

Repository: struts
Updated Tags:  refs/tags/STRUTS_2_3_24_2 [created] 5624d8138

[2/5] struts git commit: Adds additional blocked classes

2016-04-18 Thread lukaszlenart

Adds additional blocked classes


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d92654da
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d92654da
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d92654da

Branch: refs/heads/struts-2-3-24-2
Commit: d92654daf3dfe36082995b713484de92041afaea
Parents: 47da9c9
Author: Lukasz Lenart 
Authored: Mon Apr 18 20:38:49 2016 +0200
Committer: Lukasz Lenart 
Committed: Mon Apr 18 21:51:01 2016 +0200

--
 core/src/main/resources/struts-default.xml  | 3 +++
 core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/d92654da/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 f9c9ff4..56621a7 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -50,6 +50,9 @@
 ognl.MemberAccess,
 ognl.ClassResolver,
 ognl.TypeConverter,
+ognl.MemberAccess,
+ognl.DefaultMemberAccess,
+com.opensymphony.xwork2.ognl.SecurityMemberAccess,
 com.opensymphony.xwork2.ActionContext" />
 
 

http://git-wip-us.apache.org/repos/asf/struts/blob/d92654da/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java
--
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java 
b/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java
index 50bf576..6c141aa 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java
@@ -657,8 +657,7 @@ public class URLTagTest extends AbstractUITagTest {
tag.doEndTag();
 
Object allowMethodAccess = 
stack.findValue("\u0023_memberAccess['allowStaticMethodAccess']");
-   assertNotNull(allowMethodAccess);
-   assertEquals(Boolean.FALSE, allowMethodAccess);
+   assertNull(allowMethodAccess);
 
assertNull(session.get("foo"));

[1/5] struts git commit: Uses isSequence flag to block chained expressions

2016-04-18 Thread lukaszlenart

Repository: struts
Updated Branches:
  refs/heads/struts-2-3-24-2 [created] 5c51bf405


Uses isSequence flag to block chained expressions


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/47da9c9f
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/47da9c9f
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/47da9c9f

Branch: refs/heads/struts-2-3-24-2
Commit: 47da9c9f52bab960ff745e06adb3a32917698c9e
Parents: 7a98631
Author: Lukasz Lenart 
Authored: Mon Apr 18 20:38:27 2016 +0200
Committer: Lukasz Lenart 
Committed: Mon Apr 18 21:50:50 2016 +0200

--
 .../java/com/opensymphony/xwork2/ognl/OgnlUtil.java  |  6 +++---
 .../com/opensymphony/xwork2/ognl/OgnlUtilTest.java   | 15 +++
 2 files changed, 18 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/47da9c9f/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 63c45fe..0421fac 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
@@ -282,7 +282,7 @@ public class OgnlUtil {
 compileAndExecute(name, context, new OgnlTask() {
 public Void execute(Object tree) throws OgnlException {
 if (!evalName && isEvalExpression(tree, context)) {
-throw new OgnlException("Eval expression cannot be used as 
parameter name");
+throw new OgnlException("Eval expression/chained 
expressions cannot be used as parameter name");
 }
 Ognl.setValue(tree, context, root, value);
 return null;
@@ -298,7 +298,7 @@ public class OgnlUtil {
 if (context!=null && context instanceof OgnlContext) {
 ognlContext = (OgnlContext) context;
 }
-return node.isEvalChain(ognlContext);
+return node.isEvalChain(ognlContext) || 
node.isSequence(ognlContext);
 }
 return false;
 }
@@ -355,7 +355,7 @@ public class OgnlUtil {
 
 private void checkEnableEvalExpression(Object tree, Map 
context) throws OgnlException {
 if (!enableEvalExpression && isEvalExpression(tree, context)) {
-throw new OgnlException("Eval expressions has been disabled!");
+throw new OgnlException("Eval expressions/chained expressions have 
been disabled!");
 }
 }
 

http://git-wip-us.apache.org/repos/asf/struts/blob/47da9c9f/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 6726af6..13442b1 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
@@ -750,6 +750,21 @@ public class OgnlUtilTest extends XWorkTestCase {
 assertEquals(expected.getMessage(), "Method \"getRuntime\" failed for 
object class java.lang.Runtime");
 }
 
+public void testBlockSequenceOfExpressions() throws Exception {
+Foo foo = new Foo();
+
+Exception expected = null;
+try {
+
ognlUtil.setValue("#booScope=@myclass@DEFAULT_SCOPE,#bootScope.init()", 
ognlUtil.createDefaultContext(foo), foo, true);
+fail();
+} catch (OgnlException e) {
+expected = e;
+}
+assertNotNull(expected);
+assertSame(OgnlException.class, expected.getClass());
+assertEquals(expected.getMessage(), "Eval expressions/chained 
expressions have been disabled!");
+}
+
 public static class Email {
 String address;

[3/5] struts git commit: Drops defining location via request

2016-04-18 Thread lukaszlenart

Drops defining location via request


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/8f42327d
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/8f42327d
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/8f42327d

Branch: refs/heads/struts-2-3-24-2
Commit: 8f42327dc6430813e2637dfb44b8b309f92ef2e3
Parents: d92654d
Author: Lukasz Lenart 
Authored: Mon Apr 18 20:39:05 2016 +0200
Committer: Lukasz Lenart 
Committed: Mon Apr 18 21:51:11 2016 +0200

--
 .../main/java/org/apache/struts2/views/xslt/XSLTResult.java   | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/8f42327d/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
--
diff --git a/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java 
b/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
index 7c3dd77..e703325 100644
--- a/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
+++ b/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
@@ -448,12 +448,7 @@ public class XSLTResult implements Result {
 ServletActionContext.getServletContext());
 }
 
-protected Templates getTemplates(String path) throws TransformerException, 
IOException {
-String pathFromRequest = 
ServletActionContext.getRequest().getParameter("xslt.location");
-
-if (pathFromRequest != null)
-path = pathFromRequest;
-
+protected Templates getTemplates(final String path) throws 
TransformerException, IOException {
 if (path == null)
 throw new TransformerException("Stylesheet path is null");

[4/5] struts git commit: Sets SNAPSHOT version to allow prepare a new release

2016-04-18 Thread lukaszlenart

Sets SNAPSHOT version to allow prepare a new release


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/24085ee6
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/24085ee6
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/24085ee6

Branch: refs/heads/struts-2-3-24-2
Commit: 24085ee6a6a40e7e778ad4c3fb83e2d74b7f85ac
Parents: 8f42327
Author: Lukasz Lenart 
Authored: Mon Apr 18 21:56:59 2016 +0200
Committer: Lukasz Lenart 
Committed: Mon Apr 18 21:56:59 2016 +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 +-
 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 +-
 assembly/pom.xml| 2 +-
 bom/pom.xml | 4 ++--
 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/java8-support/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| 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 | 2 +-
 xwork-core/pom.xml  | 2 +-
 53 files changed, 55 insertions(+), 55 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/24085ee6/apps/blank/pom.xml
--
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index 85ff76f..784dd4b 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.3.24.1
+2.3.24.2-SNAPSHOT
 
 
 struts2-blank

http://git-wip-us.apache.org/repos/asf/struts/blob/24085ee6/apps/jboss-blank/pom.xml
--
diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
index 3f29927..ef4260e 100644
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.3.24.1
+2.3.24.2-SNAPSHOT
 
 
 struts2-jboss-blank

http://git-wip-us.apache.org/repos/asf/struts/blob/24085ee6/apps/mailreader/pom.xml
--
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index 3b7e5cf..f36dcb8 100644
--- a/apps/mailreader/pom.xml
+++ b/apps/mailreader/pom.xml
@@ -26,7 +26,7 @@

[3/5] struts git commit: Drops defining location via request

2016-04-18 Thread lukaszlenart

Drops defining location via request


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/213db3cf
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/213db3cf
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/213db3cf

Branch: refs/heads/struts-2-3-20-2
Commit: 213db3cfdbf19c9fbaa549c23e52d21ee66192c0
Parents: 51b276c
Author: Lukasz Lenart 
Authored: Mon Apr 18 20:39:05 2016 +0200
Committer: Lukasz Lenart 
Committed: Mon Apr 18 20:39:05 2016 +0200

--
 .../main/java/org/apache/struts2/views/xslt/XSLTResult.java   | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/213db3cf/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
--
diff --git a/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java 
b/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
index 7c3dd77..e703325 100644
--- a/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
+++ b/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
@@ -448,12 +448,7 @@ public class XSLTResult implements Result {
 ServletActionContext.getServletContext());
 }
 
-protected Templates getTemplates(String path) throws TransformerException, 
IOException {
-String pathFromRequest = 
ServletActionContext.getRequest().getParameter("xslt.location");
-
-if (pathFromRequest != null)
-path = pathFromRequest;
-
+protected Templates getTemplates(final String path) throws 
TransformerException, IOException {
 if (path == null)
 throw new TransformerException("Stylesheet path is null");

[struts] Git Push Summary

2016-04-18 Thread lukaszlenart

Repository: struts
Updated Tags:  refs/tags/STRUTS_2_3_20_2 [created] 4aed20dc0

[4/5] struts git commit: Sets SNAPSHOT version to allow prepare a new release

2016-04-18 Thread lukaszlenart

Sets SNAPSHOT version to allow prepare a new release


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/a966570a
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/a966570a
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/a966570a

Branch: refs/heads/struts-2-3-20-2
Commit: a966570ad2051617c5fdea337ef0e91802acd37d
Parents: 213db3c
Author: Lukasz Lenart 
Authored: Mon Apr 18 20:40:50 2016 +0200
Committer: Lukasz Lenart 
Committed: Mon Apr 18 20:40:50 2016 +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 +-
 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 +-
 assembly/pom.xml| 2 +-
 bom/pom.xml | 4 ++--
 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| 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 | 2 +-
 xwork-core/pom.xml  | 2 +-
 52 files changed, 54 insertions(+), 54 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/a966570a/apps/blank/pom.xml
--
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index 248904b..0ef12d5 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.3.20.1
+2.3.20.2-SNAPSHOT
 
 
 struts2-blank

http://git-wip-us.apache.org/repos/asf/struts/blob/a966570a/apps/jboss-blank/pom.xml
--
diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
index 90747fd..0447b43 100644
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.3.20.1
+2.3.20.2-SNAPSHOT
 
 
 struts2-jboss-blank

http://git-wip-us.apache.org/repos/asf/struts/blob/a966570a/apps/mailreader/pom.xml
--
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index 7c2418a..8ef4a4e 100644
--- a/apps/mailreader/pom.xml
+++ b/apps/mailreader/pom.xml
@@ -26,7 +26,7 @@
 
   org.apache.struts
   struts2-apps
-

[1/5] struts git commit: Uses isSequence flag to block chained expressions

2016-04-18 Thread lukaszlenart

Repository: struts
Updated Branches:
  refs/heads/struts-2-3-20-2 [created] c7113e9d6


Uses isSequence flag to block chained expressions


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/98eb21ae
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/98eb21ae
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/98eb21ae

Branch: refs/heads/struts-2-3-20-2
Commit: 98eb21ae8528dd5fdc3f76ed9ade897a1c679131
Parents: a9974ee
Author: Lukasz Lenart 
Authored: Mon Apr 18 20:38:27 2016 +0200
Committer: Lukasz Lenart 
Committed: Mon Apr 18 20:38:27 2016 +0200

--
 .../java/com/opensymphony/xwork2/ognl/OgnlUtil.java  |  6 +++---
 .../com/opensymphony/xwork2/ognl/OgnlUtilTest.java   | 15 +++
 2 files changed, 18 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/98eb21ae/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 63c45fe..0421fac 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
@@ -282,7 +282,7 @@ public class OgnlUtil {
 compileAndExecute(name, context, new OgnlTask() {
 public Void execute(Object tree) throws OgnlException {
 if (!evalName && isEvalExpression(tree, context)) {
-throw new OgnlException("Eval expression cannot be used as 
parameter name");
+throw new OgnlException("Eval expression/chained 
expressions cannot be used as parameter name");
 }
 Ognl.setValue(tree, context, root, value);
 return null;
@@ -298,7 +298,7 @@ public class OgnlUtil {
 if (context!=null && context instanceof OgnlContext) {
 ognlContext = (OgnlContext) context;
 }
-return node.isEvalChain(ognlContext);
+return node.isEvalChain(ognlContext) || 
node.isSequence(ognlContext);
 }
 return false;
 }
@@ -355,7 +355,7 @@ public class OgnlUtil {
 
 private void checkEnableEvalExpression(Object tree, Map 
context) throws OgnlException {
 if (!enableEvalExpression && isEvalExpression(tree, context)) {
-throw new OgnlException("Eval expressions has been disabled!");
+throw new OgnlException("Eval expressions/chained expressions have 
been disabled!");
 }
 }
 

http://git-wip-us.apache.org/repos/asf/struts/blob/98eb21ae/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 6726af6..13442b1 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
@@ -750,6 +750,21 @@ public class OgnlUtilTest extends XWorkTestCase {
 assertEquals(expected.getMessage(), "Method \"getRuntime\" failed for 
object class java.lang.Runtime");
 }
 
+public void testBlockSequenceOfExpressions() throws Exception {
+Foo foo = new Foo();
+
+Exception expected = null;
+try {
+
ognlUtil.setValue("#booScope=@myclass@DEFAULT_SCOPE,#bootScope.init()", 
ognlUtil.createDefaultContext(foo), foo, true);
+fail();
+} catch (OgnlException e) {
+expected = e;
+}
+assertNotNull(expected);
+assertSame(OgnlException.class, expected.getClass());
+assertEquals(expected.getMessage(), "Eval expressions/chained 
expressions have been disabled!");
+}
+
 public static class Email {
 String address;

[2/5] struts git commit: Adds additional blocked classes

2016-04-18 Thread lukaszlenart

Adds additional blocked classes


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/51b276c2
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/51b276c2
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/51b276c2

Branch: refs/heads/struts-2-3-20-2
Commit: 51b276c2d80c4008b86f47a0232c32e8385c0096
Parents: 98eb21a
Author: Lukasz Lenart 
Authored: Mon Apr 18 20:38:49 2016 +0200
Committer: Lukasz Lenart 
Committed: Mon Apr 18 20:38:49 2016 +0200

--
 core/src/main/resources/struts-default.xml  | 3 +++
 core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/51b276c2/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 256d056..b3fab8f 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -50,6 +50,9 @@
 ognl.MemberAccess,
 ognl.ClassResolver,
 ognl.TypeConverter,
+ognl.MemberAccess,
+ognl.DefaultMemberAccess,
+com.opensymphony.xwork2.ognl.SecurityMemberAccess,
 com.opensymphony.xwork2.ActionContext" />
 
 

http://git-wip-us.apache.org/repos/asf/struts/blob/51b276c2/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java
--
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java 
b/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java
index 50bf576..6c141aa 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java
@@ -657,8 +657,7 @@ public class URLTagTest extends AbstractUITagTest {
tag.doEndTag();
 
Object allowMethodAccess = 
stack.findValue("\u0023_memberAccess['allowStaticMethodAccess']");
-   assertNotNull(allowMethodAccess);
-   assertEquals(Boolean.FALSE, allowMethodAccess);
+   assertNull(allowMethodAccess);
 
assertNull(session.get("foo"));

[struts] Git Push Summary

[2/5] struts git commit: Adds additional blocked classes

[1/5] struts git commit: Uses isSequence flag to block chained expressions

[3/5] struts git commit: Drops defining location via request

[4/5] struts git commit: Sets SNAPSHOT version to allow prepare a new release

[3/5] struts git commit: Drops defining location via request

[struts] Git Push Summary

[4/5] struts git commit: Sets SNAPSHOT version to allow prepare a new release

[1/5] struts git commit: Uses isSequence flag to block chained expressions

[2/5] struts git commit: Adds additional blocked classes

10 matches

Site Navigation

Mail list logo

Footer information