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

28 lines
1.2 KiB
Diff

From d8b91e1b94096f26443457463efeb0eb7f3477c8 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Thu, 21 Jan 2021 15:36:41 +0800
Subject: [PATCH] Fixed #2998
---
.../jackson/databind/jsontype/impl/SubTypeValidator.java | 4 ++++
1 file changed, 4 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
index 2be6d49..2fda051 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
@@ -224,6 +224,10 @@ public class SubTypeValidator
// (derivative of #2478)
s.add("org.apache.tomcat.dbcp.dbcp.datasources.PerUserPoolDataSource");
s.add("org.apache.tomcat.dbcp.dbcp.datasources.SharedPoolDataSource");
+ // [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");
DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s);
}
--
2.23.0