Merge branch 'master' into alejandro.gonzalez/APPSEC-61873-4-undertow-play

Author: jandro996

.github/g2j-migrated-modules.txt

@@ -7,4 +7,5 @@
 
 buildSrc/call-site-instrumentation-plugin
 components/json
+dd-java-agent/instrumentation/sofarpc/sofarpc-5.0
 dd-trace-api

dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FilesCallSite.java

@@ -43,6 +43,19 @@ public static void beforeCopyFromStream(@CallSite.Argument(1) @Nullable final Pa
     }
   }
 
+  @CallSite.Before(
+      "java.nio.file.Path java.nio.file.Files.copy(java.nio.file.Path, java.nio.file.Path, java.nio.file.CopyOption[])")
+  public static void beforeCopyPathToPath(
+      @CallSite.Argument(0) @Nullable final Path source,
+      @CallSite.Argument(1) @Nullable final Path target) {
+    if (source != null) {
+      FileIORaspHelper.INSTANCE.beforeFileLoaded(source.toString());
+    }
+    if (target != null) {
+      FileIORaspHelper.INSTANCE.beforeFileWritten(target.toString());
+    }
+  }
+
   @CallSite.Before(
       "java.nio.file.Path java.nio.file.Files.move(java.nio.file.Path, java.nio.file.Path, java.nio.file.CopyOption[])")
   public static void beforeMove(@CallSite.Argument(1) @Nullable final Path target) {
@@ -51,6 +64,13 @@ public static void beforeMove(@CallSite.Argument(1) @Nullable final Path target)
     }
   }
 
+  @CallSite.Before("long java.nio.file.Files.copy(java.nio.file.Path, java.io.OutputStream)")
+  public static void beforeCopyToStream(@CallSite.Argument(0) @Nullable final Path source) {
+    if (source != null) {
+      FileIORaspHelper.INSTANCE.beforeFileLoaded(source.toString());
+    }
+  }
+
   // ===================== READ =====================
 
   @CallSite.Before(

dd-java-agent/instrumentation/java/java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/FilesCallSiteTest.groovy

@@ -102,6 +102,35 @@ class FilesCallSiteTest extends BaseIoRaspCallSiteTest {
     1 * helper.beforeFileWritten(path.toString())
   }
 
+  void 'test RASP Files.copy path to path fires beforeFileLoaded on source and beforeFileWritten on target'() {
+    setup:
+    final helper = Mock(FileIORaspHelper)
+    FileIORaspHelper.INSTANCE = helper
+    final source = newFile('test_rasp_copy_src.txt').toPath()
+    final target = temporaryFolder.resolve('test_rasp_copy_path_dst.txt')
+
+    when:
+    TestFilesSuite.copyPathToPath(source, target)
+
+    then:
+    1 * helper.beforeFileLoaded(source.toString())
+    1 * helper.beforeFileWritten(target.toString())
+  }
+
+  void 'test RASP Files.copy path to OutputStream fires beforeFileLoaded on source'() {
+    setup:
+    final helper = Mock(FileIORaspHelper)
+    FileIORaspHelper.INSTANCE = helper
+    final source = newFile('test_rasp_copy_stream_src.txt').toPath()
+
+    when:
+    TestFilesSuite.copyToStream(source, new ByteArrayOutputStream())
+
+    then:
+    1 * helper.beforeFileLoaded(source.toString())
+    0 * helper.beforeFileWritten(_)
+  }
+
   void 'test RASP Files.move'() {
     setup:
     final helper = Mock(FileIORaspHelper)

dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFilesSuite.java

@@ -57,6 +57,15 @@ public static BufferedWriter newBufferedWriterDefaultCharset(
     return Files.newBufferedWriter(path, options);
   }
 
+  public static Path copyPathToPath(
+      final Path source, final Path target, final CopyOption... options) throws IOException {
+    return Files.copy(source, target, options);
+  }
+
+  public static long copyToStream(final Path source, final OutputStream out) throws IOException {
+    return Files.copy(source, out);
+  }
+
   public static Path move(final Path source, final Path target, final CopyOption... options)
       throws IOException {
     return Files.move(source, target);

dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/build.gradle

@@ -0,0 +1,35 @@
+muzzle {
+  pass {
+    group = "com.alipay.sofa"
+    module = "sofa-rpc-all"
+    versions = "[5.0.0,)"
+    assertInverse = true
+  }
+}
+
+apply from: "$rootDir/gradle/java.gradle"
+
+addTestSuiteForDir('latestDepTest', 'test')
+
+configurations.testRuntimeClasspath {
+  resolutionStrategy.force "com.google.guava:guava:32.1.3-jre"
+}
+
+dependencies {
+  compileOnly group: "com.alipay.sofa", name: "sofa-rpc-all", version: "5.6.0"
+
+  testImplementation group: "com.alipay.sofa", name: "sofa-rpc-all", version: "5.14.2"
+  // JAX-RS annotations required for the REST protocol test interface (@Path, @GET, etc.)
+  testImplementation group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1.1"
+  // Required so that GrpcServerModule / GrpcClientModule are discovered via ServiceLoader
+  // in SofaRpcTripleWithGrpcForkedTest.
+  testImplementation project(':dd-java-agent:instrumentation:grpc-1.5')
+  testImplementation group: "io.grpc", name: "grpc-netty", version: "1.53.0"
+  testImplementation group: "io.grpc", name: "grpc-core", version: "1.53.0"
+  testImplementation group: "io.grpc", name: "grpc-stub", version: "1.53.0"
+  testImplementation group: "com.google.protobuf", name: "protobuf-java", version: "3.25.3"
+  testImplementation group: "com.alibaba", name: "fastjson", version: "1.2.83"
+  testImplementation group: "com.google.guava", name: "guava", version: "32.1.3-jre"
+
+  latestDepTestImplementation group: "com.alipay.sofa", name: "sofa-rpc-all", version: "+"
+}