jackson-databind/CVE-2020-36184-CVE-2020-36185.patch

29 lines
1.2 KiB
Diff
Raw Normal View History

2021-01-22 12:08:22 +08:00
From 2cf1231703fa3a348ada8fa4491c96ee747bf7ed Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
2021-01-22 12:08:22 +08:00
Date: Mon, 18 Jan 2021 18:30:47 +0800
Subject: [PATCH] Fixed #2998
---
2021-01-22 12:08:22 +08:00
.../jackson/databind/jsontype/impl/SubTypeValidator.java | 5 +++++
1 file changed, 5 insertions(+)
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
2021-01-22 12:08:22 +08:00
index 3e52fb7..9df94ec 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
2021-01-22 12:08:22 +08:00
@@ -210,6 +210,11 @@ public class SubTypeValidator
// (derivative of #2469)
s.add("com.oracle.wls.shaded.org.apache.xalan.lib.sql.JNDIConnectionPool");
+ // [databind#2998]: org.apache.tomcat/tomcat-dbcp (embedded dbcp 2.x)
+ // (derivative of #2478)
+ s.add("org.apache.tomcat.dbcp.dbcp2.datasources.PerUserPoolDataSource");
+ s.add("org.apache.tomcat.dbcp.dbcp2.datasources.SharedPoolDataSource");
2021-01-22 12:08:22 +08:00
+
DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s);
}
2021-01-22 12:08:22 +08:00
--
2.23.0