Merge branch '2.6' into 2.7
diff --git a/release-notes/VERSION b/release-notes/VERSION
index 39737dd..7a8d1a5 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -3,10 +3,13 @@
------------------------------------------------------------------------
=== Releases ===
------------------------------------------------------------------------
+
2.7.9.5 (not yet released)
#1899: Another two gadgets to exploit default typing issue in jackson-databind
(reported by OneSourceCat@github)
+#2097: Block more classes from polymorphic deserialization (CVE-2018-14718
+ - CVE-2018-14721)
2.7.9.4 (08-Jun-2018)
@@ -106,9 +109,10 @@
#1225: `JsonMappingException` should override getProcessor()
(reported by Nick B)
-2.6.8 (if ever released)
+2.6.7.1 (11-Jul-2017)
#1383: Problem with `@JsonCreator` with 1-arg factory-method, implicit param names
+#1599: Backport the extra safety checks for polymorphic deserialization
2.6.7 (05-Jun-2016)
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
index a421453..a8b1bce 100644
--- a/src/main/java/com/fasterxml/jackson/databind/jsontype/impl/SubTypeValidator.java
+++ b/src/main/java/com/fasterxml/jackson/databind/jsontype/impl/SubTypeValidator.java
@@ -67,6 +67,12 @@
s.add("org.hibernate.jmx.StatisticsService");
s.add("org.apache.ibatis.datasource.jndi.JndiDataSourceFactory");
+ // [databind#2097]: some 3rd party, one JDK-bundled
+ s.add("org.slf4j.ext.EventData");
+ s.add("flex.messaging.util.concurrent.AsynchBeansWorkManagerExecutor");
+ s.add("com.sun.deploy.security.ruleset.DRSHelper");
+ s.add("org.apache.axis2.jaxws.spi.handler.HandlerResolverImpl");
+
DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s);
}