Skip to content

DO NOT MERGE! SA performance and usage data metric reporting #280

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

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

DO NOT MERGE! SA performance and usage data metric reporting #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
46f8b7c
Support for microservices security, pipeline changes
lovesh-ap May 8, 2024
11f6641
push CC in error when response of rest client is 4xx
lovesh-ap May 8, 2024
4b2e995
Support for micro service arch in GRPC architecture
lovesh-ap May 17, 2024
c3867d4
Merge branch 'refs/heads/feature/micro-service-arch-grpc' into featur…
lovesh-ap Jun 13, 2024
c6f95ef
resolve merge conflicts
lovesh-ap Jun 13, 2024
58ee907
Add metric reporting for iast request replay
lovesh-ap Jun 13, 2024
bf305ec
Reset health check schedule to 5mins
lovesh-ap Jun 19, 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
2 changes: 1 addition & 1 deletion 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.0
jsonVersion=1.2.1
jsonVersion=2.0.0
# Updated exposed NR APM API version.
nrAPIVersion=8.4.0

Expand Down
17 changes: 4 additions & 13 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 @@ -9,6 +9,7 @@
import com.newrelic.api.agent.security.instrumentation.helpers.LowSeverityHelper;
import com.newrelic.api.agent.security.instrumentation.helpers.ServletHelper;
import com.newrelic.api.agent.security.schema.AgentMetaData;
import com.newrelic.api.agent.security.schema.RequestCategory;
import com.newrelic.api.agent.security.schema.SecurityMetaData;
import com.newrelic.api.agent.security.schema.StringUtils;
import com.newrelic.api.agent.security.schema.exceptions.NewRelicSecurityException;
Expand All @@ -17,7 +18,6 @@
import com.newrelic.api.agent.security.utils.logging.LogLevel;

import java.util.Iterator;
import java.util.Map;
import java.util.NoSuchElementException;

public class AkkaCoreUtils {
Expand Down Expand Up @@ -115,7 +115,9 @@ public static void preProcessHttpRequest (Boolean isServletLockAcquired, HttpReq

processHttpRequestHeader(httpRequest, securityRequest);

securityMetaData.setTracingHeaderValue(getTraceHeader(securityRequest.getHeaders()));
securityMetaData.setTracingHeaderValue(ServletHelper.getTraceHeader(securityRequest.getHeaders()));

NewRelicSecurity.getAgent().setEmptyIastDataRequestEntry(ServletHelper.iastDataRequestAddEmptyEntry(securityMetaData.getFuzzRequestIdentifier(), securityMetaData.getTracingHeaderValue(), securityMetaData.getCustomAttribute(GenericHelper.CSEC_PARENT_ID, String.class)), RequestCategory.HTTP);

securityRequest.setProtocol(getProtocol(httpRequest.protocol().value()));

Expand Down Expand Up @@ -146,17 +148,6 @@ public static void preProcessHttpRequest (Boolean isServletLockAcquired, HttpReq
}
}

public static String getTraceHeader(Map<String, String> headers) {
String data = EMPTY;
if (headers.containsKey(ServletHelper.CSEC_DISTRIBUTED_TRACING_HEADER) || headers.containsKey(ServletHelper.CSEC_DISTRIBUTED_TRACING_HEADER.toLowerCase())) {
data = headers.get(ServletHelper.CSEC_DISTRIBUTED_TRACING_HEADER);
if (data == null || data.trim().isEmpty()) {
data = headers.get(ServletHelper.CSEC_DISTRIBUTED_TRACING_HEADER.toLowerCase());
}
}
return data;
}

public static void processHttpRequestHeader(HttpRequest request, com.newrelic.api.agent.security.schema.HttpRequest securityRequest){
Iterator<HttpHeader> headers = request.getHeaders().iterator();
while (headers.hasNext()) {
Expand Down
17 changes: 5 additions & 12 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 @@ -9,6 +9,7 @@
import com.newrelic.api.agent.security.instrumentation.helpers.LowSeverityHelper;
import com.newrelic.api.agent.security.instrumentation.helpers.ServletHelper;
import com.newrelic.api.agent.security.schema.AgentMetaData;
import com.newrelic.api.agent.security.schema.RequestCategory;
import com.newrelic.api.agent.security.schema.SecurityMetaData;
import com.newrelic.api.agent.security.schema.StringUtils;
import com.newrelic.api.agent.security.schema.exceptions.NewRelicSecurityException;
Expand Down Expand Up @@ -119,7 +120,10 @@ public static void preProcessHttpRequest (Boolean isServletLockAcquired, HttpReq

processHttpRequestHeader(httpRequest, securityRequest);

securityMetaData.setTracingHeaderValue(getTraceHeader(securityRequest.getHeaders()));
securityMetaData.setTracingHeaderValue(ServletHelper.getTraceHeader(securityRequest.getHeaders()));

NewRelicSecurity.getAgent().setEmptyIastDataRequestEntry(ServletHelper.iastDataRequestAddEmptyEntry(securityMetaData.getFuzzRequestIdentifier(), securityMetaData.getTracingHeaderValue(),
securityMetaData.getCustomAttribute(GenericHelper.CSEC_PARENT_ID, String.class)), RequestCategory.HTTP);

securityRequest.setProtocol(getProtocol(httpRequest.protocol().value()));

Expand Down Expand Up @@ -149,17 +153,6 @@ public static void preProcessHttpRequest (Boolean isServletLockAcquired, HttpReq
}
}

public static String getTraceHeader(Map<String, String> headers) {
String data = EMPTY;
if (headers.containsKey(ServletHelper.CSEC_DISTRIBUTED_TRACING_HEADER) || headers.containsKey(ServletHelper.CSEC_DISTRIBUTED_TRACING_HEADER.toLowerCase())) {
data = headers.get(ServletHelper.CSEC_DISTRIBUTED_TRACING_HEADER);
if (data == null || data.trim().isEmpty()) {
data = headers.get(ServletHelper.CSEC_DISTRIBUTED_TRACING_HEADER.toLowerCase());
}
}
return data;
}

public static void processHttpRequestHeader(HttpRequest request, com.newrelic.api.agent.security.schema.HttpRequest securityRequest){
Iterator<HttpHeader> headers = request.getHeaders().iterator();
while (headers.hasNext()) {
Expand Down
16 changes: 4 additions & 12 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 @@ -9,6 +9,7 @@
import com.newrelic.api.agent.security.instrumentation.helpers.LowSeverityHelper;
import com.newrelic.api.agent.security.instrumentation.helpers.ServletHelper;
import com.newrelic.api.agent.security.schema.AgentMetaData;
import com.newrelic.api.agent.security.schema.RequestCategory;
import com.newrelic.api.agent.security.schema.SecurityMetaData;
import com.newrelic.api.agent.security.schema.StringUtils;
import com.newrelic.api.agent.security.schema.exceptions.NewRelicSecurityException;
Expand Down Expand Up @@ -119,7 +120,9 @@ public static void preProcessHttpRequest (Boolean isServletLockAcquired, HttpReq

processHttpRequestHeader(httpRequest, securityRequest);

securityMetaData.setTracingHeaderValue(getTraceHeader(securityRequest.getHeaders()));
securityMetaData.setTracingHeaderValue(ServletHelper.getTraceHeader(securityRequest.getHeaders()));

NewRelicSecurity.getAgent().setEmptyIastDataRequestEntry(ServletHelper.iastDataRequestAddEmptyEntry(securityMetaData.getFuzzRequestIdentifier(), securityMetaData.getTracingHeaderValue(), securityMetaData.getCustomAttribute(GenericHelper.CSEC_PARENT_ID, String.class)), RequestCategory.HTTP);

securityRequest.setProtocol(getProtocol(httpRequest.protocol().value()));

Expand Down Expand Up @@ -149,17 +152,6 @@ public static void preProcessHttpRequest (Boolean isServletLockAcquired, HttpReq
}
}

public static String getTraceHeader(Map<String, String> headers) {
String data = EMPTY;
if (headers.containsKey(ServletHelper.CSEC_DISTRIBUTED_TRACING_HEADER) || headers.containsKey(ServletHelper.CSEC_DISTRIBUTED_TRACING_HEADER.toLowerCase())) {
data = headers.get(ServletHelper.CSEC_DISTRIBUTED_TRACING_HEADER);
if (data == null || data.trim().isEmpty()) {
data = headers.get(ServletHelper.CSEC_DISTRIBUTED_TRACING_HEADER.toLowerCase());
}
}
return data;
}

public static void processHttpRequestHeader(HttpRequest request, com.newrelic.api.agent.security.schema.HttpRequest securityRequest){
Iterator<HttpHeader> headers = request.getHeaders().iterator();
while (headers.hasNext()) {
Expand Down
17 changes: 4 additions & 13 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
@@ -1,6 +1,5 @@
package akka.http.scaladsl;

import akka.Done;
import akka.http.javadsl.model.HttpHeader;
import akka.http.scaladsl.model.HttpRequest;
import com.newrelic.api.agent.Token;
Expand All @@ -10,6 +9,7 @@
import com.newrelic.api.agent.security.instrumentation.helpers.LowSeverityHelper;
import com.newrelic.api.agent.security.instrumentation.helpers.ServletHelper;
import com.newrelic.api.agent.security.schema.AgentMetaData;
import com.newrelic.api.agent.security.schema.RequestCategory;
import com.newrelic.api.agent.security.schema.SecurityMetaData;
import com.newrelic.api.agent.security.schema.StringUtils;
import com.newrelic.api.agent.security.schema.exceptions.NewRelicSecurityException;
Expand Down Expand Up @@ -119,7 +119,9 @@ public static void preProcessHttpRequest (Boolean isServletLockAcquired, HttpReq

processHttpRequestHeader(httpRequest, securityRequest);

securityMetaData.setTracingHeaderValue(getTraceHeader(securityRequest.getHeaders()));
securityMetaData.setTracingHeaderValue(ServletHelper.getTraceHeader(securityRequest.getHeaders()));

NewRelicSecurity.getAgent().setEmptyIastDataRequestEntry(ServletHelper.iastDataRequestAddEmptyEntry(securityMetaData.getFuzzRequestIdentifier(), securityMetaData.getTracingHeaderValue(), securityMetaData.getCustomAttribute(GenericHelper.CSEC_PARENT_ID, String.class)), RequestCategory.HTTP);

securityRequest.setProtocol(getProtocol(httpRequest.protocol().value()));

Expand Down Expand Up @@ -159,17 +161,6 @@ private static String getProtocol(String value) {
}
}

public static String getTraceHeader(Map<String, String> headers) {
String data = EMPTY;
if (headers.containsKey(ServletHelper.CSEC_DISTRIBUTED_TRACING_HEADER) || headers.containsKey(ServletHelper.CSEC_DISTRIBUTED_TRACING_HEADER.toLowerCase())) {
data = headers.get(ServletHelper.CSEC_DISTRIBUTED_TRACING_HEADER);
if (data == null || data.trim().isEmpty()) {
data = headers.get(ServletHelper.CSEC_DISTRIBUTED_TRACING_HEADER.toLowerCase());
}
}
return data;
}

public static void processHttpRequestHeader(HttpRequest request, com.newrelic.api.agent.security.schema.HttpRequest securityRequest){
Iterator<HttpHeader> headers = request.getHeaders().iterator();
while (headers.hasNext()) {
Expand Down
16 changes: 4 additions & 12 deletions ...0/src/main/java/com/newrelic/agent/security/instrumentation/grpc1220/GrpcServerUtils.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.*;
import com.newrelic.api.agent.security.schema.AgentMetaData;
import com.newrelic.api.agent.security.schema.HttpRequest;
import com.newrelic.api.agent.security.schema.RequestCategory;
import com.newrelic.api.agent.security.schema.SecurityMetaData;
import com.newrelic.api.agent.security.schema.exceptions.NewRelicSecurityException;
import com.newrelic.api.agent.security.schema.operation.RXSSOperation;
Expand Down Expand Up @@ -67,7 +68,9 @@ public static <ReqT, ResT> void preprocessSecurityHook(ServerStream_Instrumentat

processGRPCRequestMetadata(meta, securityRequest);

securityMetaData.setTracingHeaderValue(getTraceHeader(securityRequest.getHeaders()));
securityMetaData.setTracingHeaderValue(ServletHelper.getTraceHeader(securityRequest.getHeaders()));

NewRelicSecurity.getAgent().setEmptyIastDataRequestEntry(ServletHelper.iastDataRequestAddEmptyEntry(securityMetaData.getFuzzRequestIdentifier(), securityMetaData.getTracingHeaderValue(), securityMetaData.getCustomAttribute(GenericHelper.CSEC_PARENT_ID, String.class)), RequestCategory.GRPC);

if (call.getAttributes().get(Grpc.TRANSPORT_ATTR_SSL_SESSION) != null) {
securityRequest.setProtocol("https");
Expand Down Expand Up @@ -157,17 +160,6 @@ private static boolean isLockAcquired(String nrSecCustomAttrName) {
return false;
}

public static String getTraceHeader(Map<String, String> headers) {
String data = EMPTY;
if (headers.containsKey(ServletHelper.CSEC_DISTRIBUTED_TRACING_HEADER) || headers.containsKey(ServletHelper.CSEC_DISTRIBUTED_TRACING_HEADER.toLowerCase())) {
data = headers.get(ServletHelper.CSEC_DISTRIBUTED_TRACING_HEADER);
if (data == null || data.trim().isEmpty()) {
data = headers.get(ServletHelper.CSEC_DISTRIBUTED_TRACING_HEADER.toLowerCase());
}
}
return data;
}

public static void processGRPCRequestMetadata(Metadata metadata, HttpRequest securityRequest) {
Set<String> headerNames = metadata.keys();
for (String headerKey : headerNames) {
Expand Down
14 changes: 12 additions & 2 deletions ...src/main/java/com/newrelic/agent/security/instrumentation/grpc1220/client/GrpcClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.google.protobuf.Message;
import com.google.protobuf.util.JsonFormat;
import com.newrelic.agent.security.instrumentation.grpc1220.GrpcServerUtils;
import com.newrelic.agent.security.instrumentation.grpc1220.processor.GrpcRequestProcessor;
import com.newrelic.api.agent.security.NewRelicSecurity;
import com.newrelic.api.agent.security.instrumentation.helpers.GrpcHelper;
import com.newrelic.api.agent.security.schema.ControlCommandDto;
Expand Down Expand Up @@ -55,7 +56,9 @@ protected ManagedChannel initialValue() {
}
};

public Object fireRequest(ControlCommandDto controlCommandDto, int repeatCount) {
public Object fireRequest(GrpcRequestProcessor grpcRequestProcessor) {
ControlCommandDto controlCommandDto = grpcRequestProcessor.getControlCommandDto();
int repeatCount = grpcRequestProcessor.getRepeatCount();
try {
FuzzRequestBean requestBean = controlCommandDto.getRequestBean();
List<String> payloads = controlCommandDto.getRequestPayloads();
Expand All @@ -82,13 +85,20 @@ public Object fireRequest(ControlCommandDto controlCommandDto, int repeatCount)
isSuccess = customBiDiStream(channel, requestBean, payloads);
break;
}
grpcRequestProcessor.setSuccessful(true);

return isSuccess;
} catch (InterruptedException e) {
grpcRequestProcessor.setExceptionRaised(true);
grpcRequestProcessor.setError(e);

if (repeatCount >= 0) {
return fireRequest(controlCommandDto, --repeatCount);
return fireRequest(grpcRequestProcessor);
}
return false;
} catch (Throwable e) {
grpcRequestProcessor.setExceptionRaised(true);
grpcRequestProcessor.setError(e);
return e;
}
}
Expand Down
74 changes: 50 additions & 24 deletions .../com/newrelic/agent/security/instrumentation/grpc1220/processor/GrpcRequestProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,54 +1,80 @@
package com.newrelic.agent.security.instrumentation.grpc1220.processor;

import com.newrelic.agent.security.instrumentation.grpc1220.client.GrpcClient;
import com.newrelic.api.agent.security.NewRelicSecurity;
import com.newrelic.api.agent.security.instrumentation.helpers.GrpcClientRequestReplayHelper;
import com.newrelic.api.agent.security.schema.ControlCommandDto;
import com.newrelic.api.agent.security.utils.logging.LogLevel;

import java.util.concurrent.Callable;
import java.util.concurrent.Future;

public class GrpcRequestProcessor implements Callable<Object> {
public static final String CALL_FAILED_REQUEST_S_REASON = "Call failed : request %s reason : %s ";
private ControlCommandDto controlCommandDto;
private int repeatCount;
private static final int MAX_REPETITION = 3;

private boolean isSuccessful = false;

private int responseCode;

private boolean exceptionRaised = false;

private Throwable error;

public GrpcRequestProcessor(ControlCommandDto controlCommandDto, int repeatCount) {
this.controlCommandDto = controlCommandDto;
this.repeatCount = repeatCount;
}

@Override
public Object call() throws Exception {
return GrpcClient.getInstance().fireRequest(controlCommandDto, repeatCount);
return GrpcClient.getInstance().fireRequest(this);
}

public static void executeGrpcRequest(ControlCommandDto controlCommandDto) {
Future<Object> future = GrpcRequestThreadPool.getInstance().executor
GrpcRequestThreadPool.getInstance().executor
.submit(new GrpcRequestProcessor(controlCommandDto, MAX_REPETITION));
try {
Object futureResult = future.get();
if (futureResult instanceof Throwable) {
NewRelicSecurity.getAgent().log(LogLevel.FINER, String.format(CALL_FAILED_REQUEST_S_REASON, controlCommandDto.getRequestBean(), ((Throwable) futureResult).getMessage()), (Throwable) futureResult, GrpcClient.class.getName());
NewRelicSecurity.getAgent().reportIncident(LogLevel.WARNING,
String.format(CALL_FAILED_REQUEST_S_REASON, controlCommandDto.getId(), ((Throwable) futureResult).getMessage()),
(Throwable) futureResult, GrpcClient.class.getName());
GrpcClientRequestReplayHelper.getInstance().addFuzzFailEventToQueue(controlCommandDto.getRequestBean(), (Throwable) futureResult);
} else {
GrpcClientRequestReplayHelper.getInstance().getPendingIds().remove(controlCommandDto.getId());
}
} catch (Throwable e) {
NewRelicSecurity.getAgent().log(LogLevel.SEVERE, String.format(CALL_FAILED_REQUEST_S_REASON, controlCommandDto.getRequestBean(), e.getMessage()), e, GrpcRequestProcessor.class.getName());
NewRelicSecurity.getAgent().reportIncident(LogLevel.SEVERE,
String.format(CALL_FAILED_REQUEST_S_REASON, controlCommandDto.getId(), e.getMessage()),
e, GrpcRequestProcessor.class.getName());
GrpcClientRequestReplayHelper.getInstance().addFuzzFailEventToQueue(controlCommandDto.getRequestBean(), e);
}
}

public ControlCommandDto getPartialControlCommand() {
return controlCommandDto;
}

public boolean isSuccessful() {
return isSuccessful;
}

public void setSuccessful(boolean successful) {
isSuccessful = successful;
}

public int getResponseCode() {
return responseCode;
}

public void setResponseCode(int responseCode) {
this.responseCode = responseCode;
}

public boolean isExceptionRaised() {
return exceptionRaised;
}

public void setExceptionRaised(boolean exceptionRaised) {
this.exceptionRaised = exceptionRaised;
}

public Throwable getError() {
return error;
}

public void setError(Throwable error) {
this.error = error;
}

public ControlCommandDto getControlCommandDto() {
return controlCommandDto;
}

public int getRepeatCount() {
return repeatCount;
}
}
Loading
Loading