#452: also perform the completeness check leniently in case of .disableAllClientValidation(true)

Author: bbottema

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

@@ -86,7 +86,11 @@ public static boolean validateLenient(@NotNull final Email email)
 	public static boolean validateLenient(@NotNull final Email email, @Nullable final EmailValidator emailValidator)
 			throws MailException {
 		LOGGER.debug("validating email...");
-		MailerHelper.validateCompleteness(email);
+		try {
+			MailerHelper.validateCompleteness(email);
+		} catch (MailCompletenessException e) {
+			LOGGER.warn("encountered (and ignored) missing field: {}", e.getMessage());
+		}
 		try {
 			MailerHelper.validateAddresses(email, emailValidator);
 		} catch (MailInvalidAddressException e) {
@@ -194,8 +198,10 @@ public static void scanForInjectionAttacks(final @NotNull Email email) {
 			scanForInjectionAttack(embeddedImage.getDataSource().getName(), "email.embeddedImage.datasource.name");
 			scanForInjectionAttack(embeddedImage.getDescription(), "email.embeddedImage.description");
 		}
-		scanForInjectionAttack(email.getFromRecipient().getName(), "email.fromRecipient.name");
-		scanForInjectionAttack(email.getFromRecipient().getAddress(), "email.fromRecipient.address");
+		if (!valueNullOrEmpty(email.getFromRecipient())) {
+			scanForInjectionAttack(email.getFromRecipient().getName(), "email.fromRecipient.name");
+			scanForInjectionAttack(email.getFromRecipient().getAddress(), "email.fromRecipient.address");
+		}
 		if (!valueNullOrEmpty(email.getReplyToRecipient())) {
 			scanForInjectionAttack(email.getReplyToRecipient().getName(), "email.replyToRecipient.name");
 			scanForInjectionAttack(email.getReplyToRecipient().getAddress(), "email.replyToRecipient.address");

modules/simple-java-mail/src/test/java/org/simplejavamail/mailer/MailerHelperTest.java

@@ -34,13 +34,8 @@ public void validate() {
 
     @Test
     public void validateLenient() {
-        // missing fields should still fail
         val emailMissingFrom = newBuilder().clearFromRecipient().buildEmail();
-        assertThatThrownBy(() -> MailerHelper.validateLenient(emailMissingFrom, JMail.strictValidator()))
-                .isInstanceOf(MailCompletenessException.class)
-                .hasMessageContaining("Email is not valid: missing sender.");
-
-        // but invalid address or suspicious fields should not
+        assertThatNoException().isThrownBy(() -> MailerHelper.validateLenient(emailMissingFrom, JMail.strictValidator()));
         val emailInvalidFrom = newBuilder().from("invalid", "invalid").buildEmail();
         assertThat(MailerHelper.validateLenient(emailInvalidFrom)).isTrue();
         assertThatNoException().isThrownBy(() -> MailerHelper.validateLenient(emailInvalidFrom, JMail.strictValidator()));