Block one more gadget type (shiro-core, 2nd class)

Merged from FasterXML/jackson-databind#2653
atlassian · May 8, 2020 · 814a518 · 814a518
1 parent b9954f7
commit 814a518
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -52,6 +52,7 @@ One more patch release for 1.9.
 * [databind#2634]: Block two more gadget types (ibatis-sqlmap, anteros-core; CVE-2020-9547 / CVE-2020-9548)
 * [databind#2642]: Block one more gadget type (javax.swing, CVE-2020-10969)
 * [databind#2648]: Block one more gadget type (shiro-core)
+* [databind#2653]: Block one more gadget type (shiro-core, 2nd class)
 
 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
@@ -118,8 +118,9 @@ public class SubTypeValidator
         // [databind#2642]: javax.swing (jdk)
         s.add("javax.swing.JEditorPane");
 
-        // [databind#2648]: shire-core
+        // [databind#2648], [databind#2653]: shire-core
         s.add("org.apache.shiro.realm.jndi.JndiRealmFactory");
+        s.add("org.apache.shiro.jndi.JndiObjectFactory");
 
         DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s);
     }