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 2020/02/02 07:53:41 UTC

[struts] branch WW-5054-debug-browser updated: WW-5054 Uses a dedicated set of excluded classes & packages to be used in devMode

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch WW-5054-debug-browser
in repository https://gitbox.apache.org/repos/asf/struts.git


The following commit(s) were added to refs/heads/WW-5054-debug-browser by this push:
     new d14403e  WW-5054 Uses a dedicated set of excluded classes & packages to be used in devMode
d14403e is described below

commit d14403e9fa3f4cdb4b8c965037d844ba8d06c927
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Sun Feb 2 08:53:32 2020 +0100

    WW-5054 Uses a dedicated set of excluded classes & packages to be used in devMode
---
 .../com/opensymphony/xwork2/ognl/OgnlUtil.java     | 41 +++++++++++++++++++++-
 .../java/org/apache/struts2/StrutsConstants.java   |  5 +++
 .../struts2/config/entities/ConstantConfig.java    | 30 ++++++++++++++++
 core/src/main/resources/struts-default.xml         | 34 ++++++++++++++++++
 4 files changed, 109 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
index 88b54cc..36070b1 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
@@ -65,6 +65,10 @@ public class OgnlUtil {
     private Set<Pattern> excludedPackageNamePatterns;
     private Set<String> excludedPackageNames;
 
+    private Set<Class<?>> devModeExcludedClasses;
+    private Set<Pattern> devModeExcludedPackageNamePatterns;
+    private Set<String> devModeExcludedPackageNames;
+
     private Container container;
     private boolean allowStaticFieldAccess = true;
     private boolean allowStaticMethodAccess;
@@ -77,6 +81,13 @@ public class OgnlUtil {
         excludedClasses = Collections.unmodifiableSet(excludedClasses);
         excludedPackageNamePatterns = Collections.unmodifiableSet(excludedPackageNamePatterns);
         excludedPackageNames = Collections.unmodifiableSet(excludedPackageNames);
+
+        devModeExcludedClasses = new HashSet<>();
+        devModeExcludedPackageNamePatterns = new HashSet<>();
+        devModeExcludedPackageNames = new HashSet<>();
+        devModeExcludedClasses = Collections.unmodifiableSet(excludedClasses);
+        devModeExcludedPackageNamePatterns = Collections.unmodifiableSet(excludedPackageNamePatterns);
+        devModeExcludedPackageNames = Collections.unmodifiableSet(excludedPackageNames);
     }
 
     @Inject
@@ -111,6 +122,14 @@ public class OgnlUtil {
         this.excludedClasses = Collections.unmodifiableSet(excludedClasses);
     }
 
+    @Inject(value = StrutsConstants.STRUTS_DEV_MODE_EXCLUDED_CLASSES, required = false)
+    protected void setDevModeExcludedClasses(String commaDelimitedClasses) {
+        Set<Class<?>> excludedClasses = new HashSet<>();
+        excludedClasses.addAll(this.devModeExcludedClasses);
+        excludedClasses.addAll(parseExcludedClasses(commaDelimitedClasses));
+        this.devModeExcludedClasses = Collections.unmodifiableSet(excludedClasses);
+    }
+
     private Set<Class<?>> parseExcludedClasses(String commaDelimitedClasses) {
         Set<String> classNames = TextParseUtil.commaDelimitedStringToSet(commaDelimitedClasses);
         Set<Class<?>> classes = new HashSet<>();
@@ -134,6 +153,14 @@ public class OgnlUtil {
         this.excludedPackageNamePatterns = Collections.unmodifiableSet(excludedPackageNamePatterns);
     }
 
+    @Inject(value = StrutsConstants.STRUTS_DEV_MODE_EXCLUDED_PACKAGE_NAME_PATTERNS, required = false)
+    protected void setDevModeExcludedPackageNamePatterns(String commaDelimitedPackagePatterns) {
+        Set<Pattern> excludedPackageNamePatterns = new HashSet<>();
+        excludedPackageNamePatterns.addAll(this.devModeExcludedPackageNamePatterns);
+        excludedPackageNamePatterns.addAll(parseExcludedPackageNamePatterns(commaDelimitedPackagePatterns));
+        this.devModeExcludedPackageNamePatterns = Collections.unmodifiableSet(excludedPackageNamePatterns);
+    }
+
     private Set<Pattern> parseExcludedPackageNamePatterns(String commaDelimitedPackagePatterns) {
         Set<String> packagePatterns = TextParseUtil.commaDelimitedStringToSet(commaDelimitedPackagePatterns);
         Set<Pattern> packageNamePatterns = new HashSet<>();
@@ -153,6 +180,14 @@ public class OgnlUtil {
         this.excludedPackageNames = Collections.unmodifiableSet(excludedPackageNames);
     }
 
+    @Inject(value = StrutsConstants.STRUTS_DEV_MODE_EXCLUDED_PACKAGE_NAMES, required = false)
+    protected void setDevModeExcludedPackageNames(String commaDelimitedPackageNames) {
+        Set<String> excludedPackageNames = new HashSet<>();
+        excludedPackageNames.addAll(this.devModeExcludedPackageNames);
+        excludedPackageNames.addAll(parseExcludedPackageNames(commaDelimitedPackageNames));
+        this.devModeExcludedPackageNames = Collections.unmodifiableSet(excludedPackageNames);
+    }
+
     private Set<String> parseExcludedPackageNames(String commaDelimitedPackageNames) {
         return TextParseUtil.commaDelimitedStringToSet(commaDelimitedPackageNames);
     }
@@ -799,7 +834,11 @@ public class OgnlUtil {
 
         SecurityMemberAccess memberAccess = new SecurityMemberAccess(allowStaticMethodAccess, allowStaticFieldAccess);
         if (devMode) {
-            LOG.warn("Working in devMode, ignoring internal security");
+            LOG.warn("Working in devMode, using devMode excluded classes and packages!");
+            memberAccess.setExcludedClasses(devModeExcludedClasses);
+            memberAccess.setExcludedPackageNamePatterns(devModeExcludedPackageNamePatterns);
+            memberAccess.setExcludedPackageNames(devModeExcludedPackageNames);
+            memberAccess.setDisallowProxyMemberAccess(disallowProxyMemberAccess);
         } else {
             memberAccess.setExcludedClasses(excludedClasses);
             memberAccess.setExcludedPackageNamePatterns(excludedPackageNamePatterns);
diff --git a/core/src/main/java/org/apache/struts2/StrutsConstants.java b/core/src/main/java/org/apache/struts2/StrutsConstants.java
index 2d12095..a55ed62 100644
--- a/core/src/main/java/org/apache/struts2/StrutsConstants.java
+++ b/core/src/main/java/org/apache/struts2/StrutsConstants.java
@@ -319,6 +319,11 @@ public final class StrutsConstants {
     public static final String STRUTS_EXCLUDED_PACKAGE_NAME_PATTERNS = "struts.excludedPackageNamePatterns";
     public static final String STRUTS_EXCLUDED_PACKAGE_NAMES = "struts.excludedPackageNames";
 
+    /** Comma delimited set of excluded classes and package names which cannot be accessed via expressions in devMode */
+    public static final String STRUTS_DEV_MODE_EXCLUDED_CLASSES = "struts.devMode.excludedClasses";
+    public static final String STRUTS_DEV_MODE_EXCLUDED_PACKAGE_NAME_PATTERNS = "struts.devMode.excludedPackageNamePatterns";
+    public static final String STRUTS_DEV_MODE_EXCLUDED_PACKAGE_NAMES = "struts.devMode.excludedPackageNames";
+
     /** 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";
diff --git a/core/src/main/java/org/apache/struts2/config/entities/ConstantConfig.java b/core/src/main/java/org/apache/struts2/config/entities/ConstantConfig.java
index 904296f..5ef6c4d 100644
--- a/core/src/main/java/org/apache/struts2/config/entities/ConstantConfig.java
+++ b/core/src/main/java/org/apache/struts2/config/entities/ConstantConfig.java
@@ -129,6 +129,9 @@ public class ConstantConfig {
     private Set<Class<?>> excludedClasses;
     private List<Pattern> excludedPackageNamePatterns;
     private Set<String> excludedPackageNames;
+    private Set<Class<?>> devModeExcludedClasses;
+    private List<Pattern> devModeExcludedPackageNamePatterns;
+    private Set<String> devModeExcludedPackageNames;
     private BeanConfig excludedPatternsChecker;
     private BeanConfig acceptedPatternsChecker;
     private Set<Pattern> overrideExcludedPatterns;
@@ -257,6 +260,9 @@ public class ConstantConfig {
         map.put(StrutsConstants.STRUTS_EXCLUDED_CLASSES, classesToString(excludedClasses));
         map.put(StrutsConstants.STRUTS_EXCLUDED_PACKAGE_NAME_PATTERNS, StringUtils.join(excludedPackageNamePatterns, ','));
         map.put(StrutsConstants.STRUTS_EXCLUDED_PACKAGE_NAMES, StringUtils.join(excludedPackageNames, ','));
+        map.put(StrutsConstants.STRUTS_DEV_MODE_EXCLUDED_CLASSES, classesToString(devModeExcludedClasses));
+        map.put(StrutsConstants.STRUTS_DEV_MODE_EXCLUDED_PACKAGE_NAME_PATTERNS, StringUtils.join(devModeExcludedPackageNamePatterns, ','));
+        map.put(StrutsConstants.STRUTS_DEV_MODE_EXCLUDED_PACKAGE_NAMES, StringUtils.join(devModeExcludedPackageNames, ','));
         map.put(StrutsConstants.STRUTS_EXCLUDED_PATTERNS_CHECKER, beanConfToString(excludedPatternsChecker));
         map.put(StrutsConstants.STRUTS_ACCEPTED_PATTERNS_CHECKER, beanConfToString(acceptedPatternsChecker));
         map.put(StrutsConstants.STRUTS_OVERRIDE_EXCLUDED_PATTERNS, StringUtils.join(overrideExcludedPatterns, ','));
@@ -1209,6 +1215,30 @@ public class ConstantConfig {
         this.excludedPackageNames = excludedPackageNames;
     }
 
+    public Set<Class<?>> getDevModeExcludedClasses() {
+        return devModeExcludedClasses;
+    }
+
+    public void setDevModeExcludedClasses(Set<Class<?>> devModeExcludedClasses) {
+        this.devModeExcludedClasses = devModeExcludedClasses;
+    }
+
+    public List<Pattern> getDevModeExcludedPackageNamePatterns() {
+        return devModeExcludedPackageNamePatterns;
+    }
+
+    public void setDevModeExcludedPackageNamePatterns(List<Pattern> devModeExcludedPackageNamePatterns) {
+        this.devModeExcludedPackageNamePatterns = devModeExcludedPackageNamePatterns;
+    }
+
+    public Set<String> getDevModeExcludedPackageNames() {
+        return devModeExcludedPackageNames;
+    }
+
+    public void setDevModeExcludedPackageNames(Set<String> devModeExcludedPackageNames) {
+        this.devModeExcludedPackageNames = devModeExcludedPackageNames;
+    }
+
     public BeanConfig getExcludedPatternsChecker() {
         return excludedPatternsChecker;
     }
diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
index 9da9daf..0988d87 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -48,9 +48,21 @@
                 sun.misc.Unsafe,
                 com.opensymphony.xwork2.ActionContext" />
 
+    <constant name="struts.devMode.excludedClasses"
+              value="
+                java.lang.Object,
+                java.lang.Runtime,
+                java.lang.System,
+                java.lang.Class,
+                java.lang.ClassLoader,
+                java.lang.Shutdown,
+                java.lang.ProcessBuilder,
+                sun.misc.Unsafe" />
+
     <!-- this must be valid regex, each '.' in package name must be escaped! -->
     <!-- it's more flexible but slower than simple string comparison -->
     <!-- constant name="struts.excludedPackageNamePatterns" value="^java\.lang\..*,^ognl.*,^(?!javax\.servlet\..+)(javax\..+)" / -->
+    <!-- constant name="struts.devMode.excludedPackageNamePatterns" value="^java\.lang\..*,^ognl.*,^(?!javax\.servlet\..+)(javax\..+)" / -->
 
     <!-- this is simpler version of the above used with string comparison -->
     <constant name="struts.excludedPackageNames"
@@ -75,6 +87,28 @@
                 com.opensymphony.xwork2.security.,
                 com.opensymphony.xwork2.util." />
 
+    <constant name="struts.devMode.excludedPackageNames"
+              value="
+                ognl.,
+                java.io.,
+                java.net.,
+                java.nio.,
+                javax.,
+                freemarker.core.,
+                freemarker.template.,
+                freemarker.ext.jsp.,
+                freemarker.ext.rhino.,
+                sun.misc.,
+                sun.reflect.,
+                javassist.,
+                org.apache.velocity.,
+                org.objectweb.asm.,
+                org.springframework.context.,
+                com.opensymphony.xwork2.inject.,
+                com.opensymphony.xwork2.ognl.,
+                com.opensymphony.xwork2.security.,
+                com.opensymphony.xwork2.util." />
+
     <bean class="com.opensymphony.xwork2.ObjectFactory" name="struts"/>
     <bean type="com.opensymphony.xwork2.factory.ResultFactory" name="struts" class="org.apache.struts2.factory.StrutsResultFactory" />
     <bean type="com.opensymphony.xwork2.factory.ActionFactory" name="struts" class="com.opensymphony.xwork2.factory.DefaultActionFactory" />