Skip to content

Commit 00a81bb

Browse files
manuel-alvarez-alvarezmanuel-alvarez-alvarez
authored
Refactor of the PropagationModule and removal of WebModule (DataDog#6033)
1 parent a012761 commit 00a81bb

213 files changed

Lines changed: 2252 additions & 2097 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderAppendBenchmark.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.datadog.iast.propagation;
22

3-
import static com.datadog.iast.model.Range.NOT_MARKED;
3+
import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED;
44

55
import com.datadog.iast.IastRequestContext;
66
import com.datadog.iast.model.Range;

‎dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderBatchBenchmark.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.datadog.iast.propagation;
22

3+
import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED;
34
import static java.util.concurrent.TimeUnit.MICROSECONDS;
45

56
import com.datadog.iast.IastRequestContext;
@@ -34,8 +35,7 @@ protected StringBuilderBatchBenchmark.Context initializeContext() {
3435
final String value;
3536
if (current < limit) {
3637
value =
37-
tainted(
38-
context, UUID.randomUUID().toString(), new Range(3, 6, source(), Range.NOT_MARKED));
38+
tainted(context, UUID.randomUUID().toString(), new Range(3, 6, source(), NOT_MARKED));
3939
} else {
4040
value = notTainted(UUID.randomUUID().toString());
4141
}

‎dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderInitBenchmark.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.datadog.iast.propagation;
22

3+
import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED;
4+
35
import com.datadog.iast.IastRequestContext;
46
import com.datadog.iast.model.Range;
57
import datadog.trace.instrumentation.java.lang.StringBuilderCallSite;
@@ -14,7 +16,7 @@ protected Context initializeContext() {
1416
final IastRequestContext context = new IastRequestContext();
1517
final String notTainted = notTainted("I am not a tainted string");
1618
final String tainted =
17-
tainted(context, "I am a tainted string", new Range(3, 6, source(), Range.NOT_MARKED));
19+
tainted(context, "I am a tainted string", new Range(3, 6, source(), NOT_MARKED));
1820
return new Context(context, notTainted, tainted);
1921
}
2022

‎dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderToStringBenchmark.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.datadog.iast.propagation;
22

3+
import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED;
4+
35
import com.datadog.iast.IastRequestContext;
46
import com.datadog.iast.model.Range;
57
import datadog.trace.instrumentation.java.lang.StringBuilderCallSite;
@@ -18,7 +20,7 @@ protected Context initializeContext() {
1820
tainted(
1921
context,
2022
new StringBuilder("I am a tainted string builder"),
21-
new Range(5, 7, source(), Range.NOT_MARKED));
23+
new Range(5, 7, source(), NOT_MARKED));
2224
return new Context(context, notTaintedBuilder, taintedBuilder);
2325
}
2426

‎dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringConcatBenchmark.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.datadog.iast.propagation;
22

3+
import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED;
4+
35
import com.datadog.iast.IastRequestContext;
46
import com.datadog.iast.model.Range;
57
import datadog.trace.instrumentation.java.lang.StringCallSite;
@@ -13,7 +15,7 @@ protected StringConcatBenchmark.Context initializeContext() {
1315
final IastRequestContext context = new IastRequestContext();
1416
final String notTainted = notTainted("I am not a tainted string");
1517
final String tainted =
16-
tainted(context, "I am a tainted string", new Range(3, 5, source(), Range.NOT_MARKED));
18+
tainted(context, "I am a tainted string", new Range(3, 5, source(), NOT_MARKED));
1719
return new StringConcatBenchmark.Context(context, notTainted, tainted);
1820
}
1921

‎dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringConcatFactoryBatchBenchmark.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.datadog.iast.propagation;
22

3+
import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED;
34
import static java.util.concurrent.TimeUnit.MICROSECONDS;
45

56
import com.datadog.iast.IastRequestContext;
@@ -54,7 +55,7 @@ protected StringConcatFactoryBatchBenchmark.Context initializeContext() {
5455
double current = i / (double) stringCount;
5556
final String value;
5657
if (current < limit) {
57-
value = tainted(context, "Yep, tainted", new Range(3, 5, source(), Range.NOT_MARKED));
58+
value = tainted(context, "Yep, tainted", new Range(3, 5, source(), NOT_MARKED));
5859
} else {
5960
value = notTainted("Nop, tainted");
6061
}

‎dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringConcatFactoryBenchmark.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.datadog.iast.propagation;
22

3+
import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED;
4+
35
import com.datadog.iast.IastRequestContext;
46
import com.datadog.iast.model.Range;
57
import datadog.trace.api.iast.InstrumentationBridge;
@@ -13,8 +15,7 @@ public class StringConcatFactoryBenchmark
1315
protected StringConcatFactoryBenchmark.Context initializeContext() {
1416
final IastRequestContext context = new IastRequestContext();
1517
final String notTainted = notTainted("Nop, tainted");
16-
final String tainted =
17-
tainted(context, "Yep, tainted", new Range(3, 5, source(), Range.NOT_MARKED));
18+
final String tainted = tainted(context, "Yep, tainted", new Range(3, 5, source(), NOT_MARKED));
1819
return new StringConcatFactoryBenchmark.Context(context, notTainted, tainted);
1920
}
2021

‎dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringJoinBenchmark.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.datadog.iast.propagation;
22

3-
import static com.datadog.iast.model.Range.NOT_MARKED;
3+
import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED;
44

55
import com.datadog.iast.IastRequestContext;
66
import com.datadog.iast.model.Range;

‎dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringSubsequenceBenchmark.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.datadog.iast.propagation;
22

3-
import static com.datadog.iast.model.Range.NOT_MARKED;
3+
import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED;
44

55
import com.datadog.iast.IastRequestContext;
66
import com.datadog.iast.model.Range;

‎dd-java-agent/agent-iast/src/main/java/com/datadog/iast/GrpcRequestMessageHandler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import datadog.trace.api.gateway.Flow;
44
import datadog.trace.api.gateway.RequestContext;
5-
import datadog.trace.api.gateway.RequestContextSlot;
5+
import datadog.trace.api.iast.IastContext;
66
import datadog.trace.api.iast.InstrumentationBridge;
77
import datadog.trace.api.iast.SourceTypes;
88
import datadog.trace.api.iast.propagation.PropagationModule;
@@ -29,9 +29,9 @@ public class GrpcRequestMessageHandler implements BiFunction<RequestContext, Obj
2929
public Flow<Void> apply(final RequestContext ctx, final Object o) {
3030
final PropagationModule module = InstrumentationBridge.PROPAGATION;
3131
if (module != null && o != null) {
32-
final IastRequestContext iastCtx = ctx.getData(RequestContextSlot.IAST);
32+
final IastContext iastCtx = IastContext.Provider.get(ctx);
3333
module.taintDeeply(
34-
iastCtx, SourceTypes.GRPC_BODY, o, GrpcRequestMessageHandler::isProtobufArtifact);
34+
iastCtx, o, SourceTypes.GRPC_BODY, GrpcRequestMessageHandler::isProtobufArtifact);
3535
}
3636
return Flow.ResultFlow.empty();
3737
}

0 commit comments

Comments
 (0)