Merge pull request #79 from jtnord/JENKINS-33999

[JENKINS-33999] Do not blacklist Spring’s Exceptions
jenkinsci · Apr 5, 2016 · a86a27d · a86a27d
2 parents 7cb4138 + 39a83a1
commit a86a27d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/hudson/remoting/ClassFilter.java b/src/main/java/hudson/remoting/ClassFilter.java
@@ -60,7 +60,7 @@ public final Class check(Class c) {
         ".*org[.]apache[.]xalan.*",
         "^org[.]codehaus[.]groovy[.]runtime[.].*",
         "^org[.]hibernate[.].*",
-        "^org[.]springframework[.].*",
+        "^org[.]springframework[.](?!(\\p{Alnum}+[.])*\\p{Alnum}*Exception$).*",
         "^sun[.]rmi[.].*",
     };
 

diff --git a/src/test/java/hudson/remoting/DefaultClassFilterTest.java b/src/test/java/hudson/remoting/DefaultClassFilterTest.java
@@ -48,10 +48,12 @@ public class DefaultClassFilterTest {
     /** Some classes that should be matched by the default class filter */
     private static final List<String> defaultBadClasses = Arrays.asList("org.codehaus.groovy.runtime.Bob",
                                     "org.apache.commons.collections.functors.Wibble", "org.apache.xalan.Bogus",
-                                    "com.sun.org.apache.xalan.bogus");
+                                    "com.sun.org.apache.xalan.bogus", "org.springframework.core.SomeClass", 
+                                    "org.springframework.wibble.ExceptionHandler");
     /** Some classes that should not be matched by the default class filter */
     private static final List<String> defaultOKClasses = Arrays.asList("java.lang.String", "java.lang.Object",
-                                    "java.util.ArrayList");
+                                    "java.util.ArrayList", "org.springframework.core.NestedRuntimeException",
+                                    "org.springframework.a.b.c.yada.SomeSuperException");
 
     @Rule
     public TemporaryFolder folder = new TemporaryFolder();