Fix #2526

FasterXML · Mar 10, 2020 · eb25481 · eb25481
1 parent bbdbc40
commit eb25481
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -12,6 +12,8 @@ Project: jackson-databind
 #2462: Block two more gadget types (commons-configuration/-2)
 #2478: Block two more gadget types (commons-dbcp, p6spy, CVE-2019-16942 / CVE-2019-16943)
 #2498: Block one more gadget type (apache-log4j-extras/1.2, CVE-2019-17531)
+#2526: Block two more gadget types (ehcache/JNDI - CVEs to be allocated)
+  (repoerted by UltramanGaia)
 
 2.7.9.6 (26-Jul-2019)
 

diff --git a/src/main/java/com/fasterxml/jackson/databind/jsontype/impl/SubTypeValidator.java b/src/main/java/com/fasterxml/jackson/databind/jsontype/impl/SubTypeValidator.java
@@ -119,6 +119,10 @@ public class SubTypeValidator
         s.add("org.apache.log4j.receivers.db.DriverManagerConnectionSource");
         s.add("org.apache.log4j.receivers.db.JNDIConnectionSource");
 
+        // [databind#2526]: some more ehcache
+        s.add("net.sf.ehcache.transaction.manager.selector.GenericJndiSelector");
+        s.add("net.sf.ehcache.transaction.manager.selector.GlassfishSelector");
+
         DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s);
     }