Merge branch '2.9' into 2.10

cowtowncoder · cowtowncoder · commit 02179c618b0e · 2020-03-11T16:25:44.000-07:00
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -194,7 +194,8 @@ Project: jackson-databind
  (reported by threedr3am & V1ZkRA)
 #2642: Block one more gadget type (javax.swing, CVE-to-be-allocated)
  (reported by threedr3am)
-#2648: Block one more gadget type (shiro-core, CVE-to-be-allocated)
+#2648: Block one more gadget type (shiro-core)
+#2653: Block one more gadget type (shiro-core)
 
 2.9.10.3 (23-Feb-2020)
 
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
@@ -138,8 +138,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);
     }

Original file line number	Diff line number	Diff line change
`@@ -138,8 +138,9 @@ public class SubTypeValidator`
`138`	`138`	`// [databind#2642]: javax.swing (jdk)`
`139`	`139`	`s.add("javax.swing.JEditorPane");`
`140`	`140`
`141`		`- // [databind#2648]: shire-core`
	`141`	`+ // [databind#2648], [databind#2653]: shire-core`
`142`	`142`	`s.add("org.apache.shiro.realm.jndi.JndiRealmFactory");`
	`143`	`+ s.add("org.apache.shiro.jndi.JndiObjectFactory");`
`143`	`144`
`144`	`145`	`DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s);`
`145`	`146`	`}`