From 8f250eb0c682cd1fffd12b9b093d1374c357f65c Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 25 Nov 2021 07:14:41 +0000 Subject: [PATCH 01/31] refactor decryption functions to use verificationPubs as parameter --- extension/chrome/elements/attachment.ts | 12 +- .../chrome/elements/attachment_preview.ts | 6 +- .../compose-modules/compose-draft-module.ts | 6 +- .../compose-modules/compose-quote-module.ts | 8 +- .../compose-recipients-module.ts | 4 +- .../compose-modules/compose-storage-module.ts | 4 +- extension/chrome/elements/pgp_block.ts | 4 + .../pgp-block-attachmens-module.ts | 3 +- .../pgp-block-decrypt-module.ts | 44 +++---- .../pgp-block-render-module.ts | 5 +- .../pgp-block-signature-module.ts | 73 ++++------- extension/chrome/settings/modules/decrypt.ts | 6 +- extension/js/common/core/crypto/key.ts | 14 ++ .../js/common/core/crypto/pgp/msg-util.ts | 122 ++++-------------- .../js/common/core/crypto/pgp/openpgp-key.ts | 60 ++++++++- .../js/common/platform/store/contact-store.ts | 59 ++------- .../strategies/send-message-strategy.ts | 6 +- test/source/platform/store/contact-store.ts | 6 - test/source/tests/compose.ts | 6 +- test/source/tests/unit-node.ts | 82 +++++++++--- 20 files changed, 268 insertions(+), 262 deletions(-) diff --git a/extension/chrome/elements/attachment.ts b/extension/chrome/elements/attachment.ts index 3db31bff88e..b1a1bec737e 100644 --- a/extension/chrome/elements/attachment.ts +++ b/extension/chrome/elements/attachment.ts @@ -205,7 +205,11 @@ export class AttachmentDownloadView extends View { private processAsPublicKeyAndHideAttachmentIfAppropriate = async () => { if (this.attachment.msgId && this.attachment.id && this.attachment.treatAs() === 'publicKey') { // this is encrypted public key - download && decrypt & parse & render const { data } = await this.gmail.attachmentGet(this.attachment.msgId, this.attachment.id); - const decrRes = await MsgUtil.decryptMessage({ kisWithPp: await KeyStore.getAllWithOptionalPassPhrase(this.acctEmail), encryptedData: data }); + const decrRes = await MsgUtil.decryptMessage({ + kisWithPp: await KeyStore.getAllWithOptionalPassPhrase(this.acctEmail), + encryptedData: data, + verificationPubs: [] // todo: signature? + }); if (decrRes.success && decrRes.content) { const openpgpType = await MsgUtil.type({ data: decrRes.content }); if (openpgpType && openpgpType.type === 'publicKey' && openpgpType.armored) { // 'openpgpType.armored': could potentially process unarmored pubkey files, maybe later @@ -254,7 +258,11 @@ export class AttachmentDownloadView extends View { }; private decryptAndSaveAttachmentToDownloads = async () => { - const result = await MsgUtil.decryptMessage({ kisWithPp: await KeyStore.getAllWithOptionalPassPhrase(this.acctEmail), encryptedData: this.attachment.getData() }); + const result = await MsgUtil.decryptMessage({ + kisWithPp: await KeyStore.getAllWithOptionalPassPhrase(this.acctEmail), + encryptedData: this.attachment.getData(), + verificationPubs: [] // todo: signature? + }); Xss.sanitizeRender(this.downloadButton, this.originalButtonHTML || ''); if (result.success) { if (!result.filename || ['msg.txt', 'null'].includes(result.filename)) { diff --git a/extension/chrome/elements/attachment_preview.ts b/extension/chrome/elements/attachment_preview.ts index 0ea40612cb0..f358b5e337a 100644 --- a/extension/chrome/elements/attachment_preview.ts +++ b/extension/chrome/elements/attachment_preview.ts @@ -87,7 +87,11 @@ View.run(class AttachmentPreviewView extends AttachmentDownloadView { }; private decrypt = async () => { - const result = await MsgUtil.decryptMessage({ kisWithPp: await KeyStore.getAllWithOptionalPassPhrase(this.acctEmail), encryptedData: this.attachment.getData() }); + const result = await MsgUtil.decryptMessage({ + kisWithPp: await KeyStore.getAllWithOptionalPassPhrase(this.acctEmail), + encryptedData: this.attachment.getData(), + verificationPubs: [] // todo: signature? + }); if ((result as DecryptSuccess).content) { return result.content; } else if ((result as DecryptError).error.type === DecryptErrTypes.needPassphrase) { diff --git a/extension/chrome/elements/compose-modules/compose-draft-module.ts b/extension/chrome/elements/compose-modules/compose-draft-module.ts index 3100a11cb8a..8da5408ab19 100644 --- a/extension/chrome/elements/compose-modules/compose-draft-module.ts +++ b/extension/chrome/elements/compose-modules/compose-draft-module.ts @@ -289,7 +289,11 @@ export class ComposeDraftModule extends ViewModule { return await this.abortAndRenderReplyMsgComposeTableIfIsReplyBox('!rawBlock'); } const encryptedData = rawBlock.content instanceof Buf ? rawBlock.content : Buf.fromUtfStr(rawBlock.content); - const decrypted = await MsgUtil.decryptMessage({ kisWithPp: await KeyStore.getAllWithOptionalPassPhrase(this.view.acctEmail), encryptedData }); + const decrypted = await MsgUtil.decryptMessage({ + kisWithPp: await KeyStore.getAllWithOptionalPassPhrase(this.view.acctEmail), + encryptedData, + verificationPubs: [] + }); if (!decrypted.success) { if (decrypted.error.type === DecryptErrTypes.needPassphrase) { // "close" button will wipe this frame out, so no need to exit the recursion diff --git a/extension/chrome/elements/compose-modules/compose-quote-module.ts b/extension/chrome/elements/compose-modules/compose-quote-module.ts index 20d89796cda..2052951628d 100644 --- a/extension/chrome/elements/compose-modules/compose-quote-module.ts +++ b/extension/chrome/elements/compose-modules/compose-quote-module.ts @@ -123,7 +123,11 @@ export class ComposeQuoteModule extends ViewModule { let attachmentMeta: { content: Buf, filename?: string } | undefined; if (block.type === 'encryptedAttachment') { this.setQuoteLoaderProgress('decrypting...'); - const result = await MsgUtil.decryptMessage({ kisWithPp: await KeyStore.getAllWithOptionalPassPhrase(this.view.acctEmail), encryptedData: block.attachmentMeta.data }); + const result = await MsgUtil.decryptMessage({ + kisWithPp: await KeyStore.getAllWithOptionalPassPhrase(this.view.acctEmail), + encryptedData: block.attachmentMeta.data, + verificationPubs: [] // todo: signature? + }); if (result.success) { attachmentMeta = { content: result.content, filename: result.filename }; } @@ -160,7 +164,7 @@ export class ComposeQuoteModule extends ViewModule { }; private decryptMessage = async (encryptedData: Buf): Promise => { - const decryptRes = await MsgUtil.decryptMessage({ kisWithPp: await KeyStore.getAllWithOptionalPassPhrase(this.view.acctEmail), encryptedData }); + const decryptRes = await MsgUtil.decryptMessage({ kisWithPp: await KeyStore.getAllWithOptionalPassPhrase(this.view.acctEmail), encryptedData, verificationPubs: [] }); if (decryptRes.success) { return decryptRes.content.toUtfStr(); } else if (decryptRes.error && decryptRes.error.type === DecryptErrTypes.needPassphrase) { diff --git a/extension/chrome/elements/compose-modules/compose-recipients-module.ts b/extension/chrome/elements/compose-modules/compose-recipients-module.ts index 2ca61fae8d6..961cc5bd91a 100644 --- a/extension/chrome/elements/compose-modules/compose-recipients-module.ts +++ b/extension/chrome/elements/compose-modules/compose-recipients-module.ts @@ -3,7 +3,7 @@ 'use strict'; import { ChunkedCb, EmailProviderContact, RecipientType } from '../../../js/common/api/shared/api.js'; -import { Contact, KeyUtil } from '../../../js/common/core/crypto/key.js'; +import { Contact, KeyUtil, PubkeyInfo } from '../../../js/common/core/crypto/key.js'; import { PUBKEY_LOOKUP_RESULT_FAIL, PUBKEY_LOOKUP_RESULT_WRONG } from './compose-err-module.js'; import { ProviderContactsQuery, Recipients } from '../../../js/common/api/email-provider/email-provider-api.js'; import { RecipientElement, RecipientStatus } from './compose-types.js'; @@ -20,7 +20,7 @@ import { moveElementInArray } from '../../../js/common/platform/util.js'; import { ViewModule } from '../../../js/common/view-module.js'; import { ComposeView } from '../compose.js'; import { AcctStore } from '../../../js/common/platform/store/acct-store.js'; -import { ContactPreview, ContactStore, ContactUpdate, PubkeyInfo } from '../../../js/common/platform/store/contact-store.js'; +import { ContactPreview, ContactStore, ContactUpdate } from '../../../js/common/platform/store/contact-store.js'; /** * todo - this class is getting too big diff --git a/extension/chrome/elements/compose-modules/compose-storage-module.ts b/extension/chrome/elements/compose-modules/compose-storage-module.ts index ded7e951b96..703b8d35736 100644 --- a/extension/chrome/elements/compose-modules/compose-storage-module.ts +++ b/extension/chrome/elements/compose-modules/compose-storage-module.ts @@ -3,7 +3,7 @@ 'use strict'; import { BrowserMsg } from '../../../js/common/browser/browser-msg.js'; -import { KeyInfo, KeyUtil, Key, PubkeyResult } from '../../../js/common/core/crypto/key.js'; +import { KeyInfo, KeyUtil, Key, PubkeyInfo, PubkeyResult } from '../../../js/common/core/crypto/key.js'; import { ApiErr } from '../../../js/common/api/shared/api-error.js'; import { Assert } from '../../../js/common/assert.js'; import { Catch, UnreportableError } from '../../../js/common/platform/catch.js'; @@ -13,7 +13,7 @@ import { ViewModule } from '../../../js/common/view-module.js'; import { ComposeView } from '../compose.js'; import { KeyStore } from '../../../js/common/platform/store/key-store.js'; import { AcctStore } from '../../../js/common/platform/store/acct-store.js'; -import { ContactStore, PubkeyInfo } from '../../../js/common/platform/store/contact-store.js'; +import { ContactStore } from '../../../js/common/platform/store/contact-store.js'; import { PassphraseStore } from '../../../js/common/platform/store/passphrase-store.js'; import { Settings } from '../../../js/common/settings.js'; diff --git a/extension/chrome/elements/pgp_block.ts b/extension/chrome/elements/pgp_block.ts index 561be9a5338..1b17014187d 100644 --- a/extension/chrome/elements/pgp_block.ts +++ b/extension/chrome/elements/pgp_block.ts @@ -67,6 +67,10 @@ export class PgpBlockView extends View { this.decryptModule = new PgpBlockViewDecryptModule(this); } + public getSigner = () => { + return this.senderEmail; + }; + public render = async () => { const storage = await AcctStore.get(this.acctEmail, ['setup_done', 'google_token_scopes']); this.orgRules = await OrgRules.newInstance(this.acctEmail); diff --git a/extension/chrome/elements/pgp_block_modules/pgp-block-attachmens-module.ts b/extension/chrome/elements/pgp_block_modules/pgp-block-attachmens-module.ts index 2a44a7b15b0..b988e9eae8b 100644 --- a/extension/chrome/elements/pgp_block_modules/pgp-block-attachmens-module.ts +++ b/extension/chrome/elements/pgp_block_modules/pgp-block-attachmens-module.ts @@ -69,7 +69,8 @@ export class PgpBlockViewAttachmentsModule { private decryptAndSaveAttachmentToDownloads = async (encrypted: Attachment) => { const kisWithPp = await KeyStore.getAllWithOptionalPassPhrase(this.view.acctEmail); - const decrypted = await BrowserMsg.send.bg.await.pgpMsgDecrypt({ kisWithPp, encryptedData: encrypted.getData() }); + // todo: signature? + const decrypted = await BrowserMsg.send.bg.await.pgpMsgDecrypt({ kisWithPp, encryptedData: encrypted.getData(), verificationPubs: [] }); if (decrypted.success) { const attachment = new Attachment({ name: encrypted.name.replace(/\.(pgp|gpg)$/, ''), type: encrypted.type, data: decrypted.content }); Browser.saveToDownloads(attachment); diff --git a/extension/chrome/elements/pgp_block_modules/pgp-block-decrypt-module.ts b/extension/chrome/elements/pgp_block_modules/pgp-block-decrypt-module.ts index 377b333c1f9..84056344757 100644 --- a/extension/chrome/elements/pgp_block_modules/pgp-block-decrypt-module.ts +++ b/extension/chrome/elements/pgp_block_modules/pgp-block-decrypt-module.ts @@ -13,6 +13,8 @@ import { Ui } from '../../../js/common/browser/ui.js'; import { Xss } from '../../../js/common/platform/xss.js'; import { KeyStore } from '../../../js/common/platform/store/key-store.js'; import { PassphraseStore } from '../../../js/common/platform/store/passphrase-store.js'; +import { PubkeyInfo } from '../../../js/common/core/crypto/key.js'; +import { ContactStore } from '../../../js/common/platform/store/contact-store.js'; export class PgpBlockViewDecryptModule { @@ -25,6 +27,7 @@ export class PgpBlockViewDecryptModule { } public initialize = async (forcePullMsgFromApi = false) => { + const verificationPubs = (await ContactStore.getOneWithAllPubkeys(undefined, this.view.getSigner()))?.sortedPubkeys ?? []; try { if (this.canReadEmails && this.view.signature === true && this.view.msgId) { this.view.renderModule.renderText('Loading signed message...'); @@ -34,13 +37,13 @@ export class PgpBlockViewDecryptModule { const parsed = await Mime.decode(mimeMsg); if (parsed && typeof parsed.rawSignedContent === 'string' && parsed.signature) { this.view.signature = parsed.signature; - await this.decryptAndRender(Buf.fromUtfStr(parsed.rawSignedContent)); + await this.decryptAndRender(Buf.fromUtfStr(parsed.rawSignedContent), verificationPubs); } else { await this.view.errorModule.renderErr('Error: could not properly parse signed message', parsed.rawSignedContent || parsed.text || parsed.html || mimeMsg.toUtfStr()); } } else if (this.view.encryptedMsgUrlParam && !forcePullMsgFromApi) { // ascii armored message supplied this.view.renderModule.renderText(this.view.signature ? 'Verifying..' : 'Decrypting...'); - await this.decryptAndRender(this.view.encryptedMsgUrlParam); + await this.decryptAndRender(this.view.encryptedMsgUrlParam, verificationPubs); } else { // need to fetch the inline signed + armored or encrypted +armored message block from gmail api if (!this.view.msgId) { Xss.sanitizeRender('#pgp_block', `Missing msgId to fetch message in pgp_block. If this happens repeatedly, please report the issue to human@flowcrypt.com`); @@ -54,7 +57,7 @@ export class PgpBlockViewDecryptModule { this.isPwdMsgBasedOnMsgSnippet = isPwdMsg; this.view.renderModule.renderText('Decrypting...'); this.msgFetchedFromApi = format; - await this.decryptAndRender(Buf.fromUtfStr(armored), undefined, subject); + await this.decryptAndRender(Buf.fromUtfStr(armored), verificationPubs, undefined, subject); } } } catch (e) { @@ -62,27 +65,22 @@ export class PgpBlockViewDecryptModule { } }; - private decryptAndRender = async (encryptedData: Buf, optionalPwd?: string, plainSubject?: string) => { + private decryptAndRender = async (encryptedData: Buf, verificationPubs: PubkeyInfo[], optionalPwd?: string, plainSubject?: string) => { if (typeof this.view.signature !== 'string') { const kisWithPp = await KeyStore.getAllWithOptionalPassPhrase(this.view.acctEmail); - const result = await BrowserMsg.send.bg.await.pgpMsgDecrypt({ kisWithPp, encryptedData }); + const result = await BrowserMsg.send.bg.await.pgpMsgDecrypt({ kisWithPp, encryptedData, verificationPubs }); if (typeof result === 'undefined') { await this.view.errorModule.renderErr(Lang.general.restartBrowserAndTryAgain, undefined); } else if (result.success) { - if (result.signature?.contact && !result.signature.match && this.canReadEmails && this.msgFetchedFromApi !== 'raw' && !result.signature.isErrFatal) { - console.info(`re-fetching message ${this.view.msgId} from api because failed signature check: ${!this.msgFetchedFromApi ? 'full' : 'raw'}`); - await this.initialize(true); - } else { - await this.view.renderModule.decideDecryptedContentFormattingAndRender(result.content, Boolean(result.isEncrypted), result.signature, - async () => { - const decryptResult = await BrowserMsg.send.bg.await.pgpMsgDecrypt({ kisWithPp, encryptedData }); - if (!decryptResult.success) { - return undefined; - } else { - return decryptResult.signature; - } - }, plainSubject); - } + await this.view.renderModule.decideDecryptedContentFormattingAndRender(result.content, Boolean(result.isEncrypted), result.signature, + /* todo: retry? async () => { + const decryptResult = await BrowserMsg.send.bg.await.pgpMsgDecrypt({ kisWithPp, encryptedData, verificationPubs }); + if (!decryptResult.success) { + return undefined; + } else { + return decryptResult.signature; + } + }*/ plainSubject); } else if (result.error.type === DecryptErrTypes.format) { if (this.canReadEmails && this.msgFetchedFromApi !== 'raw') { console.info(`re-fetching message ${this.view.msgId} from api because looks like bad formatting: ${!this.msgFetchedFromApi ? 'full' : 'raw'}`); @@ -99,7 +97,7 @@ export class PgpBlockViewDecryptModule { })); await PassphraseStore.waitUntilPassphraseChanged(this.view.acctEmail, result.longids.needPassphrase); this.view.renderModule.renderText('Decrypting...'); - await this.decryptAndRender(encryptedData, optionalPwd); + await this.decryptAndRender(encryptedData, verificationPubs, optionalPwd); } else { const primaryKi = await KeyStore.getFirstOptional(this.view.acctEmail); if (!result.longids.chosen && !primaryKi) { @@ -119,9 +117,9 @@ export class PgpBlockViewDecryptModule { } else { // this.view.signature is string // sometimes signatures come wrongly percent-encoded. Here we check for typical "=3Dabcd" at the end const sigText = Buf.fromUtfStr(this.view.signature.replace('\n=3D', '\n=')); - const signatureResult = await BrowserMsg.send.bg.await.pgpMsgVerifyDetached({ plaintext: encryptedData, sigText }); - await this.view.renderModule.decideDecryptedContentFormattingAndRender(encryptedData, false, signatureResult, - async () => { return await BrowserMsg.send.bg.await.pgpMsgVerifyDetached({ plaintext: encryptedData, sigText }); }); + const signatureResult = await BrowserMsg.send.bg.await.pgpMsgVerifyDetached({ plaintext: encryptedData, sigText, verificationPubs }); + await this.view.renderModule.decideDecryptedContentFormattingAndRender(encryptedData, false, signatureResult); + // todo: retry? } }; diff --git a/extension/chrome/elements/pgp_block_modules/pgp-block-render-module.ts b/extension/chrome/elements/pgp_block_modules/pgp-block-render-module.ts index 9737066f1df..e3ea0b911da 100644 --- a/extension/chrome/elements/pgp_block_modules/pgp-block-render-module.ts +++ b/extension/chrome/elements/pgp_block_modules/pgp-block-render-module.ts @@ -76,10 +76,9 @@ export class PgpBlockViewRenderModule { } }; - public decideDecryptedContentFormattingAndRender = async (decryptedBytes: Buf, isEncrypted: boolean, sigResult: VerifyRes | undefined, - retryVerification: () => Promise, plainSubject?: string) => { + public decideDecryptedContentFormattingAndRender = async (decryptedBytes: Buf, isEncrypted: boolean, sigResult: VerifyRes | undefined, plainSubject?: string) => { this.setFrameColor(isEncrypted ? 'green' : 'gray'); - this.view.signatureModule.renderPgpSignatureCheckResult(sigResult, retryVerification); + this.view.signatureModule.renderPgpSignatureCheckResult(sigResult); const publicKeys: string[] = []; let renderableAttachments: Attachment[] = []; let decryptedContent = decryptedBytes.toUtfStr(); diff --git a/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts b/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts index 552cdc3f8e6..6c3e10114f0 100644 --- a/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts +++ b/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts @@ -2,67 +2,50 @@ 'use strict'; -import { ApiErr } from '../../../js/common/api/shared/api-error.js'; -import { BrowserMsg } from '../../../js/common/browser/browser-msg.js'; -import { Catch } from '../../../js/common/platform/catch.js'; import { PgpBlockView } from '../pgp_block'; import { Ui } from '../../../js/common/browser/ui.js'; import { VerifyRes } from '../../../js/common/core/crypto/pgp/msg-util.js'; -import { ContactStore } from '../../../js/common/platform/store/contact-store.js'; -import { Str } from '../../../js/common/core/common.js'; export class PgpBlockViewSignatureModule { - private static setSigner = (signature: VerifyRes): void => { - const signerEmail = signature.signer?.primaryUserId ? Str.parseEmail(signature.signer.primaryUserId).email : undefined; - $('#pgp_signature > .cursive > span').text(signerEmail || 'Unknown Signer'); - }; - constructor(private view: PgpBlockView) { } - public renderPgpSignatureCheckResult = (signature: VerifyRes | undefined, retryVerification?: () => Promise) => { + public renderPgpSignatureCheckResult = (signature: VerifyRes | undefined) => { this.view.renderModule.doNotSetStateAsReadyYet = true; // so that body state is not marked as ready too soon - automated tests need to know when to check results - if (signature?.signer && !signature.contact) { - this.renderPgpSignatureCheckMissingPubkeyOptions(signature.signer.longid, this.view.senderEmail, retryVerification).then((newSignature) => { // async so that it doesn't block rendering - if (newSignature) { - return this.renderPgpSignatureCheckResult(newSignature, undefined); - } - PgpBlockViewSignatureModule.setSigner(signature); - this.view.renderModule.doNotSetStateAsReadyYet = false; - Ui.setTestState('ready'); - $('#pgp_block').css('min-height', '100px'); // signature fail can have a lot of text in it to render - this.view.renderModule.resizePgpBlockFrame(); - }).catch(Catch.reportErr); + if (!signature) { + $('#pgp_signature').addClass('bad'); + $('#pgp_signature > .cursive').remove(); + $('#pgp_signature > .result').text('Message Not Signed'); + } else if (signature.error) { + $('#pgp_signature').addClass('bad'); + $('#pgp_signature > .result').text(signature.error); + this.view.renderModule.setFrameColor('red'); + } else if (signature.match) { + $('#pgp_signature').addClass('good'); + $('#pgp_signature > .result').text('matching signature'); } else { - if (!signature) { - $('#pgp_signature').addClass('bad'); - $('#pgp_signature > .cursive').remove(); - $('#pgp_signature > .result').text('Message Not Signed'); - } else if (signature.error) { - $('#pgp_signature').addClass('bad'); - $('#pgp_signature > .result').text(signature.error); - this.view.renderModule.setFrameColor('red'); - } else if (signature.match && signature.signer && signature.contact) { - $('#pgp_signature').addClass('good'); - $('#pgp_signature > .result').text('matching signature'); - } else { - $('#pgp_signature').addClass('bad'); - $('#pgp_signature > .result').text('signature does not match'); - this.view.renderModule.setFrameColor('red'); - } - if (signature) { - PgpBlockViewSignatureModule.setSigner(signature); - } - this.view.renderModule.doNotSetStateAsReadyYet = false; - Ui.setTestState('ready'); + $('#pgp_signature').addClass('bad'); + $('#pgp_signature > .result').text('signature does not match'); + this.view.renderModule.setFrameColor('red'); + } + if (signature) { + this.setSigner(signature); } - // $('#pgp_signature').css('block'); + this.view.renderModule.doNotSetStateAsReadyYet = false; + Ui.setTestState('ready'); + }; + + private setSigner = (signature: VerifyRes): void => { + const signerEmail = signature.match ? this.view.getSigner() : undefined; + $('#pgp_signature > .cursive > span').text(signerEmail || 'Unknown Signer'); }; /** * don't have appropriate pubkey by longid in contacts + * */ + /* private renderPgpSignatureCheckMissingPubkeyOptions = async (signerLongid: string, senderEmail: string, retryVerification?: () => Promise): Promise => { const render = (note: string, action: () => void) => $('#pgp_signature').addClass('neutral').find('.result').text(note).click(this.view.setHandler(action)); @@ -109,5 +92,5 @@ export class PgpBlockViewSignatureModule { } return undefined; }; - +*/ } diff --git a/extension/chrome/settings/modules/decrypt.ts b/extension/chrome/settings/modules/decrypt.ts index 74cc3de6062..4283a97bfab 100644 --- a/extension/chrome/settings/modules/decrypt.ts +++ b/extension/chrome/settings/modules/decrypt.ts @@ -55,7 +55,11 @@ View.run(class ManualDecryptView extends View { }; private decryptAndDownload = async (encrypted: Attachment) => { // todo - this is more or less copy-pasted from attachment.js, should use common function - const result = await MsgUtil.decryptMessage({ kisWithPp: await KeyStore.getAllWithOptionalPassPhrase(this.acctEmail), encryptedData: encrypted.getData() }); + const result = await MsgUtil.decryptMessage({ + kisWithPp: await KeyStore.getAllWithOptionalPassPhrase(this.acctEmail), + encryptedData: encrypted.getData(), + verificationPubs: [] // todo: signature? + }); if (result.success) { const attachment = new Attachment({ name: encrypted.name.replace(/\.(pgp|gpg|asc)$/i, ''), type: encrypted.type, data: result.content }); Browser.saveToDownloads(attachment); diff --git a/extension/js/common/core/crypto/key.ts b/extension/js/common/core/crypto/key.ts index bf6912edcdd..fcb4a6d047b 100644 --- a/extension/js/common/core/crypto/key.ts +++ b/extension/js/common/core/crypto/key.ts @@ -67,6 +67,20 @@ export interface KeyInfo { emails?: string[]; // todo - used to be missing - but migration was supposed to add it? setting back to optional for now } +export type PubkeyInfo = { + pubkey: Key, + // IMPORTANT NOTE: + // It might look like we can format PubkeyInfo[] out of Key[], but that's not good, + // because in the storage we have the table Revocations that stores fingerprints + // of revoked keys that may not exist in the database (Pubkeys table), + // that is pre-emptive external revocation. So (in a rare case) the lookup method + // receives a valid key, saves it to the storage, and after re-querying the storage, + // this key maybe returned as revoked. This is why PubkeyInfo has revoked property + // regardless of the fact that Key itself also has it. + revoked: boolean, + lastCheck?: number | undefined +}; + export interface KeyIdentity { id: string, // a fingerprint of the primary key in OpenPGP, and similarly a fingerprint of the actual cryptographic key (eg RSA fingerprint) in S/MIME type: 'openpgp' | 'x509' diff --git a/extension/js/common/core/crypto/pgp/msg-util.ts b/extension/js/common/core/crypto/pgp/msg-util.ts index e67c69c0337..c0eac1d5c96 100644 --- a/extension/js/common/core/crypto/pgp/msg-util.ts +++ b/extension/js/common/core/crypto/pgp/msg-util.ts @@ -1,15 +1,12 @@ /* ©️ 2016 - present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com */ 'use strict'; -import { Contact, Key, KeyInfo, ExtendedKeyInfo, KeyUtil } from '../key.js'; +import { Key, KeyInfo, ExtendedKeyInfo, KeyUtil, PubkeyInfo } from '../key.js'; import { MsgBlockType, ReplaceableMsgBlockType } from '../../msg-block.js'; -import { Value } from '../../common.js'; import { Buf } from '../../buf.js'; -import { Catch } from '../../../platform/catch.js'; import { PgpArmor, PreparedForDecrypt } from './pgp-armor.js'; import { opgp } from './openpgpjs-custom.js'; import { KeyCache } from '../../../platform/key-cache.js'; -import { ContactStore } from '../../../platform/store/contact-store.js'; import { SmimeKey, SmimeMsg } from '../smime/smime-key.js'; import { OpenPGPKey } from './openpgp-key.js'; @@ -26,9 +23,9 @@ export namespace PgpMsgMethod { export namespace Arg { export type Encrypt = { pubkeys: Key[], signingPrv?: Key, pwd?: string, data: Uint8Array, filename?: string, armor: boolean, date?: Date }; export type Type = { data: Uint8Array | string }; - export type Decrypt = { kisWithPp: ExtendedKeyInfo[], encryptedData: Uint8Array, msgPwd?: string }; + export type Decrypt = { kisWithPp: ExtendedKeyInfo[], encryptedData: Uint8Array, msgPwd?: string, verificationPubs: PubkeyInfo[] }; export type DiagnosePubkeys = { armoredPubs: string[], message: Uint8Array }; - export type VerifyDetached = { plaintext: Uint8Array, sigText: Uint8Array }; + export type VerifyDetached = { plaintext: Uint8Array, sigText: Uint8Array, verificationPubs: PubkeyInfo[] }; } export type DiagnosePubkeys = (arg: Arg.DiagnosePubkeys) => Promise; export type VerifyDetached = (arg: Arg.VerifyDetached) => Promise; @@ -49,8 +46,6 @@ export namespace PgpMsgMethod { } type SortedKeysForDecrypt = { - verificationContacts: Contact[]; - forVerification: OpenPGP.key.Key[]; encryptedFor: string[]; signedBy: string[]; prvMatching: ExtendedKeyInfo[]; @@ -64,12 +59,12 @@ type DecryptError$error = { type: DecryptErrTypes; message: string; }; type DecryptError$longids = { message: string[]; matching: string[]; chosen: string[]; needPassphrase: string[]; }; export type DecryptError = { success: false; error: DecryptError$error; longids: DecryptError$longids; content?: Buf; isEncrypted?: boolean; }; -type OpenpgpMsgOrCleartext = OpenPGP.message.Message | OpenPGP.cleartext.CleartextMessage; - export type VerifyRes = { + // longid is set up even if the signature isn't verified + // primaryUserId is set up from the found key + // todo: make `match` a structure and move `primaryUserId` inside it or remove at all (#2147 is no longer appropriate) signer?: { primaryUserId: string | undefined, longid: string }; - contact?: Contact; - match: boolean | null; + match: boolean | null; // we can return some pubkey information here error?: string; isErrFatal?: boolean, content?: Buf @@ -148,61 +143,13 @@ export class MsgUtil { return await OpenPGPKey.sign(signingPrivate, data, detached); }; - public static verify = async (msg: OpenpgpMsgOrCleartext, pubs: OpenPGP.key.Key[], contact?: Contact): Promise => { - const verifyRes: VerifyRes = { contact, match: null }; // tslint:disable-line:no-null-keyword - try { - // this is here to ensure execution order when 1) verify, 2) read data, 3) processing signatures - // Else it will hang trying to read a stream: https://github.com/openpgpjs/openpgpjs/issues/916#issuecomment-510620625 - const verifications = await msg.verify(pubs); // first step - const stream = msg instanceof opgp.message.Message ? msg.getLiteralData() : msg.getText(); - if (stream) { // encrypted message - const data = await opgp.stream.readToEnd(stream); // second step - verifyRes.content = data instanceof Uint8Array ? new Buf(data) : Buf.fromUtfStr(data); - } - // third step below - for (const verification of verifications) { - // todo - a valid signature is a valid signature, and should be surfaced. Currently, if any of the signatures are not valid, it's showing all as invalid - // .. as it is now this could allow an attacker to append bogus signatures to validly signed messages, making otherwise correct messages seem incorrect - // .. which is not really an issue - an attacker that can append signatures could have also just slightly changed the message, causing the same experience - // .. so for now #wontfix unless a reasonable usecase surfaces - verifyRes.match = (verifyRes.match === true || verifyRes.match === null) && await verification.verified; - if (!verifyRes.signer) { - // todo - currently only the first signer will be reported. Should we be showing all signers? How common is that? - verifyRes.signer = { - longid: OpenPGPKey.bytesToLongid(verification.keyid.bytes), - primaryUserId: await OpenPGPKey.getPrimaryUserId(pubs, verification.keyid) - }; - } - } - } catch (verifyErr) { - verifyRes.match = null; // tslint:disable-line:no-null-keyword - if (verifyErr instanceof Error && verifyErr.message === 'Can only verify message with one literal data packet.') { - verifyRes.error = 'FlowCrypt is not equipped to verify this message'; - verifyRes.isErrFatal = true; // don't try to re-fetch the message from API - } else if (verifyErr instanceof Error && verifyErr.message.startsWith('Insecure message hash algorithm:')) { - verifyRes.error = `Could not verify message: ${verifyErr.message}. Sender is using old, insecure OpenPGP software.`; - verifyRes.isErrFatal = true; // don't try to re-fetch the message from API - } else if (verifyErr instanceof Error && verifyErr.message === 'Signature is expired') { - verifyRes.error = verifyErr.message; - verifyRes.isErrFatal = true; // don't try to re-fetch the message from API - } else if (verifyErr instanceof Error && verifyErr.message === 'Message digest did not match') { - verifyRes.error = verifyErr.message; - } else { - verifyRes.error = `Error verifying this message: ${String(verifyErr)}`; - Catch.reportErr(verifyErr); - } - } - return verifyRes; - }; - - public static verifyDetached: PgpMsgMethod.VerifyDetached = async ({ plaintext, sigText }) => { + public static verifyDetached: PgpMsgMethod.VerifyDetached = async ({ plaintext, sigText, verificationPubs }) => { const message = opgp.message.fromText(Buf.fromUint8(plaintext).toUtfStr()); await message.appendSignature(Buf.fromUint8(sigText).toUtfStr()); - const keys = await MsgUtil.getSortedKeys([], message); - return await MsgUtil.verify(message, keys.forVerification, keys.verificationContacts[0]); + return await OpenPGPKey.verify(message, verificationPubs); }; - public static decryptMessage: PgpMsgMethod.Decrypt = async ({ kisWithPp, encryptedData, msgPwd }) => { + public static decryptMessage: PgpMsgMethod.Decrypt = async ({ kisWithPp, encryptedData, msgPwd, verificationPubs }) => { const longids: DecryptError$longids = { message: [], matching: [], chosen: [], needPassphrase: [] }; let prepared: PreparedForDecrypt; try { @@ -210,18 +157,19 @@ export class MsgUtil { } catch (formatErr) { return { success: false, error: { type: DecryptErrTypes.format, message: String(formatErr) }, longids }; } + if (prepared.isCleartext) { + // todo: error if no verificationPubs? + const signature = await OpenPGPKey.verify(prepared.message, verificationPubs); + const content = signature.content || Buf.fromUtfStr('no content'); + signature.content = undefined; // no need to duplicate data + return { success: true, content, isEncrypted: false, signature }; + } + const isEncrypted = true; const keys = prepared.isPkcs7 ? await MsgUtil.getSmimeKeys(kisWithPp, prepared.message) : await MsgUtil.getSortedKeys(kisWithPp, prepared.message); longids.message = keys.encryptedFor; longids.matching = keys.prvForDecrypt.map(ki => ki.longid); longids.chosen = keys.prvForDecryptDecrypted.map(decrypted => decrypted.ki.longid); longids.needPassphrase = keys.prvForDecryptWithoutPassphrases.map(ki => ki.longid); - const isEncrypted = !prepared.isCleartext; - if (!isEncrypted && !prepared.isPkcs7) { - const signature = await MsgUtil.verify(prepared.message, keys.forVerification, keys.verificationContacts[0]); - const content = signature.content || Buf.fromUtfStr('no content'); - signature.content = undefined; // no need to duplicate data - return { success: true, content, isEncrypted, signature }; - } if (!keys.prvForDecryptDecrypted.length && (!msgPwd || prepared.isPkcs7)) { return { success: false, error: { type: DecryptErrTypes.needPassphrase, message: 'Missing pass phrase' }, longids, isEncrypted }; } @@ -230,7 +178,9 @@ export class MsgUtil { const decrypted = SmimeKey.decryptMessage(prepared.message, keys.prvForDecryptDecrypted[0].decrypted); return { success: true, content: new Buf(decrypted), isEncrypted }; } - const packets = (prepared.message as OpenPGP.message.Message).packets; + // cleartext and PKCS#7 are gone by this line + const msg = prepared.message as OpenPGP.message.Message; + const packets = msg.packets; const isSymEncrypted = packets.filter(p => p.tag === opgp.enums.packet.symEncryptedSessionKey).length > 0; const isPubEncrypted = packets.filter(p => p.tag === opgp.enums.packet.publicKeyEncryptedSessionKey).length > 0; if (isSymEncrypted && !isPubEncrypted && !msgPwd) { @@ -238,14 +188,14 @@ export class MsgUtil { } const passwords = msgPwd ? [msgPwd] : undefined; const privateKeys = keys.prvForDecryptDecrypted.map(decrypted => decrypted.decrypted); - const decrypted = await OpenPGPKey.decryptMessage(prepared.message as OpenPGP.message.Message, privateKeys, passwords); - await MsgUtil.cryptoMsgGetSignedBy(decrypted, keys); // we can only figure out who signed the msg once it's decrypted - const signature = keys.signedBy.length ? await MsgUtil.verify(decrypted, keys.forVerification, keys.verificationContacts[0]) : undefined; + const decrypted = await OpenPGPKey.decryptMessage(msg, privateKeys, passwords); + // todo: test when not signed at all + const signature = await OpenPGPKey.verify(decrypted, verificationPubs); const content = signature?.content || new Buf(await opgp.stream.readToEnd(decrypted.getLiteralData()!)); if (signature?.content) { signature.content = undefined; // already passed as "content" on the response object, don't need it duplicated } - if (!prepared.isCleartext && (prepared.message as OpenPGP.message.Message).packets.filterByTag(opgp.enums.packet.symmetricallyEncrypted).length) { + if (msg.packets.filterByTag(opgp.enums.packet.symmetricallyEncrypted).length) { const noMdc = 'Security threat!\n\nMessage is missing integrity checks (MDC). ' + ' The sender should update their outdated software.\n\nDisplay the message at your own risk.'; return { success: false, content, error: { type: DecryptErrTypes.noMdc, message: noMdc }, longids, isEncrypted }; @@ -287,23 +237,8 @@ export class MsgUtil { return diagnosis; }; - private static cryptoMsgGetSignedBy = async (msg: OpenpgpMsgOrCleartext, keys: SortedKeysForDecrypt) => { - keys.signedBy = Value.arr.unique(msg.getSigningKeyIds ? msg.getSigningKeyIds().map(kid => OpenPGPKey.bytesToLongid(kid.bytes)) : []); - if (keys.signedBy.length && typeof ContactStore.get === 'function') { - const verificationContacts = await ContactStore.get(undefined, keys.signedBy); - keys.verificationContacts = verificationContacts.filter(contact => contact && contact.pubkey) as Contact[]; - keys.forVerification = []; - for (const contact of keys.verificationContacts) { - const { keys: keysForVerification } = await opgp.key.readArmored(KeyUtil.armor(contact.pubkey!)); - keys.forVerification.push(...keysForVerification); - } - } - }; - - private static getSortedKeys = async (kiWithPp: ExtendedKeyInfo[], msg: OpenpgpMsgOrCleartext): Promise => { + private static getSortedKeys = async (kiWithPp: ExtendedKeyInfo[], msg: OpenPGP.message.Message): Promise => { const keys: SortedKeysForDecrypt = { - verificationContacts: [], - forVerification: [], encryptedFor: [], signedBy: [], prvMatching: [], @@ -311,9 +246,8 @@ export class MsgUtil { prvForDecryptDecrypted: [], prvForDecryptWithoutPassphrases: [], }; - const encryptionKeyids = msg instanceof opgp.message.Message ? (msg as OpenPGP.message.Message).getEncryptionKeyIds() : []; + const encryptionKeyids = msg.getEncryptionKeyIds(); keys.encryptedFor = encryptionKeyids.map(kid => OpenPGPKey.bytesToLongid(kid.bytes)); - await MsgUtil.cryptoMsgGetSignedBy(msg, keys); if (keys.encryptedFor.length) { keys.prvMatching = kiWithPp.filter(ki => KeyUtil.getKeyInfoLongids(ki).some( longid => keys.encryptedFor.includes(longid))); @@ -344,8 +278,6 @@ export class MsgUtil { private static getSmimeKeys = async (kiWithPp: ExtendedKeyInfo[], msg: SmimeMsg): Promise => { const keys: SortedKeysForDecrypt = { - verificationContacts: [], - forVerification: [], encryptedFor: [], signedBy: [], prvMatching: [], diff --git a/extension/js/common/core/crypto/pgp/openpgp-key.ts b/extension/js/common/core/crypto/pgp/openpgp-key.ts index 2f2c2873d95..fdf8532ef0d 100644 --- a/extension/js/common/core/crypto/pgp/openpgp-key.ts +++ b/extension/js/common/core/crypto/pgp/openpgp-key.ts @@ -1,13 +1,15 @@ /* ©️ 2016 - present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com */ -import { Key, PrvPacket, KeyAlgo, KeyUtil, UnexpectedKeyTypeError } from '../key.js'; +import { Key, PrvPacket, KeyAlgo, KeyUtil, UnexpectedKeyTypeError, PubkeyInfo } from '../key.js'; import { opgp } from './openpgpjs-custom.js'; import { Catch } from '../../../platform/catch.js'; import { Str } from '../../common.js'; import { Buf } from '../../buf.js'; -import { PgpMsgMethod, MsgUtil } from './msg-util.js'; +import { PgpMsgMethod, VerifyRes } from './msg-util.js'; const internal = Symbol('internal openpgpjs library format key'); +type OpenpgpMsgOrCleartext = OpenPGP.message.Message | OpenPGP.cleartext.CleartextMessage; + export class OpenPGPKey { private static readonly encryptionText = 'This is the text we are encrypting!'; @@ -433,6 +435,57 @@ export class OpenPGPKey { return undefined; }; + public static verify = async (msg: OpenpgpMsgOrCleartext, pubs: PubkeyInfo[]): Promise => { + const verifyRes: VerifyRes = { match: null }; // tslint:disable-line:no-null-keyword + // msg.getSigningKeyIds ? msg.getSigningKeyIds() + // todo: double-check if S/MIME ever gets here + const opgpKeys = pubs.filter(x => !x.revoked && x.pubkey.type === 'openpgp').map(x => OpenPGPKey.extractExternalLibraryObjFromKey(x.pubkey)); + // todo: expired? + try { + // this is here to ensure execution order when 1) verify, 2) read data, 3) processing signatures + // Else it will hang trying to read a stream: https://github.com/openpgpjs/openpgpjs/issues/916#issuecomment-510620625 + const verifications = await msg.verify(opgpKeys); // first step + const stream = msg instanceof opgp.message.Message ? msg.getLiteralData() : msg.getText(); + if (stream) { // encrypted message + const data = await opgp.stream.readToEnd(stream); // second step + verifyRes.content = data instanceof Uint8Array ? new Buf(data) : Buf.fromUtfStr(data); + } + // third step below + for (const verification of verifications) { + // todo - a valid signature is a valid signature, and should be surfaced. Currently, if any of the signatures are not valid, it's showing all as invalid + // .. as it is now this could allow an attacker to append bogus signatures to validly signed messages, making otherwise correct messages seem incorrect + // .. which is not really an issue - an attacker that can append signatures could have also just slightly changed the message, causing the same experience + // .. so for now #wontfix unless a reasonable usecase surfaces + verifyRes.match = (verifyRes.match === true || verifyRes.match === null) && await verification.verified; + if (!verifyRes.signer) { + // todo - currently only the first signer will be reported. Should we be showing all signers? How common is that? + verifyRes.signer = { + longid: OpenPGPKey.bytesToLongid(verification.keyid.bytes), + primaryUserId: await OpenPGPKey.getPrimaryUserId(opgpKeys, verification.keyid) + }; + } + } + } catch (verifyErr) { + verifyRes.match = null; // tslint:disable-line:no-null-keyword + if (verifyErr instanceof Error && verifyErr.message === 'Can only verify message with one literal data packet.') { + verifyRes.error = 'FlowCrypt is not equipped to verify this message'; + verifyRes.isErrFatal = true; // don't try to re-fetch the message from API + } else if (verifyErr instanceof Error && verifyErr.message.startsWith('Insecure message hash algorithm:')) { + verifyRes.error = `Could not verify message: ${verifyErr.message}. Sender is using old, insecure OpenPGP software.`; + verifyRes.isErrFatal = true; // don't try to re-fetch the message from API + } else if (verifyErr instanceof Error && verifyErr.message === 'Signature is expired') { + verifyRes.error = verifyErr.message; + verifyRes.isErrFatal = true; // don't try to re-fetch the message from API + } else if (verifyErr instanceof Error && verifyErr.message === 'Message digest did not match') { + verifyRes.error = verifyErr.message; + } else { + verifyRes.error = `Error verifying this message: ${String(verifyErr)}`; + Catch.reportErr(verifyErr); + } + } + return verifyRes; + }; + private static getSortedUserids = async (key: OpenPGP.key.Key): Promise => { const data = (await Promise.all(key.users.filter(Boolean).map(async (user) => { const primaryKey = key.primaryKey; @@ -696,7 +749,8 @@ export class OpenPGPKey { } const signedMessage = await opgp.message.fromText(OpenPGPKey.encryptionText).sign([key]); output.push('sign msg ok'); - const verifyResult = await MsgUtil.verify(signedMessage, [key]); + const verifyResult = await OpenPGPKey.verify(signedMessage, + [{ pubkey: await OpenPGPKey.convertExternalLibraryObjToKey(key), revoked: false }]); if (verifyResult.error !== null && typeof verifyResult.error !== 'undefined') { output.push(`verify failed: ${verifyResult.error}`); } else { diff --git a/extension/js/common/platform/store/contact-store.ts b/extension/js/common/platform/store/contact-store.ts index 1c84b71d4e2..74552c5f523 100644 --- a/extension/js/common/platform/store/contact-store.ts +++ b/extension/js/common/platform/store/contact-store.ts @@ -5,7 +5,7 @@ import { Catch } from '../catch.js'; import { opgp } from '../../core/crypto/pgp/openpgpjs-custom.js'; import { BrowserMsg } from '../../browser/browser-msg.js'; import { DateUtility, Str } from '../../core/common.js'; -import { Key, Contact, KeyUtil } from '../../core/crypto/key.js'; +import { Key, Contact, KeyUtil, PubkeyInfo } from '../../core/crypto/key.js'; // tslint:disable:no-null-keyword @@ -64,22 +64,8 @@ export type ContactUpdate = { type DbContactFilter = { hasPgp?: boolean, substring?: string, limit?: number }; -export type PubkeyInfo = { - pubkey: Key, - // IMPORTANT NOTE: - // It might look like we can format PubkeyInfo[] out of Key[], but that's not good, - // because in the storage we have the table Revocations that stores fingerprints - // of revoked keys that may not exist in the database (Pubkeys table), - // that is pre-emptive external revocation. So (in a rare case) the lookup method - // receives a valid key, saves it to the storage, and after re-querying the storage, - // this key maybe returned as revoked. This is why PubkeyInfo has revoked property - // regardless of the fact that Key itself also has it. - revoked: boolean, - lastCheck?: number | undefined -}; - -export type EmailWithSortedPubkeys = { - info: Email, +type EmailWithSortedPubkeys = { + info: Email, // todo: convert to a model class, exclude unnecessary fields like searchable sortedPubkeys: PubkeyInfo[] }; @@ -337,6 +323,7 @@ export class ContactStore extends AbstractStore { return emailEntity ? { info: emailEntity, sortedPubkeys: await ContactStore.sortKeys(pubkeys, revocations) } : undefined; }; + // todo: return parsed and with applied revocation public static getPubkey = async (db: IDBDatabase | undefined, { id, type }: { id: string, type: string }): Promise => { if (!db) { // relay op through background process @@ -686,40 +673,16 @@ export class ContactStore extends AbstractStore { return ContactStore.toContactFromKey(contactWithAllPubkeys.info, selected?.pubkey, selected?.lastCheck, Boolean(selected?.revoked)); } // search all longids - const tx = db.transaction(['emails', 'pubkeys'], 'readonly'); - return await new Promise((resolve, reject) => { - const req = tx.objectStore('pubkeys').index('index_longids').get(emailOrLongid); - ContactStore.setReqPipe(req, - (pubkey: Pubkey) => { - if (!pubkey) { - resolve(undefined); - return; - } - const req2 = tx.objectStore('emails').index('index_fingerprints').get(pubkey.fingerprint!); - ContactStore.setReqPipe(req2, - (email: Email) => { - if (!email) { - resolve(undefined); - } else { - resolve(ContactStore.toContact(db, email, pubkey)); - } - }, - reject); - }, - reject); - }); + throw new Error('longid search is deprecated'); // should not get here }; private static getKeyAttributes = (key: Key | undefined): PubkeyAttributes => { return { fingerprint: key?.id ?? null, expiresOn: DateUtility.asNumber(key?.expiration) }; }; - private static toContact = async (db: IDBDatabase, email: Email, pubkey: Pubkey | undefined): Promise => { - if (!email) { - return; - } + /* + private static isRevoked = async (db: IDBDatabase, pubkey: Pubkey | undefined): Promise => { const parsed = pubkey ? await KeyUtil.parse(pubkey.armoredKey) : undefined; - let revokedExternally = false; if (parsed && !parsed.revoked) { const revocations: Revocation[] = await new Promise((resolve, reject) => { const tx = db.transaction(['revocations'], 'readonly'); @@ -728,13 +691,13 @@ export class ContactStore extends AbstractStore { ContactStore.setReqPipe(req, resolve, reject); }); if (revocations.length) { - revokedExternally = true; + return true; // revoked externally } } - return ContactStore.toContactFromKey(email, parsed, parsed ? pubkey!.lastCheck : null, revokedExternally); + return parsed?.revoked || false; }; - - private static toContactFromKey = (email: Email, key: Key | undefined, lastCheck: number | undefined | null, revokedExternally: boolean): Contact | undefined => { +*/ + private static toContactFromKey = (email: Email | undefined, key: Key | undefined, lastCheck: number | undefined | null, revokedExternally: boolean): Contact | undefined => { if (!email) { return; } diff --git a/test/source/mock/google/strategies/send-message-strategy.ts b/test/source/mock/google/strategies/send-message-strategy.ts index 708ac6dbe0e..3b535c99712 100644 --- a/test/source/mock/google/strategies/send-message-strategy.ts +++ b/test/source/mock/google/strategies/send-message-strategy.ts @@ -81,7 +81,7 @@ class MessageWithFooterTestStrategy implements ITestMsgStrategy { public test = async (mimeMsg: ParsedMail) => { const keyInfo = await Config.getKeyInfo(["flowcrypt.compatibility.1pp1", "flowcrypt.compatibility.2pp1"]); - const decrypted = await MsgUtil.decryptMessage({ kisWithPp: keyInfo!, encryptedData: Buf.fromUtfStr(mimeMsg.text || '') }); + const decrypted = await MsgUtil.decryptMessage({ kisWithPp: keyInfo!, encryptedData: Buf.fromUtfStr(mimeMsg.text || ''), verificationPubs: [] }); if (!decrypted.success) { throw new HttpClientErr(`Error: can't decrypt message`); } @@ -98,7 +98,7 @@ class SignedMessageTestStrategy implements ITestMsgStrategy { public test = async (mimeMsg: ParsedMail) => { const keyInfo = await Config.getKeyInfo(["flowcrypt.compatibility.1pp1", "flowcrypt.compatibility.2pp1"]); - const decrypted = await MsgUtil.decryptMessage({ kisWithPp: keyInfo!, encryptedData: Buf.fromUtfStr(mimeMsg.text!) }); + const decrypted = await MsgUtil.decryptMessage({ kisWithPp: keyInfo!, encryptedData: Buf.fromUtfStr(mimeMsg.text!), verificationPubs: [] }); if (!decrypted.success) { throw new HttpClientErr(`Error: Could not successfully verify signed message`); } @@ -141,7 +141,7 @@ class IncludeQuotedPartTestStrategy implements ITestMsgStrategy { public test = async (mimeMsg: ParsedMail) => { const keyInfo = await Config.getKeyInfo(["flowcrypt.compatibility.1pp1", "flowcrypt.compatibility.2pp1"]); - const decrypted = await MsgUtil.decryptMessage({ kisWithPp: keyInfo!, encryptedData: Buf.fromUtfStr(mimeMsg.text!) }); + const decrypted = await MsgUtil.decryptMessage({ kisWithPp: keyInfo!, encryptedData: Buf.fromUtfStr(mimeMsg.text!), verificationPubs: [] }); if (!decrypted.success) { throw new HttpClientErr(`Error: can't decrypt message`); } diff --git a/test/source/platform/store/contact-store.ts b/test/source/platform/store/contact-store.ts index 5d1a8589226..428db5aa59c 100644 --- a/test/source/platform/store/contact-store.ts +++ b/test/source/platform/store/contact-store.ts @@ -21,12 +21,6 @@ export type Pubkey = { expiresOn: number | null; }; -export type PubkeyInfo = { - pubkey: Key, - revoked: boolean, - lastCheck?: number | undefined -}; - export class ContactStore { public static get = async (db: void, emailOrLongid: string[]): Promise<(Contact | undefined)[]> => { diff --git a/test/source/tests/compose.ts b/test/source/tests/compose.ts index 253d36068a9..fe2b331a950 100644 --- a/test/source/tests/compose.ts +++ b/test/source/tests/compose.ts @@ -994,14 +994,14 @@ export const defineComposeTests = (testVariant: TestVariant, testWithBrowser: Te const message = sentMsg.payload!.body!.data!; const encrypted = message.match(/\-\-\-\-\-BEGIN PGP MESSAGE\-\-\-\-\-.*\-\-\-\-\-END PGP MESSAGE\-\-\-\-\-/s)![0]; const encryptedData = Buf.fromUtfStr(encrypted); - const decrypted0 = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData }); + const decrypted0 = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData, verificationPubs: [] }); // decryption without a ki should fail expect(decrypted0.success).to.equal(false); // decryption with ki 1 should succeed - const decrypted1 = await MsgUtil.decryptMessage({ kisWithPp: await Config.getKeyInfo(["flowcrypt.compatibility.1pp1"]), encryptedData }); + const decrypted1 = await MsgUtil.decryptMessage({ kisWithPp: await Config.getKeyInfo(["flowcrypt.compatibility.1pp1"]), encryptedData, verificationPubs: [] }); expect(decrypted1.success).to.equal(true); // decryption with ki 2 should succeed - const decrypted2 = await MsgUtil.decryptMessage({ kisWithPp: await Config.getKeyInfo(["flowcrypt.compatibility.2pp1"]), encryptedData }); + const decrypted2 = await MsgUtil.decryptMessage({ kisWithPp: await Config.getKeyInfo(["flowcrypt.compatibility.2pp1"]), encryptedData, verificationPubs: [] }); expect(decrypted2.success).to.equal(true); })); diff --git a/test/source/tests/unit-node.ts b/test/source/tests/unit-node.ts index 0755bb1753e..6e6ff44402b 100644 --- a/test/source/tests/unit-node.ts +++ b/test/source/tests/unit-node.ts @@ -15,8 +15,7 @@ import { OpenPGPKey } from '../core/crypto/pgp/openpgp-key'; import { DecryptError, DecryptSuccess, MsgUtil, PgpMsgMethod } from '../core/crypto/pgp/msg-util'; import { opgp } from '../core/crypto/pgp/openpgpjs-custom'; import { Attachment } from '../core/attachment.js'; -import { ContactStore } from '../platform/store/contact-store.js'; -import { GoogleData, GmailParser, GmailMsg } from '../mock/google/google-data'; +import { GoogleData, GmailMsg } from '../mock/google/google-data'; import { testConstants } from './tooling/consts'; import { PgpArmor } from '../core/crypto/pgp/pgp-armor'; import { ExpirationCache } from '../core/expiration-cache'; @@ -783,8 +782,7 @@ jLwe8W9IMt765T5x5oux9MmPDXF05xHfm4qfH/BMO3a802x5u2gJjJjuknrFdgXY .match(/\-\-\-\-\-BEGIN PGP SIGNED MESSAGE\-\-\-\-\-.*\-\-\-\-\-END PGP SIGNATURE\-\-\-\-\-/s)![0]; const encryptedData = Buf.fromUtfStr(enc); const pubkey = await KeyUtil.parse(testConstants.pubkey2864E326A5BE488A); - await ContactStore.update(undefined, 'president@forged.com', { name: 'President', pubkey }); - const decrypted = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData }); + const decrypted = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData, verificationPubs: [{ pubkey, revoked: false }] }); expect(decrypted.success).to.equal(true); const verifyRes = (decrypted as DecryptSuccess).signature!; expect(verifyRes.match).to.be.true; @@ -792,6 +790,50 @@ jLwe8W9IMt765T5x5oux9MmPDXF05xHfm4qfH/BMO3a802x5u2gJjJjuknrFdgXY t.pass(); }); + ava.default('[unit][MsgUtil.decryptMessage] finds correct key to verify signature', async t => { + const data = await GoogleData.withInitializedData('ci.tests.gmail@flowcrypt.test'); + const msg: GmailMsg = data.getMessage('1766644f13510f58')!; + const enc = Buf.fromBase64Str(msg!.raw!).toUtfStr() + .match(/\-\-\-\-\-BEGIN PGP SIGNED MESSAGE\-\-\-\-\-.*\-\-\-\-\-END PGP SIGNATURE\-\-\-\-\-/s)![0]; + const encryptedData = Buf.fromUtfStr(enc); + // actual key the message was signed with + const pubkey = await KeyUtil.parse(testConstants.pubkey2864E326A5BE488A); + // better key + const betterKey = await KeyUtil.parse("-----BEGIN PGP PUBLIC KEY BLOCK-----\r\nVersion: FlowCrypt Email Encryption [BUILD_REPLACEABLE_VERSION]\r\nComment: Seamlessly send and receive encrypted email\r\n\r\nxjMEYZeW2RYJKwYBBAHaRw8BAQdAT5QfLVP3y1yukk3MM/oiuXLNe1f9az5M\r\nBnOlKdF0nKnNJVNvbWVib2R5IDxTYW1zNTBzYW1zNTBzZXB0QEdtYWlsLkNv\r\nbT7CjwQQFgoAIAUCYZeW2QYLCQcIAwIEFQgKAgQWAgEAAhkBAhsDAh4BACEJ\r\nEMrSTYqLk6SUFiEEBP90ux3d6kDwDdzvytJNiouTpJS27QEA7pFlkLfD0KFQ\r\nsH/dwb/NPzn5zCi2L9gjPAC3d8gv1fwA/0FjAy/vKct4D7QH8KwtEGQns5+D\r\nP1WxDr4YI2hp5TkAzjgEYZeW2RIKKwYBBAGXVQEFAQEHQKNLY/bXrhJMWA2+\r\nWTjk3I7KhawyZfLomJ4hovqr7UtOAwEIB8J4BBgWCAAJBQJhl5bZAhsMACEJ\r\nEMrSTYqLk6SUFiEEBP90ux3d6kDwDdzvytJNiouTpJQnpgD/c1CzfS3YzJUx\r\nnFMrhjiE0WVgqOV/3CkfI4m4RA30QUIA/ju8r4AD2h6lu3Mx/6I6PzIRZQty\r\nLvTkcu4UKodZa4kK\r\n=7C4A\r\n-----END PGP PUBLIC KEY BLOCK-----\r\n"); + { + const decrypted1 = await MsgUtil.decryptMessage({ + kisWithPp: [], encryptedData, verificationPubs: [{ pubkey, revoked: false }, { pubkey: betterKey, revoked: false }] + }); + expect(decrypted1.success).to.equal(true); + const verifyRes1 = (decrypted1 as DecryptSuccess).signature!; + expect(verifyRes1.match).to.be.true; + expect(verifyRes1.signer?.primaryUserId).to.equal('A50 Sam '); + } + { + const decrypted2 = await MsgUtil.decryptMessage({ + kisWithPp: [], encryptedData, verificationPubs: [{ pubkey: betterKey, revoked: false }, { pubkey, revoked: false }] + }); + expect(decrypted2.success).to.equal(true); + const verifyRes2 = (decrypted2 as DecryptSuccess).signature!; + expect(verifyRes2.match).to.be.true; + expect(verifyRes2.signer?.primaryUserId).to.equal('A50 Sam '); + } + { + const decrypted3 = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData, verificationPubs: [{ pubkey, revoked: false }] }); + expect(decrypted3.success).to.equal(true); + const verifyRes3 = (decrypted3 as DecryptSuccess).signature!; + expect(verifyRes3.match).to.be.true; + expect(verifyRes3.signer?.primaryUserId).to.equal('A50 Sam '); + } + { + const decrypted4 = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData, verificationPubs: [{ pubkey: betterKey, revoked: false }] }); + expect(decrypted4.success).to.equal(true); + const verifyRes4 = (decrypted4 as DecryptSuccess).signature!; + expect(verifyRes4.match).to.not.be.true; + } + t.pass(); + }); + ava.default('[unit][MsgUtil.verifyDetached] verifies Thunderbird html signed message', async t => { const data = await GoogleData.withInitializedData('flowcrypt.compatibility@gmail.com'); const msg: GmailMsg = data.getMessage('1754cfd1b2f1d6e5')!; @@ -805,10 +847,10 @@ jLwe8W9IMt765T5x5oux9MmPDXF05xHfm4qfH/BMO3a802x5u2gJjJjuknrFdgXY const pubkey = plaintext .match(/\-\-\-\-\-BEGIN PGP PUBLIC KEY BLOCK\-\-\-\-\-.*\-\-\-\-\-END PGP PUBLIC KEY BLOCK\-\-\-\-\-/s)![0] .replace(/=\r\n/g, '').replace(/=3D/g, '='); - const from = GmailParser.findHeader(msg, "from"); - const contact = await ContactStore.obj({ email: from, pubkey }); - await ContactStore.save(undefined, contact); - const result = await MsgUtil.verifyDetached({ plaintext: Buf.fromUtfStr(plaintext), sigText: Buf.fromUtfStr(sigText) }); + const result = await MsgUtil.verifyDetached({ + plaintext: Buf.fromUtfStr(plaintext), sigText: Buf.fromUtfStr(sigText), + verificationPubs: [{ pubkey: await KeyUtil.parse(pubkey), revoked: false }] + }); expect(result.match).to.be.true; t.pass(); }); @@ -826,10 +868,11 @@ jLwe8W9IMt765T5x5oux9MmPDXF05xHfm4qfH/BMO3a802x5u2gJjJjuknrFdgXY const pubkey = plaintext .match(/\-\-\-\-\-BEGIN PGP PUBLIC KEY BLOCK\-\-\-\-\-.*\-\-\-\-\-END PGP PUBLIC KEY BLOCK\-\-\-\-\-/s)![0] .replace(/=\r\n/g, '').replace(/=3D/g, '='); - const from = GmailParser.findHeader(msg, "from"); - const contact = await ContactStore.obj({ email: from, pubkey }); - await ContactStore.save(undefined, contact); - const result = await MsgUtil.verifyDetached({ plaintext: Buf.fromUtfStr(plaintext), sigText: Buf.fromUtfStr(sigText) }); + const result = await MsgUtil.verifyDetached({ + plaintext: Buf.fromUtfStr(plaintext), + sigText: Buf.fromUtfStr(sigText), + verificationPubs: [{ pubkey: await KeyUtil.parse(pubkey), revoked: false }] + }); expect(result.match).to.be.true; t.pass(); }); @@ -844,14 +887,11 @@ jLwe8W9IMt765T5x5oux9MmPDXF05xHfm4qfH/BMO3a802x5u2gJjJjuknrFdgXY const plaintext = msgText .match(/Content\-Type: multipart\/mixed;\r?\n? boundary="\-\-\-\-sinikael\-\?=_2\-16054595384320\.6487848448108896".*\-\-\-\-\-\-sinikael\-\?=_2\-16054595384320\.6487848448108896\-\-\r?\n/s)![0] .replace(/\r?\n/g, '\r\n')!; - if ((await ContactStore.get(undefined, ['7FDE685548AEA788'])).length === 0) { - const contact = await ContactStore.obj({ - email: 'flowcrypt.compatibility@gmail.com', - pubkey: testConstants.flowcryptcompatibilityPublicKey7FDE685548AEA788 - }); - await ContactStore.save(undefined, contact); - } - const result = await MsgUtil.verifyDetached({ plaintext: Buf.fromUtfStr(plaintext), sigText }); + const result = await MsgUtil.verifyDetached({ + plaintext: Buf.fromUtfStr(plaintext), + sigText, + verificationPubs: [{ pubkey: await KeyUtil.parse(testConstants.flowcryptcompatibilityPublicKey7FDE685548AEA788), revoked: false }] + }); expect(result.match).to.be.true; t.pass(); }); @@ -969,7 +1009,7 @@ jLwe8W9IMt765T5x5oux9MmPDXF05xHfm4qfH/BMO3a802x5u2gJjJjuknrFdgXY const encrypted = await MsgUtil.encryptMessage({ pubkeys, data, armor: true }) as PgpMsgMethod.EncryptPgpArmorResult; const parsed = await KeyUtil.parse(prvEncryptForSubkeyOnlyProtected); const kisWithPp: ExtendedKeyInfo[] = [{ ... await KeyUtil.typedKeyInfoObj(parsed), type: parsed.type, passphrase }]; - const decrypted = await MsgUtil.decryptMessage({ kisWithPp, encryptedData: encrypted.data }); + const decrypted = await MsgUtil.decryptMessage({ kisWithPp, encryptedData: encrypted.data, verificationPubs: [] }); // todo - later we'll have an org rule for ignoring this, and then it will be expected to pass as follows: // expect(decrypted.success).to.equal(true); // expect(decrypted.content!.toUtfStr()).to.equal(data.toUtfStr()); From b8e5ce58ec97762e7236c3d37185a249cd5e3ff8 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sun, 28 Nov 2021 10:49:45 +0000 Subject: [PATCH 02/31] more refactorings and fixes --- .../pgp-block-decrypt-module.ts | 26 +++--- .../pgp-block-render-module.ts | 5 +- .../pgp-block-signature-module.ts | 23 ++++- extension/js/common/core/crypto/key.ts | 13 +-- .../js/common/core/crypto/pgp/msg-util.ts | 13 +-- .../js/common/platform/store/contact-store.ts | 86 ++++++++++--------- test/source/platform/store/contact-store.ts | 7 +- test/source/tests/unit-node.ts | 28 +++--- 8 files changed, 116 insertions(+), 85 deletions(-) diff --git a/extension/chrome/elements/pgp_block_modules/pgp-block-decrypt-module.ts b/extension/chrome/elements/pgp_block_modules/pgp-block-decrypt-module.ts index 84056344757..a909867a43e 100644 --- a/extension/chrome/elements/pgp_block_modules/pgp-block-decrypt-module.ts +++ b/extension/chrome/elements/pgp_block_modules/pgp-block-decrypt-module.ts @@ -13,7 +13,7 @@ import { Ui } from '../../../js/common/browser/ui.js'; import { Xss } from '../../../js/common/platform/xss.js'; import { KeyStore } from '../../../js/common/platform/store/key-store.js'; import { PassphraseStore } from '../../../js/common/platform/store/passphrase-store.js'; -import { PubkeyInfo } from '../../../js/common/core/crypto/key.js'; +import { KeyUtil } from '../../../js/common/core/crypto/key.js'; import { ContactStore } from '../../../js/common/platform/store/contact-store.js'; export class PgpBlockViewDecryptModule { @@ -27,7 +27,10 @@ export class PgpBlockViewDecryptModule { } public initialize = async (forcePullMsgFromApi = false) => { - const verificationPubs = (await ContactStore.getOneWithAllPubkeys(undefined, this.view.getSigner()))?.sortedPubkeys ?? []; + const parsedPubs = (await ContactStore.getOneWithAllPubkeys(undefined, this.view.getSigner()))?.sortedPubkeys ?? []; + // todo: we don't actually need parsed pubs here because we're going to pass them to the backgorund page + // maybe we can have a method in ContactStore to extract armored keys + const verificationPubs = parsedPubs.map(key => KeyUtil.armor(key.pubkey)); try { if (this.canReadEmails && this.view.signature === true && this.view.msgId) { this.view.renderModule.renderText('Loading signed message...'); @@ -65,22 +68,23 @@ export class PgpBlockViewDecryptModule { } }; - private decryptAndRender = async (encryptedData: Buf, verificationPubs: PubkeyInfo[], optionalPwd?: string, plainSubject?: string) => { + private decryptAndRender = async (encryptedData: Buf, verificationPubs: string[], optionalPwd?: string, plainSubject?: string) => { if (typeof this.view.signature !== 'string') { const kisWithPp = await KeyStore.getAllWithOptionalPassPhrase(this.view.acctEmail); - const result = await BrowserMsg.send.bg.await.pgpMsgDecrypt({ kisWithPp, encryptedData, verificationPubs }); + const decrypt = async (verificationPubs: string[]) => await BrowserMsg.send.bg.await.pgpMsgDecrypt({ kisWithPp, encryptedData, verificationPubs }); + const result = await decrypt(verificationPubs); if (typeof result === 'undefined') { await this.view.errorModule.renderErr(Lang.general.restartBrowserAndTryAgain, undefined); } else if (result.success) { await this.view.renderModule.decideDecryptedContentFormattingAndRender(result.content, Boolean(result.isEncrypted), result.signature, - /* todo: retry? async () => { - const decryptResult = await BrowserMsg.send.bg.await.pgpMsgDecrypt({ kisWithPp, encryptedData, verificationPubs }); + async (verificationPubs: string[]) => { + const decryptResult = await decrypt(verificationPubs); if (!decryptResult.success) { - return undefined; + return undefined; // note: this internal error results in a wrong "Message Not Signed" badge } else { return decryptResult.signature; } - }*/ plainSubject); + }, plainSubject); } else if (result.error.type === DecryptErrTypes.format) { if (this.canReadEmails && this.msgFetchedFromApi !== 'raw') { console.info(`re-fetching message ${this.view.msgId} from api because looks like bad formatting: ${!this.msgFetchedFromApi ? 'full' : 'raw'}`); @@ -117,9 +121,9 @@ export class PgpBlockViewDecryptModule { } else { // this.view.signature is string // sometimes signatures come wrongly percent-encoded. Here we check for typical "=3Dabcd" at the end const sigText = Buf.fromUtfStr(this.view.signature.replace('\n=3D', '\n=')); - const signatureResult = await BrowserMsg.send.bg.await.pgpMsgVerifyDetached({ plaintext: encryptedData, sigText, verificationPubs }); - await this.view.renderModule.decideDecryptedContentFormattingAndRender(encryptedData, false, signatureResult); - // todo: retry? + const verify = async (verificationPubs: string[]) => await BrowserMsg.send.bg.await.pgpMsgVerifyDetached({ plaintext: encryptedData, sigText, verificationPubs }); + const signatureResult = await verify(verificationPubs); + await this.view.renderModule.decideDecryptedContentFormattingAndRender(encryptedData, false, signatureResult, verify); } }; diff --git a/extension/chrome/elements/pgp_block_modules/pgp-block-render-module.ts b/extension/chrome/elements/pgp_block_modules/pgp-block-render-module.ts index e3ea0b911da..b766a036b8d 100644 --- a/extension/chrome/elements/pgp_block_modules/pgp-block-render-module.ts +++ b/extension/chrome/elements/pgp_block_modules/pgp-block-render-module.ts @@ -76,9 +76,10 @@ export class PgpBlockViewRenderModule { } }; - public decideDecryptedContentFormattingAndRender = async (decryptedBytes: Buf, isEncrypted: boolean, sigResult: VerifyRes | undefined, plainSubject?: string) => { + public decideDecryptedContentFormattingAndRender = async (decryptedBytes: Buf, isEncrypted: boolean, sigResult: VerifyRes | undefined, + retryVerification: (verificationPubs: string[]) => Promise, plainSubject?: string) => { this.setFrameColor(isEncrypted ? 'green' : 'gray'); - this.view.signatureModule.renderPgpSignatureCheckResult(sigResult); + await this.view.signatureModule.renderPgpSignatureCheckResult(sigResult, retryVerification); const publicKeys: string[] = []; let renderableAttachments: Attachment[] = []; let decryptedContent = decryptedBytes.toUtfStr(); diff --git a/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts b/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts index 6c3e10114f0..eeb16a80fe1 100644 --- a/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts +++ b/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts @@ -2,6 +2,8 @@ 'use strict'; +import { ApiErr } from '../../../js/common/api/shared/api-error.js'; +import { Catch } from '../../../js/common/platform/catch.js'; import { PgpBlockView } from '../pgp_block'; import { Ui } from '../../../js/common/browser/ui.js'; import { VerifyRes } from '../../../js/common/core/crypto/pgp/msg-util.js'; @@ -11,7 +13,7 @@ export class PgpBlockViewSignatureModule { constructor(private view: PgpBlockView) { } - public renderPgpSignatureCheckResult = (signature: VerifyRes | undefined) => { + public renderPgpSignatureCheckResult = async (signature: VerifyRes | undefined, retryVerification?: (verificationPubs: string[]) => Promise) => { this.view.renderModule.doNotSetStateAsReadyYet = true; // so that body state is not marked as ready too soon - automated tests need to know when to check results if (!signature) { $('#pgp_signature').addClass('bad'); @@ -25,6 +27,25 @@ export class PgpBlockViewSignatureModule { $('#pgp_signature').addClass('good'); $('#pgp_signature > .result').text('matching signature'); } else { + if (retryVerification) { + this.view.renderModule.renderText('Verifying message...'); + try { + const { pubkeys: newPubkeys } = await this.view.pubLookup.lookupEmail(this.view.getSigner()); + if (newPubkeys.length) { + await this.renderPgpSignatureCheckResult(await retryVerification(newPubkeys), undefined); + return; + } + } catch (e) { + if (ApiErr.isSignificant(e)) { + Catch.reportErr(e); + $('#pgp_signature').addClass('neutral').find('.result').text(`Could not load sender's pubkey due to an error.`); + } else { + $('#pgp_signature').addClass('neutral').find('.result').text(`Could not look up sender's pubkey due to network error, click to retry.`).click( + this.view.setHandler(() => window.location.reload())); + } + return; + } + } $('#pgp_signature').addClass('bad'); $('#pgp_signature > .result').text('signature does not match'); this.view.renderModule.setFrameColor('red'); diff --git a/extension/js/common/core/crypto/key.ts b/extension/js/common/core/crypto/key.ts index fcb4a6d047b..b58af65494c 100644 --- a/extension/js/common/core/crypto/key.ts +++ b/extension/js/common/core/crypto/key.ts @@ -67,8 +67,8 @@ export interface KeyInfo { emails?: string[]; // todo - used to be missing - but migration was supposed to add it? setting back to optional for now } -export type PubkeyInfo = { - pubkey: Key, +export interface PubkeyInfo { + pubkey: Key; // IMPORTANT NOTE: // It might look like we can format PubkeyInfo[] out of Key[], but that's not good, // because in the storage we have the table Revocations that stores fingerprints @@ -77,9 +77,12 @@ export type PubkeyInfo = { // receives a valid key, saves it to the storage, and after re-querying the storage, // this key maybe returned as revoked. This is why PubkeyInfo has revoked property // regardless of the fact that Key itself also has it. - revoked: boolean, - lastCheck?: number | undefined -}; + revoked: boolean; +} + +export interface PubkeyInfoWithLastCheck extends PubkeyInfo { + lastCheck?: number | undefined; +} export interface KeyIdentity { id: string, // a fingerprint of the primary key in OpenPGP, and similarly a fingerprint of the actual cryptographic key (eg RSA fingerprint) in S/MIME diff --git a/extension/js/common/core/crypto/pgp/msg-util.ts b/extension/js/common/core/crypto/pgp/msg-util.ts index c0eac1d5c96..f652e4e703b 100644 --- a/extension/js/common/core/crypto/pgp/msg-util.ts +++ b/extension/js/common/core/crypto/pgp/msg-util.ts @@ -1,7 +1,7 @@ /* ©️ 2016 - present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com */ 'use strict'; -import { Key, KeyInfo, ExtendedKeyInfo, KeyUtil, PubkeyInfo } from '../key.js'; +import { Key, KeyInfo, ExtendedKeyInfo, KeyUtil } from '../key.js'; import { MsgBlockType, ReplaceableMsgBlockType } from '../../msg-block.js'; import { Buf } from '../../buf.js'; import { PgpArmor, PreparedForDecrypt } from './pgp-armor.js'; @@ -9,6 +9,7 @@ import { opgp } from './openpgpjs-custom.js'; import { KeyCache } from '../../../platform/key-cache.js'; import { SmimeKey, SmimeMsg } from '../smime/smime-key.js'; import { OpenPGPKey } from './openpgp-key.js'; +import { ContactStore } from '../../../platform/store/contact-store.js'; export class DecryptionError extends Error { public decryptError: DecryptError; @@ -23,9 +24,9 @@ export namespace PgpMsgMethod { export namespace Arg { export type Encrypt = { pubkeys: Key[], signingPrv?: Key, pwd?: string, data: Uint8Array, filename?: string, armor: boolean, date?: Date }; export type Type = { data: Uint8Array | string }; - export type Decrypt = { kisWithPp: ExtendedKeyInfo[], encryptedData: Uint8Array, msgPwd?: string, verificationPubs: PubkeyInfo[] }; + export type Decrypt = { kisWithPp: ExtendedKeyInfo[], encryptedData: Uint8Array, msgPwd?: string, verificationPubs: string[] }; export type DiagnosePubkeys = { armoredPubs: string[], message: Uint8Array }; - export type VerifyDetached = { plaintext: Uint8Array, sigText: Uint8Array, verificationPubs: PubkeyInfo[] }; + export type VerifyDetached = { plaintext: Uint8Array, sigText: Uint8Array, verificationPubs: string[] }; } export type DiagnosePubkeys = (arg: Arg.DiagnosePubkeys) => Promise; export type VerifyDetached = (arg: Arg.VerifyDetached) => Promise; @@ -146,7 +147,7 @@ export class MsgUtil { public static verifyDetached: PgpMsgMethod.VerifyDetached = async ({ plaintext, sigText, verificationPubs }) => { const message = opgp.message.fromText(Buf.fromUint8(plaintext).toUtfStr()); await message.appendSignature(Buf.fromUint8(sigText).toUtfStr()); - return await OpenPGPKey.verify(message, verificationPubs); + return await OpenPGPKey.verify(message, await ContactStore.getPubkeyInfos(undefined, verificationPubs)); }; public static decryptMessage: PgpMsgMethod.Decrypt = async ({ kisWithPp, encryptedData, msgPwd, verificationPubs }) => { @@ -159,7 +160,7 @@ export class MsgUtil { } if (prepared.isCleartext) { // todo: error if no verificationPubs? - const signature = await OpenPGPKey.verify(prepared.message, verificationPubs); + const signature = await OpenPGPKey.verify(prepared.message, await ContactStore.getPubkeyInfos(undefined, verificationPubs)); const content = signature.content || Buf.fromUtfStr('no content'); signature.content = undefined; // no need to duplicate data return { success: true, content, isEncrypted: false, signature }; @@ -190,7 +191,7 @@ export class MsgUtil { const privateKeys = keys.prvForDecryptDecrypted.map(decrypted => decrypted.decrypted); const decrypted = await OpenPGPKey.decryptMessage(msg, privateKeys, passwords); // todo: test when not signed at all - const signature = await OpenPGPKey.verify(decrypted, verificationPubs); + const signature = await OpenPGPKey.verify(decrypted, await ContactStore.getPubkeyInfos(undefined, verificationPubs)); const content = signature?.content || new Buf(await opgp.stream.readToEnd(decrypted.getLiteralData()!)); if (signature?.content) { signature.content = undefined; // already passed as "content" on the response object, don't need it duplicated diff --git a/extension/js/common/platform/store/contact-store.ts b/extension/js/common/platform/store/contact-store.ts index 74552c5f523..5599313ef66 100644 --- a/extension/js/common/platform/store/contact-store.ts +++ b/extension/js/common/platform/store/contact-store.ts @@ -4,8 +4,8 @@ import { AbstractStore } from './abstract-store.js'; import { Catch } from '../catch.js'; import { opgp } from '../../core/crypto/pgp/openpgpjs-custom.js'; import { BrowserMsg } from '../../browser/browser-msg.js'; -import { DateUtility, Str } from '../../core/common.js'; -import { Key, Contact, KeyUtil, PubkeyInfo } from '../../core/crypto/key.js'; +import { DateUtility, Str, Value } from '../../core/common.js'; +import { Key, Contact, KeyUtil, PubkeyInfo, PubkeyInfoWithLastCheck } from '../../core/crypto/key.js'; // tslint:disable:no-null-keyword @@ -66,7 +66,7 @@ type DbContactFilter = { hasPgp?: boolean, substring?: string, limit?: number }; type EmailWithSortedPubkeys = { info: Email, // todo: convert to a model class, exclude unnecessary fields like searchable - sortedPubkeys: PubkeyInfo[] + sortedPubkeys: PubkeyInfoWithLastCheck[] }; const x509postfix = "-X509"; @@ -287,10 +287,9 @@ export class ContactStore extends AbstractStore { resolve(email); return; } - const uniqueAndStrippedFingerprints = email.fingerprints. - map(ContactStore.stripFingerprint). - filter((value, index, self) => !self.slice(0, index).find((el) => el === value)); - let countdown = email.fingerprints.length + uniqueAndStrippedFingerprints.length; + // fire requests to query pubkeys and revocations + // when all of them finish, the transaction will complete + ContactStore.setTxHandlers(tx, () => resolve(email), reject); // request all pubkeys by fingerprints for (const fp of email.fingerprints) { const req2 = tx.objectStore('pubkeys').get(fp); @@ -299,24 +298,10 @@ export class ContactStore extends AbstractStore { if (pubkey) { pubkeys.push(pubkey); } - if (!--countdown) { - resolve(email); - } - }, - reject); - } - for (const fp of uniqueAndStrippedFingerprints) { - const range = ContactStore.createFingerprintRange(fp); - const req3 = tx.objectStore('revocations').getAll(range); - ContactStore.setReqPipe(req3, - (revocation: Revocation[]) => { - revocations.push(...revocation); - if (!--countdown) { - resolve(email); - } - }, - reject); + }); } + // fire requests to collect revocations + ContactStore.collectRevocations(tx, revocations, email.fingerprints); }, reject); }); @@ -436,6 +421,30 @@ export class ContactStore extends AbstractStore { }); }; + // construct PubkeyInfo objects out of provided keys and revocation data in the database + // the keys themselves may not be necessarily present in the database + public static getPubkeyInfos = async (db: IDBDatabase | undefined, keys: (Key | string)[]): Promise => { + if (!db) { // relay op through background process + return (await BrowserMsg.send.bg.await.db({ f: 'getPubkeyInfos', args: [keys] })) as PubkeyInfo[]; + } + const parsedKeys = await Promise.all(keys.map(async (key) => await KeyUtil.asPublicKey(typeof key === 'string' ? await KeyUtil.parse(key) : key))); + const unrevokedIds = parsedKeys.filter(key => !key.revoked).map(key => key.id); + const revocations: Revocation[] = []; + if (unrevokedIds.length) { // need to search for external revocations + await new Promise((resolve, reject) => { + const tx = db.transaction(['revocations'], 'readonly'); + ContactStore.setTxHandlers(tx, resolve, reject); + ContactStore.collectRevocations(tx, revocations, unrevokedIds); + }); + } + return parsedKeys.map(key => { + return { + pubkey: key, + revoked: key.revoked || revocations.some(r => ContactStore.equalFingerprints(key.id, r.fingerprint)) + }; + }); + }; + public static sortPubkeyInfos = (pubkeyInfos: PubkeyInfo[]): PubkeyInfo[] => { return pubkeyInfos.sort((a, b) => ContactStore.getSortValue(b) - ContactStore.getSortValue(a)); }; @@ -474,6 +483,18 @@ export class ContactStore extends AbstractStore { return IDBKeyRange.bound(strippedFp, strippedFp + x509postfix, false, false); }; + // fire requests to collect revocations + private static collectRevocations = (tx: IDBTransaction, revocations: Revocation[], fingerprints: string[]) => { + for (const fp of Value.arr.unique(fingerprints.map(ContactStore.stripFingerprint))) { + const range = ContactStore.createFingerprintRange(fp); + const req = tx.objectStore('revocations').getAll(range); + ContactStore.setReqPipe(req, + (revocation: Revocation[]) => { + revocations.push(...revocation); + }); + } + }; + private static updateTxPhase2 = (tx: IDBTransaction, email: string, update: ContactUpdate, existingPubkey: Pubkey | undefined, revocations: Revocation[]) => { let pubkeyEntity: Pubkey | undefined; @@ -680,23 +701,6 @@ export class ContactStore extends AbstractStore { return { fingerprint: key?.id ?? null, expiresOn: DateUtility.asNumber(key?.expiration) }; }; - /* - private static isRevoked = async (db: IDBDatabase, pubkey: Pubkey | undefined): Promise => { - const parsed = pubkey ? await KeyUtil.parse(pubkey.armoredKey) : undefined; - if (parsed && !parsed.revoked) { - const revocations: Revocation[] = await new Promise((resolve, reject) => { - const tx = db.transaction(['revocations'], 'readonly'); - const range = ContactStore.createFingerprintRange(parsed!.id); - const req = tx.objectStore('revocations').getAll(range); - ContactStore.setReqPipe(req, resolve, reject); - }); - if (revocations.length) { - return true; // revoked externally - } - } - return parsed?.revoked || false; - }; -*/ private static toContactFromKey = (email: Email | undefined, key: Key | undefined, lastCheck: number | undefined | null, revokedExternally: boolean): Contact | undefined => { if (!email) { return; diff --git a/test/source/platform/store/contact-store.ts b/test/source/platform/store/contact-store.ts index 428db5aa59c..a5bb1b89ef4 100644 --- a/test/source/platform/store/contact-store.ts +++ b/test/source/platform/store/contact-store.ts @@ -2,7 +2,7 @@ // tslint:disable:no-null-keyword -import { Contact, Key, KeyUtil } from '../../core/crypto/key'; +import { Contact, Key, KeyUtil, PubkeyInfo } from '../../core/crypto/key'; const DATA: Contact[] = []; @@ -30,6 +30,11 @@ export class ContactStore { return result; }; + public static getPubkeyInfos = async (db: IDBDatabase | undefined, keys: (Key | string)[]): Promise => { + const parsedKeys = await Promise.all(keys.map(async (key) => await KeyUtil.asPublicKey(typeof key === 'string' ? await KeyUtil.parse(key) : key))); + return parsedKeys.map(key => { return { pubkey: key, revoked: false }; }); + }; + public static update = async (db: void, email: string | string[], update: ContactUpdate): Promise => { if (Array.isArray(email)) { await Promise.all(email.map(oneEmail => ContactStore.update(db, oneEmail, update))); diff --git a/test/source/tests/unit-node.ts b/test/source/tests/unit-node.ts index 6e6ff44402b..be9eee938c0 100644 --- a/test/source/tests/unit-node.ts +++ b/test/source/tests/unit-node.ts @@ -781,8 +781,7 @@ jLwe8W9IMt765T5x5oux9MmPDXF05xHfm4qfH/BMO3a802x5u2gJjJjuknrFdgXY const enc = Buf.fromBase64Str(msg!.raw!).toUtfStr() .match(/\-\-\-\-\-BEGIN PGP SIGNED MESSAGE\-\-\-\-\-.*\-\-\-\-\-END PGP SIGNATURE\-\-\-\-\-/s)![0]; const encryptedData = Buf.fromUtfStr(enc); - const pubkey = await KeyUtil.parse(testConstants.pubkey2864E326A5BE488A); - const decrypted = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData, verificationPubs: [{ pubkey, revoked: false }] }); + const decrypted = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData, verificationPubs: [testConstants.pubkey2864E326A5BE488A] }); expect(decrypted.success).to.equal(true); const verifyRes = (decrypted as DecryptSuccess).signature!; expect(verifyRes.match).to.be.true; @@ -797,36 +796,32 @@ jLwe8W9IMt765T5x5oux9MmPDXF05xHfm4qfH/BMO3a802x5u2gJjJjuknrFdgXY .match(/\-\-\-\-\-BEGIN PGP SIGNED MESSAGE\-\-\-\-\-.*\-\-\-\-\-END PGP SIGNATURE\-\-\-\-\-/s)![0]; const encryptedData = Buf.fromUtfStr(enc); // actual key the message was signed with - const pubkey = await KeyUtil.parse(testConstants.pubkey2864E326A5BE488A); + const pubkey = testConstants.pubkey2864E326A5BE488A; // better key - const betterKey = await KeyUtil.parse("-----BEGIN PGP PUBLIC KEY BLOCK-----\r\nVersion: FlowCrypt Email Encryption [BUILD_REPLACEABLE_VERSION]\r\nComment: Seamlessly send and receive encrypted email\r\n\r\nxjMEYZeW2RYJKwYBBAHaRw8BAQdAT5QfLVP3y1yukk3MM/oiuXLNe1f9az5M\r\nBnOlKdF0nKnNJVNvbWVib2R5IDxTYW1zNTBzYW1zNTBzZXB0QEdtYWlsLkNv\r\nbT7CjwQQFgoAIAUCYZeW2QYLCQcIAwIEFQgKAgQWAgEAAhkBAhsDAh4BACEJ\r\nEMrSTYqLk6SUFiEEBP90ux3d6kDwDdzvytJNiouTpJS27QEA7pFlkLfD0KFQ\r\nsH/dwb/NPzn5zCi2L9gjPAC3d8gv1fwA/0FjAy/vKct4D7QH8KwtEGQns5+D\r\nP1WxDr4YI2hp5TkAzjgEYZeW2RIKKwYBBAGXVQEFAQEHQKNLY/bXrhJMWA2+\r\nWTjk3I7KhawyZfLomJ4hovqr7UtOAwEIB8J4BBgWCAAJBQJhl5bZAhsMACEJ\r\nEMrSTYqLk6SUFiEEBP90ux3d6kDwDdzvytJNiouTpJQnpgD/c1CzfS3YzJUx\r\nnFMrhjiE0WVgqOV/3CkfI4m4RA30QUIA/ju8r4AD2h6lu3Mx/6I6PzIRZQty\r\nLvTkcu4UKodZa4kK\r\n=7C4A\r\n-----END PGP PUBLIC KEY BLOCK-----\r\n"); + const betterKey = "-----BEGIN PGP PUBLIC KEY BLOCK-----\r\nVersion: FlowCrypt Email Encryption [BUILD_REPLACEABLE_VERSION]\r\nComment: Seamlessly send and receive encrypted email\r\n\r\nxjMEYZeW2RYJKwYBBAHaRw8BAQdAT5QfLVP3y1yukk3MM/oiuXLNe1f9az5M\r\nBnOlKdF0nKnNJVNvbWVib2R5IDxTYW1zNTBzYW1zNTBzZXB0QEdtYWlsLkNv\r\nbT7CjwQQFgoAIAUCYZeW2QYLCQcIAwIEFQgKAgQWAgEAAhkBAhsDAh4BACEJ\r\nEMrSTYqLk6SUFiEEBP90ux3d6kDwDdzvytJNiouTpJS27QEA7pFlkLfD0KFQ\r\nsH/dwb/NPzn5zCi2L9gjPAC3d8gv1fwA/0FjAy/vKct4D7QH8KwtEGQns5+D\r\nP1WxDr4YI2hp5TkAzjgEYZeW2RIKKwYBBAGXVQEFAQEHQKNLY/bXrhJMWA2+\r\nWTjk3I7KhawyZfLomJ4hovqr7UtOAwEIB8J4BBgWCAAJBQJhl5bZAhsMACEJ\r\nEMrSTYqLk6SUFiEEBP90ux3d6kDwDdzvytJNiouTpJQnpgD/c1CzfS3YzJUx\r\nnFMrhjiE0WVgqOV/3CkfI4m4RA30QUIA/ju8r4AD2h6lu3Mx/6I6PzIRZQty\r\nLvTkcu4UKodZa4kK\r\n=7C4A\r\n-----END PGP PUBLIC KEY BLOCK-----\r\n"; { - const decrypted1 = await MsgUtil.decryptMessage({ - kisWithPp: [], encryptedData, verificationPubs: [{ pubkey, revoked: false }, { pubkey: betterKey, revoked: false }] - }); + const decrypted1 = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData, verificationPubs: [pubkey, betterKey] }); expect(decrypted1.success).to.equal(true); const verifyRes1 = (decrypted1 as DecryptSuccess).signature!; expect(verifyRes1.match).to.be.true; expect(verifyRes1.signer?.primaryUserId).to.equal('A50 Sam '); } { - const decrypted2 = await MsgUtil.decryptMessage({ - kisWithPp: [], encryptedData, verificationPubs: [{ pubkey: betterKey, revoked: false }, { pubkey, revoked: false }] - }); + const decrypted2 = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData, verificationPubs: [betterKey, pubkey] }); expect(decrypted2.success).to.equal(true); const verifyRes2 = (decrypted2 as DecryptSuccess).signature!; expect(verifyRes2.match).to.be.true; expect(verifyRes2.signer?.primaryUserId).to.equal('A50 Sam '); } { - const decrypted3 = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData, verificationPubs: [{ pubkey, revoked: false }] }); + const decrypted3 = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData, verificationPubs: [pubkey] }); expect(decrypted3.success).to.equal(true); const verifyRes3 = (decrypted3 as DecryptSuccess).signature!; expect(verifyRes3.match).to.be.true; expect(verifyRes3.signer?.primaryUserId).to.equal('A50 Sam '); } { - const decrypted4 = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData, verificationPubs: [{ pubkey: betterKey, revoked: false }] }); + const decrypted4 = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData, verificationPubs: [betterKey] }); expect(decrypted4.success).to.equal(true); const verifyRes4 = (decrypted4 as DecryptSuccess).signature!; expect(verifyRes4.match).to.not.be.true; @@ -847,10 +842,7 @@ jLwe8W9IMt765T5x5oux9MmPDXF05xHfm4qfH/BMO3a802x5u2gJjJjuknrFdgXY const pubkey = plaintext .match(/\-\-\-\-\-BEGIN PGP PUBLIC KEY BLOCK\-\-\-\-\-.*\-\-\-\-\-END PGP PUBLIC KEY BLOCK\-\-\-\-\-/s)![0] .replace(/=\r\n/g, '').replace(/=3D/g, '='); - const result = await MsgUtil.verifyDetached({ - plaintext: Buf.fromUtfStr(plaintext), sigText: Buf.fromUtfStr(sigText), - verificationPubs: [{ pubkey: await KeyUtil.parse(pubkey), revoked: false }] - }); + const result = await MsgUtil.verifyDetached({ plaintext: Buf.fromUtfStr(plaintext), sigText: Buf.fromUtfStr(sigText), verificationPubs: [pubkey] }); expect(result.match).to.be.true; t.pass(); }); @@ -871,7 +863,7 @@ jLwe8W9IMt765T5x5oux9MmPDXF05xHfm4qfH/BMO3a802x5u2gJjJjuknrFdgXY const result = await MsgUtil.verifyDetached({ plaintext: Buf.fromUtfStr(plaintext), sigText: Buf.fromUtfStr(sigText), - verificationPubs: [{ pubkey: await KeyUtil.parse(pubkey), revoked: false }] + verificationPubs: [pubkey] }); expect(result.match).to.be.true; t.pass(); @@ -890,7 +882,7 @@ jLwe8W9IMt765T5x5oux9MmPDXF05xHfm4qfH/BMO3a802x5u2gJjJjuknrFdgXY const result = await MsgUtil.verifyDetached({ plaintext: Buf.fromUtfStr(plaintext), sigText, - verificationPubs: [{ pubkey: await KeyUtil.parse(testConstants.flowcryptcompatibilityPublicKey7FDE685548AEA788), revoked: false }] + verificationPubs: [testConstants.flowcryptcompatibilityPublicKey7FDE685548AEA788] }); expect(result.match).to.be.true; t.pass(); From 6436edfc346286691228d681408ff7de579c6023 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sun, 28 Nov 2021 12:37:21 +0000 Subject: [PATCH 03/31] fix --- .../pgp-block-signature-module.ts | 41 +++++++++++-------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts b/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts index eeb16a80fe1..0d6517e34fb 100644 --- a/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts +++ b/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts @@ -28,27 +28,32 @@ export class PgpBlockViewSignatureModule { $('#pgp_signature > .result').text('matching signature'); } else { if (retryVerification) { - this.view.renderModule.renderText('Verifying message...'); - try { - const { pubkeys: newPubkeys } = await this.view.pubLookup.lookupEmail(this.view.getSigner()); - if (newPubkeys.length) { - await this.renderPgpSignatureCheckResult(await retryVerification(newPubkeys), undefined); - return; + const signerEmail = this.view.getSigner(); + if (!signerEmail) { + // in some tests we load the block without sender information + $('#pgp_signature').addClass('neutral').find('.result').text(`Could not verify sender.`); + } else { + this.view.renderModule.renderText('Verifying message...'); + try { + const { pubkeys: newPubkeys } = await this.view.pubLookup.lookupEmail(this.view.getSigner()); + if (newPubkeys.length) { + await this.renderPgpSignatureCheckResult(await retryVerification(newPubkeys), undefined); + return; + } + $('#pgp_signature').addClass('bad'); + $('#pgp_signature > .result').text('signature does not match'); // todo: or "neutral" missing pubkey? + this.view.renderModule.setFrameColor('red'); + } catch (e) { + if (ApiErr.isSignificant(e)) { + Catch.reportErr(e); + $('#pgp_signature').addClass('neutral').find('.result').text(`Could not load sender's pubkey due to an error.`); + } else { + $('#pgp_signature').addClass('neutral').find('.result').text(`Could not look up sender's pubkey due to network error, click to retry.`).click( + this.view.setHandler(() => window.location.reload())); + } } - } catch (e) { - if (ApiErr.isSignificant(e)) { - Catch.reportErr(e); - $('#pgp_signature').addClass('neutral').find('.result').text(`Could not load sender's pubkey due to an error.`); - } else { - $('#pgp_signature').addClass('neutral').find('.result').text(`Could not look up sender's pubkey due to network error, click to retry.`).click( - this.view.setHandler(() => window.location.reload())); - } - return; } } - $('#pgp_signature').addClass('bad'); - $('#pgp_signature > .result').text('signature does not match'); - this.view.renderModule.setFrameColor('red'); } if (signature) { this.setSigner(signature); From 7c9c25c907ad58579c37343170b20e05b77fa641 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sun, 28 Nov 2021 19:56:04 +0000 Subject: [PATCH 04/31] fix unit tests that used to query by longid --- .../browser-unit-tests/unit-ContactStore.js | 184 +++--------------- 1 file changed, 23 insertions(+), 161 deletions(-) diff --git a/test/source/tests/browser-unit-tests/unit-ContactStore.js b/test/source/tests/browser-unit-tests/unit-ContactStore.js index 47e6eb82813..0f36a26484b 100644 --- a/test/source/tests/browser-unit-tests/unit-ContactStore.js +++ b/test/source/tests/browser-unit-tests/unit-ContactStore.js @@ -258,84 +258,7 @@ BROWSER_UNIT_TEST_NAME(`ContactStore saves and returns dates as numbers`); return 'pass'; })(); -BROWSER_UNIT_TEST_NAME(`ContactStore gets a contact by any longid`); -(async () => { - const contactABBDEF = await ContactStore.obj({ - email: 'abbdef@test.com', pubkey: testConstants.abbdefTestComPubkey - }); - const contactABCDEF = await ContactStore.obj({ - email: 'abcdef@test.com', pubkey: testConstants.abcdefTestComPubkey - }); - const contactABCDDF = await ContactStore.obj({ - email: 'abcddf@test.com', pubkey: testConstants.abcddfTestComPubkey - }); - const contactABDDEF = await ContactStore.obj({ - email: 'abddef@test.com', pubkey: testConstants.abddefTestComPubkey - }); - await ContactStore.save(undefined, [contactABBDEF, contactABCDEF, contactABCDDF, contactABDDEF]); - const [abbdefByPrimaryLongid] = await ContactStore.get(undefined, ['DF63659C3B4A81FB']); - if (abbdefByPrimaryLongid.email !== 'abbdef@test.com') { - throw Error(`Expected to get the key for abbdef@test.com by primary longid but got ${abbdefByPrimaryLongid.email}`); - } - if (abbdefByPrimaryLongid.pubkey.id !== 'B790AE8F425DC44633A8C086DF63659C3B4A81FB') { - throw Error(`Expected to get the key fingerprint B790AE8F425DC44633A8C086DF63659C3B4A81FB but got ${abbdefByPrimaryLongid.pubkey.id}`); - } - const [abbdefBySubkeyLongid] = await ContactStore.get(undefined, ['621DE1814AD675E0']); - if (abbdefBySubkeyLongid.email !== 'abbdef@test.com') { - throw Error(`Expected to get the key for abbdef@test.com by subkey longid but got ${abbdefBySubkeyLongid.email}`); - } - if (abbdefBySubkeyLongid.pubkey.id !== 'B790AE8F425DC44633A8C086DF63659C3B4A81FB') { - throw Error(`Expected to get the key fingerprint B790AE8F425DC44633A8C086DF63659C3B4A81FB but got ${abbdefBySubkeyLongid.pubkey.id}`); - } - - const [abcdefByPrimaryLongid] = await ContactStore.get(undefined, ['608BCD797A23FB91']); - if (abcdefByPrimaryLongid.email !== 'abcdef@test.com') { - throw Error(`Expected to get the key for abcdef@test.com by primary longid but got ${abcdefByPrimaryLongid.email}`); - } - if (abcdefByPrimaryLongid.pubkey.id !== '3155F118B6E732B3638A1CE1608BCD797A23FB91') { - throw Error(`Expected to get the key fingerprint 3155F118B6E732B3638A1CE1608BCD797A23FB91 but got ${abcdefByPrimaryLongid.pubkey.id}`); - } - const [abcdefBySubkeyLongid] = await ContactStore.get(undefined, ['2D47A41943DFAFCE']); - if (abcdefBySubkeyLongid.email !== 'abcdef@test.com') { - throw Error(`Expected to get the key for abcdef@test.com by subkey longid but got ${abcdefBySubkeyLongid.email}`); - } - if (abcdefBySubkeyLongid.pubkey.id !== '3155F118B6E732B3638A1CE1608BCD797A23FB91') { - throw Error(`Expected to get the key fingerprint 3155F118B6E732B3638A1CE1608BCD797A23FB91 but got ${abcdefBySubkeyLongid.pubkey.id}`); - } - - const [abcddfByPrimaryLongid] = await ContactStore.get(undefined, ['75AA44AB8930F7E9']); - if (abcddfByPrimaryLongid.email !== 'abcddf@test.com') { - throw Error(`Expected to get the key for abcddf@test.com by primary longid but got ${abcddfByPrimaryLongid.email}`); - } - if (abcddfByPrimaryLongid.pubkey.id !== '6CF53D2329C2A80828F499D375AA44AB8930F7E9') { - throw Error(`Expected to get the key fingerprint 6CF53D2329C2A80828F499D375AA44AB8930F7E9 but got ${abcddfByPrimaryLongid.pubkey.id}`); - } - const [abcddfBySubkeyLongid] = await ContactStore.get(undefined, ['92CFDAC7AA3A4253']); - if (abcddfBySubkeyLongid.email !== 'abcddf@test.com') { - throw Error(`Expected to get the key for abcddf@test.com by subkey longid but got ${abcddfBySubkeyLongid.email}`); - } - if (abcddfBySubkeyLongid.pubkey.id !== '6CF53D2329C2A80828F499D375AA44AB8930F7E9') { - throw Error(`Expected to get the key fingerprint 6CF53D2329C2A80828F499D375AA44AB8930F7E9 but got ${abcddfBySubkeyLongid.pubkey.id}`); - } - - const [abddefByPrimaryLongid] = await ContactStore.get(undefined, ['5FCC1541CF282951']); - if (abddefByPrimaryLongid.email !== 'abddef@test.com') { - throw Error(`Expected to get the key for abddef@test.com by primary longid but got ${abddefByPrimaryLongid.email}`); - } - if (abddefByPrimaryLongid.pubkey.id !== '9E020D9B752FD3FFF17ED9B65FCC1541CF282951') { - throw Error(`Expected to get the key fingerprint 9E020D9B752FD3FFF17ED9B65FCC1541CF282951 but got ${abddefByPrimaryLongid.pubkey.id}`); - } - const [abddefBySubkeyLongid] = await ContactStore.get(undefined, ['EAA7A05FE34F3A1A']); - if (abddefBySubkeyLongid.email !== 'abddef@test.com') { - throw Error(`Expected to get the key for abddef@test.com by subkey longid but got ${abddefBySubkeyLongid.email}`); - } - if (abddefBySubkeyLongid.pubkey.id !== '9E020D9B752FD3FFF17ED9B65FCC1541CF282951') { - throw Error(`Expected to get the key fingerprint 9E020D9B752FD3FFF17ED9B65FCC1541CF282951 but got ${abddefBySubkeyLongid.pubkey.id}`); - } - return 'pass'; -})(); - -BROWSER_UNIT_TEST_NAME(`ContactStore gets a valid pubkey by e-mail, or exact pubkey by longid`); +BROWSER_UNIT_TEST_NAME(`ContactStore gets a valid pubkey by e-mail and all pubkeys with getOneWithAllPubkeys()`); (async () => { // Note 1: email differs from pubkey id // Note 2: not necessary to call ContactStore.save, it's possible to always use ContactStore.update @@ -347,13 +270,18 @@ BROWSER_UNIT_TEST_NAME(`ContactStore gets a valid pubkey by e-mail, or exact pub if (expectedValid.pubkey.id !== 'D6662C5FB9BDE9DA01F3994AAA1EF832D8CCA4F2') { throw Error(`Expected to get the key fingerprint D6662C5FB9BDE9DA01F3994AAA1EF832D8CCA4F2 but got ${expectedValid.pubkey.id}`); } - const [expectedRevoked1] = await ContactStore.get(undefined, ['097EEBF354259A5E']); - if (expectedRevoked1.pubkey.id !== 'A5CFC8E8EA4AE69989FE2631097EEBF354259A5E') { - throw Error(`Expected to get the key fingerprint A5CFC8E8EA4AE69989FE2631097EEBF354259A5E but got ${expectedRevoked1.pubkey.id}`); + const {sortedPubkeys: pubs} = await ContactStore.getOneWithAllPubkeys(undefined, `some.revoked@otherhost.com`); + if (pubs.length !== 3) { + throw new Error(`3 pubkeys were expected to be retrieved from the storage but got ${pubs.length}`); + } + if (!pubs.some(x => x.pubkey.id === 'A5CFC8E8EA4AE69989FE2631097EEBF354259A5E')) { + throw Error(`Expected to get the key with fingerprint A5CFC8E8EA4AE69989FE2631097EEBF354259A5E but missing it`); } - const [expectedRevoked2] = await ContactStore.get(undefined, ['DE8538DDA1648C76']); - if (expectedRevoked2.pubkey.id !== '3930752556D57C46A1C56B63DE8538DDA1648C76') { - throw Error(`Expected to get the key fingerprint 3930752556D57C46A1C56B63DE8538DDA1648C76 but got ${expectedRevoked2.pubkey.id}`); + if (!pubs.some(x => x.pubkey.id === '3930752556D57C46A1C56B63DE8538DDA1648C76')) { + throw Error(`Expected to get the key with fingerprint 3930752556D57C46A1C56B63DE8538DDA1648C76 but missing it`); + } + if (!pubs.some(x => x.pubkey.id === 'D6662C5FB9BDE9DA01F3994AAA1EF832D8CCA4F2')) { + throw Error(`Expected to get the key with fingerprint D6662C5FB9BDE9DA01F3994AAA1EF832D8CCA4F2 but missing it`); } return 'pass'; })(); @@ -371,9 +299,6 @@ BROWSER_UNIT_TEST_NAME(`ContactStore stores postfixed fingerprint internally for // extract the entity directly from the database const entityFp = '16BB407403A3ADC55E1E0E4AF93EEC8FB187C923-X509'; const fingerprint = '16BB407403A3ADC55E1E0E4AF93EEC8FB187C923'; - const longid = 'X509-MIGiMIGNMQswCQYDVQQGEwJJVDEQMA4GA1UECAwHQmVyZ2FtbzEZMBcGA1UEBwwQUG9udGUgU2Fu' + - 'IFBpZXRybzEjMCEGA1UECgwaQWN0YWxpcyBTLnAuQS4vMDMzNTg1MjA5NjcxLDAqBgNVBAMMI0FjdGFsaXMgQ2xpZW50IE' + - 'F1dGhlbnRpY2F0aW9uIENBIEcyAhBj9wJecA85RTAfsvulZ0+E'; const entity = await new Promise((resolve, reject) => { const req = db.transaction(['pubkeys'], 'readonly').objectStore('pubkeys').get(entityFp); ContactStore.setReqPipe(req, resolve, reject); @@ -381,10 +306,6 @@ BROWSER_UNIT_TEST_NAME(`ContactStore stores postfixed fingerprint internally for if (entity.fingerprint !== entityFp) { throw Error(`Failed to extract pubkey ${fingerprint}`); } - const [contactByLongid] = await ContactStore.get(db, [longid]); - if (contactByLongid.pubkey.id !== fingerprint) { - throw Error(`Failed to extract pubkey ${fingerprint}`); - } const [contactByEmail] = await ContactStore.get(db, [email]); if (contactByEmail.pubkey.id !== fingerprint) { throw Error(`Failed to extract pubkey ${fingerprint}`); @@ -392,36 +313,6 @@ BROWSER_UNIT_TEST_NAME(`ContactStore stores postfixed fingerprint internally for return 'pass'; })(); -BROWSER_UNIT_TEST_NAME(`ContactStore searches S/MIME Certificate by PKCS#7 message recipient`); -(async () => { - const db = await ContactStore.dbOpen(); - const email = 'actalis@meta.33mail.com'; - const pubkey = testConstants.expiredSmimeCert; - const contacts = [await ContactStore.obj({ email, pubkey })]; - await ContactStore.save(db, contacts); - const p7 = forge.pkcs7.createEnvelopedData(); - const certificate = forge.pki.certificateFromPem(pubkey); - p7.addRecipient(certificate); - const recipient = p7.recipients[0]; - const issuerAndSerialNumberAsn1 = - forge.asn1.create(forge.asn1.Class.UNIVERSAL, forge.asn1.Type.SEQUENCE, true, [ - // Name - forge.pki.distinguishedNameToAsn1({ attributes: recipient.issuer }), - // Serial - forge.asn1.create(forge.asn1.Class.UNIVERSAL, forge.asn1.Type.INTEGER, false, - forge.util.hexToBytes(recipient.serialNumber)) - ]); - const der = forge.asn1.toDer(issuerAndSerialNumberAsn1).getBytes(); - const buf = Buf.fromRawBytesStr(der); - const [contact] = await ContactStore.get(db, ['X509-' + buf.toBase64Str()]); - const foundCert = KeyUtil.armor(contact.pubkey); - const foundCertStripped = foundCert.match(/(.*\-\-\-\-\-END CERTIFICATE\-\-\-\-\-)\r?\n?/s)[1]; - if (foundCertStripped !== pubkey) { - throw new Error(`The certificate wasn't found by S/MIME IssuerAndSerialNumber`); - } - return 'pass'; -})(); - BROWSER_UNIT_TEST_NAME(`ContactStore: X-509 revocation affects OpenPGP key`); (async () => { const db = await ContactStore.dbOpen(); @@ -431,13 +322,9 @@ BROWSER_UNIT_TEST_NAME(`ContactStore: X-509 revocation affects OpenPGP key`); throw new Error(`Valid OpenPGP Key is expected to have fingerprint ${fingerprint} but actually is ${opgpKeyOldAndValid.id}`); } await ContactStore.update(db, 'some.revoked@localhost.com', { pubkey: opgpKeyOldAndValid }); - const [loadedOpgpKey1] = await ContactStore.get(db, [`some.revoked@localhost.com`]); - if (loadedOpgpKey1.pubkey.revoked) { - throw new Error(`The loaded OpenPGP Key (1) was expected to be valid but it is revoked.`); - } - const [loadedOpgpKey2] = await ContactStore.get(db, [`AA1EF832D8CCA4F2`]); - if (loadedOpgpKey2.pubkey.revoked) { - throw new Error(`The loaded OpenPGP Key (2) was expected to be valid but it is revoked.`); + const {sortedPubkeys: pubkeys1} = await ContactStore.getOneWithAllPubkeys(db, `some.revoked@localhost.com`); + if (pubkeys1.some(x => x.revoked)) { + throw new Error('The pubkey was expected to be valid but it is revoked.'); } // emulate X-509 revocation await new Promise((resolve, reject) => { @@ -446,13 +333,9 @@ BROWSER_UNIT_TEST_NAME(`ContactStore: X-509 revocation affects OpenPGP key`); tx.objectStore('revocations').put({ fingerprint: fingerprint + "-X509" }); }); // original key should be either revoked or missing - const [loadedOpgpKey3] = await ContactStore.get(db, [`some.revoked@localhost.com`]); - if (loadedOpgpKey3.pubkey && !loadedOpgpKey3.pubkey.revoked) { - throw new Error(`The loaded OpenPGP Key (3) was expected to be revoked but it is not.`); - } - const [loadedOpgpKey4] = await ContactStore.get(db, [`AA1EF832D8CCA4F2`]); - if (loadedOpgpKey4.pubkey && !loadedOpgpKey4.pubkey.revoked) { - throw new Error(`The loaded OpenPGP Key (4) was expected to be revoked but it is not.`); + const {sortedPubkeys: pubkeys2} = await ContactStore.getOneWithAllPubkeys(db, `some.revoked@localhost.com`); + if (pubkeys2.some(x => !x.revoked)) { + throw new Error('The pubkey was expected to be revoked but it is not.'); } return 'pass'; })(); @@ -463,14 +346,9 @@ BROWSER_UNIT_TEST_NAME(`ContactStore: OpenPGP revocation affects X.509 certifica const smimeKey = await KeyUtil.parse(testConstants.expiredSmimeCert); await ContactStore.update(db, 'actalis@meta.33mail.com', { pubkey: smimeKey }); const [loadedCert1] = await ContactStore.get(db, [`actalis@meta.33mail.com`]); - const longid = KeyUtil.getPrimaryLongid(smimeKey); if (loadedCert1.pubkey.revoked) { throw new Error(`The loaded X.509 certificate (1) was expected to be valid but it is revoked.`); } - const [loadedCert2] = await ContactStore.get(db, [longid]); - if (loadedCert2.pubkey.revoked) { - throw new Error(`The loaded X.509 certificate (2) was expected to be valid but it is revoked.`); - } // emulate openPGP revocation await new Promise((resolve, reject) => { const tx = db.transaction(['revocations'], 'readwrite'); @@ -482,10 +360,6 @@ BROWSER_UNIT_TEST_NAME(`ContactStore: OpenPGP revocation affects X.509 certifica if (loadedCert3.pubkey && !loadedCert3.pubkey.revoked) { throw new Error(`The loaded X.509 certificate (3) was expected to be revoked but it is not.`); } - const [loadedCert4] = await ContactStore.get(db, [longid]); - if (loadedCert4.pubkey && !loadedCert4.pubkey.revoked) { - throw new Error(`The loaded X.509 certificate (4) was expected to be revoked but it is not.`); - } return 'pass'; })(); @@ -506,28 +380,16 @@ BROWSER_UNIT_TEST_NAME(`ContactStore doesn't replace revoked key with older vers if (loadedOpgpKey1.pubkey.revoked) { throw new Error(`The loaded OpenPGP Key (1) was expected to be valid but it is revoked.`); } - const [loadedOpgpKey2] = await ContactStore.get(db, [`AA1EF832D8CCA4F2`]); - if (loadedOpgpKey2.pubkey.revoked) { - throw new Error(`The loaded OpenPGP Key (2) was expected to be valid but it is revoked.`); - } await ContactStore.update(db, 'some.revoked@localhost.com', { pubkey: opgpKeyRevoked }); + const [loadedOpgpKey2] = await ContactStore.get(db, [`some.revoked@localhost.com`]); + if (loadedOpgpKey2.pubkey && !loadedOpgpKey2.pubkey.revoked) { + throw new Error(`The loaded OpenPGP Key (2) was expected to be revoked but it is not.`); + } + await ContactStore.update(db, 'some.revoked@localhost.com', { pubkey: opgpKeyOldAndValid }); const [loadedOpgpKey3] = await ContactStore.get(db, [`some.revoked@localhost.com`]); if (loadedOpgpKey3.pubkey && !loadedOpgpKey3.pubkey.revoked) { throw new Error(`The loaded OpenPGP Key (3) was expected to be revoked but it is not.`); } - const [loadedOpgpKey4] = await ContactStore.get(db, [`AA1EF832D8CCA4F2`]); - if (loadedOpgpKey4.pubkey && !loadedOpgpKey4.pubkey.revoked) { - throw new Error(`The loaded OpenPGP Key (4) was expected to be revoked but it is not.`); - } - await ContactStore.update(db, 'some.revoked@localhost.com', { pubkey: opgpKeyOldAndValid }); - const [loadedOpgpKey5] = await ContactStore.get(db, [`some.revoked@localhost.com`]); - if (loadedOpgpKey5.pubkey && !loadedOpgpKey5.pubkey.revoked) { - throw new Error(`The loaded OpenPGP Key (5) was expected to be revoked but it is not.`); - } - const [loadedOpgpKey6] = await ContactStore.get(db, [`AA1EF832D8CCA4F2`]); - if (loadedOpgpKey6.pubkey && !loadedOpgpKey6.pubkey.revoked) { - throw new Error(`The loaded OpenPGP Key (6) was expected to be revoked but it is not.`); - } return 'pass'; })(); From ba745e8553ccad3d9dd408b42fe3a02ff21c01b8 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 30 Nov 2021 15:06:08 +0000 Subject: [PATCH 05/31] fixed some tests --- .../message-export-16a9c109bc51687d.json | 4 +-- test/source/tests/decrypt.ts | 29 +++++++++++++++---- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/test/source/mock/google/exported-messages/message-export-16a9c109bc51687d.json b/test/source/mock/google/exported-messages/message-export-16a9c109bc51687d.json index b6e764d9898..551c5c78ff4 100644 --- a/test/source/mock/google/exported-messages/message-export-16a9c109bc51687d.json +++ b/test/source/mock/google/exported-messages/message-export-16a9c109bc51687d.json @@ -73,11 +73,11 @@ }, { "name": "From", - "value": "FlowCrypt Compatibility " + "value": "FlowCrypt Compatibility " }, { "name": "Reply-To", - "value": "FlowCrypt Compatibility " + "value": "FlowCrypt Compatibility " }, { "name": "Subject", diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index 5b08cbe0b8e..3750ccde94b 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -394,26 +394,43 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { params: url, content: ['How is my message signed?'], - signature: ['Sams50sams50sept@Gmail.Com', 'matching signature'] + signature: ['President@Forged.Com', 'matching signature'] + }); + })); + + ava.default('signature - verification succeeds when signed with a second-best key', testWithBrowser('ci.tests.gmail', async (t, browser) => { + const threadId = '1766644f13510f58'; + const acctEmail = 'ci.tests.gmail@flowcrypt.test'; + await PageRecipe.addPubkey(t, browser, acctEmail, '-----BEGIN PGP PUBLIC KEY BLOCK-----\r\nVersion: FlowCrypt Email Encryption [BUILD_REPLACEABLE_VERSION]\r\nComment: Seamlessly send and receive encrypted email\r\n\r\nxjMEYZeW2RYJKwYBBAHaRw8BAQdAT5QfLVP3y1yukk3MM/oiuXLNe1f9az5M\r\nBnOlKdF0nKnNJVNvbWVib2R5IDxTYW1zNTBzYW1zNTBzZXB0QEdtYWlsLkNv\r\nbT7CjwQQFgoAIAUCYZeW2QYLCQcIAwIEFQgKAgQWAgEAAhkBAhsDAh4BACEJ\r\nEMrSTYqLk6SUFiEEBP90ux3d6kDwDdzvytJNiouTpJS27QEA7pFlkLfD0KFQ\r\nsH/dwb/NPzn5zCi2L9gjPAC3d8gv1fwA/0FjAy/vKct4D7QH8KwtEGQns5+D\r\nP1WxDr4YI2hp5TkAzjgEYZeW2RIKKwYBBAGXVQEFAQEHQKNLY/bXrhJMWA2+\r\nWTjk3I7KhawyZfLomJ4hovqr7UtOAwEIB8J4BBgWCAAJBQJhl5bZAhsMACEJ\r\nEMrSTYqLk6SUFiEEBP90ux3d6kDwDdzvytJNiouTpJQnpgD/c1CzfS3YzJUx\r\nnFMrhjiE0WVgqOV/3CkfI4m4RA30QUIA/ju8r4AD2h6lu3Mx/6I6PzIRZQty\r\nLvTkcu4UKodZa4kK\r\n=7C4A\r\n-----END PGP PUBLIC KEY BLOCK-----\r\n', + 'president@forged.com'); + const inboxPage = await browser.newPage(t, TestUrls.extension(`chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`)); + await inboxPage.waitAll('iframe', { timeout: 2 }); + const urls = await inboxPage.getFramesUrls(['/chrome/elements/pgp_block.htm'], { sleep: 10, appearIn: 20 }); + expect(urls.length).to.equal(1); + const url = urls[0].split('/chrome/elements/pgp_block.htm')[1]; + await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { + params: url, + content: ['How is my message signed?'], + signature: ['President@Forged.Com', 'matching signature'] }); })); ava.default('decrypt - protonmail - load pubkey into contact + verify detached msg', testWithBrowser('compatibility', async (t, browser) => { const textParams = `?frameId=none&message=&msgId=16a9c109bc51687d&` + - `senderEmail=mismatch%40mail.com&isOutgoing=___cu_false___&signature=___cu_true___&acctEmail=flowcrypt.compatibility%40gmail.com`; + `senderEmail=some.alias%40protonmail.com&isOutgoing=___cu_false___&signature=___cu_true___&acctEmail=flowcrypt.compatibility%40gmail.com`; await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { params: textParams, content: ["1234"], signature: ["Missing pubkey"] }); - await PageRecipe.addPubkey(t, browser, 'flowcrypt.compatibility%40gmail.com', testConstants.protonCompatPub); + await PageRecipe.addPubkey(t, browser, 'flowcrypt.compatibility%40gmail.com', testConstants.protonCompatPub, 'some.alias@protonmail.com'); await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { params: textParams, content: ["1234"], - signature: ["matching signature", "Flowcrypt.Compatibility@Protonmail.Com"] + signature: ["matching signature", "Some.Alias@Protonmail.Com"] }); const htmlParams = `?frameId=none&message=&msgId=16a9c0fe4e034bc2&` + - `senderEmail=&isOutgoing=___cu_false___&signature=___cu_true___&acctEmail=flowcrypt.compatibility%40gmail.com`; + `senderEmail=some.alias%40protonmail.com&isOutgoing=___cu_false___&signature=___cu_true___&acctEmail=flowcrypt.compatibility%40gmail.com`; await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { params: htmlParams, content: ["1234"], - signature: ["matching signature", "Flowcrypt.Compatibility@Protonmail.Com"] + signature: ["matching signature", "Some.Alias@Protonmail.Com"] }); })); From 8ae8d04e25d0b13bb506015a9080018fcac085df Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 30 Nov 2021 15:07:44 +0000 Subject: [PATCH 06/31] removed unused browser msg --- extension/js/common/browser/browser-msg.ts | 23 +++++----------------- 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/extension/js/common/browser/browser-msg.ts b/extension/js/common/browser/browser-msg.ts index 482b4aa2791..f72365318cd 100644 --- a/extension/js/common/browser/browser-msg.ts +++ b/extension/js/common/browser/browser-msg.ts @@ -17,8 +17,7 @@ import { MsgUtil } from '../core/crypto/pgp/msg-util.js'; import { Ui } from './ui.js'; import { GlobalStoreDict, GlobalIndex } from '../platform/store/global-store.js'; import { AcctStoreDict, AccountIndex } from '../platform/store/acct-store.js'; -import { Contact, Key, KeyUtil } from '../core/crypto/key.js'; -import { OpenPGPKey } from '../core/crypto/pgp/openpgp-key.js'; +import { Contact } from '../core/crypto/key.js'; export type GoogleAuthWindowResult$result = 'Success' | 'Denied' | 'Error' | 'Closed'; @@ -62,8 +61,6 @@ export namespace Bm { export type PgpMsgVerifyDetached = PgpMsgMethod.Arg.VerifyDetached; export type PgpHashChallengeAnswer = { answer: string }; export type PgpMsgType = PgpMsgMethod.Arg.Type; - export type KeyParse = { armored: string }; - export type KeyMatch = { pubkeys: string[], longid: string }; export type Ajax = { req: JQueryAjaxSettings, stack: string }; export type AjaxGmailAttachmentGetChunk = { acctEmail: string, msgId: string, attachmentId: string }; export type ShowAttachmentPreview = { iframeUrl: string }; @@ -83,26 +80,24 @@ export namespace Bm { export type PgpMsgVerify = VerifyRes; export type PgpMsgType = PgpMsgTypeResult; export type PgpHashChallengeAnswer = { hashed: string }; - export type KeyParse = { key: Key }; - export type KeyMatch = { key: Key | undefined }; export type AjaxGmailAttachmentGetChunk = { chunk: Buf }; export type _tab_ = { tabId: string | null | undefined }; export type Db = any; // not included in Any below export type Ajax = any; // not included in Any below export type Any = GetActiveTabInfo | _tab_ | ReconnectAcctAuthPopup - | PgpMsgDecrypt | PgpMsgDiagnoseMsgPubkeys | PgpMsgVerify | PgpHashChallengeAnswer | PgpMsgType | KeyParse + | PgpMsgDecrypt | PgpMsgDiagnoseMsgPubkeys | PgpMsgVerify | PgpHashChallengeAnswer | PgpMsgType | InMemoryStoreGet | InMemoryStoreSet | StoreAcctGet | StoreAcctSet | StoreGlobalGet | StoreGlobalSet - | AjaxGmailAttachmentGetChunk | KeyMatch; + | AjaxGmailAttachmentGetChunk; } export type AnyRequest = PassphraseEntry | StripeResult | OpenPage | OpenGoogleAuthDialog | Redirect | Reload | AddPubkeyDialog | ReinsertReplyBox | ComposeWindow | ScrollToReplyBox | ScrollToCursorInReplyBox | SubscribeDialog | RenderPublicKeys | NotificationShowAuthPopupNeeded | ComposeWindowOpenDraft | NotificationShow | PassphraseDialog | PassphraseDialog | Settings | SetCss | AddOrRemoveClass | ReconnectAcctAuthPopup | - Db | InMemoryStoreSet | InMemoryStoreGet | StoreGlobalGet | StoreGlobalSet | StoreAcctGet | StoreAcctSet | KeyParse | + Db | InMemoryStoreSet | InMemoryStoreGet | StoreGlobalGet | StoreGlobalSet | StoreAcctGet | StoreAcctSet | PgpMsgDecrypt | PgpMsgDiagnoseMsgPubkeys | PgpMsgVerifyDetached | PgpHashChallengeAnswer | PgpMsgType | Ajax | - ShowAttachmentPreview | ReRenderRecipient | KeyMatch; + ShowAttachmentPreview | ReRenderRecipient; // export type RawResponselessHandler = (req: AnyRequest) => Promise; // export type RawRespoHandler = (req: AnyRequest) => Promise; @@ -148,8 +143,6 @@ export class BrowserMsg { pgpHashChallengeAnswer: (bm: Bm.PgpHashChallengeAnswer) => BrowserMsg.sendAwait(undefined, 'pgpHashChallengeAnswer', bm, true) as Promise, pgpMsgDecrypt: (bm: Bm.PgpMsgDecrypt) => BrowserMsg.sendAwait(undefined, 'pgpMsgDecrypt', bm, true) as Promise, pgpMsgVerifyDetached: (bm: Bm.PgpMsgVerifyDetached) => BrowserMsg.sendAwait(undefined, 'pgpMsgVerifyDetached', bm, true) as Promise, - keyParse: (bm: Bm.KeyParse) => BrowserMsg.sendAwait(undefined, 'keyParse', bm, true) as Promise, - keyMatch: (bm: Bm.KeyMatch) => BrowserMsg.sendAwait(undefined, 'keyMatch', bm, true) as Promise, pgpMsgType: (bm: Bm.PgpMsgType) => BrowserMsg.sendAwait(undefined, 'pgpMsgType', bm, true) as Promise, }, }, @@ -247,12 +240,6 @@ export class BrowserMsg { BrowserMsg.bgAddListener('pgpMsgDecrypt', MsgUtil.decryptMessage); BrowserMsg.bgAddListener('pgpMsgVerifyDetached', MsgUtil.verifyDetached); BrowserMsg.bgAddListener('pgpMsgType', MsgUtil.type); - BrowserMsg.bgAddListener('keyParse', async (r: Bm.KeyParse) => ({ key: await KeyUtil.parse(r.armored) })); - BrowserMsg.bgAddListener('keyMatch', async (r: Bm.KeyMatch) => ({ - key: - (await Promise.all(r.pubkeys.map(async (pub) => await KeyUtil.parse(pub)))). - find(k => k.allIds.map(id => OpenPGPKey.fingerprintToLongid(id).includes(r.longid))) - })); }; public static addListener = (name: string, handler: Handler) => { From b0c43d45d5c4b355fc1ae507775f2a272e88b306 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 30 Nov 2021 15:08:00 +0000 Subject: [PATCH 07/31] renames --- .../js/common/platform/store/contact-store.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/extension/js/common/platform/store/contact-store.ts b/extension/js/common/platform/store/contact-store.ts index 5599313ef66..6203bfa4ee7 100644 --- a/extension/js/common/platform/store/contact-store.ts +++ b/extension/js/common/platform/store/contact-store.ts @@ -223,17 +223,17 @@ export class ContactStore extends AbstractStore { }); }; - public static get = async (db: undefined | IDBDatabase, emailOrLongid: string[]): Promise<(Contact | undefined)[]> => { + public static get = async (db: undefined | IDBDatabase, emails: string[]): Promise<(Contact | undefined)[]> => { if (!db) { // relay op through background process - return await BrowserMsg.send.bg.await.db({ f: 'get', args: [emailOrLongid] }) as (Contact | undefined)[]; + return await BrowserMsg.send.bg.await.db({ f: 'get', args: [emails] }) as (Contact | undefined)[]; } - if (emailOrLongid.length === 1) { - const contact = await ContactStore.dbContactInternalGetOne(db, emailOrLongid[0]); + if (emails.length === 1) { + const contact = await ContactStore.dbContactInternalGetOne(db, emails[0]); return [contact]; } else { const results: (Contact | undefined)[] = []; - for (const singleEmailOrLongid of emailOrLongid) { - const [contact] = await ContactStore.get(db, [singleEmailOrLongid]); + for (const email of emails) { + const [contact] = await ContactStore.get(db, [email]); results.push(contact); } return results; @@ -677,9 +677,9 @@ export class ContactStore extends AbstractStore { .map(normalized => ContactStore.dbIndex(emailEntity.fingerprints.length > 0, normalized)); }; - private static dbContactInternalGetOne = async (db: IDBDatabase, emailOrLongid: string): Promise => { - if (emailOrLongid.includes('@')) { // email - const contactWithAllPubkeys = await ContactStore.getOneWithAllPubkeys(db, emailOrLongid); + private static dbContactInternalGetOne = async (db: IDBDatabase, email: string): Promise => { + if (email.includes('@')) { // email + const contactWithAllPubkeys = await ContactStore.getOneWithAllPubkeys(db, email); if (!contactWithAllPubkeys) { return contactWithAllPubkeys; } From 482fff074843a67b544f1aa51387cc743c4f1aa0 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 1 Dec 2021 04:51:38 +0000 Subject: [PATCH 08/31] fixed Message Not Signed and Missing Pubkey --- .../pgp-block-signature-module.ts | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts b/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts index 0d6517e34fb..9651e7577cb 100644 --- a/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts +++ b/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts @@ -15,7 +15,8 @@ export class PgpBlockViewSignatureModule { public renderPgpSignatureCheckResult = async (signature: VerifyRes | undefined, retryVerification?: (verificationPubs: string[]) => Promise) => { this.view.renderModule.doNotSetStateAsReadyYet = true; // so that body state is not marked as ready too soon - automated tests need to know when to check results - if (!signature) { + const signerLongid = signature?.signer?.longid; + if (!signerLongid) { $('#pgp_signature').addClass('bad'); $('#pgp_signature > .cursive').remove(); $('#pgp_signature > .result').text('Message Not Signed'); @@ -27,6 +28,12 @@ export class PgpBlockViewSignatureModule { $('#pgp_signature').addClass('good'); $('#pgp_signature > .result').text('matching signature'); } else { + // todo: bad signature when pubkey is hit + /* + $('#pgp_signature').addClass('bad'); + $('#pgp_signature > .result').text('signature does not match'); + this.view.renderModule.setFrameColor('red'); + */ if (retryVerification) { const signerEmail = this.view.getSigner(); if (!signerEmail) { @@ -40,9 +47,7 @@ export class PgpBlockViewSignatureModule { await this.renderPgpSignatureCheckResult(await retryVerification(newPubkeys), undefined); return; } - $('#pgp_signature').addClass('bad'); - $('#pgp_signature > .result').text('signature does not match'); // todo: or "neutral" missing pubkey? - this.view.renderModule.setFrameColor('red'); + this.renderMissingPubkey(signerLongid); } catch (e) { if (ApiErr.isSignificant(e)) { Catch.reportErr(e); @@ -53,6 +58,8 @@ export class PgpBlockViewSignatureModule { } } } + } else { // !retryVerification + this.renderMissingPubkey(signerLongid); } } if (signature) { @@ -67,6 +74,10 @@ export class PgpBlockViewSignatureModule { $('#pgp_signature > .cursive > span').text(signerEmail || 'Unknown Signer'); }; + private renderMissingPubkey = (signerLongid: string) => { + $('#pgp_signature').addClass('neutral').find('.result').text(`Missing pubkey ${signerLongid}`); + }; + /** * don't have appropriate pubkey by longid in contacts * From d4160b793510d80fb4dc699ce5522114f6bbe43b Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 1 Dec 2021 09:55:55 +0000 Subject: [PATCH 09/31] fix --- .../pgp_block_modules/pgp-block-signature-module.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts b/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts index 9651e7577cb..976864588a5 100644 --- a/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts +++ b/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts @@ -16,14 +16,14 @@ export class PgpBlockViewSignatureModule { public renderPgpSignatureCheckResult = async (signature: VerifyRes | undefined, retryVerification?: (verificationPubs: string[]) => Promise) => { this.view.renderModule.doNotSetStateAsReadyYet = true; // so that body state is not marked as ready too soon - automated tests need to know when to check results const signerLongid = signature?.signer?.longid; - if (!signerLongid) { - $('#pgp_signature').addClass('bad'); - $('#pgp_signature > .cursive').remove(); - $('#pgp_signature > .result').text('Message Not Signed'); - } else if (signature.error) { + if (signature?.error) { $('#pgp_signature').addClass('bad'); $('#pgp_signature > .result').text(signature.error); this.view.renderModule.setFrameColor('red'); + } else if (!signerLongid) { + $('#pgp_signature').addClass('bad'); + $('#pgp_signature > .cursive').remove(); + $('#pgp_signature > .result').text('Message Not Signed'); } else if (signature.match) { $('#pgp_signature').addClass('good'); $('#pgp_signature > .result').text('matching signature'); From 94a6846cb7d3ca8db52df45dbdb716617b5c44ce Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 1 Dec 2021 10:09:41 +0000 Subject: [PATCH 10/31] added remarks to link to #4158 --- extension/chrome/elements/attachment.ts | 2 +- extension/chrome/elements/attachment_preview.ts | 2 +- .../chrome/elements/compose-modules/compose-quote-module.ts | 2 +- .../elements/pgp_block_modules/pgp-block-attachmens-module.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extension/chrome/elements/attachment.ts b/extension/chrome/elements/attachment.ts index b1a1bec737e..ae7b52b92ca 100644 --- a/extension/chrome/elements/attachment.ts +++ b/extension/chrome/elements/attachment.ts @@ -261,7 +261,7 @@ export class AttachmentDownloadView extends View { const result = await MsgUtil.decryptMessage({ kisWithPp: await KeyStore.getAllWithOptionalPassPhrase(this.acctEmail), encryptedData: this.attachment.getData(), - verificationPubs: [] // todo: signature? + verificationPubs: [] // todo: #4158 signature verification of attachments }); Xss.sanitizeRender(this.downloadButton, this.originalButtonHTML || ''); if (result.success) { diff --git a/extension/chrome/elements/attachment_preview.ts b/extension/chrome/elements/attachment_preview.ts index f358b5e337a..fb8da6222c7 100644 --- a/extension/chrome/elements/attachment_preview.ts +++ b/extension/chrome/elements/attachment_preview.ts @@ -90,7 +90,7 @@ View.run(class AttachmentPreviewView extends AttachmentDownloadView { const result = await MsgUtil.decryptMessage({ kisWithPp: await KeyStore.getAllWithOptionalPassPhrase(this.acctEmail), encryptedData: this.attachment.getData(), - verificationPubs: [] // todo: signature? + verificationPubs: [] // todo: #4158 signature verification of attachments }); if ((result as DecryptSuccess).content) { return result.content; diff --git a/extension/chrome/elements/compose-modules/compose-quote-module.ts b/extension/chrome/elements/compose-modules/compose-quote-module.ts index 2052951628d..3caf8f33d6e 100644 --- a/extension/chrome/elements/compose-modules/compose-quote-module.ts +++ b/extension/chrome/elements/compose-modules/compose-quote-module.ts @@ -126,7 +126,7 @@ export class ComposeQuoteModule extends ViewModule { const result = await MsgUtil.decryptMessage({ kisWithPp: await KeyStore.getAllWithOptionalPassPhrase(this.view.acctEmail), encryptedData: block.attachmentMeta.data, - verificationPubs: [] // todo: signature? + verificationPubs: [] // todo: #4158 signature verification of attachments }); if (result.success) { attachmentMeta = { content: result.content, filename: result.filename }; diff --git a/extension/chrome/elements/pgp_block_modules/pgp-block-attachmens-module.ts b/extension/chrome/elements/pgp_block_modules/pgp-block-attachmens-module.ts index b988e9eae8b..6ebee1b38ef 100644 --- a/extension/chrome/elements/pgp_block_modules/pgp-block-attachmens-module.ts +++ b/extension/chrome/elements/pgp_block_modules/pgp-block-attachmens-module.ts @@ -69,7 +69,7 @@ export class PgpBlockViewAttachmentsModule { private decryptAndSaveAttachmentToDownloads = async (encrypted: Attachment) => { const kisWithPp = await KeyStore.getAllWithOptionalPassPhrase(this.view.acctEmail); - // todo: signature? + // todo: #4158 signature verification of attachments const decrypted = await BrowserMsg.send.bg.await.pgpMsgDecrypt({ kisWithPp, encryptedData: encrypted.getData(), verificationPubs: [] }); if (decrypted.success) { const attachment = new Attachment({ name: encrypted.name.replace(/\.(pgp|gpg)$/, ''), type: encrypted.type, data: decrypted.content }); From 7130cf8b7f23e7a64e3627b7a3d5042835880312 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 1 Dec 2021 10:09:57 +0000 Subject: [PATCH 11/31] remark --- extension/chrome/settings/modules/decrypt.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extension/chrome/settings/modules/decrypt.ts b/extension/chrome/settings/modules/decrypt.ts index 4283a97bfab..4a0e47c61d3 100644 --- a/extension/chrome/settings/modules/decrypt.ts +++ b/extension/chrome/settings/modules/decrypt.ts @@ -58,7 +58,7 @@ View.run(class ManualDecryptView extends View { const result = await MsgUtil.decryptMessage({ kisWithPp: await KeyStore.getAllWithOptionalPassPhrase(this.acctEmail), encryptedData: encrypted.getData(), - verificationPubs: [] // todo: signature? + verificationPubs: [] }); if (result.success) { const attachment = new Attachment({ name: encrypted.name.replace(/\.(pgp|gpg|asc)$/i, ''), type: encrypted.type, data: result.content }); From e048d6125c06ea8bf767cf2b3acfd1ca9b66ac2b Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 2 Dec 2021 13:04:34 +0000 Subject: [PATCH 12/31] refactorings --- .../pgp-block-signature-module.ts | 21 +++---- .../js/common/core/crypto/pgp/msg-util.ts | 5 +- .../js/common/core/crypto/pgp/openpgp-key.ts | 18 +++--- .../strategies/send-message-strategy.ts | 4 +- test/source/tests/unit-node.ts | 56 +++++++++++++------ 5 files changed, 60 insertions(+), 44 deletions(-) diff --git a/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts b/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts index 976864588a5..8f899ac81b0 100644 --- a/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts +++ b/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts @@ -13,18 +13,19 @@ export class PgpBlockViewSignatureModule { constructor(private view: PgpBlockView) { } - public renderPgpSignatureCheckResult = async (signature: VerifyRes | undefined, retryVerification?: (verificationPubs: string[]) => Promise) => { + public renderPgpSignatureCheckResult = async (verifyRes: VerifyRes | undefined, retryVerification?: (verificationPubs: string[]) => Promise) => { this.view.renderModule.doNotSetStateAsReadyYet = true; // so that body state is not marked as ready too soon - automated tests need to know when to check results - const signerLongid = signature?.signer?.longid; - if (signature?.error) { + const signerLongids = verifyRes?.signerLongids; + if (verifyRes?.error) { + // todo: retry raw here! $('#pgp_signature').addClass('bad'); - $('#pgp_signature > .result').text(signature.error); + $('#pgp_signature > .result').text(verifyRes.error); this.view.renderModule.setFrameColor('red'); - } else if (!signerLongid) { + } else if (!signerLongids?.length) { $('#pgp_signature').addClass('bad'); $('#pgp_signature > .cursive').remove(); $('#pgp_signature > .result').text('Message Not Signed'); - } else if (signature.match) { + } else if (verifyRes?.match) { $('#pgp_signature').addClass('good'); $('#pgp_signature > .result').text('matching signature'); } else { @@ -47,7 +48,7 @@ export class PgpBlockViewSignatureModule { await this.renderPgpSignatureCheckResult(await retryVerification(newPubkeys), undefined); return; } - this.renderMissingPubkey(signerLongid); + this.renderMissingPubkey(signerLongids[0]); } catch (e) { if (ApiErr.isSignificant(e)) { Catch.reportErr(e); @@ -59,11 +60,11 @@ export class PgpBlockViewSignatureModule { } } } else { // !retryVerification - this.renderMissingPubkey(signerLongid); + this.renderMissingPubkey(signerLongids[0]); } } - if (signature) { - this.setSigner(signature); + if (verifyRes) { + this.setSigner(verifyRes); } this.view.renderModule.doNotSetStateAsReadyYet = false; Ui.setTestState('ready'); diff --git a/extension/js/common/core/crypto/pgp/msg-util.ts b/extension/js/common/core/crypto/pgp/msg-util.ts index f652e4e703b..61c302a6c26 100644 --- a/extension/js/common/core/crypto/pgp/msg-util.ts +++ b/extension/js/common/core/crypto/pgp/msg-util.ts @@ -61,10 +61,7 @@ type DecryptError$longids = { message: string[]; matching: string[]; chosen: str export type DecryptError = { success: false; error: DecryptError$error; longids: DecryptError$longids; content?: Buf; isEncrypted?: boolean; }; export type VerifyRes = { - // longid is set up even if the signature isn't verified - // primaryUserId is set up from the found key - // todo: make `match` a structure and move `primaryUserId` inside it or remove at all (#2147 is no longer appropriate) - signer?: { primaryUserId: string | undefined, longid: string }; + signerLongids: string[]; match: boolean | null; // we can return some pubkey information here error?: string; isErrFatal?: boolean, diff --git a/extension/js/common/core/crypto/pgp/openpgp-key.ts b/extension/js/common/core/crypto/pgp/openpgp-key.ts index fdf8532ef0d..731eb4d594f 100644 --- a/extension/js/common/core/crypto/pgp/openpgp-key.ts +++ b/extension/js/common/core/crypto/pgp/openpgp-key.ts @@ -2,7 +2,7 @@ import { Key, PrvPacket, KeyAlgo, KeyUtil, UnexpectedKeyTypeError, PubkeyInfo } from '../key.js'; import { opgp } from './openpgpjs-custom.js'; import { Catch } from '../../../platform/catch.js'; -import { Str } from '../../common.js'; +import { Str, Value } from '../../common.js'; import { Buf } from '../../buf.js'; import { PgpMsgMethod, VerifyRes } from './msg-util.js'; @@ -436,7 +436,7 @@ export class OpenPGPKey { }; public static verify = async (msg: OpenpgpMsgOrCleartext, pubs: PubkeyInfo[]): Promise => { - const verifyRes: VerifyRes = { match: null }; // tslint:disable-line:no-null-keyword + const verifyRes: VerifyRes = { match: null, signerLongids: [] }; // tslint:disable-line:no-null-keyword // msg.getSigningKeyIds ? msg.getSigningKeyIds() // todo: double-check if S/MIME ever gets here const opgpKeys = pubs.filter(x => !x.revoked && x.pubkey.type === 'openpgp').map(x => OpenPGPKey.extractExternalLibraryObjFromKey(x.pubkey)); @@ -451,20 +451,16 @@ export class OpenPGPKey { verifyRes.content = data instanceof Uint8Array ? new Buf(data) : Buf.fromUtfStr(data); } // third step below + const signerLongids: string[] = []; for (const verification of verifications) { // todo - a valid signature is a valid signature, and should be surfaced. Currently, if any of the signatures are not valid, it's showing all as invalid // .. as it is now this could allow an attacker to append bogus signatures to validly signed messages, making otherwise correct messages seem incorrect // .. which is not really an issue - an attacker that can append signatures could have also just slightly changed the message, causing the same experience // .. so for now #wontfix unless a reasonable usecase surfaces verifyRes.match = (verifyRes.match === true || verifyRes.match === null) && await verification.verified; - if (!verifyRes.signer) { - // todo - currently only the first signer will be reported. Should we be showing all signers? How common is that? - verifyRes.signer = { - longid: OpenPGPKey.bytesToLongid(verification.keyid.bytes), - primaryUserId: await OpenPGPKey.getPrimaryUserId(opgpKeys, verification.keyid) - }; - } + signerLongids.push(OpenPGPKey.bytesToLongid(verification.keyid.bytes)); } + verifyRes.signerLongids.push(...Value.arr.unique(signerLongids)); } catch (verifyErr) { verifyRes.match = null; // tslint:disable-line:no-null-keyword if (verifyErr instanceof Error && verifyErr.message === 'Can only verify message with one literal data packet.') { @@ -754,10 +750,10 @@ export class OpenPGPKey { if (verifyResult.error !== null && typeof verifyResult.error !== 'undefined') { output.push(`verify failed: ${verifyResult.error}`); } else { - if (verifyResult.match && verifyResult.signer?.longid === OpenPGPKey.bytesToLongid(key.getKeyId().bytes)) { + if (verifyResult.match && verifyResult.signerLongids.includes(OpenPGPKey.bytesToLongid(key.getKeyId().bytes))) { output.push('verify ok'); } else { - output.push(`verify mismatch: match[${verifyResult.match}] signer.uid[${verifyResult.signer?.primaryUserId}] signer.longid[${verifyResult.signer?.longid}]`); + output.push(`verify mismatch: match[${verifyResult.match}]`); } } } catch (e) { diff --git a/test/source/mock/google/strategies/send-message-strategy.ts b/test/source/mock/google/strategies/send-message-strategy.ts index 3b535c99712..44455befda3 100644 --- a/test/source/mock/google/strategies/send-message-strategy.ts +++ b/test/source/mock/google/strategies/send-message-strategy.ts @@ -105,8 +105,8 @@ class SignedMessageTestStrategy implements ITestMsgStrategy { if (!decrypted.signature) { throw new HttpClientErr(`Error: The message isn't signed.`); } - if (decrypted.signature.signer?.longid !== this.signedBy) { - throw new HttpClientErr(`Error: expected message signed by ${this.signedBy} but was actually signed by ${decrypted.signature.signer?.longid}`); + if (!decrypted.signature.signerLongids.includes(this.signedBy)) { + throw new HttpClientErr(`Error: expected message signed by ${this.signedBy} but was actually signed by ${decrypted.signature.signerLongids.length} other signers`); } const content = decrypted.content.toUtfStr(); if (!content.includes(this.expectedText)) { diff --git a/test/source/tests/unit-node.ts b/test/source/tests/unit-node.ts index be9eee938c0..89aadd1e703 100644 --- a/test/source/tests/unit-node.ts +++ b/test/source/tests/unit-node.ts @@ -775,20 +775,6 @@ jLwe8W9IMt765T5x5oux9MmPDXF05xHfm4qfH/BMO3a802x5u2gJjJjuknrFdgXY t.pass(); }); - ava.default('[unit][MsgUtil.decryptMessage] extracts Primary User ID from key', async t => { - const data = await GoogleData.withInitializedData('ci.tests.gmail@flowcrypt.test'); - const msg: GmailMsg = data.getMessage('1766644f13510f58')!; - const enc = Buf.fromBase64Str(msg!.raw!).toUtfStr() - .match(/\-\-\-\-\-BEGIN PGP SIGNED MESSAGE\-\-\-\-\-.*\-\-\-\-\-END PGP SIGNATURE\-\-\-\-\-/s)![0]; - const encryptedData = Buf.fromUtfStr(enc); - const decrypted = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData, verificationPubs: [testConstants.pubkey2864E326A5BE488A] }); - expect(decrypted.success).to.equal(true); - const verifyRes = (decrypted as DecryptSuccess).signature!; - expect(verifyRes.match).to.be.true; - expect(verifyRes.signer?.primaryUserId).to.equal('A50 Sam '); - t.pass(); - }); - ava.default('[unit][MsgUtil.decryptMessage] finds correct key to verify signature', async t => { const data = await GoogleData.withInitializedData('ci.tests.gmail@flowcrypt.test'); const msg: GmailMsg = data.getMessage('1766644f13510f58')!; @@ -804,21 +790,18 @@ jLwe8W9IMt765T5x5oux9MmPDXF05xHfm4qfH/BMO3a802x5u2gJjJjuknrFdgXY expect(decrypted1.success).to.equal(true); const verifyRes1 = (decrypted1 as DecryptSuccess).signature!; expect(verifyRes1.match).to.be.true; - expect(verifyRes1.signer?.primaryUserId).to.equal('A50 Sam '); } { const decrypted2 = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData, verificationPubs: [betterKey, pubkey] }); expect(decrypted2.success).to.equal(true); const verifyRes2 = (decrypted2 as DecryptSuccess).signature!; expect(verifyRes2.match).to.be.true; - expect(verifyRes2.signer?.primaryUserId).to.equal('A50 Sam '); } { const decrypted3 = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData, verificationPubs: [pubkey] }); expect(decrypted3.success).to.equal(true); const verifyRes3 = (decrypted3 as DecryptSuccess).signature!; expect(verifyRes3.match).to.be.true; - expect(verifyRes3.signer?.primaryUserId).to.equal('A50 Sam '); } { const decrypted4 = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData, verificationPubs: [betterKey] }); @@ -888,6 +871,45 @@ jLwe8W9IMt765T5x5oux9MmPDXF05xHfm4qfH/BMO3a802x5u2gJjJjuknrFdgXY t.pass(); }); + ava.default(`[unit][MsgUtil.verifyDetached] returns errorwhen signature doesn't match`, async t => { + const sigText = Buf.fromUtfStr(`-----BEGIN PGP SIGNATURE----- + +wsD5BAABCAAjFiEE3CZFSvtx0Y6rutc9HH5tPFVjqUEFAl+QotYFAwAAAAAACgkQHH5tPFVjqUF4 +xgv+MrdQ07MfCVU93ptZg+S+OOkQ1AcZxGFdiivs10KkNGtLm9s+w/iEUAySSWbtKjbLV6O3AYvC +QFKsFRFr17Ekz6mSPj99zifFMBvTOIAev/d08dmX0kGd6YlP+GyZL3Wqcgy1T1H3obgOmToDtk7R +V52Ki1aTJYH/Z7v6PsQRWn8emfH/yGYplBhzZy2XjO6UIar9T8wtAJOd6+Ii2sfyGyEPjzGckLaR +JZOxQ4jpJJUszz2WsvLNwtKoqwV15Eg3oxZzHWYE8P63xXoE4G762604SIqv/ggyQZTt/Es6Scun +A1BJflFm+cHzQTW2yQfwCCvlzEZNiNwXfwGfV99K5iG1eW3lv7sMLJnitwTidNIlD5LTNdeUnTXj +XJvkEQsyTUI4qbzzJbUNYz7lraizC2nPiwFzLv692mS0urtD3mUhOBA9hZwk3l/20GsGia0FeUIS +E1d8Vh/Ey7IJ8TXbfFrdv5ZP3HqMK0089SooZwx/GN2QIaOYQXsS0u7IFNhU\n=q5Sf +-----END PGP SIGNATURE-----`); + const data = await GoogleData.withInitializedData('flowcrypt.compatibility@gmail.com'); + const msg = data.getMessage('1754cfc37886899e')!; + const msgText = Buf.fromBase64Str(msg!.raw!).toUtfStr(); + { + const dhartleyPubkey = msgText + .match(/\-\-\-\-\-BEGIN PGP PUBLIC KEY BLOCK\-\-\-\-\-.*\-\-\-\-\-END PGP PUBLIC KEY BLOCK\-\-\-\-\-/s)![0] + .replace(/=\r\n/g, '').replace(/=3D/g, '='); + const resultRightKey = await MsgUtil.verifyDetached({ + plaintext: Buf.fromUtfStr('some irrelevant text'), + sigText, + verificationPubs: [dhartleyPubkey] + }); + expect(resultRightKey.match).to.be.null; + expect(resultRightKey.error).to.not.be.undefined; + } + { + const resultWrongKey = await MsgUtil.verifyDetached({ + plaintext: Buf.fromUtfStr('some irrelevant text'), + sigText, + verificationPubs: [testConstants.flowcryptcompatibilityPublicKey7FDE685548AEA788] + }); + expect(resultWrongKey.match).to.be.null; + expect(resultWrongKey.error).to.be.undefined; + } + t.pass(); + }); + ava.default('[unit][MsgUtil.getSortedKeys,matchingKeyids] must be able to find matching keys', async t => { const passphrase = 'some pass for testing'; const key1 = await OpenPGPKey.create([{ name: 'Key1', email: 'key1@test.com' }], 'curve25519', passphrase, 0); From 2609b7d9936e09f6900674bbda975e6bf512223c Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sun, 5 Dec 2021 04:44:37 +0000 Subject: [PATCH 13/31] re-fetching signed-only message on non-fatal verification error --- extension/chrome/elements/pgp_block.ts | 19 +++++++++-- .../pgp-block-decrypt-module.ts | 28 +++++++--------- .../pgp-block-render-module.ts | 4 +-- .../pgp-block-signature-module.ts | 11 +++++-- test/source/tests/decrypt.ts | 32 +++++++++++++++++++ test/source/tests/unit-node.ts | 3 +- 6 files changed, 72 insertions(+), 25 deletions(-) diff --git a/extension/chrome/elements/pgp_block.ts b/extension/chrome/elements/pgp_block.ts index 1b17014187d..00a3c4aa0f9 100644 --- a/extension/chrome/elements/pgp_block.ts +++ b/extension/chrome/elements/pgp_block.ts @@ -18,6 +18,8 @@ import { View } from '../../js/common/view.js'; import { PubLookup } from '../../js/common/api/pub-lookup.js'; import { OrgRules } from '../../js/common/org-rules.js'; import { AcctStore } from '../../js/common/platform/store/acct-store.js'; +import { ContactStore } from '../../js/common/platform/store/contact-store.js'; +import { KeyUtil } from '../../js/common/core/crypto/key.js'; export class PgpBlockView extends View { @@ -28,7 +30,10 @@ export class PgpBlockView extends View { public readonly senderEmail: string; public readonly msgId: string | undefined; public readonly encryptedMsgUrlParam: Buf | undefined; - public signature: string | boolean | undefined; // when supplied with "true", decryptModule will replace this with actual signature data + public readonly signature?: { + // when parsedSignature is undefined, decryptModule will try to fetch the message + parsedSignature?: string + }; public gmail: Gmail; public orgRules!: OrgRules; @@ -56,7 +61,11 @@ export class PgpBlockView extends View { throw new Error('API path traversal forbidden'); } this.encryptedMsgUrlParam = uncheckedUrlParams.message ? Buf.fromUtfStr(Assert.urlParamRequire.string(uncheckedUrlParams, 'message')) : undefined; - this.signature = uncheckedUrlParams.signature === true ? true : (uncheckedUrlParams.signature ? String(uncheckedUrlParams.signature) : undefined); + if (uncheckedUrlParams.signature === true) { + this.signature = {}; + } else if (uncheckedUrlParams.signature) { + this.signature = { parsedSignature: String(uncheckedUrlParams.signature) }; + } this.gmail = new Gmail(this.acctEmail); // modules this.attachmentsModule = new PgpBlockViewAttachmentsModule(this); @@ -78,7 +87,11 @@ export class PgpBlockView extends View { const scopes = await AcctStore.getScopes(this.acctEmail); this.decryptModule.canReadEmails = scopes.read || scopes.modify; if (storage.setup_done) { - await this.decryptModule.initialize(); + const parsedPubs = (await ContactStore.getOneWithAllPubkeys(undefined, this.getSigner()))?.sortedPubkeys ?? []; + // todo: we don't actually need parsed pubs here because we're going to pass them to the backgorund page + // maybe we can have a method in ContactStore to extract armored keys + const verificationPubs = parsedPubs.map(key => KeyUtil.armor(key.pubkey)); + await this.decryptModule.initialize(verificationPubs, false); } else { await this.errorModule.renderErr(Lang.pgpBlock.refreshWindow, this.encryptedMsgUrlParam ? this.encryptedMsgUrlParam.toUtfStr() : undefined); } diff --git a/extension/chrome/elements/pgp_block_modules/pgp-block-decrypt-module.ts b/extension/chrome/elements/pgp_block_modules/pgp-block-decrypt-module.ts index a909867a43e..56d15746254 100644 --- a/extension/chrome/elements/pgp_block_modules/pgp-block-decrypt-module.ts +++ b/extension/chrome/elements/pgp_block_modules/pgp-block-decrypt-module.ts @@ -13,8 +13,6 @@ import { Ui } from '../../../js/common/browser/ui.js'; import { Xss } from '../../../js/common/platform/xss.js'; import { KeyStore } from '../../../js/common/platform/store/key-store.js'; import { PassphraseStore } from '../../../js/common/platform/store/passphrase-store.js'; -import { KeyUtil } from '../../../js/common/core/crypto/key.js'; -import { ContactStore } from '../../../js/common/platform/store/contact-store.js'; export class PgpBlockViewDecryptModule { @@ -26,20 +24,16 @@ export class PgpBlockViewDecryptModule { constructor(private view: PgpBlockView) { } - public initialize = async (forcePullMsgFromApi = false) => { - const parsedPubs = (await ContactStore.getOneWithAllPubkeys(undefined, this.view.getSigner()))?.sortedPubkeys ?? []; - // todo: we don't actually need parsed pubs here because we're going to pass them to the backgorund page - // maybe we can have a method in ContactStore to extract armored keys - const verificationPubs = parsedPubs.map(key => KeyUtil.armor(key.pubkey)); + public initialize = async (verificationPubs: string[], forcePullMsgFromApi: boolean) => { try { - if (this.canReadEmails && this.view.signature === true && this.view.msgId) { + if (this.canReadEmails && this.view.signature && !this.view.signature.parsedSignature && this.view.msgId) { this.view.renderModule.renderText('Loading signed message...'); const { raw } = await this.view.gmail.msgGet(this.view.msgId, 'raw'); this.msgFetchedFromApi = 'raw'; const mimeMsg = Buf.fromBase64UrlStr(raw!); // used 'raw' above const parsed = await Mime.decode(mimeMsg); if (parsed && typeof parsed.rawSignedContent === 'string' && parsed.signature) { - this.view.signature = parsed.signature; + this.view.signature.parsedSignature = parsed.signature; await this.decryptAndRender(Buf.fromUtfStr(parsed.rawSignedContent), verificationPubs); } else { await this.view.errorModule.renderErr('Error: could not properly parse signed message', parsed.rawSignedContent || parsed.text || parsed.html || mimeMsg.toUtfStr()); @@ -68,8 +62,10 @@ export class PgpBlockViewDecryptModule { } }; + public canFetchFromApi = () => this.canReadEmails && this.msgFetchedFromApi !== 'raw'; + private decryptAndRender = async (encryptedData: Buf, verificationPubs: string[], optionalPwd?: string, plainSubject?: string) => { - if (typeof this.view.signature !== 'string') { + if (!this.view.signature?.parsedSignature) { const kisWithPp = await KeyStore.getAllWithOptionalPassPhrase(this.view.acctEmail); const decrypt = async (verificationPubs: string[]) => await BrowserMsg.send.bg.await.pgpMsgDecrypt({ kisWithPp, encryptedData, verificationPubs }); const result = await decrypt(verificationPubs); @@ -77,7 +73,7 @@ export class PgpBlockViewDecryptModule { await this.view.errorModule.renderErr(Lang.general.restartBrowserAndTryAgain, undefined); } else if (result.success) { await this.view.renderModule.decideDecryptedContentFormattingAndRender(result.content, Boolean(result.isEncrypted), result.signature, - async (verificationPubs: string[]) => { + verificationPubs, async (verificationPubs: string[]) => { const decryptResult = await decrypt(verificationPubs); if (!decryptResult.success) { return undefined; // note: this internal error results in a wrong "Message Not Signed" badge @@ -86,9 +82,9 @@ export class PgpBlockViewDecryptModule { } }, plainSubject); } else if (result.error.type === DecryptErrTypes.format) { - if (this.canReadEmails && this.msgFetchedFromApi !== 'raw') { + if (this.canFetchFromApi()) { console.info(`re-fetching message ${this.view.msgId} from api because looks like bad formatting: ${!this.msgFetchedFromApi ? 'full' : 'raw'}`); - await this.initialize(true); + await this.initialize(verificationPubs, true); } else { await this.view.errorModule.renderErr(Lang.pgpBlock.badFormat + '\n\n' + result.error.message, encryptedData.toUtfStr()); } @@ -118,12 +114,12 @@ export class PgpBlockViewDecryptModule { await this.view.errorModule.renderErr(Lang.pgpBlock.cantOpen + Lang.pgpBlock.writeMe + '\n\nDiagnostic info: "' + JSON.stringify(result) + '"', encryptedData.toUtfStr()); } } - } else { // this.view.signature is string + } else { // this.view.signature.parsedSignature is defined // sometimes signatures come wrongly percent-encoded. Here we check for typical "=3Dabcd" at the end - const sigText = Buf.fromUtfStr(this.view.signature.replace('\n=3D', '\n=')); + const sigText = Buf.fromUtfStr(this.view.signature.parsedSignature.replace('\n=3D', '\n=')); const verify = async (verificationPubs: string[]) => await BrowserMsg.send.bg.await.pgpMsgVerifyDetached({ plaintext: encryptedData, sigText, verificationPubs }); const signatureResult = await verify(verificationPubs); - await this.view.renderModule.decideDecryptedContentFormattingAndRender(encryptedData, false, signatureResult, verify); + await this.view.renderModule.decideDecryptedContentFormattingAndRender(encryptedData, false, signatureResult, verificationPubs, verify); } }; diff --git a/extension/chrome/elements/pgp_block_modules/pgp-block-render-module.ts b/extension/chrome/elements/pgp_block_modules/pgp-block-render-module.ts index ee7a0019591..2ecc50b40dc 100644 --- a/extension/chrome/elements/pgp_block_modules/pgp-block-render-module.ts +++ b/extension/chrome/elements/pgp_block_modules/pgp-block-render-module.ts @@ -77,9 +77,9 @@ export class PgpBlockViewRenderModule { }; public decideDecryptedContentFormattingAndRender = async (decryptedBytes: Buf, isEncrypted: boolean, sigResult: VerifyRes | undefined, - retryVerification: (verificationPubs: string[]) => Promise, plainSubject?: string) => { + verificationPubs: string[], retryVerification: (verificationPubs: string[]) => Promise, plainSubject?: string) => { this.setFrameColor(isEncrypted ? 'green' : 'gray'); - await this.view.signatureModule.renderPgpSignatureCheckResult(sigResult, retryVerification); + await this.view.signatureModule.renderPgpSignatureCheckResult(sigResult, verificationPubs, retryVerification); const publicKeys: string[] = []; let renderableAttachments: Attachment[] = []; let decryptedContent = decryptedBytes.toUtfStr(); diff --git a/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts b/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts index 8f899ac81b0..6fcf2676cc3 100644 --- a/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts +++ b/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts @@ -13,11 +13,16 @@ export class PgpBlockViewSignatureModule { constructor(private view: PgpBlockView) { } - public renderPgpSignatureCheckResult = async (verifyRes: VerifyRes | undefined, retryVerification?: (verificationPubs: string[]) => Promise) => { + public renderPgpSignatureCheckResult = async (verifyRes: VerifyRes | undefined, verificationPubs: string[], + retryVerification?: (verificationPubs: string[]) => Promise) => { this.view.renderModule.doNotSetStateAsReadyYet = true; // so that body state is not marked as ready too soon - automated tests need to know when to check results const signerLongids = verifyRes?.signerLongids; if (verifyRes?.error) { - // todo: retry raw here! + if (!verifyRes.isErrFatal && this.view.decryptModule.canFetchFromApi()) { + this.view.signature!.parsedSignature = undefined; // force to re-parse + await this.view.decryptModule.initialize(verificationPubs, true); + return; + } $('#pgp_signature').addClass('bad'); $('#pgp_signature > .result').text(verifyRes.error); this.view.renderModule.setFrameColor('red'); @@ -45,7 +50,7 @@ export class PgpBlockViewSignatureModule { try { const { pubkeys: newPubkeys } = await this.view.pubLookup.lookupEmail(this.view.getSigner()); if (newPubkeys.length) { - await this.renderPgpSignatureCheckResult(await retryVerification(newPubkeys), undefined); + await this.renderPgpSignatureCheckResult(await retryVerification(newPubkeys), newPubkeys, undefined); return; } this.renderMissingPubkey(signerLongids[0]); diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index 3750ccde94b..aba85f2061b 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -5,6 +5,7 @@ import * as ava from 'ava'; import { Config, TestVariant, Util } from './../util'; import { testConstants } from './tooling/consts'; import { BrowserRecipe } from './tooling/browser-recipe'; +import { GoogleData } from './../mock/google/google-data'; import { InboxPageRecipe } from './page-recipe/inbox-page-recipe'; import { SettingsPageRecipe } from './page-recipe/settings-page-recipe'; import { TestUrls } from './../browser/test-urls'; @@ -12,6 +13,7 @@ import { TestWithBrowser } from './../test'; import { expect } from "chai"; import { ComposePageRecipe } from './page-recipe/compose-page-recipe'; import { PageRecipe } from './page-recipe/abstract-page-recipe'; +import { Buf } from '../core/buf'; // tslint:disable:no-blank-lines-func // tslint:disable:max-line-length @@ -415,6 +417,36 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te }); })); + ava.default(`decrypt - missing pubkey in "incorrect message digest" scenario`, testWithBrowser('ci.tests.gmail', async (t, browser) => { + const msgId = '1766644f13510f58'; + const acctEmail = 'ci.tests.gmail@flowcrypt.test'; + const signerEmail = 'sender.for.refetch@domain.com'; + const data = await GoogleData.withInitializedData(acctEmail); + const msg = data.getMessage(msgId)!; + const signature = Buf.fromBase64Str(msg!.raw!).toUtfStr() + .match(/\-\-\-\-\-BEGIN PGP SIGNATURE\-\-\-\-\-.*\-\-\-\-\-END PGP SIGNATURE\-\-\-\-\-/s)![0]; + const params = `?frameId=none&account_email=${acctEmail}&senderEmail=${signerEmail}&msgId=${msgId}&message=Some%20corrupted%20message&signature=${encodeURIComponent(signature)}`; + // as the verification pubkey is not known, this scenario doesn't trigger message re-fetch + await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { params, content: ['Some corrupted message'], signature: ["Missing pubkey 2864E326A5BE488A"] }); + })); + + ava.default('decrypt - re-fetch signed-only message from API on non-fatal verification error', testWithBrowser('compatibility', async (t, browser) => { + const msgId = '1754cfd1b2f1d6e5'; + const acctEmail = 'flowcrypt.compatibility@gmail.com'; + const signerEmail = 'dhartley@verdoncollege.school.nz'; + const data = await GoogleData.withInitializedData(acctEmail); + const msg = data.getMessage(msgId)!; + const signature = Buf.fromBase64Str(msg!.raw!).toUtfStr() + .match(/\-\-\-\-\-BEGIN PGP SIGNATURE\-\-\-\-\-.*\-\-\-\-\-END PGP SIGNATURE\-\-\-\-\-/s)![0]; + const params = `?frameId=none&account_email=${acctEmail}&senderEmail=${signerEmail}&msgId=${msgId}&message=Some%20corrupted%20message&signature=${encodeURIComponent(signature)}`; + // as the verification pubkey is retrieved from the attester, the incorrect message digest will trigger re-fetching from API + await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { + params, + content: [], // todo: #4164 I would expect '1234' here + signature: ['Dhartley@Verdoncollege.School.Nz', 'matching signature'] + }); + })); + ava.default('decrypt - protonmail - load pubkey into contact + verify detached msg', testWithBrowser('compatibility', async (t, browser) => { const textParams = `?frameId=none&message=&msgId=16a9c109bc51687d&` + `senderEmail=some.alias%40protonmail.com&isOutgoing=___cu_false___&signature=___cu_true___&acctEmail=flowcrypt.compatibility%40gmail.com`; diff --git a/test/source/tests/unit-node.ts b/test/source/tests/unit-node.ts index 89aadd1e703..42ed4cca9c8 100644 --- a/test/source/tests/unit-node.ts +++ b/test/source/tests/unit-node.ts @@ -871,7 +871,7 @@ jLwe8W9IMt765T5x5oux9MmPDXF05xHfm4qfH/BMO3a802x5u2gJjJjuknrFdgXY t.pass(); }); - ava.default(`[unit][MsgUtil.verifyDetached] returns errorwhen signature doesn't match`, async t => { + ava.default(`[unit][MsgUtil.verifyDetached] returns non-fatal error when signature doesn't match`, async t => { const sigText = Buf.fromUtfStr(`-----BEGIN PGP SIGNATURE----- wsD5BAABCAAjFiEE3CZFSvtx0Y6rutc9HH5tPFVjqUEFAl+QotYFAwAAAAAACgkQHH5tPFVjqUF4 @@ -897,6 +897,7 @@ E1d8Vh/Ey7IJ8TXbfFrdv5ZP3HqMK0089SooZwx/GN2QIaOYQXsS0u7IFNhU\n=q5Sf }); expect(resultRightKey.match).to.be.null; expect(resultRightKey.error).to.not.be.undefined; + expect(resultRightKey.isErrFatal).to.be.undefined; } { const resultWrongKey = await MsgUtil.verifyDetached({ From 7dfdb80eeaa8800cac45786ee7e5690194db7495 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sun, 5 Dec 2021 11:04:40 +0000 Subject: [PATCH 14/31] remark --- .../elements/pgp_block_modules/pgp-block-signature-module.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts b/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts index 6fcf2676cc3..3a7c2d8a396 100644 --- a/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts +++ b/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts @@ -19,6 +19,8 @@ export class PgpBlockViewSignatureModule { const signerLongids = verifyRes?.signerLongids; if (verifyRes?.error) { if (!verifyRes.isErrFatal && this.view.decryptModule.canFetchFromApi()) { + // Sometimes the signed content is slightly modified when parsed from DOM, + // so the message should be re-fetched straight from API to make sure we get the original signed data and verify again this.view.signature!.parsedSignature = undefined; // force to re-parse await this.view.decryptModule.initialize(verificationPubs, true); return; From 99b40fc20bbb768014012b739ea2e0dc78483243 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 6 Dec 2021 15:42:13 +0000 Subject: [PATCH 15/31] differentiate bad signature and missing pubkey, red color any outcome except successful verification --- .../pgp-block-signature-module.ts | 91 +++++-------------- extension/js/common/core/common.ts | 1 + .../js/common/core/crypto/pgp/msg-util.ts | 3 +- .../js/common/core/crypto/pgp/openpgp-key.ts | 11 ++- 4 files changed, 35 insertions(+), 71 deletions(-) diff --git a/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts b/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts index 3a7c2d8a396..b4a9353d678 100644 --- a/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts +++ b/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts @@ -7,6 +7,7 @@ import { Catch } from '../../../js/common/platform/catch.js'; import { PgpBlockView } from '../pgp_block'; import { Ui } from '../../../js/common/browser/ui.js'; import { VerifyRes } from '../../../js/common/core/crypto/pgp/msg-util.js'; +import { Value } from '../../../js/common/core/common.js'; export class PgpBlockViewSignatureModule { @@ -16,7 +17,6 @@ export class PgpBlockViewSignatureModule { public renderPgpSignatureCheckResult = async (verifyRes: VerifyRes | undefined, verificationPubs: string[], retryVerification?: (verificationPubs: string[]) => Promise) => { this.view.renderModule.doNotSetStateAsReadyYet = true; // so that body state is not marked as ready too soon - automated tests need to know when to check results - const signerLongids = verifyRes?.signerLongids; if (verifyRes?.error) { if (!verifyRes.isErrFatal && this.view.decryptModule.canFetchFromApi()) { // Sometimes the signed content is slightly modified when parsed from DOM, @@ -28,46 +28,50 @@ export class PgpBlockViewSignatureModule { $('#pgp_signature').addClass('bad'); $('#pgp_signature > .result').text(verifyRes.error); this.view.renderModule.setFrameColor('red'); - } else if (!signerLongids?.length) { + } else if (!verifyRes || !verifyRes.signerLongids.length) { $('#pgp_signature').addClass('bad'); $('#pgp_signature > .cursive').remove(); $('#pgp_signature > .result').text('Message Not Signed'); - } else if (verifyRes?.match) { + } else if (verifyRes.match) { $('#pgp_signature').addClass('good'); $('#pgp_signature > .result').text('matching signature'); } else { - // todo: bad signature when pubkey is hit - /* - $('#pgp_signature').addClass('bad'); - $('#pgp_signature > .result').text('signature does not match'); - this.view.renderModule.setFrameColor('red'); - */ + // is there intersection between supplied longids and signers from the message? + const intersection = Value.arr.intersection(verifyRes.signerLongids, verifyRes.suppliedLongids); if (retryVerification) { const signerEmail = this.view.getSigner(); if (!signerEmail) { // in some tests we load the block without sender information - $('#pgp_signature').addClass('neutral').find('.result').text(`Could not verify sender.`); + $('#pgp_signature').addClass('bad').find('.result').text(`Cannot verify: missing pubkey, missing sender info`); } else { this.view.renderModule.renderText('Verifying message...'); try { - const { pubkeys: newPubkeys } = await this.view.pubLookup.lookupEmail(this.view.getSigner()); + const { pubkeys: newPubkeys } = await this.view.pubLookup.lookupEmail(signerEmail); if (newPubkeys.length) { await this.renderPgpSignatureCheckResult(await retryVerification(newPubkeys), newPubkeys, undefined); return; } - this.renderMissingPubkey(signerLongids[0]); + if (intersection.length) { + this.renderBadSignature(); + } else { + this.renderMissingPubkey(verifyRes.signerLongids[0]); + } } catch (e) { if (ApiErr.isSignificant(e)) { Catch.reportErr(e); - $('#pgp_signature').addClass('neutral').find('.result').text(`Could not load sender's pubkey due to an error.`); + $('#pgp_signature').addClass('bad').find('.result').text(`Could not load sender's pubkey due to an error.`); } else { - $('#pgp_signature').addClass('neutral').find('.result').text(`Could not look up sender's pubkey due to network error, click to retry.`).click( + $('#pgp_signature').addClass('bad').find('.result').text(`Could not look up sender's pubkey due to network error, click to retry.`).click( this.view.setHandler(() => window.location.reload())); } } } } else { // !retryVerification - this.renderMissingPubkey(signerLongids[0]); + if (intersection.length) { + this.renderBadSignature(); + } else { + this.renderMissingPubkey(verifyRes.signerLongids[0]); + } } } if (verifyRes) { @@ -83,59 +87,12 @@ export class PgpBlockViewSignatureModule { }; private renderMissingPubkey = (signerLongid: string) => { - $('#pgp_signature').addClass('neutral').find('.result').text(`Missing pubkey ${signerLongid}`); + $('#pgp_signature').addClass('bad').find('.result').text(`Missing pubkey ${signerLongid}`); }; - /** - * don't have appropriate pubkey by longid in contacts - * - */ - /* - private renderPgpSignatureCheckMissingPubkeyOptions = async (signerLongid: string, senderEmail: string, - retryVerification?: () => Promise): Promise => { - const render = (note: string, action: () => void) => $('#pgp_signature').addClass('neutral').find('.result').text(note).click(this.view.setHandler(action)); - try { - if (senderEmail) { // we know who sent it - const [senderContactByEmail] = await ContactStore.get(undefined, [senderEmail]); - if (senderContactByEmail && senderContactByEmail.pubkey) { - const foundId = senderContactByEmail.pubkey.id; - render(`Fetched the right pubkey ${signerLongid} from keyserver, but will not use it because you have conflicting pubkey ${foundId} loaded.`, () => undefined); - return undefined; - } - // ---> and user doesn't have pubkey for that email addr - const { pubkeys } = await this.view.pubLookup.lookupEmail(senderEmail); - if (!pubkeys.length) { - render(`Missing pubkey ${signerLongid}`, () => undefined); - return undefined; - } - // ---> and pubkey found on keyserver by sender email - const { key: pubkey } = await BrowserMsg.send.bg.await.keyMatch({ pubkeys, longid: signerLongid }); - if (!pubkey) { - render(`Fetched ${pubkeys.length} sender's pubkeys but message was signed with a different key: ${signerLongid}, will not verify.`, () => undefined); - return undefined; - } - // ---> and longid it matches signature - await ContactStore.update(undefined, senderEmail, { pubkey }); // <= TOFU auto-import - if (retryVerification) { - const newResult = await retryVerification(); - if (newResult) { - return newResult; - } - } - render('Fetched pubkey, click to verify', () => window.location.reload()); - } else { // don't know who sent it - render('Cannot verify: missing pubkey, missing sender info', () => undefined); - // todo - try to fetch pubkey by longid, offer to import it, show warning explaining what it means - } - } catch (e) { - if (ApiErr.isSignificant(e)) { - Catch.reportErr(e); - render(`Could not load sender pubkey ${signerLongid} due to an error.`, () => undefined); - } else { - render(`Could not look up sender's pubkey due to network error, click to retry.`, () => window.location.reload()); - } - } - return undefined; + private renderBadSignature = () => { + $('#pgp_signature').addClass('bad'); + $('#pgp_signature > .result').text('signature does not match'); + this.view.renderModule.setFrameColor('red'); // todo: in what other cases should we set the frame red? }; -*/ } diff --git a/extension/js/common/core/common.ts b/extension/js/common/core/common.ts index b96ee7c55c5..1233397dd97 100644 --- a/extension/js/common/core/common.ts +++ b/extension/js/common/core/common.ts @@ -203,6 +203,7 @@ export class Value { return result; }, contains: (arr: T[] | string, value: T): boolean => Boolean(arr && typeof arr.indexOf === 'function' && (arr as any[]).indexOf(value) !== -1), + intersection: (array1: T[], array2: T[]): T[] => array1.filter(value => array2.includes(value)), sum: (arr: number[]) => arr.reduce((a, b) => a + b, 0), average: (arr: number[]) => Value.arr.sum(arr) / arr.length, zeroes: (length: number): number[] => new Array(length).map(() => 0) diff --git a/extension/js/common/core/crypto/pgp/msg-util.ts b/extension/js/common/core/crypto/pgp/msg-util.ts index 61c302a6c26..65eb4c0dcd8 100644 --- a/extension/js/common/core/crypto/pgp/msg-util.ts +++ b/extension/js/common/core/crypto/pgp/msg-util.ts @@ -61,7 +61,8 @@ type DecryptError$longids = { message: string[]; matching: string[]; chosen: str export type DecryptError = { success: false; error: DecryptError$error; longids: DecryptError$longids; content?: Buf; isEncrypted?: boolean; }; export type VerifyRes = { - signerLongids: string[]; + signerLongids: string[]; // signers longids from the message + suppliedLongids: string[]; // longids from keys supplied to verify the message match: boolean | null; // we can return some pubkey information here error?: string; isErrFatal?: boolean, diff --git a/extension/js/common/core/crypto/pgp/openpgp-key.ts b/extension/js/common/core/crypto/pgp/openpgp-key.ts index 731eb4d594f..ecb01be1bab 100644 --- a/extension/js/common/core/crypto/pgp/openpgp-key.ts +++ b/extension/js/common/core/crypto/pgp/openpgp-key.ts @@ -436,10 +436,15 @@ export class OpenPGPKey { }; public static verify = async (msg: OpenpgpMsgOrCleartext, pubs: PubkeyInfo[]): Promise => { - const verifyRes: VerifyRes = { match: null, signerLongids: [] }; // tslint:disable-line:no-null-keyword - // msg.getSigningKeyIds ? msg.getSigningKeyIds() // todo: double-check if S/MIME ever gets here - const opgpKeys = pubs.filter(x => !x.revoked && x.pubkey.type === 'openpgp').map(x => OpenPGPKey.extractExternalLibraryObjFromKey(x.pubkey)); + const validKeys = pubs.filter(x => !x.revoked && x.pubkey.type === 'openpgp').map(x => x.pubkey); + // todo: #4172 revoked longid may result in incorrect "Missing pubkey..." output + const verifyRes: VerifyRes = { + match: null, // tslint:disable-line:no-null-keyword + signerLongids: [], + suppliedLongids: validKeys.map(x => x.allIds.map(fp => OpenPGPKey.fingerprintToLongid(fp))).reduce((a, b) => a.concat(b), []) + }; + const opgpKeys = validKeys.map(x => OpenPGPKey.extractExternalLibraryObjFromKey(x)); // todo: expired? try { // this is here to ensure execution order when 1) verify, 2) read data, 3) processing signatures From ca2750433268a78ae3c469c0bbdec6d9008b1d7c Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 7 Dec 2021 13:42:42 +0000 Subject: [PATCH 16/31] save fetched pubkeys to ContactStore --- .../pgp-block-signature-module.ts | 11 +++++-- extension/js/background_page/migrations.ts | 4 +-- .../js/common/platform/store/contact-store.ts | 20 +++++++++---- test/source/tests/decrypt.ts | 30 +++++++++++++++++++ 4 files changed, 54 insertions(+), 11 deletions(-) diff --git a/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts b/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts index b4a9353d678..fe5ae90857a 100644 --- a/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts +++ b/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts @@ -8,6 +8,7 @@ import { PgpBlockView } from '../pgp_block'; import { Ui } from '../../../js/common/browser/ui.js'; import { VerifyRes } from '../../../js/common/core/crypto/pgp/msg-util.js'; import { Value } from '../../../js/common/core/common.js'; +import { ContactStore } from '../../../js/common/platform/store/contact-store.js'; export class PgpBlockViewSignatureModule { @@ -46,9 +47,13 @@ export class PgpBlockViewSignatureModule { } else { this.view.renderModule.renderText('Verifying message...'); try { - const { pubkeys: newPubkeys } = await this.view.pubLookup.lookupEmail(signerEmail); - if (newPubkeys.length) { - await this.renderPgpSignatureCheckResult(await retryVerification(newPubkeys), newPubkeys, undefined); + const { pubkeys: fetchedPubkeys } = await this.view.pubLookup.lookupEmail(signerEmail); + if (fetchedPubkeys.length) { + for (const fetched of fetchedPubkeys) { // todo: should we ignore the ones we already have in verificationPubs? + // or better yet, create a common method to use both here and in ComposeStorageModule + ContactStore.update(undefined, signerEmail, { pubkey: fetched, pubkeyLastCheck: Date.now() }).catch(Catch.reportErr); + } + await this.renderPgpSignatureCheckResult(await retryVerification(fetchedPubkeys), fetchedPubkeys, undefined); return; } if (intersection.length) { diff --git a/extension/js/background_page/migrations.ts b/extension/js/background_page/migrations.ts index d5a0f644c38..1203668a869 100644 --- a/extension/js/background_page/migrations.ts +++ b/extension/js/background_page/migrations.ts @@ -6,7 +6,7 @@ import { storageLocalGetAll, storageLocalRemove } from '../common/browser/chrome import { KeyInfo, KeyUtil } from '../common/core/crypto/key.js'; import { SmimeKey } from '../common/core/crypto/smime/smime-key.js'; import { Str } from '../common/core/common.js'; -import { ContactStore, ContactUpdate, Email, Pubkey } from '../common/platform/store/contact-store.js'; +import { ContactStore, Email, Pubkey } from '../common/platform/store/contact-store.js'; import { GlobalStore, LocalDraft } from '../common/platform/store/global-store.js'; import { KeyStore } from '../common/platform/store/key-store.js'; @@ -212,7 +212,7 @@ const moveContactsBatchToEmailsAndPubkeys = async (db: IDBDatabase, count?: numb pubkey, lastUse: entry.last_use, pubkeyLastCheck: pubkey ? entry.pubkey_last_check : undefined - } as ContactUpdate + } }; })); { diff --git a/extension/js/common/platform/store/contact-store.ts b/extension/js/common/platform/store/contact-store.ts index 6203bfa4ee7..db9098fad65 100644 --- a/extension/js/common/platform/store/contact-store.ts +++ b/extension/js/common/platform/store/contact-store.ts @@ -56,6 +56,13 @@ export type ContactPreview = { }; export type ContactUpdate = { + name?: string | null; + lastUse?: number | null; + pubkey?: Key | string; + pubkeyLastCheck?: number | null; // when non-null, `pubkey` must be supplied +}; + +type ContactUpdateParsed = { name?: string | null; lastUse?: number | null; pubkey?: Key; @@ -212,14 +219,15 @@ export class ContactStore extends AbstractStore { if (!validEmail) { throw Error(`Cannot update contact because email is not valid: ${email}`); } - if (update.pubkey?.isPrivate) { - Catch.report(`Wrongly updating prv ${update.pubkey.id} as contact - converting to pubkey`); - update.pubkey = await KeyUtil.asPublicKey(update.pubkey); + let pubkey = typeof update.pubkey === 'string' ? await KeyUtil.parse(update.pubkey) : update.pubkey; + if (pubkey?.isPrivate) { + Catch.report(`Wrongly updating prv ${pubkey.id} as contact - converting to pubkey`); + pubkey = await KeyUtil.asPublicKey(pubkey); } const tx = db.transaction(['emails', 'pubkeys', 'revocations'], 'readwrite'); await new Promise((resolve, reject) => { ContactStore.setTxHandlers(tx, resolve, reject); - ContactStore.updateTx(tx, validEmail, update); + ContactStore.updateTx(tx, validEmail, { ...update, pubkey }); }); }; @@ -348,7 +356,7 @@ export class ContactStore extends AbstractStore { }); }; - public static updateTx = (tx: IDBTransaction, email: string, update: ContactUpdate) => { + public static updateTx = (tx: IDBTransaction, email: string, update: ContactUpdateParsed) => { if (update.pubkey && !update.pubkeyLastCheck) { const req = tx.objectStore('pubkeys').get(ContactStore.getPubkeyId(update.pubkey)); ContactStore.setReqPipe(req, (pubkey: Pubkey) => { @@ -495,7 +503,7 @@ export class ContactStore extends AbstractStore { } }; - private static updateTxPhase2 = (tx: IDBTransaction, email: string, update: ContactUpdate, + private static updateTxPhase2 = (tx: IDBTransaction, email: string, update: ContactUpdateParsed, existingPubkey: Pubkey | undefined, revocations: Revocation[]) => { let pubkeyEntity: Pubkey | undefined; if (update.pubkey) { diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index aba85f2061b..47702edc3b1 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -373,6 +373,36 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { params: url, content: ['1234'], signature }); })); + ava.default('decrypt - fetched pubkey is automatically saved to contacts', testWithBrowser('compatibility', async (t, browser) => { + const msgId = '1754cfc37886899e'; + const acctEmail = 'flowcrypt.compatibility@gmail.com'; + { + const settingsPage = await browser.newPage(t, TestUrls.extensionSettings(acctEmail)); + await SettingsPageRecipe.toggleScreen(settingsPage, 'additional'); + const contactsFrame = await SettingsPageRecipe.awaitNewPageFrame(settingsPage, '@action-open-contacts-page', ['contacts.htm', 'placement=settings']); + await contactsFrame.waitAll('@page-contacts'); + await Util.sleep(1); + expect(await contactsFrame.isElementPresent('@action-show-email-flowcryptcompatibilitygmailcom')).to.be.true; + expect(await contactsFrame.isElementPresent('@action-show-email-dhartleyverdoncollegeschoolnz')).to.be.false; + } + const params = `?frameId=none&acctEmail=${acctEmail}&msgId=${msgId}&signature=___cu_true___&senderEmail=dhartley@verdoncollege.school.nz`; + await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { params, content: ['1234'] }); + // the fetched pubkey is saved to ContactStore asynchronously, so let's wait a little + await Util.sleep(1); + { + const settingsPage = await browser.newPage(t, TestUrls.extensionSettings(acctEmail)); + await SettingsPageRecipe.toggleScreen(settingsPage, 'additional'); + const contactsFrame = await SettingsPageRecipe.awaitNewPageFrame(settingsPage, '@action-open-contacts-page', ['contacts.htm', 'placement=settings']); + await contactsFrame.waitAll('@page-contacts'); + await Util.sleep(1); + expect(await contactsFrame.isElementPresent('@action-show-email-flowcryptcompatibilitygmailcom')).to.be.true; + expect(await contactsFrame.isElementPresent('@action-show-email-dhartleyverdoncollegeschoolnz')).to.be.true; + await contactsFrame.waitAndClick('@action-show-email-dhartleyverdoncollegeschoolnz'); + // contains newly fetched key + await contactsFrame.waitForContent('@page-contacts', 'openpgp - active - DC26 454A FB71 D18E ABBA D73D 1C7E 6D3C 5563 A941'); + } + })); + ava.default('decrypt - unsigned encrypted message', testWithBrowser('compatibility', async (t, browser) => { const threadId = '17918a9d7ca2fbac'; const acctEmail = 'flowcrypt.compatibility@gmail.com'; From 48f6bf7ac27fa670b161c3ada64eb776351d10dc Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 7 Dec 2021 14:33:16 +0000 Subject: [PATCH 17/31] lint fix --- test/source/tests/decrypt.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index 47702edc3b1..693f86ef8d9 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -18,6 +18,8 @@ import { Buf } from '../core/buf'; // tslint:disable:no-blank-lines-func // tslint:disable:max-line-length /* eslint-disable max-len */ +// tslint:disable:no-unused-expression +/* eslint-disable no-unused-expressions */ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: TestWithBrowser) => { From 2de48fa3dca5d683a033d101aac5b27c9da86e10 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 7 Dec 2021 14:53:27 +0000 Subject: [PATCH 18/31] remarks --- extension/chrome/elements/attachment.ts | 2 +- extension/js/common/core/crypto/pgp/msg-util.ts | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/extension/chrome/elements/attachment.ts b/extension/chrome/elements/attachment.ts index ae7b52b92ca..99dbb1d77b6 100644 --- a/extension/chrome/elements/attachment.ts +++ b/extension/chrome/elements/attachment.ts @@ -208,7 +208,7 @@ export class AttachmentDownloadView extends View { const decrRes = await MsgUtil.decryptMessage({ kisWithPp: await KeyStore.getAllWithOptionalPassPhrase(this.acctEmail), encryptedData: data, - verificationPubs: [] // todo: signature? + verificationPubs: [] // no need to worry about the public key signature, as public key exchange is inherently unsafe }); if (decrRes.success && decrRes.content) { const openpgpType = await MsgUtil.type({ data: decrRes.content }); diff --git a/extension/js/common/core/crypto/pgp/msg-util.ts b/extension/js/common/core/crypto/pgp/msg-util.ts index 65eb4c0dcd8..b84c12eaa5d 100644 --- a/extension/js/common/core/crypto/pgp/msg-util.ts +++ b/extension/js/common/core/crypto/pgp/msg-util.ts @@ -157,7 +157,6 @@ export class MsgUtil { return { success: false, error: { type: DecryptErrTypes.format, message: String(formatErr) }, longids }; } if (prepared.isCleartext) { - // todo: error if no verificationPubs? const signature = await OpenPGPKey.verify(prepared.message, await ContactStore.getPubkeyInfos(undefined, verificationPubs)); const content = signature.content || Buf.fromUtfStr('no content'); signature.content = undefined; // no need to duplicate data @@ -188,7 +187,6 @@ export class MsgUtil { const passwords = msgPwd ? [msgPwd] : undefined; const privateKeys = keys.prvForDecryptDecrypted.map(decrypted => decrypted.decrypted); const decrypted = await OpenPGPKey.decryptMessage(msg, privateKeys, passwords); - // todo: test when not signed at all const signature = await OpenPGPKey.verify(decrypted, await ContactStore.getPubkeyInfos(undefined, verificationPubs)); const content = signature?.content || new Buf(await opgp.stream.readToEnd(decrypted.getLiteralData()!)); if (signature?.content) { From 4f009eda3c4eef6e2648ccb361f38140a8700e15 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 8 Dec 2021 06:19:04 +0000 Subject: [PATCH 19/31] fixes --- extension/chrome/elements/pgp_block.ts | 11 ++++++-- .../pgp-block-decrypt-module.ts | 4 +-- .../pgp-block-signature-module.ts | 28 +++++++++---------- extension/js/common/core/common.ts | 1 + 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/extension/chrome/elements/pgp_block.ts b/extension/chrome/elements/pgp_block.ts index 00a3c4aa0f9..0de136eadda 100644 --- a/extension/chrome/elements/pgp_block.ts +++ b/extension/chrome/elements/pgp_block.ts @@ -62,7 +62,7 @@ export class PgpBlockView extends View { } this.encryptedMsgUrlParam = uncheckedUrlParams.message ? Buf.fromUtfStr(Assert.urlParamRequire.string(uncheckedUrlParams, 'message')) : undefined; if (uncheckedUrlParams.signature === true) { - this.signature = {}; + this.signature = { parsedSignature: undefined }; // decryptModule will try to fetch the message } else if (uncheckedUrlParams.signature) { this.signature = { parsedSignature: String(uncheckedUrlParams.signature) }; } @@ -76,7 +76,12 @@ export class PgpBlockView extends View { this.decryptModule = new PgpBlockViewDecryptModule(this); } - public getSigner = () => { + public getExpectedSignerEmail = () => { + // We always attempt to verify all signatures as "signed by sender", with public keys of the sender. + // That way, signature spoofing attacks are prevented: if Joe manages to spoof a sending address + // of Jane (send an email from Jane address), then we expect Jane to be this signer: we look up + // keys recorded for Jane and the signature either succeeds or fails to verify. If it fails (that pubkey + // which Joe used is not recorded for Jane), it will show an error. return this.senderEmail; }; @@ -87,7 +92,7 @@ export class PgpBlockView extends View { const scopes = await AcctStore.getScopes(this.acctEmail); this.decryptModule.canReadEmails = scopes.read || scopes.modify; if (storage.setup_done) { - const parsedPubs = (await ContactStore.getOneWithAllPubkeys(undefined, this.getSigner()))?.sortedPubkeys ?? []; + const parsedPubs = (await ContactStore.getOneWithAllPubkeys(undefined, this.getExpectedSignerEmail()))?.sortedPubkeys ?? []; // todo: we don't actually need parsed pubs here because we're going to pass them to the backgorund page // maybe we can have a method in ContactStore to extract armored keys const verificationPubs = parsedPubs.map(key => KeyUtil.armor(key.pubkey)); diff --git a/extension/chrome/elements/pgp_block_modules/pgp-block-decrypt-module.ts b/extension/chrome/elements/pgp_block_modules/pgp-block-decrypt-module.ts index 56d15746254..cafa84618dd 100644 --- a/extension/chrome/elements/pgp_block_modules/pgp-block-decrypt-module.ts +++ b/extension/chrome/elements/pgp_block_modules/pgp-block-decrypt-module.ts @@ -62,7 +62,7 @@ export class PgpBlockViewDecryptModule { } }; - public canFetchFromApi = () => this.canReadEmails && this.msgFetchedFromApi !== 'raw'; + public canAndShouldFetchFromApi = () => this.canReadEmails && this.msgFetchedFromApi !== 'raw'; private decryptAndRender = async (encryptedData: Buf, verificationPubs: string[], optionalPwd?: string, plainSubject?: string) => { if (!this.view.signature?.parsedSignature) { @@ -82,7 +82,7 @@ export class PgpBlockViewDecryptModule { } }, plainSubject); } else if (result.error.type === DecryptErrTypes.format) { - if (this.canFetchFromApi()) { + if (this.canAndShouldFetchFromApi()) { console.info(`re-fetching message ${this.view.msgId} from api because looks like bad formatting: ${!this.msgFetchedFromApi ? 'full' : 'raw'}`); await this.initialize(verificationPubs, true); } else { diff --git a/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts b/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts index fe5ae90857a..2d59a92a426 100644 --- a/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts +++ b/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts @@ -19,7 +19,7 @@ export class PgpBlockViewSignatureModule { retryVerification?: (verificationPubs: string[]) => Promise) => { this.view.renderModule.doNotSetStateAsReadyYet = true; // so that body state is not marked as ready too soon - automated tests need to know when to check results if (verifyRes?.error) { - if (!verifyRes.isErrFatal && this.view.decryptModule.canFetchFromApi()) { + if (!verifyRes.isErrFatal && this.view.decryptModule.canAndShouldFetchFromApi()) { // Sometimes the signed content is slightly modified when parsed from DOM, // so the message should be re-fetched straight from API to make sure we get the original signed data and verify again this.view.signature!.parsedSignature = undefined; // force to re-parse @@ -37,10 +37,8 @@ export class PgpBlockViewSignatureModule { $('#pgp_signature').addClass('good'); $('#pgp_signature > .result').text('matching signature'); } else { - // is there intersection between supplied longids and signers from the message? - const intersection = Value.arr.intersection(verifyRes.signerLongids, verifyRes.suppliedLongids); if (retryVerification) { - const signerEmail = this.view.getSigner(); + const signerEmail = this.view.getExpectedSignerEmail(); if (!signerEmail) { // in some tests we load the block without sender information $('#pgp_signature').addClass('bad').find('.result').text(`Cannot verify: missing pubkey, missing sender info`); @@ -56,11 +54,7 @@ export class PgpBlockViewSignatureModule { await this.renderPgpSignatureCheckResult(await retryVerification(fetchedPubkeys), fetchedPubkeys, undefined); return; } - if (intersection.length) { - this.renderBadSignature(); - } else { - this.renderMissingPubkey(verifyRes.signerLongids[0]); - } + this.renderMissingPubkeyOrBadSignature(verifyRes); } catch (e) { if (ApiErr.isSignificant(e)) { Catch.reportErr(e); @@ -72,11 +66,7 @@ export class PgpBlockViewSignatureModule { } } } else { // !retryVerification - if (intersection.length) { - this.renderBadSignature(); - } else { - this.renderMissingPubkey(verifyRes.signerLongids[0]); - } + this.renderMissingPubkeyOrBadSignature(verifyRes); } } if (verifyRes) { @@ -87,7 +77,7 @@ export class PgpBlockViewSignatureModule { }; private setSigner = (signature: VerifyRes): void => { - const signerEmail = signature.match ? this.view.getSigner() : undefined; + const signerEmail = signature.match ? this.view.getExpectedSignerEmail() : undefined; $('#pgp_signature > .cursive > span').text(signerEmail || 'Unknown Signer'); }; @@ -100,4 +90,12 @@ export class PgpBlockViewSignatureModule { $('#pgp_signature > .result').text('signature does not match'); this.view.renderModule.setFrameColor('red'); // todo: in what other cases should we set the frame red? }; + + private renderMissingPubkeyOrBadSignature = (verifyRes: VerifyRes): void => { + if (verifyRes.match === null || !Value.arr.hasIntersection(verifyRes.signerLongids, verifyRes.suppliedLongids)) { + this.renderMissingPubkey(verifyRes.signerLongids[0]); + } else { + this.renderBadSignature(); + } + } } diff --git a/extension/js/common/core/common.ts b/extension/js/common/core/common.ts index 1233397dd97..622d1d11f71 100644 --- a/extension/js/common/core/common.ts +++ b/extension/js/common/core/common.ts @@ -204,6 +204,7 @@ export class Value { }, contains: (arr: T[] | string, value: T): boolean => Boolean(arr && typeof arr.indexOf === 'function' && (arr as any[]).indexOf(value) !== -1), intersection: (array1: T[], array2: T[]): T[] => array1.filter(value => array2.includes(value)), + hasIntersection: (array1: T[], array2: T[]): boolean => array1.some(value => array2.includes(value)), sum: (arr: number[]) => arr.reduce((a, b) => a + b, 0), average: (arr: number[]) => Value.arr.sum(arr) / arr.length, zeroes: (length: number): number[] => new Array(length).map(() => 0) From 12b3f67b208a99e65c698ba13169ec915d1eab2b Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 8 Dec 2021 06:21:43 +0000 Subject: [PATCH 20/31] lint fix --- extension/chrome/elements/pgp_block.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extension/chrome/elements/pgp_block.ts b/extension/chrome/elements/pgp_block.ts index 0de136eadda..4ca0b98c3e7 100644 --- a/extension/chrome/elements/pgp_block.ts +++ b/extension/chrome/elements/pgp_block.ts @@ -78,9 +78,9 @@ export class PgpBlockView extends View { public getExpectedSignerEmail = () => { // We always attempt to verify all signatures as "signed by sender", with public keys of the sender. - // That way, signature spoofing attacks are prevented: if Joe manages to spoof a sending address - // of Jane (send an email from Jane address), then we expect Jane to be this signer: we look up - // keys recorded for Jane and the signature either succeeds or fails to verify. If it fails (that pubkey + // That way, signature spoofing attacks are prevented: if Joe manages to spoof a sending address + // of Jane (send an email from Jane address), then we expect Jane to be this signer: we look up + // keys recorded for Jane and the signature either succeeds or fails to verify. If it fails (that pubkey // which Joe used is not recorded for Jane), it will show an error. return this.senderEmail; }; From a07a89564c9508f62f824a57cd024629014ac673 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 10 Dec 2021 09:14:55 +0000 Subject: [PATCH 21/31] lint fix --- .../elements/pgp_block_modules/pgp-block-signature-module.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts b/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts index 2d59a92a426..df1282aa650 100644 --- a/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts +++ b/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts @@ -97,5 +97,5 @@ export class PgpBlockViewSignatureModule { } else { this.renderBadSignature(); } - } + }; } From 84d92980d10539647b937d67414b628da8f6f640 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 10 Dec 2021 11:52:33 +0000 Subject: [PATCH 22/31] removed capitalization and changed sender's email for one message --- extension/css/cryptup.css | 1 - .../mock/attester/attester-endpoints.ts | 2 +- .../message-export-1766644f13510f58.json | 2 +- test/source/tests/decrypt.ts | 20 +++++++++---------- test/source/tests/gmail.ts | 4 ++-- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/extension/css/cryptup.css b/extension/css/cryptup.css index 24735fd26b2..8afb17b0b53 100644 --- a/extension/css/cryptup.css +++ b/extension/css/cryptup.css @@ -1323,7 +1323,6 @@ td { #pgp_signature > .cursive { font-family: signature; /* stylelint-disable-line font-family-no-missing-generic-family-keyword */ font-size: 24px; - text-transform: capitalize; font-weight: bold; } diff --git a/test/source/mock/attester/attester-endpoints.ts b/test/source/mock/attester/attester-endpoints.ts index 68da93de4f0..65ae870419a 100644 --- a/test/source/mock/attester/attester-endpoints.ts +++ b/test/source/mock/attester/attester-endpoints.ts @@ -62,7 +62,7 @@ export const mockAttesterEndpoints: HandlersDefinition = { if (['dhartley@verdoncollege.school.nz', '1C7E6D3C5563A941'.toLowerCase()].includes(emailOrLongid)) { return await getDC26454AFB71D18EABBAD73D1C7E6D3C5563A941(); } - if (['sams50sams50sept@gmail.com', 'president@forged.com', '2864E326A5BE488A'.toLowerCase()].includes(emailOrLongid)) { + if (['sams50sams50sept@gmail.com', 'sender@example.com'].includes(emailOrLongid)) { return testConstants.pubkey2864E326A5BE488A; } if (emailOrLongid.startsWith('martin@p')) { diff --git a/test/source/mock/google/exported-messages/message-export-1766644f13510f58.json b/test/source/mock/google/exported-messages/message-export-1766644f13510f58.json index e55605ca61d..ef3a03d12d5 100644 --- a/test/source/mock/google/exported-messages/message-export-1766644f13510f58.json +++ b/test/source/mock/google/exported-messages/message-export-1766644f13510f58.json @@ -24,7 +24,7 @@ }, { "name": "From", - "value": "Mr President " + "value": "Mr President " }, { "name": "MIME-Version", diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index 693f86ef8d9..39d551417e5 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -371,7 +371,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te const urls = await inboxPage.getFramesUrls(['/chrome/elements/pgp_block.htm'], { sleep: 10, appearIn: 20 }); expect(urls.length).to.equal(1); const url = urls[0].split('/chrome/elements/pgp_block.htm')[1]; - const signature = ['Dhartley@Verdoncollege.School.Nz', 'matching signature']; + const signature = ['dhartley@verdoncollege.school.nz', 'matching signature']; await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { params: url, content: ['1234'], signature }); })); @@ -417,7 +417,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { params: url, content: ['This is unsigned, encrypted message'], signature }); })); - ava.default('signature - sender is different from pubkey email', testWithBrowser('ci.tests.gmail', async (t, browser) => { + ava.default('signature - sender is different from pubkey uid', testWithBrowser('ci.tests.gmail', async (t, browser) => { const threadId = '1766644f13510f58'; const acctEmail = 'ci.tests.gmail@flowcrypt.test'; const inboxPage = await browser.newPage(t, TestUrls.extension(`chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`)); @@ -428,7 +428,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { params: url, content: ['How is my message signed?'], - signature: ['President@Forged.Com', 'matching signature'] + signature: ['sender@example.com', 'matching signature'] }); })); @@ -436,7 +436,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te const threadId = '1766644f13510f58'; const acctEmail = 'ci.tests.gmail@flowcrypt.test'; await PageRecipe.addPubkey(t, browser, acctEmail, '-----BEGIN PGP PUBLIC KEY BLOCK-----\r\nVersion: FlowCrypt Email Encryption [BUILD_REPLACEABLE_VERSION]\r\nComment: Seamlessly send and receive encrypted email\r\n\r\nxjMEYZeW2RYJKwYBBAHaRw8BAQdAT5QfLVP3y1yukk3MM/oiuXLNe1f9az5M\r\nBnOlKdF0nKnNJVNvbWVib2R5IDxTYW1zNTBzYW1zNTBzZXB0QEdtYWlsLkNv\r\nbT7CjwQQFgoAIAUCYZeW2QYLCQcIAwIEFQgKAgQWAgEAAhkBAhsDAh4BACEJ\r\nEMrSTYqLk6SUFiEEBP90ux3d6kDwDdzvytJNiouTpJS27QEA7pFlkLfD0KFQ\r\nsH/dwb/NPzn5zCi2L9gjPAC3d8gv1fwA/0FjAy/vKct4D7QH8KwtEGQns5+D\r\nP1WxDr4YI2hp5TkAzjgEYZeW2RIKKwYBBAGXVQEFAQEHQKNLY/bXrhJMWA2+\r\nWTjk3I7KhawyZfLomJ4hovqr7UtOAwEIB8J4BBgWCAAJBQJhl5bZAhsMACEJ\r\nEMrSTYqLk6SUFiEEBP90ux3d6kDwDdzvytJNiouTpJQnpgD/c1CzfS3YzJUx\r\nnFMrhjiE0WVgqOV/3CkfI4m4RA30QUIA/ju8r4AD2h6lu3Mx/6I6PzIRZQty\r\nLvTkcu4UKodZa4kK\r\n=7C4A\r\n-----END PGP PUBLIC KEY BLOCK-----\r\n', - 'president@forged.com'); + 'sender@example.com'); const inboxPage = await browser.newPage(t, TestUrls.extension(`chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`)); await inboxPage.waitAll('iframe', { timeout: 2 }); const urls = await inboxPage.getFramesUrls(['/chrome/elements/pgp_block.htm'], { sleep: 10, appearIn: 20 }); @@ -445,7 +445,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { params: url, content: ['How is my message signed?'], - signature: ['President@Forged.Com', 'matching signature'] + signature: ['sender@example.com', 'matching signature'] }); })); @@ -475,7 +475,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { params, content: [], // todo: #4164 I would expect '1234' here - signature: ['Dhartley@Verdoncollege.School.Nz', 'matching signature'] + signature: ['dhartley@verdoncollege.school.nz', 'matching signature'] }); })); @@ -487,14 +487,14 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { params: textParams, content: ["1234"], - signature: ["matching signature", "Some.Alias@Protonmail.Com"] + signature: ["matching signature", "some.alias@protonmail.com"] }); const htmlParams = `?frameId=none&message=&msgId=16a9c0fe4e034bc2&` + `senderEmail=some.alias%40protonmail.com&isOutgoing=___cu_false___&signature=___cu_true___&acctEmail=flowcrypt.compatibility%40gmail.com`; await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { params: htmlParams, content: ["1234"], - signature: ["matching signature", "Some.Alias@Protonmail.Com"] + signature: ["matching signature", "some.alias@protonmail.com"] }); })); @@ -504,7 +504,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { params, content: ["1234"], - signature: ["matching signature", "Flowcrypt.Compatibility@Protonmail.Com"] + signature: ["matching signature", "flowcrypt.compatibility@protonmail.com"] }); })); @@ -513,7 +513,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { params, content: ['4) signed + encrypted email if supported'], - signature: ["matching signature", "Martin@Politick.Ca"] + signature: ["matching signature", "martin@politick.ca"] }); })); diff --git a/test/source/tests/gmail.ts b/test/source/tests/gmail.ts index f894ddc11b6..31733b43d2a 100644 --- a/test/source/tests/gmail.ts +++ b/test/source/tests/gmail.ts @@ -213,7 +213,7 @@ export const defineGmailTests = (testVariant: TestVariant, testWithBrowser: Test const pgpBlockUrls = await gmailPage.getFramesUrls(['/chrome/elements/pgp_block.htm'], { sleep: 10, appearIn: 20 }); expect(pgpBlockUrls.length).to.equal(1); const url = pgpBlockUrls[0].split('/chrome/elements/pgp_block.htm')[1]; - const signature = ['Limon.Monte@Gmail.Com', 'matching signature']; + const signature = ['limon.monte@gmail.com', 'matching signature']; await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { params: url, content: ['1234'], signature }); await pageHasSecureReplyContainer(t, browser, gmailPage); await testMinimumElementHeight(gmailPage, '.pgp_block.signedMsg', 80); @@ -231,7 +231,7 @@ export const defineGmailTests = (testVariant: TestVariant, testWithBrowser: Test await testMinimumElementHeight(gmailPage, '.pgp_block.signedMsg', 80); await testMinimumElementHeight(gmailPage, '.pgp_block.publicKey', 120); const url = pgpBlockUrls[0].split('/chrome/elements/pgp_block.htm')[1]; - const signature = ['Limon.Monte@Gmail.Com', 'matching signature']; + const signature = ['limon.monte@gmail.com', 'matching signature']; await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { params: url, content: ['1234'], signature }); await pageHasSecureReplyContainer(t, browser, gmailPage); const pubkeyPage = await gmailPage.getFrame(['/chrome/elements/pgp_pubkey.htm']); From 3bbd2ad85a1b69332961a363de6ea10255f6acbd Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sat, 11 Dec 2021 14:14:45 +0000 Subject: [PATCH 23/31] common method to save fetched pubkeys to storage --- .../compose-modules/compose-storage-module.ts | 12 +++---- .../pgp-block-signature-module.ts | 13 +++----- extension/js/common/browser/browser-msg.ts | 9 ++++-- extension/js/common/shared.ts | 32 +++++++++++++++++++ 4 files changed, 48 insertions(+), 18 deletions(-) create mode 100644 extension/js/common/shared.ts diff --git a/extension/chrome/elements/compose-modules/compose-storage-module.ts b/extension/chrome/elements/compose-modules/compose-storage-module.ts index 703b8d35736..b9377e75905 100644 --- a/extension/chrome/elements/compose-modules/compose-storage-module.ts +++ b/extension/chrome/elements/compose-modules/compose-storage-module.ts @@ -16,6 +16,7 @@ import { AcctStore } from '../../../js/common/platform/store/acct-store.js'; import { ContactStore } from '../../../js/common/platform/store/contact-store.js'; import { PassphraseStore } from '../../../js/common/platform/store/passphrase-store.js'; import { Settings } from '../../../js/common/settings.js'; +import { compareAndSavePubkeysToStorage } from '../../../js/common/shared.js'; export class ComposeStorageModule extends ViewModule { // if `type` is supplied, returns undefined if no keys of this type are found @@ -176,15 +177,10 @@ export class ComposeStorageModule extends ViewModule { } try { const lookupResult = await this.view.pubLookup.lookupEmail(email); - const fetchedPubkeys = await Promise.all(lookupResult.pubkeys.map(KeyUtil.parse)); - for (const fetched of fetchedPubkeys) { - const stored = storedPubkeys.find(p => KeyUtil.identityEquals(p.pubkey, fetched))?.pubkey; - if (!stored || KeyUtil.isFetchedNewer({ fetched, stored })) { - await ContactStore.update(undefined, email, { name, pubkey: fetched, pubkeyLastCheck: Date.now() }); - await this.view.recipientsModule.reRenderRecipientFor(email); - } + if (await compareAndSavePubkeysToStorage(email, lookupResult.pubkeys, storedPubkeys)) { + await this.view.recipientsModule.reRenderRecipientFor(email); } - if (!fetchedPubkeys.length && name) { // update just name + if (name) { // update name await ContactStore.update(undefined, email, { name }); } } catch (e) { diff --git a/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts b/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts index df1282aa650..157000d2174 100644 --- a/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts +++ b/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts @@ -8,7 +8,7 @@ import { PgpBlockView } from '../pgp_block'; import { Ui } from '../../../js/common/browser/ui.js'; import { VerifyRes } from '../../../js/common/core/crypto/pgp/msg-util.js'; import { Value } from '../../../js/common/core/common.js'; -import { ContactStore } from '../../../js/common/platform/store/contact-store.js'; +import { BrowserMsg } from '../../../js/common/browser/browser-msg.js'; export class PgpBlockViewSignatureModule { @@ -45,13 +45,10 @@ export class PgpBlockViewSignatureModule { } else { this.view.renderModule.renderText('Verifying message...'); try { - const { pubkeys: fetchedPubkeys } = await this.view.pubLookup.lookupEmail(signerEmail); - if (fetchedPubkeys.length) { - for (const fetched of fetchedPubkeys) { // todo: should we ignore the ones we already have in verificationPubs? - // or better yet, create a common method to use both here and in ComposeStorageModule - ContactStore.update(undefined, signerEmail, { pubkey: fetched, pubkeyLastCheck: Date.now() }).catch(Catch.reportErr); - } - await this.renderPgpSignatureCheckResult(await retryVerification(fetchedPubkeys), fetchedPubkeys, undefined); + const { pubkeys } = await this.view.pubLookup.lookupEmail(signerEmail); + if (pubkeys.length) { + await BrowserMsg.send.bg.await.saveFetchedPubkeys({ email: signerEmail, pubkeys }); + await this.renderPgpSignatureCheckResult(await retryVerification(pubkeys), pubkeys, undefined); return; } this.renderMissingPubkeyOrBadSignature(verifyRes); diff --git a/extension/js/common/browser/browser-msg.ts b/extension/js/common/browser/browser-msg.ts index f72365318cd..bfaa920defc 100644 --- a/extension/js/common/browser/browser-msg.ts +++ b/extension/js/common/browser/browser-msg.ts @@ -18,6 +18,7 @@ import { Ui } from './ui.js'; import { GlobalStoreDict, GlobalIndex } from '../platform/store/global-store.js'; import { AcctStoreDict, AccountIndex } from '../platform/store/acct-store.js'; import { Contact } from '../core/crypto/key.js'; +import { saveFetchedPubkeysIfNewerThanInStorage } from '../shared.js'; export type GoogleAuthWindowResult$result = 'Success' | 'Denied' | 'Error' | 'Closed'; @@ -65,6 +66,7 @@ export namespace Bm { export type AjaxGmailAttachmentGetChunk = { acctEmail: string, msgId: string, attachmentId: string }; export type ShowAttachmentPreview = { iframeUrl: string }; export type ReRenderRecipient = { contact: Contact }; + export type SaveFetchedPubkeys = { email: string, pubkeys: string[] }; export namespace Res { export type GetActiveTabInfo = { provider: 'gmail' | undefined, acctEmail: string | undefined, sameWorld: boolean | undefined }; @@ -82,13 +84,14 @@ export namespace Bm { export type PgpHashChallengeAnswer = { hashed: string }; export type AjaxGmailAttachmentGetChunk = { chunk: Buf }; export type _tab_ = { tabId: string | null | undefined }; + export type SaveFetchedPubkeys = boolean; export type Db = any; // not included in Any below export type Ajax = any; // not included in Any below export type Any = GetActiveTabInfo | _tab_ | ReconnectAcctAuthPopup | PgpMsgDecrypt | PgpMsgDiagnoseMsgPubkeys | PgpMsgVerify | PgpHashChallengeAnswer | PgpMsgType | InMemoryStoreGet | InMemoryStoreSet | StoreAcctGet | StoreAcctSet | StoreGlobalGet | StoreGlobalSet - | AjaxGmailAttachmentGetChunk; + | AjaxGmailAttachmentGetChunk | SaveFetchedPubkeys; } export type AnyRequest = PassphraseEntry | StripeResult | OpenPage | OpenGoogleAuthDialog | Redirect | Reload | @@ -97,7 +100,7 @@ export namespace Bm { NotificationShow | PassphraseDialog | PassphraseDialog | Settings | SetCss | AddOrRemoveClass | ReconnectAcctAuthPopup | Db | InMemoryStoreSet | InMemoryStoreGet | StoreGlobalGet | StoreGlobalSet | StoreAcctGet | StoreAcctSet | PgpMsgDecrypt | PgpMsgDiagnoseMsgPubkeys | PgpMsgVerifyDetached | PgpHashChallengeAnswer | PgpMsgType | Ajax | - ShowAttachmentPreview | ReRenderRecipient; + ShowAttachmentPreview | ReRenderRecipient | SaveFetchedPubkeys; // export type RawResponselessHandler = (req: AnyRequest) => Promise; // export type RawRespoHandler = (req: AnyRequest) => Promise; @@ -144,6 +147,7 @@ export class BrowserMsg { pgpMsgDecrypt: (bm: Bm.PgpMsgDecrypt) => BrowserMsg.sendAwait(undefined, 'pgpMsgDecrypt', bm, true) as Promise, pgpMsgVerifyDetached: (bm: Bm.PgpMsgVerifyDetached) => BrowserMsg.sendAwait(undefined, 'pgpMsgVerifyDetached', bm, true) as Promise, pgpMsgType: (bm: Bm.PgpMsgType) => BrowserMsg.sendAwait(undefined, 'pgpMsgType', bm, true) as Promise, + saveFetchedPubkeys: (bm: Bm.SaveFetchedPubkeys) => BrowserMsg.sendAwait(undefined, 'saveFetchedPubkeys', bm, true) as Promise, }, }, passphraseEntry: (dest: Bm.Dest, bm: Bm.PassphraseEntry) => BrowserMsg.sendCatch(dest, 'passphrase_entry', bm), @@ -240,6 +244,7 @@ export class BrowserMsg { BrowserMsg.bgAddListener('pgpMsgDecrypt', MsgUtil.decryptMessage); BrowserMsg.bgAddListener('pgpMsgVerifyDetached', MsgUtil.verifyDetached); BrowserMsg.bgAddListener('pgpMsgType', MsgUtil.type); + BrowserMsg.bgAddListener('saveFetchedPubkeys', saveFetchedPubkeysIfNewerThanInStorage); }; public static addListener = (name: string, handler: Handler) => { diff --git a/extension/js/common/shared.ts b/extension/js/common/shared.ts new file mode 100644 index 00000000000..de916078e5f --- /dev/null +++ b/extension/js/common/shared.ts @@ -0,0 +1,32 @@ +/* ©️ 2016 - present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com */ + +'use strict'; + +import { KeyUtil, PubkeyInfo } from './core/crypto/key.js'; +import { ContactStore } from './platform/store/contact-store.js'; + +/** + * Save fetched keys if they are newer versions of public keys we already have (compared by fingerprint) + */ +export const compareAndSavePubkeysToStorage = async (email: string, fetchedPubkeys: string[], storedPubkeys: PubkeyInfo[]): Promise => { + let updated = false; + for (const fetched of await Promise.all(fetchedPubkeys.map(KeyUtil.parse))) { + const stored = storedPubkeys.find(p => KeyUtil.identityEquals(p.pubkey, fetched))?.pubkey; + if (!stored || KeyUtil.isFetchedNewer({ fetched, stored })) { + await ContactStore.update(undefined, email, { pubkey: fetched, pubkeyLastCheck: Date.now() }); + updated = true; + } + } + return updated; +}; + +/** + * Save fetched keys if they are newer versions of public keys we already have (compared by fingerprint) + */ +export const saveFetchedPubkeysIfNewerThanInStorage = async ({ email, pubkeys }: { email: string, pubkeys: string[] }): Promise => { + if (!pubkeys.length) { + return false; + } + const storedContact = await ContactStore.getOneWithAllPubkeys(undefined, email); + return await compareAndSavePubkeysToStorage(email, pubkeys, storedContact?.sortedPubkeys ?? []); +}; From 1456c40e2c3bb84cd5d7ad04111ded697e8773d6 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sat, 11 Dec 2021 18:09:37 +0000 Subject: [PATCH 24/31] remark regarding cleartext --- extension/js/common/core/crypto/pgp/msg-util.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/extension/js/common/core/crypto/pgp/msg-util.ts b/extension/js/common/core/crypto/pgp/msg-util.ts index b84c12eaa5d..bf4c1ce09b4 100644 --- a/extension/js/common/core/crypto/pgp/msg-util.ts +++ b/extension/js/common/core/crypto/pgp/msg-util.ts @@ -156,6 +156,11 @@ export class MsgUtil { } catch (formatErr) { return { success: false, error: { type: DecryptErrTypes.format, message: String(formatErr) }, longids }; } + // there are 3 types of messages possible at this point + // 1. PKCS#7 if isPkcs7 is true + // 2. OpenPGP cleartext message if isCleartext is true + // 3. Other types of OpenPGP message + // Hence isCleartext and isPkcs7 are mutually exclusive if (prepared.isCleartext) { const signature = await OpenPGPKey.verify(prepared.message, await ContactStore.getPubkeyInfos(undefined, verificationPubs)); const content = signature.content || Buf.fromUtfStr('no content'); From a73fc487bbb392121a20a19d92fce7163bfb62b0 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sun, 12 Dec 2021 04:29:22 +0000 Subject: [PATCH 25/31] VerifyRes.match=false on message digest mismatch --- extension/js/common/core/crypto/pgp/openpgp-key.ts | 1 + test/source/tests/unit-node.ts | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/extension/js/common/core/crypto/pgp/openpgp-key.ts b/extension/js/common/core/crypto/pgp/openpgp-key.ts index ecb01be1bab..66b5859b08a 100644 --- a/extension/js/common/core/crypto/pgp/openpgp-key.ts +++ b/extension/js/common/core/crypto/pgp/openpgp-key.ts @@ -479,6 +479,7 @@ export class OpenPGPKey { verifyRes.isErrFatal = true; // don't try to re-fetch the message from API } else if (verifyErr instanceof Error && verifyErr.message === 'Message digest did not match') { verifyRes.error = verifyErr.message; + verifyRes.match = false; } else { verifyRes.error = `Error verifying this message: ${String(verifyErr)}`; Catch.reportErr(verifyErr); diff --git a/test/source/tests/unit-node.ts b/test/source/tests/unit-node.ts index 42ed4cca9c8..074a4e8b537 100644 --- a/test/source/tests/unit-node.ts +++ b/test/source/tests/unit-node.ts @@ -895,9 +895,9 @@ E1d8Vh/Ey7IJ8TXbfFrdv5ZP3HqMK0089SooZwx/GN2QIaOYQXsS0u7IFNhU\n=q5Sf sigText, verificationPubs: [dhartleyPubkey] }); - expect(resultRightKey.match).to.be.null; + expect(resultRightKey.match).to.be.false; expect(resultRightKey.error).to.not.be.undefined; - expect(resultRightKey.isErrFatal).to.be.undefined; + expect(resultRightKey.isErrFatal).to.not.be.true; } { const resultWrongKey = await MsgUtil.verifyDetached({ From 362b7b583c8a8e3d4b55160d133ef330e18384d3 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sun, 12 Dec 2021 14:45:26 +0000 Subject: [PATCH 26/31] removed PII --- .../mock/attester/attester-endpoints.ts | 13 +- .../message-export-1754cfc37886899e.json | 213 ------------------ .../message-export-1754cfd1b2f1d6e5.json | 211 ----------------- .../message-export-17dad75e63e47f97.json | 211 +++++++++++++++++ .../message-export-17daefa0eb077da6.json | 213 ++++++++++++++++++ test/source/tests/decrypt.ts | 37 +-- test/source/tests/unit-node.ts | 28 ++- 7 files changed, 461 insertions(+), 465 deletions(-) delete mode 100644 test/source/mock/google/exported-messages/message-export-1754cfc37886899e.json delete mode 100644 test/source/mock/google/exported-messages/message-export-1754cfd1b2f1d6e5.json create mode 100644 test/source/mock/google/exported-messages/message-export-17dad75e63e47f97.json create mode 100644 test/source/mock/google/exported-messages/message-export-17daefa0eb077da6.json diff --git a/test/source/mock/attester/attester-endpoints.ts b/test/source/mock/attester/attester-endpoints.ts index 65ae870419a..eeb040797c8 100644 --- a/test/source/mock/attester/attester-endpoints.ts +++ b/test/source/mock/attester/attester-endpoints.ts @@ -24,18 +24,15 @@ const knownMockEmails = [ let data: GoogleData; export const MOCK_ATTESTER_LAST_INSERTED_PUB: { [email: string]: string } = {}; -const getDC26454AFB71D18EABBAD73D1C7E6D3C5563A941 = async () => { +const get203FAE7076005381 = async () => { if (!data) { data = await GoogleData.withInitializedData('flowcrypt.compatibility@gmail.com'); } - - const msg = data.getMessage('1754cfc37886899e')!; + const msg = data.getMessage('17dad75e63e47f97')!; const msgText = Buf.fromBase64Str(msg!.raw!).toUtfStr(); - const dhartleyPubkey = msgText + return msgText .match(/\-\-\-\-\-BEGIN PGP PUBLIC KEY BLOCK\-\-\-\-\-.*\-\-\-\-\-END PGP PUBLIC KEY BLOCK\-\-\-\-\-/s)![0] .replace(/=\r\n/g, '').replace(/=3D/g, '='); - - return dhartleyPubkey; }; export const mockAttesterEndpoints: HandlersDefinition = { @@ -59,8 +56,8 @@ export const mockAttesterEndpoints: HandlersDefinition = { if (emailOrLongid === 'flowcrypt.compatibility@protonmail.com') { return protonMailCompatKey; } - if (['dhartley@verdoncollege.school.nz', '1C7E6D3C5563A941'.toLowerCase()].includes(emailOrLongid)) { - return await getDC26454AFB71D18EABBAD73D1C7E6D3C5563A941(); + if (emailOrLongid === 'some.sender@test.com') { + return await get203FAE7076005381(); } if (['sams50sams50sept@gmail.com', 'sender@example.com'].includes(emailOrLongid)) { return testConstants.pubkey2864E326A5BE488A; diff --git a/test/source/mock/google/exported-messages/message-export-1754cfc37886899e.json b/test/source/mock/google/exported-messages/message-export-1754cfc37886899e.json deleted file mode 100644 index 601c1e31239..00000000000 --- a/test/source/mock/google/exported-messages/message-export-1754cfc37886899e.json +++ /dev/null @@ -1,213 +0,0 @@ -{ - "acctEmail": "flowcrypt.compatibility@gmail.com", - "full": { - "id": "1754cfc37886899e", - "threadId": "1754cfc37886899e", - "labelIds": [ - "Label_6255111949068864933", - "IMPORTANT", - "Label_7", - "Label_9", - "CATEGORY_PERSONAL", - "Label_4", - "INBOX" - ], - "snippet": "1234", - "payload": { - "partId": "", - "mimeType": "multipart/signed", - "filename": "", - "headers": [ - { - "name": "X-Gm-Message-State", - "value": "AOAM531dg7t33gFjAD74BUjtjzTNRfrG7ueIIKQX6Tm0jpT1FopiHote p+prqCFS2pHyF9PrSrrWcLyOrt/fhbdFEC3MECTg3fy5n95NtSSH4prb1ahSRE9QtL1d5WnmE5H so5pyceMjckNOuLs/DlgX7dq63A9R+DYekQVJfAh3EhTJuA/M3PxQeZfBH0fr+rZHUlhzKa38SN XmR2KgXNj34sL3b2lHI8JZ7tsp" - }, - { - "name": "To", - "value": "flowcrypt.compatibility@gmail.com" - }, - { - "name": "From", - "value": "dhartley@verdoncollege.school.nz" - }, - { - "name": "Autocrypt", - "value": "addr=dhartley@verdoncollege.school.nz; keydata= xsDNBF1wPuQBDAChI2DAh6K/bmwH5hfCJwkxewFUfWaAxzAIWyXe/w5wjFJBpu74MJvqO+8T WkyVMVXQqOm5dH36YkMCVcNqoGgC0mp/JZUmVIdPqKH1QYK988rRKP2HIl3CNgbyiHLjyKVf +RW4OKxeQLM1MJpQ/39V5ymWftPszz1j+LO2FKpfAsUapAImZNwhXSKZcrxvUEnoayQg17HA 9ThXadQ/UU8FDlibKQoBUvhfyig7Gf4s/Ol3p76a57M/ZClgS5hPoM77oPaC8n8QVYA/t5Bu YSd1n3CE67EU6IzJr3A83c34EZO/wHu6gwCCllouWNtU7fDvKJEbcgbTfb0o7qo224lAUwDq VB2zCVQTEKXV20h/qvujNnLxo2DjcBg+Fbd7GrZEEqK5+psc3U3ljD9mToJoM4lG7Ixy1Ev2 Sx8xfUFtL9PIktl8OwA6U/1XZvauoH5upBain8bc+0ai8axXL2/O0rAKX2DlPfHD9LOim74P NqliLUtTr4TlByMZ5IuYCjMAEQEAAc0vRGF2ZSBIYXJ0bGV5IDxkaGFydGxleUB2ZXJkb25j b2xsZWdlLnNjaG9vbC5uej7CwRQEEwEIAD4CGwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AW IQTcJkVK+3HRjqu61z0cfm08VWOpQQUCX4eCvAUJBdmq2AAKCRAcfm08VWOpQcRiC/sFhdZh FB5gQbHcs8F9+aPi8gfwu3atUFwadN6AShSa6K3pnd7V1xYlDFwRPKrAEWBBYeX9dsAWl9gx PNuCo5utRkgPR8ZSO4ceXR4ZgKTvF3k6UzzGx8HFC+MJCvdiTTPnMayUOOX/f4+79uWt+fRK SBtckwud7+Dt/88ux8j8TpvBZMhciJ8Zwr9ouVWXfgg2/RMzZNTophQHKdUOhPQ/DBzVaLxV f3QEqKPs3lhrS08ZOMpubV938KdCLgqeqeaClEtURUZEs/5Ixg7lb+SbbOo12K/lRnYu4U1p WcHVueccqkTxDZxgCDBtqN4sBMnmKtSuYAcbyy4SyWGA6Z0KIP87FxMi5Yf+04R+hEG9KWD3 fuk1JIIUeNVoiAn4aERjrIUN5q4NJAyY0d6KXmpyJxOK2Dj3ZyQglNrvXitchXJJqMfdGexB 03lzDYxyHSlu+WBp2exaSOyQIKSniQ1BhAHyp4VQBkLKKVAEV+fVeTdFxarxVH5Hs8tP7Yag JSTOwM0EXXA+5QEMAOoo+4IBfjaiZjEe4azMFDrVwvVkeEw3soMrBjAOjlySQCpE/q0qDId5 k0eSAAhttans3Us166xKW2QMfd2ojFBTLi06Zpha1jDo5Aj2kWDEGT5y+0HBRVY0NmPtvBA1 igRfF1ZSUsqIhO/dSqirdnSh08z5bZnEEyIWObBhC8leE2BAdXWgG1Wk0/02DkrA9N16lZ1/ wVGtYU09rnZBJpeDOFM0dCh7uhfA5LGzmxKzn25/rDSFUrUcmYfawAn13OS02COIlstl6lUg VJ6xtBxOaT4NLka4hkqyzpamCF6okeZQI6tHEmlm5FXuhCb/Lz/n9k9Pk793Ior0PP+xMPO8 gbWlFvPfl/MRKc3Hy2SIZw9RQ7A/33V/ozXVzg1A4drrXKkKec8JznNTkoRI6fSx/TGVpNh1 +5SOHFGgKtZ+RA1BD1vmsMz/5xmdoWGisoR0/hEtdjudxpK1Zm0r1nvNpFZmKRZB26ImfMC4 kbRVXXX5LxE6yIyJ3urFn2+6PwARAQABwsD8BBgBCAAmAhsMFiEE3CZFSvtx0Y6rutc9HH5t PFVjqUEFAl+Hgr0FCQXZqtgACgkQHH5tPFVjqUEnEwv9Ea+syu+U72SeNc3BQ3Gm6llARyQm 7gz2GZBak/epzD+3TFNKFLLh9AyBOM+wWRpGfKh1X+s9GLdSQISEA06bsW4d1KfHqEg0HTRw 4p9SRwOWHvy1L6maA1VHRQCW0/FN/7kYDrUH3bigISTkJJpmq8j4YOH66HVEbFqBO31ycYUG Gt/Bazhe7rOhAxZuGYzcVJQdSE020vjbqM5l34HfiDubuUNRhHMIaWa5IYYIyq33STbZu5Fl n/5zoGN8+Ae4wNNzzfOyWCKUzqybgbDxPWCnX2tgDEDlCt0X5X3PcItVeUpQCecDRut4eGEz OkkdNo2EM9UpBjGfei+GD8vrz9apxvQ+nKYIOi4FM8GkXrsag7gvIdEcGzWcokhmdaFqWqwe QALMUhhA86TckOwaouKkwk3CwnHtqdWryXmpvkbJxWRVrZOGgSfG+/QIku0oNY5XKRbdXURp 1dPshT490JLUzFbM+OcF++HyMZ70qj/k64f6idz5w6TvK0TCKe/M" - }, - { - "name": "Subject", - "value": "sig from new Thunderbird v78 not recognized, plain" - }, - { - "name": "Date", - "value": "Thu, 22 Oct 2020 10:06:29 +1300" - }, - { - "name": "User-Agent", - "value": "Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.3.3" - }, - { - "name": "MIME-Version", - "value": "1.0" - }, - { - "name": "Content-Type", - "value": "multipart/signed; micalg=pgp-sha256; protocol=\"application/pgp-signature\"; boundary=\"zUh80el73HdgHOoDVnJsTtQZDI9bELswe\"" - } - ], - "body": { - "size": 0 - }, - "parts": [ - { - "partId": "0", - "mimeType": "multipart/mixed", - "filename": "", - "headers": [ - { - "name": "Content-Type", - "value": "multipart/mixed; boundary=\"XWwnusC4nxhk2LRvLCC6Skcb8YiKQ4Lu0\"; protected-headers=\"v1\"" - }, - { - "name": "From", - "value": "Dave Hartley " - }, - { - "name": "To", - "value": "flowcrypt.compatibility@gmail.com" - }, - { - "name": "Message-ID", - "value": "<27f923b8-0cec-3a14-db54-d6a5c3b922d8@verdoncollege.school.nz>" - }, - { - "name": "Subject", - "value": "sig from new Thunderbird v78 not recognized, plain" - } - ], - "body": { - "size": 0 - }, - "parts": [ - { - "partId": "0.0", - "mimeType": "multipart/mixed", - "filename": "", - "headers": [ - { - "name": "Content-Type", - "value": "multipart/mixed; boundary=\"------------8D9D547E804CC8A49BF70E54\"" - }, - { - "name": "Content-Language", - "value": "en-NZ" - } - ], - "body": { - "size": 0 - }, - "parts": [ - { - "partId": "0.0.0", - "mimeType": "text/plain", - "filename": "", - "headers": [ - { - "name": "Content-Type", - "value": "text/plain; charset=utf-8" - }, - { - "name": "Content-Transfer-Encoding", - "value": "quoted-printable" - } - ], - "body": { - "size": 6, - "data": "MTIzNA0K" - } - }, - { - "partId": "0.0.1", - "mimeType": "application/pgp-keys", - "filename": "OpenPGP_0x1C7E6D3C5563A941.asc", - "headers": [ - { - "name": "Content-Type", - "value": "application/pgp-keys; name=\"OpenPGP_0x1C7E6D3C5563A941.asc\"" - }, - { - "name": "Content-Transfer-Encoding", - "value": "quoted-printable" - }, - { - "name": "Content-Disposition", - "value": "attachment; filename=\"OpenPGP_0x1C7E6D3C5563A941.asc\"" - } - ], - "body": { - "attachmentId": "ANGjdJ-yDvfUi4GXx4ZMIHVuKfjT32ffJF5mfNLlV6tjeq_OaFeiVfeVKVoZd4iSUTqunOwrlyroaITF3oL75s_jE4drJMONBjsNrA8Zq7IN2_vMmPASTtq_WAeV9TATa0xKofTE7CeN0gi8Uv_v4RxauXgC5eWdZ-tGRPpLMQYVVT9sGmKiD5nNiMfc_lGQJaYsiGUTii-i_Jl-oxdtTS76OKtJq1MXVaAkg7GJ_Oi2B4PvXiPnX8N0LAYHR7q5L20kuEdvBSDLrpalgScpdBCCxiVGZ4NSz4tfhXQTnqyhOUshqkUUfiCg2GVvRmt0IR7JvGX01q21JpJRq9cbJjI8e1higUzGjkgVcda5gUGa2QuFlG19vgHNxIJK_tM", - "size": 3147 - } - } - ] - } - ] - }, - { - "partId": "1", - "mimeType": "application/pgp-signature", - "filename": "OpenPGP_signature", - "headers": [ - { - "name": "Content-Type", - "value": "application/pgp-signature; name=\"OpenPGP_signature.asc\"" - }, - { - "name": "Content-Description", - "value": "OpenPGP digital signature" - }, - { - "name": "Content-Disposition", - "value": "attachment; filename=\"OpenPGP_signature\"" - } - ], - "body": { - "attachmentId": "ANGjdJ8iNjciNtU09awKCwED3qNYlqvsQFBKDYwSTRsaDQ_5-xbD0AjnVgB9qA2n323WQInPe_Bb4vTENJrJlfgftVeRN7kIUxtLb2TgWk3-cxLQ5OuAqiS932nGlZ31rkFhhuLs7YNwmS84--6Wxo2UVM3cTO5E0GOScpfoNCuO9W3oY9219sAd-RmQ_v6QRYfAeFzaA2HCetLT3K6rzf9GQ5BlIKBD92brbABKjV6gJiDCCm0m67lrUPyNfFsiLhlGrYOr2FK_FecuHf9N5J_xLPE0Z-Vaaea8BRr_2xaeyOHYw0rRfccVWEY4bSkj37qCu_gazJk0NLercRCJfdZxysV3KftFCtem0K-J_6dJwVEQEx9HaR_lFH5PQIg", - "size": 677 - } - } - ] - }, - "sizeEstimate": 13211, - "historyId": "1206346", - "internalDate": "1603314389000" - }, - "attachments": { - "ANGjdJ-yDvfUi4GXx4ZMIHVuKfjT32ffJF5mfNLlV6tjeq_OaFeiVfeVKVoZd4iSUTqunOwrlyroaITF3oL75s_jE4drJMONBjsNrA8Zq7IN2_vMmPASTtq_WAeV9TATa0xKofTE7CeN0gi8Uv_v4RxauXgC5eWdZ-tGRPpLMQYVVT9sGmKiD5nNiMfc_lGQJaYsiGUTii-i_Jl-oxdtTS76OKtJq1MXVaAkg7GJ_Oi2B4PvXiPnX8N0LAYHR7q5L20kuEdvBSDLrpalgScpdBCCxiVGZ4NSz4tfhXQTnqyhOUshqkUUfiCg2GVvRmt0IR7JvGX01q21JpJRq9cbJjI8e1higUzGjkgVcda5gUGa2QuFlG19vgHNxIJK_tM": { - "data": "LS0tLS1CRUdJTiBQR1AgUFVCTElDIEtFWSBCTE9DSy0tLS0tDQoNCnhzRE5CRjF3UHVRQkRBQ2hJMkRBaDZLL2Jtd0g1aGZDSndreGV3RlVmV2FBeHpBSVd5WGUvdzV3akZKQnB1NzRNSnZxTys4VFdreVYNCk1WWFFxT201ZEgzNllrTUNWY05xb0dnQzBtcC9KWlVtVklkUHFLSDFRWUs5ODhyUktQMkhJbDNDTmdieWlITGp5S1ZmK1JXNE9LeGUNClFMTTFNSnBRLzM5VjV5bVdmdFBzenoxaitMTzJGS3BmQXNVYXBBSW1aTndoWFNLWmNyeHZVRW5vYXlRZzE3SEE5VGhYYWRRL1VVOEYNCkRsaWJLUW9CVXZoZnlpZzdHZjRzL09sM3A3NmE1N00vWkNsZ1M1aFBvTTc3b1BhQzhuOFFWWUEvdDVCdVlTZDFuM0NFNjdFVTZJekoNCnIzQTgzYzM0RVpPL3dIdTZnd0NDbGxvdVdOdFU3ZkR2S0pFYmNnYlRmYjBvN3FvMjI0bEFVd0RxVkIyekNWUVRFS1hWMjBoL3F2dWoNCk5uTHhvMkRqY0JnK0ZiZDdHclpFRXFLNStwc2MzVTNsakQ5bVRvSm9NNGxHN0l4eTFFdjJTeDh4ZlVGdEw5UElrdGw4T3dBNlUvMVgNClp2YXVvSDV1cEJhaW44YmMrMGFpOGF4WEwyL08wckFLWDJEbFBmSEQ5TE9pbTc0UE5xbGlMVXRUcjRUbEJ5TVo1SXVZQ2pNQUVRRUENCkFjMHZSR0YyWlNCSVlYSjBiR1Y1SUR4a2FHRnlkR3hsZVVCMlpYSmtiMjVqYjJ4c1pXZGxMbk5qYUc5dmJDNXVlajdDd1JRRUV3RUkNCkFENENHd01GQ3drSUJ3SUdGUW9KQ0FzQ0JCWUNBd0VDSGdFQ0Y0QVdJUVRjSmtWSyszSFJqcXU2MXowY2ZtMDhWV09wUVFVQ1g0ZUMNCnZBVUpCZG1xMkFBS0NSQWNmbTA4VldPcFFjUmlDL3NGaGRaaEZCNWdRYkhjczhGOSthUGk4Z2Z3dTNhdFVGd2FkTjZBU2hTYTZLM3ANCm5kN1YxeFlsREZ3UlBLckFFV0JCWWVYOWRzQVdsOWd4UE51Q281dXRSa2dQUjhaU080Y2VYUjRaZ0tUdkYzazZVenpHeDhIRkMrTUoNCkN2ZGlUVFBuTWF5VU9PWC9mNCs3OXVXdCtmUktTQnRja3d1ZDcrRHQvODh1eDhqOFRwdkJaTWhjaUo4WndyOW91VldYZmdnMi9STXoNClpOVG9waFFIS2RVT2hQUS9EQnpWYUx4VmYzUUVxS1BzM2xoclMwOFpPTXB1YlY5MzhLZENMZ3FlcWVhQ2xFdFVSVVpFcy81SXhnN2wNCmIrU2JiT28xMksvbFJuWXU0VTFwV2NIVnVlY2Nxa1R4RFp4Z0NEQnRxTjRzQk1ubUt0U3VZQWNieXk0U3lXR0E2WjBLSVA4N0Z4TWkNCjVZZiswNFIraEVHOUtXRDNmdWsxSklJVWVOVm9pQW40YUVSanJJVU41cTROSkF5WTBkNktYbXB5SnhPSzJEajNaeVFnbE5ydlhpdGMNCmhYSkpxTWZkR2V4QjAzbHpEWXh5SFNsdStXQnAyZXhhU095UUlLU25pUTFCaEFIeXA0VlFCa0xLS1ZBRVYrZlZlVGRGeGFyeFZINUgNCnM4dFA3WWFnSlNUQ3dSUUVFd0VJQUQ0V0lRVGNKa1ZLKzNIUmpxdTYxejBjZm0wOFZXT3BRUVVDWFhBKzVRSWJBd1VKQWVFemdBVUwNCkNRZ0hBZ1lWQ2drSUN3SUVGZ0lEQVFJZUFRSVhnQUFLQ1JBY2ZtMDhWV09wUVEzMkMvNHAzaHNqZlRlQXpRUjBhSG9XR0tUUmNGb1kNCm5jOUlkWWpPNzhmbmFmZWhKSXQ1TExvTGZkK01TR1B6Njc4NWhtTmdyeWo2WHRFMWVJTU42cHZrSy9CeTZON1Y2T04xOWp6S3h2QXENCi8zZi9yUWNpZVRKbDV0dHRRUkdXc3VGWCtEZHYraXdmbEcrOVpTTTNFOWxaTDJwbzNFdzZLaG1pd0graSsrQ1JGN3V0UlJyUGorRHINCm1NQmdYajB5WXloUm1oZVVta1BqN282S2ZNK2NuL3JRUFZTSVdXSHJCSW1BbEVna05sOWZJOS9TTWhvZ052NlpzbUtYN2FlTko5eHgNClhlNnFBVzI3NnJqZEsvM2VoMHJieHdja0lZMkJaWVJlTzczZkxmRnpYckYxa0gwZ0kvVnErQWFhaDkvYzU2WkJNK1ZTRVBhK3pveFANCmR5eWMzenVsN1ExNlZMV0FnblUzUElCeWNFcS9naWxLQnpSM0dHTDJWakxValU0d0F4UTdKd1djMDdvbkttL1dTUnJmY2lnNEdDbHgNClBNb3BPS1FwNWd4MEdPSUVDTWFxRHFvV3pUQWpLK1BTR0pLZUx1eTNydGhyN09rS3JIc2ZhV1BQZ0RwZzVOSlM0MG52VVF4Z3pwQnINCmFRZ2pTS0FjU1NkVlo4bm5WVnozQkdhZm1aT0FEL3pPd00wRVhYQSs1UUVNQU9vbys0SUJmamFpWmpFZTRhek1GRHJWd3ZWa2VFdzMNCnNvTXJCakFPamx5U1FDcEUvcTBxRElkNWswZVNBQWh0dGFuczNVczE2NnhLVzJRTWZkMm9qRkJUTGkwNlpwaGExakRvNUFqMmtXREUNCkdUNXkrMEhCUlZZME5tUHR2QkExaWdSZkYxWlNVc3FJaE8vZFNxaXJkblNoMDh6NWJabkVFeUlXT2JCaEM4bGVFMkJBZFhXZ0cxV2sNCjAvMDJEa3JBOU4xNmxaMS93Vkd0WVUwOXJuWkJKcGVET0ZNMGRDaDd1aGZBNUxHem14S3puMjUvckRTRlVyVWNtWWZhd0FuMTNPUzANCjJDT0lsc3RsNmxVZ1ZKNnh0QnhPYVQ0TkxrYTRoa3F5enBhbUNGNm9rZVpRSTZ0SEVtbG01Rlh1aENiL0x6L245azlQazc5M0lvcjANClBQK3hNUE84Z2JXbEZ2UGZsL01SS2MzSHkyU0ladzlSUTdBLzMzVi9velhWemcxQTRkcnJYS2tLZWM4SnpuTlRrb1JJNmZTeC9UR1YNCnBOaDErNVNPSEZHZ0t0WitSQTFCRDF2bXNNei81eG1kb1dHaXNvUjAvaEV0ZGp1ZHhwSzFabTByMW52TnBGWm1LUlpCMjZJbWZNQzQNCmtiUlZYWFg1THhFNnlJeUozdXJGbjIrNlB3QVJBUUFCd3NEOEJCZ0JDQUFtQWhzTUZpRUUzQ1pGU3Z0eDBZNnJ1dGM5SEg1dFBGVmoNCnFVRUZBbCtIZ3IwRkNRWFpxdGdBQ2drUUhINXRQRlZqcVVFbkV3djlFYStzeXUrVTcyU2VOYzNCUTNHbTZsbEFSeVFtN2d6MkdaQmENCmsvZXB6RCszVEZOS0ZMTGg5QXlCT00rd1dScEdmS2gxWCtzOUdMZFNRSVNFQTA2YnNXNGQxS2ZIcUVnMEhUUnc0cDlTUndPV0h2eTENCkw2bWFBMVZIUlFDVzAvRk4vN2tZRHJVSDNiaWdJU1RrSkpwbXE4ajRZT0g2NkhWRWJGcUJPMzF5Y1lVR0d0L0JhemhlN3JPaEF4WnUNCkdZemNWSlFkU0UwMjB2amJxTTVsMzRIZmlEdWJ1VU5SaEhNSWFXYTVJWVlJeXEzM1NUYlp1NUZsbi81em9HTjgrQWU0d05OenpmT3kNCldDS1V6cXliZ2JEeFBXQ25YMnRnREVEbEN0MFg1WDNQY0l0VmVVcFFDZWNEUnV0NGVHRXpPa2tkTm8yRU05VXBCakdmZWkrR0Q4dnINCno5YXB4dlErbktZSU9pNEZNOEdrWHJzYWc3Z3ZJZEVjR3pXY29raG1kYUZxV3F3ZVFBTE1VaGhBODZUY2tPd2FvdUtrd2szQ3duSHQNCnFkV3J5WG1wdmtiSnhXUlZyWk9HZ1NmRysvUUlrdTBvTlk1WEtSYmRYVVJwMWRQc2hUNDkwSkxVekZiTStPY0YrK0h5TVo3MHFqL2sNCjY0ZjZpZHo1dzZUdkswVENLZS9NDQo9ajl6MA0KLS0tLS1FTkQgUEdQIFBVQkxJQyBLRVkgQkxPQ0stLS0tLQ0K", - "size": 3147 - }, - "ANGjdJ8iNjciNtU09awKCwED3qNYlqvsQFBKDYwSTRsaDQ_5-xbD0AjnVgB9qA2n323WQInPe_Bb4vTENJrJlfgftVeRN7kIUxtLb2TgWk3-cxLQ5OuAqiS932nGlZ31rkFhhuLs7YNwmS84--6Wxo2UVM3cTO5E0GOScpfoNCuO9W3oY9219sAd-RmQ_v6QRYfAeFzaA2HCetLT3K6rzf9GQ5BlIKBD92brbABKjV6gJiDCCm0m67lrUPyNfFsiLhlGrYOr2FK_FecuHf9N5J_xLPE0Z-Vaaea8BRr_2xaeyOHYw0rRfccVWEY4bSkj37qCu_gazJk0NLercRCJfdZxysV3KftFCtem0K-J_6dJwVEQEx9HaR_lFH5PQIg": { - "data": "LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0NCg0Kd3NENUJBQUJDQUFqRmlFRTNDWkZTdnR4MFk2cnV0YzlISDV0UEZWanFVRUZBbCtRb3RZRkF3QUFBQUFBQ2drUUhINXRQRlZqcVVGNA0KeGd2K01yZFEwN01mQ1ZVOTNwdFpnK1MrT09rUTFBY1p4R0ZkaWl2czEwS2tOR3RMbTlzK3cvaUVVQXlTU1didEtqYkxWNk8zQVl2Qw0KUUZLc0ZSRnIxN0VrejZtU1BqOTl6aWZGTUJ2VE9JQWV2L2QwOGRtWDBrR2Q2WWxQK0d5WkwzV3FjZ3kxVDFIM29iZ09tVG9EdGs3Ug0KVjUyS2kxYVRKWUgvWjd2NlBzUVJXbjhlbWZIL3lHWXBsQmh6WnkyWGpPNlVJYXI5VDh3dEFKT2Q2K0lpMnNmeUd5RVBqekdja0xhUg0KSlpPeFE0anBKSlVzenoyV3N2TE53dEtvcXdWMTVFZzNveFp6SFdZRThQNjN4WG9FNEc3NjI2MDRTSXF2L2dneVFaVHQvRXM2U2N1bg0KQTFCSmZsRm0rY0h6UVRXMnlRZndDQ3ZsekVaTmlOd1hmd0dmVjk5SzVpRzFlVzNsdjdzTUxKbml0d1RpZE5JbEQ1TFROZGVVblRYag0KWEp2a0VRc3lUVUk0cWJ6ekpiVU5ZejdscmFpekMyblBpd0Z6THY2OTJtUzB1cnREM21VaE9CQTloWndrM2wvMjBHc0dpYTBGZVVJUw0KRTFkOFZoL0V5N0lKOFRYYmZGcmR2NVpQM0hxTUswMDg5U29vWnd4L0dOMlFJYU9ZUVhzUzB1N0lGTmhVDQo9cTVTZg0KLS0tLS1FTkQgUEdQIFNJR05BVFVSRS0tLS0tDQo", - "size": 677 - } - }, - "raw": { - "id": "1754cfc37886899e", - "threadId": "1754cfc37886899e", - "labelIds": [ - "Label_6255111949068864933", - "IMPORTANT", - "Label_7", - "Label_9", - "CATEGORY_PERSONAL", - "Label_4", - "INBOX" - ], - "snippet": "1234", - "sizeEstimate": 13211, - "raw": "Delivered-To: flowcrypt.compatibility@gmail.com
Received: by 2002:aed:246a:0:0:0:0:0 with SMTP id s39csp5748179qtc;
        Wed, 21 Oct 2020 14:06:39 -0700 (PDT)
X-Received: by 2002:aa7:9009:0:b029:154:f822:27c9 with SMTP id m9-20020aa790090000b0290154f82227c9mr5449491pfo.48.1603314398920;
        Wed, 21 Oct 2020 14:06:38 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1603314398; cv=none;
        d=google.com; s=arc-20160816;
        b=ioIDZTkDp7DUVKVi0kp7iJ45m6ZMlo125HNUubQJHJYsnuvWUUmyPRab1ws5xHMIJK
         UslA27nqf4hxIcxf6Cnzm1AT1UTej7xwpspmxuveEuqLAJgxTaVlFPPiZ3M6P6rRDZ+M
         qT+4oanXVavnI/6svd2BenkzY27QheSDgM7Yaibvjii95yZPZXjmPX63wM3Jg5zrMKdp
         qrWftmiH0XnHzLZM113U52TPzfKNbCKyVIabOjw/uUI69AEI7wrQUQ9WynoKUdpMRErN
         W8AvjMUbaNOdfMEoZ0pI2ZceKz7bwMS7rGYq3yE84f82xjpnpe2tNfV/uO5Llz38nr/h
         hXAw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
        h=mime-version:user-agent:date:message-id:subject:autocrypt:from:to
         :dkim-signature;
        bh=COp6NEnwiMW+R3gPwq0mUWI1PvnOS68eSErLay+QSfU=;
        b=CASVRfznmU9fE/RruHMthTyluOk44h1NaLSX0DhyDAVIPufA2r0n+Sz4BAoky+AsIy
         hnu43B+2XUWcSx/UubCkGOEvDUNqy40aM1PVu3ssv47SkMxXTsyIKZQV6FwZv2l+lbz6
         0qWV8bCyRfaZnAWaxuRKw/2T9X+OmABM//x0J42J9edNVofsyB+KIOFVZ5Xho3s2rBkR
         UMVgu2xSMg5d5i3WQO8U3GgwNTfD/tyZXs4ezTdnqh0nJ62r6qzO2OYgWO7V4ZeTg5Rz
         cRWg17JgcHyWzQXxhPwROT6tzCa/giTrkVHytf8SOkRI43TlchjwPyNDVQ0q1aPCgq5n
         0plg==
ARC-Authentication-Results: i=1; mx.google.com;
       dkim=pass header.i=@verdoncollege-school-nz.20150623.gappssmtp.com header.s=20150623 header.b=lTgBw+oQ;
       spf=pass (google.com: domain of dhartley@verdoncollege.school.nz designates 209.85.220.41 as permitted sender) smtp.mailfrom=dhartley@verdoncollege.school.nz
Return-Path: <dhartley@verdoncollege.school.nz>
Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41])
        by mx.google.com with SMTPS id 20sor1933799plo.70.2020.10.21.14.06.38
        for <flowcrypt.compatibility@gmail.com>
        (Google Transport Security);
        Wed, 21 Oct 2020 14:06:38 -0700 (PDT)
Received-SPF: pass (google.com: domain of dhartley@verdoncollege.school.nz designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41;
Authentication-Results: mx.google.com;
       dkim=pass header.i=@verdoncollege-school-nz.20150623.gappssmtp.com header.s=20150623 header.b=lTgBw+oQ;
       spf=pass (google.com: domain of dhartley@verdoncollege.school.nz designates 209.85.220.41 as permitted sender) smtp.mailfrom=dhartley@verdoncollege.school.nz
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=verdoncollege-school-nz.20150623.gappssmtp.com; s=20150623;
        h=to:from:autocrypt:subject:message-id:date:user-agent:mime-version;
        bh=COp6NEnwiMW+R3gPwq0mUWI1PvnOS68eSErLay+QSfU=;
        b=lTgBw+oQL8TblgALR8hH7y9fTDYaE7BhIpvO8aTBQ+NaLYDoRKTxF3YnlacIizWJen
         9lhZFVJGnydxK2VLW6cWnQZQc1KkZVbmqf+/2jySDWXtEYa6HuGIx+R7IjOBU6pNiEFl
         bPPx6sDWJdnmUonNJkzIldR/XW6UKBmRD3Gwj7+ucz4Vhg2VUc0txdHE6TVe/l80P0kG
         i0K13aT79aqOaQm/hGmJbBB2nOD/wrlY39XQD+Ln4VW3WyNkV6CgnlV/cMmmL/jFxYZq
         /dceqLlSizGMZCCnK2HfsApV4M4VPqFOh8iDICA2T1Y9QV6nkY4v15caMf6pCP+cN8X4
         y/tg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:to:from:autocrypt:subject:message-id:date
         :user-agent:mime-version;
        bh=COp6NEnwiMW+R3gPwq0mUWI1PvnOS68eSErLay+QSfU=;
        b=nyygts2KNq0eBwL3GoP5035CsVq7lQIWzQblB+x4IqmlQeWVwtGZjho/A1HVCsNx3c
         nEiqArm78OICzwdi8GMfB5IydYZN+vjduLzUtZSfGBIjuwxQOtAXBvq6pHWCtZgknDSI
         eqQx3uAn3knYBqLqZZQluoH5vnA/Keb4Ps1Acxd7cADl9oSufRoLKOptgt5Ut/3jHFA3
         zkni6NoquIlnSzzeWscJLBGxb8TCaeO5orsOmBmL8nUe6AwdjMmhqJggBxDvC5G1EDg9
         E+w7PRIhNlUWu+RLPm+2XZ55i8zm7mqHac5xsb7J7zVUFDiZ1IjwaUopVzzLPE/pXdXh
         0fGw==
X-Gm-Message-State: AOAM531dg7t33gFjAD74BUjtjzTNRfrG7ueIIKQX6Tm0jpT1FopiHote
	p+prqCFS2pHyF9PrSrrWcLyOrt/fhbdFEC3MECTg3fy5n95NtSSH4prb1ahSRE9QtL1d5WnmE5H
	so5pyceMjckNOuLs/DlgX7dq63A9R+DYekQVJfAh3EhTJuA/M3PxQeZfBH0fr+rZHUlhzKa38SN
	XmR2KgXNj34sL3b2lHI8JZ7tsp
X-Google-Smtp-Source: ABdhPJzQ4GHrdpd1V6nMWLyW86Sx6NVqqlCM3JGNwy8djQZ0zxBkOLK9kx7jQlGHJssdFZagscffqw==
X-Received: by 2002:a17:902:423:b029:d5:f967:86fe with SMTP id 32-20020a1709020423b02900d5f96786femr5393476ple.55.1603314397804;
        Wed, 21 Oct 2020 14:06:37 -0700 (PDT)
Return-Path: <dhartley@verdoncollege.school.nz>
Received: from [10.0.6.9] ([210.55.79.13])
        by smtp.gmail.com with ESMTPSA id i126sm3069659pfc.48.2020.10.21.14.06.34
        for <flowcrypt.compatibility@gmail.com>
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Wed, 21 Oct 2020 14:06:37 -0700 (PDT)
To: flowcrypt.compatibility@gmail.com
From: Dave Hartley <dhartley@verdoncollege.school.nz>
Autocrypt: addr=dhartley@verdoncollege.school.nz; keydata=
 xsDNBF1wPuQBDAChI2DAh6K/bmwH5hfCJwkxewFUfWaAxzAIWyXe/w5wjFJBpu74MJvqO+8T
 WkyVMVXQqOm5dH36YkMCVcNqoGgC0mp/JZUmVIdPqKH1QYK988rRKP2HIl3CNgbyiHLjyKVf
 +RW4OKxeQLM1MJpQ/39V5ymWftPszz1j+LO2FKpfAsUapAImZNwhXSKZcrxvUEnoayQg17HA
 9ThXadQ/UU8FDlibKQoBUvhfyig7Gf4s/Ol3p76a57M/ZClgS5hPoM77oPaC8n8QVYA/t5Bu
 YSd1n3CE67EU6IzJr3A83c34EZO/wHu6gwCCllouWNtU7fDvKJEbcgbTfb0o7qo224lAUwDq
 VB2zCVQTEKXV20h/qvujNnLxo2DjcBg+Fbd7GrZEEqK5+psc3U3ljD9mToJoM4lG7Ixy1Ev2
 Sx8xfUFtL9PIktl8OwA6U/1XZvauoH5upBain8bc+0ai8axXL2/O0rAKX2DlPfHD9LOim74P
 NqliLUtTr4TlByMZ5IuYCjMAEQEAAc0vRGF2ZSBIYXJ0bGV5IDxkaGFydGxleUB2ZXJkb25j
 b2xsZWdlLnNjaG9vbC5uej7CwRQEEwEIAD4CGwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AW
 IQTcJkVK+3HRjqu61z0cfm08VWOpQQUCX4eCvAUJBdmq2AAKCRAcfm08VWOpQcRiC/sFhdZh
 FB5gQbHcs8F9+aPi8gfwu3atUFwadN6AShSa6K3pnd7V1xYlDFwRPKrAEWBBYeX9dsAWl9gx
 PNuCo5utRkgPR8ZSO4ceXR4ZgKTvF3k6UzzGx8HFC+MJCvdiTTPnMayUOOX/f4+79uWt+fRK
 SBtckwud7+Dt/88ux8j8TpvBZMhciJ8Zwr9ouVWXfgg2/RMzZNTophQHKdUOhPQ/DBzVaLxV
 f3QEqKPs3lhrS08ZOMpubV938KdCLgqeqeaClEtURUZEs/5Ixg7lb+SbbOo12K/lRnYu4U1p
 WcHVueccqkTxDZxgCDBtqN4sBMnmKtSuYAcbyy4SyWGA6Z0KIP87FxMi5Yf+04R+hEG9KWD3
 fuk1JIIUeNVoiAn4aERjrIUN5q4NJAyY0d6KXmpyJxOK2Dj3ZyQglNrvXitchXJJqMfdGexB
 03lzDYxyHSlu+WBp2exaSOyQIKSniQ1BhAHyp4VQBkLKKVAEV+fVeTdFxarxVH5Hs8tP7Yag
 JSTOwM0EXXA+5QEMAOoo+4IBfjaiZjEe4azMFDrVwvVkeEw3soMrBjAOjlySQCpE/q0qDId5
 k0eSAAhttans3Us166xKW2QMfd2ojFBTLi06Zpha1jDo5Aj2kWDEGT5y+0HBRVY0NmPtvBA1
 igRfF1ZSUsqIhO/dSqirdnSh08z5bZnEEyIWObBhC8leE2BAdXWgG1Wk0/02DkrA9N16lZ1/
 wVGtYU09rnZBJpeDOFM0dCh7uhfA5LGzmxKzn25/rDSFUrUcmYfawAn13OS02COIlstl6lUg
 VJ6xtBxOaT4NLka4hkqyzpamCF6okeZQI6tHEmlm5FXuhCb/Lz/n9k9Pk793Ior0PP+xMPO8
 gbWlFvPfl/MRKc3Hy2SIZw9RQ7A/33V/ozXVzg1A4drrXKkKec8JznNTkoRI6fSx/TGVpNh1
 +5SOHFGgKtZ+RA1BD1vmsMz/5xmdoWGisoR0/hEtdjudxpK1Zm0r1nvNpFZmKRZB26ImfMC4
 kbRVXXX5LxE6yIyJ3urFn2+6PwARAQABwsD8BBgBCAAmAhsMFiEE3CZFSvtx0Y6rutc9HH5t
 PFVjqUEFAl+Hgr0FCQXZqtgACgkQHH5tPFVjqUEnEwv9Ea+syu+U72SeNc3BQ3Gm6llARyQm
 7gz2GZBak/epzD+3TFNKFLLh9AyBOM+wWRpGfKh1X+s9GLdSQISEA06bsW4d1KfHqEg0HTRw
 4p9SRwOWHvy1L6maA1VHRQCW0/FN/7kYDrUH3bigISTkJJpmq8j4YOH66HVEbFqBO31ycYUG
 Gt/Bazhe7rOhAxZuGYzcVJQdSE020vjbqM5l34HfiDubuUNRhHMIaWa5IYYIyq33STbZu5Fl
 n/5zoGN8+Ae4wNNzzfOyWCKUzqybgbDxPWCnX2tgDEDlCt0X5X3PcItVeUpQCecDRut4eGEz
 OkkdNo2EM9UpBjGfei+GD8vrz9apxvQ+nKYIOi4FM8GkXrsag7gvIdEcGzWcokhmdaFqWqwe
 QALMUhhA86TckOwaouKkwk3CwnHtqdWryXmpvkbJxWRVrZOGgSfG+/QIku0oNY5XKRbdXURp
 1dPshT490JLUzFbM+OcF++HyMZ70qj/k64f6idz5w6TvK0TCKe/M
Subject: sig from new Thunderbird v78 not recognized, plain
Message-ID: <27f923b8-0cec-3a14-db54-d6a5c3b922d8@verdoncollege.school.nz>
Date: Thu, 22 Oct 2020 10:06:29 +1300
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.3.3
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 protocol="application/pgp-signature";
 boundary="zUh80el73HdgHOoDVnJsTtQZDI9bELswe"

This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
--zUh80el73HdgHOoDVnJsTtQZDI9bELswe
Content-Type: multipart/mixed; boundary="XWwnusC4nxhk2LRvLCC6Skcb8YiKQ4Lu0";
 protected-headers="v1"
From: Dave Hartley <dhartley@verdoncollege.school.nz>
To: flowcrypt.compatibility@gmail.com
Message-ID: <27f923b8-0cec-3a14-db54-d6a5c3b922d8@verdoncollege.school.nz>
Subject: sig from new Thunderbird v78 not recognized, plain

--XWwnusC4nxhk2LRvLCC6Skcb8YiKQ4Lu0
Content-Type: multipart/mixed;
 boundary="------------8D9D547E804CC8A49BF70E54"
Content-Language: en-NZ

This is a multi-part message in MIME format.
--------------8D9D547E804CC8A49BF70E54
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable

1234

--------------8D9D547E804CC8A49BF70E54
Content-Type: application/pgp-keys;
 name="OpenPGP_0x1C7E6D3C5563A941.asc"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
 filename="OpenPGP_0x1C7E6D3C5563A941.asc"

-----BEGIN PGP PUBLIC KEY BLOCK-----

xsDNBF1wPuQBDAChI2DAh6K/bmwH5hfCJwkxewFUfWaAxzAIWyXe/w5wjFJBpu74MJvqO+8TW=
kyV
MVXQqOm5dH36YkMCVcNqoGgC0mp/JZUmVIdPqKH1QYK988rRKP2HIl3CNgbyiHLjyKVf+RW4O=
Kxe
QLM1MJpQ/39V5ymWftPszz1j+LO2FKpfAsUapAImZNwhXSKZcrxvUEnoayQg17HA9ThXadQ/U=
U8F
DlibKQoBUvhfyig7Gf4s/Ol3p76a57M/ZClgS5hPoM77oPaC8n8QVYA/t5BuYSd1n3CE67EU6=
IzJ
r3A83c34EZO/wHu6gwCCllouWNtU7fDvKJEbcgbTfb0o7qo224lAUwDqVB2zCVQTEKXV20h/q=
vuj
NnLxo2DjcBg+Fbd7GrZEEqK5+psc3U3ljD9mToJoM4lG7Ixy1Ev2Sx8xfUFtL9PIktl8OwA6U=
/1X
ZvauoH5upBain8bc+0ai8axXL2/O0rAKX2DlPfHD9LOim74PNqliLUtTr4TlByMZ5IuYCjMAE=
QEA
Ac0vRGF2ZSBIYXJ0bGV5IDxkaGFydGxleUB2ZXJkb25jb2xsZWdlLnNjaG9vbC5uej7CwRQEE=
wEI
AD4CGwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQTcJkVK+3HRjqu61z0cfm08VWOpQQUCX=
4eC
vAUJBdmq2AAKCRAcfm08VWOpQcRiC/sFhdZhFB5gQbHcs8F9+aPi8gfwu3atUFwadN6AShSa6=
K3p
nd7V1xYlDFwRPKrAEWBBYeX9dsAWl9gxPNuCo5utRkgPR8ZSO4ceXR4ZgKTvF3k6UzzGx8HFC=
+MJ
CvdiTTPnMayUOOX/f4+79uWt+fRKSBtckwud7+Dt/88ux8j8TpvBZMhciJ8Zwr9ouVWXfgg2/=
RMz
ZNTophQHKdUOhPQ/DBzVaLxVf3QEqKPs3lhrS08ZOMpubV938KdCLgqeqeaClEtURUZEs/5Ix=
g7l
b+SbbOo12K/lRnYu4U1pWcHVueccqkTxDZxgCDBtqN4sBMnmKtSuYAcbyy4SyWGA6Z0KIP87F=
xMi
5Yf+04R+hEG9KWD3fuk1JIIUeNVoiAn4aERjrIUN5q4NJAyY0d6KXmpyJxOK2Dj3ZyQglNrvX=
itc
hXJJqMfdGexB03lzDYxyHSlu+WBp2exaSOyQIKSniQ1BhAHyp4VQBkLKKVAEV+fVeTdFxarxV=
H5H
s8tP7YagJSTCwRQEEwEIAD4WIQTcJkVK+3HRjqu61z0cfm08VWOpQQUCXXA+5QIbAwUJAeEzg=
AUL
CQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRAcfm08VWOpQQ32C/4p3hsjfTeAzQR0aHoWGKTRc=
FoY
nc9IdYjO78fnafehJIt5LLoLfd+MSGPz6785hmNgryj6XtE1eIMN6pvkK/By6N7V6ON19jzKx=
vAq
/3f/rQcieTJl5tttQRGWsuFX+Ddv+iwflG+9ZSM3E9lZL2po3Ew6KhmiwH+i++CRF7utRRrPj=
+Dr
mMBgXj0yYyhRmheUmkPj7o6KfM+cn/rQPVSIWWHrBImAlEgkNl9fI9/SMhogNv6ZsmKX7aeNJ=
9xx
Xe6qAW276rjdK/3eh0rbxwckIY2BZYReO73fLfFzXrF1kH0gI/Vq+Aaah9/c56ZBM+VSEPa+z=
oxP
dyyc3zul7Q16VLWAgnU3PIBycEq/gilKBzR3GGL2VjLUjU4wAxQ7JwWc07onKm/WSRrfcig4G=
Clx
PMopOKQp5gx0GOIECMaqDqoWzTAjK+PSGJKeLuy3rthr7OkKrHsfaWPPgDpg5NJS40nvUQxgz=
pBr
aQgjSKAcSSdVZ8nnVVz3BGafmZOAD/zOwM0EXXA+5QEMAOoo+4IBfjaiZjEe4azMFDrVwvVke=
Ew3
soMrBjAOjlySQCpE/q0qDId5k0eSAAhttans3Us166xKW2QMfd2ojFBTLi06Zpha1jDo5Aj2k=
WDE
GT5y+0HBRVY0NmPtvBA1igRfF1ZSUsqIhO/dSqirdnSh08z5bZnEEyIWObBhC8leE2BAdXWgG=
1Wk
0/02DkrA9N16lZ1/wVGtYU09rnZBJpeDOFM0dCh7uhfA5LGzmxKzn25/rDSFUrUcmYfawAn13=
OS0
2COIlstl6lUgVJ6xtBxOaT4NLka4hkqyzpamCF6okeZQI6tHEmlm5FXuhCb/Lz/n9k9Pk793I=
or0
PP+xMPO8gbWlFvPfl/MRKc3Hy2SIZw9RQ7A/33V/ozXVzg1A4drrXKkKec8JznNTkoRI6fSx/=
TGV
pNh1+5SOHFGgKtZ+RA1BD1vmsMz/5xmdoWGisoR0/hEtdjudxpK1Zm0r1nvNpFZmKRZB26Imf=
MC4
kbRVXXX5LxE6yIyJ3urFn2+6PwARAQABwsD8BBgBCAAmAhsMFiEE3CZFSvtx0Y6rutc9HH5tP=
FVj
qUEFAl+Hgr0FCQXZqtgACgkQHH5tPFVjqUEnEwv9Ea+syu+U72SeNc3BQ3Gm6llARyQm7gz2G=
ZBa
k/epzD+3TFNKFLLh9AyBOM+wWRpGfKh1X+s9GLdSQISEA06bsW4d1KfHqEg0HTRw4p9SRwOWH=
vy1
L6maA1VHRQCW0/FN/7kYDrUH3bigISTkJJpmq8j4YOH66HVEbFqBO31ycYUGGt/Bazhe7rOhA=
xZu
GYzcVJQdSE020vjbqM5l34HfiDubuUNRhHMIaWa5IYYIyq33STbZu5Fln/5zoGN8+Ae4wNNzz=
fOy
WCKUzqybgbDxPWCnX2tgDEDlCt0X5X3PcItVeUpQCecDRut4eGEzOkkdNo2EM9UpBjGfei+GD=
8vr
z9apxvQ+nKYIOi4FM8GkXrsag7gvIdEcGzWcokhmdaFqWqweQALMUhhA86TckOwaouKkwk3Cw=
nHt
qdWryXmpvkbJxWRVrZOGgSfG+/QIku0oNY5XKRbdXURp1dPshT490JLUzFbM+OcF++HyMZ70q=
j/k
64f6idz5w6TvK0TCKe/M
=3Dj9z0
-----END PGP PUBLIC KEY BLOCK-----

--------------8D9D547E804CC8A49BF70E54--

--XWwnusC4nxhk2LRvLCC6Skcb8YiKQ4Lu0--

--zUh80el73HdgHOoDVnJsTtQZDI9bELswe
Content-Type: application/pgp-signature; name="OpenPGP_signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="OpenPGP_signature"

-----BEGIN PGP SIGNATURE-----

wsD5BAABCAAjFiEE3CZFSvtx0Y6rutc9HH5tPFVjqUEFAl+QotYFAwAAAAAACgkQHH5tPFVjqUF4
xgv+MrdQ07MfCVU93ptZg+S+OOkQ1AcZxGFdiivs10KkNGtLm9s+w/iEUAySSWbtKjbLV6O3AYvC
QFKsFRFr17Ekz6mSPj99zifFMBvTOIAev/d08dmX0kGd6YlP+GyZL3Wqcgy1T1H3obgOmToDtk7R
V52Ki1aTJYH/Z7v6PsQRWn8emfH/yGYplBhzZy2XjO6UIar9T8wtAJOd6+Ii2sfyGyEPjzGckLaR
JZOxQ4jpJJUszz2WsvLNwtKoqwV15Eg3oxZzHWYE8P63xXoE4G762604SIqv/ggyQZTt/Es6Scun
A1BJflFm+cHzQTW2yQfwCCvlzEZNiNwXfwGfV99K5iG1eW3lv7sMLJnitwTidNIlD5LTNdeUnTXj
XJvkEQsyTUI4qbzzJbUNYz7lraizC2nPiwFzLv692mS0urtD3mUhOBA9hZwk3l/20GsGia0FeUIS
E1d8Vh/Ey7IJ8TXbfFrdv5ZP3HqMK0089SooZwx/GN2QIaOYQXsS0u7IFNhU
=q5Sf
-----END PGP SIGNATURE-----

--zUh80el73HdgHOoDVnJsTtQZDI9bELswe--
", - "historyId": "1206346", - "internalDate": "1603314389000" - } -} \ No newline at end of file diff --git a/test/source/mock/google/exported-messages/message-export-1754cfd1b2f1d6e5.json b/test/source/mock/google/exported-messages/message-export-1754cfd1b2f1d6e5.json deleted file mode 100644 index 37d81e235a4..00000000000 --- a/test/source/mock/google/exported-messages/message-export-1754cfd1b2f1d6e5.json +++ /dev/null @@ -1,211 +0,0 @@ -{ - "acctEmail": "flowcrypt.compatibility@gmail.com", - "full": { - "id": "1754cfd1b2f1d6e5", - "threadId": "1754cfd1b2f1d6e5", - "labelIds": [ - "Label_6255111949068864933", - "Label_7", - "Label_9", - "CATEGORY_PERSONAL", - "Label_4", - "INBOX" - ], - "snippet": "1234", - "payload": { - "partId": "", - "mimeType": "multipart/signed", - "filename": "", - "headers": [ - { - "name": "X-Gm-Message-State", - "value": "AOAM531rM4nAzGrXic86hgGRR70gbKiyBvs3SRmMh9kgVH8yJ1s0GvC+ TRE++jlINOPVOuuf+S0qf8T0f7HFESDK5k6CFQOVwoWzicXfXCo+aVjCup7J5DaeH2TLBSp5rsJ hSbi5GkVHnqAHw7bnoSeCZ+whg45LZ2A71oJ0Vg8Faxesbx6gSyiUl/prVCA02n2wAl7o8WQaFJ OvPH9H8c4Y6jDGuz7DmsvYOYKz" - }, - { - "name": "To", - "value": "flowcrypt.compatibility@gmail.com" - }, - { - "name": "From", - "value": "dhartley@verdoncollege.school.nz" - }, - { - "name": "Subject", - "value": "sig from new Thunderbird v78 not recognized, html" - }, - { - "name": "Autocrypt", - "value": "addr=dhartley@verdoncollege.school.nz; keydata= xsDNBF1wPuQBDAChI2DAh6K/bmwH5hfCJwkxewFUfWaAxzAIWyXe/w5wjFJBpu74MJvqO+8T WkyVMVXQqOm5dH36YkMCVcNqoGgC0mp/JZUmVIdPqKH1QYK988rRKP2HIl3CNgbyiHLjyKVf +RW4OKxeQLM1MJpQ/39V5ymWftPszz1j+LO2FKpfAsUapAImZNwhXSKZcrxvUEnoayQg17HA 9ThXadQ/UU8FDlibKQoBUvhfyig7Gf4s/Ol3p76a57M/ZClgS5hPoM77oPaC8n8QVYA/t5Bu YSd1n3CE67EU6IzJr3A83c34EZO/wHu6gwCCllouWNtU7fDvKJEbcgbTfb0o7qo224lAUwDq VB2zCVQTEKXV20h/qvujNnLxo2DjcBg+Fbd7GrZEEqK5+psc3U3ljD9mToJoM4lG7Ixy1Ev2 Sx8xfUFtL9PIktl8OwA6U/1XZvauoH5upBain8bc+0ai8axXL2/O0rAKX2DlPfHD9LOim74P NqliLUtTr4TlByMZ5IuYCjMAEQEAAc0vRGF2ZSBIYXJ0bGV5IDxkaGFydGxleUB2ZXJkb25j b2xsZWdlLnNjaG9vbC5uej7CwRQEEwEIAD4CGwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AW IQTcJkVK+3HRjqu61z0cfm08VWOpQQUCX4eCvAUJBdmq2AAKCRAcfm08VWOpQcRiC/sFhdZh FB5gQbHcs8F9+aPi8gfwu3atUFwadN6AShSa6K3pnd7V1xYlDFwRPKrAEWBBYeX9dsAWl9gx PNuCo5utRkgPR8ZSO4ceXR4ZgKTvF3k6UzzGx8HFC+MJCvdiTTPnMayUOOX/f4+79uWt+fRK SBtckwud7+Dt/88ux8j8TpvBZMhciJ8Zwr9ouVWXfgg2/RMzZNTophQHKdUOhPQ/DBzVaLxV f3QEqKPs3lhrS08ZOMpubV938KdCLgqeqeaClEtURUZEs/5Ixg7lb+SbbOo12K/lRnYu4U1p WcHVueccqkTxDZxgCDBtqN4sBMnmKtSuYAcbyy4SyWGA6Z0KIP87FxMi5Yf+04R+hEG9KWD3 fuk1JIIUeNVoiAn4aERjrIUN5q4NJAyY0d6KXmpyJxOK2Dj3ZyQglNrvXitchXJJqMfdGexB 03lzDYxyHSlu+WBp2exaSOyQIKSniQ1BhAHyp4VQBkLKKVAEV+fVeTdFxarxVH5Hs8tP7Yag JSTOwM0EXXA+5QEMAOoo+4IBfjaiZjEe4azMFDrVwvVkeEw3soMrBjAOjlySQCpE/q0qDId5 k0eSAAhttans3Us166xKW2QMfd2ojFBTLi06Zpha1jDo5Aj2kWDEGT5y+0HBRVY0NmPtvBA1 igRfF1ZSUsqIhO/dSqirdnSh08z5bZnEEyIWObBhC8leE2BAdXWgG1Wk0/02DkrA9N16lZ1/ wVGtYU09rnZBJpeDOFM0dCh7uhfA5LGzmxKzn25/rDSFUrUcmYfawAn13OS02COIlstl6lUg VJ6xtBxOaT4NLka4hkqyzpamCF6okeZQI6tHEmlm5FXuhCb/Lz/n9k9Pk793Ior0PP+xMPO8 gbWlFvPfl/MRKc3Hy2SIZw9RQ7A/33V/ozXVzg1A4drrXKkKec8JznNTkoRI6fSx/TGVpNh1 +5SOHFGgKtZ+RA1BD1vmsMz/5xmdoWGisoR0/hEtdjudxpK1Zm0r1nvNpFZmKRZB26ImfMC4 kbRVXXX5LxE6yIyJ3urFn2+6PwARAQABwsD8BBgBCAAmAhsMFiEE3CZFSvtx0Y6rutc9HH5t PFVjqUEFAl+Hgr0FCQXZqtgACgkQHH5tPFVjqUEnEwv9Ea+syu+U72SeNc3BQ3Gm6llARyQm 7gz2GZBak/epzD+3TFNKFLLh9AyBOM+wWRpGfKh1X+s9GLdSQISEA06bsW4d1KfHqEg0HTRw 4p9SRwOWHvy1L6maA1VHRQCW0/FN/7kYDrUH3bigISTkJJpmq8j4YOH66HVEbFqBO31ycYUG Gt/Bazhe7rOhAxZuGYzcVJQdSE020vjbqM5l34HfiDubuUNRhHMIaWa5IYYIyq33STbZu5Fl n/5zoGN8+Ae4wNNzzfOyWCKUzqybgbDxPWCnX2tgDEDlCt0X5X3PcItVeUpQCecDRut4eGEz OkkdNo2EM9UpBjGfei+GD8vrz9apxvQ+nKYIOi4FM8GkXrsag7gvIdEcGzWcokhmdaFqWqwe QALMUhhA86TckOwaouKkwk3CwnHtqdWryXmpvkbJxWRVrZOGgSfG+/QIku0oNY5XKRbdXURp 1dPshT490JLUzFbM+OcF++HyMZ70qj/k64f6idz5w6TvK0TCKe/M" - }, - { - "name": "Date", - "value": "Thu, 22 Oct 2020 10:07:30 +1300" - }, - { - "name": "User-Agent", - "value": "Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.3.3" - }, - { - "name": "MIME-Version", - "value": "1.0" - }, - { - "name": "Content-Type", - "value": "multipart/signed; micalg=pgp-sha256; protocol=\"application/pgp-signature\"; boundary=\"LLgksp3P0YEtQwjYvuvakoXawSV5875WB\"" - } - ], - "body": { - "size": 0 - }, - "parts": [ - { - "partId": "0", - "mimeType": "multipart/mixed", - "filename": "", - "headers": [ - { - "name": "Content-Type", - "value": "multipart/mixed; boundary=\"vv8xtFOOk2SxbnIpwvxkobfET7PglPfc3\"; protected-headers=\"v1\"" - }, - { - "name": "From", - "value": "Dave Hartley " - }, - { - "name": "To", - "value": "flowcrypt.compatibility@gmail.com" - }, - { - "name": "Message-ID", - "value": "<4a694f09-0ea9-461d-f352-db93f7381f29@verdoncollege.school.nz>" - }, - { - "name": "Subject", - "value": "sig from new Thunderbird v78 not recognized, html" - } - ], - "body": { - "size": 0 - }, - "parts": [ - { - "partId": "0.0", - "mimeType": "multipart/mixed", - "filename": "", - "headers": [ - { - "name": "Content-Type", - "value": "multipart/mixed; boundary=\"------------F36435F7FA51E9E42E13F8F3\"" - }, - { - "name": "Content-Language", - "value": "en-NZ" - } - ], - "body": { - "size": 0 - }, - "parts": [ - { - "partId": "0.0.0", - "mimeType": "text/html", - "filename": "", - "headers": [ - { - "name": "Content-Type", - "value": "text/html; charset=utf-8" - }, - { - "name": "Content-Transfer-Encoding", - "value": "quoted-printable" - } - ], - "body": { - "size": 144, - "data": "PGh0bWw-DQogIDxoZWFkPg0KDQogICAgPG1ldGEgaHR0cC1lcXVpdj0iY29udGVudC10eXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7IGNoYXJzZXQ9VVRGLTgiPg0KICA8L2hlYWQ-DQogIDxib2R5Pg0KICAgIDEyMzQNCiAgPC9ib2R5Pg0KPC9odG1sPg0K" - } - }, - { - "partId": "0.0.1", - "mimeType": "application/pgp-keys", - "filename": "OpenPGP_0x1C7E6D3C5563A941.asc", - "headers": [ - { - "name": "Content-Type", - "value": "application/pgp-keys; name=\"OpenPGP_0x1C7E6D3C5563A941.asc\"" - }, - { - "name": "Content-Transfer-Encoding", - "value": "quoted-printable" - }, - { - "name": "Content-Disposition", - "value": "attachment; filename=\"OpenPGP_0x1C7E6D3C5563A941.asc\"" - } - ], - "body": { - "attachmentId": "ANGjdJ98dLnf8-MM_CprvW1HRrALLB4B1vrufS-w_yxsc1U_An0r0qJgdXjFEZkKKh5_j_TGMM6hQ2dX8Wq7ztAJ0zxWx1h6LwVQ8D-Ve2wPsz3JJS3cVg4BxbOHDynlATGrvTHWSSczfcSV31JB3o7_Hm2bgJdrhOVyAyKQTvlKk2a7SExx3gQYcEoGQ2iBS7qXhCZesUfd_Cse-XDmHSgJiqgSlaKPVPayfKlI0W7B5YH9-DOXE5-TQFw5-Vu4VAO9pzGzhH-QODyNt6CoStib3QnaOh7KHOPqO3n1hj6heIPBa4lGiN_E8xT6-meBXrEfhL3moestUdU34TE1-2YghkKA-UuC8E4WdysKmfHfYmC_uwfR7DNwz4xLBCA", - "size": 3147 - } - } - ] - } - ] - }, - { - "partId": "1", - "mimeType": "application/pgp-signature", - "filename": "OpenPGP_signature", - "headers": [ - { - "name": "Content-Type", - "value": "application/pgp-signature; name=\"OpenPGP_signature.asc\"" - }, - { - "name": "Content-Description", - "value": "OpenPGP digital signature" - }, - { - "name": "Content-Disposition", - "value": "attachment; filename=\"OpenPGP_signature\"" - } - ], - "body": { - "attachmentId": "ANGjdJ8FiIGNSkBlPAvyT91HLJdwguQUROftsSrJDR6AOAzF3nobr7knygwgNT_dNId--icULb1T57Bc4EJ0fg1_uaYEjZ-LcsnVG2byxiy8JmM5_8NozU32t8oaTcvEOIX6JbhekbknemZl9ETfmdCHtJi5-hgQClTRiIgniSB-0M4BBCacf4a01Bu834aNbAfCGFuB4GVvwgvdBzRd3SE56C8guEF74TEvUXY4Yh54Vbi_bbNLdvJl6tg0NM2JpgO_23HYf6IWVf6Sg6gkaBp18to-FuRU6gcVCgNF6PX26MQ27uySjvoAziaZFHpnXIA-ucd1Ge26HJN_6-46MumoXYPTdjetUlcb12CDdDqfnMYdxB5wbmNO665XlNg", - "size": 677 - } - } - ] - }, - "sizeEstimate": 13258, - "historyId": "1206137", - "internalDate": "1603314450000" - }, - "attachments": { - "ANGjdJ98dLnf8-MM_CprvW1HRrALLB4B1vrufS-w_yxsc1U_An0r0qJgdXjFEZkKKh5_j_TGMM6hQ2dX8Wq7ztAJ0zxWx1h6LwVQ8D-Ve2wPsz3JJS3cVg4BxbOHDynlATGrvTHWSSczfcSV31JB3o7_Hm2bgJdrhOVyAyKQTvlKk2a7SExx3gQYcEoGQ2iBS7qXhCZesUfd_Cse-XDmHSgJiqgSlaKPVPayfKlI0W7B5YH9-DOXE5-TQFw5-Vu4VAO9pzGzhH-QODyNt6CoStib3QnaOh7KHOPqO3n1hj6heIPBa4lGiN_E8xT6-meBXrEfhL3moestUdU34TE1-2YghkKA-UuC8E4WdysKmfHfYmC_uwfR7DNwz4xLBCA": { - "data": "LS0tLS1CRUdJTiBQR1AgUFVCTElDIEtFWSBCTE9DSy0tLS0tDQoNCnhzRE5CRjF3UHVRQkRBQ2hJMkRBaDZLL2Jtd0g1aGZDSndreGV3RlVmV2FBeHpBSVd5WGUvdzV3akZKQnB1NzRNSnZxTys4VFdreVYNCk1WWFFxT201ZEgzNllrTUNWY05xb0dnQzBtcC9KWlVtVklkUHFLSDFRWUs5ODhyUktQMkhJbDNDTmdieWlITGp5S1ZmK1JXNE9LeGUNClFMTTFNSnBRLzM5VjV5bVdmdFBzenoxaitMTzJGS3BmQXNVYXBBSW1aTndoWFNLWmNyeHZVRW5vYXlRZzE3SEE5VGhYYWRRL1VVOEYNCkRsaWJLUW9CVXZoZnlpZzdHZjRzL09sM3A3NmE1N00vWkNsZ1M1aFBvTTc3b1BhQzhuOFFWWUEvdDVCdVlTZDFuM0NFNjdFVTZJekoNCnIzQTgzYzM0RVpPL3dIdTZnd0NDbGxvdVdOdFU3ZkR2S0pFYmNnYlRmYjBvN3FvMjI0bEFVd0RxVkIyekNWUVRFS1hWMjBoL3F2dWoNCk5uTHhvMkRqY0JnK0ZiZDdHclpFRXFLNStwc2MzVTNsakQ5bVRvSm9NNGxHN0l4eTFFdjJTeDh4ZlVGdEw5UElrdGw4T3dBNlUvMVgNClp2YXVvSDV1cEJhaW44YmMrMGFpOGF4WEwyL08wckFLWDJEbFBmSEQ5TE9pbTc0UE5xbGlMVXRUcjRUbEJ5TVo1SXVZQ2pNQUVRRUENCkFjMHZSR0YyWlNCSVlYSjBiR1Y1SUR4a2FHRnlkR3hsZVVCMlpYSmtiMjVqYjJ4c1pXZGxMbk5qYUc5dmJDNXVlajdDd1JRRUV3RUkNCkFENENHd01GQ3drSUJ3SUdGUW9KQ0FzQ0JCWUNBd0VDSGdFQ0Y0QVdJUVRjSmtWSyszSFJqcXU2MXowY2ZtMDhWV09wUVFVQ1g0ZUMNCnZBVUpCZG1xMkFBS0NSQWNmbTA4VldPcFFjUmlDL3NGaGRaaEZCNWdRYkhjczhGOSthUGk4Z2Z3dTNhdFVGd2FkTjZBU2hTYTZLM3ANCm5kN1YxeFlsREZ3UlBLckFFV0JCWWVYOWRzQVdsOWd4UE51Q281dXRSa2dQUjhaU080Y2VYUjRaZ0tUdkYzazZVenpHeDhIRkMrTUoNCkN2ZGlUVFBuTWF5VU9PWC9mNCs3OXVXdCtmUktTQnRja3d1ZDcrRHQvODh1eDhqOFRwdkJaTWhjaUo4WndyOW91VldYZmdnMi9STXoNClpOVG9waFFIS2RVT2hQUS9EQnpWYUx4VmYzUUVxS1BzM2xoclMwOFpPTXB1YlY5MzhLZENMZ3FlcWVhQ2xFdFVSVVpFcy81SXhnN2wNCmIrU2JiT28xMksvbFJuWXU0VTFwV2NIVnVlY2Nxa1R4RFp4Z0NEQnRxTjRzQk1ubUt0U3VZQWNieXk0U3lXR0E2WjBLSVA4N0Z4TWkNCjVZZiswNFIraEVHOUtXRDNmdWsxSklJVWVOVm9pQW40YUVSanJJVU41cTROSkF5WTBkNktYbXB5SnhPSzJEajNaeVFnbE5ydlhpdGMNCmhYSkpxTWZkR2V4QjAzbHpEWXh5SFNsdStXQnAyZXhhU095UUlLU25pUTFCaEFIeXA0VlFCa0xLS1ZBRVYrZlZlVGRGeGFyeFZINUgNCnM4dFA3WWFnSlNUQ3dSUUVFd0VJQUQ0V0lRVGNKa1ZLKzNIUmpxdTYxejBjZm0wOFZXT3BRUVVDWFhBKzVRSWJBd1VKQWVFemdBVUwNCkNRZ0hBZ1lWQ2drSUN3SUVGZ0lEQVFJZUFRSVhnQUFLQ1JBY2ZtMDhWV09wUVEzMkMvNHAzaHNqZlRlQXpRUjBhSG9XR0tUUmNGb1kNCm5jOUlkWWpPNzhmbmFmZWhKSXQ1TExvTGZkK01TR1B6Njc4NWhtTmdyeWo2WHRFMWVJTU42cHZrSy9CeTZON1Y2T04xOWp6S3h2QXENCi8zZi9yUWNpZVRKbDV0dHRRUkdXc3VGWCtEZHYraXdmbEcrOVpTTTNFOWxaTDJwbzNFdzZLaG1pd0graSsrQ1JGN3V0UlJyUGorRHINCm1NQmdYajB5WXloUm1oZVVta1BqN282S2ZNK2NuL3JRUFZTSVdXSHJCSW1BbEVna05sOWZJOS9TTWhvZ052NlpzbUtYN2FlTko5eHgNClhlNnFBVzI3NnJqZEsvM2VoMHJieHdja0lZMkJaWVJlTzczZkxmRnpYckYxa0gwZ0kvVnErQWFhaDkvYzU2WkJNK1ZTRVBhK3pveFANCmR5eWMzenVsN1ExNlZMV0FnblUzUElCeWNFcS9naWxLQnpSM0dHTDJWakxValU0d0F4UTdKd1djMDdvbkttL1dTUnJmY2lnNEdDbHgNClBNb3BPS1FwNWd4MEdPSUVDTWFxRHFvV3pUQWpLK1BTR0pLZUx1eTNydGhyN09rS3JIc2ZhV1BQZ0RwZzVOSlM0MG52VVF4Z3pwQnINCmFRZ2pTS0FjU1NkVlo4bm5WVnozQkdhZm1aT0FEL3pPd00wRVhYQSs1UUVNQU9vbys0SUJmamFpWmpFZTRhek1GRHJWd3ZWa2VFdzMNCnNvTXJCakFPamx5U1FDcEUvcTBxRElkNWswZVNBQWh0dGFuczNVczE2NnhLVzJRTWZkMm9qRkJUTGkwNlpwaGExakRvNUFqMmtXREUNCkdUNXkrMEhCUlZZME5tUHR2QkExaWdSZkYxWlNVc3FJaE8vZFNxaXJkblNoMDh6NWJabkVFeUlXT2JCaEM4bGVFMkJBZFhXZ0cxV2sNCjAvMDJEa3JBOU4xNmxaMS93Vkd0WVUwOXJuWkJKcGVET0ZNMGRDaDd1aGZBNUxHem14S3puMjUvckRTRlVyVWNtWWZhd0FuMTNPUzANCjJDT0lsc3RsNmxVZ1ZKNnh0QnhPYVQ0TkxrYTRoa3F5enBhbUNGNm9rZVpRSTZ0SEVtbG01Rlh1aENiL0x6L245azlQazc5M0lvcjANClBQK3hNUE84Z2JXbEZ2UGZsL01SS2MzSHkyU0ladzlSUTdBLzMzVi9velhWemcxQTRkcnJYS2tLZWM4SnpuTlRrb1JJNmZTeC9UR1YNCnBOaDErNVNPSEZHZ0t0WitSQTFCRDF2bXNNei81eG1kb1dHaXNvUjAvaEV0ZGp1ZHhwSzFabTByMW52TnBGWm1LUlpCMjZJbWZNQzQNCmtiUlZYWFg1THhFNnlJeUozdXJGbjIrNlB3QVJBUUFCd3NEOEJCZ0JDQUFtQWhzTUZpRUUzQ1pGU3Z0eDBZNnJ1dGM5SEg1dFBGVmoNCnFVRUZBbCtIZ3IwRkNRWFpxdGdBQ2drUUhINXRQRlZqcVVFbkV3djlFYStzeXUrVTcyU2VOYzNCUTNHbTZsbEFSeVFtN2d6MkdaQmENCmsvZXB6RCszVEZOS0ZMTGg5QXlCT00rd1dScEdmS2gxWCtzOUdMZFNRSVNFQTA2YnNXNGQxS2ZIcUVnMEhUUnc0cDlTUndPV0h2eTENCkw2bWFBMVZIUlFDVzAvRk4vN2tZRHJVSDNiaWdJU1RrSkpwbXE4ajRZT0g2NkhWRWJGcUJPMzF5Y1lVR0d0L0JhemhlN3JPaEF4WnUNCkdZemNWSlFkU0UwMjB2amJxTTVsMzRIZmlEdWJ1VU5SaEhNSWFXYTVJWVlJeXEzM1NUYlp1NUZsbi81em9HTjgrQWU0d05OenpmT3kNCldDS1V6cXliZ2JEeFBXQ25YMnRnREVEbEN0MFg1WDNQY0l0VmVVcFFDZWNEUnV0NGVHRXpPa2tkTm8yRU05VXBCakdmZWkrR0Q4dnINCno5YXB4dlErbktZSU9pNEZNOEdrWHJzYWc3Z3ZJZEVjR3pXY29raG1kYUZxV3F3ZVFBTE1VaGhBODZUY2tPd2FvdUtrd2szQ3duSHQNCnFkV3J5WG1wdmtiSnhXUlZyWk9HZ1NmRysvUUlrdTBvTlk1WEtSYmRYVVJwMWRQc2hUNDkwSkxVekZiTStPY0YrK0h5TVo3MHFqL2sNCjY0ZjZpZHo1dzZUdkswVENLZS9NDQo9ajl6MA0KLS0tLS1FTkQgUEdQIFBVQkxJQyBLRVkgQkxPQ0stLS0tLQ0K", - "size": 3147 - }, - "ANGjdJ8FiIGNSkBlPAvyT91HLJdwguQUROftsSrJDR6AOAzF3nobr7knygwgNT_dNId--icULb1T57Bc4EJ0fg1_uaYEjZ-LcsnVG2byxiy8JmM5_8NozU32t8oaTcvEOIX6JbhekbknemZl9ETfmdCHtJi5-hgQClTRiIgniSB-0M4BBCacf4a01Bu834aNbAfCGFuB4GVvwgvdBzRd3SE56C8guEF74TEvUXY4Yh54Vbi_bbNLdvJl6tg0NM2JpgO_23HYf6IWVf6Sg6gkaBp18to-FuRU6gcVCgNF6PX26MQ27uySjvoAziaZFHpnXIA-ucd1Ge26HJN_6-46MumoXYPTdjetUlcb12CDdDqfnMYdxB5wbmNO665XlNg": { - "data": "LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0NCg0Kd3NENUJBQUJDQUFqRmlFRTNDWkZTdnR4MFk2cnV0YzlISDV0UEZWanFVRUZBbCtRb3hJRkF3QUFBQUFBQ2drUUhINXRQRlZqcVVIZQ0KOFF2L1VGdzJkalNqMEpNdVRjOGt2dEkvMkJkL09FU1ZTZW1Sb09JNkVJczZ3U1pVVTdUVCtBdzIzZnJuaXdxck1YQkd4OHN3em5mYQ0KbHBXb0ZtNFZFbFZDeTlTaE9SSWNKKzNBTkVBZUo1aytnNzZZUjRQMVlCZUVJT3hzc3ZudGU0TDZtbG1hQk5hVXUzZUZHSjVnbHRkQg0KQWk1dmtPTW1lMy9taTNLaU9JbHJxdGcvZG8rZTAzOW9QNUpSR1RHZGVlTzQ0bEh1SU5XL1Y5cmlhTEppL2ZjV0hsaUh2NElLSGxQWg0KSitUUGpRQWs4NHhnd3ZKc2ZwRGhNTVV6b210MTR5cjJHUExOUkorTTdVdEdHRDNMdWRUcVNwNnI2MGp0Vi9DWXo5STh2ME1pTnZabw0KYnFrUDd4dVFCSUdLaVpVdWluTCthTUQvd2hwWWtxK3l0N1ZORGVlVElrSm81VGVZcUJqYTcyaVU2bkNrMVJTVHUrSWd3M0tmaEppcQ0KZitMbmM4Z0N1dG91Q0ZEa0Vpc3cybUd3NHRvY1E3dkRGOFR4alpyZFQ2NHlPdmhGR0s0ek5VcVNQZ0FTUlpwd0pxSy9uUzRTbnhXMw0KdG5pcm16d1RFUFdpL2pnTytNa0o0ejFNN3BlTW5zbEJoeXRXdk00alh6RTZtMmRaOW4yL0t4OE9PMW1IDQo9cFJ5dg0KLS0tLS1FTkQgUEdQIFNJR05BVFVSRS0tLS0tDQo", - "size": 677 - } - }, - "raw": { - "id": "1754cfd1b2f1d6e5", - "threadId": "1754cfd1b2f1d6e5", - "labelIds": [ - "Label_6255111949068864933", - "Label_7", - "Label_9", - "CATEGORY_PERSONAL", - "Label_4", - "INBOX" - ], - "snippet": "1234", - "sizeEstimate": 13258, - "raw": "Delivered-To: flowcrypt.compatibility@gmail.com
Received: by 2002:aed:246a:0:0:0:0:0 with SMTP id s39csp5748711qtc;
        Wed, 21 Oct 2020 14:07:37 -0700 (PDT)
X-Received: by 2002:a17:90b:4617:: with SMTP id ia23mr5211389pjb.120.1603314457346;
        Wed, 21 Oct 2020 14:07:37 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1603314457; cv=none;
        d=google.com; s=arc-20160816;
        b=gpm1K04m1+K9Xmdfe9FyqDq1SjAidkGNmMUWpYzsgX2iknbOAc8I8K/kKzRkmYu0fW
         NIFSofdKAJMsAzUsyNGXHz2uuEJ3fkpIypFK8qjR6iv98nSOr+eFq4C9r2GtSQEGEC+S
         1KEU01cV9hgrFXE5NekFoncaO5G1ImJ1g3xKnA98ImOe/3LU1OuR436aVgXD3PnBlVA5
         15GaHKPFmWMOzQ5p0wiPTWuX5/gk22b775aUy3ry0QVIZCH+WcCKnRA0RhNNMyEHR/BK
         qQcdISaFuIZO4nkS2QiNLsDUbV5Lt6PHJLHxMzt2wxX3F3sXYDcswqLezyoatmpUFqeh
         hBnw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
        h=mime-version:user-agent:date:message-id:autocrypt:subject:from:to
         :dkim-signature;
        bh=IURTjIXkumaERvck5xqCWjXKdqf+tb9zckLJgmK7w4U=;
        b=bk42sYw3tsepydSsreWPX1Ntkv3nfiLUvmnNQHn6UqFy7cLN5GE+kBOZci+X60VWfV
         X0pma8iqLdz/5F1gtDVTDHSp4nzehN0wcvPN77dMdFovUftEyt99BZkQItdJirq98EFs
         db4hVAkv78pbQ71X+HD9tC6TOffhmHp3awb97eWK3n2iAA7dvQygIjR35pNffOmcQO0G
         3KtmFRxRoRdxdt2N4IzROg/5HxuLbGWlgQxgzgisx06PVoAdp/2cjr7lu+PJzQMKI8IK
         JHAsiMARGcQ4N08aSkQ387Tp+QIBv4zG/v9M1MM63hIt8uUk1P2+RQ2LCWKmh23T5g9T
         C/oQ==
ARC-Authentication-Results: i=1; mx.google.com;
       dkim=pass header.i=@verdoncollege-school-nz.20150623.gappssmtp.com header.s=20150623 header.b=kvK9rtAO;
       spf=pass (google.com: domain of dhartley@verdoncollege.school.nz designates 209.85.220.41 as permitted sender) smtp.mailfrom=dhartley@verdoncollege.school.nz
Return-Path: <dhartley@verdoncollege.school.nz>
Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41])
        by mx.google.com with SMTPS id h6sor1009265pgi.60.2020.10.21.14.07.37
        for <flowcrypt.compatibility@gmail.com>
        (Google Transport Security);
        Wed, 21 Oct 2020 14:07:37 -0700 (PDT)
Received-SPF: pass (google.com: domain of dhartley@verdoncollege.school.nz designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41;
Authentication-Results: mx.google.com;
       dkim=pass header.i=@verdoncollege-school-nz.20150623.gappssmtp.com header.s=20150623 header.b=kvK9rtAO;
       spf=pass (google.com: domain of dhartley@verdoncollege.school.nz designates 209.85.220.41 as permitted sender) smtp.mailfrom=dhartley@verdoncollege.school.nz
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=verdoncollege-school-nz.20150623.gappssmtp.com; s=20150623;
        h=to:from:subject:autocrypt:message-id:date:user-agent:mime-version;
        bh=IURTjIXkumaERvck5xqCWjXKdqf+tb9zckLJgmK7w4U=;
        b=kvK9rtAOB073vcLCNp3fJUPYWEjYIt8+NOf712mYcvAAwlvOjf+3wJV7nuV1YzjchQ
         Gu0fQduTW0oORmBOiLtQw2DvKY7XLZQwjCKwgOh7gYP3xkr/W7U8r7Hnj4wQ1lF6jaRr
         h0Cv1AkMia2Z0JfC/+tzWSt+kDqGYEvyeAKe/GjITNPcYlYJYA1/PrGX/Mx3enki6cKI
         KVhNB5gsn/bp0zmEWO8YXLF62UOVHwvQ2JsgFGeWKGYRSIqMK5t7EF26HLjKNXm4rSYh
         lo72XXEReDJ567Euyck14F7Tpwf6m9jw67pDvQN7mX90ze01NhwPrqeY65DvDiLdO9TM
         eU4w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:to:from:subject:autocrypt:message-id:date
         :user-agent:mime-version;
        bh=IURTjIXkumaERvck5xqCWjXKdqf+tb9zckLJgmK7w4U=;
        b=J9JqAjo9qlwxEOMSm36T5N4IwCDBcLAf0/sIdAew+nKUGIVr8Ur2HxvmsjGUBW0g8B
         9x07S1O9qhnfSZfHgD9gpSWnnAqeAiJTLXiraj/DDVMm/Feu/rZMMx1l5roHoEGF265s
         oYAn5c7vTctLKhdGVmvWll9cS10eR+EOuV/7iPCuUOCLaU+ZvZ/fvXAtZBq8BlTGhhBG
         gPOyI7XzCvwFXMpUNZ6Nikq6YEhWx/EDIZgFagiFpG3RUVJPUMTLukzRIypmIpOKc+Iu
         jNgVQGXbJ81/C3x04Frx9FZ8hwRFbY1lG1eXDz6j0Rvip7LiTjSc4dUhLdQxr3NSMHSi
         Eu/Q==
X-Gm-Message-State: AOAM531rM4nAzGrXic86hgGRR70gbKiyBvs3SRmMh9kgVH8yJ1s0GvC+
	TRE++jlINOPVOuuf+S0qf8T0f7HFESDK5k6CFQOVwoWzicXfXCo+aVjCup7J5DaeH2TLBSp5rsJ
	hSbi5GkVHnqAHw7bnoSeCZ+whg45LZ2A71oJ0Vg8Faxesbx6gSyiUl/prVCA02n2wAl7o8WQaFJ
	OvPH9H8c4Y6jDGuz7DmsvYOYKz
X-Google-Smtp-Source: ABdhPJzN0vesoFUrlfuatZ4CCmGPgx8eCFuXjJf4gACrkyxGGC0HNeKtqylMFnKucSPGFO+3dw054A==
X-Received: by 2002:a63:5d43:: with SMTP id o3mr4824063pgm.89.1603314456667;
        Wed, 21 Oct 2020 14:07:36 -0700 (PDT)
Return-Path: <dhartley@verdoncollege.school.nz>
Received: from [10.0.6.9] ([210.55.79.13])
        by smtp.gmail.com with ESMTPSA id u15sm3131603pfl.215.2020.10.21.14.07.33
        for <flowcrypt.compatibility@gmail.com>
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Wed, 21 Oct 2020 14:07:36 -0700 (PDT)
To: flowcrypt.compatibility@gmail.com
From: Dave Hartley <dhartley@verdoncollege.school.nz>
Subject: sig from new Thunderbird v78 not recognized, html
Autocrypt: addr=dhartley@verdoncollege.school.nz; keydata=
 xsDNBF1wPuQBDAChI2DAh6K/bmwH5hfCJwkxewFUfWaAxzAIWyXe/w5wjFJBpu74MJvqO+8T
 WkyVMVXQqOm5dH36YkMCVcNqoGgC0mp/JZUmVIdPqKH1QYK988rRKP2HIl3CNgbyiHLjyKVf
 +RW4OKxeQLM1MJpQ/39V5ymWftPszz1j+LO2FKpfAsUapAImZNwhXSKZcrxvUEnoayQg17HA
 9ThXadQ/UU8FDlibKQoBUvhfyig7Gf4s/Ol3p76a57M/ZClgS5hPoM77oPaC8n8QVYA/t5Bu
 YSd1n3CE67EU6IzJr3A83c34EZO/wHu6gwCCllouWNtU7fDvKJEbcgbTfb0o7qo224lAUwDq
 VB2zCVQTEKXV20h/qvujNnLxo2DjcBg+Fbd7GrZEEqK5+psc3U3ljD9mToJoM4lG7Ixy1Ev2
 Sx8xfUFtL9PIktl8OwA6U/1XZvauoH5upBain8bc+0ai8axXL2/O0rAKX2DlPfHD9LOim74P
 NqliLUtTr4TlByMZ5IuYCjMAEQEAAc0vRGF2ZSBIYXJ0bGV5IDxkaGFydGxleUB2ZXJkb25j
 b2xsZWdlLnNjaG9vbC5uej7CwRQEEwEIAD4CGwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AW
 IQTcJkVK+3HRjqu61z0cfm08VWOpQQUCX4eCvAUJBdmq2AAKCRAcfm08VWOpQcRiC/sFhdZh
 FB5gQbHcs8F9+aPi8gfwu3atUFwadN6AShSa6K3pnd7V1xYlDFwRPKrAEWBBYeX9dsAWl9gx
 PNuCo5utRkgPR8ZSO4ceXR4ZgKTvF3k6UzzGx8HFC+MJCvdiTTPnMayUOOX/f4+79uWt+fRK
 SBtckwud7+Dt/88ux8j8TpvBZMhciJ8Zwr9ouVWXfgg2/RMzZNTophQHKdUOhPQ/DBzVaLxV
 f3QEqKPs3lhrS08ZOMpubV938KdCLgqeqeaClEtURUZEs/5Ixg7lb+SbbOo12K/lRnYu4U1p
 WcHVueccqkTxDZxgCDBtqN4sBMnmKtSuYAcbyy4SyWGA6Z0KIP87FxMi5Yf+04R+hEG9KWD3
 fuk1JIIUeNVoiAn4aERjrIUN5q4NJAyY0d6KXmpyJxOK2Dj3ZyQglNrvXitchXJJqMfdGexB
 03lzDYxyHSlu+WBp2exaSOyQIKSniQ1BhAHyp4VQBkLKKVAEV+fVeTdFxarxVH5Hs8tP7Yag
 JSTOwM0EXXA+5QEMAOoo+4IBfjaiZjEe4azMFDrVwvVkeEw3soMrBjAOjlySQCpE/q0qDId5
 k0eSAAhttans3Us166xKW2QMfd2ojFBTLi06Zpha1jDo5Aj2kWDEGT5y+0HBRVY0NmPtvBA1
 igRfF1ZSUsqIhO/dSqirdnSh08z5bZnEEyIWObBhC8leE2BAdXWgG1Wk0/02DkrA9N16lZ1/
 wVGtYU09rnZBJpeDOFM0dCh7uhfA5LGzmxKzn25/rDSFUrUcmYfawAn13OS02COIlstl6lUg
 VJ6xtBxOaT4NLka4hkqyzpamCF6okeZQI6tHEmlm5FXuhCb/Lz/n9k9Pk793Ior0PP+xMPO8
 gbWlFvPfl/MRKc3Hy2SIZw9RQ7A/33V/ozXVzg1A4drrXKkKec8JznNTkoRI6fSx/TGVpNh1
 +5SOHFGgKtZ+RA1BD1vmsMz/5xmdoWGisoR0/hEtdjudxpK1Zm0r1nvNpFZmKRZB26ImfMC4
 kbRVXXX5LxE6yIyJ3urFn2+6PwARAQABwsD8BBgBCAAmAhsMFiEE3CZFSvtx0Y6rutc9HH5t
 PFVjqUEFAl+Hgr0FCQXZqtgACgkQHH5tPFVjqUEnEwv9Ea+syu+U72SeNc3BQ3Gm6llARyQm
 7gz2GZBak/epzD+3TFNKFLLh9AyBOM+wWRpGfKh1X+s9GLdSQISEA06bsW4d1KfHqEg0HTRw
 4p9SRwOWHvy1L6maA1VHRQCW0/FN/7kYDrUH3bigISTkJJpmq8j4YOH66HVEbFqBO31ycYUG
 Gt/Bazhe7rOhAxZuGYzcVJQdSE020vjbqM5l34HfiDubuUNRhHMIaWa5IYYIyq33STbZu5Fl
 n/5zoGN8+Ae4wNNzzfOyWCKUzqybgbDxPWCnX2tgDEDlCt0X5X3PcItVeUpQCecDRut4eGEz
 OkkdNo2EM9UpBjGfei+GD8vrz9apxvQ+nKYIOi4FM8GkXrsag7gvIdEcGzWcokhmdaFqWqwe
 QALMUhhA86TckOwaouKkwk3CwnHtqdWryXmpvkbJxWRVrZOGgSfG+/QIku0oNY5XKRbdXURp
 1dPshT490JLUzFbM+OcF++HyMZ70qj/k64f6idz5w6TvK0TCKe/M
Message-ID: <4a694f09-0ea9-461d-f352-db93f7381f29@verdoncollege.school.nz>
Date: Thu, 22 Oct 2020 10:07:30 +1300
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.3.3
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 protocol="application/pgp-signature";
 boundary="LLgksp3P0YEtQwjYvuvakoXawSV5875WB"

This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
--LLgksp3P0YEtQwjYvuvakoXawSV5875WB
Content-Type: multipart/mixed; boundary="vv8xtFOOk2SxbnIpwvxkobfET7PglPfc3";
 protected-headers="v1"
From: Dave Hartley <dhartley@verdoncollege.school.nz>
To: flowcrypt.compatibility@gmail.com
Message-ID: <4a694f09-0ea9-461d-f352-db93f7381f29@verdoncollege.school.nz>
Subject: sig from new Thunderbird v78 not recognized, html

--vv8xtFOOk2SxbnIpwvxkobfET7PglPfc3
Content-Type: multipart/mixed;
 boundary="------------F36435F7FA51E9E42E13F8F3"
Content-Language: en-NZ

This is a multi-part message in MIME format.
--------------F36435F7FA51E9E42E13F8F3
Content-Type: text/html; charset=utf-8
Content-Transfer-Encoding: quoted-printable

<html>
  <head>

    <meta http-equiv=3D"content-type" content=3D"text/html; charset=3DUTF=
-8">
  </head>
  <body>
    1234
  </body>
</html>

--------------F36435F7FA51E9E42E13F8F3
Content-Type: application/pgp-keys;
 name="OpenPGP_0x1C7E6D3C5563A941.asc"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
 filename="OpenPGP_0x1C7E6D3C5563A941.asc"

-----BEGIN PGP PUBLIC KEY BLOCK-----

xsDNBF1wPuQBDAChI2DAh6K/bmwH5hfCJwkxewFUfWaAxzAIWyXe/w5wjFJBpu74MJvqO+8TW=
kyV
MVXQqOm5dH36YkMCVcNqoGgC0mp/JZUmVIdPqKH1QYK988rRKP2HIl3CNgbyiHLjyKVf+RW4O=
Kxe
QLM1MJpQ/39V5ymWftPszz1j+LO2FKpfAsUapAImZNwhXSKZcrxvUEnoayQg17HA9ThXadQ/U=
U8F
DlibKQoBUvhfyig7Gf4s/Ol3p76a57M/ZClgS5hPoM77oPaC8n8QVYA/t5BuYSd1n3CE67EU6=
IzJ
r3A83c34EZO/wHu6gwCCllouWNtU7fDvKJEbcgbTfb0o7qo224lAUwDqVB2zCVQTEKXV20h/q=
vuj
NnLxo2DjcBg+Fbd7GrZEEqK5+psc3U3ljD9mToJoM4lG7Ixy1Ev2Sx8xfUFtL9PIktl8OwA6U=
/1X
ZvauoH5upBain8bc+0ai8axXL2/O0rAKX2DlPfHD9LOim74PNqliLUtTr4TlByMZ5IuYCjMAE=
QEA
Ac0vRGF2ZSBIYXJ0bGV5IDxkaGFydGxleUB2ZXJkb25jb2xsZWdlLnNjaG9vbC5uej7CwRQEE=
wEI
AD4CGwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQTcJkVK+3HRjqu61z0cfm08VWOpQQUCX=
4eC
vAUJBdmq2AAKCRAcfm08VWOpQcRiC/sFhdZhFB5gQbHcs8F9+aPi8gfwu3atUFwadN6AShSa6=
K3p
nd7V1xYlDFwRPKrAEWBBYeX9dsAWl9gxPNuCo5utRkgPR8ZSO4ceXR4ZgKTvF3k6UzzGx8HFC=
+MJ
CvdiTTPnMayUOOX/f4+79uWt+fRKSBtckwud7+Dt/88ux8j8TpvBZMhciJ8Zwr9ouVWXfgg2/=
RMz
ZNTophQHKdUOhPQ/DBzVaLxVf3QEqKPs3lhrS08ZOMpubV938KdCLgqeqeaClEtURUZEs/5Ix=
g7l
b+SbbOo12K/lRnYu4U1pWcHVueccqkTxDZxgCDBtqN4sBMnmKtSuYAcbyy4SyWGA6Z0KIP87F=
xMi
5Yf+04R+hEG9KWD3fuk1JIIUeNVoiAn4aERjrIUN5q4NJAyY0d6KXmpyJxOK2Dj3ZyQglNrvX=
itc
hXJJqMfdGexB03lzDYxyHSlu+WBp2exaSOyQIKSniQ1BhAHyp4VQBkLKKVAEV+fVeTdFxarxV=
H5H
s8tP7YagJSTCwRQEEwEIAD4WIQTcJkVK+3HRjqu61z0cfm08VWOpQQUCXXA+5QIbAwUJAeEzg=
AUL
CQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRAcfm08VWOpQQ32C/4p3hsjfTeAzQR0aHoWGKTRc=
FoY
nc9IdYjO78fnafehJIt5LLoLfd+MSGPz6785hmNgryj6XtE1eIMN6pvkK/By6N7V6ON19jzKx=
vAq
/3f/rQcieTJl5tttQRGWsuFX+Ddv+iwflG+9ZSM3E9lZL2po3Ew6KhmiwH+i++CRF7utRRrPj=
+Dr
mMBgXj0yYyhRmheUmkPj7o6KfM+cn/rQPVSIWWHrBImAlEgkNl9fI9/SMhogNv6ZsmKX7aeNJ=
9xx
Xe6qAW276rjdK/3eh0rbxwckIY2BZYReO73fLfFzXrF1kH0gI/Vq+Aaah9/c56ZBM+VSEPa+z=
oxP
dyyc3zul7Q16VLWAgnU3PIBycEq/gilKBzR3GGL2VjLUjU4wAxQ7JwWc07onKm/WSRrfcig4G=
Clx
PMopOKQp5gx0GOIECMaqDqoWzTAjK+PSGJKeLuy3rthr7OkKrHsfaWPPgDpg5NJS40nvUQxgz=
pBr
aQgjSKAcSSdVZ8nnVVz3BGafmZOAD/zOwM0EXXA+5QEMAOoo+4IBfjaiZjEe4azMFDrVwvVke=
Ew3
soMrBjAOjlySQCpE/q0qDId5k0eSAAhttans3Us166xKW2QMfd2ojFBTLi06Zpha1jDo5Aj2k=
WDE
GT5y+0HBRVY0NmPtvBA1igRfF1ZSUsqIhO/dSqirdnSh08z5bZnEEyIWObBhC8leE2BAdXWgG=
1Wk
0/02DkrA9N16lZ1/wVGtYU09rnZBJpeDOFM0dCh7uhfA5LGzmxKzn25/rDSFUrUcmYfawAn13=
OS0
2COIlstl6lUgVJ6xtBxOaT4NLka4hkqyzpamCF6okeZQI6tHEmlm5FXuhCb/Lz/n9k9Pk793I=
or0
PP+xMPO8gbWlFvPfl/MRKc3Hy2SIZw9RQ7A/33V/ozXVzg1A4drrXKkKec8JznNTkoRI6fSx/=
TGV
pNh1+5SOHFGgKtZ+RA1BD1vmsMz/5xmdoWGisoR0/hEtdjudxpK1Zm0r1nvNpFZmKRZB26Imf=
MC4
kbRVXXX5LxE6yIyJ3urFn2+6PwARAQABwsD8BBgBCAAmAhsMFiEE3CZFSvtx0Y6rutc9HH5tP=
FVj
qUEFAl+Hgr0FCQXZqtgACgkQHH5tPFVjqUEnEwv9Ea+syu+U72SeNc3BQ3Gm6llARyQm7gz2G=
ZBa
k/epzD+3TFNKFLLh9AyBOM+wWRpGfKh1X+s9GLdSQISEA06bsW4d1KfHqEg0HTRw4p9SRwOWH=
vy1
L6maA1VHRQCW0/FN/7kYDrUH3bigISTkJJpmq8j4YOH66HVEbFqBO31ycYUGGt/Bazhe7rOhA=
xZu
GYzcVJQdSE020vjbqM5l34HfiDubuUNRhHMIaWa5IYYIyq33STbZu5Fln/5zoGN8+Ae4wNNzz=
fOy
WCKUzqybgbDxPWCnX2tgDEDlCt0X5X3PcItVeUpQCecDRut4eGEzOkkdNo2EM9UpBjGfei+GD=
8vr
z9apxvQ+nKYIOi4FM8GkXrsag7gvIdEcGzWcokhmdaFqWqweQALMUhhA86TckOwaouKkwk3Cw=
nHt
qdWryXmpvkbJxWRVrZOGgSfG+/QIku0oNY5XKRbdXURp1dPshT490JLUzFbM+OcF++HyMZ70q=
j/k
64f6idz5w6TvK0TCKe/M
=3Dj9z0
-----END PGP PUBLIC KEY BLOCK-----

--------------F36435F7FA51E9E42E13F8F3--

--vv8xtFOOk2SxbnIpwvxkobfET7PglPfc3--

--LLgksp3P0YEtQwjYvuvakoXawSV5875WB
Content-Type: application/pgp-signature; name="OpenPGP_signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="OpenPGP_signature"

-----BEGIN PGP SIGNATURE-----

wsD5BAABCAAjFiEE3CZFSvtx0Y6rutc9HH5tPFVjqUEFAl+QoxIFAwAAAAAACgkQHH5tPFVjqUHe
8Qv/UFw2djSj0JMuTc8kvtI/2Bd/OESVSemRoOI6EIs6wSZUU7TT+Aw23frniwqrMXBGx8swznfa
lpWoFm4VElVCy9ShORIcJ+3ANEAeJ5k+g76YR4P1YBeEIOxssvnte4L6mlmaBNaUu3eFGJ5gltdB
Ai5vkOMme3/mi3KiOIlrqtg/do+e039oP5JRGTGdeeO44lHuINW/V9riaLJi/fcWHliHv4IKHlPZ
J+TPjQAk84xgwvJsfpDhMMUzomt14yr2GPLNRJ+M7UtGGD3LudTqSp6r60jtV/CYz9I8v0MiNvZo
bqkP7xuQBIGKiZUuinL+aMD/whpYkq+yt7VNDeeTIkJo5TeYqBja72iU6nCk1RSTu+Igw3KfhJiq
f+Lnc8gCutouCFDkEisw2mGw4tocQ7vDF8TxjZrdT64yOvhFGK4zNUqSPgASRZpwJqK/nS4SnxW3
tnirmzwTEPWi/jgO+MkJ4z1M7peMnslBhytWvM4jXzE6m2dZ9n2/Kx8OO1mH
=pRyv
-----END PGP SIGNATURE-----

--LLgksp3P0YEtQwjYvuvakoXawSV5875WB--
", - "historyId": "1206137", - "internalDate": "1603314450000" - } -} \ No newline at end of file diff --git a/test/source/mock/google/exported-messages/message-export-17dad75e63e47f97.json b/test/source/mock/google/exported-messages/message-export-17dad75e63e47f97.json new file mode 100644 index 00000000000..bd16df8f72d --- /dev/null +++ b/test/source/mock/google/exported-messages/message-export-17dad75e63e47f97.json @@ -0,0 +1,211 @@ +{ + "acctEmail": "flowcrypt.compatibility@gmail.com", + "full": { + "id": "17dad75e63e47f97", + "threadId": "17dad75e63e47f97", + "labelIds": [ + "IMPORTANT", + "CATEGORY_PERSONAL", + "Label_15", + "INBOX" + ], + "snippet": "1234", + "payload": { + "partId": "", + "mimeType": "multipart/signed", + "filename": "", + "headers": [ + { + "name": "X-Gm-Message-State", + "value": "AOAM532JteVyKuMwmUH7EV/J7RYigGV0NdeRyUWpXXGOtttedTa+Km6R /QAKvHofCBjBLWfz0DEbLFZhGngx3lQfzw==" + }, + { + "name": "From", + "value": "some.sender@test.com" + }, + { + "name": "Date", + "value": "Sun, 12 Dec 2021 10:05:22 +0300" + }, + { + "name": "MIME-Version", + "value": "1.0" + }, + { + "name": "User-Agent", + "value": "Mozilla/5.0 (Windows NT 6.3; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.3.2" + }, + { + "name": "Content-Language", + "value": "en-US" + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "Subject", + "value": "Thunderbird 91.3.2 signed only with key attached" + }, + { + "name": "Autocrypt", + "value": "addr=some.sender@test.com; keydata= xsBNBGG1nOIBCAC1CCjvL0wJ6bYAxP1xWCDJGe4ykbRl9RNxJ8F31baifLPvFDIJdpB7sxOF 7WtFWS6TqfZPRdRhKKAvqlGALNEMJFgi2oK7lElZxrPB8OFBii+oa6IoQn/qWK+FXAEn3k7T eiuEKjmYjMyE2DvDB5P8pMUluwZhvB8H/rmVLLfiK8qm/fnQdU6RCfQ5++IR78kMdOrfRk6e LbuM6D3cyqS+cBq4RWd+VbJ7BT6SJrRJVDQCz3DVlCROJwxW68RRpyK/LY481grXUxqzNoDE IC9gVWD5XtBD6DmZ9LeH2dEj0nmgMsLBqFIUWGccyGOpeHZgl32tDgyhJbKOjDSMwQBVABEB AAHNG0tleTEgPHNvbWUuc2VuZGVyQHRlc3QuY29tPsLAjQQQAQgAIAUCYbWc4gYLCQcIAwIE FQgKAgQWAgEAAhkBAhsDAh4BACEJECA/rnB2AFOBFiEEK7IZd28jzkjruGCcID+ucHYAU4GW ygf/SWos4aPwxX+GdDqFtGXyRLGRh7lL19SY8vZefjUW94rnl+3ATuEx5vtDIrjWlDkryYwo c64B6c86dv6nLP+WPnQDM2n6mRejvNQ+b2KGmn8HLa7mZ7I+pf4gff9T9jjfwa1TZA870L/G QHiAB+6Lf2uPuwH4wjz66JSdRSgOTnsGkgIsIrZDdVEGhqcHdNeL9+oTR5NqtBUCaS8pLPSH OqTFISJhclKtUlBpwz8XLpG3fDdZZCTGsp1dI0PK2xSZY9U/iEREeqKzyqOOoaYBdPhdpGup 3QGEFIRAm0dreMoZpvSAihAC4wN6NGccFGa9R22ytXlSfLD0oNxNeQdA/87ATQRhtZziAQgA 0mmw+727SdQwbwti7AaGQrDo7TpytFKNyrlZVMmEQ2d77KDYGklSQmY2Sg6XL7HAotfSVBnQ si/FzvwyCX2qR9UXC/Upvm4aVQWwgW3V8NeYZiR0pWzJWj61hihAWCRjKBnDdeDwOREiBaku yM+krnHkf/vd9+kh4ZZyQje74Mw69ZuZv5wkGMhaZ5RoOS+E5m1lujPNo/1atNF5pFlVuyxv 8dedFTULzPPE6RgkeZD1W+zmMIqFB7pRMy16U79xcrzrVehnh2dd4AQ4spkgnR4sQZ6XhnvV WEYPU9T59XkxLoWMldq1XIFhuf/Lt3PhsGku7a55wnpDMA50CJMPSQARAQABwsB2BBgBCAAJ BQJhtZziAhsMACEJECA/rnB2AFOBFiEEK7IZd28jzkjruGCcID+ucHYAU4H/EAf9GXlraJYm o1UqKlUR6WuFnTonNvVY6+83uekuHXHj1xBPAFYzuVFd9dnyhQ8ob5VAfSSIBz4EV243steQ L8G+zU5t0uOoSKFHiB/36a6tW2gAmrktGkyERtXENmgAUjsy2C8nuAZq9oyDCNUZT6U//Suk EzvUrkCmVZPpE/sfiEvvo+pgFtaWRGKb6iBNaa7CXosIcJDWi5+ODaM2xeWkbfZrJOBqmKAu TGqaGrN33kRES3fupYst7Q7HWJ0iuSv6qohdt/YubvjXk3yO/XnuqDKLHVrdYgSJkRnvvx3f VZI/m1sX1+3wVCPyQ9hK0ix1ZTZdGYd76dun/fEmuNQHBg==" + }, + { + "name": "Content-Type", + "value": "multipart/signed; micalg=pgp-sha256; protocol=\"application/pgp-signature\"; boundary=\"------------bVKASqf5GXvcY0BXX7G4C4Zl\"" + } + ], + "body": { + "size": 0 + }, + "parts": [ + { + "partId": "0", + "mimeType": "multipart/mixed", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "multipart/mixed; boundary=\"------------FQ7CfxuiGriwTfTfyc4i1ppF\"; protected-headers=\"v1\"" + }, + { + "name": "From", + "value": "Some sender " + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "Message-ID", + "value": "" + }, + { + "name": "Subject", + "value": "Thunderbird 91.3.2 signed only with key attached" + } + ], + "body": { + "size": 0 + }, + "parts": [ + { + "partId": "0.0", + "mimeType": "multipart/mixed", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "multipart/mixed; boundary=\"------------05200f1IHPj8uoi0mQ7uNFC3\"" + } + ], + "body": { + "size": 0 + }, + "parts": [ + { + "partId": "0.0.0", + "mimeType": "text/plain", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "text/plain; charset=UTF-8; format=flowed" + }, + { + "name": "Content-Transfer-Encoding", + "value": "base64" + } + ], + "body": { + "size": 8, + "data": "MTIzNA0KDQo=" + } + }, + { + "partId": "0.0.1", + "mimeType": "application/pgp-keys", + "filename": "OpenPGP_0x203FAE7076005381.asc", + "headers": [ + { + "name": "Content-Type", + "value": "application/pgp-keys; name=\"OpenPGP_0x203FAE7076005381.asc\"" + }, + { + "name": "Content-Disposition", + "value": "attachment; filename=\"OpenPGP_0x203FAE7076005381.asc\"" + }, + { + "name": "Content-Description", + "value": "OpenPGP public key" + }, + { + "name": "Content-Transfer-Encoding", + "value": "quoted-printable" + } + ], + "body": { + "attachmentId": "ANGjdJ8RZUqVqturW8st-eLvfwIiBnZkD5mSAWq6qtJNj5B2jFnA2SENzTTMotBFSpGFfpS69jhWqoQy3rs0kbOwzVI66DL_zibOaUODFww7aawDpNtFCAgQ3UCBj3WGBAn1u7uooQbcRh7OOMt-LRWkXF5L-5_Hakkcy7KgN-tbsVdbzcWQAoj7k-u1YZ2uXSsAE0BDuJjMYwolzibvOGAkZSTM03_solwyiMeaBpsyLOukG5CM5kUqiqY5ZNQmVciJ5A4iXAlwodT2nwCfhX02e0eaNntF1YiI-meLNnPkry8FdXJ5axgsXqkeJuMa40uVishRvSarLPrYgm-fvVymkayZ7i3msFVC4GdSnGGjr3mwMZ-blhqGWR418bU", + "size": 1765 + } + } + ] + } + ] + }, + { + "partId": "1", + "mimeType": "application/pgp-signature", + "filename": "OpenPGP_signature", + "headers": [ + { + "name": "Content-Type", + "value": "application/pgp-signature; name=\"OpenPGP_signature.asc\"" + }, + { + "name": "Content-Description", + "value": "OpenPGP digital signature" + }, + { + "name": "Content-Disposition", + "value": "attachment; filename=\"OpenPGP_signature\"" + } + ], + "body": { + "attachmentId": "ANGjdJ9sCwY4lW9nwiNusDWRePPRmV5rJo4qxiJbEukdrzEAA23KBuFIFo8V3Szfz4vuxzGCWMW59PCXmybBwlHRJo6QsQVVHKn_DkDApioRnwy1HFYWs_i4K3hr1K6db9CgYkAN-z7FZPfQCcRgxxWY7y10pxPMCHd2Hr8vMb1fsPN2t2ceCLPK_K4RytKCJsCXoFVXYhnxWwnOaExKmCB3jWwYEs1EJbRuiS0R5nG7T7652-rmKtxSucTQT_cS1TnP821wPIqqD0pwgPR6KhbF-8N2oXdniflQOB9DLvvVk3QmTMK3qTQXY4HIHEAZ0JeECquFedzHHJzaP19iT2Fx6P4zn5nJ8eJlrd44cmDdTuSimC0LPR5UL_l5cIM", + "size": 505 + } + } + ] + }, + "sizeEstimate": 10699, + "historyId": "1332034", + "internalDate": "1639292722000" + }, + "attachments": { + "ANGjdJ8RZUqVqturW8st-eLvfwIiBnZkD5mSAWq6qtJNj5B2jFnA2SENzTTMotBFSpGFfpS69jhWqoQy3rs0kbOwzVI66DL_zibOaUODFww7aawDpNtFCAgQ3UCBj3WGBAn1u7uooQbcRh7OOMt-LRWkXF5L-5_Hakkcy7KgN-tbsVdbzcWQAoj7k-u1YZ2uXSsAE0BDuJjMYwolzibvOGAkZSTM03_solwyiMeaBpsyLOukG5CM5kUqiqY5ZNQmVciJ5A4iXAlwodT2nwCfhX02e0eaNntF1YiI-meLNnPkry8FdXJ5axgsXqkeJuMa40uVishRvSarLPrYgm-fvVymkayZ7i3msFVC4GdSnGGjr3mwMZ-blhqGWR418bU": { + "data": "LS0tLS1CRUdJTiBQR1AgUFVCTElDIEtFWSBCTE9DSy0tLS0tDQoNCnhzQk5CR0cxbk9JQkNBQzFDQ2p2TDB3SjZiWUF4UDF4V0NESkdlNHlrYlJsOVJOeEo4RjMxYmFpZkxQdkZESUoNCmRwQjdzeE9GN1d0RldTNlRxZlpQUmRSaEtLQXZxbEdBTE5FTUpGZ2kyb0s3bEVsWnhyUEI4T0ZCaWkrb2E2SW8NClFuL3FXSytGWEFFbjNrN1RlaXVFS2ptWWpNeUUyRHZEQjVQOHBNVWx1d1podkI4SC9ybVZMTGZpSzhxbS9mblENCmRVNlJDZlE1KytJUjc4a01kT3JmUms2ZUxidU02RDNjeXFTK2NCcTRSV2QrVmJKN0JUNlNKclJKVkRRQ3ozRFYNCmxDUk9Kd3hXNjhSUnB5Sy9MWTQ4MWdyWFV4cXpOb0RFSUM5Z1ZXRDVYdEJENkRtWjlMZUgyZEVqMG5tZ01zTEINCnFGSVVXR2NjeUdPcGVIWmdsMzJ0RGd5aEpiS09qRFNNd1FCVkFCRUJBQUhORzB0bGVURWdQSE52YldVdWMyVnUNClpHVnlRSFJsYzNRdVkyOXRQc0xBalFRUUFRZ0FJQVVDWWJXYzRnWUxDUWNJQXdJRUZRZ0tBZ1FXQWdFQUFoa0INCkFoc0RBaDRCQUNFSkVDQS9ybkIyQUZPQkZpRUVLN0laZDI4anpranJ1R0NjSUQrdWNIWUFVNEdXeWdmL1NXb3MNCjRhUHd4WCtHZERxRnRHWHlSTEdSaDdsTDE5U1k4dlplZmpVVzk0cm5sKzNBVHVFeDV2dERJcmpXbERrcnlZd28NCmM2NEI2Yzg2ZHY2bkxQK1dQblFETTJuNm1SZWp2TlErYjJLR21uOEhMYTdtWjdJK3BmNGdmZjlUOWpqZndhMVQNClpBODcwTC9HUUhpQUIrNkxmMnVQdXdINHdqejY2SlNkUlNnT1Ruc0drZ0lzSXJaRGRWRUdocWNIZE5lTDkrb1QNClI1TnF0QlVDYVM4cExQU0hPcVRGSVNKaGNsS3RVbEJwd3o4WExwRzNmRGRaWkNUR3NwMWRJMFBLMnhTWlk5VS8NCmlFUkVlcUt6eXFPT29hWUJkUGhkcEd1cDNRR0VGSVJBbTBkcmVNb1pwdlNBaWhBQzR3TjZOR2NjRkdhOVIyMnkNCnRYbFNmTEQwb054TmVRZEEvODdBVFFSaHRaemlBUWdBMG1tdys3MjdTZFF3Ynd0aTdBYUdRckRvN1RweXRGS04NCnlybFpWTW1FUTJkNzdLRFlHa2xTUW1ZMlNnNlhMN0hBb3RmU1ZCblFzaS9GenZ3eUNYMnFSOVVYQy9VcHZtNGENClZRV3dnVzNWOE5lWVppUjBwV3pKV2o2MWhpaEFXQ1JqS0JuRGRlRHdPUkVpQmFrdXlNK2tybkhrZi92ZDkra2gNCjRaWnlRamU3NE13NjladVp2NXdrR01oYVo1Um9PUytFNW0xbHVqUE5vLzFhdE5GNXBGbFZ1eXh2OGRlZEZUVUwNCnpQUEU2UmdrZVpEMVcrem1NSXFGQjdwUk15MTZVNzl4Y3J6clZlaG5oMmRkNEFRNHNwa2duUjRzUVo2WGhudlYNCldFWVBVOVQ1OVhreExvV01sZHExWElGaHVmL0x0M1Boc0drdTdhNTV3bnBETUE1MENKTVBTUUFSQVFBQndzQjINCkJCZ0JDQUFKQlFKaHRaemlBaHNNQUNFSkVDQS9ybkIyQUZPQkZpRUVLN0laZDI4anpranJ1R0NjSUQrdWNIWUENClU0SC9FQWY5R1hscmFKWW1vMVVxS2xVUjZXdUZuVG9uTnZWWTYrODN1ZWt1SFhIajF4QlBBRll6dVZGZDlkbnkNCmhROG9iNVZBZlNTSUJ6NEVWMjQzc3RlUUw4Ryt6VTV0MHVPb1NLRkhpQi8zNmE2dFcyZ0Ftcmt0R2t5RVJ0WEUNCk5tZ0FVanN5MkM4bnVBWnE5b3lEQ05VWlQ2VS8vU3VrRXp2VXJrQ21WWlBwRS9zZmlFdnZvK3BnRnRhV1JHS2INCjZpQk5hYTdDWG9zSWNKRFdpNStPRGFNMnhlV2tiZlpySk9CcW1LQXVUR3FhR3JOMzNrUkVTM2Z1cFlzdDdRN0gNCldKMGl1U3Y2cW9oZHQvWXVidmpYazN5Ty9YbnVxREtMSFZyZFlnU0prUm52dngzZlZaSS9tMXNYMSszd1ZDUHkNClE5aEswaXgxWlRaZEdZZDc2ZHVuL2ZFbXVOUUhCZz09DQo9eURCcA0KLS0tLS1FTkQgUEdQIFBVQkxJQyBLRVkgQkxPQ0stLS0tLQ", + "size": 1765 + }, + "ANGjdJ9sCwY4lW9nwiNusDWRePPRmV5rJo4qxiJbEukdrzEAA23KBuFIFo8V3Szfz4vuxzGCWMW59PCXmybBwlHRJo6QsQVVHKn_DkDApioRnwy1HFYWs_i4K3hr1K6db9CgYkAN-z7FZPfQCcRgxxWY7y10pxPMCHd2Hr8vMb1fsPN2t2ceCLPK_K4RytKCJsCXoFVXYhnxWwnOaExKmCB3jWwYEs1EJbRuiS0R5nG7T7652-rmKtxSucTQT_cS1TnP821wPIqqD0pwgPR6KhbF-8N2oXdniflQOB9DLvvVk3QmTMK3qTQXY4HIHEAZ0JeECquFedzHHJzaP19iT2Fx6P4zn5nJ8eJlrd44cmDdTuSimC0LPR5UL_l5cIM": { + "data": "LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0NCg0Kd3NCNUJBQUJDQUFqRmlFRUs3SVpkMjhqemtqcnVHQ2NJRCt1Y0hZQVU0RUZBbUcxbnpJRkF3QUFBQUFBQ2drUUlEK3VjSFlBVTRIMQ0KOUFnQW1pNVFVbXJ6bE1hL1Y4U2VFdjdWeWRBM3Y3SGNhL0VNMThvNG90L3lnUWdTMUJvQ205dEFhak9HV2d6bzdlRUp3REs4TFJqMg0KYy9YY0tXRXh4Y3FrTGppZW03Q2RlUGJpL3hyNWpNc1BZek9sTXRjRmFEM3pZOWg4emFiaWlHTTBrSXBUOFBWQ29mZ0ZKTXFRZEJ5cg0KZ0YwTnVpb016QWlDWStXOWFpYVN6cXVIOUZWVkUrQzRid3NVNGxlVGtBTkRHaTA1WEJVSVlhb2NOaWxIblVnaEc2RHlGV1M2cVlGVw0KY1U0U3ZSY041eUREVVVqcnRGSnFwMmEyQ3M3NktnYkJyM0tRY0Q0MkV5cFVMNC9aUys3LzRNTjRTQTA1Ui9tTXRtZks0SHdBS2NDMg0KalNCNkE5M0ptblFHSWtBZW0va3pHa0tjbG1mQWRHZmM0RlMrM0NuKzZRPT0NCj1YbXJ6DQotLS0tLUVORCBQR1AgU0lHTkFUVVJFLS0tLS0NCg", + "size": 505 + } + }, + "raw": { + "id": "17dad75e63e47f97", + "threadId": "17dad75e63e47f97", + "labelIds": [ + "IMPORTANT", + "CATEGORY_PERSONAL", + "Label_15", + "INBOX" + ], + "snippet": "1234", + "sizeEstimate": 10699, + "raw": "Delivered-To: flowcrypt.compatibility@gmail.com
Received: by 2002:a67:fd51:0:0:0:0:0 with SMTP id g17csp4217926vsr;
        Sat, 11 Dec 2021 23:05:25 -0800 (PST)
X-Received: by 2002:a05:6512:13aa:: with SMTP id p42mr21242287lfa.474.1639292725226;
        Sat, 11 Dec 2021 23:05:25 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1639292725; cv=none;
        d=google.com; s=arc-20160816;
        b=oJKwlZIUhRvYkwjGA5b05Eb6JTtgpjaaYhcMVuaQ8oPrlfbgDChpZu9eaT9GCaOa5j
         CvcYaFCuO8zGth5jqzepAmJdbsZ3hZIXydr15udqqaJeLnOT2325E43ecOM64nmhXyKe
         E2ndkZ9Tnx5+MP2lE9AzyYjLIqTYVT5HlFmJ8P2TElQdXuRhVmT1M3qvCqOX9SzyZ9vF
         1Jrf2HgcUYmTfVAC7UJcuMmBECaQDUb99AZQ+xAyL8ktlxu5b+L23FgJ+n3MhGg4AUzl
         G2KGU55UmVfG+IbGiq9GUjGA7mBmwCrqeBwAA5eBHECmHJ9gYnFrrwWpvpowhyIVDonE
         RPjA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
        h=autocrypt:subject:to:content-language:user-agent:mime-version:date
         :message-id:from:dkim-signature;
        bh=pxutqSlzfnwow+miPq1fnkMLkFgZ5J50erdI07WdOVU=;
        b=KdbVegHPmJh4szyD/dbmjReZ6SszWrMF526B6UmomLbCcdXICZ2M0Dw+BxpJdy6gWg
         Z/ySjmX9b9hm39AAc60mjcmB1QEhR6qBaLmO49UgO/4+O2O468OA9hJdcYJc7NueGyxp
         d91e+RRoGhllPJ5RX89u6+9W3RbTn79d3qW7JSXb6RTgv/aWjzcuKY2Og2rCAmlY5guv
         OpD4FEFif67/sF/OjRL+DzOcVcHYhIXffZgM3+ywgiUg3dC+XjIRxD8y/jFVTJ0+eTIL
         WxoEF5WuUDQB0lYJPv7hfkVkOqNl9R+jXKVoRX0PkZhqGCfNeJWvAWsSbxV6cwmmhrzL
         CX7Q==
ARC-Authentication-Results: i=1; mx.google.com;
       dkim=pass header.i=@flowcrypt-dev.20210112.gappssmtp.com header.s=20210112 header.b=zr6yfXPr;
       spf=neutral (google.com: 209.85.220.41 is neither permitted nor denied by best guess record for domain of ci.tests.gmail@flowcrypt.dev) smtp.mailfrom=ci.tests.gmail@flowcrypt.dev
Return-Path: <ci.tests.gmail@flowcrypt.dev>
Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41])
        by mx.google.com with SMTPS id s16sor1957850lfg.87.2021.12.11.23.05.25
        for <flowcrypt.compatibility@gmail.com>
        (Google Transport Security);
        Sat, 11 Dec 2021 23:05:25 -0800 (PST)
Received-SPF: neutral (google.com: 209.85.220.41 is neither permitted nor denied by best guess record for domain of ci.tests.gmail@flowcrypt.dev) client-ip=209.85.220.41;
Authentication-Results: mx.google.com;
       dkim=pass header.i=@flowcrypt-dev.20210112.gappssmtp.com header.s=20210112 header.b=zr6yfXPr;
       spf=neutral (google.com: 209.85.220.41 is neither permitted nor denied by best guess record for domain of ci.tests.gmail@flowcrypt.dev) smtp.mailfrom=ci.tests.gmail@flowcrypt.dev
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=flowcrypt-dev.20210112.gappssmtp.com; s=20210112;
        h=from:message-id:date:mime-version:user-agent:content-language:to
         :subject:autocrypt;
        bh=pxutqSlzfnwow+miPq1fnkMLkFgZ5J50erdI07WdOVU=;
        b=zr6yfXPrdwEHWyWWMkYbQ6OKjeDVPhQnYPIXdSox8OsWFJXHG9iQYOjC5592Uz8GF7
         jQk5msI/uUkbqJTVyTMT7o5S2HfLNtZbttFJJZvbIsZM7Qe5Top3tOjOAC6Mt4hfs46+
         DO8OyfsvdU6qNiXcSZnHP8BgpZGqdNfMTLjKFZDpNUImGTJMjysDJwvFFvYxL/qmWJvr
         GhZi8zf56xVMTIw9dz7YkR6yeQ2XROviHMi9IAuZ5FHFFKdREUbmal7w43gGnQa/E7iv
         +EVq9yUBmN35CeRAf/PrxgFUxwuxAY9J24gsTnOcV/3NrWUbgGPy1KtEtVRnNHfIcJ//
         ylMw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20210112;
        h=x-gm-message-state:from:message-id:date:mime-version:user-agent
         :content-language:to:subject:autocrypt;
        bh=pxutqSlzfnwow+miPq1fnkMLkFgZ5J50erdI07WdOVU=;
        b=QqobDnfOfg6B5zOuhfFxWypjcyS0c3ti9S1i5RmS/ZozrtbBMgdg74r4ew0gvqBPdo
         oTCvf7tT0yEBAzOEX3mW+LetEXszjrbjcWHMG0Vu08bAvRVW4ezbgcVOn2zxNszoijRe
         Zev8eTmrs9IS64Ue36W/jTyQOPVTOCrbnT+gaoDKxNpJA2/KO/W/Okjfj2opmx3GHkas
         gHW3rrFnjwkiNdfScC1coEmvpEpKuKocWuf6SRPnRMHaj/6UpZtejRUD7WW18c9gwdrx
         aVzBo9GAEwQuWsp/geUwjul+RR/TDJrEmFnvfe13cbRrxjK1GG2yj5uh0SjSbZHG3GnM
         HdLA==
X-Gm-Message-State: AOAM532JteVyKuMwmUH7EV/J7RYigGV0NdeRyUWpXXGOtttedTa+Km6R
	/QAKvHofCBjBLWfz0DEbLFZhGngx3lQfzw==
X-Google-Smtp-Source: ABdhPJwMrwuzpw/EarQdRCByw0a/HriOi1z4FIDw2G/B0ewaZeJElWIITHEVxjYIvLSpEG0JClOs2w==
X-Received: by 2002:ac2:5607:: with SMTP id v7mr22162535lfd.71.1639292724469;
        Sat, 11 Dec 2021 23:05:24 -0800 (PST)
Return-Path: <ci.tests.gmail@flowcrypt.dev>
Received: from [192.168.1.8] (0892631706.static.corbina.ru. [78.107.195.113])
        by smtp.gmail.com with ESMTPSA id g4sm926209lfv.288.2021.12.11.23.05.23
        for <flowcrypt.compatibility@gmail.com>
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Sat, 11 Dec 2021 23:05:23 -0800 (PST)
From: CI Test 68 <ci.tests.gmail@flowcrypt.dev>
X-Google-Original-From: CI Test 68 <some.sender@test.com>
Message-ID: <cf9663b4-955a-4f84-cc4b-f4d01c83afc4@test.com>
Date: Sun, 12 Dec 2021 10:05:22 +0300
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Windows NT 6.3; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.3.2
Content-Language: en-US
To: flowcrypt.compatibility@gmail.com
Subject: Thunderbird 91.3.2 signed only with key attached
Autocrypt: addr=some.sender@test.com; keydata=
 xsBNBGG1nOIBCAC1CCjvL0wJ6bYAxP1xWCDJGe4ykbRl9RNxJ8F31baifLPvFDIJdpB7sxOF
 7WtFWS6TqfZPRdRhKKAvqlGALNEMJFgi2oK7lElZxrPB8OFBii+oa6IoQn/qWK+FXAEn3k7T
 eiuEKjmYjMyE2DvDB5P8pMUluwZhvB8H/rmVLLfiK8qm/fnQdU6RCfQ5++IR78kMdOrfRk6e
 LbuM6D3cyqS+cBq4RWd+VbJ7BT6SJrRJVDQCz3DVlCROJwxW68RRpyK/LY481grXUxqzNoDE
 IC9gVWD5XtBD6DmZ9LeH2dEj0nmgMsLBqFIUWGccyGOpeHZgl32tDgyhJbKOjDSMwQBVABEB
 AAHNG0tleTEgPHNvbWUuc2VuZGVyQHRlc3QuY29tPsLAjQQQAQgAIAUCYbWc4gYLCQcIAwIE
 FQgKAgQWAgEAAhkBAhsDAh4BACEJECA/rnB2AFOBFiEEK7IZd28jzkjruGCcID+ucHYAU4GW
 ygf/SWos4aPwxX+GdDqFtGXyRLGRh7lL19SY8vZefjUW94rnl+3ATuEx5vtDIrjWlDkryYwo
 c64B6c86dv6nLP+WPnQDM2n6mRejvNQ+b2KGmn8HLa7mZ7I+pf4gff9T9jjfwa1TZA870L/G
 QHiAB+6Lf2uPuwH4wjz66JSdRSgOTnsGkgIsIrZDdVEGhqcHdNeL9+oTR5NqtBUCaS8pLPSH
 OqTFISJhclKtUlBpwz8XLpG3fDdZZCTGsp1dI0PK2xSZY9U/iEREeqKzyqOOoaYBdPhdpGup
 3QGEFIRAm0dreMoZpvSAihAC4wN6NGccFGa9R22ytXlSfLD0oNxNeQdA/87ATQRhtZziAQgA
 0mmw+727SdQwbwti7AaGQrDo7TpytFKNyrlZVMmEQ2d77KDYGklSQmY2Sg6XL7HAotfSVBnQ
 si/FzvwyCX2qR9UXC/Upvm4aVQWwgW3V8NeYZiR0pWzJWj61hihAWCRjKBnDdeDwOREiBaku
 yM+krnHkf/vd9+kh4ZZyQje74Mw69ZuZv5wkGMhaZ5RoOS+E5m1lujPNo/1atNF5pFlVuyxv
 8dedFTULzPPE6RgkeZD1W+zmMIqFB7pRMy16U79xcrzrVehnh2dd4AQ4spkgnR4sQZ6XhnvV
 WEYPU9T59XkxLoWMldq1XIFhuf/Lt3PhsGku7a55wnpDMA50CJMPSQARAQABwsB2BBgBCAAJ
 BQJhtZziAhsMACEJECA/rnB2AFOBFiEEK7IZd28jzkjruGCcID+ucHYAU4H/EAf9GXlraJYm
 o1UqKlUR6WuFnTonNvVY6+83uekuHXHj1xBPAFYzuVFd9dnyhQ8ob5VAfSSIBz4EV243steQ
 L8G+zU5t0uOoSKFHiB/36a6tW2gAmrktGkyERtXENmgAUjsy2C8nuAZq9oyDCNUZT6U//Suk
 EzvUrkCmVZPpE/sfiEvvo+pgFtaWRGKb6iBNaa7CXosIcJDWi5+ODaM2xeWkbfZrJOBqmKAu
 TGqaGrN33kRES3fupYst7Q7HWJ0iuSv6qohdt/YubvjXk3yO/XnuqDKLHVrdYgSJkRnvvx3f
 VZI/m1sX1+3wVCPyQ9hK0ix1ZTZdGYd76dun/fEmuNQHBg==
Content-Type: multipart/signed; micalg=pgp-sha256;
 protocol="application/pgp-signature";
 boundary="------------bVKASqf5GXvcY0BXX7G4C4Zl"

This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
--------------bVKASqf5GXvcY0BXX7G4C4Zl
Content-Type: multipart/mixed; boundary="------------FQ7CfxuiGriwTfTfyc4i1ppF";
 protected-headers="v1"
From: CI Test 68 <some.sender@test.com>
To: flowcrypt.compatibility@gmail.com
Message-ID: <cf9663b4-955a-4f84-cc4b-f4d01c83afc4@test.com>
Subject: Thunderbird 91.3.2 signed only with key attached

--------------FQ7CfxuiGriwTfTfyc4i1ppF
Content-Type: multipart/mixed; boundary="------------05200f1IHPj8uoi0mQ7uNFC3"

--------------05200f1IHPj8uoi0mQ7uNFC3
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: base64

MTIzNA0KDQo=
--------------05200f1IHPj8uoi0mQ7uNFC3
Content-Type: application/pgp-keys; name="OpenPGP_0x203FAE7076005381.asc"
Content-Disposition: attachment; filename="OpenPGP_0x203FAE7076005381.asc"
Content-Description: OpenPGP public key
Content-Transfer-Encoding: quoted-printable

-----BEGIN PGP PUBLIC KEY BLOCK-----

xsBNBGG1nOIBCAC1CCjvL0wJ6bYAxP1xWCDJGe4ykbRl9RNxJ8F31baifLPvFDIJ
dpB7sxOF7WtFWS6TqfZPRdRhKKAvqlGALNEMJFgi2oK7lElZxrPB8OFBii+oa6Io
Qn/qWK+FXAEn3k7TeiuEKjmYjMyE2DvDB5P8pMUluwZhvB8H/rmVLLfiK8qm/fnQ
dU6RCfQ5++IR78kMdOrfRk6eLbuM6D3cyqS+cBq4RWd+VbJ7BT6SJrRJVDQCz3DV
lCROJwxW68RRpyK/LY481grXUxqzNoDEIC9gVWD5XtBD6DmZ9LeH2dEj0nmgMsLB
qFIUWGccyGOpeHZgl32tDgyhJbKOjDSMwQBVABEBAAHNG0tleTEgPHNvbWUuc2Vu
ZGVyQHRlc3QuY29tPsLAjQQQAQgAIAUCYbWc4gYLCQcIAwIEFQgKAgQWAgEAAhkB
AhsDAh4BACEJECA/rnB2AFOBFiEEK7IZd28jzkjruGCcID+ucHYAU4GWygf/SWos
4aPwxX+GdDqFtGXyRLGRh7lL19SY8vZefjUW94rnl+3ATuEx5vtDIrjWlDkryYwo
c64B6c86dv6nLP+WPnQDM2n6mRejvNQ+b2KGmn8HLa7mZ7I+pf4gff9T9jjfwa1T
ZA870L/GQHiAB+6Lf2uPuwH4wjz66JSdRSgOTnsGkgIsIrZDdVEGhqcHdNeL9+oT
R5NqtBUCaS8pLPSHOqTFISJhclKtUlBpwz8XLpG3fDdZZCTGsp1dI0PK2xSZY9U/
iEREeqKzyqOOoaYBdPhdpGup3QGEFIRAm0dreMoZpvSAihAC4wN6NGccFGa9R22y
tXlSfLD0oNxNeQdA/87ATQRhtZziAQgA0mmw+727SdQwbwti7AaGQrDo7TpytFKN
yrlZVMmEQ2d77KDYGklSQmY2Sg6XL7HAotfSVBnQsi/FzvwyCX2qR9UXC/Upvm4a
VQWwgW3V8NeYZiR0pWzJWj61hihAWCRjKBnDdeDwOREiBakuyM+krnHkf/vd9+kh
4ZZyQje74Mw69ZuZv5wkGMhaZ5RoOS+E5m1lujPNo/1atNF5pFlVuyxv8dedFTUL
zPPE6RgkeZD1W+zmMIqFB7pRMy16U79xcrzrVehnh2dd4AQ4spkgnR4sQZ6XhnvV
WEYPU9T59XkxLoWMldq1XIFhuf/Lt3PhsGku7a55wnpDMA50CJMPSQARAQABwsB2
BBgBCAAJBQJhtZziAhsMACEJECA/rnB2AFOBFiEEK7IZd28jzkjruGCcID+ucHYA
U4H/EAf9GXlraJYmo1UqKlUR6WuFnTonNvVY6+83uekuHXHj1xBPAFYzuVFd9dny
hQ8ob5VAfSSIBz4EV243steQL8G+zU5t0uOoSKFHiB/36a6tW2gAmrktGkyERtXE
NmgAUjsy2C8nuAZq9oyDCNUZT6U//SukEzvUrkCmVZPpE/sfiEvvo+pgFtaWRGKb
6iBNaa7CXosIcJDWi5+ODaM2xeWkbfZrJOBqmKAuTGqaGrN33kRES3fupYst7Q7H
WJ0iuSv6qohdt/YubvjXk3yO/XnuqDKLHVrdYgSJkRnvvx3fVZI/m1sX1+3wVCPy
Q9hK0ix1ZTZdGYd76dun/fEmuNQHBg=3D=3D
=3DyDBp
-----END PGP PUBLIC KEY BLOCK-----
--------------05200f1IHPj8uoi0mQ7uNFC3--


--------------FQ7CfxuiGriwTfTfyc4i1ppF--

--------------bVKASqf5GXvcY0BXX7G4C4Zl
Content-Type: application/pgp-signature; name="OpenPGP_signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="OpenPGP_signature"

-----BEGIN PGP SIGNATURE-----

wsB5BAABCAAjFiEEK7IZd28jzkjruGCcID+ucHYAU4EFAmG1nzIFAwAAAAAACgkQID+ucHYAU4H1
9AgAmi5QUmrzlMa/V8SeEv7VydA3v7Hca/EM18o4ot/ygQgS1BoCm9tAajOGWgzo7eEJwDK8LRj2
c/XcKWExxcqkLjiem7CdePbi/xr5jMsPYzOlMtcFaD3zY9h8zabiiGM0kIpT8PVCofgFJMqQdByr
gF0NuioMzAiCY+W9aiaSzquH9FVVE+C4bwsU4leTkANDGi05XBUIYaocNilHnUghG6DyFWS6qYFW
cU4SvRcN5yDDUUjrtFJqp2a2Cs76KgbBr3KQcD42EypUL4/ZS+7/4MN4SA05R/mMtmfK4HwAKcC2
jSB6A93JmnQGIkAem/kzGkKclmfAdGfc4FS+3Cn+6Q==
=Xmrz
-----END PGP SIGNATURE-----

--------------bVKASqf5GXvcY0BXX7G4C4Zl--
", + "historyId": "1332034", + "internalDate": "1639292722000" + } +} \ No newline at end of file diff --git a/test/source/mock/google/exported-messages/message-export-17daefa0eb077da6.json b/test/source/mock/google/exported-messages/message-export-17daefa0eb077da6.json new file mode 100644 index 00000000000..efc266c0911 --- /dev/null +++ b/test/source/mock/google/exported-messages/message-export-17daefa0eb077da6.json @@ -0,0 +1,213 @@ +{ + "acctEmail": "flowcrypt.compatibility@gmail.com", + "full": { + "id": "17daefa0eb077da6", + "threadId": "17daefa0eb077da6", + "labelIds": [ + "UNREAD", + "IMPORTANT", + "CATEGORY_PERSONAL", + "Label_15", + "INBOX" + ], + "snippet": "1234", + "payload": { + "partId": "", + "mimeType": "multipart/signed", + "filename": "", + "headers": [ + { + "name": "X-Gm-Message-State", + "value": "AOAM5310rjz9iRy4imS1iiocbN/AfStgxrKPlqHb8aDoiNOPZ7mNoV7u E+0Fs6oCk4xlEtGG2QPtbqFoKhCoI+07Gg==" + }, + { + "name": "From", + "value": "some.sender@test.com" + }, + { + "name": "Date", + "value": "Sun, 12 Dec 2021 17:09:19 +0300" + }, + { + "name": "MIME-Version", + "value": "1.0" + }, + { + "name": "User-Agent", + "value": "Mozilla/5.0 (Windows NT 6.3; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.3.2" + }, + { + "name": "Content-Language", + "value": "en-US" + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "Subject", + "value": "Thunderbird 91.3.2 html-formatted signed only with key attached" + }, + { + "name": "Autocrypt", + "value": "addr=some.sender@test.com; keydata= xsBNBGG1nOIBCAC1CCjvL0wJ6bYAxP1xWCDJGe4ykbRl9RNxJ8F31baifLPvFDIJdpB7sxOF 7WtFWS6TqfZPRdRhKKAvqlGALNEMJFgi2oK7lElZxrPB8OFBii+oa6IoQn/qWK+FXAEn3k7T eiuEKjmYjMyE2DvDB5P8pMUluwZhvB8H/rmVLLfiK8qm/fnQdU6RCfQ5++IR78kMdOrfRk6e LbuM6D3cyqS+cBq4RWd+VbJ7BT6SJrRJVDQCz3DVlCROJwxW68RRpyK/LY481grXUxqzNoDE IC9gVWD5XtBD6DmZ9LeH2dEj0nmgMsLBqFIUWGccyGOpeHZgl32tDgyhJbKOjDSMwQBVABEB AAHNG0tleTEgPHNvbWUuc2VuZGVyQHRlc3QuY29tPsLAjQQQAQgAIAUCYbWc4gYLCQcIAwIE FQgKAgQWAgEAAhkBAhsDAh4BACEJECA/rnB2AFOBFiEEK7IZd28jzkjruGCcID+ucHYAU4GW ygf/SWos4aPwxX+GdDqFtGXyRLGRh7lL19SY8vZefjUW94rnl+3ATuEx5vtDIrjWlDkryYwo c64B6c86dv6nLP+WPnQDM2n6mRejvNQ+b2KGmn8HLa7mZ7I+pf4gff9T9jjfwa1TZA870L/G QHiAB+6Lf2uPuwH4wjz66JSdRSgOTnsGkgIsIrZDdVEGhqcHdNeL9+oTR5NqtBUCaS8pLPSH OqTFISJhclKtUlBpwz8XLpG3fDdZZCTGsp1dI0PK2xSZY9U/iEREeqKzyqOOoaYBdPhdpGup 3QGEFIRAm0dreMoZpvSAihAC4wN6NGccFGa9R22ytXlSfLD0oNxNeQdA/87ATQRhtZziAQgA 0mmw+727SdQwbwti7AaGQrDo7TpytFKNyrlZVMmEQ2d77KDYGklSQmY2Sg6XL7HAotfSVBnQ si/FzvwyCX2qR9UXC/Upvm4aVQWwgW3V8NeYZiR0pWzJWj61hihAWCRjKBnDdeDwOREiBaku yM+krnHkf/vd9+kh4ZZyQje74Mw69ZuZv5wkGMhaZ5RoOS+E5m1lujPNo/1atNF5pFlVuyxv 8dedFTULzPPE6RgkeZD1W+zmMIqFB7pRMy16U79xcrzrVehnh2dd4AQ4spkgnR4sQZ6XhnvV WEYPU9T59XkxLoWMldq1XIFhuf/Lt3PhsGku7a55wnpDMA50CJMPSQARAQABwsB2BBgBCAAJ BQJhtZziAhsMACEJECA/rnB2AFOBFiEEK7IZd28jzkjruGCcID+ucHYAU4H/EAf9GXlraJYm o1UqKlUR6WuFnTonNvVY6+83uekuHXHj1xBPAFYzuVFd9dnyhQ8ob5VAfSSIBz4EV243steQ L8G+zU5t0uOoSKFHiB/36a6tW2gAmrktGkyERtXENmgAUjsy2C8nuAZq9oyDCNUZT6U//Suk EzvUrkCmVZPpE/sfiEvvo+pgFtaWRGKb6iBNaa7CXosIcJDWi5+ODaM2xeWkbfZrJOBqmKAu TGqaGrN33kRES3fupYst7Q7HWJ0iuSv6qohdt/YubvjXk3yO/XnuqDKLHVrdYgSJkRnvvx3f VZI/m1sX1+3wVCPyQ9hK0ix1ZTZdGYd76dun/fEmuNQHBg==" + }, + { + "name": "Content-Type", + "value": "multipart/signed; micalg=pgp-sha256; protocol=\"application/pgp-signature\"; boundary=\"------------0uFim6rOI5fZebWt0qk8nYxd\"" + } + ], + "body": { + "size": 0 + }, + "parts": [ + { + "partId": "0", + "mimeType": "multipart/mixed", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "multipart/mixed; boundary=\"------------0i0uwO075ZQ0NjkA1rJACksf\"; protected-headers=\"v1\"" + }, + { + "name": "From", + "value": "Some Sender " + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "Message-ID", + "value": "<0fb349f0-ebe4-a376-afe8-6676693a98f8@test.com>" + }, + { + "name": "Subject", + "value": "Thunderbird 91.3.2 html-formatted signed only with key attached" + } + ], + "body": { + "size": 0 + }, + "parts": [ + { + "partId": "0.0", + "mimeType": "multipart/mixed", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "multipart/mixed; boundary=\"------------tbEnUmG6KD47ErjC30Q983TB\"" + } + ], + "body": { + "size": 0 + }, + "parts": [ + { + "partId": "0.0.0", + "mimeType": "text/html", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "text/html; charset=UTF-8" + }, + { + "name": "Content-Transfer-Encoding", + "value": "quoted-printable" + } + ], + "body": { + "size": 166, + "data": "PGh0bWw-DQogIDxoZWFkPg0KDQogICAgPG1ldGEgaHR0cC1lcXVpdj0iY29udGVudC10eXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7IGNoYXJzZXQ9VVRGLTgiPg0KICA8L2hlYWQ-DQogIDxib2R5Pg0KICAgIDxwPjxiPjEyMzQ8L2I-PGJyPg0KICAgIDwvcD4NCiAgPC9ib2R5Pg0KPC9odG1sPg==" + } + }, + { + "partId": "0.0.1", + "mimeType": "application/pgp-keys", + "filename": "OpenPGP_0x203FAE7076005381.asc", + "headers": [ + { + "name": "Content-Type", + "value": "application/pgp-keys; name=\"OpenPGP_0x203FAE7076005381.asc\"" + }, + { + "name": "Content-Disposition", + "value": "attachment; filename=\"OpenPGP_0x203FAE7076005381.asc\"" + }, + { + "name": "Content-Description", + "value": "OpenPGP public key" + }, + { + "name": "Content-Transfer-Encoding", + "value": "quoted-printable" + } + ], + "body": { + "attachmentId": "ANGjdJ-Mddv0XnkP86jJeBDbgKp4_XEtKqMgm9Brg6OpaF868rfMNslEK-uPuLfQYbezxaK-6pVYvSW5tDwvW-4qVM4HVHxKH1vMHfVh8WCK73fZaadX4Q9mxrZE4k1RT_iwgC-xeo1m_k04MxKktX7jwQrfIYGXWmZSzdlj5qdYAJOnOfEEfG66-dADg0-56UzP8IuWiolDMlJ0dJkkR5fjUVC45AKns3DUZ4kqr2fiDqyUecln8nlJGHX_mijEC6v5dQMp4x52_BVR9Hl70Xf_G9RNSfxn-Bwsuwp5Ay740izKiQC9awwnKVSVwcGDZQaAEWO2HFLYCoBKCSO0qE_zEZ3xWOq5jD6RLeueciD3fmLCylx3mcIrqvtjCL0", + "size": 1765 + } + } + ] + } + ] + }, + { + "partId": "1", + "mimeType": "application/pgp-signature", + "filename": "OpenPGP_signature", + "headers": [ + { + "name": "Content-Type", + "value": "application/pgp-signature; name=\"OpenPGP_signature.asc\"" + }, + { + "name": "Content-Description", + "value": "OpenPGP digital signature" + }, + { + "name": "Content-Disposition", + "value": "attachment; filename=\"OpenPGP_signature\"" + } + ], + "body": { + "attachmentId": "ANGjdJ8vtcpLF81NG4tqGWpXE1jXS6kl3RLAe6neIv0cl5xncy5Jx55efH6OVofh0SKWoWJVcrByC2W6KAmO3V33Est4bibPw9tLtpP_FaMpztOpyFCDy2jB6GRVJplLSRLK4SI7G5r_tZqbgqrcPuCSMR9gjGdduoEJCbw1fwyS8z-kfmzxh_TgMJhSq72MsIkVibHmkk9WgId3yr-sfuEjcY9XdJa9rDZ6xTkfNfyY9jP-VfJisV3XP55v-JRGc3v3I-6Sr_w5ILRwii0ilF4lnYV5h0XWgJ2vmWOu9FN14xDBeFFSWbL1AwuS7ESiX2153GJFqs-xQePSa7D1U1DCT4IDzkXOKEesI2IxkAknOit7ZhqoOVxwXQhYqWs", + "size": 505 + } + } + ] + }, + "sizeEstimate": 10888, + "historyId": "1332117", + "internalDate": "1639318159000" + }, + "attachments": { + "ANGjdJ-Mddv0XnkP86jJeBDbgKp4_XEtKqMgm9Brg6OpaF868rfMNslEK-uPuLfQYbezxaK-6pVYvSW5tDwvW-4qVM4HVHxKH1vMHfVh8WCK73fZaadX4Q9mxrZE4k1RT_iwgC-xeo1m_k04MxKktX7jwQrfIYGXWmZSzdlj5qdYAJOnOfEEfG66-dADg0-56UzP8IuWiolDMlJ0dJkkR5fjUVC45AKns3DUZ4kqr2fiDqyUecln8nlJGHX_mijEC6v5dQMp4x52_BVR9Hl70Xf_G9RNSfxn-Bwsuwp5Ay740izKiQC9awwnKVSVwcGDZQaAEWO2HFLYCoBKCSO0qE_zEZ3xWOq5jD6RLeueciD3fmLCylx3mcIrqvtjCL0": { + "data": "LS0tLS1CRUdJTiBQR1AgUFVCTElDIEtFWSBCTE9DSy0tLS0tDQoNCnhzQk5CR0cxbk9JQkNBQzFDQ2p2TDB3SjZiWUF4UDF4V0NESkdlNHlrYlJsOVJOeEo4RjMxYmFpZkxQdkZESUoNCmRwQjdzeE9GN1d0RldTNlRxZlpQUmRSaEtLQXZxbEdBTE5FTUpGZ2kyb0s3bEVsWnhyUEI4T0ZCaWkrb2E2SW8NClFuL3FXSytGWEFFbjNrN1RlaXVFS2ptWWpNeUUyRHZEQjVQOHBNVWx1d1podkI4SC9ybVZMTGZpSzhxbS9mblENCmRVNlJDZlE1KytJUjc4a01kT3JmUms2ZUxidU02RDNjeXFTK2NCcTRSV2QrVmJKN0JUNlNKclJKVkRRQ3ozRFYNCmxDUk9Kd3hXNjhSUnB5Sy9MWTQ4MWdyWFV4cXpOb0RFSUM5Z1ZXRDVYdEJENkRtWjlMZUgyZEVqMG5tZ01zTEINCnFGSVVXR2NjeUdPcGVIWmdsMzJ0RGd5aEpiS09qRFNNd1FCVkFCRUJBQUhORzB0bGVURWdQSE52YldVdWMyVnUNClpHVnlRSFJsYzNRdVkyOXRQc0xBalFRUUFRZ0FJQVVDWWJXYzRnWUxDUWNJQXdJRUZRZ0tBZ1FXQWdFQUFoa0INCkFoc0RBaDRCQUNFSkVDQS9ybkIyQUZPQkZpRUVLN0laZDI4anpranJ1R0NjSUQrdWNIWUFVNEdXeWdmL1NXb3MNCjRhUHd4WCtHZERxRnRHWHlSTEdSaDdsTDE5U1k4dlplZmpVVzk0cm5sKzNBVHVFeDV2dERJcmpXbERrcnlZd28NCmM2NEI2Yzg2ZHY2bkxQK1dQblFETTJuNm1SZWp2TlErYjJLR21uOEhMYTdtWjdJK3BmNGdmZjlUOWpqZndhMVQNClpBODcwTC9HUUhpQUIrNkxmMnVQdXdINHdqejY2SlNkUlNnT1Ruc0drZ0lzSXJaRGRWRUdocWNIZE5lTDkrb1QNClI1TnF0QlVDYVM4cExQU0hPcVRGSVNKaGNsS3RVbEJwd3o4WExwRzNmRGRaWkNUR3NwMWRJMFBLMnhTWlk5VS8NCmlFUkVlcUt6eXFPT29hWUJkUGhkcEd1cDNRR0VGSVJBbTBkcmVNb1pwdlNBaWhBQzR3TjZOR2NjRkdhOVIyMnkNCnRYbFNmTEQwb054TmVRZEEvODdBVFFSaHRaemlBUWdBMG1tdys3MjdTZFF3Ynd0aTdBYUdRckRvN1RweXRGS04NCnlybFpWTW1FUTJkNzdLRFlHa2xTUW1ZMlNnNlhMN0hBb3RmU1ZCblFzaS9GenZ3eUNYMnFSOVVYQy9VcHZtNGENClZRV3dnVzNWOE5lWVppUjBwV3pKV2o2MWhpaEFXQ1JqS0JuRGRlRHdPUkVpQmFrdXlNK2tybkhrZi92ZDkra2gNCjRaWnlRamU3NE13NjladVp2NXdrR01oYVo1Um9PUytFNW0xbHVqUE5vLzFhdE5GNXBGbFZ1eXh2OGRlZEZUVUwNCnpQUEU2UmdrZVpEMVcrem1NSXFGQjdwUk15MTZVNzl4Y3J6clZlaG5oMmRkNEFRNHNwa2duUjRzUVo2WGhudlYNCldFWVBVOVQ1OVhreExvV01sZHExWElGaHVmL0x0M1Boc0drdTdhNTV3bnBETUE1MENKTVBTUUFSQVFBQndzQjINCkJCZ0JDQUFKQlFKaHRaemlBaHNNQUNFSkVDQS9ybkIyQUZPQkZpRUVLN0laZDI4anpranJ1R0NjSUQrdWNIWUENClU0SC9FQWY5R1hscmFKWW1vMVVxS2xVUjZXdUZuVG9uTnZWWTYrODN1ZWt1SFhIajF4QlBBRll6dVZGZDlkbnkNCmhROG9iNVZBZlNTSUJ6NEVWMjQzc3RlUUw4Ryt6VTV0MHVPb1NLRkhpQi8zNmE2dFcyZ0Ftcmt0R2t5RVJ0WEUNCk5tZ0FVanN5MkM4bnVBWnE5b3lEQ05VWlQ2VS8vU3VrRXp2VXJrQ21WWlBwRS9zZmlFdnZvK3BnRnRhV1JHS2INCjZpQk5hYTdDWG9zSWNKRFdpNStPRGFNMnhlV2tiZlpySk9CcW1LQXVUR3FhR3JOMzNrUkVTM2Z1cFlzdDdRN0gNCldKMGl1U3Y2cW9oZHQvWXVidmpYazN5Ty9YbnVxREtMSFZyZFlnU0prUm52dngzZlZaSS9tMXNYMSszd1ZDUHkNClE5aEswaXgxWlRaZEdZZDc2ZHVuL2ZFbXVOUUhCZz09DQo9eURCcA0KLS0tLS1FTkQgUEdQIFBVQkxJQyBLRVkgQkxPQ0stLS0tLQ", + "size": 1765 + }, + "ANGjdJ8vtcpLF81NG4tqGWpXE1jXS6kl3RLAe6neIv0cl5xncy5Jx55efH6OVofh0SKWoWJVcrByC2W6KAmO3V33Est4bibPw9tLtpP_FaMpztOpyFCDy2jB6GRVJplLSRLK4SI7G5r_tZqbgqrcPuCSMR9gjGdduoEJCbw1fwyS8z-kfmzxh_TgMJhSq72MsIkVibHmkk9WgId3yr-sfuEjcY9XdJa9rDZ6xTkfNfyY9jP-VfJisV3XP55v-JRGc3v3I-6Sr_w5ILRwii0ilF4lnYV5h0XWgJ2vmWOu9FN14xDBeFFSWbL1AwuS7ESiX2153GJFqs-xQePSa7D1U1DCT4IDzkXOKEesI2IxkAknOit7ZhqoOVxwXQhYqWs": { + "data": "LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0NCg0Kd3NCNUJBQUJDQUFqRmlFRUs3SVpkMjhqemtqcnVHQ2NJRCt1Y0hZQVU0RUZBbUcyQW84RkF3QUFBQUFBQ2drUUlEK3VjSFlBVTRHeQ0KaVFnQXB0L0tFdGFwTFNwdjQ1ZTIvQ2xKMHBGenV0RzZoQ1luSmg2dkVMVjlnSGFTNzVWdTNuQlpQVXpQVUs4NS9pSk5sbktIMjNhMQ0KNUhaV2Iwa3pVQnhOcUUzYmJGV0cvejBWMFZxdUxodldDV0hoNURwaUlSUW9uOEc2eEpTZW9XK0hydVN6RlpydXU5QlhUOVlPUmlXaQ0KWlJzMktJTVBpR0s5eHhlY3ladFU4MXVZS1ZzR2xPL0N5RS8zd1hjZUJLVGtOdCsrUVN4T2FUR3pjWk5BU1pyV2d1U3kzejVLU3NsVQ0KUlhSYmZRb0xVSDdua29RT2xmcGVZZ0ZsaWIrSzdrT05Xc0ZuOGdIUzFMTGYwa1ErZG91alpMTHU0RGw4d0FpN21ZM1prU1A5K1J5Vw0KWjY5a2tiMFJSdEUrb0ZTUnhYYnM4Q0xGRkkwbU05U054ajBDSW1XekJRPT0NCj1mdGZODQotLS0tLUVORCBQR1AgU0lHTkFUVVJFLS0tLS0NCg", + "size": 505 + } + }, + "raw": { + "id": "17daefa0eb077da6", + "threadId": "17daefa0eb077da6", + "labelIds": [ + "UNREAD", + "IMPORTANT", + "CATEGORY_PERSONAL", + "Label_15", + "INBOX" + ], + "snippet": "1234", + "sizeEstimate": 10888, + "raw": "Delivered-To: flowcrypt.compatibility@gmail.com
Received: by 2002:a67:fd51:0:0:0:0:0 with SMTP id g17csp4529697vsr;
        Sun, 12 Dec 2021 06:09:23 -0800 (PST)
X-Received: by 2002:a2e:b88c:: with SMTP id r12mr23086410ljp.204.1639318163337;
        Sun, 12 Dec 2021 06:09:23 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1639318163; cv=none;
        d=google.com; s=arc-20160816;
        b=IuUuoDPQEhtJkRl9BHWvwLvcKnTmhEgglC1U+/yY395+pO6P6QQ76XgYlVHG9LU7dp
         IOS/EemXLtFew2ZzWYP3f8I4w8eFIlCNT/LKOAyP7V+nbW3O4nQgnGNkwsvxhuKZ7Cqi
         BiENPJDJActJKpSVzM0uSq8AywmyYnUR0Hf6bPvLhY0lgE6wYuQfYV2mP9tZ2wn/CSvL
         QaP/EKwBwYlhGQTYIDvxjCs3DtSjzIQeX7ixqcAZWdx9FyLZXCNaW1L++kTU8AEAmHRN
         4ONBgaYlhbjEWv5UQP05BDqwUR03PX1xrqoj2razjxJHbtZTpl2uRKffnN+fC/rq6PeL
         UuNw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
        h=autocrypt:subject:to:content-language:user-agent:mime-version:date
         :message-id:from:dkim-signature;
        bh=2TQdIIjOcY0Etri5BTSCTty2I+em5gHmc8aWqCED0x4=;
        b=EOdcuMa5Orb25SDXSichnWjI3uJx8D9o6/U3FZ+IeKELgvJbg7xqNZyxhrk0Q98Poa
         pPOBWxVUh0/ak2DYaXo3hbEV1it8wxLdTwu9KxU5z7XtORTfQklpcVyvQn7T1CRXx1Qf
         8gVg1xEeqPpdehubWTHgLJgFUeZ0V8QvD7Uv81Y2iSf8Rwd3YyPOYPtt2/6/YDGQ7AEH
         poY0f5m+SCgETQYW5vV+bAuhb4Krfom0rnzNdzGWKqN24eVFVwK70nW0w/r3zYSZLMn1
         TVa5lzsyiOdqrEfI7uHYTm+dS8RLwFxS91HJExR0OYEVZjPX65pv4SdaxpuIhgm+G/IE
         Z+pg==
ARC-Authentication-Results: i=1; mx.google.com;
       dkim=pass header.i=@flowcrypt-dev.20210112.gappssmtp.com header.s=20210112 header.b="dCS/4x8a";
       spf=neutral (google.com: 209.85.220.41 is neither permitted nor denied by best guess record for domain of ci.tests.gmail@flowcrypt.dev) smtp.mailfrom=ci.tests.gmail@flowcrypt.dev
Return-Path: <ci.tests.gmail@flowcrypt.dev>
Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41])
        by mx.google.com with SMTPS id p22sor3806585lji.31.2021.12.12.06.09.23
        for <flowcrypt.compatibility@gmail.com>
        (Google Transport Security);
        Sun, 12 Dec 2021 06:09:23 -0800 (PST)
Received-SPF: neutral (google.com: 209.85.220.41 is neither permitted nor denied by best guess record for domain of ci.tests.gmail@flowcrypt.dev) client-ip=209.85.220.41;
Authentication-Results: mx.google.com;
       dkim=pass header.i=@flowcrypt-dev.20210112.gappssmtp.com header.s=20210112 header.b="dCS/4x8a";
       spf=neutral (google.com: 209.85.220.41 is neither permitted nor denied by best guess record for domain of ci.tests.gmail@flowcrypt.dev) smtp.mailfrom=ci.tests.gmail@flowcrypt.dev
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=flowcrypt-dev.20210112.gappssmtp.com; s=20210112;
        h=from:message-id:date:mime-version:user-agent:content-language:to
         :subject:autocrypt;
        bh=2TQdIIjOcY0Etri5BTSCTty2I+em5gHmc8aWqCED0x4=;
        b=dCS/4x8apKPHHiOriNZpiQreIjHy5h8T38TWWjPL7mXUtfemyzvszcA4+O3+AuVB/a
         puHCEVphbjpWhQ8AwyTLmlwkNacjiAhhvo2EyR3DCmgLmFXFFTNaq+6ytj08SV7zh/0c
         eQzOF/CfOQvZIwBfUP3v2sC1Nx1Uu6D1FVTPMP070UuKiUP4UgpP/yyOMjpn3wh4HjNN
         K+jAjOYHgTnMG0KZ9SBPgehrZzKn9W2yucqrW4YQLfHFUlu+a2fPcLjXNO15hNFa0so8
         qCqEv8YDF1YvULxD+VkSFarSz8z4gv6y3f12hLJsv/XUGNEw/DVeGMzsPJ0O2LXGKiXI
         822w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20210112;
        h=x-gm-message-state:from:message-id:date:mime-version:user-agent
         :content-language:to:subject:autocrypt;
        bh=2TQdIIjOcY0Etri5BTSCTty2I+em5gHmc8aWqCED0x4=;
        b=G/JuHGL5Xoxq6pQPDSW16i4xdywyGxn98QIiWuEtq8uAHOB3zq9J4Hluiklpu5n12w
         0lJ+x3PaY1QBWtpfteZ7O0HnN1hA2wM6JBveY1MHYJc1C9OebC3FyRvB8MHIPV0aj7CL
         4skgoo1fhG1g+vAY3dVq9hCAySOp72zC2SnC77QnWfN92XRYl6aRIfsoXhDRnk6ewGn5
         PYaFMcSxZde25G7Goo65lUwxTkZm5U+gDyWq99SX40EZRvrVhVm9dyN5T5s3lqPs342O
         PSnfLXUYRjfE3D6b2OwK4yhgzipd1S6cFe2QIZo0RYKUiLqSzZ54nRfHXisEx3HBDWUt
         KEdQ==
X-Gm-Message-State: AOAM5310rjz9iRy4imS1iiocbN/AfStgxrKPlqHb8aDoiNOPZ7mNoV7u
	E+0Fs6oCk4xlEtGG2QPtbqFoKhCoI+07Gg==
X-Google-Smtp-Source: ABdhPJzIWlEvGOVdN3srW0mqGjw9uq3EcBimVyN1KLhA4+NTlPYOXvi6n2Odi38fjkeZM/DI8NUdTQ==
X-Received: by 2002:a2e:7114:: with SMTP id m20mr24123970ljc.229.1639318162333;
        Sun, 12 Dec 2021 06:09:22 -0800 (PST)
Return-Path: <ci.tests.gmail@flowcrypt.dev>
Received: from [192.168.1.8] (0892631706.static.corbina.ru. [78.107.195.113])
        by smtp.gmail.com with ESMTPSA id h11sm1037582ljb.42.2021.12.12.06.09.21
        for <flowcrypt.compatibility@gmail.com>
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Sun, 12 Dec 2021 06:09:21 -0800 (PST)
From: CI Test 68 <ci.tests.gmail@flowcrypt.dev>
X-Google-Original-From: CI Test 68 <some.sender@test.com>
Message-ID: <0fb349f0-ebe4-a376-afe8-6676693a98f8@test.com>
Date: Sun, 12 Dec 2021 17:09:19 +0300
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Windows NT 6.3; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.3.2
Content-Language: en-US
To: flowcrypt.compatibility@gmail.com
Subject: Thunderbird 91.3.2 html-formatted signed only with key attached
Autocrypt: addr=some.sender@test.com; keydata=
 xsBNBGG1nOIBCAC1CCjvL0wJ6bYAxP1xWCDJGe4ykbRl9RNxJ8F31baifLPvFDIJdpB7sxOF
 7WtFWS6TqfZPRdRhKKAvqlGALNEMJFgi2oK7lElZxrPB8OFBii+oa6IoQn/qWK+FXAEn3k7T
 eiuEKjmYjMyE2DvDB5P8pMUluwZhvB8H/rmVLLfiK8qm/fnQdU6RCfQ5++IR78kMdOrfRk6e
 LbuM6D3cyqS+cBq4RWd+VbJ7BT6SJrRJVDQCz3DVlCROJwxW68RRpyK/LY481grXUxqzNoDE
 IC9gVWD5XtBD6DmZ9LeH2dEj0nmgMsLBqFIUWGccyGOpeHZgl32tDgyhJbKOjDSMwQBVABEB
 AAHNG0tleTEgPHNvbWUuc2VuZGVyQHRlc3QuY29tPsLAjQQQAQgAIAUCYbWc4gYLCQcIAwIE
 FQgKAgQWAgEAAhkBAhsDAh4BACEJECA/rnB2AFOBFiEEK7IZd28jzkjruGCcID+ucHYAU4GW
 ygf/SWos4aPwxX+GdDqFtGXyRLGRh7lL19SY8vZefjUW94rnl+3ATuEx5vtDIrjWlDkryYwo
 c64B6c86dv6nLP+WPnQDM2n6mRejvNQ+b2KGmn8HLa7mZ7I+pf4gff9T9jjfwa1TZA870L/G
 QHiAB+6Lf2uPuwH4wjz66JSdRSgOTnsGkgIsIrZDdVEGhqcHdNeL9+oTR5NqtBUCaS8pLPSH
 OqTFISJhclKtUlBpwz8XLpG3fDdZZCTGsp1dI0PK2xSZY9U/iEREeqKzyqOOoaYBdPhdpGup
 3QGEFIRAm0dreMoZpvSAihAC4wN6NGccFGa9R22ytXlSfLD0oNxNeQdA/87ATQRhtZziAQgA
 0mmw+727SdQwbwti7AaGQrDo7TpytFKNyrlZVMmEQ2d77KDYGklSQmY2Sg6XL7HAotfSVBnQ
 si/FzvwyCX2qR9UXC/Upvm4aVQWwgW3V8NeYZiR0pWzJWj61hihAWCRjKBnDdeDwOREiBaku
 yM+krnHkf/vd9+kh4ZZyQje74Mw69ZuZv5wkGMhaZ5RoOS+E5m1lujPNo/1atNF5pFlVuyxv
 8dedFTULzPPE6RgkeZD1W+zmMIqFB7pRMy16U79xcrzrVehnh2dd4AQ4spkgnR4sQZ6XhnvV
 WEYPU9T59XkxLoWMldq1XIFhuf/Lt3PhsGku7a55wnpDMA50CJMPSQARAQABwsB2BBgBCAAJ
 BQJhtZziAhsMACEJECA/rnB2AFOBFiEEK7IZd28jzkjruGCcID+ucHYAU4H/EAf9GXlraJYm
 o1UqKlUR6WuFnTonNvVY6+83uekuHXHj1xBPAFYzuVFd9dnyhQ8ob5VAfSSIBz4EV243steQ
 L8G+zU5t0uOoSKFHiB/36a6tW2gAmrktGkyERtXENmgAUjsy2C8nuAZq9oyDCNUZT6U//Suk
 EzvUrkCmVZPpE/sfiEvvo+pgFtaWRGKb6iBNaa7CXosIcJDWi5+ODaM2xeWkbfZrJOBqmKAu
 TGqaGrN33kRES3fupYst7Q7HWJ0iuSv6qohdt/YubvjXk3yO/XnuqDKLHVrdYgSJkRnvvx3f
 VZI/m1sX1+3wVCPyQ9hK0ix1ZTZdGYd76dun/fEmuNQHBg==
Content-Type: multipart/signed; micalg=pgp-sha256;
 protocol="application/pgp-signature";
 boundary="------------0uFim6rOI5fZebWt0qk8nYxd"

This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
--------------0uFim6rOI5fZebWt0qk8nYxd
Content-Type: multipart/mixed; boundary="------------0i0uwO075ZQ0NjkA1rJACksf";
 protected-headers="v1"
From: CI Test 68 <some.sender@test.com>
To: flowcrypt.compatibility@gmail.com
Message-ID: <0fb349f0-ebe4-a376-afe8-6676693a98f8@test.com>
Subject: Thunderbird 91.3.2 html-formatted signed only with key attached

--------------0i0uwO075ZQ0NjkA1rJACksf
Content-Type: multipart/mixed; boundary="------------tbEnUmG6KD47ErjC30Q983TB"

--------------tbEnUmG6KD47ErjC30Q983TB
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

<html>
  <head>

    <meta http-equiv=3D"content-type" content=3D"text/html; charset=3DUTF=
-8">
  </head>
  <body>
    <p><b>1234</b><br>
    </p>
  </body>
</html>
--------------tbEnUmG6KD47ErjC30Q983TB
Content-Type: application/pgp-keys; name="OpenPGP_0x203FAE7076005381.asc"
Content-Disposition: attachment; filename="OpenPGP_0x203FAE7076005381.asc"
Content-Description: OpenPGP public key
Content-Transfer-Encoding: quoted-printable

-----BEGIN PGP PUBLIC KEY BLOCK-----

xsBNBGG1nOIBCAC1CCjvL0wJ6bYAxP1xWCDJGe4ykbRl9RNxJ8F31baifLPvFDIJ
dpB7sxOF7WtFWS6TqfZPRdRhKKAvqlGALNEMJFgi2oK7lElZxrPB8OFBii+oa6Io
Qn/qWK+FXAEn3k7TeiuEKjmYjMyE2DvDB5P8pMUluwZhvB8H/rmVLLfiK8qm/fnQ
dU6RCfQ5++IR78kMdOrfRk6eLbuM6D3cyqS+cBq4RWd+VbJ7BT6SJrRJVDQCz3DV
lCROJwxW68RRpyK/LY481grXUxqzNoDEIC9gVWD5XtBD6DmZ9LeH2dEj0nmgMsLB
qFIUWGccyGOpeHZgl32tDgyhJbKOjDSMwQBVABEBAAHNG0tleTEgPHNvbWUuc2Vu
ZGVyQHRlc3QuY29tPsLAjQQQAQgAIAUCYbWc4gYLCQcIAwIEFQgKAgQWAgEAAhkB
AhsDAh4BACEJECA/rnB2AFOBFiEEK7IZd28jzkjruGCcID+ucHYAU4GWygf/SWos
4aPwxX+GdDqFtGXyRLGRh7lL19SY8vZefjUW94rnl+3ATuEx5vtDIrjWlDkryYwo
c64B6c86dv6nLP+WPnQDM2n6mRejvNQ+b2KGmn8HLa7mZ7I+pf4gff9T9jjfwa1T
ZA870L/GQHiAB+6Lf2uPuwH4wjz66JSdRSgOTnsGkgIsIrZDdVEGhqcHdNeL9+oT
R5NqtBUCaS8pLPSHOqTFISJhclKtUlBpwz8XLpG3fDdZZCTGsp1dI0PK2xSZY9U/
iEREeqKzyqOOoaYBdPhdpGup3QGEFIRAm0dreMoZpvSAihAC4wN6NGccFGa9R22y
tXlSfLD0oNxNeQdA/87ATQRhtZziAQgA0mmw+727SdQwbwti7AaGQrDo7TpytFKN
yrlZVMmEQ2d77KDYGklSQmY2Sg6XL7HAotfSVBnQsi/FzvwyCX2qR9UXC/Upvm4a
VQWwgW3V8NeYZiR0pWzJWj61hihAWCRjKBnDdeDwOREiBakuyM+krnHkf/vd9+kh
4ZZyQje74Mw69ZuZv5wkGMhaZ5RoOS+E5m1lujPNo/1atNF5pFlVuyxv8dedFTUL
zPPE6RgkeZD1W+zmMIqFB7pRMy16U79xcrzrVehnh2dd4AQ4spkgnR4sQZ6XhnvV
WEYPU9T59XkxLoWMldq1XIFhuf/Lt3PhsGku7a55wnpDMA50CJMPSQARAQABwsB2
BBgBCAAJBQJhtZziAhsMACEJECA/rnB2AFOBFiEEK7IZd28jzkjruGCcID+ucHYA
U4H/EAf9GXlraJYmo1UqKlUR6WuFnTonNvVY6+83uekuHXHj1xBPAFYzuVFd9dny
hQ8ob5VAfSSIBz4EV243steQL8G+zU5t0uOoSKFHiB/36a6tW2gAmrktGkyERtXE
NmgAUjsy2C8nuAZq9oyDCNUZT6U//SukEzvUrkCmVZPpE/sfiEvvo+pgFtaWRGKb
6iBNaa7CXosIcJDWi5+ODaM2xeWkbfZrJOBqmKAuTGqaGrN33kRES3fupYst7Q7H
WJ0iuSv6qohdt/YubvjXk3yO/XnuqDKLHVrdYgSJkRnvvx3fVZI/m1sX1+3wVCPy
Q9hK0ix1ZTZdGYd76dun/fEmuNQHBg=3D=3D
=3DyDBp
-----END PGP PUBLIC KEY BLOCK-----
--------------tbEnUmG6KD47ErjC30Q983TB--


--------------0i0uwO075ZQ0NjkA1rJACksf--

--------------0uFim6rOI5fZebWt0qk8nYxd
Content-Type: application/pgp-signature; name="OpenPGP_signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="OpenPGP_signature"

-----BEGIN PGP SIGNATURE-----

wsB5BAABCAAjFiEEK7IZd28jzkjruGCcID+ucHYAU4EFAmG2Ao8FAwAAAAAACgkQID+ucHYAU4Gy
iQgApt/KEtapLSpv45e2/ClJ0pFzutG6hCYnJh6vELV9gHaS75Vu3nBZPUzPUK85/iJNlnKH23a1
5HZWb0kzUBxNqE3bbFWG/z0V0VquLhvWCWHh5DpiIRQon8G6xJSeoW+HruSzFZruu9BXT9YORiWi
ZRs2KIMPiGK9xxecyZtU81uYKVsGlO/CyE/3wXceBKTkNt++QSxOaTGzcZNASZrWguSy3z5KSslU
RXRbfQoLUH7nkoQOlfpeYgFlib+K7kONWsFn8gHS1LLf0kQ+doujZLLu4Dl8wAi7mY3ZkSP9+RyW
Z69kkb0RRtE+oFSRxXbs8CLFFI0mM9SNxj0CImWzBQ==
=ftfN
-----END PGP SIGNATURE-----

--------------0uFim6rOI5fZebWt0qk8nYxd--
", + "historyId": "1332117", + "internalDate": "1639318159000" + } +} \ No newline at end of file diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index 39d551417e5..7dcf1f3e5f2 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -331,7 +331,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te })); ava.default('decrypt - thunderbird - signedHtml verifyDetached doesn\'t duplicate PGP key section', testWithBrowser('compatibility', async (t, browser) => { - const threadId = '1754cfd1b2f1d6e5'; + const threadId = '17daefa0eb077da6'; const acctEmail = 'flowcrypt.compatibility@gmail.com'; const inboxPage = await browser.newPage(t, TestUrls.extension(`chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`)); await inboxPage.waitAll('iframe'); @@ -342,7 +342,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te })); ava.default('decrypt - thunderbird - signedMsg verifyDetached doesn\'t duplicate PGP key section', testWithBrowser('compatibility', async (t, browser) => { - const threadId = '1754cfc37886899e'; + const threadId = '17dad75e63e47f97'; const acctEmail = 'flowcrypt.compatibility@gmail.com'; const inboxPage = await browser.newPage(t, TestUrls.extension(`chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`)); await inboxPage.waitAll('iframe'); @@ -364,44 +364,45 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te })); ava.default('decrypt - thunderbird - signed text is recognized', testWithBrowser('compatibility', async (t, browser) => { - const threadId = '1754cfc37886899e'; + const threadId = '17dad75e63e47f97'; const acctEmail = 'flowcrypt.compatibility@gmail.com'; const inboxPage = await browser.newPage(t, TestUrls.extension(`chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`)); await inboxPage.waitAll('iframe', { timeout: 2 }); const urls = await inboxPage.getFramesUrls(['/chrome/elements/pgp_block.htm'], { sleep: 10, appearIn: 20 }); expect(urls.length).to.equal(1); const url = urls[0].split('/chrome/elements/pgp_block.htm')[1]; - const signature = ['dhartley@verdoncollege.school.nz', 'matching signature']; + const signature = ['some.sender@test.com', 'matching signature']; await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { params: url, content: ['1234'], signature }); })); ava.default('decrypt - fetched pubkey is automatically saved to contacts', testWithBrowser('compatibility', async (t, browser) => { - const msgId = '1754cfc37886899e'; + const msgId = '17dad75e63e47f97'; const acctEmail = 'flowcrypt.compatibility@gmail.com'; + const senderEmail = 'some.sender@test.com'; + const acctAttr = acctEmail.replace(/[\.@]/g, ''); + const senderAttr = senderEmail.replace(/[\.@]/g, ''); { const settingsPage = await browser.newPage(t, TestUrls.extensionSettings(acctEmail)); await SettingsPageRecipe.toggleScreen(settingsPage, 'additional'); const contactsFrame = await SettingsPageRecipe.awaitNewPageFrame(settingsPage, '@action-open-contacts-page', ['contacts.htm', 'placement=settings']); await contactsFrame.waitAll('@page-contacts'); await Util.sleep(1); - expect(await contactsFrame.isElementPresent('@action-show-email-flowcryptcompatibilitygmailcom')).to.be.true; - expect(await contactsFrame.isElementPresent('@action-show-email-dhartleyverdoncollegeschoolnz')).to.be.false; + expect(await contactsFrame.isElementPresent(`@action-show-email-${acctAttr}`)).to.be.true; + expect(await contactsFrame.isElementPresent(`@action-show-email-${senderAttr}`)).to.be.false; } - const params = `?frameId=none&acctEmail=${acctEmail}&msgId=${msgId}&signature=___cu_true___&senderEmail=dhartley@verdoncollege.school.nz`; + const params = `?frameId=none&acctEmail=${acctEmail}&msgId=${msgId}&signature=___cu_true___&senderEmail=${senderEmail}`; await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { params, content: ['1234'] }); - // the fetched pubkey is saved to ContactStore asynchronously, so let's wait a little - await Util.sleep(1); { const settingsPage = await browser.newPage(t, TestUrls.extensionSettings(acctEmail)); await SettingsPageRecipe.toggleScreen(settingsPage, 'additional'); const contactsFrame = await SettingsPageRecipe.awaitNewPageFrame(settingsPage, '@action-open-contacts-page', ['contacts.htm', 'placement=settings']); await contactsFrame.waitAll('@page-contacts'); await Util.sleep(1); - expect(await contactsFrame.isElementPresent('@action-show-email-flowcryptcompatibilitygmailcom')).to.be.true; - expect(await contactsFrame.isElementPresent('@action-show-email-dhartleyverdoncollegeschoolnz')).to.be.true; - await contactsFrame.waitAndClick('@action-show-email-dhartleyverdoncollegeschoolnz'); - // contains newly fetched key - await contactsFrame.waitForContent('@page-contacts', 'openpgp - active - DC26 454A FB71 D18E ABBA D73D 1C7E 6D3C 5563 A941'); + expect(await contactsFrame.isElementPresent(`@action-show-email-${acctAttr}`)).to.be.true; + expect(await contactsFrame.isElementPresent(`@action-show-email-${senderAttr}`)).to.be.true; + await contactsFrame.waitAndClick(`@action-show-email-${senderAttr}`); + // contains the newly fetched key + await contactsFrame.waitForContent('@page-contacts', 'openpgp - active - 2BB2 1977 6F23 CE48 EBB8 609C 203F AE70 7600 5381'); } })); @@ -463,9 +464,9 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te })); ava.default('decrypt - re-fetch signed-only message from API on non-fatal verification error', testWithBrowser('compatibility', async (t, browser) => { - const msgId = '1754cfd1b2f1d6e5'; + const msgId = '17daefa0eb077da6'; const acctEmail = 'flowcrypt.compatibility@gmail.com'; - const signerEmail = 'dhartley@verdoncollege.school.nz'; + const signerEmail = 'some.sender@test.com'; const data = await GoogleData.withInitializedData(acctEmail); const msg = data.getMessage(msgId)!; const signature = Buf.fromBase64Str(msg!.raw!).toUtfStr() @@ -475,7 +476,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { params, content: [], // todo: #4164 I would expect '1234' here - signature: ['dhartley@verdoncollege.school.nz', 'matching signature'] + signature: ['some.sender@test.com', 'matching signature'] }); })); diff --git a/test/source/tests/unit-node.ts b/test/source/tests/unit-node.ts index 074a4e8b537..5401830d7c4 100644 --- a/test/source/tests/unit-node.ts +++ b/test/source/tests/unit-node.ts @@ -814,13 +814,13 @@ jLwe8W9IMt765T5x5oux9MmPDXF05xHfm4qfH/BMO3a802x5u2gJjJjuknrFdgXY ava.default('[unit][MsgUtil.verifyDetached] verifies Thunderbird html signed message', async t => { const data = await GoogleData.withInitializedData('flowcrypt.compatibility@gmail.com'); - const msg: GmailMsg = data.getMessage('1754cfd1b2f1d6e5')!; + const msg: GmailMsg = data.getMessage('17daefa0eb077da6')!; const msgText = Buf.fromBase64Str(msg!.raw!).toUtfStr(); const sigText = msgText .match(/\-\-\-\-\-BEGIN PGP SIGNATURE\-\-\-\-\-.*\-\-\-\-\-END PGP SIGNATURE\-\-\-\-\-/s)![0] .replace(/=\r\n/g, '').replace(/=3D/g, '='); const plaintext = msgText - .match(/Content\-Type: multipart\/mixed; boundary="vv8xtFOOk2SxbnIpwvxkobfET7PglPfc3".*\-\-vv8xtFOOk2SxbnIpwvxkobfET7PglPfc3\-\-\r?\n/s)![0] + .match(/Content\-Type: multipart\/mixed; boundary="------------0i0uwO075ZQ0NjkA1rJACksf".*--------------0i0uwO075ZQ0NjkA1rJACksf--\r?\n/s)![0] .replace(/\r?\n/g, '\r\n')!; const pubkey = plaintext .match(/\-\-\-\-\-BEGIN PGP PUBLIC KEY BLOCK\-\-\-\-\-.*\-\-\-\-\-END PGP PUBLIC KEY BLOCK\-\-\-\-\-/s)![0] @@ -832,13 +832,13 @@ jLwe8W9IMt765T5x5oux9MmPDXF05xHfm4qfH/BMO3a802x5u2gJjJjuknrFdgXY ava.default('[unit][MsgUtil.verifyDetached] verifies Thunderbird text signed message', async t => { const data = await GoogleData.withInitializedData('flowcrypt.compatibility@gmail.com'); - const msg: GmailMsg = data.getMessage('1754cfc37886899e')!; + const msg: GmailMsg = data.getMessage('17dad75e63e47f97')!; const msgText = Buf.fromBase64Str(msg!.raw!).toUtfStr(); const sigText = msgText .match(/\-\-\-\-\-BEGIN PGP SIGNATURE\-\-\-\-\-.*\-\-\-\-\-END PGP SIGNATURE\-\-\-\-\-/s)![0] .replace(/=\r\n/g, '').replace(/=3D/g, '='); const plaintext = msgText - .match(/Content\-Type: multipart\/mixed; boundary="XWwnusC4nxhk2LRvLCC6Skcb8YiKQ4Lu0".*\-\-XWwnusC4nxhk2LRvLCC6Skcb8YiKQ4Lu0\-\-\r?\n/s)![0] + .match(/Content\-Type: multipart\/mixed; boundary="------------FQ7CfxuiGriwTfTfyc4i1ppF".*-------------FQ7CfxuiGriwTfTfyc4i1ppF--\r?\n/s)![0] .replace(/\r?\n/g, '\r\n')!; const pubkey = plaintext .match(/\-\-\-\-\-BEGIN PGP PUBLIC KEY BLOCK\-\-\-\-\-.*\-\-\-\-\-END PGP PUBLIC KEY BLOCK\-\-\-\-\-/s)![0] @@ -874,26 +874,24 @@ jLwe8W9IMt765T5x5oux9MmPDXF05xHfm4qfH/BMO3a802x5u2gJjJjuknrFdgXY ava.default(`[unit][MsgUtil.verifyDetached] returns non-fatal error when signature doesn't match`, async t => { const sigText = Buf.fromUtfStr(`-----BEGIN PGP SIGNATURE----- -wsD5BAABCAAjFiEE3CZFSvtx0Y6rutc9HH5tPFVjqUEFAl+QotYFAwAAAAAACgkQHH5tPFVjqUF4 -xgv+MrdQ07MfCVU93ptZg+S+OOkQ1AcZxGFdiivs10KkNGtLm9s+w/iEUAySSWbtKjbLV6O3AYvC -QFKsFRFr17Ekz6mSPj99zifFMBvTOIAev/d08dmX0kGd6YlP+GyZL3Wqcgy1T1H3obgOmToDtk7R -V52Ki1aTJYH/Z7v6PsQRWn8emfH/yGYplBhzZy2XjO6UIar9T8wtAJOd6+Ii2sfyGyEPjzGckLaR -JZOxQ4jpJJUszz2WsvLNwtKoqwV15Eg3oxZzHWYE8P63xXoE4G762604SIqv/ggyQZTt/Es6Scun -A1BJflFm+cHzQTW2yQfwCCvlzEZNiNwXfwGfV99K5iG1eW3lv7sMLJnitwTidNIlD5LTNdeUnTXj -XJvkEQsyTUI4qbzzJbUNYz7lraizC2nPiwFzLv692mS0urtD3mUhOBA9hZwk3l/20GsGia0FeUIS -E1d8Vh/Ey7IJ8TXbfFrdv5ZP3HqMK0089SooZwx/GN2QIaOYQXsS0u7IFNhU\n=q5Sf +wsB5BAABCAAjFiEEK7IZd28jzkjruGCcID+ucHYAU4EFAmG1nzIFAwAAAAAACgkQID+ucHYAU4H1 +9AgAmi5QUmrzlMa/V8SeEv7VydA3v7Hca/EM18o4ot/ygQgS1BoCm9tAajOGWgzo7eEJwDK8LRj2 +c/XcKWExxcqkLjiem7CdePbi/xr5jMsPYzOlMtcFaD3zY9h8zabiiGM0kIpT8PVCofgFJMqQdByr +gF0NuioMzAiCY+W9aiaSzquH9FVVE+C4bwsU4leTkANDGi05XBUIYaocNilHnUghG6DyFWS6qYFW +cU4SvRcN5yDDUUjrtFJqp2a2Cs76KgbBr3KQcD42EypUL4/ZS+7/4MN4SA05R/mMtmfK4HwAKcC2 +jSB6A93JmnQGIkAem/kzGkKclmfAdGfc4FS+3Cn+6Q==Xmrz -----END PGP SIGNATURE-----`); const data = await GoogleData.withInitializedData('flowcrypt.compatibility@gmail.com'); - const msg = data.getMessage('1754cfc37886899e')!; + const msg = data.getMessage('17dad75e63e47f97')!; const msgText = Buf.fromBase64Str(msg!.raw!).toUtfStr(); { - const dhartleyPubkey = msgText + const pubkey = msgText .match(/\-\-\-\-\-BEGIN PGP PUBLIC KEY BLOCK\-\-\-\-\-.*\-\-\-\-\-END PGP PUBLIC KEY BLOCK\-\-\-\-\-/s)![0] .replace(/=\r\n/g, '').replace(/=3D/g, '='); const resultRightKey = await MsgUtil.verifyDetached({ plaintext: Buf.fromUtfStr('some irrelevant text'), sigText, - verificationPubs: [dhartleyPubkey] + verificationPubs: [pubkey] }); expect(resultRightKey.match).to.be.false; expect(resultRightKey.error).to.not.be.undefined; From cb682af9babd42c7800ab6decb77352ad76efae1 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 15 Dec 2021 06:57:41 +0000 Subject: [PATCH 27/31] moved key sorting to platform-independent module --- extension/js/common/core/crypto/key.ts | 9 +++++++++ extension/js/common/platform/store/contact-store.ts | 12 +----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/extension/js/common/core/crypto/key.ts b/extension/js/common/core/crypto/key.ts index b58af65494c..f3b37c86859 100644 --- a/extension/js/common/core/crypto/key.ts +++ b/extension/js/common/core/crypto/key.ts @@ -429,4 +429,13 @@ export class KeyUtil { return fetched.lastModified > stored.lastModified; }; + public static sortPubkeyInfos = (pubkeyInfos: PubkeyInfo[]): PubkeyInfo[] => { + return pubkeyInfos.sort((a, b) => KeyUtil.getSortValue(b) - KeyUtil.getSortValue(a)); + }; + + private static getSortValue = (pubinfo: PubkeyInfo): number => { + const expirationSortValue = (typeof pubinfo.pubkey.expiration === 'undefined') ? Infinity : pubinfo.pubkey.expiration!; + // sort non-revoked first, then non-expired + return (pubinfo.revoked || pubinfo.pubkey.revoked) ? -Infinity : expirationSortValue; + }; } diff --git a/extension/js/common/platform/store/contact-store.ts b/extension/js/common/platform/store/contact-store.ts index db9098fad65..16546c7f6f0 100644 --- a/extension/js/common/platform/store/contact-store.ts +++ b/extension/js/common/platform/store/contact-store.ts @@ -453,16 +453,6 @@ export class ContactStore extends AbstractStore { }); }; - public static sortPubkeyInfos = (pubkeyInfos: PubkeyInfo[]): PubkeyInfo[] => { - return pubkeyInfos.sort((a, b) => ContactStore.getSortValue(b) - ContactStore.getSortValue(a)); - }; - - public static getSortValue = (pubinfo: PubkeyInfo): number => { - const expirationSortValue = (typeof pubinfo.pubkey.expiration === 'undefined') ? Infinity : pubinfo.pubkey.expiration!; - // sort non-revoked first, then non-expired - return (pubinfo.revoked || pubinfo.pubkey.revoked) ? -Infinity : expirationSortValue; - }; - private static sortKeys = async (pubkeys: Pubkey[], revocations: Revocation[]): Promise => { // parse the keys const pubkeyInfos = await Promise.all(pubkeys.map(async (pubkey) => { @@ -470,7 +460,7 @@ export class ContactStore extends AbstractStore { const revoked = pk.revoked || revocations.some(r => ContactStore.equalFingerprints(pk.id, r.fingerprint)); return { lastCheck: pubkey.lastCheck || undefined, pubkey: pk, revoked }; })); - return ContactStore.sortPubkeyInfos(pubkeyInfos); + return KeyUtil.sortPubkeyInfos(pubkeyInfos); }; private static getPubkeyId = ({ id, type }: { id: string, type: string }): string => { From e1415f039b3f2d8387c69501c1231ab90ddf11ef Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 15 Dec 2021 11:28:21 +0000 Subject: [PATCH 28/31] niceties --- test/source/tests/unit-node.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/source/tests/unit-node.ts b/test/source/tests/unit-node.ts index 5401830d7c4..b989345772a 100644 --- a/test/source/tests/unit-node.ts +++ b/test/source/tests/unit-node.ts @@ -782,29 +782,29 @@ jLwe8W9IMt765T5x5oux9MmPDXF05xHfm4qfH/BMO3a802x5u2gJjJjuknrFdgXY .match(/\-\-\-\-\-BEGIN PGP SIGNED MESSAGE\-\-\-\-\-.*\-\-\-\-\-END PGP SIGNATURE\-\-\-\-\-/s)![0]; const encryptedData = Buf.fromUtfStr(enc); // actual key the message was signed with - const pubkey = testConstants.pubkey2864E326A5BE488A; + const olderVersionOfPubkey = testConstants.pubkey2864E326A5BE488A; // better key - const betterKey = "-----BEGIN PGP PUBLIC KEY BLOCK-----\r\nVersion: FlowCrypt Email Encryption [BUILD_REPLACEABLE_VERSION]\r\nComment: Seamlessly send and receive encrypted email\r\n\r\nxjMEYZeW2RYJKwYBBAHaRw8BAQdAT5QfLVP3y1yukk3MM/oiuXLNe1f9az5M\r\nBnOlKdF0nKnNJVNvbWVib2R5IDxTYW1zNTBzYW1zNTBzZXB0QEdtYWlsLkNv\r\nbT7CjwQQFgoAIAUCYZeW2QYLCQcIAwIEFQgKAgQWAgEAAhkBAhsDAh4BACEJ\r\nEMrSTYqLk6SUFiEEBP90ux3d6kDwDdzvytJNiouTpJS27QEA7pFlkLfD0KFQ\r\nsH/dwb/NPzn5zCi2L9gjPAC3d8gv1fwA/0FjAy/vKct4D7QH8KwtEGQns5+D\r\nP1WxDr4YI2hp5TkAzjgEYZeW2RIKKwYBBAGXVQEFAQEHQKNLY/bXrhJMWA2+\r\nWTjk3I7KhawyZfLomJ4hovqr7UtOAwEIB8J4BBgWCAAJBQJhl5bZAhsMACEJ\r\nEMrSTYqLk6SUFiEEBP90ux3d6kDwDdzvytJNiouTpJQnpgD/c1CzfS3YzJUx\r\nnFMrhjiE0WVgqOV/3CkfI4m4RA30QUIA/ju8r4AD2h6lu3Mx/6I6PzIRZQty\r\nLvTkcu4UKodZa4kK\r\n=7C4A\r\n-----END PGP PUBLIC KEY BLOCK-----\r\n"; + const newlyCreatedPubkey = "-----BEGIN PGP PUBLIC KEY BLOCK-----\r\nVersion: FlowCrypt Email Encryption [BUILD_REPLACEABLE_VERSION]\r\nComment: Seamlessly send and receive encrypted email\r\n\r\nxjMEYZeW2RYJKwYBBAHaRw8BAQdAT5QfLVP3y1yukk3MM/oiuXLNe1f9az5M\r\nBnOlKdF0nKnNJVNvbWVib2R5IDxTYW1zNTBzYW1zNTBzZXB0QEdtYWlsLkNv\r\nbT7CjwQQFgoAIAUCYZeW2QYLCQcIAwIEFQgKAgQWAgEAAhkBAhsDAh4BACEJ\r\nEMrSTYqLk6SUFiEEBP90ux3d6kDwDdzvytJNiouTpJS27QEA7pFlkLfD0KFQ\r\nsH/dwb/NPzn5zCi2L9gjPAC3d8gv1fwA/0FjAy/vKct4D7QH8KwtEGQns5+D\r\nP1WxDr4YI2hp5TkAzjgEYZeW2RIKKwYBBAGXVQEFAQEHQKNLY/bXrhJMWA2+\r\nWTjk3I7KhawyZfLomJ4hovqr7UtOAwEIB8J4BBgWCAAJBQJhl5bZAhsMACEJ\r\nEMrSTYqLk6SUFiEEBP90ux3d6kDwDdzvytJNiouTpJQnpgD/c1CzfS3YzJUx\r\nnFMrhjiE0WVgqOV/3CkfI4m4RA30QUIA/ju8r4AD2h6lu3Mx/6I6PzIRZQty\r\nLvTkcu4UKodZa4kK\r\n=7C4A\r\n-----END PGP PUBLIC KEY BLOCK-----\r\n"; { - const decrypted1 = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData, verificationPubs: [pubkey, betterKey] }); + const decrypted1 = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData, verificationPubs: [olderVersionOfPubkey, newlyCreatedPubkey] }); expect(decrypted1.success).to.equal(true); const verifyRes1 = (decrypted1 as DecryptSuccess).signature!; expect(verifyRes1.match).to.be.true; } { - const decrypted2 = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData, verificationPubs: [betterKey, pubkey] }); + const decrypted2 = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData, verificationPubs: [newlyCreatedPubkey, olderVersionOfPubkey] }); expect(decrypted2.success).to.equal(true); const verifyRes2 = (decrypted2 as DecryptSuccess).signature!; expect(verifyRes2.match).to.be.true; } { - const decrypted3 = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData, verificationPubs: [pubkey] }); + const decrypted3 = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData, verificationPubs: [olderVersionOfPubkey] }); expect(decrypted3.success).to.equal(true); const verifyRes3 = (decrypted3 as DecryptSuccess).signature!; expect(verifyRes3.match).to.be.true; } { - const decrypted4 = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData, verificationPubs: [betterKey] }); + const decrypted4 = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData, verificationPubs: [newlyCreatedPubkey] }); expect(decrypted4.success).to.equal(true); const verifyRes4 = (decrypted4 as DecryptSuccess).signature!; expect(verifyRes4.match).to.not.be.true; From fe88d6277b5f97012430fa01eeda577302aa1f6b Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 15 Dec 2021 12:46:59 +0000 Subject: [PATCH 29/31] removed unnecessary optionalPwd parameter --- .../elements/pgp_block_modules/pgp-block-decrypt-module.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extension/chrome/elements/pgp_block_modules/pgp-block-decrypt-module.ts b/extension/chrome/elements/pgp_block_modules/pgp-block-decrypt-module.ts index cafa84618dd..6ebbb5a3930 100644 --- a/extension/chrome/elements/pgp_block_modules/pgp-block-decrypt-module.ts +++ b/extension/chrome/elements/pgp_block_modules/pgp-block-decrypt-module.ts @@ -54,7 +54,7 @@ export class PgpBlockViewDecryptModule { this.isPwdMsgBasedOnMsgSnippet = isPwdMsg; this.view.renderModule.renderText('Decrypting...'); this.msgFetchedFromApi = format; - await this.decryptAndRender(Buf.fromUtfStr(armored), verificationPubs, undefined, subject); + await this.decryptAndRender(Buf.fromUtfStr(armored), verificationPubs, subject); } } } catch (e) { @@ -64,7 +64,7 @@ export class PgpBlockViewDecryptModule { public canAndShouldFetchFromApi = () => this.canReadEmails && this.msgFetchedFromApi !== 'raw'; - private decryptAndRender = async (encryptedData: Buf, verificationPubs: string[], optionalPwd?: string, plainSubject?: string) => { + private decryptAndRender = async (encryptedData: Buf, verificationPubs: string[], plainSubject?: string) => { if (!this.view.signature?.parsedSignature) { const kisWithPp = await KeyStore.getAllWithOptionalPassPhrase(this.view.acctEmail); const decrypt = async (verificationPubs: string[]) => await BrowserMsg.send.bg.await.pgpMsgDecrypt({ kisWithPp, encryptedData, verificationPubs }); @@ -97,7 +97,7 @@ export class PgpBlockViewDecryptModule { })); await PassphraseStore.waitUntilPassphraseChanged(this.view.acctEmail, result.longids.needPassphrase); this.view.renderModule.renderText('Decrypting...'); - await this.decryptAndRender(encryptedData, verificationPubs, optionalPwd); + await this.decryptAndRender(encryptedData, verificationPubs); } else { const primaryKi = await KeyStore.getFirstOptional(this.view.acctEmail); if (!result.longids.chosen && !primaryKi) { From 2df39531610a2cd28a31d4dd1cb49b6e101be2ce Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 15 Dec 2021 16:12:32 +0000 Subject: [PATCH 30/31] better naming --- test/source/tests/unit-node.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/source/tests/unit-node.ts b/test/source/tests/unit-node.ts index b989345772a..c7ca8bd8305 100644 --- a/test/source/tests/unit-node.ts +++ b/test/source/tests/unit-node.ts @@ -782,29 +782,29 @@ jLwe8W9IMt765T5x5oux9MmPDXF05xHfm4qfH/BMO3a802x5u2gJjJjuknrFdgXY .match(/\-\-\-\-\-BEGIN PGP SIGNED MESSAGE\-\-\-\-\-.*\-\-\-\-\-END PGP SIGNATURE\-\-\-\-\-/s)![0]; const encryptedData = Buf.fromUtfStr(enc); // actual key the message was signed with - const olderVersionOfPubkey = testConstants.pubkey2864E326A5BE488A; + const signerPubkey = testConstants.pubkey2864E326A5BE488A; // better key - const newlyCreatedPubkey = "-----BEGIN PGP PUBLIC KEY BLOCK-----\r\nVersion: FlowCrypt Email Encryption [BUILD_REPLACEABLE_VERSION]\r\nComment: Seamlessly send and receive encrypted email\r\n\r\nxjMEYZeW2RYJKwYBBAHaRw8BAQdAT5QfLVP3y1yukk3MM/oiuXLNe1f9az5M\r\nBnOlKdF0nKnNJVNvbWVib2R5IDxTYW1zNTBzYW1zNTBzZXB0QEdtYWlsLkNv\r\nbT7CjwQQFgoAIAUCYZeW2QYLCQcIAwIEFQgKAgQWAgEAAhkBAhsDAh4BACEJ\r\nEMrSTYqLk6SUFiEEBP90ux3d6kDwDdzvytJNiouTpJS27QEA7pFlkLfD0KFQ\r\nsH/dwb/NPzn5zCi2L9gjPAC3d8gv1fwA/0FjAy/vKct4D7QH8KwtEGQns5+D\r\nP1WxDr4YI2hp5TkAzjgEYZeW2RIKKwYBBAGXVQEFAQEHQKNLY/bXrhJMWA2+\r\nWTjk3I7KhawyZfLomJ4hovqr7UtOAwEIB8J4BBgWCAAJBQJhl5bZAhsMACEJ\r\nEMrSTYqLk6SUFiEEBP90ux3d6kDwDdzvytJNiouTpJQnpgD/c1CzfS3YzJUx\r\nnFMrhjiE0WVgqOV/3CkfI4m4RA30QUIA/ju8r4AD2h6lu3Mx/6I6PzIRZQty\r\nLvTkcu4UKodZa4kK\r\n=7C4A\r\n-----END PGP PUBLIC KEY BLOCK-----\r\n"; + const wrongPubkey = "-----BEGIN PGP PUBLIC KEY BLOCK-----\r\nVersion: FlowCrypt Email Encryption [BUILD_REPLACEABLE_VERSION]\r\nComment: Seamlessly send and receive encrypted email\r\n\r\nxjMEYZeW2RYJKwYBBAHaRw8BAQdAT5QfLVP3y1yukk3MM/oiuXLNe1f9az5M\r\nBnOlKdF0nKnNJVNvbWVib2R5IDxTYW1zNTBzYW1zNTBzZXB0QEdtYWlsLkNv\r\nbT7CjwQQFgoAIAUCYZeW2QYLCQcIAwIEFQgKAgQWAgEAAhkBAhsDAh4BACEJ\r\nEMrSTYqLk6SUFiEEBP90ux3d6kDwDdzvytJNiouTpJS27QEA7pFlkLfD0KFQ\r\nsH/dwb/NPzn5zCi2L9gjPAC3d8gv1fwA/0FjAy/vKct4D7QH8KwtEGQns5+D\r\nP1WxDr4YI2hp5TkAzjgEYZeW2RIKKwYBBAGXVQEFAQEHQKNLY/bXrhJMWA2+\r\nWTjk3I7KhawyZfLomJ4hovqr7UtOAwEIB8J4BBgWCAAJBQJhl5bZAhsMACEJ\r\nEMrSTYqLk6SUFiEEBP90ux3d6kDwDdzvytJNiouTpJQnpgD/c1CzfS3YzJUx\r\nnFMrhjiE0WVgqOV/3CkfI4m4RA30QUIA/ju8r4AD2h6lu3Mx/6I6PzIRZQty\r\nLvTkcu4UKodZa4kK\r\n=7C4A\r\n-----END PGP PUBLIC KEY BLOCK-----\r\n"; { - const decrypted1 = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData, verificationPubs: [olderVersionOfPubkey, newlyCreatedPubkey] }); + const decrypted1 = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData, verificationPubs: [signerPubkey, wrongPubkey] }); expect(decrypted1.success).to.equal(true); const verifyRes1 = (decrypted1 as DecryptSuccess).signature!; expect(verifyRes1.match).to.be.true; } { - const decrypted2 = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData, verificationPubs: [newlyCreatedPubkey, olderVersionOfPubkey] }); + const decrypted2 = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData, verificationPubs: [wrongPubkey, signerPubkey] }); expect(decrypted2.success).to.equal(true); const verifyRes2 = (decrypted2 as DecryptSuccess).signature!; expect(verifyRes2.match).to.be.true; } { - const decrypted3 = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData, verificationPubs: [olderVersionOfPubkey] }); + const decrypted3 = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData, verificationPubs: [signerPubkey] }); expect(decrypted3.success).to.equal(true); const verifyRes3 = (decrypted3 as DecryptSuccess).signature!; expect(verifyRes3.match).to.be.true; } { - const decrypted4 = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData, verificationPubs: [newlyCreatedPubkey] }); + const decrypted4 = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData, verificationPubs: [wrongPubkey] }); expect(decrypted4.success).to.equal(true); const verifyRes4 = (decrypted4 as DecryptSuccess).signature!; expect(verifyRes4.match).to.not.be.true; From 761f9a9cdab04a9e7da73b884d430b6aaf05f3de Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 16 Dec 2021 13:49:39 +0000 Subject: [PATCH 31/31] don't refetch encrypted message on verification error --- .../pgp-block-signature-module.ts | 4 +- .../message-export-15f7f7c5979b5a26.json | 107 ++++++++++++++++++ test/source/tests/decrypt.ts | 65 +++++++++++ 3 files changed, 174 insertions(+), 2 deletions(-) create mode 100644 test/source/mock/google/exported-messages/message-export-15f7f7c5979b5a26.json diff --git a/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts b/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts index 157000d2174..3346975b5e1 100644 --- a/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts +++ b/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts @@ -19,10 +19,10 @@ export class PgpBlockViewSignatureModule { retryVerification?: (verificationPubs: string[]) => Promise) => { this.view.renderModule.doNotSetStateAsReadyYet = true; // so that body state is not marked as ready too soon - automated tests need to know when to check results if (verifyRes?.error) { - if (!verifyRes.isErrFatal && this.view.decryptModule.canAndShouldFetchFromApi()) { + if (this.view.signature && !verifyRes.isErrFatal && this.view.decryptModule.canAndShouldFetchFromApi()) { // Sometimes the signed content is slightly modified when parsed from DOM, // so the message should be re-fetched straight from API to make sure we get the original signed data and verify again - this.view.signature!.parsedSignature = undefined; // force to re-parse + this.view.signature.parsedSignature = undefined; // force to re-parse await this.view.decryptModule.initialize(verificationPubs, true); return; } diff --git a/test/source/mock/google/exported-messages/message-export-15f7f7c5979b5a26.json b/test/source/mock/google/exported-messages/message-export-15f7f7c5979b5a26.json new file mode 100644 index 00000000000..dd53162e03e --- /dev/null +++ b/test/source/mock/google/exported-messages/message-export-15f7f7c5979b5a26.json @@ -0,0 +1,107 @@ +{ + "acctEmail": "flowcrypt.compatibility@gmail.com", + "full": { + "id": "15f7f7c5979b5a26", + "threadId": "15f7f7c5979b5a26", + "labelIds": [ + "IMPORTANT", + "CATEGORY_PERSONAL", + "Label_4", + "INBOX" + ], + "snippet": "-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 this message is signed and was modified in transit -----BEGIN PGP SIGNATURE----- Version: FlowCrypt 5.0.4 Gmail Encryption flowcrypt.com Comment:", + "payload": { + "partId": "", + "mimeType": "multipart/alternative", + "filename": "", + "headers": [ + { + "name": "X-Gm-Message-State", + "value": "AMCzsaW+RFAVklPv6Hs+l2xafoENwylyEvCFXMMRIoBz3TKpcQySNMP7 8ckQ0bjvXRq0RMSsApXUGTrXQgpyKRe9vkBAe653qA==" + }, + { + "name": "MIME-Version", + "value": "1.0" + }, + { + "name": "From", + "value": "sender@domain.com" + }, + { + "name": "Date", + "value": "Thu, 2 Nov 2017 18:26:15 -0700" + }, + { + "name": "Subject", + "value": "signed message - maliciously modified - should not pass" + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "Content-Type", + "value": "multipart/alternative; boundary=\"94eb2c07ab54b48c8c055d09fd40\"" + } + ], + "body": { + "size": 0 + }, + "parts": [ + { + "partId": "0", + "mimeType": "text/plain", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "text/plain; charset=\"UTF-8\"" + } + ], + "body": { + "size": 1042, + "data": "LS0tLS1CRUdJTiBQR1AgU0lHTkVEIE1FU1NBR0UtLS0tLQ0KSGFzaDogU0hBMjU2DQoNCnRoaXMgbWVzc2FnZSBpcyBzaWduZWQgYW5kIHdhcyBtb2RpZmllZCBpbiB0cmFuc2l0DQotLS0tLUJFR0lOIFBHUCBTSUdOQVRVUkUtLS0tLQ0KVmVyc2lvbjogRmxvd0NyeXB0IDUuMC40IEdtYWlsIEVuY3J5cHRpb24gZmxvd2NyeXB0LmNvbQ0KQ29tbWVudDogU2VhbWxlc3NseSBzZW5kLCByZWNlaXZlIGFuZCBzZWFyY2ggZW5jcnlwdGVkIGVtYWlsDQoNCndzRmNCQUVCQ0FBUUJRSlorOFZYQ1JBR3lsVSt3a1ZkY0FBQWdSd1FBTWtjKzJXcklCZitYM1QreU5wcw0KdmE0eE1RRVZ2QkZTNEd4YlRBMXhuZG1mdW8zaHIzVmZxL3NBSTJQbG82NUQwcmQ5V2M2cDg4QXdsKzl3DQphMGw0WXgzaXNIMGptOWdjcHlwellKZjlsZWVydEJjdkl4RHZxR1pjL3hQeHlSelFLZ1hpTmt2YVpJOFUNCk5Oa29BZEN2ZXM0d3gzc2IwbEpoSUt5UmhYd0tXV3JvV0tmb0JZQXJ5S0RTRTJxOGQxeitQMG1EYm9wNw0KSjVZTHVpKzZWc0dKb3FaZE04bE1HTHAyVHV5R1Z4eTVtb0V2cklZOHp2WW02MUtlK3dHTGJMNjNCcWRnDQpaYjhwTUVwMXhkVy94UGdGVDZJcnRGZEhURWlxY3prZWlIT0c3K0Y4elBjS0Jidng2bHVGQXZGaDEwM0kNCmwwNlJSZWZlSmtwcExKMlMrQTBpRHptcURrbllpbjJIbThWQmEyaWxsL1JmSTRjMVRoek01dHJqckMxYg0Kck9NeklNWmZEZENEQ1JqZklMTnlqbmFuaHNZRVlaMzBObm1qT3JORHRoQTlWQ0VVdXBvUnZTbURiQThPDQpWdGNrWkgzWXpJaTZDc0hzOGRsMldUUS9sajF5WEtEcW5wb1d6bmR6VnJGUnRqVlc3STc1bEwvKy9NWXANCmhrdGJGQVdJa3JxcVdhcHdJVUVHZWZ6YnJ1bFJSVlVVNm02c2xiS0l1ck9na0V0K2NvSlVOTVRzdVBQWA0KYUFhNDN6ZThoVWppNUVYQUxFOUkrNDF1eitkdG5KeW1hUWhzblhMOFI4VkhBZ293cnZRZ0xldVRaTlZIDQpBZU5rYmNuZytLejNFclZrM1ErUkR0MGk1Rkwwb0l6UC9Bc3hoR2VPRzM4aitRVmU2T2dZbTdJamZhSUENCnI0OTgNCj03NnE2DQotLS0tLUVORCBQR1AgU0lHTkFUVVJFLS0tLS0NCg==" + } + }, + { + "partId": "1", + "mimeType": "text/html", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "text/html; charset=\"UTF-8\"" + }, + { + "name": "Content-Transfer-Encoding", + "value": "quoted-printable" + } + ], + "body": { + "size": 3846, + "data": "PGRpdiBkaXI9Imx0ciI-PHNwYW4gc3R5bGU9ImZvbnQtc2l6ZToxMi44cHgiPi0tLS0tQkVHSU4gUEdQIFNJR05FRCBNRVNTQUdFLS0tLS08L3NwYW4-PGJyIHN0eWxlPSJmb250LXNpemU6MTIuOHB4Ij48c3BhbiBzdHlsZT0iZm9udC1zaXplOjEyLjhweCI-SGFzaDogU0hBMjU2PC9zcGFuPjxiciBzdHlsZT0iZm9udC1zaXplOjEyLjhweCI-PGJyIHN0eWxlPSJmb250LXNpemU6MTIuOHB4Ij48c3BhbiBzdHlsZT0iZm9udC1zaXplOjEyLjhweCI-dGhpcyBtZXNzYWdlIGlzIHNpZ25lZCBhbmQgd2FzIG1vZGlmaWVkIGluIHRyYW5zaXQ8L3NwYW4-PGJyIHN0eWxlPSJmb250LXNpemU6MTIuOHB4Ij48c3BhbiBzdHlsZT0iZm9udC1zaXplOjEyLjhweCI-LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS08L3NwYW4-PGJyIHN0eWxlPSJmb250LXNpemU6MTIuOHB4Ij48c3BhbiBzdHlsZT0iZm9udC1zaXplOjEyLjhweCI-VmVyc2lvbjogRmxvd0NyeXB0IDUuMC40IEdtYWlsIEVuY3J5cHRpb27CoDwvc3Bhbj48YSBocmVmPSJodHRwOi8vZmxvd2NyeXB0LmNvbS8iIHJlbD0ibm9yZWZlcnJlciIgdGFyZ2V0PSJfYmxhbmsiIHN0eWxlPSJmb250LXNpemU6MTIuOHB4Ij5mbG93Y3J5cHQuY29tPC9hPjxiciBzdHlsZT0iZm9udC1zaXplOjEyLjhweCI-PHNwYW4gc3R5bGU9ImZvbnQtc2l6ZToxMi44cHgiPkNvbW1lbnQ6IFNlYW1sZXNzbHkgc2VuZCwgcmVjZWl2ZSBhbmQgc2VhcmNoIGVuY3J5cHRlZCBlbWFpbDwvc3Bhbj48YnIgc3R5bGU9ImZvbnQtc2l6ZToxMi44cHgiPjxiciBzdHlsZT0iZm9udC1zaXplOjEyLjhweCI-PHNwYW4gc3R5bGU9ImZvbnQtc2l6ZToxMi44cHgiPndzRmNCQUVCQ0FBUUJRSlorOFZYQ1JBR3lsVSs8L3NwYW4-PHdiciBzdHlsZT0iZm9udC1zaXplOjEyLjhweCI-PHNwYW4gc3R5bGU9ImZvbnQtc2l6ZToxMi44cHgiPndrVmRjQUFBZ1J3UUFNa2MrMldySUJmK1gzVCs8L3NwYW4-PHdiciBzdHlsZT0iZm9udC1zaXplOjEyLjhweCI-PHNwYW4gc3R5bGU9ImZvbnQtc2l6ZToxMi44cHgiPnlOcHM8L3NwYW4-PGJyIHN0eWxlPSJmb250LXNpemU6MTIuOHB4Ij48c3BhbiBzdHlsZT0iZm9udC1zaXplOjEyLjhweCI-dmE0eE1RRVZ2QkZTNEd4YlRBMXhuZG1mdW8zaHIzPC9zcGFuPjx3YnIgc3R5bGU9ImZvbnQtc2l6ZToxMi44cHgiPjxzcGFuIHN0eWxlPSJmb250LXNpemU6MTIuOHB4Ij5WZnEvc0FJMlBsbzY1RDByZDlXYzZwODhBd2wrOXc8L3NwYW4-PGJyIHN0eWxlPSJmb250LXNpemU6MTIuOHB4Ij48c3BhbiBzdHlsZT0iZm9udC1zaXplOjEyLjhweCI-YTBsNFl4M2lzSDBqbTlnY3B5cHpZSmY5bGVlcnRCPC9zcGFuPjx3YnIgc3R5bGU9ImZvbnQtc2l6ZToxMi44cHgiPjxzcGFuIHN0eWxlPSJmb250LXNpemU6MTIuOHB4Ij5jdkl4RHZxR1pjL3hQeHlSelFLZ1hpTmt2YVpJOFU8L3NwYW4-PGJyIHN0eWxlPSJmb250LXNpemU6MTIuOHB4Ij48c3BhbiBzdHlsZT0iZm9udC1zaXplOjEyLjhweCI-Tk5rb0FkQ3ZlczR3eDNzYjBsSmhJS3lSaFh3S1dXPC9zcGFuPjx3YnIgc3R5bGU9ImZvbnQtc2l6ZToxMi44cHgiPjxzcGFuIHN0eWxlPSJmb250LXNpemU6MTIuOHB4Ij5yb1dLZm9CWUFyeUtEU0UycThkMXorUDBtRGJvcDc8L3NwYW4-PGJyIHN0eWxlPSJmb250LXNpemU6MTIuOHB4Ij48c3BhbiBzdHlsZT0iZm9udC1zaXplOjEyLjhweCI-SjVZTHVpKzwvc3Bhbj48d2JyIHN0eWxlPSJmb250LXNpemU6MTIuOHB4Ij48c3BhbiBzdHlsZT0iZm9udC1zaXplOjEyLjhweCI-NlZzR0pvcVpkTThsTUdMcDJUdXlHVnh5NW1vRXZyPC9zcGFuPjx3YnIgc3R5bGU9ImZvbnQtc2l6ZToxMi44cHgiPjxzcGFuIHN0eWxlPSJmb250LXNpemU6MTIuOHB4Ij5JWTh6dlltNjFLZSt3R0xiTDYzQnFkZzwvc3Bhbj48YnIgc3R5bGU9ImZvbnQtc2l6ZToxMi44cHgiPjxzcGFuIHN0eWxlPSJmb250LXNpemU6MTIuOHB4Ij5aYjhwTUVwMXhkVy88L3NwYW4-PHdiciBzdHlsZT0iZm9udC1zaXplOjEyLjhweCI-PHNwYW4gc3R5bGU9ImZvbnQtc2l6ZToxMi44cHgiPnhQZ0ZUNklydEZkSFRFaXFjemtlaUhPRzcrPC9zcGFuPjx3YnIgc3R5bGU9ImZvbnQtc2l6ZToxMi44cHgiPjxzcGFuIHN0eWxlPSJmb250LXNpemU6MTIuOHB4Ij5GOHpQY0tCYnZ4Nmx1RkF2RmgxMDNJPC9zcGFuPjxiciBzdHlsZT0iZm9udC1zaXplOjEyLjhweCI-PHNwYW4gc3R5bGU9ImZvbnQtc2l6ZToxMi44cHgiPmwwNlJSZWZlSmtwcExKMlMrPC9zcGFuPjx3YnIgc3R5bGU9ImZvbnQtc2l6ZToxMi44cHgiPjxzcGFuIHN0eWxlPSJmb250LXNpemU6MTIuOHB4Ij5BMGlEem1xRGtuWWluMkhtOFZCYTJpbGwvPC9zcGFuPjx3YnIgc3R5bGU9ImZvbnQtc2l6ZToxMi44cHgiPjxzcGFuIHN0eWxlPSJmb250LXNpemU6MTIuOHB4Ij5SZkk0YzFUaHpNNXRyanJDMWI8L3NwYW4-PGJyIHN0eWxlPSJmb250LXNpemU6MTIuOHB4Ij48c3BhbiBzdHlsZT0iZm9udC1zaXplOjEyLjhweCI-ck9NeklNWmZEZENEQ1JqZklMTnlqbmFuaHNZRVlaPC9zcGFuPjx3YnIgc3R5bGU9ImZvbnQtc2l6ZToxMi44cHgiPjxzcGFuIHN0eWxlPSJmb250LXNpemU6MTIuOHB4Ij4zME5ubWpPck5EdGhBOVZDRVV1cG9SdlNtRGJBOE88L3NwYW4-PGJyIHN0eWxlPSJmb250LXNpemU6MTIuOHB4Ij48c3BhbiBzdHlsZT0iZm9udC1zaXplOjEyLjhweCI-VnRja1pIM1l6SWk2Q3NIczhkbDJXVFEvPC9zcGFuPjx3YnIgc3R5bGU9ImZvbnQtc2l6ZToxMi44cHgiPjxzcGFuIHN0eWxlPSJmb250LXNpemU6MTIuOHB4Ij5sajF5WEtEcW5wb1d6bmR6VnJGUnRqVlc3STc1bEw8L3NwYW4-PHdiciBzdHlsZT0iZm9udC1zaXplOjEyLjhweCI-PHNwYW4gc3R5bGU9ImZvbnQtc2l6ZToxMi44cHgiPi8rL01ZcDwvc3Bhbj48YnIgc3R5bGU9ImZvbnQtc2l6ZToxMi44cHgiPjxzcGFuIHN0eWxlPSJmb250LXNpemU6MTIuOHB4Ij5oa3RiRkFXSWtycXFXYXB3SVVFR2VmemJydWxSUlY8L3NwYW4-PHdiciBzdHlsZT0iZm9udC1zaXplOjEyLjhweCI-PHNwYW4gc3R5bGU9ImZvbnQtc2l6ZToxMi44cHgiPlVVNm02c2xiS0l1ck9na0V0K2NvSlVOTVRzdVBQWDwvc3Bhbj48YnIgc3R5bGU9ImZvbnQtc2l6ZToxMi44cHgiPjxzcGFuIHN0eWxlPSJmb250LXNpemU6MTIuOHB4Ij5hQWE0M3plOGhVamk1RVhBTEU5SSs0MXV6Kzwvc3Bhbj48d2JyIHN0eWxlPSJmb250LXNpemU6MTIuOHB4Ij48c3BhbiBzdHlsZT0iZm9udC1zaXplOjEyLjhweCI-ZHRuSnltYVFoc25YTDhSOFZIQWdvd3J2UWdMZXVUPC9zcGFuPjx3YnIgc3R5bGU9ImZvbnQtc2l6ZToxMi44cHgiPjxzcGFuIHN0eWxlPSJmb250LXNpemU6MTIuOHB4Ij5aTlZIPC9zcGFuPjxiciBzdHlsZT0iZm9udC1zaXplOjEyLjhweCI-PHNwYW4gc3R5bGU9ImZvbnQtc2l6ZToxMi44cHgiPkFlTmtiY25nK0t6M0VyVmszUSs8L3NwYW4-PHdiciBzdHlsZT0iZm9udC1zaXplOjEyLjhweCI-PHNwYW4gc3R5bGU9ImZvbnQtc2l6ZToxMi44cHgiPlJEdDBpNUZMMG9JelAvQXN4aEdlT0czOGorPC9zcGFuPjx3YnIgc3R5bGU9ImZvbnQtc2l6ZToxMi44cHgiPjxzcGFuIHN0eWxlPSJmb250LXNpemU6MTIuOHB4Ij5RVmU2T2dZbTdJamZhSUE8L3NwYW4-PGJyIHN0eWxlPSJmb250LXNpemU6MTIuOHB4Ij48c3BhbiBzdHlsZT0iZm9udC1zaXplOjEyLjhweCI-cjQ5ODwvc3Bhbj48YnIgc3R5bGU9ImZvbnQtc2l6ZToxMi44cHgiPjxzcGFuIHN0eWxlPSJmb250LXNpemU6MTIuOHB4Ij49NzZxNjwvc3Bhbj48YnIgc3R5bGU9ImZvbnQtc2l6ZToxMi44cHgiPjxzcGFuIHN0eWxlPSJmb250LXNpemU6MTIuOHB4Ij4tLS0tLUVORCBQR1AgU0lHTkFUVVJFLS0tLS08L3NwYW4-PGJyPjwvZGl2Pg0K" + } + } + ] + }, + "sizeEstimate": 10126, + "historyId": "1333314", + "internalDate": "1509672375000" + }, + "attachments": {}, + "raw": { + "id": "15f7f7c5979b5a26", + "threadId": "15f7f7c5979b5a26", + "labelIds": [ + "IMPORTANT", + "CATEGORY_PERSONAL", + "Label_4", + "INBOX" + ], + "snippet": "-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 this message is signed and was modified in transit -----BEGIN PGP SIGNATURE----- Version: FlowCrypt 5.0.4 Gmail Encryption flowcrypt.com Comment:", + "sizeEstimate": 10126, + "raw": "Delivered-To: flowcrypt.compatibility@gmail.com
Received: by 10.12.167.25 with SMTP id u25csp2708948qva;
        Thu, 2 Nov 2017 18:26:16 -0700 (PDT)
X-Received: by 10.36.253.9 with SMTP id m9mr5277471ith.105.1509672376614;
        Thu, 02 Nov 2017 18:26:16 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1509672376; cv=none;
        d=google.com; s=arc-20160816;
        b=Q41o+DC//D7tzmMEybRNjTTWDg0sMk+tdCnSrDH/QT6YwjhOeRN/7Vp8vDWqx0JEvb
         uCb4x8DkUGwFCehWA/CkM2Mm/BMG3vBtJYgMaMfLkgaLB7yRtScSCbUiFJC0Sx+IECSW
         EhxOoTSninsMOfa7pZvicHrFEL55hlpycqFbbdS7OaoxfgtfbSAqA3d1alo5d71UIrvX
         PQurGj2VO+bOV8uoHubmiLY+XyCC4oLv+v6LPH8SKwzu+dqNtE4EIP0VDgGQf6fLQbjG
         3jf9dsqiwkAGjY/uIE3VYhpbsi2pk15vrDbDZUbQF80d39BhcYyIHn3d30VswqB6VTS1
         wZdg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
        h=to:subject:message-id:date:from:mime-version:dkim-signature
         :arc-authentication-results;
        bh=aE6/OKhaqm68LDzPdpjftzLm1O6DVo/61yno+aRMzB0=;
        b=N02Lk+RphnO3cFXgSY8/OAWwofLYvQp9r7LzuMBuxkJ/Ex0rySwBGrOTtRmWN5fNRI
         jlB8CPfdm9URoblks+UXq8KoqB+UBlV0pYePic4oC6+ORKbsEEYa9JXUoHWQQZ/aYnlX
         I7oKhlEXyB1cGn7GO1Du2iEFfzHuzgByUqhQeKUC1Q9KQRAop+rSco39VBZKK+fZ5lUy
         +DsvXdcdxK4pL/5lW8VPqziba2nSrzn5hGq0ZxaMhc8bcpB/V+5jyZJ5d3ruNoNXoHqR
         MA60uPZxLoW1vf/yE9Lz35Y68+VEnbpA8hiFcJW910xMKI1ZTbZvtvV9FQiANeSuAC3k
         lBSw==
ARC-Authentication-Results: i=1; mx.google.com;
       dkim=pass header.i=@gmail.com header.s=20161025 header.b=LGP751L2;
       spf=pass (google.com: domain of cryptup.tester@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=cryptup.tester@gmail.com;
       dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmail.com
Return-Path: <cryptup.tester@gmail.com>
Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41])
        by mx.google.com with SMTPS id t15sor483364iti.67.2017.11.02.18.26.16
        for <flowcrypt.compatibility@gmail.com>
        (Google Transport Security);
        Thu, 02 Nov 2017 18:26:16 -0700 (PDT)
Received-SPF: pass (google.com: domain of cryptup.tester@gmail.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41;
Authentication-Results: mx.google.com;
       dkim=pass header.i=@gmail.com header.s=20161025 header.b=LGP751L2;
       spf=pass (google.com: domain of cryptup.tester@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=cryptup.tester@gmail.com;
       dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmail.com
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20161025;
        h=mime-version:from:date:message-id:subject:to;
        bh=aE6/OKhaqm68LDzPdpjftzLm1O6DVo/61yno+aRMzB0=;
        b=LGP751L2YRxJ6S+W5yr+I7FPXkMd7OdXsCrxdglfw7HQxBZrHGl+7Dqpng3W6dyCxl
         ykdxcABRE/DUbc3i6ujBxNyLthelX+1OjPtrnb61mAv6aBNhsKUnIXDE0W+O6+lsi+w/
         YuDT8TA+iX3LYOQUHHtQhuC4N/InjTx4Jngw7Hpuf1p1IBOjBgfnWtZ/3qpXT87kkx4P
         vfWRT0o0L/cUirtWBU8tiPbEr8iOyEn46NIXrsPMLnuyuQu9I6yIznMWD6NRbRxcQ33Y
         hkIK4+ejKrbtE65hvA7vEVWSI3VlM+V21DXGfbq1+3slywyrKE6kLePRIh2a0RUSf5dF
         nQIA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:mime-version:from:date:message-id:subject:to;
        bh=aE6/OKhaqm68LDzPdpjftzLm1O6DVo/61yno+aRMzB0=;
        b=H70Q0aPKFzvK/jtbdlnwnOfucuMFcQdNbUCuI45ijnAYE2j74lTP0kFpvpzSS8QtOF
         AUXJi9C1cqGphBRcetZC/q2rvP4L8pGVEODtB2LnljCqtiqLxY2V5U4v183qNeKS2oD3
         y0FxPXP8ngh8qMhRaLStkX6FCgy2U23k8wqYHezfylqsyj/xiLRru3GSiHkkUQNBhB+H
         Co7GH9xhs3z7Qym1Ev3Bgknl6Ctd02JslIZqV+pGZF62wBIzIa78/PViEalhKm+oAfi2
         l+Vb2I1TmrKOecw+ErqPLsJibU1H+oNRz3Jq081aPsk4bfT4b4HisvC5kSb84Dm7ZMpz
         aGGw==
X-Gm-Message-State: AMCzsaW+RFAVklPv6Hs+l2xafoENwylyEvCFXMMRIoBz3TKpcQySNMP7
	8ckQ0bjvXRq0RMSsApXUGTrXQgpyKRe9vkBAe653qA==
X-Google-Smtp-Source: ABhQp+TN5SlscUFVhICNKp8FfskWT3N4mX/aUo7BvYZr39Q2WVrfVRW4Id15RnU1Ko9A67CLyHzH5G5tNxOQxS9d8/0=
X-Received: by 10.36.197.130 with SMTP id f124mr4716167itg.99.1509672376108;
 Thu, 02 Nov 2017 18:26:16 -0700 (PDT)
MIME-Version: 1.0
Received: by 10.107.182.2 with HTTP; Thu, 2 Nov 2017 18:26:15 -0700 (PDT)
From: CryptUp Tester <cryptup.tester@gmail.com>
Date: Thu, 2 Nov 2017 18:26:15 -0700
Message-ID: <CANz6GzyZ50iDGL+O_7TmAz0hSQDjzfT7Mn6mVYGZUy1i+DEXeQ@mail.gmail.com>
Subject: signed message - maliciously modified - should not pass
To: flowcrypt.compatibility@gmail.com
Content-Type: multipart/alternative; boundary="94eb2c07ab54b48c8c055d09fd40"

--94eb2c07ab54b48c8c055d09fd40
Content-Type: text/plain; charset="UTF-8"

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

this message is signed and was modified in transit
-----BEGIN PGP SIGNATURE-----
Version: FlowCrypt 5.0.4 Gmail Encryption flowcrypt.com
Comment: Seamlessly send, receive and search encrypted email

wsFcBAEBCAAQBQJZ+8VXCRAGylU+wkVdcAAAgRwQAMkc+2WrIBf+X3T+yNps
va4xMQEVvBFS4GxbTA1xndmfuo3hr3Vfq/sAI2Plo65D0rd9Wc6p88Awl+9w
a0l4Yx3isH0jm9gcpypzYJf9leertBcvIxDvqGZc/xPxyRzQKgXiNkvaZI8U
NNkoAdCves4wx3sb0lJhIKyRhXwKWWroWKfoBYAryKDSE2q8d1z+P0mDbop7
J5YLui+6VsGJoqZdM8lMGLp2TuyGVxy5moEvrIY8zvYm61Ke+wGLbL63Bqdg
Zb8pMEp1xdW/xPgFT6IrtFdHTEiqczkeiHOG7+F8zPcKBbvx6luFAvFh103I
l06RRefeJkppLJ2S+A0iDzmqDknYin2Hm8VBa2ill/RfI4c1ThzM5trjrC1b
rOMzIMZfDdCDCRjfILNyjnanhsYEYZ30NnmjOrNDthA9VCEUupoRvSmDbA8O
VtckZH3YzIi6CsHs8dl2WTQ/lj1yXKDqnpoWzndzVrFRtjVW7I75lL/+/MYp
hktbFAWIkrqqWapwIUEGefzbrulRRVUU6m6slbKIurOgkEt+coJUNMTsuPPX
aAa43ze8hUji5EXALE9I+41uz+dtnJymaQhsnXL8R8VHAgowrvQgLeuTZNVH
AeNkbcng+Kz3ErVk3Q+RDt0i5FL0oIzP/AsxhGeOG38j+QVe6OgYm7IjfaIA
r498
=76q6
-----END PGP SIGNATURE-----

--94eb2c07ab54b48c8c055d09fd40
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><span style=3D"font-size:12.8px">-----BEGIN PGP SIGNED MES=
SAGE-----</span><br style=3D"font-size:12.8px"><span style=3D"font-size:12.=
8px">Hash: SHA256</span><br style=3D"font-size:12.8px"><br style=3D"font-si=
ze:12.8px"><span style=3D"font-size:12.8px">this message is signed and was =
modified in transit</span><br style=3D"font-size:12.8px"><span style=3D"fon=
t-size:12.8px">-----BEGIN PGP SIGNATURE-----</span><br style=3D"font-size:1=
2.8px"><span style=3D"font-size:12.8px">Version: FlowCrypt 5.0.4 Gmail Encr=
yption=C2=A0</span><a href=3D"http://flowcrypt.com/" rel=3D"noreferrer" tar=
get=3D"_blank" style=3D"font-size:12.8px">flowcrypt.com</a><br style=3D"fon=
t-size:12.8px"><span style=3D"font-size:12.8px">Comment: Seamlessly send, r=
eceive and search encrypted email</span><br style=3D"font-size:12.8px"><br =
style=3D"font-size:12.8px"><span style=3D"font-size:12.8px">wsFcBAEBCAAQBQJ=
Z+8VXCRAGylU+</span><wbr style=3D"font-size:12.8px"><span style=3D"font-siz=
e:12.8px">wkVdcAAAgRwQAMkc+2WrIBf+X3T+</span><wbr style=3D"font-size:12.8px=
"><span style=3D"font-size:12.8px">yNps</span><br style=3D"font-size:12.8px=
"><span style=3D"font-size:12.8px">va4xMQEVvBFS4GxbTA1xndmfuo3hr3</span><wb=
r style=3D"font-size:12.8px"><span style=3D"font-size:12.8px">Vfq/sAI2Plo65=
D0rd9Wc6p88Awl+9w</span><br style=3D"font-size:12.8px"><span style=3D"font-=
size:12.8px">a0l4Yx3isH0jm9gcpypzYJf9leertB</span><wbr style=3D"font-size:1=
2.8px"><span style=3D"font-size:12.8px">cvIxDvqGZc/xPxyRzQKgXiNkvaZI8U</spa=
n><br style=3D"font-size:12.8px"><span style=3D"font-size:12.8px">NNkoAdCve=
s4wx3sb0lJhIKyRhXwKWW</span><wbr style=3D"font-size:12.8px"><span style=3D"=
font-size:12.8px">roWKfoBYAryKDSE2q8d1z+P0mDbop7</span><br style=3D"font-si=
ze:12.8px"><span style=3D"font-size:12.8px">J5YLui+</span><wbr style=3D"fon=
t-size:12.8px"><span style=3D"font-size:12.8px">6VsGJoqZdM8lMGLp2TuyGVxy5mo=
Evr</span><wbr style=3D"font-size:12.8px"><span style=3D"font-size:12.8px">=
IY8zvYm61Ke+wGLbL63Bqdg</span><br style=3D"font-size:12.8px"><span style=3D=
"font-size:12.8px">Zb8pMEp1xdW/</span><wbr style=3D"font-size:12.8px"><span=
 style=3D"font-size:12.8px">xPgFT6IrtFdHTEiqczkeiHOG7+</span><wbr style=3D"=
font-size:12.8px"><span style=3D"font-size:12.8px">F8zPcKBbvx6luFAvFh103I</=
span><br style=3D"font-size:12.8px"><span style=3D"font-size:12.8px">l06RRe=
feJkppLJ2S+</span><wbr style=3D"font-size:12.8px"><span style=3D"font-size:=
12.8px">A0iDzmqDknYin2Hm8VBa2ill/</span><wbr style=3D"font-size:12.8px"><sp=
an style=3D"font-size:12.8px">RfI4c1ThzM5trjrC1b</span><br style=3D"font-si=
ze:12.8px"><span style=3D"font-size:12.8px">rOMzIMZfDdCDCRjfILNyjnanhsYEYZ<=
/span><wbr style=3D"font-size:12.8px"><span style=3D"font-size:12.8px">30Nn=
mjOrNDthA9VCEUupoRvSmDbA8O</span><br style=3D"font-size:12.8px"><span style=
=3D"font-size:12.8px">VtckZH3YzIi6CsHs8dl2WTQ/</span><wbr style=3D"font-siz=
e:12.8px"><span style=3D"font-size:12.8px">lj1yXKDqnpoWzndzVrFRtjVW7I75lL</=
span><wbr style=3D"font-size:12.8px"><span style=3D"font-size:12.8px">/+/MY=
p</span><br style=3D"font-size:12.8px"><span style=3D"font-size:12.8px">hkt=
bFAWIkrqqWapwIUEGefzbrulRRV</span><wbr style=3D"font-size:12.8px"><span sty=
le=3D"font-size:12.8px">UU6m6slbKIurOgkEt+coJUNMTsuPPX</span><br style=3D"f=
ont-size:12.8px"><span style=3D"font-size:12.8px">aAa43ze8hUji5EXALE9I+41uz=
+</span><wbr style=3D"font-size:12.8px"><span style=3D"font-size:12.8px">dt=
nJymaQhsnXL8R8VHAgowrvQgLeuT</span><wbr style=3D"font-size:12.8px"><span st=
yle=3D"font-size:12.8px">ZNVH</span><br style=3D"font-size:12.8px"><span st=
yle=3D"font-size:12.8px">AeNkbcng+Kz3ErVk3Q+</span><wbr style=3D"font-size:=
12.8px"><span style=3D"font-size:12.8px">RDt0i5FL0oIzP/AsxhGeOG38j+</span><=
wbr style=3D"font-size:12.8px"><span style=3D"font-size:12.8px">QVe6OgYm7Ij=
faIA</span><br style=3D"font-size:12.8px"><span style=3D"font-size:12.8px">=
r498</span><br style=3D"font-size:12.8px"><span style=3D"font-size:12.8px">=
=3D76q6</span><br style=3D"font-size:12.8px"><span style=3D"font-size:12.8p=
x">-----END PGP SIGNATURE-----</span><br></div>

--94eb2c07ab54b48c8c055d09fd40--
", + "historyId": "1333314", + "internalDate": "1509672375000" + } +} \ No newline at end of file diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index 7dcf1f3e5f2..a4524390f8b 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -260,6 +260,71 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te }); })); + ava.default(`decrypt - [security] signed message - maliciously modified - should not pass`, testWithBrowser('compatibility', async (t, browser) => { + const acctEmail = 'flowcrypt.compatibility@gmail.com'; + const msgId = '15f7f7c5979b5a26'; + const signerEmail = 'sender@domain.com'; + const params = `?frameId=none&account_email=${acctEmail}&senderEmail=${signerEmail}&msgId=${msgId}`; + await PageRecipe.addPubkey(t, browser, acctEmail, `-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: FlowCrypt Email Encryption 8.2.0 +Comment: Seamlessly send and receive encrypted email + +xsFNBFj/aG8BEADO625P5MArNIVlMBPp/HM1lYD1gcVwgYl4aHuXohDMS6dv +VAlSDXMVWwbsXJ9T3AxYIL3ZoOFDc1Jy0AqBKhYoOYm5miYHpOQtP/M4V6fK +3rhmc8C1LP1JXuaEXS0w7MQig8JZC08ECUH1/Gnhm3tyacRgrAr13s591Obj +oP/kwglOUjKDYvkXXk9iwouU85sh9HKwC4wR6idFhFSnsl8xp4FI4plLQPTy +Ea1nf3l+oVqCFT5moVtsew7qUD5mWkgytEdr728Sqh5vjiO+lc6cjqb0PK77 +DAuhTel1bV5PRCtRom/qrqmOz4MbE5wd2kU/JxFPIXZ1BKyicT/Q6I9MXjni +77Bl91x0V9brnBqyhfY524Vlm/2AEb3H9I10rsTBtU4TT+SJOlwyU1V7hDkJ +Kq1zTrVjCvoPcTBXGx9xSZmJO4TI7frNZFiJ5uiYwTYPwp3Yze69y/NORwme +ZlXtXJbzpVvRzXUzex89c6pFiKE8mC5/DV/eJanBYKgSyGEiHq9U6kDJrTN4 +/fSjiIJ0fWK3bcYwyYUbf9+/JcLSo2sG259FuRF75yxIe2u2RLSh62plEsyb +cpD545pvlrKIvwg/1hio999lMnSjj+hfNQ7A+Xm5BWiSzrJ1fR1Oo5rq68kY +1C4K8FUQwP3zEF2YDoqbBEnYaxaH7HUcbc34xQARAQABzSlDcnlwdFVwIFRl +c3RlciA8Y3J5cHR1cC50ZXN0ZXJAZ21haWwuY29tPsLBfwQQAQgAKQUCWP9o +cAYLCQcIAwIJEAbKVT7CRV1wBBUIAgoDFgIBAhkBAhsDAh4BAAoJEAbKVT7C +RV1wL8EP/iGk15uGa6gNYdjfoGElIjZCyp1VWTU3VSkkQhLxzWWmB6mQyuZj +vU0SpW89OGyJXoX2M7dDFuuQJmZub7adek0810FaRb9WBmxRZKJe6kdnIc13 +Z2zgs9e9ltHCq1rvHsVa+F0dQu0elFXJJbX6LqvyRnuKQxcGLIZbi/GXswgl +g3p6OsuSSSa/fKGylrUjMNPtF6jKhbEz9/5Be+3Fn3memhO07oKtr0SFYNQr +mg2Sp6xmDwVm8GGQO69DEyxBzDZtzVhnJgOgWcgKli3u6HBvvg1pVwtgLEnF +KoNug9qZoeNPPdv4ueHnE4cM1ZrWsnFqLusexO4RKgxhnQ+UaK1SeRahDKuD +bAYreN5aFex6KNUeCFum1QDSKhRlL9FUtDAPPu3HtVDfbWgu+tn/YnUXzQWN +MovbuYaIp0qyaC5f+PPZ4cqi++B8npUoIStkLrGrxwnvQVbB0fh9JMLMwzLV +4wwSbZCkSPRXCv0H71ODr71SjTUm5M9c2l6xiNmDruKdwhyvmkApbkdz4ZXV +VEg0e8E/2rH1sTB+N47h/gtJF6J0asnu3A7Pt8IuKn6ycPxmLcAtCX82vzpc +rshPtQJVaRASle4BvuoikyJdhuQ5wTf7XX3JCzUrGA1W8u/mmVdwrVb7oX3g +IzfWJbjamWQUg6jspvPAVLBBSzncwS22zsFNBFj/aG8BEACilSpjULG6TZYb +hWcnR46n/gGgQULCW/UO8y0rlAAZgS1BvfqIUnW9bbCOTBKuy3ZLMtrBeCrG +OigR4NFSuDXbvCks3lRZYBEsos68rf2vCWnf3Wro2HSeX5YlceOl2ALlV0To +XrND5aWvGkBsFLpm1f7NiDV6qPB8A5HtFCONvpPzhtkpJIixk1NlEtzjJPOW +1qKh4vX2JJjO2EyUbenSYMI6nr3yLxBVI4d4uoqRUsKfgdbkt/0x7XP4tOus +FmcCFm9GdZ7AIVaYpC+nJGi4hIZL1BJC/5qk3yL9MCQLALEb1ymb5jvKkKyq +vFEKwA43zEj/+LHKIYrsIz0WKqbdzcqq5YgnE0VmUwS14+8NRNpuGXAHkVBR +b9S4XCz5Ed7gaJsWqCqm8E+g+uLM/ml6KSDKKXLFhX+uMxZ2AQCTe7WDpiEE +DB+WmRjVfvL+rlrz6YBMwBULrQ1Fa9rbQCH8ivhz7ue6RzgAedTfpdOHp/Vl +3lJk9XKqamlwClfXBB96EZKQUc+cGiFtS5hJVm7m4xFimXywfDYLxjLANJTK +rGmlXVdLMKHoUB7r1yEL9XngSyv7AC9/1QkrTMJFvIH2i/PmxCgyvpeCXdZo +V2vlQMs0wBLE08gGmD92NX0efeSwPGBwbH7uLoGM6nO/+9RMbxPu0vJHQb9M +DonpFrO81QARAQABwsFpBBgBCAATBQJY/2hzCRAGylU+wkVdcAIbDAAKCRAG +ylU+wkVdcMWLD/97wA3viAjYsP7zbuvfvjb9qxDvomeozrcYNPdz1Ono3mLs +czEHD4p1w+4SBAdYAN2kMFw+1EaRBQP23Laa28axhKDbsb8c/JvY5hIt/osX +sxA9seXRES8iPIYq8zSNXqx8ZADUOR9jkR1tAhqpqYHvcZmsbW+bBdhHg0EV +ge2qEPFy84k0NOVM1Fwj3nsblym9ZLrx3YWQIceVJGxl0u3UmSdNpR0JgCuC +QlItExJY8DBYMVmk8kkd/uWQSBTWq6qXf/vARKEMqp+aA5gPMFngrQfL/yNI +emIRaWAXoXwqXQcJGz4BGGgBuX8zjldvT5sOnfTEokygeSg7K95ZlbPYwdvT +QhLMOUoQF7YysI8l7qIdUW2qM8zepn3eHIhpgq7QfwdzceWpgHma683zQUVf +sU09dzg2IihGnk13oXaq8wye4P4Cw4oKBDgpxNrwmh7j5wnxtreuLMrjmS0+ ++8k3NJ4HpmP2tIiIX2JThrj1ANSb2bMZIvH+kW0niR8WqJWzqG1u2hs4EoWN +RWuEm0qwW6TtrChMDpyX3K135ID5TFJ2pvpwUerliNH4LBEAbQcXZt13pe9i +1mePDNOQzBhDMbfRA8VOnL+e77I7CUB5GK/YQw1YoeOc1VamrACkYYfMVX6D +XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== +=1oxZ +-----END PGP PUBLIC KEY BLOCK-----`, 'sender@domain.com'); + // as the verification pubkey is not known, this scenario doesn't trigger message re-fetch + await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { params, content: [], signature: ["Unknown Signer", "Message digest did not match"] }); + })); + ava.default(`decrypt - [everdesk] message encrypted for sub but claims encryptedFor:primary,sub`, testWithBrowser('compatibility', async (t, browser) => { await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { content: ["this is a sample for FlowCrypt compatibility"],