Skip to content

Commit 7ee59e4

Browse files
manuel-alvarez-alvarezmanuel-alvarez-alvarez
committed
Refactor propagation module method names
1 parent 3293d86 commit 7ee59e4

190 files changed

Lines changed: 847 additions & 798 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-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/iast/NamedContext.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public NamedContextImpl(@Nonnull final PropagationModule module, @Nonnull final
6464

6565
@Override
6666
public void taintValue(@Nullable final String value) {
67-
module.taint(iastCtx(), value, source.getOrigin(), currentName, source.getValue());
67+
module.taintString(iastCtx(), value, source.getOrigin(), currentName, source.getValue());
6868
}
6969

7070
@Override
@@ -74,7 +74,7 @@ public void taintName(@Nullable final String name) {
7474
// prevent tainting the same name more than once
7575
if (currentName != name) {
7676
currentName = name;
77-
module.taint(iastCtx(), name, source.getOrigin(), name, source.getValue());
77+
module.taintString(iastCtx(), name, source.getOrigin(), name, source.getValue());
7878
}
7979
}
8080

‎dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/iast/NamedContextTest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class NamedContextTest extends DDSpecification {
3838
context.taintName(name)
3939

4040
then:
41-
1 * module.taint(_, name, source.origin, name, source.value)
41+
1 * module.taintString(_, name, source.origin, name, source.value)
4242

4343
when:
4444
context.taintName(name)
@@ -50,7 +50,7 @@ class NamedContextTest extends DDSpecification {
5050
context.taintValue(value)
5151

5252
then:
53-
1 * module.taint(_, value, source.origin, name, source.value)
53+
1 * module.taintString(_, value, source.origin, name, source.value)
5454
0 * _
5555
}
5656

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ public Flow<Void> apply(final RequestContext ctx, final Object o) {
3535
final IastContext iastCtx = ctx.getData(RequestContextSlot.IAST);
3636
final byte source = SourceTypes.GRPC_BODY;
3737
final int tainted =
38-
module.taintDeeply(iastCtx, o, source, GrpcRequestMessageHandler::isProtobufArtifact);
38+
module.taintObjectDeeply(
39+
iastCtx, o, source, GrpcRequestMessageHandler::isProtobufArtifact);
3940
if (tainted > 0) {
4041
IastMetricCollector.add(IastMetric.EXECUTED_SOURCE, source, tainted, iastCtx);
4142
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class FastCodecModule extends PropagationModuleImpl implements CodecModul
1111
@Override
1212
public void onUrlDecode(
1313
@Nonnull final String value, @Nullable final String encoding, @Nonnull final String result) {
14-
taintIfTainted(result, value);
14+
taintStringIfTainted(result, value);
1515
}
1616

1717
@Override
@@ -22,22 +22,22 @@ public void onStringFromBytes(
2222
@Nullable final String charset,
2323
@Nonnull final String result) {
2424
// create a new range shifted to the result string coordinates
25-
taintIfTainted(result, value, offset, length, false, NOT_MARKED);
25+
taintStringIfRangeTainted(result, value, offset, length, false, NOT_MARKED);
2626
}
2727

2828
@Override
2929
public void onStringGetBytes(
3030
@Nonnull final String value, @Nullable final String charset, @Nonnull final byte[] result) {
31-
taintIfTainted(result, value);
31+
taintObjectIfTainted(result, value);
3232
}
3333

3434
@Override
3535
public void onBase64Encode(@Nullable byte[] value, @Nullable byte[] result) {
36-
taintIfTainted(result, value);
36+
taintObjectIfTainted(result, value);
3737
}
3838

3939
@Override
4040
public void onBase64Decode(@Nullable byte[] value, @Nullable byte[] result) {
41-
taintIfTainted(result, value);
41+
taintObjectIfTainted(result, value);
4242
}
4343
}

0 commit comments

Comments
 (0)