#93, #95: fixed email address validation for the new headers

Author: bbottema

src/main/java/org/simplejavamail/mailer/Mailer.java

@@ -395,6 +395,10 @@ public boolean validate(final Email email)
 			throw new MailerException(MailerException.MISSING_RECIPIENT);
 		} else if (email.getFromRecipient() == null) {
 			throw new MailerException(MailerException.MISSING_SENDER);
+		} else if (email.isUseDispositionNotificationTo() && email.getDispositionNotificationTo() == null) {
+			throw new MailerException(MailerException.MISSING_DISPOSITIONNOTIFICATIONTO);
+		} else if (email.isUseReturnReceiptTo() && email.getReturnReceiptTo() == null) {
+			throw new MailerException(MailerException.MISSING_RETURNRECEIPTTO);
 		} else if (emailAddressCriteria != null) {
 			if (!EmailAddressValidator.isValid(email.getFromRecipient().getAddress(), emailAddressCriteria)) {
 				throw new MailerException(format(MailerException.INVALID_SENDER, email));
@@ -408,11 +412,13 @@ public boolean validate(final Email email)
 					.isValid(email.getReplyToRecipient().getAddress(), emailAddressCriteria)) {
 				throw new MailerException(format(MailerException.INVALID_REPLYTO, email));
 			}
-			if (email.isUseDispositionNotificationTo() && email.getDispositionNotificationTo() == null) {
-				throw new MailerException(MailerException.MISSING_DISPOSITIONNOTIFICATIONTO);
+			if (email.isUseDispositionNotificationTo() && !EmailAddressValidator
+					.isValid(email.getDispositionNotificationTo().getAddress(), emailAddressCriteria)) {
+				throw new MailerException(format(MailerException.INVALID_DISPOSITIONNOTIFICATIONTO, email));
 			}
-			if (email.isUseReturnReceiptTo() && email.getReturnReceiptTo() == null) {
-				throw new MailerException(MailerException.MISSING_RETURNRECEIPTTO);
+			if (email.isUseReturnReceiptTo() && !EmailAddressValidator
+					.isValid(email.getReturnReceiptTo().getAddress(), emailAddressCriteria)) {
+				throw new MailerException(format(MailerException.INVALID_RETURNRECEIPTTO, email));
 			}
 		}
 		return true;

src/main/java/org/simplejavamail/mailer/MailerException.java

@@ -13,13 +13,15 @@ class MailerException extends MailException {
 	static final String INVALID_RECIPIENT = "Invalid TO address: %s";
 	static final String INVALID_REPLYTO = "Invalid REPLY TO address: %s";
 	static final String INVALID_SENDER = "Invalid FROM address: %s";
+	static final String INVALID_DISPOSITIONNOTIFICATIONTO = "Invalid \"Disposition Notification To\" address: %s";
+	static final String INVALID_RETURNRECEIPTTO = "Invalid \"Return Receipt To\" address: %s";
 	static final String MISSING_SENDER = "Email is not valid: missing sender";
 	static final String MISSING_RECIPIENT = "Email is not valid: missing recipients";
 	static final String MISSING_SUBJECT = "Email is not valid: missing subject";
 	static final String MISSING_CONTENT = "Email is not valid: missing content body";
-	static final String INJECTION_SUSPECTED = "Suspected of injection attack, field: %s with suspicious value: %s";
 	static final String MISSING_DISPOSITIONNOTIFICATIONTO = "Email is not valid: missing \"Disposition Notification To\" address";
 	static final String MISSING_RETURNRECEIPTTO = "Email is not valid: missing \"Return Receipt To\" address";
+	static final String INJECTION_SUSPECTED = "Suspected of injection attack, field: %s with suspicious value: %s";
 
 	MailerException(final String message) {
 		super(message);