Email HTML Injection detection in IAST #8205
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| package com.datadog.iast.sink; | ||
|
|
||
| import com.datadog.iast.Dependencies; | ||
| import com.datadog.iast.model.VulnerabilityType; | ||
| import datadog.trace.api.iast.sink.EmailInjectionModule; | ||
| import javax.annotation.Nullable; | ||
|
|
||
| public class EmailInjectionModuleImpl extends SinkModuleBase implements EmailInjectionModule { | ||
| public EmailInjectionModuleImpl(final Dependencies dependencies) { | ||
| super(dependencies); | ||
| } | ||
|
|
||
| @Override | ||
| public void onSendEmail(@Nullable final Object messageContent) { | ||
| if (messageContent == null) { | ||
| return; | ||
| } | ||
| checkInjection(VulnerabilityType.EMAIL_HTML_INJECTION, messageContent); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| package com.datadog.iast.sink | ||
|
|
||
| import com.datadog.iast.IastModuleImplTestBase | ||
| import com.datadog.iast.Reporter | ||
| import com.datadog.iast.model.Vulnerability | ||
| import com.datadog.iast.model.VulnerabilityType | ||
| import com.datadog.iast.propagation.PropagationModuleImpl | ||
| import datadog.trace.api.iast.SourceTypes | ||
|
|
||
| class EmailInjectionModuleTest extends IastModuleImplTestBase{ | ||
|
|
||
| private EmailInjectionModuleImpl module | ||
|
|
||
| def setup() { | ||
| module = new EmailInjectionModuleImpl(dependencies) | ||
| } | ||
|
|
||
| @Override | ||
| protected Reporter buildReporter() { | ||
| return Mock(Reporter) | ||
| } | ||
|
|
||
| def "test onSendEmail with null messageContent"() { | ||
| when: | ||
| module.onSendEmail(null) | ||
|
|
||
| then: | ||
| noExceptionThrown() | ||
| } | ||
|
|
||
| def "test onSendEmail with non-null messageContent"() { | ||
| given: | ||
| def messageContent = "test message" | ||
| def propagationModule = new PropagationModuleImpl() | ||
| propagationModule.taintObject(messageContent, SourceTypes.NONE) | ||
|
|
||
| when: | ||
| module.onSendEmail(messageContent) | ||
|
|
||
| then: | ||
| 1 * reporter.report(_, _) >> { args -> | ||
| def vulnerability = args[1] as Vulnerability | ||
| vulnerability.type == VulnerabilityType.EMAIL_HTML_INJECTION && | ||
| vulnerability.evidence == messageContent | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| muzzle { | ||
| pass { | ||
| coreJdk() | ||
| } | ||
| } | ||
|
|
||
| apply from: "$rootDir/gradle/java.gradle" | ||
| apply plugin: 'call-site-instrumentation' | ||
|
||
|
|
||
| addTestSuiteForDir('latestDepTest', 'test') | ||
|
|
||
| dependencies { | ||
| testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') | ||
| implementation 'javax.mail:javax.mail-api:1.4.4' | ||
sezen-datadog marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| latestDepTestImplementation 'javax.mail:javax.mail-api:+' | ||
| testImplementation 'de.saly:javamail-mock2:0.4-beta3' | ||
smola marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| package datadog.trace.instrumentation.javax.mail; | ||
|
|
||
| import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.implementsInterface; | ||
| import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; | ||
|
|
||
| import com.google.auto.service.AutoService; | ||
| import datadog.trace.agent.tooling.Instrumenter; | ||
| import datadog.trace.agent.tooling.InstrumenterModule; | ||
| import datadog.trace.api.iast.InstrumentationBridge; | ||
| import datadog.trace.api.iast.Propagation; | ||
| import datadog.trace.api.iast.propagation.PropagationModule; | ||
| import javax.mail.Part; | ||
| import net.bytebuddy.asm.Advice; | ||
| import net.bytebuddy.description.type.TypeDescription; | ||
| import net.bytebuddy.matcher.ElementMatcher; | ||
|
|
||
| @AutoService(InstrumenterModule.class) | ||
| public class JavaxMailBodyInstrumentation extends InstrumenterModule.Iast | ||
| implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice { | ||
|
|
||
| public JavaxMailBodyInstrumentation() { | ||
| super("javax-mail", "javax-mail-body"); | ||
| } | ||
|
|
||
| @Override | ||
| public void methodAdvice(MethodTransformer transformer) { | ||
| transformer.applyAdvice( | ||
| named("setContent"), | ||
| JavaxMailBodyInstrumentation.class.getName() + "$ContentInjectionAdvice"); | ||
| transformer.applyAdvice( | ||
| named("setText"), JavaxMailBodyInstrumentation.class.getName() + "$TextInjectionAdvice"); | ||
| } | ||
|
|
||
| @Override | ||
| public String hierarchyMarkerType() { | ||
| return "javax.mail.Message"; | ||
| } | ||
|
|
||
| @Override | ||
| public ElementMatcher<TypeDescription> hierarchyMatcher() { | ||
| return implementsInterface(named(hierarchyMarkerType())); | ||
| } | ||
|
|
||
| public static class ContentInjectionAdvice { | ||
| @Propagation | ||
| @Advice.OnMethodEnter(suppress = Throwable.class) | ||
| private static void onSetContent( | ||
| @Advice.This Part part, @Advice.Argument(0) final Object content) { | ||
| PropagationModule propagationModule = InstrumentationBridge.PROPAGATION; | ||
| if (propagationModule != null && content != null) { | ||
| propagationModule.taintObjectIfTainted(part, content); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public static class TextInjectionAdvice { | ||
| @Propagation | ||
| @Advice.OnMethodEnter(suppress = Throwable.class) | ||
| private static void onSetText(@Advice.This Part part, @Advice.Argument(0) final String text) { | ||
| PropagationModule propagationModule = InstrumentationBridge.PROPAGATION; | ||
| if (propagationModule != null && text != null) { | ||
| propagationModule.taintObjectIfTainted(part, text); | ||
| } | ||
| } | ||
| } | ||
| } |
sezen-datadog marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| package datadog.trace.instrumentation.javax.mail; | ||
|
|
||
| import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; | ||
|
|
||
| import com.google.auto.service.AutoService; | ||
| import datadog.trace.agent.tooling.Instrumenter; | ||
| import datadog.trace.agent.tooling.InstrumenterModule; | ||
| import datadog.trace.api.iast.InstrumentationBridge; | ||
| import datadog.trace.api.iast.Sink; | ||
| import datadog.trace.api.iast.VulnerabilityTypes; | ||
| import datadog.trace.api.iast.sink.EmailInjectionModule; | ||
| import java.io.IOException; | ||
| import javax.mail.MessagingException; | ||
| import javax.mail.Multipart; | ||
| import javax.mail.Part; | ||
| import net.bytebuddy.asm.Advice; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| @AutoService(InstrumenterModule.class) | ||
| public class JavaxMailInstrumentation extends InstrumenterModule.Iast | ||
| implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { | ||
|
|
||
| private static Logger LOGGER = LoggerFactory.getLogger(JavaxMailInstrumentation.class); | ||
|
|
||
| public JavaxMailInstrumentation() { | ||
| super("javax-mail", "javax-mail-transport"); | ||
| } | ||
|
|
||
| @Override | ||
| public void methodAdvice(MethodTransformer transformer) { | ||
| transformer.applyAdvice( | ||
| named("send0"), JavaxMailInstrumentation.class.getName() + "$MailInjectionAdvice"); | ||
Mariovido marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| @Override | ||
| public String instrumentedType() { | ||
| return "javax.mail.Transport"; | ||
| } | ||
|
|
||
| public static class MailInjectionAdvice { | ||
sezen-datadog marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| @Sink(VulnerabilityTypes.EMAIL_HTML_INJECTION) | ||
| @Advice.OnMethodEnter(suppress = Throwable.class) | ||
| public static void onSend(@Advice.Argument(0) final Part message) | ||
| throws MessagingException, IOException { | ||
| EmailInjectionModule emailInjectionModule = InstrumentationBridge.EMAIL_INJECTION; | ||
| if (message != null && message.getContent() != null) { | ||
| if (message.isMimeType("text/html")) { | ||
| emailInjectionModule.onSendEmail(message.getContent()); | ||
| } else if (message.isMimeType("multipart/*")) { | ||
| Multipart parts = (Multipart) message.getContent(); | ||
| for (int i = 0; i < parts.getCount(); i++) { | ||
| if (parts.getBodyPart(i).isMimeType("text/html")) { | ||
| emailInjectionModule.onSendEmail(parts.getBodyPart(i).getContent()); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.