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

Jump to bottom

Add name in sources for vertx 4 header names and param values #6114

Merged
merged 1 commit into from
Oct 30, 2023
Merged

Add name in sources for vertx 4 header names and param values #6114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 ...0/src/main/java/datadog/trace/instrumentation/vertx_4_0/core/MultiMapInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public static void afterEntries(
final String name = entry.getKey();
final String value = entry.getValue();
if (keys.add(name)) {
propagation.taint(ctx, name, nameOrigin);
propagation.taint(ctx, name, nameOrigin, name);
}
propagation.taint(ctx, value, source.getOrigin(), name);
}
Expand All @@ -141,7 +141,7 @@ public static void afterNames(
final IastContext ctx = IastContext.Provider.get();
final byte nameOrigin = namedSource(source.getOrigin());
for (final String name : result) {
propagation.taint(ctx, name, nameOrigin);
propagation.taint(ctx, name, nameOrigin, name);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...ent/instrumentation/vertx-web-4.0/src/test/groovy/core/MultiMapInstrumentationTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class MultiMapInstrumentationTest extends AgentTestRunner {

then:
1 * module.findSource(instance) >> { mockedSource(origin) }
1 * module.taint(_, 'key', namedSource(origin))
1 * module.taint(_, 'key', namedSource(origin), 'key')

where:
instance << multiMaps()
Expand All @@ -122,7 +122,7 @@ class MultiMapInstrumentationTest extends AgentTestRunner {

then:
1 * module.findSource(instance) >> { mockedSource(origin) }
1 * module.taint(_, 'key', namedSource(origin))
1 * module.taint(_, 'key', namedSource(origin), 'key')
1 * module.taint(_, 'value1', origin, 'key')
1 * module.taint(_, 'value2', origin, 'key')

Expand Down
41 changes: 41 additions & 0 deletions ...sts/iast-util/src/testFixtures/groovy/datadog/smoketest/AbstractIastVertxSmokeTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import spock.lang.IgnoreIf
@CompileDynamic
abstract class AbstractIastVertxSmokeTest extends AbstractIastServerSmokeTest {

private static final MediaType FORM = MediaType.get('application/x-www-form-urlencoded')

void 'test header source'() {
setup:
final url = "http://localhost:${httpPort}/header"
Expand Down Expand Up @@ -43,6 +45,23 @@ abstract class AbstractIastVertxSmokeTest extends AbstractIastServerSmokeTest {
}
}

void 'test header names list source'() {
setup:
final url = "http://localhost:${httpPort}/headernames"
final request = new Request.Builder().url(url).header('header', 'headerValues').get().build()

when:
client.newCall(request).execute()

then:
hasTainted { tainted ->
tainted.value == 'header' &&
tainted.ranges[0].source.name == 'header' &&
tainted.ranges[0].source.value == 'header' &&
tainted.ranges[0].source.origin == 'http.request.header.name'
}
}

void 'test parameter source'() {
setup:
final url = "http://localhost:${httpPort}/param?param=paramValue"
Expand Down Expand Up @@ -75,6 +94,28 @@ abstract class AbstractIastVertxSmokeTest extends AbstractIastServerSmokeTest {
}
}

void 'test parameter names list source'() {
setup:
final request = builder.call("http://localhost:${httpPort}/paramnames")
final name = params.split('=')[0]

when:
client.newCall(request).execute()

then:
hasTainted { tainted ->
tainted.value == name &&
tainted.ranges[0].source.name == name &&
tainted.ranges[0].source.value == name &&
tainted.ranges[0].source.origin == 'http.request.parameter.name'
}

where:
params | builder
'postparam=value' | { String url -> new Request.Builder().url(url).post(RequestBody.create(FORM, params)).build() }
'getparam=value' | { String url -> new Request.Builder().url("$url?$params").get().build() }
}

void 'test form source'() {
setup:
final url = "http://localhost:${httpPort}/form_attribute"
Expand Down
15 changes: 15 additions & 0 deletions ...ke-tests/vertx-3.4/application/src/main/java/datadog/smoketest/vertx_3_4/IastHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import io.vertx.ext.web.Cookie;
import io.vertx.ext.web.RoutingContext;
import java.util.Arrays;
import java.util.Collection;
import java.util.Optional;
import java.util.Vector;

Expand All @@ -26,6 +27,13 @@ public void handle(final RoutingContext rc) {
rc.response().end("Received " + value.get("header"));
}
},
HEADER_NAMES("/headernames") {
@Override
public void handle(final RoutingContext rc) {
final Collection<String> names = rc.request().headers().names();
rc.response().end("Received " + String.join(",", names));
}
},
PARAM("/param") {
@Override
public void handle(final RoutingContext rc) {
Expand All @@ -40,6 +48,13 @@ public void handle(final RoutingContext rc) {
rc.response().end("Received " + value.get("param"));
}
},
PARAM_NAMES("/paramnames") {
@Override
public void handle(final RoutingContext rc) {
final Collection<String> names = rc.request().params().names();
rc.response().end("Received " + String.join(",", names));
}
},
FORM_ATTRIBUTE("/form_attribute") {
@Override
public void handle(final RoutingContext rc) {
Expand Down
15 changes: 15 additions & 0 deletions ...ke-tests/vertx-3.9/application/src/main/java/datadog/smoketest/vertx_3_9/IastHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import io.vertx.core.json.JsonObject;
import io.vertx.ext.web.RoutingContext;
import java.util.Arrays;
import java.util.Collection;
import java.util.Optional;
import java.util.Vector;

Expand All @@ -27,6 +28,13 @@ public void handle(final RoutingContext rc) {
rc.response().end("Received " + value.get("header"));
}
},
HEADER_NAMES("/headernames") {
@Override
public void handle(final RoutingContext rc) {
final Collection<String> names = rc.request().headers().names();
rc.response().end("Received " + String.join(",", names));
}
},
PARAM("/param") {
@Override
public void handle(final RoutingContext rc) {
Expand All @@ -41,6 +49,13 @@ public void handle(final RoutingContext rc) {
rc.response().end("Received " + value.get("param"));
}
},
PARAM_NAMES("/paramnames") {
@Override
public void handle(final RoutingContext rc) {
final Collection<String> names = rc.request().params().names();
rc.response().end("Received " + String.join(",", names));
}
},
FORM_ATTRIBUTE("/form_attribute") {
@Override
public void handle(final RoutingContext rc) {
Expand Down
15 changes: 15 additions & 0 deletions ...ke-tests/vertx-4.2/application/src/main/java/datadog/smoketest/vertx_4_2/IastHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import io.vertx.core.json.JsonObject;
import io.vertx.ext.web.RoutingContext;
import java.util.Arrays;
import java.util.Collection;
import java.util.Optional;
import java.util.Vector;

Expand All @@ -28,6 +29,13 @@ public void handle(final RoutingContext rc) {
rc.response().end("Received " + value.get("header"));
}
},
HEADER_NAMES("/headernames") {
@Override
public void handle(final RoutingContext rc) {
final Collection<String> names = rc.request().headers().names();
rc.response().end("Received " + String.join(",", names));
}
},
PARAM("/param") {
@Override
public void handle(final RoutingContext rc) {
Expand All @@ -42,6 +50,13 @@ public void handle(final RoutingContext rc) {
rc.response().end("Received " + value.get("param"));
}
},
PARAM_NAMES("/paramnames") {
@Override
public void handle(final RoutingContext rc) {
final Collection<String> names = rc.request().params().names();
rc.response().end("Received " + String.join(",", names));
}
},
FORM_ATTRIBUTE("/form_attribute") {
@Override
public void handle(final RoutingContext rc) {
Expand Down
Loading