#89 verify PGP signatures using OpenPGP.js

dev/Stores/User/OpenPGP.js

@@ -7,6 +7,8 @@ import ko from 'ko';
 import { arrayLength } from 'Common/Utils';
 import { delegateRunOnDestroy } from 'Common/UtilsUser';
 
+import Remote from 'Remote/User/Fetch';
+
 import { showScreenPopup } from 'Knoin/Knoin';
 import { OpenPgpKeyPopupView } from 'View/Popup/OpenPgpKey';
 
@@ -201,14 +203,37 @@ export const OpenPGPUserStore = new class {
 		}
 	}
 
-	async verify(message, detachedSignature, publicKey) {
+	/**
-//		message.getSigningKeyIDs();
+	 * https://docs.openpgpjs.org/#sign-and-verify-cleartext-messages
-		return await openpgp.verify({
+	 */
-			message,
+	async verify(message) {
-			verificationKeys: publicKey,
+		const data = message.pgpSigned(), // { BodyPartId: "1", SigPartId: "2", MicAlg: "pgp-sha256" }
+			publicKey = this.publicKeys().find(key => key.emails.includes(message.from[0].email));
+		if (data && publicKey) {
+			data.Folder = message.folder;
+			data.Uid = message.uid;
+			data.GnuPG = 0;
+			let response = await Remote.post('MessagePgpVerify', null, data);
+			if (response) {
+				const signature = response.Result.signature
+					? await openpgp.readSignature({ armoredSignature: response.Result.signature })
+					: null;
+				const signedMessage = signature
+					? await openpgp.createMessage({ text: response.Result.text })
+					: await openpgp.readCleartextMessage({ cleartextMessage: response.Result.text });
+//				(signature||signedMessage).getSigningKeyIDs();
+				let result = await openpgp.verify({
+					message: signedMessage,
+					verificationKeys: publicKey.key,
 //					expectSigned: true, // !!detachedSignature
-			signature: detachedSignature
+					signature: signature
 				});
+				return {
+					fingerprint: publicKey.fingerprint,
+					success: result && !!result.signatures.length
+				};
+			}
+		}
 	}
 
 };

dev/Stores/User/Pgp.js

@@ -180,6 +180,7 @@ export const PgpUserStore = new class {
 		if (/-----BEGIN PGP SIGNED MESSAGE-----/.test(plain) && /-----BEGIN PGP SIGNATURE-----/.test(plain)) {
 			let result = await OpenPGPUserStore.verify(plain);
 			console.dir(result);
+			return;
 		}
 		if (message.pgpSigned()) {
 			const sender = message.from[0].email;
@@ -188,34 +189,11 @@ export const PgpUserStore = new class {
 				return GnuPGUserStore.verify(message);
 			}
 			if ('openpgp' === mode) {
-				const publicKey = OpenPGPUserStore.getPublicKeyFor(sender);
+				return OpenPGPUserStore.verify(message);
-				OpenPGPUserStore.verify(plain, null/*detachedSignature*/, publicKey).then(result => {
-					if (result) {
-						message.plain(result.data);
-						message.viewPlain();
-						console.dir({signatures:result.signatures});
-					}
-/*
-						if (validKey) {
-							i18n('PGP_NOTIFICATIONS/GOOD_SIGNATURE', {
-								USER: validKey.user + ' (' + validKey.id + ')'
-							});
-							message.getText()
-						} else {
-							const keyIds = arrayLength(signingKeyIds) ? signingKeyIds : null,
-								additional = keyIds
-									? keyIds.map(item => (item && item.toHex ? item.toHex() : null)).filter(v => v).join(', ')
-									: '';
-
-							i18n('PGP_NOTIFICATIONS/UNVERIFIRED_SIGNATURE') + (additional ? ' (' + additional + ')' : '');
-						}
-*/
-				});
 			}
 		}
 	}
 
-
 	/**
 	 * Creates an iframe with an editor for a new encrypted mail.
 	 * The iframe will be injected into the container identified by selector.

dev/View/Popup/Compose.js

@@ -457,9 +457,9 @@ class ComposePopupView extends AbstractViewPopup {
 						data: params.Text,
 					};
 				if ('openpgp' == sign) {
-					let privateKey;
+					let privateKey, sender = this.currentIdentity().email();
 					try {
-						const key = OpenPGPUserStore.getPrivateKeyFor(this.currentIdentity().email());
+						const key = OpenPGPUserStore.getPrivateKeyFor(sender);
 						if (key) {
 							key.decrypt(window.prompt('Passphrase'));
 							cfg.privateKey = privateKey = key;
@@ -470,7 +470,7 @@ class ComposePopupView extends AbstractViewPopup {
 					}
 					if (!privateKey) {
 						this.sendError(true);
-						this.sendErrorDesc(i18n('PGP_NOTIFICATIONS/NO_PRIVATE_KEY_FOUND'));
+						this.sendErrorDesc(i18n('PGP_NOTIFICATIONS/NO_PRIVATE_KEY_FOUND_FOR', { EMAIL: sender }));
 						return;
 					}
 				}

dev/View/User/MailBox/MessageView.js

@@ -641,10 +641,26 @@ export class MailMessageView extends AbstractViewRight {
 	pgpVerify(/*self, event*/) {
 		const oMessage = currentMessage()/*, ctrl = event.target.closest('.openpgp-control')*/;
 		PgpUserStore.verify(oMessage).then(result => {
-			console.dir({result:result});
 			if (result) {
 				oMessage.pgpVerified(result);
 			}
+/*
+			if (result && result.success) {
+				i18n('PGP_NOTIFICATIONS/GOOD_SIGNATURE', {
+					USER: validKey.user + ' (' + validKey.id + ')'
+				});
+				message.getText()
+			} else {
+				const keyIds = arrayLength(signingKeyIds) ? signingKeyIds : null,
+					additional = keyIds
+						? keyIds.map(item => (item && item.toHex ? item.toHex() : null)).filter(v => v).join(', ')
+						: '';
+
+				i18n('PGP_NOTIFICATIONS/PGP_ERROR', {
+					ERROR: 'message'
+				}) + (additional ? ' (' + additional + ')' : '');
+			}
+*/
 		});
 	}
 

snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php

@@ -700,6 +700,7 @@ trait Messages
 			];
 		}
 
+		if ($this->GetActionParam('GnuPG', 1)) {
 			$GPG = $this->GnuPG();
 			if ($GPG) {
 				$info = $this->GnuPG()->verify($result['text'], $result['signature'])[0];
@@ -740,6 +741,7 @@ trait Messages
 					}, ARRAY_FILTER_USE_KEY))
 				];
 			}
+		}
 
 		return $this->DefaultResponse(__FUNCTION__, $result);
 	}