Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature Support : IAST Scheduling & IAST Scan Ignore #320

Merged
merged 31 commits into from
Sep 12, 2024
Merged

Feature Support : IAST Scheduling & IAST Scan Ignore #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
9ecfd77
Adds Configuration for IAST_SCHEDULE and IAST_SCAN_IGNORE feature
lovesh-ap Aug 14, 2024
8e12347
Add feature to IAST_SCAN_IGNORE
lovesh-ap Aug 14, 2024
f7240dc
Update gradle.properties to use 1.2.6 as json version
lovesh-ap Aug 14, 2024
eddc24c
fix for delay in start
lovesh-ap Aug 15, 2024
16cbfb2
fix for event being generated for HTTP request and SYSTEM COMMAND
lovesh-ap Aug 15, 2024
961457f
fix shutting of agent after a certain duration
lovesh-ap Aug 15, 2024
092cbab
Merge branch 'refs/heads/main' into feature/iast-skip-n-schedule
lovesh-ap Aug 15, 2024
9d2f10f
Disable agent on incorrect config
lovesh-ap Aug 15, 2024
bb427d7
Add feature to collect sample in IAST Scan deactivate mode.
lovesh-ap Aug 16, 2024
d29056c
Null checks for NextScanTime and fir for nr logging IAE.
lovesh-ap Aug 16, 2024
9c7fe75
Shutdown agent if config is incorrect
lovesh-ap Aug 16, 2024
f42659e
Fix jtds, postgress lock acquire case type.
lovesh-ap Aug 20, 2024
5408c87
rename flag for always sample collections
lovesh-ap Aug 20, 2024
ebe8789
NR-304574: Rate limit the IAST replay requests
IshikaDawda Aug 21, 2024
a729fca
fix for incompatible data type for skip scan parameters
lovesh-ap Aug 21, 2024
120ff86
Update config fields
lovesh-ap Aug 22, 2024
530d844
Merge branch 'refs/heads/feature/iast-skip-n-schedule' into feature/i…
IshikaDawda Aug 23, 2024
7b6e9c8
NR-304574: Rate limit the IAST replay requests
IshikaDawda Aug 23, 2024
cfd9a05
NR-306872: Add test-identifier, process start time to websocket heade…
IshikaDawda Aug 28, 2024
1a98cb0
roundup the value for currentFetchThreshold
IshikaDawda Aug 29, 2024
7943117
remove dependency of start-time header on test-identifier header
IshikaDawda Aug 30, 2024
c7cc91a
Merge branch 'refs/heads/feature/iast-skip-n-schedule' into feature/c…
IshikaDawda Aug 30, 2024
f84ba1f
Merge branch 'refs/heads/feature/iast-scan-rate-limit' into feature/c…
IshikaDawda Aug 30, 2024
721ed8e
agent version bump 1.4.2
lovesh-ap Sep 2, 2024
5ffd62d
set scan start time on every NR IAST trigger
lovesh-ap Sep 2, 2024
57be1b6
New Requirements Enhancing Health Checks with State Information
lovesh-ap Sep 3, 2024
30801b7
rename fields according to NR-308822
lovesh-ap Sep 3, 2024
99f3406
Merge pull request #326 from newrelic/feature/ci-cd-support
IshikaDawda Sep 12, 2024
bf9b27c
Merge pull request #321 from newrelic/feature/iast-scan-rate-limit
IshikaDawda Sep 12, 2024
eaefcc4
Merge branch 'refs/heads/feature/iast-restricted' into feature/iast-s…
lovesh-ap Sep 12, 2024
3c679c5
Use case type SQL for postgresSQL
lovesh-ap Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# The agent version.
agentVersion=1.4.1
jsonVersion=1.2.5
agentVersion=1.4.2
jsonVersion=1.2.7
# Updated exposed NR APM API version.
nrAPIVersion=8.12.0

Expand Down
3 changes: 3 additions & 0 deletions ...ecurity/akka-http-2.11_10.0.0/src/main/scala/akka/http/scaladsl/server/AkkaCoreUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ public static boolean acquireServletLockIfPossible() {
}

public static void postProcessHttpRequest(Boolean isServletLockAcquired, StringBuilder responseBody, String contentType, String className, String methodName, Token token) {
if(NewRelicSecurity.getAgent().getIastDetectionCategory().getRxssEnabled()){
return;
}
try {
token.linkAndExpire();
ServletHelper.executeBeforeExitingTransaction();
Expand Down
3 changes: 3 additions & 0 deletions ...ntation-security/akka-http-core-10.0/src/main/scala/akka/http/scaladsl/AkkaCoreUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ public static boolean acquireServletLockIfPossible() {

public static void postProcessHttpRequest(Boolean isServletLockAcquired, StringBuilder response, String contentType, int responseCode, String className, String methodName, Token token) {
try {
if(NewRelicSecurity.getAgent().getIastDetectionCategory().getRxssEnabled()){
return;
}
token.linkAndExpire();

if(!isServletLockAcquired || !NewRelicSecurity.isHookProcessingActive()){
Expand Down
7 changes: 4 additions & 3 deletions ...curity/akka-http-core-10.0/src/main/scala/akka/http/scaladsl/HttpExt_Instrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.newrelic.api.agent.security.schema.AbstractOperation;
import com.newrelic.api.agent.security.schema.SecurityMetaData;
import com.newrelic.api.agent.security.schema.StringUtils;
import com.newrelic.api.agent.security.schema.VulnerabilityCaseType;
import com.newrelic.api.agent.security.schema.exceptions.NewRelicSecurityException;
import com.newrelic.api.agent.security.schema.operation.SSRFOperation;
import com.newrelic.api.agent.security.utils.SSRFUtils;
Expand Down Expand Up @@ -65,7 +66,7 @@ public Future<Http.ServerBinding> bindAndHandleSync(
public Future<HttpResponse> singleRequest(HttpRequest httpRequest, HttpsConnectionContext connectionContext, ConnectionPoolSettings settings,
LoggingAdapter log, Materializer fm) {

boolean isLockAcquired = acquireLockIfPossible();
boolean isLockAcquired = acquireLockIfPossible(VulnerabilityCaseType.HTTP_REQUEST);
AbstractOperation operation = null;
// Preprocess Phase
if (isLockAcquired) {
Expand Down Expand Up @@ -163,9 +164,9 @@ private void releaseLock() {
}
}

private boolean acquireLockIfPossible() {
private boolean acquireLockIfPossible(VulnerabilityCaseType httpRequest) {
try {
return GenericHelper.acquireLockIfPossible(AkkaCoreUtils.NR_SEC_CUSTOM_ATTRIB_NAME, this.hashCode());
return GenericHelper.acquireLockIfPossible(httpRequest, AkkaCoreUtils.NR_SEC_CUSTOM_ATTRIB_NAME, this.hashCode());
} catch (Throwable ignored) {
}
return false;
Expand Down
3 changes: 3 additions & 0 deletions ...security/akka-http-core-2.11_10.0.11/src/main/scala/akka/http/scaladsl/AkkaCoreUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ public static boolean acquireServletLockIfPossible() {

public static void postProcessHttpRequest(Boolean isServletLockAcquired, StringBuilder responseBody, String contentType, int responseCode, String className, String methodName, Token token) {
try {
if(NewRelicSecurity.getAgent().getIastDetectionCategory().getRxssEnabled()){
return;
}
token.linkAndExpire();

if(!isServletLockAcquired || !NewRelicSecurity.isHookProcessingActive()){
Expand Down
7 changes: 4 additions & 3 deletions ...kka-http-core-2.11_10.0.11/src/main/scala/akka/http/scaladsl/HttpExt_Instrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.newrelic.api.agent.security.schema.AbstractOperation;
import com.newrelic.api.agent.security.schema.SecurityMetaData;
import com.newrelic.api.agent.security.schema.StringUtils;
import com.newrelic.api.agent.security.schema.VulnerabilityCaseType;
import com.newrelic.api.agent.security.schema.exceptions.NewRelicSecurityException;
import com.newrelic.api.agent.security.schema.operation.SSRFOperation;
import com.newrelic.api.agent.security.utils.SSRFUtils;
Expand Down Expand Up @@ -66,7 +67,7 @@ public Future<Http.ServerBinding> bindAndHandleSync(
public Future<HttpResponse> singleRequestImpl(HttpRequest httpRequest, HttpsConnectionContext connectionContext, ConnectionPoolSettings poolSettings,
LoggingAdapter loggingAdapter) {

boolean isLockAcquired = acquireLockIfPossible();
boolean isLockAcquired = acquireLockIfPossible(VulnerabilityCaseType.HTTP_REQUEST);
AbstractOperation operation = null;
// Preprocess Phase
SecurityMetaData securityMetaData = NewRelicSecurity.getAgent().getSecurityMetaData();
Expand Down Expand Up @@ -167,9 +168,9 @@ private void releaseLock() {
}
}

private boolean acquireLockIfPossible() {
private boolean acquireLockIfPossible(VulnerabilityCaseType httpRequest) {
try {
return GenericHelper.acquireLockIfPossible(AkkaCoreUtils.NR_SEC_CUSTOM_ATTRIB_NAME, this.hashCode());
return GenericHelper.acquireLockIfPossible(httpRequest, AkkaCoreUtils.NR_SEC_CUSTOM_ATTRIB_NAME, this.hashCode());
} catch (Throwable ignored) {
}
return false;
Expand Down
3 changes: 3 additions & 0 deletions ...-security/akka-http-core-2.13_10.1.8/src/main/scala/akka/http/scaladsl/AkkaCoreUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ public static boolean acquireServletLockIfPossible() {

public static void postProcessHttpRequest(Boolean isServletLockAcquired, StringBuilder responseBody, String contentType, int responseCode, String className, String methodName, Token token) {
try {
if(NewRelicSecurity.getAgent().getIastDetectionCategory().getRxssEnabled()){
return;
}
token.linkAndExpire();
if(!isServletLockAcquired || !NewRelicSecurity.isHookProcessingActive()){
return;
Expand Down
7 changes: 4 additions & 3 deletions ...akka-http-core-2.13_10.1.8/src/main/scala/akka/http/scaladsl/HttpExt_Instrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.newrelic.api.agent.security.schema.AbstractOperation;
import com.newrelic.api.agent.security.schema.SecurityMetaData;
import com.newrelic.api.agent.security.schema.StringUtils;
import com.newrelic.api.agent.security.schema.VulnerabilityCaseType;
import com.newrelic.api.agent.security.schema.exceptions.NewRelicSecurityException;
import com.newrelic.api.agent.security.schema.operation.SSRFOperation;
import com.newrelic.api.agent.security.utils.SSRFUtils;
Expand Down Expand Up @@ -66,7 +67,7 @@ public Future<Http.ServerBinding> bindAndHandleSync(
public Future<HttpResponse> singleRequestImpl(HttpRequest httpRequest, HttpsConnectionContext connectionContext, ConnectionPoolSettings poolSettings,
LoggingAdapter loggingAdapter) {

boolean isLockAcquired = acquireLockIfPossible();
boolean isLockAcquired = acquireLockIfPossible(VulnerabilityCaseType.HTTP_REQUEST);
AbstractOperation operation = null;
// Preprocess Phase
SecurityMetaData securityMetaData = NewRelicSecurity.getAgent().getSecurityMetaData();
Expand Down Expand Up @@ -167,9 +168,9 @@ private void releaseLock() {
}
}

private boolean acquireLockIfPossible() {
private boolean acquireLockIfPossible(VulnerabilityCaseType httpRequest) {
try {
return GenericHelper.acquireLockIfPossible(AkkaCoreUtils.NR_SEC_CUSTOM_ATTRIB_NAME, this.hashCode());
return GenericHelper.acquireLockIfPossible(httpRequest, AkkaCoreUtils.NR_SEC_CUSTOM_ATTRIB_NAME, this.hashCode());
} catch (Throwable ignored) {
}
return false;
Expand Down
3 changes: 3 additions & 0 deletions ...-security/akka-http-core-2.13_10.2.0/src/main/scala/akka/http/scaladsl/AkkaCoreUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ public static boolean acquireServletLockIfPossible() {

public static void postProcessHttpRequest(Boolean isServletLockAcquired, StringBuilder responseBody, String contentType, int responseCode, String className, String methodName, Token token) {
try {
if(NewRelicSecurity.getAgent().getIastDetectionCategory().getRxssEnabled()){
return;
}
token.linkAndExpire();
if(!isServletLockAcquired || !NewRelicSecurity.isHookProcessingActive()){
return;
Expand Down
7 changes: 4 additions & 3 deletions ...akka-http-core-2.13_10.2.0/src/main/scala/akka/http/scaladsl/HttpExt_Instrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import com.newrelic.api.agent.security.schema.AbstractOperation;
import com.newrelic.api.agent.security.schema.SecurityMetaData;
import com.newrelic.api.agent.security.schema.StringUtils;
import com.newrelic.api.agent.security.schema.VulnerabilityCaseType;
import com.newrelic.api.agent.security.schema.exceptions.NewRelicSecurityException;
import com.newrelic.api.agent.security.schema.operation.SSRFOperation;
import com.newrelic.api.agent.security.utils.SSRFUtils;
Expand Down Expand Up @@ -74,7 +75,7 @@ public Future<HttpResponse> singleRequest(HttpRequest httpRequest, HttpsConnecti
LoggingAdapter loggingAdapter) {
final Segment segment = NewRelic.getAgent().getTransaction().startSegment("Akka", "singleRequest");

boolean isLockAcquired = acquireLockIfPossible();
boolean isLockAcquired = acquireLockIfPossible(VulnerabilityCaseType.HTTP_REQUEST);
AbstractOperation operation = null;
// Preprocess Phase
SecurityMetaData securityMetaData = NewRelicSecurity.getAgent().getSecurityMetaData();
Expand Down Expand Up @@ -176,9 +177,9 @@ private void releaseLock() {
}
}

private boolean acquireLockIfPossible() {
private boolean acquireLockIfPossible(VulnerabilityCaseType httpRequest) {
try {
return GenericHelper.acquireLockIfPossible(AkkaCoreUtils.NR_SEC_CUSTOM_ATTRIB_NAME, this.hashCode());
return GenericHelper.acquireLockIfPossible(httpRequest, AkkaCoreUtils.NR_SEC_CUSTOM_ATTRIB_NAME, this.hashCode());
} catch (Throwable ignored) {
}
return false;
Expand Down
11 changes: 6 additions & 5 deletions ...c/main/java/org/apache/directory/ldap/client/api/LdapAsyncConnection_Instrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.newrelic.api.agent.security.instrumentation.helpers.GenericHelper;
import com.newrelic.api.agent.security.schema.AbstractOperation;
import com.newrelic.api.agent.security.schema.StringUtils;
import com.newrelic.api.agent.security.schema.VulnerabilityCaseType;
import com.newrelic.api.agent.security.schema.exceptions.NewRelicSecurityException;
import com.newrelic.api.agent.security.schema.operation.LDAPOperation;
import com.newrelic.api.agent.security.utils.logging.LogLevel;
Expand Down Expand Up @@ -61,16 +62,16 @@ private void releaseLock() {
} catch (Throwable ignored) {}
}

private boolean acquireLockIfPossible() {
private boolean acquireLockIfPossible(VulnerabilityCaseType caseType) {
try {
return GenericHelper.acquireLockIfPossible(LDAPUtils.NR_SEC_CUSTOM_ATTRIB_NAME);
return GenericHelper.acquireLockIfPossible(caseType, LDAPUtils.NR_SEC_CUSTOM_ATTRIB_NAME);
} catch (Throwable ignored) {}
return false;
}

public SearchFuture searchAsync(Dn baseDn, String filter, SearchScope scope, String... attributes )
throws LdapException {
boolean isLockAcquired = acquireLockIfPossible();
boolean isLockAcquired = acquireLockIfPossible(VulnerabilityCaseType.LDAP);
AbstractOperation operation = null;
if(isLockAcquired) {
operation = preprocessSecurityHook(baseDn.getName(), filter, LDAPUtils.METHOD_SEARCH_ASYNC);
Expand All @@ -90,7 +91,7 @@ public SearchFuture searchAsync(Dn baseDn, String filter, SearchScope scope, Str

public SearchFuture searchAsync(String baseDn, String filter, SearchScope scope, String... attributes )
throws LdapException {
boolean isLockAcquired = acquireLockIfPossible();
boolean isLockAcquired = acquireLockIfPossible(VulnerabilityCaseType.LDAP);
AbstractOperation operation = null;
if(isLockAcquired) {
operation = preprocessSecurityHook(baseDn, filter, LDAPUtils.METHOD_SEARCH_ASYNC);
Expand All @@ -109,7 +110,7 @@ public SearchFuture searchAsync(String baseDn, String filter, SearchScope scope,
}

public SearchFuture searchAsync( SearchRequest searchRequest ) throws LdapException {
boolean isLockAcquired = acquireLockIfPossible();
boolean isLockAcquired = acquireLockIfPossible(VulnerabilityCaseType.LDAP);
AbstractOperation operation = null;
if(isLockAcquired) {
operation = preprocessSecurityHook(searchRequest.getBase().getName(), searchRequest.getFilter().toString(), LDAPUtils.METHOD_SEARCH_ASYNC);
Expand Down
11 changes: 6 additions & 5 deletions ...ap/src/main/java/org/apache/directory/ldap/client/api/LdapConnection_Instrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.newrelic.api.agent.security.instrumentation.helpers.GenericHelper;
import com.newrelic.api.agent.security.schema.AbstractOperation;
import com.newrelic.api.agent.security.schema.StringUtils;
import com.newrelic.api.agent.security.schema.VulnerabilityCaseType;
import com.newrelic.api.agent.security.schema.exceptions.NewRelicSecurityException;
import com.newrelic.api.agent.security.schema.operation.LDAPOperation;
import com.newrelic.api.agent.security.utils.logging.LogLevel;
Expand Down Expand Up @@ -61,16 +62,16 @@ private void releaseLock() {
} catch (Throwable ignored) {}
}

private boolean acquireLockIfPossible() {
private boolean acquireLockIfPossible(VulnerabilityCaseType caseType) {
try {
return GenericHelper.acquireLockIfPossible(LDAPUtils.NR_SEC_CUSTOM_ATTRIB_NAME);
return GenericHelper.acquireLockIfPossible(caseType, LDAPUtils.NR_SEC_CUSTOM_ATTRIB_NAME);
} catch (Throwable ignored) {}
return false;
}

public EntryCursor search(Dn baseDn, String filter, SearchScope scope, String... attributes )
throws LdapException {
boolean isLockAcquired = acquireLockIfPossible();
boolean isLockAcquired = acquireLockIfPossible(VulnerabilityCaseType.LDAP);
AbstractOperation operation = null;
if(isLockAcquired) {
operation = preprocessSecurityHook(baseDn.getName(), filter, LDAPUtils.METHOD_SEARCH);
Expand All @@ -90,7 +91,7 @@ public EntryCursor search(Dn baseDn, String filter, SearchScope scope, String...

public EntryCursor search( String baseDn, String filter, SearchScope scope, String... attributes )
throws LdapException {
boolean isLockAcquired = acquireLockIfPossible();
boolean isLockAcquired = acquireLockIfPossible(VulnerabilityCaseType.LDAP);
AbstractOperation operation = null;
if(isLockAcquired) {
operation = preprocessSecurityHook(baseDn, filter, LDAPUtils.METHOD_SEARCH);
Expand All @@ -109,7 +110,7 @@ public EntryCursor search( String baseDn, String filter, SearchScope scope, Stri
}

public SearchCursor search(SearchRequest searchRequest ) throws LdapException {
boolean isLockAcquired = acquireLockIfPossible();
boolean isLockAcquired = acquireLockIfPossible(VulnerabilityCaseType.LDAP);
AbstractOperation operation = null;
if(isLockAcquired) {
operation = preprocessSecurityHook(searchRequest.getBase().getName(), searchRequest.getFilter().toString(), LDAPUtils.METHOD_SEARCH);
Expand Down
12 changes: 3 additions & 9 deletions ...java/com/newrelic/agent/security/instrumentation/org/asynchttpclient/AsynchttpHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.newrelic.api.agent.security.instrumentation.helpers.ServletHelper;
import com.newrelic.api.agent.security.schema.AbstractOperation;
import com.newrelic.api.agent.security.schema.StringUtils;
import com.newrelic.api.agent.security.schema.VulnerabilityCaseType;
import com.newrelic.api.agent.security.schema.exceptions.NewRelicSecurityException;
import com.newrelic.api.agent.security.schema.operation.SSRFOperation;
import com.newrelic.api.agent.security.utils.SSRFUtils;
Expand Down Expand Up @@ -36,15 +37,8 @@ public static boolean isLockAcquired() {
return false;
}

public static boolean acquireLockIfPossible() {
try {
if (NewRelicSecurity.isHookProcessingActive() &&
!isLockAcquired()) {
NewRelicSecurity.getAgent().getSecurityMetaData().addCustomAttribute(getNrSecCustomAttribName(), true);
return true;
}
} catch (Throwable ignored){}
return false;
public static boolean acquireLockIfPossible(VulnerabilityCaseType httpRequest) {
return GenericHelper.acquireLockIfPossible(httpRequest, getNrSecCustomAttribName());
}

public static void releaseLock() {
Expand Down
3 changes: 2 additions & 1 deletion ...-http-client-2.0.0/src/main/java/org/asynchttpclient/AsyncHttpClient_Instrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import com.newrelic.api.agent.security.NewRelicSecurity;
import com.newrelic.api.agent.security.instrumentation.helpers.GenericHelper;
import com.newrelic.api.agent.security.schema.AbstractOperation;
import com.newrelic.api.agent.security.schema.VulnerabilityCaseType;
import com.newrelic.api.agent.security.utils.logging.LogLevel;
import com.newrelic.api.agent.weaver.MatchType;
import com.newrelic.api.agent.weaver.Weave;
Expand All @@ -27,7 +28,7 @@ public abstract class AsyncHttpClient_Instrumentation {

public <T> ListenableFuture<T> executeRequest(Request request, AsyncHandler<T> handler) {
URI uri = null;
boolean isLockAcquired = AsynchttpHelper.acquireLockIfPossible();
boolean isLockAcquired = AsynchttpHelper.acquireLockIfPossible(VulnerabilityCaseType.HTTP_REQUEST);
AbstractOperation operation = null;
if(isLockAcquired) {
try {
Expand Down
7 changes: 4 additions & 3 deletions ...ty/camel-xpath/src/main/java/org/apache/camel/builder/BuilderSupport_Instrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.newrelic.api.agent.security.instrumentation.helpers.GenericHelper;
import com.newrelic.api.agent.security.schema.AbstractOperation;
import com.newrelic.api.agent.security.schema.StringUtils;
import com.newrelic.api.agent.security.schema.VulnerabilityCaseType;
import com.newrelic.api.agent.security.schema.exceptions.NewRelicSecurityException;
import com.newrelic.api.agent.security.schema.operation.XPathOperation;
import com.newrelic.api.agent.security.utils.logging.LogLevel;
Expand Down Expand Up @@ -56,15 +57,15 @@ private void releaseLock() {
} catch (Throwable ignored) {}
}

private boolean acquireLockIfPossible() {
private boolean acquireLockIfPossible(VulnerabilityCaseType xpath) {
try {
return GenericHelper.acquireLockIfPossible(XPATHUtils.NR_SEC_CUSTOM_ATTRIB_NAME);
return GenericHelper.acquireLockIfPossible(xpath, XPATHUtils.NR_SEC_CUSTOM_ATTRIB_NAME);
} catch (Throwable ignored) {}
return false;
}

public ValueBuilder xpath(String value, Class<?> resultType, Namespaces namespaces) {
boolean isLockAcquired = acquireLockIfPossible();
boolean isLockAcquired = acquireLockIfPossible(VulnerabilityCaseType.XPATH);
AbstractOperation operation = null;
if(isLockAcquired) {
operation = preprocessSecurityHook(value, XPATHUtils.METHOD_XPATH);
Expand Down
3 changes: 2 additions & 1 deletion ...dra-datastax-3/src/main/java/com/datastax/driver/core/SessionManager_Instrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.newrelic.api.agent.security.NewRelicSecurity;
import com.newrelic.api.agent.security.instrumentation.helpers.GenericHelper;
import com.newrelic.api.agent.security.schema.AbstractOperation;
import com.newrelic.api.agent.security.schema.VulnerabilityCaseType;
import com.newrelic.api.agent.security.utils.logging.LogLevel;
import com.newrelic.api.agent.weaver.MatchType;
import com.newrelic.api.agent.weaver.Weave;
Expand All @@ -16,7 +17,7 @@ abstract class SessionManager_Instrumentation {
abstract Configuration configuration();

public ResultSetFuture executeAsync(Statement statement) {
boolean isLockAcquired = CassandraUtils.acquireLockIfPossible(statement.hashCode());
boolean isLockAcquired = CassandraUtils.acquireLockIfPossible(VulnerabilityCaseType.NOSQL_DB_COMMAND, statement.hashCode());
ResultSetFuture result = null;
AbstractOperation cqlOperation = null;

Expand Down
4 changes: 2 additions & 2 deletions ...ra-datastax-3/src/main/java/com/datastax/driver/core/SimpleStatement_Instrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
public abstract class SimpleStatement_Instrumentation {

public SimpleStatement_Instrumentation(String query, Object... values) {
boolean isLockAcquired = CassandraUtils.acquireLockIfPossible(hashCode());
boolean isLockAcquired = CassandraUtils.acquireLockIfPossible(VulnerabilityCaseType.NOSQL_DB_COMMAND, hashCode());

try{
if(isLockAcquired){
Expand All @@ -41,7 +41,7 @@ public SimpleStatement_Instrumentation(String query, Object... values) {
}

public SimpleStatement_Instrumentation(String query, Map<String, Object> values){
boolean isLockAcquired = CassandraUtils.acquireLockIfPossible(hashCode());
boolean isLockAcquired = CassandraUtils.acquireLockIfPossible(VulnerabilityCaseType.NOSQL_DB_COMMAND, hashCode());

try{
if(isLockAcquired){
Expand Down
Loading
Loading