#283: fix for quoted-printable calendar attachments

Author: bbottema

modules/simple-java-mail/src/main/java/org/simplejavamail/converter/internal/mimemessage/MimeMessageParser.java

@@ -26,7 +26,6 @@
 import javax.mail.internet.MimeUtility;
 import javax.mail.internet.ParseException;
 import javax.mail.util.ByteArrayDataSource;
-import javax.mail.util.SharedByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
@@ -142,7 +141,7 @@ private static void parseMimePartTree(@NotNull final MimePart currentPart, @NotN
 			//noinspection RedundantCast
 			parsedComponents.htmlContent.append((Object) parseContent(currentPart));
 		} else if (isMimeType(currentPart, "text/calendar") && parsedComponents.calendarContent == null && !Part.ATTACHMENT.equalsIgnoreCase(disposition)) {
-			final SharedByteArrayInputStream calendarContent = parseContent(currentPart);
+			final InputStream calendarContent = parseContent(currentPart);
 			try {
 				parsedComponents.calendarContent = MiscUtil.readInputStreamToString(calendarContent, UTF_8);
 			} catch (IOException e) {

modules/simple-java-mail/src/test/java/org/simplejavamail/converter/EmailConverterTest.java

@@ -2,11 +2,15 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.junit.Test;
+import org.simplejavamail.api.email.CalendarMethod;
 import org.simplejavamail.api.email.Email;
 import org.simplejavamail.api.email.EmailAssert;
 import org.simplejavamail.api.email.Recipient;
+import testutil.SecureTestDataHelper;
+import testutil.SecureTestDataHelper.PasswordsConsumer;
 
 import java.io.File;
+import java.util.Properties;
 
 import static demo.ResourceFolderHelper.determineResourceFolder;
 import static javax.mail.Message.RecipientType.CC;
@@ -16,15 +20,16 @@
 
 public class EmailConverterTest {
 
-	private static final String RESOURCE_FOLDER = determineResourceFolder("simple-java-mail") + "/test/resources/test-messages";
+	private static final String RESOURCES = determineResourceFolder("simple-java-mail") + "/test/resources";
+	private static final String RESOURCE_TEST_MESSAGES = RESOURCES + "/test-messages";
 
 	@Test
 	public void testOutlookBasicConversions() {
 		final Recipient elias = new Recipient("Elias Laugher", "[email protected]", null);
 		final Recipient sven = new Recipient("Sven Sielenkemper", "[email protected]", TO);
 		final Recipient niklas = new Recipient("[email protected]", "[email protected]", CC);
 
-		@NotNull Email msg = EmailConverter.outlookMsgToEmail(new File(RESOURCE_FOLDER + "/simple email with TO and CC.msg"));
+		@NotNull Email msg = EmailConverter.outlookMsgToEmail(new File(RESOURCE_TEST_MESSAGES + "/simple email with TO and CC.msg"));
 		EmailAssert.assertThat(msg).hasFromRecipient(elias);
 		EmailAssert.assertThat(msg).hasSubject("Test E-Mail");
 		EmailAssert.assertThat(msg).hasOnlyRecipients(sven, niklas);
@@ -39,7 +44,7 @@ public void testOutlookUnicode() {
 		final Recipient kalejs = new Recipient("[email protected]", "[email protected]", null);
 		final Recipient dummy = new Recipient("[email protected]", "[email protected]", TO);
 
-		@NotNull Email msg = EmailConverter.outlookMsgToEmail(new File(RESOURCE_FOLDER + "/tst_unicode.msg"));
+		@NotNull Email msg = EmailConverter.outlookMsgToEmail(new File(RESOURCE_TEST_MESSAGES + "/tst_unicode.msg"));
 		EmailAssert.assertThat(msg).hasFromRecipient(kalejs);
 		EmailAssert.assertThat(msg).hasSubject("Testcase");
 		EmailAssert.assertThat(msg).hasOnlyRecipients(dummy);
@@ -65,12 +70,26 @@ public void testOutlookUnicode() {
 	public void testOutlookUnsentDraft() {
 		final Recipient time2talk = new Recipient("[email protected]", "[email protected]", TO);
 
-		@NotNull Email msg = EmailConverter.outlookMsgToEmail(new File(RESOURCE_FOLDER + "/unsent draft.msg"));
+		@NotNull Email msg = EmailConverter.outlookMsgToEmail(new File(RESOURCE_TEST_MESSAGES + "/unsent draft.msg"));
 		EmailAssert.assertThat(msg).hasFromRecipient(new Recipient(null, "[email protected]", null));
 		EmailAssert.assertThat(msg).hasSubject("MSG Test File");
 		EmailAssert.assertThat(msg).hasOnlyRecipients(time2talk);
 		EmailAssert.assertThat(msg).hasNoAttachments();
 		assertThat(msg.getPlainText()).isNotEmpty();
 		assertThat(normalizeNewlines(msg.getHTMLText())).isNotEmpty();
 	}
+
+	@Test
+	public void testEmlWithQuotablePrintableCalendarAttachment()
+			throws Exception {
+		SecureTestDataHelper.runTestWithSecureTestData(new PasswordsConsumer() {
+			@Override
+			public void accept(final Properties passwords) {
+				File file = new File(RESOURCES + "/secure-testdata/secure-testdata/calendar-quotable-printable-email/qp-calendar-multipart.eml");
+				final Email email = EmailConverter.emlToEmail(file);
+				assertThat(email.getCalendarMethod()).isEqualTo(CalendarMethod.REQUEST);
+				assertThat(email.getCalendarText()).startsWith("BEGIN:VCALENDAR");
+			}
+		});
+	}
 }