#230: properly handle missing address value in headers

src/main/java/org/simplejavamail/converter/internal/mimemessage/MimeMessageParseException.java

@@ -14,7 +14,7 @@
 class MimeMessageParseException extends MailException {
 
 	static final String ERROR_PARSING_FROMADDRESS = "Error parsing from-address";
-	static final String ERROR_PARSING_ADDRESS = "Error parsing [%s] address";
+	static final String ERROR_PARSING_ADDRESS = "Error parsing [%s] address [%s]";
 	static final String ERROR_PARSING_DISPOSITION = "Error parsing MimeMessage disposition";
 	static final String ERROR_PARSING_CONTENT = "Error parsing MimeMessage Content";
 	static final String ERROR_PARSING_MULTIPART_COUNT = "Error parsing MimeMessage multipart count";

src/main/java/org/simplejavamail/converter/internal/mimemessage/MimeMessageParser.java

@@ -143,15 +143,15 @@ private static void parseMimePartTree(@Nonnull final MimePart currentPart, @Nonn
 			}
 		}
 	}
-
+	
 	@SuppressWarnings("StatementWithEmptyBody")
 	private static void parseHeader(final Header header, @Nonnull final ParsedMimeMessageComponents parsedComponents) {
 		if (header.getName().equals("Disposition-Notification-To")) {
-			parsedComponents.dispositionNotificationTo = createAddress(header, "Disposition-Notification-To");
+			parsedComponents.dispositionNotificationTo = createAddress(header.getValue(), "Disposition-Notification-To");
 		} else if (header.getName().equals("Return-Receipt-To")) {
-			parsedComponents.returnReceiptTo = createAddress(header, "Return-Receipt-To");
+			parsedComponents.returnReceiptTo = createAddress(header.getValue(), "Return-Receipt-To");
 		} else if (header.getName().equals("Return-Path")) {
-			parsedComponents.bounceToAddress = createAddress(header, "Return-Path");
+			parsedComponents.bounceToAddress = createAddress(header.getValue(), "Return-Path");
 		} else if (!HEADERS_TO_IGNORE.contains(header.getName())) {
 			parsedComponents.headers.put(header.getName(), header.getValue());
 		} else {
@@ -245,12 +245,15 @@ public static List<Header> retrieveAllHeaders(@Nonnull final MimePart part) {
 		}
 	}
 
-	@Nonnull
-	private static InternetAddress createAddress(final Header header, final String typeOfAddress) {
+	@Nullable
+	static InternetAddress createAddress(final String address, final String typeOfAddress) {
 		try {
-			return new InternetAddress(header.getValue());
+			return new InternetAddress(address);
 		} catch (final AddressException e) {
-			throw new MimeMessageParseException(format(MimeMessageParseException.ERROR_PARSING_ADDRESS, typeOfAddress), e);
+			if (e.getMessage().equals("Empty address")) {
+				return null;
+			}
+			throw new MimeMessageParseException(format(MimeMessageParseException.ERROR_PARSING_ADDRESS, typeOfAddress, address), e);
 		}
 	}
 

src/test/java/org/simplejavamail/converter/internal/mimemessage/MimeMessageParserTest.java

@@ -1,5 +1,6 @@
 package org.simplejavamail.converter.internal.mimemessage;
 
+import org.assertj.core.api.ThrowableAssert;
 import org.junit.Test;
 import org.simplejavamail.converter.EmailConverter;
 import org.simplejavamail.converter.internal.mimemessage.MimeMessageParser.ParsedMimeMessageComponents;
@@ -9,11 +10,15 @@
 import org.simplejavamail.email.Recipient;
 import testutil.ConfigLoaderTestHelper;
 
+import javax.mail.internet.AddressException;
+import javax.mail.internet.InternetAddress;
 import javax.mail.util.ByteArrayDataSource;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 
 import static javax.mail.Message.RecipientType.TO;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.simplejavamail.converter.internal.mimemessage.MimeMessageParser.moveInvalidEmbeddedResourcesToAttachments;
 
 public class MimeMessageParserTest {
@@ -51,7 +56,37 @@ public void testMoveInvalidEmbeddedResourcesToAttachments_Invalid() throws IOExc
 		assertThat(parsedComponents.cidMap).containsOnlyKeys("moo1");
 		assertThat(parsedComponents.attachmentList).extracting("key").containsOnly("moo2");
 	}
-
+
+	@Test
+	public void testCreateAddress() throws AddressException, UnsupportedEncodingException {
+		assertThat(interpretRecipient("[email protected]")).isEqualTo(new InternetAddress("[email protected]", null));
+		assertThat(interpretRecipient(" [email protected] ")).isEqualTo(new InternetAddress("[email protected]", null));
+		assertThat(interpretRecipient(" <[email protected]> ")).isEqualTo(new InternetAddress("[email protected]", null));
+		assertThat(interpretRecipient(" < [email protected] > ")).isEqualTo(new InternetAddress("[email protected]", null));
+		assertThat(interpretRecipient("moo <[email protected]>")).isEqualTo(new InternetAddress("[email protected]", "moo"));
+		assertThat(interpretRecipient("moo<[email protected]>")).isEqualTo(new InternetAddress("[email protected]", "moo"));
+		assertThat(interpretRecipient(" moo< [email protected]   > ")).isEqualTo(new InternetAddress("[email protected]", "moo"));
+		assertThat(interpretRecipient("\"moo\" <[email protected]>")).isEqualTo(new InternetAddress("[email protected]", "moo"));
+		assertThat(interpretRecipient("\"moo\"<[email protected]>")).isEqualTo(new InternetAddress("[email protected]", "moo"));
+		assertThat(interpretRecipient(" \"moo\"< [email protected]   > ")).isEqualTo(new InternetAddress("[email protected]", "moo"));
+		assertThat(interpretRecipient(" \"  m oo  \"< [email protected]   > ")).isEqualTo(new InternetAddress("[email protected]", "  m oo  "));
+		assertThat(interpretRecipient("< >")).isNull();
+
+		// next one is unparsable by InternetAddress#parse(), so it should be taken as is
+		assertThatThrownBy(new ThrowableAssert.ThrowingCallable() {
+			@Override
+			public void call() throws Throwable {
+				interpretRecipient(" \"  m oo  \" [email protected]    ");
+			}
+		})
+				.isInstanceOf(MimeMessageParseException.class)
+				.hasMessage("Error parsing [TO] address [ \"  m oo  \" [email protected]    ]");
+	}
+
+	private InternetAddress interpretRecipient(String address) {
+		return MimeMessageParser.createAddress(address, "TO");
+	}
+
 	@Test
 	// https://github.com/bbottema/simple-java-mail/issues/227
 	public void testSemiColonSeparatedToAddresses() {