From 509cb9c4b4652fa50ab95d43ff439b13ca89c2df Mon Sep 17 00:00:00 2001 From: lovesh-ap Date: Mon, 29 Jan 2024 18:17:35 +0530 Subject: [PATCH 1/3] NR-214326 : Fix class circluarity error CSEC version bump --- gradle.properties | 2 +- newrelic-agent/src/main/resources/META-INF/excludes | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 5bf2bbbb4f..4748d9e25f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # The agent version. agentVersion=8.9.0 -securityAgentVersion=1.0.7-public-preview +securityAgentVersion=1.1.0-public-preview newrelicDebug=false org.gradle.jvmargs=-Xmx2048m diff --git a/newrelic-agent/src/main/resources/META-INF/excludes b/newrelic-agent/src/main/resources/META-INF/excludes index 391ffdbc99..0bc1763fbb 100644 --- a/newrelic-agent/src/main/resources/META-INF/excludes +++ b/newrelic-agent/src/main/resources/META-INF/excludes @@ -3,6 +3,11 @@ ^java/io/(BufferedOutputStream|ByteArrayOutputStream|DataOutputStream|FilterOutputStream|ObjectOutputStream|PipedOutputStream) ^java/lang/(NullOutputStream|ProcessPipeOutputStream) ^java/net/SocketOutputStream +//To resolve class circularity error +^javax/crypto/BadPaddingException +^javax/crypto/SecretKey +//This is to avoid vulnerabilities flagged in NR APM code +^java/util/concurrent/ThreadLocalRandom ^(org/objectweb/asm/|javax/xml/|org/apache/juli/)(.*) # Don't instrument agent threads ^com/newrelic/agent/.*AgentThread.* From bb50dd4c27fd09ee10f10cda96888a0c37de7d95 Mon Sep 17 00:00:00 2001 From: lovesh-ap Date: Mon, 29 Jan 2024 23:45:00 +0530 Subject: [PATCH 2/3] CSEC public release --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 4748d9e25f..5112259311 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # The agent version. agentVersion=8.9.0 -securityAgentVersion=1.1.0-public-preview +securityAgentVersion=1.1.0 newrelicDebug=false org.gradle.jvmargs=-Xmx2048m From 6c4dcfd60ab8f1341dafb24e0579e25c871f0eed Mon Sep 17 00:00:00 2001 From: lovesh-ap Date: Mon, 29 Jan 2024 23:54:37 +0530 Subject: [PATCH 3/3] Update comment --- newrelic-agent/src/main/resources/META-INF/excludes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/newrelic-agent/src/main/resources/META-INF/excludes b/newrelic-agent/src/main/resources/META-INF/excludes index 0bc1763fbb..c416afe95d 100644 --- a/newrelic-agent/src/main/resources/META-INF/excludes +++ b/newrelic-agent/src/main/resources/META-INF/excludes @@ -6,7 +6,7 @@ //To resolve class circularity error ^javax/crypto/BadPaddingException ^javax/crypto/SecretKey -//This is to avoid vulnerabilities flagged in NR APM code +//Remove ThreadLocal Weak Random Class Instrumentation ^java/util/concurrent/ThreadLocalRandom ^(org/objectweb/asm/|javax/xml/|org/apache/juli/)(.*) # Don't instrument agent threads