Skip to content

Commit cad2b7a

Browse files
committed
#410: added missing CRLF injection checks for disposition-notification-to and return-receipt-to recipients (if provided in the email)
1 parent 0ad788d commit cad2b7a

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

modules/simple-java-mail/src/main/java/org/simplejavamail/mailer/MailerHelper.java

+8
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,14 @@ public static boolean validate(@NotNull final Email email, @Nullable final Email
101101
scanForInjectionAttack(email.getBounceToRecipient().getName(), "email.bounceToRecipient.name");
102102
scanForInjectionAttack(email.getBounceToRecipient().getAddress(), "email.bounceToRecipient.address");
103103
}
104+
if (!valueNullOrEmpty(email.getDispositionNotificationTo())) {
105+
scanForInjectionAttack(email.getDispositionNotificationTo().getName(), "email.dispositionNotificationTo.name");
106+
scanForInjectionAttack(email.getDispositionNotificationTo().getAddress(), "email.dispositionNotificationTo.address");
107+
}
108+
if (!valueNullOrEmpty(email.getReturnReceiptTo())) {
109+
scanForInjectionAttack(email.getReturnReceiptTo().getName(), "email.returnReceiptTo.name");
110+
scanForInjectionAttack(email.getReturnReceiptTo().getAddress(), "email.returnReceiptTo.address");
111+
}
104112
for (final Recipient recipient : email.getRecipients()) {
105113
scanForInjectionAttack(recipient.getName(), "email.recipient.name");
106114
scanForInjectionAttack(recipient.getAddress(), "email.recipient.address");

0 commit comments

Comments
 (0)