Clarified field/method names to indicate it is not just about S/MIME signed emails, but also about encrypted email

Author: bbottema

modules/core-module/src/main/java/org/simplejavamail/api/internal/smimesupport/builder/SmimeParseResult.java

@@ -10,7 +10,7 @@
 
 public interface SmimeParseResult {
 	@NotNull OriginalSmimeDetails getOriginalSmimeDetails();
-	@Nullable AttachmentResource getSmimeSignedEmail();
+	@Nullable AttachmentResource getSmimeSignedOrEncryptedEmail();
 	@NotNull List<AttachmentDecryptionResult> getDecryptedAttachmentResults();
 	@NotNull List<AttachmentResource> getDecryptedAttachments();
 }

modules/simple-java-mail/src/main/java/org/simplejavamail/converter/EmailConverter.java

@@ -267,8 +267,8 @@ private static void updateEmailIfBothSignedAndEncrypted(final EmailPopulatingBui
 	private static void handleSmimeParseResult(final InternalEmailPopulatingBuilder emailBuilder, final SmimeParseResult smimeParseResult) {
 		emailBuilder.withDecryptedAttachments(smimeParseResult.getDecryptedAttachments());
 		emailBuilder.withOriginalSmimeDetails(smimeParseResult.getOriginalSmimeDetails());
-		if (smimeParseResult.getSmimeSignedEmail() != null) {
-			emailBuilder.withSmimeSignedEmail(emlToEmail(smimeParseResult.getSmimeSignedEmail().getDataSourceInputStream()));
+		if (smimeParseResult.getSmimeSignedOrEncryptedEmail() != null) {
+			emailBuilder.withSmimeSignedEmail(emlToEmail(smimeParseResult.getSmimeSignedOrEncryptedEmail().getDataSourceInputStream()));
 		}
 	}
 

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

@@ -221,7 +221,7 @@ public void createMailSession_OutlookMessageSmimeEncryptTest()
 				.smimeName("smime.p7m")
 				.build());
 	}
-
+	
 	@Test
 	public void createMailSession_OutlookMessageSmimeSignEncryptTest()
 			throws IOException, MessagingException, ExecutionException, InterruptedException {
@@ -230,9 +230,9 @@ public void createMailSession_OutlookMessageSmimeSignEncryptTest()
 		builder.encryptWithSmime(new File(RESOURCES_PKCS + "/smime_test_user.pem.standard.crt"));
 		Email email = assertSendingEmail(builder, false, true, false, true, false);
 		verifyReceivedOutlookEmail(email, true, true);
-
+		
 		EmailAssert.assertThat(email).wasMergedWithSmimeSignedMessage();
-
+		
 		EmailAssert.assertThat(email).hasOriginalSmimeDetails(OriginalSmimeDetailsImpl.builder()
 				.smimeMode(SmimeMode.SIGNED_ENCRYPTED)
 				.smimeMime("application/pkcs7-mime")
@@ -248,6 +248,32 @@ public void createMailSession_OutlookMessageSmimeSignEncryptTest()
 				.smimeSignedBy("Benny Bottema")
 				.build());
 	}
+	
+	@Test
+	public void testEncryptSendAndReceiveDecrypt()
+			throws IOException, MessagingException, ExecutionException, InterruptedException {
+		val builder = EmailHelper.createDummyEmailBuilder(null, true, true, true, false, false, false, false)
+				.encryptWithSmime(new File(RESOURCES_PKCS + "/smime_test_user.pem.standard.crt"));
+		
+		Email email = assertSendingEmail(builder, false, true, false, false, false);
+		
+		EmailAssert.assertThat(email).wasMergedWithSmimeSignedMessage();
+		
+		EmailAssert.assertThat(email).hasOriginalSmimeDetails(OriginalSmimeDetailsImpl.builder()
+				.smimeMode(SmimeMode.ENCRYPTED)
+				.smimeMime("application/pkcs7-mime")
+				.smimeType("enveloped-data")
+				.smimeName("smime.p7m")
+				.build());
+		EmailAssert.assertThat(email.getSmimeSignedEmail()).hasOriginalSmimeDetails(OriginalSmimeDetailsImpl.builder()
+				.smimeMode(SmimeMode.PLAIN)
+				.smimeMime(null)
+				.smimeProtocol(null)
+				.smimeMicalg(null)
+				.smimeSignatureValid(null)
+				.smimeSignedBy(null)
+				.build());
+	}
 
 	private void verifyReceivedOutlookEmail(final Email email, final boolean smimeSigned, final boolean smimeEncrypted) throws IOException {
 		// Google SMTP overrode this, Outlook recognized it as: Benny Bottema <[email protected]>; on behalf of; lollypop <[email protected]>
@@ -381,6 +407,17 @@ private Email assertSendingEmail(final EmailPopulatingBuilder originalEmailPopul
 
 		if (!skipChecksDueToSmime) { // reading a signed mail is different from building a new one
 			assertThat(receivedEmail).isEqualTo(originalEmailPopulatingBuilder.buildEmail());
+		} else {
+			val originalMail = originalEmailPopulatingBuilder.buildEmail();
+			EmailAssert.assertThat(receivedEmail).hasSubject(originalMail.getSubject());
+			EmailAssert.assertThat(receivedEmail).hasFromRecipient(originalMail.getFromRecipient());
+			EmailAssert.assertThat(receivedEmail).hasOnlyRecipients(originalMail.getRecipients());
+			EmailAssert.assertThat(receivedEmail).hasHTMLText(originalMail.getHTMLText());
+			EmailAssert.assertThat(receivedEmail).hasPlainText(originalMail.getPlainText());
+			EmailAssert.assertThat(receivedEmail).hasCalendarMethod(originalMail.getCalendarMethod());
+			EmailAssert.assertThat(receivedEmail).hasCalendarText(originalMail.getCalendarText());
+			EmailAssert.assertThat(receivedEmail).hasBounceToRecipient(originalMail.getBounceToRecipient());
+			EmailAssert.assertThat(receivedEmail).hasDispositionNotificationTo(originalMail.getDispositionNotificationTo());
 		}
 
 		return receivedEmail;

modules/smime-module/src/main/java/org/simplejavamail/internal/smimesupport/SMIMESupport.java

@@ -111,7 +111,7 @@ public SmimeParseResultBuilder decryptAttachments(@NotNull final List<Attachment
 
 		if (smimeBuilder.getOriginalSmimeDetails().getSmimeMode() == SmimeMode.SIGNED) {
 			// this is the only way for Outlook messages to know a valid signature was included
-			smimeBuilder.getOriginalSmimeDetails().completeWithSmimeSignatureValid(smimeBuilder.getSmimeSignedEmail() != null);
+			smimeBuilder.getOriginalSmimeDetails().completeWithSmimeSignatureValid(smimeBuilder.getSmimeSignedOrEncryptedEmail() != null);
 		}
 
 		return smimeBuilder;
@@ -182,7 +182,7 @@ private void decryptAttachments(@NotNull final SmimeParseResultBuilder smimeBuil
 			final AttachmentDecryptionResult onlyAttachmentDecrypted = smimeBuilder.getDecryptedAttachmentResults().get(0);
 			if (isSmimeAttachment(onlyAttachment) && isMimeMessageAttachment(onlyAttachmentDecrypted.getAttachmentResource())) {
 				smimeBuilder.getOriginalSmimeDetails().completeWith(determineSmimeDetails(onlyAttachment));
-				smimeBuilder.setSmimeSignedEmail(onlyAttachmentDecrypted.getAttachmentResource());
+				smimeBuilder.setSmimeSignedOrEncryptedEmail(onlyAttachmentDecrypted.getAttachmentResource());
 			}
 		}
 	}

modules/smime-module/src/main/java/org/simplejavamail/internal/smimesupport/builder/SmimeParseResultBuilder.java

@@ -18,7 +18,7 @@ public class SmimeParseResultBuilder implements SmimeParseResult {
 
 	@NotNull private final List<AttachmentDecryptionResult> decryptedAttachmentResults = new ArrayList<>();
 	@NotNull private final OriginalSmimeDetailsImpl originalSmimeDetails = OriginalSmimeDetailsImpl.builder().build();
-	@Nullable private AttachmentResource smimeSignedEmail;
+	@Nullable private AttachmentResource smimeSignedOrEncryptedEmail;
 
 	public void addDecryptedAttachments(@NotNull final List<AttachmentDecryptionResult> attachments) {
 		decryptedAttachmentResults.addAll(attachments);