test continue

DataDog · sezen-datadog · Feb 5, 2025 · Jan 15, 2025 · Jan 15, 2025 · Jan 15, 2025
commit 2111e77df9655e41e66f9f5a003dfbb62f64126f
diff --git a/.../src/main/java/datadog/trace/instrumentation/javax/mail/JavaxMailBodyInstrumentation.java b/.../src/main/java/datadog/trace/instrumentation/javax/mail/JavaxMailBodyInstrumentation.java
@@ -15,7 +15,7 @@
 public class JavaxMailBodyInstrumentation extends InstrumenterModule.Iast
     implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public JavaxMailBodyInstrumentation(String instrumentationName, String... additionalNames) {
+  public JavaxMailBodyInstrumentation() {
     super("javax-mail", "body");
   }
 

@@ -22,7 +22,7 @@ public class JavaxMailInstrumentation extends InstrumenterModule.Iast
 
   private static Logger LOGGER = LoggerFactory.getLogger(JavaxMailInstrumentation.class);
 
-  public JavaxMailInstrumentation(String instrumentationName, String... additionalNames) {
+  public JavaxMailInstrumentation() {
     super("javax-mail", "transport");
   }
 
@@ -40,7 +40,7 @@ public String instrumentedType() {
   public static class MailInjectionAdvice {
     @Sink(VulnerabilityTypes.EMAIL_HTML_INJECTION)
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    private static void onSend(@Advice.Argument(0) final Part message)
+    public static void onSend(@Advice.Argument(0) final Part message)
         throws MessagingException, IOException {
       EmailInjectionModule emailInjectionModule = InstrumentationBridge.EMAIL_INJECTION;
       if (message != null && message.getContent() != null) {

@@ -2,6 +2,7 @@ import datadog.trace.agent.test.AgentTestRunner
 import datadog.trace.api.iast.InstrumentationBridge
 import datadog.trace.api.iast.sink.EmailInjectionModule
 
+import javax.mail.Session
 import javax.mail.Transport
 import javax.mail.internet.MimeMessage
 
@@ -13,7 +14,7 @@ class JavaxMailInstrumentationTest  extends AgentTestRunner {
   }
 
 
-  void 'test javax.mail.Message'(Object value) {
+  void 'test javax.mail.Message'(MimeMessage value) {
     given:
     final module = Mock(EmailInjectionModule)
     InstrumentationBridge.registerIastModule(module)
@@ -27,6 +28,11 @@ class JavaxMailInstrumentationTest  extends AgentTestRunner {
     1 * module.onSendEmail(message)
 
     where:
-    value << [new MimeMessage(null), new MimeMessage(null)]
+    value << [
+      new MimeMessage(Session.getDefaultInstance(new Properties())) { {
+          setContent("<html><body>Hello, World!</body></html>", "text/html")
+        }
+      }
+    ]
   }
 }