Merge branch 'master' into smola/revert-pr-6610

Author: smola

dd-java-agent/agent-tooling/src/main/resources/datadog/trace/agent/tooling/bytebuddy/matcher/ignored_class_name.trie

@@ -258,6 +258,7 @@
 0 org.springframework.beans.factory.support.AbstractBeanFactory
 0 org.springframework.beans.factory.support.DefaultListableBeanFactory
 0 org.springframework.beans.factory.support.DisposableBeanAdapter
+0 org.springframework.boot.SpringApplicationRunListeners
 1 org.springframework.boot.SpringApplicationShutdownHook$Handlers
 1 org.springframework.boot.autoconfigure.ssl.FileWatcher$WatcherThread
 2 org.springframework.boot.*
@@ -274,6 +275,8 @@
 0 org.springframework.boot.web.embedded.tomcat.TomcatWebServer$1
 0 org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext
 0 org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext
+0 org.springframework.boot.web.servlet.support.SpringBootServletInitializer
+0 org.springframework.boot.web.support.SpringBootServletInitializer
 2 org.springframework.cache.*
 2 org.springframework.cglib.*
 # LoadingCache.createEntry constructs FutureTasks which it executes synchronously,

dd-java-agent/instrumentation/akka-http-10.0/src/iastTest/groovy/datadog/trace/instrumentation/akkahttp/iast/IastAkkaTest.groovy

@@ -13,7 +13,6 @@ import spock.lang.Shared
 import java.nio.charset.StandardCharsets
 
 import static org.hamcrest.Matchers.greaterThan
-import static org.hamcrest.Matchers.nullValue
 
 class IastAkkaTest extends IastRequestTestRunner {
   @Shared
@@ -340,7 +339,7 @@ class IastAkkaTest extends IastRequestTestRunner {
     then:
     toc.hasTaintedObject {
       value 'var1=foo&var1=bar&var2=a+b+c'
-      range 0, 28, source(SourceTypes.REQUEST_QUERY, null, null)
+      range 0, 28, source(SourceTypes.REQUEST_QUERY, null, 'var1=foo&var1=bar&var2=a+b+c')
     }
     toc.hasTaintedObject {
       value 'var1'
@@ -486,14 +485,16 @@ class IastAkkaTest extends IastRequestTestRunner {
   }
 
   void 'json request — #variant variant'() {
+    given:
+    final json =  '''{
+        "var1": "foo",
+        "var2": ["foo2", "foo2"]
+      }'''
+
     when:
     String url = buildUrl "iast/$variant"
     def request = new Builder().url(url).post(
-      RequestBody.create(MediaType.get("application/json"), '''{
-        "var1": "foo",
-        "var2": ["foo2", "foo2"]
-      }'''.getBytes(StandardCharsets.US_ASCII))
-      ).build()
+      RequestBody.create(MediaType.get("application/json"), json.getBytes(StandardCharsets.US_ASCII))).build()
     def response = client.newCall(request).execute()
     def respBody = response.body().string()
 
@@ -505,21 +506,22 @@ class IastAkkaTest extends IastRequestTestRunner {
     def toc = finReqTaintedObjects
 
     then:
+    // source values take the value of the full body as it's converted to string at TaintFutureHelper
     toc.hasTaintedObject {
       value 'var1'
-      range 0, 4, source(SourceTypes.REQUEST_BODY, 'var1', nullValue())
+      range 0, 4, source(SourceTypes.REQUEST_BODY, 'var1', json)
     }
     toc.hasTaintedObject {
       value 'var2'
-      range 0, 4, source(SourceTypes.REQUEST_BODY, 'var2', nullValue())
+      range 0, 4, source(SourceTypes.REQUEST_BODY, 'var2', json)
     }
     toc.hasTaintedObject {
       value 'foo'
-      range 0, 3, source(SourceTypes.REQUEST_BODY, 'var1', nullValue())
+      range 0, 3, source(SourceTypes.REQUEST_BODY, 'var1', json)
     }
     toc.hasTaintedObject {
       value 'foo2'
-      range 0, 4, source(SourceTypes.REQUEST_BODY, 'var2', nullValue())
+      range 0, 4, source(SourceTypes.REQUEST_BODY, 'var2', json)
     }
 
     where:

dd-java-agent/instrumentation/pekko-http-1.0/src/iastTest/groovy/datadog/trace/instrumentation/pekkohttp/iast/IastPekkoTest.groovy

@@ -13,7 +13,6 @@ import spock.lang.Shared
 import java.nio.charset.StandardCharsets
 
 import static org.hamcrest.Matchers.greaterThan
-import static org.hamcrest.Matchers.nullValue
 
 class IastPekkoTest extends IastRequestTestRunner {
   @Shared
@@ -340,7 +339,7 @@ class IastPekkoTest extends IastRequestTestRunner {
     then:
     toc.hasTaintedObject {
       value 'var1=foo&var1=bar&var2=a+b+c'
-      range 0, 28, source(SourceTypes.REQUEST_QUERY, null, null)
+      range 0, 28, source(SourceTypes.REQUEST_QUERY, null, 'var1=foo&var1=bar&var2=a+b+c')
     }
     toc.hasTaintedObject {
       value 'var1'
@@ -486,14 +485,16 @@ class IastPekkoTest extends IastRequestTestRunner {
   }
 
   void 'json request — #variant variant'() {
+    given:
+    final json =  '''{
+        "var1": "foo",
+        "var2": ["foo2", "foo2"]
+      }'''
+
     when:
     String url = buildUrl "iast/$variant"
     def request = new Builder().url(url).post(
-      RequestBody.create(MediaType.get("application/json"), '''{
-        "var1": "foo",
-        "var2": ["foo2", "foo2"]
-      }'''.getBytes(StandardCharsets.US_ASCII))
-      ).build()
+      RequestBody.create(MediaType.get("application/json"), json.getBytes(StandardCharsets.US_ASCII))).build()
     def response = client.newCall(request).execute()
     def respBody = response.body().string()
 
@@ -505,21 +506,22 @@ class IastPekkoTest extends IastRequestTestRunner {
     def toc = finReqTaintedObjects
 
     then:
+    // source values take the value of the full body as it's converted to string at TaintFutureHelper
     toc.hasTaintedObject {
       value 'var1'
-      range 0, 4, source(SourceTypes.REQUEST_BODY, 'var1', nullValue())
+      range 0, 4, source(SourceTypes.REQUEST_BODY, 'var1', json)
     }
     toc.hasTaintedObject {
       value 'var2'
-      range 0, 4, source(SourceTypes.REQUEST_BODY, 'var2', nullValue())
+      range 0, 4, source(SourceTypes.REQUEST_BODY, 'var2', json)
     }
     toc.hasTaintedObject {
       value 'foo'
-      range 0, 3, source(SourceTypes.REQUEST_BODY, 'var1', nullValue())
+      range 0, 3, source(SourceTypes.REQUEST_BODY, 'var1', json)
     }
     toc.hasTaintedObject {
       value 'foo2'
-      range 0, 4, source(SourceTypes.REQUEST_BODY, 'var2', nullValue())
+      range 0, 4, source(SourceTypes.REQUEST_BODY, 'var2', json)
     }
 
     where:

dd-java-agent/instrumentation/spring-boot/build.gradle

@@ -0,0 +1,53 @@
+ext {
+  latestDepTestMinJavaVersionForTests = JavaVersion.VERSION_17
+  latestDepForkedTestMinJavaVersionForTests = JavaVersion.VERSION_17
+  boot3TestMinJavaVersionForTests = JavaVersion.VERSION_17
+  boot3ForkedTestMinJavaVersionForTests = JavaVersion.VERSION_17
+}
+muzzle {
+  pass {
+    group = 'org.springframework.boot'
+    module = 'spring-boot'
+    versions = "[1.3.0.RELEASE,3)"
+  }
+  pass {
+    group = 'org.springframework.boot'
+    module = 'spring-boot'
+    versions = "[3,)"
+    javaVersion = "17"
+  }
+}
+
+apply from: "$rootDir/gradle/java.gradle"
+
+addTestSuiteForDir("boot1LatestDepTest", "test")
+addTestSuiteForDir("boot2Test", "test")
+addTestSuiteForDir("boot2LatestDepTest", "test")
+addTestSuiteForDir("boot3Test", "test")
+addTestSuiteForDir("latestDepTest", "test")
+addTestSuiteExtendingForDir("boot1LatestDepForkedTest", "boot1LatestDepTest", "test")
+addTestSuiteExtendingForDir("boot2ForkedTest", "boot2Test", "test")
+addTestSuiteExtendingForDir("boot2LatestDepForkedTest", "boot2LatestDepTest", "test")
+addTestSuiteExtendingForDir("boot3ForkedTest", "boot3Test", "test")
+addTestSuiteExtendingForDir("latestDepForkedTest", "latestDepTest", "test")
+
+[compileLatestDepTestGroovy, compileBoot3TestGroovy].each {
+  it.javaLauncher = getJavaLauncherFor(17)
+}
+
+dependencies {
+  compileOnly group: 'org.springframework.boot', name: 'spring-boot', version: '1.3.0.RELEASE'
+  testImplementation group: 'org.springframework.boot', name: 'spring-boot', version: '1.3.0.RELEASE'
+  boot1LatestDepTestImplementation group: 'org.springframework.boot', name: 'spring-boot', version: '1.+'
+  boot1LatestDepForkedTestImplementation group: 'org.springframework.boot', name: 'spring-boot', version: '1.+'
+  boot2TestImplementation group: 'org.springframework.boot', name: 'spring-boot', version: '2.0.0.RELEASE'
+  boot2ForkedTestImplementation group: 'org.springframework.boot', name: 'spring-boot', version: '2.0.0.RELEASE'
+  boot2LatestDepTestImplementation group: 'org.springframework.boot', name: 'spring-boot', version: '1.+'
+  boot2LatestDepForkedTestImplementation group: 'org.springframework.boot', name: 'spring-boot', version: '1.+'
+  boot3TestImplementation group: 'org.springframework.boot', name: 'spring-boot', version: '3.0.0'
+  boot3ForkedTestImplementation group: 'org.springframework.boot', name: 'spring-boot', version: '3.0.0'
+  latestDepTestImplementation group: 'org.springframework.boot', name: 'spring-boot', version: '+'
+  latestDepForkedTestImplementation group: 'org.springframework.boot', name: 'spring-boot', version: '+'
+  latestDepTestImplementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.4.8' // otherwise clashes with RootLogLevelConfigurator
+  latestDepForkedTestImplementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.4.8'
+}