Block one more gadget type (shaded-hikari-config, CVE-2020-9546)

Merged from FasterXML/jackson-databind#2631
atlassian · May 8, 2020 · c4e6fbe · c4e6fbe
1 parent 553c58c
commit c4e6fbe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -48,6 +48,7 @@ One more patch release for 1.9.
 * [databind#2498]: Block one more gadget type (log4j-extras/1.2)
 * [databind#2526]: Block two more gadget types (ehcache/JNDI - CVE-2019-20330)
 * [databind#2620]: Block one more gadget type (xbean-reflect/JNDI - CVE-2020-8840)
+* [databind#2631]: Block one more gadget type (shaded-hikari-config, CVE-2020-9546)
 
 1.9.13 (14-Jul-2013)
 

diff --git a/src/mapper/java/org/codehaus/jackson/map/jsontype/impl/SubTypeValidator.java b/src/mapper/java/org/codehaus/jackson/map/jsontype/impl/SubTypeValidator.java
@@ -107,7 +107,10 @@ public class SubTypeValidator
 
         // [databind#2620]: xbean-reflect
         s.add("org.apache.xbean.propertyeditor.JndiConverter");
-
+
+        // [databind#2631]: shaded hikari-config
+        s.add("org.apache.hadoop.shaded.com.zaxxer.hikari.HikariConfig");
+
         DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s);
     }