Fix #2478 (cve)

FasterXML · Sep 29, 2019 · 9593e16 · 9593e16
1 parent 998efd7
commit 9593e16
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -14,6 +14,7 @@ Unreleased but backported
 #2460: Block one more gadget type (ehcache, no CVE allocated yet)
 #2462: Block two more gadget types (commons-configuration)
 #2469: Block one more gadget type (xalan2)
+#2478: Block two more gadget types (commons-dbcp, p6spy)
 
 2.8.11.4 (25-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
@@ -114,6 +114,10 @@ public class SubTypeValidator
         // [databind#2469]: xalan2
         s.add("org.apache.xalan.lib.sql.JNDIConnectionPool");
 
+        // [databind#2478]: comons-dbcp, p6spy
+        s.add("org.apache.commons.dbcp.datasources.SharedPoolDataSource");
+        s.add("com.p6spy.engine.spy.P6DataSource");
+
         DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s);
     }