Skip to content

Commit 95dcacd

Browse files
manuel-alvarez-alvarezdevflow.devflow-routing-intake
manuel-alvarez-alvarez
and
devflow.devflow-routing-intake
authored
Remove calls to dd.datad0g.com in IAST tests (#10891)
Remove calls to dd.datad0g.com in IAST tests Co-authored-by: devflow.devflow-routing-intake <devflow.devflow-routing-intake@kubernetes.us1.ddbuild.io>
1 parent ee6b3da commit 95dcacd

File tree

5 files changed

+60
-22
lines changed

5 files changed

+60
-22
lines changed

‎dd-smoke-tests/armeria-grpc/src/test/groovy/datadog/smoketest/IastArmeriaSmokeTest.groovy‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,13 @@ class IastArmeriaSmokeTest extends AbstractIastServerSmokeTest {
3131
return processBuilder
3232
}
3333

34+
protected boolean withExternalServer() {
35+
true
36+
}
37+
3438
void 'test SSRF detection'() {
3539
setup:
36-
final url = 'https://dd.datad0g.com/'
40+
final url = externalServer.address.toString()
3741
final request = Iast.Request.newBuilder().setType(Iast.Request.Type.URL)
3842
.setUrl(Iast.Request.Url.newBuilder().setValue(url).build()).build()
3943

‎dd-smoke-tests/grpc-1.5/src/test/groovy/datadog/smoketest/IastGrpcSmokeTest.groovy‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,14 @@ class IastGrpcSmokeTest extends AbstractIastServerSmokeTest {
2929
return processBuilder
3030
}
3131

32+
@Override
33+
boolean withExternalServer() {
34+
true
35+
}
36+
3237
void 'test SSRF detection'() {
3338
setup:
34-
final url = 'https://dd.datad0g.com/'
39+
final url = externalServer.address.toString()
3540
final request = Iast.Request.newBuilder().setType(Iast.Request.Type.URL)
3641
.setUrl(Iast.Request.Url.newBuilder().setValue(url).build()).build()
3742

‎dd-smoke-tests/iast-util/iast-util-11/src/testFixtures/groovy/datadog/smoketest/AbstractIast11SpringBootTest.groovy‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ abstract class AbstractIast11SpringBootTest extends AbstractIastServerSmokeTest
3333
]
3434
}
3535

36+
@Override
37+
protected boolean withExternalServer() {
38+
true
39+
}
40+
3641
void 'ssrf is present (#path)'() {
3742
setup:
3843
final url = "http://localhost:${httpPort}/ssrf/${path}"
@@ -60,9 +65,9 @@ abstract class AbstractIast11SpringBootTest extends AbstractIastServerSmokeTest
6065
}
6166
6267
where:
63-
path | parameter | value | async | promise
64-
"java-net" | "url" | "https://dd.datad0g.com/" | "false" | "false"
65-
"java-net" | "url" | "https://dd.datad0g.com/" | "true" | "false"
66-
"java-net" | "url" | "https://dd.datad0g.com/" | "true" | "true"
68+
path | parameter | value | async | promise
69+
"java-net" | "url" | externalServer.address.toString() | "false" | "false"
70+
"java-net" | "url" | externalServer.address.toString() | "true" | "false"
71+
"java-net" | "url" | externalServer.address.toString() | "true" | "true"
6772
}
6873
}

‎dd-smoke-tests/iast-util/src/testFixtures/groovy/datadog/smoketest/AbstractIastServerSmokeTest.groovy‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
package datadog.smoketest
22

3+
import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer
4+
35
import datadog.smoketest.model.TaintedObject
46
import datadog.smoketest.model.Vulnerability
57
import datadog.smoketest.model.Vulnerability.Source
8+
import datadog.trace.agent.test.server.http.TestHttpServer
69
import groovy.json.JsonBuilder
710
import groovy.json.JsonSlurper
811
import groovy.transform.CompileDynamic
912
import groovy.transform.stc.ClosureParams
1013
import groovy.transform.stc.SimpleType
1114
import org.spockframework.runtime.SpockTimeoutError
15+
import spock.lang.AutoCleanup
1216
import spock.lang.Shared
1317
import spock.util.concurrent.PollingConditions
1418

@@ -33,6 +37,17 @@ abstract class AbstractIastServerSmokeTest extends AbstractServerSmokeTest {
3337
return {} // force traces decoding
3438
}
3539

40+
@AutoCleanup
41+
@Shared
42+
TestHttpServer externalServer = withExternalServer() ? httpServer {
43+
handlers {
44+
prefix('/') {
45+
String msg = "Hello."
46+
response.status(200).send(msg)
47+
}
48+
}
49+
} : null
50+
3651
def setupSpec() {
3752
try {
3853
processTestLogLines { it.contains(IAST_STARTED_MSG) }
@@ -246,4 +261,8 @@ abstract class AbstractIastServerSmokeTest extends AbstractServerSmokeTest {
246261
}
247262
return vulnerabilities
248263
}
264+
265+
protected boolean withExternalServer() {
266+
false
267+
}
249268
}

‎dd-smoke-tests/iast-util/src/testFixtures/groovy/datadog/smoketest/AbstractIastSpringBootTest.groovy‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ abstract class AbstractIastSpringBootTest extends AbstractIastServerSmokeTest {
4141
]
4242
}
4343

44+
@Override
45+
protected boolean withExternalServer() {
46+
true
47+
}
48+
4449
@Override
4550
boolean isErrorLog(String log) {
4651
if (log.contains('no such algorithm: DES for provider SUN')) {
@@ -777,10 +782,10 @@ abstract class AbstractIastSpringBootTest extends AbstractIastServerSmokeTest {
777782

778783
where:
779784
path | parameter | value
780-
'' | 'url' | 'https://dd.datad0g.com/'
781-
'' | 'host' | 'dd.datad0g.com'
782-
'/uri' | 'url' | 'https://dd.datad0g.com/'
783-
'/uri' | 'host' | 'dd.datad0g.com'
785+
'' | 'url' | externalServer.address.toString()
786+
'' | 'host' | externalServer.address.host
787+
'/uri' | 'url' | externalServer.address.toString()
788+
'/uri' | 'host' | externalServer.address.host
784789
}
785790

786791
void 'ssrf is present (#path) (#parameter)'() {
@@ -818,18 +823,18 @@ abstract class AbstractIastSpringBootTest extends AbstractIastServerSmokeTest {
818823
}
819824

820825
where:
821-
path | parameter | value | protocolSecure | endSlash
822-
"apache-httpclient4" | "url" | "https://dd.datad0g.com/" | true | true
823-
"apache-httpclient4" | "host" | "dd.datad0g.com" | false | false
824-
"apache-httpasyncclient" | "url" | "https://dd.datad0g.com/" | true | true
825-
"apache-httpasyncclient" | "urlProducer" | "https://dd.datad0g.com/" | true | true
826-
"apache-httpasyncclient" | "host" | "dd.datad0g.com" | false | false
827-
"apache-httpclient5" | "url" | "https://dd.datad0g.com/" | true | true
828-
"apache-httpclient5" | "urlHandler" | "https://dd.datad0g.com/" | true | true
829-
"apache-httpclient5" | "host" | "dd.datad0g.com" | false | true
830-
"commons-httpclient2" | "url" | "https://dd.datad0g.com/" | true | true
831-
"okHttp2" | "url" | "https://dd.datad0g.com/" | true | true
832-
"okHttp3" | "url" | "https://dd.datad0g.com/" | true | true
826+
path | parameter | value | protocolSecure | endSlash
827+
"apache-httpclient4" | "url" | "$externalServer.address/" | true | true
828+
"apache-httpclient4" | "host" | externalServer.address.host | false | false
829+
"apache-httpasyncclient" | "url" | "$externalServer.address/" | true | true
830+
"apache-httpasyncclient" | "urlProducer" | "$externalServer.address/" | true | true
831+
"apache-httpasyncclient" | "host" | externalServer.address.host | false | false
832+
"apache-httpclient5" | "url" | "$externalServer.address/" | true | true
833+
"apache-httpclient5" | "urlHandler" | "$externalServer.address/" | true | true
834+
"apache-httpclient5" | "host" | externalServer.address.host | false | true
835+
"commons-httpclient2" | "url" | "$externalServer.address/" | true | true
836+
"okHttp2" | "url" | "$externalServer.address/" | true | true
837+
"okHttp3" | "url" | "$externalServer.address/" | true | true
833838
}
834839

835840
void 'test iast metrics stored in spans'() {

0 commit comments

Comments
 (0)