jackson-databind/CVE-2020-36188-CVE-2020-36189.patch

29 lines
1.2 KiB
Diff

From 506ad31e38a80f2862d85aa385c88496b3d341cb Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Thu, 21 Jan 2021 15:26:02 +0800
Subject: [PATCH] Fixed #2996
---
.../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
index 9df94ec..94f2b95 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
@@ -215,6 +215,11 @@ public class SubTypeValidator
s.add("org.apache.tomcat.dbcp.dbcp2.datasources.PerUserPoolDataSource");
s.add("org.apache.tomcat.dbcp.dbcp2.datasources.SharedPoolDataSource");
+ // [databind#2996]: newrelic-agent + embedded-logback-core
+ // (derivative of #2334 and #2389)
+ s.add("com.newrelic.agent.deps.ch.qos.logback.core.db.JNDIConnectionSource");
+ s.add("com.newrelic.agent.deps.ch.qos.logback.core.db.DriverManagerConnectionSource");
+
DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s);
}
--
2.23.0