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/develop Commit: 21ef4e3487f5dbf46f9b6bdff7eceb057da28bdd Parents: 63897e8 9654287 Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Wed Jun 18 08:48:22 2014 +0200 Committer: Lukasz Lenart <lukaszlen...@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(-) ----------------------------------------------------------------------
