Handle S/MIME encrypt, decrypt, sign and very everywhere #259

dev/App/User.js

@@ -35,7 +35,7 @@ import { AccountUserStore } from 'Stores/User/Account';
 import { ContactUserStore } from 'Stores/User/Contact';
 import { FolderUserStore } from 'Stores/User/Folder';
 import { PgpUserStore } from 'Stores/User/Pgp';
-import { SMimeUserStore } from 'Stores/User/SMime';
+//import { SMimeUserStore } from 'Stores/User/SMime';
 import { MessagelistUserStore } from 'Stores/User/Messagelist';
 import { ThemeStore, initThemes } from 'Stores/Theme';
 import { LanguageStore } from 'Stores/Language';
@@ -217,7 +217,8 @@ export class AppUser extends AbstractApp {
 						setInterval(reloadTime, 60000);
 
 						PgpUserStore.init();
-						SMimeUserStore.loadCertificates();
+// TODO:
+//						SMimeUserStore.loadCertificates();
 
 						setTimeout(() => mailToHelper(SettingsGet('mailToEmail')), 500);
 

dev/Mime/Utils.js

@@ -12,7 +12,6 @@ import { EmailModel } from 'Model/Email';
  */
 export function MimeToMessage(data, message)
 {
-	let signed;
 	const struct = ParseMime(data);
 	if (struct.headers) {
 		let html = struct.getByContentType('text/html'),
@@ -65,12 +64,21 @@ export function MimeToMessage(data, message)
 				} else {
 					message.attachments.push(attachment);
 				}
-			} else if ('multipart/signed' === type.value && 'application/pgp-signature' === type.params.protocol) {
-				signed = {
-					micAlg: type.micalg,
-					bodyPart: part.parts[0],
-					sigPart: part.parts[1]
-				};
+			} else if ('multipart/signed' === type.value) {
+				let protocol = type.params.protocol;
+				if ('application/pgp-signature' === protocol) {
+					message.pgpSigned({
+						micAlg: type.micalg,
+						bodyPart: part.parts[0],
+						sigPart: part.parts[1]
+					});
+				} else if ('application/pkcs7-signature' === protocol.replace('x-')) {
+					message.smimeSigned({
+						micAlg: type.micalg,
+						bodyPart: part,
+						detached: true
+					});
+				}
 			}
 		});
 
@@ -81,10 +89,9 @@ export function MimeToMessage(data, message)
 		message.plain(data);
 	}
 
-	if (!signed && message.plain().includes(BEGIN_PGP_MESSAGE)) {
-		signed = true;
+	if (message.plain().includes(BEGIN_PGP_MESSAGE)) {
+		message.pgpSigned(true);
 	}
-	message.pgpSigned(signed);
 
 	// TODO: Verify instantly?
 }

dev/View/Popup/Compose.js

@@ -33,6 +33,7 @@ import { PgpUserStore } from 'Stores/User/Pgp';
 import { OpenPGPUserStore } from 'Stores/User/OpenPGP';
 import { GnuPGUserStore } from 'Stores/User/GnuPG';
 //import { OpenPgpImportPopupView } from 'View/Popup/OpenPgpImport';
+import { SMimeUserStore } from 'Stores/User/SMime';
 
 import { MessageUserStore } from 'Stores/User/Message';
 import { MessagelistUserStore } from 'Stores/User/Messagelist';
@@ -377,21 +378,21 @@ export class ComposePopupView extends AbstractViewPopup {
 					});
 					this.pgpSignKey(result)
 				});
-				this.initPgpEncrypt();
+				this.initEncrypt();
 			},
 
 			cc: value => {
 				if (false === this.showCc() && value.length) {
 					this.showCc(true);
 				}
-				this.initPgpEncrypt();
+				this.initEncrypt();
 			},
 
 			bcc: value => {
 				if (false === this.showBcc() && value.length) {
 					this.showBcc(true);
 				}
-				this.initPgpEncrypt();
+				this.initEncrypt();
 			},
 
 			replyTo: value => {
@@ -410,7 +411,7 @@ export class ComposePopupView extends AbstractViewPopup {
 				if (this.emptyToError() && value.length) {
 					this.emptyToError(false);
 				}
-				this.initPgpEncrypt();
+				this.initEncrypt();
 			},
 
 			attachmentsInProcess: value => {
@@ -1387,7 +1388,7 @@ export class ComposePopupView extends AbstractViewPopup {
 			].join(',').split(',').map(value => getEmail(value.trim())).validUnique();
 	}
 
-	initPgpEncrypt() {
+	initEncrypt() {
 		const recipients = this.allRecipients();
 		PgpUserStore.hasPublicKeyForEmails(recipients).then(result => {
 			console.log({canPgpEncrypt:result});
@@ -1401,6 +1402,14 @@ export class ComposePopupView extends AbstractViewPopup {
 //				this.dropMailvelope();
 			}
 		});
+		const count = recipients.length,
+			identity = this.currentIdentity(),
+			from = (identity.smimeKey() && identity.smimeCertificate()) ? identity.email() : null,
+			length = count ? recipients.filter(email =>
+				email == from
+				|| SMimeUserStore.find(certificate => email == certificate.emailAddress && certificate.smimeencrypt)
+			).length : 0;
+		this.canSMimeEncrypt(length && length === count);
 	}
 
 	async getMessageRequestParams(sSaveFolder, draft)
@@ -1561,12 +1570,13 @@ export class ComposePopupView extends AbstractViewPopup {
 					// Does encrypt attachments
 					params.encryptFingerprints = JSON.stringify(GnuPGUserStore.getPublicKeyFingerprints(recipients));
 					autocrypt();
-/*
-				} else if (identity && identity.smimeCertificate()) {
-					// TODO: S/MIME certificates of all recipients
+				} else if (this.canSMimeEncrypt() && identity && identity.smimeKey() && identity.smimeCertificate()) {
 					params.encryptCertificates = [identity.smimeCertificate()];
-				}
-*/
+					SMimeUserStore.forEach(certificate => {
+						certificate.emailAddress != identity.email()
+						&& recipients.includes(certificate.emailAddress)
+						&& params.encryptCertificates.push(certificate.id)
+					});
 				} else {
 					throw 'Encryption with ' + encrypt + ' not yet implemented';
 				}