From f5e09bc2db6cfae553461a22c4207fff6d94210f Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 5 Apr 2023 18:06:12 +0100 Subject: [PATCH 001/147] (wip) move in the direction of common renderer --- .../compose-modules/compose-draft-module.ts | 4 +- .../inbox-active-thread-module.ts | 47 ++++-------- .../common/api/email-provider/gmail/gmail.ts | 2 +- extension/js/common/core/mime.ts | 49 +++++-------- extension/js/common/ui/message-renderer.ts | 71 +++++++++++++++++++ .../webmail/gmail-element-replacer.ts | 50 ++++++++++--- 6 files changed, 146 insertions(+), 77 deletions(-) create mode 100644 extension/js/common/ui/message-renderer.ts diff --git a/extension/chrome/elements/compose-modules/compose-draft-module.ts b/extension/chrome/elements/compose-modules/compose-draft-module.ts index f19d498382e..2039a12c000 100644 --- a/extension/chrome/elements/compose-modules/compose-draft-module.ts +++ b/extension/chrome/elements/compose-modules/compose-draft-module.ts @@ -11,7 +11,7 @@ import { Ui } from '../../../js/common/browser/ui.js'; import { Buf } from '../../../js/common/core/buf.js'; import { Str, Url } from '../../../js/common/core/common.js'; import { DecryptErrTypes, MsgUtil } from '../../../js/common/core/crypto/pgp/msg-util.js'; -import { Mime, MimeContent, MimeProccesedMsg } from '../../../js/common/core/mime.js'; +import { Mime, MimeContentWithHeaders, MimeProccesedMsg } from '../../../js/common/core/mime.js'; import { MsgBlockParser } from '../../../js/common/core/msg-block-parser.js'; import { Catch } from '../../../js/common/platform/catch.js'; import { GlobalStore } from '../../../js/common/platform/store/global-store.js'; @@ -293,7 +293,7 @@ export class ComposeDraftModule extends ViewModule { } }; - private fillAndRenderDraftHeaders = async (decoded: MimeContent) => { + private fillAndRenderDraftHeaders = async (decoded: MimeContentWithHeaders) => { this.view.recipientsModule.addRecipientsAndShowPreview({ to: decoded.to, cc: decoded.cc, bcc: decoded.bcc }); if (decoded.from) { this.view.S.now('input_from').val(decoded.from); diff --git a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts index 9c0e3d655ca..c6c720d6e28 100644 --- a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts +++ b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts @@ -3,9 +3,9 @@ 'use strict'; import { Bm, BrowserMsg } from '../../../../js/common/browser/browser-msg.js'; -import { FactoryReplyParams, XssSafeFactory } from '../../../../js/common/xss-safe-factory.js'; +import { FactoryReplyParams } from '../../../../js/common/xss-safe-factory.js'; import { GmailParser, GmailRes } from '../../../../js/common/api/email-provider/gmail/gmail-parser.js'; -import { Str, Url, UrlParams } from '../../../../js/common/core/common.js'; +import { Url, UrlParams } from '../../../../js/common/core/common.js'; import { ApiErr } from '../../../../js/common/api/shared/api-error.js'; import { BrowserMsgCommonHandlers } from '../../../../js/common/browser/browser-msg-common-handlers.js'; @@ -13,7 +13,7 @@ import { Buf } from '../../../../js/common/core/buf.js'; import { Catch } from '../../../../js/common/platform/catch.js'; import { InboxView } from '../inbox.js'; import { Lang } from '../../../../js/common/lang.js'; -import { Mime } from '../../../../js/common/core/mime.js'; +import { MessageRenderer } from '../../../../js/common/ui/message-renderer.js'; import { Ui } from '../../../../js/common/browser/ui.js'; import { ViewModule } from '../../../../js/common/view-module.js'; import { Xss } from '../../../../js/common/platform/xss.js'; @@ -105,40 +105,19 @@ export class InboxActiveThreadModule extends ViewModule { private renderMsg = async (message: GmailRes.GmailMsg) => { const htmlId = this.replyMsgId(message.id); - const from = GmailParser.findHeader(message, 'from') || 'unknown'; + const from = GmailParser.findHeader(message, 'from'); try { const { raw } = await this.view.gmail.msgGet(message.id, 'raw'); - const mimeMsg = Buf.fromBase64UrlStr(raw!); // eslint-disable-line @typescript-eslint/no-non-null-assertion - const { blocks, headers } = await Mime.process(mimeMsg); - let r = ''; - let renderedAttachments = ''; - for (const block of blocks) { - if (block.type === 'encryptedMsg' || block.type === 'publicKey' || block.type === 'privateKey' || block.type === 'signedMsg') { - this.threadHasPgpBlock = true; - } - if (r) { - r += '

'; - } - if (['encryptedAttachment', 'plainAttachment'].includes(block.type)) { - renderedAttachments += XssSafeFactory.renderableMsgBlock( - this.view.factory, - block, - message.id, - from, - this.view.storage.sendAs && !!this.view.storage.sendAs[from] - ); - } else if (this.view.showOriginal) { - r += Xss.escape(Str.with(block.content)).replace(/\n/g, '
'); - } else { - r += XssSafeFactory.renderableMsgBlock(this.view.factory, block, message.id, from, this.view.storage.sendAs && !!this.view.storage.sendAs[from]); - } - } - if (renderedAttachments) { - r += `
${renderedAttachments}
`; - } + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + const { blocks, headers } = await MessageRenderer.processMessageFromRaw(raw!); + // todo: review the meaning of threadHasPgpBlock + this.threadHasPgpBlock ||= blocks.some(block => ['encryptedMsg', 'publicKey', 'privateKey', 'signedMsg'].includes(block.type)); + // todo: take `from` from the processedMessage? const exportBtn = this.debugEmails.includes(this.view.acctEmail) ? 'download api export' : ''; - r = - `

From: ${Xss.escape(from)} ${headers.date} ${exportBtn}

` + r; + const r = + `

From: ${Xss.escape(from || 'unknown')} ${ + headers.date + } ${exportBtn}

` + MessageRenderer.renderMsg({ from, blocks }, this.view.factory, this.view.showOriginal, message.id, this.view.storage.sendAs); $('.thread').append(this.wrapMsg(htmlId, r)); // xss-safe-factory if (exportBtn) { $('.action-export').on( diff --git a/extension/js/common/api/email-provider/gmail/gmail.ts b/extension/js/common/api/email-provider/gmail/gmail.ts index 75cad4a34a0..62e3c4383fd 100644 --- a/extension/js/common/api/email-provider/gmail/gmail.ts +++ b/extension/js/common/api/email-provider/gmail/gmail.ts @@ -295,7 +295,7 @@ export class Gmail extends EmailProviderApi implements EmailProviderInterface { await this.apiGmailLoopThroughEmailsToCompileContacts(needles, gmailQuery, chunkedCb); }; - /** + /** @deprecated should not be used by pgp_block frames * Extracts the encrypted message from gmail api. Sometimes it's sent as a text, sometimes html, sometimes attachments in various forms. * As MsgBlockParser detects incomplete encryptedMsg etc. and they get through, we're handling them too */ diff --git a/extension/js/common/core/mime.ts b/extension/js/common/core/mime.ts index ed3e2c1c94a..6fb75fb52f8 100644 --- a/extension/js/common/core/mime.ts +++ b/extension/js/common/core/mime.ts @@ -23,16 +23,19 @@ const Iso88592 = requireIso88592(); type AddressHeader = { address: string; name: string }; type MimeContentHeader = string | AddressHeader[]; export type MimeContent = { - headers: Dict; attachments: Attachment[]; rawSignedContent?: string; subject?: string; html?: string; text?: string; - from?: string; +}; + +export type MimeContentWithHeaders = MimeContent & { + headers: Dict; to: string[]; cc: string[]; bcc: string[]; + from?: string; }; export type MimeEncodeType = 'pgpMimeEncrypted' | 'pgpMimeSigned' | 'smimeEncrypted' | 'smimeSigned' | undefined; @@ -46,12 +49,14 @@ export type SendableMsgBody = { }; /* eslint-enable @typescript-eslint/naming-convention */ export type MimeProccesedMsg = { - rawSignedContent: string | undefined; - headers: Dict; + rawSignedContent: string | undefined; // undefined if format was 'full' blocks: MsgBlock[]; - from: string | undefined; - to: string[]; }; + +export type MimeProccesedFromRawMsg = MimeProccesedMsg & { + headers: Dict; +}; + type SendingType = 'to' | 'cc' | 'bcc'; export class Mime { @@ -127,17 +132,17 @@ export class Mime { } } return { - headers: decoded.headers, blocks, - from: decoded.from, - to: decoded.to, rawSignedContent: decoded.rawSignedContent, }; }; - public static process = async (mimeMsg: Uint8Array): Promise => { + public static process = async (mimeMsg: Uint8Array): Promise => { const decoded = await Mime.decode(mimeMsg); - return Mime.processDecoded(decoded); + return { + headers: decoded.headers, + ...Mime.processDecoded(decoded), + }; }; public static isPlainImgAttachment = (b: MsgBlock) => { @@ -149,12 +154,6 @@ export class Mime { ); }; - public static replyHeaders = (parsedMimeMsg: MimeContent) => { - const msgId = String(parsedMimeMsg.headers['message-id'] || ''); - const refs = String(parsedMimeMsg.headers['in-reply-to'] || ''); - return { 'in-reply-to': msgId, references: refs + ' ' + msgId }; - }; - public static resemblesMsg = (msg: Uint8Array | string) => { const chunk = (typeof msg === 'string' ? msg.substring(0, 3000) : new Buf(msg.slice(0, 3000)).toUtfStr('ignore')).toLowerCase().replace(/\r\n/g, '\n'); const headers = chunk.split('\n\n')[0]; @@ -177,18 +176,8 @@ export class Mime { return contentType.index === 0; }; - public static decode = async (mimeMsg: Uint8Array | string): Promise => { - let mimeContent: MimeContent = { - attachments: [], - headers: {}, - subject: undefined, - text: undefined, - html: undefined, - from: undefined, - to: [], - cc: [], - bcc: [], - }; + public static decode = async (mimeMsg: Uint8Array | string): Promise => { + let mimeContent: MimeContentWithHeaders; const parser = new MimeParser(); const leafNodes: { [key: string]: MimeParserNode } = {}; parser.onbody = (node: MimeParserNode) => { @@ -338,7 +327,7 @@ export class Mime { return pgpMimeSigned; }; - private static headerGetAddress = (parsedMimeMsg: MimeContent, headersNames: Array) => { + private static headerGetAddress = (parsedMimeMsg: MimeContentWithHeaders, headersNames: Array) => { const result: { to: string[]; cc: string[]; bcc: string[] } = { to: [], cc: [], bcc: [] }; let from: string | undefined; const getHdrValAsArr = (hdr: MimeContentHeader) => diff --git a/extension/js/common/ui/message-renderer.ts b/extension/js/common/ui/message-renderer.ts new file mode 100644 index 00000000000..50980ae33ee --- /dev/null +++ b/extension/js/common/ui/message-renderer.ts @@ -0,0 +1,71 @@ +/* ©️ 2016 - present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com */ + +'use strict'; + +import { GmailParser, GmailRes } from '../api/email-provider/gmail/gmail-parser.js'; +import { Buf } from '../core/buf.js'; +import { Dict, Str } from '../core/common.js'; +import { Mime, MimeContent, MimeProccesedMsg } from '../core/mime.js'; +import { MsgBlock } from '../core/msg-block.js'; +import { SendAsAlias } from '../platform/store/acct-store.js'; +import { Xss } from '../platform/xss.js'; +import { XssSafeFactory } from '../xss-safe-factory.js'; + +export type ProccesedMsg = MimeProccesedMsg & { + from?: string; +}; + +export class MessageRenderer { + public static renderMsg = ( + { from, blocks }: { blocks: MsgBlock[]; from?: string }, + factory: XssSafeFactory, + showOriginal: boolean, + msgId: string, // todo: will be removed + sendAs?: Dict + ) => { + const isOutgoing = Boolean(from && !!sendAs?.[from]); + let r = ''; + let renderedAttachments = ''; + for (const block of blocks) { + if (r) { + r += '

'; + } + if (['encryptedAttachment', 'plainAttachment'].includes(block.type)) { + renderedAttachments += XssSafeFactory.renderableMsgBlock(factory, block, msgId, from || 'unknown', isOutgoing); + } else if (showOriginal) { + r += Xss.escape(Str.with(block.content)).replace(/\n/g, '
'); + } else { + r += XssSafeFactory.renderableMsgBlock(factory, block, msgId, from || 'unknown', isOutgoing); + } + } + if (renderedAttachments) { + r += `
${renderedAttachments}
`; + } + return r; + }; + + public static process = async (gmailMsg: GmailRes.GmailMsg): Promise => { + const processedMsg = gmailMsg.raw ? await MessageRenderer.processMessageFromRaw(gmailMsg.raw) : MessageRenderer.processMessageFromFull(gmailMsg); + return { from: GmailParser.findHeader(gmailMsg, 'from'), ...processedMsg }; + }; + + public static processMessageFromRaw = async (raw: string) => { + const mimeMsg = Buf.fromBase64UrlStr(raw); + return await Mime.process(mimeMsg); + }; + + private static processMessageFromFull = (gmailMsg: GmailRes.GmailMsg) => { + const bodies = GmailParser.findBodies(gmailMsg); + const attachments = GmailParser.findAttachments(gmailMsg); + const text = bodies['text/plain'] ? Buf.fromBase64UrlStr(bodies['text/plain']).toUtfStr() : undefined; + // todo: do we need to strip? + const html = bodies['text/html'] ? Xss.htmlSanitizeAndStripAllTags(Buf.fromBase64UrlStr(bodies['text/html']).toUtfStr(), '\n') : undefined; + // reconstructed MIME content + const mimeContent: MimeContent = { + text, + html, + attachments, + }; + return Mime.processDecoded(mimeContent); + }; +} diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index 0898db14854..30bb81d2b8a 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -25,16 +25,22 @@ import { SendAsAlias } from '../../common/platform/store/acct-store.js'; // todo: can we somehow define a purely relay class for ContactStore to clearly show that crypto-libraries are not loaded and can't be used? import { ContactStore } from '../../common/platform/store/contact-store.js'; import { Buf } from '../../common/core/buf.js'; -import { MsgBlockParser } from '../../common/core/msg-block-parser.js'; +import { MessageRenderer, ProccesedMsg } from '../../common/ui/message-renderer.js'; type JQueryEl = JQuery; +interface MessageCacheEntry { + full: Promise; + processedFull?: ProccesedMsg; +} + export class GmailElementReplacer implements WebmailElementReplacer { private debug = false; private gmail: Gmail; private recipientHasPgpCache: Dict = {}; private sendAs: Dict; + private messages: Dict = {}; private factory: XssSafeFactory; private clientConfiguration: ClientConfiguration; private pubLookup: PubLookup; @@ -152,8 +158,29 @@ export class GmailElementReplacer implements WebmailElementReplacer { } }; + private msgGetCached = (msgId: string): MessageCacheEntry => { + // todo: retries? exceptions? + let msgDownload = this.messages[msgId]; + if (!msgDownload) { + this.messages[msgId] = { full: this.gmail.msgGet(msgId, 'full') }; + msgDownload = this.messages[msgId]; + } + return msgDownload; + }; + + private msgGetProcessed = async (msgId: string): Promise => { + // todo: retries? exceptions? + const msgDownload = this.msgGetCached(msgId); + if (msgDownload.processedFull) { + return msgDownload.processedFull; + } + const msg = await msgDownload.full; + msgDownload.processedFull = await MessageRenderer.process(msg); + return msgDownload.processedFull; + }; + private everything = () => { - this.replaceArmoredBlocks(); + this.replaceArmoredBlocks().catch(Catch.reportErr); this.replaceAttachments().catch(Catch.reportErr); this.replaceComposeDraftLinks(); this.replaceConvoBtns(); @@ -163,7 +190,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { this.renderLocalDrafts().catch(Catch.reportErr); }; - private replaceArmoredBlocks = () => { + private replaceArmoredBlocks = async () => { const emailsContainingPgpBlock = $(this.sel.msgOuter).find(this.sel.msgInnerContainingPgp).not('.evaluated'); for (const emailContainer of emailsContainingPgpBlock) { if (this.debug) { @@ -173,14 +200,12 @@ export class GmailElementReplacer implements WebmailElementReplacer { if (this.debug) { console.debug('replaceArmoredBlocks() for of emailsContainingPgpBlock -> emailContainer added evaluated'); } - const senderEmail = this.getSenderEmail(emailContainer); - const isOutgoing = !!this.sendAs[senderEmail]; const msgId = this.determineMsgId(emailContainer); - const { blocks } = MsgBlockParser.detectBlocks(emailContainer.innerText); + const { blocks, from } = await this.msgGetProcessed(msgId); if (blocks.length === 1 && blocks[0].type === 'plainText') { // only has single block which is plain text } else { - const replacementXssSafe = XssSafeFactory.renderableMsgBlocks(this.factory, blocks, msgId, senderEmail, isOutgoing); + const replacementXssSafe = MessageRenderer.renderMsg({ blocks, from }, this.factory, false, msgId, this.sendAs); $(this.sel.translatePrompt).hide(); if (this.debug) { console.debug('replaceArmoredBlocks() for of emailsContainingPgpBlock -> emailContainer replacing'); @@ -390,7 +415,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { if (this.debug) { console.debug('processNewPgpAttachments() -> msgGet may take some time'); } - const msg = await this.gmail.msgGet(msgId, 'full'); // todo: cache or thoroughly refactor in #5022 + const msg = await this.msgGetCached(msgId).full; if (this.debug) { console.debug('processNewPgpAttachments() -> msgGet done -> processAttachments', msg); } @@ -423,7 +448,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { if (this.debug) { console.debug('processAttachments()', attachmentMetas); } - let msgEl = this.getMsgBodyEl(msgId); // not a constant because sometimes elements get replaced, then returned by the function that replaced them + const msgEl = this.getMsgBodyEl(msgId); // not a constant because sometimes elements get replaced, then returned by the function that replaced them const isBodyEmpty = msgEl.text() === '' || msgEl.text() === '\n'; const senderEmail = this.getSenderEmail(msgEl); const isOutgoing = !!this.sendAs[senderEmail]; @@ -444,6 +469,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { if (treatAs !== 'plainFile') { this.hideAttachment(attachmentSel, attachmentsContainerInner); nRenderedAttachments--; + /* if (treatAs === 'encryptedFile') { // actual encrypted attachment - show it attachmentsContainerInner.prepend(this.factory.embeddedAttachment(a, true)); // xss-safe-factory @@ -483,7 +509,9 @@ export class GmailElementReplacer implements WebmailElementReplacer { const embeddedSignedMsgXssSafe = this.factory.embeddedMsg('signedMsg', '', msgId, false, senderEmail, true); msgEl = this.updateMsgBodyEl_DANGEROUSLY(msgEl, 'set', embeddedSignedMsgXssSafe); // xss-safe-factory } + */ } else if (treatAs === 'plainFile' && a.name.substr(-4) === '.asc') { + // todo: // normal looking attachment ending with .asc // eslint-disable-next-line @typescript-eslint/no-non-null-assertion const data = await this.gmail.attachmentGetChunk(msgId, a.id!); // .id is present when fetched from api @@ -579,6 +607,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { return nRenderedAttachments; }; + /* todo: private renderBackupFromFile = async ( attachmentMeta: Attachment, attachmentsContainerInner: JQueryEl, @@ -598,7 +627,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { this.updateMsgBodyEl_DANGEROUSLY(msgEl, 'append', this.factory.embeddedBackup(downloadedAttachment.data.toUtfStr())); // xss-safe-factory return nRenderedAttachments; }; - + */ private filterAttachments = (potentialMatches: JQueryEl | HTMLElement, regExp: RegExp) => { return $(potentialMatches) .filter('span.aZo:visible, span.a5r:visible') @@ -683,6 +712,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { } }; + // todo: should we use it? private getSenderEmail = (msgEl: HTMLElement | JQueryEl) => { return ($(msgEl).closest('.gs').find('span.gD').attr('email') || '').toLowerCase(); }; From 73082cf2ff864efc5c58e1251e12aa41390161ca Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 7 Apr 2023 09:26:57 +0100 Subject: [PATCH 002/147] fix --- .../compose-modules/compose-draft-module.ts | 4 +- .../compose-modules/compose-quote-module.ts | 10 +- .../inbox-active-thread-module.ts | 17 +++- extension/js/common/core/mime.ts | 91 +++++++++++++------ .../js/common/{ui => }/message-renderer.ts | 47 ++++++---- .../webmail/gmail-element-replacer.ts | 30 +++--- 6 files changed, 126 insertions(+), 73 deletions(-) rename extension/js/common/{ui => }/message-renderer.ts (57%) diff --git a/extension/chrome/elements/compose-modules/compose-draft-module.ts b/extension/chrome/elements/compose-modules/compose-draft-module.ts index 2039a12c000..1ecfc3a0852 100644 --- a/extension/chrome/elements/compose-modules/compose-draft-module.ts +++ b/extension/chrome/elements/compose-modules/compose-draft-module.ts @@ -304,13 +304,13 @@ export class ComposeDraftModule extends ViewModule { }; private decryptAndRenderDraft = async (encrypted: MimeProccesedMsg): Promise => { - const rawBlock = encrypted.blocks.find(b => ['encryptedMsg', 'signedMsg', 'pkcs7'].includes(b.type)); + const rawBlock = encrypted.blocks.find(b => ['encryptedMsg', 'signedMsg', 'pkcs7'].includes(b.block.type)); if (!rawBlock) { return await this.abortAndRenderReplyMsgComposeTableIfIsReplyBox('!rawBlock'); } const decrypted = await MsgUtil.decryptMessage({ kisWithPp: await KeyStore.getAllWithOptionalPassPhrase(this.view.acctEmail), - encryptedData: rawBlock.content, + encryptedData: rawBlock.block.content, verificationPubs: [], }); if (!decrypted.success) { diff --git a/extension/chrome/elements/compose-modules/compose-quote-module.ts b/extension/chrome/elements/compose-modules/compose-quote-module.ts index eee74fa4f3b..442ca3284ca 100644 --- a/extension/chrome/elements/compose-modules/compose-quote-module.ts +++ b/extension/chrome/elements/compose-modules/compose-quote-module.ts @@ -104,14 +104,14 @@ export class ComposeQuoteModule extends ViewModule { decryptedBlockTypes.push('decryptedAttachment'); } const readableBlocks: MsgBlock[] = []; - for (const block of message.blocks.filter(b => readableBlockTypes.includes(b.type))) { - if (['encryptedMsg', 'signedMsg'].includes(block.type)) { + for (const block of message.blocks.filter(b => readableBlockTypes.includes(b.block.type))) { + if (['encryptedMsg', 'signedMsg'].includes(block.block.type)) { this.setQuoteLoaderProgress('decrypting...'); - const decrypted = await this.decryptMessage(block.content); + const decrypted = await this.decryptMessage(block.block.content); const msgBlocks = await MsgBlockParser.fmtDecryptedAsSanitizedHtmlBlocks(Buf.fromUtfStr(decrypted)); readableBlocks.push(...msgBlocks.blocks.filter(b => decryptedBlockTypes.includes(b.type))); } else { - readableBlocks.push(block); + readableBlocks.push(block.block); } } const decryptedAndFormatedContent: string[] = []; @@ -154,7 +154,7 @@ export class ComposeQuoteModule extends ViewModule { return { headers, text: decryptedAndFormatedContent.join('\n'), - isOnlySigned: !!(decoded.rawSignedContent || (message.blocks.length > 0 && message.blocks[0].type === 'signedMsg')), + isOnlySigned: !!(decoded.rawSignedContent || (message.blocks.length > 0 && message.blocks[0].block.type === 'signedMsg')), decryptedFiles, }; } catch (e) { diff --git a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts index c6c720d6e28..5c28c09b15c 100644 --- a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts +++ b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts @@ -13,7 +13,7 @@ import { Buf } from '../../../../js/common/core/buf.js'; import { Catch } from '../../../../js/common/platform/catch.js'; import { InboxView } from '../inbox.js'; import { Lang } from '../../../../js/common/lang.js'; -import { MessageRenderer } from '../../../../js/common/ui/message-renderer.js'; +import { MessageRenderer } from '../../../../js/common/message-renderer.js'; import { Ui } from '../../../../js/common/browser/ui.js'; import { ViewModule } from '../../../../js/common/view-module.js'; import { Xss } from '../../../../js/common/platform/xss.js'; @@ -111,13 +111,24 @@ export class InboxActiveThreadModule extends ViewModule { // eslint-disable-next-line @typescript-eslint/no-non-null-assertion const { blocks, headers } = await MessageRenderer.processMessageFromRaw(raw!); // todo: review the meaning of threadHasPgpBlock - this.threadHasPgpBlock ||= blocks.some(block => ['encryptedMsg', 'publicKey', 'privateKey', 'signedMsg'].includes(block.type)); + this.threadHasPgpBlock ||= blocks.some(block => ['encryptedMsg', 'publicKey', 'privateKey', 'signedMsg'].includes(block.block.type)); // todo: take `from` from the processedMessage? + const { renderedXssSafe, renderedAttachments } = MessageRenderer.renderMsg( + { from, blocks }, + this.view.factory, + this.view.showOriginal, + message.id, + this.view.storage.sendAs + ); const exportBtn = this.debugEmails.includes(this.view.acctEmail) ? 'download api export' : ''; const r = `

From: ${Xss.escape(from || 'unknown')} ${ headers.date - } ${exportBtn}

` + MessageRenderer.renderMsg({ from, blocks }, this.view.factory, this.view.showOriginal, message.id, this.view.storage.sendAs); + } ${exportBtn}

` + + renderedXssSafe + + (renderedAttachments.length + ? `
${renderedAttachments.map(a => a.renderedBlock).join('')}
` + : ''); $('.thread').append(this.wrapMsg(htmlId, r)); // xss-safe-factory if (exportBtn) { $('.action-export').on( diff --git a/extension/js/common/core/mime.ts b/extension/js/common/core/mime.ts index 6fb75fb52f8..1f66e6160f6 100644 --- a/extension/js/common/core/mime.ts +++ b/extension/js/common/core/mime.ts @@ -50,7 +50,7 @@ export type SendableMsgBody = { /* eslint-enable @typescript-eslint/naming-convention */ export type MimeProccesedMsg = { rawSignedContent: string | undefined; // undefined if format was 'full' - blocks: MsgBlock[]; + blocks: { block: MsgBlock; file?: Attachment }[]; // may be many blocks per file }; export type MimeProccesedFromRawMsg = MimeProccesedMsg & { @@ -61,22 +61,25 @@ type SendingType = 'to' | 'cc' | 'bcc'; export class Mime { public static processDecoded = (decoded: MimeContent): MimeProccesedMsg => { - const blocks: MsgBlock[] = []; + const blocksFromBody: MsgBlock[] = []; if (decoded.text) { const blocksFromTextPart = MsgBlockParser.detectBlocks(Str.normalize(decoded.text)).blocks; // if there are some encryption-related blocks found in the text section, which we can use, and not look at the html section if (blocksFromTextPart.find(b => ['pkcs7', 'encryptedMsg', 'signedMsg', 'publicKey', 'privateKey'].includes(b.type))) { - blocks.push(...blocksFromTextPart); // because the html most likely containt the same thing, just harder to parse pgp sections cause it's html + blocksFromBody.push(...blocksFromTextPart); // because the html most likely containt the same thing, just harder to parse pgp sections cause it's html } else if (decoded.html) { // if no pgp blocks found in text part and there is html part, prefer html - blocks.push(MsgBlock.fromContent('plainHtml', decoded.html)); + blocksFromBody.push(MsgBlock.fromContent('plainHtml', decoded.html)); } else { // else if no html and just a plain text message, use that - blocks.push(...blocksFromTextPart); + blocksFromBody.push(...blocksFromTextPart); } } else if (decoded.html) { - blocks.push(MsgBlock.fromContent('plainHtml', decoded.html)); + blocksFromBody.push(MsgBlock.fromContent('plainHtml', decoded.html)); } + const blocks: { block: MsgBlock; file?: Attachment }[] = blocksFromBody.map(block => { + return { block }; + }); const signatureAttachments: Attachment[] = []; for (const file of decoded.attachments) { const isBodyEmpty = decoded.text === '' || decoded.text === '\n'; @@ -84,51 +87,69 @@ export class Mime { if (treatAs === 'encryptedMsg') { const armored = PgpArmor.clip(file.getData().toUtfStr()); if (armored) { - blocks.push(MsgBlock.fromContent('encryptedMsg', armored)); + blocks.push({ block: MsgBlock.fromContent('encryptedMsg', armored), file }); } } else if (treatAs === 'signature') { signatureAttachments.push(file); } else if (treatAs === 'publicKey') { - blocks.push(...MsgBlockParser.detectBlocks(file.getData().toUtfStr()).blocks); + blocks.push( + ...MsgBlockParser.detectBlocks(file.getData().toUtfStr()).blocks.map(block => { + return { block, file }; // todo: test when more than one + }) + ); } else if (treatAs === 'privateKey') { - blocks.push(...MsgBlockParser.detectBlocks(file.getData().toUtfStr()).blocks); - } else if (treatAs === 'encryptedFile') { blocks.push( - MsgBlock.fromAttachment('encryptedAttachment', '', { + ...MsgBlockParser.detectBlocks(file.getData().toUtfStr()).blocks.map(block => { + return { block, file }; // todo: test when more than one + }) + ); + } else if (treatAs === 'encryptedFile') { + blocks.push({ + // todo: fromAttachment return complete record? + block: MsgBlock.fromAttachment('encryptedAttachment', '', { name: file.name, type: file.type, length: file.getData().length, data: file.getData(), - }) - ); + }), + file, + }); } else if (treatAs === 'plainFile') { - blocks.push( - MsgBlock.fromAttachment('plainAttachment', '', { + blocks.push({ + block: MsgBlock.fromAttachment('plainAttachment', '', { name: file.name, type: file.type, length: file.getData().length, data: file.getData(), inline: file.inline, cid: file.cid, - }) - ); + }), + file, + }); } } if (signatureAttachments.length) { // todo: if multiple signatures, figure out which fits what - const signature = signatureAttachments[0].getData().toUtfStr(); - for (const block of blocks) { - if (block.type === 'plainText') { - block.type = 'signedText'; - block.signature = signature; - } else if (block.type === 'plainHtml') { - block.type = 'signedHtml'; - block.signature = signature; + const signatureAttachment = signatureAttachments[0]; + // todo: data may not be present + if (signatureAttachment.hasData()) { + const signature = signatureAttachment.getData().toUtfStr(); + for (const block of blocks) { + if (block.block.type === 'plainText') { + block.block.type = 'signedText'; + block.block.signature = signature; + } else if (block.block.type === 'plainHtml') { + block.block.type = 'signedHtml'; + block.block.signature = signature; + } } - } - if (!blocks.find(block => ['plainText', 'plainHtml', 'signedMsg', 'signedHtml', 'signedText'].includes(block.type))) { - // signed an empty message - blocks.push(new MsgBlock('signedMsg', '', true, signature)); + if (!blocks.find(block => ['plainText', 'plainHtml', 'signedMsg', 'signedHtml', 'signedText'].includes(block.block.type))) { + // signed an empty message + blocks.push({ block: new MsgBlock('signedMsg', '', true, signature), file: signatureAttachment }); + } + } else { + // debugger; + throw new Error('No data.'); } } return { @@ -177,7 +198,17 @@ export class Mime { }; public static decode = async (mimeMsg: Uint8Array | string): Promise => { - let mimeContent: MimeContentWithHeaders; + let mimeContent: MimeContentWithHeaders = { + attachments: [], + headers: {}, + subject: undefined, + text: undefined, + html: undefined, + from: undefined, + to: [], + cc: [], + bcc: [], + }; const parser = new MimeParser(); const leafNodes: { [key: string]: MimeParserNode } = {}; parser.onbody = (node: MimeParserNode) => { diff --git a/extension/js/common/ui/message-renderer.ts b/extension/js/common/message-renderer.ts similarity index 57% rename from extension/js/common/ui/message-renderer.ts rename to extension/js/common/message-renderer.ts index 50980ae33ee..f60a25bde9e 100644 --- a/extension/js/common/ui/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -2,22 +2,28 @@ 'use strict'; -import { GmailParser, GmailRes } from '../api/email-provider/gmail/gmail-parser.js'; -import { Buf } from '../core/buf.js'; -import { Dict, Str } from '../core/common.js'; -import { Mime, MimeContent, MimeProccesedMsg } from '../core/mime.js'; -import { MsgBlock } from '../core/msg-block.js'; -import { SendAsAlias } from '../platform/store/acct-store.js'; -import { Xss } from '../platform/xss.js'; -import { XssSafeFactory } from '../xss-safe-factory.js'; +import { GmailParser, GmailRes } from './api/email-provider/gmail/gmail-parser.js'; +import { Attachment } from './core/attachment.js'; +import { Buf } from './core/buf.js'; +import { Dict, Str } from './core/common.js'; +import { Mime, MimeContent, MimeProccesedMsg } from './core/mime.js'; +import { MsgBlock } from './core/msg-block.js'; +import { SendAsAlias } from './platform/store/acct-store.js'; +import { Xss } from './platform/xss.js'; +import { XssSafeFactory } from './xss-safe-factory.js'; export type ProccesedMsg = MimeProccesedMsg & { from?: string; }; +export type RenderedAttachment = { + renderedBlock: string; + file: Attachment; +}; + export class MessageRenderer { public static renderMsg = ( - { from, blocks }: { blocks: MsgBlock[]; from?: string }, + { from, blocks }: { blocks: { block: MsgBlock; file?: Attachment }[]; from?: string }, factory: XssSafeFactory, showOriginal: boolean, msgId: string, // todo: will be removed @@ -25,23 +31,28 @@ export class MessageRenderer { ) => { const isOutgoing = Boolean(from && !!sendAs?.[from]); let r = ''; - let renderedAttachments = ''; + const renderedAttachments: RenderedAttachment[] = []; for (const block of blocks) { if (r) { r += '

'; } - if (['encryptedAttachment', 'plainAttachment'].includes(block.type)) { - renderedAttachments += XssSafeFactory.renderableMsgBlock(factory, block, msgId, from || 'unknown', isOutgoing); + // todo: we don't need types, just source property? + if (['encryptedAttachment', 'plainAttachment'].includes(block.block.type) && !block.file) { + // debugger; + throw new Error('Unexpected!'); + } + if (block.file) { + renderedAttachments.push({ + renderedBlock: XssSafeFactory.renderableMsgBlock(factory, block.block, msgId, from || 'unknown', isOutgoing), + file: block.file, + }); } else if (showOriginal) { - r += Xss.escape(Str.with(block.content)).replace(/\n/g, '
'); + r += Xss.escape(Str.with(block.block.content)).replace(/\n/g, '
'); } else { - r += XssSafeFactory.renderableMsgBlock(factory, block, msgId, from || 'unknown', isOutgoing); + r += XssSafeFactory.renderableMsgBlock(factory, block.block, msgId, from || 'unknown', isOutgoing); } } - if (renderedAttachments) { - r += `
${renderedAttachments}
`; - } - return r; + return { renderedXssSafe: r, renderedAttachments }; }; public static process = async (gmailMsg: GmailRes.GmailMsg): Promise => { diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index 30bb81d2b8a..ec7614481ab 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -25,13 +25,13 @@ import { SendAsAlias } from '../../common/platform/store/acct-store.js'; // todo: can we somehow define a purely relay class for ContactStore to clearly show that crypto-libraries are not loaded and can't be used? import { ContactStore } from '../../common/platform/store/contact-store.js'; import { Buf } from '../../common/core/buf.js'; -import { MessageRenderer, ProccesedMsg } from '../../common/ui/message-renderer.js'; +import { MessageRenderer, RenderedAttachment } from '../../common/message-renderer.js'; type JQueryEl = JQuery; interface MessageCacheEntry { full: Promise; - processedFull?: ProccesedMsg; + processedFull?: { renderedXssSafe?: string; renderedAttachments: RenderedAttachment[] }; } export class GmailElementReplacer implements WebmailElementReplacer { @@ -168,14 +168,20 @@ export class GmailElementReplacer implements WebmailElementReplacer { return msgDownload; }; - private msgGetProcessed = async (msgId: string): Promise => { + private msgGetProcessed = async (msgId: string): Promise<{ renderedXssSafe?: string; renderedAttachments: RenderedAttachment[] }> => { // todo: retries? exceptions? const msgDownload = this.msgGetCached(msgId); if (msgDownload.processedFull) { return msgDownload.processedFull; } const msg = await msgDownload.full; - msgDownload.processedFull = await MessageRenderer.process(msg); + const { blocks, from } = await MessageRenderer.process(msg); + if (blocks.length === 1 && blocks[0].block.type === 'plainText') { + // only has single block which is plain text + msgDownload.processedFull = { renderedAttachments: [] }; + } else { + msgDownload.processedFull = MessageRenderer.renderMsg({ blocks, from }, this.factory, false, msgId, this.sendAs); + } return msgDownload.processedFull; }; @@ -201,16 +207,13 @@ export class GmailElementReplacer implements WebmailElementReplacer { console.debug('replaceArmoredBlocks() for of emailsContainingPgpBlock -> emailContainer added evaluated'); } const msgId = this.determineMsgId(emailContainer); - const { blocks, from } = await this.msgGetProcessed(msgId); - if (blocks.length === 1 && blocks[0].type === 'plainText') { - // only has single block which is plain text - } else { - const replacementXssSafe = MessageRenderer.renderMsg({ blocks, from }, this.factory, false, msgId, this.sendAs); + const { renderedXssSafe } = await this.msgGetProcessed(msgId); + if (renderedXssSafe) { $(this.sel.translatePrompt).hide(); if (this.debug) { console.debug('replaceArmoredBlocks() for of emailsContainingPgpBlock -> emailContainer replacing'); } - this.updateMsgBodyEl_DANGEROUSLY(emailContainer, 'set', replacementXssSafe); // xss-safe-factory: replace_blocks is XSS safe + this.updateMsgBodyEl_DANGEROUSLY(emailContainer, 'set', renderedXssSafe); // xss-safe-factory: replace_blocks is XSS safe if (this.debug) { console.debug('replaceArmoredBlocks() for of emailsContainingPgpBlock -> emailContainer replaced'); } @@ -448,7 +451,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { if (this.debug) { console.debug('processAttachments()', attachmentMetas); } - const msgEl = this.getMsgBodyEl(msgId); // not a constant because sometimes elements get replaced, then returned by the function that replaced them + let msgEl = this.getMsgBodyEl(msgId); // not a constant because sometimes elements get replaced, then returned by the function that replaced them const isBodyEmpty = msgEl.text() === '' || msgEl.text() === '\n'; const senderEmail = this.getSenderEmail(msgEl); const isOutgoing = !!this.sendAs[senderEmail]; @@ -469,7 +472,6 @@ export class GmailElementReplacer implements WebmailElementReplacer { if (treatAs !== 'plainFile') { this.hideAttachment(attachmentSel, attachmentsContainerInner); nRenderedAttachments--; - /* if (treatAs === 'encryptedFile') { // actual encrypted attachment - show it attachmentsContainerInner.prepend(this.factory.embeddedAttachment(a, true)); // xss-safe-factory @@ -509,7 +511,6 @@ export class GmailElementReplacer implements WebmailElementReplacer { const embeddedSignedMsgXssSafe = this.factory.embeddedMsg('signedMsg', '', msgId, false, senderEmail, true); msgEl = this.updateMsgBodyEl_DANGEROUSLY(msgEl, 'set', embeddedSignedMsgXssSafe); // xss-safe-factory } - */ } else if (treatAs === 'plainFile' && a.name.substr(-4) === '.asc') { // todo: // normal looking attachment ending with .asc @@ -607,7 +608,6 @@ export class GmailElementReplacer implements WebmailElementReplacer { return nRenderedAttachments; }; - /* todo: private renderBackupFromFile = async ( attachmentMeta: Attachment, attachmentsContainerInner: JQueryEl, @@ -627,7 +627,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { this.updateMsgBodyEl_DANGEROUSLY(msgEl, 'append', this.factory.embeddedBackup(downloadedAttachment.data.toUtfStr())); // xss-safe-factory return nRenderedAttachments; }; - */ + private filterAttachments = (potentialMatches: JQueryEl | HTMLElement, regExp: RegExp) => { return $(potentialMatches) .filter('span.aZo:visible, span.a5r:visible') From e91bc1b7e5881ffb4924469bdfd57d06ab5ee0d6 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sat, 8 Apr 2023 08:30:14 +0100 Subject: [PATCH 003/147] fix --- .../inbox-active-thread-module.ts | 10 ++++++---- extension/js/common/core/mime.ts | 9 ++++++--- extension/js/common/message-renderer.ts | 18 +++++++----------- .../webmail/gmail-element-replacer.ts | 12 +++++++----- test/source/tests/decrypt.ts | 15 +++++++++++++-- 5 files changed, 39 insertions(+), 25 deletions(-) diff --git a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts index 5c28c09b15c..f1e1b0e8f72 100644 --- a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts +++ b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts @@ -3,7 +3,7 @@ 'use strict'; import { Bm, BrowserMsg } from '../../../../js/common/browser/browser-msg.js'; -import { FactoryReplyParams } from '../../../../js/common/xss-safe-factory.js'; +import { FactoryReplyParams, XssSafeFactory } from '../../../../js/common/xss-safe-factory.js'; import { GmailParser, GmailRes } from '../../../../js/common/api/email-provider/gmail/gmail-parser.js'; import { Url, UrlParams } from '../../../../js/common/core/common.js'; @@ -113,7 +113,7 @@ export class InboxActiveThreadModule extends ViewModule { // todo: review the meaning of threadHasPgpBlock this.threadHasPgpBlock ||= blocks.some(block => ['encryptedMsg', 'publicKey', 'privateKey', 'signedMsg'].includes(block.block.type)); // todo: take `from` from the processedMessage? - const { renderedXssSafe, renderedAttachments } = MessageRenderer.renderMsg( + const { renderedXssSafe, attachmentBlocks, isOutgoing } = MessageRenderer.renderMsg( { from, blocks }, this.view.factory, this.view.showOriginal, @@ -126,8 +126,10 @@ export class InboxActiveThreadModule extends ViewModule { headers.date } ${exportBtn}

` + renderedXssSafe + - (renderedAttachments.length - ? `
${renderedAttachments.map(a => a.renderedBlock).join('')}
` + (attachmentBlocks.length // todo: we always have data on this page (for now), as we download 'raw' + ? `
${attachmentBlocks + .map(block => XssSafeFactory.renderableMsgBlock(this.view.factory, block.block, message.id, from || 'unknown', isOutgoing)) + .join('')}
` : ''); $('.thread').append(this.wrapMsg(htmlId, r)); // xss-safe-factory if (exportBtn) { diff --git a/extension/js/common/core/mime.ts b/extension/js/common/core/mime.ts index 1f66e6160f6..f1d85420125 100644 --- a/extension/js/common/core/mime.ts +++ b/extension/js/common/core/mime.ts @@ -109,8 +109,10 @@ export class Mime { block: MsgBlock.fromAttachment('encryptedAttachment', '', { name: file.name, type: file.type, - length: file.getData().length, - data: file.getData(), + length: file.hasData() ? file.getData().length : undefined, + data: file.hasData() ? file.getData() : undefined, + id: file.id, // todo: + cid: file.cid, // todo: }), file, }); @@ -122,7 +124,8 @@ export class Mime { length: file.getData().length, data: file.getData(), inline: file.inline, - cid: file.cid, + id: file.id, // todo: + cid: file.cid, // todo: }), file, }); diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index f60a25bde9e..867b5715bf0 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -16,9 +16,9 @@ export type ProccesedMsg = MimeProccesedMsg & { from?: string; }; -export type RenderedAttachment = { - renderedBlock: string; - file: Attachment; +export type AttachmentBlock = { + block: MsgBlock; + file: Attachment; // todo: only need id in MsgBlock's AttachmentMeta? }; export class MessageRenderer { @@ -31,28 +31,24 @@ export class MessageRenderer { ) => { const isOutgoing = Boolean(from && !!sendAs?.[from]); let r = ''; - const renderedAttachments: RenderedAttachment[] = []; + const attachmentBlocks: AttachmentBlock[] = []; for (const block of blocks) { if (r) { r += '

'; } - // todo: we don't need types, just source property? if (['encryptedAttachment', 'plainAttachment'].includes(block.block.type) && !block.file) { // debugger; throw new Error('Unexpected!'); } - if (block.file) { - renderedAttachments.push({ - renderedBlock: XssSafeFactory.renderableMsgBlock(factory, block.block, msgId, from || 'unknown', isOutgoing), - file: block.file, - }); + if (block.file && ['encryptedAttachment', 'plainAttachment'].includes(block.block.type)) { + attachmentBlocks.push({ block: block.block, file: block.file }); } else if (showOriginal) { r += Xss.escape(Str.with(block.block.content)).replace(/\n/g, '
'); } else { r += XssSafeFactory.renderableMsgBlock(factory, block.block, msgId, from || 'unknown', isOutgoing); } } - return { renderedXssSafe: r, renderedAttachments }; + return { renderedXssSafe: r, attachmentBlocks, isOutgoing }; }; public static process = async (gmailMsg: GmailRes.GmailMsg): Promise => { diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index ec7614481ab..7cd2e359306 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -25,13 +25,15 @@ import { SendAsAlias } from '../../common/platform/store/acct-store.js'; // todo: can we somehow define a purely relay class for ContactStore to clearly show that crypto-libraries are not loaded and can't be used? import { ContactStore } from '../../common/platform/store/contact-store.js'; import { Buf } from '../../common/core/buf.js'; -import { MessageRenderer, RenderedAttachment } from '../../common/message-renderer.js'; +import { MessageRenderer, AttachmentBlock } from '../../common/message-renderer.js'; type JQueryEl = JQuery; +type ProcessedMessage = { renderedXssSafe?: string; attachmentBlocks: AttachmentBlock[] }; + interface MessageCacheEntry { full: Promise; - processedFull?: { renderedXssSafe?: string; renderedAttachments: RenderedAttachment[] }; + processedFull?: ProcessedMessage; } export class GmailElementReplacer implements WebmailElementReplacer { @@ -168,7 +170,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { return msgDownload; }; - private msgGetProcessed = async (msgId: string): Promise<{ renderedXssSafe?: string; renderedAttachments: RenderedAttachment[] }> => { + private msgGetProcessed = async (msgId: string): Promise => { // todo: retries? exceptions? const msgDownload = this.msgGetCached(msgId); if (msgDownload.processedFull) { @@ -178,7 +180,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { const { blocks, from } = await MessageRenderer.process(msg); if (blocks.length === 1 && blocks[0].block.type === 'plainText') { // only has single block which is plain text - msgDownload.processedFull = { renderedAttachments: [] }; + msgDownload.processedFull = { attachmentBlocks: [] }; } else { msgDownload.processedFull = MessageRenderer.renderMsg({ blocks, from }, this.factory, false, msgId, this.sendAs); } @@ -418,7 +420,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { if (this.debug) { console.debug('processNewPgpAttachments() -> msgGet may take some time'); } - const msg = await this.msgGetCached(msgId).full; + const msg = await this.msgGetCached(msgId).full; // todo: msgGetProcessed if (this.debug) { console.debug('processNewPgpAttachments() -> msgGet done -> processAttachments', msg); } diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index 2135d7c9dc4..5ee4625c07d 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -1000,14 +1000,25 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== const extraAuthHeaders = { Authorization: `Bearer ${accessToken}` }; // eslint-disable-line @typescript-eslint/naming-convention const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/1866867cfdb8b61e`, undefined, extraAuthHeaders); await gmailPage.waitAll('iframe'); - const pgpBlock = await gmailPage.getFrame(['pgp_block.htm']); + const pgpBlocks = await Promise.all((await gmailPage.getFramesUrls(['pgp_block.htm'])).map(url => gmailPage.getFrame([url]))); + expect(pgpBlocks.length).to.equal(3); + await BrowserRecipe.pgpBlockCheck(t, pgpBlocks[0], { + content: ['this is message 3 for flowcrypt issue 4342'], + encryption: 'not encrypted', + signature: 'signed', + }); // should re-fetch the correct text/plain text with signature - await BrowserRecipe.pgpBlockCheck(t, pgpBlock, { + await BrowserRecipe.pgpBlockCheck(t, pgpBlocks[1], { content: ['this is message 1 for flowcrypt issue 4342'], unexpectedContent: ['this is message 1 CORRUPTED for flowcrypt issue 4342'], encryption: 'not encrypted', signature: 'signed', }); + await BrowserRecipe.pgpBlockCheck(t, pgpBlocks[2], { + content: ['this is message 2 for flowcrypt issue 4342'], + encryption: 'not encrypted', + signature: 'signed', + }); await gmailPage.close(); }) ); From 928fbbfb23997049719b9b766fc24cd2f96a3d56 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 12 Apr 2023 08:21:53 +0100 Subject: [PATCH 004/147] (wip) better attachment recognition --- .../inbox-active-thread-module.ts | 16 +- extension/js/common/browser/browser-msg.ts | 8 +- extension/js/common/core/attachment.ts | 24 +- .../js/common/core/crypto/pgp/msg-util.ts | 8 +- extension/js/common/core/mime.ts | 67 +++-- extension/js/common/message-renderer.ts | 32 +-- .../webmail/gmail-element-replacer.ts | 271 +++++++++++------- 7 files changed, 252 insertions(+), 174 deletions(-) diff --git a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts index f1e1b0e8f72..ea9ea417a4c 100644 --- a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts +++ b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts @@ -13,12 +13,13 @@ import { Buf } from '../../../../js/common/core/buf.js'; import { Catch } from '../../../../js/common/platform/catch.js'; import { InboxView } from '../inbox.js'; import { Lang } from '../../../../js/common/lang.js'; -import { MessageRenderer } from '../../../../js/common/message-renderer.js'; +import { AttachmentBlock, MessageRenderer } from '../../../../js/common/message-renderer.js'; import { Ui } from '../../../../js/common/browser/ui.js'; import { ViewModule } from '../../../../js/common/view-module.js'; import { Xss } from '../../../../js/common/platform/xss.js'; import { Browser } from '../../../../js/common/browser/browser.js'; import { Attachment } from '../../../../js/common/core/attachment.js'; +import { MsgBlock } from '../../../../js/common/core/msg-block'; export class InboxActiveThreadModule extends ViewModule { private threadId: string | undefined; @@ -113,8 +114,17 @@ export class InboxActiveThreadModule extends ViewModule { // todo: review the meaning of threadHasPgpBlock this.threadHasPgpBlock ||= blocks.some(block => ['encryptedMsg', 'publicKey', 'privateKey', 'signedMsg'].includes(block.block.type)); // todo: take `from` from the processedMessage? - const { renderedXssSafe, attachmentBlocks, isOutgoing } = MessageRenderer.renderMsg( - { from, blocks }, + const messageBlocks: MsgBlock[] = []; + const attachmentBlocks: AttachmentBlock[] = []; + for (const block of blocks) { + if (block.file && ['encryptedAttachment', 'plainAttachment'].includes(block.block.type)) { + attachmentBlocks.push({ block: block.block, file: block.file }); + } else { + messageBlocks.push(block.block); + } + } + const { renderedXssSafe, isOutgoing } = MessageRenderer.renderMsg( + { from, blocks: messageBlocks }, this.view.factory, this.view.showOriginal, message.id, diff --git a/extension/js/common/browser/browser-msg.ts b/extension/js/common/browser/browser-msg.ts index cacb24a0d67..88b126860b8 100644 --- a/extension/js/common/browser/browser-msg.ts +++ b/extension/js/common/browser/browser-msg.ts @@ -7,7 +7,7 @@ import { AjaxErr } from '../api/shared/api-error.js'; import { Buf } from '../core/buf.js'; import { Dict, Str, UrlParams } from '../core/common.js'; import { ArmoredKeyIdentityWithEmails, KeyUtil } from '../core/crypto/key.js'; -import { DecryptResult, DiagnoseMsgPubkeysResult, MsgUtil, PgpMsgMethod, PgpMsgTypeResult, VerifyRes } from '../core/crypto/pgp/msg-util.js'; +import { DecryptResult, DiagnoseMsgPubkeysResult, MsgUtil, PgpMsgMethod, VerifyRes } from '../core/crypto/pgp/msg-util.js'; import { NotificationGroupType } from '../notifications.js'; import { Catch } from '../platform/catch.js'; import { AccountIndex, AcctStoreDict } from '../platform/store/acct-store.js'; @@ -76,7 +76,6 @@ export namespace Bm { export type PgpMsgDecrypt = PgpMsgMethod.Arg.Decrypt; export type PgpMsgDiagnoseMsgPubkeys = PgpMsgMethod.Arg.DiagnosePubkeys; export type PgpMsgVerifyDetached = PgpMsgMethod.Arg.VerifyDetached; - export type PgpMsgType = PgpMsgMethod.Arg.Type; export type PgpKeyBinaryToArmored = { binaryKeysData: Uint8Array }; export type Ajax = { req: JQueryAjaxSettings; stack: string }; export type AjaxGmailAttachmentGetChunk = { acctEmail: string; msgId: string; attachmentId: string }; @@ -100,7 +99,6 @@ export namespace Bm { export type PgpMsgDecrypt = DecryptResult; export type PgpMsgDiagnoseMsgPubkeys = DiagnoseMsgPubkeysResult; export type PgpMsgVerify = VerifyRes; - export type PgpMsgType = PgpMsgTypeResult; export type PgpKeyBinaryToArmored = { keys: ArmoredKeyIdentityWithEmails[] }; export type AjaxGmailAttachmentGetChunk = { chunk: Buf }; export type _tab_ = { tabId: string | null | undefined }; // eslint-disable-line @typescript-eslint/naming-convention @@ -117,7 +115,6 @@ export namespace Bm { | PgpMsgDecrypt | PgpMsgDiagnoseMsgPubkeys | PgpMsgVerify - | PgpMsgType | InMemoryStoreGet | InMemoryStoreSet | StoreAcctGet @@ -161,7 +158,6 @@ export namespace Bm { | PgpMsgDecrypt | PgpMsgDiagnoseMsgPubkeys | PgpMsgVerifyDetached - | PgpMsgType | Ajax | ShowAttachmentPreview | ReRenderRecipient @@ -227,7 +223,6 @@ 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, pgpKeyBinaryToArmored: (bm: Bm.PgpKeyBinaryToArmored) => BrowserMsg.sendAwait(undefined, 'pgpKeyBinaryToArmored', bm, true) as Promise, saveFetchedPubkeys: (bm: Bm.SaveFetchedPubkeys) => @@ -330,7 +325,6 @@ export class BrowserMsg { BrowserMsg.bgAddListener('pgpMsgDiagnosePubkeys', MsgUtil.diagnosePubkeys); BrowserMsg.bgAddListener('pgpMsgDecrypt', MsgUtil.decryptMessage); BrowserMsg.bgAddListener('pgpMsgVerifyDetached', MsgUtil.verifyDetached); - BrowserMsg.bgAddListener('pgpMsgType', async (r: Bm.PgpMsgType) => MsgUtil.type(r)); BrowserMsg.bgAddListener('saveFetchedPubkeys', saveFetchedPubkeysIfNewerThanInStorage); BrowserMsg.bgAddListener('pgpKeyBinaryToArmored', async (r: Bm.PgpKeyBinaryToArmored) => ({ keys: await KeyUtil.parseAndArmorKeys(r.binaryKeysData), diff --git a/extension/js/common/core/attachment.ts b/extension/js/common/core/attachment.ts index 19bf62f1764..dfd0f871791 100644 --- a/extension/js/common/core/attachment.ts +++ b/extension/js/common/core/attachment.ts @@ -5,7 +5,17 @@ import { Buf } from './buf.js'; import { Str } from './common.js'; -type Attachment$treatAs = 'publicKey' | 'privateKey' | 'encryptedMsg' | 'hidden' | 'signature' | 'encryptedFile' | 'plainFile' | 'inlineImage'; +export type Attachment$treatAs = + | 'publicKey' + | 'privateKey' + | 'encryptedMsg' + | 'hidden' + | 'signature' + | 'encryptedFile' + | 'plainFile' + | 'inlineImage' + | 'needChunk' + | 'maybePgp'; type ContentTransferEncoding = '7bit' | 'quoted-printable' | 'base64'; export type AttachmentMeta = { data?: Uint8Array; @@ -101,6 +111,9 @@ export class Attachment { return `f_${Str.sloppyRandom(30)}@flowcrypt`; }; + /** @deprecated attachment and pgp_block frames won't be performing this analysis + * + */ public isPublicKey = (): boolean => { if (this.treatAsValue) { return this.treatAsValue === 'publicKey'; @@ -173,9 +186,14 @@ export class Attachment { return 'publicKey'; } else if (this.name.match(/(cryptup|flowcrypt)-backup-[a-z0-9]+\.(key|asc)$/g)) { return 'privateKey'; - } else if (this.name.match(/\.asc$/) && this.length < 100000 && !this.inline) { - return 'encryptedMsg'; } else { + // && !Attachment.encryptedMsgNames.includes(this.name) -- already checked above + const isAmbiguousAscFile = /\.asc$/.test(this.name); // ambiguous .asc name + const isAmbiguousNonameFile = !this.name || this.name === 'noname'; // may not even be OpenPGP related + // todo: do we know length before fetching? + if (!this.inline && this.length < 100000 && (isAmbiguousAscFile || isAmbiguousNonameFile)) { + return this.hasData() ? 'maybePgp' : 'needChunk'; + } return 'plainFile'; } }; diff --git a/extension/js/common/core/crypto/pgp/msg-util.ts b/extension/js/common/core/crypto/pgp/msg-util.ts index 64bd17385fe..38c8d2466b8 100644 --- a/extension/js/common/core/crypto/pgp/msg-util.ts +++ b/extension/js/common/core/crypto/pgp/msg-util.ts @@ -34,7 +34,7 @@ export namespace PgpMsgMethod { armor: boolean; date?: Date; }; - export type Type = { data: Uint8Array | string }; + export type Type = { data: Uint8Array }; export type Decrypt = { kisWithPp: KeyInfoWithIdentityAndOptionalPp[]; encryptedData: Uint8Array | string; @@ -122,12 +122,6 @@ export class MsgUtil { if (!data || !data.length) { return undefined; } - if (typeof data === 'string') { - // Uint8Array sent over BrowserMsg gets converted to blobs on the sending side, and read on the receiving side - // Firefox blocks such blobs from content scripts to background, see: https://github.com/FlowCrypt/flowcrypt-browser/issues/2587 - // that's why we add an option to send data as a base64 formatted string - data = Buf.fromBase64Str(data); - } const firstByte = data[0]; // attempt to understand this as a binary PGP packet: https://tools.ietf.org/html/rfc4880#section-4.2 if ((firstByte & 0b10000000) === 0b10000000) { diff --git a/extension/js/common/core/mime.ts b/extension/js/common/core/mime.ts index f1d85420125..2a9970bf531 100644 --- a/extension/js/common/core/mime.ts +++ b/extension/js/common/core/mime.ts @@ -22,12 +22,16 @@ const Iso88592 = requireIso88592(); type AddressHeader = { address: string; name: string }; type MimeContentHeader = string | AddressHeader[]; -export type MimeContent = { + +export type MimeContentBody = { + html?: string; + text?: string; +}; + +export type MimeContent = MimeContentBody & { attachments: Attachment[]; rawSignedContent?: string; subject?: string; - html?: string; - text?: string; }; export type MimeContentWithHeaders = MimeContent & { @@ -60,51 +64,58 @@ export type MimeProccesedFromRawMsg = MimeProccesedMsg & { type SendingType = 'to' | 'cc' | 'bcc'; export class Mime { - public static processDecoded = (decoded: MimeContent): MimeProccesedMsg => { - const blocksFromBody: MsgBlock[] = []; + public static processBody = (decoded: MimeContentBody): MsgBlock[] => { + const blocks: MsgBlock[] = []; if (decoded.text) { const blocksFromTextPart = MsgBlockParser.detectBlocks(Str.normalize(decoded.text)).blocks; // if there are some encryption-related blocks found in the text section, which we can use, and not look at the html section if (blocksFromTextPart.find(b => ['pkcs7', 'encryptedMsg', 'signedMsg', 'publicKey', 'privateKey'].includes(b.type))) { - blocksFromBody.push(...blocksFromTextPart); // because the html most likely containt the same thing, just harder to parse pgp sections cause it's html + blocks.push(...blocksFromTextPart); // because the html most likely containt the same thing, just harder to parse pgp sections cause it's html } else if (decoded.html) { // if no pgp blocks found in text part and there is html part, prefer html - blocksFromBody.push(MsgBlock.fromContent('plainHtml', decoded.html)); + blocks.push(MsgBlock.fromContent('plainHtml', decoded.html)); } else { // else if no html and just a plain text message, use that - blocksFromBody.push(...blocksFromTextPart); + blocks.push(...blocksFromTextPart); } } else if (decoded.html) { - blocksFromBody.push(MsgBlock.fromContent('plainHtml', decoded.html)); + blocks.push(MsgBlock.fromContent('plainHtml', decoded.html)); } - const blocks: { block: MsgBlock; file?: Attachment }[] = blocksFromBody.map(block => { - return { block }; - }); + return blocks; + }; + + public static processAttachments = (messageBlocks: MsgBlock[], decoded: MimeContent): MimeProccesedMsg => { + const attachmentBlocks: { block: MsgBlock; file: Attachment }[] = []; const signatureAttachments: Attachment[] = []; for (const file of decoded.attachments) { - const isBodyEmpty = decoded.text === '' || decoded.text === '\n'; - const treatAs = file.treatAs(decoded.attachments, isBodyEmpty); + const isBodyEmpty = decoded.text === '' || decoded.text === '\n'; // todo: + let treatAs = file.treatAs(decoded.attachments, isBodyEmpty); + if (['needChunk', 'maybePgp'].includes(treatAs)) { + // don't want to reference MsgUtil and OpenPGP.js here, so + // todo: think about refactoring this + treatAs = 'encryptedMsg'; // publicKey? + } if (treatAs === 'encryptedMsg') { const armored = PgpArmor.clip(file.getData().toUtfStr()); if (armored) { - blocks.push({ block: MsgBlock.fromContent('encryptedMsg', armored), file }); + attachmentBlocks.push({ block: MsgBlock.fromContent('encryptedMsg', armored), file }); } } else if (treatAs === 'signature') { signatureAttachments.push(file); } else if (treatAs === 'publicKey') { - blocks.push( + attachmentBlocks.push( ...MsgBlockParser.detectBlocks(file.getData().toUtfStr()).blocks.map(block => { return { block, file }; // todo: test when more than one }) ); } else if (treatAs === 'privateKey') { - blocks.push( + attachmentBlocks.push( ...MsgBlockParser.detectBlocks(file.getData().toUtfStr()).blocks.map(block => { return { block, file }; // todo: test when more than one }) ); } else if (treatAs === 'encryptedFile') { - blocks.push({ + attachmentBlocks.push({ // todo: fromAttachment return complete record? block: MsgBlock.fromAttachment('encryptedAttachment', '', { name: file.name, @@ -117,7 +128,7 @@ export class Mime { file, }); } else if (treatAs === 'plainFile') { - blocks.push({ + attachmentBlocks.push({ block: MsgBlock.fromAttachment('plainAttachment', '', { name: file.name, type: file.type, @@ -137,7 +148,7 @@ export class Mime { // todo: data may not be present if (signatureAttachment.hasData()) { const signature = signatureAttachment.getData().toUtfStr(); - for (const block of blocks) { + for (const block of attachmentBlocks) { if (block.block.type === 'plainText') { block.block.type = 'signedText'; block.block.signature = signature; @@ -146,9 +157,9 @@ export class Mime { block.block.signature = signature; } } - if (!blocks.find(block => ['plainText', 'plainHtml', 'signedMsg', 'signedHtml', 'signedText'].includes(block.block.type))) { + if (!attachmentBlocks.find(block => ['plainText', 'plainHtml', 'signedMsg', 'signedHtml', 'signedText'].includes(block.block.type))) { // signed an empty message - blocks.push({ block: new MsgBlock('signedMsg', '', true, signature), file: signatureAttachment }); + attachmentBlocks.push({ block: new MsgBlock('signedMsg', '', true, signature), file: signatureAttachment }); } } else { // debugger; @@ -156,11 +167,21 @@ export class Mime { } } return { - blocks, + blocks: [ + ...messageBlocks.map(block => { + return { block }; + }), + ...attachmentBlocks, + ], rawSignedContent: decoded.rawSignedContent, }; }; + public static processDecoded = (decoded: MimeContent): MimeProccesedMsg => { + const bodyBlocks = Mime.processBody(decoded); + return Mime.processAttachments(bodyBlocks, decoded); + }; + public static process = async (mimeMsg: Uint8Array): Promise => { const decoded = await Mime.decode(mimeMsg); return { diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index 867b5715bf0..03696367c13 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -12,9 +12,7 @@ import { SendAsAlias } from './platform/store/acct-store.js'; import { Xss } from './platform/xss.js'; import { XssSafeFactory } from './xss-safe-factory.js'; -export type ProccesedMsg = MimeProccesedMsg & { - from?: string; -}; +export type ProccesedMsg = MimeProccesedMsg; export type AttachmentBlock = { block: MsgBlock; @@ -23,7 +21,7 @@ export type AttachmentBlock = { export class MessageRenderer { public static renderMsg = ( - { from, blocks }: { blocks: { block: MsgBlock; file?: Attachment }[]; from?: string }, + { from, blocks }: { blocks: MsgBlock[]; from?: string }, factory: XssSafeFactory, showOriginal: boolean, msgId: string, // todo: will be removed @@ -31,48 +29,40 @@ export class MessageRenderer { ) => { const isOutgoing = Boolean(from && !!sendAs?.[from]); let r = ''; - const attachmentBlocks: AttachmentBlock[] = []; for (const block of blocks) { if (r) { r += '

'; } - if (['encryptedAttachment', 'plainAttachment'].includes(block.block.type) && !block.file) { - // debugger; - throw new Error('Unexpected!'); - } - if (block.file && ['encryptedAttachment', 'plainAttachment'].includes(block.block.type)) { - attachmentBlocks.push({ block: block.block, file: block.file }); - } else if (showOriginal) { - r += Xss.escape(Str.with(block.block.content)).replace(/\n/g, '
'); + if (showOriginal) { + r += Xss.escape(Str.with(block.content)).replace(/\n/g, '
'); } else { - r += XssSafeFactory.renderableMsgBlock(factory, block.block, msgId, from || 'unknown', isOutgoing); + r += XssSafeFactory.renderableMsgBlock(factory, block, msgId, from || 'unknown', isOutgoing); } } - return { renderedXssSafe: r, attachmentBlocks, isOutgoing }; + return { renderedXssSafe: r, isOutgoing }; }; + /* todo: remove public static process = async (gmailMsg: GmailRes.GmailMsg): Promise => { - const processedMsg = gmailMsg.raw ? await MessageRenderer.processMessageFromRaw(gmailMsg.raw) : MessageRenderer.processMessageFromFull(gmailMsg); - return { from: GmailParser.findHeader(gmailMsg, 'from'), ...processedMsg }; - }; + return gmailMsg.raw ? await MessageRenderer.processMessageFromRaw(gmailMsg.raw) : MessageRenderer.processMessageFromFull(gmailMsg); + }; */ public static processMessageFromRaw = async (raw: string) => { const mimeMsg = Buf.fromBase64UrlStr(raw); return await Mime.process(mimeMsg); }; - private static processMessageFromFull = (gmailMsg: GmailRes.GmailMsg) => { + public static reconstructMimeContent = (gmailMsg: GmailRes.GmailMsg): MimeContent => { const bodies = GmailParser.findBodies(gmailMsg); const attachments = GmailParser.findAttachments(gmailMsg); const text = bodies['text/plain'] ? Buf.fromBase64UrlStr(bodies['text/plain']).toUtfStr() : undefined; // todo: do we need to strip? const html = bodies['text/html'] ? Xss.htmlSanitizeAndStripAllTags(Buf.fromBase64UrlStr(bodies['text/html']).toUtfStr(), '\n') : undefined; // reconstructed MIME content - const mimeContent: MimeContent = { + return { text, html, attachments, }; - return Mime.processDecoded(mimeContent); }; } diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index 7cd2e359306..46d96acc3c3 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -8,7 +8,7 @@ import { GmailParser, GmailRes } from '../../common/api/email-provider/gmail/gma import { IntervalFunction, WebmailElementReplacer } from './setup-webmail-content-script.js'; import { AjaxErr } from '../../common/api/shared/api-error.js'; import { ApiErr } from '../../common/api/shared/api-error.js'; -import { Attachment } from '../../common/core/attachment.js'; +import { Attachment, Attachment$treatAs } from '../../common/core/attachment.js'; import { BrowserMsg } from '../../common/browser/browser-msg.js'; import { Catch } from '../../common/platform/catch.js'; import { GlobalStore, LocalDraft } from '../../common/platform/store/global-store.js'; @@ -25,11 +25,13 @@ import { SendAsAlias } from '../../common/platform/store/acct-store.js'; // todo: can we somehow define a purely relay class for ContactStore to clearly show that crypto-libraries are not loaded and can't be used? import { ContactStore } from '../../common/platform/store/contact-store.js'; import { Buf } from '../../common/core/buf.js'; -import { MessageRenderer, AttachmentBlock } from '../../common/message-renderer.js'; +import { MessageRenderer } from '../../common/message-renderer.js'; +import { Mime } from '../../common/core/mime.js'; +import { MsgUtil } from '../../common/core/crypto/pgp/msg-util.js'; type JQueryEl = JQuery; -type ProcessedMessage = { renderedXssSafe?: string; attachmentBlocks: AttachmentBlock[] }; +type ProcessedMessage = { renderedXssSafe?: string; attachments: Attachment[] }; interface MessageCacheEntry { full: Promise; @@ -43,6 +45,8 @@ export class GmailElementReplacer implements WebmailElementReplacer { private recipientHasPgpCache: Dict = {}; private sendAs: Dict; private messages: Dict = {}; + private chunkDownloads: { attachment: Attachment; result: Promise }[]; + // private attachmentDownloads: { attachment: Attachment; result: Promise }[]; private factory: XssSafeFactory; private clientConfiguration: ClientConfiguration; private pubLookup: PubLookup; @@ -170,6 +174,25 @@ export class GmailElementReplacer implements WebmailElementReplacer { return msgDownload; }; + private queueAttachmentChunkDownload = (a: Attachment) => { + if (a.hasData()) { + return { attachment: a, result: Promise.resolve(a.getData()) }; + } + let download = this.chunkDownloads.find(d => d.attachment === a); + if (!download) { + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + download = { attachment: a, result: this.gmail.attachmentGetChunk(a.msgId!, a.id!) }; + this.chunkDownloads.push(download); + } + return download; + }; + + /* + private queueAttachmentDownload = (a: Attachment) => { + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + this.attachmentDownloads.push({ attachment: a, result: this.gmail.attachmentGet(a.msgId!, a.id!) }); + }; + */ private msgGetProcessed = async (msgId: string): Promise => { // todo: retries? exceptions? const msgDownload = this.msgGetCached(msgId); @@ -177,13 +200,31 @@ export class GmailElementReplacer implements WebmailElementReplacer { return msgDownload.processedFull; } const msg = await msgDownload.full; - const { blocks, from } = await MessageRenderer.process(msg); - if (blocks.length === 1 && blocks[0].block.type === 'plainText') { + const mimeContent = MessageRenderer.reconstructMimeContent(msg); + const blocks = Mime.processBody(mimeContent); + // todo: only start `signature` download? + // start download of all attachments that are not plainFile, for 'needChunk' -- chunked download + for (const a of mimeContent.attachments.filter(a => !a.hasData())) { + const treatAs = a.treatAs(mimeContent.attachments); // todo: isBodyEmpty + if (treatAs === 'plainFile') continue; + if (treatAs === 'needChunk') { + this.queueAttachmentChunkDownload(a); + } else if (treatAs === 'publicKey') { + // we also want a chunk before we replace the attachment in the UI + // todo: or simply download in full? + this.queueAttachmentChunkDownload(a); + } else { + // todo: this.queueAttachmentDownload(a); + } + } + let renderedXssSafe: string | undefined; + if (blocks.length === 0 || (blocks.length === 1 && ['plainText', 'plainHtml'].includes(blocks[0].type))) { // only has single block which is plain text - msgDownload.processedFull = { attachmentBlocks: [] }; } else { - msgDownload.processedFull = MessageRenderer.renderMsg({ blocks, from }, this.factory, false, msgId, this.sendAs); + const from = GmailParser.findHeader(msg, 'from'); + ({ renderedXssSafe } = MessageRenderer.renderMsg({ blocks, from }, this.factory, false, msgId, this.sendAs)); } + msgDownload.processedFull = { renderedXssSafe, attachments: mimeContent.attachments }; return msgDownload.processedFull; }; @@ -420,11 +461,11 @@ export class GmailElementReplacer implements WebmailElementReplacer { if (this.debug) { console.debug('processNewPgpAttachments() -> msgGet may take some time'); } - const msg = await this.msgGetCached(msgId).full; // todo: msgGetProcessed + const { attachments } = await this.msgGetProcessed(msgId); if (this.debug) { - console.debug('processNewPgpAttachments() -> msgGet done -> processAttachments', msg); + console.debug('processNewPgpAttachments() -> msgGet done -> processAttachments', attachments); } - await this.processAttachments(msgId, GmailParser.findAttachments(msg), attachmentsContainer, false); + await this.processAttachments(msgId, attachments, attachmentsContainer, false); } catch (e) { if (ApiErr.isAuthErr(e)) { this.notifications.showAuthPopupNeeded(this.acctEmail); @@ -446,101 +487,44 @@ export class GmailElementReplacer implements WebmailElementReplacer { private processAttachments = async ( msgId: string, - attachmentMetas: Attachment[], + attachmentMetas: Attachment[], // todo: these are not Metas! attachmentsContainerInner: JQueryEl | HTMLElement, skipGoogleDrive: boolean ) => { if (this.debug) { console.debug('processAttachments()', attachmentMetas); } - let msgEl = this.getMsgBodyEl(msgId); // not a constant because sometimes elements get replaced, then returned by the function that replaced them - const isBodyEmpty = msgEl.text() === '' || msgEl.text() === '\n'; + const msgEl = this.getMsgBodyEl(msgId); // not a constant because sometimes elements get replaced, then returned by the function that replaced them + const isBodyEmpty = msgEl.text() === '' || msgEl.text() === '\n'; // todo: const senderEmail = this.getSenderEmail(msgEl); const isOutgoing = !!this.sendAs[senderEmail]; attachmentsContainerInner = $(attachmentsContainerInner); attachmentsContainerInner.parent().find(this.sel.numberOfAttachments).hide(); let nRenderedAttachments = attachmentMetas.length; for (const a of attachmentMetas) { - const treatAs = a.treatAs(attachmentMetas, isBodyEmpty); - // todo - [same name + not processed].first() ... What if attachment metas are out of order compared to how gmail shows it? And have the same name? const attachmentSel = this.filterAttachments( attachmentsContainerInner.children().not('.attachment_processed'), new RegExp(`^${Str.regexEscape(a.name || 'noname')}$`) ).first(); - if (this.debug) { - console.debug('processAttachments() treatAs'); - } - try { - if (treatAs !== 'plainFile') { - this.hideAttachment(attachmentSel, attachmentsContainerInner); - nRenderedAttachments--; - if (treatAs === 'encryptedFile') { - // actual encrypted attachment - show it - attachmentsContainerInner.prepend(this.factory.embeddedAttachment(a, true)); // xss-safe-factory - nRenderedAttachments++; - } else if (treatAs === 'encryptedMsg') { - const isAmbiguousAscFile = a.name.substr(-4) === '.asc' && !Attachment.encryptedMsgNames.includes(a.name); // ambiguous .asc name - const isAmbiguousNonameFile = !a.name || a.name === 'noname'; // may not even be OpenPGP related - if (isAmbiguousAscFile || isAmbiguousNonameFile) { - // Inspect a chunk - if (this.debug) { - console.debug('processAttachments() try -> awaiting chunk + awaiting type'); - } - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - const data = await this.gmail.attachmentGetChunk(msgId, a.id!); // .id is present when fetched from api - const openpgpType = await BrowserMsg.send.bg.await.pgpMsgType({ data: data.toBase64Str() }); // base64 for FF, see #2587 - if (openpgpType && openpgpType.type === 'publicKey' && openpgpType.armored) { - // if it looks like OpenPGP public key - nRenderedAttachments = await this.renderPublicKeyFromFile(a, attachmentsContainerInner, msgEl, isOutgoing, attachmentSel, nRenderedAttachments); - } else if (openpgpType && ['encryptedMsg', 'signedMsg'].includes(openpgpType.type)) { - msgEl = this.updateMsgBodyEl_DANGEROUSLY(msgEl, 'append', this.factory.embeddedMsg(openpgpType.type, '', msgId, false, senderEmail)); // xss-safe-factory - } else { - attachmentSel.show().children('.attachment_loader').text('Unknown OpenPGP format'); - nRenderedAttachments++; - } - if (this.debug) { - console.debug('processAttachments() try -> awaiting done and processed'); - } - } else { - msgEl = this.updateMsgBodyEl_DANGEROUSLY(msgEl, 'set', this.factory.embeddedMsg('encryptedMsg', '', msgId, false, senderEmail)); // xss-safe-factory - } - } else if (treatAs === 'publicKey') { - // todo - pubkey should be fetched in pgp_pubkey.js - nRenderedAttachments = await this.renderPublicKeyFromFile(a, attachmentsContainerInner, msgEl, isOutgoing, attachmentSel, nRenderedAttachments); - } else if (treatAs === 'privateKey') { - nRenderedAttachments = await this.renderBackupFromFile(a, attachmentsContainerInner, msgEl, attachmentSel, nRenderedAttachments); - } else if (treatAs === 'signature') { - const embeddedSignedMsgXssSafe = this.factory.embeddedMsg('signedMsg', '', msgId, false, senderEmail, true); - msgEl = this.updateMsgBodyEl_DANGEROUSLY(msgEl, 'set', embeddedSignedMsgXssSafe); // xss-safe-factory - } - } else if (treatAs === 'plainFile' && a.name.substr(-4) === '.asc') { - // todo: - // normal looking attachment ending with .asc - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - const data = await this.gmail.attachmentGetChunk(msgId, a.id!); // .id is present when fetched from api - const openpgpType = await BrowserMsg.send.bg.await.pgpMsgType({ data: data.toBase64Str() }); // base64 for FF, see #2587 - if (openpgpType && openpgpType.type === 'publicKey' && openpgpType.armored) { - // if it looks like OpenPGP public key - nRenderedAttachments = await this.renderPublicKeyFromFile(a, attachmentsContainerInner, msgEl, isOutgoing, attachmentSel, nRenderedAttachments); - this.hideAttachment(attachmentSel, attachmentsContainerInner); - nRenderedAttachments--; - } else { - attachmentSel.addClass('attachment_processed').children('.attachment_loader').remove(); - } - } else { - // standard file - attachmentSel.addClass('attachment_processed').children('.attachment_loader').remove(); - } - } catch (e) { - if (!ApiErr.isSignificant(e) || (e instanceof AjaxErr && e.status === 200)) { - attachmentSel.show().children('.attachment_loader').text('Categorize: net err'); - nRenderedAttachments++; - } else { - Catch.reportErr(e); - attachmentSel.show().children('.attachment_loader').text('Categorize: unknown err'); - nRenderedAttachments++; - } + // todo: shouldn't call `treatAs` in too many places ? + const renderStatus = await this.processAttachment( + a, + a.treatAs(attachmentMetas, isBodyEmpty), + attachmentSel, + attachmentsContainerInner, + msgEl, + msgId, + senderEmail, + isOutgoing + ); + if (renderStatus === 'hidden') { + nRenderedAttachments--; } + // if (renderStatus === 'shown') attachmentSel.show(); + } + if (nRenderedAttachments !== attachmentMetas.length) { + // according to #4200, no point in showing "download all" button if at least one attachment is encrypted etc. + $(this.sel.attachmentsButtons).hide(); } if (nRenderedAttachments >= 2) { // Aligned with Gmail, the label is shown only if there are 2 or more attachments @@ -555,6 +539,82 @@ export class GmailElementReplacer implements WebmailElementReplacer { } }; + private processAttachment = async ( + a: Attachment, + treatAs: Attachment$treatAs, + attachmentSel: JQueryEl, + attachmentsContainerInner: JQueryEl, + msgEl: JQueryEl, + msgId: string, // deprecated + senderEmail: string, // deprecated? + isOutgoing: boolean // deprecated + ): Promise<'shown' | 'replaced' | 'hidden'> => { + // todo - [same name + not processed].first() ... What if attachment metas are out of order compared to how gmail shows it? And have the same name? + try { + if (['needChunk', 'maybePgp', 'publicKey'].includes(treatAs)) { + // todo: this isn't the best way to do this + // todo: move into a handler + // Inspect a chunk + if (this.debug) { + console.debug('processAttachments() try -> awaiting chunk + awaiting type'); + } + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + const data = await this.queueAttachmentChunkDownload(a).result; + const openpgpType = MsgUtil.type({ data }); + if (openpgpType && openpgpType.type === 'publicKey' && openpgpType.armored) { + // if it looks like OpenPGP public key + treatAs = 'publicKey'; + } else if (openpgpType && ['encryptedMsg', 'signedMsg'].includes(openpgpType.type)) { + treatAs = 'encryptedMsg'; // todo: signedMsg ? + } else { + attachmentSel.show().children('.attachment_loader').text('Unknown OpenPGP format'); + if (this.debug) { + console.debug("processAttachments() try -> awaiting done and processed -- doesn't look like OpenPGP"); + } + return 'shown'; + } + if (this.debug) { + console.debug('processAttachments() try -> awaiting done and processed'); + } + } + if (treatAs !== 'plainFile') { + this.hideAttachment(attachmentSel, attachmentsContainerInner); + } + if (treatAs === 'encryptedFile') { + // actual encrypted attachment - show it + attachmentsContainerInner.prepend(this.factory.embeddedAttachment(a, true)); // xss-safe-factory + return 'replaced'; // native should be hidden, custom should appear instead + } else if (treatAs === 'encryptedMsg') { + msgEl = this.updateMsgBodyEl_DANGEROUSLY(msgEl, 'set', this.factory.embeddedMsg('encryptedMsg', '', msgId, false, senderEmail)); // xss-safe-factory + return 'hidden'; // native attachment should be hidden, the "attachment" goes to the message container + } else if (treatAs === 'publicKey') { + // todo - pubkey should be fetched in pgp_pubkey.js + return await this.renderPublicKeyFromFile(a, attachmentsContainerInner, msgEl, isOutgoing, attachmentSel); + } else if (treatAs === 'privateKey') { + return await this.renderBackupFromFile(a, attachmentsContainerInner, msgEl); + } else if (treatAs === 'signature') { + const embeddedSignedMsgXssSafe = this.factory.embeddedMsg('signedMsg', '', msgId, false, senderEmail, true); + msgEl = this.updateMsgBodyEl_DANGEROUSLY(msgEl, 'set', embeddedSignedMsgXssSafe); // xss-safe-factory + return 'hidden'; // native attachment should be hidden, the "attachment" goes to the message container + } else { + // standard file + attachmentSel.show().addClass('attachment_processed').children('.attachment_loader').remove(); + return 'shown'; + } + } catch (e) { + if (!ApiErr.isSignificant(e) || (e instanceof AjaxErr && e.status === 200)) { + // todo: show() not needed? + attachmentSel.show().children('.attachment_loader').text('Categorize: net err'); + return 'shown'; + } else { + Catch.reportErr(e); + // todo: show() not needed? + attachmentSel.show().children('.attachment_loader').text('Categorize: unknown err'); + return 'shown'; + } + } + }; + private processGoogleDriveAttachments = async (msgId: string, msgEl: JQueryEl, attachmentsContainerInner: JQueryEl) => { const notProcessedAttachmentsLoaders = attachmentsContainerInner.find('.attachment_loader'); if (notProcessedAttachmentsLoaders.length && msgEl.find('.gmail_drive_chip, a[href^="https://drive.google.com/file"]').length) { @@ -573,6 +633,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { treatAs: 'encryptedFile', }) ); + // todo: start download } else { console.info('Missing Google Drive attachments download_url'); } @@ -586,48 +647,40 @@ export class GmailElementReplacer implements WebmailElementReplacer { attachmentsContainerInner: JQueryEl, msgEl: JQueryEl, isOutgoing: boolean, - attachmentSel: JQueryEl, - nRenderedAttachments: number - ) => { + attachmentSel: JQueryEl + ): Promise<'hidden' | 'shown'> => { let downloadedAttachment: GmailRes.GmailAttachment; try { // eslint-disable-next-line @typescript-eslint/no-non-null-assertion downloadedAttachment = await this.gmail.attachmentGet(attachmentMeta.msgId!, attachmentMeta.id!); // .id! is present when fetched from api } catch (e) { attachmentsContainerInner.show().addClass('attachment_processed').find('.attachment_loader').text('Please reload page'); - nRenderedAttachments++; - return nRenderedAttachments; + // todo: attachmentSel.show()? unit-test this case? + return 'shown'; } - const openpgpType = await BrowserMsg.send.bg.await.pgpMsgType({ - data: Buf.fromUint8(downloadedAttachment.data.subarray(0, 1000)).toBase64Str(), - }); // base64 for FF, see #2587 + const openpgpType = MsgUtil.type({ data: downloadedAttachment.data.subarray(0, 1000) }); if (openpgpType && openpgpType.type === 'publicKey') { this.updateMsgBodyEl_DANGEROUSLY(msgEl, 'after', this.factory.embeddedPubkey(downloadedAttachment.data.toUtfStr(), isOutgoing)); // xss-safe-factory + return 'hidden'; } else { attachmentSel.show().addClass('attachment_processed').children('.attachment_loader').text('Unknown Public Key Format'); - nRenderedAttachments++; + return 'shown'; } - return nRenderedAttachments; }; - private renderBackupFromFile = async ( - attachmentMeta: Attachment, - attachmentsContainerInner: JQueryEl, - msgEl: JQueryEl, - attachmentSel: JQueryEl, - nRenderedAttachments: number - ) => { + private renderBackupFromFile = async (attachmentMeta: Attachment, attachmentsContainerInner: JQueryEl, msgEl: JQueryEl) => { let downloadedAttachment: GmailRes.GmailAttachment; try { + // todo: fetch from queue // eslint-disable-next-line @typescript-eslint/no-non-null-assertion downloadedAttachment = await this.gmail.attachmentGet(attachmentMeta.msgId!, attachmentMeta.id!); // .id! is present when fetched from api } catch (e) { + // todo: do we really need show() for attachmentsContainerInner? attachmentsContainerInner.show().addClass('attachment_processed').find('.attachment_loader').text('Please reload page'); - nRenderedAttachments++; - return nRenderedAttachments; + return 'shown'; } this.updateMsgBodyEl_DANGEROUSLY(msgEl, 'append', this.factory.embeddedBackup(downloadedAttachment.data.toUtfStr())); // xss-safe-factory - return nRenderedAttachments; + return 'hidden'; }; private filterAttachments = (potentialMatches: JQueryEl | HTMLElement, regExp: RegExp) => { @@ -648,8 +701,6 @@ export class GmailElementReplacer implements WebmailElementReplacer { if (!attachmentEl.length) { attachmentsContainerSel.children('.attachment_loader').text('Missing file info'); } - // according to #4200, no point in showing "download all" button if at least one attachment is encrypted etc. - $(this.sel.attachmentsButtons).hide(); }; private determineMsgId = (innerMsgEl: HTMLElement | JQueryEl) => { From 38ee474401fefff1718c90d129aed06d1674add1 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 12 Apr 2023 13:06:41 +0100 Subject: [PATCH 005/147] lint fix --- .../webmail/gmail-element-replacer.ts | 24 +++++++++++-------- test/source/patterns.ts | 2 +- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index 46d96acc3c3..5711b9fb800 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -494,9 +494,9 @@ export class GmailElementReplacer implements WebmailElementReplacer { if (this.debug) { console.debug('processAttachments()', attachmentMetas); } - const msgEl = this.getMsgBodyEl(msgId); // not a constant because sometimes elements get replaced, then returned by the function that replaced them - const isBodyEmpty = msgEl.text() === '' || msgEl.text() === '\n'; // todo: - const senderEmail = this.getSenderEmail(msgEl); + const msgElReference = { msgEl: this.getMsgBodyEl(msgId) }; + const isBodyEmpty = msgElReference.msgEl.text() === '' || msgElReference.msgEl.text() === '\n'; // todo: + const senderEmail = this.getSenderEmail(msgElReference.msgEl); const isOutgoing = !!this.sendAs[senderEmail]; attachmentsContainerInner = $(attachmentsContainerInner); attachmentsContainerInner.parent().find(this.sel.numberOfAttachments).hide(); @@ -512,7 +512,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { a.treatAs(attachmentMetas, isBodyEmpty), attachmentSel, attachmentsContainerInner, - msgEl, + msgElReference, msgId, senderEmail, isOutgoing @@ -535,7 +535,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { attachmentsContainerInner.parents(this.sel.attachmentsContainerOuter).first().hide(); } if (!skipGoogleDrive) { - await this.processGoogleDriveAttachments(msgId, msgEl, attachmentsContainerInner); + await this.processGoogleDriveAttachments(msgId, msgElReference.msgEl, attachmentsContainerInner); } }; @@ -544,7 +544,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { treatAs: Attachment$treatAs, attachmentSel: JQueryEl, attachmentsContainerInner: JQueryEl, - msgEl: JQueryEl, + msgElReference: { msgEl: JQueryEl }, msgId: string, // deprecated senderEmail: string, // deprecated? isOutgoing: boolean // deprecated @@ -585,16 +585,20 @@ export class GmailElementReplacer implements WebmailElementReplacer { attachmentsContainerInner.prepend(this.factory.embeddedAttachment(a, true)); // xss-safe-factory return 'replaced'; // native should be hidden, custom should appear instead } else if (treatAs === 'encryptedMsg') { - msgEl = this.updateMsgBodyEl_DANGEROUSLY(msgEl, 'set', this.factory.embeddedMsg('encryptedMsg', '', msgId, false, senderEmail)); // xss-safe-factory + msgElReference.msgEl = /* xss-safe-factory */ this.updateMsgBodyEl_DANGEROUSLY( + msgElReference.msgEl, + 'set', + this.factory.embeddedMsg('encryptedMsg', '', msgId, false, senderEmail) + ); return 'hidden'; // native attachment should be hidden, the "attachment" goes to the message container } else if (treatAs === 'publicKey') { // todo - pubkey should be fetched in pgp_pubkey.js - return await this.renderPublicKeyFromFile(a, attachmentsContainerInner, msgEl, isOutgoing, attachmentSel); + return await this.renderPublicKeyFromFile(a, attachmentsContainerInner, msgElReference.msgEl, isOutgoing, attachmentSel); } else if (treatAs === 'privateKey') { - return await this.renderBackupFromFile(a, attachmentsContainerInner, msgEl); + return await this.renderBackupFromFile(a, attachmentsContainerInner, msgElReference.msgEl); } else if (treatAs === 'signature') { const embeddedSignedMsgXssSafe = this.factory.embeddedMsg('signedMsg', '', msgId, false, senderEmail, true); - msgEl = this.updateMsgBodyEl_DANGEROUSLY(msgEl, 'set', embeddedSignedMsgXssSafe); // xss-safe-factory + msgElReference.msgEl = this.updateMsgBodyEl_DANGEROUSLY(msgElReference.msgEl, 'set', embeddedSignedMsgXssSafe); // xss-safe-factory return 'hidden'; // native attachment should be hidden, the "attachment" goes to the message container } else { // standard file diff --git a/test/source/patterns.ts b/test/source/patterns.ts index d4baa8f711b..f84c841ccf0 100644 --- a/test/source/patterns.ts +++ b/test/source/patterns.ts @@ -26,7 +26,7 @@ const getAllFilesInDir = (dir: string, filePattern: RegExp): string[] => { }; const hasXssComment = (line: string) => { - return /\/\/ xss-(known-source|direct|escaped|safe-factory|safe-value|sanitized|none|reinsert|dangerous-function)/.test(line); + return /\/[\/\*] xss-(known-source|direct|escaped|safe-factory|safe-value|sanitized|none|reinsert|dangerous-function)/.test(line); }; const hasErrHandledComment = (line: string) => { From fad9db3a63a3d882b814801881cdd79d1b781d65 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 13 Apr 2023 16:39:16 +0100 Subject: [PATCH 006/147] extended test for #5029 for GmailElementReplacer --- test/source/mock/google/google-data.ts | 29 ++++++++++++++++++-------- test/source/tests/decrypt.ts | 12 +++++++++-- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/test/source/mock/google/google-data.ts b/test/source/mock/google/google-data.ts index 706f5045f14..bd4f6e8ca61 100644 --- a/test/source/mock/google/google-data.ts +++ b/test/source/mock/google/google-data.ts @@ -224,16 +224,13 @@ export class GoogleData { const payload = (await GoogleData.withInitializedData(acct)).getMessage(msgId)!.payload!; const fromHeader = payload.headers!.find(header => header.name === 'From')!; const fromAddress = fromHeader.value!; - let htmlData: string; - const htmlPart = payload.parts!.find(part => part.mimeType === 'text/html'); - if (htmlPart) { - htmlData = Buf.fromBase64Str(htmlPart.body!.data!).toUtfStr(); - } else { - const textPart = payload.parts!.find(part => part.mimeType === 'text/plain')!; - const textData = Buf.fromBase64Str(textPart.body!.data!).toUtfStr(); - htmlData = Xss.escape(textData); + let htmlData = GoogleData.getHtmlDataToDisplay(payload.parts!); + if (typeof htmlData === 'undefined') { + // search inside multipart/alternative + const alternativePart = payload.parts!.find(part => part.mimeType === 'multipart/alternative'); + htmlData = GoogleData.getHtmlDataToDisplay(alternativePart!.parts!); } - const otherParts = payload.parts!.filter(part => !['text/plain', 'text/html'].includes(part.mimeType!)); + const otherParts = payload.parts!.filter(part => part.filename); if (otherParts.length) { attachmentsBlock = `
${otherParts.length} Attachments
@@ -292,6 +289,20 @@ export class GoogleData { ); }; + private static getHtmlDataToDisplay = (parts: GmailMsg$payload$part[]): string | undefined => { + const htmlPart = parts.find(part => part.mimeType === 'text/html'); + if (htmlPart) { + return Buf.fromBase64Str(htmlPart.body!.data!).toUtfStr(); + } else { + const textPart = parts.find(part => part.mimeType === 'text/plain'); + if (typeof textPart?.body?.data === 'undefined') { + return undefined; + } + const textData = Buf.fromBase64Str(textPart.body.data).toUtfStr(); + return Xss.escape(textData); + } + }; + public storeSentMessage = (parseResult: ParseMsgResult, id: string): string => { let bodyContentAtt: { data: string; size: number; filename?: string; id: string } | undefined; const parsedMail = parseResult.mimeMsg; diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index 987bc264ec5..4f839fdc988 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -70,7 +70,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te ); test( - `decrypt - parsed signed message with signautre.asc as plain attachment`, + `decrypt - parsed signed message with signature.asc as plain attachment`, testWithBrowser('compatibility', async (t, browser) => { const threadId = '187085b874fb727c'; const acctEmail = 'flowcrypt.compatibility@gmail.com'; @@ -78,8 +78,16 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te await inboxPage.waitForSelTestState('ready'); await inboxPage.waitAll('iframe'); const pgpBlock = await inboxPage.getFrame(['pgp_block.htm']); - await pgpBlock.waitForContent('@pgp-block-content', 'flowcrypt-browser issue #5029 test email'); + const expectedContent = 'flowcrypt-browser issue #5029 test email'; + await pgpBlock.waitForContent('@pgp-block-content', expectedContent); + const accessToken = await BrowserRecipe.getGoogleAccessToken(inboxPage, acctEmail); await inboxPage.close(); + const extraAuthHeaders = { Authorization: `Bearer ${accessToken}` }; // eslint-disable-line @typescript-eslint/naming-convention + const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${threadId}`, undefined, extraAuthHeaders); + await gmailPage.waitAll('iframe'); + const pgpBlock2 = await gmailPage.getFrame(['pgp_block.htm']); + await pgpBlock2.waitForContent('@pgp-block-content', expectedContent); + await gmailPage.close(); }) ); From 02d31d842e672202e4b36c366785b596305699ef Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 13 Apr 2023 16:40:30 +0100 Subject: [PATCH 007/147] fix signature attachment --- extension/js/common/core/mime.ts | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/extension/js/common/core/mime.ts b/extension/js/common/core/mime.ts index 2a9970bf531..e84ba150e44 100644 --- a/extension/js/common/core/mime.ts +++ b/extension/js/common/core/mime.ts @@ -84,7 +84,7 @@ export class Mime { return blocks; }; - public static processAttachments = (messageBlocks: MsgBlock[], decoded: MimeContent): MimeProccesedMsg => { + public static processAttachments = (bodyBlocks: MsgBlock[], decoded: MimeContent): MimeProccesedMsg => { const attachmentBlocks: { block: MsgBlock; file: Attachment }[] = []; const signatureAttachments: Attachment[] = []; for (const file of decoded.attachments) { @@ -148,16 +148,17 @@ export class Mime { // todo: data may not be present if (signatureAttachment.hasData()) { const signature = signatureAttachment.getData().toUtfStr(); - for (const block of attachmentBlocks) { - if (block.block.type === 'plainText') { - block.block.type = 'signedText'; - block.block.signature = signature; - } else if (block.block.type === 'plainHtml') { - block.block.type = 'signedHtml'; - block.block.signature = signature; + const blocksToRevisit = [...bodyBlocks, ...attachmentBlocks.map(x => x.block)]; + for (const block of blocksToRevisit) { + if (block.type === 'plainText') { + block.type = 'signedText'; + block.signature = signature; + } else if (block.type === 'plainHtml') { + block.type = 'signedHtml'; + block.signature = signature; } } - if (!attachmentBlocks.find(block => ['plainText', 'plainHtml', 'signedMsg', 'signedHtml', 'signedText'].includes(block.block.type))) { + if (!blocksToRevisit.find(block => ['plainText', 'plainHtml', 'signedMsg', 'signedHtml', 'signedText'].includes(block.type))) { // signed an empty message attachmentBlocks.push({ block: new MsgBlock('signedMsg', '', true, signature), file: signatureAttachment }); } @@ -168,7 +169,7 @@ export class Mime { } return { blocks: [ - ...messageBlocks.map(block => { + ...bodyBlocks.map(block => { return { block }; }), ...attachmentBlocks, From 269b55fadfef2035f8663bcd608e49eb5a1a0fbf Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sun, 16 Apr 2023 08:11:00 +0100 Subject: [PATCH 008/147] Temporarily increase test overall timeout --- package.json | 2 +- test/source/test.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index e337f0eeb16..917d8efe28b 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "test_patterns": "node build/test/test/source/patterns.js", "test_async_stack": "node build/test/test/source/async-stack.js", "test_buf": "npx ava --timeout=3m --verbose --concurrency=10 build/test/test/source/buf.js", - "test_ci_chrome_consumer_live_gmail": "npx ava --timeout=30m --verbose --tap --concurrency=1 build/test/test/source/test.js -- CONSUMER-LIVE-GMAIL STANDARD-GROUP | npx tap-xunit > report.xml", + "test_ci_chrome_consumer_live_gmail": "npx ava --timeout=60m --verbose --tap --concurrency=1 build/test/test/source/test.js -- CONSUMER-LIVE-GMAIL STANDARD-GROUP | npx tap-xunit > report.xml", "test_ci_chrome_consumer": "npx ava --timeout=30m --verbose --tap --concurrency=10 build/test/test/source/test.js -- CONSUMER-MOCK STANDARD-GROUP | npx tap-xunit > report.xml", "test_ci_chrome_enterprise": "npx ava --timeout=30m --verbose --tap --concurrency=10 build/test/test/source/test.js -- ENTERPRISE-MOCK STANDARD-GROUP | npx tap-xunit > report.xml", "test_ci_chrome_consumer_flaky": "npx ava --timeout=30m --verbose --tap --concurrency=10 build/test/test/source/test.js -- CONSUMER-MOCK FLAKY-GROUP | npx tap-xunit > report.xml", diff --git a/test/source/test.ts b/test/source/test.ts index 730d48d537c..861af3ecd82 100644 --- a/test/source/test.ts +++ b/test/source/test.ts @@ -38,8 +38,8 @@ const consts = { // higher concurrency can cause 429 google errs when composing TIMEOUT_SHORT: minutes(1), TIMEOUT_EACH_RETRY: minutes(4), - TIMEOUT_ALL_RETRIES: minutes(25), // this has to suffer waiting for semaphore between retries, thus almost the same as below - TIMEOUT_OVERALL: minutes(30), + TIMEOUT_ALL_RETRIES: minutes(55), // this has to suffer waiting for semaphore between retries, thus almost the same as below + TIMEOUT_OVERALL: minutes(60), ATTEMPTS: testGroup === 'STANDARD-GROUP' ? oneIfNotPooled(3) : process.argv.includes('--retry=false') ? 1 : 3, POOL_SIZE: oneIfNotPooled(isMock ? 20 : 3), PROMISE_TIMEOUT_OVERALL: undefined as unknown as Promise, // will be set right below From 2e1101bdba30df0c3c2a91d9fd00f40db67d2a3e Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sun, 16 Apr 2023 18:47:28 +0100 Subject: [PATCH 009/147] fix --- .../js/content_scripts/webmail/gmail-element-replacer.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index 5711b9fb800..13b49a24bee 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -580,7 +580,9 @@ export class GmailElementReplacer implements WebmailElementReplacer { if (treatAs !== 'plainFile') { this.hideAttachment(attachmentSel, attachmentsContainerInner); } - if (treatAs === 'encryptedFile') { + if (treatAs === 'hidden') { + return 'hidden'; + } else if (treatAs === 'encryptedFile') { // actual encrypted attachment - show it attachmentsContainerInner.prepend(this.factory.embeddedAttachment(a, true)); // xss-safe-factory return 'replaced'; // native should be hidden, custom should appear instead From 598735d99606542de3ebd3c17ddbde24525e4cdc Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 17 Apr 2023 10:00:39 +0100 Subject: [PATCH 010/147] fix --- .../js/content_scripts/webmail/gmail-element-replacer.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index 13b49a24bee..cc9e9bdd761 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -45,8 +45,8 @@ export class GmailElementReplacer implements WebmailElementReplacer { private recipientHasPgpCache: Dict = {}; private sendAs: Dict; private messages: Dict = {}; - private chunkDownloads: { attachment: Attachment; result: Promise }[]; - // private attachmentDownloads: { attachment: Attachment; result: Promise }[]; + private chunkDownloads: { attachment: Attachment; result: Promise }[] = []; + // private attachmentDownloads: { attachment: Attachment; result: Promise }[] = []; private factory: XssSafeFactory; private clientConfiguration: ClientConfiguration; private pubLookup: PubLookup; From 557ea8dfa1f3e708b2721e0317bf1add339dcc37 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 17 Apr 2023 15:33:11 +0100 Subject: [PATCH 011/147] inrease execution timeout --- .semaphore/semaphore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 1081ea0cb36..22cbd1fbdee 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -60,7 +60,7 @@ blocks: run: when: branch = 'master' OR branch =~ 'live-test' OR branch =~ 'gmail-test' execution_time_limit: - minutes: 30 + minutes: 45 task: secrets: - name: flowcrypt-browser-ci-secrets From f3313fbe5578685d282462bced0bd1a1ea44cbf5 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 20 Apr 2023 11:33:30 +0100 Subject: [PATCH 012/147] (wip) render-only pgp block iframe --- .../chrome/elements/pgp_base_block_view.ts | 18 ++ extension/chrome/elements/pgp_block.ts | 22 +- .../pgp-block-decrypt-module.ts | 83 +++++- .../pgp-block-print-module.ts | 131 +++++++++ .../pgp-block-quote-module.ts | 12 +- .../pgp-block-render-module.ts | 264 +----------------- .../chrome/elements/pgp_render_block.htm | 42 +++ extension/chrome/elements/pgp_render_block.ts | 66 +++++ extension/js/common/message-renderer.ts | 185 +++++++++++- extension/js/common/render-interface.ts | 13 + extension/js/common/render-message.ts | 13 + extension/js/common/render-relay.ts | 40 +++ extension/js/common/xss-safe-factory.ts | 25 ++ .../webmail/gmail-element-replacer.ts | 41 ++- extension/manifest.json | 18 +- 15 files changed, 684 insertions(+), 289 deletions(-) create mode 100644 extension/chrome/elements/pgp_base_block_view.ts create mode 100644 extension/chrome/elements/pgp_block_modules/pgp-block-print-module.ts create mode 100644 extension/chrome/elements/pgp_render_block.htm create mode 100644 extension/chrome/elements/pgp_render_block.ts create mode 100644 extension/js/common/render-interface.ts create mode 100644 extension/js/common/render-message.ts create mode 100644 extension/js/common/render-relay.ts diff --git a/extension/chrome/elements/pgp_base_block_view.ts b/extension/chrome/elements/pgp_base_block_view.ts new file mode 100644 index 00000000000..b2ddbf1d80d --- /dev/null +++ b/extension/chrome/elements/pgp_base_block_view.ts @@ -0,0 +1,18 @@ +/* ©️ 2016 - present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com */ + +'use strict'; + +import { View } from '../../js/common/view.js'; +import { PgpBlockViewQuoteModule } from './pgp_block_modules/pgp-block-quote-module.js'; +import { PgpBlockViewRenderModule } from './pgp_block_modules/pgp-block-render-module.js'; + +export abstract class PgpBaseBlockView extends View { + public readonly quoteModule: PgpBlockViewQuoteModule; + public readonly renderModule: PgpBlockViewRenderModule; + + public constructor(public readonly parentTabId: string, public readonly frameId: string) { + super(); + this.quoteModule = new PgpBlockViewQuoteModule(this); + this.renderModule = new PgpBlockViewRenderModule(this); + } +} diff --git a/extension/chrome/elements/pgp_block.ts b/extension/chrome/elements/pgp_block.ts index 38174e27a23..1f6d311d18c 100644 --- a/extension/chrome/elements/pgp_block.ts +++ b/extension/chrome/elements/pgp_block.ts @@ -10,8 +10,6 @@ import { Lang } from '../../js/common/lang.js'; import { PgpBlockViewAttachmentsModule } from './pgp_block_modules/pgp-block-attachmens-module.js'; import { PgpBlockViewDecryptModule } from './pgp_block_modules/pgp-block-decrypt-module.js'; import { PgpBlockViewErrorModule } from './pgp_block_modules/pgp-block-error-module.js'; -import { PgpBlockViewQuoteModule } from './pgp_block_modules/pgp-block-quote-module.js'; -import { PgpBlockViewRenderModule } from './pgp_block_modules/pgp-block-render-module.js'; import { PgpBlockViewSignatureModule } from './pgp_block_modules/pgp-block-signature-module.js'; import { Ui } from '../../js/common/browser/ui.js'; import { View } from '../../js/common/view.js'; @@ -20,11 +18,11 @@ import { ClientConfiguration } from '../../js/common/client-configuration.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'; +import { PgpBaseBlockView } from './pgp_base_block_view.js'; +import { PgpBlockViewPrintModule } from './pgp_block_modules/pgp-block-print-module.js'; -export class PgpBlockView extends View { +export class PgpBlockView extends PgpBaseBlockView { public readonly acctEmail: string; - public readonly parentTabId: string; - public readonly frameId: string; public readonly isOutgoing: boolean; public readonly senderEmail: string; public readonly msgId: string | undefined; @@ -41,20 +39,17 @@ export class PgpBlockView extends View { public readonly debug: boolean; public readonly attachmentsModule: PgpBlockViewAttachmentsModule; public readonly signatureModule: PgpBlockViewSignatureModule; - public readonly quoteModule: PgpBlockViewQuoteModule; public readonly errorModule: PgpBlockViewErrorModule; - public readonly renderModule: PgpBlockViewRenderModule; + public readonly printModule: PgpBlockViewPrintModule; public readonly decryptModule: PgpBlockViewDecryptModule; public fesUrl?: string; public constructor() { - super(); Ui.event.protect(); const uncheckedUrlParams = Url.parse(['acctEmail', 'frameId', 'message', 'parentTabId', 'msgId', 'isOutgoing', 'senderEmail', 'signature', 'debug']); + super(Assert.urlParamRequire.string(uncheckedUrlParams, 'parentTabId'), Assert.urlParamRequire.string(uncheckedUrlParams, 'frameId')); this.acctEmail = Assert.urlParamRequire.string(uncheckedUrlParams, 'acctEmail'); - this.parentTabId = Assert.urlParamRequire.string(uncheckedUrlParams, 'parentTabId'); - this.frameId = Assert.urlParamRequire.string(uncheckedUrlParams, 'frameId'); this.isOutgoing = uncheckedUrlParams.isOutgoing === true; this.debug = uncheckedUrlParams.debug === true; const senderEmail = Assert.urlParamRequire.string(uncheckedUrlParams, 'senderEmail'); @@ -73,9 +68,8 @@ export class PgpBlockView extends View { // modules this.attachmentsModule = new PgpBlockViewAttachmentsModule(this); this.signatureModule = new PgpBlockViewSignatureModule(this); - this.quoteModule = new PgpBlockViewQuoteModule(this); this.errorModule = new PgpBlockViewErrorModule(this); - this.renderModule = new PgpBlockViewRenderModule(this); + this.printModule = new PgpBlockViewPrintModule(this); this.decryptModule = new PgpBlockViewDecryptModule(this); } @@ -93,7 +87,7 @@ export class PgpBlockView extends View { this.fesUrl = storage.fesUrl; this.clientConfiguration = await ClientConfiguration.newInstance(this.acctEmail); this.pubLookup = new PubLookup(this.clientConfiguration); - await this.renderModule.initPrintView(); + await this.printModule.initPrintView(); if (storage.setup_done) { 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 @@ -108,7 +102,7 @@ export class PgpBlockView extends View { public setHandlers = () => { $('.pgp_print_button').on( 'click', - this.setHandler(() => this.renderModule.printPGPBlock()) + this.setHandler(() => this.printModule.printPGPBlock()) ); }; } 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 f7de897d0b4..db658e2dc35 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 @@ -4,7 +4,7 @@ import { BrowserMsg } from '../../../js/common/browser/browser-msg.js'; import { Buf } from '../../../js/common/core/buf.js'; -import { DecryptErrTypes } from '../../../js/common/core/crypto/pgp/msg-util.js'; +import { DecryptErrTypes, VerifyRes } from '../../../js/common/core/crypto/pgp/msg-util.js'; import { GmailResponseFormat } from '../../../js/common/api/email-provider/gmail/gmail.js'; import { Lang } from '../../../js/common/lang.js'; import { Mime } from '../../../js/common/core/mime.js'; @@ -15,6 +15,9 @@ import { KeyStore } from '../../../js/common/platform/store/key-store.js'; import { PassphraseStore } from '../../../js/common/platform/store/passphrase-store.js'; import { MsgBlockParser } from '../../../js/common/core/msg-block-parser.js'; import { Str } from '../../../js/common/core/common.js'; +import { Attachment } from '../../../js/common/core/attachment.js'; +import { MsgBlock } from '../../../js/common/core/msg-block.js'; +import { MessageRenderer } from '../../../js/common/message-renderer.js'; export class PgpBlockViewDecryptModule { private msgFetchedFromApi: false | GmailResponseFormat = false; @@ -118,7 +121,7 @@ export class PgpBlockViewDecryptModule { return await this.decryptAndRender(fetchedContent, verificationPubs); } } - await this.view.renderModule.decideDecryptedContentFormattingAndRender( + await this.decideDecryptedContentFormattingAndRender( result.content, result.isEncrypted, result.signature, @@ -191,7 +194,81 @@ export class PgpBlockViewDecryptModule { 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, verificationPubs, verify); + await this.decideDecryptedContentFormattingAndRender(encryptedData, false, signatureResult, verificationPubs, verify); + } + }; + + private decideDecryptedContentFormattingAndRender = async ( + decryptedBytes: Uint8Array | string, + isEncrypted: boolean, + sigResult: VerifyRes | undefined, + verificationPubs: string[], + retryVerification: (verificationPubs: string[]) => Promise, + plainSubject?: string + ) => { + if (isEncrypted) { + this.view.renderModule.renderEncryptionStatus('encrypted'); + this.view.renderModule.setFrameColor('green'); + } else { + this.view.renderModule.renderEncryptionStatus('not encrypted'); + this.view.renderModule.setFrameColor('gray'); + } + const publicKeys: string[] = []; + let renderableAttachments: Attachment[] = []; + let decryptedContent: string | undefined; + let isHtml = false; + // todo - replace with MsgBlockParser.fmtDecryptedAsSanitizedHtmlBlocks, then the extract/strip methods could be private? + if (!Mime.resemblesMsg(decryptedBytes)) { + const fcAttachmentBlocks: MsgBlock[] = []; + decryptedContent = Str.with(decryptedBytes); + decryptedContent = MsgBlockParser.extractFcAttachments(decryptedContent, fcAttachmentBlocks); + decryptedContent = MsgBlockParser.stripFcTeplyToken(decryptedContent); + decryptedContent = MsgBlockParser.stripPublicKeys(decryptedContent, publicKeys); + if (fcAttachmentBlocks.length) { + renderableAttachments = fcAttachmentBlocks.map( + attachmentBlock => new Attachment(attachmentBlock.attachmentMeta!) // eslint-disable-line @typescript-eslint/no-non-null-assertion + ); + } + } else { + this.view.renderModule.renderText('Formatting...'); + const decoded = await Mime.decode(decryptedBytes); + let inlineCIDAttachments: Attachment[] = []; + if (typeof decoded.html !== 'undefined') { + ({ sanitizedHtml: decryptedContent, inlineCIDAttachments } = MessageRenderer.replaceInlineImageCIDs(decoded.html, decoded.attachments)); + isHtml = true; + } else if (typeof decoded.text !== 'undefined') { + decryptedContent = decoded.text; + } else { + decryptedContent = ''; + } + if ( + decoded.subject && + isEncrypted && + (!plainSubject || !Mime.subjectWithoutPrefixes(plainSubject).includes(Mime.subjectWithoutPrefixes(decoded.subject))) + ) { + // there is an encrypted subject + (either there is no plain subject or the plain subject does not contain what's in the encrypted subject) + decryptedContent = MessageRenderer.getEncryptedSubjectText(decoded.subject, isHtml) + decryptedContent; // render encrypted subject in message + } + for (const attachment of decoded.attachments) { + if (attachment.isPublicKey()) { + publicKeys.push(attachment.getData().toUtfStr()); + } else if (!inlineCIDAttachments.some(inlineAttachment => inlineAttachment.cid === attachment.cid)) { + renderableAttachments.push(attachment); + } + } + } + this.view.quoteModule.separateQuotedContentAndRenderText(decryptedContent, isHtml); + await this.view.signatureModule.renderPgpSignatureCheckResult(sigResult, verificationPubs, retryVerification); + if (isEncrypted && publicKeys.length) { + BrowserMsg.send.renderPublicKeys(this.view.parentTabId, { afterFrameId: this.view.frameId, publicKeys }); + } + if (renderableAttachments.length) { + this.view.attachmentsModule.renderInnerAttachments(renderableAttachments, isEncrypted); + } + this.view.renderModule.resizePgpBlockFrame(); + if (!this.view.renderModule.doNotSetStateAsReadyYet) { + // in case async tasks are still being worked at + Ui.setTestState('ready'); } }; } diff --git a/extension/chrome/elements/pgp_block_modules/pgp-block-print-module.ts b/extension/chrome/elements/pgp_block_modules/pgp-block-print-module.ts new file mode 100644 index 00000000000..351946ad7d7 --- /dev/null +++ b/extension/chrome/elements/pgp_block_modules/pgp-block-print-module.ts @@ -0,0 +1,131 @@ +/* ©️ 2016 - present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com */ + +'use strict'; + +import { PgpBlockView } from '../pgp_block.js'; +import { Time } from '../../../js/common/browser/time.js'; +import { Xss } from '../../../js/common/platform/xss.js'; +import { AcctStore } from '../../../js/common/platform/store/acct-store.js'; +import { GmailParser } from '../../../js/common/api/email-provider/gmail/gmail-parser.js'; +import { Str } from '../../../js/common/core/common.js'; + +export class PgpBlockViewPrintModule { + private printMailInfoHtml!: string; + + public constructor(private view: PgpBlockView) {} + + public initPrintView = async () => { + const fullName = await AcctStore.get(this.view.acctEmail, ['full_name']); + Xss.sanitizeRender('.print_user_email', `${fullName.full_name} <${this.view.acctEmail}>`); + try { + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + const gmailMsg = await this.view.gmail.msgGet(this.view.msgId!, 'metadata', undefined); + const sentDate = new Date(GmailParser.findHeader(gmailMsg, 'date') ?? ''); + const sentDateStr = Str.fromDate(sentDate).replace(' ', ' at '); + const from = Str.parseEmail(GmailParser.findHeader(gmailMsg, 'from') ?? ''); + const fromHtml = from.name ? `${Xss.htmlSanitize(from.name)} <${from.email}>` : from.email; + /* eslint-disable @typescript-eslint/no-non-null-assertion */ + const ccString = GmailParser.findHeader(gmailMsg, 'cc') + ? `Cc: ${Xss.escape(GmailParser.findHeader(gmailMsg, 'cc')!)}
` + : ''; + const bccString = GmailParser.findHeader(gmailMsg, 'bcc') ? `Bcc: ${Xss.escape(GmailParser.findHeader(gmailMsg, 'bcc')!)}
` : ''; + /* eslint-enable @typescript-eslint/no-non-null-assertion */ + this.printMailInfoHtml = ` +
+

${Xss.htmlSanitize(GmailParser.findHeader(gmailMsg, 'subject') ?? '')}

+
+
+
+
+ From: ${fromHtml} +
+
+ ${sentDateStr} +
+
+ To: ${Xss.escape(GmailParser.findHeader(gmailMsg, 'to') ?? '')}
+ ${ccString} + ${bccString} +
+ `; + } catch (e) { + this.view.errorModule.debug(`Error while getting gmail message for ${this.view.msgId} message. ${e}`); + } + }; + + public printPGPBlock = async () => { + const w = window.open(); + const html = ` + + + + + + + ${$('#print-header').html()} +
+ ${Xss.htmlSanitize(this.printMailInfoHtml)} +
+
+ ${Xss.htmlSanitize($('#pgp_block').html())} +
+ + + `; + w?.document.write(html); + // Give some time for above dom to load in print dialog + // https://stackoverflow.com/questions/31725373/google-chrome-not-showing-image-in-print-preview + await Time.sleep(250); + w?.window.print(); + w?.document.close(); + }; +} diff --git a/extension/chrome/elements/pgp_block_modules/pgp-block-quote-module.ts b/extension/chrome/elements/pgp_block_modules/pgp-block-quote-module.ts index 03298dc4049..dc51b979c79 100644 --- a/extension/chrome/elements/pgp_block_modules/pgp-block-quote-module.ts +++ b/extension/chrome/elements/pgp_block_modules/pgp-block-quote-module.ts @@ -2,14 +2,14 @@ 'use strict'; -import { PgpBlockView } from '../pgp_block.js'; import { Str } from '../../../js/common/core/common.js'; import { Xss } from '../../../js/common/platform/xss.js'; +import { PgpBaseBlockView } from '../pgp_base_block_view.js'; export class PgpBlockViewQuoteModule { - public constructor(private view: PgpBlockView) {} + public constructor(private view: PgpBaseBlockView) {} - public separateQuotedContentAndRenderText = async (decryptedContent: string, isHtml: boolean) => { + public separateQuotedContentAndRenderText = (decryptedContent: string, isHtml: boolean) => { if (isHtml) { const message = $('
').html(Xss.htmlSanitizeKeepBasicTags(decryptedContent)); // xss-sanitized let htmlBlockQuoteExists = false; @@ -32,10 +32,10 @@ export class PgpBlockViewQuoteModule { message[0].removeChild(shouldBeQuoted[i]); quotedHtml += shouldBeQuoted[i].outerHTML; } - await this.view.renderModule.renderContent(message.html(), false); + this.view.renderModule.renderContent(message.html(), false); this.appendCollapsedQuotedContentButton(quotedHtml, true); } else { - await this.view.renderModule.renderContent(decryptedContent, false); + this.view.renderModule.renderContent(decryptedContent, false); } } else { const lines = decryptedContent.split(/\r?\n/); @@ -62,7 +62,7 @@ export class PgpBlockViewQuoteModule { // only got quoted part, no real text -> show everything as real text, without quoting lines.push(...linesQuotedPart.splice(0, linesQuotedPart.length)); } - await this.view.renderModule.renderContent(Str.escapeTextAsRenderableHtml(lines.join('\n')), false); + this.view.renderModule.renderContent(Str.escapeTextAsRenderableHtml(lines.join('\n')), false); if (linesQuotedPart.join('').trim()) { this.appendCollapsedQuotedContentButton(linesQuotedPart.join('\n')); } 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 b806aaf2faf..a59020c3184 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 @@ -2,144 +2,17 @@ 'use strict'; -import { VerifyRes } from '../../../js/common/core/crypto/pgp/msg-util.js'; -import { Attachment } from '../../../js/common/core/attachment.js'; import { BrowserMsg } from '../../../js/common/browser/browser-msg.js'; import { Catch } from '../../../js/common/platform/catch.js'; -import { Mime } from '../../../js/common/core/mime.js'; -import { MsgBlock } from '../../../js/common/core/msg-block.js'; -import { PgpBlockView } from '../pgp_block.js'; -import { Ui } from '../../../js/common/browser/ui.js'; import { Xss } from '../../../js/common/platform/xss.js'; -import { MsgBlockParser } from '../../../js/common/core/msg-block-parser.js'; -import { AcctStore } from '../../../js/common/platform/store/acct-store.js'; -import { GmailParser } from '../../../js/common/api/email-provider/gmail/gmail-parser.js'; -import { CID_PATTERN, Str } from '../../../js/common/core/common.js'; -import DOMPurify from 'dompurify'; -import { Time } from '../../../js/common/browser/time.js'; +import { PgpBaseBlockView } from '../pgp_base_block_view'; export class PgpBlockViewRenderModule { public doNotSetStateAsReadyYet = false; private heightHist: number[] = []; - private printMailInfoHtml!: string; - public constructor(private view: PgpBlockView) {} - - public initPrintView = async () => { - const fullName = await AcctStore.get(this.view.acctEmail, ['full_name']); - Xss.sanitizeRender('.print_user_email', `${fullName.full_name} <${this.view.acctEmail}>`); - try { - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - const gmailMsg = await this.view.gmail.msgGet(this.view.msgId!, 'metadata', undefined); - const sentDate = new Date(GmailParser.findHeader(gmailMsg, 'date') ?? ''); - const sentDateStr = Str.fromDate(sentDate).replace(' ', ' at '); - const from = Str.parseEmail(GmailParser.findHeader(gmailMsg, 'from') ?? ''); - const fromHtml = from.name ? `${Xss.htmlSanitize(from.name)} <${from.email}>` : from.email; - /* eslint-disable @typescript-eslint/no-non-null-assertion */ - const ccString = GmailParser.findHeader(gmailMsg, 'cc') - ? `Cc: ${Xss.escape(GmailParser.findHeader(gmailMsg, 'cc')!)}
` - : ''; - const bccString = GmailParser.findHeader(gmailMsg, 'bcc') ? `Bcc: ${Xss.escape(GmailParser.findHeader(gmailMsg, 'bcc')!)}
` : ''; - /* eslint-enable @typescript-eslint/no-non-null-assertion */ - this.printMailInfoHtml = ` -
-

${Xss.htmlSanitize(GmailParser.findHeader(gmailMsg, 'subject') ?? '')}

-
-
-
-
- From: ${fromHtml} -
-
- ${sentDateStr} -
-
- To: ${Xss.escape(GmailParser.findHeader(gmailMsg, 'to') ?? '')}
- ${ccString} - ${bccString} -
- `; - } catch (e) { - this.view.errorModule.debug(`Error while getting gmail message for ${this.view.msgId} message. ${e}`); - } - }; - - public printPGPBlock = async () => { - const w = window.open(); - const html = ` - - - - - - - ${$('#print-header').html()} -
- ${Xss.htmlSanitize(this.printMailInfoHtml)} -
-
- ${Xss.htmlSanitize($('#pgp_block').html())} -
- - - `; - w?.document.write(html); - // Give some time for above dom to load in print dialog - // https://stackoverflow.com/questions/31725373/google-chrome-not-showing-image-in-print-preview - await Time.sleep(250); - w?.window.print(); - w?.document.close(); - }; + public constructor(private view: PgpBaseBlockView) {} public renderText = (text: string) => { // eslint-disable-next-line @typescript-eslint/no-non-null-assertion @@ -172,12 +45,15 @@ export class PgpBlockViewRenderModule { }); }; - public renderContent = async (htmlContent: string, isErr: boolean) => { + public renderContent = (htmlContent: string, isErr: boolean) => { + /* + todo: if (!isErr && !this.view.isOutgoing) { // successfully opened incoming message // eslint-disable-next-line @typescript-eslint/naming-convention await AcctStore.set(this.view.acctEmail, { successfully_received_at_leat_one_message: true }); } + */ if (!isErr) { // rendering message content $('.pgp_print_button').show(); @@ -243,132 +119,4 @@ export class PgpBlockViewRenderModule { .addClass(status === 'signed' ? 'green_label' : 'red_label') .text(status); }; - - public decideDecryptedContentFormattingAndRender = async ( - decryptedBytes: Uint8Array | string, - isEncrypted: boolean, - sigResult: VerifyRes | undefined, - verificationPubs: string[], - retryVerification: (verificationPubs: string[]) => Promise, - plainSubject?: string - ) => { - if (isEncrypted) { - this.renderEncryptionStatus('encrypted'); - this.setFrameColor('green'); - } else { - this.renderEncryptionStatus('not encrypted'); - this.setFrameColor('gray'); - } - const publicKeys: string[] = []; - let renderableAttachments: Attachment[] = []; - let decryptedContent: string | undefined; - let isHtml = false; - // todo - replace with MsgBlockParser.fmtDecryptedAsSanitizedHtmlBlocks, then the extract/strip methods could be private? - if (!Mime.resemblesMsg(decryptedBytes)) { - const fcAttachmentBlocks: MsgBlock[] = []; - decryptedContent = Str.with(decryptedBytes); - decryptedContent = MsgBlockParser.extractFcAttachments(decryptedContent, fcAttachmentBlocks); - decryptedContent = MsgBlockParser.stripFcTeplyToken(decryptedContent); - decryptedContent = MsgBlockParser.stripPublicKeys(decryptedContent, publicKeys); - if (fcAttachmentBlocks.length) { - renderableAttachments = fcAttachmentBlocks.map( - attachmentBlock => new Attachment(attachmentBlock.attachmentMeta!) // eslint-disable-line @typescript-eslint/no-non-null-assertion - ); - } - } else { - this.renderText('Formatting...'); - const decoded = await Mime.decode(decryptedBytes); - let inlineCIDAttachments: Attachment[] = []; - if (typeof decoded.html !== 'undefined') { - ({ sanitizedHtml: decryptedContent, inlineCIDAttachments } = this.replaceInlineImageCIDs(decoded.html, decoded.attachments)); - isHtml = true; - } else if (typeof decoded.text !== 'undefined') { - decryptedContent = decoded.text; - } else { - decryptedContent = ''; - } - if ( - decoded.subject && - isEncrypted && - (!plainSubject || !Mime.subjectWithoutPrefixes(plainSubject).includes(Mime.subjectWithoutPrefixes(decoded.subject))) - ) { - // there is an encrypted subject + (either there is no plain subject or the plain subject does not contain what's in the encrypted subject) - decryptedContent = this.getEncryptedSubjectText(decoded.subject, isHtml) + decryptedContent; // render encrypted subject in message - } - for (const attachment of decoded.attachments) { - if (attachment.isPublicKey()) { - publicKeys.push(attachment.getData().toUtfStr()); - } else if (!inlineCIDAttachments.some(inlineAttachment => inlineAttachment.cid === attachment.cid)) { - renderableAttachments.push(attachment); - } - } - } - await this.view.quoteModule.separateQuotedContentAndRenderText(decryptedContent, isHtml); - await this.view.signatureModule.renderPgpSignatureCheckResult(sigResult, verificationPubs, retryVerification); - if (isEncrypted && publicKeys.length) { - BrowserMsg.send.renderPublicKeys(this.view.parentTabId, { afterFrameId: this.view.frameId, publicKeys }); - } - if (renderableAttachments.length) { - this.view.attachmentsModule.renderInnerAttachments(renderableAttachments, isEncrypted); - } - this.resizePgpBlockFrame(); - if (!this.doNotSetStateAsReadyYet) { - // in case async tasks are still being worked at - Ui.setTestState('ready'); - } - }; - - /** - * Replaces inline image CID references with base64 encoded data in sanitized HTML - * and returns the sanitized HTML along with the inline CID attachments. - * - * @param html - The original HTML content. - * @param attachments - An array of email attachments. - * @returns An object containing sanitized HTML and an array of inline CID attachments. - */ - private replaceInlineImageCIDs = (html: string, attachments: Attachment[]): { sanitizedHtml: string; inlineCIDAttachments: Attachment[] } => { - // Array to store inline CID attachments - const inlineCIDAttachments: Attachment[] = []; - - // Define the hook function for DOMPurify to process image elements after sanitizing attributes - const processImageElements = (node: Element | null) => { - // Ensure the node exists and has a 'src' attribute - if (!node || !('src' in node)) return; - const imageSrc = node.getAttribute('src') as string; - if (!imageSrc) return; - const matches = imageSrc.match(CID_PATTERN); - - // Check if the src attribute contains a CID - if (matches && matches[1]) { - const contentId = matches[1]; - const contentIdAttachment = attachments.find(attachment => attachment.cid === `<${contentId}>`); - - // Replace the src attribute with a base64 encoded string - if (contentIdAttachment) { - inlineCIDAttachments.push(contentIdAttachment); - node.setAttribute('src', `data:${contentIdAttachment.type};base64,${contentIdAttachment.getData().toBase64Str()}`); - } - } - }; - - // Add the DOMPurify hook - DOMPurify.addHook('afterSanitizeAttributes', processImageElements); - - // Sanitize the HTML and remove the DOMPurify hooks - const sanitizedHtml = DOMPurify.sanitize(html); - DOMPurify.removeAllHooks(); - - return { sanitizedHtml, inlineCIDAttachments }; - }; - - private getEncryptedSubjectText = (subject: string, isHtml: boolean) => { - if (isHtml) { - return `
Encrypted Subject: - ${Xss.escape(subject)} -
-
`; - } else { - return `Encrypted Subject: ${subject}\n----------------------------------------------------------------------------------------------------\n`; - } - }; } diff --git a/extension/chrome/elements/pgp_render_block.htm b/extension/chrome/elements/pgp_render_block.htm new file mode 100644 index 00000000000..b4a4defe2d5 --- /dev/null +++ b/extension/chrome/elements/pgp_render_block.htm @@ -0,0 +1,42 @@ + + + + + + + FlowCrypt + + + + + + +
+ +
+
+ Print +
+ +
+
Loading...
+
+ + + + + + + diff --git a/extension/chrome/elements/pgp_render_block.ts b/extension/chrome/elements/pgp_render_block.ts new file mode 100644 index 00000000000..06adecb9ef0 --- /dev/null +++ b/extension/chrome/elements/pgp_render_block.ts @@ -0,0 +1,66 @@ +/* ©️ 2016 - present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com */ + +'use strict'; + +import { Url } from '../../js/common/core/common.js'; +import { Assert } from '../../js/common/assert.js'; +import { Ui } from '../../js/common/browser/ui.js'; +import { View } from '../../js/common/view.js'; +import { PgpBaseBlockView } from './pgp_base_block_view.js'; +import { RenderMessage } from '../../js/common/render-message.js'; + +export class PgpRenderBlockView extends PgpBaseBlockView { + public readonly debug: boolean; + + public constructor() { + Ui.event.protect(); + const uncheckedUrlParams = Url.parse(['frameId', 'parentTabId', 'debug']); + super(Assert.urlParamRequire.string(uncheckedUrlParams, 'parentTabId'), Assert.urlParamRequire.string(uncheckedUrlParams, 'frameId')); + this.debug = uncheckedUrlParams.debug === true; + window.addEventListener('message', this.handleMessage, true); + } + + public render = async () => { + // await this.renderModule.initPrintView(); + }; + + public setHandlers = () => { + /* + $('.pgp_print_button').on( + 'click', + this.setHandler(() => this.renderModule.printPGPBlock()) + ); + */ + }; + + private handleMessage = (event: MessageEvent) => { + const data = event.data as RenderMessage; + // todo: order better + if (data?.renderEncryptionStatus) { + this.renderModule.renderEncryptionStatus(data.renderEncryptionStatus); + } + if (data?.renderSignatureStatus) { + this.renderModule.renderSignatureStatus(data.renderSignatureStatus); // todo: "offline"->click->reload? + } + if (data?.renderText) { + this.renderModule.renderText(data.renderText); + } + if (data?.resizePgpBlockFrame) { + this.renderModule.resizePgpBlockFrame(); + } + if (data?.separateQuotedContentAndRenderText) { + this.quoteModule.separateQuotedContentAndRenderText( + data.separateQuotedContentAndRenderText.decryptedContent, + data.separateQuotedContentAndRenderText.isHtml + ); + } + if (data?.setFrameColor) { + this.renderModule.setFrameColor(data.setFrameColor); + } + if (data?.setTestState) { + Ui.setTestState(data.setTestState); + } + }; +} + +View.run(PgpRenderBlockView); diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index 03696367c13..776491d72e7 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -5,12 +5,18 @@ import { GmailParser, GmailRes } from './api/email-provider/gmail/gmail-parser.js'; import { Attachment } from './core/attachment.js'; import { Buf } from './core/buf.js'; -import { Dict, Str } from './core/common.js'; +import { CID_PATTERN, Dict, Str } from './core/common.js'; +import { KeyUtil } from './core/crypto/key.js'; +import { MsgUtil, VerifyRes } from './core/crypto/pgp/msg-util.js'; import { Mime, MimeContent, MimeProccesedMsg } from './core/mime.js'; +import { MsgBlockParser } from './core/msg-block-parser.js'; import { MsgBlock } from './core/msg-block.js'; import { SendAsAlias } from './platform/store/acct-store.js'; +import { ContactStore } from './platform/store/contact-store.js'; import { Xss } from './platform/xss.js'; +import { RenderInterface } from './render-interface.js'; import { XssSafeFactory } from './xss-safe-factory.js'; +import * as DOMPurify from 'dompurify'; export type ProccesedMsg = MimeProccesedMsg; @@ -20,6 +26,38 @@ export type AttachmentBlock = { }; export class MessageRenderer { + public static renderSignedMessage = async (raw: string, renderModule: RenderInterface, signerEmail: string) => { + // ... from PgpBlockViewDecryptModule.initialize + const mimeMsg = Buf.fromBase64UrlStr(raw); + const parsed = await Mime.decode(mimeMsg); + if (parsed && typeof parsed.rawSignedContent === 'string') { + const signatureAttachment = parsed.attachments.find(a => a.treatAs(parsed.attachments) === 'signature'); // todo: more than one signature candidate? + if (signatureAttachment) { + const parsedSignature = signatureAttachment.getData().toUtfStr(); + // ... from PgpBlockViewDecryptModule.decryptAndRender + const sigText = parsedSignature.replace('\n=3D', '\n='); + const encryptedData = parsed.rawSignedContent; + try { + const parsedPubs = (await ContactStore.getOneWithAllPubkeys(undefined, signerEmail))?.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)); + const verify = async (verificationPubs: string[]) => await MsgUtil.verifyDetached({ plaintext: encryptedData, sigText, verificationPubs }); + const signatureResult = await verify(verificationPubs); + // todo: retry verification with looked up keys? + await MessageRenderer.decideDecryptedContentFormattingAndRender(encryptedData, false, signatureResult, renderModule); + } catch (e) { + console.log(e); + } + } + } + /* todo: await this.view.errorModule.renderErr( + 'Error: could not properly parse signed message', + parsed.rawSignedContent || parsed.text || parsed.html || mimeMsg.toUtfStr(), + 'parse error' + ); */ + }; + public static renderMsg = ( { from, blocks }: { blocks: MsgBlock[]; from?: string }, factory: XssSafeFactory, @@ -65,4 +103,149 @@ export class MessageRenderer { attachments, }; }; + + /** + * Replaces inline image CID references with base64 encoded data in sanitized HTML + * and returns the sanitized HTML along with the inline CID attachments. + * + * @param html - The original HTML content. + * @param attachments - An array of email attachments. + * @returns An object containing sanitized HTML and an array of inline CID attachments. + */ + public static replaceInlineImageCIDs = (html: string, attachments: Attachment[]): { sanitizedHtml: string; inlineCIDAttachments: Attachment[] } => { + // Array to store inline CID attachments + const inlineCIDAttachments: Attachment[] = []; + + // Define the hook function for DOMPurify to process image elements after sanitizing attributes + const processImageElements = (node: Element | null) => { + // Ensure the node exists and has a 'src' attribute + if (!node || !('src' in node)) return; + const imageSrc = node.getAttribute('src') as string; + if (!imageSrc) return; + const matches = imageSrc.match(CID_PATTERN); + + // Check if the src attribute contains a CID + if (matches && matches[1]) { + const contentId = matches[1]; + const contentIdAttachment = attachments.find(attachment => attachment.cid === `<${contentId}>`); + + // Replace the src attribute with a base64 encoded string + if (contentIdAttachment) { + inlineCIDAttachments.push(contentIdAttachment); + node.setAttribute('src', `data:${contentIdAttachment.type};base64,${contentIdAttachment.getData().toBase64Str()}`); + } + } + }; + + // Add the DOMPurify hook + DOMPurify.addHook('afterSanitizeAttributes', processImageElements); + + // Sanitize the HTML and remove the DOMPurify hooks + const sanitizedHtml = DOMPurify.sanitize(html); + DOMPurify.removeAllHooks(); + + return { sanitizedHtml, inlineCIDAttachments }; + }; + + public static getEncryptedSubjectText = (subject: string, isHtml: boolean) => { + if (isHtml) { + return `
Encrypted Subject: + ${Xss.escape(subject)} +
+
`; + } else { + return `Encrypted Subject: ${subject}\n----------------------------------------------------------------------------------------------------\n`; + } + }; + + public static decideDecryptedContentFormattingAndRender = async ( + decryptedBytes: Uint8Array | string, + isEncrypted: boolean, + sigResult: VerifyRes | undefined, + renderModule: RenderInterface, + plainSubject?: string + ) => { + if (isEncrypted) { + renderModule.renderEncryptionStatus('encrypted'); + renderModule.setFrameColor('green'); + } else { + renderModule.renderEncryptionStatus('not encrypted'); + renderModule.setFrameColor('gray'); + } + const publicKeys: string[] = []; + let renderableAttachments: Attachment[] = []; + let decryptedContent: string | undefined; + let isHtml = false; + // todo - replace with MsgBlockParser.fmtDecryptedAsSanitizedHtmlBlocks, then the extract/strip methods could be private? + if (!Mime.resemblesMsg(decryptedBytes)) { + const fcAttachmentBlocks: MsgBlock[] = []; + decryptedContent = Str.with(decryptedBytes); + decryptedContent = MsgBlockParser.extractFcAttachments(decryptedContent, fcAttachmentBlocks); + decryptedContent = MsgBlockParser.stripFcTeplyToken(decryptedContent); + decryptedContent = MsgBlockParser.stripPublicKeys(decryptedContent, publicKeys); + if (fcAttachmentBlocks.length) { + renderableAttachments = fcAttachmentBlocks.map( + attachmentBlock => new Attachment(attachmentBlock.attachmentMeta!) // eslint-disable-line @typescript-eslint/no-non-null-assertion + ); + } + } else { + renderModule.renderText('Formatting...'); + const decoded = await Mime.decode(decryptedBytes); + let inlineCIDAttachments: Attachment[] = []; + if (typeof decoded.html !== 'undefined') { + ({ sanitizedHtml: decryptedContent, inlineCIDAttachments } = MessageRenderer.replaceInlineImageCIDs(decoded.html, decoded.attachments)); + isHtml = true; + } else if (typeof decoded.text !== 'undefined') { + decryptedContent = decoded.text; + } else { + decryptedContent = ''; + } + if ( + decoded.subject && + isEncrypted && + (!plainSubject || !Mime.subjectWithoutPrefixes(plainSubject).includes(Mime.subjectWithoutPrefixes(decoded.subject))) + ) { + // there is an encrypted subject + (either there is no plain subject or the plain subject does not contain what's in the encrypted subject) + decryptedContent = MessageRenderer.getEncryptedSubjectText(decoded.subject, isHtml) + decryptedContent; // render encrypted subject in message + } + for (const attachment of decoded.attachments) { + if (attachment.isPublicKey()) { + publicKeys.push(attachment.getData().toUtfStr()); + } else if (!inlineCIDAttachments.some(inlineAttachment => inlineAttachment.cid === attachment.cid)) { + renderableAttachments.push(attachment); + } + } + } + renderModule.separateQuotedContentAndRenderText(decryptedContent, isHtml); // todo: quoteModule ? + MessageRenderer.renderPgpSignatureCheckResult(renderModule, sigResult); + if (isEncrypted && publicKeys.length) { + // todo: BrowserMsg.send.renderPublicKeys(this.view.parentTabId, { afterFrameId: this.view.frameId, publicKeys }); + } + if (renderableAttachments.length) { + // todo: this.view.attachmentsModule.renderInnerAttachments(renderableAttachments, isEncrypted); + } + renderModule.resizePgpBlockFrame(); + renderModule.setTestState('ready'); + }; + + public static renderPgpSignatureCheckResult = (renderModule: RenderInterface, verifyRes: VerifyRes | undefined) => { + if (verifyRes?.error) { + /* todo: if (not raw) { + // 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; + } */ + renderModule.renderSignatureStatus(`error verifying signature: ${verifyRes.error}`); + renderModule.setFrameColor('red'); + } else if (!verifyRes || !verifyRes.signerLongids.length) { + renderModule.renderSignatureStatus('not signed'); + } else if (verifyRes.match) { + renderModule.renderSignatureStatus('signed'); + } else { + // todo: renderModule.renderMissingPubkeyOrBadSignature(verifyRes); + } + renderModule.setTestState('ready'); + }; } diff --git a/extension/js/common/render-interface.ts b/extension/js/common/render-interface.ts new file mode 100644 index 00000000000..e98d53f130e --- /dev/null +++ b/extension/js/common/render-interface.ts @@ -0,0 +1,13 @@ +/* ©️ 2016 - present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com */ + +'use strict'; + +export interface RenderInterface { + setTestState(state: 'ready' | 'working' | 'waiting'): void; + resizePgpBlockFrame(): void; + separateQuotedContentAndRenderText(decryptedContent: string, isHtml: boolean): void; + renderText(text: string): void; + setFrameColor(color: 'red' | 'green' | 'gray'): void; + renderEncryptionStatus(status: string): void; + renderSignatureStatus(status: string): void; // todo: need to implement "offline error"->"click"->retry scenario +} diff --git a/extension/js/common/render-message.ts b/extension/js/common/render-message.ts new file mode 100644 index 00000000000..ecbdc90efdc --- /dev/null +++ b/extension/js/common/render-message.ts @@ -0,0 +1,13 @@ +/* ©️ 2016 - present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com */ + +'use strict'; + +export type RenderMessage = { + setTestState?: 'ready' | 'working' | 'waiting'; + resizePgpBlockFrame?: boolean; + separateQuotedContentAndRenderText?: { decryptedContent: string; isHtml: boolean }; + renderText?: string; + setFrameColor?: 'green' | 'gray' | 'red'; + renderEncryptionStatus?: string; + renderSignatureStatus?: string; +}; diff --git a/extension/js/common/render-relay.ts b/extension/js/common/render-relay.ts new file mode 100644 index 00000000000..ad7885b4614 --- /dev/null +++ b/extension/js/common/render-relay.ts @@ -0,0 +1,40 @@ +/* ©️ 2016 - present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com */ + +'use strict'; + +import { RenderInterface } from './render-interface.js'; +import { RenderMessage } from './render-message.js'; + +export class RenderRelay implements RenderInterface { + public constructor(private frameWindow: Window) {} + public setTestState = (state: 'ready' | 'working' | 'waiting') => { + this.relay({ setTestState: state }); + }; + public resizePgpBlockFrame = () => { + this.relay({ resizePgpBlockFrame: true }); + }; + + public separateQuotedContentAndRenderText = (decryptedContent: string, isHtml: boolean) => { + this.relay({ separateQuotedContentAndRenderText: { decryptedContent, isHtml } }); + }; + + public renderText = (text: string) => { + this.relay({ renderText: text }); + }; + + public setFrameColor = (color: 'green' | 'gray' | 'red') => { + this.relay({ setFrameColor: color }); + }; + + public renderEncryptionStatus = (status: string) => { + this.relay({ renderEncryptionStatus: status }); + }; + + public renderSignatureStatus = (status: string) => { + this.relay({ renderSignatureStatus: status }); + }; + + private relay = (message: RenderMessage) => { + this.frameWindow.postMessage(message, '*'); // todo: targetOrigin + }; +} diff --git a/extension/js/common/xss-safe-factory.ts b/extension/js/common/xss-safe-factory.ts index d36fcad36c2..79411ade2d2 100644 --- a/extension/js/common/xss-safe-factory.ts +++ b/extension/js/common/xss-safe-factory.ts @@ -105,6 +105,16 @@ export class XssSafeFactory { return blocks.map(block => XssSafeFactory.renderableMsgBlock(factory, block, msgId, senderEmail, isOutgoing)).join('\n\n'); }; + public static getWindowOfEmbeddedMsg = (frameId: string): Window | undefined => { + // const iframe = document.getElementById(frameId) as HTMLIFrameElement; + const iframe = $(`iframe#${frameId}`).get(0) as HTMLIFrameElement; + if (iframe?.contentWindow) { + return iframe?.contentWindow; + } + Catch.report('Unable to find iframe by frameId=' + frameId); + return undefined; + }; + public srcImg = (relPath: string) => { return this.extUrl(`img/${relPath}`); }; @@ -162,6 +172,16 @@ export class XssSafeFactory { }); }; + public srcPgpRenderBlockIframe = () => { + const frameId = this.newId(); + return { + frameId, + frameSrc: this.frameSrc(this.extUrl('chrome/elements/pgp_render_block.htm'), { + frameId, + }), + }; + }; + public srcPgpPubkeyIframe = (armoredPubkey: string, isOutgoing?: boolean) => { return this.frameSrc(this.extUrl('chrome/elements/pgp_pubkey.htm'), { frameId: this.newId(), @@ -228,6 +248,11 @@ export class XssSafeFactory { return this.iframe(this.srcPgpBlockIframe(armored, msgId, isOutgoing, sender, signature), ['pgp_block', type]) + this.hideGmailNewMsgInThreadNotification; }; + public embeddedRenderMsg = () => { + const { frameId, frameSrc } = this.srcPgpRenderBlockIframe(); + return { frameId, frameHtml: this.iframe(frameSrc, ['pgp_block']) + this.hideGmailNewMsgInThreadNotification }; + }; + public embeddedPubkey = (armoredPubkey: string, isOutgoing?: boolean) => { return this.iframe(this.srcPgpPubkeyIframe(armoredPubkey, isOutgoing), ['pgp_block', 'publicKey']); }; diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index cc9e9bdd761..7660438688c 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -26,15 +26,17 @@ import { SendAsAlias } from '../../common/platform/store/acct-store.js'; import { ContactStore } from '../../common/platform/store/contact-store.js'; import { Buf } from '../../common/core/buf.js'; import { MessageRenderer } from '../../common/message-renderer.js'; +import { RenderRelay } from '../../common/render-relay.js'; import { Mime } from '../../common/core/mime.js'; import { MsgUtil } from '../../common/core/crypto/pgp/msg-util.js'; +import { RenderInterface } from '../../common/render-interface.js'; type JQueryEl = JQuery; type ProcessedMessage = { renderedXssSafe?: string; attachments: Attachment[] }; interface MessageCacheEntry { - full: Promise; + download: { full: Promise; raw?: Promise }; processedFull?: ProcessedMessage; } @@ -168,12 +170,20 @@ export class GmailElementReplacer implements WebmailElementReplacer { // todo: retries? exceptions? let msgDownload = this.messages[msgId]; if (!msgDownload) { - this.messages[msgId] = { full: this.gmail.msgGet(msgId, 'full') }; + this.messages[msgId] = { download: { full: this.gmail.msgGet(msgId, 'full') } }; msgDownload = this.messages[msgId]; } return msgDownload; }; + private msgGetRaw = async (msgId: string): Promise => { + const msgDownload = this.msgGetCached(msgId).download; + if (!msgDownload.raw) { + msgDownload.raw = this.gmail.msgGet(msgId, 'raw'); + } + return (await msgDownload.raw).raw || ''; + }; + private queueAttachmentChunkDownload = (a: Attachment) => { if (a.hasData()) { return { attachment: a, result: Promise.resolve(a.getData()) }; @@ -199,8 +209,9 @@ export class GmailElementReplacer implements WebmailElementReplacer { if (msgDownload.processedFull) { return msgDownload.processedFull; } - const msg = await msgDownload.full; - const mimeContent = MessageRenderer.reconstructMimeContent(msg); + const fullOrRawMsg = await Promise.race(Object.values(msgDownload.download).filter(Boolean)); + // todo: what should we do if we received 'raw'? + const mimeContent = MessageRenderer.reconstructMimeContent(fullOrRawMsg); const blocks = Mime.processBody(mimeContent); // todo: only start `signature` download? // start download of all attachments that are not plainFile, for 'needChunk' -- chunked download @@ -221,7 +232,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { if (blocks.length === 0 || (blocks.length === 1 && ['plainText', 'plainHtml'].includes(blocks[0].type))) { // only has single block which is plain text } else { - const from = GmailParser.findHeader(msg, 'from'); + const from = GmailParser.findHeader(fullOrRawMsg, 'from'); ({ renderedXssSafe } = MessageRenderer.renderMsg({ blocks, from }, this.factory, false, msgId, this.sendAs)); } msgDownload.processedFull = { renderedXssSafe, attachments: mimeContent.attachments }; @@ -599,8 +610,16 @@ export class GmailElementReplacer implements WebmailElementReplacer { } else if (treatAs === 'privateKey') { return await this.renderBackupFromFile(a, attachmentsContainerInner, msgElReference.msgEl); } else if (treatAs === 'signature') { - const embeddedSignedMsgXssSafe = this.factory.embeddedMsg('signedMsg', '', msgId, false, senderEmail, true); + // todo: generate frameId here, prevent frameId duplicates? + const { frameId, frameHtml: embeddedSignedMsgXssSafe } = this.factory.embeddedRenderMsg(); msgElReference.msgEl = this.updateMsgBodyEl_DANGEROUSLY(msgElReference.msgEl, 'set', embeddedSignedMsgXssSafe); // xss-safe-factory + const frameWindow = XssSafeFactory.getWindowOfEmbeddedMsg(frameId); + if (frameWindow) { + const renderModule = new RenderRelay(frameWindow); + this.processSignedMessage(msgId, renderModule, senderEmail).catch(Catch.reportErr); // todo: clear cached items + } else { + Catch.report('Unexpected: unable to reference a newly created message frame'); // todo: + } return 'hidden'; // native attachment should be hidden, the "attachment" goes to the message container } else { // standard file @@ -621,6 +640,16 @@ export class GmailElementReplacer implements WebmailElementReplacer { } }; + private processSignedMessage = async (msgId: string, renderModule: RenderInterface, senderEmail: string) => { + try { + renderModule.renderText('Loading signed message...'); + const raw = await this.msgGetRaw(msgId); + await MessageRenderer.renderSignedMessage(raw, renderModule, senderEmail); + } catch { + // todo: render error via renderModule + } + }; + private processGoogleDriveAttachments = async (msgId: string, msgEl: JQueryEl, attachmentsContainerInner: JQueryEl) => { const notProcessedAttachmentsLoaders = attachmentsContainerInner.find('.attachment_loader'); if (notProcessedAttachmentsLoaders.length && msgEl.find('.gmail_drive_chip, a[href^="https://drive.google.com/file"]').length) { diff --git a/extension/manifest.json b/extension/manifest.json index 9a1161f5ad1..7d1b7fc67b0 100644 --- a/extension/manifest.json +++ b/extension/manifest.json @@ -42,7 +42,22 @@ { "matches": ["https://mail.google.com/*"], "css": ["/css/webmail.css", "/css/sweetalert2.css"], - "js": ["/lib/purify.js", "/lib/jquery.min.js", "/lib/openpgp.js", "/lib/sweetalert2.js", "/lib/streams_web.js", "/js/content_scripts/webmail_bundle.js"] + "js": [ + "/lib/purify.js", + "/lib/jquery.min.js", + "/lib/openpgp.js", + "/lib/sweetalert2.js", + "/lib/streams_web.js", + "/lib/emailjs/punycode.js", + "/lib/iso-8859-2.js", + "/lib/emailjs/emailjs-stringencoding.js", + "/lib/emailjs/emailjs-mime-codec.js", + "/lib/emailjs/emailjs-mime-types.js", + "/lib/emailjs/emailjs-addressparser.js", + "/lib/emailjs/emailjs-mime-builder.js", + "/lib/emailjs/emailjs-mime-parser.js", + "/js/content_scripts/webmail_bundle.js" + ] }, { "matches": ["https://www.google.com/robots.txt*"], @@ -66,6 +81,7 @@ "/img/logo/flowcrypt-logo-19-19.png", "/chrome/elements/compose.htm", "/chrome/elements/pgp_block.htm", + "/chrome/elements/pgp_render_block.htm", "/chrome/elements/setup_dialog.htm", "/chrome/elements/attachment.htm", "/chrome/elements/attachment_preview.htm", From c6ffa6dbdb38d0ecb46e391649d6471afaa48904 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sat, 22 Apr 2023 11:39:25 +0100 Subject: [PATCH 013/147] test fix --- test/source/tests/decrypt.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index cc93b2caf98..d11aaa569dc 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -90,26 +90,25 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te ); test( - `decrypt - parsed signed message with signautre.asc as plain attachment`, + `decrypt - parsed signed message with signature.asc as plain attachment`, testWithBrowser(async (t, browser) => { const threadId = '187085b874fb727c'; const acctEmail = 'flowcrypt.compatibility@gmail.com'; t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + const { accessToken } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + const expectedContent = 'flowcrypt-browser issue #5029 test email'; const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitForSelTestState('ready'); await inboxPage.waitAll('iframe'); const pgpBlock = await inboxPage.getFrame(['pgp_block.htm']); - const expectedContent = 'flowcrypt-browser issue #5029 test email'; await pgpBlock.waitForContent('@pgp-block-content', expectedContent); - const accessToken = await BrowserRecipe.getGoogleAccessToken(inboxPage, acctEmail); await inboxPage.close(); const extraAuthHeaders = { Authorization: `Bearer ${accessToken}` }; // eslint-disable-line @typescript-eslint/naming-convention const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${threadId}`, undefined, extraAuthHeaders); await gmailPage.waitAll('iframe'); - const pgpBlock2 = await gmailPage.getFrame(['pgp_block.htm']); + const pgpBlock2 = await gmailPage.getFrame(['pgp_render_block.htm']); await pgpBlock2.waitForContent('@pgp-block-content', expectedContent); await gmailPage.close(); }) From 43219bf63e95ad0f774e2d9153f8b13f0eac1bc1 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sat, 22 Apr 2023 14:27:59 +0100 Subject: [PATCH 014/147] fixed relay renderer to await for the destination frame readyToReceive message --- extension/chrome/elements/pgp_render_block.ts | 3 +- .../js/common/relay-manager-interface.ts | 9 ++++ extension/js/common/relay-manager.ts | 42 +++++++++++++++++++ extension/js/common/render-relay.ts | 5 ++- .../webmail/gmail-element-replacer.ts | 29 ++++--------- .../webmail/setup-webmail-content-script.ts | 13 +++++- .../js/content_scripts/webmail/webmail.ts | 8 ++-- 7 files changed, 80 insertions(+), 29 deletions(-) create mode 100644 extension/js/common/relay-manager-interface.ts create mode 100644 extension/js/common/relay-manager.ts diff --git a/extension/chrome/elements/pgp_render_block.ts b/extension/chrome/elements/pgp_render_block.ts index 06adecb9ef0..9e99bff856f 100644 --- a/extension/chrome/elements/pgp_render_block.ts +++ b/extension/chrome/elements/pgp_render_block.ts @@ -17,7 +17,8 @@ export class PgpRenderBlockView extends PgpBaseBlockView { const uncheckedUrlParams = Url.parse(['frameId', 'parentTabId', 'debug']); super(Assert.urlParamRequire.string(uncheckedUrlParams, 'parentTabId'), Assert.urlParamRequire.string(uncheckedUrlParams, 'frameId')); this.debug = uncheckedUrlParams.debug === true; - window.addEventListener('message', this.handleMessage, true); + window.addEventListener('message', this.handleMessage, true); // todo: capture? + window.addEventListener('load', () => window.parent.postMessage({ readyToReceive: this.frameId }, '*')); } public render = async () => { diff --git a/extension/js/common/relay-manager-interface.ts b/extension/js/common/relay-manager-interface.ts new file mode 100644 index 00000000000..df44c5ebfd6 --- /dev/null +++ b/extension/js/common/relay-manager-interface.ts @@ -0,0 +1,9 @@ +/* ©️ 2016 - present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com */ + +'use strict'; + +import { RenderMessage } from './render-message.js'; + +export interface RelayManagerInterface { + relay(frameId: string, message: RenderMessage): void; +} diff --git a/extension/js/common/relay-manager.ts b/extension/js/common/relay-manager.ts new file mode 100644 index 00000000000..0284617d66b --- /dev/null +++ b/extension/js/common/relay-manager.ts @@ -0,0 +1,42 @@ +/* ©️ 2016 - present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com */ + +'use strict'; + +import { Dict } from './core/common.js'; +import { RelayManagerInterface } from './relay-manager-interface.js'; +import { RenderInterface } from './render-interface.js'; +import { RenderMessage } from './render-message.js'; +import { RenderRelay } from './render-relay.js'; + +export class RelayManager implements RelayManagerInterface { + private frames: Dict<{ frameWindow: Window; readyToReceive?: true; queue: RenderMessage[] }> = {}; + + public relay = (frameId: string, message: RenderMessage) => { + const frameData = this.frames[frameId]; + frameData.queue.push(message); + if (frameData.readyToReceive) { + this.flush(frameData); + } + }; + + public createRelay = (frameId: string, frameWindow: Window): RenderInterface => { + this.frames[frameId] = { frameWindow, queue: [] }; // can readyToReceive message come earlier? Probably not. + return new RenderRelay(this, frameId); + }; + + public readyToReceive = (frameId: string) => { + const frameData = this.frames[frameId]; + frameData.readyToReceive = true; + this.flush(frameData); + }; + + private flush = ({ frameWindow, queue }: { frameWindow: Window; queue: RenderMessage[] }) => { + while (true) { + const message = queue.shift(); + if (message) { + frameWindow.postMessage(message, '*'); // todo: targetOrigin + // todo: if ready status, release resources -- callback function? + } else break; + } + }; +} diff --git a/extension/js/common/render-relay.ts b/extension/js/common/render-relay.ts index ad7885b4614..fc294e809e8 100644 --- a/extension/js/common/render-relay.ts +++ b/extension/js/common/render-relay.ts @@ -2,11 +2,12 @@ 'use strict'; +import { RelayManagerInterface } from './relay-manager-interface.js'; import { RenderInterface } from './render-interface.js'; import { RenderMessage } from './render-message.js'; export class RenderRelay implements RenderInterface { - public constructor(private frameWindow: Window) {} + public constructor(private relayManager: RelayManagerInterface, private frameId: string) {} public setTestState = (state: 'ready' | 'working' | 'waiting') => { this.relay({ setTestState: state }); }; @@ -35,6 +36,6 @@ export class RenderRelay implements RenderInterface { }; private relay = (message: RenderMessage) => { - this.frameWindow.postMessage(message, '*'); // todo: targetOrigin + this.relayManager.relay(this.frameId, message); }; } diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index 7660438688c..648a0870212 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -26,7 +26,7 @@ import { SendAsAlias } from '../../common/platform/store/acct-store.js'; import { ContactStore } from '../../common/platform/store/contact-store.js'; import { Buf } from '../../common/core/buf.js'; import { MessageRenderer } from '../../common/message-renderer.js'; -import { RenderRelay } from '../../common/render-relay.js'; +import { RelayManager } from '../../common/relay-manager.js'; import { Mime } from '../../common/core/mime.js'; import { MsgUtil } from '../../common/core/crypto/pgp/msg-util.js'; import { RenderInterface } from '../../common/render-interface.js'; @@ -45,16 +45,10 @@ export class GmailElementReplacer implements WebmailElementReplacer { private gmail: Gmail; private recipientHasPgpCache: Dict = {}; - private sendAs: Dict; private messages: Dict = {}; private chunkDownloads: { attachment: Attachment; result: Promise }[] = []; // private attachmentDownloads: { attachment: Attachment; result: Promise }[] = []; - private factory: XssSafeFactory; - private clientConfiguration: ClientConfiguration; private pubLookup: PubLookup; - private acctEmail: string; - private injector: Injector; - private notifications: Notifications; private webmailCommon: WebmailCommon; private currentlyEvaluatingStandardComposeBoxRecipients = false; private currentlyReplacingAttachments = false; @@ -85,21 +79,16 @@ export class GmailElementReplacer implements WebmailElementReplacer { }; public constructor( - factory: XssSafeFactory, - clientConfiguration: ClientConfiguration, - acctEmail: string, - sendAs: Dict, - injector: Injector, - notifications: Notifications + private factory: XssSafeFactory, + private clientConfiguration: ClientConfiguration, + private acctEmail: string, + private sendAs: Dict, + private injector: Injector, + private notifications: Notifications, + private relayManager: RelayManager ) { - this.factory = factory; - this.acctEmail = acctEmail; - this.sendAs = sendAs; - this.injector = injector; - this.notifications = notifications; this.webmailCommon = new WebmailCommon(acctEmail, injector); this.gmail = new Gmail(acctEmail); - this.clientConfiguration = clientConfiguration; this.pubLookup = new PubLookup(this.clientConfiguration); } @@ -615,7 +604,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { msgElReference.msgEl = this.updateMsgBodyEl_DANGEROUSLY(msgElReference.msgEl, 'set', embeddedSignedMsgXssSafe); // xss-safe-factory const frameWindow = XssSafeFactory.getWindowOfEmbeddedMsg(frameId); if (frameWindow) { - const renderModule = new RenderRelay(frameWindow); + const renderModule = this.relayManager.createRelay(frameId, frameWindow); this.processSignedMessage(msgId, renderModule, senderEmail).catch(Catch.reportErr); // todo: clear cached items } else { Catch.report('Unexpected: unable to reference a newly created message frame'); // todo: diff --git a/extension/js/content_scripts/webmail/setup-webmail-content-script.ts b/extension/js/content_scripts/webmail/setup-webmail-content-script.ts index 96c573a7ce4..f159abc49ca 100644 --- a/extension/js/content_scripts/webmail/setup-webmail-content-script.ts +++ b/extension/js/content_scripts/webmail/setup-webmail-content-script.ts @@ -24,6 +24,7 @@ import { AcctStore } from '../../common/platform/store/acct-store.js'; import { GlobalStore } from '../../common/platform/store/global-store.js'; import { InMemoryStore } from '../../common/platform/store/in-memory-store.js'; import { WebmailVariantString, XssSafeFactory } from '../../common/xss-safe-factory.js'; +import { RelayManager } from '../../common/relay-manager.js'; export type WebmailVariantObject = { newDataLayer: undefined | boolean; @@ -44,7 +45,8 @@ type WebmailSpecificInfo = { inject: Injector, notifications: Notifications, factory: XssSafeFactory, - notifyMurdered: () => void + notifyMurdered: () => void, + relayManager: RelayManager ) => Promise; }; export interface WebmailElementReplacer { @@ -433,7 +435,14 @@ export const contentScriptSetupIfVacant = async (webmailSpecific: WebmailSpecifi ppEvent, Catch.try(() => notifyExpiringKeys(acctEmail, clientConfiguration, notifications)) ); - await webmailSpecific.start(acctEmail, clientConfiguration, inject, notifications, factory, notifyMurdered); + const relayManager = new RelayManager(); + window.addEventListener('message', e => { + const regex = new RegExp(`^(chrome|moz)-extension://${chrome.runtime.id}$`); + if (regex.test(e.origin) && typeof e.data?.readyToReceive === 'string') { + relayManager.readyToReceive(e.data.readyToReceive); + } + }); + await webmailSpecific.start(acctEmail, clientConfiguration, inject, notifications, factory, notifyMurdered, relayManager); } catch (e) { if (e instanceof TabIdRequiredError) { console.error(`FlowCrypt cannot start: ${String(e)}`); diff --git a/extension/js/content_scripts/webmail/webmail.ts b/extension/js/content_scripts/webmail/webmail.ts index 7b321afef07..33ed4114d7f 100644 --- a/extension/js/content_scripts/webmail/webmail.ts +++ b/extension/js/content_scripts/webmail/webmail.ts @@ -4,8 +4,6 @@ // todo - a few things are duplicated here, refactor -/// - import { WebmailVariantObject, contentScriptSetupIfVacant } from './setup-webmail-content-script.js'; import { Catch } from '../../common/platform/catch.js'; import { ContentScriptWindow } from '../../common/browser/browser-window.js'; @@ -17,6 +15,7 @@ import { Str } from '../../common/core/common.js'; import { XssSafeFactory } from '../../common/xss-safe-factory.js'; import { ClientConfiguration } from '../../common/client-configuration.js'; import { AcctStore } from '../../common/platform/store/acct-store.js'; +import { RelayManager } from '../../common/relay-manager.js'; Catch.try(async () => { const gmailWebmailStartup = async () => { @@ -98,7 +97,8 @@ Catch.try(async () => { injector: Injector, notifications: Notifications, factory: XssSafeFactory, - notifyMurdered: () => void + notifyMurdered: () => void, + relayManager: RelayManager ) => { hijackGmailHotkeys(); const storage = await AcctStore.get(acctEmail, ['sendAs', 'full_name']); @@ -107,7 +107,7 @@ Catch.try(async () => { storage.sendAs[acctEmail] = { name: storage.full_name, isPrimary: true }; } injector.btns(); - replacer = new GmailElementReplacer(factory, clientConfiguration, acctEmail, storage.sendAs, injector, notifications); + replacer = new GmailElementReplacer(factory, clientConfiguration, acctEmail, storage.sendAs, injector, notifications, relayManager); await notifications.showInitial(acctEmail); const intervaliFunctions = replacer.getIntervalFunctions(); for (const intervalFunction of intervaliFunctions) { From 21d8d1878db91fe52adb16a92d22ef8ff0c2a400 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sat, 22 Apr 2023 14:52:21 +0100 Subject: [PATCH 015/147] update test and recipe to check pgp block for correctness --- test/source/tests/decrypt.ts | 12 ++++++++---- test/source/tests/tooling/browser-recipe.ts | 11 +++++++++-- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index d11aaa569dc..a9afb7eda02 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -102,14 +102,18 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitForSelTestState('ready'); await inboxPage.waitAll('iframe'); - const pgpBlock = await inboxPage.getFrame(['pgp_block.htm']); - await pgpBlock.waitForContent('@pgp-block-content', expectedContent); + await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame(['pgp_block.htm']), { + encryption: 'not encrypted', + content: [expectedContent], + }); await inboxPage.close(); const extraAuthHeaders = { Authorization: `Bearer ${accessToken}` }; // eslint-disable-line @typescript-eslint/naming-convention const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${threadId}`, undefined, extraAuthHeaders); await gmailPage.waitAll('iframe'); - const pgpBlock2 = await gmailPage.getFrame(['pgp_render_block.htm']); - await pgpBlock2.waitForContent('@pgp-block-content', expectedContent); + await BrowserRecipe.pgpBlockCheck(t, await gmailPage.getFrame(['pgp_render_block.htm']), { + encryption: 'not encrypted', + content: [expectedContent], + }); await gmailPage.close(); }) ); diff --git a/test/source/tests/tooling/browser-recipe.ts b/test/source/tests/tooling/browser-recipe.ts index e6f24d75d1c..bc24a68dd56 100644 --- a/test/source/tests/tooling/browser-recipe.ts +++ b/test/source/tests/tooling/browser-recipe.ts @@ -13,6 +13,7 @@ import { testConstants } from './consts'; import { PageRecipe } from '../page-recipe/abstract-page-recipe'; import { InMemoryStoreKeys } from '../../core/const'; import { GmailPageRecipe } from '../page-recipe/gmail-page-recipe'; +import { expect } from 'chai'; export class BrowserRecipe { public static oldAndNewComposeButtonSelectors = ['div.z0[class*="_destroyable"]', 'div.pb-25px[class*="_destroyable"]', '.new_secure_compose_window_button']; @@ -208,19 +209,25 @@ export class BrowserRecipe { } } } + const sigBadgeContent = await pgpBlockPage.read('@pgp-signature'); if (m.signature) { - const sigBadgeContent = await pgpBlockPage.read('@pgp-signature'); if (sigBadgeContent !== m.signature) { t.log(`found sig content:${sigBadgeContent}`); throw new Error(`pgp_block_verify_decrypted_content:missing expected signature content:${m.signature}\nactual sig content:${sigBadgeContent}`); } + } else { + // some badge still has to be present + expect(sigBadgeContent).to.be.ok; } + const encBadgeContent = await pgpBlockPage.read('@pgp-encryption'); if (m.encryption) { - const encBadgeContent = await pgpBlockPage.read('@pgp-encryption'); if (encBadgeContent !== m.encryption) { t.log(`found enc content:${encBadgeContent}`); throw new Error(`pgp_block_verify_decrypted_content:missing expected encryption content:${m.encryption}`); } + } else { + // some badge still has to be present + expect(encBadgeContent).to.be.ok; } if (m.error) { await pgpBlockPage.notPresent('@action-print'); From 4f881d9b41fe27e1a6d3abd7516a23c3150202fd Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sat, 22 Apr 2023 18:48:31 +0100 Subject: [PATCH 016/147] show signature badge --- .../pgp-block-signature-module.ts | 26 +++---------------- extension/js/common/message-renderer.ts | 24 ++++++++++++++--- extension/js/common/render-interface.ts | 9 ++++--- 3 files changed, 31 insertions(+), 28 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 65b10bc4965..9d365b43756 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 @@ -4,11 +4,11 @@ import { ApiErr } from '../../../js/common/api/shared/api-error.js'; import { Catch } from '../../../js/common/platform/catch.js'; -import { PgpBlockView } from '../pgp_block'; +import { PgpBlockView } from '../pgp_block.js'; 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 { BrowserMsg } from '../../../js/common/browser/browser-msg.js'; +import { MessageRenderer } from '../../../js/common/message-renderer.js'; export class PgpBlockViewSignatureModule { public constructor(private view: PgpBlockView) {} @@ -48,7 +48,7 @@ export class PgpBlockViewSignatureModule { await this.renderPgpSignatureCheckResult(await retryVerification(pubkeys), pubkeys, undefined); return; } - this.renderMissingPubkeyOrBadSignature(verifyRes); + MessageRenderer.renderMissingPubkeyOrBadSignature(this.view.renderModule, verifyRes); } catch (e) { if (ApiErr.isSignificant(e)) { Catch.reportErr(e); @@ -63,28 +63,10 @@ export class PgpBlockViewSignatureModule { } } else { // !retryVerification - this.renderMissingPubkeyOrBadSignature(verifyRes); + MessageRenderer.renderMissingPubkeyOrBadSignature(this.view.renderModule, verifyRes); } } this.view.renderModule.doNotSetStateAsReadyYet = false; Ui.setTestState('ready'); }; - - private renderMissingPubkey = (signerLongid: string) => { - this.view.renderModule.renderSignatureStatus(`could not verify signature: missing pubkey ${signerLongid}`); - }; - - private renderBadSignature = () => { - this.view.renderModule.renderSignatureStatus('bad signature'); - this.view.renderModule.setFrameColor('red'); // todo: in what other cases should we set the frame red? - }; - - private renderMissingPubkeyOrBadSignature = (verifyRes: VerifyRes): void => { - // eslint-disable-next-line no-null/no-null - 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/message-renderer.ts b/extension/js/common/message-renderer.ts index 776491d72e7..a77c44fa352 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -5,7 +5,7 @@ import { GmailParser, GmailRes } from './api/email-provider/gmail/gmail-parser.js'; import { Attachment } from './core/attachment.js'; import { Buf } from './core/buf.js'; -import { CID_PATTERN, Dict, Str } from './core/common.js'; +import { CID_PATTERN, Dict, Str, Value } from './core/common.js'; import { KeyUtil } from './core/crypto/key.js'; import { MsgUtil, VerifyRes } from './core/crypto/pgp/msg-util.js'; import { Mime, MimeContent, MimeProccesedMsg } from './core/mime.js'; @@ -14,7 +14,7 @@ import { MsgBlock } from './core/msg-block.js'; import { SendAsAlias } from './platform/store/acct-store.js'; import { ContactStore } from './platform/store/contact-store.js'; import { Xss } from './platform/xss.js'; -import { RenderInterface } from './render-interface.js'; +import { RenderInterface, RenderInterfaceBase } from './render-interface.js'; import { XssSafeFactory } from './xss-safe-factory.js'; import * as DOMPurify from 'dompurify'; @@ -244,8 +244,26 @@ export class MessageRenderer { } else if (verifyRes.match) { renderModule.renderSignatureStatus('signed'); } else { - // todo: renderModule.renderMissingPubkeyOrBadSignature(verifyRes); + MessageRenderer.renderMissingPubkeyOrBadSignature(renderModule, verifyRes); } renderModule.setTestState('ready'); }; + + public static renderMissingPubkeyOrBadSignature = (renderModule: RenderInterfaceBase, verifyRes: VerifyRes): void => { + // eslint-disable-next-line no-null/no-null + if (verifyRes.match === null || !Value.arr.hasIntersection(verifyRes.signerLongids, verifyRes.suppliedLongids)) { + MessageRenderer.renderMissingPubkey(renderModule, verifyRes.signerLongids[0]); + } else { + MessageRenderer.renderBadSignature(renderModule); + } + }; + + public static renderMissingPubkey = (renderModule: RenderInterfaceBase, signerLongid: string) => { + renderModule.renderSignatureStatus(`could not verify signature: missing pubkey ${signerLongid}`); + }; + + public static renderBadSignature = (renderModule: RenderInterfaceBase) => { + renderModule.renderSignatureStatus('bad signature'); + renderModule.setFrameColor('red'); // todo: in what other cases should we set the frame red? + }; } diff --git a/extension/js/common/render-interface.ts b/extension/js/common/render-interface.ts index e98d53f130e..9e76a469621 100644 --- a/extension/js/common/render-interface.ts +++ b/extension/js/common/render-interface.ts @@ -2,12 +2,15 @@ 'use strict'; -export interface RenderInterface { - setTestState(state: 'ready' | 'working' | 'waiting'): void; +export interface RenderInterfaceBase { resizePgpBlockFrame(): void; - separateQuotedContentAndRenderText(decryptedContent: string, isHtml: boolean): void; renderText(text: string): void; setFrameColor(color: 'red' | 'green' | 'gray'): void; renderEncryptionStatus(status: string): void; renderSignatureStatus(status: string): void; // todo: need to implement "offline error"->"click"->retry scenario } + +export interface RenderInterface extends RenderInterfaceBase { + setTestState(state: 'ready' | 'working' | 'waiting'): void; + separateQuotedContentAndRenderText(decryptedContent: string, isHtml: boolean): void; +} From ab682c9157e57a40f93be2ce9eef54c1bcca7abf Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sat, 22 Apr 2023 19:02:58 +0100 Subject: [PATCH 017/147] fix test recipe --- test/source/tests/tooling/browser-recipe.ts | 41 +++++++++++---------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/test/source/tests/tooling/browser-recipe.ts b/test/source/tests/tooling/browser-recipe.ts index bc24a68dd56..30e6eb1bea0 100644 --- a/test/source/tests/tooling/browser-recipe.ts +++ b/test/source/tests/tooling/browser-recipe.ts @@ -185,7 +185,7 @@ export class BrowserRecipe { if (m.expectPercentageProgress) { await pgpBlockPage.waitForContent('@pgp-block-content', /Retrieving message... \d+%/, 20, 10); } - await pgpBlockPage.waitForSelTestState('ready', 100); + await pgpBlockPage.waitForSelTestState('ready', 10000); await Util.sleep(1); if (m.quoted) { await pgpBlockPage.waitAndClick('@action-show-quoted-content'); @@ -210,26 +210,10 @@ export class BrowserRecipe { } } const sigBadgeContent = await pgpBlockPage.read('@pgp-signature'); - if (m.signature) { - if (sigBadgeContent !== m.signature) { - t.log(`found sig content:${sigBadgeContent}`); - throw new Error(`pgp_block_verify_decrypted_content:missing expected signature content:${m.signature}\nactual sig content:${sigBadgeContent}`); - } - } else { - // some badge still has to be present - expect(sigBadgeContent).to.be.ok; - } const encBadgeContent = await pgpBlockPage.read('@pgp-encryption'); - if (m.encryption) { - if (encBadgeContent !== m.encryption) { - t.log(`found enc content:${encBadgeContent}`); - throw new Error(`pgp_block_verify_decrypted_content:missing expected encryption content:${m.encryption}`); - } - } else { - // some badge still has to be present - expect(encBadgeContent).to.be.ok; - } if (m.error) { + expect(sigBadgeContent).to.be.empty; + expect(encBadgeContent).to.be.empty; await pgpBlockPage.notPresent('@action-print'); const errBadgeContent = await pgpBlockPage.read('@pgp-error'); if (errBadgeContent !== m.error) { @@ -240,6 +224,25 @@ export class BrowserRecipe { if (!(await pgpBlockPage.isElementVisible('@action-print'))) { throw new Error(`Print button is invisible`); } + } else { + if (m.signature) { + if (sigBadgeContent !== m.signature) { + t.log(`found sig content:${sigBadgeContent}`); + throw new Error(`pgp_block_verify_decrypted_content:missing expected signature content:${m.signature}\nactual sig content:${sigBadgeContent}`); + } + } else { + // some badge still has to be present + expect(sigBadgeContent).to.be.ok; + } + if (m.encryption) { + if (encBadgeContent !== m.encryption) { + t.log(`found enc content:${encBadgeContent}`); + throw new Error(`pgp_block_verify_decrypted_content:missing expected encryption content:${m.encryption}`); + } + } else { + // some badge still has to be present + expect(encBadgeContent).to.be.ok; + } } }; } From e202c16df14d88e53aab3cd5479b7186513dadbf Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sun, 23 Apr 2023 17:13:17 +0100 Subject: [PATCH 018/147] simplify tests --- test/source/tests/decrypt.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index a9afb7eda02..a43c4fe9525 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -1603,8 +1603,6 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { params, content: [expectedContent], - encryption: '', - signature: '', error: 'decrypt error', }); }) @@ -1698,8 +1696,6 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { params, content: [], - encryption: '', - signature: '', error: 'parse error', }); }) From 7d6aa45a52b6fb27a77a957ac0b14f5fb0a0ce06 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sun, 23 Apr 2023 17:14:30 +0100 Subject: [PATCH 019/147] fix test --- test/source/tests/gmail.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/source/tests/gmail.ts b/test/source/tests/gmail.ts index 799b5738e84..2d962db3435 100644 --- a/test/source/tests/gmail.ts +++ b/test/source/tests/gmail.ts @@ -236,7 +236,7 @@ export const defineGmailTests = (testVariant: TestVariant, testWithBrowser: Test expect(pgpBlockUrls.length).to.equal(1); 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 url = pgpBlockUrls[0].split('/chrome/elements/pgp_render_block.htm')[1]; await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { params: url, content: ['1234'], From e0197ab88ec456de2753d58aa6dc62fc19e626f8 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 26 Apr 2023 18:01:19 +0100 Subject: [PATCH 020/147] test fixes --- extension/js/common/xss-safe-factory.ts | 6 ++++-- .../webmail/gmail-element-replacer.ts | 2 +- test/source/tests/gmail.ts | 14 ++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/extension/js/common/xss-safe-factory.ts b/extension/js/common/xss-safe-factory.ts index 79411ade2d2..4d6b5285a18 100644 --- a/extension/js/common/xss-safe-factory.ts +++ b/extension/js/common/xss-safe-factory.ts @@ -248,9 +248,11 @@ export class XssSafeFactory { return this.iframe(this.srcPgpBlockIframe(armored, msgId, isOutgoing, sender, signature), ['pgp_block', type]) + this.hideGmailNewMsgInThreadNotification; }; - public embeddedRenderMsg = () => { + public embeddedRenderMsg = ( + type: MsgBlockType // for diagnostic purposes + ) => { const { frameId, frameSrc } = this.srcPgpRenderBlockIframe(); - return { frameId, frameHtml: this.iframe(frameSrc, ['pgp_block']) + this.hideGmailNewMsgInThreadNotification }; + return { frameId, frameHtml: this.iframe(frameSrc, ['pgp_block', type]) + this.hideGmailNewMsgInThreadNotification }; }; public embeddedPubkey = (armoredPubkey: string, isOutgoing?: boolean) => { diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index 648a0870212..2d203a3ee81 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -600,7 +600,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { return await this.renderBackupFromFile(a, attachmentsContainerInner, msgElReference.msgEl); } else if (treatAs === 'signature') { // todo: generate frameId here, prevent frameId duplicates? - const { frameId, frameHtml: embeddedSignedMsgXssSafe } = this.factory.embeddedRenderMsg(); + const { frameId, frameHtml: embeddedSignedMsgXssSafe } = this.factory.embeddedRenderMsg('signedMsg'); msgElReference.msgEl = this.updateMsgBodyEl_DANGEROUSLY(msgElReference.msgEl, 'set', embeddedSignedMsgXssSafe); // xss-safe-factory const frameWindow = XssSafeFactory.getWindowOfEmbeddedMsg(frameId); if (frameWindow) { diff --git a/test/source/tests/gmail.ts b/test/source/tests/gmail.ts index 2d962db3435..a863b839dff 100644 --- a/test/source/tests/gmail.ts +++ b/test/source/tests/gmail.ts @@ -202,14 +202,13 @@ export const defineGmailTests = (testVariant: TestVariant, testWithBrowser: Test const gmailPage = await openGmailPage(t, browser); await gotoGmailPage(gmailPage, '/FMfcgzGkbDZKPJrNLplXZhKfWwtgjrXt'); // validate pgp_block.htm is rendered - const pgpBlockUrls = await gmailPage.getFramesUrls(['/chrome/elements/pgp_block.htm'], { + const pgpBlockUrls = await gmailPage.getFramesUrls(['/chrome/elements/pgp_render_block.htm'], { sleep: 10, appearIn: 25, }); expect(pgpBlockUrls.length).to.equal(1); - const url = pgpBlockUrls[0].split('/chrome/elements/pgp_block.htm')[1]; - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - params: url, + const pgpBlockFrame = await gmailPage.getFrame([pgpBlockUrls[0]]); + await BrowserRecipe.pgpBlockCheck(t, pgpBlockFrame, { content: ['1234'], encryption: 'not encrypted', signature: 'signed', @@ -229,16 +228,15 @@ export const defineGmailTests = (testVariant: TestVariant, testWithBrowser: Test const gmailPage = await openGmailPage(t, browser); await gotoGmailPage(gmailPage, '/FMfcgzGkbDZKPKzSnGtGKZrPZSbTBNnB'); // validate pgp_block.htm is rendered - const pgpBlockUrls = await gmailPage.getFramesUrls(['/chrome/elements/pgp_block.htm'], { + const pgpBlockUrls = await gmailPage.getFramesUrls(['/chrome/elements/pgp_render_block.htm'], { sleep: 10, appearIn: 25, }); expect(pgpBlockUrls.length).to.equal(1); await testMinimumElementHeight(gmailPage, '.pgp_block.signedMsg', 80); await testMinimumElementHeight(gmailPage, '.pgp_block.publicKey', 120); - const url = pgpBlockUrls[0].split('/chrome/elements/pgp_render_block.htm')[1]; - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - params: url, + const pgpBlockFrame = await gmailPage.getFrame([pgpBlockUrls[0]]); + await BrowserRecipe.pgpBlockCheck(t, pgpBlockFrame, { content: ['1234'], encryption: 'not encrypted', signature: 'signed', From 4f44474ad0406ca213308bc9daf857d2c28c3740 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 28 Apr 2023 19:41:11 +0100 Subject: [PATCH 021/147] encrypted message relay rendering, inner attachments, pubkeys inside encrypted attachments --- extension/chrome/dev/export.ts | 2 +- extension/chrome/elements/attachment.ts | 26 +++---- .../chrome/elements/attachment_preview.ts | 4 +- .../compose-modules/compose-quote-module.ts | 46 ++++++------ .../chrome/elements/pgp_base_block_view.ts | 9 ++- extension/chrome/elements/pgp_block.ts | 11 ++- .../pgp-block-attachmens-module.ts | 4 +- .../chrome/elements/pgp_render_block.htm | 1 + extension/chrome/elements/pgp_render_block.ts | 13 +++- .../inbox-active-thread-module.ts | 2 +- .../api/email-provider/gmail/gmail-parser.ts | 6 +- .../common/api/email-provider/gmail/gmail.ts | 4 +- extension/js/common/core/attachment.ts | 72 +++++++++++-------- extension/js/common/core/mime.ts | 9 ++- extension/js/common/message-renderer.ts | 64 ++++++++++++----- extension/js/common/render-interface.ts | 3 + extension/js/common/render-message.ts | 6 ++ extension/js/common/render-relay.ts | 6 ++ .../webmail/gmail-element-replacer.ts | 71 +++++++++++++----- .../webmail/setup-webmail-content-script.ts | 10 --- test/source/tests/gmail.ts | 11 +-- 21 files changed, 243 insertions(+), 137 deletions(-) diff --git a/extension/chrome/dev/export.ts b/extension/chrome/dev/export.ts index 5f25164f562..a232bd3b1b3 100644 --- a/extension/chrome/dev/export.ts +++ b/extension/chrome/dev/export.ts @@ -87,7 +87,7 @@ Catch.try(async () => { const fetchableAttachments: Attachment[] = []; const skippedAttachments: Attachment[] = []; for (const msg of messages) { - for (const attachment of GmailParser.findAttachments(msg)) { + for (const attachment of GmailParser.findAttachments(msg, msg.id)) { if (attachment.length > 1024 * 1024 * 7) { // over 7 mb - attachment too big skippedAttachments.push( diff --git a/extension/chrome/elements/attachment.ts b/extension/chrome/elements/attachment.ts index e2233530445..6ca35b0f500 100644 --- a/extension/chrome/elements/attachment.ts +++ b/extension/chrome/elements/attachment.ts @@ -8,7 +8,7 @@ import { PromiseCancellation, Str, Url } from '../../js/common/core/common.js'; import { Api } from '../../js/common/api/shared/api.js'; import { ApiErr } from '../../js/common/api/shared/api-error.js'; import { Assert } from '../../js/common/assert.js'; -import { Attachment } from '../../js/common/core/attachment.js'; +import { Attachment, AttachmentId } from '../../js/common/core/attachment.js'; import { Browser } from '../../js/common/browser/browser.js'; import { Catch } from '../../js/common/platform/catch.js'; import { Gmail } from '../../js/common/api/email-provider/gmail/gmail.js'; @@ -32,10 +32,8 @@ export class AttachmentDownloadView extends View { protected readonly isEncrypted: boolean; protected readonly errorDetailsOpened: boolean; protected readonly type: string | undefined; - protected readonly msgId: string | undefined; - protected readonly id: string | undefined; protected readonly name: string | undefined; - protected readonly url: string | undefined; + protected readonly attachmentId: AttachmentId; protected readonly gmail: Gmail; protected attachment!: Attachment; protected ppChangedPromiseCancellation: PromiseCancellation = { cancel: false }; @@ -73,11 +71,17 @@ export class AttachmentDownloadView extends View { this.errorDetailsOpened = uncheckedUrlParams.errorDetailsOpened === true; this.size = uncheckedUrlParams.size ? parseInt(String(uncheckedUrlParams.size)) : undefined; this.type = Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'type'); - this.msgId = Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'msgId'); - this.id = Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'attachmentId'); this.name = Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'name'); // url contains either actual url of remote content or objectUrl for direct content, either way needs to be downloaded - this.url = Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'url'); + const url = Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'url'); + if (url) { + this.attachmentId = { url }; + } else { + this.attachmentId = { + msgId: Assert.urlParamRequire.string(uncheckedUrlParams, 'msgId'), + id: Assert.urlParamRequire.string(uncheckedUrlParams, 'attachmentId'), + }; + } this.gmail = new Gmail(this.acctEmail); } @@ -91,11 +95,9 @@ export class AttachmentDownloadView extends View { this.fesUrl = storage.fesUrl; try { this.attachment = new Attachment({ + ...this.attachmentId, name: this.origNameBasedOnFilename, type: this.type, - msgId: this.msgId, - id: this.id, - url: this.url, }); } catch (e) { Catch.reportErr(e); @@ -107,9 +109,9 @@ export class AttachmentDownloadView extends View { this.renderHeader(); $('#name').attr('title', this.name || ''); $('img#file-format').attr('src', this.getFileIconSrc()); - if (!this.size && this.url) { + if (!this.size && 'url' in this.attachmentId) { // download url of a file that has an unknown size - this.getUrlFileSize(this.url) + this.getUrlFileSize(this.attachmentId.url) .then(fileSize => { if (typeof fileSize !== 'undefined') { this.size = fileSize; diff --git a/extension/chrome/elements/attachment_preview.ts b/extension/chrome/elements/attachment_preview.ts index af687abbfff..446e61d7713 100644 --- a/extension/chrome/elements/attachment_preview.ts +++ b/extension/chrome/elements/attachment_preview.ts @@ -36,11 +36,9 @@ View.run( try { Xss.sanitizeRender(this.attachmentPreviewContainer, `${Ui.spinner('green', 'large_spinner')}`); this.attachment = new Attachment({ + ...this.attachmentId, name: this.origNameBasedOnFilename, type: this.type, - msgId: this.msgId, - id: this.id, - url: this.url, }); await this.downloadDataIfNeeded(); const result = this.isEncrypted ? await this.decrypt() : this.attachment.getData(); diff --git a/extension/chrome/elements/compose-modules/compose-quote-module.ts b/extension/chrome/elements/compose-modules/compose-quote-module.ts index 442ca3284ca..823860ca79a 100644 --- a/extension/chrome/elements/compose-modules/compose-quote-module.ts +++ b/extension/chrome/elements/compose-modules/compose-quote-module.ts @@ -123,29 +123,31 @@ export class ComposeQuoteModule extends ViewModule { decryptedAndFormatedContent.push(Xss.htmlUnescape(htmlParsed)); } else if (block.type === 'plainHtml') { decryptedAndFormatedContent.push(Xss.htmlUnescape(Xss.htmlSanitizeAndStripAllTags(stringContent, '\n', false))); - } else if (['encryptedAttachment', 'decryptedAttachment', 'plainAttachment'].includes(block.type)) { - if (block.attachmentMeta?.data) { - 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, - verificationPubs: [], // todo: #4158 signature verification of attachments - }); - if (result.success) { - attachmentMeta = { content: result.content, filename: result.filename }; - } - } else { - attachmentMeta = { - content: Buf.fromUint8(block.attachmentMeta.data), - filename: block.attachmentMeta.name, - }; - } - if (attachmentMeta) { - const file = new File([attachmentMeta.content], attachmentMeta.filename || ''); - decryptedFiles.push(file); + } else if ( + block.attachmentMeta && + 'data' in block.attachmentMeta && + ['encryptedAttachment', 'decryptedAttachment', 'plainAttachment'].includes(block.type) + ) { + 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, + verificationPubs: [], // todo: #4158 signature verification of attachments + }); + if (result.success) { + attachmentMeta = { content: result.content, filename: result.filename }; } + } else { + attachmentMeta = { + content: Buf.fromUint8(block.attachmentMeta.data), + filename: block.attachmentMeta.name, + }; + } + if (attachmentMeta) { + const file = new File([attachmentMeta.content], attachmentMeta.filename || ''); + decryptedFiles.push(file); } } else { decryptedAndFormatedContent.push(stringContent); diff --git a/extension/chrome/elements/pgp_base_block_view.ts b/extension/chrome/elements/pgp_base_block_view.ts index b2ddbf1d80d..375d54c2820 100644 --- a/extension/chrome/elements/pgp_base_block_view.ts +++ b/extension/chrome/elements/pgp_base_block_view.ts @@ -3,16 +3,23 @@ 'use strict'; import { View } from '../../js/common/view.js'; +import { PgpBlockViewAttachmentsModule } from './pgp_block_modules/pgp-block-attachmens-module.js'; import { PgpBlockViewQuoteModule } from './pgp_block_modules/pgp-block-quote-module.js'; import { PgpBlockViewRenderModule } from './pgp_block_modules/pgp-block-render-module.js'; export abstract class PgpBaseBlockView extends View { public readonly quoteModule: PgpBlockViewQuoteModule; public readonly renderModule: PgpBlockViewRenderModule; + public readonly attachmentsModule: PgpBlockViewAttachmentsModule; - public constructor(public readonly parentTabId: string, public readonly frameId: string) { + public constructor( + public readonly parentTabId: string, + public readonly frameId: string, + public readonly acctEmail: string // needed for attachment decryption, probably should be refactored out + ) { super(); this.quoteModule = new PgpBlockViewQuoteModule(this); this.renderModule = new PgpBlockViewRenderModule(this); + this.attachmentsModule = new PgpBlockViewAttachmentsModule(this); } } diff --git a/extension/chrome/elements/pgp_block.ts b/extension/chrome/elements/pgp_block.ts index 1f6d311d18c..36dfbc401b7 100644 --- a/extension/chrome/elements/pgp_block.ts +++ b/extension/chrome/elements/pgp_block.ts @@ -7,7 +7,6 @@ import { Assert } from '../../js/common/assert.js'; import { Buf } from '../../js/common/core/buf.js'; import { Gmail } from '../../js/common/api/email-provider/gmail/gmail.js'; import { Lang } from '../../js/common/lang.js'; -import { PgpBlockViewAttachmentsModule } from './pgp_block_modules/pgp-block-attachmens-module.js'; import { PgpBlockViewDecryptModule } from './pgp_block_modules/pgp-block-decrypt-module.js'; import { PgpBlockViewErrorModule } from './pgp_block_modules/pgp-block-error-module.js'; import { PgpBlockViewSignatureModule } from './pgp_block_modules/pgp-block-signature-module.js'; @@ -22,7 +21,6 @@ import { PgpBaseBlockView } from './pgp_base_block_view.js'; import { PgpBlockViewPrintModule } from './pgp_block_modules/pgp-block-print-module.js'; export class PgpBlockView extends PgpBaseBlockView { - public readonly acctEmail: string; public readonly isOutgoing: boolean; public readonly senderEmail: string; public readonly msgId: string | undefined; @@ -37,7 +35,6 @@ export class PgpBlockView extends PgpBaseBlockView { public pubLookup!: PubLookup; public readonly debug: boolean; - public readonly attachmentsModule: PgpBlockViewAttachmentsModule; public readonly signatureModule: PgpBlockViewSignatureModule; public readonly errorModule: PgpBlockViewErrorModule; public readonly printModule: PgpBlockViewPrintModule; @@ -48,8 +45,11 @@ export class PgpBlockView extends PgpBaseBlockView { public constructor() { Ui.event.protect(); const uncheckedUrlParams = Url.parse(['acctEmail', 'frameId', 'message', 'parentTabId', 'msgId', 'isOutgoing', 'senderEmail', 'signature', 'debug']); - super(Assert.urlParamRequire.string(uncheckedUrlParams, 'parentTabId'), Assert.urlParamRequire.string(uncheckedUrlParams, 'frameId')); - this.acctEmail = Assert.urlParamRequire.string(uncheckedUrlParams, 'acctEmail'); + super( + Assert.urlParamRequire.string(uncheckedUrlParams, 'parentTabId'), + Assert.urlParamRequire.string(uncheckedUrlParams, 'frameId'), + Assert.urlParamRequire.string(uncheckedUrlParams, 'acctEmail') + ); this.isOutgoing = uncheckedUrlParams.isOutgoing === true; this.debug = uncheckedUrlParams.debug === true; const senderEmail = Assert.urlParamRequire.string(uncheckedUrlParams, 'senderEmail'); @@ -66,7 +66,6 @@ export class PgpBlockView extends PgpBaseBlockView { } this.gmail = new Gmail(this.acctEmail); // modules - this.attachmentsModule = new PgpBlockViewAttachmentsModule(this); this.signatureModule = new PgpBlockViewSignatureModule(this); this.errorModule = new PgpBlockViewErrorModule(this); this.printModule = new PgpBlockViewPrintModule(this); 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 bc71a93fc78..800283bf425 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 @@ -6,7 +6,7 @@ import { Api } from '../../../js/common/api/shared/api.js'; import { Attachment } from '../../../js/common/core/attachment.js'; import { Browser } from '../../../js/common/browser/browser.js'; import { BrowserMsg } from '../../../js/common/browser/browser-msg.js'; -import { PgpBlockView } from '../pgp_block'; +import { PgpBaseBlockView } from '../pgp_base_block_view.js'; import { CommonHandlers, 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'; @@ -19,7 +19,7 @@ declare const filesize: { filesize: Function }; // eslint-disable-line @typescri export class PgpBlockViewAttachmentsModule { public includedAttachments: Attachment[] = []; - public constructor(private view: PgpBlockView) {} + public constructor(private view: PgpBaseBlockView) {} public getParentTabId = () => { return this.view.parentTabId; diff --git a/extension/chrome/elements/pgp_render_block.htm b/extension/chrome/elements/pgp_render_block.htm index b4a4defe2d5..c6659042175 100644 --- a/extension/chrome/elements/pgp_render_block.htm +++ b/extension/chrome/elements/pgp_render_block.htm @@ -37,6 +37,7 @@ + diff --git a/extension/chrome/elements/pgp_render_block.ts b/extension/chrome/elements/pgp_render_block.ts index 9e99bff856f..bff4ec8f725 100644 --- a/extension/chrome/elements/pgp_render_block.ts +++ b/extension/chrome/elements/pgp_render_block.ts @@ -8,14 +8,19 @@ import { Ui } from '../../js/common/browser/ui.js'; import { View } from '../../js/common/view.js'; import { PgpBaseBlockView } from './pgp_base_block_view.js'; import { RenderMessage } from '../../js/common/render-message.js'; +import { Attachment } from '../../js/common/core/attachment.js'; export class PgpRenderBlockView extends PgpBaseBlockView { public readonly debug: boolean; public constructor() { Ui.event.protect(); - const uncheckedUrlParams = Url.parse(['frameId', 'parentTabId', 'debug']); - super(Assert.urlParamRequire.string(uncheckedUrlParams, 'parentTabId'), Assert.urlParamRequire.string(uncheckedUrlParams, 'frameId')); + const uncheckedUrlParams = Url.parse(['frameId', 'parentTabId', 'debug', 'acctEmail']); + super( + Assert.urlParamRequire.string(uncheckedUrlParams, 'parentTabId'), + Assert.urlParamRequire.string(uncheckedUrlParams, 'frameId'), + Assert.urlParamRequire.string(uncheckedUrlParams, 'acctEmail') + ); this.debug = uncheckedUrlParams.debug === true; window.addEventListener('message', this.handleMessage, true); // todo: capture? window.addEventListener('load', () => window.parent.postMessage({ readyToReceive: this.frameId }, '*')); @@ -61,6 +66,10 @@ export class PgpRenderBlockView extends PgpBaseBlockView { if (data?.setTestState) { Ui.setTestState(data.setTestState); } + if (data?.renderInnerAttachments) { + const attachments = data.renderInnerAttachments.attachments.map(Attachment.fromTransferableAttachment); + this.attachmentsModule.renderInnerAttachments(attachments, data.renderInnerAttachments.isEncrypted); + } }; } diff --git a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts index ea9ea417a4c..1d99dae71f4 100644 --- a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts +++ b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts @@ -166,7 +166,7 @@ export class InboxActiveThreadModule extends ViewModule { private exportMsgForDebug = async (msgId: string) => { const full = await this.view.gmail.msgGet(msgId, 'full'); const raw = await this.view.gmail.msgGet(msgId, 'raw'); - const existingAttachments = GmailParser.findAttachments(full); + const existingAttachments = GmailParser.findAttachments(full, full.id); await this.view.gmail.fetchAttachments(existingAttachments); this.redactExportMsgHeaders(full); this.redactExportMsgHeaders(raw); diff --git a/extension/js/common/api/email-provider/gmail/gmail-parser.ts b/extension/js/common/api/email-provider/gmail/gmail-parser.ts index 45d5b487ceb..59f22da9245 100644 --- a/extension/js/common/api/email-provider/gmail/gmail-parser.ts +++ b/extension/js/common/api/email-provider/gmail/gmail-parser.ts @@ -141,14 +141,14 @@ export class GmailParser { public static findAttachments = ( msgOrPayloadOrPart: GmailRes.GmailMsg | GmailRes.GmailMsg$payload | GmailRes.GmailMsg$payload$part, + internalMsgId: string, internalResults: Attachment[] = [], - internalMsgId?: string, { pgpEncryptedIndex }: { pgpEncryptedIndex?: number } = {} ) => { if (msgOrPayloadOrPart.hasOwnProperty('payload')) { internalMsgId = (msgOrPayloadOrPart as GmailRes.GmailMsg).id; // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - GmailParser.findAttachments((msgOrPayloadOrPart as GmailRes.GmailMsg).payload!, internalResults, internalMsgId); + GmailParser.findAttachments((msgOrPayloadOrPart as GmailRes.GmailMsg).payload!, internalMsgId, internalResults); } if (msgOrPayloadOrPart.hasOwnProperty('parts')) { const payload = msgOrPayloadOrPart as GmailRes.GmailMsg$payload; @@ -159,7 +159,7 @@ export class GmailParser { parts.length === 2 && contentType?.value?.startsWith('multipart/encrypted;') && contentType.value.includes('protocol="application/pgp-encrypted"') ); for (const [i, part] of parts.entries()) { - GmailParser.findAttachments(part, internalResults, internalMsgId, { + GmailParser.findAttachments(part, internalMsgId, internalResults, { pgpEncryptedIndex: pgpEncrypted ? i : undefined, }); } diff --git a/extension/js/common/api/email-provider/gmail/gmail.ts b/extension/js/common/api/email-provider/gmail/gmail.ts index 75b8bc998b8..991567999f7 100644 --- a/extension/js/common/api/email-provider/gmail/gmail.ts +++ b/extension/js/common/api/email-provider/gmail/gmail.ts @@ -325,7 +325,7 @@ export class Gmail extends EmailProviderApi implements EmailProviderInterface { const subject = gmailMsg.payload ? GmailParser.findHeader(gmailMsg.payload, 'subject') : undefined; if (format === 'full') { const bodies = GmailParser.findBodies(gmailMsg); - const attachments = GmailParser.findAttachments(gmailMsg); + const attachments = GmailParser.findAttachments(gmailMsg, gmailMsg.id); const textBody = Buf.fromBase64UrlStr(bodies['text/plain'] || '').toUtfStr(); const fromTextBody = PgpArmor.clip(textBody); if (fromTextBody) { @@ -392,7 +392,7 @@ export class Gmail extends EmailProviderApi implements EmailProviderInterface { const msgs = await this.msgsGet(msgIds, 'full'); const attachments: Attachment[] = []; for (const msg of msgs) { - attachments.push(...GmailParser.findAttachments(msg)); + attachments.push(...GmailParser.findAttachments(msg, msg.id)); } await this.fetchAttachments(attachments); const { keys: foundBackupKeys } = await KeyUtil.readMany(Buf.fromUtfStr(attachments.map(a => a.getData().toUtfStr()).join('\n'))); diff --git a/extension/js/common/core/attachment.ts b/extension/js/common/core/attachment.ts index 74c43324d9e..2cde5502063 100644 --- a/extension/js/common/core/attachment.ts +++ b/extension/js/common/core/attachment.ts @@ -17,23 +17,23 @@ export type Attachment$treatAs = | 'needChunk' | 'maybePgp'; type ContentTransferEncoding = '7bit' | 'quoted-printable' | 'base64'; -export type AttachmentMeta = { - data?: Uint8Array; - type?: string; - name?: string; +export type AttachmentId = { id: string; msgId: string } | { url: string }; +export type AttachmentProperties = { length?: number; - url?: string; - inline?: boolean; - id?: string; - msgId?: string; + name?: string; + type?: string; treatAs?: Attachment$treatAs; + inline?: boolean; cid?: string; contentDescription?: string; contentTransferEncoding?: ContentTransferEncoding; }; +export type AttachmentMeta = (AttachmentId | { data: Uint8Array }) & AttachmentProperties; export type FcAttachmentLinkData = { name: string; type: string; size: number }; +export type TransferableAttachment = (AttachmentId | { data: /* base64 see #2587 */ string }) & AttachmentProperties; + export class Attachment { public static readonly webmailNamePattern = /^(((cryptup|flowcrypt)-backup-[a-z0-9]+\.(key|asc))|(.+\.pgp)|(.+\.gpg)|(.+\.asc)|(noname)|(message)|(PGPMIME version identification)|(ATT[0-9]{5})|())$/m; @@ -53,29 +53,23 @@ export class Attachment { private bytes: Uint8Array | undefined; private treatAsValue: Attachment$treatAs | undefined; // this field is to disable on-the-fly detection by this.treatAs() - public constructor({ data, type, name, length, url, inline, id, msgId, treatAs, cid, contentDescription, contentTransferEncoding }: AttachmentMeta) { - if (typeof data === 'undefined' && typeof url === 'undefined' && typeof id === 'undefined') { - throw new Error('Attachment: one of data|url|id has to be set'); - } - if (id && !msgId) { - throw new Error('Attachment: if id is set, msgId must be set too'); - } - if (data) { - this.bytes = data; - this.length = data.length; + public constructor(attachmentMeta: AttachmentMeta) { + if ('data' in attachmentMeta) { + this.bytes = attachmentMeta.data; + this.length = attachmentMeta.data.length; } else { - this.length = Number(length); + this.length = Number(attachmentMeta.length); } - this.name = name || ''; - this.type = type || 'application/octet-stream'; - this.url = url || undefined; - this.inline = !!inline; - this.id = id || undefined; - this.msgId = msgId || undefined; - this.treatAsValue = treatAs || undefined; - this.cid = cid || undefined; - this.contentDescription = contentDescription || undefined; - this.contentTransferEncoding = contentTransferEncoding || undefined; + this.name = attachmentMeta.name || ''; + this.type = attachmentMeta.type || 'application/octet-stream'; + this.url = 'url' in attachmentMeta ? attachmentMeta.url : undefined; + this.inline = !!attachmentMeta.inline; + this.id = 'id' in attachmentMeta ? attachmentMeta.id : undefined; + this.msgId = 'msgId' in attachmentMeta ? attachmentMeta.msgId : undefined; + this.treatAsValue = attachmentMeta.treatAs; + this.cid = attachmentMeta.cid; + this.contentDescription = attachmentMeta.contentDescription; + this.contentTransferEncoding = attachmentMeta.contentTransferEncoding; } public static treatAsForPgpEncryptedAttachments = (mimeType: string | undefined, pgpEncryptedIndex: number | undefined) => { @@ -111,6 +105,26 @@ export class Attachment { return `f_${Str.sloppyRandom(30)}@flowcrypt`; }; + public static toTransferableAttachment = (attachmentMeta: AttachmentMeta): TransferableAttachment => { + return 'data' in attachmentMeta + ? { + ...attachmentMeta, + data: Buf.fromUint8(attachmentMeta.data).toBase64Str(), // should we better convert to url? + } + : attachmentMeta; + }; + + public static fromTransferableAttachment = (t: TransferableAttachment): Attachment => { + return new Attachment( + 'data' in t + ? { + ...t, + data: Buf.fromBase64Str(t.data), + } + : t + ); + }; + /** @deprecated attachment and pgp_block frames won't be performing this analysis * */ diff --git a/extension/js/common/core/mime.ts b/extension/js/common/core/mime.ts index e84ba150e44..197eec3c4ca 100644 --- a/extension/js/common/core/mime.ts +++ b/extension/js/common/core/mime.ts @@ -120,10 +120,15 @@ export class Mime { block: MsgBlock.fromAttachment('encryptedAttachment', '', { name: file.name, type: file.type, + length: file.getData().length, + data: file.getData(), + /* + todo: do we need this? length: file.hasData() ? file.getData().length : undefined, data: file.hasData() ? file.getData() : undefined, - id: file.id, // todo: - cid: file.cid, // todo: + id: file.id, + msgId: file.id, + cid: file.cid, */ }), file, }); diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index a77c44fa352..ca54753d3ef 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -3,10 +3,10 @@ 'use strict'; import { GmailParser, GmailRes } from './api/email-provider/gmail/gmail-parser.js'; -import { Attachment } from './core/attachment.js'; +import { Attachment, TransferableAttachment } from './core/attachment.js'; import { Buf } from './core/buf.js'; import { CID_PATTERN, Dict, Str, Value } from './core/common.js'; -import { KeyUtil } from './core/crypto/key.js'; +import { KeyInfoWithIdentityAndOptionalPp, KeyUtil } from './core/crypto/key.js'; import { MsgUtil, VerifyRes } from './core/crypto/pgp/msg-util.js'; import { Mime, MimeContent, MimeProccesedMsg } from './core/mime.js'; import { MsgBlockParser } from './core/msg-block-parser.js'; @@ -38,14 +38,11 @@ export class MessageRenderer { const sigText = parsedSignature.replace('\n=3D', '\n='); const encryptedData = parsed.rawSignedContent; try { - const parsedPubs = (await ContactStore.getOneWithAllPubkeys(undefined, signerEmail))?.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)); + const verificationPubs = await MessageRenderer.getVerificationPubs(signerEmail); const verify = async (verificationPubs: string[]) => await MsgUtil.verifyDetached({ plaintext: encryptedData, sigText, verificationPubs }); const signatureResult = await verify(verificationPubs); // todo: retry verification with looked up keys? - await MessageRenderer.decideDecryptedContentFormattingAndRender(encryptedData, false, signatureResult, renderModule); + return await MessageRenderer.decideDecryptedContentFormattingAndRender(encryptedData, false, signatureResult, renderModule); } catch (e) { console.log(e); } @@ -56,6 +53,28 @@ export class MessageRenderer { parsed.rawSignedContent || parsed.text || parsed.html || mimeMsg.toUtfStr(), 'parse error' ); */ + return {}; + }; + + public static renderEncryptedMessage = async ( + encryptedData: string | Uint8Array, + kisWithPp: KeyInfoWithIdentityAndOptionalPp[], + renderModule: RenderInterface, + signerEmail: string + ) => { + const verificationPubs = await MessageRenderer.getVerificationPubs(signerEmail); + const decryptResult = await MsgUtil.decryptMessage({ kisWithPp, encryptedData, verificationPubs }); + if (decryptResult.success) { + return await MessageRenderer.decideDecryptedContentFormattingAndRender( + decryptResult.content, + !!decryptResult.isEncrypted, + decryptResult.signature, + renderModule + ); + } else { + // todo: + } + return {}; }; public static renderMsg = ( @@ -92,7 +111,7 @@ export class MessageRenderer { public static reconstructMimeContent = (gmailMsg: GmailRes.GmailMsg): MimeContent => { const bodies = GmailParser.findBodies(gmailMsg); - const attachments = GmailParser.findAttachments(gmailMsg); + const attachments = GmailParser.findAttachments(gmailMsg, gmailMsg.id); const text = bodies['text/plain'] ? Buf.fromBase64UrlStr(bodies['text/plain']).toUtfStr() : undefined; // todo: do we need to strip? const html = bodies['text/html'] ? Xss.htmlSanitizeAndStripAllTags(Buf.fromBase64UrlStr(bodies['text/html']).toUtfStr(), '\n') : undefined; @@ -164,7 +183,7 @@ export class MessageRenderer { sigResult: VerifyRes | undefined, renderModule: RenderInterface, plainSubject?: string - ) => { + ): Promise<{ publicKeys?: string[] }> => { if (isEncrypted) { renderModule.renderEncryptionStatus('encrypted'); renderModule.setFrameColor('green'); @@ -173,7 +192,7 @@ export class MessageRenderer { renderModule.setFrameColor('gray'); } const publicKeys: string[] = []; - let renderableAttachments: Attachment[] = []; + let renderableAttachments: TransferableAttachment[] = []; let decryptedContent: string | undefined; let isHtml = false; // todo - replace with MsgBlockParser.fmtDecryptedAsSanitizedHtmlBlocks, then the extract/strip methods could be private? @@ -185,7 +204,7 @@ export class MessageRenderer { decryptedContent = MsgBlockParser.stripPublicKeys(decryptedContent, publicKeys); if (fcAttachmentBlocks.length) { renderableAttachments = fcAttachmentBlocks.map( - attachmentBlock => new Attachment(attachmentBlock.attachmentMeta!) // eslint-disable-line @typescript-eslint/no-non-null-assertion + attachmentBlock => Attachment.toTransferableAttachment(attachmentBlock.attachmentMeta!) // eslint-disable-line @typescript-eslint/no-non-null-assertion ); } } else { @@ -212,20 +231,26 @@ export class MessageRenderer { if (attachment.isPublicKey()) { publicKeys.push(attachment.getData().toUtfStr()); } else if (!inlineCIDAttachments.some(inlineAttachment => inlineAttachment.cid === attachment.cid)) { - renderableAttachments.push(attachment); + renderableAttachments.push( + Attachment.toTransferableAttachment({ + name: attachment.name, + type: attachment.type, + length: attachment.getData().length, + data: attachment.getData(), + cid: attachment.cid, // todo: do we need it? + }) + ); } } } renderModule.separateQuotedContentAndRenderText(decryptedContent, isHtml); // todo: quoteModule ? MessageRenderer.renderPgpSignatureCheckResult(renderModule, sigResult); - if (isEncrypted && publicKeys.length) { - // todo: BrowserMsg.send.renderPublicKeys(this.view.parentTabId, { afterFrameId: this.view.frameId, publicKeys }); - } if (renderableAttachments.length) { - // todo: this.view.attachmentsModule.renderInnerAttachments(renderableAttachments, isEncrypted); + renderModule.renderInnerAttachments(renderableAttachments, isEncrypted); } renderModule.resizePgpBlockFrame(); renderModule.setTestState('ready'); + return isEncrypted ? { publicKeys } : {}; }; public static renderPgpSignatureCheckResult = (renderModule: RenderInterface, verifyRes: VerifyRes | undefined) => { @@ -266,4 +291,11 @@ export class MessageRenderer { renderModule.renderSignatureStatus('bad signature'); renderModule.setFrameColor('red'); // todo: in what other cases should we set the frame red? }; + + private static getVerificationPubs = async (signerEmail: string) => { + const parsedPubs = (await ContactStore.getOneWithAllPubkeys(undefined, signerEmail))?.sortedPubkeys ?? []; + // todo: we don't actually need parsed pubs here because we're going to pass them to the background page + // maybe we can have a method in ContactStore to extract armored keys + return parsedPubs.map(key => KeyUtil.armor(key.pubkey)); + }; } diff --git a/extension/js/common/render-interface.ts b/extension/js/common/render-interface.ts index 9e76a469621..51afdce165d 100644 --- a/extension/js/common/render-interface.ts +++ b/extension/js/common/render-interface.ts @@ -2,6 +2,8 @@ 'use strict'; +import { TransferableAttachment } from './core/attachment.js'; + export interface RenderInterfaceBase { resizePgpBlockFrame(): void; renderText(text: string): void; @@ -11,6 +13,7 @@ export interface RenderInterfaceBase { } export interface RenderInterface extends RenderInterfaceBase { + renderInnerAttachments(attachments: TransferableAttachment[], isEncrypted: boolean): void; setTestState(state: 'ready' | 'working' | 'waiting'): void; separateQuotedContentAndRenderText(decryptedContent: string, isHtml: boolean): void; } diff --git a/extension/js/common/render-message.ts b/extension/js/common/render-message.ts index ecbdc90efdc..00347a8f058 100644 --- a/extension/js/common/render-message.ts +++ b/extension/js/common/render-message.ts @@ -2,6 +2,8 @@ 'use strict'; +import { TransferableAttachment } from './core/attachment.js'; + export type RenderMessage = { setTestState?: 'ready' | 'working' | 'waiting'; resizePgpBlockFrame?: boolean; @@ -10,4 +12,8 @@ export type RenderMessage = { setFrameColor?: 'green' | 'gray' | 'red'; renderEncryptionStatus?: string; renderSignatureStatus?: string; + renderInnerAttachments?: { + attachments: TransferableAttachment[]; + isEncrypted: boolean; + }; }; diff --git a/extension/js/common/render-relay.ts b/extension/js/common/render-relay.ts index fc294e809e8..2252ed12659 100644 --- a/extension/js/common/render-relay.ts +++ b/extension/js/common/render-relay.ts @@ -5,9 +5,15 @@ import { RelayManagerInterface } from './relay-manager-interface.js'; import { RenderInterface } from './render-interface.js'; import { RenderMessage } from './render-message.js'; +import { TransferableAttachment } from './core/attachment.js'; export class RenderRelay implements RenderInterface { public constructor(private relayManager: RelayManagerInterface, private frameId: string) {} + + public renderInnerAttachments = async (attachments: TransferableAttachment[], isEncrypted: boolean) => { + this.relay({ renderInnerAttachments: { attachments, isEncrypted } }); + }; + public setTestState = (state: 'ready' | 'working' | 'waiting') => { this.relay({ setTestState: state }); }; diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index 2d203a3ee81..a10337c5527 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -28,8 +28,10 @@ import { Buf } from '../../common/core/buf.js'; import { MessageRenderer } from '../../common/message-renderer.js'; import { RelayManager } from '../../common/relay-manager.js'; import { Mime } from '../../common/core/mime.js'; -import { MsgUtil } from '../../common/core/crypto/pgp/msg-util.js'; +import { FormatError, MsgUtil } from '../../common/core/crypto/pgp/msg-util.js'; import { RenderInterface } from '../../common/render-interface.js'; +import { MsgBlockType } from '../../common/core/msg-block.js'; +import { KeyStore } from '../../common/platform/store/key-store.js'; type JQueryEl = JQuery; @@ -587,11 +589,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { attachmentsContainerInner.prepend(this.factory.embeddedAttachment(a, true)); // xss-safe-factory return 'replaced'; // native should be hidden, custom should appear instead } else if (treatAs === 'encryptedMsg') { - msgElReference.msgEl = /* xss-safe-factory */ this.updateMsgBodyEl_DANGEROUSLY( - msgElReference.msgEl, - 'set', - this.factory.embeddedMsg('encryptedMsg', '', msgId, false, senderEmail) - ); + this.startProcessingForMsgEl(msgElReference, 'encryptedMsg', renderModule => this.processEncryptedMessage(a, renderModule, senderEmail)); return 'hidden'; // native attachment should be hidden, the "attachment" goes to the message container } else if (treatAs === 'publicKey') { // todo - pubkey should be fetched in pgp_pubkey.js @@ -599,16 +597,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { } else if (treatAs === 'privateKey') { return await this.renderBackupFromFile(a, attachmentsContainerInner, msgElReference.msgEl); } else if (treatAs === 'signature') { - // todo: generate frameId here, prevent frameId duplicates? - const { frameId, frameHtml: embeddedSignedMsgXssSafe } = this.factory.embeddedRenderMsg('signedMsg'); - msgElReference.msgEl = this.updateMsgBodyEl_DANGEROUSLY(msgElReference.msgEl, 'set', embeddedSignedMsgXssSafe); // xss-safe-factory - const frameWindow = XssSafeFactory.getWindowOfEmbeddedMsg(frameId); - if (frameWindow) { - const renderModule = this.relayManager.createRelay(frameId, frameWindow); - this.processSignedMessage(msgId, renderModule, senderEmail).catch(Catch.reportErr); // todo: clear cached items - } else { - Catch.report('Unexpected: unable to reference a newly created message frame'); // todo: - } + this.startProcessingForMsgEl(msgElReference, 'signedMsg', renderModule => this.processSignedMessage(msgId, renderModule, senderEmail)); return 'hidden'; // native attachment should be hidden, the "attachment" goes to the message container } else { // standard file @@ -629,14 +618,62 @@ export class GmailElementReplacer implements WebmailElementReplacer { } }; + private startProcessingForMsgEl = ( + msgElReference: { msgEl: JQueryEl }, + type: MsgBlockType, // for diagnostics + cb: (renderModule: RenderInterface) => Promise<{ publicKeys?: string[] }> + ) => { + // todo: generate frameId here, prevent frameId duplicates? + const { frameId, frameHtml: embeddedSignedMsgXssSafe } = this.factory.embeddedRenderMsg(type); + msgElReference.msgEl = this.updateMsgBodyEl_DANGEROUSLY(msgElReference.msgEl, 'set', embeddedSignedMsgXssSafe); // xss-safe-factory + const frameWindow = XssSafeFactory.getWindowOfEmbeddedMsg(frameId); + if (frameWindow) { + const renderModule = this.relayManager.createRelay(frameId, frameWindow); + cb(renderModule) + .then(result => { + const appendAfter = $(`iframe#${frameId}`); + for (const armoredPubkey of result.publicKeys ?? []) { + appendAfter.after(this.factory.embeddedPubkey(armoredPubkey, false)); + } + }) + .catch(Catch.reportErr); // todo: clear cached items + } else { + Catch.report('Unexpected: unable to reference a newly created message frame'); // todo: + } + }; + private processSignedMessage = async (msgId: string, renderModule: RenderInterface, senderEmail: string) => { try { renderModule.renderText('Loading signed message...'); const raw = await this.msgGetRaw(msgId); - await MessageRenderer.renderSignedMessage(raw, renderModule, senderEmail); + return await MessageRenderer.renderSignedMessage(raw, renderModule, senderEmail); + } catch { + // todo: render error via renderModule + } + return {}; + }; + + private processEncryptedMessage = async (attachment: Attachment, renderModule: RenderInterface, senderEmail: string) => { + try { + if (!attachment.hasData()) { + // todo: common cache, load control? + renderModule.renderText('Retrieving message...'); + await this.gmail.fetchAttachments([attachment]); // todo: render progressCb + } + // todo: probaby subject isn't relevant in attachment-based decryption? + // const subject = gmailMsg.payload ? GmailParser.findHeader(gmailMsg.payload, 'subject') : undefined; + const armoredMsg = PgpArmor.clip(attachment.getData().toUtfStr()); + if (!armoredMsg) { + // todo: + throw new FormatError('Problem extracting armored message', attachment.getData().toUtfStr()); + } + renderModule.renderText('Decrypting...'); + const kisWithPp = await KeyStore.getAllWithOptionalPassPhrase(this.acctEmail); // todo: cache? + return await MessageRenderer.renderEncryptedMessage(armoredMsg, kisWithPp, renderModule, senderEmail); } catch { // todo: render error via renderModule } + return {}; }; private processGoogleDriveAttachments = async (msgId: string, msgEl: JQueryEl, attachmentsContainerInner: JQueryEl) => { diff --git a/extension/js/content_scripts/webmail/setup-webmail-content-script.ts b/extension/js/content_scripts/webmail/setup-webmail-content-script.ts index f159abc49ca..9425a40797d 100644 --- a/extension/js/content_scripts/webmail/setup-webmail-content-script.ts +++ b/extension/js/content_scripts/webmail/setup-webmail-content-script.ts @@ -199,16 +199,6 @@ export const contentScriptSetupIfVacant = async (webmailSpecific: WebmailSpecifi BrowserMsg.addListener('reinsert_reply_box', async ({ replyMsgId }: Bm.ReinsertReplyBox) => { webmailSpecific.getReplacer().reinsertReplyBox(replyMsgId); }); - BrowserMsg.addListener('render_public_keys', async ({ traverseUp, afterFrameId, publicKeys }: Bm.RenderPublicKeys) => { - const traverseUpLevels = (traverseUp as number) || 0; - let appendAfter = $(`iframe#${afterFrameId}`); - for (let i = 0; i < traverseUpLevels; i++) { - appendAfter = appendAfter.parent(); - } - for (const armoredPubkey of publicKeys) { - appendAfter.after(factory.embeddedPubkey(armoredPubkey, false)); - } - }); BrowserMsg.addListener('close_dialog', async () => { Swal.close(); }); diff --git a/test/source/tests/gmail.ts b/test/source/tests/gmail.ts index a863b839dff..5ee4bdca0fb 100644 --- a/test/source/tests/gmail.ts +++ b/test/source/tests/gmail.ts @@ -253,16 +253,11 @@ export const defineGmailTests = (testVariant: TestVariant, testWithBrowser: Test await BrowserRecipe.setUpCommonAcct(t, browser, 'ci.tests.gmail'); const gmailPage = await openGmailPage(t, browser); await gotoGmailPage(gmailPage, '/FMfcgzGkbDZKPLBqWFzbgWqCrplTQdNz'); - const pgpBlockUrls = await gmailPage.getFramesUrls(['/chrome/elements/pgp_block.htm'], { - sleep: 10, - appearIn: 25, - }); - const url = pgpBlockUrls[0].split('/chrome/elements/pgp_block.htm')[1]; - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - params: url, + const pgpBlockFrame = await gmailPage.getFrame(['pgp_render_block.htm'], { sleep: 10, timeout: 25 }); + await BrowserRecipe.pgpBlockCheck(t, pgpBlockFrame, { content: ['Encrypted Subject: [ci.test] Thunderbird html signed + encrypted', '1234'], encryption: 'encrypted', - signature: 'not signed', + signature: 'not signed', // should be 'signed'? #3944 }); await pageHasSecureReplyContainer(t, browser, gmailPage); const pubkeyPage = await gmailPage.getFrame(['/chrome/elements/pgp_pubkey.htm']); From b935a6b809ddbb2327027f6a0c6516b485af482c Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sat, 29 Apr 2023 07:03:27 +0100 Subject: [PATCH 022/147] fix tests --- test/source/tests/gmail.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/test/source/tests/gmail.ts b/test/source/tests/gmail.ts index 5ee4bdca0fb..94244832903 100644 --- a/test/source/tests/gmail.ts +++ b/test/source/tests/gmail.ts @@ -133,7 +133,7 @@ export const defineGmailTests = (testVariant: TestVariant, testWithBrowser: Test await gmailPage.waitAndClick('[aria-label^="Inbox"]'); await gmailPage.waitAndClick('[role="row"]'); // click the first message await gmailPage.waitForContent('.nH h2.hP', `Automated puppeteer test: ${subject}`); - const urls = await gmailPage.getFramesUrls(['/chrome/elements/pgp_block.htm'], { sleep: 1 }); + const urls = await gmailPage.getFramesUrls(['/chrome/elements/pgp_render_block.htm'], { sleep: 1 }); await GmailPageRecipe.deleteThread(gmailPage); expect(urls.length).to.eq(1); }) @@ -182,11 +182,10 @@ export const defineGmailTests = (testVariant: TestVariant, testWithBrowser: Test await BrowserRecipe.setUpCommonAcct(t, browser, 'ci.tests.gmail'); const gmailPage = await openGmailPage(t, browser); await gotoGmailPage(gmailPage, '/QgrcJHrtqfgLGKqwChjKsHKzZQpwRHMBqpG'); - const urls = await gmailPage.getFramesUrls(['/chrome/elements/pgp_block.htm'], { sleep: 10, appearIn: 25 }); + const urls = await gmailPage.getFramesUrls(['/chrome/elements/pgp_render_block.htm'], { sleep: 10, appearIn: 25 }); expect(urls.length).to.equal(1); - const params = urls[0].split('/chrome/elements/pgp_block.htm')[1]; - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - params, + const pgpBlockFrame = await gmailPage.getFrame(['pgp_render_block.htm']); + await BrowserRecipe.pgpBlockCheck(t, pgpBlockFrame, { content: ['test that content from msg.asc renders'], encryption: 'encrypted', signature: 'not signed', From b579ea81f4420d8e32abbf0c5880b7707a3c9f63 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sun, 30 Apr 2023 15:27:26 +0100 Subject: [PATCH 023/147] test setup for text/plain messages --- test/source/mock/google/google-data.ts | 26 +++++++++++++------ test/source/tests/decrypt.ts | 36 ++++++++++++++++---------- 2 files changed, 40 insertions(+), 22 deletions(-) diff --git a/test/source/mock/google/google-data.ts b/test/source/mock/google/google-data.ts index bd4f6e8ca61..53b91a686c4 100644 --- a/test/source/mock/google/google-data.ts +++ b/test/source/mock/google/google-data.ts @@ -224,14 +224,20 @@ export class GoogleData { const payload = (await GoogleData.withInitializedData(acct)).getMessage(msgId)!.payload!; const fromHeader = payload.headers!.find(header => header.name === 'From')!; const fromAddress = fromHeader.value!; - let htmlData = GoogleData.getHtmlDataToDisplay(payload.parts!); - if (typeof htmlData === 'undefined') { - // search inside multipart/alternative - const alternativePart = payload.parts!.find(part => part.mimeType === 'multipart/alternative'); - htmlData = GoogleData.getHtmlDataToDisplay(alternativePart!.parts!); + let htmlData: string | undefined; + if (payload.mimeType === 'text/plain') { + const textData = Buf.fromBase64Str(payload.body!.data!).toUtfStr(); + htmlData = GoogleData.htmlFromText(textData); + } else { + htmlData = GoogleData.getHtmlDataToDisplay(payload.parts!); + if (typeof htmlData === 'undefined') { + // search inside multipart/alternative + const alternativePart = payload.parts!.find(part => part.mimeType === 'multipart/alternative'); + htmlData = GoogleData.getHtmlDataToDisplay(alternativePart!.parts!); + } } - const otherParts = payload.parts!.filter(part => part.filename); - if (otherParts.length) { + const otherParts = payload.parts?.filter(part => part.filename); + if (otherParts?.length) { attachmentsBlock = `
${otherParts.length} Attachments
` + @@ -299,10 +305,14 @@ export class GoogleData { return undefined; } const textData = Buf.fromBase64Str(textPart.body.data).toUtfStr(); - return Xss.escape(textData); + return GoogleData.htmlFromText(textData); } }; + private static htmlFromText = (textData: string): string => { + return Xss.escape(textData); // this is skewed, as we should replace \r\n with
etc., but it should be good for tests + }; + public storeSentMessage = (parseResult: ParseMsgResult, id: string): string => { let bodyContentAtt: { data: string; size: number; filename?: string; id: string } | undefined; const parsedMail = parseResult.mimeMsg; diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index fd353e7fee0..54e41226c16 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -1235,7 +1235,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== }, }, }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'ci.tests.gmail'); + const { accessToken } = await BrowserRecipe.setUpCommonAcct(t, browser, 'ci.tests.gmail'); await PageRecipe.addPubkey( t, browser, @@ -1243,17 +1243,25 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== '-----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', 'sender@example.com' ); - const inboxPage = await browser.newExtensionPage(t, `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, + // todo: make sure pubkey2864E326A5BE488A isn't present in ContactStore yet + const extraAuthHeaders = { Authorization: `Bearer ${accessToken}` }; // eslint-disable-line @typescript-eslint/naming-convention + const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${threadId}`, undefined, extraAuthHeaders); + await gmailPage.waitAll('iframe', { timeout: 2 }); + const frameUrlsFromGmailPage = await gmailPage.getFramesUrls(['/chrome/elements/pgp_render_block.htm'], { sleep: 10, appearIn: 20 }); + expect(frameUrlsFromGmailPage.length).to.equal(1); + const expectedMessage = { content: ['How is my message signed?'], encryption: 'not encrypted', signature: 'signed', - }); + }; + await BrowserRecipe.pgpBlockCheck(t, await gmailPage.getFrame([frameUrlsFromGmailPage[0]]), expectedMessage); + await gmailPage.close(); + // todo: remove pubkey2864E326A5BE488A from ContactStore + const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); + await inboxPage.waitAll('iframe', { timeout: 2 }); + const urls = await inboxPage.getFramesUrls(['/chrome/elements/pgp_render_block.htm'], { sleep: 10, appearIn: 20 }); + expect(urls.length).to.equal(1); + await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame([urls[0]]), expectedMessage); }) ); @@ -1278,7 +1286,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== const extraAuthHeaders = { Authorization: `Bearer ${accessToken}` }; // eslint-disable-line @typescript-eslint/naming-convention const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/1869220e0c8f16dd`, undefined, extraAuthHeaders); await gmailPage.waitAll('iframe'); - const pgpBlock = await gmailPage.getFrame(['pgp_block.htm']); + const pgpBlock = await gmailPage.getFrame(['pgp_render_block.htm']); await BrowserRecipe.pgpBlockCheck(t, pgpBlock, { content: ['Sent with Proton Mail secure email.'], encryption: 'encrypted', @@ -1299,10 +1307,10 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== const threadId = '1869220e0c8f16dd'; let inboxPage = await browser.newExtensionInboxPage(t, acctEmail, threadId); await inboxPage.waitAll('iframe'); - expect((await inboxPage.getFramesUrls(['pgp_block.htm'])).length).to.equal(1); + expect((await inboxPage.getFramesUrls(['pgp_render_block.htm'])).length).to.equal(1); expect((await inboxPage.getFramesUrls(['pgp_pubkey.htm'])).length).to.equal(1); expect((await inboxPage.getFramesUrls(['attachment.htm'])).length).to.equal(0); // invisible - await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame(['pgp_block.htm']), { + await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame(['pgp_render_block.htm']), { content: ['Sent with Proton Mail secure email.'], encryption: 'encrypted', signature: 'could not verify signature: missing pubkey 616D596BC2065D48', @@ -1319,10 +1327,10 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== await dbPage.close(); inboxPage = await browser.newExtensionInboxPage(t, acctEmail, threadId); await inboxPage.waitAll('iframe'); - expect((await inboxPage.getFramesUrls(['pgp_block.htm'])).length).to.equal(1); + expect((await inboxPage.getFramesUrls(['pgp_render_block.htm'])).length).to.equal(1); expect((await inboxPage.getFramesUrls(['pgp_pubkey.htm'])).length).to.equal(1); expect((await inboxPage.getFramesUrls(['attachment.htm'])).length).to.equal(0); // invisible - await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame(['pgp_block.htm']), { + await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame(['pgp_render_block.htm']), { content: ['Sent with Proton Mail secure email.'], encryption: 'encrypted', signature: 'signed', From 8474dda8e67f13a1c61b237b017678ba9177768f Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sun, 30 Apr 2023 15:44:09 +0100 Subject: [PATCH 024/147] encryptedMsg from inline blocks, wire render relay to InboxActiveThreadModule --- extension/chrome/elements/pgp_render_block.ts | 3 + .../inbox-active-thread-module.ts | 14 +- extension/chrome/settings/inbox/inbox.ts | 8 + .../js/common/core/crypto/pgp/msg-util.ts | 2 +- extension/js/common/message-renderer.ts | 141 ++++++++++++++++-- extension/js/common/render-interface.ts | 1 + extension/js/common/render-message.ts | 1 + extension/js/common/render-relay.ts | 4 + extension/js/common/xss-safe-factory.ts | 15 +- .../webmail/gmail-element-replacer.ts | 38 ++--- 10 files changed, 176 insertions(+), 51 deletions(-) diff --git a/extension/chrome/elements/pgp_render_block.ts b/extension/chrome/elements/pgp_render_block.ts index bff4ec8f725..4d770d4c3c8 100644 --- a/extension/chrome/elements/pgp_render_block.ts +++ b/extension/chrome/elements/pgp_render_block.ts @@ -45,6 +45,9 @@ export class PgpRenderBlockView extends PgpBaseBlockView { if (data?.renderEncryptionStatus) { this.renderModule.renderEncryptionStatus(data.renderEncryptionStatus); } + if (data?.renderVerificationInProgress) { + $('#pgp_signature').addClass('gray_label').text('verifying signature...'); + } if (data?.renderSignatureStatus) { this.renderModule.renderSignatureStatus(data.renderSignatureStatus); // todo: "offline"->click->reload? } diff --git a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts index 1d99dae71f4..ea56330dd93 100644 --- a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts +++ b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts @@ -5,7 +5,7 @@ import { Bm, BrowserMsg } from '../../../../js/common/browser/browser-msg.js'; import { FactoryReplyParams, XssSafeFactory } from '../../../../js/common/xss-safe-factory.js'; import { GmailParser, GmailRes } from '../../../../js/common/api/email-provider/gmail/gmail-parser.js'; -import { Url, UrlParams } from '../../../../js/common/core/common.js'; +import { Str, Url, UrlParams } from '../../../../js/common/core/common.js'; import { ApiErr } from '../../../../js/common/api/shared/api-error.js'; import { BrowserMsgCommonHandlers } from '../../../../js/common/browser/browser-msg-common-handlers.js'; @@ -19,7 +19,7 @@ import { ViewModule } from '../../../../js/common/view-module.js'; import { Xss } from '../../../../js/common/platform/xss.js'; import { Browser } from '../../../../js/common/browser/browser.js'; import { Attachment } from '../../../../js/common/core/attachment.js'; -import { MsgBlock } from '../../../../js/common/core/msg-block'; +import { MsgBlock } from '../../../../js/common/core/msg-block.js'; export class InboxActiveThreadModule extends ViewModule { private threadId: string | undefined; @@ -123,7 +123,7 @@ export class InboxActiveThreadModule extends ViewModule { messageBlocks.push(block.block); } } - const { renderedXssSafe, isOutgoing } = MessageRenderer.renderMsg( + const { renderedXssSafe, isOutgoing, blocksInFrames } = MessageRenderer.renderMsg( { from, blocks: messageBlocks }, this.view.factory, this.view.showOriginal, @@ -142,6 +142,14 @@ export class InboxActiveThreadModule extends ViewModule { .join('')}
` : ''); $('.thread').append(this.wrapMsg(htmlId, r)); // xss-safe-factory + // todo: isOutgoing ? + MessageRenderer.processInlineBlocks( + this.view.relayManager, + this.view.factory, + this.view.acctEmail, + blocksInFrames, + from ? Str.parseEmail(from).email : undefined + ).catch(Catch.reportErr); if (exportBtn) { $('.action-export').on( 'click', diff --git a/extension/chrome/settings/inbox/inbox.ts b/extension/chrome/settings/inbox/inbox.ts index 5245f96602e..5e8ec2bc24d 100644 --- a/extension/chrome/settings/inbox/inbox.ts +++ b/extension/chrome/settings/inbox/inbox.ts @@ -22,6 +22,7 @@ import { WebmailCommon } from '../../../js/common/webmail.js'; import { Xss } from '../../../js/common/platform/xss.js'; import { XssSafeFactory } from '../../../js/common/xss-safe-factory.js'; import { AcctStore, AcctStoreDict } from '../../../js/common/platform/store/acct-store.js'; +import { RelayManager } from '../../../js/common/relay-manager.js'; export class InboxView extends View { public readonly inboxMenuModule: InboxMenuModule; @@ -42,6 +43,7 @@ export class InboxView extends View { public factory!: XssSafeFactory; public storage!: AcctStoreDict; public tabId!: string; + public relayManager = new RelayManager(); public constructor() { super(); @@ -57,6 +59,12 @@ export class InboxView extends View { this.inboxNotificationModule = new InboxNotificationModule(this); this.inboxActiveThreadModule = new InboxActiveThreadModule(this); this.inboxListThreadsModule = new InboxListThreadsModule(this); + window.addEventListener('message', e => { + const regex = new RegExp(`^(chrome|moz)-extension://${chrome.runtime.id}$`); + if (regex.test(e.origin) && typeof e.data?.readyToReceive === 'string') { + this.relayManager.readyToReceive(e.data.readyToReceive); + } + }); } public render = async () => { diff --git a/extension/js/common/core/crypto/pgp/msg-util.ts b/extension/js/common/core/crypto/pgp/msg-util.ts index 38c8d2466b8..3c3ce671b12 100644 --- a/extension/js/common/core/crypto/pgp/msg-util.ts +++ b/extension/js/common/core/crypto/pgp/msg-util.ts @@ -46,7 +46,7 @@ export namespace PgpMsgMethod { } export type DiagnosePubkeys = (arg: Arg.DiagnosePubkeys) => Promise; export type VerifyDetached = (arg: Arg.VerifyDetached) => Promise; - export type Decrypt = (arg: Arg.Decrypt) => Promise; + export type Decrypt = (arg: Arg.Decrypt) => Promise; export type Type = (arg: Arg.Type) => PgpMsgTypeResult; export type Encrypt = (arg: Arg.Encrypt) => Promise; export type EncryptResult = EncryptPgpResult | EncryptX509Result; diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index ca54753d3ef..2ed5791e405 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -3,18 +3,24 @@ 'use strict'; import { GmailParser, GmailRes } from './api/email-provider/gmail/gmail-parser.js'; +import { PubLookup } from './api/pub-lookup.js'; +import { ClientConfiguration } from './client-configuration.js'; import { Attachment, TransferableAttachment } from './core/attachment.js'; import { Buf } from './core/buf.js'; import { CID_PATTERN, Dict, Str, Value } from './core/common.js'; import { KeyInfoWithIdentityAndOptionalPp, KeyUtil } from './core/crypto/key.js'; -import { MsgUtil, VerifyRes } from './core/crypto/pgp/msg-util.js'; +import { DecryptResult, MsgUtil, VerifyRes } from './core/crypto/pgp/msg-util.js'; import { Mime, MimeContent, MimeProccesedMsg } from './core/mime.js'; import { MsgBlockParser } from './core/msg-block-parser.js'; import { MsgBlock } from './core/msg-block.js'; +import { Catch } from './platform/catch.js'; import { SendAsAlias } from './platform/store/acct-store.js'; import { ContactStore } from './platform/store/contact-store.js'; +import { KeyStore } from './platform/store/key-store.js'; import { Xss } from './platform/xss.js'; +import { RelayManager } from './relay-manager.js'; import { RenderInterface, RenderInterfaceBase } from './render-interface.js'; +import { saveFetchedPubkeysIfNewerThanInStorage } from './shared.js'; import { XssSafeFactory } from './xss-safe-factory.js'; import * as DOMPurify from 'dompurify'; @@ -26,7 +32,98 @@ export type AttachmentBlock = { }; export class MessageRenderer { - public static renderSignedMessage = async (raw: string, renderModule: RenderInterface, signerEmail: string) => { + public static relayAndProcess = async ( + relayManager: RelayManager, + factory: XssSafeFactory, + frameId: string, + cb: (renderModule: RenderInterface) => Promise<{ publicKeys?: string[] }> + ) => { + const frameWindow = XssSafeFactory.getWindowOfEmbeddedMsg(frameId); + if (frameWindow) { + const renderModule = relayManager.createRelay(frameId, frameWindow); + const result = await cb(renderModule); + const appendAfter = $(`iframe#${frameId}`); + for (const armoredPubkey of result.publicKeys ?? []) { + appendAfter.after(factory.embeddedPubkey(armoredPubkey, false)); + } + // todo: wait for renderModule completion: the queue has been actually flushed, + // and then remove the frame from relayManager.frames + // Something like: + // await relayManager.waitForCompletion(renderModule) + } else { + Catch.report('Unexpected: unable to reference a newly created message frame'); // todo: + } + }; + + public static processInlineBlocks = async ( + relayManager: RelayManager, + factory: XssSafeFactory, + acctEmail: string, + blocks: Dict, + from?: string // need to unify somehow when we accept `abc ` and when just `email@address` + ) => { + const kisWithPp = await KeyStore.getAllWithOptionalPassPhrase(acctEmail); // todo: cache + const signerEmail = from ? Str.parseEmail(from).email : undefined; + await Promise.all( + Object.entries(blocks).map(([frameId, block]) => + MessageRenderer.relayAndProcess(relayManager, factory, frameId, renderModule => + MessageRenderer.renderMsgBlock(block, kisWithPp, renderModule, acctEmail, signerEmail) + ).catch(Catch.reportErr) + ) + ); + }; + + public static renderMsgBlock = async ( + block: MsgBlock, + kisWithPp: KeyInfoWithIdentityAndOptionalPp[], + renderModule: RenderInterface, + acctEmail: string, + signerEmail?: string + ) => { + const verificationPubs = signerEmail ? await MessageRenderer.getVerificationPubs(signerEmail) : []; + // todo: 'signedMsg' + const decrypt = (verificationPubs: string[]) => MsgUtil.decryptMessage({ kisWithPp, encryptedData: block.content, verificationPubs }); + const decryptResult = await decrypt(verificationPubs); + if (decryptResult.success) { + return await MessageRenderer.decideDecryptedContentFormattingAndRender( + decryptResult.content, + !!decryptResult.isEncrypted, + decryptResult.signature, + renderModule, + signerEmail + ? MessageRenderer.getRetryVerification(acctEmail, signerEmail, verificationPubs => + MessageRenderer.decryptFunctionToVerifyRes(() => decrypt(verificationPubs)) + ) + : undefined + ); + } else { + // todo: + } + return {}; + }; + + // todo: this should be moved to some other class? + public static getRetryVerification = + (acctEmail: string, signerEmail: string, verify: (verificationPubs: string[]) => Promise) => async () => { + const clientConfiguration = await ClientConfiguration.newInstance(acctEmail); + const { pubkeys } = await new PubLookup(clientConfiguration).lookupEmail(signerEmail); + if (pubkeys.length) { + await saveFetchedPubkeysIfNewerThanInStorage({ email: signerEmail, pubkeys }); // synchronously because we don't want erratic behaviour + return await verify(pubkeys); + } + return undefined; + }; + + public static decryptFunctionToVerifyRes = async (decrypt: () => Promise): Promise => { + const decryptResult = await decrypt(); + if (!decryptResult.success) { + return undefined; // note: this internal error results in a wrong "Not Signed" badge + } else { + return decryptResult.signature; + } + }; + + public static renderSignedMessage = async (acctEmail: string, raw: string, renderModule: RenderInterface, signerEmail: string) => { // ... from PgpBlockViewDecryptModule.initialize const mimeMsg = Buf.fromBase64UrlStr(raw); const parsed = await Mime.decode(mimeMsg); @@ -41,8 +138,13 @@ export class MessageRenderer { const verificationPubs = await MessageRenderer.getVerificationPubs(signerEmail); const verify = async (verificationPubs: string[]) => await MsgUtil.verifyDetached({ plaintext: encryptedData, sigText, verificationPubs }); const signatureResult = await verify(verificationPubs); - // todo: retry verification with looked up keys? - return await MessageRenderer.decideDecryptedContentFormattingAndRender(encryptedData, false, signatureResult, renderModule); + return await MessageRenderer.decideDecryptedContentFormattingAndRender( + encryptedData, + false, + signatureResult, + renderModule, + MessageRenderer.getRetryVerification(acctEmail, signerEmail, verify) + ); } catch (e) { console.log(e); } @@ -57,19 +159,24 @@ export class MessageRenderer { }; public static renderEncryptedMessage = async ( + acctEmail: string, encryptedData: string | Uint8Array, kisWithPp: KeyInfoWithIdentityAndOptionalPp[], renderModule: RenderInterface, signerEmail: string ) => { const verificationPubs = await MessageRenderer.getVerificationPubs(signerEmail); - const decryptResult = await MsgUtil.decryptMessage({ kisWithPp, encryptedData, verificationPubs }); + const decrypt = (verificationPubs: string[]) => MsgUtil.decryptMessage({ kisWithPp, encryptedData, verificationPubs }); + const decryptResult = await decrypt(verificationPubs); if (decryptResult.success) { return await MessageRenderer.decideDecryptedContentFormattingAndRender( decryptResult.content, !!decryptResult.isEncrypted, decryptResult.signature, - renderModule + renderModule, + MessageRenderer.getRetryVerification(acctEmail, signerEmail, async verificationPubs => + MessageRenderer.decryptFunctionToVerifyRes(() => decrypt(verificationPubs)) + ) ); } else { // todo: @@ -85,6 +192,7 @@ export class MessageRenderer { sendAs?: Dict ) => { const isOutgoing = Boolean(from && !!sendAs?.[from]); + const blocksInFrames: Dict = {}; let r = ''; for (const block of blocks) { if (r) { @@ -92,11 +200,15 @@ export class MessageRenderer { } if (showOriginal) { r += Xss.escape(Str.with(block.content)).replace(/\n/g, '
'); + } else if (['signedMsg', 'encryptedMsg'].includes(block.type)) { + const { frameId, frameXssSafe } = factory.embeddedRenderMsg(block.type); + r += frameXssSafe; + blocksInFrames[frameId] = block; } else { r += XssSafeFactory.renderableMsgBlock(factory, block, msgId, from || 'unknown', isOutgoing); } } - return { renderedXssSafe: r, isOutgoing }; + return { renderedXssSafe: r, isOutgoing, blocksInFrames }; }; /* todo: remove @@ -182,6 +294,7 @@ export class MessageRenderer { isEncrypted: boolean, sigResult: VerifyRes | undefined, renderModule: RenderInterface, + retryVerification?: () => Promise, plainSubject?: string ): Promise<{ publicKeys?: string[] }> => { if (isEncrypted) { @@ -244,7 +357,7 @@ export class MessageRenderer { } } renderModule.separateQuotedContentAndRenderText(decryptedContent, isHtml); // todo: quoteModule ? - MessageRenderer.renderPgpSignatureCheckResult(renderModule, sigResult); + await MessageRenderer.renderPgpSignatureCheckResult(renderModule, sigResult, retryVerification); if (renderableAttachments.length) { renderModule.renderInnerAttachments(renderableAttachments, isEncrypted); } @@ -253,7 +366,11 @@ export class MessageRenderer { return isEncrypted ? { publicKeys } : {}; }; - public static renderPgpSignatureCheckResult = (renderModule: RenderInterface, verifyRes: VerifyRes | undefined) => { + public static renderPgpSignatureCheckResult = async ( + renderModule: RenderInterface, + verifyRes: VerifyRes | undefined, + retryVerification?: () => Promise + ) => { if (verifyRes?.error) { /* todo: if (not raw) { // Sometimes the signed content is slightly modified when parsed from DOM, @@ -268,7 +385,13 @@ export class MessageRenderer { renderModule.renderSignatureStatus('not signed'); } else if (verifyRes.match) { renderModule.renderSignatureStatus('signed'); + } else if (retryVerification) { + renderModule.renderVerificationInProgress(); + await MessageRenderer.renderPgpSignatureCheckResult(renderModule, await retryVerification(), undefined); + return; } else { + // todo: is this situation possible: no sender info in `from`? + // renderModule.renderSignatureStatus('could not verify signature: missing pubkey, missing sender info'); MessageRenderer.renderMissingPubkeyOrBadSignature(renderModule, verifyRes); } renderModule.setTestState('ready'); diff --git a/extension/js/common/render-interface.ts b/extension/js/common/render-interface.ts index 51afdce165d..8492b1d1d6a 100644 --- a/extension/js/common/render-interface.ts +++ b/extension/js/common/render-interface.ts @@ -16,4 +16,5 @@ export interface RenderInterface extends RenderInterfaceBase { renderInnerAttachments(attachments: TransferableAttachment[], isEncrypted: boolean): void; setTestState(state: 'ready' | 'working' | 'waiting'): void; separateQuotedContentAndRenderText(decryptedContent: string, isHtml: boolean): void; + renderVerificationInProgress(): void; } diff --git a/extension/js/common/render-message.ts b/extension/js/common/render-message.ts index 00347a8f058..9d08f8493ce 100644 --- a/extension/js/common/render-message.ts +++ b/extension/js/common/render-message.ts @@ -12,6 +12,7 @@ export type RenderMessage = { setFrameColor?: 'green' | 'gray' | 'red'; renderEncryptionStatus?: string; renderSignatureStatus?: string; + renderVerificationInProgress?: boolean; renderInnerAttachments?: { attachments: TransferableAttachment[]; isEncrypted: boolean; diff --git a/extension/js/common/render-relay.ts b/extension/js/common/render-relay.ts index 2252ed12659..4f224578051 100644 --- a/extension/js/common/render-relay.ts +++ b/extension/js/common/render-relay.ts @@ -41,6 +41,10 @@ export class RenderRelay implements RenderInterface { this.relay({ renderSignatureStatus: status }); }; + public renderVerificationInProgress = () => { + this.relay({ renderVerificationInProgress: true }); + }; + private relay = (message: RenderMessage) => { this.relayManager.relay(this.frameId, message); }; diff --git a/extension/js/common/xss-safe-factory.ts b/extension/js/common/xss-safe-factory.ts index 4d6b5285a18..e8079ebab68 100644 --- a/extension/js/common/xss-safe-factory.ts +++ b/extension/js/common/xss-safe-factory.ts @@ -64,16 +64,6 @@ export class XssSafeFactory { return Xss.escape(Str.with(block.content)).replace(/\n/g, '
') + '

'; } else if (block.type === 'plainHtml') { return Xss.htmlSanitizeAndStripAllTags(Str.with(block.content), '
') + '

'; - } else if (block.type === 'encryptedMsg') { - return factory.embeddedMsg( - 'encryptedMsg', - block.complete ? PgpArmor.normalize(Str.with(block.content), 'encryptedMsg') : '', - msgId, - isOutgoing, - senderEmail - ); - } else if (block.type === 'signedMsg') { - return factory.embeddedMsg('signedMsg', Str.with(block.content), msgId, isOutgoing, senderEmail); } else if (block.type === 'publicKey') { return factory.embeddedPubkey(PgpArmor.normalize(Str.with(block.content), 'publicKey'), isOutgoing); } else if (block.type === 'privateKey') { @@ -101,9 +91,6 @@ export class XssSafeFactory { * * When edited, REQUEST A SECOND SET OF EYES TO REVIEW CHANGES */ - public static renderableMsgBlocks = (factory: XssSafeFactory, blocks: MsgBlock[], msgId: string, senderEmail: string, isOutgoing?: boolean) => { - return blocks.map(block => XssSafeFactory.renderableMsgBlock(factory, block, msgId, senderEmail, isOutgoing)).join('\n\n'); - }; public static getWindowOfEmbeddedMsg = (frameId: string): Window | undefined => { // const iframe = document.getElementById(frameId) as HTMLIFrameElement; @@ -252,7 +239,7 @@ export class XssSafeFactory { type: MsgBlockType // for diagnostic purposes ) => { const { frameId, frameSrc } = this.srcPgpRenderBlockIframe(); - return { frameId, frameHtml: this.iframe(frameSrc, ['pgp_block', type]) + this.hideGmailNewMsgInThreadNotification }; + return { frameId, frameXssSafe: this.iframe(frameSrc, ['pgp_block', type]) + this.hideGmailNewMsgInThreadNotification }; }; public embeddedPubkey = (armoredPubkey: string, isOutgoing?: boolean) => { diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index a10337c5527..3af43693600 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -30,12 +30,12 @@ import { RelayManager } from '../../common/relay-manager.js'; import { Mime } from '../../common/core/mime.js'; import { FormatError, MsgUtil } from '../../common/core/crypto/pgp/msg-util.js'; import { RenderInterface } from '../../common/render-interface.js'; -import { MsgBlockType } from '../../common/core/msg-block.js'; +import { MsgBlock, MsgBlockType } from '../../common/core/msg-block.js'; import { KeyStore } from '../../common/platform/store/key-store.js'; type JQueryEl = JQuery; -type ProcessedMessage = { renderedXssSafe?: string; attachments: Attachment[] }; +type ProcessedMessage = { renderedXssSafe?: string; blocksInFrames: Dict; attachments: Attachment[]; from: string | undefined }; interface MessageCacheEntry { download: { full: Promise; raw?: Promise }; @@ -220,13 +220,14 @@ export class GmailElementReplacer implements WebmailElementReplacer { } } let renderedXssSafe: string | undefined; + let blocksInFrames: Dict = {}; if (blocks.length === 0 || (blocks.length === 1 && ['plainText', 'plainHtml'].includes(blocks[0].type))) { // only has single block which is plain text } else { const from = GmailParser.findHeader(fullOrRawMsg, 'from'); - ({ renderedXssSafe } = MessageRenderer.renderMsg({ blocks, from }, this.factory, false, msgId, this.sendAs)); + ({ renderedXssSafe, blocksInFrames } = MessageRenderer.renderMsg({ blocks, from }, this.factory, false, msgId, this.sendAs)); } - msgDownload.processedFull = { renderedXssSafe, attachments: mimeContent.attachments }; + msgDownload.processedFull = { renderedXssSafe, blocksInFrames, from: GmailParser.findHeader(fullOrRawMsg, 'from'), attachments: mimeContent.attachments }; return msgDownload.processedFull; }; @@ -252,7 +253,10 @@ export class GmailElementReplacer implements WebmailElementReplacer { console.debug('replaceArmoredBlocks() for of emailsContainingPgpBlock -> emailContainer added evaluated'); } const msgId = this.determineMsgId(emailContainer); - const { renderedXssSafe } = await this.msgGetProcessed(msgId); + const { renderedXssSafe, blocksInFrames, from } = await this.msgGetProcessed(msgId); + const senderEmail = this.getSenderEmail(this.getMsgBodyEl(msgId)) || from; + // todo: const isOutgoing = !!this.sendAs[senderEmail]; + MessageRenderer.processInlineBlocks(this.relayManager, this.factory, this.acctEmail, blocksInFrames, senderEmail).catch(Catch.reportErr); if (renderedXssSafe) { $(this.sel.translatePrompt).hide(); if (this.debug) { @@ -623,30 +627,16 @@ export class GmailElementReplacer implements WebmailElementReplacer { type: MsgBlockType, // for diagnostics cb: (renderModule: RenderInterface) => Promise<{ publicKeys?: string[] }> ) => { - // todo: generate frameId here, prevent frameId duplicates? - const { frameId, frameHtml: embeddedSignedMsgXssSafe } = this.factory.embeddedRenderMsg(type); - msgElReference.msgEl = this.updateMsgBodyEl_DANGEROUSLY(msgElReference.msgEl, 'set', embeddedSignedMsgXssSafe); // xss-safe-factory - const frameWindow = XssSafeFactory.getWindowOfEmbeddedMsg(frameId); - if (frameWindow) { - const renderModule = this.relayManager.createRelay(frameId, frameWindow); - cb(renderModule) - .then(result => { - const appendAfter = $(`iframe#${frameId}`); - for (const armoredPubkey of result.publicKeys ?? []) { - appendAfter.after(this.factory.embeddedPubkey(armoredPubkey, false)); - } - }) - .catch(Catch.reportErr); // todo: clear cached items - } else { - Catch.report('Unexpected: unable to reference a newly created message frame'); // todo: - } + const { frameId, frameXssSafe } = this.factory.embeddedRenderMsg(type); + msgElReference.msgEl = this.updateMsgBodyEl_DANGEROUSLY(msgElReference.msgEl, 'set', frameXssSafe); // xss-safe-factory + MessageRenderer.relayAndProcess(this.relayManager, this.factory, frameId, cb).catch(Catch.reportErr); }; private processSignedMessage = async (msgId: string, renderModule: RenderInterface, senderEmail: string) => { try { renderModule.renderText('Loading signed message...'); const raw = await this.msgGetRaw(msgId); - return await MessageRenderer.renderSignedMessage(raw, renderModule, senderEmail); + return await MessageRenderer.renderSignedMessage(this.acctEmail, raw, renderModule, senderEmail); } catch { // todo: render error via renderModule } @@ -669,7 +659,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { } renderModule.renderText('Decrypting...'); const kisWithPp = await KeyStore.getAllWithOptionalPassPhrase(this.acctEmail); // todo: cache? - return await MessageRenderer.renderEncryptedMessage(armoredMsg, kisWithPp, renderModule, senderEmail); + return await MessageRenderer.renderEncryptedMessage(this.acctEmail, armoredMsg, kisWithPp, renderModule, senderEmail); } catch { // todo: render error via renderModule } From bcbe05666e3f5e26b60bfed2b87e4568229aeb3b Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sun, 30 Apr 2023 17:32:02 +0100 Subject: [PATCH 025/147] fix some tests --- test/source/tests/decrypt.ts | 37 ++++++++++--------- .../tests/page-recipe/inbox-page-recipe.ts | 2 +- test/source/tests/settings.ts | 2 +- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index 54e41226c16..d8cef7215a8 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -37,7 +37,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitForSelTestState('ready'); await inboxPage.waitAll('iframe'); - const pgpBlock = await inboxPage.getFrame(['pgp_block.htm']); + const pgpBlock = await inboxPage.getFrame(['pgp_render_block.htm']); await pgpBlock.waitForContent('@pgp-encryption', 'not encrypted'); await pgpBlock.waitForContent('@pgp-signature', 'not signed'); await pgpBlock.waitForContent('@pgp-block-content', '-----BEGIN PGP MESSAGE-----\n\nThis is not a valid PGP message'); @@ -57,7 +57,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitForSelTestState('ready'); await inboxPage.waitAll('iframe'); - const pgpBlock = await inboxPage.getFrame(['pgp_block.htm']); + const pgpBlock = await inboxPage.getFrame(['pgp_render_block.htm']); await pgpBlock.waitForContent('@remote-image-container', 'Authenticity of this remote image cannot be verified.'); await pgpBlock.checkIfImageIsDisplayedCorrectly('#pgp_block img'); // Chceck if forwarded message contains img url @@ -82,7 +82,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitForSelTestState('ready'); await inboxPage.waitAll('iframe'); - const pgpBlock = await inboxPage.getFrame(['pgp_block.htm']); + const pgpBlock = await inboxPage.getFrame(['pgp_render_block.htm']); await pgpBlock.waitForContent('@pgp-block-content', 'This message contains inline base64 image'); await pgpBlock.waitAll('#pgp_block img'); await pgpBlock.checkIfImageIsDisplayedCorrectly('#pgp_block img'); @@ -936,7 +936,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitAll('iframe'); - const pgpBlock = await inboxPage.getFrame(['pgp_block.htm']); + const pgpBlock = await inboxPage.getFrame(['pgp_render_block.htm']); await pgpBlock.waitForSelTestState('ready'); await pgpBlock.checkIfImageIsDisplayedCorrectly('#pgp_block img'); const replyFrame = await inboxPage.getFrame(['compose.htm']); @@ -1015,7 +1015,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== await BrowserRecipe.setUpCommonAcct(t, browser, 'ci.tests.gmail'); const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitAll('iframe'); - const pgpBlock = await inboxPage.getFrame(['pgp_block.htm']); + const pgpBlock = await inboxPage.getFrame(['pgp_render_block.htm']); await pgpBlock.waitForSelTestState('ready'); const urls = await inboxPage.getFramesUrls(['pgp_pubkey.htm'], { sleep: 3 }); expect(urls.length).to.be.equal(1); @@ -1174,7 +1174,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitAll('iframe'); - const urls = await inboxPage.getFramesUrls(['/chrome/elements/pgp_block.htm'], { sleep: 3 }); + const urls = await inboxPage.getFramesUrls(['/chrome/elements/pgp_render_block.htm'], { sleep: 3 }); expect(urls.length).to.equal(1); const url = urls[0].split('/chrome/elements/pgp_block.htm')[1]; await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { @@ -1204,11 +1204,12 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== }); await BrowserRecipe.setUpCommonAcct(t, browser, 'ci.tests.gmail'); const threadId = '1766644f13510f58'; + // todo: test with gmail mock page const inboxPage = await browser.newExtensionPage(t, `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 }); + const urls = await inboxPage.getFramesUrls(['/chrome/elements/pgp_render_block.htm'], { sleep: 10, appearIn: 20 }); expect(urls.length).to.equal(1); - const url = urls[0].split('/chrome/elements/pgp_block.htm')[1]; + const url = urls[0].split('/chrome/elements/pgp_render_block.htm')[1]; await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { params: url, content: ['How is my message signed?'], @@ -1353,7 +1354,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== const extraAuthHeaders = { Authorization: `Bearer ${accessToken}` }; // eslint-disable-line @typescript-eslint/naming-convention const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/1866867cfdb8b61e`, undefined, extraAuthHeaders); await gmailPage.waitAll('iframe'); - const pgpBlocks = await Promise.all((await gmailPage.getFramesUrls(['pgp_block.htm'])).map(url => gmailPage.getFrame([url]))); + const pgpBlocks = await Promise.all((await gmailPage.getFramesUrls(['pgp_render_block.htm'])).map(url => gmailPage.getFrame([url]))); expect(pgpBlocks.length).to.equal(3); await BrowserRecipe.pgpBlockCheck(t, pgpBlocks[0], { content: ['this is message 3 for flowcrypt issue 4342'], @@ -1634,7 +1635,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); const inboxPage = await browser.newPage(t, 'chrome/settings/inbox/inbox.htm?acctEmail=flowcrypt.compatibility%40gmail.com&threadId=16f0bfce331ca2fd'); await inboxPage.waitAll('iframe.pgp_block'); - const pgpBlock = await inboxPage.getFrame(['pgp_block.htm']); + const pgpBlock = await inboxPage.getFrame(['pgp_render_block.htm']); await pgpBlock.waitForSelTestState('ready'); const content = await pgpBlock.read('#pgp_block'); expect(content).to.include( @@ -1653,7 +1654,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); const inboxPage = await browser.newPage(t, 'chrome/settings/inbox/inbox.htm?acctEmail=flowcrypt.compatibility%40gmail.com&threadId=1762c9a49bedbf6f'); await inboxPage.waitAll('iframe.pgp_block'); - const pgpBlock = await inboxPage.getFrame(['pgp_block.htm']); + const pgpBlock = await inboxPage.getFrame(['pgp_render_block.htm']); await pgpBlock.waitForSelTestState('ready'); const htmlContent = await pgpBlock.readHtml('#pgp_block'); expect(htmlContent).to.include('rel="noopener noreferrer"'); @@ -1670,7 +1671,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); const inboxPage = await browser.newPage(t, 'chrome/settings/inbox/inbox.htm?acctEmail=flowcrypt.compatibility%40gmail.com&threadId=1762c9a49bedbf6f'); await inboxPage.waitAll('iframe.pgp_block'); - const pgpBlock = await inboxPage.getFrame(['pgp_block.htm']); + const pgpBlock = await inboxPage.getFrame(['pgp_render_block.htm']); await pgpBlock.waitForSelTestState('ready'); await pgpBlock.click('#pgp_block a'); await Util.sleep(5); @@ -1728,7 +1729,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId1}`); await inboxPage.waitAll('iframe'); - const pgpBlock = await inboxPage.getFrame(['pgp_block.htm']); + const pgpBlock = await inboxPage.getFrame(['pgp_render_block.htm']); await pgpBlock.waitForSelTestState('ready'); await pgpBlock.waitForContent('@pgp-block-content', '[skipped attachment due to invalid url]'); await pgpBlock.notPresent(['.preview-attachment', '@download-attachment-0']); @@ -1829,7 +1830,7 @@ d6Z36//MsmczN00Wd60t9T+qyLz0T4/UG2Y9lgf367f3d+kYPE0LS7mXuFmjlPXfw0nKyVsSeFiu }); await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); - const pgpBlockPage = await inboxPage.getFrame(['pgp_block.htm']); + const pgpBlockPage = await inboxPage.getFrame(['pgp_render_block.htm']); await pgpBlockPage.waitAndClick('@download-attachment-0'); // check warning modal for inline encrypted attachment on FlowCrypt web extension page const downloadedFile1 = await inboxPage.awaitDownloadTriggeredByClicking(() => @@ -1851,7 +1852,8 @@ d6Z36//MsmczN00Wd60t9T+qyLz0T4/UG2Y9lgf367f3d+kYPE0LS7mXuFmjlPXfw0nKyVsSeFiu expect(Object.entries([downloadedFile1, downloadedFile2]).length).to.equal(2); await inboxPage.close(); const inboxPage2 = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId2}`); - const pgpBlockPage2 = await inboxPage2.getFrame(['pgp_block.htm']); + const pgpBlockPage2 = await inboxPage2.getFrame(['pgp_render_block.htm']); + // todo: glitch? it shows "not encrypted" and "not signed" await pgpBlockPage2.waitAndClick('@download-attachment-0'); // check warning modal for inline signed attachment on FlowCrypt web extension page const downloadedFile3 = await inboxPage2.awaitDownloadTriggeredByClicking(() => @@ -1866,7 +1868,7 @@ d6Z36//MsmczN00Wd60t9T+qyLz0T4/UG2Y9lgf367f3d+kYPE0LS7mXuFmjlPXfw0nKyVsSeFiu const extraAuthHeaders = { Authorization: `Bearer ${accessToken}` }; // eslint-disable-line @typescript-eslint/naming-convention const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${threadId}`, undefined, extraAuthHeaders); await gmailPage.waitAll('iframe'); - const pgpBlockPage3 = await gmailPage.getFrame(['pgp_block.htm']); + const pgpBlockPage3 = await gmailPage.getFrame(['pgp_render_block.htm']); await pgpBlockPage3.waitAndClick('@download-attachment-0'); // check warning modal for inline encrypted attachment test on Gmail page const downloadedFile4 = await gmailPage.awaitDownloadTriggeredByClicking(() => @@ -1889,7 +1891,8 @@ d6Z36//MsmczN00Wd60t9T+qyLz0T4/UG2Y9lgf367f3d+kYPE0LS7mXuFmjlPXfw0nKyVsSeFiu expect(Object.entries([downloadedFile4, downloadedFile5]).length).to.equal(2); await gmailPage.close(); const gmailPage2 = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${threadId2}`, undefined, extraAuthHeaders); - const pgpBlockPage4 = await gmailPage2.getFrame(['pgp_block.htm']); + const pgpBlockPage4 = await gmailPage2.getFrame(['pgp_render_block.htm']); + // todo: glitch? it shows "not encrypted" and "not signed" await pgpBlockPage4.waitAndClick('@download-attachment-0'); // check warning modal for inline signed attachment test on Gmail page const downloadedFile6 = await gmailPage2.awaitDownloadTriggeredByClicking(() => diff --git a/test/source/tests/page-recipe/inbox-page-recipe.ts b/test/source/tests/page-recipe/inbox-page-recipe.ts index bebebc44b3e..0fa0a42c381 100644 --- a/test/source/tests/page-recipe/inbox-page-recipe.ts +++ b/test/source/tests/page-recipe/inbox-page-recipe.ts @@ -35,7 +35,7 @@ export class InboxPageRecipe extends PageRecipe { await InboxPageRecipe.finishSessionOnInboxPage(inboxPage); await inboxPage.waitAll('iframe'); } - const pgpBlockFrame = await inboxPage.getFrame(['pgp_block.htm']); + const pgpBlockFrame = await inboxPage.getFrame(['pgp_render_block.htm']); await pgpBlockFrame.waitAll('@pgp-block-content'); await pgpBlockFrame.waitForSelTestState('ready'); if (enterPp) { diff --git a/test/source/tests/settings.ts b/test/source/tests/settings.ts index 522f2df79a1..550e0611b67 100644 --- a/test/source/tests/settings.ts +++ b/test/source/tests/settings.ts @@ -765,7 +765,7 @@ export const defineSettingsTests = (testVariant: TestVariant, testWithBrowser: T t, `chrome/settings/inbox/inbox.htm?acctEmail=flowcrypt.compatibility@gmail.com&threadId=16e8b01f136c3d28` ); - const pgpBlockFrame = await inboxPage.getFrame(['pgp_block.htm']); + const pgpBlockFrame = await inboxPage.getFrame(['pgp_render_block.htm']); // check if download is awailable await pgpBlockFrame.waitAll('.download-attachment'); // and preview From d52d8ce49a4eb846d9c48c8ed4a1ad9c12f4ac07 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 1 May 2023 10:05:05 +0100 Subject: [PATCH 026/147] fix some tests --- test/source/tests/decrypt.ts | 31 +++++++++++---------- test/source/tests/tooling/browser-recipe.ts | 22 +++++++++------ 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index d8cef7215a8..78f2dc571b6 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -98,7 +98,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - const { accessToken } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); const expectedContent = 'flowcrypt-browser issue #5029 test email'; const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitForSelTestState('ready'); @@ -108,8 +108,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te content: [expectedContent], }); await inboxPage.close(); - const extraAuthHeaders = { Authorization: `Bearer ${accessToken}` }; // eslint-disable-line @typescript-eslint/naming-convention - const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${threadId}`, undefined, extraAuthHeaders); + const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${threadId}`, undefined, authHdr); await gmailPage.waitAll('iframe'); await BrowserRecipe.pgpBlockCheck(t, await gmailPage.getFrame(['pgp_render_block.htm']), { encryption: 'not encrypted', @@ -1171,18 +1170,23 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + const expectedMessage = { + content: ['This is unsigned, encrypted message'], + encryption: 'encrypted', + signature: 'not signed', + }; + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitAll('iframe'); const urls = await inboxPage.getFramesUrls(['/chrome/elements/pgp_render_block.htm'], { sleep: 3 }); 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: ['This is unsigned, encrypted message'], - encryption: 'encrypted', - signature: 'not signed', - }); + await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame([urls[0]]), expectedMessage); + await inboxPage.close(); + const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${threadId}`, undefined, authHdr); + await gmailPage.waitAll('iframe', { timeout: 2 }); + const frameUrlsFromGmailPage = await gmailPage.getFramesUrls(['/chrome/elements/pgp_render_block.htm'], { sleep: 10, appearIn: 20 }); + expect(frameUrlsFromGmailPage.length).to.equal(1); + await BrowserRecipe.pgpBlockCheck(t, await gmailPage.getFrame([frameUrlsFromGmailPage[0]]), expectedMessage); }) ); @@ -1236,7 +1240,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== }, }, }); - const { accessToken } = await BrowserRecipe.setUpCommonAcct(t, browser, 'ci.tests.gmail'); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'ci.tests.gmail'); await PageRecipe.addPubkey( t, browser, @@ -1245,8 +1249,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== 'sender@example.com' ); // todo: make sure pubkey2864E326A5BE488A isn't present in ContactStore yet - const extraAuthHeaders = { Authorization: `Bearer ${accessToken}` }; // eslint-disable-line @typescript-eslint/naming-convention - const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${threadId}`, undefined, extraAuthHeaders); + const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${threadId}`, undefined, authHdr); await gmailPage.waitAll('iframe', { timeout: 2 }); const frameUrlsFromGmailPage = await gmailPage.getFramesUrls(['/chrome/elements/pgp_render_block.htm'], { sleep: 10, appearIn: 20 }); expect(frameUrlsFromGmailPage.length).to.equal(1); diff --git a/test/source/tests/tooling/browser-recipe.ts b/test/source/tests/tooling/browser-recipe.ts index 30e6eb1bea0..5894317ada7 100644 --- a/test/source/tests/tooling/browser-recipe.ts +++ b/test/source/tests/tooling/browser-recipe.ts @@ -7,7 +7,7 @@ import { BrowserHandle, Controllable, ControllableFrame, ControllablePage } from import { OauthPageRecipe } from './../page-recipe/oauth-page-recipe'; import { SetupPageRecipe } from './../page-recipe/setup-page-recipe'; import { TestUrls } from '../../browser/test-urls'; -import { google } from 'googleapis'; +import { gmail_v1, google } from 'googleapis'; import { testVariant } from '../../test'; import { testConstants } from './consts'; import { PageRecipe } from '../page-recipe/abstract-page-recipe'; @@ -98,7 +98,8 @@ export class BrowserRecipe { } const accessToken = await BrowserRecipe.getGoogleAccessToken(settingsPage, acctEmail); await settingsPage.close(); - return { acctEmail, accessToken }; + const authHdr = { Authorization: `Bearer ${accessToken}` }; // eslint-disable-line @typescript-eslint/naming-convention + return { acctEmail, authHdr }; }; public static getGoogleAccessToken = async (controllable: Controllable, acctEmail: string): Promise => { @@ -130,15 +131,20 @@ export class BrowserRecipe { // eslint-disable-next-line @typescript-eslint/naming-convention const list = await gmail.users.drafts.list({ userId: 'me', access_token: accessToken }); if (list.data.drafts) { - await Promise.all( - list.data.drafts - .filter(draft => draft.id) - // eslint-disable-next-line @typescript-eslint/naming-convention, @typescript-eslint/no-non-null-assertion - .map(draft => gmail.users.drafts.delete({ id: draft.id!, userId: 'me', access_token: accessToken })) - ); + await BrowserRecipe.deleteDrafts(list.data.drafts, accessToken); } }; + public static deleteDrafts = async (drafts: gmail_v1.Schema$Draft[], accessToken: string) => { + const gmail = google.gmail({ version: 'v1' }); + await Promise.all( + drafts + .filter(draft => draft.id) + // eslint-disable-next-line @typescript-eslint/naming-convention, @typescript-eslint/no-non-null-assertion + .map(draft => gmail.users.drafts.delete({ id: draft.id!, userId: 'me', access_token: accessToken })) + ); + }; + // todo - ideally we could just add a 3rd common account: 'compatibility' | 'compose' | 'pp-change' in setUpCommonAcct public static setUpFcPpChangeAcct = async (t: AvaContext, browser: BrowserHandle) => { const acctEmail = 'flowcrypt.test.key.imported@gmail.com'; From 3313c138ea48fef58659097829b46c8bfb3f5f35 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 1 May 2023 16:21:02 +0100 Subject: [PATCH 027/147] wiring needPassphrase --- .../chrome/elements/pgp_base_block_view.ts | 4 + extension/chrome/elements/pgp_block.ts | 6 +- .../pgp-block-decrypt-module.ts | 41 +- .../pgp-block-error-module.ts | 33 +- .../pgp-block-render-module.ts | 18 +- extension/chrome/elements/pgp_render_block.ts | 19 +- .../inbox-active-thread-module.ts | 10 +- extension/chrome/settings/inbox/inbox.ts | 3 + extension/js/common/message-renderer.ts | 439 ++++++++++-------- extension/js/common/render-interface.ts | 3 + extension/js/common/render-message.ts | 7 +- extension/js/common/render-relay.ts | 14 +- extension/js/common/xss-safe-factory.ts | 8 +- .../webmail/gmail-element-replacer.ts | 16 +- .../tests/page-recipe/inbox-page-recipe.ts | 2 +- 15 files changed, 340 insertions(+), 283 deletions(-) diff --git a/extension/chrome/elements/pgp_base_block_view.ts b/extension/chrome/elements/pgp_base_block_view.ts index 375d54c2820..cbf7a774102 100644 --- a/extension/chrome/elements/pgp_base_block_view.ts +++ b/extension/chrome/elements/pgp_base_block_view.ts @@ -4,6 +4,7 @@ import { View } from '../../js/common/view.js'; import { PgpBlockViewAttachmentsModule } from './pgp_block_modules/pgp-block-attachmens-module.js'; +import { PgpBlockViewErrorModule } from './pgp_block_modules/pgp-block-error-module.js'; import { PgpBlockViewQuoteModule } from './pgp_block_modules/pgp-block-quote-module.js'; import { PgpBlockViewRenderModule } from './pgp_block_modules/pgp-block-render-module.js'; @@ -11,8 +12,10 @@ export abstract class PgpBaseBlockView extends View { public readonly quoteModule: PgpBlockViewQuoteModule; public readonly renderModule: PgpBlockViewRenderModule; public readonly attachmentsModule: PgpBlockViewAttachmentsModule; + public readonly errorModule: PgpBlockViewErrorModule; public constructor( + public readonly debug: boolean, public readonly parentTabId: string, public readonly frameId: string, public readonly acctEmail: string // needed for attachment decryption, probably should be refactored out @@ -21,5 +24,6 @@ export abstract class PgpBaseBlockView extends View { this.quoteModule = new PgpBlockViewQuoteModule(this); this.renderModule = new PgpBlockViewRenderModule(this); this.attachmentsModule = new PgpBlockViewAttachmentsModule(this); + this.errorModule = new PgpBlockViewErrorModule(this); } } diff --git a/extension/chrome/elements/pgp_block.ts b/extension/chrome/elements/pgp_block.ts index 36dfbc401b7..93575d98446 100644 --- a/extension/chrome/elements/pgp_block.ts +++ b/extension/chrome/elements/pgp_block.ts @@ -8,7 +8,6 @@ import { Buf } from '../../js/common/core/buf.js'; import { Gmail } from '../../js/common/api/email-provider/gmail/gmail.js'; import { Lang } from '../../js/common/lang.js'; import { PgpBlockViewDecryptModule } from './pgp_block_modules/pgp-block-decrypt-module.js'; -import { PgpBlockViewErrorModule } from './pgp_block_modules/pgp-block-error-module.js'; import { PgpBlockViewSignatureModule } from './pgp_block_modules/pgp-block-signature-module.js'; import { Ui } from '../../js/common/browser/ui.js'; import { View } from '../../js/common/view.js'; @@ -34,9 +33,7 @@ export class PgpBlockView extends PgpBaseBlockView { public clientConfiguration!: ClientConfiguration; public pubLookup!: PubLookup; - public readonly debug: boolean; public readonly signatureModule: PgpBlockViewSignatureModule; - public readonly errorModule: PgpBlockViewErrorModule; public readonly printModule: PgpBlockViewPrintModule; public readonly decryptModule: PgpBlockViewDecryptModule; @@ -46,12 +43,12 @@ export class PgpBlockView extends PgpBaseBlockView { Ui.event.protect(); const uncheckedUrlParams = Url.parse(['acctEmail', 'frameId', 'message', 'parentTabId', 'msgId', 'isOutgoing', 'senderEmail', 'signature', 'debug']); super( + uncheckedUrlParams.debug === true, Assert.urlParamRequire.string(uncheckedUrlParams, 'parentTabId'), Assert.urlParamRequire.string(uncheckedUrlParams, 'frameId'), Assert.urlParamRequire.string(uncheckedUrlParams, 'acctEmail') ); this.isOutgoing = uncheckedUrlParams.isOutgoing === true; - this.debug = uncheckedUrlParams.debug === true; const senderEmail = Assert.urlParamRequire.string(uncheckedUrlParams, 'senderEmail'); this.senderEmail = Str.parseEmail(senderEmail).email || ''; this.msgId = Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'msgId'); @@ -67,7 +64,6 @@ export class PgpBlockView extends PgpBaseBlockView { this.gmail = new Gmail(this.acctEmail); // modules this.signatureModule = new PgpBlockViewSignatureModule(this); - this.errorModule = new PgpBlockViewErrorModule(this); this.printModule = new PgpBlockViewPrintModule(this); this.decryptModule = new PgpBlockViewDecryptModule(this); } 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 db658e2dc35..4a3ec4e3cb9 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 @@ -4,7 +4,7 @@ import { BrowserMsg } from '../../../js/common/browser/browser-msg.js'; import { Buf } from '../../../js/common/core/buf.js'; -import { DecryptErrTypes, VerifyRes } from '../../../js/common/core/crypto/pgp/msg-util.js'; +import { DecryptErrTypes, FormatError, VerifyRes } from '../../../js/common/core/crypto/pgp/msg-util.js'; import { GmailResponseFormat } from '../../../js/common/api/email-provider/gmail/gmail.js'; import { Lang } from '../../../js/common/lang.js'; import { Mime } from '../../../js/common/core/mime.js'; @@ -18,6 +18,8 @@ import { Str } from '../../../js/common/core/common.js'; import { Attachment } from '../../../js/common/core/attachment.js'; import { MsgBlock } from '../../../js/common/core/msg-block.js'; import { MessageRenderer } from '../../../js/common/message-renderer.js'; +import { ApiErr } from '../../../js/common/api/shared/api-error.js'; +import { Catch } from '../../../js/common/platform/catch.js'; export class PgpBlockViewDecryptModule { private msgFetchedFromApi: false | GmailResponseFormat = false; @@ -66,12 +68,34 @@ export class PgpBlockViewDecryptModule { } } } catch (e) { - await this.view.errorModule.handleInitializeErr(e); + await this.handleInitializeErr(e); } }; public canAndShouldFetchFromApi = () => this.msgFetchedFromApi !== 'raw'; + private handleInitializeErr = async (e: unknown) => { + if (ApiErr.isNetErr(e)) { + await this.view.errorModule.renderErr(`Could not load message due to network error. ${Ui.retryLink()}`, undefined); + } else if (ApiErr.isAuthErr(e)) { + BrowserMsg.send.notificationShowAuthPopupNeeded(this.view.parentTabId, { acctEmail: this.view.acctEmail }); + await this.view.errorModule.renderErr(`Could not load message due to missing auth. ${Ui.retryLink()}`, undefined); + } else if (e instanceof FormatError) { + await this.view.errorModule.renderErr( + Lang.pgpBlock.cantOpen + Lang.pgpBlock.badFormat + Lang.pgpBlock.details + e.message + ' ' + Lang.pgpBlock.dontKnowHowOpen(!!this.view.fesUrl), + e.data + ); + } else if (ApiErr.isInPrivateMode(e)) { + await this.view.errorModule.renderErr( + `FlowCrypt does not work in a Firefox Private Window (or when Firefox Containers are used). Please try in a standard window.`, + undefined + ); + } else { + Catch.reportErr(e); + await this.view.errorModule.renderErr(Xss.escape(String(e)), this.view.encryptedMsgUrlParam ? this.view.encryptedMsgUrlParam.toUtfStr() : undefined); + } + }; + private retrieveMessage = async (msgId: string) => { // todo: msgId === this.view.msgId this.view.renderModule.renderText('Retrieving message...'); @@ -144,18 +168,7 @@ export class PgpBlockViewDecryptModule { await this.view.errorModule.renderErr(Lang.pgpBlock.badFormat + '\n\n' + result.error.message, Str.with(encryptedData)); } } else if (result.longids.needPassphrase.length) { - const enterPp = `${Lang.pgpBlock.enterPassphrase} ${Lang.pgpBlock.toOpenMsg}`; - await this.view.errorModule.renderErr(enterPp, undefined, 'pass phrase needed'); - $('.enter_passphrase').on( - 'click', - this.view.setHandler(() => { - Ui.setTestState('waiting'); - BrowserMsg.send.passphraseDialog(this.view.parentTabId, { - type: 'message', - longids: result.longids.needPassphrase, - }); - }) - ); + this.view.renderModule.renderPassphraseNeeded(result.longids.needPassphrase); await PassphraseStore.waitUntilPassphraseChanged(this.view.acctEmail, result.longids.needPassphrase); this.view.renderModule.clearErrorStatus(); this.view.renderModule.renderText('Decrypting...'); diff --git a/extension/chrome/elements/pgp_block_modules/pgp-block-error-module.ts b/extension/chrome/elements/pgp_block_modules/pgp-block-error-module.ts index 1aca3207883..4241a9a0718 100644 --- a/extension/chrome/elements/pgp_block_modules/pgp-block-error-module.ts +++ b/extension/chrome/elements/pgp_block_modules/pgp-block-error-module.ts @@ -2,13 +2,10 @@ 'use strict'; -import { ApiErr } from '../../../js/common/api/shared/api-error.js'; import { Browser } from '../../../js/common/browser/browser.js'; import { BrowserMsg } from '../../../js/common/browser/browser-msg.js'; -import { Catch } from '../../../js/common/platform/catch.js'; -import { FormatError } from '../../../js/common/core/crypto/pgp/msg-util.js'; import { Lang } from '../../../js/common/lang.js'; -import { PgpBlockView } from '../pgp_block.js'; +import { PgpBaseBlockView } from '../pgp_base_block_view.js'; import { Ui } from '../../../js/common/browser/ui.js'; import { Xss } from '../../../js/common/platform/xss.js'; import { Str } from '../../../js/common/core/common.js'; @@ -16,13 +13,13 @@ import { Str } from '../../../js/common/core/common.js'; export class PgpBlockViewErrorModule { private debugId = Str.sloppyRandom(); - public constructor(private view: PgpBlockView) {} + public constructor(private view: PgpBaseBlockView) {} - public renderErr = async (errBoxContent: string, renderRawMsg: string | undefined, errMsg?: string) => { + public renderErr = (errBoxContent: string, renderRawMsg: string | undefined, errMsg?: string) => { this.view.renderModule.setFrameColor('red'); this.view.renderModule.renderErrorStatus(errMsg || 'decrypt error'); const showRawMsgPrompt = renderRawMsg ? 'show original message' : ''; - await this.view.renderModule.renderContent(`
${errBoxContent.replace(/\n/g, '
')}
${showRawMsgPrompt}`, true); + this.view.renderModule.renderContent(`
${errBoxContent.replace(/\n/g, '
')}
${showRawMsgPrompt}`, true); $('.action_show_raw_pgp_block').on( 'click', this.view.setHandler(async () => { @@ -82,28 +79,6 @@ export class PgpBlockViewErrorModule { } }; - public handleInitializeErr = async (e: unknown) => { - if (ApiErr.isNetErr(e)) { - await this.renderErr(`Could not load message due to network error. ${Ui.retryLink()}`, undefined); - } else if (ApiErr.isAuthErr(e)) { - BrowserMsg.send.notificationShowAuthPopupNeeded(this.view.parentTabId, { acctEmail: this.view.acctEmail }); - await this.renderErr(`Could not load message due to missing auth. ${Ui.retryLink()}`, undefined); - } else if (e instanceof FormatError) { - await this.renderErr( - Lang.pgpBlock.cantOpen + Lang.pgpBlock.badFormat + Lang.pgpBlock.details + e.message + ' ' + Lang.pgpBlock.dontKnowHowOpen(!!this.view.fesUrl), - e.data - ); - } else if (ApiErr.isInPrivateMode(e)) { - await this.renderErr( - `FlowCrypt does not work in a Firefox Private Window (or when Firefox Containers are used). Please try in a standard window.`, - undefined - ); - } else { - Catch.reportErr(e); - await this.renderErr(Xss.escape(String(e)), this.view.encryptedMsgUrlParam ? this.view.encryptedMsgUrlParam.toUtfStr() : undefined); - } - }; - public btnHtml = (text: string, addClasses: string) => { return ``; }; 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 a59020c3184..9a8465044cf 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 @@ -3,9 +3,11 @@ 'use strict'; import { BrowserMsg } from '../../../js/common/browser/browser-msg.js'; +import { Ui } from '../../../js/common/browser/ui.js'; +import { Lang } from '../../../js/common/lang.js'; import { Catch } from '../../../js/common/platform/catch.js'; import { Xss } from '../../../js/common/platform/xss.js'; -import { PgpBaseBlockView } from '../pgp_base_block_view'; +import { PgpBaseBlockView } from '../pgp_base_block_view.js'; export class PgpBlockViewRenderModule { public doNotSetStateAsReadyYet = false; @@ -100,6 +102,20 @@ export class PgpBlockViewRenderModule { await this.renderContent(content, false); }; + public renderPassphraseNeeded = (longids: string[]) => { + const enterPp = `${Lang.pgpBlock.enterPassphrase} ${Lang.pgpBlock.toOpenMsg}`; + this.view.errorModule.renderErr(enterPp, undefined, 'pass phrase needed'); + $('.enter_passphrase').on( + 'click', + this.view.setHandler(() => { + Ui.setTestState('waiting'); + BrowserMsg.send.passphraseDialog(this.view.parentTabId, { + type: 'message', + longids, + }); + }) + ); + }; public renderErrorStatus = (status: string): JQuery => { return $('#pgp_error').text(status).show(); }; diff --git a/extension/chrome/elements/pgp_render_block.ts b/extension/chrome/elements/pgp_render_block.ts index 4d770d4c3c8..4fcb884e32e 100644 --- a/extension/chrome/elements/pgp_render_block.ts +++ b/extension/chrome/elements/pgp_render_block.ts @@ -11,17 +11,15 @@ import { RenderMessage } from '../../js/common/render-message.js'; import { Attachment } from '../../js/common/core/attachment.js'; export class PgpRenderBlockView extends PgpBaseBlockView { - public readonly debug: boolean; - public constructor() { Ui.event.protect(); const uncheckedUrlParams = Url.parse(['frameId', 'parentTabId', 'debug', 'acctEmail']); super( + uncheckedUrlParams.debug === true, Assert.urlParamRequire.string(uncheckedUrlParams, 'parentTabId'), Assert.urlParamRequire.string(uncheckedUrlParams, 'frameId'), Assert.urlParamRequire.string(uncheckedUrlParams, 'acctEmail') ); - this.debug = uncheckedUrlParams.debug === true; window.addEventListener('message', this.handleMessage, true); // todo: capture? window.addEventListener('load', () => window.parent.postMessage({ readyToReceive: this.frameId }, '*')); } @@ -66,13 +64,22 @@ export class PgpRenderBlockView extends PgpBaseBlockView { if (data?.setFrameColor) { this.renderModule.setFrameColor(data.setFrameColor); } - if (data?.setTestState) { - Ui.setTestState(data.setTestState); - } if (data?.renderInnerAttachments) { const attachments = data.renderInnerAttachments.attachments.map(Attachment.fromTransferableAttachment); this.attachmentsModule.renderInnerAttachments(attachments, data.renderInnerAttachments.isEncrypted); } + if (data?.renderErr) { + this.errorModule.renderErr(data.renderErr.errBoxContent, data.renderErr.renderRawMsg, data.renderErr.errMsg); + } + if (data?.renderPassphraseNeeded) { + this.renderModule.renderPassphraseNeeded(data.renderPassphraseNeeded); + } + if (data?.clearErrorStatus) { + this.renderModule.clearErrorStatus(); + } + if (data?.setTestState) { + Ui.setTestState(data.setTestState); + } }; } diff --git a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts index ea56330dd93..0ace5a27eff 100644 --- a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts +++ b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts @@ -143,13 +143,9 @@ export class InboxActiveThreadModule extends ViewModule { : ''); $('.thread').append(this.wrapMsg(htmlId, r)); // xss-safe-factory // todo: isOutgoing ? - MessageRenderer.processInlineBlocks( - this.view.relayManager, - this.view.factory, - this.view.acctEmail, - blocksInFrames, - from ? Str.parseEmail(from).email : undefined - ).catch(Catch.reportErr); + this.view.messageRenderer + .processInlineBlocks(this.view.relayManager, this.view.factory, blocksInFrames, from ? Str.parseEmail(from).email : undefined) + .catch(Catch.reportErr); if (exportBtn) { $('.action-export').on( 'click', diff --git a/extension/chrome/settings/inbox/inbox.ts b/extension/chrome/settings/inbox/inbox.ts index 5e8ec2bc24d..7ec3f5c95d1 100644 --- a/extension/chrome/settings/inbox/inbox.ts +++ b/extension/chrome/settings/inbox/inbox.ts @@ -23,6 +23,7 @@ import { Xss } from '../../../js/common/platform/xss.js'; import { XssSafeFactory } from '../../../js/common/xss-safe-factory.js'; import { AcctStore, AcctStoreDict } from '../../../js/common/platform/store/acct-store.js'; import { RelayManager } from '../../../js/common/relay-manager.js'; +import { MessageRenderer } from '../../../js/common/message-renderer.js'; export class InboxView extends View { public readonly inboxMenuModule: InboxMenuModule; @@ -40,6 +41,7 @@ export class InboxView extends View { public injector!: Injector; public webmailCommon!: WebmailCommon; + public readonly messageRenderer: MessageRenderer; public factory!: XssSafeFactory; public storage!: AcctStoreDict; public tabId!: string; @@ -49,6 +51,7 @@ export class InboxView extends View { super(); const uncheckedUrlParams = Url.parse(['acctEmail', 'labelId', 'threadId', 'showOriginal', 'debug']); this.acctEmail = Assert.urlParamRequire.string(uncheckedUrlParams, 'acctEmail'); + this.messageRenderer = new MessageRenderer(this.acctEmail); this.labelId = uncheckedUrlParams.labelId ? String(uncheckedUrlParams.labelId) : 'INBOX'; this.threadId = Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'threadId'); this.showOriginal = uncheckedUrlParams.showOriginal === true; diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index 2ed5791e405..1a669ab0fde 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -8,15 +8,17 @@ import { ClientConfiguration } from './client-configuration.js'; import { Attachment, TransferableAttachment } from './core/attachment.js'; import { Buf } from './core/buf.js'; import { CID_PATTERN, Dict, Str, Value } from './core/common.js'; -import { KeyInfoWithIdentityAndOptionalPp, KeyUtil } from './core/crypto/key.js'; -import { DecryptResult, MsgUtil, VerifyRes } from './core/crypto/pgp/msg-util.js'; +import { KeyUtil } from './core/crypto/key.js'; +import { DecryptErrTypes, DecryptResult, MsgUtil, VerifyRes } from './core/crypto/pgp/msg-util.js'; import { Mime, MimeContent, MimeProccesedMsg } from './core/mime.js'; import { MsgBlockParser } from './core/msg-block-parser.js'; import { MsgBlock } from './core/msg-block.js'; +import { Lang } from './lang.js'; import { Catch } from './platform/catch.js'; import { SendAsAlias } from './platform/store/acct-store.js'; import { ContactStore } from './platform/store/contact-store.js'; import { KeyStore } from './platform/store/key-store.js'; +import { PassphraseStore } from './platform/store/passphrase-store.js'; import { Xss } from './platform/xss.js'; import { RelayManager } from './relay-manager.js'; import { RenderInterface, RenderInterfaceBase } from './render-interface.js'; @@ -24,6 +26,8 @@ import { saveFetchedPubkeysIfNewerThanInStorage } from './shared.js'; import { XssSafeFactory } from './xss-safe-factory.js'; import * as DOMPurify from 'dompurify'; +export type JQueryEl = JQuery; + export type ProccesedMsg = MimeProccesedMsg; export type AttachmentBlock = { @@ -32,208 +36,7 @@ export type AttachmentBlock = { }; export class MessageRenderer { - public static relayAndProcess = async ( - relayManager: RelayManager, - factory: XssSafeFactory, - frameId: string, - cb: (renderModule: RenderInterface) => Promise<{ publicKeys?: string[] }> - ) => { - const frameWindow = XssSafeFactory.getWindowOfEmbeddedMsg(frameId); - if (frameWindow) { - const renderModule = relayManager.createRelay(frameId, frameWindow); - const result = await cb(renderModule); - const appendAfter = $(`iframe#${frameId}`); - for (const armoredPubkey of result.publicKeys ?? []) { - appendAfter.after(factory.embeddedPubkey(armoredPubkey, false)); - } - // todo: wait for renderModule completion: the queue has been actually flushed, - // and then remove the frame from relayManager.frames - // Something like: - // await relayManager.waitForCompletion(renderModule) - } else { - Catch.report('Unexpected: unable to reference a newly created message frame'); // todo: - } - }; - - public static processInlineBlocks = async ( - relayManager: RelayManager, - factory: XssSafeFactory, - acctEmail: string, - blocks: Dict, - from?: string // need to unify somehow when we accept `abc ` and when just `email@address` - ) => { - const kisWithPp = await KeyStore.getAllWithOptionalPassPhrase(acctEmail); // todo: cache - const signerEmail = from ? Str.parseEmail(from).email : undefined; - await Promise.all( - Object.entries(blocks).map(([frameId, block]) => - MessageRenderer.relayAndProcess(relayManager, factory, frameId, renderModule => - MessageRenderer.renderMsgBlock(block, kisWithPp, renderModule, acctEmail, signerEmail) - ).catch(Catch.reportErr) - ) - ); - }; - - public static renderMsgBlock = async ( - block: MsgBlock, - kisWithPp: KeyInfoWithIdentityAndOptionalPp[], - renderModule: RenderInterface, - acctEmail: string, - signerEmail?: string - ) => { - const verificationPubs = signerEmail ? await MessageRenderer.getVerificationPubs(signerEmail) : []; - // todo: 'signedMsg' - const decrypt = (verificationPubs: string[]) => MsgUtil.decryptMessage({ kisWithPp, encryptedData: block.content, verificationPubs }); - const decryptResult = await decrypt(verificationPubs); - if (decryptResult.success) { - return await MessageRenderer.decideDecryptedContentFormattingAndRender( - decryptResult.content, - !!decryptResult.isEncrypted, - decryptResult.signature, - renderModule, - signerEmail - ? MessageRenderer.getRetryVerification(acctEmail, signerEmail, verificationPubs => - MessageRenderer.decryptFunctionToVerifyRes(() => decrypt(verificationPubs)) - ) - : undefined - ); - } else { - // todo: - } - return {}; - }; - - // todo: this should be moved to some other class? - public static getRetryVerification = - (acctEmail: string, signerEmail: string, verify: (verificationPubs: string[]) => Promise) => async () => { - const clientConfiguration = await ClientConfiguration.newInstance(acctEmail); - const { pubkeys } = await new PubLookup(clientConfiguration).lookupEmail(signerEmail); - if (pubkeys.length) { - await saveFetchedPubkeysIfNewerThanInStorage({ email: signerEmail, pubkeys }); // synchronously because we don't want erratic behaviour - return await verify(pubkeys); - } - return undefined; - }; - - public static decryptFunctionToVerifyRes = async (decrypt: () => Promise): Promise => { - const decryptResult = await decrypt(); - if (!decryptResult.success) { - return undefined; // note: this internal error results in a wrong "Not Signed" badge - } else { - return decryptResult.signature; - } - }; - - public static renderSignedMessage = async (acctEmail: string, raw: string, renderModule: RenderInterface, signerEmail: string) => { - // ... from PgpBlockViewDecryptModule.initialize - const mimeMsg = Buf.fromBase64UrlStr(raw); - const parsed = await Mime.decode(mimeMsg); - if (parsed && typeof parsed.rawSignedContent === 'string') { - const signatureAttachment = parsed.attachments.find(a => a.treatAs(parsed.attachments) === 'signature'); // todo: more than one signature candidate? - if (signatureAttachment) { - const parsedSignature = signatureAttachment.getData().toUtfStr(); - // ... from PgpBlockViewDecryptModule.decryptAndRender - const sigText = parsedSignature.replace('\n=3D', '\n='); - const encryptedData = parsed.rawSignedContent; - try { - const verificationPubs = await MessageRenderer.getVerificationPubs(signerEmail); - const verify = async (verificationPubs: string[]) => await MsgUtil.verifyDetached({ plaintext: encryptedData, sigText, verificationPubs }); - const signatureResult = await verify(verificationPubs); - return await MessageRenderer.decideDecryptedContentFormattingAndRender( - encryptedData, - false, - signatureResult, - renderModule, - MessageRenderer.getRetryVerification(acctEmail, signerEmail, verify) - ); - } catch (e) { - console.log(e); - } - } - } - /* todo: await this.view.errorModule.renderErr( - 'Error: could not properly parse signed message', - parsed.rawSignedContent || parsed.text || parsed.html || mimeMsg.toUtfStr(), - 'parse error' - ); */ - return {}; - }; - - public static renderEncryptedMessage = async ( - acctEmail: string, - encryptedData: string | Uint8Array, - kisWithPp: KeyInfoWithIdentityAndOptionalPp[], - renderModule: RenderInterface, - signerEmail: string - ) => { - const verificationPubs = await MessageRenderer.getVerificationPubs(signerEmail); - const decrypt = (verificationPubs: string[]) => MsgUtil.decryptMessage({ kisWithPp, encryptedData, verificationPubs }); - const decryptResult = await decrypt(verificationPubs); - if (decryptResult.success) { - return await MessageRenderer.decideDecryptedContentFormattingAndRender( - decryptResult.content, - !!decryptResult.isEncrypted, - decryptResult.signature, - renderModule, - MessageRenderer.getRetryVerification(acctEmail, signerEmail, async verificationPubs => - MessageRenderer.decryptFunctionToVerifyRes(() => decrypt(verificationPubs)) - ) - ); - } else { - // todo: - } - return {}; - }; - - public static renderMsg = ( - { from, blocks }: { blocks: MsgBlock[]; from?: string }, - factory: XssSafeFactory, - showOriginal: boolean, - msgId: string, // todo: will be removed - sendAs?: Dict - ) => { - const isOutgoing = Boolean(from && !!sendAs?.[from]); - const blocksInFrames: Dict = {}; - let r = ''; - for (const block of blocks) { - if (r) { - r += '

'; - } - if (showOriginal) { - r += Xss.escape(Str.with(block.content)).replace(/\n/g, '
'); - } else if (['signedMsg', 'encryptedMsg'].includes(block.type)) { - const { frameId, frameXssSafe } = factory.embeddedRenderMsg(block.type); - r += frameXssSafe; - blocksInFrames[frameId] = block; - } else { - r += XssSafeFactory.renderableMsgBlock(factory, block, msgId, from || 'unknown', isOutgoing); - } - } - return { renderedXssSafe: r, isOutgoing, blocksInFrames }; - }; - - /* todo: remove - public static process = async (gmailMsg: GmailRes.GmailMsg): Promise => { - return gmailMsg.raw ? await MessageRenderer.processMessageFromRaw(gmailMsg.raw) : MessageRenderer.processMessageFromFull(gmailMsg); - }; */ - - public static processMessageFromRaw = async (raw: string) => { - const mimeMsg = Buf.fromBase64UrlStr(raw); - return await Mime.process(mimeMsg); - }; - - public static reconstructMimeContent = (gmailMsg: GmailRes.GmailMsg): MimeContent => { - const bodies = GmailParser.findBodies(gmailMsg); - const attachments = GmailParser.findAttachments(gmailMsg, gmailMsg.id); - const text = bodies['text/plain'] ? Buf.fromBase64UrlStr(bodies['text/plain']).toUtfStr() : undefined; - // todo: do we need to strip? - const html = bodies['text/html'] ? Xss.htmlSanitizeAndStripAllTags(Buf.fromBase64UrlStr(bodies['text/html']).toUtfStr(), '\n') : undefined; - // reconstructed MIME content - return { - text, - html, - attachments, - }; - }; + public constructor(private readonly acctEmail: string) {} /** * Replaces inline image CID references with base64 encoded data in sanitized HTML @@ -366,6 +169,61 @@ export class MessageRenderer { return isEncrypted ? { publicKeys } : {}; }; + public static decryptFunctionToVerifyRes = async (decrypt: () => Promise): Promise => { + const decryptResult = await decrypt(); + if (!decryptResult.success) { + return undefined; // note: this internal error results in a wrong "Not Signed" badge + } else { + return decryptResult.signature; + } + }; + + public static processMessageFromRaw = async (raw: string) => { + const mimeMsg = Buf.fromBase64UrlStr(raw); + return await Mime.process(mimeMsg); + }; + + public static reconstructMimeContent = (gmailMsg: GmailRes.GmailMsg): MimeContent => { + const bodies = GmailParser.findBodies(gmailMsg); + const attachments = GmailParser.findAttachments(gmailMsg, gmailMsg.id); + const text = bodies['text/plain'] ? Buf.fromBase64UrlStr(bodies['text/plain']).toUtfStr() : undefined; + // todo: do we need to strip? + const html = bodies['text/html'] ? Xss.htmlSanitizeAndStripAllTags(Buf.fromBase64UrlStr(bodies['text/html']).toUtfStr(), '\n') : undefined; + // reconstructed MIME content + return { + text, + html, + attachments, + }; + }; + + public static renderMsg = ( + { from, blocks }: { blocks: MsgBlock[]; from?: string }, + factory: XssSafeFactory, + showOriginal: boolean, + msgId: string, // todo: will be removed + sendAs?: Dict + ) => { + const isOutgoing = Boolean(from && !!sendAs?.[from]); + const blocksInFrames: Dict = {}; + let r = ''; + for (const block of blocks) { + if (r) { + r += '

'; + } + if (showOriginal) { + r += Xss.escape(Str.with(block.content)).replace(/\n/g, '
'); + } else if (['signedMsg', 'encryptedMsg'].includes(block.type)) { + const { frameId, frameXssSafe } = factory.embeddedRenderMsg(block.type); + r += frameXssSafe; + blocksInFrames[frameId] = block; + } else { + r += XssSafeFactory.renderableMsgBlock(factory, block, msgId, from || 'unknown', isOutgoing); + } + } + return { renderedXssSafe: r, isOutgoing, blocksInFrames }; + }; + public static renderPgpSignatureCheckResult = async ( renderModule: RenderInterface, verifyRes: VerifyRes | undefined, @@ -421,4 +279,177 @@ export class MessageRenderer { // maybe we can have a method in ContactStore to extract armored keys return parsedPubs.map(key => KeyUtil.armor(key.pubkey)); }; + + public relayAndProcess = async ( + relayManager: RelayManager, + factory: XssSafeFactory, + frameId: string, + cb: (renderModule: RenderInterface) => Promise<{ publicKeys?: string[]; needPassphrase?: string[] }> + ) => { + const embeddedReference = XssSafeFactory.getEmbeddedMsg(frameId); + if (embeddedReference) { + const renderModule = relayManager.createRelay(frameId, embeddedReference.frameWindow); + let result = await cb(renderModule); + const appendAfter = $(`iframe#${frameId}`); + // todo: how publicKeys and needPassphrase interact? + for (const armoredPubkey of result.publicKeys ?? []) { + appendAfter.after(factory.embeddedPubkey(armoredPubkey, false)); + } + while (result.needPassphrase) { + // todo: queue into a dictionary? + await PassphraseStore.waitUntilPassphraseChanged(this.acctEmail, result.needPassphrase); + renderModule.clearErrorStatus(); + renderModule.renderText('Decrypting...'); + result = await cb(renderModule); + } + // todo: wait for renderModule completion: the queue has been actually flushed, + // and then remove the frame from relayManager.frames + // Something like: + // await relayManager.waitForCompletion(renderModule) + } else { + Catch.report('Unexpected: unable to reference a newly created message frame'); // todo: + } + }; + + public processInlineBlocks = async ( + relayManager: RelayManager, + factory: XssSafeFactory, + blocks: Dict, + from?: string // need to unify somehow when we accept `abc ` and when just `email@address` + ) => { + const signerEmail = from ? Str.parseEmail(from).email : undefined; + await Promise.all( + Object.entries(blocks).map(([frameId, block]) => + this.relayAndProcess(relayManager, factory, frameId, renderModule => this.renderMsgBlock(block, renderModule, signerEmail)).catch(Catch.reportErr) + ) + ); + }; + + public renderMsgBlock = async (block: MsgBlock, renderModule: RenderInterface, signerEmail?: string) => { + // todo: 'signedMsg' also handled here? + return await this.renderEncryptedMessage(block.content, renderModule, signerEmail); + }; + + // todo: this should be moved to some other class? + public getRetryVerification = (signerEmail: string, verify: (verificationPubs: string[]) => Promise) => async () => { + const clientConfiguration = await ClientConfiguration.newInstance(this.acctEmail); + const { pubkeys } = await new PubLookup(clientConfiguration).lookupEmail(signerEmail); + if (pubkeys.length) { + await saveFetchedPubkeysIfNewerThanInStorage({ email: signerEmail, pubkeys }); // synchronously because we don't want erratic behaviour + return await verify(pubkeys); + } + return undefined; + }; + + public renderSignedMessage = async (raw: string, renderModule: RenderInterface, signerEmail: string) => { + // ... from PgpBlockViewDecryptModule.initialize + const mimeMsg = Buf.fromBase64UrlStr(raw); + const parsed = await Mime.decode(mimeMsg); + if (parsed && typeof parsed.rawSignedContent === 'string') { + const signatureAttachment = parsed.attachments.find(a => a.treatAs(parsed.attachments) === 'signature'); // todo: more than one signature candidate? + if (signatureAttachment) { + const parsedSignature = signatureAttachment.getData().toUtfStr(); + // ... from PgpBlockViewDecryptModule.decryptAndRender + const sigText = parsedSignature.replace('\n=3D', '\n='); + const encryptedData = parsed.rawSignedContent; + try { + const verificationPubs = await MessageRenderer.getVerificationPubs(signerEmail); + const verify = async (verificationPubs: string[]) => await MsgUtil.verifyDetached({ plaintext: encryptedData, sigText, verificationPubs }); + const signatureResult = await verify(verificationPubs); + return await MessageRenderer.decideDecryptedContentFormattingAndRender( + encryptedData, + false, + signatureResult, + renderModule, + this.getRetryVerification(signerEmail, verify) + ); + } catch (e) { + console.log(e); + } + } + } + /* todo: await this.view.errorModule.renderErr( + 'Error: could not properly parse signed message', + parsed.rawSignedContent || parsed.text || parsed.html || mimeMsg.toUtfStr(), + 'parse error' + ); */ + return {}; + }; + + public renderEncryptedMessage = async ( + encryptedData: string | Uint8Array, + renderModule: RenderInterface, + signerEmail?: string + ): Promise<{ publicKeys?: string[]; needPassphrase?: string[] }> => { + const kisWithPp = await KeyStore.getAllWithOptionalPassPhrase(this.acctEmail); // todo: cache + const verificationPubs = signerEmail ? await MessageRenderer.getVerificationPubs(signerEmail) : []; + const decrypt = (verificationPubs: string[]) => MsgUtil.decryptMessage({ kisWithPp, encryptedData, verificationPubs }); + const result = await decrypt(verificationPubs); + // from decryptAndRender + if (typeof result === 'undefined') { + // todo: renderErr(Lang.general.restartBrowserAndTryAgain(!!this.view.fesUrl), undefined); + } else if (result.success) { + return await MessageRenderer.decideDecryptedContentFormattingAndRender( + result.content, + !!result.isEncrypted, + result.signature, + renderModule, + signerEmail + ? this.getRetryVerification(signerEmail, verificationPubs => MessageRenderer.decryptFunctionToVerifyRes(() => decrypt(verificationPubs))) + : undefined + ); + } else if (result.error.type === DecryptErrTypes.format) { + renderModule.renderErr(Lang.pgpBlock.badFormat + '\n\n' + result.error.message, Str.with(encryptedData)); + } else if (result.longids.needPassphrase.length) { + renderModule.renderPassphraseNeeded(result.longids.needPassphrase); + return { needPassphrase: result.longids.needPassphrase }; + /* + const enterPp = `${Lang.pgpBlock.enterPassphrase} ${Lang.pgpBlock.toOpenMsg}`; + await this.view.errorModule.renderErr(enterPp, undefined, 'pass phrase needed'); + $('.enter_passphrase').on( + 'click', + this.view.setHandler(() => { + Ui.setTestState('waiting'); + BrowserMsg.send.passphraseDialog(this.view.parentTabId, { + type: 'message', + longids: result.longids.needPassphrase, + }); + }) + ); + await PassphraseStore.waitUntilPassphraseChanged(this.view.acctEmail, result.longids.needPassphrase); + this.view.renderModule.clearErrorStatus(); + this.view.renderModule.renderText('Decrypting...'); + await this.decryptAndRender(encryptedData, verificationPubs); + */ + } else { + /* + if (!result.longids.chosen && !(await KeyStore.get(this.view.acctEmail)).length) { + await this.view.errorModule.renderErr( + Lang.pgpBlock.notProperlySetUp + this.view.errorModule.btnHtml('FlowCrypt settings', 'green settings'), + undefined + ); + } else if (result.error.type === DecryptErrTypes.keyMismatch) { + await this.view.errorModule.handlePrivateKeyMismatch( + kisWithPp.map(ki => ki.public), + encryptedData, + this.isPwdMsgBasedOnMsgSnippet === true + ); + } else if (result.error.type === DecryptErrTypes.wrongPwd || result.error.type === DecryptErrTypes.usePassword) { + await this.view.errorModule.renderErr(Lang.pgpBlock.pwdMsgAskSenderUsePubkey, undefined); + } else if (result.error.type === DecryptErrTypes.noMdc) { + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + await this.view.errorModule.renderErr(result.error.message, result.content!.toUtfStr()); // missing mdc - only render the result after user confirmation + } else if (result.error) { + await this.view.errorModule.renderErr(`${Lang.pgpBlock.cantOpen}\n\n${result.error.type}: ${result.error.message}`, Str.with(encryptedData)); + } else { + // should generally not happen + await this.view.errorModule.renderErr( + Lang.pgpBlock.cantOpen + Lang.general.writeMeToFixIt(!!this.view.fesUrl) + '\n\nDiagnostic info: "' + JSON.stringify(result) + '"', + Str.with(encryptedData) + ); + } + */ + } + return {}; + }; } diff --git a/extension/js/common/render-interface.ts b/extension/js/common/render-interface.ts index 8492b1d1d6a..be00e19949b 100644 --- a/extension/js/common/render-interface.ts +++ b/extension/js/common/render-interface.ts @@ -13,6 +13,9 @@ export interface RenderInterfaceBase { } export interface RenderInterface extends RenderInterfaceBase { + clearErrorStatus(): void; + renderPassphraseNeeded(longids: string[]): void; + renderErr(errBoxContent: string, renderRawMsg: string | undefined, errMsg?: string): void; renderInnerAttachments(attachments: TransferableAttachment[], isEncrypted: boolean): void; setTestState(state: 'ready' | 'working' | 'waiting'): void; separateQuotedContentAndRenderText(decryptedContent: string, isHtml: boolean): void; diff --git a/extension/js/common/render-message.ts b/extension/js/common/render-message.ts index 9d08f8493ce..42a8be98d6b 100644 --- a/extension/js/common/render-message.ts +++ b/extension/js/common/render-message.ts @@ -6,15 +6,18 @@ import { TransferableAttachment } from './core/attachment.js'; export type RenderMessage = { setTestState?: 'ready' | 'working' | 'waiting'; - resizePgpBlockFrame?: boolean; + resizePgpBlockFrame?: true; separateQuotedContentAndRenderText?: { decryptedContent: string; isHtml: boolean }; renderText?: string; setFrameColor?: 'green' | 'gray' | 'red'; renderEncryptionStatus?: string; renderSignatureStatus?: string; - renderVerificationInProgress?: boolean; + renderVerificationInProgress?: true; renderInnerAttachments?: { attachments: TransferableAttachment[]; isEncrypted: boolean; }; + renderPassphraseNeeded?: string[]; // longids + renderErr?: { errBoxContent: string; renderRawMsg: string | undefined; errMsg?: string }; + clearErrorStatus?: true; }; diff --git a/extension/js/common/render-relay.ts b/extension/js/common/render-relay.ts index 4f224578051..e0d66995838 100644 --- a/extension/js/common/render-relay.ts +++ b/extension/js/common/render-relay.ts @@ -10,7 +10,11 @@ import { TransferableAttachment } from './core/attachment.js'; export class RenderRelay implements RenderInterface { public constructor(private relayManager: RelayManagerInterface, private frameId: string) {} - public renderInnerAttachments = async (attachments: TransferableAttachment[], isEncrypted: boolean) => { + public renderErr = (errBoxContent: string, renderRawMsg: string | undefined, errMsg?: string | undefined) => { + this.relay({ renderErr: { errBoxContent, renderRawMsg, errMsg } }); + }; + + public renderInnerAttachments = (attachments: TransferableAttachment[], isEncrypted: boolean) => { this.relay({ renderInnerAttachments: { attachments, isEncrypted } }); }; @@ -45,6 +49,14 @@ export class RenderRelay implements RenderInterface { this.relay({ renderVerificationInProgress: true }); }; + public renderPassphraseNeeded = (longids: string[]) => { + this.relay({ renderPassphraseNeeded: longids }); + }; + + public clearErrorStatus = () => { + this.relay({ clearErrorStatus: true }); + }; + private relay = (message: RenderMessage) => { this.relayManager.relay(this.frameId, message); }; diff --git a/extension/js/common/xss-safe-factory.ts b/extension/js/common/xss-safe-factory.ts index e8079ebab68..89ebd6a1bd2 100644 --- a/extension/js/common/xss-safe-factory.ts +++ b/extension/js/common/xss-safe-factory.ts @@ -92,11 +92,11 @@ export class XssSafeFactory { * When edited, REQUEST A SECOND SET OF EYES TO REVIEW CHANGES */ - public static getWindowOfEmbeddedMsg = (frameId: string): Window | undefined => { + public static getEmbeddedMsg = (frameId: string): { frameElement: HTMLIFrameElement; frameWindow: Window } | undefined => { // const iframe = document.getElementById(frameId) as HTMLIFrameElement; - const iframe = $(`iframe#${frameId}`).get(0) as HTMLIFrameElement; - if (iframe?.contentWindow) { - return iframe?.contentWindow; + const frameElement = $(`iframe#${frameId}`).get(0) as HTMLIFrameElement; + if (frameElement?.contentWindow) { + return { frameElement, frameWindow: frameElement.contentWindow }; } Catch.report('Unable to find iframe by frameId=' + frameId); return undefined; diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index 3af43693600..806ad904667 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -25,15 +25,12 @@ import { SendAsAlias } from '../../common/platform/store/acct-store.js'; // todo: can we somehow define a purely relay class for ContactStore to clearly show that crypto-libraries are not loaded and can't be used? import { ContactStore } from '../../common/platform/store/contact-store.js'; import { Buf } from '../../common/core/buf.js'; -import { MessageRenderer } from '../../common/message-renderer.js'; +import { JQueryEl, MessageRenderer } from '../../common/message-renderer.js'; import { RelayManager } from '../../common/relay-manager.js'; import { Mime } from '../../common/core/mime.js'; import { FormatError, MsgUtil } from '../../common/core/crypto/pgp/msg-util.js'; import { RenderInterface } from '../../common/render-interface.js'; import { MsgBlock, MsgBlockType } from '../../common/core/msg-block.js'; -import { KeyStore } from '../../common/platform/store/key-store.js'; - -type JQueryEl = JQuery; type ProcessedMessage = { renderedXssSafe?: string; blocksInFrames: Dict; attachments: Attachment[]; from: string | undefined }; @@ -57,6 +54,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { private switchToEncryptedReply = false; private removeNextReplyBoxBorders = false; private shouldShowEditableSecureReply = false; + private readonly messageRenderer: MessageRenderer; private sel = { // gmail_variant=standard|new @@ -91,6 +89,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { ) { this.webmailCommon = new WebmailCommon(acctEmail, injector); this.gmail = new Gmail(acctEmail); + this.messageRenderer = new MessageRenderer(acctEmail); this.pubLookup = new PubLookup(this.clientConfiguration); } @@ -256,7 +255,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { const { renderedXssSafe, blocksInFrames, from } = await this.msgGetProcessed(msgId); const senderEmail = this.getSenderEmail(this.getMsgBodyEl(msgId)) || from; // todo: const isOutgoing = !!this.sendAs[senderEmail]; - MessageRenderer.processInlineBlocks(this.relayManager, this.factory, this.acctEmail, blocksInFrames, senderEmail).catch(Catch.reportErr); + this.messageRenderer.processInlineBlocks(this.relayManager, this.factory, blocksInFrames, senderEmail).catch(Catch.reportErr); if (renderedXssSafe) { $(this.sel.translatePrompt).hide(); if (this.debug) { @@ -629,14 +628,14 @@ export class GmailElementReplacer implements WebmailElementReplacer { ) => { const { frameId, frameXssSafe } = this.factory.embeddedRenderMsg(type); msgElReference.msgEl = this.updateMsgBodyEl_DANGEROUSLY(msgElReference.msgEl, 'set', frameXssSafe); // xss-safe-factory - MessageRenderer.relayAndProcess(this.relayManager, this.factory, frameId, cb).catch(Catch.reportErr); + this.messageRenderer.relayAndProcess(this.relayManager, this.factory, frameId, cb).catch(Catch.reportErr); }; private processSignedMessage = async (msgId: string, renderModule: RenderInterface, senderEmail: string) => { try { renderModule.renderText('Loading signed message...'); const raw = await this.msgGetRaw(msgId); - return await MessageRenderer.renderSignedMessage(this.acctEmail, raw, renderModule, senderEmail); + return await this.messageRenderer.renderSignedMessage(raw, renderModule, senderEmail); } catch { // todo: render error via renderModule } @@ -658,8 +657,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { throw new FormatError('Problem extracting armored message', attachment.getData().toUtfStr()); } renderModule.renderText('Decrypting...'); - const kisWithPp = await KeyStore.getAllWithOptionalPassPhrase(this.acctEmail); // todo: cache? - return await MessageRenderer.renderEncryptedMessage(this.acctEmail, armoredMsg, kisWithPp, renderModule, senderEmail); + return await this.messageRenderer.renderEncryptedMessage(armoredMsg, renderModule, senderEmail); } catch { // todo: render error via renderModule } diff --git a/test/source/tests/page-recipe/inbox-page-recipe.ts b/test/source/tests/page-recipe/inbox-page-recipe.ts index 0fa0a42c381..50d0776cd96 100644 --- a/test/source/tests/page-recipe/inbox-page-recipe.ts +++ b/test/source/tests/page-recipe/inbox-page-recipe.ts @@ -79,7 +79,7 @@ export class InboxPageRecipe extends PageRecipe { const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await InboxPageRecipe.finishSessionOnInboxPage(inboxPage); await inboxPage.waitAll('iframe'); - const pgpBlockFrame = await inboxPage.getFrame(['pgp_block.htm']); + const pgpBlockFrame = await inboxPage.getFrame(['pgp_render_block.htm']); await pgpBlockFrame.waitAll('@pgp-block-content'); await pgpBlockFrame.waitForSelTestState('ready'); await pgpBlockFrame.waitAndClick('@action-show-passphrase-dialog', { delay: 1 }); From 9bbdb8e889ae33fdef5c9162a31cad4fe6244434 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 2 May 2023 13:39:42 +0100 Subject: [PATCH 028/147] fixes --- .../webmail/gmail-element-replacer.ts | 6 ++--- test/source/tests/decrypt.ts | 24 +++++++------------ test/source/tests/gmail.ts | 4 ++-- 3 files changed, 13 insertions(+), 21 deletions(-) diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index 806ad904667..6661bd0819f 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -253,9 +253,6 @@ export class GmailElementReplacer implements WebmailElementReplacer { } const msgId = this.determineMsgId(emailContainer); const { renderedXssSafe, blocksInFrames, from } = await this.msgGetProcessed(msgId); - const senderEmail = this.getSenderEmail(this.getMsgBodyEl(msgId)) || from; - // todo: const isOutgoing = !!this.sendAs[senderEmail]; - this.messageRenderer.processInlineBlocks(this.relayManager, this.factory, blocksInFrames, senderEmail).catch(Catch.reportErr); if (renderedXssSafe) { $(this.sel.translatePrompt).hide(); if (this.debug) { @@ -265,6 +262,9 @@ export class GmailElementReplacer implements WebmailElementReplacer { if (this.debug) { console.debug('replaceArmoredBlocks() for of emailsContainingPgpBlock -> emailContainer replaced'); } + const senderEmail = this.getSenderEmail(this.getMsgBodyEl(msgId)) || from; + // todo: const isOutgoing = !!this.sendAs[senderEmail]; + this.messageRenderer.processInlineBlocks(this.relayManager, this.factory, blocksInFrames, senderEmail).catch(Catch.reportErr); } } }; diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index dccad2fffef..50d39ccaefe 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -1213,9 +1213,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== await inboxPage.waitAll('iframe', { timeout: 2 }); const urls = await inboxPage.getFramesUrls(['/chrome/elements/pgp_render_block.htm'], { sleep: 10, appearIn: 20 }); expect(urls.length).to.equal(1); - const url = urls[0].split('/chrome/elements/pgp_render_block.htm')[1]; - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - params: url, + await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame(['pgp_render_block.htm']), { content: ['How is my message signed?'], encryption: 'not encrypted', signature: 'signed', @@ -1276,7 +1274,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'ci.tests.gmail'); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'ci.tests.gmail'); const dbPage = await browser.newExtensionPage(t, 'chrome/dev/ci_unit_test.htm'); // todo: url? // add the pubkey of the sender await dbPage.page.evaluate(async (pubkey: string) => { @@ -1285,10 +1283,8 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== // eslint-disable-next-line @typescript-eslint/no-explicit-any await (window as any).ContactStore.update(undefined, 'schlemazle@proton.me', { pubkey: key }); }, testConstants.protonPubkey); - const accessToken = await BrowserRecipe.getGoogleAccessToken(dbPage, acctEmail); await dbPage.close(); - const extraAuthHeaders = { Authorization: `Bearer ${accessToken}` }; // eslint-disable-line @typescript-eslint/naming-convention - const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/1869220e0c8f16dd`, undefined, extraAuthHeaders); + const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/1869220e0c8f16dd`, undefined, authHdr); await gmailPage.waitAll('iframe'); const pgpBlock = await gmailPage.getFrame(['pgp_render_block.htm']); await BrowserRecipe.pgpBlockCheck(t, pgpBlock, { @@ -1350,12 +1346,10 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'ci.tests.gmail'); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'ci.tests.gmail'); const settingsPage = await browser.newExtensionSettingsPage(t, acctEmail); - const accessToken = await BrowserRecipe.getGoogleAccessToken(settingsPage, acctEmail); // todo: include in t? await settingsPage.close(); - const extraAuthHeaders = { Authorization: `Bearer ${accessToken}` }; // eslint-disable-line @typescript-eslint/naming-convention - const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/1866867cfdb8b61e`, undefined, extraAuthHeaders); + const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/1866867cfdb8b61e`, undefined, authHdr); await gmailPage.waitAll('iframe'); const pgpBlocks = await Promise.all((await gmailPage.getFramesUrls(['pgp_render_block.htm'])).map(url => gmailPage.getFrame([url]))); expect(pgpBlocks.length).to.equal(3); @@ -1832,7 +1826,7 @@ d6Z36//MsmczN00Wd60t9T+qyLz0T4/UG2Y9lgf367f3d+kYPE0LS7mXuFmjlPXfw0nKyVsSeFiu }, }, }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); const pgpBlockPage = await inboxPage.getFrame(['pgp_render_block.htm']); await pgpBlockPage.waitAndClick('@download-attachment-0'); @@ -1867,10 +1861,8 @@ d6Z36//MsmczN00Wd60t9T+qyLz0T4/UG2Y9lgf367f3d+kYPE0LS7mXuFmjlPXfw0nKyVsSeFiu }) ); expect(Object.entries(downloadedFile3).length).to.equal(1); - const accessToken = await BrowserRecipe.getGoogleAccessToken(inboxPage2, acctEmail); await inboxPage2.close(); - const extraAuthHeaders = { Authorization: `Bearer ${accessToken}` }; // eslint-disable-line @typescript-eslint/naming-convention - const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${threadId}`, undefined, extraAuthHeaders); + const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${threadId}`, undefined, authHdr); await gmailPage.waitAll('iframe'); const pgpBlockPage3 = await gmailPage.getFrame(['pgp_render_block.htm']); await pgpBlockPage3.waitAndClick('@download-attachment-0'); @@ -1894,7 +1886,7 @@ d6Z36//MsmczN00Wd60t9T+qyLz0T4/UG2Y9lgf367f3d+kYPE0LS7mXuFmjlPXfw0nKyVsSeFiu ); expect(Object.entries([downloadedFile4, downloadedFile5]).length).to.equal(2); await gmailPage.close(); - const gmailPage2 = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${threadId2}`, undefined, extraAuthHeaders); + const gmailPage2 = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${threadId2}`, undefined, authHdr); const pgpBlockPage4 = await gmailPage2.getFrame(['pgp_render_block.htm']); // todo: glitch? it shows "not encrypted" and "not signed" await pgpBlockPage4.waitAndClick('@download-attachment-0'); diff --git a/test/source/tests/gmail.ts b/test/source/tests/gmail.ts index 94244832903..6f6df2560c2 100644 --- a/test/source/tests/gmail.ts +++ b/test/source/tests/gmail.ts @@ -150,14 +150,14 @@ export const defineGmailTests = (testVariant: TestVariant, testWithBrowser: Test await Util.sleep(2); // wait for search results */ await gotoGmailPage(gmailPage, '/FMfcgzGkbDWztBnnCgRHzjrvmFqLtcJD'); - const pgpBlockUrls = await gmailPage.getFramesUrls(['/chrome/elements/pgp_block.htm'], { + const pgpBlockUrls = await gmailPage.getFramesUrls(['/chrome/elements/pgp_render_block.htm'], { sleep: 10, appearIn: 25, }); expect(pgpBlockUrls.length).to.equal(1); await gmailPage.page.setOfflineMode(true); // go offline mode await gmailPage.press('Enter'); // open the message - const pgpBlockFrame = await gmailPage.getFrame(['pgp_block.htm']); + const pgpBlockFrame = await gmailPage.getFrame([pgpBlockUrls[0]]); await gmailPage.page.setOfflineMode(true); // go offline mode await pgpBlockFrame.frame.goto(pgpBlockFrame.frame.url()); // reload the frame await pgpBlockFrame.waitForContent('@pgp-block-content', 'this should decrypt even offline'); From 249b44cd1623471344f7c27ad80c491ef97263ca Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 2 May 2023 19:11:13 +0100 Subject: [PATCH 029/147] enable print --- .../chrome/elements/pgp_base_block_view.ts | 2 + .../pgp-block-print-module.ts | 52 +++---------------- extension/chrome/elements/pgp_render_block.ts | 11 ++-- .../inbox-active-thread-module.ts | 7 +-- extension/js/common/message-renderer.ts | 45 +++++++++++++++- extension/js/common/render-interface.ts | 2 + extension/js/common/render-message.ts | 6 +++ extension/js/common/render-relay.ts | 6 ++- .../webmail/gmail-element-replacer.ts | 43 ++++++++++----- test/source/tests/decrypt.ts | 3 +- 10 files changed, 107 insertions(+), 70 deletions(-) diff --git a/extension/chrome/elements/pgp_base_block_view.ts b/extension/chrome/elements/pgp_base_block_view.ts index cbf7a774102..842d9218704 100644 --- a/extension/chrome/elements/pgp_base_block_view.ts +++ b/extension/chrome/elements/pgp_base_block_view.ts @@ -5,6 +5,7 @@ import { View } from '../../js/common/view.js'; import { PgpBlockViewAttachmentsModule } from './pgp_block_modules/pgp-block-attachmens-module.js'; import { PgpBlockViewErrorModule } from './pgp_block_modules/pgp-block-error-module.js'; +import { PgpBlockViewPrintModule } from './pgp_block_modules/pgp-block-print-module.js'; import { PgpBlockViewQuoteModule } from './pgp_block_modules/pgp-block-quote-module.js'; import { PgpBlockViewRenderModule } from './pgp_block_modules/pgp-block-render-module.js'; @@ -13,6 +14,7 @@ export abstract class PgpBaseBlockView extends View { public readonly renderModule: PgpBlockViewRenderModule; public readonly attachmentsModule: PgpBlockViewAttachmentsModule; public readonly errorModule: PgpBlockViewErrorModule; + public readonly printModule = new PgpBlockViewPrintModule(); public constructor( public readonly debug: boolean, diff --git a/extension/chrome/elements/pgp_block_modules/pgp-block-print-module.ts b/extension/chrome/elements/pgp_block_modules/pgp-block-print-module.ts index 351946ad7d7..231cdab8e18 100644 --- a/extension/chrome/elements/pgp_block_modules/pgp-block-print-module.ts +++ b/extension/chrome/elements/pgp_block_modules/pgp-block-print-module.ts @@ -2,58 +2,18 @@ 'use strict'; -import { PgpBlockView } from '../pgp_block.js'; import { Time } from '../../../js/common/browser/time.js'; +import { Catch } from '../../../js/common/platform/catch.js'; import { Xss } from '../../../js/common/platform/xss.js'; -import { AcctStore } from '../../../js/common/platform/store/acct-store.js'; -import { GmailParser } from '../../../js/common/api/email-provider/gmail/gmail-parser.js'; -import { Str } from '../../../js/common/core/common.js'; export class PgpBlockViewPrintModule { - private printMailInfoHtml!: string; - - public constructor(private view: PgpBlockView) {} - - public initPrintView = async () => { - const fullName = await AcctStore.get(this.view.acctEmail, ['full_name']); - Xss.sanitizeRender('.print_user_email', `${fullName.full_name} <${this.view.acctEmail}>`); - try { - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - const gmailMsg = await this.view.gmail.msgGet(this.view.msgId!, 'metadata', undefined); - const sentDate = new Date(GmailParser.findHeader(gmailMsg, 'date') ?? ''); - const sentDateStr = Str.fromDate(sentDate).replace(' ', ' at '); - const from = Str.parseEmail(GmailParser.findHeader(gmailMsg, 'from') ?? ''); - const fromHtml = from.name ? `${Xss.htmlSanitize(from.name)} <${from.email}>` : from.email; - /* eslint-disable @typescript-eslint/no-non-null-assertion */ - const ccString = GmailParser.findHeader(gmailMsg, 'cc') - ? `Cc: ${Xss.escape(GmailParser.findHeader(gmailMsg, 'cc')!)}
` - : ''; - const bccString = GmailParser.findHeader(gmailMsg, 'bcc') ? `Bcc: ${Xss.escape(GmailParser.findHeader(gmailMsg, 'bcc')!)}
` : ''; - /* eslint-enable @typescript-eslint/no-non-null-assertion */ - this.printMailInfoHtml = ` -
-

${Xss.htmlSanitize(GmailParser.findHeader(gmailMsg, 'subject') ?? '')}

-
-
-
-
- From: ${fromHtml} -
-
- ${sentDateStr} -
-
- To: ${Xss.escape(GmailParser.findHeader(gmailMsg, 'to') ?? '')}
- ${ccString} - ${bccString} -
- `; - } catch (e) { - this.view.errorModule.debug(`Error while getting gmail message for ${this.view.msgId} message. ${e}`); - } - }; + public printMailInfoHtml: string | undefined; public printPGPBlock = async () => { + if (!this.printMailInfoHtml) { + Catch.reportErr('printMailInfoHtml not prepared!'); + return; + } const w = window.open(); const html = ` diff --git a/extension/chrome/elements/pgp_render_block.ts b/extension/chrome/elements/pgp_render_block.ts index 4fcb884e32e..49f2380480a 100644 --- a/extension/chrome/elements/pgp_render_block.ts +++ b/extension/chrome/elements/pgp_render_block.ts @@ -9,6 +9,7 @@ import { View } from '../../js/common/view.js'; import { PgpBaseBlockView } from './pgp_base_block_view.js'; import { RenderMessage } from '../../js/common/render-message.js'; import { Attachment } from '../../js/common/core/attachment.js'; +import { Xss } from '../../js/common/platform/xss.js'; export class PgpRenderBlockView extends PgpBaseBlockView { public constructor() { @@ -25,16 +26,14 @@ export class PgpRenderBlockView extends PgpBaseBlockView { } public render = async () => { - // await this.renderModule.initPrintView(); + // }; public setHandlers = () => { - /* $('.pgp_print_button').on( 'click', - this.setHandler(() => this.renderModule.printPGPBlock()) + this.setHandler(() => this.printModule.printPGPBlock()) ); - */ }; private handleMessage = (event: MessageEvent) => { @@ -80,6 +79,10 @@ export class PgpRenderBlockView extends PgpBaseBlockView { if (data?.setTestState) { Ui.setTestState(data.setTestState); } + if (data?.printMailInfo) { + Xss.sanitizeRender('.print_user_email', data.printMailInfo.userNameAndEmail); + this.printModule.printMailInfoHtml = data.printMailInfo.html; + } }; } diff --git a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts index 0ace5a27eff..80b98ab16aa 100644 --- a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts +++ b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts @@ -108,9 +108,10 @@ export class InboxActiveThreadModule extends ViewModule { const htmlId = this.replyMsgId(message.id); const from = GmailParser.findHeader(message, 'from'); try { - const { raw } = await this.view.gmail.msgGet(message.id, 'raw'); + const msg = await this.view.gmail.msgGet(message.id, 'raw'); // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - const { blocks, headers } = await MessageRenderer.processMessageFromRaw(raw!); + const { blocks, headers } = await MessageRenderer.processMessageFromRaw(msg.raw!); + const printInfoHtml = await this.view.messageRenderer.getPrintViewInfo(msg); // todo: review the meaning of threadHasPgpBlock this.threadHasPgpBlock ||= blocks.some(block => ['encryptedMsg', 'publicKey', 'privateKey', 'signedMsg'].includes(block.block.type)); // todo: take `from` from the processedMessage? @@ -144,7 +145,7 @@ export class InboxActiveThreadModule extends ViewModule { $('.thread').append(this.wrapMsg(htmlId, r)); // xss-safe-factory // todo: isOutgoing ? this.view.messageRenderer - .processInlineBlocks(this.view.relayManager, this.view.factory, blocksInFrames, from ? Str.parseEmail(from).email : undefined) + .processInlineBlocks(this.view.relayManager, this.view.factory, printInfoHtml, blocksInFrames, from ? Str.parseEmail(from).email : undefined) .catch(Catch.reportErr); if (exportBtn) { $('.action-export').on( diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index 1a669ab0fde..e473ae55d68 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -15,13 +15,14 @@ import { MsgBlockParser } from './core/msg-block-parser.js'; import { MsgBlock } from './core/msg-block.js'; import { Lang } from './lang.js'; import { Catch } from './platform/catch.js'; -import { SendAsAlias } from './platform/store/acct-store.js'; +import { AcctStore, SendAsAlias } from './platform/store/acct-store.js'; import { ContactStore } from './platform/store/contact-store.js'; import { KeyStore } from './platform/store/key-store.js'; import { PassphraseStore } from './platform/store/passphrase-store.js'; import { Xss } from './platform/xss.js'; import { RelayManager } from './relay-manager.js'; import { RenderInterface, RenderInterfaceBase } from './render-interface.js'; +import { PrintMailInfo } from './render-message'; import { saveFetchedPubkeysIfNewerThanInStorage } from './shared.js'; import { XssSafeFactory } from './xss-safe-factory.js'; import * as DOMPurify from 'dompurify'; @@ -284,11 +285,13 @@ export class MessageRenderer { relayManager: RelayManager, factory: XssSafeFactory, frameId: string, + printMailInfo: PrintMailInfo, cb: (renderModule: RenderInterface) => Promise<{ publicKeys?: string[]; needPassphrase?: string[] }> ) => { const embeddedReference = XssSafeFactory.getEmbeddedMsg(frameId); if (embeddedReference) { const renderModule = relayManager.createRelay(frameId, embeddedReference.frameWindow); + renderModule.setPrintMailInfo(printMailInfo); let result = await cb(renderModule); const appendAfter = $(`iframe#${frameId}`); // todo: how publicKeys and needPassphrase interact? @@ -314,13 +317,16 @@ export class MessageRenderer { public processInlineBlocks = async ( relayManager: RelayManager, factory: XssSafeFactory, + printMailInfo: PrintMailInfo, blocks: Dict, from?: string // need to unify somehow when we accept `abc ` and when just `email@address` ) => { const signerEmail = from ? Str.parseEmail(from).email : undefined; await Promise.all( Object.entries(blocks).map(([frameId, block]) => - this.relayAndProcess(relayManager, factory, frameId, renderModule => this.renderMsgBlock(block, renderModule, signerEmail)).catch(Catch.reportErr) + this.relayAndProcess(relayManager, factory, frameId, printMailInfo, renderModule => this.renderMsgBlock(block, renderModule, signerEmail)).catch( + Catch.reportErr + ) ) ); }; @@ -452,4 +458,39 @@ export class MessageRenderer { } return {}; }; + + public getPrintViewInfo = async (metadata: GmailRes.GmailMsg): Promise => { + const fullName = await AcctStore.get(this.acctEmail, ['full_name']); // todo: cache + const sentDate = new Date(GmailParser.findHeader(metadata, 'date') ?? ''); + const sentDateStr = Str.fromDate(sentDate).replace(' ', ' at '); + const from = Str.parseEmail(GmailParser.findHeader(metadata, 'from') ?? ''); + const fromHtml = from.name ? `${Xss.htmlSanitize(from.name)} <${from.email}>` : from.email; + /* eslint-disable @typescript-eslint/no-non-null-assertion */ + const ccString = GmailParser.findHeader(metadata, 'cc') + ? `Cc: ${Xss.escape(GmailParser.findHeader(metadata, 'cc')!)}
` + : ''; + const bccString = GmailParser.findHeader(metadata, 'bcc') ? `Bcc: ${Xss.escape(GmailParser.findHeader(metadata, 'bcc')!)}
` : ''; + /* eslint-enable @typescript-eslint/no-non-null-assertion */ + return { + userNameAndEmail: `${fullName.full_name} <${this.acctEmail}>`, + html: ` +
+

${Xss.htmlSanitize(GmailParser.findHeader(metadata, 'subject') ?? '')}

+
+
+
+
+ From: ${fromHtml} +
+
+ ${sentDateStr} +
+
+ To: ${Xss.escape(GmailParser.findHeader(metadata, 'to') ?? '')}
+ ${ccString} + ${bccString} +
+ `, + }; + }; } diff --git a/extension/js/common/render-interface.ts b/extension/js/common/render-interface.ts index be00e19949b..4410f2411fe 100644 --- a/extension/js/common/render-interface.ts +++ b/extension/js/common/render-interface.ts @@ -3,6 +3,7 @@ 'use strict'; import { TransferableAttachment } from './core/attachment.js'; +import { PrintMailInfo } from './render-message.js'; export interface RenderInterfaceBase { resizePgpBlockFrame(): void; @@ -13,6 +14,7 @@ export interface RenderInterfaceBase { } export interface RenderInterface extends RenderInterfaceBase { + setPrintMailInfo(info: PrintMailInfo): void; clearErrorStatus(): void; renderPassphraseNeeded(longids: string[]): void; renderErr(errBoxContent: string, renderRawMsg: string | undefined, errMsg?: string): void; diff --git a/extension/js/common/render-message.ts b/extension/js/common/render-message.ts index 42a8be98d6b..26961afc9e2 100644 --- a/extension/js/common/render-message.ts +++ b/extension/js/common/render-message.ts @@ -4,6 +4,11 @@ import { TransferableAttachment } from './core/attachment.js'; +export type PrintMailInfo = { + userNameAndEmail: string; + html: string; +}; + export type RenderMessage = { setTestState?: 'ready' | 'working' | 'waiting'; resizePgpBlockFrame?: true; @@ -20,4 +25,5 @@ export type RenderMessage = { renderPassphraseNeeded?: string[]; // longids renderErr?: { errBoxContent: string; renderRawMsg: string | undefined; errMsg?: string }; clearErrorStatus?: true; + printMailInfo?: PrintMailInfo; }; diff --git a/extension/js/common/render-relay.ts b/extension/js/common/render-relay.ts index e0d66995838..8cf367c2d7b 100644 --- a/extension/js/common/render-relay.ts +++ b/extension/js/common/render-relay.ts @@ -4,7 +4,7 @@ import { RelayManagerInterface } from './relay-manager-interface.js'; import { RenderInterface } from './render-interface.js'; -import { RenderMessage } from './render-message.js'; +import { PrintMailInfo, RenderMessage } from './render-message.js'; import { TransferableAttachment } from './core/attachment.js'; export class RenderRelay implements RenderInterface { @@ -57,6 +57,10 @@ export class RenderRelay implements RenderInterface { this.relay({ clearErrorStatus: true }); }; + public setPrintMailInfo = (printMailInfo: PrintMailInfo) => { + this.relay({ printMailInfo }); + }; + private relay = (message: RenderMessage) => { this.relayManager.relay(this.frameId, message); }; diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index 6661bd0819f..530c5cc4691 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -31,8 +31,15 @@ import { Mime } from '../../common/core/mime.js'; import { FormatError, MsgUtil } from '../../common/core/crypto/pgp/msg-util.js'; import { RenderInterface } from '../../common/render-interface.js'; import { MsgBlock, MsgBlockType } from '../../common/core/msg-block.js'; +import { PrintMailInfo } from '../../common/render-message.js'; -type ProcessedMessage = { renderedXssSafe?: string; blocksInFrames: Dict; attachments: Attachment[]; from: string | undefined }; +type ProcessedMessage = { + renderedXssSafe?: string; + blocksInFrames: Dict; + attachments: Attachment[]; + printMailInfo: PrintMailInfo; + from: string | undefined; +}; interface MessageCacheEntry { download: { full: Promise; raw?: Promise }; @@ -220,13 +227,19 @@ export class GmailElementReplacer implements WebmailElementReplacer { } let renderedXssSafe: string | undefined; let blocksInFrames: Dict = {}; + const from = GmailParser.findHeader(fullOrRawMsg, 'from'); if (blocks.length === 0 || (blocks.length === 1 && ['plainText', 'plainHtml'].includes(blocks[0].type))) { // only has single block which is plain text } else { - const from = GmailParser.findHeader(fullOrRawMsg, 'from'); ({ renderedXssSafe, blocksInFrames } = MessageRenderer.renderMsg({ blocks, from }, this.factory, false, msgId, this.sendAs)); } - msgDownload.processedFull = { renderedXssSafe, blocksInFrames, from: GmailParser.findHeader(fullOrRawMsg, 'from'), attachments: mimeContent.attachments }; + msgDownload.processedFull = { + renderedXssSafe, + blocksInFrames, + printMailInfo: await this.messageRenderer.getPrintViewInfo(fullOrRawMsg), + from, + attachments: mimeContent.attachments, + }; return msgDownload.processedFull; }; @@ -252,7 +265,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { console.debug('replaceArmoredBlocks() for of emailsContainingPgpBlock -> emailContainer added evaluated'); } const msgId = this.determineMsgId(emailContainer); - const { renderedXssSafe, blocksInFrames, from } = await this.msgGetProcessed(msgId); + const { renderedXssSafe, blocksInFrames, printMailInfo, from } = await this.msgGetProcessed(msgId); if (renderedXssSafe) { $(this.sel.translatePrompt).hide(); if (this.debug) { @@ -264,7 +277,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { } const senderEmail = this.getSenderEmail(this.getMsgBodyEl(msgId)) || from; // todo: const isOutgoing = !!this.sendAs[senderEmail]; - this.messageRenderer.processInlineBlocks(this.relayManager, this.factory, blocksInFrames, senderEmail).catch(Catch.reportErr); + this.messageRenderer.processInlineBlocks(this.relayManager, this.factory, printMailInfo, blocksInFrames, senderEmail).catch(Catch.reportErr); } } }; @@ -466,11 +479,11 @@ export class GmailElementReplacer implements WebmailElementReplacer { if (this.debug) { console.debug('processNewPgpAttachments() -> msgGet may take some time'); } - const { attachments } = await this.msgGetProcessed(msgId); + const { attachments, printMailInfo } = await this.msgGetProcessed(msgId); if (this.debug) { console.debug('processNewPgpAttachments() -> msgGet done -> processAttachments', attachments); } - await this.processAttachments(msgId, attachments, attachmentsContainer, false); + await this.processAttachments(msgId, attachments, attachmentsContainer, printMailInfo, false); } catch (e) { if (ApiErr.isAuthErr(e)) { this.notifications.showAuthPopupNeeded(this.acctEmail); @@ -494,6 +507,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { msgId: string, attachmentMetas: Attachment[], // todo: these are not Metas! attachmentsContainerInner: JQueryEl | HTMLElement, + printMailInfo: PrintMailInfo, skipGoogleDrive: boolean ) => { if (this.debug) { @@ -519,6 +533,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { attachmentsContainerInner, msgElReference, msgId, + printMailInfo, senderEmail, isOutgoing ); @@ -540,7 +555,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { attachmentsContainerInner.parents(this.sel.attachmentsContainerOuter).first().hide(); } if (!skipGoogleDrive) { - await this.processGoogleDriveAttachments(msgId, msgElReference.msgEl, attachmentsContainerInner); + await this.processGoogleDriveAttachments(msgId, msgElReference.msgEl, attachmentsContainerInner, printMailInfo); } }; @@ -551,6 +566,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { attachmentsContainerInner: JQueryEl, msgElReference: { msgEl: JQueryEl }, msgId: string, // deprecated + printMailInfo: PrintMailInfo, senderEmail: string, // deprecated? isOutgoing: boolean // deprecated ): Promise<'shown' | 'replaced' | 'hidden'> => { @@ -592,7 +608,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { attachmentsContainerInner.prepend(this.factory.embeddedAttachment(a, true)); // xss-safe-factory return 'replaced'; // native should be hidden, custom should appear instead } else if (treatAs === 'encryptedMsg') { - this.startProcessingForMsgEl(msgElReference, 'encryptedMsg', renderModule => this.processEncryptedMessage(a, renderModule, senderEmail)); + this.startProcessingForMsgEl(msgElReference, 'encryptedMsg', printMailInfo, renderModule => this.processEncryptedMessage(a, renderModule, senderEmail)); return 'hidden'; // native attachment should be hidden, the "attachment" goes to the message container } else if (treatAs === 'publicKey') { // todo - pubkey should be fetched in pgp_pubkey.js @@ -600,7 +616,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { } else if (treatAs === 'privateKey') { return await this.renderBackupFromFile(a, attachmentsContainerInner, msgElReference.msgEl); } else if (treatAs === 'signature') { - this.startProcessingForMsgEl(msgElReference, 'signedMsg', renderModule => this.processSignedMessage(msgId, renderModule, senderEmail)); + this.startProcessingForMsgEl(msgElReference, 'signedMsg', printMailInfo, renderModule => this.processSignedMessage(msgId, renderModule, senderEmail)); return 'hidden'; // native attachment should be hidden, the "attachment" goes to the message container } else { // standard file @@ -624,11 +640,12 @@ export class GmailElementReplacer implements WebmailElementReplacer { private startProcessingForMsgEl = ( msgElReference: { msgEl: JQueryEl }, type: MsgBlockType, // for diagnostics + printMailInfo: PrintMailInfo, cb: (renderModule: RenderInterface) => Promise<{ publicKeys?: string[] }> ) => { const { frameId, frameXssSafe } = this.factory.embeddedRenderMsg(type); msgElReference.msgEl = this.updateMsgBodyEl_DANGEROUSLY(msgElReference.msgEl, 'set', frameXssSafe); // xss-safe-factory - this.messageRenderer.relayAndProcess(this.relayManager, this.factory, frameId, cb).catch(Catch.reportErr); + this.messageRenderer.relayAndProcess(this.relayManager, this.factory, frameId, printMailInfo, cb).catch(Catch.reportErr); }; private processSignedMessage = async (msgId: string, renderModule: RenderInterface, senderEmail: string) => { @@ -664,7 +681,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { return {}; }; - private processGoogleDriveAttachments = async (msgId: string, msgEl: JQueryEl, attachmentsContainerInner: JQueryEl) => { + private processGoogleDriveAttachments = async (msgId: string, msgEl: JQueryEl, attachmentsContainerInner: JQueryEl, printMailInfo: PrintMailInfo) => { const notProcessedAttachmentsLoaders = attachmentsContainerInner.find('.attachment_loader'); if (notProcessedAttachmentsLoaders.length && msgEl.find('.gmail_drive_chip, a[href^="https://drive.google.com/file"]').length) { // replace google drive attachments - they do not get returned by Gmail API thus did not get replaced above @@ -687,7 +704,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { console.info('Missing Google Drive attachments download_url'); } } - await this.processAttachments(msgId, googleDriveAttachments, attachmentsContainerInner, true); + await this.processAttachments(msgId, googleDriveAttachments, attachmentsContainerInner, printMailInfo, true); } }; diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index 50d39ccaefe..04b1e98c43b 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -971,9 +971,10 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + // todo: test mock gmail page const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitAll('iframe'); - const pgpBlock = await inboxPage.getFrame(['pgp_block.htm']); + const pgpBlock = await inboxPage.getFrame(['pgp_render_block.htm']); await pgpBlock.waitForSelTestState('ready'); const printPage = await browser.newPageTriggeredBy(t, () => pgpBlock.click('@action-print')); await printPage.waitForContent('@print-user-email', 'First Last '); From a602a16b6081a0d5519cd68861ff1d01e053cc99 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 2 May 2023 19:14:50 +0100 Subject: [PATCH 030/147] fix --- extension/chrome/elements/pgp_block.ts | 46 +++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 4 deletions(-) diff --git a/extension/chrome/elements/pgp_block.ts b/extension/chrome/elements/pgp_block.ts index 93575d98446..980274b26af 100644 --- a/extension/chrome/elements/pgp_block.ts +++ b/extension/chrome/elements/pgp_block.ts @@ -17,7 +17,8 @@ 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'; import { PgpBaseBlockView } from './pgp_base_block_view.js'; -import { PgpBlockViewPrintModule } from './pgp_block_modules/pgp-block-print-module.js'; +import { GmailParser } from '../../js/common/api/email-provider/gmail/gmail-parser.js'; +import { Xss } from '../../js/common/platform/xss.js'; export class PgpBlockView extends PgpBaseBlockView { public readonly isOutgoing: boolean; @@ -34,7 +35,6 @@ export class PgpBlockView extends PgpBaseBlockView { public pubLookup!: PubLookup; public readonly signatureModule: PgpBlockViewSignatureModule; - public readonly printModule: PgpBlockViewPrintModule; public readonly decryptModule: PgpBlockViewDecryptModule; public fesUrl?: string; @@ -64,7 +64,6 @@ export class PgpBlockView extends PgpBaseBlockView { this.gmail = new Gmail(this.acctEmail); // modules this.signatureModule = new PgpBlockViewSignatureModule(this); - this.printModule = new PgpBlockViewPrintModule(this); this.decryptModule = new PgpBlockViewDecryptModule(this); } @@ -82,7 +81,7 @@ export class PgpBlockView extends PgpBaseBlockView { this.fesUrl = storage.fesUrl; this.clientConfiguration = await ClientConfiguration.newInstance(this.acctEmail); this.pubLookup = new PubLookup(this.clientConfiguration); - await this.printModule.initPrintView(); + await this.initPrintView(); if (storage.setup_done) { 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 @@ -100,6 +99,45 @@ export class PgpBlockView extends PgpBaseBlockView { this.setHandler(() => this.printModule.printPGPBlock()) ); }; + + private initPrintView = async () => { + const fullName = await AcctStore.get(this.acctEmail, ['full_name']); + Xss.sanitizeRender('.print_user_email', `${fullName.full_name} <${this.acctEmail}>`); + try { + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + const gmailMsg = await this.gmail.msgGet(this.msgId!, 'metadata', undefined); + const sentDate = new Date(GmailParser.findHeader(gmailMsg, 'date') ?? ''); + const sentDateStr = Str.fromDate(sentDate).replace(' ', ' at '); + const from = Str.parseEmail(GmailParser.findHeader(gmailMsg, 'from') ?? ''); + const fromHtml = from.name ? `${Xss.htmlSanitize(from.name)} <${from.email}>` : from.email; + /* eslint-disable @typescript-eslint/no-non-null-assertion */ + const ccString = GmailParser.findHeader(gmailMsg, 'cc') + ? `Cc: ${Xss.escape(GmailParser.findHeader(gmailMsg, 'cc')!)}
` + : ''; + const bccString = GmailParser.findHeader(gmailMsg, 'bcc') ? `Bcc: ${Xss.escape(GmailParser.findHeader(gmailMsg, 'bcc')!)}
` : ''; + /* eslint-enable @typescript-eslint/no-non-null-assertion */ + this.printModule.printMailInfoHtml = ` +
+

${Xss.htmlSanitize(GmailParser.findHeader(gmailMsg, 'subject') ?? '')}

+
+
+
+
+ From: ${fromHtml} +
+
+ ${sentDateStr} +
+
+ To: ${Xss.escape(GmailParser.findHeader(gmailMsg, 'to') ?? '')}
+ ${ccString} + ${bccString} +
+ `; + } catch (e) { + this.errorModule.debug(`Error while getting gmail message for ${this.msgId} message. ${e}`); + } + }; } View.run(PgpBlockView); From 52b13ee93ce099e5a044fd4c7ce28a2ccaf62b13 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 3 May 2023 10:45:52 +0100 Subject: [PATCH 031/147] goBack works in offline mode --- extension/js/common/xss-safe-factory.ts | 6 +++++- test/source/tests/gmail.ts | 20 +++++--------------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/extension/js/common/xss-safe-factory.ts b/extension/js/common/xss-safe-factory.ts index 89ebd6a1bd2..1ded5c422d1 100644 --- a/extension/js/common/xss-safe-factory.ts +++ b/extension/js/common/xss-safe-factory.ts @@ -94,7 +94,11 @@ export class XssSafeFactory { public static getEmbeddedMsg = (frameId: string): { frameElement: HTMLIFrameElement; frameWindow: Window } | undefined => { // const iframe = document.getElementById(frameId) as HTMLIFrameElement; - const frameElement = $(`iframe#${frameId}`).get(0) as HTMLIFrameElement; + const frameElement = $(`iframe#${frameId}`) + .filter(function () { + return this.offsetHeight > 0; // filter visible, there may be invisible leftovers + }) + .get(0) as HTMLIFrameElement; if (frameElement?.contentWindow) { return { frameElement, frameWindow: frameElement.contentWindow }; } diff --git a/test/source/tests/gmail.ts b/test/source/tests/gmail.ts index 6f6df2560c2..f590fc38f0e 100644 --- a/test/source/tests/gmail.ts +++ b/test/source/tests/gmail.ts @@ -144,23 +144,13 @@ export const defineGmailTests = (testVariant: TestVariant, testWithBrowser: Test testWithBrowser(async (t, browser) => { await BrowserRecipe.setUpCommonAcct(t, browser, 'ci.tests.gmail'); const gmailPage = await openGmailPage(t, browser); - /* - await gmailPage.type('[aria-label^="Search"]', 'encrypted email for offline decrypt'); - await gmailPage.press('Enter'); // submit search - await Util.sleep(2); // wait for search results - */ await gotoGmailPage(gmailPage, '/FMfcgzGkbDWztBnnCgRHzjrvmFqLtcJD'); - const pgpBlockUrls = await gmailPage.getFramesUrls(['/chrome/elements/pgp_render_block.htm'], { - sleep: 10, - appearIn: 25, - }); - expect(pgpBlockUrls.length).to.equal(1); - await gmailPage.page.setOfflineMode(true); // go offline mode - await gmailPage.press('Enter'); // open the message - const pgpBlockFrame = await gmailPage.getFrame([pgpBlockUrls[0]]); + const expectedMessage = { content: ['this should decrypt even offline'], signature: 'signed', encryption: 'encrypted' }; + await BrowserRecipe.pgpBlockCheck(t, await gmailPage.getFrame(['/chrome/elements/pgp_render_block.htm'], { timeout: 10000 }), expectedMessage); + await gotoGmailPage(gmailPage, '/FMfcgzGkbDRNgcQxLmkhBCKVSFwkfdvV'); // plain convo await gmailPage.page.setOfflineMode(true); // go offline mode - await pgpBlockFrame.frame.goto(pgpBlockFrame.frame.url()); // reload the frame - await pgpBlockFrame.waitForContent('@pgp-block-content', 'this should decrypt even offline'); + await gmailPage.page.goBack({ waitUntil: 'load' }); + await BrowserRecipe.pgpBlockCheck(t, await gmailPage.getFrame(['/chrome/elements/pgp_render_block.htm']), expectedMessage); }) ); From eddf070fb934c6d447102b3a0b862c4f9942d79b Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 3 May 2023 13:11:22 +0100 Subject: [PATCH 032/147] bogus PGP message --- .../pgp-block-render-module.ts | 5 +++-- extension/chrome/elements/pgp_render_block.ts | 3 +++ extension/js/common/message-renderer.ts | 9 +++++++-- extension/js/common/render-interface.ts | 1 + extension/js/common/render-message.ts | 1 + extension/js/common/render-relay.ts | 4 ++++ .../webmail/gmail-element-replacer.ts | 2 +- test/source/tests/decrypt.ts | 17 ++++++++++++----- 8 files changed, 32 insertions(+), 10 deletions(-) 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 9a8465044cf..7f69ce24288 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 @@ -95,11 +95,12 @@ export class PgpBlockViewRenderModule { } }; - public renderAsRegularContent = async (content: string) => { + public renderAsRegularContent = (content: string) => { this.setFrameColor('gray'); this.renderSignatureStatus('not signed'); this.renderEncryptionStatus('not encrypted'); - await this.renderContent(content, false); + this.renderContent(content, false); + Ui.setTestState('ready'); }; public renderPassphraseNeeded = (longids: string[]) => { diff --git a/extension/chrome/elements/pgp_render_block.ts b/extension/chrome/elements/pgp_render_block.ts index 49f2380480a..1dfc387f616 100644 --- a/extension/chrome/elements/pgp_render_block.ts +++ b/extension/chrome/elements/pgp_render_block.ts @@ -83,6 +83,9 @@ export class PgpRenderBlockView extends PgpBaseBlockView { Xss.sanitizeRender('.print_user_email', data.printMailInfo.userNameAndEmail); this.printModule.printMailInfoHtml = data.printMailInfo.html; } + if (data?.renderAsRegularContent) { + this.renderModule.renderAsRegularContent(data.renderAsRegularContent); + } }; } diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index e473ae55d68..df2f66ca470 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -333,7 +333,7 @@ export class MessageRenderer { public renderMsgBlock = async (block: MsgBlock, renderModule: RenderInterface, signerEmail?: string) => { // todo: 'signedMsg' also handled here? - return await this.renderEncryptedMessage(block.content, renderModule, signerEmail); + return await this.renderEncryptedMessage(block.content, renderModule, true, signerEmail); }; // todo: this should be moved to some other class? @@ -385,6 +385,7 @@ export class MessageRenderer { public renderEncryptedMessage = async ( encryptedData: string | Uint8Array, renderModule: RenderInterface, + fallbackToPlainText: boolean, signerEmail?: string ): Promise<{ publicKeys?: string[]; needPassphrase?: string[] }> => { const kisWithPp = await KeyStore.getAllWithOptionalPassPhrase(this.acctEmail); // todo: cache @@ -405,7 +406,11 @@ export class MessageRenderer { : undefined ); } else if (result.error.type === DecryptErrTypes.format) { - renderModule.renderErr(Lang.pgpBlock.badFormat + '\n\n' + result.error.message, Str.with(encryptedData)); + if (fallbackToPlainText) { + renderModule.renderAsRegularContent(Str.with(encryptedData)); + } else { + renderModule.renderErr(Lang.pgpBlock.badFormat + '\n\n' + result.error.message, Str.with(encryptedData)); + } } else if (result.longids.needPassphrase.length) { renderModule.renderPassphraseNeeded(result.longids.needPassphrase); return { needPassphrase: result.longids.needPassphrase }; diff --git a/extension/js/common/render-interface.ts b/extension/js/common/render-interface.ts index 4410f2411fe..1669a5bd878 100644 --- a/extension/js/common/render-interface.ts +++ b/extension/js/common/render-interface.ts @@ -14,6 +14,7 @@ export interface RenderInterfaceBase { } export interface RenderInterface extends RenderInterfaceBase { + renderAsRegularContent(content: string): void; setPrintMailInfo(info: PrintMailInfo): void; clearErrorStatus(): void; renderPassphraseNeeded(longids: string[]): void; diff --git a/extension/js/common/render-message.ts b/extension/js/common/render-message.ts index 26961afc9e2..9f6fe89d570 100644 --- a/extension/js/common/render-message.ts +++ b/extension/js/common/render-message.ts @@ -26,4 +26,5 @@ export type RenderMessage = { renderErr?: { errBoxContent: string; renderRawMsg: string | undefined; errMsg?: string }; clearErrorStatus?: true; printMailInfo?: PrintMailInfo; + renderAsRegularContent?: string; }; diff --git a/extension/js/common/render-relay.ts b/extension/js/common/render-relay.ts index 8cf367c2d7b..4f40b2b26e2 100644 --- a/extension/js/common/render-relay.ts +++ b/extension/js/common/render-relay.ts @@ -61,6 +61,10 @@ export class RenderRelay implements RenderInterface { this.relay({ printMailInfo }); }; + public renderAsRegularContent = (content: string) => { + this.relay({ renderAsRegularContent: content }); + }; + private relay = (message: RenderMessage) => { this.relayManager.relay(this.frameId, message); }; diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index 530c5cc4691..ed5f5095bcc 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -674,7 +674,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { throw new FormatError('Problem extracting armored message', attachment.getData().toUtfStr()); } renderModule.renderText('Decrypting...'); - return await this.messageRenderer.renderEncryptedMessage(armoredMsg, renderModule, senderEmail); + return await this.messageRenderer.renderEncryptedMessage(armoredMsg, renderModule, false, senderEmail); } catch { // todo: render error via renderModule } diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index 04b1e98c43b..14c8df81451 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -29,19 +29,26 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te `decrypt - detect bogus pgp message`, testWithBrowser(async (t, browser) => { const threadId = '17d7a32a0613071d'; + const msgId = '17d7a337b7b87eb9'; const acctEmail = 'flowcrypt.compatibility@gmail.com'; t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitForSelTestState('ready'); await inboxPage.waitAll('iframe'); - const pgpBlock = await inboxPage.getFrame(['pgp_render_block.htm']); - await pgpBlock.waitForContent('@pgp-encryption', 'not encrypted'); - await pgpBlock.waitForContent('@pgp-signature', 'not signed'); - await pgpBlock.waitForContent('@pgp-block-content', '-----BEGIN PGP MESSAGE-----\n\nThis is not a valid PGP message'); + const expectedMessage = { + encryption: 'not encrypted', + signature: 'not signed', + content: ['-----BEGIN PGP MESSAGE-----\n\nThis is not a valid PGP message'], + }; + await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame(['pgp_render_block.htm']), expectedMessage); await inboxPage.close(); + const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${msgId}`, undefined, authHdr); + await gmailPage.waitAll('iframe'); + await BrowserRecipe.pgpBlockCheck(t, await gmailPage.getFrame(['pgp_render_block.htm']), expectedMessage); + await gmailPage.close(); }) ); From bb9be06f10c6f0d0b16978537d6e460155cde1f1 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 3 May 2023 19:37:10 +0100 Subject: [PATCH 033/147] setup mock gmail for nested multipart/mixed and chunk download support --- test/source/mock/google/google-data.ts | 41 +++++++++++++++------ test/source/mock/google/google-endpoints.ts | 2 +- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/test/source/mock/google/google-data.ts b/test/source/mock/google/google-data.ts index 53b91a686c4..6ea0a06bfed 100644 --- a/test/source/mock/google/google-data.ts +++ b/test/source/mock/google/google-data.ts @@ -216,6 +216,18 @@ export class GoogleData { return msgCopy; }; + public static partsHavingFilename = (parts?: GmailMsg$payload$part[]): GmailMsg$payload$part[] => { + if (!parts) return []; + return parts + .map(part => { + if (part.mimeType === 'multipart/mixed') { + return GoogleData.partsHavingFilename(part.parts); + } + return part.filename ? [part] : []; + }) + .reduce((a, b) => a.concat(b)); + }; + public static getMockGmailPage = async (acct: string, msgId?: string) => { let msgBlock = ''; let attachmentsBlock = ''; @@ -230,14 +242,9 @@ export class GoogleData { htmlData = GoogleData.htmlFromText(textData); } else { htmlData = GoogleData.getHtmlDataToDisplay(payload.parts!); - if (typeof htmlData === 'undefined') { - // search inside multipart/alternative - const alternativePart = payload.parts!.find(part => part.mimeType === 'multipart/alternative'); - htmlData = GoogleData.getHtmlDataToDisplay(alternativePart!.parts!); - } } - const otherParts = payload.parts?.filter(part => part.filename); - if (otherParts?.length) { + const otherParts = GoogleData.partsHavingFilename(payload.parts); + if (otherParts.length) { attachmentsBlock = `
${otherParts.length} Attachments
` + @@ -256,7 +263,7 @@ export class GoogleData { msgBlock = `
Mock Sender -
${htmlData}
+
${htmlData ?? ''}
${attachmentsBlock}
@@ -301,12 +308,22 @@ export class GoogleData { return Buf.fromBase64Str(htmlPart.body!.data!).toUtfStr(); } else { const textPart = parts.find(part => part.mimeType === 'text/plain'); - if (typeof textPart?.body?.data === 'undefined') { - return undefined; + if (typeof textPart?.body?.data !== 'undefined') { + const textData = Buf.fromBase64Str(textPart.body.data).toUtfStr(); + return GoogleData.htmlFromText(textData); } - const textData = Buf.fromBase64Str(textPart.body.data).toUtfStr(); - return GoogleData.htmlFromText(textData); } + // search inside multipart/alternative + const alternativePart = parts.find(part => part.mimeType === 'multipart/alternative'); + if (alternativePart) { + return GoogleData.getHtmlDataToDisplay(alternativePart.parts!); + } + // search inside multipart/mixed + const mixedPart = parts.find(part => part.mimeType === 'multipart/mixed'); + if (mixedPart) { + return GoogleData.getHtmlDataToDisplay(mixedPart.parts!); + } + return undefined; }; private static htmlFromText = (textData: string): string => { diff --git a/test/source/mock/google/google-endpoints.ts b/test/source/mock/google/google-endpoints.ts index 65fd39e5570..1b62365d326 100644 --- a/test/source/mock/google/google-endpoints.ts +++ b/test/source/mock/google/google-endpoints.ts @@ -231,7 +231,7 @@ export const getMockGoogleEndpoints = (oauth: OauthMock): HandlersDefinition => if (req.url?.includes('/attachments/')) { const attachment = data.getAttachment(id); if (attachment) { - return attachment; + return { data: attachment.data }; // Note: data (or quoted) field must be last in serialized JSON } throw new HttpClientErr(`MOCK attachment not found for ${acct}: ${id}`, Status.NOT_FOUND); } From 8af508c21a2c7842a45e0630f4d5fa39f587abbb Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 3 May 2023 19:38:26 +0100 Subject: [PATCH 034/147] Added OpenPGP_signature webmailNamePattern --- extension/js/common/core/attachment.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extension/js/common/core/attachment.ts b/extension/js/common/core/attachment.ts index 2cde5502063..5e5f4f3b91f 100644 --- a/extension/js/common/core/attachment.ts +++ b/extension/js/common/core/attachment.ts @@ -36,7 +36,7 @@ export type TransferableAttachment = (AttachmentId | { data: /* base64 see #2587 export class Attachment { public static readonly webmailNamePattern = - /^(((cryptup|flowcrypt)-backup-[a-z0-9]+\.(key|asc))|(.+\.pgp)|(.+\.gpg)|(.+\.asc)|(noname)|(message)|(PGPMIME version identification)|(ATT[0-9]{5})|())$/m; + /^(((cryptup|flowcrypt)-backup-[a-z0-9]+\.(key|asc))|(.+\.pgp)|(.+\.gpg)|(.+\.asc)|(OpenPGP_signature(.asc)?)|(noname)|(message)|(PGPMIME version identification)|(ATT[0-9]{5})|())$/m; public static readonly encryptedMsgNames = ['msg.asc', 'message.asc', 'encrypted.asc', 'encrypted.eml.pgp', 'Message.pgp', 'openpgp-encrypted-message.asc']; public length = NaN; From 47c1ff4a0e29202b71156790cedd690ba13825e6 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 3 May 2023 19:39:16 +0100 Subject: [PATCH 035/147] more mock gmail tests --- test/source/tests/decrypt.ts | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index 14c8df81451..8d223d1d6d0 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -170,16 +170,19 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'ci.tests.gmail'); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'ci.tests.gmail'); const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitForSelTestState('ready'); await inboxPage.waitAll('iframe'); expect(await inboxPage.isElementPresent('@container-attachments')).to.equal(true); await inboxPage.waitForContent('.message.line', 'Plain message'); // expect no pgp blocks - const urls = await inboxPage.getFramesUrls(['/chrome/elements/pgp_block.htm']); + const urls = await inboxPage.getFramesUrls(['/chrome/elements/pgp_render_block.htm']); expect(urls.length).to.equal(0); await inboxPage.close(); + const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${threadId}`, undefined, authHdr); + expect((await inboxPage.getFramesUrls(['pgp_render_block.htm'])).length).to.equal(0); + await gmailPage.close(); }) ); @@ -1001,13 +1004,20 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitAll('iframe'); const pgpBlock = await inboxPage.getFrame(['pgp_block.htm']); await pgpBlock.waitForSelTestState('ready'); const urls = await inboxPage.getFramesUrls(['pgp_pubkey.htm'], { sleep: 3 }); expect(urls.length).to.be.equal(1); + await inboxPage.close(); + const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${threadId}`, undefined, authHdr); + await gmailPage.waitAll('iframe'); + const pgpBlockFromGmailPage = await gmailPage.getFrame(['pgp_render_block.htm']); + await pgpBlockFromGmailPage.waitForSelTestState('ready'); + const frameUrlsFromGmailPage = await inboxPage.getFramesUrls(['pgp_pubkey.htm'], { sleep: 3 }); + expect(frameUrlsFromGmailPage.length).to.be.equal(1); }) ); From efcfe85ef20ba84764b2432d13a9680b75b0584a Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 4 May 2023 09:07:35 +0100 Subject: [PATCH 036/147] fix tests --- test/source/tests/decrypt.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index 8d223d1d6d0..a594c802d38 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -181,7 +181,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te expect(urls.length).to.equal(0); await inboxPage.close(); const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${threadId}`, undefined, authHdr); - expect((await inboxPage.getFramesUrls(['pgp_render_block.htm'])).length).to.equal(0); + expect((await gmailPage.getFramesUrls(['pgp_render_block.htm'])).length).to.equal(0); await gmailPage.close(); }) ); @@ -1016,7 +1016,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== await gmailPage.waitAll('iframe'); const pgpBlockFromGmailPage = await gmailPage.getFrame(['pgp_render_block.htm']); await pgpBlockFromGmailPage.waitForSelTestState('ready'); - const frameUrlsFromGmailPage = await inboxPage.getFramesUrls(['pgp_pubkey.htm'], { sleep: 3 }); + const frameUrlsFromGmailPage = await gmailPage.getFramesUrls(['pgp_pubkey.htm'], { sleep: 3 }); expect(frameUrlsFromGmailPage.length).to.be.equal(1); }) ); From add21f8181ce95ed538541c9072bbeb84b463edf Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 8 May 2023 19:31:54 +0100 Subject: [PATCH 037/147] refactor to use only pgp_render_block.htm (wip) --- .../inbox-active-thread-module.ts | 102 +++- extension/chrome/settings/inbox/inbox.ts | 9 +- .../js/common/core/crypto/pgp/msg-util.ts | 8 +- extension/js/common/downloader.ts | 61 ++ .../js/common/loader-context-interface.ts | 42 ++ extension/js/common/message-renderer.ts | 364 +++++++++--- .../js/common/relay-manager-interface.ts | 4 + extension/js/common/relay-manager.ts | 30 +- .../webmail/gmail-element-replacer.ts | 367 +----------- .../content_scripts/webmail/loader-context.ts | 106 ++++ .../message-export-16a9c0fe4e034bc2.json | 4 +- .../message-export-16a9c109bc51687d.json | 4 +- test/source/mock/google/google-data.ts | 21 +- test/source/tests/compose.ts | 39 +- test/source/tests/decrypt.ts | 553 ++++++++++-------- test/source/tests/tooling/browser-recipe.ts | 58 +- test/source/util/index.ts | 4 - 17 files changed, 1029 insertions(+), 747 deletions(-) create mode 100644 extension/js/common/downloader.ts create mode 100644 extension/js/common/loader-context-interface.ts create mode 100644 extension/js/content_scripts/webmail/loader-context.ts diff --git a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts index 80b98ab16aa..8eca577a630 100644 --- a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts +++ b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts @@ -13,13 +13,56 @@ import { Buf } from '../../../../js/common/core/buf.js'; import { Catch } from '../../../../js/common/platform/catch.js'; import { InboxView } from '../inbox.js'; import { Lang } from '../../../../js/common/lang.js'; -import { AttachmentBlock, MessageRenderer } from '../../../../js/common/message-renderer.js'; +import { MessageRenderer } from '../../../../js/common/message-renderer.js'; import { Ui } from '../../../../js/common/browser/ui.js'; import { ViewModule } from '../../../../js/common/view-module.js'; import { Xss } from '../../../../js/common/platform/xss.js'; import { Browser } from '../../../../js/common/browser/browser.js'; import { Attachment } from '../../../../js/common/core/attachment.js'; import { MsgBlock } from '../../../../js/common/core/msg-block.js'; +import { Mime } from '../../../../js/common/core/mime.js'; +import { LoaderContextInterface, bindNow } from '../../../../js/common/loader-context-interface.js'; +import { BindInterface } from '../../../../js/common/relay-manager-interface.js'; + +class LoaderContext implements LoaderContextInterface { + private frameIdsToBind: string[] = []; + + public constructor(public readonly factory: XssSafeFactory, public renderedMessageXssSafe: string | undefined, public renderedAttachments: string[]) {} + + public bind = (frameId: string) => { + this.frameIdsToBind.push(frameId); + }; + + public renderPlainAttachment = (a: Attachment) => { + // todo: render error argument + this.renderedAttachments.push(this.factory.embeddedAttachment(a, false)); + }; + + public prependEncryptedAttachment = (a: Attachment) => { + this.renderedAttachments.unshift(this.factory.embeddedAttachment(a, true)); + }; + + public setMsgBody = (xssSafe: string, method: 'set' | 'append' | 'after') => { + if (method === 'set') { + this.renderedMessageXssSafe = xssSafe; + } else { + // todo: how append should differ from after? + this.renderedAttachments.unshift(xssSafe); + } + }; + + public hideAttachment = () => { + // not applicable + }; + + public completeBinding = (binder: BindInterface) => { + while (true) { + const frameId = this.frameIdsToBind.shift(); + if (!frameId) break; + bindNow(frameId, binder); + } + }; +} export class InboxActiveThreadModule extends ViewModule { private threadId: string | undefined; @@ -106,44 +149,57 @@ export class InboxActiveThreadModule extends ViewModule { private renderMsg = async (message: GmailRes.GmailMsg) => { const htmlId = this.replyMsgId(message.id); - const from = GmailParser.findHeader(message, 'from'); try { - const msg = await this.view.gmail.msgGet(message.id, 'raw'); - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - const { blocks, headers } = await MessageRenderer.processMessageFromRaw(msg.raw!); + const msg = await this.view.gmail.msgGet(message.id, 'full'); + const mimeContent = MessageRenderer.reconstructMimeContent(msg); + const blocks = Mime.processBody(mimeContent); const printInfoHtml = await this.view.messageRenderer.getPrintViewInfo(msg); // todo: review the meaning of threadHasPgpBlock - this.threadHasPgpBlock ||= blocks.some(block => ['encryptedMsg', 'publicKey', 'privateKey', 'signedMsg'].includes(block.block.type)); + this.threadHasPgpBlock ||= blocks.some(block => ['encryptedMsg', 'publicKey', 'privateKey', 'signedMsg'].includes(block.type)); // todo: take `from` from the processedMessage? const messageBlocks: MsgBlock[] = []; - const attachmentBlocks: AttachmentBlock[] = []; + const attachmentBlocks: MsgBlock[] = []; for (const block of blocks) { - if (block.file && ['encryptedAttachment', 'plainAttachment'].includes(block.block.type)) { - attachmentBlocks.push({ block: block.block, file: block.file }); + if (block.attachmentMeta && ['encryptedAttachment', 'plainAttachment'].includes(block.type)) { + attachmentBlocks.push(block); } else { - messageBlocks.push(block.block); + messageBlocks.push(block); } } - const { renderedXssSafe, isOutgoing, blocksInFrames } = MessageRenderer.renderMsg( - { from, blocks: messageBlocks }, + const { renderedXssSafe, blocksInFrames, printMailInfo, from } = await this.view.messageRenderer.msgGetProcessed(message.id); + + const exportBtn = this.debugEmails.includes(this.view.acctEmail) ? 'download api export' : ''; + const loaderContext = new LoaderContext( this.view.factory, - this.view.showOriginal, - message.id, - this.view.storage.sendAs + renderedXssSafe, + attachmentBlocks.map(block => + XssSafeFactory.renderableMsgBlock(this.view.factory, block, message.id, senderEmail, this.view.messageRenderer.isOutgoing(senderEmail)) + ) ); - const exportBtn = this.debugEmails.includes(this.view.acctEmail) ? 'download api export' : ''; + const senderEmail = from || 'unknown'; + for (const a of mimeContent.attachments) { + // todo: isBodyEmpty + const isBodyEmpty = false; + await this.view.messageRenderer.processAttachment( + a, + a.treatAs(mimeContent.attachments, isBodyEmpty), + loaderContext, + undefined, + message.id, + printMailInfo, + senderEmail + ); + } const r = `

From: ${Xss.escape(from || 'unknown')} ${ - headers.date + GmailParser.findHeader(msg, 'Date') ?? '' } ${exportBtn}

` + - renderedXssSafe + - (attachmentBlocks.length // todo: we always have data on this page (for now), as we download 'raw' - ? `
${attachmentBlocks - .map(block => XssSafeFactory.renderableMsgBlock(this.view.factory, block.block, message.id, from || 'unknown', isOutgoing)) - .join('')}
` + (loaderContext.renderedMessageXssSafe ?? '') + + (loaderContext.renderedAttachments.length // todo: we always have data on this page (for now), as we download 'raw' + ? `
${loaderContext.renderedAttachments.join('')}
` : ''); $('.thread').append(this.wrapMsg(htmlId, r)); // xss-safe-factory - // todo: isOutgoing ? + loaderContext.completeBinding(this.view.relayManager); this.view.messageRenderer .processInlineBlocks(this.view.relayManager, this.view.factory, printInfoHtml, blocksInFrames, from ? Str.parseEmail(from).email : undefined) .catch(Catch.reportErr); diff --git a/extension/chrome/settings/inbox/inbox.ts b/extension/chrome/settings/inbox/inbox.ts index 7ec3f5c95d1..b61c567537a 100644 --- a/extension/chrome/settings/inbox/inbox.ts +++ b/extension/chrome/settings/inbox/inbox.ts @@ -41,7 +41,7 @@ export class InboxView extends View { public injector!: Injector; public webmailCommon!: WebmailCommon; - public readonly messageRenderer: MessageRenderer; + public messageRenderer!: MessageRenderer; public factory!: XssSafeFactory; public storage!: AcctStoreDict; public tabId!: string; @@ -51,7 +51,6 @@ export class InboxView extends View { super(); const uncheckedUrlParams = Url.parse(['acctEmail', 'labelId', 'threadId', 'showOriginal', 'debug']); this.acctEmail = Assert.urlParamRequire.string(uncheckedUrlParams, 'acctEmail'); - this.messageRenderer = new MessageRenderer(this.acctEmail); this.labelId = uncheckedUrlParams.labelId ? String(uncheckedUrlParams.labelId) : 'INBOX'; this.threadId = Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'threadId'); this.showOriginal = uncheckedUrlParams.showOriginal === true; @@ -76,6 +75,12 @@ export class InboxView extends View { this.injector = new Injector('settings', undefined, this.factory); this.webmailCommon = new WebmailCommon(this.acctEmail, this.injector); this.storage = await AcctStore.get(this.acctEmail, ['email_provider', 'picture', 'sendAs']); + // todo: remove code duplication + if (!this.storage.sendAs) { + this.storage.sendAs = {}; + this.storage.sendAs[this.acctEmail] = { name: this.storage.full_name, isPrimary: true }; + } + this.messageRenderer = new MessageRenderer(this.acctEmail, this.gmail, this.relayManager, this.factory, this.storage.sendAs, this.debug); this.inboxNotificationModule.render(); const emailProvider = this.storage.email_provider || 'gmail'; try { diff --git a/extension/js/common/core/crypto/pgp/msg-util.ts b/extension/js/common/core/crypto/pgp/msg-util.ts index 3c3ce671b12..9094bffe986 100644 --- a/extension/js/common/core/crypto/pgp/msg-util.ts +++ b/extension/js/common/core/crypto/pgp/msg-util.ts @@ -106,6 +106,7 @@ export enum DecryptErrTypes { badMdc = 'bad_mdc', needPassphrase = 'need_passphrase', format = 'format', + armorChecksumFailed = 'armor_checksum_failed', other = 'other', } @@ -181,7 +182,7 @@ export class MsgUtil { try { prepared = await PgpArmor.cryptoMsgPrepareForDecrypt(encryptedData); } catch (formatErr) { - return { success: false, error: { type: DecryptErrTypes.format, message: String(formatErr) }, longids }; + return { success: false, error: MsgUtil.cryptoMsgDecryptCategorizeErr(formatErr), longids }; } // there are 3 types of messages possible at this point // 1. PKCS#7 if isPkcs7 is true @@ -429,6 +430,11 @@ export class MsgUtil { type: DecryptErrTypes.badMdc, message: `Security threat - opening this message is dangerous because it was modified in transit.`, }; + } else if (e === 'Ascii armor integrity check failed') { + return { + type: DecryptErrTypes.armorChecksumFailed, + message: e, + }; } else { return { type: DecryptErrTypes.other, message: e }; } diff --git a/extension/js/common/downloader.ts b/extension/js/common/downloader.ts new file mode 100644 index 00000000000..d801f57667d --- /dev/null +++ b/extension/js/common/downloader.ts @@ -0,0 +1,61 @@ +/* ©️ 2016 - present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com */ + +'use strict'; + +import { GmailRes } from './api/email-provider/gmail/gmail-parser'; +import { Gmail } from './api/email-provider/gmail/gmail.js'; +import { Attachment } from './core/attachment.js'; +import { Buf } from './core/buf.js'; +import { Dict } from './core/common'; +import { MsgBlock } from './core/msg-block'; +import { PrintMailInfo } from './render-message'; + +export type ProcessedMessage = { + renderedXssSafe?: string; + blocksInFrames: Dict; + attachments: Attachment[]; + printMailInfo: PrintMailInfo; + from: string | undefined; +}; + +export interface MessageCacheEntry { + download: { full: Promise; raw?: Promise }; + processedFull?: ProcessedMessage; +} + +export class Downloader { + private chunkDownloads: { attachment: Attachment; result: Promise }[] = []; + private messages: Dict = {}; + + public constructor(private readonly gmail: Gmail) {} + + /* + private queueAttachmentDownload = (a: Attachment) => { + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + this.attachmentDownloads.push({ attachment: a, result: this.gmail.attachmentGet(a.msgId!, a.id!) }); + }; + */ + + public queueAttachmentChunkDownload = (a: Attachment) => { + if (a.hasData()) { + return { attachment: a, result: Promise.resolve(a.getData()) }; + } + let download = this.chunkDownloads.find(d => d.attachment === a); + if (!download) { + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + download = { attachment: a, result: this.gmail.attachmentGetChunk(a.msgId!, a.id!) }; + this.chunkDownloads.push(download); + } + return download; + }; + + public msgGetCached = (msgId: string): MessageCacheEntry => { + // todo: retries? exceptions? + let msgDownload = this.messages[msgId]; + if (!msgDownload) { + this.messages[msgId] = { download: { full: this.gmail.msgGet(msgId, 'full') } }; + msgDownload = this.messages[msgId]; + } + return msgDownload; + }; +} diff --git a/extension/js/common/loader-context-interface.ts b/extension/js/common/loader-context-interface.ts new file mode 100644 index 00000000000..5f23f169a6f --- /dev/null +++ b/extension/js/common/loader-context-interface.ts @@ -0,0 +1,42 @@ +/* ©️ 2016 - present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com */ + +'use strict'; + +import { Attachment } from './core/attachment.js'; +import { Catch } from './platform/catch.js'; +import { BindInterface } from './relay-manager-interface.js'; +import { XssSafeFactory } from './xss-safe-factory.js'; + +export type JQueryEl = JQuery; + +export interface LoaderContextBindInterface { + bind(frameId: string, binder: BindInterface): void; +} + +export interface LoaderContextInterface extends LoaderContextBindInterface { + readonly factory: XssSafeFactory; + + renderPlainAttachment(a: Attachment, attachmentEl?: JQueryEl, error?: string): void; + + // prependAttachments is used to render encrypted attachment prepending AttachmentContainerInner + prependEncryptedAttachment(a: Attachment): void; + + hideAttachment(attachmentSel?: JQueryEl): void; + + setMsgBody(frameXssSafe: string, method: 'set' | 'append' | 'after'): void; +} + +export const bindNow = (frameId: string, binder: BindInterface) => { + const embeddedReference = XssSafeFactory.getEmbeddedMsg(frameId); + if (embeddedReference) { + binder.bind(frameId, embeddedReference.frameWindow); + } else { + Catch.report('Unexpected: unable to reference a newly created message frame'); + } +}; + +export class LoaderContextBindNow implements LoaderContextBindInterface { + public bind = (frameId: string, binder: BindInterface) => { + bindNow(frameId, binder); + }; +} diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index df2f66ca470..643812ab4ea 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -5,14 +5,15 @@ import { GmailParser, GmailRes } from './api/email-provider/gmail/gmail-parser.js'; import { PubLookup } from './api/pub-lookup.js'; import { ClientConfiguration } from './client-configuration.js'; -import { Attachment, TransferableAttachment } from './core/attachment.js'; +import { Attachment, Attachment$treatAs, TransferableAttachment } from './core/attachment.js'; import { Buf } from './core/buf.js'; import { CID_PATTERN, Dict, Str, Value } from './core/common.js'; import { KeyUtil } from './core/crypto/key.js'; -import { DecryptErrTypes, DecryptResult, MsgUtil, VerifyRes } from './core/crypto/pgp/msg-util.js'; +import { DecryptErrTypes, DecryptResult, FormatError, MsgUtil, VerifyRes } from './core/crypto/pgp/msg-util.js'; +import { PgpArmor } from './core/crypto/pgp/pgp-armor.js'; import { Mime, MimeContent, MimeProccesedMsg } from './core/mime.js'; import { MsgBlockParser } from './core/msg-block-parser.js'; -import { MsgBlock } from './core/msg-block.js'; +import { MsgBlock, MsgBlockType } from './core/msg-block.js'; import { Lang } from './lang.js'; import { Catch } from './platform/catch.js'; import { AcctStore, SendAsAlias } from './platform/store/acct-store.js'; @@ -22,22 +23,30 @@ import { PassphraseStore } from './platform/store/passphrase-store.js'; import { Xss } from './platform/xss.js'; import { RelayManager } from './relay-manager.js'; import { RenderInterface, RenderInterfaceBase } from './render-interface.js'; -import { PrintMailInfo } from './render-message'; +import { PrintMailInfo } from './render-message.js'; import { saveFetchedPubkeysIfNewerThanInStorage } from './shared.js'; import { XssSafeFactory } from './xss-safe-factory.js'; import * as DOMPurify from 'dompurify'; - -export type JQueryEl = JQuery; +import { Downloader, ProcessedMessage } from './downloader.js'; +import { JQueryEl, LoaderContextBindInterface, LoaderContextBindNow, LoaderContextInterface } from './loader-context-interface.js'; +import { Gmail } from './api/email-provider/gmail/gmail.js'; +import { ApiErr, AjaxErr } from './api/shared/api-error.js'; +import { isCustomerUrlFesUsed } from './helpers'; export type ProccesedMsg = MimeProccesedMsg; -export type AttachmentBlock = { - block: MsgBlock; - file: Attachment; // todo: only need id in MsgBlock's AttachmentMeta? -}; - export class MessageRenderer { - public constructor(private readonly acctEmail: string) {} + private downloader: Downloader; + public constructor( + private readonly acctEmail: string, + private readonly gmail: Gmail, + private readonly relayManager: RelayManager, + private readonly factory: XssSafeFactory, + private sendAs: Dict, + private debug: boolean = false + ) { + this.downloader = new Downloader(gmail); + } /** * Replaces inline image CID references with base64 encoded data in sanitized HTML @@ -246,7 +255,7 @@ export class MessageRenderer { renderModule.renderSignatureStatus('signed'); } else if (retryVerification) { renderModule.renderVerificationInProgress(); - await MessageRenderer.renderPgpSignatureCheckResult(renderModule, await retryVerification(), undefined); + await MessageRenderer.renderPgpSignatureCheckResult(renderModule, (await retryVerification()) ?? verifyRes, undefined); return; } else { // todo: is this situation possible: no sender info in `from`? @@ -281,37 +290,120 @@ export class MessageRenderer { return parsedPubs.map(key => KeyUtil.armor(key.pubkey)); }; - public relayAndProcess = async ( + public isOutgoing = (senderEmail: string) => { + return !!this.sendAs[senderEmail]; // todo: remove code duplication + }; + + public processAttachment = async ( + a: Attachment, + treatAs: Attachment$treatAs, + loaderContext: LoaderContextInterface, + attachmentSel: JQueryEl | undefined, + msgId: string, // deprecated + printMailInfo: PrintMailInfo, + senderEmail: string + ): Promise<'shown' | 'hidden' | 'replaced'> => { + // todo - [same name + not processed].first() ... What if attachment metas are out of order compared to how gmail shows it? And have the same name? + try { + if (['needChunk', 'maybePgp', 'publicKey'].includes(treatAs)) { + // todo: this isn't the best way to do this + // todo: move into a handler + // Inspect a chunk + if (this.debug) { + console.debug('processAttachment() try -> awaiting chunk + awaiting type'); + } + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + const data = await this.downloader.queueAttachmentChunkDownload(a).result; + const openpgpType = MsgUtil.type({ data }); + if (openpgpType && openpgpType.type === 'publicKey' && openpgpType.armored) { + // if it looks like OpenPGP public key + treatAs = 'publicKey'; + } else if (openpgpType && ['encryptedMsg', 'signedMsg'].includes(openpgpType.type)) { + treatAs = 'encryptedMsg'; // todo: signedMsg ? + } else { + if (this.debug) { + console.debug("processAttachment() try -> awaiting done and processed -- doesn't look like OpenPGP"); + } + // plain attachment with a warning + loaderContext.renderPlainAttachment(a, attachmentSel, 'Unknown OpenPGP format'); + return 'shown'; + } + if (this.debug) { + console.debug('processAttachment() try -> awaiting done and processed'); + } + } + if (treatAs !== 'plainFile') { + loaderContext.hideAttachment(attachmentSel); + } + if (treatAs === 'hidden') { + return 'hidden'; + } else if (treatAs === 'encryptedFile') { + // actual encrypted attachment - show it + loaderContext.prependEncryptedAttachment(a); + return 'replaced'; // native should be hidden, custom should appear instead + } else if (treatAs === 'encryptedMsg') { + await this.setMsgBodyAndStartProcessing(loaderContext, treatAs, printMailInfo, renderModule => + this.processEncryptedMessage(a, renderModule, senderEmail) + ); + return 'hidden'; // native attachment should be hidden, the "attachment" goes to the message container + } else if (treatAs === 'publicKey') { + // todo - pubkey should be fetched in pgp_pubkey.js + return await this.renderPublicKeyFromFile(a, loaderContext, this.isOutgoing(senderEmail), attachmentSel); + } else if (treatAs === 'privateKey') { + return await this.renderBackupFromFile(a, loaderContext, this.isOutgoing(senderEmail)); + } else if (treatAs === 'signature') { + await this.setMsgBodyAndStartProcessing(loaderContext, 'signedMsg', printMailInfo, renderModule => + this.processSignedMessage(msgId, renderModule, senderEmail) + ); + return 'hidden'; // native attachment should be hidden, the "attachment" goes to the message container + } else { + // standard file + loaderContext.renderPlainAttachment(a, attachmentSel); + return 'shown'; + } + } catch (e) { + if (!ApiErr.isSignificant(e) || (e instanceof AjaxErr && e.status === 200)) { + loaderContext.renderPlainAttachment(a, attachmentSel, 'Categorize: net err'); + return 'shown'; + } else { + Catch.reportErr(e); + loaderContext.renderPlainAttachment(a, attachmentSel, 'Categorize: unknown err'); + return 'shown'; + } + } + }; + + public relayAndStartProcessing = async ( relayManager: RelayManager, + loaderContext: LoaderContextBindInterface, factory: XssSafeFactory, frameId: string, printMailInfo: PrintMailInfo, cb: (renderModule: RenderInterface) => Promise<{ publicKeys?: string[]; needPassphrase?: string[] }> ) => { - const embeddedReference = XssSafeFactory.getEmbeddedMsg(frameId); - if (embeddedReference) { - const renderModule = relayManager.createRelay(frameId, embeddedReference.frameWindow); - renderModule.setPrintMailInfo(printMailInfo); - let result = await cb(renderModule); - const appendAfter = $(`iframe#${frameId}`); - // todo: how publicKeys and needPassphrase interact? - for (const armoredPubkey of result.publicKeys ?? []) { - appendAfter.after(factory.embeddedPubkey(armoredPubkey, false)); - } - while (result.needPassphrase) { - // todo: queue into a dictionary? - await PassphraseStore.waitUntilPassphraseChanged(this.acctEmail, result.needPassphrase); - renderModule.clearErrorStatus(); - renderModule.renderText('Decrypting...'); - result = await cb(renderModule); - } - // todo: wait for renderModule completion: the queue has been actually flushed, - // and then remove the frame from relayManager.frames - // Something like: - // await relayManager.waitForCompletion(renderModule) - } else { - Catch.report('Unexpected: unable to reference a newly created message frame'); // todo: - } + const renderModule = relayManager.createRelay(frameId); + loaderContext.bind(frameId, relayManager); + renderModule.setPrintMailInfo(printMailInfo); + cb(renderModule) + .then(async result => { + const appendAfter = $(`iframe#${frameId}`); // todo: late binding? won't work + // todo: how publicKeys and needPassphrase interact? + for (const armoredPubkey of result.publicKeys ?? []) { + appendAfter.after(factory.embeddedPubkey(armoredPubkey, false)); + } + while (result.needPassphrase) { + // todo: queue into a dictionary? + await PassphraseStore.waitUntilPassphraseChanged(this.acctEmail, result.needPassphrase); + renderModule.clearErrorStatus(); + renderModule.renderText('Decrypting...'); + result = await cb(renderModule); + } + // todo: wait for renderModule completion: the queue has been actually flushed, + // and then remove the frame from relayManager.frames + // Something like: + // await relayManager.waitForCompletion(renderModule) + }) + .catch(Catch.reportErr); }; public processInlineBlocks = async ( @@ -324,8 +416,8 @@ export class MessageRenderer { const signerEmail = from ? Str.parseEmail(from).email : undefined; await Promise.all( Object.entries(blocks).map(([frameId, block]) => - this.relayAndProcess(relayManager, factory, frameId, printMailInfo, renderModule => this.renderMsgBlock(block, renderModule, signerEmail)).catch( - Catch.reportErr + this.relayAndStartProcessing(relayManager, new LoaderContextBindNow(), factory, frameId, printMailInfo, renderModule => + this.renderMsgBlock(block, renderModule, signerEmail) ) ) ); @@ -414,60 +506,41 @@ export class MessageRenderer { } else if (result.longids.needPassphrase.length) { renderModule.renderPassphraseNeeded(result.longids.needPassphrase); return { needPassphrase: result.longids.needPassphrase }; - /* - const enterPp = `${Lang.pgpBlock.enterPassphrase} ${Lang.pgpBlock.toOpenMsg}`; - await this.view.errorModule.renderErr(enterPp, undefined, 'pass phrase needed'); - $('.enter_passphrase').on( - 'click', - this.view.setHandler(() => { - Ui.setTestState('waiting'); - BrowserMsg.send.passphraseDialog(this.view.parentTabId, { - type: 'message', - longids: result.longids.needPassphrase, - }); - }) - ); - await PassphraseStore.waitUntilPassphraseChanged(this.view.acctEmail, result.longids.needPassphrase); - this.view.renderModule.clearErrorStatus(); - this.view.renderModule.renderText('Decrypting...'); - await this.decryptAndRender(encryptedData, verificationPubs); - */ } else { - /* - if (!result.longids.chosen && !(await KeyStore.get(this.view.acctEmail)).length) { - await this.view.errorModule.renderErr( - Lang.pgpBlock.notProperlySetUp + this.view.errorModule.btnHtml('FlowCrypt settings', 'green settings'), - undefined - ); + if (!result.longids.chosen && !(await KeyStore.get(this.acctEmail)).length) { + renderModule.renderErr(Lang.pgpBlock.notProperlySetUp /* + todo: this.view.errorModule.btnHtml('FlowCrypt settings', 'green settings') */, undefined); } else if (result.error.type === DecryptErrTypes.keyMismatch) { - await this.view.errorModule.handlePrivateKeyMismatch( + /* todo: await this.view.errorModule.handlePrivateKeyMismatch( kisWithPp.map(ki => ki.public), encryptedData, this.isPwdMsgBasedOnMsgSnippet === true - ); + ); */ } else if (result.error.type === DecryptErrTypes.wrongPwd || result.error.type === DecryptErrTypes.usePassword) { - await this.view.errorModule.renderErr(Lang.pgpBlock.pwdMsgAskSenderUsePubkey, undefined); + renderModule.renderErr(Lang.pgpBlock.pwdMsgAskSenderUsePubkey, undefined); } else if (result.error.type === DecryptErrTypes.noMdc) { // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - await this.view.errorModule.renderErr(result.error.message, result.content!.toUtfStr()); // missing mdc - only render the result after user confirmation + renderModule.renderErr(result.error.message, result.content!.toUtfStr()); // missing mdc - only render the result after user confirmation } else if (result.error) { - await this.view.errorModule.renderErr(`${Lang.pgpBlock.cantOpen}\n\n${result.error.type}: ${result.error.message}`, Str.with(encryptedData)); + renderModule.renderErr(`${Lang.pgpBlock.cantOpen}\n\n${result.error.type}: ${result.error.message}`, Str.with(encryptedData)); } else { // should generally not happen - await this.view.errorModule.renderErr( - Lang.pgpBlock.cantOpen + Lang.general.writeMeToFixIt(!!this.view.fesUrl) + '\n\nDiagnostic info: "' + JSON.stringify(result) + '"', + renderModule.renderErr( + Lang.pgpBlock.cantOpen + + Lang.general.writeMeToFixIt(await isCustomerUrlFesUsed(this.acctEmail)) + + '\n\nDiagnostic info: "' + + JSON.stringify(result) + + '"', Str.with(encryptedData) ); } - */ } return {}; }; public getPrintViewInfo = async (metadata: GmailRes.GmailMsg): Promise => { const fullName = await AcctStore.get(this.acctEmail, ['full_name']); // todo: cache - const sentDate = new Date(GmailParser.findHeader(metadata, 'date') ?? ''); - const sentDateStr = Str.fromDate(sentDate).replace(' ', ' at '); + const sentDate = GmailParser.findHeader(metadata, 'date'); + const sentDateStr = sentDate ? Str.fromDate(new Date(sentDate)).replace(' ', ' at ') : ''; const from = Str.parseEmail(GmailParser.findHeader(metadata, 'from') ?? ''); const fromHtml = from.name ? `${Xss.htmlSanitize(from.name)} <${from.email}>` : from.email; /* eslint-disable @typescript-eslint/no-non-null-assertion */ @@ -498,4 +571,147 @@ export class MessageRenderer { `, }; }; + + public msgGetProcessed = async (msgId: string): Promise => { + // todo: retries? exceptions? + const msgDownload = this.downloader.msgGetCached(msgId); + if (msgDownload.processedFull) { + return msgDownload.processedFull; + } + const fullOrRawMsg = await Promise.race(Object.values(msgDownload.download).filter(Boolean)); + // todo: what should we do if we received 'raw'? + const mimeContent = MessageRenderer.reconstructMimeContent(fullOrRawMsg); + const blocks = Mime.processBody(mimeContent); + // todo: only start `signature` download? + // start download of all attachments that are not plainFile, for 'needChunk' -- chunked download + for (const a of mimeContent.attachments.filter(a => !a.hasData())) { + const treatAs = a.treatAs(mimeContent.attachments); // todo: isBodyEmpty + if (treatAs === 'plainFile') continue; + if (treatAs === 'needChunk') { + this.downloader.queueAttachmentChunkDownload(a); + } else if (treatAs === 'publicKey') { + // we also want a chunk before we replace the attachment in the UI + // todo: or simply download in full? + this.downloader.queueAttachmentChunkDownload(a); + } else { + // todo: this.downloader.queueAttachmentDownload(a); + } + } + let renderedXssSafe: string | undefined; + let blocksInFrames: Dict = {}; + const from = GmailParser.findHeader(fullOrRawMsg, 'from'); + if (blocks.length === 0 || (blocks.length === 1 && ['plainText', 'plainHtml'].includes(blocks[0].type))) { + // only has single block which is plain text + } else { + ({ renderedXssSafe, blocksInFrames } = MessageRenderer.renderMsg({ blocks, from }, this.factory, false, msgId, this.sendAs)); + } + msgDownload.processedFull = { + renderedXssSafe, + blocksInFrames, + printMailInfo: await this.getPrintViewInfo(fullOrRawMsg), + from, + attachments: mimeContent.attachments, + }; + return msgDownload.processedFull; + }; + + private setMsgBodyAndStartProcessing = async ( + loaderContext: LoaderContextInterface, + type: MsgBlockType, // for diagnostics + printMailInfo: PrintMailInfo, + cb: (renderModule: RenderInterface) => Promise<{ publicKeys?: string[] }> + ) => { + const { frameId, frameXssSafe } = loaderContext.factory.embeddedRenderMsg(type); + loaderContext.setMsgBody(frameXssSafe, 'set'); + await this.relayAndStartProcessing(this.relayManager, loaderContext, loaderContext.factory, frameId, printMailInfo, cb); + }; + + private processSignedMessage = async (msgId: string, renderModule: RenderInterface, senderEmail: string) => { + try { + renderModule.renderText('Loading signed message...'); + const raw = await this.msgGetRaw(msgId); + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + return await this.renderSignedMessage(raw!, renderModule, senderEmail); + } catch { + // todo: render error via renderModule + } + return {}; + }; + + private processEncryptedMessage = async (attachment: Attachment, renderModule: RenderInterface, senderEmail: string) => { + try { + if (!attachment.hasData()) { + // todo: common cache, load control? + renderModule.renderText('Retrieving message...'); + await this.gmail.fetchAttachments([attachment]); // todo: render progressCb + } + // todo: probaby subject isn't relevant in attachment-based decryption? + // const subject = gmailMsg.payload ? GmailParser.findHeader(gmailMsg.payload, 'subject') : undefined; + const armoredMsg = PgpArmor.clip(attachment.getData().toUtfStr()); + if (!armoredMsg) { + // todo: + throw new FormatError('Problem extracting armored message', attachment.getData().toUtfStr()); + } + renderModule.renderText('Decrypting...'); + return await this.renderEncryptedMessage(armoredMsg, renderModule, false, senderEmail); + } catch { + // todo: render error via renderModule + } + return {}; + }; + + private renderPublicKeyFromFile = async ( + attachmentMeta: Attachment, + loaderContext: LoaderContextInterface, + isOutgoing: boolean, + attachmentSel: JQueryEl | undefined + ): Promise<'shown' | 'hidden'> => { + // let downloadedAttachment: GmailRes.GmailAttachment; + try { + // todo: how is different -- downloader.attachmentGet(attachmentMeta.msgId!, attachmentMeta.id!); // .id! is present when fetched from api + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + await this.gmail.fetchAttachments([attachmentMeta]); + } catch (e) { + loaderContext.renderPlainAttachment(attachmentMeta, undefined, 'Please reload page'); + return 'shown'; + } + const openpgpType = MsgUtil.type({ data: attachmentMeta.getData().subarray(0, 1000) }); + if (openpgpType?.type === 'publicKey') { + loaderContext.setMsgBody(this.factory.embeddedPubkey(attachmentMeta.getData().toUtfStr(), isOutgoing), 'after'); + return 'hidden'; + } else if (openpgpType?.type !== 'encryptedAttachment') { + loaderContext.renderPlainAttachment(attachmentMeta, attachmentSel, 'Unknown Public Key Format'); + return 'shown'; + } else { + // todo: renderEncryptedAttachment + return 'hidden'; // todo: return 'shown' + } + }; + + private renderBackupFromFile = async ( + attachmentMeta: Attachment, + loaderContext: LoaderContextInterface, + isOutgoing: boolean + ): Promise<'shown' | 'hidden'> => { + // let downloadedAttachment: GmailRes.GmailAttachment; + try { + // todo: fetch from queue + // todo: how is different -- downloader.attachmentGet(attachmentMeta.msgId!, attachmentMeta.id!); // .id! is present when fetched from api + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + await this.gmail.fetchAttachments([attachmentMeta]); + loaderContext.setMsgBody(this.factory.embeddedPubkey(attachmentMeta.getData().toUtfStr(), isOutgoing), 'append'); + return 'hidden'; + } catch (e) { + loaderContext.renderPlainAttachment(attachmentMeta, undefined, 'Please reload page'); + return 'shown'; + } + }; + + private msgGetRaw = async (msgId: string): Promise => { + const msgDownload = this.downloader.msgGetCached(msgId).download; + if (!msgDownload.raw) { + msgDownload.raw = this.gmail.msgGet(msgId, 'raw'); + } + return (await msgDownload.raw).raw || ''; + }; } diff --git a/extension/js/common/relay-manager-interface.ts b/extension/js/common/relay-manager-interface.ts index df44c5ebfd6..59858a4ec3f 100644 --- a/extension/js/common/relay-manager-interface.ts +++ b/extension/js/common/relay-manager-interface.ts @@ -7,3 +7,7 @@ import { RenderMessage } from './render-message.js'; export interface RelayManagerInterface { relay(frameId: string, message: RenderMessage): void; } + +export interface BindInterface { + bind(frameId: string, frameWindow: Window): void; +} diff --git a/extension/js/common/relay-manager.ts b/extension/js/common/relay-manager.ts index 0284617d66b..06c9e3c73e0 100644 --- a/extension/js/common/relay-manager.ts +++ b/extension/js/common/relay-manager.ts @@ -3,31 +3,41 @@ 'use strict'; import { Dict } from './core/common.js'; -import { RelayManagerInterface } from './relay-manager-interface.js'; +import { BindInterface, RelayManagerInterface } from './relay-manager-interface.js'; import { RenderInterface } from './render-interface.js'; import { RenderMessage } from './render-message.js'; import { RenderRelay } from './render-relay.js'; -export class RelayManager implements RelayManagerInterface { - private frames: Dict<{ frameWindow: Window; readyToReceive?: true; queue: RenderMessage[] }> = {}; +export class RelayManager implements RelayManagerInterface, BindInterface { + private frames: Dict<{ frameWindow?: Window; readyToReceive?: true; queue: RenderMessage[] }> = {}; public relay = (frameId: string, message: RenderMessage) => { - const frameData = this.frames[frameId]; - frameData.queue.push(message); - if (frameData.readyToReceive) { - this.flush(frameData); + const { frameWindow, readyToReceive, queue } = this.frames[frameId]; + queue.push(message); + if (readyToReceive && frameWindow) { + this.flush({ frameWindow, queue }); } }; - public createRelay = (frameId: string, frameWindow: Window): RenderInterface => { - this.frames[frameId] = { frameWindow, queue: [] }; // can readyToReceive message come earlier? Probably not. + public createRelay = (frameId: string): RenderInterface => { + this.frames[frameId] = { queue: [] }; // can readyToReceive message come earlier? Probably not. return new RenderRelay(this, frameId); }; public readyToReceive = (frameId: string) => { const frameData = this.frames[frameId]; frameData.readyToReceive = true; - this.flush(frameData); + if (frameData.frameWindow) { + this.flush({ frameWindow: frameData.frameWindow, queue: frameData.queue }); + } + }; + + public bind = (frameId: string, frameWindow: Window) => { + const frameData = this.frames[frameId]; + frameData.frameWindow = frameWindow; + if (frameData.readyToReceive) { + this.flush({ frameWindow, queue: frameData.queue }); + } }; private flush = ({ frameWindow, queue }: { frameWindow: Window; queue: RenderMessage[] }) => { diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index ed5f5095bcc..730e83f459f 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -4,11 +4,9 @@ import { Dict, Str } from '../../common/core/common.js'; import { FactoryReplyParams, XssSafeFactory } from '../../common/xss-safe-factory.js'; -import { GmailParser, GmailRes } from '../../common/api/email-provider/gmail/gmail-parser.js'; import { IntervalFunction, WebmailElementReplacer } from './setup-webmail-content-script.js'; -import { AjaxErr } from '../../common/api/shared/api-error.js'; import { ApiErr } from '../../common/api/shared/api-error.js'; -import { Attachment, Attachment$treatAs } from '../../common/core/attachment.js'; +import { Attachment } from '../../common/core/attachment.js'; import { BrowserMsg } from '../../common/browser/browser-msg.js'; import { Catch } from '../../common/platform/catch.js'; import { GlobalStore, LocalDraft } from '../../common/platform/store/global-store.js'; @@ -24,35 +22,17 @@ import { ClientConfiguration } from '../../common/client-configuration.js'; import { SendAsAlias } from '../../common/platform/store/acct-store.js'; // todo: can we somehow define a purely relay class for ContactStore to clearly show that crypto-libraries are not loaded and can't be used? import { ContactStore } from '../../common/platform/store/contact-store.js'; -import { Buf } from '../../common/core/buf.js'; -import { JQueryEl, MessageRenderer } from '../../common/message-renderer.js'; +import { MessageRenderer } from '../../common/message-renderer.js'; import { RelayManager } from '../../common/relay-manager.js'; -import { Mime } from '../../common/core/mime.js'; -import { FormatError, MsgUtil } from '../../common/core/crypto/pgp/msg-util.js'; -import { RenderInterface } from '../../common/render-interface.js'; -import { MsgBlock, MsgBlockType } from '../../common/core/msg-block.js'; import { PrintMailInfo } from '../../common/render-message.js'; - -type ProcessedMessage = { - renderedXssSafe?: string; - blocksInFrames: Dict; - attachments: Attachment[]; - printMailInfo: PrintMailInfo; - from: string | undefined; -}; - -interface MessageCacheEntry { - download: { full: Promise; raw?: Promise }; - processedFull?: ProcessedMessage; -} +import { LoaderContextWebmail } from './loader-context.js'; +import { JQueryEl } from '../../common/loader-context-interface.js'; export class GmailElementReplacer implements WebmailElementReplacer { private debug = false; private gmail: Gmail; private recipientHasPgpCache: Dict = {}; - private messages: Dict = {}; - private chunkDownloads: { attachment: Attachment; result: Promise }[] = []; // private attachmentDownloads: { attachment: Attachment; result: Promise }[] = []; private pubLookup: PubLookup; private webmailCommon: WebmailCommon; @@ -86,17 +66,17 @@ export class GmailElementReplacer implements WebmailElementReplacer { }; public constructor( - private factory: XssSafeFactory, + private readonly factory: XssSafeFactory, private clientConfiguration: ClientConfiguration, private acctEmail: string, - private sendAs: Dict, + private readonly sendAs: Dict, private injector: Injector, private notifications: Notifications, private relayManager: RelayManager ) { this.webmailCommon = new WebmailCommon(acctEmail, injector); this.gmail = new Gmail(acctEmail); - this.messageRenderer = new MessageRenderer(acctEmail); + this.messageRenderer = new MessageRenderer(acctEmail, this.gmail, this.relayManager, factory, sendAs); this.pubLookup = new PubLookup(this.clientConfiguration); } @@ -163,86 +143,6 @@ export class GmailElementReplacer implements WebmailElementReplacer { } }; - private msgGetCached = (msgId: string): MessageCacheEntry => { - // todo: retries? exceptions? - let msgDownload = this.messages[msgId]; - if (!msgDownload) { - this.messages[msgId] = { download: { full: this.gmail.msgGet(msgId, 'full') } }; - msgDownload = this.messages[msgId]; - } - return msgDownload; - }; - - private msgGetRaw = async (msgId: string): Promise => { - const msgDownload = this.msgGetCached(msgId).download; - if (!msgDownload.raw) { - msgDownload.raw = this.gmail.msgGet(msgId, 'raw'); - } - return (await msgDownload.raw).raw || ''; - }; - - private queueAttachmentChunkDownload = (a: Attachment) => { - if (a.hasData()) { - return { attachment: a, result: Promise.resolve(a.getData()) }; - } - let download = this.chunkDownloads.find(d => d.attachment === a); - if (!download) { - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - download = { attachment: a, result: this.gmail.attachmentGetChunk(a.msgId!, a.id!) }; - this.chunkDownloads.push(download); - } - return download; - }; - - /* - private queueAttachmentDownload = (a: Attachment) => { - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - this.attachmentDownloads.push({ attachment: a, result: this.gmail.attachmentGet(a.msgId!, a.id!) }); - }; - */ - private msgGetProcessed = async (msgId: string): Promise => { - // todo: retries? exceptions? - const msgDownload = this.msgGetCached(msgId); - if (msgDownload.processedFull) { - return msgDownload.processedFull; - } - const fullOrRawMsg = await Promise.race(Object.values(msgDownload.download).filter(Boolean)); - // todo: what should we do if we received 'raw'? - const mimeContent = MessageRenderer.reconstructMimeContent(fullOrRawMsg); - const blocks = Mime.processBody(mimeContent); - // todo: only start `signature` download? - // start download of all attachments that are not plainFile, for 'needChunk' -- chunked download - for (const a of mimeContent.attachments.filter(a => !a.hasData())) { - const treatAs = a.treatAs(mimeContent.attachments); // todo: isBodyEmpty - if (treatAs === 'plainFile') continue; - if (treatAs === 'needChunk') { - this.queueAttachmentChunkDownload(a); - } else if (treatAs === 'publicKey') { - // we also want a chunk before we replace the attachment in the UI - // todo: or simply download in full? - this.queueAttachmentChunkDownload(a); - } else { - // todo: this.queueAttachmentDownload(a); - } - } - let renderedXssSafe: string | undefined; - let blocksInFrames: Dict = {}; - const from = GmailParser.findHeader(fullOrRawMsg, 'from'); - if (blocks.length === 0 || (blocks.length === 1 && ['plainText', 'plainHtml'].includes(blocks[0].type))) { - // only has single block which is plain text - } else { - ({ renderedXssSafe, blocksInFrames } = MessageRenderer.renderMsg({ blocks, from }, this.factory, false, msgId, this.sendAs)); - } - msgDownload.processedFull = { - renderedXssSafe, - blocksInFrames, - printMailInfo: await this.messageRenderer.getPrintViewInfo(fullOrRawMsg), - from, - attachments: mimeContent.attachments, - }; - return msgDownload.processedFull; - }; - private everything = () => { this.replaceArmoredBlocks().catch(Catch.reportErr); this.replaceAttachments().catch(Catch.reportErr); @@ -265,13 +165,13 @@ export class GmailElementReplacer implements WebmailElementReplacer { console.debug('replaceArmoredBlocks() for of emailsContainingPgpBlock -> emailContainer added evaluated'); } const msgId = this.determineMsgId(emailContainer); - const { renderedXssSafe, blocksInFrames, printMailInfo, from } = await this.msgGetProcessed(msgId); + const { renderedXssSafe, blocksInFrames, printMailInfo, from } = await this.messageRenderer.msgGetProcessed(msgId); if (renderedXssSafe) { $(this.sel.translatePrompt).hide(); if (this.debug) { console.debug('replaceArmoredBlocks() for of emailsContainingPgpBlock -> emailContainer replacing'); } - this.updateMsgBodyEl_DANGEROUSLY(emailContainer, 'set', renderedXssSafe); // xss-safe-factory: replace_blocks is XSS safe + LoaderContextWebmail.updateMsgBodyEl_DANGEROUSLY(emailContainer, 'set', renderedXssSafe); // xss-safe-factory: replace_blocks is XSS safe if (this.debug) { console.debug('replaceArmoredBlocks() for of emailsContainingPgpBlock -> emailContainer replaced'); } @@ -479,7 +379,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { if (this.debug) { console.debug('processNewPgpAttachments() -> msgGet may take some time'); } - const { attachments, printMailInfo } = await this.msgGetProcessed(msgId); + const { attachments, printMailInfo } = await this.messageRenderer.msgGetProcessed(msgId); if (this.debug) { console.debug('processNewPgpAttachments() -> msgGet done -> processAttachments', attachments); } @@ -506,17 +406,17 @@ export class GmailElementReplacer implements WebmailElementReplacer { private processAttachments = async ( msgId: string, attachmentMetas: Attachment[], // todo: these are not Metas! - attachmentsContainerInner: JQueryEl | HTMLElement, + attachmentsContainerInner: JQueryEl, printMailInfo: PrintMailInfo, skipGoogleDrive: boolean ) => { if (this.debug) { console.debug('processAttachments()', attachmentMetas); } - const msgElReference = { msgEl: this.getMsgBodyEl(msgId) }; - const isBodyEmpty = msgElReference.msgEl.text() === '' || msgElReference.msgEl.text() === '\n'; // todo: - const senderEmail = this.getSenderEmail(msgElReference.msgEl); - const isOutgoing = !!this.sendAs[senderEmail]; + const msgEl = this.getMsgBodyEl(msgId); + const isBodyEmpty = msgEl.text() === '' || msgEl.text() === '\n'; // todo: + const senderEmail = this.getSenderEmail(msgEl); + const loaderContext = new LoaderContextWebmail(this.factory, msgEl, attachmentsContainerInner); attachmentsContainerInner = $(attachmentsContainerInner); attachmentsContainerInner.parent().find(this.sel.numberOfAttachments).hide(); let nRenderedAttachments = attachmentMetas.length; @@ -526,18 +426,16 @@ export class GmailElementReplacer implements WebmailElementReplacer { new RegExp(`^${Str.regexEscape(a.name || 'noname')}$`) ).first(); // todo: shouldn't call `treatAs` in too many places ? - const renderStatus = await this.processAttachment( + const renderStatus = await this.messageRenderer.processAttachment( a, a.treatAs(attachmentMetas, isBodyEmpty), + loaderContext, attachmentSel, - attachmentsContainerInner, - msgElReference, msgId, printMailInfo, - senderEmail, - isOutgoing + senderEmail ); - if (renderStatus === 'hidden') { + if (['hidden', 'tomessage'].includes(renderStatus)) { nRenderedAttachments--; } // if (renderStatus === 'shown') attachmentSel.show(); @@ -555,132 +453,10 @@ export class GmailElementReplacer implements WebmailElementReplacer { attachmentsContainerInner.parents(this.sel.attachmentsContainerOuter).first().hide(); } if (!skipGoogleDrive) { - await this.processGoogleDriveAttachments(msgId, msgElReference.msgEl, attachmentsContainerInner, printMailInfo); - } - }; - - private processAttachment = async ( - a: Attachment, - treatAs: Attachment$treatAs, - attachmentSel: JQueryEl, - attachmentsContainerInner: JQueryEl, - msgElReference: { msgEl: JQueryEl }, - msgId: string, // deprecated - printMailInfo: PrintMailInfo, - senderEmail: string, // deprecated? - isOutgoing: boolean // deprecated - ): Promise<'shown' | 'replaced' | 'hidden'> => { - // todo - [same name + not processed].first() ... What if attachment metas are out of order compared to how gmail shows it? And have the same name? - try { - if (['needChunk', 'maybePgp', 'publicKey'].includes(treatAs)) { - // todo: this isn't the best way to do this - // todo: move into a handler - // Inspect a chunk - if (this.debug) { - console.debug('processAttachments() try -> awaiting chunk + awaiting type'); - } - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - const data = await this.queueAttachmentChunkDownload(a).result; - const openpgpType = MsgUtil.type({ data }); - if (openpgpType && openpgpType.type === 'publicKey' && openpgpType.armored) { - // if it looks like OpenPGP public key - treatAs = 'publicKey'; - } else if (openpgpType && ['encryptedMsg', 'signedMsg'].includes(openpgpType.type)) { - treatAs = 'encryptedMsg'; // todo: signedMsg ? - } else { - attachmentSel.show().children('.attachment_loader').text('Unknown OpenPGP format'); - if (this.debug) { - console.debug("processAttachments() try -> awaiting done and processed -- doesn't look like OpenPGP"); - } - return 'shown'; - } - if (this.debug) { - console.debug('processAttachments() try -> awaiting done and processed'); - } - } - if (treatAs !== 'plainFile') { - this.hideAttachment(attachmentSel, attachmentsContainerInner); - } - if (treatAs === 'hidden') { - return 'hidden'; - } else if (treatAs === 'encryptedFile') { - // actual encrypted attachment - show it - attachmentsContainerInner.prepend(this.factory.embeddedAttachment(a, true)); // xss-safe-factory - return 'replaced'; // native should be hidden, custom should appear instead - } else if (treatAs === 'encryptedMsg') { - this.startProcessingForMsgEl(msgElReference, 'encryptedMsg', printMailInfo, renderModule => this.processEncryptedMessage(a, renderModule, senderEmail)); - return 'hidden'; // native attachment should be hidden, the "attachment" goes to the message container - } else if (treatAs === 'publicKey') { - // todo - pubkey should be fetched in pgp_pubkey.js - return await this.renderPublicKeyFromFile(a, attachmentsContainerInner, msgElReference.msgEl, isOutgoing, attachmentSel); - } else if (treatAs === 'privateKey') { - return await this.renderBackupFromFile(a, attachmentsContainerInner, msgElReference.msgEl); - } else if (treatAs === 'signature') { - this.startProcessingForMsgEl(msgElReference, 'signedMsg', printMailInfo, renderModule => this.processSignedMessage(msgId, renderModule, senderEmail)); - return 'hidden'; // native attachment should be hidden, the "attachment" goes to the message container - } else { - // standard file - attachmentSel.show().addClass('attachment_processed').children('.attachment_loader').remove(); - return 'shown'; - } - } catch (e) { - if (!ApiErr.isSignificant(e) || (e instanceof AjaxErr && e.status === 200)) { - // todo: show() not needed? - attachmentSel.show().children('.attachment_loader').text('Categorize: net err'); - return 'shown'; - } else { - Catch.reportErr(e); - // todo: show() not needed? - attachmentSel.show().children('.attachment_loader').text('Categorize: unknown err'); - return 'shown'; - } + await this.processGoogleDriveAttachments(msgId, loaderContext.msgEl, attachmentsContainerInner, printMailInfo); } }; - private startProcessingForMsgEl = ( - msgElReference: { msgEl: JQueryEl }, - type: MsgBlockType, // for diagnostics - printMailInfo: PrintMailInfo, - cb: (renderModule: RenderInterface) => Promise<{ publicKeys?: string[] }> - ) => { - const { frameId, frameXssSafe } = this.factory.embeddedRenderMsg(type); - msgElReference.msgEl = this.updateMsgBodyEl_DANGEROUSLY(msgElReference.msgEl, 'set', frameXssSafe); // xss-safe-factory - this.messageRenderer.relayAndProcess(this.relayManager, this.factory, frameId, printMailInfo, cb).catch(Catch.reportErr); - }; - - private processSignedMessage = async (msgId: string, renderModule: RenderInterface, senderEmail: string) => { - try { - renderModule.renderText('Loading signed message...'); - const raw = await this.msgGetRaw(msgId); - return await this.messageRenderer.renderSignedMessage(raw, renderModule, senderEmail); - } catch { - // todo: render error via renderModule - } - return {}; - }; - - private processEncryptedMessage = async (attachment: Attachment, renderModule: RenderInterface, senderEmail: string) => { - try { - if (!attachment.hasData()) { - // todo: common cache, load control? - renderModule.renderText('Retrieving message...'); - await this.gmail.fetchAttachments([attachment]); // todo: render progressCb - } - // todo: probaby subject isn't relevant in attachment-based decryption? - // const subject = gmailMsg.payload ? GmailParser.findHeader(gmailMsg.payload, 'subject') : undefined; - const armoredMsg = PgpArmor.clip(attachment.getData().toUtfStr()); - if (!armoredMsg) { - // todo: - throw new FormatError('Problem extracting armored message', attachment.getData().toUtfStr()); - } - renderModule.renderText('Decrypting...'); - return await this.messageRenderer.renderEncryptedMessage(armoredMsg, renderModule, false, senderEmail); - } catch { - // todo: render error via renderModule - } - return {}; - }; - private processGoogleDriveAttachments = async (msgId: string, msgEl: JQueryEl, attachmentsContainerInner: JQueryEl, printMailInfo: PrintMailInfo) => { const notProcessedAttachmentsLoaders = attachmentsContainerInner.find('.attachment_loader'); if (notProcessedAttachmentsLoaders.length && msgEl.find('.gmail_drive_chip, a[href^="https://drive.google.com/file"]').length) { @@ -708,47 +484,6 @@ export class GmailElementReplacer implements WebmailElementReplacer { } }; - private renderPublicKeyFromFile = async ( - attachmentMeta: Attachment, - attachmentsContainerInner: JQueryEl, - msgEl: JQueryEl, - isOutgoing: boolean, - attachmentSel: JQueryEl - ): Promise<'hidden' | 'shown'> => { - let downloadedAttachment: GmailRes.GmailAttachment; - try { - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - downloadedAttachment = await this.gmail.attachmentGet(attachmentMeta.msgId!, attachmentMeta.id!); // .id! is present when fetched from api - } catch (e) { - attachmentsContainerInner.show().addClass('attachment_processed').find('.attachment_loader').text('Please reload page'); - // todo: attachmentSel.show()? unit-test this case? - return 'shown'; - } - const openpgpType = MsgUtil.type({ data: downloadedAttachment.data.subarray(0, 1000) }); - if (openpgpType && openpgpType.type === 'publicKey') { - this.updateMsgBodyEl_DANGEROUSLY(msgEl, 'after', this.factory.embeddedPubkey(downloadedAttachment.data.toUtfStr(), isOutgoing)); // xss-safe-factory - return 'hidden'; - } else { - attachmentSel.show().addClass('attachment_processed').children('.attachment_loader').text('Unknown Public Key Format'); - return 'shown'; - } - }; - - private renderBackupFromFile = async (attachmentMeta: Attachment, attachmentsContainerInner: JQueryEl, msgEl: JQueryEl) => { - let downloadedAttachment: GmailRes.GmailAttachment; - try { - // todo: fetch from queue - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - downloadedAttachment = await this.gmail.attachmentGet(attachmentMeta.msgId!, attachmentMeta.id!); // .id! is present when fetched from api - } catch (e) { - // todo: do we really need show() for attachmentsContainerInner? - attachmentsContainerInner.show().addClass('attachment_processed').find('.attachment_loader').text('Please reload page'); - return 'shown'; - } - this.updateMsgBodyEl_DANGEROUSLY(msgEl, 'append', this.factory.embeddedBackup(downloadedAttachment.data.toUtfStr())); // xss-safe-factory - return 'hidden'; - }; - private filterAttachments = (potentialMatches: JQueryEl | HTMLElement, regExp: RegExp) => { return $(potentialMatches) .filter('span.aZo:visible, span.a5r:visible') @@ -760,15 +495,6 @@ export class GmailElementReplacer implements WebmailElementReplacer { .closest('span.aZo, span.a5r'); }; - private hideAttachment = (attachmentEl: JQueryEl | HTMLElement, attachmentsContainerSel: JQueryEl | HTMLElement) => { - attachmentEl = $(attachmentEl); - attachmentsContainerSel = $(attachmentsContainerSel); - attachmentEl.hide(); - if (!attachmentEl.length) { - attachmentsContainerSel.children('.attachment_loader').text('Missing file info'); - } - }; - private determineMsgId = (innerMsgEl: HTMLElement | JQueryEl) => { const parents = $(innerMsgEl).parents(this.sel.msgOuter); return parents.attr('data-legacy-message-id') || parents.attr('data-message-id') || ''; @@ -778,59 +504,6 @@ export class GmailElementReplacer implements WebmailElementReplacer { return $(this.sel.msgOuter).filter(`[data-legacy-message-id="${msgId}"]`).find(this.sel.msgInner); }; - private wrapMsgBodyEl = (htmlContent: string) => { - return '
' + htmlContent + '
'; - }; - - /* eslint-disable @typescript-eslint/naming-convention */ - /** - * XSS WARNING - * - * new_html_content must be XSS safe - */ - // prettier-ignore - private updateMsgBodyEl_DANGEROUSLY(el: HTMLElement | JQueryEl, method: 'set' | 'append' | 'after', newHtmlContent_MUST_BE_XSS_SAFE: string): JQueryEl { // xss-dangerous-function - /* eslint-enable @typescript-eslint/naming-convention */ - // Messages in Gmail UI have to be replaced in a very particular way - // The first time we update element, it should be completely replaced so that Gmail JS will lose reference to the original element and stop re-rendering it - // Gmail message re-rendering causes the PGP message to flash back and forth, confusing the user and wasting cpu time - // Subsequent times, it can be updated naturally - const msgBody = $(el); - const replace = !msgBody.is('.message_inner_body'); // not a previously replaced element, needs replacing - if (method === 'set') { - if (replace) { - const parent = msgBody.parent(); - msgBody.replaceWith(this.wrapMsgBodyEl(newHtmlContent_MUST_BE_XSS_SAFE)); // xss-safe-value - this.ensureHasParentNode(msgBody); // Gmail is using msgBody.parentNode (#2271) - return parent.find('.message_inner_body'); // need to return new selector - old element was replaced - } else { - return msgBody.html(newHtmlContent_MUST_BE_XSS_SAFE); // xss-safe-value - } - } else if (method === 'append') { - if (replace) { - const parent = msgBody.parent(); - const wrapper = msgBody.wrap(this.wrapMsgBodyEl('')); - wrapper.append(newHtmlContent_MUST_BE_XSS_SAFE); // xss-reinsert // xss-safe-value - this.ensureHasParentNode(wrapper); // Gmail is using msgBody.parentNode (#2271) - return parent.find('.message_inner_body'); // need to return new selector - old element was replaced - } else { - return msgBody.append(newHtmlContent_MUST_BE_XSS_SAFE); // xss-safe-value - } - } else if (method === 'after') { - msgBody.after(newHtmlContent_MUST_BE_XSS_SAFE); - return msgBody; - } else { - throw new Error('Unknown update_message_body_element method:' + method); - } - } - - private ensureHasParentNode = (el: JQuery) => { - if (!el.parent().length) { - const dummyParent = $('
'); - dummyParent.append(el); // xss-direct - } - }; - // todo: should we use it? private getSenderEmail = (msgEl: HTMLElement | JQueryEl) => { return ($(msgEl).closest('.gs').find('span.gD').attr('email') || '').toLowerCase(); diff --git a/extension/js/content_scripts/webmail/loader-context.ts b/extension/js/content_scripts/webmail/loader-context.ts new file mode 100644 index 00000000000..89816054485 --- /dev/null +++ b/extension/js/content_scripts/webmail/loader-context.ts @@ -0,0 +1,106 @@ +/* ©️ 2016 - present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com */ + +'use strict'; + +import { Attachment } from '../../common/core/attachment.js'; +import { JQueryEl, LoaderContextInterface, bindNow } from '../../common/loader-context-interface.js'; +import { BindInterface } from '../../common/relay-manager-interface.js'; +import { XssSafeFactory } from '../../common/xss-safe-factory.js'; + +export class LoaderContextWebmail implements LoaderContextInterface { + public constructor(public readonly factory: XssSafeFactory, public msgEl: JQueryEl, private readonly attachmentsContainerInner: JQueryEl) {} + + /* eslint-disable @typescript-eslint/naming-convention */ + /** + * XSS WARNING + * + * new_html_content must be XSS safe + */ + // prettier-ignore + public static updateMsgBodyEl_DANGEROUSLY( // xss-dangerous-function + el: HTMLElement | JQueryEl, + method: 'set' | 'append' | 'after', + newHtmlContent_MUST_BE_XSS_SAFE: string + ): JQueryEl { + /* eslint-enable @typescript-eslint/naming-convention */ + // Messages in Gmail UI have to be replaced in a very particular way + // The first time we update element, it should be completely replaced so that Gmail JS will lose reference to the original element and stop re-rendering it + // Gmail message re-rendering causes the PGP message to flash back and forth, confusing the user and wasting cpu time + // Subsequent times, it can be updated naturally + const msgBody = $(el); + const replace = !msgBody.is('.message_inner_body'); // not a previously replaced element, needs replacing + if (method === 'set') { + if (replace) { + const parent = msgBody.parent(); + msgBody.replaceWith(this.wrapMsgBodyEl(newHtmlContent_MUST_BE_XSS_SAFE)); // xss-safe-value + this.ensureHasParentNode(msgBody); // Gmail is using msgBody.parentNode (#2271) + return parent.find('.message_inner_body'); // need to return new selector - old element was replaced + } else { + return msgBody.html(newHtmlContent_MUST_BE_XSS_SAFE); // xss-safe-value + } + } else if (method === 'append') { + if (replace) { + const parent = msgBody.parent(); + const wrapper = msgBody.wrap(this.wrapMsgBodyEl('')); + wrapper.append(newHtmlContent_MUST_BE_XSS_SAFE); // xss-reinsert // xss-safe-value + this.ensureHasParentNode(wrapper); // Gmail is using msgBody.parentNode (#2271) + return parent.find('.message_inner_body'); // need to return new selector - old element was replaced + } else { + return msgBody.append(newHtmlContent_MUST_BE_XSS_SAFE); // xss-safe-value + } + } else if (method === 'after') { + msgBody.after(newHtmlContent_MUST_BE_XSS_SAFE); + return msgBody; + } else { + throw new Error('Unknown update_message_body_element method:' + method); + } + } + + private static ensureHasParentNode = (el: JQuery) => { + if (!el.parent().length) { + const dummyParent = $('
'); + dummyParent.append(el); // xss-direct + } + }; + + private static wrapMsgBodyEl = (htmlContent: string) => { + return '
' + htmlContent + '
'; + }; + + public bind = (frameId: string, binder: BindInterface) => { + bindNow(frameId, binder); + }; + + public renderPlainAttachment = (a: Attachment, attachmentSel?: JQueryEl, error?: string) => { + // simply show existing attachment + if (!attachmentSel) { + this.attachmentsContainerInner + .show() + .addClass('attachment_processed') + .find('.attachment_loader') + .text(error || 'Please reload page'); + } else { + const el = attachmentSel.show(); + if (error) { + el.children('.attachment_loader').text(error); + } else { + el.addClass('attachment_processed').children('.attachment_loader').remove(); + } + } + }; + + public prependEncryptedAttachment = (a: Attachment) => { + this.attachmentsContainerInner.prepend(this.factory.embeddedAttachment(a, true)); // xss-safe-factory + }; + + public setMsgBody = (frameXssSafe: string, method: 'set' | 'append' | 'after') => { + this.msgEl = LoaderContextWebmail.updateMsgBodyEl_DANGEROUSLY(this.msgEl, method, frameXssSafe); // xss-safe-factory + }; + + public hideAttachment = (attachmentEl: JQueryEl) => { + attachmentEl.hide(); + if (!attachmentEl.length) { + this.attachmentsContainerInner.children('.attachment_loader').text('Missing file info'); + } + }; +} diff --git a/test/source/mock/google/exported-messages/message-export-16a9c0fe4e034bc2.json b/test/source/mock/google/exported-messages/message-export-16a9c0fe4e034bc2.json index 7cc3cb6a45b..7df13b9923a 100644 --- a/test/source/mock/google/exported-messages/message-export-16a9c0fe4e034bc2.json +++ b/test/source/mock/google/exported-messages/message-export-16a9c0fe4e034bc2.json @@ -68,11 +68,11 @@ }, { "name": "From", - "value": "FlowCrypt Compatibility " + "value": "some.alias@protonmail.com" }, { "name": "Reply-To", - "value": "FlowCrypt Compatibility " + "value": "some.alias@protonmail.com" }, { "name": "Subject", 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 3694e3f7d74..b349ee532e0 100644 --- a/test/source/mock/google/exported-messages/message-export-16a9c109bc51687d.json +++ b/test/source/mock/google/exported-messages/message-export-16a9c109bc51687d.json @@ -68,11 +68,11 @@ }, { "name": "From", - "value": "FlowCrypt Compatibility " + "value": "some.alias@protonmail.com" }, { "name": "Reply-To", - "value": "FlowCrypt Compatibility " + "value": "some.alias@protonmail.com" }, { "name": "Subject", diff --git a/test/source/mock/google/google-data.ts b/test/source/mock/google/google-data.ts index 6ea0a06bfed..a18272653cf 100644 --- a/test/source/mock/google/google-data.ts +++ b/test/source/mock/google/google-data.ts @@ -235,7 +235,7 @@ export class GoogleData { /* eslint-disable @typescript-eslint/no-non-null-assertion */ const payload = (await GoogleData.withInitializedData(acct)).getMessage(msgId)!.payload!; const fromHeader = payload.headers!.find(header => header.name === 'From')!; - const fromAddress = fromHeader.value!; + const fromAddress = fromHeader!.value; let htmlData: string | undefined; if (payload.mimeType === 'text/plain') { const textData = Buf.fromBase64Str(payload.body!.data!).toUtfStr(); @@ -333,6 +333,7 @@ export class GoogleData { public storeSentMessage = (parseResult: ParseMsgResult, id: string): string => { let bodyContentAtt: { data: string; size: number; filename?: string; id: string } | undefined; const parsedMail = parseResult.mimeMsg; + const parts: GmailMsg$payload$part[] = []; for (const attachment of parsedMail.attachments || []) { const attId = Util.lousyRandom(); const gmailAtt = { @@ -345,6 +346,11 @@ export class GoogleData { if (attachment.filename === 'encrypted.asc') { bodyContentAtt = gmailAtt; } + parts.push({ + partId: attId, + mimeType: attachment.contentType, + filename: attachment.filename, + }); } let body: GmailMsg$payload$body; const htmlOrText = parsedMail.html || parsedMail.text; @@ -355,6 +361,13 @@ export class GoogleData { } else { throw new Error('MOCK storeSentMessage: no parsedMail body, no appropriate bodyContentAtt'); } + const headers = [ + { name: 'Subject', value: parsedMail.subject || '' }, + { name: 'Message-ID', value: parsedMail.messageId || '' }, + ]; + if (parsedMail.from) { + headers.push({ name: 'From', value: parsedMail.from.text }); + } const barebonesGmailMsg: GmailMsg = { // todo - could be improved - very barebones id, @@ -362,11 +375,9 @@ export class GoogleData { historyId: '', labelIds: ['SENT' as GmailMsg$labelId], payload: { - headers: [ - { name: 'Subject', value: parsedMail.subject || '' }, - { name: 'Message-ID', value: parsedMail.messageId || '' }, - ], + headers, body, + parts, }, raw: parseResult.base64, }; diff --git a/test/source/tests/compose.ts b/test/source/tests/compose.ts index 7b863f244ef..93909706503 100644 --- a/test/source/tests/compose.ts +++ b/test/source/tests/compose.ts @@ -3690,24 +3690,22 @@ const sendImgAndVerifyPresentInSentMsg = async (t: AvaContext, browser: BrowserH await composePage.page.evaluate((src: string) => { $('[data-test=action-insert-image]').val(src).click(); }, imgBase64); + const acctEmail = 'flowcrypt.compatibility@gmail.com'; + const accessToken = await BrowserRecipe.getGoogleAccessToken(composePage, acctEmail); await ComposePageRecipe.sendAndClose(composePage); // get sent msg id from mock - const sentMsg = (await GoogleData.withInitializedData('flowcrypt.compatibility@gmail.com')).searchMessagesBySubject(subject)[0]; + const sentMsg = (await GoogleData.withInitializedData(acctEmail)).searchMessagesBySubject(subject)[0]; if (sendingType === 'plain') { expect(sentMsg.payload?.body?.data).to.match(/Test Sending Plain Message With Image/); return; // todo - this test case is a stop-gap. We need to implement rendering of such messages below, // then let test plain messages with images in them (referenced by cid) just like other types of messages below } - let url = `chrome/dev/ci_pgp_host_page.htm?frameId=none&msgId=${encodeURIComponent( - sentMsg.id - )}&senderEmail=flowcrypt.compatibility%40gmail.com&isOutgoing=___cu_false___&acctEmail=flowcrypt.compatibility%40gmail.com`; - if (sendingType === 'sign') { - url += '&signature=___cu_true___'; - } // open a page with the sent msg, investigate img - const pgpHostPage = await browser.newPage(t, url); - const pgpBlockPage = await pgpHostPage.getFrame(['pgp_block.htm']); + const authHdr = { Authorization: `Bearer ${accessToken}` }; // eslint-disable-line @typescript-eslint/naming-convention + const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${sentMsg.id}`, undefined, authHdr); + await gmailPage.waitAll('iframe'); + const pgpBlockPage = await gmailPage.getFrame(['pgp_render_block.htm']); const img = await pgpBlockPage.waitAny('body img'); expect(await PageRecipe.getElementPropertyJson(img, 'src')).to.eq(imgBase64); }; @@ -3723,19 +3721,24 @@ const sendTextAndVerifyPresentInSentMsg = async ( } Message With Test Text ${text} ${Util.lousyRandom()}`; const composePage = await ComposePageRecipe.openStandalone(t, browser, 'compatibility'); await ComposePageRecipe.fillMsg(composePage, { to: 'human@flowcrypt.com' }, subject, text, sendingOpt); + const acctEmail = 'flowcrypt.compatibility@gmail.com'; + const accessToken = await BrowserRecipe.getGoogleAccessToken(composePage, acctEmail); await ComposePageRecipe.sendAndClose(composePage); /* eslint-disable @typescript-eslint/no-non-null-assertion */ // get sent msg from mock - const sentMsg = (await GoogleData.withInitializedData('flowcrypt.compatibility@gmail.com')).searchMessagesBySubject(subject)[0]; - const message = encodeURIComponent(sentMsg.payload!.body!.data!); + const sentMsg = (await GoogleData.withInitializedData(acctEmail)).searchMessagesBySubject(subject)[0]; + const authHdr = { Authorization: `Bearer ${accessToken}` }; // eslint-disable-line @typescript-eslint/naming-convention /* eslint-enable @typescript-eslint/no-non-null-assertion */ - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - content: [text], - unexpectedContent: [], - params: `?frameId=none&msgId=${encodeURIComponent( - sentMsg.id - )}&senderEmail=flowcrypt.compatibility%40gmail.com&isOutgoing=___cu_false___&acctEmail=flowcrypt.compatibility%40gmail.com&message=${message}`, - }); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + sentMsg.id, + { + content: [text], + unexpectedContent: [], + }, + authHdr + ); }; const setRequirePassPhraseAndOpenRepliedMessage = async (t: AvaContext, browser: BrowserHandle, passphrase: string) => { diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index a594c802d38..988234946ad 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -5,23 +5,21 @@ import test 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 { TestWithBrowser } from './../test'; import { expect } from 'chai'; import { PageRecipe } from './page-recipe/abstract-page-recipe'; -import { Buf } from '../core/buf'; import { get203FAE7076005381, protonMailCompatKey, mpVerificationKey, - sha1signpubkey, + // sha1signpubkey, somePubkey, singlePubKeyAttesterConfig, } from '../mock/attester/attester-key-constants'; import { ConfigurationProvider } from '../mock/lib/api'; -import { onlyOnWkdPubKey } from '../mock/wkd/wkd-constants'; +// import { onlyOnWkdPubKey } from '../mock/wkd/wkd-constants'; export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: TestWithBrowser) => { if (testVariant !== 'CONSUMER-LIVE-GMAIL') { @@ -110,7 +108,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitForSelTestState('ready'); await inboxPage.waitAll('iframe'); - await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame(['pgp_block.htm']), { + await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame(['pgp_render_block.htm']), { encryption: 'not encrypted', content: [expectedContent], }); @@ -209,18 +207,22 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - content: ['This is a compatibility test email'], - unexpectedContent: ['Encrypted Subject:', '(no subject)'], - encryption: 'encrypted', - signature: 'not signed', - params: - '?frameId=none&message=-----BEGIN%20PGP%20MESSAGE-----%0A%0AhQEMA%2Ba5zJlucROnAQf%2BJc3kkQPIko5gnq0bN510e16pk%2FBNq3w00BWZZmqe8QZ3%0A2CDi1i8mJCTf0ax9zCjJmNEoK4sonX88ZtQ3nDX819ATeu8gi6cWTaaTrdtfI5wF%0AGoD3IgRiwOGJf3NAUSa8YB77%2Fpx6AL35je44uXHvstmmWrt4LMQBQaRUGHG51vxf%0AQKNx9hBHLOv83wGjjKoDOByb0Lf2sGIlECgeOHGfowKG3fH4NNO0kWbaLcVvM9Dh%0AgWjQQWWAWhZCuFmpYdIktYzC4CN7JaTRdGbyuK2syrsiWyc1tty%2FlV1XM06dwYO8%0A7xgdXTDbmVwujEtQJW1bJuOoI8DiuRbYfEgGSGADmIUCDANLWi%2F85i2VAQEP%2F1qR%0AiYLG5IMS60KJf89GK13PNeo1QzbNNYrNjxWyiEZOy7n0qZ1X7JWfGrRSx2Wqtesh%0AvzY5Dt%2FWQWVES%2F4sl54GO8Pjlhi6YjIn3wFyZryftOF4eXjoQ7dbbpoOsHhOizcD%0Ap3l4zXPRng8hC4gF%2FZ6XxCsFRHLXgDRsJKu5bZ8VEJvK2m1soG%2BCDl9s%2FDifjf%2FU%0AJVc3DWh7lQPGy%2B8TxkvHtvaD1ZbNSjOIfdmsybBS3Hk%2BSoaLb3MI%2Bv2clHMYnSKs%0A1Z2zEn21SBxrLd%2BYKWD5mBE9UZGyarANvvbMkiPGVkHzzUrfu6NjF9sVKoNLDJmu%0Aegjr6RWNv2CrHr%2BREQWRaQ4004Xfu2WRZkcZH7DLaOvIMlvi8mHNW1EplL2SrvF9%0AoH7YMev0j2x0BLEkrOWtFfRG7NpgMU%2FO1bDz3DD7uDHIgi32KJ%2BUhSYXqiMOlIPK%0A8wB39mCqgY1vD5bkw7l%2FVHX%2BfwU7QTAK2Lg7%2BUGD29VmJhso46Mpz1pbL0HZiuCY%0A9JRr1Cxi%2FXwKWXgng8ijIUhQ8%2FsDdUxuRIx%2FxgLCn%2BNy69MrjZnXE2T0W5%2BgBpuX%0Ac7KUdJwCUEkdiB%2FWlz4izdPUCBUnc0QAqCt7Ixx4S4Hn%2BU1lNfrECqJI14kbf27r%0ALmLiZqEB5WJHLBtUkegyFWr6WwHmqQFxtuu2Tg%2Fz0ukBkZDzODNz0eVQANEb%2FkWn%0AxaaH%2FDhvkx%2BDxKeyhi6LDfAtU7oOOo8C3%2BiTFzk%2BSsr2Tl6Mb6fuSSxxVc%2Fi1YZb%0AEOWEuw%2BTLGhH3nzWG1reM7N0q7lNVy5mz3V9cXRcvRUj7wYBhxf4LyBRtCq3lOUl%0AhfHf7U3zk6ZpIUCq146CbWVAy83jnKbJwzmlOCWoy1rVfbRg6%2BemShml3ugOCjfp%0AJVViuW33ZUEGYIeDHa8CihGn3ai0aN4CHQiuDe%2FA9tljFseYi%2BIdfVhIz10VRPBO%0AbRTW%2FnFDkVjI9E3Bd%2BH5%2Byj4LEbGFYfcSHMjgoMjS578p5dmbl%2FVeNt%2FwS9dxPF8%0A8iRV2tcSu5HbLhWGZJ1l%2Bcn6N1PwW6Rs9NrdfsMD7QNsyDU71hOz10asOgebxYNM%0AgFhhw%2FlxHig9iuNwO8GE0HBDmRv%2BHKxLXue0pHPWt9Ut%2FmY4r%2F%2BruXloxRsU8gjG%0AhzSamV5IdvfQy0xCog2bWDCL4rCngh1IkrFi0CtNNl1mPskhoZqMZjso290yNaUc%0AHeFIdyPyvjjxyoHd9K3BuXx6fPvYbZzFRz9YikMqHxz6AyHAiMJnl8OPFH6XOTki%0AO1liU9LI%2BMsLCmeDqGliNap9VMvpBkJK6lWoC0RDtqHM48sI4BqHBgW6nUwnGv5H%0AtKbDTgFfMZw5c%2BklOWIUHME4eFNyRej69uoofFyb2rNjXBqvKlL2g0dUXbm2nmYG%0AUW4JPHWria6djv6zg0h037c%2FP6%2BDhVdm2O8in8b%2BBgqsdr7ChYPp2jUX8rouFNwd%0AU4xAXYo7iLoDN7AXHUb%2BG19qrx3c%2FXBrb5msVllfjDfKspX9ftTBukl1%2FJv2QdE0%0AG0kEVzAVB3amt9KHNX%2BfMC28rBla60gfxmpEJ9Q7fZCAOqTJPPcS1D9AKVm3wpoh%0ANWNJXYstblVGNBGuYeJuvHyjcGfs23RPgy1PI%2FAqJJcumUCcGb8Aa4BufsyZLw4L%0ACkN6yaCuw5DdmeNklkm%2FNVDJJJpvkLYrTRr6V5VIeO1usvmTYwAg5301DjG%2FI6qP%0AVRJQ7GeUXB9G6r6g15KbNfIALz0SUt6wKrFn6H39aVlBXzFO5Y6EmmD%2BYapfJH0o%0AhOHiIbWHXqU9rPToLC2Pn9WDq9FIUMx%2B0wL0En172e2%2BUOfEoPrcoykVFXemGCVp%0AIbB9HsIUVrsYyqvs7HLQfMdR%2FSjw%2BsFilKzIIBFjgNWHiyOwshVMkHCUHohcw6mJ%0A3cx01xWgJaG42ggGSYvkb4BvZEfgKmslwIV79pbwQxuayKNNqCpPwHuqA1fdlZ2E%0AhR8Dn%2BShq2eP5lStlK0V%2BGYT9fBcfuqApdUKNmJA1Pks%2Bj9h0CzseWYA%0A%3DHRui%0A-----END%20PGP%20MESSAGE-----&msgId=1600f39127880eed&senderEmail=&isOutgoing=___cu_false___&acctEmail=flowcrypt.compatibility%40gmail.com', - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '1600f39127880eed', + { + content: ['This is a compatibility test email'], + unexpectedContent: ['Encrypted Subject:', '(no subject)'], + encryption: 'encrypted', + signature: 'not signed', + }, + authHdr + ); }) ); - + /* test( `decrypt - [enigmail] encrypted iso-2022-jp pgp/mime`, testWithBrowser(async (t, browser) => { @@ -256,7 +258,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te }); }) ); - +*/ test( `decrypt - iso-2022-jp, signed plain text`, testWithBrowser(async (t, browser) => { @@ -264,17 +266,21 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - content: ['テストです\nテスト'], - encryption: 'not encrypted', - signature: 'could not verify signature: missing pubkey, missing sender info', - params: - '?frameId=none&message=&msgId=18024d53a24b19ff&senderEmail=&isOutgoing=___cu_false___&signature=___cu_true___&acctEmail=flowcrypt.compatibility%40gmail.com', - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '18024d53a24b19ff', + { + content: ['テストです\nテスト'], + encryption: 'not encrypted', + signature: 'could not verify signature: missing pubkey, missing sender info', + }, + authHdr + ); }) ); - + /* test( `decrypt - quoted part parsing will not crash browser`, testWithBrowser(async (t, browser) => { @@ -311,7 +317,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te }); }) ); - +*/ test( `decrypt - [gpgmail] signed message will get parsed and rendered (though verification fails, enigmail does the same)`, testWithBrowser(async (t, browser) => { @@ -319,17 +325,21 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - content: ['Hi this is a signed message.'], - encryption: 'not encrypted', - signature: 'could not verify signature: missing pubkey, missing sender info', - params: - '?frameId=none&message=&msgId=15f81b5e6ed91b20&senderEmail=&isOutgoing=___cu_false___&signature=___cu_true___&acctEmail=flowcrypt.compatibility%40gmail.com', - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '15f81b5e6ed91b20', + { + content: ['Hi this is a signed message.'], + encryption: 'not encrypted', + signature: 'could not verify signature: missing pubkey, missing sender info', + }, + authHdr + ); }) ); - + /* test( `decrypt - [gpg] signed fully armored message`, testWithBrowser(async (t, browser) => { @@ -529,7 +539,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te }); }) ); - +*/ test( `decrypt - [enigmail] encrypted+signed+file pgp/mime + load from gmail`, testWithBrowser(async (t, browser) => { @@ -537,17 +547,21 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - content: ['Message encrypted and signed as a whole using PGP/MIME.', 'cape-town-central.jpg', '185.69 kB'], - encryption: 'encrypted', - signature: 'could not verify signature: missing pubkey, missing sender info', - params: - '?account_email=flowcrypt.compatibility%40gmail.com&frame_id=frame_ZFnrtBtiit&message=&message_id=15f7fd7fe45fc026&senderEmail=&is_outgoing=___cu_false___', - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '15f7fd7fe45fc026', + { + content: ['Message encrypted and signed as a whole using PGP/MIME.', 'cape-town-central.jpg', '185.69 kB'], + encryption: 'encrypted', + signature: 'could not verify signature: missing pubkey, missing sender info', + }, + authHdr + ); }) ); - + /* test( `decrypt - encrypted missing checksum`, testWithBrowser(async (t, browser) => { @@ -565,7 +579,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te }); }) ); - +*/ test( `decrypt - pgp/mime with large attachment - mismatch`, testWithBrowser(async (t, browser) => { @@ -573,14 +587,18 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - content: ['Your current key cannot open this message.'], - params: - '?account_email=flowcrypt.compatibility%40gmail.com&frame_id=frame_yVMKFLRDiY&message=&message_id=162275c819bcbf9b&senderEmail=&is_outgoing=___cu_false___', - error: 'decrypt error', - expectPercentageProgress: true, - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '162275c819bcbf9b', + { + content: ['Your current key cannot open this message.'], + error: 'decrypt error', + expectPercentageProgress: true, + }, + authHdr + ); }) ); @@ -591,15 +609,19 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - content: ['This will will have a larger attachment below', 'image-large.jpg'], - encryption: 'encrypted', - signature: 'not signed', - params: - '?account_email=flowcrypt.compatibility%40gmail.com&frame_id=frame_yVMKFLRDiY&message=&message_id=1622ea42f3654ddc&senderEmail=&is_outgoing=___cu_false___', - expectPercentageProgress: true, - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '1622ea42f3654ddc', + { + content: ['This will will have a larger attachment below', 'image-large.jpg'], + encryption: 'encrypted', + signature: 'not signed', + expectPercentageProgress: true, + }, + authHdr + ); }) ); @@ -610,15 +632,19 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - content: ['This will will have a larger attachment below', 'image-large.jpg'], - encryption: 'encrypted', - signature: 'not signed', - params: - '?account_email=flowcrypt.compatibility%40gmail.com&frame_id=frame_yVMKFLRDiY&message=&message_id=1622eaa286f90737&senderEmail=&is_outgoing=___cu_false___', - expectPercentageProgress: true, - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '1622eaa286f90737', + { + content: ['This will will have a larger attachment below', 'image-large.jpg'], + encryption: 'encrypted', + signature: 'not signed', + expectPercentageProgress: true, + }, + authHdr + ); }) ); @@ -629,17 +655,21 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - content: ['Can you confirm this works.', 'Senior Consultant, Security'], - encryption: 'encrypted', - signature: 'not signed', - params: - '?account_email=flowcrypt.compatibility%40gmail.com&frame_id=frame_yVMKFLRDiY&message=&message_id=16224f57d26e038e&senderEmail=&is_outgoing=___cu_false___', - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '16224f57d26e038e', + { + content: ['Can you confirm this works.', 'Senior Consultant, Security'], + encryption: 'encrypted', + signature: 'not signed', + }, + authHdr + ); }) ); - + /* test( `decrypt - [flowcrypt] escape and keep tags in plain text`, testWithBrowser(async (t, browser) => { @@ -657,7 +687,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te }); }) ); - +*/ test( `decrypt - [symantec] base64 german umlauts`, testWithBrowser(async (t, browser) => { @@ -665,14 +695,18 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - content: ['verspätet die gewünschte', 'Grüße', 'ä, ü, ö or ß'], - encryption: 'encrypted', - signature: 'not signed', - params: - '?frame_id=frame_TWloVRhvZE&message=&message_id=166117c082a73905&senderEmail=&is_outgoing=___cu_false___&account_email=flowcrypt.compatibility%40gmail.com', - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '166117c082a73905', + { + content: ['verspätet die gewünschte', 'Grüße', 'ä, ü, ö or ß'], + encryption: 'encrypted', + signature: 'not signed', + }, + authHdr + ); }) ); @@ -683,14 +717,18 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - content: ['still can read your message ยังคงอ่านได้อยู่', "This is time I can't read ครั้งนี้อ่านไม่ได้แล้ว"], - encryption: 'encrypted', - signature: 'not signed', - params: - '?frame_id=frame_oGBJClmooG&message=&message_id=166147ea9bb6669d&senderEmail=&is_outgoing=___cu_false___&account_email=flowcrypt.compatibility%40gmail.com', - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '166147ea9bb6669d', + { + content: ['still can read your message ยังคงอ่านได้อยู่', "This is time I can't read ครั้งนี้อ่านไม่ได้แล้ว"], + encryption: 'encrypted', + signature: 'not signed', + }, + authHdr + ); }) ); @@ -701,14 +739,18 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - content: ['เทสไทย', 'Vulnerability Assessment'], - encryption: 'encrypted', - signature: 'not signed', - params: - '?frame_id=frame_NBokFyMmgB&message=&message_id=16613ff9c3735102&senderEmail=&is_outgoing=___cu_false___&account_email=flowcrypt.compatibility%40gmail.com', - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '16613ff9c3735102', + { + content: ['เทสไทย', 'Vulnerability Assessment'], + encryption: 'encrypted', + signature: 'not signed', + }, + authHdr + ); }) ); @@ -719,14 +761,18 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - content: ['The following text is bold: this is bold'], - encryption: 'encrypted', - signature: 'could not verify signature: missing pubkey, missing sender info', - params: - '?frame_id=frame_aLOUYUkbNJ&message=&message_id=1663a65bbd73ce1a&senderEmail=&is_outgoing=___cu_false___&account_email=flowcrypt.compatibility%40gmail.com', - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '1663a65bbd73ce1a', + { + content: ['The following text is bold: this is bold'], + encryption: 'encrypted', + signature: 'could not verify signature: missing pubkey D97859FF68EA0F04', + }, + authHdr + ); }) ); @@ -737,18 +783,22 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - content: ['這封信是用 Thunderbird 做加密與簽章所寄出。', '第四屆董事會成員、認證委員會委員'], - encryption: 'encrypted', - signature: 'could not verify signature: missing pubkey, missing sender info', - quoted: true, - params: - '?frame_id=frame_TgvZakuQNa&message=&message_id=164563dc9e3a8549&senderEmail=&is_outgoing=___cu_false___&account_email=flowcrypt.compatibility%40gmail.com', - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '164563dc9e3a8549', + { + content: ['這封信是用 Thunderbird 做加密與簽章所寄出。', '第四屆董事會成員、認證委員會委員'], + encryption: 'encrypted', + signature: 'could not verify signature: missing pubkey 0B38948F4CD565B5', + quoted: true, + }, + authHdr + ); }) ); - + /* test( `decrypt - [security] mdc - missing - error`, testWithBrowser(async (t, browser) => { @@ -782,7 +832,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te }); }) ); - +*/ test( `decrypt - [security] signed message - maliciously modified - should not pass`, testWithBrowser(async (t, browser) => { @@ -790,10 +840,8 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); const msgId = '15f7f7c5979b5a26'; - const signerEmail = 'sender@domain.com'; - const params = `?frameId=none&account_email=${acctEmail}&senderEmail=${signerEmail}&msgId=${msgId}`; await PageRecipe.addPubkey( t, browser, @@ -857,15 +905,20 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== '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: [], - encryption: 'not encrypted', - signature: 'error verifying signature: Signed digest did not match', - }); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + msgId, + { + content: [], + encryption: 'not encrypted', + signature: 'error verifying signature: Signed digest did not match', + }, + authHdr + ); }) ); - + /* test( `decrypt - [everdesk] message encrypted for sub but claims encryptedFor:primary,sub`, testWithBrowser(async (t, browser) => { @@ -902,7 +955,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== }); }) ); - +*/ test( 'decrypt - by entering pass phrase + remember in session', testWithBrowser(async (t, browser) => { @@ -965,10 +1018,11 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitAll('iframe'); - const pgpBlock = await inboxPage.getFrame(['pgp_block.htm']); + const pgpBlock = await inboxPage.getFrame(['pgp_render_block.htm']); await pgpBlock.waitForSelTestState('ready'); const urls = await inboxPage.getFramesUrls(['pgp_pubkey.htm'], { sleep: 3 }); expect(urls.length).to.be.lessThan(2); + // todo: mock gmail page }) ); @@ -1007,8 +1061,14 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitAll('iframe'); - const pgpBlock = await inboxPage.getFrame(['pgp_block.htm']); + const pgpBlock = await inboxPage.getFrame(['pgp_render_block.htm']); await pgpBlock.waitForSelTestState('ready'); + const expectedMessage = { + signature: 'could not verify signature: missing pubkey 203FAE7076005381', + encryption: 'not encrypted', + content: ['1234'], + }; + await BrowserRecipe.pgpBlockCheck(t, pgpBlock, expectedMessage); const urls = await inboxPage.getFramesUrls(['pgp_pubkey.htm'], { sleep: 3 }); expect(urls.length).to.be.equal(1); await inboxPage.close(); @@ -1016,6 +1076,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== await gmailPage.waitAll('iframe'); const pgpBlockFromGmailPage = await gmailPage.getFrame(['pgp_render_block.htm']); await pgpBlockFromGmailPage.waitForSelTestState('ready'); + await BrowserRecipe.pgpBlockCheck(t, pgpBlockFromGmailPage, expectedMessage); const frameUrlsFromGmailPage = await gmailPage.getFramesUrls(['pgp_pubkey.htm'], { sleep: 3 }); expect(frameUrlsFromGmailPage.length).to.be.equal(1); }) @@ -1059,15 +1120,14 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== const threadId = '17dad75e63e47f97'; const inboxPage = await browser.newExtensionPage(t, `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 }); + const urls = await inboxPage.getFramesUrls(['/chrome/elements/pgp_render_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, + await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame([urls[0]]), { content: ['1234'], encryption: 'not encrypted', signature: 'signed', }); + // todo: check gmail mock }) ); @@ -1090,16 +1150,15 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== }, }, }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - const params = `?frameId=none&acctEmail=${acctEmail}&msgId=${msgId}&signature=___cu_true___&senderEmail=${senderEmail}`; - const pgpHostPage = await browser.newPage(t, `chrome/dev/ci_pgp_host_page.htm${params}`); - const pgpBlockPage = await pgpHostPage.getFrame(['pgp_block.htm']); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${msgId}`, undefined, authHdr); + const pgpBlockPage = await gmailPage.getFrame(['pgp_render_block.htm']); await pgpBlockPage.waitForContent('@pgp-block-content', '1234', 4, 10); await pgpBlockPage.waitForContent('@pgp-signature', 'verifying signature...', 3, 10); await pgpBlockPage.waitForContent('@pgp-signature', 'signed', 10, 10); }) ); - + /* test( 'verification - public key fetched from WKD', testWithBrowser(async (t, browser) => { @@ -1127,7 +1186,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== }); }) ); - +*/ test( 'decrypt - fetched pubkey is automatically saved to contacts', testWithBrowser(async (t, browser) => { @@ -1146,7 +1205,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== }, }, }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); const acctAttr = acctEmail.replace(/[\.@]/g, ''); const senderAttr = senderEmail.replace(/[\.@]/g, ''); { @@ -1158,13 +1217,17 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== 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=${senderEmail}`; - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - params, - content: ['1234'], - encryption: 'not encrypted', - signature: 'signed', - }); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + msgId, + { + content: ['1234'], + encryption: 'not encrypted', + signature: 'signed', + }, + authHdr + ); { const settingsPage = await browser.newExtensionSettingsPage(t, acctEmail); await SettingsPageRecipe.toggleScreen(settingsPage, 'additional'); @@ -1391,7 +1454,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== await gmailPage.close(); }) ); - + /* test( `decrypt - corrupted text in "incorrect message digest" scenario`, testWithBrowser(async (t, browser) => { @@ -1423,12 +1486,12 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== await BrowserRecipe.setUpCommonAcct(t, browser, 'ci.tests.gmail'); const signerEmail = 'sender.for.refetch@domain.com'; const data = await GoogleData.withInitializedData(acctEmail); - /* eslint-disable @typescript-eslint/no-non-null-assertion */ + // eslint-disable @typescript-eslint/no-non-null-assertion const msg = data.getMessage(msgId)!; const signature = Buf.fromBase64Str(msg!.raw!) .toUtfStr() .match(/\-\-\-\-\-BEGIN PGP SIGNATURE\-\-\-\-\-.*\-\-\-\-\-END PGP SIGNATURE\-\-\-\-\-/s)![0]; - /* eslint-enable @typescript-eslint/no-non-null-assertion */ + // eslint-enable @typescript-eslint/no-non-null-assertion const params = `?frameId=none&account_email=${acctEmail}&senderEmail=${signerEmail}&msgId=${msgId}&message=Some%20corrupted%20message&signature=${encodeURIComponent( signature )}`; @@ -1462,12 +1525,12 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== }, }); await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - /* eslint-disable @typescript-eslint/no-non-null-assertion */ + // eslint-disable @typescript-eslint/no-non-null-assertion const msg = data.getMessage(msgId)!; const signature = Buf.fromBase64Str(msg!.raw!) .toUtfStr() .match(/\-\-\-\-\-BEGIN PGP SIGNATURE\-\-\-\-\-.*\-\-\-\-\-END PGP SIGNATURE\-\-\-\-\-/s)![0]; - /* eslint-enable @typescript-eslint/no-non-null-assertion */ + // eslint-enable @typescript-eslint/no-non-null-assertion const params = `?frameId=none&account_email=${acctEmail}&senderEmail=${signerEmail}&msgId=${msgId}&message=Some%20corrupted%20message&signature=${encodeURIComponent( signature )}`; @@ -1481,6 +1544,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== }) ); +*/ test( 'decrypt - protonmail - load pubkey into contact + verify detached msg', testWithBrowser(async (t, browser) => { @@ -1497,32 +1561,41 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== }, }, }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - const textParams = - `?frameId=none&message=&msgId=16a9c109bc51687d&` + - `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'], - encryption: 'not encrypted', - signature: 'could not verify signature: missing pubkey 7ED43D79E9617655', - }); - await PageRecipe.addPubkey(t, browser, 'flowcrypt.compatibility%40gmail.com', testConstants.protonCompatPub, 'some.alias@protonmail.com'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - params: textParams, - content: ['1234'], - encryption: 'not encrypted', - signature: 'signed', - }); - 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'], - encryption: 'not encrypted', - signature: 'signed', - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '16a9c109bc51687d', + { + content: ['1234'], + encryption: 'not encrypted', + signature: 'could not verify signature: missing pubkey 7ED43D79E9617655', + }, + authHdr + ); + await PageRecipe.addPubkey(t, browser, 'flowcrypt.compatibility@gmail.com', testConstants.protonCompatPub, 'some.alias@protonmail.com'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '16a9c109bc51687d', + { + content: ['1234'], + encryption: 'not encrypted', + signature: 'signed', + }, + authHdr + ); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '16a9c0fe4e034bc2', + { + content: ['1234'], + encryption: 'not encrypted', + signature: 'signed', + }, + authHdr + ); }) ); @@ -1542,16 +1615,18 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== }, }, }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - const params = - `?frameId=none&message=&msgId=16a9c109bc51687d&` + - `senderEmail=flowcrypt.compatibility%40protonmail.com&isOutgoing=___cu_false___&signature=___cu_true___&acctEmail=flowcrypt.compatibility%40gmail.com`; - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - params, - content: ['1234'], - encryption: 'not encrypted', - signature: 'signed', - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '16a9c109bc51687d', + { + content: ['1234'], + encryption: 'not encrypted', + signature: 'signed', + }, + authHdr + ); }) ); @@ -1571,14 +1646,18 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== }, }, }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - const params = `?frameId=none&message=&msgId=1617429dc55600db&senderEmail=martin%40politick.ca&isOutgoing=___cu_false___&acctEmail=flowcrypt.compatibility%40gmail.com`; - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - params, - content: ['4) signed + encrypted email if supported'], - encryption: 'encrypted', - signature: 'signed', - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '1617429dc55600db', + { + content: ['4) signed + encrypted email if supported'], + encryption: 'encrypted', + signature: 'signed', + }, + authHdr + ); }) ); @@ -1628,15 +1707,19 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); const threadId = '15f7ffb9320bd79e'; const expectedContent = 'Ascii armor integrity check failed'; - const params = `?frame_id=&threadId=${threadId}&msgId=${threadId}&senderEmail=&account_email=flowcrypt.compatibility%40gmail.com`; - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - params, - content: [expectedContent], - error: 'decrypt error', - }); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + threadId, + { + content: [expectedContent], + error: 'decrypt error', + }, + authHdr + ); }) ); @@ -1698,7 +1781,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== ); test.todo('decrypt - by entering secondary pass phrase'); - + /* test( `decrypt - don't allow api path traversal`, testWithBrowser(async (t, browser) => { @@ -1723,16 +1806,20 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - const params = '?frame_id=&msgId=corrupted-1&signature=___cu_true___&senderEmail=&account_email=flowcrypt.compatibility%40gmail.com'; - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - params, - content: [], - error: 'parse error', - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + 'corrupted-1', + { + content: [], + error: 'parse error', + }, + authHdr + ); }) ); - +*/ test( 'decrypt - prevent rendering of attachments from domain sources other than flowcrypt.s3.amazonaws.com', testWithBrowser(async (t, browser) => { @@ -1750,7 +1837,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== await pgpBlock.notPresent(['.preview-attachment', '@download-attachment-0']); }) ); - + /* test( `decrypt - try path traversal forward slash workaround`, testWithBrowser(async (t, browser) => { @@ -1807,7 +1894,7 @@ d6Z36//MsmczN00Wd60t9T+qyLz0T4/UG2Y9lgf367f3d+kYPE0LS7mXuFmjlPXfw0nKyVsSeFiu }); }) ); - +*/ test( 'verify - Kraken - urldecode signature', testWithBrowser(async (t, browser) => { @@ -1815,15 +1902,19 @@ d6Z36//MsmczN00Wd60t9T+qyLz0T4/UG2Y9lgf367f3d+kYPE0LS7mXuFmjlPXfw0nKyVsSeFiu t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - const params = `?frameId=frame_ZRxshLEFdc&message=&msgId=171d138c8750863b&senderEmail=Kraken%20%3Ccensored%40email.com%3E&isOutgoing=___cu_false___&signature=___cu_true___&acctEmail=flowcrypt.compatibility%40gmail.com&parentTabId=12%3A0`; + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); const expectedContent = 'Kraken clients can now begin converting popular currencies'; - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - params, - content: [expectedContent], - encryption: 'not encrypted', - signature: 'could not verify signature: missing pubkey A38042F607D623DA', - }); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '171d138c8750863b', + { + content: [expectedContent], + encryption: 'not encrypted', + signature: 'could not verify signature: missing pubkey A38042F607D623DA', + }, + authHdr + ); }) ); diff --git a/test/source/tests/tooling/browser-recipe.ts b/test/source/tests/tooling/browser-recipe.ts index 5894317ada7..568a262f6bb 100644 --- a/test/source/tests/tooling/browser-recipe.ts +++ b/test/source/tests/tooling/browser-recipe.ts @@ -1,6 +1,6 @@ /* ©️ 2016 - present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com */ -import { Config, Util, TestMessage, TestMessageWithParams } from '../../util'; +import { Config, Util, TestMessage } from '../../util'; import { AvaContext } from '.'; import { BrowserHandle, Controllable, ControllableFrame, ControllablePage } from '../../browser'; @@ -177,14 +177,17 @@ export class BrowserRecipe { return { acctEmail, passphrase: key.passphrase, settingsPage }; }; - public static pgpBlockVerifyDecryptedContent = async (t: AvaContext, browser: BrowserHandle, m: TestMessageWithParams) => { - const pgpHostPage = await browser.newPage(t, `chrome/dev/ci_pgp_host_page.htm${m.params}`); - try { - const pgpBlockPage = await pgpHostPage.getFrame(['pgp_block.htm']); - return await BrowserRecipe.pgpBlockCheck(t, pgpBlockPage, m); - } finally { - await pgpHostPage.close(); - } + public static pgpBlockVerifyDecryptedContent = async ( + t: AvaContext, + browser: BrowserHandle, + msgId: string, + m: TestMessage, + extraHeaders: Record + ) => { + const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${msgId}`, undefined, extraHeaders); + await gmailPage.waitAll('iframe'); + await BrowserRecipe.pgpBlockCheck(t, await gmailPage.getFrame(['pgp_render_block.htm']), m); + await gmailPage.close(); }; public static pgpBlockCheck = async (t: AvaContext, pgpBlockPage: ControllableFrame, m: TestMessage) => { @@ -217,6 +220,24 @@ export class BrowserRecipe { } const sigBadgeContent = await pgpBlockPage.read('@pgp-signature'); const encBadgeContent = await pgpBlockPage.read('@pgp-encryption'); + if (m.signature) { + if (sigBadgeContent !== m.signature) { + t.log(`found sig content:${sigBadgeContent}`); + throw new Error(`pgp_block_verify_decrypted_content:missing expected signature content:${m.signature}\nactual sig content:${sigBadgeContent}`); + } + } else if (!m.error) { + // some badge still has to be present + expect(sigBadgeContent).to.be.ok; + } + if (m.encryption) { + if (encBadgeContent !== m.encryption) { + t.log(`found enc content:${encBadgeContent}`); + throw new Error(`pgp_block_verify_decrypted_content:missing expected encryption content:${m.encryption}`); + } + } else if (!m.error) { + // some badge still has to be present + expect(encBadgeContent).to.be.ok; + } if (m.error) { expect(sigBadgeContent).to.be.empty; expect(encBadgeContent).to.be.empty; @@ -230,25 +251,6 @@ export class BrowserRecipe { if (!(await pgpBlockPage.isElementVisible('@action-print'))) { throw new Error(`Print button is invisible`); } - } else { - if (m.signature) { - if (sigBadgeContent !== m.signature) { - t.log(`found sig content:${sigBadgeContent}`); - throw new Error(`pgp_block_verify_decrypted_content:missing expected signature content:${m.signature}\nactual sig content:${sigBadgeContent}`); - } - } else { - // some badge still has to be present - expect(sigBadgeContent).to.be.ok; - } - if (m.encryption) { - if (encBadgeContent !== m.encryption) { - t.log(`found enc content:${encBadgeContent}`); - throw new Error(`pgp_block_verify_decrypted_content:missing expected encryption content:${m.encryption}`); - } - } else { - // some badge still has to be present - expect(encBadgeContent).to.be.ok; - } } }; } diff --git a/test/source/util/index.ts b/test/source/util/index.ts index 339b40a327b..c5b91aeed0a 100644 --- a/test/source/util/index.ts +++ b/test/source/util/index.ts @@ -46,10 +46,6 @@ export type TestMessage = { error?: string; }; -export type TestMessageWithParams = TestMessage & { - params: string; -}; - export type TestKeyInfo = { title: string; passphrase: string; From 79aec8218cd129b46487558b8b65b8d751784cec Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 8 May 2023 20:04:52 +0100 Subject: [PATCH 038/147] cleanup --- extension/chrome/dev/ci_pgp_host_page.htm | 15 --------------- extension/chrome/dev/ci_pgp_host_page.ts | 21 --------------------- extension/js/common/core/mime.ts | 14 +++----------- extension/js/common/core/msg-block.ts | 4 +--- extension/js/common/message-renderer.ts | 5 ----- extension/js/common/xss-safe-factory.ts | 4 ---- 6 files changed, 4 insertions(+), 59 deletions(-) delete mode 100644 extension/chrome/dev/ci_pgp_host_page.htm delete mode 100644 extension/chrome/dev/ci_pgp_host_page.ts diff --git a/extension/chrome/dev/ci_pgp_host_page.htm b/extension/chrome/dev/ci_pgp_host_page.htm deleted file mode 100644 index d5cde5101a5..00000000000 --- a/extension/chrome/dev/ci_pgp_host_page.htm +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/extension/chrome/dev/ci_pgp_host_page.ts b/extension/chrome/dev/ci_pgp_host_page.ts deleted file mode 100644 index 3f4c2304062..00000000000 --- a/extension/chrome/dev/ci_pgp_host_page.ts +++ /dev/null @@ -1,21 +0,0 @@ -/* ©️ 2016 - present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com */ - -'use strict'; - -import { BrowserMsg } from '../../js/common/browser/browser-msg.js'; -import { Catch } from '../../js/common/platform/catch.js'; -import { Xss } from '../../js/common/platform/xss.js'; -import { Env } from '../../js/common/browser/env.js'; - -Catch.try(async () => { - const tabId = await BrowserMsg.requiredTabId(); - - // BrowserMsg.addPgpListeners(); // todo - re-allow when https://github.com/FlowCrypt/flowcrypt-browser/issues/2560 fixed - BrowserMsg.listen(tabId); - - let src = Env.getBaseUrl(); - src += `/chrome/elements/pgp_block.htm${location.search}`; - src += `&parentTabId=${encodeURIComponent(tabId)}`; - $('body').append(``); // xss-escaped - $('body').attr('data-test-view-state', 'loaded'); -})(); diff --git a/extension/js/common/core/mime.ts b/extension/js/common/core/mime.ts index 197eec3c4ca..2a0ee640e89 100644 --- a/extension/js/common/core/mime.ts +++ b/extension/js/common/core/mime.ts @@ -154,16 +154,7 @@ export class Mime { if (signatureAttachment.hasData()) { const signature = signatureAttachment.getData().toUtfStr(); const blocksToRevisit = [...bodyBlocks, ...attachmentBlocks.map(x => x.block)]; - for (const block of blocksToRevisit) { - if (block.type === 'plainText') { - block.type = 'signedText'; - block.signature = signature; - } else if (block.type === 'plainHtml') { - block.type = 'signedHtml'; - block.signature = signature; - } - } - if (!blocksToRevisit.find(block => ['plainText', 'plainHtml', 'signedMsg', 'signedHtml', 'signedText'].includes(block.type))) { + if (!blocksToRevisit.find(block => ['plainText', 'plainHtml', 'signedMsg'].includes(block.type))) { // signed an empty message attachmentBlocks.push({ block: new MsgBlock('signedMsg', '', true, signature), file: signatureAttachment }); } @@ -178,7 +169,8 @@ export class Mime { return { block }; }), ...attachmentBlocks, - ], + ], // todo: check how compose-quote-module works, previous version made 'plainText' and 'plainHtml' invisible if a 'signature' block is present + // by changing their types to 'signedText' and 'signedHtml' respectively rawSignedContent: decoded.rawSignedContent, }; }; diff --git a/extension/js/common/core/msg-block.ts b/extension/js/common/core/msg-block.ts index 7a5a2057475..52c2251d4dd 100644 --- a/extension/js/common/core/msg-block.ts +++ b/extension/js/common/core/msg-block.ts @@ -12,7 +12,6 @@ export type ReplaceableMsgBlockType = KeyBlockType | 'signedMsg' | 'encryptedMsg export type MsgBlockType = | ReplaceableMsgBlockType | 'plainText' - | 'signedText' | 'plainHtml' | 'decryptedHtml' | 'plainAttachment' @@ -20,8 +19,7 @@ export type MsgBlockType = | 'decryptedAttachment' | 'encryptedAttachmentLink' | 'decryptErr' - | 'verifiedMsg' - | 'signedHtml'; + | 'verifiedMsg'; export class MsgBlock { public constructor( diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index 643812ab4ea..3d6e984d809 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -188,11 +188,6 @@ export class MessageRenderer { } }; - public static processMessageFromRaw = async (raw: string) => { - const mimeMsg = Buf.fromBase64UrlStr(raw); - return await Mime.process(mimeMsg); - }; - public static reconstructMimeContent = (gmailMsg: GmailRes.GmailMsg): MimeContent => { const bodies = GmailParser.findBodies(gmailMsg); const attachments = GmailParser.findAttachments(gmailMsg, gmailMsg.id); diff --git a/extension/js/common/xss-safe-factory.ts b/extension/js/common/xss-safe-factory.ts index 1ded5c422d1..850abafdf7b 100644 --- a/extension/js/common/xss-safe-factory.ts +++ b/extension/js/common/xss-safe-factory.ts @@ -74,10 +74,6 @@ export class XssSafeFactory { return block.attachmentMeta ? factory.embeddedAttachment(new Attachment(block.attachmentMeta), block.type === 'encryptedAttachment') : '[missing encrypted attachment details]'; - } else if (block.type === 'signedHtml') { - return factory.embeddedMsg('signedHtml', '', msgId, isOutgoing, senderEmail, true); // empty msg so it re-fetches from api. True at the and for "signature" - } else if (block.type === 'signedText') { - return factory.embeddedMsg('signedText', '', msgId, isOutgoing, senderEmail, true); // empty msg so it re-fetches from api. True at the and for "signature" } else { Catch.report(`don't know how to process block type: ${block.type} (not a hard fail)`); return ''; From 002258b435a868c270aadf120a1c6040699e4779 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 8 May 2023 20:09:48 +0100 Subject: [PATCH 039/147] cleanup --- extension/chrome/elements/pgp_block.htm | 51 ---- extension/chrome/elements/pgp_block.ts | 143 --------- .../pgp-block-decrypt-module.ts | 287 ------------------ .../pgp-block-signature-module.ts | 72 ----- 4 files changed, 553 deletions(-) delete mode 100644 extension/chrome/elements/pgp_block.htm delete mode 100644 extension/chrome/elements/pgp_block.ts delete mode 100644 extension/chrome/elements/pgp_block_modules/pgp-block-decrypt-module.ts delete mode 100644 extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts diff --git a/extension/chrome/elements/pgp_block.htm b/extension/chrome/elements/pgp_block.htm deleted file mode 100644 index 0532d62fba8..00000000000 --- a/extension/chrome/elements/pgp_block.htm +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - FlowCrypt - - - - - - -
- -
-
- Print -
- -
-
Loading...
-
- - - - - - - - - - - - - - - - diff --git a/extension/chrome/elements/pgp_block.ts b/extension/chrome/elements/pgp_block.ts deleted file mode 100644 index 980274b26af..00000000000 --- a/extension/chrome/elements/pgp_block.ts +++ /dev/null @@ -1,143 +0,0 @@ -/* ©️ 2016 - present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com */ - -'use strict'; - -import { Str, Url } from '../../js/common/core/common.js'; -import { Assert } from '../../js/common/assert.js'; -import { Buf } from '../../js/common/core/buf.js'; -import { Gmail } from '../../js/common/api/email-provider/gmail/gmail.js'; -import { Lang } from '../../js/common/lang.js'; -import { PgpBlockViewDecryptModule } from './pgp_block_modules/pgp-block-decrypt-module.js'; -import { PgpBlockViewSignatureModule } from './pgp_block_modules/pgp-block-signature-module.js'; -import { Ui } from '../../js/common/browser/ui.js'; -import { View } from '../../js/common/view.js'; -import { PubLookup } from '../../js/common/api/pub-lookup.js'; -import { ClientConfiguration } from '../../js/common/client-configuration.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'; -import { PgpBaseBlockView } from './pgp_base_block_view.js'; -import { GmailParser } from '../../js/common/api/email-provider/gmail/gmail-parser.js'; -import { Xss } from '../../js/common/platform/xss.js'; - -export class PgpBlockView extends PgpBaseBlockView { - public readonly isOutgoing: boolean; - public readonly senderEmail: string; - public readonly msgId: string | undefined; - public readonly encryptedMsgUrlParam: Buf | undefined; - public readonly signature?: { - // when parsedSignature is undefined, decryptModule will try to fetch the message - parsedSignature?: string; - }; - - public gmail: Gmail; - public clientConfiguration!: ClientConfiguration; - public pubLookup!: PubLookup; - - public readonly signatureModule: PgpBlockViewSignatureModule; - public readonly decryptModule: PgpBlockViewDecryptModule; - - public fesUrl?: string; - - public constructor() { - Ui.event.protect(); - const uncheckedUrlParams = Url.parse(['acctEmail', 'frameId', 'message', 'parentTabId', 'msgId', 'isOutgoing', 'senderEmail', 'signature', 'debug']); - super( - uncheckedUrlParams.debug === true, - Assert.urlParamRequire.string(uncheckedUrlParams, 'parentTabId'), - Assert.urlParamRequire.string(uncheckedUrlParams, 'frameId'), - Assert.urlParamRequire.string(uncheckedUrlParams, 'acctEmail') - ); - this.isOutgoing = uncheckedUrlParams.isOutgoing === true; - const senderEmail = Assert.urlParamRequire.string(uncheckedUrlParams, 'senderEmail'); - this.senderEmail = Str.parseEmail(senderEmail).email || ''; - this.msgId = Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'msgId'); - if (/\.\.|\\|\//.test(decodeURI(this.msgId || ''))) { - throw new Error('API path traversal forbidden'); - } - this.encryptedMsgUrlParam = uncheckedUrlParams.message ? Buf.fromUtfStr(Assert.urlParamRequire.string(uncheckedUrlParams, 'message')) : undefined; - if (uncheckedUrlParams.signature === true) { - this.signature = { parsedSignature: undefined }; // decryptModule will try to fetch the message - } else if (uncheckedUrlParams.signature) { - this.signature = { parsedSignature: String(uncheckedUrlParams.signature) }; - } - this.gmail = new Gmail(this.acctEmail); - // modules - this.signatureModule = new PgpBlockViewSignatureModule(this); - this.decryptModule = new PgpBlockViewDecryptModule(this); - } - - 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; - }; - - public render = async () => { - const storage = await AcctStore.get(this.acctEmail, ['setup_done', 'fesUrl']); - this.fesUrl = storage.fesUrl; - this.clientConfiguration = await ClientConfiguration.newInstance(this.acctEmail); - this.pubLookup = new PubLookup(this.clientConfiguration); - await this.initPrintView(); - if (storage.setup_done) { - 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)); - await this.decryptModule.initialize(verificationPubs, false); - } else { - await this.errorModule.renderErr(Lang.pgpBlock.refreshWindow, this.encryptedMsgUrlParam ? this.encryptedMsgUrlParam.toUtfStr() : undefined); - } - }; - - public setHandlers = () => { - $('.pgp_print_button').on( - 'click', - this.setHandler(() => this.printModule.printPGPBlock()) - ); - }; - - private initPrintView = async () => { - const fullName = await AcctStore.get(this.acctEmail, ['full_name']); - Xss.sanitizeRender('.print_user_email', `${fullName.full_name} <${this.acctEmail}>`); - try { - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - const gmailMsg = await this.gmail.msgGet(this.msgId!, 'metadata', undefined); - const sentDate = new Date(GmailParser.findHeader(gmailMsg, 'date') ?? ''); - const sentDateStr = Str.fromDate(sentDate).replace(' ', ' at '); - const from = Str.parseEmail(GmailParser.findHeader(gmailMsg, 'from') ?? ''); - const fromHtml = from.name ? `${Xss.htmlSanitize(from.name)} <${from.email}>` : from.email; - /* eslint-disable @typescript-eslint/no-non-null-assertion */ - const ccString = GmailParser.findHeader(gmailMsg, 'cc') - ? `Cc: ${Xss.escape(GmailParser.findHeader(gmailMsg, 'cc')!)}
` - : ''; - const bccString = GmailParser.findHeader(gmailMsg, 'bcc') ? `Bcc: ${Xss.escape(GmailParser.findHeader(gmailMsg, 'bcc')!)}
` : ''; - /* eslint-enable @typescript-eslint/no-non-null-assertion */ - this.printModule.printMailInfoHtml = ` -
-

${Xss.htmlSanitize(GmailParser.findHeader(gmailMsg, 'subject') ?? '')}

-
-
-
-
- From: ${fromHtml} -
-
- ${sentDateStr} -
-
- To: ${Xss.escape(GmailParser.findHeader(gmailMsg, 'to') ?? '')}
- ${ccString} - ${bccString} -
- `; - } catch (e) { - this.errorModule.debug(`Error while getting gmail message for ${this.msgId} message. ${e}`); - } - }; -} - -View.run(PgpBlockView); 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 deleted file mode 100644 index 4a3ec4e3cb9..00000000000 --- a/extension/chrome/elements/pgp_block_modules/pgp-block-decrypt-module.ts +++ /dev/null @@ -1,287 +0,0 @@ -/* ©️ 2016 - present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com */ - -'use strict'; - -import { BrowserMsg } from '../../../js/common/browser/browser-msg.js'; -import { Buf } from '../../../js/common/core/buf.js'; -import { DecryptErrTypes, FormatError, VerifyRes } from '../../../js/common/core/crypto/pgp/msg-util.js'; -import { GmailResponseFormat } from '../../../js/common/api/email-provider/gmail/gmail.js'; -import { Lang } from '../../../js/common/lang.js'; -import { Mime } from '../../../js/common/core/mime.js'; -import { PgpBlockView } from '../pgp_block.js'; -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 { MsgBlockParser } from '../../../js/common/core/msg-block-parser.js'; -import { Str } from '../../../js/common/core/common.js'; -import { Attachment } from '../../../js/common/core/attachment.js'; -import { MsgBlock } from '../../../js/common/core/msg-block.js'; -import { MessageRenderer } from '../../../js/common/message-renderer.js'; -import { ApiErr } from '../../../js/common/api/shared/api-error.js'; -import { Catch } from '../../../js/common/platform/catch.js'; - -export class PgpBlockViewDecryptModule { - private msgFetchedFromApi: false | GmailResponseFormat = false; - private isPwdMsgBasedOnMsgSnippet: boolean | undefined; - - public constructor(private view: PgpBlockView) {} - - public initialize = async (verificationPubs: string[], forcePullMsgFromApi: boolean) => { - try { - if (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'; - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - const mimeMsg = Buf.fromBase64UrlStr(raw!); // used 'raw' above - const parsed = await Mime.decode(mimeMsg); - if (parsed && typeof parsed.rawSignedContent === 'string') { - const signatureAttachment = parsed.attachments.find(a => a.treatAs(parsed.attachments) === 'signature'); // todo: more than one signature candidate? - if (signatureAttachment) { - this.view.signature.parsedSignature = signatureAttachment.getData().toUtfStr(); - return await this.decryptAndRender(parsed.rawSignedContent, verificationPubs); - } - } - await this.view.errorModule.renderErr( - 'Error: could not properly parse signed message', - parsed.rawSignedContent || parsed.text || parsed.html || mimeMsg.toUtfStr(), - 'parse error' - ); - } 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, 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. ' + Lang.general.contactIfHappensAgain(!!this.view.fesUrl)); - this.view.renderModule.resizePgpBlockFrame(); - } else { - const { armored, plaintext, subject } = await this.retrieveMessage(this.view.msgId); - this.view.renderModule.renderText('Decrypting...'); - if (plaintext) { - await this.view.renderModule.renderAsRegularContent(plaintext); - } else { - await this.decryptAndRender(armored, verificationPubs, subject); - } - } - } - } catch (e) { - await this.handleInitializeErr(e); - } - }; - - public canAndShouldFetchFromApi = () => this.msgFetchedFromApi !== 'raw'; - - private handleInitializeErr = async (e: unknown) => { - if (ApiErr.isNetErr(e)) { - await this.view.errorModule.renderErr(`Could not load message due to network error. ${Ui.retryLink()}`, undefined); - } else if (ApiErr.isAuthErr(e)) { - BrowserMsg.send.notificationShowAuthPopupNeeded(this.view.parentTabId, { acctEmail: this.view.acctEmail }); - await this.view.errorModule.renderErr(`Could not load message due to missing auth. ${Ui.retryLink()}`, undefined); - } else if (e instanceof FormatError) { - await this.view.errorModule.renderErr( - Lang.pgpBlock.cantOpen + Lang.pgpBlock.badFormat + Lang.pgpBlock.details + e.message + ' ' + Lang.pgpBlock.dontKnowHowOpen(!!this.view.fesUrl), - e.data - ); - } else if (ApiErr.isInPrivateMode(e)) { - await this.view.errorModule.renderErr( - `FlowCrypt does not work in a Firefox Private Window (or when Firefox Containers are used). Please try in a standard window.`, - undefined - ); - } else { - Catch.reportErr(e); - await this.view.errorModule.renderErr(Xss.escape(String(e)), this.view.encryptedMsgUrlParam ? this.view.encryptedMsgUrlParam.toUtfStr() : undefined); - } - }; - - private retrieveMessage = async (msgId: string) => { - // todo: msgId === this.view.msgId - this.view.renderModule.renderText('Retrieving message...'); - const format: GmailResponseFormat = !this.msgFetchedFromApi ? 'full' : 'raw'; - const extractionResult = await this.view.gmail.extractArmoredBlock(msgId, format, progress => { - this.view.renderModule.renderText(`Retrieving message... ${progress}%`); - }); - this.isPwdMsgBasedOnMsgSnippet = extractionResult.isPwdMsg; - this.msgFetchedFromApi = format; - return extractionResult; - }; - - // #4342 - we have some corrupted cleartext signed message, find the correct message by the base64 signature characters - private getNeededCleartextMessage = (armoredInput: string, referenceData: string): string | undefined => { - const { blocks } = MsgBlockParser.detectBlocks(armoredInput); - const candidateBlocks = blocks.filter(b => b.type === 'signedMsg'); - if (candidateBlocks.length === 0) { - return undefined; - } - const initialSignatureMatch = referenceData.match(/\r?\n-----BEGIN PGP SIGNATURE-----(?=[\r\n]).*?\r?\n\r?\n(.*)\r?\n-----END PGP SIGNATURE-----$/s); - const initialSignature = initialSignatureMatch ? initialSignatureMatch[1].replace(/\s/g, '') : ' '; - for (const candidateBlock of candidateBlocks.map(b => (typeof b.content === 'string' ? b.content : b.content.toUtfStr()))) { - const match = candidateBlock.match( - /^-----BEGIN PGP SIGNED MESSAGE-----\r?\n.*?\r?\n-----BEGIN PGP SIGNATURE-----(?=[\r\n]).*?\r?\n\r?\n(.*?)\r?\n-----END PGP SIGNATURE-----\r?\n?$/s - ); - if (match && match[1].replace(/\s/g, '') === initialSignature) { - return match[0]; - } - } - return undefined; - }; - - private decryptAndRender = async (encryptedData: Uint8Array | string, verificationPubs: string[], plainSubject?: string): Promise => { - 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); - if (typeof result === 'undefined') { - await this.view.errorModule.renderErr(Lang.general.restartBrowserAndTryAgain(!!this.view.fesUrl), undefined); - } else if (result.success) { - if (result.isCleartext && result.signature?.error === 'Signed digest did not match' && this.view.msgId && !this.msgFetchedFromApi) { - // only try to re-fetch 'full' - console.info(`re-fetching message ${this.view.msgId} from api because looks like bad formatting: full`); - const { armored } = await this.retrieveMessage(this.view.msgId); // todo: subject? - const fetchedContent = this.getNeededCleartextMessage(armored, Str.with(encryptedData)); - if (typeof fetchedContent !== 'undefined') { - return await this.decryptAndRender(fetchedContent, verificationPubs); - } - } - await this.decideDecryptedContentFormattingAndRender( - result.content, - result.isEncrypted, - result.signature, - verificationPubs, - async (verificationPubs: string[]) => { - const decryptResult = await decrypt(verificationPubs); - if (!decryptResult.success) { - return undefined; // note: this internal error results in a wrong "Not Signed" badge - } else { - return decryptResult.signature; - } - }, - plainSubject - ); - } else if (result.error.type === DecryptErrTypes.format) { - 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 { - await this.view.errorModule.renderErr(Lang.pgpBlock.badFormat + '\n\n' + result.error.message, Str.with(encryptedData)); - } - } else if (result.longids.needPassphrase.length) { - this.view.renderModule.renderPassphraseNeeded(result.longids.needPassphrase); - await PassphraseStore.waitUntilPassphraseChanged(this.view.acctEmail, result.longids.needPassphrase); - this.view.renderModule.clearErrorStatus(); - this.view.renderModule.renderText('Decrypting...'); - await this.decryptAndRender(encryptedData, verificationPubs); - } else { - if (!result.longids.chosen && !(await KeyStore.get(this.view.acctEmail)).length) { - await this.view.errorModule.renderErr( - Lang.pgpBlock.notProperlySetUp + this.view.errorModule.btnHtml('FlowCrypt settings', 'green settings'), - undefined - ); - } else if (result.error.type === DecryptErrTypes.keyMismatch) { - await this.view.errorModule.handlePrivateKeyMismatch( - kisWithPp.map(ki => ki.public), - encryptedData, - this.isPwdMsgBasedOnMsgSnippet === true - ); - } else if (result.error.type === DecryptErrTypes.wrongPwd || result.error.type === DecryptErrTypes.usePassword) { - await this.view.errorModule.renderErr(Lang.pgpBlock.pwdMsgAskSenderUsePubkey, undefined); - } else if (result.error.type === DecryptErrTypes.noMdc) { - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - await this.view.errorModule.renderErr(result.error.message, result.content!.toUtfStr()); // missing mdc - only render the result after user confirmation - } else if (result.error) { - await this.view.errorModule.renderErr(`${Lang.pgpBlock.cantOpen}\n\n${result.error.type}: ${result.error.message}`, Str.with(encryptedData)); - } else { - // should generally not happen - await this.view.errorModule.renderErr( - Lang.pgpBlock.cantOpen + Lang.general.writeMeToFixIt(!!this.view.fesUrl) + '\n\nDiagnostic info: "' + JSON.stringify(result) + '"', - Str.with(encryptedData) - ); - } - } - } else { - // this.view.signature.parsedSignature is defined - // sometimes signatures come wrongly percent-encoded. Here we check for typical "=3Dabcd" at the end - const sigText = 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.decideDecryptedContentFormattingAndRender(encryptedData, false, signatureResult, verificationPubs, verify); - } - }; - - private decideDecryptedContentFormattingAndRender = async ( - decryptedBytes: Uint8Array | string, - isEncrypted: boolean, - sigResult: VerifyRes | undefined, - verificationPubs: string[], - retryVerification: (verificationPubs: string[]) => Promise, - plainSubject?: string - ) => { - if (isEncrypted) { - this.view.renderModule.renderEncryptionStatus('encrypted'); - this.view.renderModule.setFrameColor('green'); - } else { - this.view.renderModule.renderEncryptionStatus('not encrypted'); - this.view.renderModule.setFrameColor('gray'); - } - const publicKeys: string[] = []; - let renderableAttachments: Attachment[] = []; - let decryptedContent: string | undefined; - let isHtml = false; - // todo - replace with MsgBlockParser.fmtDecryptedAsSanitizedHtmlBlocks, then the extract/strip methods could be private? - if (!Mime.resemblesMsg(decryptedBytes)) { - const fcAttachmentBlocks: MsgBlock[] = []; - decryptedContent = Str.with(decryptedBytes); - decryptedContent = MsgBlockParser.extractFcAttachments(decryptedContent, fcAttachmentBlocks); - decryptedContent = MsgBlockParser.stripFcTeplyToken(decryptedContent); - decryptedContent = MsgBlockParser.stripPublicKeys(decryptedContent, publicKeys); - if (fcAttachmentBlocks.length) { - renderableAttachments = fcAttachmentBlocks.map( - attachmentBlock => new Attachment(attachmentBlock.attachmentMeta!) // eslint-disable-line @typescript-eslint/no-non-null-assertion - ); - } - } else { - this.view.renderModule.renderText('Formatting...'); - const decoded = await Mime.decode(decryptedBytes); - let inlineCIDAttachments: Attachment[] = []; - if (typeof decoded.html !== 'undefined') { - ({ sanitizedHtml: decryptedContent, inlineCIDAttachments } = MessageRenderer.replaceInlineImageCIDs(decoded.html, decoded.attachments)); - isHtml = true; - } else if (typeof decoded.text !== 'undefined') { - decryptedContent = decoded.text; - } else { - decryptedContent = ''; - } - if ( - decoded.subject && - isEncrypted && - (!plainSubject || !Mime.subjectWithoutPrefixes(plainSubject).includes(Mime.subjectWithoutPrefixes(decoded.subject))) - ) { - // there is an encrypted subject + (either there is no plain subject or the plain subject does not contain what's in the encrypted subject) - decryptedContent = MessageRenderer.getEncryptedSubjectText(decoded.subject, isHtml) + decryptedContent; // render encrypted subject in message - } - for (const attachment of decoded.attachments) { - if (attachment.isPublicKey()) { - publicKeys.push(attachment.getData().toUtfStr()); - } else if (!inlineCIDAttachments.some(inlineAttachment => inlineAttachment.cid === attachment.cid)) { - renderableAttachments.push(attachment); - } - } - } - this.view.quoteModule.separateQuotedContentAndRenderText(decryptedContent, isHtml); - await this.view.signatureModule.renderPgpSignatureCheckResult(sigResult, verificationPubs, retryVerification); - if (isEncrypted && publicKeys.length) { - BrowserMsg.send.renderPublicKeys(this.view.parentTabId, { afterFrameId: this.view.frameId, publicKeys }); - } - if (renderableAttachments.length) { - this.view.attachmentsModule.renderInnerAttachments(renderableAttachments, isEncrypted); - } - this.view.renderModule.resizePgpBlockFrame(); - if (!this.view.renderModule.doNotSetStateAsReadyYet) { - // in case async tasks are still being worked at - Ui.setTestState('ready'); - } - }; -} 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 deleted file mode 100644 index 9d365b43756..00000000000 --- a/extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts +++ /dev/null @@ -1,72 +0,0 @@ -/* ©️ 2016 - present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com */ - -'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.js'; -import { Ui } from '../../../js/common/browser/ui.js'; -import { VerifyRes } from '../../../js/common/core/crypto/pgp/msg-util.js'; -import { BrowserMsg } from '../../../js/common/browser/browser-msg.js'; -import { MessageRenderer } from '../../../js/common/message-renderer.js'; - -export class PgpBlockViewSignatureModule { - public constructor(private view: PgpBlockView) {} - - 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 - if (verifyRes?.error) { - 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 - await this.view.decryptModule.initialize(verificationPubs, true); - return; - } - this.view.renderModule.renderSignatureStatus(`error verifying signature: ${verifyRes.error}`); - this.view.renderModule.setFrameColor('red'); - } else if (!verifyRes || !verifyRes.signerLongids.length) { - this.view.renderModule.renderSignatureStatus('not signed'); - } else if (verifyRes.match) { - this.view.renderModule.renderSignatureStatus('signed'); - } else { - if (retryVerification) { - const signerEmail = this.view.getExpectedSignerEmail(); - if (!signerEmail) { - // in some tests we load the block without sender information - this.view.renderModule.renderSignatureStatus('could not verify signature: missing pubkey, missing sender info'); - } else { - $('#pgp_signature').addClass('gray_label').text('verifying signature...'); - try { - 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; - } - MessageRenderer.renderMissingPubkeyOrBadSignature(this.view.renderModule, verifyRes); - } catch (e) { - if (ApiErr.isSignificant(e)) { - Catch.reportErr(e); - this.view.renderModule.renderSignatureStatus(`error verifying signature: ${e}`); - } else { - this.view.renderModule.renderSignatureStatus('error verifying signature: offline, click to retry').on( - 'click', - this.view.setHandler(() => window.location.reload()) - ); - } - } - } - } else { - // !retryVerification - MessageRenderer.renderMissingPubkeyOrBadSignature(this.view.renderModule, verifyRes); - } - } - this.view.renderModule.doNotSetStateAsReadyYet = false; - Ui.setTestState('ready'); - }; -} From 7c8872dfbe76fb23d912b4cde947cb60c4e3c1b0 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 8 May 2023 20:12:49 +0100 Subject: [PATCH 040/147] temporarily increase execution_time_limit --- .semaphore/semaphore.yml | 2 +- package.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 22cbd1fbdee..dbb84eb35fb 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -12,7 +12,7 @@ blocks: - name: Mock UI Tests dependencies: [] execution_time_limit: - minutes: 30 + minutes: 45 task: secrets: - name: flowcrypt-browser-ci-secrets diff --git a/package.json b/package.json index e9c16322152..e9dc582e6aa 100644 --- a/package.json +++ b/package.json @@ -80,9 +80,9 @@ "test_async_stack": "node build/test/test/source/async-stack.js", "test_buf": "npx ava --timeout=3m --verbose --concurrency=10 build/test/test/source/buf.js", "test_ci_chrome_consumer_live_gmail": "npx ava --timeout=60m --verbose --tap --concurrency=1 build/test/test/source/test.js -- CONSUMER-LIVE-GMAIL STANDARD-GROUP | npx tap-xunit > report.xml", - "test_ci_chrome_consumer": "npx ava --timeout=30m --verbose --tap --concurrency=10 build/test/test/source/test.js -- CONSUMER-MOCK STANDARD-GROUP | npx tap-xunit > report.xml", - "test_ci_chrome_enterprise": "npx ava --timeout=30m --verbose --tap --concurrency=10 build/test/test/source/test.js -- ENTERPRISE-MOCK STANDARD-GROUP | npx tap-xunit > report.xml", - "test_ci_chrome_consumer_flaky": "npx ava --timeout=30m --verbose --tap --concurrency=10 build/test/test/source/test.js -- CONSUMER-MOCK FLAKY-GROUP | npx tap-xunit > report.xml", + "test_ci_chrome_consumer": "npx ava --timeout=60m --verbose --tap --concurrency=10 build/test/test/source/test.js -- CONSUMER-MOCK STANDARD-GROUP | npx tap-xunit > report.xml", + "test_ci_chrome_enterprise": "npx ava --timeout=60m --verbose --tap --concurrency=10 build/test/test/source/test.js -- ENTERPRISE-MOCK STANDARD-GROUP | npx tap-xunit > report.xml", + "test_ci_chrome_consumer_flaky": "npx ava --timeout=60m --verbose --tap --concurrency=10 build/test/test/source/test.js -- CONSUMER-MOCK FLAKY-GROUP | npx tap-xunit > report.xml", "test_ci_chrome_content_scripts": "npx ava --timeout=3m --verbose --tap build/test/test/source/test.js -- CONTENT-SCRIPT-TESTS > report.xml", "dev_start_gmail_mock_api": "./scripts/build.sh && cd ./conf && node ../build/tooling/tsc-compiler --project tsconfig.test.json && cd .. && node ./build/test/test/source/mock.js", "run_firefox": "npm run build-incremental && npx web-ext run --source-dir ./build/firefox-consumer/ --firefox-profile ~/.mozilla/firefox/flowcrypt-dev --keep-profile-changes", From 1afb4e5ef0a275a8eaabdb5eb4714f6b4a1cac87 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 8 May 2023 20:31:40 +0100 Subject: [PATCH 041/147] fix --- extension/js/common/message-renderer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index 3d6e984d809..bf6dea478c4 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -31,7 +31,7 @@ import { Downloader, ProcessedMessage } from './downloader.js'; import { JQueryEl, LoaderContextBindInterface, LoaderContextBindNow, LoaderContextInterface } from './loader-context-interface.js'; import { Gmail } from './api/email-provider/gmail/gmail.js'; import { ApiErr, AjaxErr } from './api/shared/api-error.js'; -import { isCustomerUrlFesUsed } from './helpers'; +import { isCustomerUrlFesUsed } from './helpers.js'; export type ProccesedMsg = MimeProccesedMsg; From a75b4091a8aa72b3895697797f239bcd36c0a218 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 9 May 2023 08:52:45 +0100 Subject: [PATCH 042/147] revert debug code --- test/source/tests/tooling/browser-recipe.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/source/tests/tooling/browser-recipe.ts b/test/source/tests/tooling/browser-recipe.ts index 568a262f6bb..69cf3d2a517 100644 --- a/test/source/tests/tooling/browser-recipe.ts +++ b/test/source/tests/tooling/browser-recipe.ts @@ -194,7 +194,7 @@ export class BrowserRecipe { if (m.expectPercentageProgress) { await pgpBlockPage.waitForContent('@pgp-block-content', /Retrieving message... \d+%/, 20, 10); } - await pgpBlockPage.waitForSelTestState('ready', 10000); + await pgpBlockPage.waitForSelTestState('ready', 100); await Util.sleep(1); if (m.quoted) { await pgpBlockPage.waitAndClick('@action-show-quoted-content'); From 734b4b55eee7acd94d04f84a6ee41c002d100689 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 10 May 2023 19:37:09 +0100 Subject: [PATCH 043/147] signerEmail fix --- extension/js/common/message-renderer.ts | 27 ++++++++++++++----------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index bdef7e4f754..4d32c8c0b05 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -202,7 +202,9 @@ export class MessageRenderer { }; private static getVerificationPubs = async (signerEmail: string) => { - const parsedPubs = (await ContactStore.getOneWithAllPubkeys(undefined, signerEmail))?.sortedPubkeys ?? []; + const email = Str.parseEmail(signerEmail).email; + if (!email) return []; + const parsedPubs = (await ContactStore.getOneWithAllPubkeys(undefined, email))?.sortedPubkeys ?? []; // todo: we don't actually need parsed pubs here because we're going to pass them to the background page // maybe we can have a method in ContactStore to extract armored keys return parsedPubs.map(key => KeyUtil.armor(key.pubkey)); @@ -523,17 +525,18 @@ export class MessageRenderer { // todo: this should be moved to some other class? private getRetryVerification = (signerEmail: string | undefined, verify: (verificationPubs: string[]) => Promise) => { - return signerEmail - ? async () => { - const clientConfiguration = await ClientConfiguration.newInstance(this.acctEmail); - const { pubkeys } = await new PubLookup(clientConfiguration).lookupEmail(signerEmail); - if (pubkeys.length) { - await saveFetchedPubkeysIfNewerThanInStorage({ email: signerEmail, pubkeys }); // synchronously because we don't want erratic behaviour - return await verify(pubkeys); - } - return undefined; - } - : undefined; + if (!signerEmail) return undefined; + const { email } = Str.parseEmail(signerEmail); // todo: we can also store name if contact doesn't exist + if (!email) return undefined; + return async () => { + const clientConfiguration = await ClientConfiguration.newInstance(this.acctEmail); + const { pubkeys } = await new PubLookup(clientConfiguration).lookupEmail(email); + if (pubkeys.length) { + await saveFetchedPubkeysIfNewerThanInStorage({ email, pubkeys }); // synchronously because we don't want erratic behaviour + return await verify(pubkeys); + } + return undefined; + }; }; private renderSignedMessage = async (raw: string, renderModule: RenderInterface, signerEmail: string) => { From 3b55b3f48b037b51cc93e96bbbf9755491ef89cb Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 11 May 2023 10:45:29 +0100 Subject: [PATCH 044/147] fix test for #3944 --- test/source/tests/gmail.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/source/tests/gmail.ts b/test/source/tests/gmail.ts index f590fc38f0e..ff2810ca6ac 100644 --- a/test/source/tests/gmail.ts +++ b/test/source/tests/gmail.ts @@ -246,7 +246,7 @@ export const defineGmailTests = (testVariant: TestVariant, testWithBrowser: Test await BrowserRecipe.pgpBlockCheck(t, pgpBlockFrame, { content: ['Encrypted Subject: [ci.test] Thunderbird html signed + encrypted', '1234'], encryption: 'encrypted', - signature: 'not signed', // should be 'signed'? #3944 + signature: 'signed', }); await pageHasSecureReplyContainer(t, browser, gmailPage); const pubkeyPage = await gmailPage.getFrame(['/chrome/elements/pgp_pubkey.htm']); From 7e86b578a0045802ebbe7d3ebd4e3af619924d2a Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 11 May 2023 10:58:34 +0100 Subject: [PATCH 045/147] fix test for #3944 --- test/source/tests/decrypt.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index 05aaee1d3cf..c20177add90 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -686,7 +686,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te { content: ['Can you confirm this works.', 'Senior Consultant, Security'], encryption: 'encrypted', - signature: 'not signed', + signature: 'could not verify signature: missing pubkey 6FC39F2CDD104B3C', }, authHdr ); From 16bcf06fd33a1ba8f748503c387908b13f827fa5 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 11 May 2023 13:44:58 +0100 Subject: [PATCH 046/147] isBodyEmpty fix --- .../inbox/inbox-modules/inbox-active-thread-module.ts | 4 +--- extension/js/common/core/mime.ts | 11 +++++++++-- extension/js/common/message-renderer.ts | 2 +- .../content_scripts/webmail/gmail-element-replacer.ts | 4 ++-- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts index 8eca577a630..5054f261cb9 100644 --- a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts +++ b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts @@ -178,11 +178,9 @@ export class InboxActiveThreadModule extends ViewModule { ); const senderEmail = from || 'unknown'; for (const a of mimeContent.attachments) { - // todo: isBodyEmpty - const isBodyEmpty = false; await this.view.messageRenderer.processAttachment( a, - a.treatAs(mimeContent.attachments, isBodyEmpty), + a.treatAs(mimeContent.attachments, Mime.isBodyEmpty(mimeContent)), loaderContext, undefined, message.id, diff --git a/extension/js/common/core/mime.ts b/extension/js/common/core/mime.ts index 2a0ee640e89..b3dbbfa513e 100644 --- a/extension/js/common/core/mime.ts +++ b/extension/js/common/core/mime.ts @@ -84,12 +84,19 @@ export class Mime { return blocks; }; + public static isBodyEmpty = ({ text, html }: MimeContent) => { + return Mime.isBodyTextEmpty(text) && Mime.isBodyTextEmpty(html); + }; + + public static isBodyTextEmpty = (text: string | undefined) => { + return !(text && !/^(\r)?(\n)?$/.test(text)); + }; + public static processAttachments = (bodyBlocks: MsgBlock[], decoded: MimeContent): MimeProccesedMsg => { const attachmentBlocks: { block: MsgBlock; file: Attachment }[] = []; const signatureAttachments: Attachment[] = []; for (const file of decoded.attachments) { - const isBodyEmpty = decoded.text === '' || decoded.text === '\n'; // todo: - let treatAs = file.treatAs(decoded.attachments, isBodyEmpty); + let treatAs = file.treatAs(decoded.attachments, Mime.isBodyEmpty(decoded)); if (['needChunk', 'maybePgp'].includes(treatAs)) { // don't want to reference MsgUtil and OpenPGP.js here, so // todo: think about refactoring this diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index 4d32c8c0b05..4cda0e1bc76 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -358,7 +358,7 @@ export class MessageRenderer { // todo: only start `signature` download? // start download of all attachments that are not plainFile, for 'needChunk' -- chunked download for (const a of mimeContent.attachments.filter(a => !a.hasData())) { - const treatAs = a.treatAs(mimeContent.attachments); // todo: isBodyEmpty + const treatAs = a.treatAs(mimeContent.attachments, Mime.isBodyEmpty(mimeContent)); if (treatAs === 'plainFile') continue; if (treatAs === 'needChunk') { this.downloader.queueAttachmentChunkDownload(a); diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index 730e83f459f..348f6cbe2f8 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -27,6 +27,7 @@ import { RelayManager } from '../../common/relay-manager.js'; import { PrintMailInfo } from '../../common/render-message.js'; import { LoaderContextWebmail } from './loader-context.js'; import { JQueryEl } from '../../common/loader-context-interface.js'; +import { Mime } from '../../common/core/mime.js'; export class GmailElementReplacer implements WebmailElementReplacer { private debug = false; @@ -414,7 +415,6 @@ export class GmailElementReplacer implements WebmailElementReplacer { console.debug('processAttachments()', attachmentMetas); } const msgEl = this.getMsgBodyEl(msgId); - const isBodyEmpty = msgEl.text() === '' || msgEl.text() === '\n'; // todo: const senderEmail = this.getSenderEmail(msgEl); const loaderContext = new LoaderContextWebmail(this.factory, msgEl, attachmentsContainerInner); attachmentsContainerInner = $(attachmentsContainerInner); @@ -428,7 +428,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { // todo: shouldn't call `treatAs` in too many places ? const renderStatus = await this.messageRenderer.processAttachment( a, - a.treatAs(attachmentMetas, isBodyEmpty), + a.treatAs(attachmentMetas, Mime.isBodyTextEmpty(msgEl.text())), loaderContext, attachmentSel, msgId, From 888dac9575b57175801d2129fe00775fdcb59e88 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 11 May 2023 15:44:47 +0100 Subject: [PATCH 047/147] improved mock gmail page --- test/source/mock/google/google-data.ts | 27 +++++++++++++------------- test/source/tests/decrypt.ts | 2 +- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/test/source/mock/google/google-data.ts b/test/source/mock/google/google-data.ts index a18272653cf..6dbb453d1b7 100644 --- a/test/source/mock/google/google-data.ts +++ b/test/source/mock/google/google-data.ts @@ -216,14 +216,15 @@ export class GoogleData { return msgCopy; }; - public static partsHavingFilename = (parts?: GmailMsg$payload$part[]): GmailMsg$payload$part[] => { + public static getFileParts = (parts: GmailMsg$payload$part[] | undefined, skipParts: GmailMsg$payload$part[]): { filename: string }[] => { if (!parts) return []; return parts + .filter(part => part.mimeType !== 'multipart/alternative' && !skipParts.includes(part)) .map(part => { if (part.mimeType === 'multipart/mixed') { - return GoogleData.partsHavingFilename(part.parts); + return GoogleData.getFileParts(part.parts, skipParts); } - return part.filename ? [part] : []; + return [{ filename: part.filename || 'noname' }]; }) .reduce((a, b) => a.concat(b)); }; @@ -237,13 +238,14 @@ export class GoogleData { const fromHeader = payload.headers!.find(header => header.name === 'From')!; const fromAddress = fromHeader!.value; let htmlData: string | undefined; + let processedParts: GmailMsg$payload$part[] = []; if (payload.mimeType === 'text/plain') { const textData = Buf.fromBase64Str(payload.body!.data!).toUtfStr(); htmlData = GoogleData.htmlFromText(textData); } else { - htmlData = GoogleData.getHtmlDataToDisplay(payload.parts!); + ({ htmlData, processedParts } = GoogleData.getHtmlDataToDisplay(payload.parts!) ?? { htmlData: undefined, processedParts: [] }); } - const otherParts = GoogleData.partsHavingFilename(payload.parts); + const otherParts = GoogleData.getFileParts(payload.parts, processedParts); if (otherParts.length) { attachmentsBlock = `
${otherParts.length} Attachments
@@ -302,16 +304,15 @@ export class GoogleData { ); }; - private static getHtmlDataToDisplay = (parts: GmailMsg$payload$part[]): string | undefined => { + private static getHtmlDataToDisplay = (parts: GmailMsg$payload$part[]): { htmlData: string; processedParts: GmailMsg$payload$part[] } | undefined => { const htmlPart = parts.find(part => part.mimeType === 'text/html'); + const textPart = parts.find(part => part.mimeType === 'text/plain'); + const processedParts = [htmlPart, textPart].filter(Boolean) as GmailMsg$payload$part[]; if (htmlPart) { - return Buf.fromBase64Str(htmlPart.body!.data!).toUtfStr(); - } else { - const textPart = parts.find(part => part.mimeType === 'text/plain'); - if (typeof textPart?.body?.data !== 'undefined') { - const textData = Buf.fromBase64Str(textPart.body.data).toUtfStr(); - return GoogleData.htmlFromText(textData); - } + return { htmlData: Buf.fromBase64Str(htmlPart.body!.data!).toUtfStr(), processedParts }; + } else if (typeof textPart?.body?.data !== 'undefined') { + const textData = Buf.fromBase64Str(textPart.body.data).toUtfStr(); + return { htmlData: GoogleData.htmlFromText(textData), processedParts }; } // search inside multipart/alternative const alternativePart = parts.find(part => part.mimeType === 'multipart/alternative'); diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index c20177add90..bc69baa01e1 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -298,7 +298,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te { content: ['テストです\nテスト'], encryption: 'not encrypted', - signature: 'could not verify signature: missing pubkey, missing sender info', + signature: 'could not verify signature: missing pubkey 73A5534E5887BBAA', }, authHdr ); From f0c13f86c77ddc68566871a7f60a25413bac9e3f Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 11 May 2023 15:54:00 +0100 Subject: [PATCH 048/147] updated test message for lookup --- .../exported-messages/message-export-17dad75e63e47f97.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/source/mock/google/exported-messages/message-export-17dad75e63e47f97.json b/test/source/mock/google/exported-messages/message-export-17dad75e63e47f97.json index 80aede51f47..98f9707c77b 100644 --- a/test/source/mock/google/exported-messages/message-export-17dad75e63e47f97.json +++ b/test/source/mock/google/exported-messages/message-export-17dad75e63e47f97.json @@ -16,7 +16,7 @@ }, { "name": "From", - "value": "some.sender@test.com" + "value": "this.pubkey.takes.long.time.to.load@sender.test" }, { "name": "Date", @@ -66,7 +66,7 @@ }, { "name": "From", - "value": "Some sender " + "value": "Some sender " }, { "name": "To", From ab4d8fb014d89bfdb59fa28ac7b17b87dc3da85e Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 11 May 2023 15:57:52 +0100 Subject: [PATCH 049/147] test fix --- test/source/tests/decrypt.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index bc69baa01e1..665b1fd43fb 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -357,7 +357,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te { content: ['Hi this is a signed message.'], encryption: 'not encrypted', - signature: 'could not verify signature: missing pubkey, missing sender info', + signature: 'could not verify signature: missing pubkey 21FC55064B1DDC75', }, authHdr ); From 9f14ac9c6d0d8d55e2b5116230656cdc0657116f Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 11 May 2023 16:47:45 +0100 Subject: [PATCH 050/147] fix google mock --- test/source/mock/google/google-data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/source/mock/google/google-data.ts b/test/source/mock/google/google-data.ts index 6dbb453d1b7..5cc13926082 100644 --- a/test/source/mock/google/google-data.ts +++ b/test/source/mock/google/google-data.ts @@ -226,7 +226,7 @@ export class GoogleData { } return [{ filename: part.filename || 'noname' }]; }) - .reduce((a, b) => a.concat(b)); + .reduce((a, b) => a.concat(b), []); }; public static getMockGmailPage = async (acct: string, msgId?: string) => { From 7ccff985c6718a12f28b47795f6c3df25d1f2de3 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 11 May 2023 18:26:38 +0100 Subject: [PATCH 051/147] fix tests using the same message 17dad75e63e47f97 --- .../exported-messages/message-export-17dad75e63e47f97.json | 4 ++-- test/source/tests/decrypt.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/source/mock/google/exported-messages/message-export-17dad75e63e47f97.json b/test/source/mock/google/exported-messages/message-export-17dad75e63e47f97.json index 98f9707c77b..80aede51f47 100644 --- a/test/source/mock/google/exported-messages/message-export-17dad75e63e47f97.json +++ b/test/source/mock/google/exported-messages/message-export-17dad75e63e47f97.json @@ -16,7 +16,7 @@ }, { "name": "From", - "value": "this.pubkey.takes.long.time.to.load@sender.test" + "value": "some.sender@test.com" }, { "name": "Date", @@ -66,7 +66,7 @@ }, { "name": "From", - "value": "Some sender " + "value": "Some sender " }, { "name": "To", diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index 665b1fd43fb..c19ee1d5eea 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -1159,7 +1159,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== testWithBrowser(async (t, browser) => { const msgId = '17dad75e63e47f97'; const acctEmail = 'flowcrypt.compatibility@gmail.com'; - const senderEmail = 'this.pubkey.takes.long.time.to.load@sender.test'; + const senderEmail = 'some.sender@test.com'; t.mockApi!.configProvider = new ConfigurationProvider({ attester: { pubkeyLookup: { From f06c9e0287571badbbbc136a06f146f1ee9358cc Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 11 May 2023 18:32:59 +0100 Subject: [PATCH 052/147] fix test according to sender email --- test/source/tests/decrypt.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index c19ee1d5eea..9232a5edadc 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -1632,7 +1632,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== [acctEmail]: { pubkey: somePubkey, }, - 'flowcrypt.compatibility@protonmail.com': { + 'some.alias@protonmail.com': { pubkey: protonMailCompatKey, }, }, From 5464eb2303c2aa6ea7b0749e8ef1a85b5167c5e8 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 11 May 2023 19:35:59 +0100 Subject: [PATCH 053/147] changed test file to have 'full' version instead of 'raw' --- .../message-export-16e8b01f136c3d28.json | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/test/source/mock/google/exported-messages/message-export-16e8b01f136c3d28.json b/test/source/mock/google/exported-messages/message-export-16e8b01f136c3d28.json index ff2eb48d474..209457e1fde 100644 --- a/test/source/mock/google/exported-messages/message-export-16e8b01f136c3d28.json +++ b/test/source/mock/google/exported-messages/message-export-16e8b01f136c3d28.json @@ -78,7 +78,7 @@ } ], "body": { - "attachmentId": "ANGjdJ-45vBleV9HteDOioeYSuhxwlHCD8trEB5vet7JYw-nbw9T3GnGk0zhoJ8VIQTVNSCNY8qCu75UPRr13d6A8CtB4wxZFYMsgBgw3cizodRak5SvOBymX3vKTqRoZ-MpuuvzW6_y1Dc276vUgJTCrWKRXKNdDUdullUZO95x-NfGa_4SoUpfrDfcPVrAVLOaebITtTBuiSRRl5GUeRdU8nEPdZcq5TrvdBhsxqhNIgXrauTfDmQsTwEZxgANrUD7dKPbnBopmQezh8Sc84Q6N24vhzJifVykeu3ETAMlRuVrA4mttka7NMt9ocxRKseo0OgAvw2ycnOqi1AW2mMx45EOpEgJh1g6En2OEXROEpAhBt9DeHOcWEs9rXj6hLI184S5k6AF9UgSEM3N", + "attachmentId": "ANG-att-1", "size": 10 } }, @@ -109,7 +109,7 @@ } ], "body": { - "attachmentId": "ANGjdJ_ox_J7EzfZv_2mZXXnWBn2BKUGGjTQWGI8HMWfVpLMckOhXuqi0QHQVte16xtF7eYVAmTUAmOlwDMkYAz3IVGkeIAG3JhNoLT2WRwjkzl7JzeIkY3_4-QzbHdQXY0McH6kXMTOG8kk9Cs9OEokEEVNFSwGKJu3c7gm9rq_vAstFKQhAOaYLLiJsHkVLOQ7bK5p7zRfJvqqZrbDswwChmHRbXZ0nF9d9pKx2yCXZiO8yhW8KcDtSh7N-CwT3UN6ry-D2g6mFn-cv3WNnEpzTXcypxOvTqk5bjIzCXZdaCoEtmWg893v1Yr7MDQlelvRQNa9ryq_7QZzmjVy7WeJ6z1tdaT-qe9DluRL4lkqDrwoTSj6cqVv7YOUDfdtMn3kg9qLhVBZleYP7X6J", + "attachmentId": "ANG-att-2", "size": 165884 } } @@ -119,10 +119,19 @@ "historyId": "1095349", "internalDate": "1574290190000" }, + "attachments": { + "ANG-att-1": { + "data": "VmVyc2lvbjogMQ", + "size": 10 + }, + "ANG-att-2": { + "data": "LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tDQpWZXJzaW9uOiBGbG93Q3J5cHQgNy4wLjkgR21haWwgRW5jcnlwdGlvbg0KQ29tbWVudDogU2VhbWxlc3NseSBzZW5kIGFuZCByZWNlaXZlIGVuY3J5cHRlZCBlbWFpbA0KDQp3Y0ZNQTB0YUwvem1MWlVCQVJBQWkvelNsUXVnbUhYVjNTbXcxRzZyU040Q0FMd3dxTndxc2M3dDMyNEwNCit6OWZlVkxGVjEzcXVhdG11V3dhTjZla3FlbHhFaXZudnZaQzhVVlBmbFBqQVVmR2JneW4wVCtpNHVMeA0KK2ZlZ1p6cjAwTlV3akxoaW5QQW1xVzVqZHNmRVF1S2JZaEJJV3l5ODBIMEVlcmIzZXl3dmt5c2gyTmNBDQpLd2lwWWdxcGUyZk95UHloZjN5amgxZ05ML3NJWWxMRGZhajdUcDZvK2dkRHNoZnladXN5Uk1pdWlnWkYNClBKUzBMaUx6UnVHVGl1K2ZHcHY4Y0NOUWxUOWpoeVhmWm1UcmZkVmpkY2IrSHR3ZTMzOVJkVmYwRjg1OA0KcTNEekhHcnFYWmFraVhIak9zVjdVVTc2MzFUVHZuOWN0dzhsMXZKUGovazRXTXQyRDhCY3lDWDZ0WDBsDQpBOVkzR3lvSTBMMC9kVnFpZ2pWN2JKTWR1aEJmUUpNdFR3bENDUDVsYkdEOFFQdWVUbmpWdzk4eUNZWXMNClNiSlhaaXNLS3pJTjJmUVhtUHVNeWd1UXdLTGJ5Qjl2QytjU1VBOW5YblVXK3lHL1k0a0ZxMTJEKzB2eg0KUDU1L1JEOXFvbW5RaUJBbmRxYVJkNEhrd3R4eFdVeGpLS09jaEFmeGdXLy9LaDZNZDBlWUgvY1hRSWExDQpQVjNBemRxa1dkQmNNMnlpZUFTTWRVZEZidVNaejR6NGFXd2ZqLzIxNUFhbk1RbmxFZzZoajk2QVozcjUNClpya1J5TFNDZjdhTTU5MEF6ekgrT1hDZ2lkU0prbkp2QXU4UU1uQjkzSnNnbElqUXJGMDRpY2JNWFRrQQ0KOWwzanpjMzdkNEdlWGJlZHlsYmV1bStXZ1ZXak1TeTFLWHdlSVc0cWhWekJ3VXdETUYrQnFhN1JJRFVCDQpELzRra0JIWHpaSjZoTnlmeUtuLzFkZ3gwSGx0WXRCUldvR2VTYVhOaTVqTzR1WnhqUzRPb05leUhqWWwNCkRjVzZPaTF2ajVJSWZMak5tcW5ZYlh2akJQRFRxS2ZuZTd3c2VzRlUzcHBnQzFpQlZVQndKMGVGRkV0dw0KYzdpVUh0VGxtaGNRQmJMWTRuZWlVSEg4aHJ6REJ3dnhYVFZmMU5KTVBLMzlNQmNBaFF0S3JPbmhpWjRuDQplL1MwaUoxUFVCbGZwTnBMQ2FCNHJpbWNmNnpqc0R6R0JpRXI5M3prOFpwN000OWZvRG1BVG1NQzBRMngNCnY4cjBuL1RIbENDMHRNTFdDbi9YcSt3RFh6d1lBSlVOUm5HYjJ3ZzB4RXFOWXIrZnhMZjFLSjZTS09GSw0KMEl0RVQ1SlJ6YXVId3grODNzYkhsYzN5TzVhNkIyQ3F0ekpOSzNIOXcxSStwN0hKT2xBNkNhcUJBVlZuDQpyMUdSSWtwRmFmejMxc1Arcll4QUFOMFhybHBzeDAvSHgzUzg0a2E2a25yMmlxMjhSMEgxOGhVdWlITnoNCm5nL25hMnNhZFljeDhpY2d1S1BhOU5PanZDVE5HanRJbXZsb0pQQzYwZXZETlZ2SFR2Y2pJM2Y1TnRZOA0KRlIyN3pld25oZWdFNTVIdlg5dWhGK0V6WnVwMXFHdkd0ckdBTzNCc1BrYkNWT24rVkxRWlZYM053NXdqDQpqVE9KajhRR0QwSHN4ZDZ5QkdSK21SY1JqYzJyRVFxdmUxOWNqQlJsVWZyNHgvZm9JRkJQYmQwVDlIb0gNCk1KMFFEcXE4L1Z3R1RqU1VXVFFHU2hsRG9nUFVmNVJrQ3cvVjhiTzNOQ0luMldBM3M1blNTa1JWRm9kMQ0KeUJlMG5Td1lWWGFSTjh4MXpieWlJMCtZVWRML0FBSFJ0UUh6QzdYRGRNM1ozWjFqSjBFWGVQQ3VSNkI1DQpmVDdvYzVWbnI3QVc0TUdhZDJHdmVxVldIaHV2VmVOTGxrYmdsNEFkWHJGQzFhVHpoN2lEbTlnUmJRdSsNCnRQUllRVnlub2ExcDF4VGhMb2xJUXNHRnRTbC94SitkZDBrbUVpL3N1UXZQMCtucE1NZ1czNkFKQWttWg0KdGpPTUFtbjNMSzNwbENGZjlDWmhaMGNBL3c0L3NDRnJIZzlHU2FvcHM4SVV3NU5tTkJZM00vamlubjFiDQpWaGI0MUtuTVRUVCtDVWIvaUhUNXM0dXg5NHJ4MFcxcDlpWnhOemFlRnVvOTlkRkE2SmVYbVM3M0JXY3ENClFERW9QeWNVNndNa3FmOE1Ua0dBb1JEbGpWQmYyVUF0ZDhmUmJCZStRU0c0ck1WZG00dW9YeURrbENpYQ0KcUNDT3c1dlF4WjI2WTJ0SXhzL083aGkvRE16TnlvcGVkeHZYSjUyV1dVRzl0V2pkL0Ezek5pYUhwRXA5DQowaXcwTTVidmJzeFZIb0xNT0x5NzRGQzVHZmRFNlJQamJLRzF4dWVjbWFycENJWWFrMFhGZVRoa0tTdVANCmIyTWF4b0dYVlZmTG9yQ2RYUlMzSUVlWnFUblJNOWQxTEozRkNVSnR1WC9Kc1RObkRIQjFNemY5b0RlTg0KSCtMVCtpcERRcjZvTEFPdVJ1UWFVbDRXYkxrdTJLN0JiUEg1Mlpydjc1c29ycjVERmpzbStkSkdYdXBEDQpzb3B3a0c2L0duTVJIMG9zd0ZUTkd4UVNtWHgwU3o5Z0NZRnU2OUZNejFHMGljclQ3NFJuY2JCaFB2VlANCnJRN1pEaFhiSCtoQnRrOHJ5ZFNhZUgwYzRuVC8wY0svUGg0VHdJenNtZTR1VG1hOWdWVVJ3eVJMV21CVQ0KQVRtdVRXMnZXa28wcUoxUHpGVnI3N3NwaXdkOW96eEljOW56ZW9ObUZBRXNKYjE4R1hBaXNncWxIQ3o4DQpYbmY1N1NkY2F0anlVbnhJQ3o3VjlQdFhMQktjajBlMDMxMDB1eGhwTWJJb1U5TUNUcWJKTUtVY3dtb3gNClJZTmVYakxyRHdiQ01EREtlVy9QMnUwRy9tWk85aWlNN0dWYmR1bGY5ZWZaY3FkKzRmK2lmQjVSekt4Qw0KNzRxdUloWTRRZHRIUGVvcWtsNnZBVW5nMlJ5RUxTS3pVY2dWQitlb3FmOFRXNlhPY05GODJ0eE5CbHB6DQptNzc4aWt4Nm5ueWtZWUFSb1cxZFpPOXJEa2FpRFJscHFKQ3QvZzQxeXJPbmVHcVVWakk5VUFBYUdFSDQNCnYvZEhiTmFDS3dDWWtRekFRbnJnSVBuQTdLKzh2NGZPN2FlWGtRY25ZQVd0UG1RYmIzNzRtanJ3YzVvSw0KN1dQUk5ibGx3SHkrQVBEbGlyMmNPaXVZMGkrbUZSL3RQZ2x2aVJUV05LeU1wMDBVU3V2UFdMdWFxd3prDQpPYnJQMWZTSVNOaVFtTnhzRlhuMER0UjMwRHBBeFEwRE5HVytXTDVxQzhhNUNsUVFndnVRZ3orZkk1UWINCjNoM3FNWTJjUXRXdlVuVDVucW9nck5SdWIrYkdXTUtZWnBCTTJnY3JkbDhqR0pCdWNsL3YycHlpV04rMg0KVThNZWFmQzVpYUI0WndKemdweXhTRkpRRlQ2UWIxT2g1Z1NJYlRWekpiOGlvdERGY3RhT1VUZEgvYjZxDQp0VElDczMrajZQZ0trb0d2VFBTMjZXN0FWSE9XZHduSWllb2NFU2hNMXgxQy9sekw5cXVvU2JZNVNpR1ANCjBmVTl4RE1tRzBFbU52WVluRUNSTXZvQWQvMDFWMXFzMkExcmlUdFVqVDArdWNLN1NCZlZwd0d6eTkzZA0KckxrQUNOdVQ4VitibUkvNWZITDJ3RzBWMzlwbm9CSk1pWWVmSThVQTh6V0RJQ3Y3VGJ5dWFoN05lbHV6DQo3Z242cEdtZFVLWUJCWTdST05qTERLL1d2Z1hqTS8rbjdEejBpRHpNaTRGZGFrQ2IrVWpiK0xYRnFUNWINCmIwaytoLzBKUGFOclloWk96dE05U1owZ21UdnhHNEI1L2VQYXZiZ29YT0UxM2lkQnJHZCtWUkVZYjM5Tw0KSkVIbDBwenE1UHNVendMMTdMYWRLK3VDRjY3RFh5aXpKSjVFZzdOZXBoK2ZyblJzcGp3dld6SmVLNDBlDQpxeTMxSUxhWXFERlRsTlY0Qno5YjBUTDBFRjdYeGRUNUQxcktwZTMyMUFYd0NCZVF3UGdZQkxwdU1ycUQNCmRWVXVNZXhOVndKanpWbURZTUhuaTE4cWNkRGJxbExjaWd5bEFqaVpoaHhjeEFXZEdYZCtiek5YRk15bw0KMDFsZTM5T2NuVi9TK0NOQkpNbHRScldLS0ZkdkpXUnFjc1FCT0NNR3ZZN3Nsbkk4ZThZM3drcDI3UTVEDQp0cWpMTGtqT05Iek5sa29oNHgyaE9Va2tiN2JWenlVSWpUYXEvQnZ6cEFCZDdNSURaeEJ3ZlhySW1VcWQNClpOV05QZ0FDR3VoSzVwMW1pb25hd0E0RUVqeUl3TEs2WUFDaTFjS2krOC9BU3hVNWN6ZTZvWnhneVU4QQ0KQzZmSW1SNGN3MU0zcmw4YnFXS2NFaW1aMW0wM2JGV0pxbkl6T1ZCaWgraHI3R0VSUCsybUU5WUQzNHgyDQpnSHZWcTlSNi96dUE1dlpBYkFMV1pSTjdwc0MrYVcwcUFMSEFZMGxUTDZWc1FQN2hWSVIzdHo3ZVRtRVgNCjEzUkpmcERib3ZnZ1FRSVo4MFd6Mk1KaHA3Sm5LOGZKamtST0k4TFBqRVQ2eXB4dHdCQmROZ25nS3A5bg0KbEZOdGlrTUVZTlRvaWdCUEdPbjM0N1JhRStmdkg4YXBQelBXa203YmZQWnJrZ1YyS2RCWC80UGRBQmxWDQpOUmxSZW1rQ2w1T3RjOC9JRkVOSlV5ODFRakNNK0ZPQ2J3b3Z6UnZnSmdDYlpaNC80YUVQRFE1RmZValINCnlCUWp0bnFGZkFYWXdNK2c0bWFzem4zRlJqQWIxcEl3L2dwbWNtckRuaUlqd3JtQXVacFFWbFVaamEzRg0KeE5kbU5TNW9wdlFONXd4OXFyNGlMUzd4anBxYmV0QzcyWXduOGlUaDgxdGt2RFB0UmpkUC9oNWV1Vm5IDQpTc0ZEM2FVbEdmdUJJZmpMb3J5N2lxRUtSeUNuQXpTaEN1a1VFVUFtc0RVRCtJSHZNbm03aWJOQ0N0SGMNCmp0eXpQc3I1VHcyNm9RY2FTVWtNSlNJS253S2ZBTFBRenNia3Z4V21oL1QyMzV2QjRIdzZwSWYzQXhuNA0KeEIwMm9tN0cyanBWejgvYVRiYTYxYzRhNUdzeVkzZU03Qis4WUtmRFc0MGQwOVZxemhseFhmVXFwSDMvDQpPZFFPNC8zUko1ay9oUEtYNWpnaEZGRWdXWCtUNk83Ni9yYTNzNzZZcU1McGpPZXFGZ1lMWjVPQnZ5MjgNCmFTZDk1QThHcEJFbU5FeCt1bVhJbkdYa01tU2VodTJpMWxyWDdLbjVuQ0tGeWpPZFR0Y3VFMll6VmcxTA0KclNBSXZSMFdBSWVVUlkrZDJ6cDk3clVKMkxqckJGMEd2VVFaS016UmI0WFpubkJTZVhkZVRWaWkwKzFzDQpBYzJpNVd4WUtkUnZxY0hCTCtvaWc3TklRZG5TVGtsYXVGR2tZZnhMa0xpYzN4b1ppRVd4ckJFa3BJYzgNCjlRbldpRk9mMkNXekY5NFpRdWpDYmlCaXZMemh4blhWTDZ4bUk4dHlSZ2dZMm5aR2RkNnFCaFBwNjZ6Vg0KZ2xVamxONDhjdWhINXQ4aEJIcUhOaFRVODdSUmtZblk4TXFZd3UzQjdBTGU1V2dsTk5SK2lVemZWOC8zDQpnY1M1dmVLdG94cWk5NWl1azB3elVWOUZLNCtqOU5mWU5yWHdUNHJKUjFWM1BOZ3ZFNDRiYkc5SjArZGkNCkRpZ25FL3pXQXpkS1RpOHNTNEt5MWYwUXMxYVZXT3l1R2w2eUMvaHRqWExpbWxncGo4NXZXenlpZlNQNg0KWVRqNmU4MnB2ZXhDamtiMDk5ajJzNm0zRnNiZFVPTi9ibXp4SDdXQ3VDR1RXWGQrSjFSR1NULzlpTHpPDQpJSWREK1FKWFo3M3lwajdPMkt6c05aWlRQUHdUVFYzQWxhV1FtNlBFN2RjSTFpdTJFMDdoM2Y0c0IwWEMNCmZ2Z3Y5ZDFWL3NsTzgxQW82ODVXbDZ0QWQ0MytwKzZtZTVabzdwekRPeUF1MGNEcGRLQ2pFM1h2VlUzbg0KT3lqOHBjd2NOTElpWXRocXBkMU5pZmxiRFZBZ01TYmJ0QVFOWkkrcXRoUmxIcUhmbE9FUUlOcmRSM21iDQo5NENJbGpCTExJOENITlhTUHc4Lzd1WHVQNGtnL3VYQWFlYVNldjQxTWxQT3MvQjdnblZIZ2pkcDUyS2oNClkraHZYU0dTeXVMRGpRZ1MyM0pPclZtdFo2OU0xSUtUZEFPTVV4bEhGV0RWcWhuWjl5cUJZcXZIb1N6QQ0KdDE1NWdmaUNEanhTUmxIVUpLWnVBU3BPd2VVcy93QjdkTU1rTlRXVzdmY0NEWG93NUFzR0hPR2llWmNCDQpDbGZpWXowUDd0bDA2bmxJL2dSWjVoNzVxajZyV0pOdGNDOVF2cC9KellQOTNleXBvN1NwWGlGd01sUUYNCjFjVkV0djd1bVVXNzRPb0RES0l5UG12QUZyWEVOblI4ODMxUy84UTF4STZFczFyd0owUk5CSURBbmRTWA0KcS9vMm1rQkhkN09zS01xZDJZUkptbS9BaFhuUTh1UzdXclNJOVdCZDJOQ0FnVFNjUFR2RmFhb2RKY244DQpqTjNoMGdua2w2RHQ0ZmJOSzdaaEFPdzdXTHdoK29EWVd6YW0rM2ZIb1Z3MFkrMm84TmxNRHo4Nk9BaXYNCmVnUnF4OTZleHRtSFNRRGpOVlR3d2Y4dDF6RmV5Vzg2WFcxUml1SlRGMkRleHlBMDNhdlJwQmZtTHd2MQ0KOGZadW1KRkpGNk5uUWVvR2c2T1krMjRjclJmRWd5c0QxZE5XZU1ob0NPREIxZkxvTXlLOFNNR0I5a3ZjDQp4cHNnTXZFOHVwakpyRjF1MnNwVFZJbGoyYUhxa2VSKzhyQW5pei9CbzF0a1F3M1RlZS9DVEM2TFhTaTQNCi82ZTcwN2NxOEJsUm50d0Y3aFhQcnQvZFZEQjNjdFpIaUc0OVRHdEU2VHlSdGtSNVZ3NzkzYkxseHFhVg0KN3c3bjdxME14ZjlIVzZleGljeStpc3dvbTFSM25ldFhveEFQa01XNDVyOVc4K1hPRkRDVHVYeGZUWFpRDQp1M1kxc2RqM2hnbWxJWGc1SmYvbndBbG1vVm9sbHVIek9mUDljcU1ycFhUZGI0eHRNZHU4VWpUZi9KUngNCnJrZEV0MGs2SDBJK1hYRldsVFFRaXc4UmF6Mk0rQTZkV3JITkhGVGlSelhhYm9UMFk0U2VFbGEyMWR6WA0KUHNsczNpSFBNQkdKQ1BhQVVmS3JDNzhFR2E0ckNiVlRXcjVCdFdLVkl1RmUxQ3ZINUVyVDNpcnlFam9ZDQozbVM4RVFaRHJmLzlFYUpVV3lGdXZlYUJVd1BrdTZjT2lEYWFWRGZzZGVNKzYxcUJKOSs0a3U2Z1hnSE4NCmo3MFJJNVRNWkFJQ05tcEFNV0kzZ1ZxRjgzbGxsaS93OWNQWkhVRDVsSHR4TmJTZVI1djBacnc0Z3lIMQ0KZmJpaXRreFVHSWU3L3MwT3JJVVdpMVZKQ3IreTdNMDFvZjhkSmh2NFllZSsxOU5sb0J4ZmZaVGNZS1liDQo3dXpMaG85OGFuNVdSMlBQYyt2UUlYZm51UTYrSEVFU1NJR1hSWmJxQm1rY1NCZDNvdU5SUXgzZXZIc3gNCm90UTdMMmZiWTVHTlUyZjM2S1pQc3lETGRqeVRZMnMrQkxrd3E3dGdpUlNYQjVjeEJleklHS0dzVVZiKw0KY3l5QVpoaG5xMnJOS0VFNTVMdjJKanBQK1BFZStkQ2h4MDEwSnNhNmlXOHh4a3ZyQitPaDhHeTNzclhQDQo4MmJnZ1ZnbUFONkNJM1BEdnNFSFl2TDdhVXVoOVhzN1EwekttNEEzREJ2bTA2RU1BZWhkMEY0bzV5bUwNCjMyd1FWWEJZWHpydFZHWHEwVGJWRWhRY204UWswdkFDUTN1dlhZaGp2dEM2Wk1NUERNMHIrTkliNlhmQg0KNDhON2lFZTFIeFJpaXh4R2tzN1l5TERJaUdSQmJIeWZqbWRta2FlVUZLM1JNT3NvOGtHdWJFRUk2VzhQDQp1UDN2VnQvTEZnMER3dGZoS3FJbEZJcWxOM3QxUVFpUjdLSmFZM1dLaHNSbW1neGxIR290NENkRS9lK1cNClpoRnRWbWN3WUEyWSt2UGVsTTQzaytRMnN3elQ4MmUrK2FEczMxM1NPRnlWaERvZTlJYWxtbUlCTHVEdQ0KKzhuRGl5YzNpY1kxSXFUczlxMjVSUlJCbE5mKzFYWEtRTTl2c2JIUzk3bXFzV2thUkJSMXZBNzE3ZWxyDQpySXBwQUlXSTNWRzB6U3I3WFduQld1c2ZpRkMrcjB1K3ZiSHpJTmdWTFdBRFFDTU9mNWNaZVM1UGJ2WUMNCmhpc0VqNE9weVRaQ2xSVGdWQmlRSVFFandhZ1B6cVBLdHJTaUlIVHp3UmFoM2g1ZWZxVW9SY1dNSTlqUw0KNFlBWFVzUCtaN0FsQlpTdGV1b3dvNDNtRUJJWjlUQnB0eTFQU2YyUkpuQkFGM1N1QUpJTWJHYzJod3lWDQpGV1F6YXpqMmthSWJDMUgxUTJZQW5sdUNlZG1hYUMrblVVWUNSYjhzMDdFWXp3SXV2M0RPYWRRZXg1SjMNCjhUdzZrRFJDdnB0aWtUcHp2SlJIOFJwRmdLU1QwVnM0eDU1ZjRVV1FMR2lLazBkNnlnOEY4NytldGxGRw0KbHhiVkRyT08xWkIyREQrMFlSY2Zya3p5TUNkQVVLTU5RUVA5VWs0dWlRbTl5bWZaM1J2a1ZSWnhycU1xDQpTRXMxRDZuT2J1Y3B2T1pBSzZpVS9EcUJ0RFdEdEs5WmFIZW90OFh3cDA3M1FONGt6amRaYnkvOEhrQi8NCjQyRDlxNTU0Wm5QdTEvRWM4TDloakhIOG16QWVyWlY4bG5mNXpueGhVN1RRT1phT0Jvb2JnVEtTNEVhZQ0KcTBBTUNMc0RGUDVYUnpiMTVCK0RyM3ZBb1lpenVCUXFUWEw3bGwvT3gyNDJQaGVYT0ZBNzBBK0IxK3h0DQpUbVI0Y1luM3NSY3B4aVoyTDlsU05NT1NuVzhCRFlXUVVMbjJMaWtzMCtYaWdlS3ZIaTBkOHhsZ1M3ZUoNCkJ1ZHM5U2Yrb0laL1JsUE1NZFRWaktqOVhRZDdsbUZwODZIL3JOZE1YTlE3b1l6S2dxbEtEc1lvOXdYaw0KWW01aDBScXo5Y2FNYTVDT2NpZEFVQUJFY1Q1MG1aWHZ1UkxTL0FQME1haW5TSGhZbU81d0l1MG5kY2lhDQp4N3YwcFVmcEhLc3NmS3Q4QlU0b1UvYm5aY0tRU0JnYzZzVEJWdnp5S0s0SUJNWFFHZVNEK25BL3Q2d1UNClRKdTBmeEdXTFh2OTBZOGVWR2VYTU41K0hwMjV5RjNsaHQ2Z05JNVBPRFRGYWw2RWdJRkF0eW9uRnZMYQ0KMGNMRnhNMFg5UjdiR0tWUXd5UGpZNTRKS3Y5VE1PQUNIZTVzcGhLVGZ1enZ5U2NaVWljMy9WaVlaMzhqDQpPZTh1d3lmL3d5MklhTjR2WktBUDl2Z25KcVlmNjN0akUra1cyRUFGRkg2eWlESTZPNmwycjRqRXUyUTMNCjFIQ21SNmhwTDN3NzYvamw4T2RhUmhrMHpuZnN5VkVQbzJ5a1RTSS9kK2ZsMndETDliQmk1TFROUWlPLw0KbnIzMTVxRjNGQ1VKZ20xMzc5bGsrZ0lvNmUrYU5zY0hKOHFPWEc2dXlPYzlGOVhPVnBJWG56T21OQjFFDQpVL3hQVlRmM3JSOVVjMmFlMS9ZM0grS2VUb1pQOERlRjlvY2JldUo2MEVBWXkvZS9HODIwY29qV2QxWlYNCjJnOXV6dW1BY1VrKzUzZXhRa1RjMEZ1dWlFaWFyQzZJeDBlR29mWkF1ekxMZEZmOFpoV0UvOVpXT2ZYSg0KckExSlV2TEpEeE5OWGZOdkN2QitadG9kOUQ5dldJU0hEbHRmaGhSOVU3QUxodkVhb2ZRcjJCT2laQ21vDQpqaXNHbmVHVUxxdGU2dUhyRzdjMnNobDVRRVUraGpqd1Rhc3JjOXJwNE5lMkpsZ3hLditRejAySjJseWsNCnFra2RxWHRyakdRUXpxUW5WdXlyeDNaemVSRVFYd1haQkVxcnNaN2lkUktCQXR6Rk9nR0MzeDRqYVZ1Tg0KS0hTbTVRKytNQlkzb3NEUWlUK042ekx4cTFxYjgyNUhJRGF3UUhFeGpQa2NxRllPKzRKTklGdFhpV2ZWDQpTTU0rSEdvZEF4Z1ZIaFZPSUZFMDRJQXdyKzI1U0Q2eEJpdnhZVURwTnBIM3dOMkQ1VWtiNWMxUVkxVDENCm5GV3VGT1BLaU5BRmxCa1cwV1FGMnJjKzFEanNiaGpjd2dPV2dqTEpUd2hiSnptbGZZWTl1bU12RGpmdQ0KRGlJZlNQVmUvTEsrSFExYUdPSHVLQmFhclZkNjFWbGRNNmJLc2xEeVNqNGNaaUZoWVByNnlkQ09OcEk0DQp1THNZUHRqNUxSQ1RmaURNT0lOcGYzck1Md3p4SjBONVpIM2JWMWtjaDRWMmVLME9IVTJFUitQZEVGQm8NCnNGTHlnek5KVGQvd3Y2UURoa25yUFNuTVQ2bDQ1RkppbCtybGloSXlxa0g5T3F6anB4dEN6Z1hxR2srNg0KamFOdTllVVFIY1NLelUxN0k1emRtb2ttVE5IdkhZU3hyOHN0QXRTbGJQMmxkQldMUmdmVkljVDJEdWhFDQozRU54M2g2cGZuTFlhd3JDeExYT2c3VEhjZWFGUDJwZEdUaTZJYndGcWVzRW5pL3hjQ1VkMUR6U2NoQWYNCjJlMXRQRVlhUGVlMDB1TWZOYTgxcnVVd2wzZU40Tjl4dXgrazR2UzJORTBFazNCaEJKeVZEWGd4VlAyUw0KNC9vRXZPWFlKaGhJOGdPL2h2LzJGY1ZlQ003MVJWOEdOWkErTE14SnFCckE4Ykt5T09OTmJjTkpMUWJmDQp1MkkzRGE4OGtVOEN6cmpHd2tkM0NJVjlHVVVXblplT0l0OVdGSzhKT2dDd1NnTkVkR0txK0pOYThTc3ANCkw0NXBvWXlIbVdHRnIxU3BDM2lGSkFBdUpnVmxIc2FPdEZIclREVUFPTWs0S0hvL2lzL1N6R3kybk1PNA0KbjZWcWlrbG5LL0pydXJOMGhkOGFqSFNaS2x2dkRqbVg2azNJdnhZQ3EyM1hzbnBWUlFPSm9ucWM4aTRYDQoxYW5hU1BLL0k2a1dDR05RaGZnQ01XWXpWT2IvMGYxUjJ5Y3ppT01VbkVJQktQdk5xa1RXci8yaFA2dXgNCnRUUTRNYk83V1ZlMXd3dkJVOHdVVW5CT3lMRWxQODlTZFB3c0lUSGVpd2lGT2Irdm1Ic2dYYlcvbDNjdw0KQmtWWTJWV0VWZkRXWU92eGZ3Y0JCa0Fzc2JMS25wKzFtRFQ5TEdkUHhKckdHT1ZZRndVQnZDZVd5UjZwDQorK0VZNjRwQS9QaUlDRnRXVmlHT1NTL0FEM2EzTUVYcmR4YjdKQ0dGRXFjNzJSMGVidjhiYmV0QWhUUEINCnNvMU9XYis1aHNXaDAzcnFVdlNyUHhudThKSHhqOXV0Y2tPUkxyNFRtV0QzMlJ3MGxISVFhTEJJUFMzYw0KdFBza0NRNUhpZjBPbkNaLzBwMjBkcjJJZGdmbXE0eTNlV2ZkSlpXVE5wZlJ3V1RUMitzTzc0ZzhtUVp1DQpBcHhQeXIxM1V6SkVhRnNiZlB6VDlXcEs2L09sY0J2MFY1aFQxUElyZjMxbnROYjlLcGRJWDk3UUpyWW4NCjV1a3g5dDJpSWV2YnAwUy9aSmJTU0cyRTRxSEM3ZGZKQ3pvbGRScFU3RmhlU0l1N3kyOEx2d2JoeHRNMA0KeHI1S1VUMmJraXlTL1JqdnhDeXRubmR3bndFRmgrUlZZK1hjaU8zTFBrOHFsdE4rVUx1YW9wSitDU2FIDQo3VEdPM0dLd1NYM3BJNXlTV1p1c1ZpMHNNbDNZeDJFTSsrbncwRVlQR0hBNWdWbyt6WWFDRFl6aUYvWUMNCjJ1bXhCT2RIc0dvNEJ1cHZaZHM1dE9Xa09rZFlnaEZrZjkrMjZESVl1dTVOQ3VWRXZGbVIybURFd0VKSw0KSUN1elhGSFVDcGs0RWZ2UXVjVEZPTXdGNGgvdC91aGhCRlM4VVZ0cnZJbERLd3FTdHRCV1hSSkxpUC9HDQo0TzdOamdHU0x6V2lGeDlkQlRJUU81T0RLOFQ0ZU5hZkRqYkNETmJ6aDViNDF6WDdJSmcwM3hNVWQ5aHcNCjVjZmJ6YTJaeWE5SFFyVjVWcnp2aW5uR0JtTVhwUWZhaGlRcXQxMWV3YkdRZUNuYTBJRXhtc2FLdWhPVA0KaTN5OFJTSmNvc2ZXR3NNbllITnJLWFNtRHpFNHpSRDhqY2dZblc0UnVVSEJGTUVKZ2d2UmFSaUY5b3EyDQpiK2FiTU01M3U5NEpFK3AwZmpzY3BEdVJpTE9sQ3FJVXJjdm1RdTZ2SjJFckhHNWZObUZKU1pMdnVFTEkNCjRQU1ZFQWlzakQxUjUrbVZGQ0ovYjFHbkQwN1lrSkRkZTB0dUI3aUJ3bGlrVFRZcFFtbG80cGJjNEk3Ng0KK3JPNStVM2dPVUtZNUFSRWs1eFJ2bmNoSWJLMEdvTlNTdURnT29YVW13STgzVWhmcnVBbXRGbU1UUHQ5DQpUWmdQdlV0SXoxSFBWbVIxYWNxc3F0cUk4YU14YnJmbjVWSU9aYnFzc3k5TllRL09LL0hLWVJ4SjhRbHQNClVrd2ZUMlF1MUxVektPNlZjTUdzK05Rd1dnMWdrd01peXozQnhIdkx6UVl0UFJRRllQZmxBa2s0V3lnYw0KVmNHZmdRYVd6d1p1SGFXYm55bW5naGlDQTZ2V1JMb3JLYzRxdWdKeVd6WnMyNk5LTzR3OFZUaDFPM2FJDQpNY3QrYXZldmZpZ2UzRGR0ZHo3aGlrWjFrYTdTZ240NjBoYi9CNkp4SVZrajZpaThLcVdQamhjUGxhMGoNCmQyYzFIYzU5N1k1RDBMckxXTkc3aEZDdXRqRXQ3cVlFUVNzaXZ5K2lTVnR1Tm9yaGx4NldiRE1KQ2d0Ug0KUjhGajBCdGwyYWRYMk1ZMTA0Z3VVd3NDdW5saEsrZndHNVIyZytwTmJRNjNETVBCTFd4QUdiRG5ZTnMzDQppVEZ3TWhNaXpSTlJnaDlpL292VWlnME9UV0VGbk9ielJvVjBwWXo4anBERjFSN3JrZEgrS1VneHo4RFkNCjIvb1ZIWkdIYjBXcEVVVCtVVjgvTzQzK21iU3ZydThiUnczN0lGTENmVFZJZnBMN2ZROTRTOXRCTEI3Wg0KbWRISUptZU5XV3JNWTZKSnlPaXVYT25KTHI2c2E3b01rdlIvYUpoMlBuRWRJZEQydFFIVDNRM0xxck00DQpjeUJSVDZjSkFsVUw3QVRCN3dEd2RCeGJPRUZ1NTFNUjN6cGh5cEhkbDdWUzBqYXdCY3hzbEtWb2NDeE4NCmFrUWpSbEFIcHgzaEVzUUdMd1d1amlMNlF5QTlmaDBWVmlqMTN2cXhIdHJTZnVJeDdZSGNVSFh1a1FLTg0KOWNmakNDS0QvVE5CVTU3dk5qbTlDck10cWIwYk5uWmloZGN5cnl4RVR4bHhtS0JjM0EvUDZVSmtnUFJJDQpiRVZYYmt6NlloWEd3Nk5kM3BuMlFyUU5BY29wOTlaKzkzTEZEQWdFbVZaNmlVUDU1SEhPWXNOQ2hCQWQNCm1CV0tVbm5ObG5uV3FzYlp4cGxHeExkV1I5Z1RWRnIzUFRQeWJrQW5EaDRlVkRhcWgzV0RpdHl2VFEvQg0KYjZYQUE1RHR0OTIwRnZaOHlpa1podzhtZThUd1VyUTVhdlFRL0xXRDdzWlVJN2Q5T1BvK2Q3Tk5mL1N0DQpmN3JjRzMwdFp3NWVsbGhWQUlNUlV3OG5FS3ZSNDNPUWpGczVhdENLTTgxUnVYNUMrN2daMzk2QXBwMHENCnJLTVdoNFd1aGdwdWoxVEZURDAyczZMRVgraGlWMUIxaHZGWndzMCtMNk9BTG15bFhxWXhsNGRwTVpqRA0KazNaNDdoKzEzNWwyNVNjUTcwWVhUeWs4LzBmam16UXdMY1lQK0c3QlFjTzBnaUVBY2ozTlI1a1lhNUFSDQpXR041eXp1cWRMN256YldoWElwRitSeFRrRVBHK1QwVVoxV01CblR6N1dRY3M3L1ExVm9UbWwwZEFHNDANCk4zUTAvSkRmUG9tMjg3c2FVcWVzU29NMk52c1pqTURUTWN3REU1U0pHOHF6VjRKUjhCUVQzZVdhVTBSQg0KVkRkMXRISTJLOG5LekNrUXIyZTBuQUkyZWZCZVU0V0lXZGRWeXpEZEsrZ3lJYklwODFWYUM4Z0NtWEJRDQpnNE5ib0VWYzNHR1NuZzFmKzh4eWIvbDQvckI3UXd3RTc4Yk4rUzJIV252UktHUklJTGN4emVzYmdXTFgNCkZBc000ZnRGczNlZEZ6U2lJSGVXUDJqN25lTWxhVk9lMXdIbkFSWG5JSlZvT2hwUnhDSkNDUVhRdzBpcQ0KcjBYNzE3dEpYa1NTRG1UUUZSUjd5ek44QmMyMm05M2J6eDdBVURhL2hvdEFmNisyYXYzRVdxbmdDVElnDQo0TlZWbWpER0N1SnlwQzVZS2hqWDNPQ0cwMkkyL2haNTB0dE9GREV0VFJ3b1V0Y1dGb0I1VFY3SnNnWkkNCmc5d3YwQm1nZlVPdGE5Tk54cEYxWWExR2tlOFNUU0M4Zzc3bVUvUTA1VUxiUXQ2QTgwODN0dVZnaFlqeA0KUFUyQ21TRUxjdWJtUFlXNzdyczB5dDdYRTJ3UUx1S2p5VGlxVytDcXlwU3ZRZCtvOU1SaGNjK1RTM3VMDQpjMGVFN2FMMXF3dk1hTGcyQktoSk1QTXhMTnVFTmQ1TEVLSVF3bnVJWXZUaXlqWGFVdEVBZExiTllwdUMNCmIrUDcvbDIxVlJ4dGtuSTRZaTh2VnpGYmUrWHRMT1FlVkFVQlNtS2NvcUd0bUVOc1VBbVErekxXb0dzbg0KRnYwT2ZZZ0Njam9kZzl1MjZJbmgwa0tWTDBWbDB6VVc1T1Z2NmRHV0FkTTllYnlDMTJmZFBFWVhhMVFsDQpNTVVIeWhWNDBMck81MVdSL2RZUWFiTnNLQ2RYQXdlZHN3RnVpS3lkRDI1M3pjWU5ZcXpJZkFnL0toWHkNCmo4Z0NzNGtwUW5TVTkrejVNZHhCalg1czRPSGRmYWVpOHJoRjJSUGd2cjhnUVNxaURPaEtNRGxCN1NqMQ0KaWR5K3I1Zk05dWh5QWdEZ3ZzQU9GQU9VTWxUcDZWZGFpODZPTDVQVkNXOUtCbmVPVEVwT0RjamNpTnJVDQpmM3AyQUsrMDFjeThmVnJXNi9Zd1BJaER4Tm9VQ24rRHBZaVAvOG1qUHhpdTB5RTBaZTBTSGRSNDU1M2ENClBJRVFJU2lRQi9wMDRHVW9BZXV4NWRlVjBGblRwcS9nWGk1dnBqV0l4YTBEaWVha1BUZEdWUS9GV1ZiUw0KcG9ZUDc1bXROZ2RKYmJmTjMrUzMwUWpmRzRoekxqRjhPb0FoQW5Ob08rME5YcmVBWGljUkRKZmRpZldKDQpkcTRUK1l5YnRXbGxXb25kNFIrK2EwV0xNdE1JWHJMQzNQSTVtR1VoQjVSNVJtT1RrNW02MnhQYzcvQ2MNCnVyZ3BuT1hzNkt6dDNnakJlSDlxYU4xdUJjakw3VGpBbnRTRkd2dGxSM3IrclRYSklpUjJYWklzMzRoRQ0KYXQ5QUROUlJFVGRKL2lrN2wzNW5FVmErRVpjR0x1RVIzemVmQUxjbHZLOHRlZ2haRDc4TDJDZnA1dFdSDQp3MXBJRXg2Nys4K0c2c25YQXU3c2JFMzcvU2xmRXp6aDFXQWV0Mzk4a3FuUExOeHRVQmlBRy8wVEE5L0sNCjJhZlp1Qk5ha1JobEtPSjlYRjV6N09DWERTUE5JMWF0Zis1VXVyZVVYenVBTkVxcWxFNDlzSlZPVmFzUA0Kait3ektGdlNHYk43aW9IRWRkdVhETkRSWWxjY01hbUo3MnVvS3VHaXF4OVFQVXZwS1Z1ZjUrUUZ6Z3pHDQpBUER4ejR3SkJpVU4xZmc4bEIybEZyZUZKRVZqTXNaYVdCWTJyUDQzTnJISThzWGdkNEdlUFBMZ1RIZ1gNCldmNEV0eFFvN2g2dFM3MDJKOEJiRG44WnhNTlRwZVUvL1ViNUtmOVFWZ2RSSm4wRkVQZjMvcmlvaTBuNA0KemhnUU5GL3U2Uk1PQndUbnM2cXJiQ0lXQ3ZzeUdlRHY5dUMyaEFFYzBRZXExRGE0M1c4OC9lblUyNkl0DQpJeTdpR1pRTUR1MHhRVHNidXV0R0c1OEM4M0xKWExZQVFBcVhmVkRwajJZeFkvTHF3WVZqc1gvemg3bkcNCmdXUjdJc2t3L2g1YS9NMUF5dG9uN1VUOVFOOG9iSmxBdnhCMUcyVjlZczBPd3JuY2h6R0Y0eE0vTHlXSA0Kd1E2eENHN1VWdE5zem8xbUlybWs5UlZqUlFrdmNGREVrSWxyOVhsclllaVhsd2xwWE51QW1wZysrR1h4DQpQQWFmNDRraFZ6VW1yQmI1bFAwMzZleko5cjRJc2Z5cmMzSS9tY1UrUDRHRG03ZTVFTWtkZjlrTTVWUEENCmRSSlh1L1VLVlNtSkFUUEZVNDNmdDNmT2dwY0FseUV6S3JLaGg1VkFvMWF6ZXJKVHptN2RqWTJ4MGRaRw0KbmhLSTVvbUNFd0N3RC9QS0RSbHVadmR6ZW1QVkh6cFlpSjJtZmluMzEyWDlmTmpxTDFWdURZWkdGS25YDQpzZWxCSHlJUVN3NFZKM3BETTdjUmYrcFB5QjJRZGRmNjhESmlQa3lwazJEeUNyM09IUHdVQXJOdyswaHYNCkg4MXl1U0taeFR2RG1YKzNObTB2R0U4RkNwNW9Xa1ZySUk3VmsvOEJwTDhGa1IzaFlzRHVpS01SblhPbQ0KbVZZMFVrUUNjanBmaEhoTGxWVVhMNGU2NjZ0bHJPNE5kdTh4RzFtbXVTdGR0TWdtZldBZ3RIa0FyalJvDQpBNUtSelNaY3BxV2RsVGpGRllsci8vWkRsWHpsV2ZFYVE2Q3IvWjF2anFxUVA2dS9zd05uRHdzcW5sR00NClNVa09halg1VzVkdjN3MGM1SExWM2NEUkFuZjNzdHRKbWdIMTdUSTYrcGtqS1hVMjdxenZCZ1c0Ym9QdA0KeHZFTjFmWkdDaVJ2NHpwOFhoZmhEeXNRZWZPOE9MYU5TdWM1QW9iajE1Znh2anFVTERXcFNhOVZpNkZRDQoza1RyNHpoWDJoV2p4MnQvblpLWitwZVVkK1A2NElqUXgyS29uc0xlMTdwMEpaUTNWQU81RUU3ckNRa28NCnB3TWdqZDEwZEl5MXlKbFpiMWJPOEhHR05WZlQ2TnFESVBwbTlYN3A0a2FLajZBcEVaTjN6YWZsYkRETg0KdklKSzF3UDlSLzEraXVKOGtINzNzTXBlaXJEcHU3V29BdTFpdmljVklYUGdpckl6ZnBWVFp1SGZMWnlGDQp1L2xRODhrTnc5OEJPVjVWd1VtM0UzNGEydm56cGhXU1VhMHVYZkRmOElpTEFhV1NYeGdMOHM4ZFVwOUgNCjR1clV2ZHp4by96ZHR5R1JIMFNCdGRRYVFXVzFubmJPVndtVnJhSmpwSytzMEFwTXJOMXJTNnEybjNoMw0KY3F1S1UycXAyMkhKNnJPWXVVUU5jWldxWWZDZU5MbXpsTVp2MmRST1hTMHhrZ3Z1QzJMV1RCY3dxa1JkDQp6TG1QOHhEWU9pcTdJWWhTcG9mYldubk9DNzBTaGxzdkpPSlMveDZUVU1PUFA2cG9ZdndpdVdxbnhJcjcNCk9LQW50M3Q0NVZUaGcvWjNxRzdTdE9ISG5sTjVnT1RTV1N5alVOVkFvM3dTNkIreG9FUUIrcWxiSW43RQ0KWXp2SjNTeXpSMFFjU3pUUTkyVCtNU1R4SmNaeVZ1MWZrMXBZVTRna2YzUStKdU5JRG8yYWJyUTRBa0dJDQoxcTAxVVNIeFVOY3lITkdNUXE5Q3hPS2hSK3l1M0gvemNQNWNwUDBnMWd5cDlSQmwveVZlNlNyd1hGeVQNCkh4NktZWHBVSmtLY1R0RllvWEJuZlpha0tsRVpQaFdvb3NiTTlwbDJJdFlacXh6OUZLbkRTbGJ2UmZlYg0KRnI2clQvcDliWDhVc3JkeUxTaDdyK3NVK0c0KytHNWJQM0FGM3BJOVZjemRnQm90d0tGbm1NZ0p0WWQwDQpvbmZsWEpVeXJSbFBGNmUycWpGNUZ5VVQ5THdmUXpMaVUwa3ZBbTB3KzlPRG5sYUpLQWp1WWlnU3kxWWENCm4rT0R4T0lzSFRHbngxd2VYVDZSSVMwek5zck5pbnBpdXJmKzJMMTd1bERCYjk1WURmdTNpU2V1WG04Zg0KVmRpK0dzQmZ3cE5wOER4MkllSCs5aEk0WWloZzZYV2tCMExRVmVBeTBCOUhaeW00b2FUYjJENkFVcnhnDQpXRnZFRDRxVGVES3Z2VDVHbmlVTW9qQXZHeEhSYkFLS0FaOE50YW5JZ1Mza002dWZjNVBIWkFBVWtobUgNCmhreFc1Mjc2M0l2OVhwdnpsOGpHR3BGQWhRcWk1WXRCcVBCNXhnQVREZ1EzcHpoN3ZCOW1nYlI5NkI3OA0KaUpVSXNTU28yYi92aXNiL1kxM1BuZ0RkQUV2NzVjRTVONlFaajhmMGZ2OUg4cFRiR1hvajh1NWtQNnFmDQpDWFdsNGZwUzJQNEVkTjRnZHZSeXBnU1Rta25DQU5jRlFyUlhqN1BYcVNVMnBXakRQZU5NN3ZzOThpZUoNCjRhVi9FdjFRYUd6eldEVjJpYzEweG1TYzdxQ1pDeHppQkJKMGRmT3MxdEZzRWJ3azhRcDNUdWFzSGh1Rg0KNUxBM1Y1VGNZekRaN09DQlVMY1dBc2FQaFFKOWRYTnRqR3M1T05xNXRTeE9ydHpDTUlHNmFPa2N2UU5tDQo4WjNOVkh1OGJhL21LSUJnYjhDUVRCVmFqcXRVL0U2V0lJenZnTSsxS2xFOTluWk5hNThhUW55aTZpU2MNCmF1Y1lCakQxdFVGOTJoQkFqRWhTbGw3ZGNIaDdiL3FjckF5R1ROK1dERzdManhzYjFUTW9WMFhaR2lXUQ0KK1AvOHp4RUVxazZyODlrYTNCTk54QnAvUUFCYVdKWWVsaVZ0bjZqOVRneGVlbHZydXZ6QUNRVGtod2RXDQpCNUkvd2szS0c1cWZIT2V4MVF5N1pIOXo0SkVmUmZyOHM1V2ZYbkVTQjZZemp6bUxSVDFpcVQ3cGIzOUcNCkQwUFZRWG8yTGNVTUJTempMR1RlenpXMEV4dkdxUVM2UE9hemhaT2lvdWlwVHdodXFBNldWUkhOQzQ0VA0KSVVnVTNQNlZWS2k3Ync2L20yS1VGb0xUM0hEQVNFUDJrVk9ENmFpa0FOWlVRNGprYURvU1lXLzV5ZEF1DQpzWjNBdVRqSk1lamp2bVRZOHBUbVJKLytQeVN4WjB1TFZ6NEx3QUIzbUcxNFVOZW1GS21yVjUrOVp5QWcNClhWQjZSU053Ty9KWVVpM0JZcGZEcmMrNm1LYlY4ZHFtSWZORFQ1U0FmR0wzVGpHSkZBbW9OVzZlMUxUVQ0KNEl1TC81ZG40dkJ3dHRMMnA0VHhjTC9EUXNIWnpSTStHejViKzJ6c25iM3V6WkN6eEZOQUtUeWtvdnNtDQozNFJnZlBORHpmVU5jUU9pTTFmV09pQnIyM3RTS2RDUjhhOWtwYUdNZHVmNDdPZFpXZFQxYkg2YzdBSEcNCnFwdmx0dWxKNGtZU1hIRVhwM2dRT0YybXgvNlJRYkhDVzE3WHl3RnExQTB2K3c4Mm1yUGUxNGdhR1pOWA0KV0RzRmVIc1BXTWN6MUExakRLYVprY1lhRlhXTVlNVHZ5bExNQkZ6WHJaYWdadFM0NkZaUkhDNlVwNVFtDQowVVJNN3N5YzJKbFBKN1NETVREZ0J3Q0hPQm1YQ3pwWlRuRmJxZnhwRHA4K3Y1eStLNWFyWjlacHJNWmsNClBOWkZSTlFSa3dINXN6K2JpMWdLYldIazV2SnFNZEo5disyTHF5NENZVHhDcERmWVlvTEZJMEVxZWcyMQ0KL0NsU2hCNm51VDdqR2NEdTltOUJCV1kxV0tDaUJyaTB0QlFuY0tYR2pUWnZsdUF2ckxSTlp6MlI2eEpmDQpTZ2V5Z1RMTmZwOERNRUJXYlVldTNjazd3Ui9QZ1BheE1BZ0JvRmNKQTNrYTVKZVlqYnNUQUhuYkZZSm0NCkJ6SGtJTWMvUXlqWmlKYmhzQVVIdTRudjhDYmFiY3dpQ05IWEFLeE12VW9DanBYWXZEQjRZM0plMDBuYw0KTW9uVitmWXNzekptdlFMWmdLR3VvdEdHMXJqNmdxRTRqci9FS3hobUN2ZDZOOXl0UDhkT0pUY2xINXdrDQpXRGpmZFlVVnd4TXNPaldDTmlWL0RUSGJWZTVPODhJMXFoSm90RHVyYWhXdk5lSXVoTHIwb0ZWSDR1K2cNClZucEtySm1RdHlmL3JRMm9zZzBkWGlZeHVXa0t3emt0aHRtUFhiQW9YSFZLaWw0c1FycFhmdllOOU9jLw0KdjAwRDBaRk1HQnFVeEU0UmdseGFmU2tVUVd3eHVOcEJlS3BpK3NaWXlieXVlWnlUQ1RnL1FXcHVITXdNDQpZYzZQMnRraUhlYzFjT3FBc1dMbWtrL0dseDZKMnVkNzlFRWhBMU1RU3Q4aUw0QU05RHpjMUM5dlEwd3kNCmFjdHhlU3JtSEdxL3ZLQy9SL0wvN2xnNHVUcm5vWnlpNkh2NWxHNGNwQWl2RmR5MytCSWVGZGd6L2ppVw0KbXpuYi9yUnVwYXRKUkVqZ0F4T0dtcUF4dVpJUmpoU1ZwbmE4TXVlc2hGMU1vNkh2UFMwZ1hEbWpjeE1IDQpsYU9LM2ZUVlB6M2EzdWk2WEJ3RnV2YWNUbHdkVFNIWnROcDVYTDRDcGx2Y1FpTkxDWVYrSHR3dHQzT3ANCm1YaytzRC9sQitnNVR3MzRVekNVQXFySG5CYk13cE42UW1xWk9lVWVOWm1FY0ltQ3d3eTUyMHpMNjJWbQ0KZUZPcmVoRm1wQlBkbWJvdStMQlU5c2M5QnlhT2VrTER0bEVBaDFiZnRub1NrL2lsZndjbFFMNE9qUHFtDQpIUDhIR1NTVmt4S3VpWHhQS1VrZ2l2WEFGcXAyNzlSeEFBL2k0WHA0MHVOZE04c2NwNmFnaEhnYXE5eTcNCkZNQlE1ZWhiWk50RnREdU43NnE1cG80cDA1NEp5NTdNNXhhQ2htOUZWK1ZWQitVZTJhVkk2aTYwWG9MbQ0KYWhvdDNyQWhCODNZbkwycWdwY2F0VzZLUFVsVTJKMlBqQ1lHajZzaEg2SVRocHpPa0ZZVWVha3dDMlF4DQo0MWNUSTFwdWRMUE9rakI0d3VKdWpHZDBVYS9zMGhRdXpDeEU4cGo5b1pWaXI5TFpxSVdkclBSWFFYL2INCmt2am5PcG9xSjM3MU90aXUreThNYllLekd4SFgremh0YVVSNklEb04rc3hwNkFoYWRQSk45Q01HM2dKTg0KNFExS2MxQStmQVBqN3d0OVpJdThCV0FMZ1d3czJPVjFObHVGWmRHN1Q3anBNR0NmV25ZZHdrOHNrdHU0DQpDVW1YcXJyaUlmTEpVMDAvbmlmL3dEcmh4VmVlR2cvbzFCSDlmMnd4TDdEZk5PNUdPRVpNVFJlRHdINWoNCnAxNUMwVlVXcWd6OWRKTHJMNzlvNHU0VU1qWnQ2dG1raldvaFcxZUNSMEh5NXJ3MmxMbUxYNkNsdzNiRA0KdXhWbTdaZEhUREEvOHZZZUdNWFJDdnVZWDZxRGFyd1J5UVNIS21vUWlmU3NRYlhpQlRmRWI4K1hSWjdyDQo2THd3dVM3Ym9rOUlrS281T2lBTjh3TTFlN2orcmRzemJWcVY3TW8xNHlaQWZCdnUrOWlVS1FSQVJDTWkNCmZERG5tZkVneUIvVVR5Q3pFTDF1emxDcGdzR3RXTUVSaVhPRXlkVlN1djhJZmt2bGpqalBIN0JkZ1pmRw0Ka2JkYjgvT09EemR1bjdtWUYyaG04dFc5bXZBcm1PNW8rVVNOM1J1SjVHMUJJZ2VYdDFjbklXKzd4czFuDQpYb3FBNmZIbVpTR25XSUtrR2xBR1k1MnFSR0l3d0tnbjJxeVpCY3J0VzVURGhLNFJyL0MxaDQzcDBSaUQNCnROdVdJSVU0Z2FnMC8zcm9jdnN2LzYvTm42MlpEL05qWEJvOWRzd1loL2wyUUxaaVFSdEhsbjJrSHcrRw0KaVZLM2tibi9McFIySlRNTTFmcHZRODBZR2RpZjlXRjdpaUpicWdGc1B0SE9TdXZ1VVE0YnhUb0txRjhlDQpvdlpSRFpreEZaNnNwSURTT0NUOFl5Q1FrbEs4S2pCdGxQd2FCeEdWYVRtM3RXUktoREhEUUZRVzBHZ2sNCkcvejFOSGlMWURXeGhWT3pySFZxbGtPV0N1YWV4OE52TmtiQVU0Z214MEt2L3piOGxEZE1pemw2RlBScg0KZThwQUFpSDFYT256WFA0V2NUckR6ZGM4SGJ4a1JWNkYweHNrMjFUdTkrL0FKT0I4NDN3TUNRam1hcHRGDQpsZHZqL3pXWlJjQkRyYk1CZzdNN0t5L09Cck1rYlRVcGx1Mk1udzQvRXN3azBZZWNwVll0SnB1ZGMrRTENCi9jU0V1NXppM3VPMktsU0tqSlloWHZTYmF2cFZTZWcxNXhKU0oySDJQOGJiNm9Od0xET0JhK3B3ZGErbQ0KK2R3YUdiQW41T0U5UXppQnBaYkhKL0s5N1IxZllqb1k4Qk5MQS9JcGNWTHNLRmxHQkpOYkJBcENqdEZFDQpBa01aMHF2NWZOTU9WRDNqNnpyL0RjY24xVnJrZG1HNUJ0dFlHN3hOSzZKbGVHc3ZvaFZwaE9BM1FOWkwNClcvU0dtck5ZSGVOYjRIbkxmMzJqaWx1OVpOL3dlV25iZHZvM0orUFF4a1k3by9vYi9rM3IwNUJ6UFZvRQ0KSGtJeG1PRzlvMkVweWQvN1krdWFuenNIZHJCMlpUMGVBcUZnb3hhNVJoa1pZL1psaTY1b1BMdUQ2NUpJDQpVc2sxNk92QkFJK3Z3MjB3M3ppcHQrN2tsaHZ0bmVoTWNCUU9NQklSeGpSSWJOMSttQVBRSU9tREx3bG4NCjgzTWFwZTVhMTdSZTlDZHkrd1RMT1dxZW9DNXFiZWVhNjF5VGYvdnJublhRLzM2TGFINkV6Nkd6TGNobA0KdXFiRmEzTE1VVW85NjJpdXRQUlRld3MzMklUVzdYK3hFNlo1RjRwYU1uTmJFS0RhdzVJRU9ReExCRjNoDQpTK2tpeXo3ZWNFZHVyUDFMVExLTkN3WmJ5T2JZVUNRcy9RQnVLOFllRmhQRndmSDFIMmlmRmZ0NW1WY0QNCjhZUVFOOXQ3emRkS1dHNGQzVWMxRU9tV1Izd25EQUwwckx4ZUs4V1Exa2ZsY2Ewai9HeTJJVVlDNVBpSw0KdTBZbndSeFFXS1ZacXNqQnlQaHVWaUNTZ09GaFRuU2pmaHhjc1hQZXJ3bEVHb2Z0dld0WkhVNE9XcDJHDQpuR1V0T01tY1QwMDRJTTBVVVZwQlIxRVhOT3FhaURaR1U1WGxNRlFDblZZTmcxYktoSTF1WTRhK2xZRzENCnExTjhkVFlBbkZmc3owU3cwNUN6UTFMNUphVHdLUGpoUHg2ZGVuaVRGelNSeXZaZCtlalo0OHlwc29nRA0KcVh5WUxOREoxN3RPd1c1Q1ViVVFOdnhJb1NZWkFvTnl3ZXppMWZQb0xrN1pYcGhnTWhWalVNdmZHTW91DQo5eUNFeTJ5VW1xVFg5WndUaWNpeUQ4ZzdsM1FkQ3lsWXRZUXR2VnJDY1pERjJQV01mUTlCamR1N0lJeUgNClQwNjljYUlFdUwyZTUzem1iQ3FkU2VtaUJybTQzRktjTk13b1N4dXBFRzBlcmxJSTFLWlRvVzF3TmZ6NA0KUkNhd0oxbCswNytaWkZTclIzTjcvZWVxU0tSbWJWNkNXZFVCOU5zdkRzU3o2QzhVWER4WmRGL2RodzhwDQpIeXYzRTNMTis1THV5YkFPYkRDNVE5SmpObW9pOWZkU2ZXdXJHYm5yRm1xbVQ2eUlQZzVjMHpOdjlvQkQNCjNxSjZob3pjMlFHZHpYV0NXVFoxYVRUVDYxSGtWaDc0QUdNN3JwSW1jd0t5U1JQOHJSMjkwRDl3QWNMNQ0KTUd5VGdsQlIzek5JWnQycXlyMm5pSHBrVTVxLy9LdHdUU2sya053SGNUNnJTTGlKMVUraWxJVHhyUHVyDQoxSy9SOG9qYVpKZGZlZFhPeWsvMzlpZEM5QWV1bWpDWUduWTJmZGlkemlXMGFkRWE4NjBQN2lsd0JnZnYNCjdORU9wT24vallKazBjOTdlU21Gc0RSL21oMjBYQjhLTVJ3RTBEOFUxSzl4RnNvK0MwdVJHSG9UWFNhbw0KTVNBamJhNGU0b1ZFQzRrSFByaTJ5eVNEeENCT0dnWndodUZzMXllclF0WjhZWEZvMlFHZEQyQ200ZS9mDQpPeVNmaTZYZFBMOEFRQXFzN2lJSkJqUm51c2FZa2FWL2JXR21xTzUrS1I0bjFKaUxyNlFjb0pZakJMYlENCktBckRLS2ZMQVpuaGxtQk5RMVNJd296SDVueWJrelFRMkF2U1pheWpzT2RDUUkxeitCMHZQN3ZvYUVibQ0Kay9hdms3NTdxQkFTWEw3djRobkVWSGpMdUdtekpjR3JJMGV2dHJySkhWWk9KZC96QVc0dEdwemt0OHVpDQpwTWR5MGRuOU9yRHFKVTFKTzNyUmdvb0FPTTQwVnEvUlpSMHA3MjV0ZVp0Z2pnbFR5SmRqN3kxYmlvcWkNCmpucHRGNWlMd1VMbjBLU3lrOW0wM0ZkZXFqT2xMUjBGQmt1cDdtb0FiYzU0MzlXRkd4cDF0MTZhMzF1dQ0KOCtHTnZvWjliaE9Na0ZraGdpdzVMUEMwZXpLemM1d1pYZkZseGwyZjhRODVlWEoxTUpieG1xaHhBZkVNDQpxc1Fmem5tbzhscHFDRlF6WXFBcmRTbkMwa2lvWnZYMnFuNDlaSUtHOFRSWVFoUE4rWXZnRUhKYTdSZjkNCi9rNkNQWUY1OEMzY1U2MGtYMktXRkxiWXo4VUdLeVR0dEozK0t2akFpSWtzR3pBRHNPaG5pWkdlVU1QeA0KOWFYcFB3anZzM0N4MkszUGNGN24wTzZ0VldIY3FvSnVzSWdkK0MwTFMwbE1hREVLN1NFbzZxNHcxTE1qDQpkNjQ2Qmg3N3MvRUZVYjYyL0tycXpCKzNmblNCMDRtWDZUR0grZjBBbmsyS2xWR2owZlVoWVNoM0x5SHkNCjcxVzFxL2ZUTWhiSE1DajFpQTNSaWF5dXBMT1RCUFN0dFZJUk1uVjMza0pTbDZSWDhWTER5TzJlbWhDMg0KOXZYcnlHOG1WNjkxSXgyYW93Zk1vZFBhNWRVMFZJZmowT2lMQVBGckQ2M1VqdlRSbFUrSWM2TGsyZzcvDQpHbUY5Q3c0L0tua3NBSkRQVWFQS2NUZFBjYUhGZWRydHp6VUk0SzYxZDhJVEJtVVpLN2tNT1pEa3hWSGsNCjExSUFpV3A2MjhjWUNJL3Uxd0FRMTRBaGlwRUh5KzIwZFBsQnR2ZFZDMGM0QWJ5WXp1MmNIK1NnNTJ0aw0KUi95eVAvVnVQUnAvSTdSWWQra2taenlXb056QS96ZmpzZlJqSEFvV3pTS1pDQ0h0UDlKZ0o2anBGTXdlDQpXdEN3U1dCWGExdWdoM2pCSXpkaVRtRW9LQVdDRXBWSDlNRlhJZGFiSjVvaC9tdjhTTlkyNlhvUkJtQ0MNCmU1aUNpcmNOVi9oMUdmKy9EQ3cyallzYzhQSVVXanFpUXRad3pMa1hYVnorY2wyT2JORWI3MGFsbWF2bg0KMDBxZEhDNm0xTkY2bnZsckoxRjJpV2svanRBN2t2bG1SNzZlQ3gxaHZLVkNiOE91SThuelFqYTNwZXpFDQpQeWIyV2QrVHcrL0pDN05ldWovaUpoNFUyYUl2a0FKZDBDZ294NzdiN0tIL1hRbHIxeDgyS2ZZZW4xTnINCnR6bmVmSmU1MzVpcDZMUExoSVd4czB2S0ZoYUlWd3hYd0phSGRhejZXWStVYlNYdFNPYXB5Sk9CcFdCTQ0KcitnZFBTRE84bXZaYmF0UmEyaFdmbkpOSDdlUFlscGdoNUFZeGFURi9NeHNRQmtpeUNDREFPMUErNFZGDQp4Uk93Yk4xVkZwMlMrY2N6TWRmQXhrVEdIQU4yRWVwZzBzYVY4MTNRMnc2cW83NCszZG04c2NxemFXR2kNCjlZclRjaWNOYnhMU3I0eVgwYVJxamVTU0N4SlN4UHdYQ1ZSRVFWNkI5R0xxWTJWaHRXSWI1Tmc2dWI4WQ0KSU1hZzlzVEh1RWIxMEkvYVcyeVpJZC9wYm1zUjZzK0NPZ21pUmRZWkF2WTlITWtkLzJMT1pKb281RThJDQpJbXJ3TURhMTJyWms2RVliUWdtdEM2SkVFeklIRWY0NWdURTM2OGwrOHVnY3FMc0ZBQlRZa0g5YXRPK04NCkJGNVVPb1ZaVXlmWmdRSTVIMGZzNGFUNVFVcmxWRVJVUnJBeEFSb2Q3a1p2a2JLM0U5YzE2c0VNMlJyNg0KUEwvdGNZSG9VL1kwQkl6M3Nib1F4RU5DSzhvR1h5dVRzUE5BcjVLRWxjcEk2cWgramdSdno0ZjFSbkxaDQpMeGQxWnU1T3pRVXFDRklSbU5hZ2JyVituTS94MVVwZE1hYTNjQmsxUTVvVWdDWGx6L0hLK3Vra3JzdEQNCkdyTnh1UlNWWFRZYVd3SmZsZlpGM2g3ckptVUpjUkZ3TTV2NmZ3TjdOZEU0OVpjcGQzN1NJMlNSZCtMSQ0KYW1xSSs0MHpycXlWem1SKzlCTDZkbDkvS3dERmFHTk1EMXlsQTU4SzkwM1FJcWxZek5LYS9xR1cwYitQDQpJWjlweE1qbU1rV1FoRE0xZE8yaHFzbGdiNDhJdHoyT09mOWhzRXExcUl4TTRoYmpoMW5Fc3dna1NrMFgNClBZeEV2MmZJUUhPOUl3eUMxeTllNGQvK09DenFlOHcxd2FBMis3V2Z3VDh4UUoxV0hCUnVNZGZJMk13WQ0KTkhiWWg4UHdnUkxzeHN0MmlYczdwME5DZWV5a3pKYUowR0JJMjRGemt3SzBUWW9CSzZVUXFhWXFHQk53DQpWdFFBdGpqVnNMaUF5MlNCMERqbzZaTlJjRjA4TDRPT2M4c1k0NVIrWFd4UGVWUjJmK1EvVTg4YldaRjQNCitVY0h1QWplK21uRVpaY0oxMWErWGVrSjJRV0dzaWFSSW9BMXJWN0gvWTcwa2Z4b1ZGcm5GOVBMYXJLYQ0KcmV3UkFQK1JhVkNzTGRaWnlhOG9TVWo3RXhKNzZ0WEVnQms5S1o1MUQ5WnREVk9yVm9lSENudkpsMXZRDQo3eHQ5eno2Y213TkR3R0FMeHlkM0txdXE0S01hZU4yV3JyNGZIUHYvVnNHeEIwRGxHbVF1UWc5N3Z5VnoNCjJzemVvS1BXWlQ0a0JXQm5tczh3d3UrLzAwZ09HTXpYak94NXBVSUdObks5akdzUFlUbmxsRnBoY0Y2cw0KRkFIYS9qbTNSaDBGVXhvZzl1c2YwQUNpRnRlZWk5dkQxUXJxMGRGbkFKYnJGbG5RL3RHL0N6alVHRndVDQo2TTVEZzJsTGFzdy9oM3QxMmtoUmloVGNHQk5rbzdKOTY0RjdSVW16ZjU5U1Zha0V5ZFlvRzd3S1JtcmQNCnY0WUF1bkdiZUc1bEQvdEhzZFl0c3lZazFBUEZRa0h3ZjBZaWNXU1JZaFRUSEU5ZmJHcmFoOVZXNUpGQw0KOE1oV0xlS1RhVGlUSzdsQVJ3RytKVXAxYS9QaEtQQm5yVWpnZS8vRVpDTDNvdGJ1aGN4aDhwdHFrNzVxDQpTalQrcWVHNU1CdEZKREtRK2ZGMXlKaTgwNXc3VjNMZ1ArbUtSa1hSc1k2R2JUNmJiQlplUjlmUkdYNVANCkc0VERzZlg3aFZhaTl6L1VucDlXclo3dkZ1WHFEUGZTa00wVlIzOEhtZGN2S1FsWXY4NnloM0NXOXJKTg0KZHlUVVZ6a1QxRmhVeWtObHA2ZCszSmtkM1k4VVRGa2tQUjZ0eGJFZTVYcXkvMHNFMnl4aWZnY0pxZ2NwDQo2dlhuWHFEOUp5OGQ5dDJTQ29qcHM4N0VzaUNEb1NzUEU3aUV2ampVT1BQbDZNTTA3UFVLc0VUZ2F5RDENCnBSd3htcnF2NWpQb1NUYVR3UVNicWU0ZUMycFNhaTBHOW80eVJNdkZDWmpPazBnWVVDUW5IcjcxczQxZQ0KMlBFUVJ3VnM3VExBRVo5U0pNcndQTG1kNVZaWGhLNDB1QmVSN2tyUUd0NXNiU3htazRkWUdwNHk4UTNUDQpDalFvSTVKSUIrRFdJZUhsUlFDOGoxNm5pQlM0LzdITGdMNEdZT25Yd0l4R3ZGU2U3V0ZjZ3dEOGh5U1QNCmxrc3JEeTVlZER5VnZWNGRmTUpmODh1c0pLNjBhSzVyQk9qalZFRUh5M1lnTHIxNlQza09FMi95RXBqLw0KSXJsbXdJRzdRSERwSkFlVHB6L0hqbFltQXJhMGF2Uk1XZVJXYTBRSW5iQnAzTzA0RlI0THZMRFRaUmlmDQpHRHpEU2U0RDh2OVQwSjFWcW15bWl6SXVsQVd5NE9uZC8wbE9jRjluYnVyaCtNWC9aTHVkbGl4WE9tanYNCnMzdGtXTE9DK0tuSER0UWlod1B6YzUrVkpyaWhvUW5QQm1GcWdmTk9oVC93dDNpSG1UaEkzR0ZnQktFMg0KQmpvTmxoZ2RIL3JEWHFKL0k1VS8wT2ZhcG1LK0dNNkpwWVZyNHhGYUdvSTBCTkxiZ2dqSjJQVm9sWjB4DQprczNEbzE3c2JoTk5aZVVKcnR1OUw5SDExVzAzUUxXU01YRGhFdzV3a2haSUJ1dnlMWnNmamZZK2F1d2kNClZVN1ZyU0RyR3BQYTllNDBLd1YzK1NqMm1kWEpUbGZ5TXpXRGdjY0lQTkV2Qk45SUlpUWdHWGNRSEhPMg0KYTB1ZkFhQWFvR0Z4cExVd1JYdnlveExNYS9aeUttTXJFcUtMeERyME04NFI5N1FJQVRqVUU2aTZ6Ump4DQpTSnhNZzg2dzdKcm9Ub1V1S2NqRkNFYnRJbG1mWWNWd3JrOHZ4YWxsNTRKbytZQXJJY1lvam1IcWFVZGUNCm5vZEMzOEN0TWhQcytPWW5Ed0tRaGRzRk1wQnRCaUpURW5tNEMzcmpIOU11VzExS3ZQQkMwWk1ZQlFKVw0KNDdFR0U2NVZYWThZL3RwYzRQZUczVDFUaGN6RlNTcGtPZmhIM2J3d2VvNTAyYW9QVWZ2amt3SURaZXR5DQphY1NROWtwUXZ2SGJteHJFTFVscjZPMHNmalRIMHVDbFJpMWVlZmNKeDhWbmxlREd3cVBSNis4RlhFdzYNCjU1TXZvT21FVTVmQUhkKzJqZEhWMHo1L3ZaR1MraThXMGVkd3BjSjJMTnNUbk8raktLbFBrNENXcVU3Rg0KREtlMU16ZGRjc0pvZ3UyWmE2dTZGTXFPYzFRNlZhb0J5MWdZdm5DN1FOZjgvYUU0Q0FRMGRSWG9xSTd2DQpmbHp0WG1VOWswcnNzOUFRZVJrVE0vcTMwN1hydjZSOWtWeTNXMldGQjB0SjF5RHNUcktYcUZqYWNoYjkNCjdUWHBpWkFKNUpIaE1PTk5tUlhKUnFwdkxMREYxMW5Sc1dnUU5saXJmL2xNYWozcFVqVmJ1VnpwZ3loZg0KR0ErQkR0MHQ0ZDVvTVZhSStOQ0RaT09DTm1KcjlTUWMrMFRoVlg3Z1AzbC9tYlBvS29zYmtQQlp6WEgxDQpLVWRLYi9yc0VUdHdMQzZKK2RtNjM5TzNzR0pWUk8zZldVZlRCQzIyb1plRzlQR0VOVkVud1dZaHE1RWUNCmR2WDdxUmNhYVRYdnl6L2xUbzRsTFNNZWVZL21ucUJZY2JPd1IwRGhQNnkxOEpaZDBubmM0aGEvU2V5cg0KUVZ6WGZVZXVRTDRSOWprdUMwMTRpdkNxSmtTQ0V3aTBobEQxYnpTTnpjVzNXQldTNzZ0TDdFTWhzTURNDQoxY0laWGR5Z1pXMEtTOXRxb0czRmIrRFhzZmZWOWFWbGxvL2VXM2haZEFTMkQzVFhDWXNZK3JWTzl3bU8NClBzR2Z4b2lSa0hVQUwyNXJnNEdseTZLV1NJaUZKTG1wdW9kNjBjZ21kcHJPQXV6bDJSdGV1Z1hLVGI5Lw0KZHB5RzYvWkFpMlV5dE1NV1FVRE5rRWJxY2t5Ujg4ZURYOFRhTlZnajZaNE1VMjZXZWRvaVV2VjBqdTMzDQpONlQzQ0tMbkVBRjNMQnBYQ1NwbTlrRWk2TU8yWUp3SEdsUk9iUmRkYVB1T09iamRZSVgxNzI5bk9BRHQNCkh5b29YYzAxcjdSK2JxSStySGk5aHJuc0NoVnhrYVdyc0V5Y3hDWS9xVm1BWFlhMmFJV25FZTM4L3ZlaQ0KR1F2ZXFRSmlJODlVR3k1ZVlkdmk5MVdxV3BOKzlPVkZLRGVRVmdWRHpSRGltRDVHNkUvWG12SnZMbklrDQpST09GS2ZlaGtYQTc5b0s1TWRZbVcySkRNZXB2dHUvd3VsUExZVzRuaVdCRlV3RG9KRXpYbUFCeHkzZ04NCnVac1NvQjRGelBJalpaeEFkVng0bWRZU29lYmhyZ1Y3ZEt6NnpBbEJuazUvQ0E2R0FPUHhpK1pUWG04Yg0KcjNxNWI0SUVBYkZITjJ6TUpGaVFZbVBtTXl1aXVzQ1hwRDc5Ymh6OHhXaXcvWXNPU3ZzaGw2eGVFcURYDQpwRnR0SHdyWW8rVHlWUE5YbGZCZi9JSW1zZThlTGRPN3o5RnhxZC94UEhLNnRsQnBXVFBGYm5ZZVVwT2wNCk9oVG9iQXEzQVN5UmJ1VVFZZXQvZnU1ZzVZN3o4NTE2a3dEQkNRMFgrTHc2WktMUVdlZU05WG1IcHFxKw0KVDFIME5TODZRTlNUdEFHTGo2ZUMrRDZ6TVNIN3N3L2ZjRHZXTUNtZFFwNWcyNFhWQjBaT2J5WkRVTnQ5DQpOQ2lwN2EwR0ZGVm1sUWpzTzkzZDhwMVZMbUd0TWNrU0ZoTS9UUFVOMU5RbFpEWHFLRmROVlJGU0M3RWUNCnpJMEV5QjlEOERvMzRERTRkbFE4cDcweUw5d2Z2bExhQ3QrR2ZNUlVpbmNoc1QzV09IcGtpVklmcEx1bw0KeVZ5RkJKaWNrbWFLS2lrS2hNblByTTlIRVhySGxwWmxhdFJPTXZROVJZNjhQSmNDbEFzUE5hMkdyZk1kDQpDVFI4MkIyRThUeWRMSGs5akF4RkFUbkVVZllLRnZvU3dlYWMzUWpLcXZidDZ2aGJiMGxrSjB2TjUxeTINCnRwRnlLang3cHhBMnNTYm5pcGFpaFMyWVRldGZQYW85QkVVVmtXQ1prYVhRc0NSaGZ6OFZLK0gxVjdCNw0KdndLVDdFR2tVdjh0OGpEcllpbDNNRHFqb2JjdUFla0hKUTR5N0NnTDBsYXVVbkxnNnFCditnSnRkc2dmDQp6WmVzR2NoSmlnQkdhQnFPbGsrOU91OE1Gc29yZkFja2tPcTUxeS9pWUpGM3VDMXhEYjl5RFNJZTRkbW0NCkZibHNtbnlacC9va2tBYzBxRFQwVE01MUdVMHM1OWVjMUlncHh4dXFVaWZEZVc4NG5kME84YyswS0x3WQ0KREZQb2VxajZnWUNTQ0Z5ZmkxVHFjM0pJVUtpUm4vbnBuMnFRMmI0TG1jK3ZzSDlOb2d4a0g3RmZnOTVZDQpVMEpJQmFuY2Vxem9SSWhTMzlqbXlKT0ZLVVRkbVJtcGFNTmFnU3FITldoWW9xNE1uVXRmdkFiRFlqbmQNClhSYy83bVgvTFpEeGJ1SlhKWHF5YWxFVzhmNklmT01DSUpzT3dKRjZ6WkU3cEZxK2VPT05kbXBYUDgzYw0KSzZ6VmJJcjdrVXV2WWxJTFQ0OXlhcW9vM1Z1K3RwUU5rTkNFYUJuSUhMMlBodTI3dXFKNWh2ZVg3c0xvDQpQRVFnamIveUg2bHRqZ1hHemEwdy9nR3c5OTlXUDN1TDJ2bmw0RXBwKy9CdFlVM3hPOVZQdllNUzl6QkMNCjN3OUJWbUpnN1R2Y1hNTTBudEdxeW9oTUlSdU9XaVpBNVJhbjVNbVd6L1hpWkxTY2xvU3JDRWxRQzdwdQ0KYTgyMmloVE1kVW1GVDc0WU1nTHlZTnk4MXJPVFJxaFNjS2p6S1hGWHp1QndKNzFiQ2F2YjFYZWx2UW9EDQpiWXB1d1FWWlhBZ0ZsRGxJVmk5MWc3bWNKTGhxNXl1a1pEQXBqRTdkT3hnd2dSSFVPbS8vc3RSY0VzYjINCmtUS2t0YWU5djg2akJUbk5RMHNsYUpYNTRSTi9hYXFwTDA3ekVHNndmUkpOY1NmUktnL1VUZkkzOFR3OA0KbTRDSjU1a2hpRHc2OWFkRlZkMWRTL3V6UXZQYm1iTHlOa3hSem9wZ3JZR3ByY1VYUzdWZllHUmdNcm80DQpJS0o5Q21md3p5YkREWm5DWTRkVXhZV2pEcHcxZHF6bVBDVEY3S2J1QzFwVDlvaGF2R0xKaW54NkFRaGMNCm5aekgreXYzanVaaTZWY3hwa1lidUlLVElPRTBFZ3ZSZmRLK2RyK1FSZGtnUG1iMHlvSzlXUXB5dm1XZQ0KVFJkSUE3S1psdW80d05yTVVOem0vVWIwbndvSWM0UjBQM3BpTVR1cVlsa0xRUDNZVWhCWE1DRCtxVGJKDQpLcmkvY2tTY29XTDFjQVl0dU1GWCtYWURsQmRxVEdGSkQyNEdtamgyaGx2U3JTUXo3R2FjUS9TVVBSbTkNCkxjbmVEbWhKRTVhM1lGUXE1bzNVQ1ltWURvSm9NR2FENkVIbVFrMldzaGN6ZkRBTWVUMUp0d1RCTVo0bQ0KaVA2WkpnY3N1Uld5OFVwS1o3N3hpeXdxM1M5T3NDSkttMEdnK01odmVVSFI1S21oclphVk9YNlhhckY5DQorVFdRdjJtQVpiaDV0WWxwdU5sS2FxRXRXNEsrNUZSZzJoaEZqQ1U3ZjdSRW1FU1cray9yd1h3cCtVQkENCm1VRGFCWU5oN2FjbnpIMnAwLzFvTWE2ZXRmSnJpVlkvYk4xNDZYM0t1b3FMV0lGdTl3dFVwamI5VzlmUA0Kb285NjAwYVRvSWlOOVl1WURDRnlPVDlzZmNVUDN0V2lDVTNHMHFFc25OWUFLY2VpeWUrZHhYcEs1Z0UwDQozZ1NoTG9VTUFnTFJpYiszL1JXZ3dncEh3SFlUOGJ2Yi9tNC9QVlBwejZIa0EyNTF0c2E0ak5JSlhFc0INCjZuMHlTNlNBL0JnQnpJQVFsMGsxMDFab00xYWVHS0VxU1VTa2VPWlNGdFp3YzRxQzhqUC9DbVZLVmFTdA0KbGV2NHVmREhPZlBDcTVCV0NEUTNpVDBoY3dhdWR3MDFFTFBiM0pIeFkxZVc1NStBaVlCc2h5SXZLNTEzDQpJdy9MUUkrRktKdlBJNnRUZXR1Z212YUJmeUFhWlp4cVpROENtTy94aEhxRVZ2ZTRueTNnTGRucGI2MUQNCm9qTFhWR2E2ZnhicWc2dmk2Rjd3SkxCenRyN1BubCtLdk52ei96UzBKU2FhbVV0UFFMMitCUHQ5Q01mTg0KMmgzb2cvTnVEMy94ZUpkTVR0M0hhN2NrMVhmTUdRQ1N4Uk80SUp3dEtzK3dKWlFsQVlkeTRxejJuRU8yDQpuZldGVVkreXZyT2J6UU1VelNtUlVEejBpajdVL0NpTXRXK0Vlbit1dVBnYnFtQ3I4SUFmcTYvYmF6bWkNCmlkUmhSSXhQbXZucGJ2a3AzaDV3Vm44THdmdWRuejAzZVorNUQ2S2p6cEF1em53SzdqR1dZdGY0RTRCUw0KZHdHMmVqa0daQWdJcDZCcjRROGR4MG01dkFnMVd6aUhETHdZQW9DTXB1Wm5YS2VoVjVHVElTNDM4YWtmDQowekFhRFloZHFHaW9vcFdGQXBHYnhJU1FqM0p2djRQcTJHdmJ4UFRsdTJoNTNKSHpyRFJpM3l0RThXc3kNCm5nODFjK2pmeDlxZ0FQaGUxa1Y0b2JKYjNTZnhhWTJ3aXVHYWVzcWZROG9aVC91dU5abFdxRysyWFErQQ0KWm01UUs4aVF2K0N0ejRkUHBVZ2MySzVpemd0cE5xVTI3c0x4U2R0Uy9ycnRycVF1N0xiMkptcjJaQmVzDQpaOGl3SzdqTXJaVk41aFBsc1UwMDRlbmlhYzFnVVpxUDhlTGwrN1J2M0FPRFE5RGNjeERnMVg4WGRiZ3gNCmxhWEZLR1BDRno5RnZrREQvR3VsV2Z1Q0JBeXNXZlBGZ21kSFRid3JXWnNTdSsyUGs1TW50UTlvdEFmeg0KWnpRM1RBUnpGSlVPQXJYamV1WWIxdC9zYitNa2lTZGJrOWpwaUU2REV3YUpkcndhOXo3S0xjTVFGM05IDQpsOE1iaHNPRTl3V3kxUldxYUpmSEw0cFZqZmMrMnpWSjVnTlRxMThVMFZnbEVmS2JMRlZvVmZyRnFaZW0NCmk5T0JjWlU2QVp3ekc1WVNpbGkvV2pYYkNuQ0Flc1Rac0lSb2ZlZVFaSjRWVE0rblludGN3TTRNOWtyLw0KL0lQczMyYjBsM25DakNKSmdkUlhLVThPVVBHNW8vN3pOQndWdFY5c3c4b0NmMWJVTFRWTTlvMHAvYllmDQpXY1dmN3dFa29pRnVuWkpEYXpYNEdGbXhFdzlOdUFKbGZNbUlxT05EaEdLZ2RXbEkzV3JaMWZsb1M2em8NCmtjQ29hNys5OHN4N1NYZ1BNZ1ZzNUpScFBZRzRFQnB2Qjk4QzBHSCs4cVg5NkEzWnd2NHk1TlZxWS9Hcw0KaTNQQll1OEkzdm9XNnFXMWRzb3pQVEV2M2xnWnZlOTdRQ28vYnFBYWhhQ0tLOEpzSGtsajc3YnQ4d2ZiDQpsVTF5WU5vdWlmRS9mdG5mT1dtUmhFVVV2MzhrUndteXd5NmxKb1JPbmF0UllUNlRiUkk0aWlOTGxpdEkNClQwQWxDb0wvWWJUV0UvS2h3RllwYmNpZUhWTHF5eEx6Rlh1djQ0ZXpPQ05oWTJmbG9SSnRGRmdlajlMcA0KcUJjcGNyYktZb2ZnbkdzT1FSY2tmOTJ3SjVqZkV4NWxpQWcybUxmZjVyN3l0aGZsS2NrR1QxTDAweU1jDQpjM3JzRTIrK2lvcFZrN2s4Mit2SlUwRm04RzJXWVJYOGFuVHNtcnYzdjhsYlJ3TVhFaW5TQ2FNdEkvVzcNCm10ZE93L1J0Q2lIdXNHTkRRWW11b2Uvemt3MUxoVHlOSXU2ZlBNVVRDSWRMRVBKc2NSQlRldHBVOEMxRQ0Ka3pIL3hwenh5b3Y4MDRHRkJORjFET05qOXhQSzdCaUYvNm1yTFpmVjhzR3VkOGkyU1JzUHFkcDJraWM1DQpoR3dOOWt0MWIzZFM4WVNJemNtNVhCSjRNSEM1Q2cwTmhBNWgyWFV6QTlOTEN0Mkk2SVZMckdXbkdqMUYNClBDRHVKSHlHd09tb1ZQVXlsa0Mydm9UVjFraXozYXRGelRyZUUzTUxXbDhnQS8wZUJKbXZjN1lCWDNGcw0KbGpnQm01cE5PK3Y2c25Fb2dEYWVOS0xkaTdlbVNsSitpSG1rakIzdUhyTThadmEvUDFsWVhlMXdIbmxpDQpSOHJuVjEwSVN6N3lTVDh6K1VoblNiNEdqT3ZGTUd5MUppU2dYQ2hhYnAwY0phQkg4SktGVk9uTGkxWkoNCmVqdTJHVytTMUJmaHJoc3JqMzZuQ1JTbVlscUFBU0pRRWtFYlBZRVB6d3dlUUlDSHdPMXNyV24xYStZdw0KQk5xZ1kwRG1xTnoxUU91WjdBemZ4OERhUDJwakRYV3pMOWc3bS96OHFCOHFrN1IyRlI0dksweTBQZGJzDQpQTFJjNmFGdU13U3pJaGhQRlJSZkdFT3d1Smhnd0NzWUptSllGYm9HYWJjbytCM3RkR1ZpMnVQVC9YTHoNCjIrRGRDSjh0NThETXJIc0haTjY1TVJIRzEvZjk3ZEJHUDBnVXpGSmdLTDIvR2hKbEQ0WEtzY1hGVmZjTw0KbDNzQzV1dHFabDdiL2VyVkwzV2tGMTVmUnp3T3VhbXJsdHo3NlNnTE1JZExVZEZLV0tIcElOUm1tSUtjDQo4Z1ZNY3M2WGdVVmtxN2o1TnlXUDZrakFlUEFHU0V4d3VvcldXWjFCSHJPY2Q1elJ5cXBkZEpsa2dYcHQNClN5NlNZQzlnZFM3cVFqL2hNUWM4MHR6d3QxWGcrQjlPb25ROGZ4VXBOM3E2b0JHZHpLbGo0blRGRk15dw0KTGFZR3ZrVTN5YVNJOVkyLzJQRURtMzNEY2xWWUVyNVhueElMQnRrOG5ZUTZPbkExN3NTNjJIOXFtYTNrDQoyaEJKU1FGc0pBa0VhS3BYbnpqMUdIQ1JIMkxWM3pTV1FvbzJDbWRNZ1A4QWVIazdCNWNGZVI4Vk5DVkwNCnhiZUhaMml5ak0vM09GSUVBanN4N1ljQXpEK2Q4TXIvakwvd0twUXlWR0hDOTdkNEJWUisrRDhoT2kzVA0KMGFJQU1Rd25BTERHS1cyM0JDNjdhNlQxak9CaUE5TVBDenFzNXRRTEIvMnpHeUhReXc3cGNDdWozVzhiDQo5NkdPS2hQQVJmT09VYVc1aEZuQ1hwa1NqcTNSMlA2cEFLdEpkaDhINzFPM2NxRXJxaG0zdXFpUVl0RUoNCkRTYjA1VnN6Z0dVUlJFSGhncnZQU0xJbDBhNVpsUmNseTRUTGVIZGdBL0xyZTFFNlZpN2dDVHA0c1Bjaw0KQ2t2eHFucTB0YUZDWVRhSUNZVEJvcmFuckZ4cGltQWw4TU90dWJhYWloYjdpQUVBeHBMd3FWTi9DOG45DQpCeGN2RWk3NzZkb25qVDAreC9XWU1rdHpDZXAxUGhzanZiTXZPcWs3K2tHc3RLRnQzaG15ZkEvbWVROVYNCmhIdFV5bTJjNndXQU92YjduZHhTUkthV0RBRzgySTBVQ2FxbTRwQjJ5Sk4zTnNJV2o3QzlvNXdybXY3bQ0KcURLVEIvbXVRTS9wMkRwWThkRm5vSHhKbS9sSzNaT1RocTcrU1M0YWlTOWF0R2dHWlFRVG5LaDRqamQvDQpocEJ1LzVRb3l5M1JCckF4NDdBdzlaZmZ4UUw2NkxDb1M0NWdxSVl1KzdtNkVVcHF3MXpRaCtiL2dLZmINCnkyZ3EwLzF0ZFU4dnJZRElLSzBsa2MzSGdVZE40Zzk5SytqU2F6U3U0Wk4zYXVUYlpHT250dlFDTWhkMA0KQi96L0NyVE85NDBZalNjSEhudHQ1NEErcTZDMUN6Vkc5U2c4eFNudkFVV1g2cUJWUW5LWkd4cmMvbWdtDQpCNUd5aUNyaFZHRU02bVRZcjhtbjYrWG5jQm5pZXVmTFBudGN3SWZjWTZ5K00xbUZUMStaS3Q0WXZaRG8NCmlkZ0RiZkhXYnVSMEVwNUVCRVlpcFl0Z2N3VU45VEZkM3RyeEZ4dXFxNCtYY0JmaGxKb3VUUWFjVk9iYQ0KT2JtME5aMUhadHcydWFaYzluSmtobXdwNUE2THJyRTcrZDhlR2ZkZDAxWWJwWTZHRitKZm40TWliTjduDQpPak5WLzkzWE1WRmdSYkNCbXBFRVdxRXBBbXpzY0IrbXhrNmkwVGkzVkltS2srdGN6UDVucitqOGVxVjUNCkhPd21CY25UYnVNQkRtYkdKcXVJNmIyblBwclhtTm9pWnJrbjJTNkFOc2F0Y0NnTzBjVm13dU1MSU1rUg0KeWh6Z21IS0JmWlhBOE93M25WZ3BqSUlDcVhndXFYRmpMb3VkNVRob1ozMkdmUHovaFRXeEFueUpsRFl2DQpRQVNGSE55U2lJbTVlVjRRbkhnV1pOcHNpMno4S0ZENW5SaDY0SHMvQlA2cTNzZHV3ZTlMTDRCOVZETCsNCjBmcGdWKzM2dTB4UkVvNEQ3ampEQXphc2tsQ3B2d2NFRjUrMVpqMFFIQjBNVkMzV2c4WCtUYWpybGNQTQ0KdU13NFRMbTFFVm92OTd2eXVYQml3YkF4WEtmWG9PSm5VRWE4UXNFNytBOXo1OGVOd0pvK21zQXRwS2RODQpSM3JpREFEZlhQTnN2bEZoaDJSKzZzWkhGQTdQanR4b2h1VTBHQUtCOEYwR3E1K3FxZ0xPTHNkYXhSQTYNCmFSWGhRYjFxVGVnZDBiL1p2ZVJLWlhQbDJzak5tRXlNQmdTNmFJTmprTTNpZ3hKYytYSmV4Q2tWWVFaaQ0Ka2xsTlBFeDBmNUV4VGUzalpMY2k4US94M0ZaY1FxOFp2ZHNlOUVMN2g2VTFpSkloME9tdVp1cVZwRjJrDQpUK0RlLzV0UElCTUFlQlU0Qk5uUEZBUlRDMWhCT2oxWmNQb0NOcHdQa0xoUU5lRG1qNU1nbFhkbHdhYW0NCmI4T05GRGg0SWpJYnhPU0JFVWprbXpUczhTSTRRcTA4VEhkakZPR0ptSzNTSElFUGo5Uk1TdlB6cWphUQ0KSG42ekp0T3h5aXV6TSsxMGttR1o2NDdNRTBkaFpjM3RNZEZFUVFpb0R2Z1FROCtrY3d2ZzQ2UHZUTFRNDQpjTTh6cXMrWVdSSWhvaGdMYW9EMGVTbXU3ZXViZDBUZE14ZWNsSGgvdU1jOFE4SGFCVjdYVDNnNTBubHENCjNJSlMxUDFoNlFPZm56bENtWnVyZXJnQXFWcnN5RzBoMFR2VnNkUWl6S3ltcDFiNHN4aU1lVnhKOXY3bA0KVEpGTlh4MUhhYTE2N001UWFXSm90ellpUkdZTFlaMFhLdlpUUFJSeU5PdUo4eStGNitPM21jVzh2RlBEDQpzZDY2dkk3V0xlQUxJdE9pSERrSXVxWWRHeFBObFVLanI2STV3NklwZThVTUE2VTc0TE03TkUzUmY0WXUNCnBzSFV2V3JzcEZOdkpaVjA5cVZWVkw5Mkl2bCtES1pIYVByWTBuMERpa2srL25FZkxwanlicHVlUzhMSQ0KTjNZYW1FV0pkQWJUQW1JWHZPNGxxc1VNaGhLMlR6bTlzRGF0ZGFSQzRvNDlpanJpNFFZQ1UxYVIzaTZ3DQplQjZUd0RqNURURVo4RGxXakZodllKNlF3QkNqZE5Jay9NUXZjTXd3TERXWHN2dzIvMDhRNW1XWSt0NmUNCnNpMHhuZXlBdXlqZDNwMGh2aVV2MmJMWlJRVXd6VXhta3VoUldXZCt5TUl2dHlwbjE3VFRDbkJlc3oyMQ0KZWNTMm91WW5aMXRIMm9nUUgyOTg2MVFObjRIQmxFNlVNNWtLc1lDbmtpRTV5MkYyZE9HekJiZ2NlOHhYDQpub0VLditlSkx2K1VoZVVoUlM0TlAyaUdzcW9vS3hobzJGSGZYemF6S0hnUDVnYXJoUEJmVndXLzNwM1kNCllRbkwvUUtuejkwTk5vekgwYzkxVlkyOWd0ejJFK21iR2pwTmdIVGlsTEtqV3ExdHEvQmFxTmRhRitzUA0KU1V5KzhxRXR6TTBzdHBkUU9qUXJBazg5cXpjcEliTGNWMHZYdHljR3NGUkhDOEZ4NVJ1dlVtbktGL0h6DQp6MGQ0a3lHVHZrUTh4MEZTYjQxMTVVeUhPNmpucWRnWW16amZNZ0Q1Tmh5dm43QnZBZGNhdUFFdXQrdXUNCmRHQUZaMVc2TFRubFpIeGhWcHlDWlZhQms1SmRxUTVvTExRd2ZiT1FnbGpwU2M1TFVMYTE2aDE4VEFDYg0KWmNadHFwYXBMemttZFo3SGoxb3ZWaVd6dzN6QkJQcThDd0V1YWtIRlgrWXE2Si9Tb2dETk1ERWNUM0NLDQo2ZHNmZkpaV3AvY0dzZEZBVUdvUmI4THVqZnJsVGFiWEFybjRQcjUzSzdXbDZ0MEhwUWIzZGU4Y0c4RnoNCnRQV1g0bW5jRnJFMWl0L1FmcUkzYUhqK2g0SnEzYzRYbWwvUnRMYVhzS3NWU3gzUG5UTDFhU3B4SDU4Zg0Kb1RhMkxsK0t0QkNiSndCRmpNSUp5Qkw3MGJDMmV6RkZCb0N0NE5LMXpialphYVpqYmg2SFBxZzhLRUx6DQpveW9YY0JVSnhseGhSZmswSHFISE53eDNVQkFUbFc0RTFnd2xyb1RrNEs1V0pDeDh1UkZKaXRuN1FJVjcNCnpyZGdvVS9KaERYdnd1RElMa0JHOHBxM3FtcDRIQ3MxUkd5UDEvSlpZL3I4azR4d0VETG5qTVErazZobg0KZ0psRDNEcEtRamNZQytkTWlSK2wvSjlTbFA1K1BNRDBvbUQ1QWx6V015RWpheEdyM1ZnZzc2M3lJSTdVDQpSMWFnK0dYMTZPZk80Q004YllwL0xhYkJvYjNoV2x5M0gvSDltYkt1VTVPN2d2am5zVitMMHBWdTkxQzINCkNKVUsyYmRCRkNqeWhKWkVzczArakhCTG5MYzN6Y3RjM2dJc05WSEtjcmpGUnh1L0hxRU1UMjdGc0gyVw0KdFdhcU54Mk1uVDRqeWRkYThNZ1Z6OUpUNFcvMmtJN1A5d1RIY0d5NjNYZHpCVG5mN0FPUFNFeGI5eG4vDQplRjZhdFJ0RGR6NXErNjdGNGRobUxIcU9BdWhPQ0YrajlFVXNzanlwbzZpTVJFWW1XL2NwYjNVdkphZzcNClRKQllJL3lqTFI3cDlVcVdWa0pXQ0RoREV1ZWw1QWE4NTdOekdNTVRuaEQ3NnpvU1FWWVZodnM4RDJxeg0KS0hPYmpERjgyTXkxV2prTzJzL3ZlNkd3YXZ4SEpEYkt4ekpsY2IyWllpUXQ0SjIraDdLamQ3NHpyaHV4DQo0UVI1dmIrN0YvbHFsY3N0a3V5YlNEQmFhVTMwd1hjeitEamd3cC81RFlOeThrVGJTREdLaXRxRmliRmcNCkZRYVZySHhNMDUxdnlZRm8yQ1BKU1dYR1FvZGlQT2c2eUpJSDZ6SjAyTHRWN2ZUZWM4YjBRZE5QakU4Mg0KRWZuTm1zUHZxT2RqcW42YzBPWlBtcmRsaWsvSEp5Z3VrYUJPajEyc0luNjNLWEZXb1lnc0M5NGx3MkN3DQp5YjdEQmxLNFg0Y3g0SmRxUTFSQUhGSUg0TDdUWkhRRFZWUDRuWkNNckRQb2RXRGNHN0F5Rzg4bVFZWXENClRIck1oRGcyOGtSWjJOd0FWbzRtZ0dnQVRzSkJTVGJYZG1DTXBxc3B3NFNDWnJpaWdPaVpBYUFzVTkwQQ0KczBWWk9OKzVXeTIyMmkyc1pFY1RXanF3NHVJWlZNSGVCZXE3Q1RlK1V4ZVBUWjFwbjJ6UFh2c3ZCREhPDQp0Z2QrbVFwTmVLL2dXWUVVOWNYVmViU1dKSXNqOEREQ0Yzc1JlMzFtRURRWjFmcXhvUU9ScFJ4ejhacFANClJnWGl1c1Z6T3I0WmJQV2R4MlVqK0p1cXYrZmlqbitEUWk0R1VBVmYwSS83SEZHMXBSOThRTjVYVnlJbA0KMVhFQ0NvNHE5dWh6RGh0VVhpNFBFU215b0ZWaXhLL0VjSlYwZGMyTEVEMFNRVFVRaFk0a2lvWXBZRENlDQpHc2tvOTFvMnppRnEramFMWEhCRWl0bWFhU05LZE9iT1VTajJheWsrTVExY0dwU0pyQ3pYSHZUMVFmd2QNCm1PR2xXTFlWZ2NNbSsyZGhhYUpPc3RtSUZFWTBVYXpXbFIrUy8vUDNoaTFUYlB2dnFCbGdaSitRUkhNRg0KWDhjNVlrbVdRNkxiUndFbXNxSWE0cG5vVjY4YWNqWEE4N3J6Ujk5T25uYzcyVmJBV2FLcDJoS1JZN245DQpraHFOQ0lJcEwyNUZJVityMzNzeUlHdHpXZm16VWdhZGtWUWt0dTVzVUE2dXlmZ0IyN3hWMzg0ZlNtajMNCkZGQlRydU9ENG56WFBhem0yV3I1U0RmTk0xaDh0cE5XWGx1Y3BOd1poN1FYZytOWkJqQVV6TFRjUGxEaQ0KQXBTME5PTGVkVE9pZmlib1Voc3lma2QvV2ZiZFZkV1lzZW03bitsT1ZjbXdrV1cyZFdsWTVnb3F0SXk0DQpEL2QyNEo1cXRuMkYzbHJaaWVKaS9RQ3FEaE5rbHMvWi9sYkEwOUJyem5abHVsNHlaa1M1QkluTkF4RmoNCkduTEFnRHRJRjFqejNBeWpmVHZ1TVNJenZaVjdRWnlYT1huQlU5U01MS0NFQWlFTHUvTWNmRW5JZXpwZw0Kdm9sRnQ3Qm9VODBzRFVicENTNzFyTlhQMEVMSExyV0lVV1Y4K3k2TEpkb21rQzRIWVA4YlNma004c1YrDQpqWUxKZENTdWVma0hHb2RtM3J2Q3ErTW9vc0x4KzFhdEUyWEJPV2pDM1UrWTNobHpyQWV6QjVta215SXANCnhTSlpLTDR4R0c3Q2d1T2puTzdpTFB6UlRnK2dhZS9kaGRQdHZnckFBMlNGNC9aMFQzQjNZWTN6UTdTQg0KVkpINXFyZ0VPNnh5MWFwRC9qandZQjdMd2NjTi85ZTJpQjhBOE95YlNqTmQweENBT255SDBvbm1nVkdDDQpIU1UzOWgvL1hrWGV5THVxYVJ6VTFBYU8weU1hRXkvSk5rUFB2cHNKMnFPK3VsdnpaVWlzOXFwSGFWLy8NCmlXRDU3bE0rVHdwZE5SS0p0K3BrNkgvNFlLcTRTSmMwQjNTRHN1dG1BV0NwanZQcWpWK2pWbXhHV0FzSA0KdkpYdnFHTUdiL0wybFBzYzZuMjFLcFVRNEFNSWpLY0NvZUM0MDN2bzZheUwyMDhpMjJtbkdZQmNheDdoDQpycTRZTTNLekpxVHhEeEU2akRuN25jUm9Ta1h1dWprc2swWXRqOEVDMjJnbjg2ZFdCMVQ3ZkhFa2UzTHoNCjJBMm1TQXRRcG83bFQ3SUtPSmpVMjBZWU5idVBNZHlZVnljQ0hIZHBXMDl4U0R0eFN1UTFUSmplQUx5Zw0KVHlpb2ZyU0JNSHdIekhrUHpjRlNYalgycjNwMUk1VTJPeGtsOEVNNG9JNkZXZWljQ0NUdGNMZllJNjhUDQovMnpobjJvMkx4bFNnK1M5NHhzVXltU29BQndWMTRUbDRxc1RIR0k2TXpqcE44S0N2YnJBaUtDZ0ZDY0cNCkdPd201YU9zSUhFRmZWR2RudENPcG01Vmp1NUZubnhDT0tGSVhjWDFNKzZPVzRXc1FIdWJxUDNZWjIvMQ0KQzFjWlp4UmttUkJHd1p3WlJIZlc5OXNFeHB6aHhnYmtDMXhTQU1SOWt5SG1lbFlGb1hVUXpWcjZNdHJGDQpMa0V1OXpxS0VnU2g3Q3NoQnlwOWxoSG9zcHFjNkRPMUN0eW9ENlhxQXY4Q09Ob3NOMnhqcUprUERITUENCjNXV3lGZGM3S2FaSGlsVmV3cWdGWUozdXQwMVRTRTN0TUp0Yy9uZ2cvUS9wc3pTam5SZjNjN3hycXVFMw0KS2VnRzl6OGRWQ1hmVVFEWHRvMVo4SHF4T0FrTzRIWnBxbkFrWHBxRk5QTlZMdDBtRkRZMEJWNlZRTGYvDQpMbERVa1R4czRnbjNpd2R2bEQzdmRNc1NCWnFnMXhKTmIwVS94K014N2I1VTViTTV5OXY3a0RweWpqazENCjN2WUtUWGl3QmhNRXRjN0VBTnVpUDVjU1hDWDBKbUFMRHNLdHJ4WFNSSnlud2JNMDQ2eVhXdUVWM3M5Ug0KZ1JXa1A1aS9JUktsMTRTOHFCTkE2bHJVQWh4WnN2TEI1MFc0bmMzZEs5M3RHcHZ1Ykd3WllxSUZCSUNzDQo0bEJYVDZ1MDlRb1E0YlpQNmpoZnhyL3FncmhEN3ZQMGRhNk1YVVFrVlNNQkhwVmducldtdDZyTENFVFoNCjJua0dXaGtpYjdNbGNUb3NhaDJWeWRmeFU4RnVlcS83SE01Q3VVUlJoV3pJQWhvSElpdGJBMGY4Q1VaQQ0KcUZWYnVJcFBpTXh6UXB5WldJOXpvbXFCVytzTU9UZDN3T3B2QmtvQzRSMVhEMjlhaFF6cjJVeHlYTzRZDQorWHhFUlJlN3dERmpJWkxYbXJYeUdJZS9wK0k5UVdDMlYramdlY3dGbXExNmlDWklTVktwUDFQbFRJUXcNCnVDWE9BTTdwUGw0OHl0V2JpTU1hbDkwZjFDeHBHZzFxY0ZBRmw1MXJkZGtEQXF2dXZINmtGb2NQWEQ0Ug0KOHFGTWhKb2VUdE9pTXZRWTIrVmhOa0VESWF4cm5venQ0eDByOXhSN3lBZFlmSytFL2FvTlEyd0RoY1liDQoyVnd4YlBqMEZPM2o4c2lIUFA4bkRLYnlsZXhQUXFZUDluZW9ycmVxcWwzV29qV05TYzRxRVFKMCtZR3INCnFrRE0xb2RzTWpPWENWdjVvRndBOGNOeG5YQjM4MzkrZlRGdEhjQ0VmZXRadGJteWNkU28xVk9LeXZIVg0KM0ttWWljdGRPSzZ4ODNTK0FvWmtCWjZENWwrdDJrTlB0MkJCNCtxOUhwZjBoNXdnaGxoMm5ET2ZyeDkrDQoxb1hySklwc0RwQ2lBOFFha3QvSlNDOVBxdnpKY0VhV2RyMmVBRzhUeHpzNTErTUtXZWwyQmRlT3VqOTANCldYUTdFNHNERVZNdWRKUWIvM1BiMm5wcXBLWmQ1Y1FPUVJPbVFlYUtqMjFVOEt6R0lWSXI0bm82R1EveQ0KZ3B3TGFrYkZraTVOdXJEbVllc2sxS0pYMExFS3lBV2c5d2tkbDBlR01kOTdKNThEVkFta1FMQmt5M09WDQpGZmw2TlVET3dibVZOeTJIcDNDRkZRWmx2SnQrT3ltNjh5RnJMTHhrNEVTNVU2ZTRSTDhlZC82YTVoYVQNClRCYmhoRVMwZWpGbWxNUW5tMy9qMHhWSWtLeDRmTjdRSXJmZGRUYUtBWkMyWDY1c2tQa3p2QUNyZGtJdQ0KMXo3ZC9sUDV2MWltOTJUL2RjeEZ5c1cxYkJWa0ZmWmIvdGpKUU5oa1NHQ1ZkOVFveVdqV2gvRXJ5NlJWDQpXVlpQM1h4UDBUWVF0enZqZ0t3cVBKZEhYbFFZQXJzcWdNbmEwNXNmY2piN3hWVXhnWHpNK0tBd0g0UkENCi9ObjBjdUVxUFZNR2V3QlhPK21kclBIUDJIa2U0N1lDcFEyQ1JPdTY1c25QL3pjemM4Lzh3TENRU2JkVw0KVFRSNnRPS2VxR3h4VGcySHhldXN3NzZVdTA2c1Y0VFhYODl2OFFrUmNxbC94aXJaZ2g3QVVheEs2UWp3DQpjeWRWQUJzQmt4cW1VK09BUWFuc2RXUlRmcytzSUxIMGwwbnFwdWI1VGFPYnJjSFhPOVJ6eitjamVTWGgNCkMram9TMXdTN3ppb2lSdGpNcTRjdlNWLzZXNTRnS09EN3FBSFlqdm04ZUI1VDNNUUZPbUdjNU03YWlGbQ0KUmkzMUxqaVVGa1UzQmloczYvRWc1UDFjV0daZVFZQ3oyMFRkQnBLTzRQOGZ4cUtoUklzMkF6UzZvWlFTDQowRWRDdE5HTjRUS2xkWWJNTDNzMEVhNVVMK29NcUVrSE1KbW1YYjNhSFp4V1ZXWnBiOC9EL3d5WnZ2MGsNCkd1YTNsT1VJT0YxbjBpdHZ6UG41K2RIMXkyVUcxTlNQRUZwenVDaWpnRm41cTVXMGdwVThiS29icVFqdw0KckhVRDVKN04zeHFkcEYxOXQ1L1ZNa3ordjQ0TXhnbVIwb3BJd3VGRU5EOW5jWk9pWG1VNWdCM2E0YzRlDQpjU0dGL0VYUTRWeHhmems1Zy9MMVBWSWVsRlBXRWtGNDJiakRqaENQU3RTTXR6SVg1L3VTZlB6eWVwYkwNCmd5VUNySmxqeU83VGhHRUtOVDZOdmlINFNWTDV3WjB1dFBUYm9HMVh3akhPMnpxVXlaeUNqd2VnNnh0SQ0KcHJqWlFmL29pNmhYcGZpZ0l1R1hBVkMzVzducjByVlJONVhpZTNWdzBhZnpnT0ppY1BCcEY4ajVBNDM3DQpjN3RGaTdhc3RVWEk3eGtqdlNFOXBpdzlxaUl4MWU3LzBuL0V2V1MvWWRRWVJkMkNWemZKRDZhZmNHR2wNCnI5OVR3dWdzNlRTeERxME5JUnY0RHI4cWlkSXJXQTFVZEZUbnBWcEozTlpDdEZaRVNONUJTVlVCTGZkNw0KSXJVRFdIOWhaaTBJdTgvWGdGcERaa0pJL3ZpNkM5VURGMjJHZGZBd3pjMW5YUTgwZGlWdGxtaWUxODBBDQo0WXk5Tnh0TVlQM1ludVV6Q2ZCRlgyZE9oWE9IZGV1T0NjR1hGeGN3TXE2UXZaYWlyQUdnaXpNbENiTGMNCko1anYyVytDNEp3SGtyWVRjcWJpZ2NXT1JDd0RJTVV3bzJhY1N3N1RvZGpnaDZjdnhnZW9yRkZlUkdYSQ0KanBPTGI3aUJwdzBXSkNJNFNqNUFRbnk4UTRzazdvalFmU29DZVdlUktldURvYUZTTStDTVgwZkQ2b0E3DQorV3RIaFZkNDFiMTUrZmJvUWVZNjQ0RkpXSmcyWGRTYmxacWJvQ1hvc2k2NWxYeFc4Z0hvSzBIV2RBUEENClgvTFFhMFR4N2F0VllOanFjZUk2dlpXR3VkaHJnN0l5OW11UE94SDBkckdNNWs4K2N0eWlacjM3azNuMw0KK1pOeTh4Zm9RbVJ6TzVmdy9waWR0blNsWm03MHVJN3JSdGxUdkhIbXEybFlJK1g4QXcwc3BydTdTR09QDQpaYlBBbjZoVkZCTmVOMlA3RDQ2T0lEMERKZThrd1ZRbXphTmF3T1BQbzlISWEvaS9oT0FYN2xNVDlSNVcNClZ1aDlOOGpuRGZWMWo4bFJ5azQ3d2hHTVMzeXRZQTluRlFWb2xlUEhzdldNejVuSkluVXlUOUVsR0lRNA0KdWMzclBTNmJ5NzlqbTRSME9oWlNMa3BTMEhEaHBadk1NeVVmeUMwM1pmM2NHc0Fnb1JOTVhoVHltU3V4DQpCY2ZwcWVUbHJkV0wxRDhMU0J6Mi9peFUvUzZxUmhSOXUvOU9FVGtNaFN4QzdLNkVCMW1UczJlYXZQY04NCjZVTkhRTVU1SXk1Ym1jWGwrZmFGSit3RjJLSWFZbUs1TTlSbDlEd2c2RGs5Z25PK1hxbE4rVnExeEtDOQ0KSHN4dDlkdng1UFBMeFdUbTFWUE9OSndrUTBIMFd2WDFRbUlLZlBUcjNlbUpyNW9rb1R0Y1RWc3BMbFpCDQoyQ1FzRzVqaDNKL2htSUtjV3JMS1JJQTVoQjRCNmVrbUF2K0pMNHV2a2YvTmdsbG1GTjdtUTdsOWFLcVENCmwrOFJPcU5NRlRNbTMvRjJxM3BJT2tWVFlRYVo5ckNIR3l6cUpvVUVJRWkwZWdsVUxlZThTaTM2KzFUdg0KR1pzM1RmVDdwN0dNMDNPT0NrOU5yOG5sUjNrWXNoZTA0NHdkMXZWdk5zRVJKckNIbTNVOUtGZ0FZNzRtDQpVMkZWcTRVYldWR3h6bmdvd3JidFBMVFBxSDV6MmJiZlhtSHJYa3lXbGdZVitBMmh1SVAzQ1J6L0llY0YNClR5RTlmeWN0YzlKOU93MWVSZUhoQXQ4ZXFvS1ZRNmNlRFpIRTBGVm5LTmZZRTJhVTRWV1psaWtKTXNvNA0Kc3hHUmIwMUdiam9WM1dvTWl1UzgyTjE1YWkvU0N6WSs5aC9iRUpLemdxZ2RFRmw3NDN5Yk9KVFBJbEVHDQpBVHZMRFp3UFhhbmxRVXlzNU5GWXdzWC96QWs3OEJzQnFNYnlqNXIycW5ieFlXalZyTExCbFhzU0ZhaVENCmU4Z01SczNGdlNxVDA0TmV0bnZhejcvakhmbXdYNXM3NXFSZ2laOU53L2MrU0orRDZTNHI1UkdtZndDNg0KTGw2bjQvZzJZRUFkYlVQUXdQSzNuK0RqQTRMSzNpakNKVXV5VmplSk1jWHlkTmRQeitoWWVJWktiY1ZHDQp4QStwRGdwSUZhZXdsS21pZ1krTFplOE03QmJmWTRtNFplOXhFa2hpNkkwVnNubEpyTDlPeVF5Vmw0VmUNCkU5MzFKV1R4YnRTcVZtWFA0RHFqUUgvd0RGYlp3cUtQYnNGK2lMR3dJcVo1V3FMSTdGcTQ1S3htdkJJaA0KdnRhZHl6ditKblA0ZVJSNStIdVMyT0JydWNJOU5wQjV1STEvZEQ3UlNYQjlFUzlUTmtteGFkcHlYM1dBDQprVVBHNUlYTFQ0c05JMXY4OXVvV2N3TDFMTEVFRDJ5OUxxM1h4VTVjWS9KcjVCcHRZNGdsaklhRWRURTYNCnNaZTF4N3FLTWRpTndHZVR2UmhrakJWVGFjSkE5ZWFFQ0xqME84SHU4cFhDWUFDdnBnTElFYmxDL0NQeg0KRnR3ZzVwQU5yUkNYdUUrVnZvNUx0WDBBR3pFS3U2MHR0eGMxdktXSURZa3Q2Snh6a25PamxTaEJyNHpkDQpSRWJreVNzTlVvZlhya1hnUHQvWjJONzZFUTQxOHF1RU5QTnh6STBieUUxV3VHWjRBeXIwcE92MXhDcE0NCldSN0k2elJnVEQ0Y3dhNEduZitTUWpaaC9mMUw2ZjhpR0JKc3VMSWhSVDNsMU5sMTRSVExZWmcxdjh3TA0KTVNZTVVjY3ViNWduWVlFZWp4NzFpa1hqMU43K1BmdWEzYXEvUlR1WWNUelNlNUpjdlc1TmVlZVRNd0NsDQp3TWpFQlVGOUVGakpIMm9JUS92VC9tVHZvK3Y5MEhWdS9PdE5ObWllMmFqcldsRkhaSzRoUHU1RVVaN3INCkgwVVpObXloNFRNeStMa0VnaTIxMEx0dWVVVXcycXAzWnAxaElqdUordnNGdHZKZCtqRFlVYURrK3pQRw0KbFJVRkdoaDg3VlV2eEpTNG8rcXlUbE1JRDVkd0RFc29BWUMwT1RMeGw2RDFMN2laODBRKzVPODNVcVRCDQpIREowNG1KaW42MHBhSjJoQ1h2dmEwa2VPN3dLN1MvMlN4aHhhaVJKbHA3T0JwRHltQklsUFNyNXV2RmkNCkQvNVA3OXVJQ1RIbWhHdkZTT3llK3kweEY1V21LVVZBOExEZFZ4eDhZUHd6S0V0YXByaVZHVjUxN0RTcA0KL050MFdTWC9rU1p6SEI5Tms5aUxiYjhLU3VQWElVTnhCK0I2djRuc0YyVXlueDhRRVBVa2hVMWk4WE8yDQpTbS9VRmxTekxPZFR6b2ZTM0lIM1VxSkljYmU0Vkdtc2RXeVlvUVBBalUwNU55dTdQUjRIS0RvcFBIUmUNCmdjQ0VDVkJWaVdZMWhvZmd4aHdKRmw2TGQyNlpkcUZoc1F3dXUrcFlHcWdVNVVqUDM0bTZHNFBuTTdMaA0KZEkzOUs0ZlVCcHBMbm1abWQzTks3azFVVkJyRndvdzBsdXJWdHY5b2x2aGNTZUdmM0o4T1NUd0dsK3VDDQpJRVJQWFZSSVpqQTlTb0JIbVRsOEdWOGFXU0xyUjhuYnUrYUNPdVRWZ0pTalFaMytOaE0wR0ppbjZBdGkNCjRqL3ZHK0lnclVYVG9qS0RmTHR2K2g0bFZaN3k5SEtvaVlydUluUVd0SU56djBaWXZYaG1xM2ErdFlwRw0KdHdtMS9aK1BhV0hHUDRCZ1ZFNmFjY0s0MXRmaFBvYjUwSnYxNHZQWFQxZUM1bDhVWXNnVVQ2TlhPdWxIDQo5WDN0cHVwblN1ZE5kbnVRRWtRSTlMam1JMlhRbWVNTVFRa2tNbFdZN2JqOGZUVks3eXVFeDVKYVhIdysNCkJHMm1Ed3NKUmpXMEFkOFVLR3pBMTBQemMzYm9NRGZUUlpDVXZtQ1hvTVNQMzNLYlJWUUZwNWQ1ajh2Zw0KbkpHM1BqcCtOQVE2SU9GSndCODFqdjdaRjJ4aUVTOTF2SytEU1hvV2lMQ2xrNjExSDB5WlVJdjdiNk1RDQpnZzdzL0djZ1Qwa0RVTXZPTWdEdUQ1c1lFcCs3OTlwWU9MaDZ0VkZNQ0EzbnEyWWJwd21WU2pMdWcrUzcNClZ4ZWo1c1QyOUc1MW5RVXdDdTdlYnFtN3RZa0Z2RVZOOW0yYnRQN21oSEFHcUUxbHQwaC9RcmgxQitpRQ0KMWphN2xYdEhvTzdJb1ZwQmRTWHc3RjZiSGNaWEF2QVJTTXVab3VnTkVzZDdpZGZEUHRLeUU3em0ySzRoDQozQ3ZPMXRURHA5MUUyQWVJb2c2Y3ppWFN2cHl5MkE2Wk54TlZScU43QkVZb3I5ZllRUmEzMEtWZk9SRXQNCnhoQjdGRjkzL0x6dFVBcExvNHN1NTIzRGdvdS93UkRiQzkxeWg5ckJVMGJMRGxLMW5odVlSU1QxaG01ZA0KcGpSUmpJR0dmUTRNZ1FYYmpRL21kYURnNmVkRjZFNlMxd0p3Rk5oMXo3Uk9Dd25naGFjbHVlMmsrUi9oDQpXQ2ZSelFGTjA5VHM0TlcyRDBPNklnZzlXSExubjBXWmZYb29BVDk2WTg3WGJOclhxaHhXY3B6aTNoWXcNCmRWT0N4ZjhFRnVCZGZHNFo1Uldta1hoZ1ZGZk9LMUhxZjREalhjelBjbHV2NDZLdGVEYndvdytKeGV2Rg0KQWNNRFY1ZUhyZml0TXVLNHMwNkVDbE9kRUthT0RsbUNGOVR1VFdDQ2hPRGp6YzRHa1VWTmwxc04zUmpvDQo4YkVKT0xUSUFhN2V6V0RrQ0k5ekZNQmljY1RwVVpoWWpGbTBDSWl2UTVjZkZNWVA3OGYxMlU3ZkhuVHYNCkhyd0x0bjNoN2xCaXRGU0xucHYzSnN5SVdhNGZ3cHkrZjlWcC9xeTRKSmFMN0Q2Mnc5QS9nZ2RXY01ZMA0KTWZ6QmdEbitYS0p6enRxdkV4eDFQakdEMTlHZkVSNWphQUcyU0JKWUl4ank2V1hzcDZrRU4xSDA3RkFoDQo5U2N5Sjh6NDI0cGo5SkZPTGVVVmQ5RXc0b0w4SkFWQVN3dG91cFVOdnJiUkFTV21QMFAxT242TzZwUFgNCllQWnVRb0hINlIvdkU5MmZwVUk0MTBIQXhwVG1TcTFydGw5UmdMaDc5L2kzdkxIbmhMMlZPeWZ5S3gyRg0KeFhCSmVVOTJJSW9ZekNLbG9GRURzbVR1VzJTOXluUzJtcVRHMUQrbGpTd1JJNnViRTE5VmVoalFnQ1UzDQorcDd1SklIeUZQNStpYjdmSk9kNUVWdVJWN2hGS2pjS2Z0cStjQ2FxWVlPMWFtNVJnMEcvNnFGZzlKUk0NCktFYUR3UmljNGVmNE5DSVkxRFUvR2dxY1lnL2RzSFpzUUV0SHQrU3ZCcVJHL2g5TGRPSUpnQVhmcGN4bA0KWTJxbnZIRU5OOHFFWFVvOXZTUVRGSUVWeE5oVE9EblQzMzRGY2U0eUJTMzllTW9DMUhTTTdjaGc1MjZoDQpVRHBkcUEwcjB6SkhPc25wanFFQmhvUGVTdlRPRHQ4eUY4VWY4TGpjNWVjYk40NExrbmRSdU90LzVuUzYNCnBBUXNWN0ppL2huRGh1Q1FKaDBFek9FMGZyS0prTyt2SzZuaCsrRTdobGZRY1ltT2tVa3dYbFE5cFd1QQ0KRDdpLytUSFk2K2JIcFhpNytkY2tpaU44b0daekI2czBBUW8rMXhYY0RMR1RlV1NFVG5wZ0RGQWlUakMyDQp6QVdqeHFZRldoaWtKY3o5OXRjUXMvMFE3U0dKb3RibWEzMjVJOGFkQmRHNktlbkVoS0daZm1PelZxaEoNCm5BejZTMXlnQ1U4citKUjN1RVFRSDR6aWZGWkNxUHhneHZabzBGaElkb3oyVTNJTlN1NzVnNDZKSTVXVQ0KKzhiaGZYM0VxSUhwNGhUc3ltdENINnBLQTZ3YUpOZjdPWUEzTENOSDF4eGhuSUw3WkdwT3ZGMDlQUFNyDQpCZXVsM3JSQXhBQUZ3ZDNRTkpuQk9EcytIaExaeHI2WnZTSkNnODl6S2tTNVFoc0l0bmlnZThnalJqbkENCjVWSXppOE1Ecy9YbHI3WGkxZG9lU0tYeS9hZTdFbVpqMjNTYUhWNkRObFk0UGF0blZkdFI3bWdKbnBnUQ0KaWcyNXRqTHdrczcvbTBRaFBoT29XTGxOZHZPOUlYUVByTnpIYWtHNEVFQjdoZS9pMGt1aHVLYkZzUERiDQpZaXZjSGZuMm1XekRwbFM3WS9XOS9Fc2dCWHZGVHhJTVBqMXpxQjh0V29hOERqNW1xVHZHMXpaUVY3K1oNCmZGdnR2d3B3LzJybnNSUGR6MmZaTGl2ekpRdWNwcWduNTBQVXFCYnh3b09SL0Z3Smlya0piSW45MUxWZQ0KbmRMclpoSGx3S2QvZElHRjFWZkVaRTRPYVRiOWFVajdycTB1V0JER3h0M05kYitDWlRvaE41bTI2SWtQDQp6OG1hK3g2blN1U3oveVdHTlM2M3k2SG5yaFJLL3UzV25xWmJ0cDdxc09ORGFBc05zWW5HWTZodHV4WWENCkdwaEMzVzh0VlFQeGRCdFRqbzJKaGlwamVrbjNiQTJjbXppU0xzNXVkOUFaV0pDZXFBUFAycFZ4Y2Jqbg0Kc1dsYnZyVXRPdXVQMXk5RiswczlGS2Frd1NuSE9EeXhLVDIwczhJSmd6MDFneXN0MEx6ZElZQzQzQlJqDQpjaVJpT3pIVkM1blZ4dUI5UmQ5Y1RkY1lUTFBLbHg5NGVGK2kyU2FkSy96a1Y1Wlg0SXljNGlTNjByVmgNCkRIV2ttb3BRbnRjZXNLNkphS1ovS2w0ZnVEN00xaVlnU21PeklKQnoxMEpJQ0wxZExRMmZuVGtSbWRJMQ0KTm15bnBBMHdIa1YrMmEwTXk2a3hxMXcyZ0FzQzBOQUZLZlYyc3p6N04wRG4rYmpnSHZ2ZnY1RUsxTERrDQpOdEhHS0ZrMXpPUTFrd09hTDY5RUVqV0NXeWVDU0EvNFpzQ2hMdFE5dVBBeS85b0VTNU8zekx4MnoyYXkNCkV0b082dTBKOTI5cUFHVkdHNXAvTmVicTE5dm0vUUEwQlhZaENNcWQvQVluM2QzL3Jya1lEc0FWTGh3dw0KMU5HZE9pOGI4NXZYSHQ0Z1BaSkhoQmlpTm5XV0plVkNFNHBHL2YwWnpWM3dYZFcxWVowYVI5TWtsQTFUDQpKOWFqS3JxdVVTZEcxTHhzS243Q1VZaXpZaTlrYlpPYUEwL200aVhReTdvcW9jSlZFM21ONVgwaW1XUVQNCm5ZU3kvN1drY1FGMmZHTkhpNXllRU5mT1I0TmRnNlh1Y3RyMitCWmw5NzZ1a0tqRTJXYUN4aGdHdjdEZA0KVnBjTFVEV3FPU1Y1WDVyN01vRkJkbk4zeExaQ2hXemJDYUgzZzVyNWUwNkJObFVrL2VJUEdRUC83TGRHDQpjdGt3ek5BSEYrVlpOelFYL015bkxSNWQrenNic0NiNkVFaHBsZTEyU3BuYzg3VEZiWEJPL0M3SUZ3eHYNCnRNbHNPVkRpWW9INkR2MjcxZ2pWMjNkK1kyVEpRWG5GNFMxcCtuWG9CdlhUaS8wQ1FaYU5UYnB5cW5JRQ0KanVyNU5SWE9ubFV0d2hrVHozSS8zNjJReVh5ZzVmZHB5TjU2dThvK1hNS3NORHV3WTI1MFAzajJMOHJnDQpnTFdIRFFGbC9LY2Q0MmgvcEY5ZnJidnVVd0JMUk1tT284MmNRaXV1QUJhd093dlQ1R0hGY1JDNVE2ZlMNClJkeFhrdmE4cnhEMHJCNEU0emZSQU1obUFPTXFid01nVDhQaWdZUHpyMjZqaGhVejVCWWFxRFRtUG5ibA0Kd09uOWRPc3NHZjh4MG13TG43VXJQMUV1RTNrZElSRGkzNlE4aHNmOUhBV1cvcTRuM0cxSDRaUkh2VGNWDQpoZjltNDNVZG52eExuUGlrN3QyeEwxRVoyQVdyREtTbU9NR0hHRUVobDhxYkx1NHlUamdicVVIOENFUGENCm82NmlmWmI3RU9RQ3FCVnlGd05wd0NqMHNvemZPYzlRQk1qeFd6eGQ5KzVUdVRGczVVSklTOUQyTHNYeg0KaDhGaHc2TnduNlNia0RzUFZucGV4dldHYXRqc2VURjZxbjcwMWRldDBuTmsxdks3SzF6cjc5TElKaUFWDQpHUTFKNWRPc3hETHNKR2hDdzREZVRkQnFKQWpqbm00RG91MHRKcTdpWi9TcnFNeC92d3czaXdodi8zT3YNCnhaOHVucWIrQTk0Q2p5UEhkaE5OVkMyK2RzbWhnU2RqYUprTFBnMityNnhFTXpCNjdidG1ESnRxNnliMQ0KRFh3M1EyRnFueXlWaUtLVDhid1pJNjUzTmllRVJ2SVhOVWYwR1U2NWZnZkpCUEMvVUpMRmVXUTNzVjJ4DQpFU0h6TkpWKzFtYUFCSEhUTE1nMmRoNzh6aVlGVjM0cUE5SHNOS0dpdHdkeDZOQVU4ZGpoRDlHeERCaXUNCkFMWHhPTm1MOU1DblhiNmlxZ3VaUG9hT3VLaytDdlp2VS9USVRsaitvZFhuZDdZQmRyTWU3U3NueXJ6QQ0KN3BnbkZIb2drZzdSU1NVMmpCRGtqUVlaam9CU1NHN3dpWEYveGQwMU02Y1JvbnJGVWhMOS9semZjWC9nDQo5SFhFWWdYenVUeHNxQnhNMEVyZkM0MzczUnVPUDJCK3UxY21tWU1PaDNMY2d3c2NNdXZQcDl1T0VKQnMNCklHL0hDaGIwNCtuajJsRHlsYURjR09XUWNnTFpwSkhCb2tzaFU4WXpNaU5vTlNza2dONDVEQTRYTEIzdA0KcnZidW83OFN6SjVQVW1CRE4rdGRZRlgvNDNiREFXdzRTNGtZandtcy8yNkwzakR0MmdnZW5PejUyK3ZxDQpyM2J5V0pJSk1kWW9sMDE1ei9jNmFLRnhOMFRqK1NUcjU3ZXYxSUZyTFgvQy9XV2dTb1dJTGZoKzY1Q3UNCkpTWnRxeU5VekdqOXBFQnoyUjZ0b3VSbkFja0UrYUNZYkl4V21pWlU3bmtGckNjb1c5YndqQ2dsbVhDZQ0KOFRlNkcrU2xFcnR1TEFRdmxaWWVsYlFPVGJObU9uT0Y4RkZrLzBtbzV1WjVoNU5QeW10S2dlMU4rNHAyDQpuTDRYV0h6OFRIOUtGS1BlQWNDUFVpWjc4RUtDVlN6Tnh1REZmR0h6UzJhOFNkb1hudHNZckg5ckhOMW4NCjlJL0ZyQ0JweU45V3pWMEVHRlljMThLWXR5NHRHN0N5V2NtcFBZMTlUeXpnV2kxTWJoVGZkejJNUkRlZA0KejNkWS8wbVROUUt0d0pubGZleFAyZzFxYWFtYXRZSlNTZ2dlY08yUWNYemV3TnB3dGlhdUU0cVZXSHEyDQoxUys2ajhUTUhLSFpGOWVPVUpmTmpvRE9VOFdoNjJwMFV5bm1ZSnIrY1hxbW45RVhCM0EzOFNoLzN2dysNCnNOa0I3NzB6SWFTcitkZ1ArNEdhazRKTVpPaVJ2MDRpWmJUeEtUaE96SFJEUDNRSWFpK1BqQ2hWZ3h1TQ0KMVZWU2dmb1dxbnhXT2xXWXloQ1ZaT2ZhVC9KT0VJNDNMYWdFelpnN1ZFbnBaMHQ5eDlIT1BoRktNK3ozDQpqelNYRTZkaEMvYW5QaGpEeGRJS1I3d0FZb3lUN2lPUTBaV2R1b2h4d0QwL01jOVN0ZWhmbjdQNUZleGoNCk5oUXNCd1ZteUZnM3Y0ZDZYdVg1Z282NnIxRVgxdzlFZDdMSmRIWTMrcUJMYkcwTDhDSTl2Rnl4OEJEQQ0Kb250Ly9BKzY0V3dFME5CbnRDR3IyZzZCTTROSFNmTFRRMUZJUk54Vk1PMkVsL0pyNmhtU0lRZ0NSbU5JDQpDdnRnTG5SaUpZd21uRFVLSUl3YkhBSDQ5ZDRJcEU2TUFESy9FdG5xRFRWdXUyZGVyQlRDS09ZV21mdkUNCnVmNFJjeUdSUTVSRjVnc3A2YXBmaG5uRXo0L2dycDR4U05SNFVoZENpOXFzSnhhZzY2bzluZnZtaWxrRQ0KV1ZlQ1Y0MGkzR0IxaCtkSTZUb2p2YTFOK3lFaXhUeE02d1NTQmdSMTdYMEpyY3hXb2loM0V0UXZvRTFCDQo3WXR4M1dtRnhCTDFGQm5WNCtIb1ptNUtZQnJLZlNPU3lUV2tJK054VUVaZkRiYnVWdXFvOEpNTWxOK0sNClJsR0tWV3ArTE9zQ0djV3VpcDl3cUdqOTY3b0FIRTBiYWZ6VWZaRVV0aWRHTHJXcmlSYlBFNWhKVUdENg0KMlB6dWx6cWw0aFZweHAxVXVlMHlDeUQxYytINnFiTEFFTDc1TUh0OW1BcklaWCtVdkd1L3E2eElHdnlXDQo0aVhrTGZCb2VUWmJrOHc1SUIzV2pvdHR5MVRYMmkxWkEyNjBHUUpxb3Q3RmVYWWRieDJITWVLVUMzaS8NCm5PSE54dS8zMnpOeTdBUVBqdlNmeXE0Mnl2UlFJRmRBRGF3SVRTMkJNcTBMcmVhOUNlN3ZoOWNhckJnNQ0KeXJ4R3BNRTZZamcwYnZXbkprMzRMZUNzczZiaVNVeEJuZ0FnM05zZTdXMzM3RW1va3BHUXlyOWFIVEN6DQo5cENpL2FNSkk5RHlzenpJcmxBTkoyaUQ2Y1liRU1XMUhlckZCWjlRcFVXNG1rREVjTk5KNGRDOGd5WDINCkdXVWplS0hnTWxEU2VKbEJXV1ZqVVh3UnRrdFNKcU9wU2V4WXp6T2JkMktTblNFYUNPUDJnZ2owZk1GZw0KUU8zN1ZjalhPenZqcU9ZMWJkMVNSZWZyS1JwZWl3VW40NEdlL1hWL1oyOFlXZ2tUOGFpWkRrbGEvUXlsDQpqd214N1FLQTZvTXJkdDZ2Mm1PMVdhT25GcUdJc2FzTlFydEhCMzZsYWdnTlhJdHBMYzdBNzllMURvRHYNCnhPRnl4SFNBamFVMCtNMEpKWE9WUWRxUlVWbDhCV2dCeDNVUVZyUjN0YkRKVzkzQmlKR3lLMTVyRVVybw0KLzA4QXlRdDgrUUozeGxJUmRsbmZGWjMySlcyV2FOZlhybjZLNkZTeWplTTM2TlpnQU5Cbjk0WFJvRmtZDQp0M3dQT3Vod3pJbURJOUlpYllvdGczaFhsdGRienJCNXlxRU1iWnpvNlZ0aENBY0U0d1JOQ2laUGdnblcNCjVveWZNUWxaN1RPV1FkajFEYlc3RmVlcnFmbVdIZHgyZW5xUHNqRWNwTDZnOC90blRRNDl6Mk1nVTYvSw0KZHZqM1JMeDRneXFuUnBnMmtJQTdMQndra2picEIwQ3NwWmFrL0lrQ0g1aHIyd1hOVS9DLzJIV1hOSnRnDQpRV2phZlFHODN2VUlsci9kSDlYYUtQWEdUMGRWZW5YdjR3ZG9pcFpxUTFienMzamtoOHdvRFRlTXlDOGYNCk5kRE9zVkpaMW8zbEUxUzJkcVhlSENjTGNhMURhMVR5bElISHk1b0tnUXBUQ1pDd2R4Nm8yNE5Vc3cvVg0KOUFIRlRWTEVaZGx4MFhZVFVrZy96cGhxMmNTRmR3ZkxyVzVZdXNNdEZHbHJSdzZOdCt5Zk82QW1OY1BMDQpKait5UDd0clFhcXBOZmZmWUJHZWdTaFNOMGk0K1d6LzU2Y2V1UmFJdkwrbERsMlFZa0RmN2pHZFJOYUENCmtYalgyUHVJanNaRVBDeFdUNlUzNnF3QnZUQkgzQmwvT3VtYitVbWtvZzdqTUZ6NUM1SFQ4cWVKYU5SYQ0KZTZZanBRdjBtL0lVQnZ1MmNTOWxBODZqVjMrd0c1U1hGNjhHK2VTRlNBeXY5MCtBVUJaOGRrUmZRN2ZBDQpiSnJQQ3dBQ3RIb1RSVDVzbVltclZFakZzR29taXhUckxOeFp2dU5vSzZPMmR5bzRMQ0RYVms1TVpQRXYNCjFId0psSEJ2c29VaVd3RjZrdDZtRkFCUjRodU1rOTY3d1Vsc0JVRTdvSkcxN2NxM1lSTkp6ZmdsYmxzTA0KZXV2SmV1aDBOWHRXYlFjMVJzQnlaYUpTdUNpcjJwK0dBTVhrMTN2QTNyOE9MYjVBRmpuS05TenViSDdNDQpmbDZVSFcySlZwYWp6RVowMHBnZ0lEY3NUNFQxWmc3M1RsRkFyb0lGckpVYW5NcE81Y1hqL0RjMjRMdDQNClZ2M1dXMk9FQ1dKVW9vU1VqZ0xXMWgyL0tiVUtXQWRwNnpjemk1bGhkUnFFdnZKUnYveThHQ0tSZ0x0bQ0KUXI1Wmd1QW13SGxWWHNCMHRoMHNXemN1emJSSU82Ly83czdiYy9nckZ6YXZ2N2FranRTanQ1emFmeUpPDQpRS2NrTHdlazJESEZublJ4TWs4bkNrTUFQRUdtQlZEb3JtTFk5OGlSMnZnU0xFUHhUK1JzNEFUSjFPVC8NCnppNkdMd2VCRnk0eFhLcG1uYkh1RGx1b3Rlc2JGS2NJMWg3aUw2NnVha0dXdVBoOHpqOENCK2UvVlgyWg0KTk1xNHREQjQ3WlJ2cnI5SlgwN3N4eDZMSHNIYWFBcTdSVFA0OEdrZEU0VUppckRKWkNGd1JKUlIvMTN5DQowbEl2ZzBZSlprRjBnUWxYRHJKczgrell1a1pBMUxMVFRuWkFGZWFZU2Z4dElGVXNrREtwYStjZ2ZxN1cNCmQrQlluZjBFMUFBdVB1VFZzTmU2SzEwd0wwWGNOZTdZZGNEdzVnSDUxMzNXdGVWbGN4QVhnSng5QklUUg0KaTRoUjloeEhHMW1RSi96bmE4SXlSSEladFZubTdyS3JxYmxtc205YlZPQmVHUmRVUGNBVERrNklKMldGDQpsM3FOYXBiSDZ5M2VwMDc2TzVCejBiSmpyWFNoZzJwQUlmcm43VVF0cWg2eHlsaUxWdFNjRmJRWks3SjQNClByZ1hKRTJneVVoMWNoVjB4SWVoTHB0ekFzWkUvNFlSNHE5MW4xWldpT1U2aXNSK1RnNnozNzZXTUhJQQ0KNGNQb0NoVUdQSHFTUXU3RFlTbkt5akpwbEJMRmx3VnNOUVhZUzJHQmw1MmRSeXp1cnhCU3daZTlSNUFjDQpNaE9pTEEzdEFqQ1ZrZDk3cTdIZCtXck1NM0tMTTdDZ09sSVF2U2ExU09vbGNDcDliS3FzNVZNRkVpQmwNCnNKTjQ3cEpra2pDeUY5dkxMQXQvR08rQlNVSXpjRWQzRUZUNytOU1V5dHZXeUdnc0tNMEQ3MGZCQllIZg0KRnFLRDB6R3dkVk5kaEgybE5odjIvZXNJeEc2WnpUdXl1MW1TSEVLN1JjbWp3dUx4dFRBYldzQ3hndHI5DQpnWWx2K25CQTcyUjVtVXFJTUwwRVlmTERqWnZMTkFMbkVMNkFJdTNsN21uYllhQzJUWFNpZndVQzhLUWkNCkZZaFpRSmpZd1IrTkdoNDh0eDJkV05GbEk0U04rcmtocm9mMjJOaXMwL3FFSlpXV0tUQ3VxZ1g3TkZjUA0KR242K01RTWVhYk5MY3M1MDlKZEkvdzh4dCtNMlgvMkE4SEtETFZWU2N5RWdrdW14Z1BVbXF3SmhnOThJDQpNN2FlcWJtUXNjUjcvbEFvdHlXc3liTmdPU1Q5dzZZdnhQVG1nOVlkNmYrWVdJaVRiTTV6VTZSSkxROXINCm5qVW1vQnJnaGo1aHJNeHFrb05lV0hjYlNPbFNoQUswdkpET3hjaTFzK1NzSktRaEVhYXlmaUVuOG5MSw0KNE9lclVYWHFoRVdyRE5PRHhETmlGVFBXdlZjOTB2V0dONnZEK1NXbnFRRDhCT2tNcDRJSkk4bkFZT2JqDQpTRmplOXd0Um15ZjhtSjRobHZodmJwdEFUeUFkenVUNXAyS05yYUd0WGY4ekJaSzVHeThLMnJwQmMrOUkNClN3RGZwUkdtWURZNG5mbGxsb2VqY0h4K0pVY2tjWnFaeWt1MC9vdVB0MUdQamdzYW05TXBtN05LT0lyUA0KUlBmeXRWQW5mcXlRcnRlNDZnTER5ZDFLdnhjTE0yV3RFckZqS2xvWlBSaVMwTFN2UThWZmpkOXFldDU4DQpWaVdzZUc3YnZ4TFRVMWJHM0dTQXA2V215Mmk0ZFdlVWJFSGVJbWFCQi9kRUtSc2RxeHJodjNoSmZUblANClcrcHJROXBUVkc4bVFyS3NRM25kSFR0elFSTHBsRjZacHpCajk1ZDQrYnJTeG5NSHNwQkk0ODNsOVFQaA0KaTg3d2plZ0V0VzEranNkNHhmclBobHYzc1NrL0ZqcnErMlE3RVZBSm1SdGNKcHRvSlp3emNYS2Voa2VrDQpaSTFuRi9OZ0Q0eGlYa2dkYjhmWkxTd2Q5TFMxWGMrTVp5cllYMHBLNFBhNlpkdk5oS2lPdkhKbGp3Q3kNCkZKZE8wcWkzczByQjhtTlFDV2VoSCtBRmZkeWVQSlNLNytwanAyd2VzS3o5YXNlWkRvTEpQcGpoeDZqMg0KcjRBeFFTVUxIRDNVbDRuaXFJQzdiSlcwQ0VFSk9qVXRtOE1QOGIraXkvZXJ5Y21nRUNPdmc5VXNZUFJiDQpZWnovdm1vWXdFUkJQYnNpR3BtL0hDWWRsT0dmYTFraEVBOWo1NTRmV1lHTHlNOUYyZ2UxLzdRSDg0ZGUNCnIzYzNGQkxzajhZZCtiRmhUbXFmTnNrZlZJTjUrcmloOWdZMmdneUFzUWV5aEhqUk9kRGNaNjNBTUMvbg0KM2tSUG5pdDV3YU0vSlZJR0ViYThJdkV5VUwzWUpVUCtMV0c4RHcvQ1NJdDlUTXFJSC9CU1dOTVVtblBZDQpyUzJLRmhnUm5KMVBTU1RWTXA3MmNIaGdHWXVxcmorZzhobnBaYyszbkpuRVNDd0pGTUljZWN1WkZYbEQNCkh4TGtTbXdzMTdqUDRmUHM1T1RIS0pKclptYm8wNWJIcXVyb2pTUXNPZEVjYWUvMXJTSDRjQ2hCTDMrMQ0KYXlqdlZoSXMxWmRXcXFLMkxMUXVRVFhEU3RPZFNPcStVSnV6OWNNMDkxcnB6ZVNwTVFIRkJEUlFuT3hzDQphcmNTZ2RQOGhGSWhwbGVhVDJhejJ3MUl2Uk14VWVEelhoVERTUnhtVlFodzVHQUV3b3ZkRDFNMC9uZVUNCkNqUThBcFFuYk5EQkJuZHl0WStwRExZV0lWdVgyYllEOWRjeStneDFuY21KOWlrZDYrMXFUZG0wZG9ZRA0KODdEdmtKT0RKZUdnM0JPV0RhaWpjVmhNWXpnNVQwRkYrUTJxRmFDcmcrWFRNcmp2Z2J1VVptcWtQQzl6DQpjOU5MV1RxMjJ0K1JrL3hFbzNEWHNDSDBORnJzRk9mZmM0Z0N6MXQ2S3RURytGNlE3aldwdEloN3A3K1kNCjkybFhValdNVURPRnpvZFF0VGR2anpLcURvU0ppN1JnOVRDeFdtWE1ieWJZREF0VDh0d09qVFhLS0NjUg0KS1hmK3RTbW55T1kyempSK2twblZlWEJkdzZucEdDYTZtYlp3aVlRZGcycUhCRFFQbFY0aGpmQzZ5RWcrDQpTTXZ4a0MxYXVuQ0xrSytBRWo2TWd3dkUyMEl4VWNKRmFaeWVLRXFZYUhmTEp5T3Q3M3VsbDVPWldKd0sNCmE0bGh3OHZPZGh0VndFUDFyWkQxS3RQa1krZmsrL3h3aGJuYXRlS3Z1M1BROUw5MktHQ0lZWW5IWGxabQ0KcVBGRC9aRHNNMTZONHR0bjltT1pjc1hpK2ZmY3VXZjBlL3lrNTFGZUZFUS9PNzc2ZnBvalpqNWxybzh0DQpkYlJGV2c3U2VDb2RhVml3WDdTVjI3T0xPaFlMQnlCdG5RbDVsQXNvMERBOVpHck9Ic21scjRkRnJaOVkNClFVNzhnZklUaEpyQ1psYmdONEJYaks0M0cxL05RUDlST1BWUXcyOXgyZ1d1TUVtLzBKRkZGSnMxdWkydg0KdFpyb1ZoV1lVRXFocUFRS3cwVkxadE91NUFZbkFEZlgvbTZjdkxSb29CKy91WkVnenRKNTlkZlFvUlJWDQpNc0ZrY3o1Yi9qM1dZRjJyQjVIUjNsbzFka3M4ODZGblhhVmhQREVscTRaaHNDLysvdFhzZnM3czhZZEUNCmVOUmM1Q0FEUlZPUzhDWlh2WkZwRW1JMVZNSlg2NUhOY1JITzFadkRrOTRzWHQrQ0VQWFB4d3NIdnUvLw0KQll5dlRiUVU1WnNrSzNDL3BvNGtxVVdERXVTcXB0L2VRd01JbHNWYVA2NUx0OWpMVzkvUzI0aGVxY3BVDQpFWTNXRSt5UHplU053b0dnWFl4Wk9RQU82aUtJVm9mS09DZWx2QjcyczFRb09ETlRORHVxenhxUGliNE0NCkV4SzlSS1kzUkRpaE5wOE1aNjU2cmhFaUVqVFQ2czNxTEsxMUZ6d1lmN01qQ2tSeTg0aXp6a3Jvc2VYag0Kd3JBNlU2eFh3NHdoNlgyclc5WEJiSE5aNWtYb202ZHQwWG1jcndzQitJbndjVlhpbHVoRzJ5dk1JM2hJDQo0UnlVWlhuUXF2ZEtPZks4dVJlQ1loNmxMdDBhSDdDcW5GdU5oTkpBcFMzYmZtRmdROUhRajE1cHpBcEINCnpPajN3QUxlK25PeVB2M2FIRmJJUWtjdFF4cSt4VTBIc21UOTAxaDRiNmZKU1RpRnoyY3N2TmFYays0Vg0KVkN4bE5FbmlIenhibE8xb3JPdGlUclp6ZEQrcWZPa2tuTXQ0eEMrWWJGZ1RyWmFhVmtGVk9RMHFFc2JqDQpBT0szUGJ4LzZEUHY1RzRsbVFHNUp2c0FFckFtS3NRbTNIYnhIYSt5TzdrWCtsN0VNdkNuYmhOV0V4UmMNClFobGNQWExjb1JBeU1nb0RlbXowYzJUNU9yU1d2R1BiaUQxRlVoVC9OTWNoRTRUSGZoaHorV3pzbFAraA0KcDBQYStQV1FLV0dUR0hNdjViZldVZElCODAxR253cDI2R0tZS1FiOXF1aHcvaERuODFLRDJTcERSOTB6DQpqUEUvVFpoaVpwNDFNMTBqSWdyZ3NaN3poZGlELzl6WUVjK2c0OHg3UXI0UEFYdnY1UDVLUzJZTEsvWkINClJMK1I4MDRDYXl0Sm1hcnlQU09kMGF0OXJRMXRtck92eG96djdGa1dkaGx1cGRWb25aeVY1dUJWVnkxbg0KQ2JVUG94VzNOZ3pXTUZsUytPcFl6T3lqUFpEWWhrME5paTRrYndkUElwbmtnUVJvM0FER29uSkZTVnNhDQpna2dOeUpobndET2ZoSk5xai9sV2E4Z29UbmszVXE2RjgwMld5OWp2WXJHZEFJUkdRUW1oSzZsY2R0SkoNCnhqVE9raVd0NXB2Q2NTRlpBZ0p1NlB0OGIrV3A1WkJGcTJLODB5ZjZmelFJMU9uM2ZXcGpKb2MwZ211RA0KQUFVTDRlZEFFSjh5UXNzblptNlBQMWR5Y040eTRXUHNIL2MvRFo1MWY4K3crUGRUa2dZRm83NzBHUDdtDQpkVTM5RU9RWlNhRi9XbWR5M0hEWlZkZWpkZmVnUWlOWElBbFNLd2F6L3JNSWcxQmRWeTREQ1ZtVXEvSUgNCm5zTm9ra2lIaWRWNERiRU5xU2hvR3h4WERFSStNeEVvV0JCYXFwNCtWOEIvV253eDRBTDJHVGVZcXpZTQ0KMFBLbTFZdXRPTlNQTmI0bUlNWWVsc0JTYWtCTkFkaTMyYVc5N3JvQzBXbjlwZnBSbmdtaE1hL2xkL05BDQpMSDgwd04vaW1HSU9yQkNWVmhkclBYQzhGWlU4M3c1ZUVrV2dpKy9mVjU3M2RqSUdoR2hPLzJ3dU1IemUNCkR4K1M4Qzc0OUJVclVKM2l4dTJKQ1JCSno4WXUzQjNEYnhPYVhMbEhjRHFXUWZraDc0Z0NzanFVWkNTZA0KRGNZMVNGeHdma21kaFdiMU9CdGxrV1JWRFhLMU9JeFBodlpnZDVXL0w4QWRMUFl1NmdyQzBGQ3k3SE9IDQp0Qm5vK1R6NTNWSDNwc0g4dzZLQk5BRThPc3RoU3NGeDhBR0JWb0NQMFNBRlZxMnNScG5uQnlnT1pxR3ENCmJqUWdTRWlTVGR5UkdIMjFLWkNkcjZVWFJrdjV3ck1XUEhxbVFwK1liRWViREpyWGdvMkVCbFpsMnJqcg0KMVdaNmJLc2FnVi9kMWc4bkZvM2J2bEZCYW9WZ2Z4NloweDZvREVHaDM0TjI1UVRMV3FOOEJxMHF3NkJPDQo3QWp6a1V2dlN1RVJobTh3ZUNhNHNwVFdGVVdpR0M2a3VTamU0RWIrSFRZUmpBaU9WejJPdVBLdUZoT0ENCitvUGQxa3dxNHR5TWZhMWY3aGlpcDNFMWxyZjZNRVowclAxSEh0OVdtN1dYVWpLajhLM3lSMVQrRGkwRw0KZXpCS0IzUWw2N2hjMHNrZ0ZsUGRIZGVsNm5JeWdYLzVRUlpjM092cDhzUzgzQ2lKalNnZFBhMzJZNkRGDQpwRWs5WjdETm1ONkFGVmhXQ01jUUZYa3ZMV1pVU3BBcHJ2Rlp1VXFrdGdDMlF6ME1JSy94OFY2MGJ6cTQNCi8zYjZIUWtKRDAwcTl1ZGh2dXFsNVQyajUrL2lUbE9xZHBEVytOQUliSzVQY09YR1ZDdzNRZTRjd3ZZNQ0Kcnd4N08rYXZ3Z2N6Ry81aWQraVJTL2xueTloSFp0YlR4R0JLdGtpOUQrT3Zpb1EwMU9XQjVJTmh2TWJMDQo3dXVqcVNRYXlVWHFvc2VINDMxQ2hXQ201Y0ppVkVsV0hxcFBUWnBsQXZpTkMxTUU3clkxcC9FNEtONFMNClVDRWxPeExPamN1WUhDSUc0bGtIUUJMaHdJbm1kWDhWbktid1FKUHp0S3llYTNPamtrckUwbXViZmttMw0KRzlOTU42RUhZdjN0WTZRRGxQWjYyU3dFK1Y2SXcwUHZ4VFBQdytDR3J5S3d3MkpRMUh4NytLUkttb3N3DQpKY01HZjJEUGdJWlRGY2pETER3THBsQUpqN0I4SU5oRjZnTVoxaGUvZHlHNnVOeUlydWh1WXdJVC9CcWoNCnoybEJRZWxVb2dTdStNSTlHSmNZcnl5cEIyb1ZaS1JpOW5aajdZdVI4SW9VdHZ5V2h6YTZYYjZCQVdnbw0KR2Fia2xWSTRIVmZtQVkwV0NkUDVhTGhPQXRiUTRBYmZMY3NMclc3YXAyZHArZVRYWGsrUUY5M0lyZjNqDQpjR2paQ2xvbk1QVVdwYUdCaVRMdTZ3bjJQV05odTI5ckpTUDJ5VWZrNWhwK25QZERldkw3eS9RMVdNdG4NCmhBRmZZS0pYbjNHYXJ5cHF6REVTeGp1V1I3SVpIbU9lMEdtaWlzOGpMRHJJUDByajZzcFYyUmZ3ZVpVZQ0KMUp6QmhkbUp0SndxaEVZN2p1a0Y4MHcvQU9oS3kvUGszZEdGa2tieHZXZjBaNytrYzAzUzU4ZzViT0ZWDQo4R1NlckMyc0c0OUJlUWZiMnJKRlFmQUVWNkpqcFFMTlQrdnJYWmdLdlZ4aks5YUJtT3g4RHd6R0xhc1cNCjB6Rm85VU1pZHphUWNkSFlJQzdYVndOajRzZUwzRGZ1MVZNeHRMcWs1U2dqN250SG01c09ZaklxZ2VVMg0KWVdDQmZVU3BDQXJpNmFBWDhycXZqWFlkZUdXd3VlTUJPeDRIb2FQU1Z1a08rVGpvRVlBNEs1ZzUvWVlwDQp3ZFI5UUl2ZWg1anVpWUVtNjJ4aFhZZ0RJS0VvUTZybkRSMUVvdjErQzJQclgwa0JWSHdrY3BzRDRMRFkNCmduZHFvc2Fab2hzT0o1VmRLUWVOK29GbjkwZEd0QVZnUWpOaVhsUXJRcGpFMVZJanQ1U2hJQVd6c3lLMA0KN3JnZ2llcE4xK2FVbG1TQVVaYTlmeGRrWHUvdHFSZWV2cUZGU3JSd1g4Zjk2dUp6TGQ4cWhYb3plOHJaDQp1emJKYnBUZ3lWdDA4VE5zOStoZlRldDI1eEwvSityc21YS29oaTllcVpOUEhBMTJaOE1xMkdIRkZiYUgNCkRCMEJQSlJpQ3lJQnBzZXB2aEpacjFFRVlKZ29tSXhuVXBOMk15NXFtYk5VbmNqMFNSL0VIV3RLaFlKUA0KR0RiTnlzN1FEMnpKaFl1dEczL05ZcFVkbDlreEcvYy82TnFPN3ROTG52TWM5b09PZDRqd0h5dXdDSHlUDQoxMXBsaEpKTnlxZjlNamdBYnFQa1FJc29yWGV6WFhVRmxkU3Z5TXk1VXc3SHRhOURjaXA5YkZ5REpCUzcNCkIvSnhsdVhFSmRZbEJXanFXeUt6dHU5RTMvcGt0Mk5LSXRoWkdxVWE3MGkrMXhTV05OR09PZUxtWFN6VQ0KeCtPN1FMMWhMNzV4Y0dWenFJSVR3ZGlneUUreTZsWG85cTZDbitIdVE4NG16VWRiREM0Qlc1TUs1SUY1DQpxRDZ0UGZnemIxWmowK0M1ZUhvMllXL25KR3hNWlJwSGs5SHZ2aWlzckp3NFpBQVlLbmxkQTNSZ2V4YUINCkhqMTZJOE5qMmZmSGpyYnl2aWdkbWZrMTNFYWhxeFk3c0ZEZ0piMlZIdlJ1MmlwVm9IeE1XQkNKdUg1SQ0KcTR5dk05UGZPSks2WGMzWVRqZkNxQmdxaFRWa09XU3pyNDMxTUFhczNnY25IZEQ4UEZpVVA2VnlCTkJTDQpYTFlBSjUxc2VqTms5SlozRGJKQVRmTk4zbUZvcDFWVGlFVjlDK1NPZ3hrY2UyN1ZJMWUrbWZSRGN3bUINCnU0NXBJY0wzMER0Y1VHaWZOaS9JdGxxQUhDdFpNVHp1WHBZSHN5NDZiRGlkME1YWExNb0RrNDMxTEVDTg0KMnlYdkZ6djJNRUxmMlRyTUcvZlY0cU1iaTNrY3oreGw2blQrVFVXVFFERm1iMkwzTWNoZ0tibVFhMXFUDQpTcnRyNzJQNCtTdVdvWWJjekV5bnQ0Uy9aaTlMWGt4RUo0blNmSkhXR1hyNlJWZFVwNnlwb0lIR2x6R2cNClpEa0w1Q2pVZGNHbTJDYUk3SlZsa0ExRGE1ZlhzRjJtUzZpaWJxNXZOL3ovTDlOMjNuT1JUellMem1uaQ0KaVlXby9NSU1ObHVZOWZOMWNjUytiWkM4QitOdkF4V3RXcW5DaGg5dXUwR2ZpallNY3lMRXNQa2hZOG01DQpxYm9ndkNNZHE3SDdPOTBrVXFJaUtwRkRrVFloSWJMSko2ZmJzMFpuSjl6Z2pLeWlBUUFiTVFRdkVXemYNCm41SHFTUnRiZVhmMTFmNytnUGwzOWhFdWc0VmRTZWZVeDRIUWY0UTQ4ZHU4bytjeTZRMmRTUTFETW1GZQ0KbmNMVitEMzFsQ3VQU2czZXNRNkVVem5nTHQyN1dWZW5LWmQ1RWpQZEtoZXRsWEg3dVJkTk9CdWRrdTdRDQpZb20zQnBhdDMyaUpBRFVQNGE0TnNGSm5lLzNpNGErWEJyR3owN3FEWnhIWlJtZUswZlZtK21GWGZnSXANCjlLTHNFUEx4OWt5WHZSVzlUMVd3TlpGWXJRTEI3WE10cEd5azNFSE1UU0VId29lTjlyTVpWVGJQYWFFZQ0KUVV3dmNuWTVqTG1ud0t0ME95aWpxdDJETU4vR3VCbWpaQUxiYUozYjV1OGp4dE5iOUFhZ1hvU3VUK3IrDQpmV0lUajBkWGhNVHNqdGVEOC9Uc0FDanJWSHVjc0hIWEF3WmNscWRMS1JPQitkMjNwcXF1bUpFbWp0TUUNClVHS21sUFdIZHZCWko5a0F1RDE3bDQxZDN2ZzdFd1M4RjRYNlpNbGRqU0pRVDVXTHhDb3k0c2ZJVFRHMg0KOXBjdzVLVU1hMDNvSTdYYklncWpaWnZjRTFYL0MwM2FrQTAvTVdXcmxMTWo0TzJZMGd0aUFWeVEvdHYzDQpkSFNOUVcwQXRJeW1XZnB3bXBCclhzV0I3OG5NUHRrVkd4MzdrOXpnTU9RemtacEJseks5UUZBZ000TU0NCmZZeVliNUp5K3p2d09Cb2dwd1BCbG8rUFZVNnBQUlJnN0RBRHBwbktyMGV6eDd3TUZEajhQQlNLeWVSYg0KZlRxTkxaSFlRNEovWERKelFlcU5yOGJPOWIzN2k3b3BYME1pU2NZaTNJd1ZVbWZDeGh5ZUcrUWZ5QlMvDQpZbHJMZ3dwelA4NEVoVEhWUnl2c0NKcmc5UTFHV3FpMmRXWmp2MFBRVFhoeS9YWGlKZk1xb1dMd0xvTGUNClNwSzB1MTBzU1hyblJlRmhvNW1yWnlMVElxRXVMNnY3bWl0clo3TW5uY096NHFQY2NrM0NDd1Z0UjBGbQ0KVTc3RGlFa05DUWpvVkJnQ2xaa1lWVnNabkswSk9nYkpKUHBKSWtVVlNBZ2RKbTBEYVp6eGNYQlJvSlh0DQoyRGJpN2lMZk9ublk0aDl1OGgyR1doWnNhRi82Z0diaGU2ZTVRSTdCdERDdkUwRnFGb2U1QVAwbGo0amENCkkyZDFHRUFnZjhWSENvMWJyMUFxeFRmZUZHckEvSnZQZFV1ZldoSGpRMkt2RWM3cEN1TlZWQ3lscXhDRQ0KUGxka0ZWWUZqUXFrV3NoSmFZQitoem9zVjZKeDFMUm8zMHo3dkxjWnU5b2VOOHFXaks4cVRRZ20yS0lODQpDSko0OHJ5TE1PemJ6SERUcElPQm9IR04vcXZaSGxEUFNjZDNpY2YzTjVpMGw4YlBPbGNZT2xrWENxUmsNCjArM2xwdGs5TWVMbzdrWk41NXc5Mk1xT0tSenA4VnQ5eEJ2WnlpaXgybjFoME4wS0hQNmlPQ0hqRkFWTw0KOHByeFNPYzJNeXVIeXkrYmE5d2JVd1lwcHltOGxpNm5BaGZIN1ZWUzY2YXV2VUlLZkUvWXMwbGFtL240DQpVUHp0WjNKUkZhSzgwNDlFbjB6RDQ1UGdGMEcwckUxZGtzcThxc3ZkTXlCdGd4SVFjRjdkSTV4dGdpZnkNCjZHYzJwbWRyOXA0NG1oVURxa0RuZjE3RlhPcWJzR3FVbkxNcGZIa3VFamJtUnRIZGUyT3YwdTFYUXI4aw0KcnMxQXhpZUhEcTZ5ekd0aDJPa0VEQUlEa0VhSXNLTk9tTmxpZkZQRCt6ODBENElpakpKdkJMbmhDNTFwDQpuQnprMEJHc3UvQkErY09ISEpYTkVUTFZpdE0yM2JSeEtQZzN4UHpQdjUvT1JoVmQ0WnRKbUdWcGdZWXENCmRzME9mTnp0QXB5MVZKZWJCb3o0SFNOYUM4MVBNb01aTWJldUxJeWErTGtPZ2pNUHhKTkJYQnpOL0UrOA0KSVg4V21IaGtzUUxkblBEblpscGphM0xaTWVrdzlHVFNJbXlOLzNnZWlNd2VKbmoraUNYZ05UcWc5SU9DDQpEWmxIQ09VQkRQYkZ6SWhmMGFZWlpOYXNneXA4TUhnSnJXQktUaitVa21pNHY4cHZWcGtDSjJLQnBJUWQNCmhXUDFHZjRKN2RtV01YRHhvS0NHWk5vdzRFT203LzNvVlBOaDJHalhSRXhJT0NuSWgwc2QwcFkxYlp3cQ0KNk5xYUVRVk5LdEpZdG93T05taDRnN1IxUElpekRud1BvOVozZFlwRWlaREVVaTNhRHE0M2lWR0E0dTk5DQpFTWRUTHp6WmVNbnhFakRrRjAwWjZPdkViUGlQVldFZEpGcmdmTjdNNEdXRUh5YWZrVllHdC8zSWJlM3YNCk5Gbkc5TW1MaG1uVDdsWGVzeFYwWGdnbEUveGVUOVdYMExhMFhMYnMzcnBrVU9NeVlIc2Z1SU5Qem1tcA0KTzY0VEtrYUl5YkxIc3NPWHpENkFibXBlRDBobDQwNmFuTUh6M0trL1VKOEZPaGgxZ1BDU1dibm9ydFZUDQpUZDAyN3ZtSnB5a3VnOVVsaUp0UE1Eeng5UStTT3NTaTNMT085bEduK1p5SjViY1JNQkRQUjRpL2k1SEcNCkdsTHBRS2MwYms0ZUhWeis4ZGNVS1pnYXFkRmhZN1drbk1OZ0pRcjluZ0pabHEwRE94bTdkZHp5S0xUUA0Kd01ZblA3OTJzWXVlMzdJQVZGYWNXM29QY2w5Rm5BN2gwYmxmMER0M2hnWGgvcUs4T3lNdjN2RU9VdE43DQp6emJUSEU5M1RqaTd1V1RWRGpLdG1Ib1pjWE13N3lCbXZ4NkRJbDRReGtucS9KaDd6YVNvRFRvMzhZdHANCmRvVEtBUXdPaTJEM0c0alBLY1FZdmpZSWdJQkhLdVlFTTNMWnl4YVNCTSt3VTA4eEliMEVFUnFoalVMZg0KeUx5eE5mMXhwaTBvSlJoNW9PYm1ML1RudEpkai9ZcVBPTHlXeHRNbTF4RG1PQ0JKVzhjL0VndlFSeUd4DQpUOU9UV2NEZzAyL3JRYzFaUlhJUmprSHQ4S3JGb0VEVTluZzBsbzF6bjlZY3U0bks1d1R2RlpBZlB3RFgNClFsbkpYcmtJd2hkWHgySi9MNjB2NUtLaVArZEVhWGNheGNadXIzZFd6c1dPNGp3M1B0Y1BKSERIekRtVQ0KTXY3amJlNXJxUXBLUWZJS01SMFJHRXJENnRUVFNOcU1scjhHenkybURLL3MrTEJ2Z25kdWVEb2tpYWhqDQpXNVNGL3MwanZOZjBEbkNQWVhtSVNuVnNjekw0RzRTdExnaEpMb0wwc05ab2dXM2pmUjNnSC9INmVHVFANCngwdUVPUmtKdTRNTXk2TVhCZVNKaWdIZUNIVFg0S0dGbjlvZ3l0UjRScnc1ZEFwb1laNVFIc3RuZVpCUw0KOEs2eUtzRnVsODFWTHQyM0J2eWc0REc2WTJqWHE5VTBWd1U5RW00cDJPcWZrdzExcElUNFJlcnZwSE4zDQo4c2ZYMDk1dFNtbG1oQmpYS3VvOFV5K0Z2OWlsYVVsMStvTE5Relh6SVhkcXl3NUVJS0FZazNlQ2RhSGoNCnZFdkxtVkFjUEJod00vTHNhcmJ6Nks1YVRGTkh5SG02QmZoVXdxZXk3M2hLUnZ6N2FoZEdPT3RaenlXag0KRGNYbzBEYnBkZWd0aXRtd0U1cXV5OXJhSTdKaTYyWG5HRS9UM0YvWU5vS0c2Wi9JMzVkTStrK2pDZGZ4DQpwU2sxRTB3blVzejlhSjI1R0ZFazczb0ZnSUJYYVo0OVpqMmlCZjZrczZRQnM1SlhGd08waXAxdGk3R2ENCkhBVXp2M241NmNITTF3ckJjMmpnNlkxb1REZFlUVU1wMDgyV29oeW1nMU8vczV6anIweFV0SHJ2NktJRA0Kem9hRUNkYzdqeUlSLzBYTHdmS3RtaGo5c0M5UFJ6S3NSeXE5Y0k5L2tHNi9nakJhVTdCdnBDRnZhOTBNDQpmUmpqeW5ScG9kQnFNbXhQYVBESmtEczdRc1AzNVd0Y1FSbTdIVitxVmdKMVVPZ2N2QUJybEtSdVY0SHoNCmVYT0J4cEdzb3ZJa2dUZE50WGdXYTh3aVpJYzRGaUdvU091QTgzOXcwVk10L1o0ZkpweDV3Y2JRcE5ZMg0KZDVRNnNvUzBxOTh3d2hoV3lOZ1FDbGZBaWZBejllT0trTEVXTmhjWEJndHY2MzNrbHVpV0l3bUJmcEVzDQozV3B3Z0tjdXIwWTRBSTF5NEg5Q3BXSHpoNS9vSjZFTkJGRzBia0RjVURQMmh0MkVXRjR4ODFWQmpzcjENCk9DazRyMHFubHRkTXNsRm1zVzFVVjJJUGkxWGdtbzlHa0owdDc2NTBOV25ncjBVSlR3Smp4TnFVL1JCRA0KUU5YVDFjcEZTSHM0VjhvWnZuWGZWdU8yUU5qUHRJT3hlZGdNeTV2SDhzeW13YmZGcE1yb2NTSTN3TlFDDQpnMVo5Z0pMbnBxOTBtNS9Cb3lTbDgyL1NqSmZTdG9tM1Mrd1NEYXlJS0h6QXVkYTdZdEtYdDlPK3pYWWINCkhya2N0a3Q3Sk5QdUxlRWluQ1NNYlUvWXNrRm9jbDRuQmEvWHNqU0duck40SUxkSFZoYlBSUGpURkhOaw0KQ1ZVTUVrTnRxNmVzVW8vUkJ0eG5VRTBEeTJPRmxQaTVUbURvSkVBc3J5czNZUGxBdUlRLzBNZEMwQnJ2DQo5RXFqTFg4cUd0blBydi9kancyVGZibHNjZkNzQkhycTFESXlialNhTkVZQWtheFJIYTlnaENra1ZPMjcNCmZvZXVCL1U5RmpSMlY0TElwWXJlREovYngvcEsySmY5ZmR2Z1ZIZUR0NFpzdHorWDMwVWRMbHNSMmhiVg0KN2Qya3BwWU5CVDFlY1BjV1JHOFgvRUZsTUVURGRGR3N6RTAzSmF2Vkt4d2FUQ0orNVJVb2N3dy80Z29wDQptRUlSQjJkaU8xV1BHNUlqMngrNWYwSFBqajFJMlZxeE9xSjVTK0ZrVyt1L1BSKzhwdElOL2JoMm5uR1gNCmZ0Skk4VnJoZ0Z1RG5CaFQ2cjhESXJBaGx0TDAvaTVtVkxDYmxyN2VxWGpvUzdrd0VnSVI0SG5zSEIzdQ0KdXNGMnA5VmFHZW9IeVVOaDdHMDVkUi9rUXdBaElaZVBqWEUyRmt1RkVLbzEzcnp1cUxBeGtlMzBhdW9MDQpXWjJ6SnRtelp6dHlmc0RlOEFFclRlcE5MZUxNdXVUanRCVldrS0FVY01pemZxNEREVVFPUzVZY1BXZkUNClJIR3dtaDlJbGhGVi9Kdmhyckhrc2k1K1Fubjh4c3VjSVpQZ3FCRyswY2ZCK3NKQW9CVW56SWNHOFFPaQ0KSFBvQk14K3E4UkZSWHBOS2RrQVR5UnVXM3kzbGFvbXk5Y2wzdjJSWFJBRmNjbVFMNEIzVXNYTDd5a1RJDQpqTDZPeTFxT29EakVFcEFVVmF4RTRTd2RPTHEzcEFvbXBpSW9FcjRMaDdZOTdoQXE1U1I0YkxMRWtUOFcNClVtL1JYcFNybHVoTW9iRGdYa0ZUTXN6NUt5ZVFIQ0VDZU1pa1lHMTlEQXA1S1VBL01vNjNoYnQ4U21HeQ0KVC9UL2MyU21nK21NbXkzU2FhRmJuZGlKWWJvYVZJeDRUdXo1a0E0MHR0NnlxVkNIbm5BaVZSUkUrejJmDQprbENiVWd3bGU5TTByNEdCaklDa0ZKR0d4aG1KMmRISGJWK1JxemRTUE9wRGY4Z0QwWkJwYTdURHVwYkENCkNKOG5WSkxQYXNyR2grYWVGRkpHdnRKT1duMS9SQnBXZXNqK2U1UFlKQlhSWlFVNjRmTFNOYmkyM0QwSQ0KZjEvY3VhWXBXY2h4YzEyM0t3VVcyVUNIdDJkOUo2WHVES1pmK3ZSYkF6UndLakNueUdobHZ4djBCODYrDQplQWVDbHhOeFROMWJnaEgvSFV0OFEydUFleU5rbVFDOXpraTFqZW0wQyszY0JER0tmQkhaTHBVMWdWdWENClIvYlVCRS91NjVZTnhRUXB3T2dXNlVGTU9QSXhQakIrRzVBRm9lL0ZOOVhvZGlQcGd4ZExTTDVua1lvWQ0KUmxhd25IdW96UjBEMWJTQ1VTQVpiQnZFVzNWOWpydDBqMHdxejZXVFprZ0ZLc0hRQmtPOTRFTHZEL1NMDQpjYm1sd1pBWTF1YWRIZU9PSHpvZWs1dzMwQnRsaTJad2djUzVFQXBWU0JiNFh3eTJINEplNmc5dXIxYjYNCkJRL21ka0xmR3djTWh1Z1ZyK2RBMFU3WDREZ3FLUUE5TkdpcnJPYmF4Q2hNck0rcDRRbUxsNkVoRWFCSg0KZzBsTWdWSGZ1aGo3UHpNY1hzMEpZelhjUy9uaGUvcXhxMTFrT0haR3BRYlNKMzkzQkVSS3NVZGJpaXovDQpzREoyUVhmRlYzOTNVcHo0cVl5OUxGdVBNRWZhMEhXVldlWjI0N3RYVnFFOFNkUy9qTG1PcWhsRk0zSk0NCllaUEU3bENGenlQQUwwVXl3SzNqNk5udzFUSWpVMTVyTzA2VXZnK0t0RXdPZlBPY3lBOXdIOWk2bkxUeQ0KeXQ2K2kwcmxVMExDcTMwTWRSVmQ2K3RUSW1XUlNCZ2o3RHBlZ1hIZWV2a1AwTlB3eGJvQlJnWXgzcDNvDQpEYUs4a2FaaXMwK1RQYUNaelUyWnE4RUdHREdrK3QvNUpJaXBJK3hsWXBsVTVOWi9ZaExrQTlEUVBnTWINCnQ1clI1N0hUUUdwUlNXMUxPQ1prdUNHYXk4eUpJZHp4NXpueDIzK0lyYnBRVlB0bGF3QlFXbHBBcWRFRQ0KblMySE43bk14QjhuNTB3MVptajRoSTBIUm1qK0NQeDZPUUZ3S2dwZTlaUmFtWFZVUFVsNkx6Z2JpZDFYDQpJUWJ6R3FJTE1MY0I5ZkhqTGdNZ3VkLzlOaEF6ZGRUajJmdUpEdjdpak5nTmJabjkrd2djTDIyV24vWDANCkltb0FFRjNkOVFEODF0aXpSU05IaVNndkw5QmZkMWNYNjMwZit4WFp3V0xGWVRCM3I5UGV4ZDJKSXF5Ng0KNjBoMTNMbzZ3RFIwZTNGNExRVEpudzRvSEcydCswYXZPVzZiOG5uQzZQV1pxbFp6Y0x4VG5aTzlWSmF1DQppcW9OYjdLRWtGMnJRWExSdWROcC80NXNNUGEwWm50WUtyU24xbmtCNUJ0SlpvUldoYnBiR3ozZ3NhMGMNCk1zRkxEVDV1M1NGYm9rVHo4TkVOR3RzT1dkNUMrbURqNWsrb25PajZOQzRGdmF5bVd5bVY3bGNIMHR6VA0KczBzMXU1a3FGYmU3ZlFIdzdhUVUvTW5ORWExc1ZoWmpmaTBCSzIvVXVvVHBzblo2Z2Vyek9PSW1NeWVXDQo2aUV0WkU5NWpKdlZPREFrZlhBbjdnRGRqUXE4bTRpSE5MTlJkSU5SWWpYWXFQa3ptY0NDOStRTWVza0INCldoUXh1WDR1V05IQUx6bHhxczhYV21PNEpxbndmK2ZhR0VXV1RuR2ZLMHhlQ1NmRE9aSktXQUVQNEhrSQ0KdGhxRXRiODNwSFFrL2pFeWNiaWp2Qm00dW5sd1ZqR2NCbFVVSHhISUVMandMWU14YytnSXJ6ajNYTlJZDQpGeUpJaHhJelIwWGVOc2ZmOE94L1Voby9XVzBtU2xnS0NNakxEenZxVndXQk4zRjlISXA5TDZQT2R3bWUNCjVSRUxnM2wwenpOMGNoejNhekpSMHNrQXFmVk42eEpabGlhUDNaUGJoSU5CQkE3dzc0ZzJXdHBDZzhqTg0KQUlEcWNSSlNyVVovUXE5dHpmZ2tvNzFRU2NJbS9oQkdKamM3b1BYNWJjZEZ0N2FVY2hXOU5TZ3dhQXdXDQphRE9ROE5OQ3A2SlZRaTRUVWU4eXNnb3Q2TDNmUUxLT2Z2RkpjemhwbFNMMnQ4b3pkTEx2azZoMTNzRk0NCklZdDhpeVIzSHhNanNaMTFtVkwxOVdIeFFLN3EyZi81eFdCb09mQ2U4SzBMSkEydmJ4UkZjbmpzSEVhQQ0KUWp0SEo3R0hNUEZ5Q0hFWlJ2Qk1RUk85ZWIxK1dMNXFZN0lnYjdBZ1YzQmU2MDk1eHgvNGpoZTlpRDhVDQpnUG4zakJhTU5XbmxCY0FwcjRTZzRsaXRFN0tlbUJ3NGZIbHdwVk9hZUovMkd5enh3cCs5ZmRnMHJ3dFENCmFxZWRraE1hWGdpV1IxRmEraGdNUk9kM0NLSDNDZit0UUpZQVlXUzdTUG9ZZDA3ZXhzWTdCMUFUNDloSA0KNElvT2E0OVdBWTVERWhPZUtDNTZuVXVRVTFaOEJaVG1PbjcydmtPVWg3UG1sdHdjT1YzSDlDdGd2L3NwDQp3Ymw0M3hTY0doQ2E3VEZKK2NUK1Q3Wnc3UU91U0t2WktkOTl5QmVVa1c1R0VFenJLRGhEYVB6RnczSC8NCkE3MjU1VmxPTnVuQVFCVTkvU3c5eS9seElTTkNUdXZ4SnFjQTNBM0dxZW9ZSkhBSldJWXZJRUZ4ZzEyTA0KTWNDTzA2YndreWpqLzNoVEhCbUJVUDNRT3djM3JXTnltVmxVdU85TzNqRWZhcVVLOHBzc0VUYTlrUjdQDQpCV1IxV0lSQUMwSzFBWmsySXVXdWowdnk1ODdVelJWV0lqKzBjOURuWXNEM29uckp2MytwMmJwQUZtZXUNCmR6K1VGRHh4UFpBTWxlSUovaUlNVG14U3gwdlNQVExNTnQvdVhmM0s4R09kN3QxSHRmSldsc0lTajNiLw0KdTl6M0MxaG1yZDBOc2ZpYlo4S21yL0VVanhmMDhMaE9ZRkgwSEtYYjQwcFdobnNKU0dpZnlsQ3gvNmRpDQpQRGNmVlk2OXE4STRCcjcxaEhXbkk4UlpBZExNMGVNMUUyZzM4NFhZd3BobStkd0M4Q2VsWkMwV1RwQTYNCmhKQ01XT2VuZUdXRitCRXErbUV5QjMyWTNJc0RPOHl6Q05pVVRDYkt2S2hXQlJsdHFkc0hIQzZUZzJSMg0KVzN3MmVaWllpRzJsTnVWaVlZblZ1MkU4QVhuMkJLK2NybzdQOHltalRLSk02d3lWZU9KQWloaUFvaXVyDQpqS0l2SkFKZGFMRlJFYmVYZFcxd1RYd1ZpWTJPSHZPRFluOXB2bllSa2VreTM0UjNHUjFaN3NrV252ZEMNCk5mSE1WUVVpRy9hai9FNGg4WVdrRjlKdnpOWk5YckpxckVDaGxrQVJ1aEYxQi9JL1AyZDdCeFNHMGEzZw0KV3VqdmF2U0JJTStMMzZjbWg0cGtOUXVMeFRIdUNQUU5Fb3RZVktjcEp0WjNVYk5ESFIzc3U3UjFPRXU2DQpGblNCZHBxRDMyY2dZSWJMcGlnaVZjTlNSb2tBYnFkSXMzSy81VmtNUWRYaEphblgwNTNKMkxxYVBsNGwNClhsQXBZZkVqM1VWRW4yRVg0M0dZZEZZaWduTmpJYXplTFFPa0FjMU9abzZwUGZXUW9laU9xSHFhYjZ2Ug0KdzM0NW5YK1gvRURtVHN0ejBjdEJEajRoK0RYcnovREJ1dm11cE01b3NiVUhIQTNic1dUWVhtd3h3YmpXDQpOdnpnRWlsZWMxS3VoVUU4bjQ4YzhqeUhWcjFLZDRwWmFVQVJ2UDBFVnV1Z3hBKzRkQ3l5NlZvb0lBSzgNCjlVcHArb1I2cWxjei9sdmNhMzZIYlZGMklQbUpqSFB2Z0NObkExSlNVZ1BFbzhyT3BQaHhISVhHM1pJag0KVWM5VlRXODY2cW9YSGdUNkcxYjBxcjU3dGNIcTA1NjIwUStlVkVFeDd4UkZZZ0dEK09KTDJhMXlKZzRnDQo4T2NaWTVpZm1EM3lrV25PVWJRMXhNSFBZK1lYR1hQcFRjUUVCaUhMTk5BNGZ4amFxVWhQdkdTdFdSMmgNClFVK1E5N05NNUxrMHZRY2E0b1BDb09DL0tWTEI5aU9UQXJnQTdvQlV6OXY4amJ1L0ExTjdUZEdiZm5jYw0KUXl3djVpb201emRhMEd4SnllNGszTDJ2L1ZXZWdsOU1JbHV5Yzl2b1NGUU9wUEUyK3JFdHc4QXhUQ01ZDQpwd3g1SlpWT0JPTDVLYzE5Nk9ldUxyYkY3VVlhZHpvd3hkcitvTkNhT0F6Sk5uclRnVWdEcmxGeVFTbGoNCm8zbkJNaGo2OGE0d1krelRlN2FuV3VJVS83bEhiS2pLeHIxaUt6ZnN5R0pjRUM2WEVxT2I1NlFmcVFGSA0KT3MvUGQ3RmV6ZEtnc2NvMzJVK0liaGpGOTBLWWR6OUxndVd0c3BEUlh2bXB6TTFXTng0YmdzdEdwbVhGDQovTGJzcTZKRWNnZHQyc3AwL1o4b2hOakdrSXZzKzNScndDc2tDQ3hDNGlaZUtLdVMraXR6RktPelRKek4NCm1Vd1pQbUtFcURWNlFvUGp4eDYrNFFIYzU4SU5aRWRjVkdGSnZlYm5aQkUvMStKVWNiTml4Y0QzdFpnaw0KUlh2bEkrbXY5aSsycFByWkdmK1R0UmIrQVpCYmg2b1czcmY3VmsreUM0QlAyTkovTFpPOVFwRTdQWjJDDQpmT2VhMUtINURBTFFMcWNsM3diWGR2bllmRytSYzFYWEsxYVlob1pVRHpzNWNINmp4b1hEeDYxSG5HNzkNCjllVjRJRXJmUkF6Z3RUTWZHVEJDTVJha3FZWnJQMUNEOWNZSFNsd2luZXY4YS83aU1vZUcrU0pSU0Vvcg0KcDZYOWxNZStHRmtXUkUrbmJhOHRkOS9DNDZhWW8xYk5YWEJISnBibXI4TEMwaDVWS3ptZExxbTYvbkVwDQp5UVZJdkdsSTNnMlpVSENQTENVdi95SmZWM1ZSNXN5REdFQnBsR3RFWURESW16aUpkb3BxVWt3azFjQVMNCk5SaU44MjFXelRxY2JXODBtMDZ3VUlQUEhBOExhL21TWnZnZ25kazBocks0eFQ4d1dPUmQ0bHhwZXU1cg0KUkc5NGZiU0F5L2pwZXk3WGhWSlozL1drSkZFOWx3QzYwWTJjeUtVM01UdlBYdnJKWGhwNmhWa05MMFlkDQpncUFnMC83ckhEKzgzdUNrTFBLdms5YVFLZ1E4VWF1OExwelpRTTJlN2kvdXgxcmtQSitNWkp4V1FzWnUNCloxYnlhS29NTzY1Y00zMU9NMGdXRGpQWlErSlRkLzVicUhJQ2ZBajVRQ0QxZVV1THFFa1NCZk01L0U3eQ0KUmRvT1FNNVlMRStNd2R6d2RZV0pab3BGVVprdFdoWXM3UnA5OSsyOEpzdTdzQ3FHa3dYWXJSM0RWRnhIDQppVlhKbmdiUTEra2xuRVp1c29lZmZnUGg3Y0VUdHRFYXhYK1pGSkZ3WHRpOGRyOGxjUndRdzFtQzZRVVUNCndXblFOcFBwT1BHbmU2dHRBN0YvR2pqYkF1OWNVNDRZbEZnUVBmRStPUDhyazBJNy9DTnNmcXgrMzhsTA0Kd0pVZUlHWGJnOXpaWjhkRWRUNWhTME9LdWNtUytreXF1WWlwU2pYMzBGcm9KYWV1aWx3WnJkWUIwaXUwDQpYUFFibWlac21sN2QyQ3M4QWgwL1BJd3R0QW9sODVPNXNOcHB4a3FoN0swVHNsMENlK0ZQTDdpTVpsdncNClNiY05yd214cG5qTGUwbExUMVUxUEdLZWRvVnRkYXpRLzJHZDZoK3YxUVhjVGo4bmc4c0tCdGsxeEdhcA0KT1FreW00Z0JXK1Jnb2hHdzJ2bnR1ZmliMnRIeFFxaVo3NG1RTUVxWm8rVUFiWHlyZUdsOXY0MUZ3aHg2DQowaVFVZFd5am9ob0l6MUxyOUU3NGg2RkxYZ0hQejdvVzd3K3V1NDY0WG5XVmtIYjU1anc1R0p1UUk1WS8NCmNWRjRjc0tybkErMUQ0N0tUM2xEZVo1ekxndkF4d1paaS9vc2NIK3RwSHdWOVNzNUNNRVh1OVl5Z1hleQ0KYkxHYko5enRvODhxUlREeldSeUdWbGEwN3c1bHFsNXZOTG9uZmxjMUlnOEYvendJejhSU256ajZFUzlZDQpsNnRrN0E1N25lRkdhMWFkYVQ2TUsxNFpYMFk2NXVENWZWVnFJd0ZmSmhMRjRobWlvUGxXdkZwTGFQREMNCjE4V1lmeHlSUUQzKzN2K29XZC9uTWtFTHdBcDd5aUZrYVdwdUhiMlpPUzJkcUxuUVY5OVkzUXp4VFlMTw0KZWJ1RFJTNTNwcm5hS1JZMkJTbDhYZjVCMndYUFN1Y0UrNVBtS0hjb2lPYjFhNytNRkdETkdCc3ZrY0FpDQo0ZVJ1d1B4bFNYclBxNE51cVA5VjkrSzB3LzlqZGk5UTlkNFlPV0ZOWUVPWWN1UmZob3M2WjBNdnFzVnYNCmliQ2U4aGc5aWNJRHRPb25ua0ZqcWxqZUVOQVFmU2o5ejROMHN4bThqOXo4ckdLYjUxbncxYXhrL1NMYQ0KQkQ4cWpOZUFNakFqVDk4NzZ5ZmZDd0JNOWw5cUE0Z2ZMSSs4bkw0Rmg2bllZa0kzdG1qMFc2aGZvcWZhDQp6WkhvSjNobGU2SEdwdWhTaWgxaDBPR0VMcUQvcHBZQ2ZIUEZEaCtwNy9GQzNpdW8vOGkxWndQRTJtNkwNCjQyekdScGN2WG9hWk5CNitXNkdyVUpEaGovR2dvS21rM0ZGbnkwWVNIWi9Ubzk2SnJPNlJ2VkxpTXhwVQ0KZ0E2b0VGaEVYejNkTmZya2pGZVQwRy9TOVh5RUFKNm8relFCMzR4NWdiU0lwTGhmT2lKYVBTOUxuRlp2DQpVdXNGMTNWM3hLQ1B2U3BqRHF5OXFnQytjREQ5Q2JHUllBV0dtMHE2NGRMYXkraGJkc21sZWpWNzNLbkgNCndnSWczTFVkOXNOWnUwR1JlMlNuVmF4TEdXRmhZMGRlZThxdGxRMWl3bEJ6dWxtY0NNcGNMQ3hzR1JYeA0KSk1POEVXNHI1ckNCNGVPM0dqT0c4TzFzVE1JS05lL0ViTG52NTJjcXIrYUdzU011Ty9jenpZMkRLNzBHDQpGeDVVM1pPMmFXQ2JkQitsbEY4dkh1SGVteDlCUEFBUEx4QXhmR3pxdEFIREtHNWExQmNzaExraUZsdjYNCmlwN25BOStXVWlFVVJ4REJaN0tkUitWMGxPQXIxZm1HM3NyN1lvYm1WSnR0cEVIUTJvV1pDcit0M0dhRw0Kd0ovWVRFMjZPRFV5bzNhOWFvUUtYeUlkWUFSc2dPM0s4dnlHZ3NTMmUrajBoYkdxNXpSVmc1Y1FLMDJpDQpjeEpNNkljTEhXS2l1bkxoNE9JMjlSd2VDMElxcWdUa240aG5YWUFSWTZYUHFZYmxhdU9yeWVmTVJ3QXANClVNVEQ4OFpTNXpKZ1h6SkQ2aWUvR1h3UUNRR3Z4YlJlU3A3RWE4bnJUaWt2NzE1R3dtcDhaRXdYcG4vNg0KSUVJb01HVnNnOHoxZmJHd0lrTks2S3Nyc3pSRDNGNE1heE9iamNseVpTdUhEVUdZMFh5QUVrTjZ2QkExDQpNT2ZYVGFMU3Z2cGRYWGhObW5OVndmYUN5ckRYNmZhVVA1UzBzcDJFMDQ2eXg2NDZCd0VwQXpnZ2JQZlgNCjhqaC9Rbmx6THpZbU1KNTVFTGhyTDdOWEd6WTh4QzZ2UVZiTzgvL2pnSFRrYXdOelFCcTJWME5wc3ZZUw0KSDUrNGlNRDMzaU96RXB0REFiWHM1ZldEdytqR3pteVNHS3NOZjVmcU04dUE5RHJIUXR6MkNCVG9ESTRKDQpKT3h2dDI0Sm9MNk50WjgxK1pMWEpuVHVTM1VRa3RZQkMvcFhpcUt3dTlsK05zZEtZRStGY1U1V3pzUEwNCkVlbHBvVEdHSm9qT291cUFJOTdjWnRZNWFxTGN0WGVEVFpmZFpyM2s2SUJ5bjRCeU92eWY0czFzWmVEUw0KYUxQTk85YUM5ajZVdGVSMGExazhDWkRrc3B5RDJpb3JQNllDcURUYTdpVEdSdU9RdzMvTGVsSk1TeWl6DQpiS01vTVdwUlU4ditGVHFKcWl1TURrV0VrZGpNS1Z1R2UraElQb3Yyc0EyVTZLOG9xZUo0QmtiYkVOQmMNCjZJcXk3bEZwQ1pQZFUyZk12eDBIbVJMRmxlSE5pai9ydG4rRTBXSFBIMVU5aGZkblpmWHdaUGVOdjRjdw0KRnJCcEZlSDB1VXdhQTJxdnFKYUNBRGN2TllvYkxGQmE3Mi9TRm0ydjI2WmVQczh2Ull4a3ErbVBxTXNGDQpSVSt3RHB0VEw1OHRQWHdwaE5pL2hLNkZMd1A0UDRDVWhwTVlRZG5yY2w0ZVk0dVdZVVJSYi9PdTRxbmgNCnpsb25CaUxaNUhKdno5UEZxQmFjM0x3RHlMTGdCWjRqcXc0VFI2cmdOd25FRUV4dE9PT0x6R0pTZVZ2Rw0KMVM2bU5TUXNtY1JMaWF0RDFoUi93L2tvd1NWYU12YUtTeGZHZENGcGVtajN6NVl1U1dJMzRCOGNaL3o4DQpMTFlDNnRWOVZWYUV6MGMzRVFMWkQ4ZjRwUTRNUVhLbDFTUGw2YUFvYStWYTdSMVJZbDF2RUM2T2tBWGINClN0ZTNLTEZUNWUxRFFjdTZQWG9FeFcxVGgyRnFJbXlHZE1NbXNncktFVysveHV1ZDhOQldaVkNiQWVOMg0KZkxGcy95c3F1WjF0azBZdk0vdFhBOUN2cVJmcFR1RkZtRGtVdGV5aG83M2Zybm1kK09hd0ZqWXhLYzlYDQpFbGNlMnBiazNnVnVpbzl5QWJBSmtpaDdEMkJRSXZhMkFTbGtUZnE3cE9XSTlaT2tHTjBlUDNTdzlKRk4NCkFIUkFOM0FIendEa3VqOWJzQWJiWldYTGtLZnBJRHFjMlQwa0kyRDgyYmJYTHhUNHlzQmlqWG16TFIvNA0KVTY5NWROTjNmTUZVYUFGZitrdFNENFpvbG1OcWVqNUhORThJSFU1aURTZnk4eVM0Y1dkVEVQaFpOL3ZBDQpVMXBrTkMvOTdBcEtiek91NUZVcnR1L0pYS2ZuWnF2UlZ3Wi80Wk1GdGNFSDhnczNMR1hoYmwvbDlqNVUNCmRoTVpDbVNWa1RjSkRualJBQXZORWVYVDJNWUpqUllCTys2UWFmQ3dpckwzUUdtRUFqcysxczVvT200ZA0KMTBMcG8reEVyVEw2TEZueFg0WHFud1FzQTFzaHpDdlZpVTZOUGZtK1U1amZYZW9QOXJ0NUdENWNOcStHDQp0a1hvWmoxT0c4czZ1QTZ6WnlQVnRGOGFpYXdVQklnSkFQc2VTa1djbGJjZk1DelE5d01Nend0bklpeWUNCnljd2VCbGJWQW5mSjNkWDU4WGVLS0xVTGJnRW5ZTldmb3lic3lUa0RlVi93YXI5STJJck41SWFWRi9haA0KMUEvMnl5N1h6UEh0UzVRcnRSZDJIalFzWU1QbzFFVVlaVzZ5eTA2T2NCdE10a0V5OGtkNjg1cGZyOTNODQpBZTMwblIrMzl1R1RyMVlEdWRodEtha1g1YkNXNlJUWVZXQ1B1TlIwbzJkdWZNQUpidVBDekMvb2JhT20NCm9ETUsyalFMNmtUTWhGb3BDOWgzeHdjNHVpUlVXS2RRZkFmQ0MyV0d4YjV3bFQyTWllTCtuWjBrdlJmZw0KYnIvUUdXN0RCUzEvbjYzNndnUmRCOGp5WmU0aVR2NEJ3bUhEcStZczNJd1U0Mm1Wbk5PY1NRQXdGaEgyDQpjTVArS1BnVkFkWlhWR3gxU2JyY1AyWkZXWHdPektjNjZySDQ3MWlmdG9WNy95eFB0R2h6OEtsL1U4dUMNCk9KTWozR0QvN1pkdkNOL25JSmNsdnlPaE5ybzhZZUhhYy9sNXdJaFA2VW8xUnl6VzZoNXZDWEdWaU52aA0KNzlucmdlb0VONHJDSVA1WGFTSWZtOEhTL014MUJ0VHpTVTV0bnkzeHNiRHZjZE5EN2lsWEtnQ2ZKOHpxDQpRWDRSd3JQQUJoa1JRazZKdXNYVFRRNDhNRFRLV09KeHVWRkJXbGFwUVVkbm9UaWhiZFNCdGF3TndlbkkNClE0bzFqQks1SVh0ei8rZXY4WkF3aGpiUnVWSXR2cmNFMGFtN3hZa0tGbytDLzlpOHA1Lyt2dXcrT1ZvVA0KR1lhekhDQ3pkalpJWFRQK1htVm1JQjdHdDlxUWdpNTNqRW1kaHlwNHFvTXYrbk5UVmZqT2JnTHdXeFY2DQp5WUE1L3dwblg2UHdsVWtKOWw2NGpKVmtDVWcxVUZTcWxyRDZRNWNMYm9IN0VFMkpmQnUvdVJGNWptOEYNCk5UaWNNalJ2MXVVYU1ydHYzUFFzZEc2YnlndjNVNlZjbzVmaVRUc1BBa3dqNW5GWmFqeE5iU3UzWHphbA0KS2xyNUN0N1g2Wm96RllSdmRNbHpPTituS1VvaXErR3lBREhoMXVvUW4zQzVtQkNTNk1LaUZ6TGRLV3BVDQp2Q2lSWW9idmJVbE5DZnc0SDdQVVEveFNvUldiakZpa09LY0o1WUlMM2ZOakZuME5xNE96WisvQXdIeS8NClNCZXpjU0w5N3VzUkNhamxyK3hkWG9VVHJJRHNNbXdIYkRoVS81OHF5Qy9jSFF2czFxR1hxYW1Yc3ZieQ0KanNqTnNtL1JxN2VYU25pc1oxOHhiWXBpOC9KWm8yUUJORFVmMXdDVm1GOVcrRHVWd3BOSjlYd0psdnhHDQp1MDB1ZVZHdWF0emt0NStGQnNaRGsySnMzRnpadkdpSkhuSmNjYUdERnVwcGl4d25XUm9oL0ZjMS9DNW4NCktMbkRUTnNjTkFCL29aRFN2ejFLQm9lL0hoY1ZTR2dHeFByZlJXaGxvaDZiYzRtRFF4K1NTMXpkTnZIYQ0KWTdyVllsc1lNYXNFb0lXQWdYbUE3SjZBN3hQeGhaRmNhd0dPZGlqNlpualFNUnR1Tjd6dm1JSEJFQm9jDQppZFU4VXp1alEyekVXQWpXS0psWi91KzJWVkp1UnVSK1p0UGUxVXpENlhTUmt4UUl1WDBZSkdYeDRPSU8NCk9pSUZ0emszMWgzZWZvc09FcmlBS2dFWWFXK1l5ZHJUSzdIVEhkQjN6VENiVUFia0NEV3pYZDhYTnIvTQ0KZ1c5a2ZKWlhELzJUQldTYm01UjZxbURpSHlQSHdwL1F5cVlibDlqSnRTR09UMktpOVh2QjluV0RHaVlyDQowQ0daNkh5REk3WWVmMXY4VmhwYm53RFNNakhSMEtYclo2QmxCbXVCNi9KaUFBNm1rSlNrbWRLeW9rSi8NCnJvWlVmM2NmY1dqdytQZFZQcjdoWEViMEhXV3h2QjRUU09zYTJhdXdMUCtuOEN6bmdIdkQyb0c0VGxsbw0KL0ROTmJ1ZnZnc3Y4K3dBMklvNE1yb0xCODN0bHJ0Ly9QOUhoLzNUUlBKeUVrcmYvUXRFb1VyT29qb1hlDQpEaVNMYXZnNENsQ3czc1FaMU5vVExCUUlUZzY2UU9hZTJsZGZHZHF2U29JaisrdnByd25oaWV6cjhXS1MNCndqU2ZHVnI4UW1MaWh6WEk3aENBeEZMRXNjWjVQV09lUjh5Z21qMzRkb2oyazJWWTNMNUlXeGNVMFRrUg0Ka3VvWXp3U0F0Wmhsb0Z1dEdNdEpLQVdpNTBCT1M4SFFoVkZZbVl5NXhLaXd1VHJqeEZWY0tRSnRGUERJDQphSlVHek4rT1U3K20yVFlWa2tFbXRRdmdKb1hpQ3o1d1ZwNVJWZzFQdlZKNkJGZzBxL01SQzBOWGN1S0cNCmFlZW9QNFFnZldWd0REME9uUGJxRGUrZzVUZW5qcFpuQzQ4N3FaUmVXa1M0RkxtWDAwQjNIbUg2azFEdg0KNVdQeUp5cGtURmpUcjUxN0tEWng2RGdNMVNyNHVRRllUWUpPdEpHMXQwVXlMbkN6ZTE3NmNYdU1tM0EvDQptT3FNdFJaaWVNTmc3SHcvaVpsZmtYcUk4NzdBWGRKakFYWXV2bEVBVnZmOEdHRk0xUVBia0c0TXhsOEkNCmhWQ2F4aGViMUJ0eGx0U3lLZE95OXFlR2RXQWh1K2MwVWJMcHhSb3pGS1dEa0RzcFZ2S1NGMS9YZC9UZw0KQW9Ram52cXY5VWFOQ3VmOU50WG5zMFRQRDNJZ2ZQVitlbFF2TC9zNWE5YzZRbldYcThiZ21DUlNqS2tmDQpPVk1HeEVXQVY5dzlMYWFnb2pwZVFsL2xMNlovTTlseWdndVB4ekhsc3piN3VoSTJnNnQ4UGpGQjRXTU4NCnpNNis4QWc0aWN1Q1hnSVZaYzVXMUNTamtKL0VCbXdGSGdGSXdJdUp4MW5pN0EwMmlOLzRQSXZ4NFY2dg0KRThxVm1tNWVxL0F3U0NXNHZuSEI2THpaZEI5UURocWFudFBGeUlwQU0xZWptQWhaS0FSbGErMlpDWkhEDQp0aTV4WG5yczN6LzNUVElyaTJpaEdJNlI2bmhDMlhTcC9ZYVg0Vmt1aENxZGtvQUlQR0hDQkxiUlVxeFANCjZnZk5KYndtYkxlelhKMEZhc1VoU2t1enVtMWdhRXVWNExHUzNwaVdPZEVvdm9aV1dGZS80bHRURWxJbg0KMlFncnhtSWRpOFZwU0RkNHE1bnZxS3c4aDhydmVvYnFIMUk5eU03ZkpyYWhFWk1NMmFIMnhzaGlOeUNWDQpKbEhWNUtwV3ZUWkJ4ekNReCszQlpGQnd0ZnAwT2poY0hveFZKVU0zbG9wRzBBSEtqSjk4dWRiaWxZMisNCk55elNNZDIvWjZNOEJCVDJ2YkRKSFFBaXcxYjBiRnk5TXdCc3laU09ZNU1yRkJKK0tLL3NHTVRyd3VQNQ0KL1VZS3NuS1hYQ3hMNk15N3Mzc09BSDBaVGFNTDhjUGxTTzl3Y1JpQ1Jwdzl4aFhHUUFRY1NkeEo3bG96DQpxZVg5QlF3VG5YL2VTQ29jUGNwdXpmc3ozMlpRYUI5dHhtTWVNTVg3RmZ4UU5NdHBTQ0NnMkhBY3VSakgNCkZudThRL2FZNFFIRWZFMVlQVnBQOVlXZ1JPSW9hY3VJSHdXN3loNTNOUnkrbkppRlArUHRWNGl4R3BDVQ0KRlF0Nk1jRWlYQjZxczEwaCtsTzdiZUVRejN2c0hDc3lGc1A0azBPL25sRjVLUi9UVUY0c0p6bHRUREpBDQpmQ1BFR3JoTlBXQzRjQnEwS2d3K0tydDF6MmMzUWVUL1RxMThpdThpSUlrS0xZQ3NWTUxiU01IYUlybFgNCmZCd0tjaSs2MWdOYTVkYTFwbVQ1UmRkL2tNMWNmVTUyK3BEbG1iQWppeHhJRG8rN05lM05rREhIeDNDRw0KTDdEUDlQc1BiOGw0SHlJY0Vka0g0Z3NLQmEzOVc3b0RZS0xYR3IybCtOMjNPVGhUcFVvc3pXV2l5dThBDQoyMU9rb1p0N3dJb29xYVJpbWVmREp0Qm4yQWFyMzhHL3c2ZC8vUnJzZlZzdnVhR0p4SkE3QTVDMXl1bngNCmdlTjdHZlc1djhGK2VGU0hXZ3hSL3JLM1FOZVowV2R3MldYR29TYkpwUmZIbWRVNWlwd2ZqcitiWGNtVg0KSmFFM0JIU0RaeVZuUjVPczZ5TDRvQnhQOVY2NnRMQXc4L2VMeEp4b3JTTXluVDNDRDZJc1pFREFmWnhhDQpSMnhZankyQVpaZlcvZTVrK0lzdzlwYUlrbUVxTTlHVm5OWDhuWWxadTFPbE93Um9EZVViTGkvc0EyMWkNCnBSSllTWG16WWpzQ3lpL0RaT2t2NWFzNkpTMTlPMWVISjJFbmwvMml1aUpLZ1NGY3FSdHJFQ202Uyt5dw0KUnJBM1Uxc2N1T1huSzBxMDYreTJpU2VabHVLdHZEUDBzQUdIdXhKMEhWK0lzRVNTeFlmQ210Mi8yTFhuDQo5ejRadEZadG5WK0lNUVptRWpmRC9FMkd5VG9iQ0dESUJlVHA5UXJkYmJqRmVhWGtlVEJQcWY4b2JFYXINCnNSNEFWNjFQTFlPbzJIelFkOXR0OEhjdk9tTWhDc2JzWEdtbUFEQmlyK0RtN012QWN1TGRLN09BOTI0RQ0KT0dIdkdKcWpTZXkrQmJkdTRFOTFCei9seHBxK0tvV0ZGQnZGR2IxZHUwWTF5aVBMTHRvM2xjbzAwU0NoDQpHR2J1eXZzbU1qN2VGZEwyYmJHWStubnVsbVZFVXF5T2oxMTVvVlpCblc0Zm9aUjVzL2g2NXhQcTYvSlMNCnAxV2ZoaXIvMlpqcTk4VmQ5eEhTU0JQN2hsWHVEMDg2S3ZPY3hiT1JjWW1Rbi9BSWlaWEY5cDE2T1RxYw0KMXVwNjJGNWljc2hLUUFBY2pXajhIbjlXY2lUT2tTdmpXUkxPSzY5dGpZMEhVUUw3OFdLWlUyNWZhaTdKDQo3d0V4M2cvNWM4ZVl2WE9ESlVXcXFmV1hoK3FLTmVEcnRGaEZuOStFQ0cxUGNpMjkwbEFISmgwWkFoeGMNClNHSDE1K01CZWg2emdPVXNqTlhQd0RLVmhjY1o1czFpamRxOXNST25XVUhnS1UxQTR0Nk1CZ3lhV3NicQ0KMWtYWGJmUEJGS0NiUW9Ba0NmeGdrdDdqOVQyMVN2MVExK2RIZk9BY1V3VmZSUG9wbUVUYnhJNmNiK0FMDQpHYkZyQ0crY3doMEJnWlhkdWp6OHo3L2c1bmZYMllFdjVGdkUwa3FLQzVSU1ZDQW1MZmdhcWtrNEJ6TkQNCmcrZ2pSZnA3QmRkN05wSDczNUhHMWlUeHkwL2pxVTlqYnRHOTVkUlVpaVZ6K0gzbXVOM0xRUXpxajJMMw0KUHU2dlRCMm1LZWR6RFNJNnhHMy81V2FZcWJ5NUU3eEFqOEplbTNTUmJSRnhwODBaNWthUkp1bkowQ0oxDQprckN2KzNFOVNwU1F5bHArR2x6ZFlzWngrTkVHWm1Va05RSzhvNlpRTDB5VnFIaWg0c0luTzFZYkMzamsNCmorUlQ4UnJ4U1pXdmRlL2k0eXdUdkMxRUcvVUlLUittQkdjT1UyY285a1h5ckpPY0xkMUR2VUpRM0VZaQ0KeENYcTYwL2wyODJ6cEVWbC9PWmhMQmZ1eWxUdzR0aXdPYU9hSm5Kc0EwbytzcWgwU293VGR2WnNuT1FTDQpKSnNFU01aUGhxcjdXb2sycDUvajA4c2tFVjlJRklNTzhWVFdBTFNPeXVSVXhkUGZkek42RUxqRUszR0YNCmoybmtlNlJpWmN2YVd3RWxxWXVlalR4dkRsaENlK3V6clZndVlUYWphaUJ2Y1o4Y3FyQmU5WGM2cFFpRQ0KTHhmcG8wb2tyYVB6K1Zwc3dMbFgvZURsNU5vdTBuSUw5UlF5YTg2U25iVitQOEJkNXAwTFdnbFV4NlBoDQpRaExkOXlxV2F2eXUzelZXcUxVMEZ4ZWtCWkJkZUVSQXJyNFRFbXAzcnZrK2xQWllURnYva2g2ejQ4T28NCm55MzJCb0RUOFg2TU9ZNkJURHFpMG0yRmNzaXlRY0lKWXpITWgwZ2gxZ01IMGtLOWZVSlZHTzdTeVBWYg0KWkxGbUZQREJaaHYvWHZiQmlHRVQ2UjZMc0F4Z1lMbGMvOGdyMThIZys3WFdJNTVNRXUvWWdENGlZKzUwDQprTmVXWmdyc1FFSWFuYkh3RklZM1JBeWlRVDA3VjBBaUFGYWgvM0llNzdLdVAwQk5aTjM2Si82T2NNdWgNCi9IN1FUcHROeVR2eXRKdnVPOUZOZnB1N2k4UjhYalY4b3RMNGhMMXI1Z3owbHBUYnBWakhvdk1sSE1HUw0KakVyQ1hUZ3hiN21FUytvOGZ2T0JzT3ZEWmwyaklKelN1MkQ0ZWEvU3lnZGlVeFpRT2hPdUtFSFVXMGFEDQpDb0ZTVkNCdEdWb3BtYS9VczdGRncrbXQ2K2RGeG80UjBUL09PV1pPYWRsWnFva0RtaENDaW5qRHd3ZlQNCjJOUFgrRWN4Ynd1WmsxQzFOMmVuVUU3dzNvdEdLWjU3dTY0UWxyRUFBNnFORy9qakJwSFlXdVdRSFlwOQ0KUFh0dXBtV3NhdVlyckVJblVOa0Zqbk1XUTdVaEY5dUsyVHowWDBjbWJ4bER3cFBMV0Fqei8yeFpSOGJ0DQpjNzhBR1praUpoK0c4MDRqcDkxZjRUeENwUHRlV1QxcC9rS1dUZzdOVHZJMUFQTVlZTC9QT0s5R1JnangNCnVsOVRxZHNXODdVZ2U5dkNGL2FCaUtLelhxNnIzMWtHa3hDVm5UNnNXRng4OTJFK29PNjhwUmVaUW56SQ0KdUJCajB3OEpUR1MySWJtUGVuVlJ1Y3NkZG8zTjJ5VWJwRkprQ3FDZUJjaDR2dWQrY09Nd1pRUTdGck9WDQpORDVYR1grTUxlem9UMkdHd2tVWVhVTk0ySzkrK1RzaWhmQXN0blBWOTRZcGlYSFVpWjc5MlJITS9wWW0NCmxLTnFXbGZBL0l1RjBLcis4c2JlUDdLazYrclMzV1EyaWlURmNQWml4WStZVUJHb1V0VWJCb3NvZ1NEZg0KWjJOSXk2S3ZMQy9jNEJDTzl5TzVGYzBUeTNLekJYNmRjbHdpUDdkVXBwNmJDdDZVbE1IbzRCS1ArcVNRDQpoTVJicXNES3dkb092ZmY1RmhkQUkzakgvN1lPbGpSVW11OXZNaExHL0JkcGRMcTFIdGxjbnlJd1RVUVQNCmVlR3VPWEZKc3NGa01OSS9ZZE5RMjB6YWJKeGl0K1k4dDNJRkhvMk5NZ0xnZW8rYW5namdsQm1pclQrUQ0KZ2hZb1pOMTNmV3VUZnRwT09KYUNVdzllait5NXBhQ3N5K2xPMktjUXR5T0g5NnNid0NoQ3RkdEFmWGpxDQpwRGNwSmZXeHByODlGcGhaSzRjblBsQVIyTmMzRm5DU1htWE9nRmtXd21sdC9vQVY5OTNkUm84UjRzaisNCnpSWURnWER2dy8wbXIxSGhiK1A1dFlHUXNkaWtPeHZ2QTMrOTZwOVI4RjlSNmxkUzlFSzQ0eUZXNjRuSA0KbVJmVVE0bUtTUUhpa290OUdBc2FZd1Jsd3ZpSStaYnZYMHZWN2NVK1p6eGxTRzBhaS9MUlNGUWRWdlRODQpwMFZoTXRWU3dXNVBpZTdnckx2YWZWRG1WZUs0NlJuYUVhQ0ViUGhyeWZmUE5CdGZ6R2NqdDNtR0VDNkYNCnNPRUZLbEdHbHU1c3VEc1hLQjdRREVUZ3lvdVVhTmRSKzNkSXR2QzY0Sk5zVndJcVdvYmkrUTBxdzlVRw0KZTBpU0djL3JSSTFhWVNVbUdkMExjSlU3UkErVTNxajQvc25LejJ0bnVYTzJNdDFxMFZDRldVSVpxcXJ0DQpOYlJINk9WV3hBVWxpYnZVRkk0SjVxN3BlQW9JRzMvS3p3eDlEZUpJUGVnTmRsOTVQbG5iVHNOd3loaUINCmY0REo2SmdHSmo0cnRxYU5OeUE0VEtUdjhTT1VYbXJmMWVyZUtpRGNDdFgyaGt5WkJQQ090Ri8vWi8rTQ0KOW1mS0F0YmN4STk1OTIxcHV3YWttTzdFQUN6UXRMcFkwOEx4YnZiVFdFUHNQMXpQUEwzaDlFbWlUbWMyDQpKbFZIZ1BxbTF4TTAzMnNKa3BzdW5mTjFKcWpVS3B6TXR5ZGtjV3ZJZElCVlJpWktjVlAxeDF0SlhVV2YNCkR5c0xDY1RDTDdpNTR0U0J2NUk1YzF6VWtSWHRSd1pPeGNUVTdWNUVUZXlDRHNRWENnazFBNEgxOHJnOQ0KY1UzaVA0YkNmZUplRnZwQjB0NW5pN1NtQmZLT1FmRVVzMVRTNitENk9lMVlBTThQRWh4SXZJaDR5NEV6DQprbzJ5ZUJva3U5R2Fic1BFRHptSnhJYmVDQjZic3JHZnVuWFdOYWViODBITEVGZkNYOEwwcTFiaEl0dXINCnJJUE1nT1lqTHFmdHoyazdacGhHcnpvSkl1T1pUdTJpd3lLbys5RFpJMEZjRWo2L243ck56SElCYmkwZg0KOTQrZ1VhZVV3aTZNbDZJK1BaK2NKdlBlaHJqckEvMW5sS0hUL0VOVHdBZmxpWi80dFk3eFJnMXo3M1N0DQp4NFlhSWRGSXpMQWJnTkpiNG9EMGxXVEc0TG5MUEsxY1NZdEIvNVg2MUo0V1ZSeWI3Z3V3bnA2UEJyRWwNCnhhU1pxa2JoZENUbHcyRC96K2NZY1Zxd3ludVdGTFc4ZVR2VXdjT21DK2Z6emtyUk9VK0prUWEzVll6eg0KZ3FuaU9uc1JpcmZvNnZhNWhaL3RPaDlxYUpnUFdka0VRZFoxNVAxN3hheG1vbk9wQ2ZTVGZsYmY1Vml3DQp4azIxamdpNkozTW9ieWtwVDdPbzdQOGZSaFdvTDlSdTlKL240VmxmcnFCdGtLa2duZXZTc1FocXBxUk0NClBBbEFSOTRQbTV2dnQyVDRybnAyMHZ4dlpaY3RVYmZPRDVmenh0ZnN3cEl1WStSSml1ZlpSTVJ4Qk9NMQ0KMHNxb1RDeTN2djJOcndyYXdsaUJSa05VZnJsMVBKTDQ2Y05ZcTA3QlE0bE5rQzVpVjZrYjQ4bkl1c1NQDQppTWhtK1RkcmpPM2xwVlI5TC9EK0lwWjNyRDVFRjhUWUEzUmp4WjIzMVYyZHRpaTluY1g5OFN4c2IveUUNCmFNTGdlM0hnY1AwVzlIZXN2VUVyS2xUU2hxS0orNHI5d2Y0eFFxUFFYRWh0bUtXait0OVBVeVk1OTFpWg0KYzQzbU1yY0hodlA2S3ZEM1pIZjQ3Qk1RV0NnV3YwS3hXMmxkZDMxZDAxY3k2V21ZUlVVOFNiSDdPR0MyDQpNd3ZiTkVrcFpsTlF0OHRLQ0JEKzVWUnhENHFESXA5S1BOay8vbjQxcHRMY2VPZHFTSkV3czl0UDlOQzkNCjY4VW9uNjd4dzZFMlJMcnJuamQ4TE1hQVZiUlVEQXYzdVpEN1FuTXA3QXVoWjVFcGowRGRNZERWL2RhYg0KNWRKU0c3SlZJaHNOMXNOdGVaWDY4aEJzZUF6eEdRTDNWUzRDS3p5bTk3eTFXcVNOVHhmcTlndDlYZGZsDQo2N3hyYlAxNVFBUm42bVcySm5pM1JORkdHOHVzSVZNM1F5NFpnQTFYaXEwaDdpeTdDRTNPeE1HZVR2aHMNCjAzWnJOS0pHMFFVcUF2dGVLbXpxZGNQRCtyTTRZaEYvb2ZKV3hWYVhCUTQ2WWE5ZmhzUkRUSVkwYTIvSg0KWXBMMzIyaUdzc3pOM1EwZmxycWVUR0NjUC9zMGx6bS8xb0c4RzU4RGtFNWxQc2hjTEIzNGRPeWxVVXRwDQpEdm1BTy9jVmZDaWh0bUpiMGIvV2tIUEU0QlB3MVAvMVo2SEUrN0ZIQkxPdytUdXZjaG92WVBKeGZJeWENCmFIRldWSW5oME1Fc0QzMUx5cCtTM3ZGNjlScXJEQWdjeCtIUTNMdVNYdmpBMWNWUDgxUTFlOXFSdFJENQ0KTjNGcWUyOUZnQkJ3QWMxbVZqK3VCbzNSUi9Fdkp4SWFpUUFBZU5UZzdTVXNFcGVLSStlQlhhSzdwL3JUDQpLZHZwUmhsMnRlbUZDZFZHdXM1QXlGMTlXMituUUltczdtWXdTdzZ6dWRSUkZaamdCekpoMXZwTVNIZ3oNCnNtZFhaMisyNm1wTWM5YjZYWkkva1ZDNXZXK0ZIcEltNjBLTjJNUmoxTkxqbk1HTXFVU293NGtSQmJLSQ0KTGc0VENpLzZpSTJ5NkVsU1M3eURCaDk2a1h2Q1RRUWNsd3kvck4rSWlOazNHSEhYTFpudnk0dHRRaGs2DQpzeUFhbUgzNHVhSW1aOTFyYW5oMmM0K0sxaFZaV0RpczAvSGp1bitYTUorejJESnNLODh6Qm9yUVdSWVUNCmhadzJYSzJOK1ZOeU8xWUViejM2bEVNYUVFMVdob2lUd1F3eEN5bndHZkNObmRxQ21BN1F5eHJLN2JmUw0KeW0wYk5oTEFsVlRYTTg4cndIK09UVzJsOUE5YzJJMTYxeTdscmxnbkdKSlFacmxsOE1nbVFyUHladUVsDQpoUHIrOW02NUVvellUaXh6ekE1eGpMOUo3dC9rNWwyV1puVEllcEt6SVFQVHEyYzhCeVpueGFmUm9sNkwNCnJpOGt1UzlnZ1B0MWNNZytzOC8yQXhmWTVIT2h6bVk0V0o3RTJUeUExTXhidjZaN1YrSTViL1FKSnNrYQ0KbXg0anZlTmc5QjR3dmxyUnRPd25PWGtVRDJVQ2NKMDFUS3JJODdWOXh2TGpNM1BMaU83NElFZU1ZK0VZDQpVVzNtdGZ3WG1IOGdJdVk2L2tpdGRhUy9XZlhtTUVUQlRHbXVoYWxwTi96M0xqK09DVC9BUmVnTjlnOFANCnl2UXEyR2p3dW04UGZsa0JxOEFtRG5RcFZJVnN0SE8rNlNJQ2JpWHZJaDN4dStXRjRhaFg1LzA1MnpNOQ0KY3BuUllPcDFXWHRIclNLUjdlYXI4KzRqdm1JQ2JPalR1VDBBMXJzeko3Rm1scWxab015S1R1aXo4UHBIDQpYcXZ1UkI3dW9mOFI4VFZwVGo4NzZoZ0J3MW1KZUd4MWdETjlJREx0ZTV6bnMyQ0N4ZHpKR3F0MWFCREkNCmJBM0ozajhmaHk0bzltNjdnOGhPQlRSREZiZTV5ajYzNXN3SEdVUlQvTTRpOGNWaGRub0R5VHIxc3VHaQ0Kd0haOUhEUmRKK3ZDV1Y3dFlqNFpPOHlXSytORW0yREVZT3QzZm1KVFNmR2dZeSt5ZEhueGtRT3d0VERaDQptcWU1MFlkSENDRWM3dURKT1laVkV4aHpJeXcwb0ZNbk1nZnY3Q3ZMK2lJZElhdWtydEFlVVpxMmNaOUgNCklYQWVVQ0JETGhQdzViaEpBQTE0ZjVzbG15MzNDNmlJcjN0T2hzYi9SNHUrdjdEODlsdk5EYTk4T2lzZw0KQ3hVc0l2aVJPaFhXTmN4b3QwUVIyUzhqSDVPeWtXOG42UlJUYnFUNnNlWTZNVVVWcVRkeVo4VEFmR0RuDQowN1dnY0xMTWJ0SVRRUUhvSFZaOHI4U0szVzFYcER5V0EyckJPYU1qV29QcHZBZlhldUtLclV2QUxUU0wNCkIvRHpiTWFWaFdCM3YvVmQvUDBrYlhSZk53cHV5SEdtMFUyYmNpUWY5aTZGektTTUJLN1ppTkV2Zlhuag0KVVZmUEtSMGYvRkZoNlh3VGZvRHNTQVAxQ3FwdkJhK0x3VjkzL05HMmptcFBMUm5rN2lXeWJ5WmhHQUpLDQpDdmFxV0lURWNVcHdteEV6RlZyeHEzSEtOaytzMzNhN25CRWE1cmQ4dDVJSlp5Kyt2aEZpUDU0UmI0QmQNCllHRzN6UDk5MVdHYjhBTjVJeU1CellINlFNcytQNWtsc1hjbVRpeGxnVi9pRFd4TjAycUVsNVF0R1ZkNw0KemNPRVJEaTVwVUVSbDFlbTh6V0lsVkpBTkZpNVR5MnhwdzNPWUN6cXp2UUxaZ1RKZElIdy9KN2JqdGNyDQpZUnErUzFXVFQ1cDMxMGl5SDhQRmpUT2g0RnV3dUJZcG5LSlB1dG1HT3VVUmMvczFyQUdEZmpFYlZPdnkNCjBNejUzYlRXelRhdFVpVTRvUit4ZHFvTG5UZ3p5UWZRZzdvcnU2dEM5SHlJM0pTbElic1VvRXFpSSt4eg0KVGJUWk9zTWxZYXF3NDF1SjdLbG1ndC9lL21KY1dFaGlOa09EU2R2Y1lmdWx6bE9wWWtIT2hNc1JkdTBoDQpYenI5Z0E3dnEzRS95SmVzdzBxeE40eGExQVQ1U1ZHM3VVcmhFUFJkRVdpZkNhLzFvaFplcitzcnVoc0UNCml1OWJGNThKWlF3ZVM1ODAyM1g5Vmh0b0RDWTdNbDJHbjg3VTkyaU9uSjBUdWJpbkd4R29DU1NuR1hCZA0Kb3FyOTdMbzZGZi9DRVFGeEVTSm5pVnZTZXlpcndtSkZsc1N0SVlXVS9UMHArU1prb3RhbHFtUk9DZ0dtDQp1MXJ1bnVQQ0k2OHAyUjU0b2FyQ2dWTWJxa25LbmV5cTVXU283YTZ4eS82OU1NeXRuazBSdTg2cDczazkNClljUW9mRG13ZWY3ZGRFQzdJaUxTWmk1WkQzVlgrV1pQRUV5S1prbWRLVUsyMTBmQkQ5VTZPNDNTODNkdA0KaUVHUGp2S3V5SzI0cVJuMEFGWk8zZHo1R0hMbWJQOWZaVTBpSERGakZRNDNKOEp3c3NMOU5TOURSUEU1DQpSRzZsUDgrTDhramNyM29qWERaZ3Njc3JEc0dKdmwvU1J0YTZ4d2hESkYvbHZ0ZjdYNDFRcThtSUtiWjkNCjJlNldTeHppWngwcmpQcFd5SlZ2U0lYcmVJM3NyQ1M3Y0RIblVRMWxKVzhIWUEyejJjZVdpU3R0czRKbg0KRlZiRitndUtucDFMbk44TFlaWUtLRnhwNkJtbGxoeUpNUlpnSTJhT0VBUEFtYS9RRUNQNkxRYy9iSm9hDQpqL05ZR1FxaWl4Z0F2SmhuZXpRTy93VXk1K1FkYnlUZ1FjWFF5MkF6N3Q1b2lzS0gyNDdoQXRCWm1BWE8NCnE5OW1BQnBhbm5YUUpDR242QitFTXRqQnYrUHZ5dzFSMENaUm95bXAycUp0U1AzTnE1YWNiUS9FWjhwZQ0KM1cvMXFweEZDa2VKTTJUZ1VDSHdwNTFvWHpGZ2YwM1ZkVzhYUmsyaGg3c1U5cnlWanIxL2dSc2RvK25YDQpuVllLSHY3Mk9DQkxyclpleHBVZURsOWF1a1hSK3YrZW8vTlI5QisrYlJ6emZtZTI0L0hlRXlpWGpLSnENCi9QeHJzMktRMENoQjBHalJGUTk1SERUSGMxK091TG1qdVcxd2p1YUFLaXF3WW5za0VqNkVLeUtFblUxRQ0KVTZGZEhFSTh6cGRWSkFFOFh2dkxlamUrTG9vZ3FLdFJDMDdEbzhuVjNTQ0NtSGZUbUwrd1R5MkFUZnMxDQpNRlNrYTdLUmZnL01oY2JFc0paL1FTeDRXdDJqVVFqRG1FMUNFdU5KN0Q1cGFlWC80eUF6ZjNjNDlRRzINCmhOcC90YkxZalgwdUNVa1ErejZ4NHJtUEdidTFuZlk1K0RZMzY2QU5MdndaRzJlK1JzUzZHMFFPT2RZZQ0KQ0dxTmxvQTJCdmsyQkJQQkQ5UHEzUkFqcGE2ZWNiSnRFV1BNQlF4VjY1OE9OSWpUeVJNbnJlbkdiL1Q1DQp6L0UyS0VMNFpiRk5MZmN3S1l5UURwU0NWcnM2Q0hhMGlGVjY3ODd6S0NWTUE5bm5BZG9VcnVyellvc3ANCmtabWd6YXNUYXhST1U0YlUwYlFUWnlYRjNUdnpkb2RyR1I1WElJdjAwUjlGdnUybWl2SUgzaE5YZ3BqOQ0KdHBMUk1LeWMvT25XTEhMYUhHL1Y2Qk1yMzAyVSs2cEZiS0dkbVFIS2htbEpET1BZVFhPaFJycFpGQW1tDQpON0tmWFRscEhlL1E3WUNJNG0zR1lMcE9vZnIyWFNCQUJwZWJaYmVTR3Y0dnN3OXQ3U0RLRFdiN3JUOTkNCkl4MkhMNndNbDIyeitmdkt1UVFtdHNVZVhzdExVVVVPdzQ0WmpDR1lnbXI0cE4yV1hwSkdua2Z6U082eg0KUW1TODNTSmRRMWV2dmdQUDJ4SWh3MExRT0txb3JPQWVveG5VR2p1a3ZWbVJxa0F2TUZkQW94eHFaUHBrDQpGTElUYWxUeDZlMXdTWXJKaGVJQXZyVysvQmVtRzZVbytwK1lSWjh3OFlxektGWUQ4Z2RGN3paTHBRUmwNCnFMRU9rRHlGZ2dTaUo0RWNmanhUaE1IMy9NN3NNaDhZbTN4N3pMN0ZCMHl4dG9idmZyUUFJUHdsMkcrYw0KVlhWZ2tjWGE5ZTFhaDFtM1FyZnExTEsyTjdzTnJRUVpocFp1VEY5Tk5ySEZ2Qy9CWlVydW1SVUNPdlQ4DQp1ZG9ONEJQVU11YmNlYmhIL2NQek12VTRFYjZ6ZGF0NFB1cXZKcmFjR2lVeS85dVJ1eEphSUlZeG9VWDgNCkt3UVlYUEVqVk5wQUpjTHlPb1NUVWU4TEYvNWtKa0RRZ3BLN2hKWXU4UTFCQWllQXRqcU5LeEdOMGRRbw0KTHo3U2k3eHIxS1JFQlR6SExpeWRLVUI4QzVqY3FGUEtTdDhSV2hBRkhTbDRRRnVFd1lINytESXFxSnFPDQoxVzdMTGl5V1JKQ3A5ekd6Wmc1U0kwYVFCNDBiUSsycnNrY0tvaXR6bmhPWGZZemZSV2xZZFM3YkNZakQNCkd3S0JGR09WVGcxek8xcDV3Q25QUzJIakd5T1kwYWV5dUxsd0NFcnE2b1ZVZ3ZSdFA5bVVXUDRBNHplUQ0KcHU4eWczb0cxR2RrNEJCTlg0ZW5ubnc5NkphZGo3cEpQWWpEcWdpUDVSUzBMaXNiazBPMmlxeUVkRXN1DQpId1BHRWtla09Fb08zVTBoak90V1gyVHB3dmIrdWR1Sk9XWEpTam45eElYblZnUlhKNnFCbHVIdGxpZksNCldzNWhQSzhnM2hmczdORWMyVUpidU5Rd2lVbkQ0NGNjcGwvVFBhR1ZqRmMrZklQcExDUkpBVWdLNmE4dQ0KWUp3K3pDWURVeW95Z1ZKaEtOWVlra3FXcW94NmljQVNsbjh1SXl2VlR2ckZqT2E2SlFkQmZFK1EzaUEwDQp0VUNlc3BONVJUV1hGejRQNWxiNWlBMFl1TWFLTXp1T0h0ZHdqZXlpbHRUY1J4c1NLVTNTQW5FbTRVdHkNCmVISWdqUlJDenYzR2xjVDZZcnlaajdnSlc4REE4YnBTbE9lV05Cci8wMmFnZjFoK0hIeUVTNk1jc2EycA0Ka1BLUUJTYUFMMWhWL25GdE5mVlRCYnUwNjJycWswTEZTcXBCZVFYN1J4dFZKOVB4ZGFQVXByV2ZrSDBQDQpOSjVOTjZDL01telNLelo5c2ZjZkpNcGdkL1ZORTMxanpkeDhYQUJrc0lmSGZOVVhBRENzWDRIT21HWEINCmMxeTVBdHF4QjN6Y1R5MUJSL3krZmE0Sk4vekU3Q0k0ZWdVcGNWZlZPZHhwOE0rSE1QTXREVUFscFpiOQ0KcHdUa3pseE5NRlFyZEhxWEZwN3dGWUY2U0hDdUpjNkdQTTdhTzM4UFArY01vZ1EwYVAxdmx1UzdkWWdDDQo2MXVFKzI2ZytIaEdocGZHRlBqYW5ySzVNYzZpNk5YL3RXVGhxdjhNOEJ2TXlUbXg2dHdXWk9ZMlVSOUENClZEZERPci8rWWtXTWtuMkpPNVMzdUs3NVU4VGtweHlkdmpScEw3TCsxNENWQm9HUlFhcWNYSVhZT2J0UQ0KaWsxWVZwcVJFb1dlT0JsTzluR1J3ZFpFa1VUQ3V1Y3pMaHh4RlVFQUhORURmYlY3Y3R3RU8xWUZmTTVWDQo0NEFoaDhHSjJDc2VNYmNBazVzVUxkdVExL1FlSmJYRXhTNnNyVkNybVd0Y0NjcXJ2R3ZqNjRkNU5JN0QNCk1aZEJ0QmtGVW9hajFPRDVUbXhqZ3FsUHo1dUJBZmVIRkNBSUJNcEgvb0Q0VnIvQUhhV3lwOEZtY1BveA0KaVdUT0ZxcVJ6aUIxN1cvR09KNGlGV3ZjaDM0alpBNHFGcWhnTEtwL0FHNGdLbVZrZklOVmdMazNCcmRFDQpKSkRCK0dObk56cDlWSFIzYmo2VjZseE1GZldNMjY2UWhxaWdZZlh4VnQ4MHdJUDMwejI5Mjh2MEVLMEMNCmtZbitDcjZ5dzEzRk91Y0NiaTVhYjNlcjZNV2xybEI1NXJsMHhjckxvWUNLQ0NkZXI4UXdTSWVKaVlwMw0KY3pIRk1kN3YxVXFTUjArbVR4N3k2Z2JpVlNXbW1ES1pNdHJIUHE2ZFAybjNDbDN3ckcyY1liVVRwTitHDQpDNDBDaUdyWndCS2UrUVEyVWZFbGZRNm9Mc0xTdTFmeGM3ek5lYUFUWjVJblhTc3FCck5QbFZtVmpmbW8NCjBpWnE4YURKc0ZRa3BUWVJPL3RKTXpuQ1k3dGJ3cXZ3WlFSenNBamFvalpCRmxEYUJNZGYwY3JYVjFSTg0KTFpmbkdSTDM2MkF0NjBPNytpWDYvSGxURUI0SGlyaVhkMDJ6SXQxVmRsaFFicHdrTWxUMVhQMUFHMmo3DQpSRDlHYll3c2VHRjdZd1YzRWU2RzhyS0trMFkvbC9tUXZuRjdGRFZEU2lSZUlweU5HYUVHSFJEaWZWMXgNClNpeE5icVJjZmNFUFcycHNpejJ3UGpWR05yNnM0MW45VFdDOUZVcXhCaXVQWHdkblQ1RnpRTW9iREhpUw0KMmZScU5adnFGakowbmxzeVFUbjBUbVRoNWF5dXF1SkhTWUlQTWFMWXdZQWZvRVFBekxEN2w0NDJidEIrDQprbkYvYS8xbUd1MnV2Q2U1Tzl0c0VzSmNUMVJzeHB3YmxWeU5vWDRDd3JOTjZmRTQ5eUF4YWgwZGovQWUNCnNXM29rcXJ1SWdudW9jR2Q2WW83YldPbS9iZ1RIbFpKWmFiVVFYaWdnUUNWVFV6bmcza3dnOFF3T0lSNQ0KRTB3UDA3QmlGRVpvQ1pjZVFzVkpMMmVId1NLTThEOHVVbi9HYzM3aWFZMWZhNW1wUVdZMmZiNGFvTEpCDQpwbzAxSldIQVpiSG9sbmNvRjF1eFJidEMvQktYaHlRS0hDT3VDcUNrVGw1dTN1VGdIeW1rYzdRRExHQUkNCkgwTnJ3Z013K1A2NkQyQjI1ZEs5ZW9PYlpPSE9HTVM3RmR1VlAvZW5CSTBzZDZjWTk2VEJzK1NYbjlmdQ0KcVBwSjdDZnNDd2xuSFVneUlOK1crYVkzY0hHUzhoM0RnNG9rWDViMU56cFFvY2paZUpNZG9BaHl4aDVsDQplQ0I5K2NDYndjQzNtRnhSc3NFbW1UNkNWUnF2NEVqOWlNaG5uK3gzVDIvaDA1OE9scXRnVEFMNWJxbkgNCnhONzFsVVVWOCtXdVdLMkFqaUNYZVdiTSsvZG9za0ZuQ1E0dFRkeXQ0S0Nlb1hLd2lmK2h3MkY0MWhIcg0KYWpjWDVNTTZ0ZXgrK0FvODVISUo0ZDB0NTd0d1VDUkk2UU8xU1c4SHUrbjBsOXN6U2l2Zit2d0l6eUV0DQpvQ25zUW1IRlp2ZFc0N0JYcFlrelpzU3RSbnZSR3NiQVhDTXRscGdyNUNhR293ODFOUmdzZ0pEWUVSZnANCnRnaXhBU2RPNWdhaWpwYnhoTENBeFBHRnZEdVJGSmU4UUZ6WWRrR1pFN1p1b2M3VlBpRlJQZlFVNVFYMw0KZWhnOFRjaWZFTFdIUVA0dzNmSXJSWXdKbFRCM3d6enhMQXIzTXFqeUhkVUxVdzR6VGIwUVpOb1dLK0NPDQpPMVBFVTR3M1hBOXAzR0JEaVRtQ2g5c3NvdzNra1lBYzFjb3ZESHpSTGlNZzVoKzl1K3UrR21tNlg3OGMNCkt4anoxcW5haENjcWRmcGhxRFRDVnVWWlZLc1V6TlVwNzNjekJlOGF5bkxwNS9KSHFqRmVleldIZlhLNg0KSUl6T0NJWjl2V1ZETmdOQWFGWDEyWmxvZXBMcEJ0S1ZMS2l2NXByRXVDNTRzUlRkSnpIWDB2Ukt4MzJRDQpHWHJyMGhYQ1BEVlJ3SG0wTngxQ0dObFpWVUMyZ2xlZmpvbGpid2FaUml4M0N1YUhuMnhhWVVSR2tTMFINCnQ3akpScHFtYUd0R0d1cnkvT3hoZ01TVXVEMFYvL2JWcitoamI1L0ovcVhNN0pJS1UxcHh6bFZrdDgzUw0KMTRCUnlybXJ6SGhIeHlaWTF1RWJ6Ry9YZ2dMb3ZmdmRmSnZaNzNJTFRhcm9tZmJlajV4bXlsVUJlRHpvDQpZUi9VZmpiWjhPaUQrKzhqMmdkeDVxV3JJNnVTNG5UV2FkWWhBbnViOXNPejkzOVpHRmJsVmlwdFY3Q1ENCjFvd0xMWXJCRjU0TzV6VXc2cFNWWEs5Wkdta0hha2syMjlMOThkM2NYN3Y3cWhkd3hBaWtJR1NTeW5Ccw0KVzJDNmF1bDB0cWlIN0VpM3hqdXh0eDhZSjBua0N6KzFuaXpUc29xNlpvbmZjbFlxNUhNdXhEdmNtRTZqDQo0VFFBczk0WU1KdGhwMjFCN2twYndJdC9GRGtOR3EybFpTMlJiREtoMUJWMXp2ZWhacHRvVGRhMkpLMEUNCkpLWTQvdCszZHpvM2JjMS8wTHljUmFmY0podUN6ZkZqaWlYcDhnTlA4MzNjbXBWalI4RWlNOGRIUEs2Yw0KbzRFdFVrMStKS01RdHhOMVdGa1BETFA4OFdvV0h3bzc4cFEvdk5OOWVhdWpPV3h1em1Nc0k1UXdIMVUyDQo1YWFrV1UxTldlbE9jWktKSVZ3aHBlcHpIcTFEQVRZd1c0cGpPZnFqWmhqSWpVcEFVN3FIais4OGZTT0kNCm4reHp0aWNub0h6dGNScXRVUXo1SFY2WXNhdng3UkpIT1JDTmZGZGJPVHRaNXhRTWt4d3luSHQvTmdNUA0KbTRVWS91WmxpT1Q1YmFJeGRmdkFjRVZ3Mi84VHIwZVRSNHJQZEpBVllEL253UGlENDI4NTE0Q1hXWFRiDQpRVGFaYlFBL2h1dWJqZzk3dGU0UGVEQjY4MytIYlp4M3NLaFV4cFZwTCtnM0tPY3JseDBxd2MxYjg0ZloNClF5YlVJMS9HR0syRURIeVhaaU5HVjU1UVdZSDBSZlBsT0FBMUc0QWZCOGtCL1I4UUVNS0VxQlJFNmZqZg0KNHhmbGZGSHFyR1MwMlg2emZpYVFmYmlBNEJtVW9iTE5yUzkxSlEvc25Nck51cVUrcmRBT2hMTSs4bEowDQpvZlhFWnZWbW9RZVN4ZlFMd2xZNzBQVVFJaGIvOU5zTURvTXNJek16enVjU1ZoRTl0YUdCYW5nOHl3V1ANCnA5bmNYRUtCaGpHZ1UzSzJlWjVweG5aRS9tT25Na1hNalFrMmNBWVhzcHBDQm0vWkdYalliY0ZGa01seQ0KS3Qwc1NJcHVxaGN0MWUrNGowaU9Hd1NZL1dSQWhnd2M2d2xKaSt0aFlsS0N3Vk5iMWxOWEdVWmZkY2FODQptdElHZXM1ckMxUkp4R2xGY01hR2JicWNYMFVWNWRyRVBxelZNR2JJRXBZbUdrSEllSkcrOEgzc1p5TFoNCkFrZkRNdE9qbUtxR1E3Yy9mRXRmU2NqcGlpdWhyaUZCZDBSbDdGN1lYekIrcnBFaHJ1U2NIb2w3bHZsRg0Kb2RuMUFScm9tZ216alRsUEtzVVdhYlY5SGVTWUdPaEdjNUlGa24rNEpWakpwSEFxa1ljcVY2L1R5ZjJDDQpKNVBiNzc1WDJOTFhVcUpCejFZWW5aWXlqM1NiVGRmcDBYU1JVWlIrbWZzRVlMQk43RzA4MlBVLzJrc2gNCkI2K3lPK0dhdUFMb21UNEF5YUFmNHQ2VDFWODNnUTBRS1BnbHFRbHdiWkFWK2lhODZTQ2ZYTjRVT2NuRg0KNHFDZEtlVUtpcVgvdDNLT1ZjaTkzWEErUUJJTWQ0eXltVmppYURnSmRPTUpKak9Sc1JVM1h5anVkWEc3DQpTU1N0M1cwKzAwT25JZGk2eGQ5TTJHcE4rU2xoN0tFbFpXM2k4YnRQSU5PU0FURnUxSHhRWXBhRThPeEUNCjZncHN5QU9kRHpyeHRCZjZpRXJWK3V0ejk3d3grUktOKzJPNUlDdUl4c2t3TXhBWUNNNTBxa3h6VTRmTg0KeE5TUTdjbDRnSXpUUUNTdHhNN29YTjJOeDk3R2E2dkhBcmpENlM2bFBTMU5NTXkvU1oyeVk5OGMvOENMDQovWHdUSitSajVqL0xhZkZTN1k1b3g0U2JaS29CU3ZXeUFLcVYrL3lBU2crcjUyZkwwdzE4YnNmeDZpSEYNCkJVUjRaVEFQNXNma0YwS1FEcHN2SjMxWklKY1poSklybGtlY1JPZDVVSUQ4enhBQTU2V1k4MWFRVjM2OQ0KWklPUDBJeTNIaGZJY3BMcldvQVp4R0pGTG40VVNzQ05zektZS1dKYkJQUTJNb3Awajc1ZFd6N0RxYTQ0DQo4VEcyUGtOYXJORDdwMW9xYVJjU0t2eCt3ZnpBeGtINE1ILy9CTTNndDBoTmtrUStoSktBTXN2bzN1a2wNCjUwTDdsemZuSFptR2pBYXo4OXVwUlNnQXJ3L09XZDBubjlFZU1UUUh2TjBYbmhhVVYxcytFZklIZ3FYdQ0KVjVTQnpTTnBBb0xMV2crLzhmdUt6eHBqdmN4QkJLYW44N3JaTkg5aW96SE02aXczZFZvWGlnQ0tiRzFYDQo2ZHZzUjBlM0J2aWpENVpzVkhkdUJlUUs5NmJiWndZeVl3eGQzZ3pQY1dYVXQ3VE91bytBeG1zWUtsdGwNClhubWRDZ3lsNXlqcmw3UmV2R2RyOFNVMWs0VzcvY1FTZzJ5NFRjV2V0ODkwdkVHWUdPNFVzaTRqOVZ5VA0KZUlXeWlaTllyTlBZTXRCWDRSbmpYTGNrSGdaL2pkbUpuZ3c4TkdQVGJXc1NUUGJTNVBvZ3R3T3pUcVB5DQpqdHNGRHhLWEExaGJnMEhTUzVTMWpXMXhHTktaQ3VSOEhOR1RWeUJrY0tYdDRxZThIYXhTaHluV3NsVFgNCk1pZ0RDcmo4a1Fpd0VGNkloQ1pDZmdJUDhYT0NrbHBDdWVQRFc2WXh6cHhKcS95UUFNUmFqWkREMlJmYQ0KRWJrM0dlMnorcDJDYVdHNE5LWldxQzQvREE5UVBmeDEzblhMMmdsNWtDMUx4WWp3K3YxRm5OaWxrRjBIDQpxOTlyWEd3UnhzTjg2QUhIVXU0MngvM0tCb2k1RkxKMnVaVTQ1SjZyYXZhTFRPWkhzc2t0L3VXdERuV2ENCnJZa01QVmRhVndrM1BYcUxzUDJVTVN1ZjlxKytaZEpkRVdRYkN3WUJ3RzJETVhoWUZPL3hQdktDenpKNQ0KeGVhV0Y4UmtWTE5yR3R3cVhlY0xaWW1uZjdtbFlIamRGRi8waGJXYkhCWE9iTnViREZpNmZkNW9KazN2DQowR2dmaUIxMVd6WDhDbEp4a21MRmNlUG9vQ1daQmlOQ1FrTUdyTnNpclozUGdSZGVUNDZFWVJWeGNGb3QNCnM0T3g5NnZiMXpTQmNsenF4T1dseGlzUkMraTlPYXYxMG1TUm5iNW5FSnE1c05SMXQ4RUdkc0FTR3hBOQ0Ka2JmWFBhMDBiaGpzVlBQQVBla3VCaEhZdUFZNWRoM25BeGcyVkdab3NaQkFsNHFNSnBpSnZ3M0l6OUlyDQppRU9TbzNDRGNZOEt4aVhTdnZMYjF0Q0R5ZU9KY3czUnFCZFNmcWxVYzQ1RjBnQ2FyNFE4NUJRMTdPOVkNCno1OGlwOE5sTkYwNkRSVVRkVHhCakViWEtUNFJaemVqNkhBWGNwNEtFWTBSWEh5SmV4YmV2dzMzUWtPdw0KdGFHM2d3NFdsaysyUlNQeWF6TU1HdlB6WDd6TVY2TUFqZm1WZ3RNN0V1MGMyU2pIeXdSOGVuSW0yRndFDQpLMlZmdVNsZzZzTkkva3d4cTRzVjFYQndYUDIxcmh4Ylp5UW85YnFhQW1VaVphakg0L2VqczlHOTF6REsNCnd0Wkl6YjAvR2kwcE44a1I5bEtkbG91Umt4MTg5TmZYN25xbCt1a0VNWmE3S05TeVNpTURBanhGaG1uLw0KOUVGei9ucm5yNjhOOUVhalJjUDQ4cGZSMFFmb25OMDJDbFpZWnhwQWdHbC9taHpsQzdpL1FwKzJZRFJmDQpVZlJ1dS9EZ0N1TDlDeUJRRThzS08vZ1FzaWJ5ajg5dVM2UXgvTEFnUjJxbTZPWFNaMHJKV1czaXE0NnMNCjl3eld2b3BQUDVicTAzNkZKR3R2d29KQUJkNC9pUURKSHgzTXZsQ0JTVmtSVVFuWGk4dDdUMENrcXNNWQ0KcTE3QlpYUnFHUmJaUlZNaVVQQVNPZUxkMDhuR3d3NHREYStCQkZxRXZ3Ny9jQmFLcDhSQTJsMUpGSzhpDQo5UHc3N2tIQVpGdG40aThZbW1lVGtucHU5dlgzcXpOd2YrSGhLa1YyYXB1TFlnVTdzWWxqRW85N3J4ZGINCjdUczg3K3UvaDBiVzB5VFNSNmI3b3g2NG5FZ3hlSTJJVFlHODZUNjUvaTYxbGVsZjl0NFA3M0ZKaURRRA0KamJ4Q0R2UXVvTnVLVm1OZkZYVW5KUmNnUnlZNFdkUndJM0VOU3pick56aTFrVHdZNVJZbVYvanZsME9nDQowL08zekR2bUxFRTFXckpFZ1hTMTQ2Z0NRWUJ6YUxXTm1DdW9zSWN0SlFDMERjelB0TkhZMHhaTnQvcHQNCkVaWml6bE42Yko4TGw0WW9weHFoNkJveFozLy9POTIzMFJTbUZYbE9Kc3RYSGExSlRMNHErbnFrYXhDSA0KNUJkK0dlSFlKWStEbXphZGMxdm9ROGk4WDdZVWk4VFRHdDF1RE5NUXRRY1U5ejVWdThTYVp4YWtUcFA0DQp6Q0NZK2NPOW0xOFhRTGg5Q3J3MXZscm1LM1lXSEZOeVNpWFlWVEg5Nm0rTGhXM2xJKzkyQ3dWeHkvZGwNCnJZRjhXZzVPTWQ3c253VFYrNHl5TCtpSGMvdkk0OVA4WVdBUFJFMnNvcUVIL1ZwSHU2aUxUcksxcVpScQ0KbUhJL0Z0OWkzcE9xamdia2ZLb1ZDMDVoellSWDJqa0tYUXlrcXB2aU54RExqdzR1RHZtWElmenFza1hTDQp2aTE0RFhFV2lXQ1Bxay9aL3k3blpLR3NIZHRBSFU5RW42QWZkZERpM3RhV1A2b2l5bmFRa01FVXhERkcNClQweVRpeFBjQWkyNktYckw5ZUVlR1BZTjFrUXBzMzZURlVOak9FYTN2S0R2Q3JJOUFtYXpWM2R2cE1oNg0KaWFZUXJHMUxrK0FUTzBoMUZwZ0xVTkt6WUt5Uyt5L09vV0x6M0ZLK0dMbWVqbXNIWDZDM1h6WlhUakdaDQpHMTRZd1QyMjJYTmhwSksrRVFYYTV2eUNvS09YUlFleUdYZzVObnZFYWtWZjAxWjMzcWF1a1pvMTdSdzgNCk5TQzVrTDNFcy9OejhqWTNDWllBNzdBR202aTVwZ0NFZmFKMEFzOHFLd1JDcTRBYXVjZHQ0SDZOcWk0OA0KNnd3enNNczRUK0I1NzZIeGJRZUl3czFxbFNrS25JUkxta21pdWg3L3NLaC9FenN0SlRIZzNWbmpzbC9nDQpDYmRRN3M0NU8yMUxUMDBrajNUQ1ZITERlZU5OVnFCNlRXRGpRNDFRd1dVend0aUxhb1BmczVkeEN5Mm8NCmhxSCtTazIzaHNZQmoxSjRVKzFEMzE4bFhYaVFCMGFaYW5iQmhHa2RFMHFoaTVEUy82c2hQQ0hMcUdKNg0KTXB3dWdSOVdPSzdpcWVmOGlIakcrRUtPRHlNSVRqVVk3WW5MekNnNzA1ODBpcUM3TlZLT09DOGx2NnlrDQpOZ1JYNFVNM1RoTTRaUTZQdHJlVmhDVWVmanZFWU5qN1BRQUxGa1o5MFJKclpkTVhOQmVvWnBweFlrV2YNCnEyVnhEQzR5Y0E5NldFY3piME15SmNHaGdZazFzNy9LRjBkR1dBUk40b3JwL1pIUlN4TkE0OG11aGQyQw0KZTBPRm5FWVAreDQvM2x1c1pvWE04RmtXeitIQzVTdDNYNm9KNktJWXpHclVPOHhNRWRZQnJtdGZhV2pqDQpmS3pxTVNaNXhTOU8xeC9FY2VSaGV2ejRtc1BnSThxVHh5ZFkzeWMvNVE3NVNSRkRYY3JUT3Z1OUQyMGQNCldZTGhlUTA1elBJT05qVzRQTi9Jd2xpa2gyck1JTkhBQW1iZElFb0lxWWlyUnI1MlhlYitlZ2Z0a3p6Nw0KUzB2cjNWaldGU0wvOHQzNVA0WjN1UDRGeTl0anV0eVZTOUYwd2owalFiK0o2b1RpL0FtTGc2clpQWWdXDQpMUnB6RGxocFQ0L0dLb3Q1NHJHcTA4N3hkZFpNRGtyYWg3QzBuWDZaMHRiSHZZemFRWTRlbkxBYXk0R0ENCm5ndUZUNStmL1hXVGxLVXIxdmY0bTdFTVNsWjRkaDRJb0p1RC8rTjVwZGptRHltdmFxZ3ZaZE81UG04VA0KWGlySk56SDhTOGg3STdHVnBPQTJlU3FkTnBWSW1MeTdhWXhrMnpzODhJV2p1VXhVWW05K2JVeWpTbkU4DQo2ZDR5TktTNUxjZjBvQWxmanpIMlVDZ1ViRm5vcHpOUmdGUUMwOFpIbzNRTVo2eTMrOWpTYmVDWDdaKzgNCmhaa0trUVJHN3lRQ3BXY1hjZGNkcWF2eWVWQnBMWnEzOXVvSjlFaEJjZlMyL0RGRFdpZnpmUE5JU01ISg0KQ2V2bTFkcXVPUm9jbWsxNi9OZEQvQUM0bkEvWHg3aFBoc1hIeWxWNGpKYTc0TmhJd3g3b1Z5djBXVHlLDQphMUhZQ09DZ1Z2VzVoT2I3elZnRk9SUzBGRzIyNlJnNFp1NTFYWUQ5N21jb0YvV2ovU0kybmtZMWdGdk4NCjBzQVBhMDFWek04bFpyTk5tc2k1V1RSa1JSWGJPWE00d2FHMURuNXFOcEJSZVZSdmZaZ3c5dkI5d2lUSA0KWjN6eGhSYzVHM1lDMWJacDRwb05lU1ZlM0ZXa2xSNFp3Vk5Idlh0Uy9uekJKcERac25ZWDJ6SnRDYzlnDQpWeDFCUnNQTnNqd09JRUdiR0VYUXRxYmVRSlNmL1pRN2V6ZjZFek1EZmI4ZnFuZzVuTU13bkZWdm1uT0sNCms4Y1VtTG9YVHdCRG54MEo4ZUF6a2RMWmZMWFNGZkdCaHdGSERQN3FhZURNQkVjelYvTkV3clRGMWlZdw0KMDFOQy9JNGM0Y0d2dHoyMm9hSzFrOUpvWE92bXpEODcrOFA1cG1WNURTeFVYNExhQlI2MjdrNGFIQXNHDQowMHZUbG8yME5aNHNHSm94NnBYTXBUam8wTGZlVzlDZy9sZnErMkZ2R2xyNDBvVWI4TmxsUEptY0t2TS8NCkVjRkZxckFCWDRiZEdETTArNDd3andhc0xtTVdsK2lZdWFlbm9LSEJ6c1h3RFNvV0phdURLWWp2YW9PSA0KQlBxbS91bWdranlJKzZiUGhwLzQ1NTlqdHJoUDg5YjNmVTVyZUZNcnE3OVIzTUZuY3g4VWdiaVhhWFpMDQplT043OTYxODVodUVBMWRxb2VrbGxuazRndmxvUzV5Q2hNZDg5UGlnTCtITmt2VHpnRTBhbTFGQ21CWE0NCnhCYld6OFNBUEVISmk2SjJyUVdwWkl2M3J0UWFod21vdHIvUHJlMjljVVV6aDg3WXFCUytINHJBc2RtOQ0KeG9EVE9BMVB1RjlNT0xuazlodXN3aW1oeUZTZTA5dTZMZGVLd0Nwd0k2S09ScE82Z0Fna3ByRWVUM1VsDQpWRUJ4UlNJWUlCa2J0VGRCSWhkZDFrNmdaaU8zaVU0RnJQcmJtbnpVY1JqaXE2eS9mNFQya3JNeVZ2c0UNCjJaeVl3M1VrQmdXeWtPeWhCT0Q3djF5ckZjcWxCelJLWE5rWG1YZGhIZVhuNFkrNGsrM2YxTVExak9KKw0KQ21zK3VacVhBdExPSDlvQ2xZK25ZVTRDU0I2Wk5iclpya3FBMGhLL3F5TmhwS1d4bC84bTJHQzhjakE1DQp5cVdPNUdLeFFRMEcxUEVjTGdwRFN0Ym03VldEMWxmd29XY1RRVTIwT1RWdjJ4RVFTckVVYktnQ0NEVi8NCnlTYmsydWdJaHlDQnkxYVA2MWJSQUsrdStDalR4cUx3OGZmdWtqQnY3anFvUHZwOHlhbWhoa29rVlZxVQ0KMkhqSFlxWXBDMXVzTm42elB3dDB5STc0ZTgvVHlSMnpLNkNGWFdiMy9UdFl3VXFNeHhlQTlIc2hDNERzDQpvRmh1eUhSc0VHc2I4bmZSSkt2T0ZpVVBhMTJpSDBMVnV4Slh1MkxOejFYTkZydkdJWEZMUnlHWHlsMlMNCnZyODQ0Z0xvc3k2OHZIT2RyNFNtVGx4YkpTdk1ZY0tzQlF2bG9OLzRzblRzLzdjdVhJNTF3bXFUc1E2VA0KWTFXUm1yeWUzeHVUZzRtOFVtS3ZWb3NYcENUZzZWRS9mQ3AyZGVPd2ZINXV4SjdMVm0vNFhaRHh2dDFZDQpNZllyanYvbVdaWW1WQWNTa2hMRVE0Z0Y3RGZubUxXL3RDTGdodWFQUm03ay8vQmZQUVhxdnZzT2dnb1QNClBLbk5COWVESnoyWk1VWTMyZnVOR0xFcE5mdWpTR3ZDU1R1eUorM3g1U0VvaVJ2b3lSS2c0L2dpdXMwNQ0KVFFnMjRQV2VqS0dhNVF4Y3pTVFcvZkR3T2dCcnJwUHZHVTh3SmZndGZKRC8zYlptUUN6d1ZsRG42ZHRDDQpwU3djdFB1NjdtQ2p2VGhjdmFqWVFYdnYrajc4QTZGZGQwQkRiWHVsdXFOcDhrNWQyNFBra282ZnBwRmQNClZ6ZVZLajBRWDFoaDNjRWRGaXBRbmQrNTN1OUUwS0UyS0hSbjc3RStnaHFTVEZOa05LSkRLcFdxcmpmWA0KU3c5TzVhYVZ0M3d4YTR5U21qS1JWdHlONTB5Q1E3a01EZ2hyc2pLdnFKbjRadVlWeThaVWlaODZic3dNDQp0UmNHdURvWEFaSnNsTTNudFhRTUo3bituczJ6QUoyMlhuZ2lTUFNXSGVmRWdvcW5UdFB5ZnlWcThicUcNCmNKVmZhYzV1dzNZTWQrSnFKcVRrWUNhcDV0dU93czN6WCtxQUhRWStIdkMrZWhoNWJsaHB4cFFJaXB3Mg0KazlNVVd3T1dXOWtpQ1R0ZkNlZGRZMDJLQjllTENyd2FkU1Rwekt5NTBzWEtndmovUVZkd2pmVnp3QzhKDQowTWRyYkF4WEIrOFowdmVEVGpKU3hDWDdDa2VQTmJwUDhPYzg4WmZQejlFQlpsdUp6MFkxeU9MWGc1YnQNCkNvWHY3V2lYVzBjc2tlOUttbmpySHZsczNWS2paTXJqN0Jubzgrc3A1RjZmTnkxTytNTmxqQm9qMEQrWA0KRER1eTg0VWFyd1hXd3M4WDFyL1RPbW84aCsvT1I2K0ZCbXNUOGhHZUpNZllUUzEzVVBYNzlhN0VTRTlhDQpqMnVPNks5UWsrUjlwVkhMZU9YRXpDaXpNbkF0Nzh4RC9mcEJmdnRIbmo5MWdSaHdKVUJGNXdhSDVSemMNCmttL0xxMmpLTUFOTWRSR3RvcFVkUWx2TmRsUllHcVNQdU9IUTRPdlB2Yk1vcS82NVlNdFg2alRHVjlNaQ0KSE5uRWh0RFJGekhNMTNvL3EvbDJsSm9KYkFjOHFrZ2psWllWcUZUdkRHZjNpM1owZHlHZDZudWZSZXp6DQphQkZFSWlaWGtvOEViem9UelpQZW9UWU1rbEtTeTgwa2tMS3pUaVpCQ25zRGlETHhaaHZybktuSWF5dkYNCjQ1eldGSUhRbUxBWUhUQThOZllrQVpPWURzVzlMVUgrd2J6ODJUQzhUNFgyU1N2SGNKZFo2VkMrbEgyMA0KSjI1VmpSY1pIUmlwZW9udk5rVzBrWUtVQk5zLzZIU1R2QVg4WWJYVHliSVdlQ1VKb3dXdzl5bWRDajVPDQpneHU4SHdiOENBV0lTOWZwYklYdGh4V1Q0Sm0xRWFvWkhSeTc1UUlYWHcxMWhqeStsMmhkUHlweWNuQVMNCkRCSytsK2FIT2pSSGw4SUc2bGtRdzgvOWhWLytDN0VQVjVqd1ZqU3pFTkhSNnYzYzVHdHEyT1M3bElyRA0KQmpidm9FQ3NhajRRdkdLdUJtVHhWQUUzTUpybnlaNTB6REYyc0FWcGU3ZzdPWlV3OXdZWDkwc21sK3FmDQpOa25TcFlkNGxvODNZbHcwMWV1YU5JWnMwQmVQOTlhOW1sTEFFWThGb0N4R2JWTm9uUy8vRUJTbm1DSmoNCmNEcXUyM0xrU1hTNUhQa28xeDQxNDZQQWJzbkZtRmgwMGp3S29xUStsTXNsb0tyd2hoUnBDRlBBM29jQQ0KanFqaHpjejBIMG1jS0NQRUJrYWcwNUJqZE9URzdHa2h0WEcrSlFVQ1hYWWpvbzFvWHVsU0hWVnJwL3FzDQprbkkwVnprL3VaQlpLOWM4VHl3QW9Nb004MjMvVmhSc0xpU2xaclB1WUZXUUcxOTF2aDJQMWJOQndFZngNClNOYjRxdjUzU21ybmJmbnIvc0VjcVhFUkhEUWxjQTNGQWUwajJsRjNqZkY3ZjgzRTlIdEFoc0pObzdHVg0Kc0ZkKzdHU0pwRVBCTUUxTUQyOWRVLzdrekRxcjkrZmU5cG9HVGR4L25WMGt5cWdIVnBIYUovV0prUWNSDQpNdnJKQThFajdoY01hOHFaMzE1czNJYWJZaFRkNXFRUkFsbjlvRWNRdk96WUw0eWQ2b1Uzb3IrTm1wRnANCmRzamgwSjVCdUlFS0FMYXlhM0VreDNhQ011TjFLakh4ejR0TXB4OVhoTzZRY3NGR1FxSjM2UVNhTkUveQ0KNlI0SDM5dm5tenM1aCtJUkptTTN4eUtNS0pMUDZyaXlsWVRhUzl2cEVoeXYxZHk0KytVcXpIV2hxTExwDQpIem1UUndwdTd3UDR1VkcwZ25CMUNJc3JvWVlZekdadjIyK3RHS3ZxWkg1MG5zMkFaaTVnS1pZTk1ZWEUNCmtwV3N3V2NyM3JHZzFEcTY3RG9hQ1A0NTlNTlFnSDYrd2p2SWtxRFpOZEdTZ1J0Q214bjlXcEV1S2NZdA0KRWJjK3V6VlJaN3Zqcld3YTJ4aWJOajluYjBBOXAzS2Jkc3hBd0RqWkgrUXNSamRhYisrMTA0THNEZ0VFDQp5RmZUZmhOQmd1WHVnRDk2KzlJVHRaS1VYdmc2SFUxWE82UXF0NXUzTlh5UjVOY3dJaTJvVnZsU2ZMbXoNClZNc0FaV29TQjdxMVFCMVl1ckF5SWhTZ2hqcGZ4YzIwTGZQUWY4MndhUmxZRDl4ZlZQTXpJek1qOVpSSw0KTURuTFB6elQ5L2RyTDRSSW9JN0tFQjVCb0tjYk1sSndVNk1CdUFyVmR6a0NWL0p2Q1dYcitwczlicEUrDQpFdi91WlVtQlAwekRKbDRPYnVxa3c1TytUQXFTdklUNlV2QS82ODVhQ1d3bXJ1OFc0ZVlPa0lidXpjaVENCm1jT3hCMEZ6S2JvdWZqTW1zMmUrVlJUYmwyR2c1WCt1T0hPTnd6MUF2K0NOQ3NzT09XSWp1UnpjeEx0dA0KbVpHTGpmekJUQkltbmFEd1NaOXRJUEZrNlhzaCt4b044dmp4ZnhjeXA3dndYejgxb3RTWFhBemRiWll1DQpERFFmWmlWeWxNWDFDS2srd0NPWHMzZklnUi96VTJyQ242UmN3OUZaMU1MMkRzL1h4bVhFREFURjFpOGQNCnZVTVNPT0dOSnFkd2JYNytKbk1KVWJ4ZGdWb0FmcXdjL0NTZzB1disrN091VUR1aDBkTkJKWkxueURmWQ0KVlp1R1NDMElHWkg1Ym83bEJmMjZudkdNeXlhNlpQMGtmNExZWkFDTGZwK1luTzVZcDF6bE9xWllKQW53DQpGYW44TW93WGRDbWxLODdySmdOa0dkWVRDRnE4NDUzZDMwQnBITUFWb2QvS0JUNGxOaWxzUVJwYlltOCsNCk03VGZ2eXJsYnJENGdHdXNPR1N5YXdwNWF4bVkzRGV2bWpzVEJJOWVmTlR2VDJ1S3lWdDlrd015cm42Mg0KOENuNW10NUVYVk5pejI2L2lSa3U3enUxbU5SUmRrTmpHWW1vbk94RHFncUM5WUZQWkZaWlpmUUJIVkdTDQpuN2xXejVvdENDbHoyWUN1dEFwYkdYMWxJd05jNTEwRG9CQVBxVjJIaktiZW9qbklaRURKUlV4eHdJcUINClMxcEJUSFIwbElqaGtMWkp4Yi9ObTFKSXRLV2VNNHRORHlHeEtreHdVZUtyUVhMTjBuZW5mVXVMbEFvSA0KT1ZIZ2VGMzYvQjd3eFlwUE9NYVUwbCtWd3lQUktIcU5oTmErNVBpYndmYkMraUpqNmtWbDlWT2dqNUVZDQo0QndjbTZERUNKallCelladEtsZGZ2VFFBdEpub3c2SG96SHZ6RkJVUTVtTHJxQmIyb2l3Y2FxczJxT1QNCkVnMVRabWluaHdha1RPNEdOenh1R1hVTVg3T0JiMGljTS84dG1nVHlmbTBOQWFNNFJUakkyK0dZOFdGVQ0KR2FyNEVmQ010a05NT2NVbHY2RkUvQkU0OG9mclNWMzdVdSs1UEcxcUs1UXZ2SFgrVnVWZTJqZHBaMGpGDQpkN0NIQTQ3Z1BHaXI1MVlka2w5WmJ0TkpHTXdkcE9kM0N0bjJvL2c1MWRpOW84MDhmakNZUVhtLy8xeXQNCjVRNmRmV1FCZXpBTnN6bjBPRlJYNVhHMXhMK1hqWjh5RTZEMmtMQUxtbnd5bFp6aEtUZnZoUUR6ZytxKw0KNE40NmxxQTNPMXY3SlpkQmxJMlprN3IwcmhmWVlkTU5HM0cvNERBbmdKSG5zQzFqcHkrdlhpY0xablNYDQpkaFRsWTdyRnNTZldNZHhseWNWaUx4aTBmMzBXOHRqMTZteTdvL3pJZlJ0dnRYMnZCcUNsQTRKMXhhL1cNCnhUNFF4c2ZFOEdjcHhPVnlZK0IwNkJ6enNtNlI2VTUrMi9pNEVPcmJqV0lPdFlpcE5JdVZNRHR1RFZ6VQ0KMDVodFRDc1NPeUYzeUpwRUV5UFJkRHU1TFdwUVY0UjlkKzgxeDBnY2t1Vi81Ny9uWVBkeEkyUFZqZ3hqDQpOSGdxWVNQdVdkOXB1MUpCeXRWOStVZUlnck5HU000d1U3SkZpaUJRL1NZL01IZzN2d1E3SW02NTBSSDUNCkVJRUpNN25LaTJ6UWYyWVRDRFBHTW5YNUg1WGIxZElzTGs5V0haenR5dXh1TFdOT25HdVBqdkhha1FUNA0KYzVMNUh0S2R5TEtCa2djVGNoRW9RZzBUd0JkUWRWcUQ2ZnFqdkVqSDFRY2lrazJtOTdNcUNJTis5SGN6DQpDRGtVZUtpdUxGcDMvOTVOOWFBN1BYNGtaYUtEOEdmalFTS2xUaCtFQ05kVi8xRHJYS205V0wxMi9sNlYNCnoxWktNdmFxckhMRHJPM2tnUlYrczVuaWhJaklGWWlqcWhhMGpscTJlUFhyaHBUazZReG1jSzdmRWhVOQ0KUUFFb0JKM1NuSzRmbFlBV29nbmttZE1SZlBlVUNKRE9VeUYxK1pUSGlUbjYvT3ZkTGwvdFIwb2ZUMXRFDQpIeE42Sjl6Z1k4QklYVEpOV0NUOEg0RGo3bFBVM2M0U2VQNXRTSDNrSjc1b202VFlPNGtTT25BeDBGczINCjJKY3lpVkZLNFJVdkJ3Y3diS0RvUXNjaVNtQkdYbTU1VUVJU0ZFRTZxcEdBVHZHWmtpaG4yTUNxLy9HdA0KWFdCN3I3cGVyaFlqL3pjb1lvY2I4QlFQMU9jNDlQQk0zZ0d0M3FXRUtOd2ttVUpUZTdWT3JxVStiUko2DQpNbEJQUVJ6ODhLUERRSk5rZm91Y3M0TUtQUGRkdXBUVlFUOXNwK0NMdDEyRGhMeFp4ajMvZ0xnT2RPcU0NCnppN3JieTBvekx6b2ZoZmFxUERMdEd1ZHFpMC9tTUU5TlozdWU0LzRTRGdVT1RIZHVvODVpQmZzc1k0Mw0KZ04wYytGS0UvaEN3S0FCaVB0WnNPbThNOVh2bDNGQnRrdUVWbDd5ZnA1bmNRNktGZU9sSWdxOUl2Z1pIDQpCL1oyMnJCcXZCUWlHOUhEbG56VnAwK3FqL08yQWJ2VG13dHA0TTRUTWV5L29BeDhseFVCVXlxUVRtYlINCkhtTXU1UkRVUGcwR09oc0R5OE5JVjhNdlBWajg1N0RxRGJvYVREd0dIdnpyT0RuL0cyejZLOGx4TlFKMw0KWU9LT3F6QkVLT3R2V2FVNngyY0F5cTMvL3BmZ0JQMG1rSTVPSHQweWE5Q1NIdkRhbUVNSWVRWE9CVWhJDQp6WWV5NFZZRWNNejZ3MzBtWjlIQ0p3d0NtR1pRNWN2M25lb0dBYkd1bWNJTSsyaDNUV2pINTBId0dIMEoNCnhVc2ZwTloxY1VDaFhma2cwZHdSV1lCNU9YSC9lNTV3bllBSTRQZDUrVGw4NnN3dnFaTlY2c0NLWUpldg0KSVY0Vmlvc20xdnIyWkI0QWxKbS9tNTR4SVV6Vk1Pb1VFL1VzZGpBelNPa2JKLzJvaGJXNmt6V1d6Y3lwDQpOR2JWOVV5L2dkdXprWWpSbU53M2x1cTNzaUo2RktjZm9JdGtMSWhkb1N2eXNncmtHZFBHcmlzTGFhNHoNCjV6dk51aG9jZHl3TW9va3RqWHcxV1VXWFhKK280VkJKcC9Ea3ovbmMrRi9BMnF0RUdNektnYUhjUmZvcQ0KYVNCK2o5dGR0MzJmcE1BSnlFNTZCbFVoRDROdWFoWFdHWldCZTlORlVSb2g4MFI3VmZLSFViNW1QQXp3DQpDWnFPNU5ZbzRSM2o2emFIa1pydnVxWW1yblFNV3RQOVVWN0hMU05TVlYrbE9YUTFzMUh5R1EwU0RSNnENCnpma2IwakVTbjZjOVZ1SkZtVEU5SDA0b1RlNjBmS2FwcnZFSWc0Z2hpMzFqS1dxYWdEV0FKOS9rZGxScw0KcnFzNDFkRVViYVllOExkMmZncCtnc0Zpc0lOSjRWMU4wbXNSQzRHTkxsb3hQdW9ZeGhaeW9GR1lMVUViDQpZSmdXYVlGbmZKNHpUbVFzb1kzK09rR2JaL3JkSlpRNUVTazFYNEUwaFRTb2VMVGdLZ1hjT3ExVnRtV3YNCng2bXBEZ2VUVklqU0pISDRIT3dkQVlWM2p3OStYT3pvSVBIK0RuMGduaEhNSmlhT2hUdVpLNE5ieEE5YQ0KQUp0QWpxMDRwZ3VISkdUVjk0eUdMZG5EOWkwcGQvcHpGNUJzTmlNbzcyZlZkWkp0UVBPQzdFNjVZbXEzDQprSmJ4eldQREhZQU0wbDlBN240MGtQMFlQc0x3eUhmTTlsTXZVTTNnbDlRUElBUWF1dEI1UTN6bEt1SVMNCnU5YWJ3bGtkOFhWTklKT3AreDJacy8rYVkvbmd2bVNJQlpIMWRZRWJLV2lFaStkV0hrVlZ1blJsWlVvNA0KWmd6Z2JoRnZxZ1VjbSt3eUtqcVFXMUNTTllGNmFkLzIzS0Q4VFd4LzJFbUtIeGNmbVNaMEF6dCtMbFVMDQpIMnNJbm0yNlJPK3ZVbEhQRTFGYndjUkFOOWlnNlpIS043ZEZYWEE0R0pYZWZnRWU1cHBYMWxiRHJKajENCjdKRHNZdGgyaXFoUWxpRlVyYjJLUkFBaEdJWWw1V0s3QlZNWW1acnBYb2ZqYmpySzIxZHp4Y2ZBekNjVg0KRXhMRFFJOUNWdUtTMzF3R3B2SDlxc3hYUWR6MnJUR0hIeGJLMXJHa0QvVVdWMzJ0K3BLaHAvY09ObWxJDQpyeXdrckF6NGtqY3E2U1V0dEhhOGhTN3JlZktwdkk2SjJGcDVXbjFVMU9ZVGlObStoaWVCZVNoaGtpc2wNClJicXY1STFjVzRmTmliT29rL3dNUmhwcEtQNXhmb3FqMFFkbk5JUW1pU0xOaGlnVzJXM0RFMDdIbTRQVg0KRVZyYllMQzdjR1MzVUpncEJTT2lYWWk1eHArT0RKczk4Q3ZZcE1XWXJtN201Y2luaXhpbWIycE41WC84DQpsV2hjNEtOUnc4aWNHWFd6dXhOQ2o4ckVuN2ZXK3pXR3hWUmJGbFZVUFhUU1gwTHA1YmYzNTJpS00vTWQNClhkaGdLZDlxL3NKdEk0MTRJL3ZiNi9Ldks4bmdDaXJ2Zkt6M3Nrd3Z1MDRXSWxBRkNqSFF2am9JVjkrLw0KRHVYQTM0Y2kvNHVyQzlrSUhGQ2NUamEyYlBOTS9Wb21CR05EaDYrR2NaZjZiY3liVFVuTDJ6L2ROVW41DQoyb0hYdWdGQTJiYlpibW9uVDZqUzhqMkU1bnZoNXVSTU9CRDdaRC9XNVM4Y2F0VFBtSzJPTzdsOHp3cVcNCjdMR3BrS0ltdnFldW1hY21UQjhHRmNINkJtRTQ4L1lWOHBJSmJCWnpCRmNnK0F0MWFYZm5LbU9BUTNEaw0KQk5yejJXL0hWSWxFeExXcytXUzE0RTZveUZkQ2MwRjdTSCsyM2cydmkvVmp1amZNdFVWVEthNS9NdWdhDQpBU0liSWlBMjFwWWJXdHhmZ3NML1BYRjEyZzJwSFY2eFRDelhUZW1mUm1RbWM3ajdjRlFieE10RXFQcDMNClpXRHNPYWc1N1Bjb3ROdDhMa1czWk52NmZ6aDNIR2tuK2JITlU0d3hZczYxY2haVkFCenl5S2wzOG1XWg0KOW5sY0tMeklKUHZxcUUwUzYrYkV0Y0dCNXVYb3EwRnRtUm0ybWMrb2FzZE1RVDRxTkRleWE1TEQvOGUrDQowdUswd0JnZ0FlWHBEczI0QmdkVVE3WUpiTms3cjNrdnFuUFRoNzVyRUhjNmpEV0J4RGxpSGlFN2NJL1ENClUxR3oyWmt0MHliejVTK3E0dUpYMmU0NHhGMGF5UE02MUdYSzNuekNFOFhxK0hFTkRNUnduZDZwWlNHag0KM0FqOVFvNUIvY0QyaXRjbmp3K2FJK1pqdFhjaG4zRG45T1l2R3FxNDBZK1ZOSGpySkJPeEg3WTZueU1wDQp5NU1QczErQzhpQjlBdzhMeW9zQkZTMHVtdmVwQlJxSytnSFNvTHdhKzBOZXRQZFBDNkZoZURiNXJkYVYNCnRGKzZCMFd2dW9MOGRpZTRORkh2aWtmUVRzWUFUcHd0Ynh0eEpmcDFFdm53YmcvOWdKMmlhc2xjcU5teA0KMWtFcWxDcWQwbWpBZWtNQTh3MkErUHovNFZoWmVWdEJTZ085ZFJKZ25za2hmbEI3K2ZxNzV1cy9WTVRKDQp4TFZycmpDdlE1clZhSHVjSm9GUko4Wlo4ZS8rcG9oMVVFODBsdTlKQ1NjTWd4MFNCYjcvZmJDM2IzOEcNClV5T05iRnZtZWtiTktPVkxwb3ZPWVlRdVF6eGdraXQyWGEyVUxjV3VrbnMrQ1NqeHJnT1hQY2lXWktWSQ0KdEtQUkRmR2Q2U0xOV1A0UCtPT3JCSGEvL1VTTHpLZmUxdjhYWXlzYXB4MEJqU2NpcHkzTVBFSXp3Ni9YDQptSXFrV1lhQVlSQytpR3VKa0FHVFJyb2RCSmZyNFFDRU9FbnlFT050SUsrOUQvamxRY2xSRTZKM3pCWjMNCkdzSHJpSDVQenNiSlFBdWwzb0pKV0pkN3dIVkxzUStLU0JyWkJLS2prUkljV05INVZCeWZiU3doc2FpUg0KVS9xYmQ5TXd4TzhOZlJGM0NKc1FuSm4waWVLdHJZeC9BeWtjeEJSVWkvd2YzK2Mzamd3WlZrbGNQa1VhDQpmMUYrTktva3JuQVBzRFEvMW5aUmN4UzN1NThYNjhhQW1tdk0vRHNRazFzVm1CWjJLYi91Yy9vMEwrUTINCjlTTXBCS09rOUN0LzVKRUJEZU5FQVMwVzM3ME45bVl5VmxNT2l5WE5VTDlRNDhWNFA5NmNmc2F5bU44dQ0KSTc1WkkzejBKUjZHcDB6S2ptb1dxbXA3NjNOMWJKclpDN25aaG9vRTdDZjA2TWREZ2tHejZoMHl5ZGQ3DQpBakFEV2NmZTNkMTFWdHlDUVFFSzlPaHIzMFM4YXhzRHdhTFNmZWNqWEpmM0VUYnFBTzRNTmsydkQ4aXoNCnRReERBQmQ5eG45UEQ3bVpnOTY3MVAzV1BKcEFvdVRHNWJ4bkdRZ2dyd1NPaWJlazZObFVwU3lJdGYxQg0KYjdpREh1RnowWGFTNXhaVXRMUm9TczNOVC9PbUFBSFQ4R0xYNm50Z0E0RjZPUE50cmFoRFVmZnpXMjBoDQpwT3BncTJralB6RWVMMDREVFVDZVcvYUxEcWorQStDblB5Z3A4RXBac0xiRm1EK1ExTldlSWhrOHU2aDYNClk1WXAwdDNuWUJPLzdYRGhzZHhZR0lja000dmZQZ1VXU2poRXRML29ROC9XZjY2RWhGMWxobi90dm9qNQ0KcUZNbnZrNnJhL0xmT082WFZHWUtBdFdvQkpwNXNMd2RBd2wzSVFOR2xlakdxKzJSaWpzNnZIRFJLTUhODQpTMzhEbUxsd2NYdGdjQlMyVVVPc2wxd3hEaXBXYSt6dkdXek55SVNabGF4TjRaSnBZNlpuQVFjaWR6ZG0NCm9lYk00RW5sOENEVUVuaTgxNDFzS3dZOXBrTnNFQ3Fld2sxRlRQVFBnZHErQ1VlQ1lKWmdjby9WYnd4Yg0KeEFTUFZLZHM3aHpsbTFZV3pKdU5PU1pEZ0FjUnhRY2pVNGlJZ1NhOStrL1lSbmdzdWNPd1VBZngvTDgrDQoxT3N1YVpyRVlzUkFmTEFQWlVMZXh5aU5oQURTWm1lVWVyQkNZMEVDK0E0RWoycHA0K09oNXYzQUR2VWINClpTM1lRL3l4ZTh4dGo1RVFDSzVtdTZjNSs4T2RxelFPdTY4aERCTVluOFprSk0yQjRhbjZ3Z3RPQ251WQ0KZFVWMmhYeWhuS0RuVDcrOVl6c3hhVjNlMzFnRW9VZ2ZtdHptMEJUOWZnV01MUHVpQitWMm5VMWxyeVRnDQpRamdCNXpQV1ltWFBMaGNHQ1dnWkVXOThIcmliTXlVb3VTeldDTnRlcllKZUlRSGgya2JZVXIyb2haSGENCm1JRkRvWjRnRzNjTkdFQ0VyRXRrMFBZbWtadUNpWDRQTXZ6cThGbzlVZXd5OEZsNjE2ZzNVbmUxY1FERA0KcUpzelRNQzc5bHhueG5rRFhvN2E5TTdsdHU3VStPdEZSZVFmd0RoeWhIcENUbXRqOWJHWnZZR3R1cll2DQp4bE1jMEZtNkFOZlpIWi9RVGhzQnpCTjBPMmhQTWlHTlF2Wk9JS08wUHM3S2tUK3BGaFFjeklZTFhTcjgNClZXSWtLN1NuckhqNnF1YkFGRU5hbW50ektkM2wzNndwZGhBMHNWemxxSWhtbTFKNzN6ZFEwSmRCbkxINw0KY2VIU1NNYkJJSXJudndHclRhcE50cEkyZE9ZVlVYalFjeTRpQW54cDVCYWYzZFdvek9aRTJsL1FXSmZYDQo1M1NNQTdjZ01NOVpvbHVucmxwK0Rrcm9ibGdEUU51Sy9QRldlaGdFTFVZNkxTTHE4czhNaWpIU21icnANCmNwMVV4ZXVyUnRiYnRwd0hWSE02SUkrRHhYR0svMjdidzdUQ3BiWnVlbDgwd1htK3YweUg5ZGRFU0dGcA0KZC9qQkl6cmNhZHB1c0lYamMxems2SnA4cUlpQjd3N1RHQVNTQXI5dURaeSs4SElmS3lIdWRkZVNwMWY2DQpIdm1OM253cFVqY2c4d0Y3VnR0Zm9vN3ZHblVHc2k2TVJXTzBnWllsSnFUMXBqUU9hUnAreU5xWmRYWHENCmdPekhPNlV4REkweDhFeWhLTjR4TXo3dUpnZlh2WW5CRkxxbGEvMVRvUlFTais0QWJrZlplWUJrZnFWUg0KcWdEVkxMUCtwVXFJSUtmeFZzWHQxMXdyMCtnRllUNG8zc3ZJaFVNTDZ2dmpXNVNDWmMraVlHTzJzZnJIDQpsS3l5dG5GTVpIbXREdWVLK3VlTmVJRUhVOTJxT016dExiQ1VoNTd5dnR5ZU1xVjdNb25XU2NnckxKbE0NClFLT0ZwUnljdkRkRng2a1h2WWhIWXMrYjMvRElMd2QzWHZKOHpJTnRPMkx6MEJSN3B1Ymw0Zk9rM1dNag0KS1dPd2w3cWQzVzhTRkRZTm1VbDJWRTJhQTVMSy9MVzVUODF4VXNUeHFSS1JaMCsweVlBUjgwTFpaTUJkDQo2WGxtMThsM3VaMDRrOW9VbERpb1VwU2p2LytrN1hyY0pKeVBqQVFJMTJrdEZVNHFlc3VOWi8zZjAvYnUNCmJ1dDZDNnREVEdaUHJDaCszRU9jYlp6cHBzV0xrSGJHYXZaMWFNQnRETFIvd25ic3FZTmx3eGFXQmtJaw0KSXN0eVZiM1VmYzF4Um1jR2h2c3ZTQmRjSlFQVHJpSHIyVG5UdDN4MmM1S2hvZ3lSNHV0dlB6dTV3NVQyDQpVTVpza1FJRGhienVwdUpqVWR5c3M5Q29kcjR5UVErYVI4ZjNGV2tHbm9MZGEwOTk5dHZtODZ0RzEyY1INCjNkQlhvOWdFNW1JUG1ZVUxCeVdLQkRkK1J3cUlpQ0xxdFA0dWNHUThKZ09VdVlabDNrelJxTUlqWHRHYQ0KRmdJQWYzUk9idmpma3RHTEgzKzViaE53UDdsS0FFYjNJc2E3b21ad3JHRFVETnRJanZsM0QzRXFNcUs0DQp5QXJnWHpmdDhNSnRpeGgxMjRRY1l4RENRMVdkYUNQM004RHZBQUcwTkU4M0ljNndBbGg2a0hnc0g5N24NCk5tbGpBdnNwaGNRSnovRGhZU3huTm9uMTVTSUYwb2F5V3dON0hJbU93R3ZpNEc4enJLUll3VUoxRlpEbg0KUTFkSE9xTGlrSjhNRTZZdktkYXY4VFI1c0tRRS9HQit3QVZtSXlEVEZrWEFJb1AxR1gvRHhmNHcyaTAzDQpSWE1WU3lMMXd2d3ZEYThtUE1hbS85WlZLNk0xRy9zVWNOUDlWUGZoNmFaV2tzMyt0TUJjVURZR3ZQYnkNCmRVaVFQQjh6Y2dNeW4yZHBLSDZmRzdtTXV1UkNCZzY5Y01KdnF2d3I4elFmUmRQMlRMdUpWeEd2eFFZbQ0KQThiR0NOWGtWcXRnOWhyR3diRFJCMHpqYmR1RFlkOFJOMkZTS01kNWEyNXc4ZklmNWZrVlhCbnFoeVBMDQpmVGYyUkdmVnhQMklROGpuUVlicDhqYUl1cW5wQWJjcy9FWnJMWUtkZ082bjlPSVhySFRaaUtNc1ZlcXUNClBJV0pkYkVtbXJJRVFiMkVQNTNPWEFlOXB1NktremlmRGNhTzE5SWpYRXljYXdKRmo1bGxFeThINThYcA0KUkUyRE1FSlp6bnBlMldZQjBUT3hrY2prNUsrSUhQWklxYjRJZ2tmSVlKd3V2bEwrNkpUYnl0TXBabVhwDQpPQWhFNTJnaThRWWc1eStxUExRbnFaWkhyb014TE12NEd6ZnAydmhIa2pVTjFpQ3dzZW4yYWJSaG5CdmkNCkJnTEtXYTJsY2hmZSt0MkFvaEVQbVBjTWFaNWdhVldKQVNPK3NCbndJRG13WkNSbkdKZ0ZTc0hnZ1JNYQ0KckVnTjNkNmRqd3E1OTFjNzZNSnIraWMycVhaNVVXanJ5SkdJalA5OTdVdExTVk9NMGFmUjZyR2szR1dsDQpvUEUvRmdnbzVsYjV6OUpRZStzV1JkcFIxNityN3JmSXFKeEFwaEVST2xCOFV6cS9jK1RuaGR5TjQ2a1MNCnNETHcwbDNIOUhCYmFwTWg5cGhCYWtWSEZEL1g1NnpuZkQxUGpDMG5BblhBWStWOXNSRzVRVitxS1BBNA0KeVI4elRZdmVJUzNaMkpmVzBqdlovVEdlMElLN2hxYkJmTHZxNTZlT1JFZjhyUUE5WXRhb3RqSFJacXo5DQpOT0NLZEZ0MHNDZE5abmx2Z1ZYMW5XSFF5RG1hbHlOZU5SOW44QVpTcVZQb3VEUVdrMmdtVVBUZnltc1gNClVNSkYxRXQwOWYxd2dEckw3NkdVcXlFRENsTUhJcVprVVlydjBrMzhZeUFQaEM0MkRHMFBPbFhZVE55MQ0KRGZEVFZ6SDIyTHZDSkliT2ZnL1NqcWJOWFJRSDJ3K2NiNlM1K3kvZFBnbGFVa2EwdXRNLzEwbXBTejFzDQpJeXJtNWp0SVZqOVR2RS85aEJvamFyNmhTcWU1TjdyUnFHR0Q0bzU5dEJIYVZkM09xVlJCckQxWEc2T3QNCjhqMGdiaXhra1N1T1dJOEtnUEZqZGl6WUhndGJ0bUc1VXhucllpdHJmQndicmFGYWl1NjlHSDBjZkhxWQ0KWU9STXpuaWtyMmg5VG8wNml2YmdSN284eHVJemRNZmJPcDlnbnVnR2QvWUFnWmlPOUQyVitQT1J6a0FVDQppUUN5d0NOaG8xdXZQOXZ6bnNGY3FnUXd5RVJ1Z0xUeFdZOWE0cWRVSXp2ZER2enJHSGdOaHB0eElHSnMNCjNKZ0RyTEc0eEZrbTFlYzJvUEozNVU5bm8zbENRNXU4UGFRN2Z2c213SmZrSThCVGV5NTVjTWdha21peA0KTmcrTnpxNlFlOTh0VlE4MDQzL3g5cTg2eDAwSzRrWXV4cHJtY0l2dmVCa3dyUmpTTVdhWElEWlV0Z3NODQpiMjVFTjRkbDlOZWlhNmNpYi8wNGt4SjZUMlhWT2lnME9kalN5TWIrYU4yaVVGejgzeUFKNWxjT1dIdnUNCkdyUE9vK05PcnNqMk1lVGJBcVh4OWsyNmh1eTRXbnRDb2MyVksrUm1BRXIyUjBpb2lWYXMrNC9SWUpGNw0KWHJiZ1lFQWNCNVVSOG9MOG10ZDZONEVXSVh3YmF6YXBqTlJid1lGUUFxdE1rb0RCenpsRXo2SHdNUS9CDQpvQ0NudHEvcWY1Q1YrNjducXlpWDhTS1FQZ0poM1lyTStuT0YvVmU2VjZwYS9nbEUycDgya2xIRFZhZUINCkFUcWJiU3RFbHlNY293Wkkxa1BvRkovcEJLZ0ttelY4V1NqYmNxNzdBRFN0WDgrWHc2YU1oZmtGVW1FQg0KR2kxam1yeUt4UEhSTlB2anBZek5ML2t4Q29QZWtLSG0xTHJkK1g1TkJHVS9Qb3RZVFd0YXdCQndkK1hKDQphYmo0dER4am5teWFWZ0dLeGpSdnFYb3Vjc1ZqaDJxL3pFTWR0WWVCWEJ4eUdaS1E0blliMzRyaGRZbzANClNLWFE2TlVKejNWci8yQzlTMm5uQnRHR3JJWnVvUG9VRTlIWThESElvRmZGUWU4bUxhU0hXQmJsaDFSMA0KYk51bUFBVTB6Y2JySS9MTzRxZTY5SXlmcmNuUlUzZ2N2dHYxZG9UUXRRcGkremZvR1F0c1NJSlgzWGNzDQpVWnVzUmZMdlRFZ1hURDFyblFwTHgwRHBjRXhZY2VZd0FYenFkemFyN2FzNFBnT0hvMlMwcWc3R01ucysNCnEwNXVwTEJnenlrM1F4WnZ2Tm5PMzgvelgrNm1iQjNQQ2RjeWhNQ2I3RHBTOExIWFR0aGhqTjIraEVTOQ0KaVRvUXlIQUMxS2hSbmlvZzdBcjUxblo1elJ4V0ZtSjI3VWNGVW9QUnBlMDhDWThhZHV5YUhsU1lVdklODQovZSt2dVNFNDRncUY3ek1Md0hCRE1iai9BNDVjbHZCTGwxZEJmMmc3cmc4aldCME5vdFhqT21SYllmSVgNClhEbmphanFRcWZNUkVJWVl5R3V2MnRlTm9pdlg1aE9WSnQzZmdqTFFSYWc3MmtuemRya2xLVFpsZ29uRg0KMysxZGZLYXQveFdGM3dZQm1GVGxLeFN3ZlhNZVhNa3VwU09RblE1a21LTjZIeWt0YlF1dDRleGlFbW5zDQphU01INzBqblVtaG5LS1V1a0R4U1M5YWgvQnN1V2V2cUlPcU8zaW15eGdsR3pTTkVLMzVIQUJBLzN6Y3ANCjZWTWMvMHJSU2hNaXFGcVl1Y2lVTjVXSTJuSStVdTBqd3duMVRLbU9aVzlTZkZNaHNTUzhsa0hySnNQcQ0KMzVYY3R2TmNCeFRNZm55RU9Gb1JMQTBkWENLbUtZMFdrMGtSN0Jja2VYMEUwaXdoS3YxQmNsbmt4VDd6DQp0YnMzS21jYVdvNjNFSkp3WkJsemh2V04rbVRRazc2Sk0rT1BseEh3dVQ3d1hXQUxsTDZKdWRGSDJDS2gNCnJraTdRejRxd3l5OGRYZ3lTZFp0NGpaM205bk9kYUs5M0VzZ3FvRzc0OGNZTUt2TmI3blQzVVA3WU1QVg0KVlgzcDZBR29kaFIyRVdVbEpWc1huV3VrRGJWVDIyUStUNnd2eklxeWU2YzVDaHhNbW1HUHRJdDI2SUpUDQpnR1NNU3BKU21TSzkxWmZzeVB5c1RHbGlKaTBxcWRBTDZ3dWcwYVVGeTRQc1hVM3czeGhsOURha1pIRmoNCkVxRlhVOGt2Z3FDYXZNU2s0bXN5cFIwb3NiMlBEWUNHVlVHbG1XclQrY0ZoclRWQWllZWRUaWF5M0pKNA0KVlVZR0lrQUNoazRyL2dlVVVpNWdIN1l2Y1duNjdaKzhkcFNXRjErT2VPYlROOWpDeDcyakx4U1BocVFUDQpwT010aUh1Vkc4TnpyVHlOVXN2MnZaOGZKY1ZGVE05MUg3UlRVY3lFNDB4WEQ5ckROZW95OW5IUHZYZ3cNCjg3cG1Rd29JUFUyaEVQQjB4TXRnTkwvSEd6ZWxJYnovQ1lXUDJPMnJ3QTFqQnptUS93RjU5eTdGdlo0SQ0KMlVzNTh1U2hveXV6RlZMYndmclI0VUU0ckZDQWo5ZkE1OFlqSFI5dHdNT3Nka1B3K245RWU5aFQ0eUY2DQozOWNnRnR6NFlhOE15Q3VtZUpNUTZZUjBHUHhUQTN5ejd6M0RocnVqcXBJMk05eUR1TEVtVzFuaEtwMlYNCkZLay9iUkJ4SDYrcEluZ3hTUytxNnRWNERKWktCUGwzQU9ScDBEZzBwNlRMZkNnczI2V1NTZ1c2amdMeQ0KVWF4eXluV0IwQ1k0TDRRcVJlMFo3ci8wbjZPSldtd0ZMRWtzdS9keTErWTMybUY4b2dacXRNTVhtbjNYDQpKNGpNb2ExS0VTb2dKTmZQemhZU1RGS3d2U0hFaWN1bDFFQ1owdlB0SDhIVUI2cGJVTlI3QVd5UG9CTlcNCkxSU2tDem5tU0tyZ200bzFDdGt1TjJBQ2lNbndld0VqTDY0d3g0ZzBIZHF0L2xPSGdxVkRXYk9IZW9pag0KaEFCZDNCZlJpYkFPNUdvRWJjMkQ1MjlHczlmZHJpUmFndnlOUE1qN0xXK2J6TjZJUXN5UXRIT2pVd0pGDQp4ejIxRnllU283VHFtbTBUUG5FWFZWdmhXeHVYKzV3NGZDMzRSSXNSWU9ZU2NtY2JnYzVGMXlSK284OVQNClRxbmtmMnRLWVE5RGhBWGxHbzV5TnJ4Y0txVkhMelp3b2x4QkhhaW1DU1RUTm9rWGE2aXJJcCtrUGxxOA0KZ0JjR3ZUZ3lBUlJneEFOYTNLalkzemw5Yk14eGNYN1NqUU0wS3hZOHp0Y0hoNTQ5bFA4cG1DUmM5L2tIDQpZQXJJMVhxYi9PK2k2ak5GR3ZmZlRXZTZiUE1nWUtmV3dHbU1sMWlhVTk4K1d1dU1Ka1k2MXpKS2JWaFMNCnhZbVUrdXFxSzVjaVNqWldPanllUDBZRDlnSkpPbzZpdzZ4SGtyWFhjNENqYjFsY0VIOEhORTZ4RjF3Ng0KWnRsNC8rQ2YzWUpvMlhEeEQ3Rm8yWW9pZU9sQkRPNjdudUN5NHNzMnJGVDZHa3NyMzRBNFNRZ3ArVUJsDQpkYTVFbS9wRnpsVUJrQ3dJSFpHYTZPYWNJUUd2VW4zdTJlUkZxdkVmdjJiRDh3ZnVITlY0clVlNkpueDANCk5DLzV2em9heUwzYVBONTB5RVdvWTcxaks4Um5nSkVTellmdjFKWUQ3TUNpeWxKSk5MMzBrQ2IzR1VsVg0KYk9mYnAwTEk5dHpuTXA3VEdjSnNXZ0JzTmdldms3MnhQYWVNVUl3REJWUTJ5eFBVODgyNldPcTUvWEk2DQpweGRVSDZtMWhVWTl2WlQ1Y2dNV2RtS3M0QzIrN0xGSHEvM0lZc1huajh4M3RxM3YyUUhsVk8wVWQ0bXgNCllGZTNSK0kxbjZ0Zm82TlZYMUhEMHJVTEtDVTRpV2p4QkpGL3pNa1BEZlVSR1NKRU04MnZDR1c1cjNjcA0KZDhNaVpTVWpyd0U1YitLSm41UjdsU2dBU1IvUGY2aWpuSXQ4QWZySzZyUmZiQkF2NXdsaG9tMUV4MzBpDQpNanJWdllpbUVFOE52WHBBcEN3SmUxUGk0cVZaMENXM3BsY1ZYb2tkZUZVWHczeVNpQ1VXa3ZxK0lDclQNCjhENmIvSG1Sc1M3MHJKZnFtTmtmM0NBcEEyOFJQRFErcXhLZjVFTkE0QWxBbGhkeDE5L2RkQUZUb1doOQ0KVld4RmdJZW05VkR6YjJYanFLRS9UNndCOFJ0dUlKZGNFdzRta3FudStteHA3TXBobjUvVU5lYVNNcFpkDQpFbzc4cXhjQ1FGWVVZZzgzamhnRkxyWGZFYVVMWmFLcVBzRlNuVWkra2FJcmREUW9Bdklpc0JGN1dlOWUNCmkrTFU4aXJPbklnYmI5TjVPM285dGh0dzhuRW1wYTRYaHpqa040NWJPdlhmRzBEUHg4Q2Y5WGZLdjJWQg0KQkUrUFYzWEpDaVZaS2F3QVNKTGR4b2Zsb0FBdmVGWE1mRlZQbU5sQ09GMVI0aXJqRHpueEhBcVZrRXVqDQpOKyttbzdnTlY3QllFc3lvaTRSeHpJeW0ySWJURnZhR1FRREpHcFZYNUYzc2xyV3RZanBFVGQwL2hYOE4NClBnUW9iMVV1MEVyWlR2Q01GTVN1V3FMTEVYRWhSR09ScmMrUTNDZUgyNkp1cE16RkdzVnJPRmgxMyt0OQ0KeUNnNjhSZ2Mzc0VXWWFTQmNBRmVQd3RoSFJlZmxwWUMyYXRaYmVUWWJsdFYyeW05VWxzb2g3WUplaXFrDQpabUtIOGltNUZFSlFEbWwydjR2V3A0ZzZSYnFGVXJUby9EdGtyT01OR2FyMzlyMjV2amZIclpLUkFvSDgNCnJwTXp3NnJPUytWV0tFWVRKdVZaNEIrRU9FYW1nS0ZjWDA0OFdpUkh1a2Z4MURzQkZHUTJHcXQ4cjlUTQ0KaWp0TldQai96NWh6YUhNWFc0L2h0cTdZa00xbGZwUmZuY2RxelViZWhrNTU3REJhYUF1ZURTZ2drdGlZDQptSXp5M29aKzNPTDV5blhLc0pjbFU0dWdLU1BqVmVxNjA5Sm1BYytmV1ovbDBQRlVrenp4SDJwRnpZdkINClFrV0dBdzFQY29lYW9WcUptK1k5c2ZnaFlxb2NUUlZJVkNCbzZEV3lZMUF4T1dmeW1PemF4VjFBZFlFaw0KRmpDNE1nalZyWXFXbytUZTlqTlNhMjhrVVo3VXdMaVpjWVdPb2lDRjFzUnRqQUZsQmZCSVdHL0QwTGhmDQpqSWV6VlU5Ly9pUVVkQnorTG9kRjBWTTV3NlFlUUVHNGNlSXdZVktRQWRhTlRpNGdmU1I3NmZTWW9uZFINCmhWenRaTmh5WFpZblMzVWMxNE9UQS82RXJCKzNjaERFeVFWS242SE5zb0cyKytBeFA1UWhsTzV0SGRZLw0KSUZTUFh6YXZmdTBiTi9tU3hiL0o3YWU1SUxpakNuRGFKK25NSEJ5eTdaZ1BFVWVSenlJKzB3NjRoRmhhDQptTkFobkpZS05Qa0RSVWxaclVPMktqZVVIcnYrR3VkelZTRlJteksydVgzamxlSGZRekxIeE5BVzIvVUwNCmRHcTF1ZFhFK29yRE9zbXd1ZEhnWFVrSitZUGYva3EwVUpNZjBqZ1NDMXlwSTM0UGZDUXJadHdHelVTcQ0KNUxxMjRFTWpJbW9BRU5EOHFLNE5wQVUvbmhxbDhlK1pNczBMZVROQm1VeEFabHBNMHpSTXMrSkcrTEgvDQpQRUozMWI1c0o3YkE4UTZxMndIRkVYOEw4Q2tMZDA4Y1p0dHc2RU9ROW1KOXc2VzE2ZHVWSmRxQ1lOcFcNCnBYK211NW5ITEZJZ1BIWU9CRjcyN0tCdWQ2NENZcDBaMXVSenJmcFB0d1lEdGtFeW1SbjVsVk53V0d0Sw0KcUppKzVnaHg2N01mOHlpd2JmQ1VGODYvODhXb0ZTS3RwbjN0NG9OeG85dnBYVlA2VmZpc2l5dkZMZlhDDQphUU4yQ1RWc3hCbGNYWThGVU1Edkw3WSt1SWZVblFVZ3g5c0xVUDYvbWMwWEYrUzlwM29JSmcxSVR4cGkNCk5qd3g2MndCUENzQ0tqMUNTRkJITEZpejNQWnU4cmk4bVZaSC9UTkdvZGpQa3EwTVdjbktQcW9aYnl4Uw0KMVJaekJRaXhOYTBvVFZ1NVhkOWV1ZmRjeTNJekVEc0NLaHhsLzVHNUVRMGhOQkZ0NkNUQVZDU2tPc3pvDQpCSy9NMG1pWnEvNWJhU0lrbm1YcnBOVXNaT3hYeFBSdFE1RDVjT0c3akNLMnVaQlNMbTJSN3prZXNuQ3gNCklyU1FROVNzTHhtaWgwb296d2pZbGs2UFVHbVRBNXpjUnhTMU5LSHdZekEzRWd1QjVrSVZsK2Z3eHo3Mg0KZ1NyNkltV0x3L2hsVmdNaFZSQVcvL2YydXFqYlV3Mm9NQ2RERThEem0rczlHZkFJLzBzWmtMWkV4M0YvDQp5ZnJwcnRvbjFUQnVySTIvZ1VnN3pINU0xL3U0Y05RaDFscnVNV25maHYwZkl3eXBrSmlDVmRQdXNFTDENCnBUa0hERm1rWXNtNWhQTXZ5MzR3Y1FxSlh2VmNvUXhkclk0ZWRqV3YwQTd6OGg5WGtzOUZGL1RabFRmNg0Ka1B0ZnNIbzdXaUdHV1JEMDBWQXVBMmdLcUEyUlhlenlHR3lIU2EwU2VRN2U2RU9JL3o4eTkzTUV0NThYDQpjdVhuc25hVXBwVWtxMEhsNEwzRVBwVjRDMG9TMDRjMW5RVXVXbTV6S0RUVjVmWEkvNDF1VWdZM3lMc00NCjBhZm96Zktod013a0pRSERZQS94V2wzTmVJMnJtQ1U0THU1SXE0K05pZEFoZnVwejlkZXA0cVpoWFJpeQ0KS2wvc1pYSENaRzcrdGtzVE0vYmZBcllHQy9DSmFLVkg1SEtmUW5pU0sxT0hST3pWRmlOR2t3K096WHRODQpzL1BieUxmdGNINmdZOUJPT0w4STQ3OFltR0Q0NUNJcXJXekFWZitKZWtzZEFlcHc4WW1WUFg5aWZGUVoNCmdobXdaOE9XUFNJZ2lhcENBemtuY20vU0tPbHhxallkWjB2YU5kT3ZLQkRVbEFBQ1ZlQ1c0VXlGN2srZw0KdTdCTnFFaHlyMXJBQytTTUh5L3paRWFad0g5dlF6WDA5a05lUlo0SHhjTFNLRm5UaEp5Q2V6a2o4RGdKDQphV2N4ZFNXbTJBZmdxWkUxQXJUNkMycGhrOHNreTJFN0crVlZwVzEwUlBGcWpaSDJFdGRFQi8rajJLb1QNCjhUWnlxcnJRZ1U4RFp3dER6K0VpNTZPR3loeE5oUkZhdk1hTWlORWFjWGFaQTRFM3BqNkF3M1lybEkxdA0KY1hKUTZNQzczN2hzNUJlRWRsRmhkK1FYZHp6R2QwdlBZQUlIL2tuK0h3UC9yQThOVE5TdStnZFNSS1FuDQpoU1F3UTczWlQ1dlEwd3RFN1djTjlPLzlJZ053ekpWMUM1b3o1YU5aUUlOYU02MFlRUVpoOG5HQitGK0sNCmFYRU1FaGpITzU5amdTUXNZdmJVZ0hTUkNIMklxMEl6aFlVcXN6VFlWUCtnd2lmSnVDbktISXlyYjJmWg0KVndsdjNKQUZQOUVqRDBETEtycUprdUtIdXU5NndCTEVqaGdqbzl0d0FaaWs3T2pQL0dNNkpoZmNwdy8zDQpCSUdWZ3g5bEZwNGlKY0tRakFHeGF3a1VzNzV5ZDlSUW1IZWhzZkRyTE9ZYWU1V0hjUmNkZmFmYk9iWUYNCmczNENkL0VBa1g0Yko4ZVowZlNRbEZweTNJWUhJZ3dFUGg4REhMMzFSQkVRL3R2VlNGTElndmlXZ0EyTQ0KWGE2Zm4rVkZIalcxbEhyVGpLbjFtVXRuY1Q1bmd4NkE1cUYrWWNHam1ITVk1SmFEbDEzRmc0by9ERUVjDQpoaHlpNk5pa0FHbjdBR29LLzY2eFNCcGgvTVFYK2pNVjhYUzUwc2hPT2x2V1k5YW1veGR4TzJtbVluMUQNCnJWT01nU28zeG5BOWR2d3oxS2tDa3dkRmdHbDVsMXp6V0Job3Y0QW1YT0pVNGdWQk1SUy9xay83cmxiRQ0KSC93ZVV5ZndQSUc3QW81Y0xtRENlVzljazRJTkFwb1JIWk9zRG9JSDNLcnZGd0pmTnBrTkNOWWVraFhHDQo5Y0hCQXlwNVNyMHdZT1czT3ZiV21BM2FObTltM0VPM2dKVXpVRi9PUnIxNFV0Y0xIdTJ2SjNsQ2p1azcNClU2aTFFVlVPWDJqaXZNMTdYNmVXMmdzMTMwbmZFdk9zS3QvNGVaQ29vVFZvQXhtNHJwZFArSUZWcTNPaw0KZHMyWUt0TEQ4L0E5Uk9zNWx3RkRQWE9iQ1hsUXpzZkpFb0JzUU1jR2tFWEdOQWhjZmNiVFJpYjVQYmVODQo4Z1pra1FudUdrOFRHc2ttemFRUzlkYXZ4UURVQjBRSEoxZmZRUkhibjVnaHlVTW05Z05DNnB3OXFvSkUNCjMvdFhOVEpveXBrWGoxZjFqdUlTMml0Vis5Vlgya3VLMDkwY3VMSU9nOUxiR1pvVzV1T2hqanBGNjFRNw0KTmN2TjNITDN6MXpyVzFicnlzSFdxbzhaaEVvcS8xc2k2RWpTeThGRzE1WW5VRVdoRERQMEJmL25jQTI2DQpQK3lhZGc4VU56QTRBdkZ6VHp5MmNVZ3ljZnBtcTlvL2VsbnpmL1h1VHVZQmlUWTJVeDh2MTJxcXk2RXQNClhVWGV4ZkNKMm1DdHJnWEFLV0R2NVZvRlluL3Z1THZtVGRzRFZCbXEzRE14MjVLcTcxMXErTFNyTDRacg0KWVZ4OFA3U0o5UVpXbUpyeHhkQUdDdTdPeGJYeVBKY0tLY2tHNTVQOHh5OHowL1U5OXRsekpFcU9xalZ1DQpKTXhDektvVkhab04xRWFaYng0eUR1TGJzdUhYZGdvYTNIVXh0Mk42WTQxdVJ4elA4aUdxaFpPNGU5SnMNCkpmUDl4S2VjVEJTdHgxQnZYbk9lOFVtSXkzR2xNb3pWc3FRQzJsTzRIRHFYR2ZTTnM0dDk4cGY5eXVjZA0KTUFCYmlqbC9nb0NhYWZtRUpZRnRRbDNZL01PY0NydnpPVmFEakJheFJ2T0I0N28wTUZqeXdjMTc0UXpSDQpyWElISG9WUEJQWUw5RFdoQXZIVHQ0MTdGVUFLaC9QQUhYUzN3bFRhbW5iY2U2QllyTkVDdjNvckhjWDMNCkZUdnNQaDNYdEVneVpsclpid092SFI4ZUx2SVFzVUJUT01CSTNWRkFnTWlmK0ZVS09DZTRXeWRuVnRVMg0KSksxY3Q1dTRUMHF6c25mUFk1RFdNUUtqTExUWHpOemNnVFNZQjdBMW9xMWdvSHVTSFJwbm5YNC81ckVIDQpnYXFxaXNjNm5sVWVacHptSWt0a08vTXg5MmxqVTA5WFFJUW4yeXFLWUw0dm1qb1ExbXB0dVFMTEdFMFgNCmxKM1Zva2duWW0zWWpRT0tOZ3U4Sng2eHlML1Q4aFpPZlVyVmZLOU90eDg2SHd6a1hXN2t3OXROaFlhdw0KVmNxMUFTMWdHV1p0MUJIaUR3eUxJQUxQWUVBMmZsVmxZKzNyZHZmcjRORFU4dkxDdmhNREZHV3JDbU1LDQpZWkFEMlI1d20wUjUxckZJSkR6aGVqemtQbDMwRmVxMUJYTHlKd2dRZTdjUXYrbWs1SGxhbzR5Zk81NDcNCjRRZGZRQS96cEtwY25jNGpSMmNSY1NOcGQra0VrYVZocW9TTWNJRmZYRFlUMCs2V2RHZ2FscWs4ZUdaTw0KSmFYdlovamY5U0Mzay8zN3BaeVI3ZGtLb1NMOXcxcE8zNVg5SVliak0yTFRpdytmYk51aEJ6dHI2enY0DQpHRE5NMVZ2bFZXcW5QUjlKQTJaaHpvZjVrcHI3QU5CUEFPQWViNzNaQldtWitwZGxsdHROZWczd2Rjb1kNCkFYL3M5NWlWVFVXcTQwWlVjNm56U2dZSDJDVFNTY2tOYkwzd25USU9rQ0JaRU01Z1djajRyazNxU3pqYw0KaXVMbjAxZDJYWW5iVWJQOTB0UEptRGxycDMrMkRZZFd3eHN4c1JZWENJVzZsWnVtbzUzSkdzNWRibk5LDQpTalYxUGVjWnBQTldFRjhUM0pvOC9TdXhNRHQxSFUwWis5VWVuR2JETTRXM3V4ZnE1T0REMXJWSmVnT2ENCnhFVUhLWmIwaGVRb3RTalN0NVRPOEpUc2IzNXFqNHRyakhBSU54dFpqdFRFM1ZSbkJGYXZkblFtdnVyVw0KanQraUN5enBQK253NEFsL0dPaDA4dkUyWXVmT1JXbVJ1cGtDMWY4NE5PdGFDbDFTa0NzcEIyTDZJb2RCDQpUYlpwKzVDN01RSUlqTFdLSWF0M0VrYnBKMnYwZ0xzWGlOM3dPYUJxZWRYU3FQZXpRUXQ3VlRYNTdSWGwNClFrNkhZcE1CTUhDTkFiNTFFVk9MQndVMWR0YzZURW9iQjcyWGJJSXM4dHZqQ3Fmcmdvajk0SG1VWVJ3cQ0KUnFSQzc1SURSNUpmTnQwVHRHY3IrQXU4SVlsU0E2Vko1Sld1WlMwNkV2ZENlQ09JaXVhOE9tZmtUajZsDQpuU3lWMjdYUGxJRzJTT1hRc3piMlVQbkdXd3FxY1ZyM3EyVGxsUFBlL0l6dFhEVEwwRDk3TWVIaXNjOXUNCmw5U2pyRWhvVUZNZEN0TEQrRkFZMndvOXhJc0JEd1pHRUtLc2FlUWdDM0ltQkt5QmVUL1M2WFVsb0Z6NQ0KZHpMQkZrRHNkb3ptR1ZlZTRSbmFLUW5OMElEYVVpZy92QmpITnNVYXlSbHJhVytGV1JGRzNUa1laSGNYDQpsRnVDVHVUenpTc3ByUlNYSjBydkpVcFZyb1kwdjVoRlpJVExKeXpibFpUN2cyUE92QlR1ZmhPaHMrLzcNCm9rL0NVbEdNTk1XK1dBajRiVkRLRFppQmFPVWN2a1kzN0RzSUFXNUM0dHhRaDRCa2p2L2FuY21adWNtdQ0KSk9GR3VOZk5pVEExUWxxem9HcW5oM28zalVUTTNZSlc1ZU4rN2NNZnlmVEVRaDJmQlZocXY4Q1RmQjcxDQpnYnFDcElGcnJBVFRxRk01TGQ1RjIySDdDZjBwUHR5UVh0V3duZ0NRY1Fvb0FwRXFmbnZQTytxSE9TVDcNCkVjc0Z2NjVoOXhIRjIwWWJJMmdvSTdzUGMrNVlWaVh0ZDdlTG40NXU2c3hRZXQrYzFtQnNsWFVUSktGbA0KTTBzWnRIK21GTEFPNGpxdVlZQ1kzSDlSYVM3NG1KZ3A4d1d4OE80N3B6ZVhxLzRUQWJQTTI2cC95YzgxDQpJeDZ5QTB6N0FxZmFOeWFhR2JTdDJoc2xoRGlGbUx5Rm0wMldYb0hrNG5yQ095dmJ4eVp2eUJ3dnB2RmMNClcxcE14M3BoNFhGeHo5cCttMUdMTVkyckt2amh3NERpQytncDlyVEx3U0ZhNjQ2TUVLSGpaQ1ZPWG0wVA0KbXlKSVRUSmZZVXNteHhkYThmNFRHbEJIeHM4Z094dkJBdXdJUzVMTEcxOGpnc1U0SlpLNjBrMFNJMFNYDQplaU9GUTRrZ3ZjbjhvZExGMzFFdXR5aEU1ZXRydjN0OW56OUltWFV2bDkvMytvcG4xN0cxUUNBVm9TUFUNCkxQdVJCaitGR2RheGl0R3ZIZDJoTFRJQ1lPYkNxSUlZZlVKRDkrbC9lSE1OaHpYZkt3bUFCOXpneWNzQw0KZk5ZdTlNRVUxR1hEWi9aOGhlWkhVbTJUVldyNFk0NnpyNjJWTWxUdEV5U01ncllMbjdtb0NKZUc5NWdTDQp5eThvWVR5L1l1bGFmbGtQRTZ5T2doMUJ2cUh2aXZuZDQ1TkxXZ1BmNU9OODVQcTlnM01OTzVKSlhsTncNCk5OZm9Cczg1N28wYVpHOVZaSVRVV2grR2NSRGwrZHJqUGx2emVSdDkxSFA3QXFrdjkwUjhCNlcwUGwzSQ0KZ3RjeXljU01ORHFhK1VjbGVzV2JFNkYxUGtZYjFpMEoyNytDSU9ITjh4dTZOZjg3NDFRQmk4dzZMTE9GDQp2LytzYlFMV1czc29nMmY1ZzZDcEhpUlBTNFgyaFF4VEo5Z2JFL1RvakNYSUlsRUJ1c3U2VUcxNkNNc3kNCklOQTJVZXg0clR6WElCVkc3dEcrZHRTU0xzeVJMdmlVVWhNVUhrQnlsVTE2WnE0R0RFZUdHQkhzVzJXTg0KNDdpSFdoaTJlYUVSaXdIREFHTDkyQ1JCWE5mc0dtN3FkYkFrUmZFZTF6cGpOVDhTVVJkY1RDam9IQjhRDQpDWnFQeUxpeXRGWWZJVnl5SzZiWXVzYUtZN1FzZThEOXlXOTZINGdnOXVEdldKNVRnSit4dU0ycXNjTk0NCjZBU1ZyZlVQK3NaNjVvcHNZUkdiTXVsb21aZEliN04rSUplcGJQTEhUYTFhSzVhWkNUMk52c20xN0JUSA0KM1AyRGJ5Yk5CNFRWSVFBSmVzOUZkNnU3QlNBN3BJTGtLbksxU2ZzT096MkZDdFBHam0vTmhzMk5LQ0RLDQp3ZWJ1UmpONmxjU2RvRlpXNThVdUhuYlI3REkxNFkxSTR4eW9sL3pnajhoNVc0QkhUOFdtZHZJTHlqR08NCjFXaFlkNzdHOTZIVjZQVHNGc3dnN2kzblhTRzE1N1Q2Q3FwY0x4UE1kV0daOEtGaWRjU1grMUlQazRRNw0KTjRjMGRvaENjeXVyekZmWGhQZXVPSGZabE5nY1RSZWw4NWdjWnBiUkU0eW1MNjRoWHE1Smx5SWI0RDZaDQpVTjQwcVdBaGhUVFlQbTgzOWNPUDJwZGt5akhQT1NZR2t6UUY1R29lWkxPOUFwcHNETEgrMWJnWUF4NEkNCmUwODFhTUZZS3FnWmplY1hRV0tXVFpteFRrdndJTGtnU2FreDhIMmxab09xc3BVUTlNS040VjNTelB1cg0KTmw3Q0ZOSnZsV0ZsR0doNTdib2RrVitsa01WZU1BVlRwVHFqN0FOUW45KzdYMkJYT1JXMXhwQUFSRFRrDQphbEVXcmVnS2FaM3NxS2FIRzA2M0tNdnJ4Q0pLM1o2QVN4aitlVzV3ajVHQk9Jc2RXYlBzQm1DbTBBeS8NCk1jWU05SkJ4STBvNUxmdHdqaTZZY3hEeFhQV081OG9GOGRzbm9qTGFZTWRmaHRiQkxqMVpxVndyQmJmZw0KMzYvMm9mengrYmUvR3VocVhYSUkzMXp4UGFabXdPRGJqa1ZCRmYzQlpvR1ArQ09HQVBqNDZkd2lMZm5nDQpNQWpwTzFhZkZndHprbTZvQ25FZlhCQktGOW5WOTl3RTNRaUUxUjlMZG0wU1ZVSHoxYWhrTzM0RXJ2MHQNCkxkUHd3eGJwaXNncmxDN2NWQXk0eGZzTDFPZ3hNS0I0WUx6QzYwaVkvbGJyOWEzQk1sVDdHeU04OGdPUg0KRzdXdFRRbFNQUFIrN3JLZThlYlR5dnVXK1NmdnZPY0V5b3JpVjRpMHQzUERLd1Z1OFFPVjhUR0tUc0N4DQpnSXhCQUttd3hicFhZcDcrSHFLbmhkcURoVUZoQ0dUQ1ZTZFVLcCsvZEs5bjIzY2o0L2R1TUh5dlRLQlYNCmpySmU0QXNvU0d0M0lmMUdiV3BWTGx2ajU0R1czN2U2cXBsUHBubWJBZTlMTmczMm52c3pBSEg3WHhsSA0KVnlRMlZaMmM3aEpZSUlXeW8vb29uMCtxR1RSckcxbjduUlMzTktMUVIxdHZwbUNieHZTZm16N3IvRk55DQpTQXJJODZ1S0tNR3N0OFFDWk1rU2xMT0hhNzk3ZWFrWGpWbkh5bktOSy9uc0JjRG1TSGcySklGRGpwZXENCk56VVNyMmRrdDZ5TmNkRFlPNTBPeUtNZkpoQlBuRS8rbFZRbGxPeEkyQU52KzdReWRLWFJsZGpWRGg2dg0KL1BTcUJnTUwrZ25PZTZqcUMzNjg2SnkvVExaZnBKdk92Q1A0UnJkZkRLSU1HaUtveWJKKzUxU3NKcE5mDQpVODlyZzVaVU5icW53bTNLSVh6UGFjNEdYelNCelFRcDBMemVJandiSjVWK2FOd3Rtd0dQSTU3ZjFYekMNCm0rTmM5RmhnVnRldnN6Zm13aWZQS081SFRIM2U2WGhENUNkOVJHSXA5UDMxV3Y2bGtHVy9NMHMzSVRIbw0KVXovY2luOEJ3WXo1eDlYM2llLzNGdzJKY21ldFpURml4SUN3L1dMcVdidDBWdFF6K0xudlJXL3Rqd0c2DQpsZXNhOUhYb2tSQitZTnpMQzNCazRnZCt1R2JiczM5THpJT1hMZXpVRXdqV2VlYzNqdGlyQ2QrUFRxOWkNCmxyNDNSOXBPZmhNaElVc3JQOGNkNFIvTVhvQSt4cjlKeFB0SU5zTU9qVXRLZWJHNnBzTGJwOXhxRlc4bQ0KSWFwNnVRbFZva3J6YjB5YW4xUDFjVUVHc1VIOFBjakJHRjcvL1ZTU3hkVnJDMys5YzRzNitPL2pDNEl4DQpTVUdaSEVKTkNoUHhsYW1ZQ0hYNUYrTlNYN2ZGbFJsZ0p0MGJoOGRhcnh1ajBpVklodmxNZVVSYXVIL08NClFDMWFqTkl5N2dCR08zM216dzlXR3ZoNHh6MEIrRzY3S1FKNEsxakpseC8zY3l0TGxhSWNEREMybkxQQg0KZ3RDbDVDOEFBN1cwQnJ5R281djhqeUhhU3RyaTZSa3JzK3dRUDRON3VORE9UUGc4cE1EL3RXbmszN2c2DQpYZEFtUGpleUJFc1kvOEF5aHFZUTZEUEcrUHFUbEFobVBqQzlBQmRPRnRQNW1IUlk5QVJrZXNaWWw5eWQNCmJic1dsZ0k0MVd2d2FTMWY2TEovSlFSRUVmNU9CdmpJQ3Z0VXVtM3BocXVFRUhOQzR1VjlIdDBNYm9ZVQ0KNkhSYTlwTzlmL1docHFYb05rRTJVWU1HUnJDcG9WSSt6cGtpVUphOUZlSGp0Tit6T1pjNzlMb0hHRkMzDQp0WExOcHpMT0J6YzVYMm1vUWxSdW01U0hJZCt6cWxNOHNDUEp5V1lRTi9Pc1BDQ3RMb0orL3VnOTV0WGgNCjFkbGZoWFNjZ3dNczJsQzNiV3YxYSswTis1djBFbVQ5ZjhkVy9iZldoNDJpK3pDbVRmbUhJdENvMmRrbQ0KK0hxaGlwQldidUdpVGlQeDBHTnNvZFhJMUtvL1ZJWUlPWUZMajlnTnlPbFJqNEQwTjZ4bE16TUJnYVFvDQpEUWl0MVBXMm5uUUJRZGlHLzNtbnZ0UVVCWFpEVE4xdWpoY21DM1BNd1hTOHNDaG1odHc1Q2lSNzEzNncNCjZOS3Z0cVp3NkRKUm9zRlYyZFRlSGkvL0g5d0gwdDhXTVBlS0IvcmtBdmdhWVBkTkNPd3ZUZXk1TUY3OQ0KNStpdUFETlRmYVFIWDkrd3VSbWFwRlM5c1pCZkQ0WXA5TUpONEQ5SXJIaVlKV29Nd0ptbGM5SjJvV2JYDQp2Uy9XQzlXOXBDOWFtWCtlZW5ITlhweXBWR1craWs5ZW9sdGJkMmliOXRMbEQ1aUozV3BsR0ZNQklmYnUNClN5Y25tajFGWHd6ODhpam9scWZjQUZXck1WNnZGaUtTYVkxVzl1a2pxcFM3RTI4Ui9LeUNibnZCM0xnRQ0KYWY2OFFSMlNlSWFDM25lWG40S0hlZmhpSG1HSWpod1RlQ3JhblI5YXVpNk1sNVJSdS85RzdJZ3U5V2F2DQpSTVA4RUNlM0Q1cWpjU0FXeFdiSldNMk5SVTdBRFh6aUJTWTgrVW54aVRhS0krWXViQXpsNTloWXdCTVgNCmtTcUd6ZStvODhaeDFzNUNRa1p3ZDFxNnhWOTFmWTU5a2tkRlg0emlxYjRCR3huYWY5Y1orTThVTW1kYw0KQ0U2VE0xRTFYTVBjUWNIMnd2aTRlUG9oeVFFYS9oM1N5WFYzRlVXb3NxZWdQVzVIZmdhREdiN2JSZ1pPDQpnaFYwNWxZTVBtbWZLTndPdWI2VjZWSG5MQ3JoNlBlZDB6eFBsMGc5aWdYbTlKbkdqQXMwZDQ3NE1sSy8NCllUUHFESStEdllHNVMyYkluNzZ3Mi8zN3phU3lyUDdoVUo4eUNJMWNrQzhsTUQyUWVKczJXL3hYTUxRQQ0KTW9HQk8zRytKeTZQejB0WTVPd254YnlYUWppQTdmMiswVjZUU3dEVVFCdUxvVUpaL0FpZWY3SG9ETUNDDQo1Z25CSkJoQTRNV2JjZTgrdFhiVmhDMnNCM1RzSUwxVzRnZGxSQkRFRWJtRkIxdTVBR1B5emhwaG5ST2wNCnZhc1J4YjdLOGQ2OVMwWmRuQWFtVXdRWEZkZmI5azdQNkl6OUJNb0kzd2YxaGlXVk5jSmc3RGQvci96eA0KL2lDN1N5bEQ2K1kwZCtZeHdZQk1ZM2xIZ0kxVEpTSWQyRUZUUDhwWnZwWFdROWtrOGloay9PS2JFQTRpDQp6R3ZHcmdGdHZhOFJBWU1nQjFKZ1cyZ1NEbXJ5MldacSs4eWF3Rm1pZFd0Qy9oSElaQVpLSGVSRUx6MncNCkRwWjAvTWlOS0kxeFNZOXRkWkdFbVN5TmNiVmFObWZ2NmhsNW1RR3VvTERwcUlhSHZ1RCtJSFJwNWZ6eA0KYTZacG0zY3FINGZ2blBjc09RcGQ3Z1dqaC9IMnYrOVkyZzBaUkZlVm1HeXdzT0NFL0Q5MGZwSWMxaktODQpZK2ZPNUtzcnQxVC9RblBLUEJBaGxHbkFCS1pOYjlBdFNMZmZXQTVWRlNDYmlnK0UreVB4RUVWRFhENTgNClYyUUhrTlNCbklzTEgrc1NQVXE2ZFU4VFJ1NS9JeTJVck8wc0dNeVhhbDRCZmY0M216RUVCRG5aWU1FVA0KWFZVcU1ZUkJzc0tiL2VmSHkySnIxSGhTVksxM1Q0UkI0dmQ2d00wSElHMlZXMXdIL1Zpb1JkUjk1K1AwDQptcEdpeFdJWjBJOFZGRGNVbEY1d1pvd1kvOEdaRHZGSUVpOXl1cHVkcWkwbWlVY3AzRjBmL2RJN0R5RG8NCnQwbXFIVXpmN3RhQXowbS9qLzFkUHBtdmFnNUFSaTAzR0NVdkRsc0ZhNjBuNmtlUVhwTk1Iby9uNzYrVg0KakVzMjhreTArRXF0UTRTdzJUYll4MmhVcEdBemNUUncyaTNXS0RnUkpWbFlodjdLdC93czgzcFpRamp3DQpTaGtTakkrV1prdjBiRXZTYmZocEFhZWp2QklNL2FNdFMzS1BUQWljV2xON2plTUVRbW5YUXd3M25yZTYNCldFcEUrWEQ2bkZOMmtpRjUyQ0pod1ZvOEt5YVNkU2QvelR4RlBoQkRSc2E5ZFNsWlo4aHpUUkhxbVdkaQ0KTG5HYW9HYXpGMHVaSTBWUnkrdERXR3d3SmxOY0FwNVZxUENsV2FVTnY5QkdBY083R3pHdHZHb013RWd1DQo2UlpkRjZnMWpJT3Y0NTQ2RnBxN1RBdEN6LzA1YmV4QlNhZGs4SVJSMG0xQ20wRk55RHFtbHRjMkhZR3kNCk4wajhrNUJpbk1ZOEU3ZHNvT1I3ZVZ6VktOUjRZWS9ualRkMmdOazBlTWpPaDVxbEljaGlEOEdqUlMrUw0Kb2JnRjFndVpvd3U0anV0dnFoMWlSUjl6RHU0TU1QQjFXSXZ0cFRBZ1VSRCtvQVFxbE40ckNLUGptSmpsDQp5TURVclFFRERVMkx3dElEcHRaRlp5aTBKdk4vRnhaaVc4bkhFdnBRVVJBdGpJNm9EaGFpYlg4Qk5SU3oNCjNKVHNFSUdSTVRLTnMvaDlSbklnNjJzUm5wMXV5a3ZOTTRYRUIvMThDbFUzLzNrNStJcys4LzNNNS9TZQ0KL3JLZE9UZWFxTGliaHNtYmYzUUVRRkppL3c5dU1DaG9qME9CN25DUU5LdDA3R1dGQjVLUDd0WkJWTkpuDQpzem1Jbi90M2FkZ2lOQVp2SmVpZG1LRWVMaTBQQ29ieHFkMVJDcGtwem1hb25ONm1HdEgxYkkxOTI2ZHUNClVKYTlGRFV0UlYzYnk5blMwdWNoUEQxUlNISjNSbTloNzVvWmlMS0RpbXBRV3A0ZDJkU2pRcTlrWmFNOQ0KQWcxYk9zOHo3cnFrWmRDWjJYeGJtQ2xsZ3d3cEJIVEN0alBkZlZiK1U4dGlXdlhlQ3N4QTFGdkhlMlJPDQp3LzJYVzA2cHpRZEpwaEw4MVJqRHJ5b2dISzJPVE8rVXRRdnJXUG5YbzV3TzQvM3V2MElPVVFCOHNzQU4NCmlwb3k4OEF0VE4yc3lJSmVrZVUvc1JaSlhlUXlPQVJ4UHlTVDJ0QkwzcjUzZk1DNHRYTUJMbXhnSWEyKw0KakZsMG80YTE4ck5xT1I3TnI4ZGJFTzZkVHcxVm1VN0Y1M2Q0ZkEvRGRwcGJUR2pmRThSL1Rrd0d1cHVLDQpYWDgzdW1QaWthbkZBaElaWkFIcGdMUmk0WnNPZHNvdDhvcW1zeTFZNTdtN2N1WGJTWHJ3TmNxdkxXYmINCm9RNUdWcVorV2ZEb2lnVit1eG5GaEhGMndKZ2N5Zys5VFF3emdMcmVXVXI4bjRsRzZvVjlRVjF3STdRSA0Ka2FwQmoyMHAvYlEzTnFweFRERnVaaExyUGVESU9zQ2ppTExxZUQ1bzBKQUZoZjdLV3pPTDhTc3FVNXNPDQpIczhaZUhHam82U3A4NFZHSzZ6bzZ3TllwUjZYV2ova0FaT1B5a2Y2U3ZTcDNQbnBPc3dXcVlCRWVBZW0NClNSS2JPQUpRVjY2TllrQ3RDOUNhT0hYQ2YrOXoxVWl4ajRUOFFFODB2aG53TStIZi9EbmdRUWJwYkNJdw0KQ3FuK0RUdzFDWTl5RTNMekNQdWQrbmZxQ3hZaHdKY1J1MWx5OExMVXZiZWl1OU5ITkFvY1liRDZUa2pzDQpZbCtET3ozbi9mbkJGbkREOFlwZFM0NUNTWTZzb0ZCQW5hWndpWjdRR2Z4VXZIdHY1R3ZGU05admREaGcNClhvM3h6ckp1U1lLQk90eWE0MlRMdFZ1eVI2dG1rK3RuQXFRWldCcEZoUWtkQVZpNStHbDlJVGQvby9YNw0KMGo4ZDNFeFNMd2IvTFFuOVgvQkdBZktkSzJTell2MThhVk9rdDhCK0xYdHYwaUgrdHZoMUlEUTBETjdUDQpOL3NjeHZkQ0JBZ2FKUWJ4TGxDaDdWWEJLMWVUL214Vk9WcEhsN0RpcnpWeFgzblZUV3ZoZEthK1ZrcDYNCmtKVUFiRlpEb2FReVdmTzVBY3lRdHlqZGRudGNleHEwTmlIQzVySStyakpyYTZDZE9YTk1aTUJ5Rlozeg0KbjFNUEcyakp1eDNnL0tSamVOR3N3MnJLYVQyMThid1lTU2hJbUtFRm5vK2dJbGhoNWZMOXdabkdWemQwDQpxMWZJb3BhaUVsOEJRVG5aaG51TUFhTjFIR1BremxRTFRvVFVNVzZYYzV6ZTZaT1VRaS9ITUFqTUM1UEkNCkhUeTlpSmRTaktZdzRoc1VxeWNPRFFKclUwL3ZjL2VaeHVGdFRZYWVHUXFrdmNQT1ZJNEdtS3cxRUtEMQ0KNUt6Z2dFVzJNN29vYlg4ZytVZUw1NGlLQ0t6THhXaXJGR29NQTBGSlBiVjlrQzRmUkNkTnpIOGg2Z1NoDQpvNmN1dTN6dUtOU05HTDNOWEVMcHBHRlliSFErNFlEbWNQT0ttSjJRMmhvVy9XbzVPYVhhRXo4SG5HRHYNCjZSVC9la0ZuS0pRTEhmdjhqbE5HOFBXS29FRzB4bm1hazh2TU9ScU1JUEk4L29HWFRNZkUrdW5lRGdGWQ0KZlQxUGZSQlJWZVBuTnhwbnFZTm9ERmlVclJyWFlQRHdnOS9mQk4zQWRkdUNxOUJkeU1GQ0ZrdnYyUWtrDQpVbWNiajlKWDY3aHBFL0lKcmZ0YXpsQVkrTmoyS1NtODc4RWhtSU8xUFZ6QXZhWlg5TzB5K0p6WURLSXYNClZOS3ZzdUN3TXJ0WUMvWHRoRU1zTkF2VXhuTExLU0Z0WmdEeG1tMEJpOEJXUFhiV3hJMkt6SUw2ZER5cw0KeFcyT0lGai9mazdsdVZ0eXZKMDFwakN4TzlYblBYVVAxeVBHcHo4Mkl6dWJZTUZQOWJsVDFWS1BLK1lzDQp2QnRldW5ReTA0c2dTaDFCdllzUFBhbXhHd2w1V2NyTUhUM0wyZHNvd3ovdmFwR1Y0V0lmVnR1WFkvUTANCk5PTE9kMjJIMHJDTlJ0OTNETTVCTit0M1dYTjZtNUFhcnh0cmdlWGJxUmxZMExwTnU0K2llWC9rbWliTA0KNnI2YzRuQU5RVmFra1MxMXpCL20wSHI2ZGcxbE1DaE9yb3NCdDdLSWFMWXlMV0s4V3VRaWhBby9jMWtjDQpiZEt6OXNnK3gvam9Udnd3TkwxT1RLclRWVW96OXQyZENlR2hKL01HWnlBbDE1bXozbEFKK0srTkFISFoNCkg4T3MydkhWT21qdjhTMmoxSFk0ZzAraVVtS3dxMFZvREJNR1dmcDhJNXNzTS9jZUZCeTYxcUR1TVdBYw0KM1JWK1A1VTB4anhOOTJoTFFVaE15V3JYUVB1Nk5vSzJwU0ovQ0xlcjBadExlUEVtWE5PK2tncEh5WFFKDQpGd2M1VncyRGhSN2QvSXF5eGNNMlBSMHhjZ05YalFxc3loV2wydGxKcjFVdHEwZHB4Zms2RzlvdUdRVXgNClZYemNqQlRvVCtnSmhLRHcvdkhUbzRZQ3pvWSs2WVJoSFdWWHdvclRxVGNFNWx1WkJIUDNscjdoblp4ZA0KZkhKcmJEaFUwVW9BMVlZeTZIQ2NBdDFSUHYyNCsvNDBIV1RHMEFFbG1KZlFWbVQwdHJxY3h0eFoveG5nDQptck52bkNhT1YzbnZSdGlRU1h0K0h5T25yOU9xVTFVRmJ0SWU2VFcwZ2VCa3JnMXpDR0t6YlZpaFhucmINCnZLUTU4OWZDRCswRkNXUDVjc3FvWmFKZmZqYlgwR0FCcXRLSHB3L1VnNS9mS2tCUS9NV2pwdkE4MFpLeg0KdmVKdUROZmdrdklod09lUmRSbWRzZ1pYelJVU3B3NFFOVGN2cWhMUWsvU0pKNWl0UEhubGMrRnFvZitjDQpraEY3RTZQVGVYYmRNOE1VV1ZDalNhR0tnNkx5Ry83Q3ZjbFpEREVKMDRFLzJtUFVuOEU3UjJKdHRGYi8NCkNpaWNTVWh6VHl4TC9WY0hKYVcyUGh5eFhMYTFnKzdHZE16cUh0MG5vNk1iYTZEYU5PcDlFSmJPOTNFYQ0KS2l0TUN1NGNPRklVTklpaSthMFlNZ21LTHAyWEdGSjZXUjhaUGljWk5HY2c2SGNNa2hqTDVzbzdoRUYzDQpsUDYxR1h6T0RTVjVhM1hJRFZFOFpOYXMvbExtdWp1WFFKZEw3UHdaOVFJVDM3RFhnVTY1bk1EYm13dTMNCjMwU1pjT3ovSm16MVdqeHNiaTFnZ3MrYjM0R0xSK01LR2hRTm9qck1abDhQc01oQzMybVVjU0hiRlZVcQ0KYXhOUXVWWGFKZ3cvdjFMcjF3S0Jpc1VGS0IwNUplUWlwMjdQR1NMVXY3LzNHRGRXUENJT2hLbWh0L1JrDQpBbGF3OGZZcHpydTJRMDgvV25XUzZyUzBqcjhIQkNmdlNFK2xFWFlUdnVxSHl2T0xjTTJ3R1VSamhlUysNClJHdGlHM2lpZGttYWVJbEViSEp6cVZReFEzRlM3MUY3SGYyZFo2cW4yeDhoTWEyeVlCM0xIQzhlOHdRSA0KcTBURGh1UDRXQ0drL0REL1hNQldUdVBtUVpVQ29FcDQxNGZ5dEpXRkFIeUIxR2RmUlJoa2VaT1VCVHExDQp1by9XNVVqeHQ3V1Nwbjk5aUJld1BvTnVIUEsvUkhxY0JaV20xbTZsRXhxdjlWWnJNUVFYeXQ3TUhiWmMNCnVPZFJacnFRaUR0Vy9jZjRKd3VsSGxTdlZpTGNCU3NxdzV6QWUwY1Rrb09nTnVNeTVxaCtGNWUvNm5QTQ0KcDNYR051cnF5WnBDRGpOdVBudFdaSk5mdmhTb2NHZ3JObjJOVERHbEFicEtYRHB3WTREL3lVTFpSZi9iDQoyTDVNS3B5U3NOMVB6d2tUcHVURW1jZnBTZGR3THc5eFlqTSszck8rNUF4UHVBc0pJZXFCbnFkRDFJY3INCkpoa09iSHRLNkxPOStSNDFFanlHclloalRDa1AvdVlRRVRZRXAxb1JTVFYyaVJYUEFTTTJEWXlDM3NMMA0KQk9DYkdjWUl4OUZqSzl4WCs5UkE4SkpCVUgyRktQSmQxK1hGamZlbjE5NFUrTmJLUEtrencxdVR6ODluDQpLOXUrSXRpS21VNUdicEtTb0VmRURVWmFOb2lkUDUwMjAwZUFSY0RSRmRpeUNUUzVTSVlhWXRjYkE2YXMNCkdQRzFRamJzdVpYT2ZhUERkM0R4ZHRMZjNQZ2xaYStGaC9UUjlWWlJ5eFl6ekN0ZzhvTUlMYWc2MHNXcA0KYVR5OC9jc1Z3MzdhUXFWWHBMTU5qVmF1QnZHaU50dzR6THFjdGh1aW90VWJYWHVkakl6VEJpN1N1a29qDQo2UHhXZlh2N1NKNVhHRVUvQzB0aDJTUHpzMTBScDZKcEhiT0dRNmhBU0xxNTdONHVRenI5VWk5UkhsYWYNCmQwaE1lR0hUWVdNbHF3SUNuaHQzNkRPUnNXVk1wU0c4WWdoVDR3dkhrSGdpTkRscVVYc1VBTHd0Z1p1Yg0KTEErTjdkTWdKM2g3QU80YXlBWlZXZzV3cFljVjZIZTFNV0k3RnV3ZnJmVDFVbEdzbUhKd29KRjNPRFdqDQpBQmNuUnV0K3Y5RXEyOWtDbWpxRU0vTERvcG5hRW9VT3NPckx6cWQ4Nm1Cc0x6K1c2QWJ3aDRQSitDdkwNCldRYW5QSmxrWVhSaDJXL1ZKYU8zZHFqNGh4U1paMWxXaVdBbzU0OVZkOXljQ2RvV3h1MHVpdnJ6cnJORQ0KKzgrVXNHYWptY0JwQUhGUFk2R3AwcGQxWW55TWd6RFRLdktJS0g5Y0xhd05CVnJpZjRvZU1tcGdHQTV6DQp6eGRabG55ZUN2c0Y2dm1hemc5ZTVTMTNmeDJqdFVuYWQ2UnVOZTRwT2NtWjdIcUkwaXNNajIvaWhuSnMNClNjdU0rSkNwU2VUOXdPQnJIOEMzRzNTMk1PNTJLRzlOcXlmYTNzNXp1Q2dVT3pnQXRMVktOZElMdkZyYg0KV0lnK0tlMTB0SDU1N1A0UzdQZ1loOFFXN3JBRk5rbEFRcHdKay94MG9vN0pUQlNKSTQwVUQrS1M1MHBTDQpPdStRTE0rZDQ5NTBqVEVZNUpJbXNzU2kxbHBmZjJwMlI4K1VKWjdsT2pXR09xWUVqUE9Pb1Y5S0hPTkINCmI4VTRXS0hwMEpVL2FzUDdUOE5iQithSjA3QTFaajExS1R6S0ttWmorWHViS3lxd0UzVzdqNDNiZWQ4bA0KT3R2Q0VRbEhSdGNBUTVmWERjNTBUbk90MXZ6c29wNXR6WVVvN0hBMy82Q1NaMTlJcTNrMXVreWRsMEFwDQpIZitlcSsybzdlV0w5WG5Ec29saVZWTGxLaUlaeEFZc0JZVkpPa3Z1d1Z1Q0JPVm1HdkU2WU52RkxDVk4NCkh0YzZ2UzExdXcydTJBWUFQclFlSjFBRlltS0dsWFpuVVV0ZWc0cUpsRnB4SG9jNktCK0sxQ1ljeE9OTg0KTElObFk4Z0lxd3MyNUZsYTBRTGtDeHd2UHF4TXhwMDZ2WXFqYUtrc0FGdkdIbDI1a2UxeS9uRElDcVNuDQp3YmFrSGFKTzZ4aU9IanVUWXg3ZmdIcmlGWkdrb1ZVZEhFdXFxV1BQZ3Y1UW9Dd0hjOFIxWGZUTUZIbzINCnhJKytoaU4wRzFxeVNqaHJQTitSaTdTcjV2L0VBRVA4WDhWbndwY2MvNHA3TVQxamF0NmF4QWhYRDNEbA0KRjh4cVpKd0o3UXhHMmQvNFIyVVlxTlBhRDNnOWpjNTdrSnlmRnU4ZTlYZ0JhR3o2VE1LeTJoc0VsVndwDQpvTWx6RmFFRnlFaFVHaDV5TWQyRlhEazhIdWxEb1BscWRXQVJBNHZNMDEvejAyZDFCYXMwUUtFSWNkQUUNCmNzVGsrT2RFVGtmOU55c0FyMTNlTnZpdFlLOW9JanUzTFpvRy90Zno4NmMwMkhaZlprQVJNcjI5NFl0aw0KeVlOYTBQMFE5cFp0bjFWWnJwQWcvRWNDUnZqdmI1bkdRODcvQW0wMTQ5MjdDSjU3QUtJME1Ea3FFTTlIDQpZcXlDMDlLWjNYRWhIaXJwelRZU0xZcXZwNTZzNGg1SmJTeVR0aWlBS2xmQ2I5T0t1anIrUUxBTUhjdlQNCjMxY2VZUDdZeExQZnRnU1RtcURHRjc3U3pmdW95eEZ3SEFzbTBRQmpSQWk5eGdaNlpBcGtZQzFRbUhmMg0Ka0dKNUFUMExURVYrdThiYjNyS3lkcDNDY0RjKzAwcjhxd3pxekZUandRd2VSakF1QVovWkpLSzVhNVhCDQpwcy9HS2Uwd3Rlblo0dkozYklUU0dOQndkbmxjOURqNkI0QTA5bDRBZDRXYmwvSkdtMHA5ejNWSUxqSWwNCnV1ZTNqNXBRY085WXpOL2RaSFo2cFhxN3RYVmxvb3dlVjJGc3pXQnN5OExvZ21uWmVISGFkcjlkbmw1WQ0KWDBzbnhlOUMwR2lKemNLK3gybVhseUhSM0FQS1V0RStJWXNiRHhncTVaMy9ucmc2bFlnNzFaT25HWnZXDQp5RUV5VHRGK25mUVF6Ynl2ZkwvaWQwQkpvUDN0WXRRS25QTEprYU4vS2VwOUg1c2tKWkV1WHU5YkU2REUNCnRIanRNc3JTWUxRa2lTN1pmSWVTTFJxNktEbVhpVkVQVE85K2UrcmVVb0hGa2pCWThBWUVmamNBRExDLw0KRzhZanFkY2wxRjd0YnZGNlh5Y1BHd3BvSlRYa09sZ2xtbmo3RFhnVjBySXhBNlNyS0VER3RPaEtJMUpRDQpwaUxNQkQ1aWFac0RHNSs5Ti9HMHZzaU5MNTNxOTNSSDdKUzBDa2lDb3J0cktoMnFRTE5rekRwTVo1M2gNCkVFcVJGY2VsWFFkbUJaQURPMm9nQXA4czdJWWFQTmZnMlhWbHRreXZVRVZEYW5hMy9GVGJtTDQxNW5ibA0Kd0pwZXp0LzA0SVJ3NnA4RTJEbUhqMUZPWVl0UjlJdFRpcmM4c0pNZXNXK3JUMG85SzNySnhyUkVubUtqDQpXS2tMVEV4aDZPOVp3OHFiNDZFeXA0WkUwVmwzR0NQT21ZZmRJNEJZNnV1QTRlR1hWVi95QlR1SWtYS0oNCkluN2xic0Y5c3I3U1V4U0NVOE5MbVQzcjlZUUk5eW9WOGgycmRwc2JlOStGMFo1SEFGcjVBb2tuZjBDcg0KMzFEZEg5QU56ckdNR1NKU0VFWi91Tk51dXBya1Z1WEtkOWNYUEFHN1pQcG9WWVpXaGs1M2t3ZzRWKzV3DQp5bXorV24wVVlnZXZEVXRxb1FIcUpyNkpBVDl3RzNLUmxFMndVRm9sTnVMelh0ZkhZSlB0d0lidDB0TkUNCndCQlFMblZkL1Bya3poM045c1BOOUZsM0JQb21qclB5ZlJGdE5va3g2ckFUaFJ4UXdTU3o3MUlMcWF4YQ0KU1F4eUxZNkFYT0RCL2RiZ1MraXlrMFN4V2hma0tQM1pXRzFHdVAyWjY1RnV0OFUwQVcwb1ZOeUE4cGZsDQpla3djMHl6OTA3ZmhXdTRwN2w4MzFXU2daMWhXTUxrMDZsTXdyakJLN0lzbFVNbXk3d2tVOElBZ2dPWkcNCnZwM3Y4c3hKdlloaW5rKzhsMTVWbkNCcDhXcHl0cjJlbkNZeitNTFN3bUgxaW9ILzBpd3BIbEMrQmY2ZA0KeGxVNzdtKzFOaEYvRFFKSUhuU0FYcnJXbFZHZzZuSlNKNlFwU3lFOUNOajRvbFdqY05WVTc5SnZKSUZ3DQpSRWpqMlN1L3pIV2tBZERLNThkcDFwVG1xcS9ydkZDR0FjbFpXMHNxYW1Da3diSFFkOXA2LzlZbEJQMk4NCklkNXFyUysyZU5MREtuMHBrcW5zQWYrWHN1R3d0S0lHQXl2dTdFeldpNFIvSG13OEZlVTVFTHVoRFBDMQ0KT0VJazR0UzRYcHZPTndUMDZXaWRPWVNTdE9qT1RMUE1vZXd2cGxwcHBESmJWYWp6MXZMVHhMeDhqRlRtDQpSVThhNXVNNHBXTlZOMTg3SmR1VUJXS2tJdUZsbGRad3BRc291enZsWDBYNzFTUy9teEV5cDRLSVc4M2ENClgvcURhdmRPT0NzdlNZcC9pMXNSelpYd2lrcEVKc0RnNHNEckxrZTMvTDk2TzhkNlN6SzRuQ2tnWWwrYw0KUkFZUmlScHRXamJLQzdMK2JEbXp6Q2RtL0FEOXplUXR5YmpybU9uTUVFYUpGMkNUOEJ6U1FMeVRKdGJXDQp6bWJqakxWUUkzaUdMRWxzNUJKV3huWi9Eazc5M3JBSldZZUcxUEI2cEFOLzY4UC94LzFReVZOcnovRXYNCjd6VnQrUEpLd0YzZkU4ZXJObVdKRURlc3c2dVZaQVk3Zk1aR1BCL0gyVE5saWxneTFEdkIrSVNIS1lDRg0KdlIxUEJKNDRBVGRrdkFuOVFSR0ZSemVROVkxY3FRckJXdkkvazdaNzRrM3ZWdTU2TGY2N0JrdlVyS3NNDQpmKzUxUnVYL3BmVWUvM1RMV0d6aGkzUDZRRGd5a0lYOGx5eGhxYksrSFZGR1h3a2U5bTBiWVI4UzhGekcNCitjZ2duSWF2bEF4L0tnVXV6YVpISmJrSEUvKy82YjVmc0VFaUN0dXVPenpmZ2piakswME1UdEZxeGhFRA0KcEJZZVE4WFVYVnVoUHlBQURJdXVwd1BYaWhOcEdwZlQ5Y3Z3N1NSRjZFbTI5OFBDVXJkR0lTYmRDVnU4DQpOL1pGS3UwQVJFNS9uY1ZkM1AxZVIyR2prZ3JiSGNaN2w5SFhvNGpWMU1vbFByekR0WDdCSlFKN3hrd00NCnNhSjhCS3IrYmcxejhXVzRacW4rTm5JWFIxN1h0bVQ4ZU44Wk1mM21idWlIa1NDUkl1WDVUU1FZdWlhMw0KSTVMaklGWFZIY1dkNWxnNHcrR093aTFPN3JwZCt4Z3lPSHI3WVM4Skl1b25BWWowOE93QW9yZTgyN0lpDQpYeFUvMk4yTEVIY1ZiQ0hJazV0RXZ2eFB0WFFoUkh5WFFodXB6L1RvZ05qUUpuUU5uajhsUkFKVkJHQ0UNCi9XT2xwMzVKTytDeU95WEFBeU5NUlVsT3VOdkkwc0VRRys1Q0pZVDNYSnQwSmUvcDJoVi9sd2w0TkZURQ0KMWwrUnNCbDNZNmhDT3hMLzdaWXlmaDJNUVRPTW9mQWEzNWdwWVAzREc3bGYzemVvV0xzWFhKSDRLM284DQpKaTJpZCtoU2tTT1NzYS9UZnBKTTJ0M0JsakZnSWgyQS84QzNrdzZVMVBLdmhVRWVFMzF1bXhaT0tFZXkNCnFQaTVSTTNLWk1GaHdOZkhCRUJRU2Rqa09aZXVRVGxsclBYaHd2Q1dsWlNIdUNiMmQxTGdVUWtaT0JLUw0KalExNnk0dEF6a2ZKd3ZFcEZjRG9SSkhvbDkyc2VkZjlJaUVKSS81WG15OEZIQUt3L3R5K0RXYkdrcGwyDQpxZ3hCdjRJN1pjd2xXalAxTTJFVVM3NEF0d2YrNzd0bHpEcjh3VnNjTWR3eE9JZnRrcmlMZ0k3RkR3K2kNCm9nWnJycDdodm4vSGZRVUR4eTBwL25MbmxLRXpMMEhlMnlNRWVhaTVLRGljMStDNTlXYklFK3pWUVE5ag0KNlJwdFNDenhvSGJhMkV5cHd6WjA3MUhBak9icVdGeTdydzFMcVB2azRWTC82ZUdNQWpETnJqNmpTSUhYDQo2MVVwNkgrR3JqT09KaGxEZXdBN3IydjhINHRSR2J5Vi96c3p2Z0hXM3pONGlQMkZBNUhpQ1gyeHlzY3ANCnhrck8yd1JaQkVxQ2M0dmozV05zNk5tSzB3QmV5c3MyOFJZczZXaEVWd21pa2Zlc3NWVmh6N1hqYTJLSg0KazlYMDNxUFg2WUk3THpaSnRscGFPZVFPNUI0T0Z2NHdLMmd6WnRVMkg5elNMbndjekpRMjJMdG1EQTJJDQpkU0tSNjBCOEZkUTlPM01iS1YzNXJoa2Fwb1hScUY3TEVJQ1FnczZCS3dRdlJxQTJkN2NjRDdKcCtTU3ANClljR1F2dktaQ2tTRDhBdkJZcm8vTnkwUGlPMUxNckhWZzBJb3FLRTNLbDBZSXdmNGxkWFUrWkVLV2lSQw0KZzJNclU4cFQyV3piMnJRZ1N4RGRvQkxUY243WFVpK0JZVyswRGhVaXFqTzFYQUMycjY1U2Z0Nm1QQUlsDQo5YS90Qmk0cS8weGl6ejFnci9CK0lWNWd4S1JXb003YUZtbDhWaWF0eFRtY0FMOUQ0NzVKcDY4aFFqM1MNCityd3UzY2tFakVnQnh0MjlOZURiWDZMZW9wUGMwRnN4TjlCdXhpT3pONmV6S2F4eWduWlhwbzFjZTd0eA0KaGxFSVFMWkVvb1VSQVNBZE5BK0QzbnRUaVZGZTNJaFlKeThIN3IwVnExSVl3OVRVbUVqTndBTXlyRzRSDQppeE1STUNReDMrZ1NJa3I0MlRnLzFiSHpHYWh2NmQyQkVNay94UHE0QmVJaVRMOTNxVm5NUFgyd1BOZXkNCnV6NThQYitBbFNhR0hBcG5FTEMyazhiRHRJZkRwc1I0ZE5OUHlydXpxcTVsSVdhdlI2MlB2Vmt1aTVNZA0KUmtseXBuWS9pY2xRZitGeE5CMk1OWVdpSldUZkIxYUkzYzRFQnFmc1dQSE9YQ0oyUTlZalFKMTBRVERHDQpiSVlnYmJhVHI4Uk0vNytGMkEvV29oRWRzWWY3OEVLR0RBUURhaG56c0FoTFZpWVptQ1RCYmtkZDM1ZXYNCkRZWXNaUndJT1RtbWhVRk5CUzcyckpUTGpGN2NhUHcvSFF3M2RBczdyM0gvZ0dLbHA1K1Fkc2NUTC9XTA0KYkYyK2RpQW5seGVaZ21yeVQ1eXd0YmY1OVlobXVVaDF1UStXMXhBeTBHOG5jR0xXTWJCdkg4QWNTMXE1DQpyUHhDZ0VVN1poU3luaUFQNXNPN0dkeS9ybk56WUlwdW9aRlNyTXJZUGhQeWRlSno3UVlwaDVwcjVReXQNCjZlN1ZLcGVoUE95QlhKOUVwcEJZeWx0VjNHZVp3b1Z1SzF4VDJGZ0dRYzNlV09UK1ByalBzdFJhWFpENA0KMlQra3EzdWFub2xSRTZ0M1lGSytqVWtpR1lubnJMU09XWE04MElKKzJFdHJTZGE0a3JzbVRLUStNQlA3DQpQRE9nZnBUUHBGSmFwTldZYUlJa3hKb0NxYnFYSkhBbFhSTUNwUVQvVHVrM1dIOWhTa2dGTFVQSWRZVnMNCkxXSWRHbFJFNHRHZG10ZVVSS2tWa1RKZTZIWjlKdmYrdkVWRnJGMkEwakMrcUN2dGVhWWFqSk5tM1hJOA0KLzJqQVBROXExalpVc0NkZWhKbEpEYmNteiszcEhNU3Z4eTJ4dlpISGRTM25GN2YwMzg3bUl0SDZSQXB4DQpEY2plMTY3RjZkcmo4UDhNL2F3L1RPWVlUbVVIeEN0bFpRSkRiS1hLSkZiRHZUbUtiVTBCVExSTENHOFoNCkYyQytpM1cyUWpLaU90bWFJenJjU3libGV5cy92UnpIeXYvZFQ1bmVVQWNaYWYwdFVsbndoUmdWcUZBeg0KaCtmMWNrOWtocURXU3l0dmxKNGwrcEpQY3FPblE4T0FHbVU4WEJzbVlwSFUvL3pDblYxKzFKK1JxRHBaDQp6cDNWU25DREZneldBa3I5WXdjdy92YlVueVBLWTdGRHdhRDdMWnJ2ZmVrWDlnbFZ3TmdwZDgwdmdmd2wNCk1uUFFRRFRsdHNOTHNFbHIrZFZVS0hWQ1VXQVRtQVJXTWYvN1daVlUvNjJHb29lT2JTb3lrN0pqQ3BjNQ0KM0xyT3BLS3VSSTVzK2NVYWpUZnBTZUpqQ1dxUkhISTE3UGdHSXlvam9GZUR4VzJDV1NLNnd0K2RIQkQ2DQp0SFFvbjZLZlpKOEJnajBlMHZlb253UzdJamhWZW9vdUpyVi92QTBtYU9Fa1BCTjNtQUpBdEhPdjNiUU8NClJXb0IyN0lDYWRucFJWTzVaUVllZWd0NXpvTzhkYTlVTVVGN3BzcHN6c3h5TCtTdXFpcVFCMHBybTNIdQ0KM2FvN1FLelJkUWFWZUc3b2pxc0xnUkduUmVNcklwUjFBUUpYVi9nUmhKdHJKMnpYWUQyeHpzVjN5SENSDQpObUZaLy9samV0TVR3eWRJN25ucGZtYXFDWE1ZZ3JkNjRmZ2ZQK0FTTmV3S3J2UFUraWduQmZmOE0zTFQNCm9TeFM2cHVVNFpVSHVCV0hDQXoxM0Z4RHR2VEd0N0FXYjhtR0dsNU9JM0hlNDJOVXEzS2xzbjRSZ0RKOQ0KL09DZ08zMnd1anFLQUxCYU4rWnpjU2VxL3hCWm55d2VFWWxhRTlMeGJlNkxGVU5OR1lzSVcyTkJyU3VlDQpldW5sbEE1TUQ1Z2xNbXo3eEVCaXNuUTVLYzZhK3NkNHNaM0N4aWh2K21BM0t3UXZFZ1MzSzYzZHlOelUNCjlWbVJybmkzWWZKSTZqbHM0TUNIeC96cnlWTmMyWldrUm52a2ViajJ2YVpOaHBqR3JiQU02ZWxxWHRPRg0KZ254eXRiUHdBYkRrZ1RWK3R5Z1gyZTI1YzRwREprVnpVaGJzbFM5TEd3blh3VEVOVm84MUtRRDNGTUpqDQpGMTRoU1ZRWG1BUS92dzQvMzRzL3AzN0VPZ0ZBejVqS0gyL1VXbjVYUDRPNDRjRllieHVrZXVKdmxhd0YNCk1HWFNQb1JvTW1KeG1sWFRvdndnV1hqVVdCbUZZMDBaa2tqOXBlaEpGdFBkSFBsNEFkQUl6Z2Y1b1R2Tg0KMVB5RmRKckpQMm1KUDZMZDlIWU9qSlhjTVp0NS9nb0JMbzlYZ2JRMDcreTBzWnBzTXVWOUw3MWFlbXZEDQovcW1NM2pIREVsanRBa0tHQkVpNXl1cXZrZUdIQTByRkRvVXBJeVRZM1EzbXJKUjVENUIxem9kalJjNDUNCmI3YmRZaGd6UEZTQkQ2Um1jbStxWmxOSUtWdVFNT0xjRHkwdUNTVDV5eks0SFVHaXlmVTk0eEpPWHVjSg0KY1ZIYXBvTkM0c04vLzkydFhQdHNiOTVVdFdGaVdNNG9oWDJnNzVNanpubDg0dkN0bTh1UU9KU3NOVXRPDQpXTnFZNHJJdmNHNTVsREdDakRyWjlvTTBMY2hISmRmNEVIY1ZPWjVkUDJwOS9xWC91cTN2L1pJVFZjdjQNCkZxMzFtNE9hVm1nVDM2NUhuTG9lQ1F4NjlCVTAwMjJWdkEyL21GZFFDVWJtVm01TlMyWWZLZXdqaFh5NA0KbEhrNzNJMms4YUZpaWwrUEpLemZFRzUyV3JXWldoTjh4dUhmbTZQUEdFVUZ0VlVUSVVnd1MvdlM3UThUDQpwMHQ4STd1VHRTUCtkY0hSdWVtdUtqOTlLQkxHbnZmSWtYek1ndjdqWlpuZE15T2REeDlrQjV5KzhaZkENClRlVGhLbVdiNGo4UUdFbVdpUXo1eGlUMzdic293NUdBYWgyZ3FoSzJoaC93czhUNWdyVU9rKzkxREJ0Vg0KcWdmbTM2WFRic0VvSVZTbGZIK25ERDhiTTFsRFdhZjBzWUZNU2t4OENnRUd1N0tMdTFlK0xFL3dkQ3BHDQprM0YxN2VPbGJ2cTBnT3BlblhrNkhGazlzeFN3N05IZ3NFZlAveEt2alFRN2F0aVp1OXRzRGFwS2pvQXkNCkxrTm1vY3pZQS9yQ05OVjBmc3RPTFhJVUZBbnV4TmdDS2thamowWk9ET0dzUzhOV0xJY3AzY0IwNXpJNw0KZmFXWFdjaDNhOTY3TVJvVUI3cFQzUVpOclNldE5ad1V6NW04S09YSWdmYTU2cUFhNzIzSEVBTkU0VVJEDQp3UmtuaExYT2tHOUZuNnJ2ZGNIYU9JODlhdHVPa2V3N0hHNnJYWGhuUS82TmVaMm5scHhlSEVBMEpHVlENCmpXS1ZTRjljOGF5eXEwbGsyVktlOHc2YXg1a21NMGZqczROS0V6Uy8yTmlRSHdHOHZGMkUvd2pNd0UrLw0KQ0hGNVJkZGtpbWdYc2pPVE5ZMkhDWWJWQkZGcEhDNjRxOEZtZ0lxUk1RaWY2bW9SY0F2MDcwUnNCdVpPDQpWcSsxczcvbGdPWmJrMm9GRTczcVUzQzJTZ0RTZXk5WDd5VnBDV3RoRGMrRXRDd0c2T2RkdnpzR3NqckoNClpocUU4MStnZ0RIUnRJVHNLRStIcTliU0lPTkdhRFpJaU9YR3dPWERaTW41OXZrTDloWUFTc29QOC81cQ0KZXVMRXJEcW10Ny91ZldLTzVyRVRvTy9ya1FybUVxUHd4TW85QzBHbXlMbHNDRC8rMURlcGFzOHZGOE01DQp4SmhTZWlJMWlVc0ZiUStjNVpmKzN1WUtQN2x2dzNZeEJoUEx0ZTh0cDg5aisxRVhkSWJ6TXIzOFFzWUwNCm56U1NSZk9KRWFsOXFIYzdORG1TMzYzZUx1U1hLY21KY0J6KytQQXVNU2dwWHBvZUtGaXl5T2hjVnRpTQ0KUjFWckJ1UVV6U2E4Q3ZvZjVtazZDS1RLeWx0WE5MWXZ1WDFCZlRmYVRYcjkwZ2lYdG5oVVZUZGtEeGtIDQpxVFgzaG1Ka3JiVitKMzNsSUtsWUhPSDUvaGczWE9oNnZFaTZSY3BvQXRyU29iZnlYWGV1M3VONnUxQnINCmMyVHRwWEJVcDZycFVHNmV5UXJaSmUrVXZ2UmRiWkpUeDdNTGtnWVpWSUpCWVlCdWdGL0xzc0MwZGFiKw0KZC91WVBhUkpLV05XUVdNZDZIMGQzQmxtRGhUb0FKRlA5WFowMGFlTjIza3pMZzQ3ck9XWmllSzZBWEtQDQpwNTBBQjdMQnAzckRQZ1dTa0xRVTUrMS9GMjBOeDJWa0RYTXpsRlZiYStwQlZQbWs0aFFoR3RDUzM5Nm0NCmk2dkZzUnQ3dGFOa1BwV3hoSTN0S0xjRG4vVjVuUWU2OEp6TnNSc2hSQW9OeGRKbmFrYTlQSXhyRy9sTg0KNnQ0cnBYRHVsQkZrc2pMOEJoOWE4ZlB2NjFBM1hNT0VZZTFqbDlxNVNsRW9pRFpNTlBPelQ5aFJ2VnJHDQorMnp1aDNGQXdrOGJZVmdySFl6RnNaMVR1NUZINld2U0Noa0UydnpEc1BDNFBMZXJMdUNvZm84VjJ1QlQNCldKYmJuUFcxa1k1NjErZGFWZXBCc0JaMDNIWjZRakVkYytDRk05U1I4eXJXS3gwK3pCaXJDeTVLVjQxOQ0KSUdqNDRHc0dRZk1OdktrNzVBN1VaZnNVb1ZxeTdpK0ROOG9IM2N3dmVzZjBHTFJhek5WdEtlSkdIZjhyDQpOQXZWclk5NVRSazhMLzN2c1RQdVc0dGJBU1hrNTlCdXZLYU9JTHdoK3BKby9Oc3dGMkNkV203L3U0eUQNClpWVk5vNElzd0x5TTNJMUpwbU83UWZTU290eTR1RzMvNmpmU3g3UnJ0bWFQVWJUZ2NqQnBPSytCQ0lPaA0KUm5XY01BeStzZnhBajRMdzltTzkyM2tteHBPUkF2SGRxaHFWcC8xSDBXMHBEVVc5UU5abitDNDE1SGxODQp4VXlMWm9FQXJubmRJaXFFUm9NT1pxemZ5TzZodXcrazJHU3lOMzBZN1d2d3NyOWNyZEF0ZjFHL20yeWYNCkR4ek5qelAwTlUxYVpyWFFkRThRM1RKS0g2bWlVUlpYQ1N3T1VRbll3YU9pNjdFYnFlRTFienhNejhVQg0KNk9EL1BKeFRxQi84OHhVc3ZNV3FqQnJVQTFaU20vZldMb1R4S0U0UFRqN0hnSldmRURRVFdlbjBuTVRCDQpkQ3hHSXlGWTU1bTQ4TEtZTW56cmJGdHNGZXllbFRzREM1YjIxaU8wSUhTS1BZUDFxUDBvTGRXeFcrUVYNCkxuTjBVZGVwTWlteUk2czdnNEJ5U2tJUTlpRlo1QUQ3NElIcGV6ZXdzdTdmS3lqMm5NajhNb2dFMDR5aA0KbWI5aHp6T3puM2pKaFpDbGlFcDkwNjJtK0lHN0JWa29mM1FnazdtcmtSYWcrNEdhendIcGZDOXlTaFpLDQpPTmdMbDBSQXlPWWM2dFcyUlpvUEVxc3VMN1Q5UUR4Z01uaUhvN2x2MzhYeVJLRXZyTW93K0gxVnBDOGcNCmtzVmFTNFUzeFB4Vk9RQlp5QTJTSytzdFZ4dVdyNndaaG9EeW1FN1hSeGRDbjJMaU5pZkt2WTB4OHZndA0KNXpxVkoyQkMwMnhydjFYVnZzNXFTb3FYOEROVC9CdEIxa2xuTmdGOWpsTzY0OTRtYUR1ZFFuM0w3QUJtDQpiVWtMOURVbVh3ZDNZancxUlVOV0dwZFlXalgwMHZKL0NLU1UxWi90R1hCUjkvVnZhNlZ6cVB6RWE5NWMNCkI5YW5HL1hVd0wzWDJ3OENRT3c1eWpydGp1ZjIvenJHV1ozempjMUFmUG0wTk1OZStnbDVISUNnZDJJeQ0KQVJBTlAvQk9qekJONUN6MldhVDBuNnlIQXFWMUdmaVVzRWtpSXE2dXVQMGw4YUNnWFl6cGJweld0MEUwDQpISU85WjFmajRyemhzczJLYUx6dFREc1pKWGtrYnBZb3F5dlFwQzV6Q0xXWUNhbGpnaGJkbHdwNFZkTloNCit3cCtmN2pRUE01NG1LUWNaQkVXbU1OMVRENC9XdUFyNWVYNDVTWW5NVE15QjJCTnZ6UjVYNTg0a05wNA0KRXhtbFFVQjlHam42aVEzd00wMG9hTjJvTFNWSVppZ1lzQ25VUGNyNkVpc29qbkNZekJQSU9EUWZ6c0tvDQpIWTlJUnVFcEVlcVovU0UxWVRFa3JNQ0wxeGxIWWZHQ2cvNHIwaTdIblpqTXBpSExXcmVmSTVUdXJZMEoNCjJGVlAzbERjeHo0NVJkdTRKaHpxVVkxcjZSVW15NWp2ejJDaTYxTC9CUCszRVNqQVNTbWkxL0dUeEtudQ0KK2xwVVU4TEt0dWJSaUp1Q21DZ21hSURUN1NEZGtUTWFNMXZPd3hJRlFzMjJmQjlOTWUzQ0VsTnBpbzR4DQovQjVNSU45NFhTNFk1SmNvQXdTdFpLTzZrS0ZFbVg5QTFyb1hQY0Fqb2Y2S3V1SHVnTUpPd2twditjNmMNCkVkR2NjY2NmdjBlK0NXcVM0Yk1YM09hekI5Z2R0OHQyeTVsT0JMR1RSSDllQ1NzTmZpeC9Cek5jekMrcQ0KUi9VODA2WjNDcnZNZHJyQW9ualpLUm82L3FvRzRDcG1ESlZYSVNkYWViQzFRL1k0VVAyL1NRQzNUZTIxDQpGNkQ4UHc0bGxYV21SRXFhd0lOampSaE83bkdzMEptVnpCWnVuekxkbXhBdXBKQUpZcWI3TWRVSFRYdDcNCkozd3lKRWpNMjFOWmlPdkVQVzh1dWFUWTJvbXRrbXVSTlVOUDQyM0hjeXhpd0hTRjJQb21jVVpkdGhQdA0KZm1iaktFc1pNbm5NYWZscUZTV1Z1TUJxYmRDMndwbm5MVUg4ZkhhVldSOEZoSHN6cGNRRHQwUEdScGlUDQpKSmpCck1YbzdiWGltVTdSWUNUUVNiSmQ3VUpUVW4vYTdTNTZMTWplWHVBY2NNMmZYZVYrY241bW5KcHENCm9tUXEwa25LQ2M4UkVYcloyTVlreDM0Zy9PM2FqVitUb0JFdHcxR0NNcm1xNTJmY05OYTZHT2Y0ZlRTUQ0KSEVkdVAxQUF0b3VqaTRnQ1VObSsrbC93dzI4T3pUZWY5djhTQmtmMXpCSFErMExVWnpQdU1maW5lTWFJDQpBaHFKTWR3NkRNSEIxTlgzU09GUm1qbUtmUFVYazN6RHB1aXZzYi9PdFlmZ2s3WXIyNTIyQ3RFeVJPNUsNCnJUNWZhRTJSc0JoeVJTRFNsVlBwQ2ZQbmtGRnYyNHVqMDkxKzdHUHZsM082OWpqRUo1dTVJTE91VDRXUQ0KQ0Q2c2ppV1BPamNkdHBxWWdHWi8wVlZrVks2a0FwOHJTc0lYNDk2RDdVSHdMQUdkUW5zbU5oNm8ra29BDQpteVNRZWlhWGx2eERkUHZONldHRnR3czVtdGlEMWhUMGMxaU5CenBYUHdCMklOb3RJY25WLzE2U2c2VE8NCnhUMkYvVWduVzE0OUcxa0lxcjNRMEdxdWtGaUEvWnllbCs2SjVHeVpra2RaSXNVQmJmVkw0VjZ6cHdPeg0KMDRTOS9KNkFwRVZ4dWdhR1JTR2luK1pEQ3hYUmhtWm5iNU1hV0h5ZWczSXdlWTlQVGNXQis4cGVUTkhLDQp3ZzcxbEQzYmg2VzZUbmVScmVtMUQvWkxRd0tyaGwyeTAxTVFZenZ4T1JqdW51RkNUZWdVY05USnZnYjUNCmlaYWxLT0Z6WWFTMWRRYjd2U1l3RGxJZTRHNnRvZncyWlZVZUllaEFDZFJ1RmNPMkZkb3gyeTBNZVNRdQ0KOEdQSVFSNWtqeGxrWFJhWVNGVEgrYlV4Qm1Id1o0d0lHVnZDQWZvSmY4UzFGKy94OEdOYS9ZUEppaUQ5DQo2NWY1MFRpcTdhMUVsekhFbGZQYmJrZHNGYWJDMlFKQTloc1h4amNhUzA4RmVkRWl4bWp1UkdrZEU4Z3UNCitSNCtDNmMxbng5bU5kZHNxMnhaWHNDQ1lWeUkxZ0w5RExMcUFFaUNRVHBEbWtaYUI0S2RpOGRMT2cyYQ0KVVhkTnJwV1RubStZMjROUG9nSGw3QnkrdlRCcXhBUWZpT0FWRk1TZU5YKzZ3alRHalBmallLTzlpTGhNDQpGcENodjdsTFhudXJrbDlBVWdzTThJTHJBME5lZ2V4ZlkxRFhBYVJkRkl6cE5TTEtWT3A5QjVMdmkvaUsNCmJSOGdZUkcyampTZ2lnZWJYeVU2RnhSamxTVmozekxHUVg3bHM5Rm1DM1VLMUZRdVBDSlJaTW0yVUY3dA0KVkN3bG82WFZKY2xxZTBzWkVxY0tHQVBiczhsckxDSzQ5RC9HRDlRMzFDQmJCSGxXdDdudk9mSStrdmJSDQpaVTBPdUpEWHdMcWlHbXc5S1ZRZXc2SW1RM1pmTWdxcC9BMm9OeVozUzYyc2I0cWFISjZFV1paaDl1TXoNCmlIWFZrdzd4dVRyMXZGN1dnRUdHakZ6TDROc3ZqbW1FTmdkck5VS3RHL1hLdzR1OWlnMW1kSGxBWnFpbw0KZkhiMkJWZisxZ0tiSmpPUENWcFJOVTFQMDdTbGJoYnFpRjhsVzNVYXA0dFJDZFYvOG81R1VuUC9zWjVsDQphNE1ZdDlLY2NNanFEbElGZUIzdE9sbFAyclkzNFdRUHhrTjFWVFVnd2JhVnhXd1g3Q08wMk1vZHltWnINCjlkYzBsV3FQM2ZtdEJ0U0JmSzdEZEZmYUNIMHlMek1SbE9HbWkxbmxHQzVsMWE5MXUrTDkzcmp5N1ZKcQ0KN3E5U1dhUFRUajBjNWlYOEpSbGFjWHZaZWZjOVVJT0p1UkxGZDNZZzNsWmdCTWxvYzhtQzNacXFPd2piDQppek1JdmxNSll6c0MydS92RWZWNVBUWDIzN0pZcGJpMHFhUUhGTkUvb3JUd2dWT21BeldIMjlEMmREVXYNClVHakRjdGFyN0VyNERxZGh4UDdlYTlmZFlhcnAyWXlCSG1ERUVRMDRRYzYrNE85QU5rc05lc1hWekk2dA0KWlBwME5rK0NiVmEyUDNWYXRGS1VORE5aTm1pNXhvNXJKRDJPYkRoY2lNTGZlSDFXRk1xN2JkY1NCNjF1DQo2Y2U0cDZMSGNTbUpWWTV1NDZ3OEZjOWVmRHZRQkVzQlRYaGJ4d1IyRE8rbWh3QlhhVitRa3M4OWdxWUYNCjVWcnZ1dW9seERRZGJodlRXN3hVanZncGZ2MGN6dStqT3J0TS9HMVZpSlV0WEN2a0ZwVDFkVUJGSUJjZA0KaXdqbWFiZTNsTzgrekg5SHpGVXhwc0U0VG1tSWhFeDRHSGI0YlFCL3BjSVJaMHJmNUV3YkNHRWo4dS9BDQpXTGlrYUdjYTdCR1VWTHgrdmsxcFhxU3lDK3pqQmNUR3dNdmZrY1p4N2J1dGg5cjRxaGxLMnlDZkh4d2UNCllaR3ZmcjJWayt3a3EwR0tBcFh1VGdDZHZabjZ3QmdoOUJkb3ljMUMzbGVGYnd6d1dUdXNWVlAxak1XZw0KOHh5ZXp4bVAxbXpBQWt6UCs1dkpvVmhGUmZURW1pTDBmb24rSFhYME43b3JVRHlPNE44RmQxaFZ4VjRKDQpZTXhjL3l0NCt0QlkzTkVzV0xleC9aTUZZeFQ0YWRJd0ZLSzN6bzJqK25OWDJoQ1R0eUdQRGRGdjMzTFgNCjVHalFUeWJ0eER5a2djRUQ1USs3Y2U2SGdQRnQvYmM3UEcxeGo3YTdaWDkwSERNTmdnTkQwc201UGQ2bQ0KUE1DTGdpeDc1elBpTjFEbUlKNGwveWhpWGJsR3M4NjBoaFFITG85UEp3MFI0UGU3b1NZd1N4OGlFV0taDQpGQVBIOHVsaDlrbmlRNnlzSFluTFZtQmh4VHBxRWd3d0pWUGdHcVFSdlBZN1FQRVJCc0cvZ2k4dXBvUGENClVLdnZ1aUFqeFNSeWt0bE5sTENGbDZ5cjFTdDhiM0Z6K2tTd01CQXgwYityd2Vqc0NaYmQ2Mnd6Sldtbw0Kc2dUa1pqM1NNM0ZhalA0eHd3TDEvNnpqNUp0YlErSVpvUzEvREZ0dGtaTksvVHE3ZCt1SWx4YWx1QlhTDQpla2d2S2NWTjNUSlA3YmRUN3BXWUR3RHRoNHhNNnRFTkx2UDd6dDBUMnV0dEdieHV5RW1tVCt4UW9DNjANCktqRUp5RWhrQzd0bWxtWVhTTlFJd096R2VuMENEQnBMTWFkbjhWazBPclQ4VUg5ZWE0ZEpnOEJsTE56Tg0KaXdJc0k0UVNlVHpWa080SlVqT0pxRUc0Zm5SeXRvd2JWSkswakpxZjh4U3JOcDMvZXVWemxlMk8reHV1DQpQaHBJVXRFTUIxVFJDWHZRSzJncHB1QWxGNU9mV09Qc0JuOWYwREI2RVREajE0N2ZUd3gyL0duSjFhVloNClc5S0FQUFI2RWxuZys3ayt3VkJ4alJkUHNNTERoaVN6cHRYU3VrQmsyRUFHNFBYTU5WNzUrcmVBOGoySg0KR1c1RFkyakZaWnJCeVo4ZzY2SkM2UEZFSjhlbkUvZGtzMXdNZUdCQ0F5S1hmK2tLRzNFN2dHbFpaL0VODQpzRWJpZC9UT2ZveTdjVEl1UG1GbXhvSnJ5bVdmeWVxOHlnZDQwaHM5bi9uK3kwWGZlbStoeHRDT2pMd2sNCkZhbTdOSEJaME5McjlIaHk4enhFbGx6clhwczNoNnJUa2VNdEJua2xSWm9zQ1pIcVZTUzBSREI0QTlJUA0KRnptbTkvOWVPN1JZbUpjdGdXdUIvNmdwaDdHdGtKWGhKaHZZSXduVVFTWmVQcnBObTZwS0YxVFlkeGtyDQpBMHhveDVpR0FWdFZCQ1FoUU5jOGVIV2w1RUMyVjJhWjd3cEo3NnR4R0dHQ1ZvUTVycHhCV2FlUGN3cWcNClhNZFRoYWo4SmZMTzMxZVhsbStkdjU0QnFFSFh1VlVyeTJFRHp0bVBVajdlSHB4ZDU5dklXd0RYdjMxTg0KdXROM2h2MEs5ZGRHWE53QUtHbkZCUm1LWDczM1cyWHhBWThJbDl5TkhkUHNJQzV0cXZDRVlCenJYd3orDQpES2Ivb25zc1BXUm8zV2N5LzNGcWM1Y2dDSTk5U1F1dGZyNXFrQ25QR1hqRGJRYi9Wam9wdWtUb3pHTlANCi9iUlFVOXd0Vlk1cUwvS09Jb2wyaDVKdzk4bWNMYVpXMWlNMUtVa1VKb1VpMlpxdTZTRTdJTVB4NnQrRQ0KSVNWaGZLMlVkUHVYMXBmVkhVREVDejBvaFE5WXZDbllRMDJOVHJmcTFnSDRQTmtFZXBORUU0WjZEYy9oDQpITUhnTTdpS2gxbWY0RkYrOWsxZkh3VTQ4UUl3OUlueHNLZGhaTWRwWXk3b3ZTVnFBRkxMRmRSTm1xdFANCmhCb3FJRmNJcm1vRDZVZmErdUpNR0x6MjYyT01XUkt4b01oeFMzMzZVcHJqM1FSQ2xWd2hxeDdDcmJLRw0KajU3dStvcVg5QXp1dHhNcmM1Rjh2OXhkVzR1UitiNVd6Um9NcUNIYjRsM2UyS0RTdFQ2L1QwVi9RekpuDQpoSTVPQThTMU92aUErNVplT0UzZlZWWGRZYisxd2FUZW9hUXo2MVdTODhlN3UwcGY0ek1xZzhzaUJtRWUNClJ5VkFhVjY3K3BLQmxXY3pCZHdZaW5jZ2F1Q0NqT1BUYWgxeDludUJBK2JJM1pDR2FEM3I4NUtIb05QWQ0KOGI2REx4cTNucUxnU0xTSmdSNC9xMmUrWTE4d1dQL0t0OTcvZWdhODNqb215V0JQUlBjOHB4S1J6NHlnDQo1dzlNNFQ0VUhaVi9zcTZjR2FQU3lpZXB2NkNDNktGWnJPd3pzNkRZczVQZ2h2L2N1ZUNJQTZDdjZvN3UNCllMNEU2czUzbTNFMXdVWnkyMHl6NEluZ28xa215SGg1dk9BVTZ5UjFXdC9SQ25KZnRyRERPeTdwa1pkRw0Ka2I0ckZaZnJES1BDOUJodU0rb3M2OGJiV0dzUFQ0cnI4M283aThtY1BlZHNCNzU0TlIzcVEvNGJ1UUpyDQpndlMyUzJGRmdhNzJjaW55N0dJOExHOUg3Z3E5UXlzWkJyNG9nendxOEgydHFmYWdzSldZTVVJOXJPaGMNCm5Yc1M1U1Z6cDZiTUpiYXUvT2txU0U5cW9pUE5UdEtMUE1kdjQvaDFDMW1iL294VExjSEhqN2xmVVdWSw0KM1Y0bldBVWZrcHRuU3NlZ1BncS9zWVc5OEhDNVR6V1Qzd1d5WENrdStOZHp1Rm1WRzBzK0VYQW83WUJZDQpscHk4WkcxSERRL0lvRjhsNGhiQzFoeGs4RUcwZDdrc3pOVElmVnRSMFJKRkkwd2dnMjY5b0c3TUt2ZzcNCkw0OHRvZnZ0V1FFWG0wdVlqcFBtekEzSXdYRHExc1ZsUFZGVHlmN3hoYzRVTFhaWmlJcXhFd2krb2xHVg0KRlluNHFveDNCWU9xK0ZnczA1N2JpL2YzajMwSmhKVzlWZWRUZGRVbTBsYzlidHVDK3lUY0UvS3BmNk02DQp1Q1RVUm1Ldm01Y1lwZzdmcVg4dXdxeFRidjFpRW81T1hkWFU1M1J1K0JUQm1aeXZhRGVHelYzMVVOWW8NCjEzVXB0dS8rUlNiZHVDUlZ0RXNGMUZkcGFMT29rZnNWSUZlK0tqZ2NrUEFHejd3U0ZYdmF2N0RaRm14ZQ0KeGFoL2VZaGYyTjhpWDJVc0V6NUNydDJ0a05VbWdFM0RyMENrVGRoenlkM0dudVFZbCt5aXBMMVd2RWtjDQp4SHBHM25nN3pIditBdmVLbnNmK1JudFBvNWJKeVR3VjlsUDQxUWZGSkx5ekpVWGtQTm9Odm5OaE5JakgNCk9yU3c5UWJpUXZLZnpHWDFLUlg3QU9SU0JSVTA1RkhPN0JxeUNDbDVjUmoxRVV2TzRLWUJBcTRUM1FSYg0KVDAzVDdXcThtSjRGQkxDM2drWklBRkJYakJldENTK0lZUTZGM1Z1OTYxQ1JYM3kxQVE1QUlPMWpzMGF3DQppdTdxbk5uUzRXRXFOaEJKOTFGdVZncG5mam92VmZmQzZjVlFmZXBncXFrelZNZThCWnM5TWpRbUxVcnkNCmdTMDJ0czFjMjFPdHdHUE1FS1F2RUEySFUvYlRUSXd6LzRVajNWNTJBN2Z5MUxUU0tBVUx6SFN6c0VlVQ0KVzluR2cyVDVqQTBkckhwdzdOTHpnNzFzbXozMFFINVZycGptaTFIY1BpaEFGRmdEbHJvNDkrQW9IcDMxDQpOcytEM3pUUmRLZFRnMHVWRWpRSkRUeVk3dklQSW9xMFJQNFdrdTUrRUVzTExrOW95cit2WE1Bc1FUKy8NCkduajI0ak9mZlJDOTc4bHZrSlZpU3pLWTVOWEV3UHdmZlNkT3hVWHJyQ0xZUERwVXV6Y1F3UjJ3Y0xrbw0KUllZOGppaGQ4UmVjeU1UVG02VUU4Y1p1RlhzbHB5ZGxvUXRoV2EwZzhiWFNKZXNRUFdwY0RkS2FBTzcrDQpCQlR3S0lIRE94dm1obDliWDA2V2V4TTFadTBNcmQ2UUx6cWRsTTcyQUZyU3cwWGlXUDA3QWRmME0wWWsNCjBxemhEQTNwZkZ3a0dOb1ZscmhnTWNCOEVWNUVDaU04VWNTUjQvdGt3V3YxanA2L2RUR0szT09tNlhVYg0KdzE1UWdXRmFMOVNLSzdLL3RVM3RhUDBFVTBQWFgrNkVZWTdLMytSSUhNS0Y4c2dzK01JZnB6c0J1WDBuDQo5NDdmeG1vNjdrZ1ZHZS9VS3RRaHpEUlZpZzVGYkpma2VQOEY0T0h2YnNKcCt4TkxkcTQ2UUZVVzNhTmUNCjBrUFc5RXlndTFocnFGbkZUelJlQXcxdlVHQWpERXc0MitqdHhFcStTd21JZWFiOHdpMWdqK1dXa1YxbQ0KTngwamVXMUx1VGRzV3JLejJtU053Y2ZrU2lEcjhkYnpScS9HTzBmVVVkZWNzNCtnNGFkaGlFRURpU0pjDQpQTjV4bHQxVEZZZ2N2UTJIZWVRa2tiZWtBN1JEcTlkZXJTSm1mWWFXb3ZnMFU0TC9WM1VXdTU2RHgyS2INCk95STFDVVlOL2UxNi9adEYwbWxnNWhCcVR4b1FXYUdzZ0tKbG9wNjd1QSt2UlVGWXNaWnMrVG16NndWWA0KaS92LzlDcDg3Sy9yaUo3THVxMHJXelhWc3hxWXp1R3VaVWhjT0FaN3I4dlZQa1ZvektSMzRGbTRoM0FGDQpCd0ZuQUVCL29xam9oRWgrZ2NNT3Q3em1SRUtDM295UXAzdmpGQVE0MFIrWHhxT0FHeHU2N2phTmRjOHcNCkEvM3F5OUpDRE5DbFQ4SitmYlFqRXhpMEhPSlR1TlEweWNPWklHS2VySGwvRlN3OEtuZXdCZmwxUXlteQ0KT2N3VUFWOFR5UHZ3NFNNN2hKOVYxbnkvSTR3Y29VeXlKZVVOMkVONWwwYklqR1pFR1ZYL3VVSGVrR05oDQpyVXFReDAyeXN2QnNsY01DYXpJVzJSYnNYbnFpM0ZWbkgxalJwUEkxaEc4cGNPeTFtZFdCd3ZoRWF3dE0NCm9STGNaUHNsM1h5Qi9jWWNlVk9FY2hqd1FoKy9DanZaWGtkZUcrWGRsbFJkRm80T0kzeHhNa3B3RmlqKw0KTjBCdEZwMmJuZVh3LzBVbmhOS2o5M2xrcXoyM0F0YU5mR0tMbXZvK0FWa0Nwc3M1SzF1TDdkazZiRzBEDQpDcjUxL1BMeSt0dTBEZmRBbVQvVU1Yd0NLbm5mSjgzbmVRcmNHYkV5ZUxRaFlmL3RvQlJyUlY1YUs2ZVMNCjcxT1o2d3hMSmNoVUN4VGZKWDhpTStXSDRtRG9ITWwvc3VobVlFSjJ4KzZrQy8vWitzc3cwK2w1YlpQUQ0KTXhqbU1KaU9nMm5JVWxiNEw1cVJFOTdic0lVb0M2Z3ZIeVJySEpBTWhiVEVEZUFzejBQNWZOMEdybzFPDQp0V3F0cDlMeWdHeUN5Z0NUbElIamFjUmFibWVneTN5UWlyT0VNYTlObVJEdHVtVnVXRjFYZGlmb2JPeDMNCndVMUVEU2VKa2NRL2ZCWlZRS2p5eUZCQkl5bUd6cFJKVFozQ0l6V09mM0lzTmtBb3dwN3NYYzZUTDlLNA0KckxrMCtjQVVaMVBBSVROMnVKaVlFQlNlMEZ4bDh5SjRFTlMyYk1ZSk1kWUp3SEhpa3BUZ0xuMThCL2s2DQpsQ0hTdC9TTWIzRVdNSkZJUnRIRHlSVmZVNXcrQjVGekF3M0VnaERYNzdiWTVnSU91dUJzRzVnUlNjUUENCnYzQWtyRHFJTVBMUjFhVnVNb0hBaHovMlh2QVBiM2pnRy81ckF6WmczaTlpMVo3dDBiQVd5WlpFUEZzRA0KVUVWNnpyZmNuZFp4V25GRlNBeVh6RW5NcHNIcUY2TE1vZUlHUVIzZHBDeks5ekplSXVWMXVtODVxMmpIDQpDbWpuNnh5d2dvZW16NVFhV0NIR0ZTajNhbnNMOENrRUYzRDNTLzZFMzAwUWJxaDU1cDJ3U2owcHR1L3cNCncyd2s0MytDUFhwUmE5RksrTXZvMk50b2F2aUNmTHl4aGxHL1pqWW9wTzdhT1UrTHNmRlFId2lERmRBdw0KbmZ3SSszYXdLTW5TOGdUeGVVUnNTck9kblhzUnY5RFZYTUpMNnlDaEhlV0NDUEtYdDE4U0J6eTE2MkVMDQp2OFQ2VEdCbG1Ba3FVTVQwc0pPRDRsWVRRakkwbnBZeVlLTG45amVHTGtOYnk2WWFIQlByUFkrU3E3Wk4NCndTc3VNZ3hvTEE2bjIzTHJ5d3VDWmdPbHlVV1pvSlh5U0lxV0t1ejlaZ1U1dGNxaTdJZk9mS1R4VThDTQ0KbGVObmoxRC9pK20yZ1E1TmtJdm96YU1KL252a1dJVkNWcGF6dkNWMTNDRVJ6RGN5Vlo0bWhCdzl3c2grDQpCSnoyNEVQdjE1NUJOU2FYU0xnZWRnTzZlTU5halJSaE9TdGdsMWFqUmlTQnJIaGxUaHM0UmhXYU0rMlUNCnhkWjdUWnJXdFNWSnVoaTV1TWZ5OFhPTlBmbVhCWGlpNHNaamszZE9ydnQxZEVjeDhSdUsxbHNScXlIVw0KNmRVVjlTbVE5NHhYUHJrRytDTTJqZ3ZnVVNPR1NzZmlXTS9Xdkp4WFNMVzhib2ZJQW5SR2xNYXJWYjgwDQpHbGpWdzdLWi9oMGJOY0svUWJ4bHdjU3B2cC80L3kvVW80UHAybjlZUWtGSmFwSlphYVEwMmZ6c2lPUVANCm1tUE9IMk1zc1VMWGYydkliUm5FQ3I0Q0YzNEVnbzJYMTZBQXEzcnZDQUgyWjJTWlNQREdWdS9VSEtLZw0KNklNWFRybzVHNmNuVW1sd0xWVU00cDMyUVpYRDk0SWphYTJuYTdzNDd4dlVtei9hTmdPalFSTFk3YnBTDQo0cnVZa29lamFONEhmcXRVV1J0RnltUXFqMlo4cFBzbmlmZE9mMWhkeXZpZEdxSVY1b09HZXlEMVA0RHMNCnRsTlpYR2toTFdQbjkwcXJ3YXp1YnNoa0VJdGZCblkxNFNQTTlBWXlEUVkzRlVWU2Y0eVVxKytHcDB3RA0KOHRQMExHRWl2UE5ZTXpmbVRzNVUvNVhTeUdkdmM5YXNGeDE5aTEveFlhVkVvTjVSajdOTmJmTUFuSDJFDQpKejRxa1JNRkhFVUsrakFRanJjWjBBMnlwOXNOYjJabWoxQkJXNFlqcWMyZlMxM3JDYklIeC95aGgraXUNCml3V1BTYWloek1GYnBaUVZhem5VdEFQMnJDNnNjNW14a2x5ZmV4bzY1L3pEODVrYm9pSFNiUmNnV245bg0KampzcmNwQWhQYnp2REtxZ0FKS2p4UUhCclo2eEpISmNhMGYwbnhHOGxJaXIzU1ZTY2RIZDc3SzhxblF5DQoydzl5dGhmeUQzK0xramJKdzYyRHpOenFGeS8rTUc4RC9zQTZHdFRKaXlpOTdYWTBQcG9YS1hKVE9JMVANCk5mbkNseG0zVFhzNlNjWWN6VU9uR0NNYitnQVpCY0hCM0xIK3NqdVI1QUpjeWk1SjByY0FnWUlGajJBZA0KMnM5bVYvOUUrS1hUSnZOdnpRTzlxRW9heWxYU2lGbTFCYnBncHdoV0FjanpKSmw0QWxPQzVQREpvNGZkDQpqOFZaZGdRTnRjV2dYSUZhem1SbCtQK3BBWHNJTDJDN3VzT0MxeDhxZTlvbUl0RWI2eTJGQmpmNHNqUzUNClVScG80Q3JBSnhpM2ZGTG1zY3Q1cmNvSVIyZkZENENKa1RpRk9CODkxYnFra0tRUHozT2VvRGUzTWY5Qw0KcW10WkdFd2xLYU1PbVZJeVRQSXI5eFQreEFkM2hJMHREazdjbFVkc3lxTzFDR2FPOU4wK01vNE5VeHdaDQpNWFdFTFBGem93UWZDMzNKdHVEcHU2YkdXUldXSXJzcDA2M1k0UElTRmRwenNjSWh6Z3JGUHJteXBVZmwNCnpHSXF6Z1dGV2RMWDBmai92bzgwUTJOQmdQaUNrNlR6bU05T042bkcvL2pWNXFuTHN6MCtjRmFzM044dg0KdU5na0lCN25BalZBQ3hiUTNNQ0dFZkw2V21xTXYySGxnNUVPaEpnelZCMk54OVB2STdOV3FFYmRJVGR2DQpFNTZOa1UzSVFvSWZMY1Fhck52aVg0SmFmdXBiN2FPWmVtdmRLUGM1a0NZRm1HSWhkU3R2c2ZQVmpEbkwNCmh3YWZ4aUkxbWZtTTlJVG5XVmhqUWpTNTFGOFVvNTM3MmczcHRKYjBnSHdPRWlERW0zbWM3aUV3L1ZMZw0KbzVUVWxEWjNwVGFTSSt3ZHlmVnkrRk56eWt4eWhnRXNydFhNN0FSRGprVW1oODhWa21EYVZTUDdzdTQyDQpZeElmdW91SkNsWjJyNmZZMkVtR05zdjlnNXFpcFlHNW9mdFIzalg1TGdqdUtpOEY1UHhXZCtrWWdVaDYNCjh6RnZkbjZacFNiTlAzaStBVVh1Mll4QjM1ZkhoWHdaTy9OZlBwaTg5TVFXVW5KLysvN2cwTzJsQU1XSQ0KUGdYQkI2WUJPaUNBWVlwZHE5YlZ2K1Q2WVJOdlFVQ05Nc1FsdVBmU0dVam00OU9DMkViSkxDbTIyb3F6DQpYZ29sbVhuZldzY1lwSmdDUzhOZ1NpNDkzQWFOYUgwU09qZVZydEgyL2VIb2pwMnRRZlVZWHJHU1BYTEUNCmxKMFhKazFrQ0NEOHVVU0R1MjNyd2lzQXN1NGlrTHY2THdQVTdyOWVneTVDa3JHb2hqYmdPUGlUODJtTg0KaDVkUE9QdEw0TmJOV3RubnNuc0tXTDQxcXBQSGM4VlZhK1lyYzl3WkwrTXQxSmVSTkJoK3VxeUNhM21LDQozWjRGQ2ZoZUFTZmpoR3VOWTdWOUVxRmk0TDFkQmUwM3V6Z1RYd2k3L3NUb2dSTDNSMFB3SXJtcmFHRUQNClAvMWJvaWdFazBDMHE5L08xdGIySnNDbnl3VWR3eEU0VXEwWVBFcGhpdDhpcVRvUGVKMlBRVmpsakx5Lw0KZFdiYTk3M0ZDMmhQL2xIRWtJeVBmN2VXbGRaT3Q3R2dPYmhPMXpjRy9MUWxGWTNkcWV1UWZqUDIzemM3DQpkY2Zkekh1KzNVNDNDc1d5dEVQSS81WENFczAySmJJVis0SGpGR1hveURVQnkraGtNL1VSTFdEU0Uva3YNCnhyYjBnNHR1czZSL0xrRFBuYjFJQjQvNjdrelRwYlZPdERPdUFzZWQrZFY1V1hVM243Q0VtQWxHcC9jSA0Kb3J6Q0dNMjJsS2ljSG9PWDU3YUNiMEpVZmhKbDZpb2JBUk9yZ0I1dDBLYTdEeWFrbFhBQ1NtVVBIRG1aDQo1czhuTE1hVGdHaDJQSVVHSXFvdFRjSkFJRGc4NW53Y3BCL0VSdlczY0hLNitWMHlRU09WbnhXN0w1WkwNCjJjanovN1doUnp0ZDVsSWZXTys5dTdtTHpHNGhWTitrQWd2d0ZEVFlWeEhySnZrQ3lZR1lXTlh2S3JVUQ0KWFZ0bDFGYUtSSE1KMGhsK09zaWptaHFieGZjbE9qWVF1empIM09QUjF2aDNFWHRHcytwdmZaMkc5QlNmDQpMYUIwMnFvczl4bTc0Z3lWbkpvRlNHZzAxREpwajd3WktDVTNaSHlxVmYzcFRpN21OTlpOTDhjcWVhZkMNCmlHRThPZGl6Vm9SNlFOSTFFMzZubVJtTkhRMGZvblFFRmtuWGdXYWdlOXQ4aWg5cjVNQVNTLzZmRTF5RQ0KWGpyN3hyNkJKS0ovWVRMVmdZY1pveXNJL3BqZ0lLM04xN2dxOHQ3WVJDdnBocjZyUTJWMExFUU8rNDJPDQpuNlN6dGpVazhoVlFLZVhiYmFxSlpJU21NYUd1S1lSRExHUit5QVBYK1ltTnVKUGJSZmFrQ0lLVTE5Sm4NCjF2UEdYYjIvcE1lZVNMTnBxVkRkemRId01UQ1BVbVkxZ0orR0N5cDRyamVTbWoxOWR3ckNTN0RaR2k4Qw0KTkY1L2c5UExNdG1kZ1ZVMDlkTVBKbDVwdDBGaEFaWnA1THVyRlBOWHVyN3ZpeEtRNUdpbVBZYW5OeVpjDQovMXBiRE1qUkU2UUVLMXlXRlJQcXYzbW9KOENia3dzcTA1YVJ1K1JycmJjdHFORFJhMGtBelVGTGNrLzYNCjZqWngreFp2d3lkYm9TMkpCRGVoazh0NkhJVGpra1lXbVQ4WllLbUVLaGN3ckZJS3VNSnd3S0tSYS9oRg0KT0V6eXgzbno0Tnc5STZ6RCt2SU4xSEJadDhuUDc5WnE0L0c1cEllcmV4QUdlL3hzWHdCSmovUlFvU1BODQpsRitVVjJuVDM0L0FYL3QvdXp1VXhHQmM2QTFOUC82dUFLdTdpLzhYUXB4Z21ZK0sycndIOVlNb3BTOHkNCmhhdlArNzF1QXZMZTBuVnZhWVRuTG13V0lOZzRZMUxFZEFMZGtBWTlxZ1Mza2c0N2kxdmg0NHNlbWVHWg0KLzdKNmRGTHdNTXJJOThRYVBDd0lHa0hpb3pUOXJQRk5ONWdWbUhDMVhLNXFvN29lZDRueFdQUEl3dFBBDQpVbXFqNHpaZE5YSlkvK3RLNUlvQXd3TzRrMm84Y2RMUVh4bVFMdGIwQVQwdjFrREdjbmdReFkvNFVyanENCmVHMkNmOEJ2aTV5YVBYWm54M0JORlhoT3NtOTFoK2Q5cDZhM0JUNHJvNEp1WmU3cnR2NVVheDNucFpLVA0KeDlxTlVMUi9iUmdoMHRFc3pnY2FiZXFPQUV0d1NVVUVuVlJxZ2wwZEVQL0R0NHRubkZOeTZtdllyT0h3DQpoNWRqZzdtMmk0RXNGNkRFMlMwQktyTmRKL1FOd2RmV1h3WUV2eWVSaDlDT2xZZjl4OWh3Z3IxZ1hFSE8NCmp5RTUrNXRjUTk5SW9ManpYeld0K0dqTFBrd1ExUXowM1JRWjZpeGFqdXlZK29hSUR4VE9ILzZGRWlJMw0KbnVHT05mZlpIcllRdTNGNTRTVlNrWGUySG83OE8rKy9NZ281T2h5ZlBvTTMvblZVOUJtYm9MSVg3NTlPDQpYamZWcnh0RGI5SkVTbE9KN2JRQUdnYUZQSW41b216Nm5YQmszcmM4aHBFZkhnVHNWa0g5eGl6QXVoMVANCmxYQkd4ZXFGYmZNS01hV2VUNVpFdWZsMUdtb0dsaXY1dk9KTzNIcGhDUXdTcm9rQ3JQeXlQVFV6cVl5Mw0KdEJLUjJYdTRwdHcrbVRYdFVBZG9QQXhLRThZL1gwSmh2MnFkcHAyM2d1dkpJT3Fndjh4ZG9oZzdYaE9rDQozQnBJT0xhaFRoeGp3NDJaSFptMFE4OGVsWnd3N293RlpjWGRCTXp0S0o3NFRSV0lub2VHekJncHdHVHoNCnZHSzUzR1lmUWtxWVFtWXNTcVVIcVdzT3VqTmF5YU5rZUhLNnp2RmxQRHM3MmF2UzQyeGlWVzVEM0NCag0KVDVHUFZmNFluLzNrdEMyU2FZakZYZVVrN2xXZis5cmorWk12VHo4aFZnYkpSbldPTG83dW5uYmRENndEDQp0ZWlUekI0MG1OSi9QUUprRDkrOENudnpIdk5HS0MvMEJSeEtHY2dPVWduT05KZEhieDBKeEkzZFoyOXQNCmhmdlBmVS9zbDRyZnVSQUhLbGpUU1ZERFgxbVN4S2NIdEtHR0FkdkltU3ZNQ0JwRE1tc1E0MXBkMTNuaQ0KMmVLV25oKzllRkU0UXhFaXlEVVJuWjFTYmZhOGZNTGZYV1V6ZndNcTNhWHA4MEIrZFdxNHFCZnZ1cjlkDQpLSlVHa1pmVExxdGVlVHBTNU15U051U0t6RnhGKy9mcUtYYUdxSFI1a2dkZUljcm14QmdLMDhkMEgrWVMNClJCU0tmQTlwK0FvNkhpSHNLWHBIeEk1blRkWHhCSTVMVlYveXorZXlFQUpRR2tralpqZ2tLMU5wRXQ4Ng0KYVhlc0tySzNOK2NOQndkbVRXcldQNFZlWjhhQ2sxem15TVNCMURteDdlOVUrMWpJUzYwVFJsZGQzVnRrDQo4SG41dDhQdCtVelk4aFN4c3JRdmtGcStEeG5mTkQ2VVRoUjA1b0x4Y1JsYjRoVmlXYnlQMXZPVXZTc20NClhJTW1PbVZXV0FxRkVkVGp3K1owNi9JU1J2TThYSmhQd1ZIanF4ckU4Mm4xS1hhQy8wZ3ErZVJtYmdDZQ0KVFZFUFErZnpESmdrQjZVTjk3TzJnQ2hCNk1QUWlFZlQ3dmVJZ2ViRTEvOE1HRkhBSk55NmNsWURCemhaDQo3ZmQ3TXI5M01LZXBDdVlIYVdaMmlTb3RGYjJueDRnRU9xT2JiK2ZXWCsxbURNdTBnNFFOTVF1NzM3dGwNCnMzVkE5akFHUVVVMFpNNVlPaGxjZ2xzMklVeVFhd3k1TlhSaXhLeXArR3hPY0svcVlFN3QwVTBZWUZkbA0Kc3RqTWxNeThwSE1TVmtPckRaR0xUd2ZBeXZ5QS9VU1NScC9tNXdpa0pBcG01QmlYN3RXRzBCLy9leVIyDQpnUUY4UWl3TzZaVUlxNEo3MXBlTVZHSUt1RlBhTWNnNGkvdzRJcFpld21rbjh4UEM2MzlRNDBqbU9aUC8NCjVzTXd4Yy9WZmJJMm5ZM0xoM2tHcVpkK1I3bFJ0b1B3OVRzOEM4bWROQlB1bDRYMm5oMUk3TzZKU2dqVw0KNFRwdFBqd2ViZE45WG5RKzNQajcyMDh0NzJrRGpXSWN5VldDYThJU1VsODg2TXFxa0lQdmZaU0FiOS8xDQordFcrd24vQmFkVThQeG1LZGRZbDd1dnJBQmZwZlpzNWlSUVhJejJJN2FhcXBCeE84RmZjWlViY0tYN0YNCnl3aE1WM00rYitraWNOaGlvNVN3WlIrRmNhMFhBQWxYQXVGSVF3eFFhQzFjak5iaEx0ZDdOSE9iLzhXUw0KYmREWnZvN0trclRmOGVsS1YyaGdSblE1czRhaC9vZW1jYTg3MjhzaEpldFF0U0lFckRmclpzRmdybVdYDQpLai9NdTlFdEhzNkNhRmhkcVkwcWVlUHRLVXgwWXJBZXoyWU9Md0FBU2p3MzBwN0pwYWlMS3lUOXhFb2cNClhpMjNBSmNyOWZ2empCR0RnaGxVQVJ5RXV3WFpIZVAvYW5wSUtBS0owUTljbjlVYTlzMjFQRklobW1tQg0KVkl5MTkyZ2xQTnlXY3ZVM2RGSnBFWE4rZnc5elFSemx6NUE1YURrNWJManNCR0hLTFNqS0I1SkI1dXZxDQozNDE1VmovOXJ0K253SHFPeHBXTFAvK2ltYllucmhLbnZCdjFlUUFRd0t4N1lRQVFaa1hlSGxPcHN2ankNCmN5c0ZJL2dyRUN4cHpXdHRQdHVGekpIZXpiY3ZaQ2NhSGVRNUU1QTY2VlpCV09KSmJXMEkvVWUzM0VnNw0KZEh1Nk53VXVXVmRsL1lob0doNGRQMGxDaTdtRG1mbitZL0w0QndMY2Q4MDUyaHEzTUVHVkFLRHRwQzdUDQpZUThNUktGbjlDT3JMc2ZCMUpCVUw5aG1rTnl6S0wwci9vMGI3cHQrbjJRdWJmK1A1V1dNSGdSeXNKVU8NCk9uQlFmV2JQSXFpVGpHVkF2Y1QrU0wvZG5aN2VudWRVckxyVUlpODRmYXh6SkRMQ3dKWmhuY2RnSlBtbg0KeFJuU2RDakZTWUl4c0xBMkk0aXp1UUxoaG9vSWxMUk1QczBoaFUvSDdTVWdCQUpDVmw4WFN4QWpFZ3pJDQpobVRyVmFtMWdXeVRpbmxQZWpHSGt5eTR2ME11ZlRNbjhHT2FvdTAwS0NkVEtrRUg1MXduWVBOWE1lMk0NCnRnQTVOK1g2ZzNUMisxK0IxNFVsY3JYb3JNc0FCNW4vOEFjcFhpQndFVFdVREw1WkY5Y3FONUlOZzRtRw0KUVdzRnF4aytSWjFBS2xwVnpLTU9OM0dmbEc4bWw5eUp4cmxmYjc2V1VvbzR3RTgxbGdHZGtFZzRCbjBFDQp6b0VPNEQ1WWJwZllWVDI4TWp3SXBRQmRsM3RycW10eUFBTGZJbXhtS0dpejlnbk9kR0pwYXpHWEliSkENCnR3Z3VZcE13anZzcHE5L0RFaGtVQkIzcjYxZHRBVGJHTGZEVnJkZU9GSWFvMXRXVHRwb1RlV1JPSUdTZQ0Kc1hWZkxUQ1hNelJwaDdLMytjejBTV3FKcWppUDRWMCtlOVh0UmdRYTdNQjRCN1pPWHJhMVU1eDEyazB4DQo4MmdabExpOENJQ0w2REZuMnRGYlVZb29NQ05tNDZJN2dTeE41K0hXbUh6SnJpT0pwWUk3RGRZUGRpUmoNCjdVK0FpUCtEZ2pGQ2Y2T0FMRHNyckhpTG5QeGIwZ2J5T0d1dE4yT3N5S0ZLaWs5ZVN6WUFzckl5ZXU5bw0KT2JsMWpxZmZUZ2doRG1NQmt4SGxLTGV0MVlqQnJWYXV3djUrVlgwV2pUV3A4ZjNDTU1JVFRPVHhaYXI4DQpsSHo0RC9vMnVLYlc4SHRST1pJbjhDTk9UWFVjK0d6bFR3Z2syTUFuNVZSRTVuMUFDNUExd1U2cTQ0NGgNCmJuT2FpVWQyTWtiTDE1K1NYR3lHSytzLytHMDFHV1ovSXZWd3k0czhQUHZIQmxzMW82VHM4L3dnNEdIdg0Ka1hJV1c4OWJTTkZhaEszcmxqN2IvMGk5MWw1VWZmQ0J2Vzh4dys2TXVSWHVHeWM4d2hUVnlVanF6ektzDQpUTzd6TmVlZlFROXhKYVhVQ2VNc05PVG14a1VNM2Fob0JaZm5ldm94bTJpaG54M1ROOTgycm9OM2NoRUMNCnBmblFFeGg1eG1ZR0dPVGpYY2RmbFdxNlBsOTUxRGJiUG56OGV3MlJFeEdlaUdWY3VGVlpxMzIvK0tMSA0KQ2NReE0xZHcvT2RtbGhpRG9VSXB0U3ZUZUhhMFl0bWNNa2E4QXBSREFBaVRxQ1lzOXc5c1pjWlc5MjIxDQpDME5aMS9FUDlQQklSRlEyZEJiL3FpVVRTMVNFL3BLaGVKQkVlb1dxTzJGeEkzdy9xWlp0ODlWcVBsaFANCmlGMzl1bDBPYTgydDY0RStVZU5ESFA5VTVFcWx3YWJ4T3NDWGRHSHh6QURXdzdLUy9FVy9vWWVVR1VrNg0KWjFmcW5GZUhDMXpKZ2Y1VGxXL29SK0JDQWQwWXZKVlpxQ2JOYVZncVVQTkpxVmp5WFBMWldaTHhIb25XDQp4UThhdTdwY1hZSFk1TEVaeVNaWndWNnY0NFFqVC81VS9lUjNZSnB3S016MVRGUk44RmRoeDVOUGNQTXgNCmhKQ3JJRS95SEVkdFhWaCt5S3lQaXdESmR1ajRlcWMrWjdidlpnRy9GZ1ZMMUt2bDVOT0VsSXV2OGVHcQ0KengvSis4MDg1OUpIQXN1R0ZLKzBKVWZKNEc3TW0vMlhFZHp5bGF0U1Q5MmhOREt4OXFxZFZYcTlUZk1TDQpxZ0k2TVVERjE4WFl3U05JNk0veFVPa0NSWlRKaEU0eDI0Q0REY2R0ZDBMNUVKbHkvNy82ZElCRkF6OTUNCllheHNLenlPU2d5M1JWY1JxeWFUbWRZZ2FPbjFramt3TjFzUXpUQkpUMUpuMTlUZGt2MXcyc3NMMnVjZw0KMXFCdzBzR0h6UTVFWXg0ck5zenVmMVYySk0rS2ZqT09uaDlwUDNxY0lHMW0yQXh0OVc2YXBWREs3aUpYDQp4MG02QTdrK2NETHJqdlhIdUt3YUFiTXBPWkdZdlZOUkZlZFhmanRFVG51UzdiYk5Kb2JtUXF5Q1VUNHUNCnRjSDdZNnk5anh2SUhBS1pUdlhVL1FiMVpTNTlNUEk4M2tCN1ByVGdzVDQ1QlZTa3lnWjRiY21oSVN3Tg0KcGhTL1k1d0xhYTc1OG1tMk9nS0RneTRSSjF0c3pDSit3eHNRdExCRzhDc0x2ZlkzTjRVTVlXOHp0Y3FwDQorSTNkUnlRMEQrRkZ2T1FkdGh1b1FVcDhRZmNndWFmd3pqTktGSGtZWm1WR2NtSlRWZkwyQ04xNnJNdjUNCk93MnM2QzloSzFhejRuaFFuUjJVZEpRVlh4Z0dESmNuOElGOWJqZFpOMk9pUk1wTFQvVzFPeUs3YXhmYw0KV0YrNEVWd3czTmtmOGhmWm5LRkZDdzlHdjJmTXZtdHN4OEpuV2JuMlJvOVFBeEVoOWVXK24yUFJOcDRNDQpoeTdOYU10Ri9FMEx1ZUVPV2RQRkRqSStlSmtaQ0lWS0pPbDA1K2EzZTlzVHRyOTg2YSs0R0o5QmJzb04NCmR2RnlIQWZyTzM5ME41WWxvdnZ6MlBpMDRRQ0pRTUFGSm84ZDJ1UjJ3dHBwQmxNWmkxY2RpOFM4azdPVA0KZHhmcjE4RVJjZ0dCWjB0S1NhZytPYmZzUllqYkc3THpVRzBNM2xKYUFnOEgrQXQ5MTFOQTVsdW9hWkZjDQo4dU40Y1ArNk1iRXVpVmtoZzBMaDRjZjRseXlOb2VjYXZycWU2eUJ6aHNZY1BUTE9jVVR0eVRINC9RKy8NClhwc2pOYURaMEVQbWtGTzhvNUlsOGMzd2RzY1h1N25yZlZXeW9JcFJmZ2xxVlhDRFViZlhFOHUyZ2dDNA0KVG9pUkFrVUM1Rkl3MVZkaW1HVCtaY3B4ZVcyMmJUM2pBbjRieU82andvTkhlY0dudk1BYVE1bXF6eXVaDQpvMjlPSkdvZXV2bERjOWwzbnZNT3hmQi9CUnRIdTNWdEUvb0wvK2EvQlRGSXVHa2VWdlRlOW9lRVIwazMNCjRlSjV5enBTU3NOWThpZ29tdkYwRGZEMGIyKzZqekI0eGJORGw2a0dQWURKMkJoRG5vTnZjNmNCRFpmRg0KSDlxb1hxaEJ1S0Z2MEpaVFFkMGkxdzNPYXN6WGhrTUdqU2p3UTNlQ0xudWJPZGYwVU5MSU5kRForR1FnDQpqRkR4SnNUUVBDSWJMY1hNQys0My9sTkJ2STI1YzdaT2thaUlna1NCSTlTSGZvWktkVC9Kdk1WdkdOc08NCnBpdnBlNDQ2dDFIM2wxV2JsVUlUZ2F2NlhlM21VbXFaclRVOGVuclFvRXdwYnJsRWRJY29ZSTEzMDNoTQ0Kb1hmVkpkeVlRVHN5aHJpNHNQbUVBbWxkY3YrK3FUUjhlZVVkTFpLclFHYlgxbkk2YzRSK3JMY2Q4NzVCDQpKeTV3N0c2WWV2WVlURmdqWWZuNnhDcGMwOVA0ekpzbWgwRVpsRExPNlRzOElpcHFjY3E3V1Rtdis1OXoNCmEwb2pzd1RNTFFxc012ZmxyelJaNDMwQ3lTelBLSGdraTNEK1VrZk56M3p0U1Z3MjZiZmtZeFI3clFQOQ0KSGRLREtVd3hLVEdjQ2RVQkE1N1FLTlRrdTN4ZkdoTGthdlIzbUljTHNSTkxaazdVMTJjVzFqblNtOXlxDQpURkxSeHJTZkYraU5kUng4SkIwVUZ3VmI2WnptV1czRlJxaGVvK0RTQUpnRTRKVlV6S2J1SkpNbUZuMzgNClhXZzhxSzJZSWZ5cFJISmpOLy9RT2FEMzVCa0VRWkt5NlB1NjJmOWFjV0ZuMzJpTGlBRGlXcjg5OFlHbg0KNzV1MitwQWFYR0ZjUm82ME0vMmQ2bTNlSXZmWVJUNHdLbmhZaHRTS0xCS1dleTVpOXQyMnJ1OFZZRVBSDQpuWjR4blFDVjB3YVVqczB4MDlkT0FXNERJUUozZHg0WDViQXJJMTBEOEVRcjJhZk5LTEQ1R3R0a0hNRUsNCjdWRGpDUm4va3pvWmdoR09sM2Y0cEZuajIrUTI5YWswY2JDSjFmMWNWYUNWYWpQVk9qWHlXd1IvNmhqLw0KRnZuR09SaklNQVFabkdaOGtEWDM5ZUxFbVMxV1JPc0Rxa0tnMFNKOUQ4NlR1RURPRGM4bVdLdkxwNzRXDQptYzFmY1NkQTcxYTE1UVZNK1lqd3lTWlN1WFl0VjRJc2RlVHlLQlU2Q3ZaUDlWOUZSb04vNU96QlFxTzcNCmIvY2FmWm5CYkZ3bVd6TU1McDEzS2RHc0tyYmt4eWovVWJqblRlaFNlR3lQNFhrNllNUzBZTXAxR3U4Yg0KV0YyZ2ViWFZablZxSzJnazk0Nk8vRVEzclJqV0c1dXJEdnBGWXduSCt1NklEVHRVZU9ZNW02ckZyZ1d1DQpBcXJSdWpRQ0YvanM0NDdOVWNDVzBENm92YjhFNG9VTGNVMUljTWxpZ3hnMzJFaXNhRlhyY201ZTFMMDYNCkZaU1dyTVNMaTBWQjkwdlF1bzQ3NWZpTEJOMkJPK2dFbjJTbXRURjNSbGxud0gwaWV0Z0NMT05wMFZYbQ0Kd1FKMHN0bVBxcmJyb280bk1wcTB4dVJQTWNuMlZVR3JHajU2bGxoam1HdzhZcjFLVDRqVFdmZThOaFIxDQpGVUtEUlZMZFMzcUlqUU4xL2M1ZlRYWE9jS2hPbjczaUY3N0RtTXdmVGJLUktXNG96RzlraytUbGNVNG4NCkY0cEtlWDY4d2lkVlN6aEhXNUMvVW1WOWRsYWZiQkZmb3NtNzlXUFppV25TckNqOFVhYjcxWGZ0cHR1MA0KTHZuM05SY1pjaVhLZFpadjRzTnA0N0hvTm5pR1JnOUsrTzNObVk3bkV0dmN4WEhuNWg4WlFXWXJWc3d2DQoyRUhZSUlqWVplTGZ5WDNWQUZLOElGMzFDYnlRcGUyUFJCeUhQUnVDTkNvV1lhOEhpelpqRW9WSEVQa2kNCmJNU0tGdkF2TU95ODc5MlJ3emZvZkRxOGJ5Q2tncndJaGtSbjRiQk1WQXFtalltMGdJWGluODQzU0Y1TA0KNTFGby9Xd2Nla1NLejNRM0tPRXpJY2k5MXRxcDFtY3JVcVc1VGVuUklaMFZTcFFYMFovTi9SbkwxWFhvDQorcy96K0VNOVRXSGVuWVpxUmJJY256NXo0MnFybEhjNktlODgzQ0tjSC84SVkyc3Z4L0dFQkhGUW1xdDgNCllCTHNQVjYraXFiM2hvQjlVaHZBYjRHdEhNRTAyNmdObXNRcU1HVi9KY3F6ejVnWCsrc21salRDc3FDRw0KRGlBNzltYTBlazU4bThEaVllc25yNUtqRnFzNjhxN0dLZVJIelAxZm5pRUsvdXlrVW9NOXltQmh1WHlODQpBZzc0L1NsRStmQUZQUHM3dXdEV2N2K1BlUUNLRkdRd3hDcytvL2VrY2kyT1hscTEyd2xRaVFDUWl5ak0NCjRWZmczMXgrc3RraE8zU2RleVhVdVVySWp3OThJZUVHNXlDbmxWRFFuZE1MNGlOSXNDR0ZjTVNGaStpOQ0KWTA1WXlwRXZzK0grTjBwbThtR2U2VFFhOGljM0Vnc0xHeFlTN3F3SWpORS9jditTdTRPRzRRSFBwSGNmDQpKRXIrNmoxMWpIZ2E4UFQzUHloTWREamlHa2pSc3dyNXIrU1g4bFhMNWs0TDF5eUo2M05EdGlQR0MwNUcNClkrSEdTUUlJd21nZUM1a09RTjdJOGdORm5vcmtOM1dGRU8rOUU1K2lXbzY0ZytyMW5ZUWhHUVRDamdjdw0KS3R6Z0JUK1ZnTElVUGZXQm9vVFAzbkFJakFGUm1uYTVpUGJyclZMb0M2R25FTWhuZzRlSlRMNWRuM1hKDQphWG5uNUhRc3BHUmR5REFMUWU1RHNUbnN5aEpYOHdGYWNzcjg0dDZ0a0NFV1dhYWJldXE2TGRQV2RuUUsNCitZYWJZcjVvMzlHeWtZOEhEeEVVaU9MUWF5SjJIaThnd01hWC84Sy9LRlVrUUlrNVlraFd5N0Z6dk15Ug0KYXdvaWdrNXhzT3FJVzFMd3k3Qytjb1FVUFZpZFpnbFdrb2lzMFVXUmRJVmVneWI2L2JNUzcybWpWQUUwDQpMaW9KVExLTnpDOGJpdUJMUnNvTEQzY2JQK01BOENiczdxR0VNRGFwV0tDTzdCTlA3OXF0MlR3UGFmbWkNCnJHVFQ3UUJoaCtGMUc5aEhlZG1odGFEVmFOTDhISmV5UGhQNTJFRjBWZ1dwcHBja0I5QTkxNEpIUVo3dg0KSUF4Y0Jja3VqZlJmZjhCZVVtMTBEa0NsS2tORVA3NjBUcWxYbmErM0d4Qm1HSkhHQ0FieE9FMHlvenZDDQpwb2dST3RxNjEzQmg3VXBINkNzdXVvNlkyZG93cGRvUVZaSVJsWlBmVXlTU3lDL3BHdFlqb3NJYjEvUDANCjJiVDRNVXlyRmorbWhjTjd4bFhxNC9KYjhWRzMwTkZibStVV3VLNllvZkgybWFvdUVITTdyaE85b3QzeA0Kd1F5SExhY1FoQk5JTGN5NzZMd1p4VmJWWjdEUlFXLzNtOTVmSS9Ub1FRTWR6NWRpdUYwSVJjQ1NIK1hLDQpqT2ROSzRTYks5SU9HY3o1TUdGWXNiMUtoUThLaEFBbWYrQml1MklWTm9Jb2lFQnU1RFNaL3lMdDJWOW4NCkR0NTVIQXVFTHFmYTBVN2EzQllud01TRjdvNXlrMDNHdG5lMUE2Vk5GNHFOa0FhY0tlaWRBT1BjR3k4WQ0KT2xIaERxMjJOeDRiWDFDNm9oQUk0dXRxVzBFRlEyTFAyNzlROVNMVUtTdHlyM2t3eXRJWngzMHFVT1NGDQp1WDUvbWtCWXF5RlpUMHp2VFNuSHB5MkVkSnk1Y2FhWUJoMHREOUVrSk1aVjlHT1NOb29LWUk4NFJWRUoNCkpTN2dpQStxVFpHMWtFUkhUMllsSzZ5MU1SeU9OZmI4VnhYeHhTYW9kcytoVk1nQVJkSFJneWJGc1YzcQ0KZ2hDeHplV0hZbjhZcVRpLzhJa3l5bEJHZlNtS1FJTnBQZTJ4MXVVMm4vV3MvcStaVFg2TXB6bDFBTjY0DQpsVzJCS3ZLVzEzS244RytzUFpkY1NmbDJoTDhpRjRSNDR0SUdQSHB1K3pWVmJZM0tuS2tSRnB3NUNJT2kNCkprRHNMZ3JsbjJjOUxyR2Zzd0FJMnN1MkhEUTBYMDN2U2d4QjhXWkpVcjR5VXJUQWtkMlcvNEQ2YTNQVA0KTG1oME5MYkpCcC9iYnE0R1NXM2lnYitSODcwVTFoNjkrMUtKTjBVbnpuT3dwdEtGa0N3emFBd3RkR2R2DQpVWjNUZ1ZrRUNwZDZoY3FyZmczcHE2dFRQbWxzRC9EV2lzbE1wY2Fub3hRTUVEVGhmSmIybm83U05FeEINCmlxM0xIbUp1aUNIR3NTTHlRd0xrcXNzUkZ2anltRTZqSWk0My8yckEzK2NaVGJDNUpaMzdJTWR3SCtnMg0KaXluUHhrZjBvcnJDU01SUTgvbk5TaEhvWEZydFpGWUg1bUhwUG9mNUFxby9RYWlkUEFRN3FuVkhIZzdpDQpBMEdrZ1Bac2ZJY0tLWWZWaDJ4L2IxWkpTcnlLT21UK2xMNC9Odm5jVG9JUWkrdnh3clRQRjdYWlk4Nm8NClQ4MlVLSzVoNmpaazFCYkhmMFRLallaWjZ5QXhSYUhCZisrcGIzUGt5eW85c1RHVHdpa2lwUWZXNi9UYg0KZ3YzRzkyenNjaXM2bEVaR0dsOHlsUjc1czl6OWJzZlNlQURZVXdMNTMyZndZT1RsUjV2M3Q3Tk9KVVFlDQpPRDNOT01TOGhkaE5mR2NCY3c3ZVk2UzVTb1VtSTdOOFpSVHFYQklxOVJKcUlTQkwzb1QyN2kyci9tNEMNCmRNMnJKL2xWK0pMOGJ6VnpMS0pybTJNaC9ZMDIya3I2a3pmR1Ric2VqOUd6eGNFRFRqenl3N1FQbE1nMw0KRmY2OWx6RHJ6ZVFVMkxnTHgveVl0NnFHLzlIeStPaGJjNzU1a3NkNDN5MFJ2NjZuKzhXd1RzNmU5ZzNyDQpqL3kzOWFlakI0ZWUzRlVuMDBsdXA4MGV1TWhBRjFocFRhRkhXZnhPNjZ3bnRqb1J5Q2U1eDFnNjJFRVENCjdETzkycm1KR21JZGx6bjRPWGtYaWJpRmpOaFFJWk54Z2xSZnY2V2dLc3VoK2NTV0pyem1iWTVNUzRvNw0Kd0lpWFRKWi9rNjQycEFWaXZaR0g1S3ljT1Q5N2ZHOEYxejVXSVl5NHNjL2JpKzhuVWgzeWJGQjI4WkxiDQpRWEIxK052UHFMTkJLT1FsblFiNGkrd21PY2k0ZGRHK3kzYmFPdkxVWWdNSTJhbzVwdnJEK0NUdG02aXYNCmJNejhXZWFyVnpVeXc2RnlTbXR4WnZCOUdHSFRrLytnK0FTb2dsQm9iOXlxNkhXQzMvYUJ6UTN6UmJCRQ0KQmIrRloyREo5M0VLTEh5dkVtZnRHM2Rjbk02clR0TDR2Z21YN2xoWHFOck1MSkFoV3ZDbW1oRWNvWUV1DQpORStJak02emYwdXRMOGRvbDFmMWd0ZFVFSkc4OWdEekxBbjZUakN6VjRYOHZYd2xBa2RST0NpM2MveGQNCjl6K216NHd6YUdKaElwUkRvS3prWWdRWDhTczNCV3RpdnZaN2Y5ZlFCK25LWE1sdnBLL3k2VWhHb2JUdg0Kb1J1bEtvUktJR0daTkM5c1ErdWgvTjdrblpvRDdTMHJQT2VSZVNyZ2ZjWFByRUFjMVlsRUFmWTBSY0hwDQpGaFNnMS9nbWVnOUcvNVR3SWJXUnFYQmhrcG5YUEs5Ky8vaDBOc0o4eVVaQUJiSHpRK1hBdThHNlFta1cNCktLZ3JKWFd6VzF1L1BLK3hhMUJKUjJnZnVFY3BuV1ZWSlE3VDZBeEF4Ny8zR0xhOUg1WE0xWURDOFBaVQ0Kcm5CanoyVm9wT3Z5TkZ2Qmt2TGZlMzNqRWphcCtaM3VXbmpxQk1ENXBwb2V1bXAyNjROeHN5bzVVV21IDQpaRCswR01WYmhUbElocU4xV29tNmJyalM3SGlYMUV4WE1OMnNkN2x3dHcvVFdVU2JvV2pLWStnQUc4eFoNCk03c1VJSm1xcU1YOUpFTFNCdGdwbENab2swcXl0aFJzaFZ6QzdvMEhKeTlKRVVaK1pNcUI1dHJMaEZDMw0KTFZheUU2Yi9MUDQ4cFpjYUluQWh5QzQ4SGpkT1plejFHaUxXd1NoaTA5eTY0amRoUzlNWHZwU0JFNklDDQpNUlFqT29OaENGRFkyQlJ0Qk9rc2hldHZzQlFsekRoSWVSMk5HWXFObzh2ekNleXJVdW9rYWg1aERWbysNCit6RnJJaWlzVE01N2prb2FLcmp6OGp4MTlNWEUzSEkwTVFJSlJMTVJqaFdES3JlUUIxeEQ2K3h2WVR3dQ0KaXZsTUdKMDlSVGNvZkpTNjJ6TGZoV3pCa3ltaW0yMktoM3RtYjI3cnR0aVpXdXVYQUQ0RTAxMzhHUVIyDQpBNU9DQVByR08wUUZVTGNIZ2UzVy9xY3pJTEZRN1Jxb2did3N6cDVyeFBXZzFsZUJpYjkxWTBmL0FTc0cNClhhKzhZOVpMRi9qMDZkcGt6dEtGaVFRR2RhZkxiejQ0dXZ6VmtRYVhwU25LWUMzZ2RKK3VLbzErRmU4Qg0KR3F4aWJqb1F6Zm00cHR1WHk0VmlBRlp4amtYQVRrNHNJK2M5R1dHNFNpOFA2YWdkT0x0bHVmanVtdVVnDQpUYjlVd05DUzN1d3lSOEM5T2dSclc2M1Y0VDZrNFFmaFB6VVFVMEpDYld3WVE1MldNY2JJd2d1UjFpd2cNClBhYkxSNUJoUlBHLytwNkVyTVVLRllJM3ovelBPcGlXU3NSQmJiT2F0OXFLYVVJbG51cjAwU2RsTTJmUA0KdmQzT1V2REZnUVMxSHhPdnIxUEhNZFkreEdqazV1N3Z5S0MzWXU4aHJBNFkvbzF3d05XOG8vTDlQMjlwDQpUYVJPTzRsWXNnTXJUUmZVTzVJQ0JyVENZU2RPUDF3TnBIdlVXeXovdStHQXNRb2tCejkySWxmYzZIa1UNCnpxWjZ3Y05RQTNUWDdoem10YjhUenRYc1Z4a2xCMWMzUXVDSGtlamR0cy9BQTJnK1BNbitEOFF4RkxERQ0KYVRhZWZvbkIyZkFPRFBEZ3dLSlJaNmFZdkllRDNleE5YVEdKN0lWTWJEeWFOSnVLQUUwY3hZK1VpZE5QDQovNlBMZGtwcUpvWmUwODZPOWtVT1VBaXRCN1k2T3dVR2wwNVM3cEVjL1RrNThmL0g2VGtRY1cwaEhIbTINClBrMXdnN3dYMkhCME1SMS9XbTc2SmxoR0pGS2xNZXRnem5RMXZ3OXBQMUtTeERYQUk5OVcvcGV2dEllaA0KVGRjRnpFeWFxV0RRaXhqODc3VUFvWU1Bd05SaGEvUzFyMjJ0Y1dzRWdHTkJCMHVEenZ4ODlHNXIvZE1tDQo4Zys4d0tZY0ZJbTl3NVc5cFRJZ2dCcStiY3NqdUt1d1FZY3U3aTBXNWVXWTBCSTl6N0RIbWsvRURFWmUNCktrQm9DQmMwSzk3K1kxbHEvNm92WDVrRXJSUlFEeHhtc1UwM0hIeUl3N3djME05OXJBMXJzMVp5aFZKZg0KSG5UTWMyZDVYTnd1MjdLTjhsYTk3U2lnOGR4aW9veWpNYUJORTFiem9hUGRZa0RqN2pidDF6UHI2SHY2DQpoMDBIakxUUklmTzd3ZEFGVGdlVXMzeEhxNU0rOWl1Qk9FQm14OTN0aVhmc3R5U0MxRXRiZnkxRlY3UGcNCkV1alRRbThBRTRyblBXSURvM2tsRDBKbjZPUmowRHhQdHNqTW9raW9MMVE2ZDJUUTEzb0dld2xhV0ZJeg0KZ2R0OVFPaDlZZllUYTRCQUdmdFRKOHJPSHRkaGVkYVc0Y2h5NitWU1J5MDNLVnQrYmI4OHc3SllQNnVQDQppRkNpanFxV0lSZW9pdmVKTlM3dWd5Z001a2d1clpEeXBQeU5JVERRTi91cHZYdWJMRmZ2NE1vM3FlTSsNCmxPQVM4VjFlMjVnNFVSbUdLMFQwc2tVV1ZSTytCbUpGYnJyWGJGVzRxRkIzVWk5Vkp0d0dNTGw2aEgyUw0KOGdUMGtERzdKREticVhmajY4ZWQrcUJmRTh1QkZwMFZTOWphWUgvWVEwS2w2QkhLVXJZSGVhekNtTkJYDQo4aFRaekIxNDkySmRBRDR6cnA3ZCs5N1JnNWVWeUkzOSsrNmtYTHhlcVhoaVJxMDlRcXpieEZjdDN1NmUNCm15SXYva1FLTitPencrZlNyN1F4VHRDbmc3MHY5S3JXR3gwQnhhTDZsd1JCT0Z2YUo5QmtkdFFDWm9wVQ0KNmluOVRjVjZ1UHZXV3VKckNiTkgyOWZTVEFjQlNpUUV3YzRjajMvRnZQNzhzQTRKL0VFVFluRDNCa1FHDQpUanhKcVhpNHFjb2wvSC9RU0VBV2dqbTBQUU9aY3JYVk1oZFVRWGxMenJ5SVgrekFEdmZQbWs0OE52Q3kNCkk3RVZKcHhOVmFLQ2hBaVlHT0s3a0NKbUJYQ1cxcGlrajcwSXcwbGNBRFZqYjViVlJtcXRzRGR3N2x2ZQ0Kd2dCUEx3b1AyZFZCbVQxbW14dHBmcXdFL0p0dVRTNE8wOG1BSitodlR4eEw2MGQxdnZKTzBmaUltcFFZDQpCUjlqRUlaU2ZFUmo2dmtIam0vY0xPQXA4V2FvOWRxTG01Y0s3UEduQWxCK3hyZHRVTmkvZElEdm1LeEoNCi9hcmhCcjQ5RnBHVElqcFJYL0ZJYTFUN2lvL2hjcjFhUXEveWFEU0pTVlR5aVZ2NFRIM1RMWHlQbHowag0KOU1NYTNwM0tYWFdyVTZjZ3A2ZmVXVmtVUkpUTGV0ZlJIemNtUlE4TUUyb29WNmlqaSt2RzZuSTRoSSsxDQoxNzdvemltajZtZzlOeEs3QmFtbjk4TWlFUUZxcHlBbDZ3dFNIbEpicU1pY2tiQ1c5a28zZGx0VHhwZ0INCk85UEFLc1E0S242QlByRC9YN0MvRk43S2I2d0dENXhCWU40NkJhbmRLMm16K2ZJTWZNODM1M0hITUV3bQ0KZ1dQMG5zalF6NzNwb21CNk43MUVZcWd0VzBlZUdKVnB6Z3dRRVJxblAzalM1WHRBT280RitLMHphdzczDQpydjliRE0wTStjMXNDQVRaVnMzK2dHQzJpc25IZ2RzdGxZNE51TWQ1YUFFN2d4YlVITDluNStZQWN6aysNClN4NkJRSnZXRzlSbWpiU1lQNmpsVmV5L0ZmRUx5QlVOSWh3UDNaOFRJdHRKNWhYWVdwWVZYcCs5M1pRTQ0KbmFaWWFONHJjTGpHL3M2RURNU3NyVFc0RXNnRmZBTTVKc2p2TlAxcTB3TlA0dHVLWW1ONFoveGErZUE2DQo3MmxLWTNFcGhSbDlRTEZ1bXN0dWozQ3ZtaE5ZbkxoVXZwTC9jbUJYblczeG1kL3BrZHRoN2prbU1NSDANCkx3QWpWanFzbmR4UUNiRDdWeThOVjNDSFRkdTlqRFdBS0RlV0JQcEpkeXhpNTdXWXB2WEJMeDVjcVNmZA0KUWUrc1BTendNZ3BTaVhucnBzaU8rbmk0dkVEVHhQbXA4TW04K3hIVzJ2aXhXV3YrcEk4cGdJeXM2QUdLDQpWVHJOenBjN2p3R0lWQkdhY1hHWUVpeEZKbmVFSXFzcHhXMjQ3eEM1cTNMQkpSbENQdUF5dGJWenZLODINClJESCtQZlUzQThHV2FEWWpUZWcvMEc5UkZETnE4VkdQdjkwL0NCRWljaFloK2Z3ZlJKQytEUXpnWG1XSQ0KOU5ENlM4NExqWWVwYnd5VFZwbjNmTW9Wc010L1A3bzNkZ054M3dKbjM3QnJXL1VFWnU2NUd0bnluamYyDQpHOHdpWEUwZ3lQbkpEdjhORGF0ajhNSGR6R3ExU3N5bkJXbGFjdmtIODE3TG9SZnoyUnZXM0NxNmwwNFQNCjY0Q25yZnVFMzROTUtNV3ZtMmlRcUdYdTFvZnlzQTY4WEM5WkE4T2R2TFZVU1pIa0M5RDFGRGFTK3R5VA0KVFhIM2J6cFZ2aE9xamY3Q3JmSG9ic3VUZTJNZXNvSUZJMGl4Zk9WZlhBbEFGMHJIdStvbE9uNFprZ09TDQpIdUtjTXNDWUtqU09sWFpScUplTVhDc0Z1QjQzbFJVTXBUZ2t4Y1dBQy9qUlVnS0tGdVNTazYrWDZwNHINCmhIYVd6WDYzU05VMGZscmFLSm9hVStaT21PMFV6U0xrb05PQ1ZRai8xQk5lenl5d3VkdFRVWFptYVdOOQ0KZVg0Rzkyd24zNGNoY01sb252cnFGR0ErcmVmTE1iQ2tMN3diUnMxRGdVV0xuU05Eclp3UU9xMGJMeGQ4DQpqTVhTSFBXRHN0dVgvREp1bDd4UUxVakNWMlZBc3M2dFlzTEpDZFNqUEdTTDIwWnBEbFBZWUwxQnJOa0wNCmhGR1o0YlM1U1J0ZWtrczI2Vm5ONkJmRHZmcTNKVFpGL0J0SDgvdGJYZGJ5MS9xejFZZG1KenhEVkJRaQ0KNWtQcGh4RkNyTmltYXVva0s1SGVtaTB6RmtoTWU4YXV4VDcyN2JXRndsVXcvSXJSMGtFa3dLQkNpZXZjDQpJWmVFaUlZeE5kTVhPOUJPRjk1OEM3THNQSDcwaWdBSlFRS1czZzhOQ3pzSkh2MWQzaUVnUXVXYlZCekgNCld3a3lLV1hYZVlmSXJ1M3V6cnhmV2VsWFlreXh4dGxPbmdjNU1CZndkMTl3M2k1V0NYbVY0Y1ozaWd6Ug0KUUFQYTFyOWI3ZzFycjA0WW42cmtHWlhrM2ZUQ2p0ZkoxMVc1Vmoxc2o3ZG5wNGV6bUY2bmNNblB4a2h0DQowZHc5cit6MVdOMEdNWjFmUDhoUUtOOUFhUkdjM3d3TksyWmU1RGdaTHl0V2VWbXd6bFNyRVZBbVd3TWYNCm9GbmxiUkljVTNZd3RjZU1IMi9pSE15dmx0bU80TmtnbVNaSVBHTkk3K2lZbG50R3l3UXJTdyt3NU1yVw0KZ21INUdiTXY3UnZocmQ4cGdGOS93ZUhITG51N204eXFIZzBCL1gzREpZdDhYVWdPZWhSVW8xSGZibmxtDQpiYmRla2NCeE0yMTJVYmRlcFp1MG1jcUNCOXdYVjlicXhIM0FxbitQTXVHZnRhM2k3QUF5M1huWlc1SXgNCnFMS3BsOEpaSVRUa0t6MlJvck9RU0Era3ZzMzJrbG5WNDVsazM3TExyaCtXWEdzY2F0YkVJdmt0cGZQSw0KQ2xSaUwrODQ2dkpCR1ZOUmo5c21vUVFra2Zva1IxMTl1aFBoNHpCV0tUKzhyekYvS0V6ZkRIKzhEWURQDQpBeDRtOU40OW50Q285RlZxRWRKSUFEUlhnK0o3akVaVVY3eEI1UVRzTW1pVVlyc2tGNkR1OTFQK3lIMWwNCmZCbHBMai9pYUdnd3RJbE54SGlyRlhsYUxRTmR4L2NzM2N5ZlQ5QWNuYUI5MHJSSkNXTWIxdkZPTUNBVg0KaWMxMEI2OFhkbytyVlgyeVJDYjdnN2Erc0tmYjBjclNuT0oxc2owNTBweTRGbW11S2lIQ3BVWnlCOW13DQpWWEJOMnVTdEFiV2JnT3hnYWVsbm4vN3RxbDU4Uk9jWTMwOHZlL0ZmZHFMRUlFd0V1c1JNdzQvSmV6cm8NCnhsbFZ1cnp6YjZJb25Fc0ZLUmY1RmRmRDdySmI2aUVHQzlkUTNoTVRLaE1DQytIVlBpOHZIVkFpTU4rNg0KUGlxdmVmNkVmYmszbkZkcGtLSXpkWTFKcW9TNElhd0RlcWJpSDJWYnhEODhyTXpSZ1Mwa0EyeDh6R3pXDQpkOTE4a1VNUGQ1T1pPMlA4WDl4YUdQTTBnOWtDR2V4MTJTK3NnTGpOOFdDSnhMdlFuSlpEU0s2Tnlud3gNCk00V25RMlRGRmRPZHV4OHJnRE1JTmlwT2Z6dWV0OC81cmZHdVEwUlZDQit0Z3dnT2NORFQ1WXdMVDI3Rw0KU1pES09LWUFHY3dUWHlGMjBNbUxZaDFFMG9DRXl3dnZTdStoOEVJb2dPcDQ3c3N5YnZUR0U5aGdRbkNUDQpPZC9CMWhvT01XaDJ1ZXovdDBpRU5IV1AveU9ReDRrL0lJalZ2U2dHVnVjQlVXeXhYSThRLzZORGI2R1oNCjNaMEsyNmZTbk1HMkE4clVBTFY4VlQ4c0taV012bHNpUVhxd0Y5UXdESUlicFkyOGRYYUd6NnFxaWczSQ0KZExsaEppaklaVmtUTmM5cjJrTksyNkQ2bWU5K01nR3Z1cm0xY1NvbXZpYUJRR04xWjllY3VWdTlGSVc2DQpsR2tiam9GUURkYmd1cVpUSGtiUkF3ZzRnM2pQdFlWZGNGamkzRWdNNldzOG1jVTV1cHNiNmVWZkdMbHYNCnBMQ3dJVWJJYmxCV3pFQ1VhV25DNTR6WU0xbVZJMGE4dDRaYm4zT0kzZGdsS3h5cEtJblhqdjMwa2tVcg0Ka1JNTi9KT1gwamYxdXRjQjZYU2dmN0hwMm5EWFVOZkF4a0xFUlBZMHhQMEQ4aXlLM3BPbjQxZW9CMTd1DQpORWx6R25rZ2t5MDBLVTRGRjhqN04vaTlYT1J1QklVNGVPTFRzRm1IWDZxS1pSODlNY3BVclVKZ2dRaFMNClZSbU5qeDVjQ3hwWHFLYkdDSWdFL1puVERFb3dpZTRMYkJsa1FYYVRWYWdDOTlITGNRRWxkb1NyLzQrUA0KZjNmRTlxUHRibGNTZHhKUU94NUc4T3Q4eHNXeWhKZ3JQMldrT0Y1UFVPUTFGTUdkQmZIRVluL1M2VUVZDQpReXkzNEQ3ZXdMMlMxU0IzZFAzVWRWdWVsT0tmMmVnU3VXK1Zzek1XQkNCUFRYV1lLaXRrSnZTdlBWbU8NCm9XUTlMSXR3T0t4WHlSaEo5c1RBM1pYbjFLQ05ZUEVXUUZ6MG9zZkR1bWRWdWVjVGRzYUhKWGszcHVjZQ0KV1NQOHBsS1VrUndXMUhRampsWFdjaU15dVpYUSsvMEVGRlllaXlEeG52VzVMQkFuWUhpSFhNYUN3UHVKDQp6dVpvVjVFZkhOYkhrazZKRkt4YzRPZmNPUmtYS0NRNGNLWUVKSGFVbWJwZUxsQ1lmV0NZbVR6clk4b24NCmtSaGxtRU10R3QyR0NIMjA5K0Zqdjd2Z3RuKyt3SHc3alBRYTFmNGFzdWV4OFNhVytmRll0QzZIL1NJdg0KU0hmejFrTGwvcktGbDlKOFBDNjUwdlpSd0FUZkdaby8rT05zelZSUjR3bHJwbTJGZnliZWFXMDRmQm40DQpPSmN0aHlNNms1eXhVRTFPVlZDN3MwVXluUkhSbHdJVGZqdytpOEVqT3o1WUIwTXllY2FBRThpUWtmU3ENClk4VElGRit1b1FocGFramV3K3V6MkZJaGtxTGRtODg0VUF4MXUwc3Z2bFR2Q2d1YjJPOWl2djhBV1FIVA0KZnBaQy80MUtBMHJHZVQ1Y0tlS29XTkJjQW9tQ2kzWm1Yd0FxYm9vd3JxZkZDZVZ6endvdmsyUmlyUE5ODQpQUXBjZERrYjJZcmh3NkMzaklBNTNIUE1MSkNnOWh1anI2WFpmcGs3bVd4U1ZDK3JwQ0M2UUhPOURDMEMNClE4ZytyQTdjQUduVlRFdjQ3M2dmMDBPL2YyeUdmQ0djR0pwNHhlMWdHYTVxMEZydGpleUx1OU9ScmVGbQ0KRkNUbHl3dWhERG9Lb1NXaGErdHptempPZUZlVllXRldjdjRTbVEydXFXQ0JrMHlmZytiZHcvQllqUVpIDQpJdk53VHdyRGRYazlIR3NNaTZnOFU4V3Y3STZKeVhuRzFaQ0xLSCt0Vzh0SWpSYldRdjF3M3dENXdwVC8NCjhsQ2JYRkYrdkdGbTN5amFGMFBsYXdYZUFIZXhyd0ZJdUpySEZYNzk3VFN2Z085RVg0NWJOT3NVdThTRQ0KT3RsYTg3NFpsOEhQOWJsNXUrYkpuQ09obHRpQk9RU1ZveU42OEsvYVRCTUpXZFBqU3BBQmZjbzhUbDY2DQplMTNjRlRiOEpSODFZamhpRGkwM29GMlZua1RlOXB6RGhZL1ZiKzdyMXkxVTZ5YVJSNTlXdzlzMWVYRTYNClFxM0hPYzFDVzJYZEtoNmRuR3YvYkk0b21KZ0dNSlByNktpU3kyb3FFZURFYUJhMTY1RDZwWVg2elUrYQ0KN0RFZUljNGZWNm13UDI2R2ljWUN2Tnk3Q3FoTHE4SUlXeEVpNWJOcWJJcUluZTRDTlp4alQwREFSZFFVDQpTcW0xYWRDc2taM2QraFc5NkZjOXViaFdoM1ZnbVpxQVR6Qjc2cll5SlRZYWpodkk3OWNiOVE2R0FEZ1ANCnRWR3JoSW5Vb2VSVjNNUDdObFRjOFQrVG5pVERXTUFDZG9SZXBIem5OeEpyTC9XSC8rQ2dROC9QUVRKOA0KN1h2bHhFaWJnTzlxQitxY3plK2JnN09xd08wclV3dTA0L1gvdlMvNXpSdllRUitzVVZ0WVVLWGVwZUU5DQoyNC9IZjVHdmU5NUNZN1R1V01KSXdKWDhRT1YwWlB3SnZjRUlQbTRsY2RFeWtjZWVkZ1FWQlBRc1QvLzcNCjNUMjJPRlRreXFIdzcxa21qMzNsTkZiTWE0NHZydXdRZkkxTDNDZk0reWdmVVBzc0RudlNjSktzYk5zYw0KbzNKNzVIOHI3NEVwejBZeGo3cnhVenhudTh5UUNaSEY5YzFuYStjODR0M2t2WkpWcHI5MlhLYm9LUHgvDQpHYVRBVTZpZ204UDhSWk5aMlh0azRtRTNlYVFmbXRTWmhxUFNrQjVzUE5qWjJSYnFCd2Q0RUljY042S3cNCmQxRjdsdE1FNVROWk1qVjhUWDBKSVNmb3hFMTNQWGtzUmpsb0RlOGtZUmROalRYem9uWnAyTnBUTmlEbw0KR1lyd0tyeFgwVjBPRmpSRUxOV0g0bHkzd252RUZScndYNkszWE5ablF5YTlRNlY1ak96bVkrNjBCL1pXDQp0ZldiU2F5TWZVM093YnVvdlYzOUdjK3VsWjlpU0lFejI0d29GZnVLTnorL0VPWnM2d3Z1VmFOTXYreGgNCnhaeDRJWUI2a2ZnZ1pHSHVqcVZWd1FpOUVlWlZtbVpwQnIxb2JQZ2xueWN0L0FSYlRFenh0WEN2Z1N5ag0KTDBia3JHRTE4bWpRdVRLcFJOMnlKOFdzYVJLZ2ZoelpPS3pndDJCSU1zSzNvUCtQTk40N0ltVHp3Z0RJDQpnek5HZCtiTVEvbTNFa0NVTnRQZFh4b1dOdU9jSmtWa0QzYkNUNWJiZnFNbmRWTTE4d3UybW1aYVo1WUsNCkU2M3RoZ0dpK2RyM1hMNkM1NURMSmszMEhFdmZ5TGpweXp0eFBWMXlIQkVZZWpDRFpxWnNTWHF4TDJIKw0KazhTSGFjcDNQR0RJdy9DRVd3bGM0TklkVVNDTElZZHJOeGVxdVFHcGptODhGd1RlVXdSSzRoNCtPcmx4DQo0RnF5ZW55cks3eHEwT1NvdlpqYzlDRXlXTTR0M01KME1aWDV1c284cjdpMmFmS1hldkhMVE5WNFEyQ1UNCnZTY1pWdUtDTlVpR0MzdWNDNHBsdWJEODN5M2MrWlVJRlBka3FOd2Vyb0lMOGRrUFZrcnRzTStGdmlCeA0KL0FWVjJVaVk0MXRYSlpXcUhBdncydTlHVWhraVYzVzRSL2dMZmpXbkVZRmt2WlEzT0liZXpnckFGYjAzDQowb1BYWTFwOGw1QzByOHlsRS9lekRuYWN6NEM5VENWc2ZzdGpQMFUvK2cxblNiNXI5ZTUvSjNCMHVKSWYNCmFTSEZucUpzVnZyVWpGT2xTakRpRGpFZmsvdVFxVjlmSFFQMnk3NUpaWnZIODVxaXlhUU5ST0N3M0QreQ0KeU1kbHNFSU1YMzI1VGN2VytNTGt5ZnJVMlg2SlpsNXE2dXFZL2dXSVZ5T2hrSmtpQWdGNytJN3Myb1hlDQpnaDdQVnZkZWpDd2VJa0cxZlJnb285d3Mwako0UE00MGhoVUhpSW90UGRTM3pBejZ4Mk4vQkFuRmVYNDUNClpNVG5raTNxbnkvYWxTcVhZcTZYbGJqdDdqNXRBM0s4Z1BUUXRZUlFCVVd2MzFybEt6SzVTSnhZWGx1Nw0KT3RvM05Ja1hGYVZLeW5tNkpPNHByQ3lvNHU2N1JNdTI1R0hDM2djSEMzd3k0aEhwcUVheHJ1L1p0MGh0DQpqLzdtSTBucWowdnkzZWZzSmV2ejFCYXdYeTlSdG5VckxzRWhzMnBHeXA1NVpmOExEMnlBQlViajNwUWoNCnJMc3RQMXpENVBWdHFHdnd0UmFwYWwyOEEwUmxJRDFxc3M5RndIWkxDYjAxZ2tPWWw5Y1FJZS9CcVV4Yg0KWldIUHZqN2FRY0xvalVqay9mZlUwMlFEQzFvRCtGSkZla3M1a0YrKzVjQllBSUVwTExVdzVRUEVMekQrDQpTKzluMjMwY0Y1SVhMQzQyeE1HbElHNFpjMlNyQWpXcVVvY3BrcFB2anlaN1JoUW1MZW41OEdlNjdETjQNCnVnS2YwVUF2TVhWWWM1Q3Z1RnU5OHk2NlRMMXA3ajhyUFZDWkRTbnBJWk9GZzNCRnFTbk1Da3pzNVV6dg0KbGlNU1ZVeVNmend0ajZ2RnlwbDZnQmQxUmk2Z2ViK0YyZ1RaU3RYd1JsL0VvYW45ckRhUWZiMGExZUwzDQpubFVqMGJ2czdOUTFGNGM0Yk5ZQlhhVmZJdUlhQzRCdlRZZmJGMGR4UFNObFlwL2U0VlZrRjRNMHYzUDQNCkhvc091MFh3Q2RYRG1HZHFWT054MHR5cXJzREIyYVpwWlpoaFdtb2JvL3hEYzh5SHZhdjMzMFhUaUpqaA0KUHVqY2JWRTFUWU11MFNyMmwwTmtUK1hZZVZpZktsNUFsZ2ZPTkFXK0NUa1kwbE1wY3g2bmFxV3E1Q3lpDQoyZTVJZ08xV291a1hTcG5rcmNhb2JweDBIZHo0UkVROE0yQ0JxdnExb09FbU0vZ0h2TFNkTFdyTHpGV1kNCkJEZzh0SzhpSzRtNDJDZ05HbXI4NGdOK3BDcVBaZk0vQ1RoUS9ia1pBeURNU1VGM0RpZ0pydUlSRklERw0KZUhCbjRjN0ZQK05sUkVQaWJXcC84U0VWOTBHYS9mWnRVbTdETE9zeFE4dzZPRWE5NjNMZEM5MUcvTUIwDQpXY3NZRzdhdVVzZGN2R2xGSm9sM3lJUkhDQUh5UWg4alM3ZnQzQkgrUm8veEtpR1VxVzgwWDVOU0NUOW4NCi9oNXZScmpDaXgwdnJQRXRoSUtYMmFWYVA0S1ZCZVdVa1RuYm9uRW0za3RmQ1d5Y2E1UXFRMlZpcE5iMg0Kc2c0cmhFdVJsV1lNSHdkN0RrQXN0OS9pdjV6N0h4ZHBXRXBEczIwRm5UNzlHUVNDVWdYRFYzN3JvUEJDDQpYQk84UnBEbWIyUktNT1k2ZEpXd1g0UXc5V1R3MXY4My8yTmI2VjNyTmJMejlIbWhrbGV4WUdNVUNjNlANCnFJdGJyOEt4akptVE5OVGgrR09CVmRRdXJIYU9pbHo4aDlxQ2lXVXlLbm4zOFZYKzdkUjcrTUl4Z2V6Uw0KZnpvejYzdFFGZ0JTc2pWblkvRWxFUUZRLytSbXVMdm9nV21aejBFdllSMWhudG1FV1VLQTZ3OXEwcjltDQpQT0hQRkkvYlo4ZllkdTZvQmlEZHYvL0pmdG1UTWRpVG16aTFzTDNCNHYyV3FoQVZLY1lUaldUSVJiSTYNCmxKMERNSDVBSk1Qa3B6L0FuZ0tnWXhaTjgyS1lOSGludmpOWWxBam5nQzJlMWxPeE92YWJJRG9VNzFaMw0KRkxyK042eXZ2cUhQT3N0cmZid1J5RWd1NmszYzRFRTNRNHRLL0JNdFN2RTBFcHI2Qy93U244ZzlVdkNmDQpvSkN1V29IVE1LQzJaa1BGc3J2eHF6Wk5saWxtN3V3elJrNkhqMEY3YUJSNXBHYnNUY2o1OCs1WGxCVjINCmJpMElmcng3ZWpmTnJxeXFXSm02U1pub1lnM2craTM1SE9MRk1jTkZ4MklGNDZNdGFoS1dreWFaN0I2ZA0KVnVwS3dCN0RkS2ZaR280UThwcXJwVGVtVHV5WE92UEJ4ZVUxWUFXVjlOSlpmem4yaHl5S09UMEg2cVdhDQpPRUZncmxaSVJ0eCtraFEvV09QKzZTamZCNWFySlNhMDhicDF6b0RZN2t3RThhUGE1M1Z3QTRFclNFcnYNCjYyQ3IvQWJ5OEI3RjV6OTZ2OHJYdWpHcC9TWk9SekI2Yi8ycVRNcmZxWk9XaHh6YTcvZVFwQ3JqMUlmeQ0KZ08xb1V5aU9ETThBQ1RFY0dXcC93YXh4SVR0eTRqWTg5SDMvSzFLdXNweldwZUtOMzdKcDEvT2NDTXBEDQoyVDhkUmlmb1pJMXZRbUdncUk1L2kxM3k1WlVKR0x6aDRIcUo0YUlqeWs2NHRqNGFZbks1WGZpMm9zWFgNCjJ6MFdveEtqTHNuWmZySmFUZ3BsdUtncHhkUFZxL0F6MVVoeXlURDRzbmZhMk42Z1NsMk9XVFhXR21SQg0KQ29sZzRzbk5LTTl4OVR2SlVCVDUyNDFMWUFyS0RIbUgycFI0WDhONEkyQzZjOUxwU2dWRFRYdHZVN1ZFDQpGWURldSszWlJwbWEwVWFTeVZISWtTVFFYZkpjY1RacG1IME1yeXVzb3FuTVo4MG9XNk5GUi9jdWFUTisNCkFLM250QkVuNGZoNElEWVJhRVFVQ29hUVVOSnY0MStyMlJSa0lTTnR1NW8ramNhTXpmelYzNGVQWUFEbw0KNkVGVDR2cEJXWDVUbGVENUlTcURqd2lkTWppM3hPcHRJWXhKRzhQN0VQbHdlSXYwYWNVS3FvakJ0a1IvDQpNMmtGN3lScGdlbE1JLzJUbXZjaFFmbitSNzVPVmwxVUhIU0ZUTHp2b0tMaGZhNmkrcjRlWmdCa1djck0NCkdlZHozbWQyOHQ5Tk4vRWpubERpNnlhTThEQU8vOTVWVlVDNVl4S0daT3ZGN2lJSjdKUFhINVBhY0VsYQ0KNys4VVJhNG5QWXdBbEZSWHZyL1NvUTNFdkdCTmhZU0Yrd01vcjJjL2tTajZNcGNremVLWGVGeGwxQkFHDQpicjkxZThJOXBTcW5MOEQwc3I5cG5YUHlnVk9oS3BBcGRKa3lETXU0RHNnRXVTZ1JGeE1na0tHSWF5cmgNCkFpWkF6OEJlZjFKMXVQOThJTGVZdGdoV01KSnJTTkxiczJQZ04wbDFyZlp2dmVFMytsM2hZS0ZCZkkvSQ0KQkR3WFJZNThNbWptSE1nTXJ6VkJIcGtiVlVQZUEzS2pSUmc5bm1sZHJSTVZHVkRGOG1JaVpkY3A0VjlJDQo2aHNPYlFzWjRETUVraXdPY0VmdklvNURaVGtNbHZLbEMvZUtjbWhHb0RzUE1kVTJoSjFRbWJ2QWZRck0NCmdBN1RKbU5jT3RWVEtYWkg2bWNmVExiZ0FZL3lHNk5abm10VHNCallkSDdyT2FNVVozWGU1MG9JSmtRbw0KdGhtV3A4MEU3YVN5VUtXRktVcThrN29wT29BaWRvMzN6Smh3djNzamMyYkVhdW90WTdKQnVJS0NBOExsDQo0S09qWlY5QjYzaUtxUWg4bFNyOEw0OTcyUHFIMm0wQ1RWbHd4VHpFZTZwZHpUdkRSNWZVM0RpUDE5RVQNCloxMDYwZGhJdDNYTGxLdklrMElOOERONkpVYUN4WlBrR0NLTHlSZlJNWHZJUlNYeCt5S3k1bkZ1TG53bQ0KQjkyeVlDSnpyeXBXaG1teU5vMVdUU2cxU1NOREtXbW1hRG1renBYVjFId2xOVnYrdlJlbm15MWNlUE1SDQo4eVhzOE5PcUtiSmRrSGFUWUlra0V0Z3NiZElpS0ZnT3VqaFF2RzZSWnNvSzYzQ1JzeTZJaElTSXVNWFQNCnpTcUNqZ3NKR3BYbXNBeE1oVnlLd3hxa0xLNUhjYTE4dUhQVGVmVzh1cGlVY2hKTFd3cTBaMW1OSkQxUQ0KYU5UdjhQREttckZFTTZ5TFFYV3ZyK1JuemtuZ1hRdTlGazU3YVgwNVliaGszU2ZhdlpxMEFUcGc5YS9ODQpBUURjNGFNSjVJM2hLa3dwcE4xa0Z2MUE0d1IrRnFpNWtzSjZuazMxNGE5cSs1OUtVNTFPM28zVHhVRTgNCk9NQm1ka2lKMFRVc3JXMW43NHlreU5ETmVYTjZVeTltVS8zcFdaZkF2eVFxQm5QbjZqN21mUURnNkNTNw0KU2EzaUdtNVJMWncxNHVCRWkvVnZpdkhEZ3Q3N2pNemFBSUduNnVLTTVuNGxJZEZmNER0QVZCRXhqd1BqDQpjb3VYbGxId1R3T1FHYmdSQWNHYWU4T29oeGF4SGV5Q0xhSFhYRXlVbElzNTVwb003ZUkzWk14SlVxWnkNCjNIYmVaNzZRQ0Z6YjV0MGZOZEN5bVNCK0hGbUJtK1RsT2Y3OUQ3WTJ4cmxHbW16aDNJVldIb1BiOS8yWg0KbFZZSjViQ1I3SG5qaHNUUGx3c0VjY1RTL3NOMzdDUVp1RUViMnF0T0JjWnRwWVI3YW5XRklwRWVFeXpFDQpXYUU3b0dROTcxNWRaTWt6ZnRoQUdtUmJBWDNxcTNFNk94VDRzOWlMOTVtMTk0WnhoTlJKZktnUzd1ZFkNCksvWmZwUC9hdjVTb21OQ2NlQ1RqdjZ2KzlYRWkzSjdTUnltaTJEOUFhbUEvTmpxNEMwT0NpOXpQZ0NSMw0KQXBpbXJiWEdLTjZLWWVqN3ZaMnduNmI2UHI3dkF1SEEwK1drbS84T0FDRFc5NFI5L2FuOEpYT3czT285DQpKSUZzSGo3VFJpVXZsSndHYWIrMGxCMFU5R3ZiWVI5R296bHdhS20yeHB5TnpFN2ZCMkV2TUUzSU14RGsNCkpJL2w3SHFVQldMQUFUMlUxVFFiVkV5TmRrckpsenVVNEpMcmg0UU9FekxoM1psMUd5ZW1UMDJpK1NUNQ0KYUVZWnV4L2d5di91V3o2MU9LTzlNNzBIM0cyWEZPaGxlYW1aRk4rcHhDTHp0cmxwUlk4MGoxRnRzOVUzDQo5SFl6MXZGUnlBOE5xZmQvRXBTZDhxTFNFbVNkSTNDTnRUZGtneHBWblY1YkxEUTcvbGdVR0lVNkFYWjYNCmRLRlRwNGRBaXhxZ0hXU2R2U2NrTkJ0RXBHNC9Ddit3ZnljUFVtNDladW9jVjMzc0ZuNHMrYzFOTW1BSA0KQVlHWTlCSDZNV1U0bFNwMVJhQkIvTGlZMDJyLzZzQVdUOWJXQVl3cWliZDVmZ0Q2ZnJQR0JReTBlM3hJDQpaTjJMMkdPUWxsdnNRNHdMM2I3VjlhL0tTMDIvZFo1OU9RNjlxZVc0UWlDYjdUcWtqazBwbjhuaTVYNmUNCkFsem1Ea0NSMlNrSDJxMnhUbUFjVVhPODI0ZG1GMnluTGZzT1BaSWxEdEMrSDNiMVdDbmF1TEpXM2pkaA0KVEJDdHNYNXpDYy9SKzcrN3lvdW1JSlFjazlvN0JyL0JqN1hwOE9ESDF0RFVkSW0wb3ZIRThjbXRvbk1iDQo3OGZBaHJxM0grY1NsUFlxSFFPTTVyL1ZLb3NjM0cvWVY2MDJ6cDY2d2Y4Yk5UYzFGVmF5TGZRK0xHanYNCmp4TmtSY0FpOFBwOHBBWm1zcFlWMzBWdTV1d1Y3TmFyZVUxRGl1bytDNjVPT1NkWGZFbTExYTRUQTFDUA0KcVQ4NVloTHJHUm1XdGJ1NkJ1ZlpkQ2lkdmFEbThEQm1JQ2NoTWNvUEZpSWU1ZlpPd2pPWnk2dzZ0TllCDQpjNTBKYy9HZGNLUTFaWjZTakVEZm9sM085V0NxTFR5TWZtWW5VckJ4bjZvSERHc0tFUjVYNFZNeGZLTjkNCkJENkIvSG44eVkyN1gzTFFrbVE0VnNlVHgvdVV0T0Y5SUVtNzBWMEZFOVNOZmozTjJ0NFFUY0VzcmdrcA0KK3BGZkVTMytUc28xVDRNK0pBTzZ1L2dmNXRqMDF3a1BWM2RqUHB2YVpsWUVnOG9OaG4xdjFrSVYvNmZBDQpDL0tHTmR4SzhPd1M2YnNHbVJneG9VeGhnQnF6cmE1eFZkazd0Z3pCeXc2djNXRFoxVDg2N1dXeUdmclQNCk1hY0RST2xZR1JlcHdlWFE0M3JvOXVJZDA3K25ZWXVzSGx1alFJZ0FPL2FWSzdIMmVTS1ZpZDl4dkVCag0KM2VHYVlJUE5KR1VCRXQwbDZRZUZuVVBZbkw3RTlZbldwUXRvUkhBa3MvaW1DSjFZVVZzZm5xd1IzZEh2DQptQTF2MVlZR29KbG5VMVVZKzZzMHE1N3NQeXRYa1ZENGE3SThxNnpUVXMyOUwzV0VVeUYxcWJYQ0Exd1ANCm95ZGEyWk5idFdrWWRQd0NGY1hmQkVOTGJJdTN0L1ByUGZ4TUpOUVdIOVZjSEdhTkdDVnRWNng3S0IyZw0KeVJTUkEycEV2ajNIdUlPVGZBTmgvcTFTS0FBcytTQmtiYUFvaUNodEIyK2Q3c0Jpc1h2MHNpOGVpWGZLDQoyVkxiSWNob0FvUndXUC9kNHQzcU1kY2E0TnpzeG5iMm56VHBDQW11UVlScEZobzgwWkVnUGhHR09RblYNCk8yU1p6bnc3ZXJzRmROVXpobHpXSm5rcEtkaVJNVVZRalhMNnhIN3l2TCtPR09zS2pLQXIxK2kvdnI3Kw0KU00xOW1iTTc1SllOdHhYZVVqaGl0bFZBNHB0UW1CVG5pdFBDU1A0RmVhSmoxVDY1OHIvNEhDMlJmc2EwDQp3WjdJTVlEYXZrRzVEL1RMNjFSelZMVVFLaWlycnVia24xUThHZnd4cjJmUE1PbnV1cm0ySkZwaDQ4Q3QNCm1iUVltTDFQSGw5OXNqekNyZk5uOHZwWlVReVViakMzSGwrYXgxQkV4QVJhb3pvNGd0M3JqZTkzYlFYRw0KTE55TmR1NlhhdDBNVU1aVXo0S3MrQmRIYUVqRDhXcldoVU50MWk1Nkp5WTREbDV0S2hQSUtOWUEzV0VHDQp0aFdGQ2hsRnhvRzNRbk95amNLWkZ1dDBvNWdjbU1qckppUmlLTHltcXQwbjV4SVc5TU82d2hqNzNvVjMNClFhdHhJU0pXQWZHL2VwWnZta0NtSE5TWFpGaFdZaFl0N1RyZWpFakVDY2k3RmlXVUV2c2JzZ2wzSmxKNg0KRkpPZEpqK21qcjROdVVhZUxQa3F2bXRidVFKQmRqemNzRUY5d1h1b0tKYmhnQUpGUVRWaVBENlJuZGlnDQovVDMyWnh4L0dibVcrRS92cWpSTXpUeXlrV0NoYzZReGY3Y3lrZjY2ek5hbUZmUmI4ckptS0ZsV1BzbmMNClJaa3dIUkRGVlJlOHBjWTM1WGw3L3gzbWVrYmZWRER3dGhsWU5XcUlTVTF6bUlGMUhYeFJQRzlqY05aRA0KUnZmcGFjZ3drZVJMVE5JblgvS3RoWVArOXAxWWdXRDhhemNUYlFrSW1PeWlzb2tjb3hHYzJpS1F3Vi9BDQpKN3lncm1oRFpzM2MwZTVFTXFLUVNkNkcvMFo1V3dmNDdaVDhrWEQzV3k4L09QanJUVUVuaWpyZ3pCOTUNCjltc0ZNWVVyRy9XSEdKZVBneVlTYkpVY0JhUGlmSytsQ2lnQmhrYUlESStIS0g4UE9XWXZ4OW9FTXNvMw0KZnppQndzQzdiZjhzU1JBNWV4Umxvb2xZWC9mSjRhKzE2aXI3bVVIbFdoZG1mZ2FnejRSU2h3MEZENWxYDQplalZsajFEc0ZybEtabnNaZE9Ecy8zV01pb3pWR052Sm4vUGdZamFZR3hubEwyTjBtOGdrVWxNK2EzS1oNCnpVeUNoL3A0clpnbjhWQnVXMEV0cFA0L1l5dXA3K3hRMFo1K1BxVkV5NVl2Y09hSGhUN2NjWlppcGpoVg0KYlRQckx4RkpFeTI3ZmhPL2pWNWV2Ny9nWTgzQTluRGlranByaXdiMTFneU5uVVJEekFUSE8wN3E0Q0wvDQp0LzdLSUlXZWwrYVYxMWxzYXJTckZ2VWY5cnBobzQzTWF5WFRwclkzU3FDcEpnRTNadXdZK0dTZjBHUlkNCjM2QTJ4ckVxMTlrTUcyVEVFQ3o5ZzZsQThxZXVQdzdXZnlCcC9OblpleTcxUU9BQkt6T1F2WjIzVFY5dA0KRDVHMGlXVms4ODJaOUovMDh3Ym4veDlIK0w4b2JzYVhaaFp4UjgzeVJSdmR0WlkrRUw4SnZDeWpMRWo5DQpBcm5IbkJpcUgzZGNzL09GTHZPcWJ3Z1U3cHRybGNFNFNkT09LYXp1c2pyWnVzZGFZMjZaeEFBakNQbUQNCmFSdXVleEM1Q21qakxwSmdTNFUrMUo1TVNndzNTVjR4SEhuWXF0bnErWUlKTzE4NUUrb2VXcytjc1VCZw0KR1o0MWRaTWQ4MFhERWFCcFJjOXJtbHBhdndIM01zazdWNUZaQTFCWjVUNTc3TFM0L2ticzRJSTYzMjhrDQpNVFpNRngwZTJEeTRwak5ucnZDY1loc25USUh3QUxEVUZ1Z3FacEo2MjU0bzB6R1lhc0Z0TFNhcW4zTm8NClVhM09jMGdXTVJDTDBDa2ZLT2Fnc28rTG9Wa25wNk51OG54Sk5PVWVwdEY2SzhFdTcxbTUyOFYzZXllLw0KK0ZEUjNWcUkydk1pRUpUTk9UbVBka3FTUEJMVi9SM3BmZUhtVUtTdEhTc1NKeXNla3J3a0kyZjNHZE5uDQpZdDRYMG84ZThrQ3FEa2FTMUZHaGpJbHVWODFyemhhVW82MjgwUnpYRlJvOXMyZ1V3K2lLNncyYmdQZHANClYxTUx2UCtjdk1CQXlpYncvREV0MVBkU3gxcnJyd3NOTWVacUtRaE5ocUFReGgybTZuK2lVOEx2U1E4MQ0KNlNGWGhJMkp3TXVtZFIxUk9lSE1sdEVubzg1V3VQZExESlRZNk1XRXlXMDVtMUY3RzhJWXdHbjlkdldoDQo5cklqMXc1MHYyWVRiejR3WFZQZTUzWG9WNXdaTDcvS3UreDZML0M5NHoyTVJXRElHdUhJU3JYanhuVG0NCnQxTGZZR1htOHIxa3JHT0dBUEd0UDk5cFduOFY0dkZCZGFaYlphYjEvQi9yQ285Y0x0czdnREt1MmRKQw0KcC8zOGZjbDVyQnVPakJjTytxKzFiaG53NDc3bm1NU0Fzci9Yd1E3STBqK3cvY3NQL3N4ckhUZGNxN0pUDQpVRkhzbUdKazNCeXNXREN4Zks2WjN2Nnh0ZUZyTjUxK0xtMHNDdG9iL1RIS2k0b2FoUlJvSnE2VWdFOW8NCmoxcENqK0phT0ZqOHEvMnhLZWVjOUFjTmhyR3p4OHYvT2ZuaXpyN01wTEFqNUV5UGRCQzRUVSt6VG5ncg0KdzhWYXlTbmxlWHIraWNLUlF2VU1PRlE0Z0pzd1Y3MlpPZmlKU3BhVlBkUCtXM0VlcW5MM2F5a01aTm5mDQpDQjRMK3I0Z3AxSEJ6MmtmWHpyZXZrZGJtSWdQRnhwS3EwZFZMOUFTaGlaOGZkUThwRjl4ZUgwZ051S3ENCnV3NkJBNTFmWmFTejk5MCtWNG5FVFdpTmVaL0VUbHVCQngvSTZMR0czZDgwdXF6L3JiQ290ditpNGRjNQ0KdTIzUUtQb0hOYTVkamZ2cVJtYjFoTVRTYUdXRHQ2TVpBNkQ5N3ZnTDJ3ZTVEMkM4TnlqanRoek11S0ZkDQphbFZnVU84WUdvRFM4UlRvRnNuTFcvSlJYNzhMeHRlM3diMmZRT1RBaENVTE1QTG56YkJDa2kwR1hUYTgNCmdSbWxiVlNVL0ZSSU5Zbjg3Ri9XWEhWaG50YUU0VGM0cjJqWlBkM2EzY1hRT0NVL1liYTNnVUcvSVNTaA0KeXRMbDdyWWRWVXI5RWlMVDdXQVpjWG5JS1kvbGhGeDBLWHBUWHp6K0lKZWdDSW51WkVMTERmYktBb295DQpUamc1NkptUWtEUHk1VCtZcVFONExGY1gvSkovVS9pb2l1STZ4Mmw0bGRTZHg5OXJhaXZzaVIvTGg1aWoNCjNaSVhxUHlUS2M2SkI5OVZweERxYjJMT2hWZG9JY0FOaFFuS2RkZ0VZYm9CYkRNUU4zRG0rU1B6ZTV1Zw0KU1JPWWJaN3phQ3ZIZlJ2MVZzT3RvWVM5Rzh2amZ6b0x6TVdiS1ljZTJzUHBYNHYwTldrZmh4Mmc3RStFDQpzdUpOTkVxRXBSUGFpd1VROG16Y25vK1A1TnhlWTdPKzZlQkF3dHVIR2RGOUFmNkhJUXArWmRtSVRKMDkNCnNGSE9lTmVTaEZGZGxtRTRXaEpOTVFCYkZyUlp5SkEvYVM4RXN1U1NJcHUwbU1QVHN3N1g4YkVtYUxGZw0KZmZORjhpZlNiZHdPWEFNQitrc3hnZlVzYklMa0J6Q3kzTVRBMmZDUGJzd2c5bzhOYUtvRVFJTHZCWXZLDQpuM09CdzMzUHhqRGdDUWI4MkNYaDBwRUswVzNUSVRPZVN5VElURmkydWxObjhPY2R4L2ZjWmZ0b0JuK2QNCnJENEkxYW5BNzJXdmFWeDZNanFEV0c5ekZqSDJZbEpCanZJcVpyRk1uKzZaNC90c1JFVXdDQkFkdUk3ag0KNU91S2QxalBhWXNQSUx0ZjNtY1U1blE1cTlLaDM5MkR5dWtEdFpXNGlSWHpuLzdWME92S3NTeUFPWTBEDQpHZnVwU1krTzZIUEpzZHkxczJaakFFejBmd1hIb0VLeGc4Yk02RXNOMm5kNmRIOUxjNlpPZHRHUktqNloNCm5DQUVPM1MzWEV4cThjeWVXOHRuMHdwdlhDTmF6QXlHUDhKdCtBSk55RFFkSWY5dTZPNUZhNGROb3VTNA0KR21aWkZya3YxTGxxcjRySG1NUFhic1g5Wnh5b01Pc3l2RTljQXlCT2FUQ1FIZ2UwYXdnT0dGMjU3VTlvDQp5aVRNbHpQOEx6ZEJ4akNRdlRsMEhDTllCNjFWVnFvYVpacnJ4UjFNTUlYWG8valpYNnJVNnl0OEVRTW0NCjBpYmNjYkV1YVJwWVptNndhZDNEV0ZScFFIcDF6MURHcG5qbUxyWXZ0TFpjaXdnQjZDU2dLUXhGRkV0Zg0KSW0zWEtPSEd2TlVjaTRieHNXNkR5Yk5YNVVBeGxPeW9oc21NZ05TTmYxRURsdDRycWN3c2J3d3NRVlJBDQpkdk5WM2hSN1FHWU1FWjcxTWhSUzdpU2R1ZlFjcStPVDBDUjFBci9ReHM2eXFSOTFFb2xnejdvL1VjSUsNClEwbC9FZmI1TjdzZ1VKRzNnZkc3RVF3dmo1eTNOOTltanBpVnA0eUFHOW9pZnlTaC95cmxaNkZIdzlWdw0KV0xlZzlFdnRwNlNDM3ZrbXFSL05kZTBrVzk3bjNLY1pCTldod1VjNzhnTjBDbUR3dHhiQ3RlNU9qRWJ3DQo0QTRSM3JJenhrczVWSDN5WTMrQ0VDNmhWOHhrbGo4Ym1pYmtrQmZtMkUySnFIaEtZMEp0OWZWTms5Wm4NCjc0WkQ1MzFjakMwUUoxcnN2eHE0UXZBdVdCMU43c095MWJrSWFFK090QzdWSSs1NllTL3NlRHdMM2JuOA0KZDNkNnZiaFl6OU9zSW9OY1hNY2tMakd1YWRPeTFYcXEzZ3FkekpZTTFyUC9EOUphcjkxTmRRT25xSjkwDQorMjh1bUQvc2hCNEhkWnNHOEdUY2hOa2VTQWQrVXBlQ1g2UzBlektyL1lNZXFETlZYZjVoNXJ2SzhIOWgNClFjQjRyNEd4TTB6OSs2UHVNTDNhTS9IakxRRHhxS2FGcmRLQW41eURsamhxVDQwaGhQVVpUb3hDYzJoVg0KeUpmOFlQcE5teVVJbjhHZDFMcWE3VUJDRHVaUkNhcjFWM1JOWjJZVE5CZTJwbWtON05DMnlBdktvSVV2DQpqemhEaDUzQ2RCOTQ2OVJhREhwUS8wZE4yajM3SmczUkhhS29nUzE3LzBLQzdoeVpFUHZ3RnJ6dWpqZ24NCk5wOXltZ1M0Q2dwc0JERFZpRVpDT0NFSFV3d1dobFR2enJHUGJvOEtNM1h4L3p4OUV1ME53U2t5a0pleg0KQnFKNFhGN1loczF0QzNuOTd3b3p5cGxvaDdYTzFrQWoxMktTakF3S1dzWXU0RkdhSGxsUXQvSmhlaUNoDQp0dzA0RlJMbWQ3Y04yemN3TnEwTklIbCtJVjJFVHYycFJiZjgxSVFGL0ZWTFFSNng1alVvRGw1ZEhDeVYNCkxoTlE3cWJ3a3dwdnBNaitERHJWTzVlc2dydE51VkQ4ekJheFcrNTVIREFrRVBuNmNkaXVIVFBwVFBEWg0KeEhBNE5ZellLRnI4ek5DK3F3Y2xHeEZxeEtRSmM5RHdyWThlTit6ZFYvQnkvbFFIS1lkMlkyRmZVZmpiDQpoaUVuUitRaEhUZlpwdHBOVzFDRjJ0S1QyeVVCd05CUENlRGxML2xrZHpUNTJ6REVNdW1lSXZWU0FhN2YNCktZaVltQlc2d3RIeStPWll5ZlpuZGQ1Vi9BYmc0MC85YUt5dG9YQzRPNWNXYmUyYVUvaGVXMGhkQUttKw0KUDNFSWRXZnFBSEwrM3h1OXR5Sm1kYVIweUFNREJteVVYME4rbEpjQUxLSlpMdm5JZWd1b2lCOGJQQUUyDQpCN2FwRjlINENnQ1ZnMlZuQ2R3VzRCNnphbXkyUHpHVk9PRGl0SjV0TzgxOHV6Z29zRUpXTWtrZDJlZUQNCitMQkFnc0ViZTdMWk02RnJ0ei9RRjl6UWcrOHZGck9xMStsQTJQWjRSVEhRSDAwdmdpZlUvVjVmc3Rpbw0KKzFHSlc0SE1HNVBEbVY2VnRwNWFuaUFjbUUvMWRqQjhPd0gzVmJzYUNZS3JDcnlmemZRVEdGdEp5ZVBHDQpQMHgrd3hRWDVLcGRoRlZaZmFYckVhbkYwZWdBNUpka2JPd3VlUU1QTEw1cFBPbDNTeTV0YkV1enVoZHkNCm40NUErbW9oMk5rYWZ0ZCtvQXo1Y1Q4OHFSTkpxYzJTN0VNakxqSHpRZnFJUFJZQnJkMER6MDMwelhPRg0KRXN0blltTUFna0hOd2lEZUZLQ0h5cndyUEo4LzdaMFlnT1NwVDFKdWxYbVRBMi92SmZHcGp3MG5zT1lCDQp0ZjU3dUw4bEZ1NEJJcDI5N1NXU2REdE5QWFhNVHNucldFaW9XRzR3c2xFRGwyeEZWTXpOczhMOHFHYzMNCmVpSmlHVjI5RUhwREJTSU5hOWVmQzBIbVJjVU5QMEpSdGhrNlNQMStOTy9wUVRwaXBudENNdlZXcTF0VA0KbTVYTFRIL1M3M1F3NEFrQXV3V0dwYTFsK3pJTXBHQXRwbFd6VlA4dC94ejdXam5FRTUvclI4MVJ5WE40DQpvR0o5T3MxeWNqeTdSWkVZVGlvQVBIMGMralE2YmwwSHRDdWZCWWZUV1p2OXg0U0R1eUJVQ1RTNGJ1dXINCmI4dWt0RnJydTcrL0k4ZU9VVkgxb2NxODI1QnY4R05xK3BCbzEzL2RPT3hJL3lQdnJ6Q1J6SlN6ell5Kw0Kb3ZPditwWmlUTmhlRWl5R2Q4N2NXKytVYlp3NkxmSXM3ZDRoSERuVmgxOHNLUGRvZFViWVBsdDJSVm5WDQpiancxOUtHL3ovQUZIWnFSTGRlZE8zUThHcmJqb3B1NFMwU0JPalgxVnRmeXIvQVVZR1JYZXNmSWR6dkcNCjZUTExuSmdtZXVSL2ZDUmRCd2crUDZ4V0dpYmw5anBZNDZIMkdON1VlQzIyV2Q3RjBYN1czNEY2c0RmMw0KTGJMbXpJdEdsTGJRR24xenI3aWU5cTB4YWZCcjFsZy9XVTl4SnlaREllRWJQWHBKV1QyK2FwRlIvYVBwDQo3UE5yb0h3OFk0ejlWeUxxcUIvbjYxSGFIejVBTjdqd0Q4bEE5eUdvaVRXQ2M1dmF0aENERk0xV0RFc0cNCkJYQkpkQzViV3lIQjErbmh2b2VZS3ZPSjlSampFWkdkc2laUjJmclU4eXRhbGMzUGFuUExOTkJrWStwcQ0Kdk04bkI1SmtWSllWeXovb0Y3OUJ2b2dOSUplREJ4cFhyeFdUeGI3cTV3c1lJN0NRcEplbEkzRXI2T1piDQo4cEEyM053dVhTNVhzakIxL2Z6UUVZY1pRY05QSFpmUVhGcTdFQURnWHVuVnRLbXhNNW1QVE1Db1lRdUYNCmdZcDBBOGc1N0FMaWY2TG8vNjlDWjRpSjc2aGtjcUZMRTEyNlZUaUh1OUtPMXlXRnJyR242OE83THQvYg0KYXlBUHdXRHpzNW4yMSs5T0gwTmdsVHdUMHVpTzZVMGVOVURVYVkrdG9oV29wL25jYkxLcENZL0gwZm1yDQpwVCtGVlBKV2FvUFZGcThmL2pXQ0Vwb0JZVVZTOVk1a0NNcFNxQUxpeW1GV3JpS0RxWklXYnRQeU9QSm0NCkduN0p6MXNBTDJkUkVkZnYvcW0yUnc1YVdMQ1duMXE4djZObkVPWTkybnBoK2FuVGpjdjkrbVR1U05sMw0KYnpBN3FHNU5WYUgrWTBmaGlieDNwU1JzZHJVYTcwSndUc29RZWxzTGVXYjV1akIrODhXREZTa3N1Wld3DQpJWTROU1VUWll1emFJNG04ZkR3L1lOVzdTRWJJTWJLamhPb3dkTEpnZFh2SFJpdzkwRVR4Zzl4VkFZbTENCnVNbmJXSCtUZXBpU204OW5Ydkh3VGVqVzBhMXRqUHU1c24vY0xWTmlQc1VMejFLRVFjQ1ozQXJLaVRvNw0KU3RNMFpBTnEyeU54ZWdFcUNhVlh6NnRMNDdEM2ptQm9lTkRidGJyUzVSOXlYZUxRUUE5L05WSHBwSnRnDQpXOGhhUXlOUWxXSVg1NXlBelVKOEdROFhCeVprYTFWRjJJREk2STdIbTlnRm5IQVBoMGNGYVU2YXhQOFQNCnR3K0VETUMvOGRZQktXUTdKRDdaVFBMU2h5elBRSjlDUnBTTlh6YnA1Q3RtRURQWStqa0x4WElKMFBrSg0KaDRsRE5hQmJNV1NLd3J1K0toVk5uTGpNcXNnZ1YyNnkwckIvaEtpQVdRQXBpbFNmRXljZVZ3bURzdCtoDQpzU2R1K1JGenhCMVNVTTdwb0NSNE13UjNFNEV6a2YwbWNTVDhmYzE5UStzTFV0bVJETXkxRzRBcFN5Ti8NCm1zS3JTSnkrU01VUmZGSHZ6YVpLL1U2V0tEMm51QjZIeHRkWDB6UExYWTV6NFJZbHlrQTU2TFVLek1vQQ0Kc1Y2U0NIcXFJWTNyaE01YllIcjFSblJzeUVNZys0TEl2VnFnbmVRNHY1NlhSclg0dWxSMHRWenhLaUxTDQpnemJRVjlMQkVvQ3VGaXRueW1sL09xeDAzNSswd0Q1SWZkS1dRZnFBWFhtZEoxY3VqQkRGRmpPdU5yT3ENCklvQXh3R1hNTllNc0I2Y2VmcGpGY1kyenhSNVpWK3U1NXplSFZrSVNXaFU2WXVRMWJlV2N0RGljZm1acg0KWVl0d1RERituVlhib0RlQ1dTRlN1ak5YTGVjcDNseWNSWjcwd2pSK3hvZWszTXBUb3ZKWHRnRWJRb3ZoDQpOcTNKYWZRa2NzNHdvVTNMSjlUUnJwR1Q5N01hQjc4b1JCd2RsaEgrNkdmMFI4d0RUMHFNOW1Ic2toSjcNCnN3NU5IOElBRHRVT2F3V1N1QzlpOFNQYzdWZ1pZZlRLWFBvdHYyMUlQNFl6YUJtSWFrVnQwQ0NVRFZieg0KVzFTL0dhTzljeHpGNUtrVjBJcjQzNWIvWlBjeWlUeURLUkhJdnZWMHkvR3MxVUlFd25pM1FZYnBtTWFjDQpuSElvZlh1SllRNzg2OHNUcDFSVitSeHl6TnRBZDFtUUZWalE0QVU0VWJMYTdLOTFhZXNOMitRU1NJdEsNClYrMFRHa0F3anNKQ3kxbDI3dXNLZi9rZGQ5OGdSb2hTblVYcnNtSnJVVmVGRk1CaXhndWJKVFd4VisyWg0KdzNtYXFORjZaTG95K1VGTFg3eXJhNFRqclhmMnR3TU1vMnJpa0t4eGRTcmFFMWJsY2xwclNzN2RnUnY5DQpFNEJSZ1FoaC9zQkxtU2Faa3hzUEVkeEV1NEpkeWRTQlgwMlR1ZVNNOTRGSm53KzlvTTlFMkxnNitXa0cNClJQeDc0WGp4YlNtUDdUd1pnaDlnaXluRk1za3FRaDZtQnhSRGZKbXdaRnQ1QkMyVDkrQVJYdTEzQTZhZA0KTjRPQkgzYjUxZnFoZGVjeFRXNmdhUnUvNmdDTU0zTFNoQzRCNWVWSU1acDRnUXU5YVhXZ3RES3ZXK2ZPDQo2TVNtTjhSM3VVUzZHeTNPTnBORnczRHFURkRQa2V0ZFczaDAvbmZZdEFuK1FFQ3hraWlwLzdMd2dlS2sNCkoxMHMwVnBIR1VoQkMxM1lLUlo2d252Y2FJc3RSNXpodUs2dWlLb0krdW5yTmZzc29FNzA1UjVKTnZKUg0Kc1ZjZ2o1ZE85QmQyTVhianI0ZWR4eVlBUSt0VnpLMkd3WFdsdzM0dVdLYTVJVDRJSExXV1BQNFpJbVkzDQpWZE1ZZEJCRmdGRy9rMmRxcnR3TEhJODdCbXBSUThxREF5cFR3alRxS2RLZjZZZUs4aGxUN0RhNllkc3oNCld4Rkx6WmRrQUtyb2szdTRFWGZPOXNydjZSd2tBTUQvM2RZSlQ2TmtqL1R1REdMSkVSdXk0S2EreWcwcA0KM0ZjVUJaOXd1S3JybEplNnFGVVRHSGpNWHBRbHFneENWTVE5NmF5Q2Vob0EvcjArRTFLSHVXR29XNHhBDQpNaHlyeWJmNVRjdHkwOTdyN1I5N29tdFE4eUdHeldmb3F0TFd2czBqVzRqTGpxNlhaYzlwVUxES3ZEV3kNCmFnckRlS0gyUGdyM20vWDBncEQvNW5scm5Dc2JOQVNSTE5HZjRhRThFZitsVkx3ZU1DbDNOR3JxdzQzcA0KK3g0Z2R2Vk8vWGpvL2xZYkJRYmVTSGI3YmR3cHFzb3UxN0xIckxkMXRGSGQ4cTUxa1RETkFFTGJMWjZnDQpGOG96MWdnRFZiRXl1RzJ0Y1FqQytXbDZWeXU4dkpYdUs2clp1RkdkZjBKM3haZ2lVTlBaS3MvUnEzQmsNCmUxNVRPSlFiR2NtQUpmOER1aEUwckJPVTY3S0NpbWVDZDQ4TUlpdHNEOTdVWmZ4dVpkMGFUNkRtdk8wdA0KNmFZV202Rk80Y21IUmllVG94V20rN1A4OTRMT3AzL0FiaEhQcHpwdnR0aDlQanNYSjBoUWhUb1B1bWFhDQo5VEM5a2JvSXZuQ1ZocTVCVUFGSVB2ejRvbmlId2NHZjEwU1ZtVGE5V1NvODlFa2Z3VFV2YXRIMTlWRFUNCkM4dTl1VGNQb1h0VFNHb2NLSm9vbS8zY0ZZNGlZY1hBZHllQ0RLdnR4SHpkdU9jMHI4YWhQSjE0b3JHSA0KV29kQkdSL1FXMzVLb0pKK05HdEYwQTdyTnRkMUJpRXJVdGFFSFVaUDNVa285bHlRVTNJY1pWNHRLWTFjDQo1ODdZdHFmNDlOdm00UnkvOTRjd1N6MUU3cld5c0ZwYmJJSVdYWjU0clZ4elBMS1paSkY1SmNXQy8rM1ENCk1vOWFKREdkUjNuNS93L0NBdnJWSFlqNEVVNVRNOVhna1U2cFc0UzJGb1g2VFh0L1VpY0EydlNyb2krZg0Ka08veUpIS1VNaDhRcnN5YzZ6R2FsM2RWZEpnQ3F4emFsaWNwc1VHZGFsRzMrdmhvZ1ZjWjU0dlAxSHVYDQo4RXpYRHF5elE5UXlwNjBhUTdwWU5kUmJqc1c5QzZLb0xkVDAyUFQ3UmNZYSsxSWRlaDFNQmRhamZhdFoNClJGcXNIdWVqbSsvU0ltUzZXSnU2akNCYm1nYUpNS3BFRmpyZE1PMkpKZUxOd3pLdlRFMTJtL0VTam1CRg0KRlRpV3BVVDVmbkFGMXpxaDFsdWgvQmJXTDI4TkRzeDZkUUJNTks3WDk5ZFVKbGZxcCs0a2dCekZRVWcxDQpPQTZTTmE4bFBWQkF4UlVKcG9CZC9yVDh6czFDNmJuWGtwT3l1UlhHN215OWV6OG1Id2E4cWNlbkJudzgNClNKbGNSQ2tSVkhxY0NBek83UUdWZmp0U204anpMQ2FBR3N3S0tGT0ZlUkx0aHhtYkFLd3RhSUcxRVRrRA0KTVRaTjJTVk82aU5lVkhOZ0hKWjNSUjJHcC9tMWlQR2lHWGhjdE9OQWJUbmJaZngydk9BM3hySW9LbFZYDQpMbWoxYkFta1IwZWpMdnNaZ2tGNE9vaVZTZDBGSG1CS3dpcCtXN0JyZ1FQRm9HNytCSEMyRUtxaTBpWEENCmJZMjlqYWR0MzVJeXpPMk1zWmIxMHFRM01hNnZ4WVpraG55QjZ1WVdXSGVwUjZVNlRETUNCbXhUYVpYag0KWHVwUnRDVHBVeFR2UmE0b3dtcVlKY1B3UEUvZzRwM0Y1cGVXUEVMMmNUK1k1aU9Nd2liNjFmYW1kanlnDQpRSkRudEtaMW01dHQ5U2tibUVrR2JOS0Z2cGtBR05mWnlUK05mOHlnT0JQazgzWjhnQXpXRDNTbmJHOTENCkRzNnJJR3U4SjVFNEYrclpHTEI5UjVWN25SbTI0ZHRWam5IUHpQdGRJa254V05oOVYwOGhPaTlnZmw5SA0KVTgxd2pQcENtSEdRVDFoZXpFNzNCVVZncVA1Umc3QWUzTVBTUlBUdlAyVU9ORnFSU3NiT29LSDVQTHp6DQpIRXhWblcyTDNlWjNDWGhhUWR6ZW90Z2FJMVNBTi9RZTlYdHBqUWpscTRmUzlLNHBtYWJhbFVKOTdHY3INClgyaEVHYk1pbWhOY1NvazliWkN3dzJlekRYTXhrMGxZODljM05uSlN2eHQ5M2hxVFl4am9aWlB6cnpPNA0KalQ4YTd3dUJ1MzN1bmhaQVZtRFNYb1AzVzV5M1ZsVm95M0NYKzlKdGt5S0d2bHFRakRFUlhuaUJ4YWM2DQpkNXNKRXRKdnRNZ3lNcnBlUFR4MVZMdzlqRDF4NE1iTW9vNWdnVGE1U0piZ3IxODhkakpUVEtXb0lYZXINCjgzcUdXMjlJMEdMTUg1eDFOVzdBeU4zbzl5emhMVFloMEVndzJFNVEzV1JUYThBZkpLeVJOcnpPTGtNNA0KUWE5R2tiSHY2SFE3K21LdERzRlRJQTNzb1FNUkhFSFNVWWxWenQ1N2FjMEZGbzRWMTR3amlsQzZNZ3RjDQplVmJJSXlIQnJ0THppdWNvTVBwUmpzbGdTSDlZalB0a29HamlYUEhjYTZGMHRmS0xXYVlOT1V5ejVrRE0NCnVKUGNnZms0MSs0M0RPd2I4MXVrY041WHU0bFBHQjI0dVNReXpYM29lKzJLUUkzMENhS2QyOXFoeC8zSA0KVWN2dXhrNE9rVTYwS2JUSUZHR2RRejlMaUdYdHVRTFlneGFqREFmNDU5SnlJeFlYMnhWRFprRUc0YXZiDQo1SHRLd0VQT2d1a2x1V1cwbkh2Y3E1SDVXeUxxQnV2cHZLbnhQMFdqZWhKaldqa0hFdDBDbWVYbTVTMWcNCjNpYXZTK1pJZWhlMExlSzBMVkZYMjZQbjAvK2RmZ1RUWnpITHNseVlDa256VFAvalAzZDd1NGszS1AzTg0KSmYwbDg0YTQ1Rm1UNlJkMmxmUlQ3ekVlYzBrNy9GZ242ZWtsRkVmOUZZTDdpcFNUeTlwVGVRM2d0VnU2DQo0a1lTM2JJUHdtYjlvL284cW5Jcnc5Z0NGUTIwaSthYXcxanZHVEY3UEpMWm1vZVBGRHVrVS9vVURvc3MNCmlkNjRac1IvZ0lnaVVzRWd4OC9SaHFna2VQRWI3ZGkzUlBmbUcrcEpGZmJ2dzlJTVhNUExtY2tlU3NDaw0KeUxJaWRzSmJvZG1WL3FHbFJJZUFENW5LaStTbk9EbXhJVTd2RGZpT3krb25ZYWZLbE00bmljaVRCQkRCDQpiRGZMWlJtRnJtTFBHRldyUWxpakcrVTNDc2xSWllqV01nZGpxQXoxeU9JaEd4SmVxVUgyOFlBTVZHa1QNCmc1NnNUeXJhN3RzRmJJb2V1NzlvM2UzdExwUjltdzdjdk1nMkZwcGh1MUpEU3hkT1NvTEJqVHp4MENUYw0KWEhueGoybXpuSFJON0NEc1lxQnhMb3JKNk1zRjl1Z29Ed0hKYjBCZDFuZnRhbnh3eXpXa01pbHNLSjJ0DQpzeGNtWFQ3WUVFQnBaRmlETXBNKzY1bS9Lb1l4SldRNDI5QjVwQ2k5QjB6ZUhmMm5JSmRJR3RrdCtqZ3QNCkFHbEJFNFNWWGpFSkdJMG1tOWxHQnZsN3FNbTF5QnJmNHBDbDhpSFdienVvcEowRXFxQzRmVnYyc3Vpdg0KQ0FydXdYeXdZVnZONDB2YWZVREtKQXVNckpIV01tVDllMTcxSHhXaUp1OVFQZURWSWRlalUxdVpEdlN2DQpmWUtOcXpEb25NZGowUWRnVnA1L2ZFakRhZFFUZUpBNENuTnVNNEZwT21nRzRPNlA1aGNmRmwwa0srVzENCkhndDlORzdxSzAwUFJSdHd5WlFmUnJnOUhhTVVjNmtqVmlQZzdkUkN4a1FoRnR6QzdNQndTWlN3Y1p6WA0KQVcxYTkvMmFMTGVGcDhxMjBMcTlNN29SZThmNUh3eFhsU29UVjlkalkwYnNNSDZTdTNFd1hPc0tjdDdhDQovc3lLUjVGOEh6L1ZFbnk2YUxtY3dHNDVLOXlWSUhMMmJIRDR0dDBDL2RrOXB3OUlFeUU0ZFUzSGJIRnkNCm83WTFqUGFCVjFJRWkvVGRsQlpuT1F5d0N2aWd3M1VrR25KemNKMlRrVmpEZndTVmo1OGdpaWRKMUQwTg0KUWwxb2daNzdFakFaSUU4MSt6N2pnNnE2ME5mbVNoQjhHbXlPYnFKVnVCRGFESklMRWtFdkxMVFZHVE1mDQp0OWhUdzNPV09LRnVPcTQxM2dhdEdpV1RPTy9WWHZDNlVvcGg1TzFQaXVYejZUckZSQnJqcTI0SkNnUWUNCkd1aTFMemZEc041dHdyVXZ5S1lzaFk2OWdocC9xVUE1Q1N0bDJxbkFpRkNCMjM5VnNJY08wVFIwYnJ0eQ0KdzFXdTlTc1EwMXhsTmVER04ralB1RG1YYUVJelpST0xhMDU5eHYyMUJHaU5VQkNGODZWZUk0dzBZamFoDQovaXFZSWxMc2dlY1BQRUhzbjRGUUh3RllST2lTcklLOWhadFhXZEVBV0dpd2pMbzJwU0lwVmdpTmd4cFgNCjYzRjdOeUFjMHZIeEw4TkgybjE4dFMyUUUvbzNBVVhCN1BwZk1CSGwzVVRqTkdPV21zT1JoeTZpVHdDUw0KeGltSEQyYjZEYzJzamZsZlROTWRuUHVva25VdjlTWDJGbEUyMWg1UEtyOXovOE5jek9HZVhXZzM5UzJzDQpXK0dZSjJsMjdHSFRjR2xUeldKOUpycEFEUWlEWW1DWGhJR2lHMWRWYjlCZHNDTWpSMjVsVTYrOTJwWE8NCjZXdDQrL3VMcXlrYTA1b3R6bVFMeFVCRjlkdUZpM0pFUmVUeDFHbm81bWErSGxHL2RJeVhWREZwb2JUQg0KT1p2K1h3UWVQWjBwNjRhSjlQWDRDc1hiMzNuaXpiL0FHTEVmV2g2NlN4M3o4cXlFa1dHOGp4eHNnWkpNDQpBb2I3N3NRWFNudWJyMEViZzdwc05SWkRDVWNscFlxSVdEdGRvUWRUd2RHcnVRTDJZcmQ2RUVpc0syRHgNCmRLTjhMUi8xZzRIQ3RZR0VTTDNEdDBqL0RHRDFkT0hHZXhlV0xRR2o1OGlvekF6WGRwZUFxaDdodk5iVw0KYUExWjJIUS9kK1ZHaEhtZGNReGpmTGZzTHFQdWtsRUt6RUcxYVZWUFdKMTd3UkVlY2QxWkZEbjFQUFI3DQp4a2txZDd3Y2YwYUhSbmJuSk1RVkRtR0kzL0hUZ1BPdkpQSk5EMkt4Z3BkYlFCTzhlL2FNazRuVlZmckENCnBaeWdIQWVvVzR4UnU3TTJNUTlOYUZHZmxFelVLNGN6QmVnYjlGdXRyTCs1UVQ4c3NMYjQrdG9GdFBlbQ0KMEg4SUZPSmR5dTJjakZBMjl2WXVyMVhVVmRSU0RwSjMwdGc5Z0MrN21EV2kxMXRZdkdGaTRnelVqN2JkDQpvSVJaL2Z4VW5jSGJvVWc1d3VkOXg5NWtWcGRUcUJkclRsbWk0WDJXekZGcVU3Q3JSandXWkRxNkFJRXQNCmkxSFJpdzB2OEJySk1idllUc3dZdWN5VHR0RGFHZGZvb0J2d09MQm5ZdmZuRytwek1GRlRPb281NktXeA0KWkViWHFxWGtDL2lpQjdxdFMzYS9hN3JiZE55OWtEWllQRDJaNUJZcmVXTy9tdlhLNGZPVkRQcmxYVnJtDQpRZ0NtaktDaDg4UVEvYXcwYUtPbkRqY0x6MWpabkptdmlGWFRZTktHc0dlTm9UNmhhS21JV2t2S0hFd2ENCnJGZm5KNExqaDJrQTVJTFMyOTM2R3V1Yitwd1E4clV2cmFSN0JJQlY5eThnMitSMjlxU1RtaUREQU9TWQ0KR3lQcGNuSjN2Mkdxd3Z5ekJRc2I4NGhqVDI1WVFKVjJOU3V6cEZWWHQvS3EzUGprckRzYkg4N1VpTUJvDQpTNkFuRmVzQ3FqUy8rS2hLbUdNdlRMZ0t3cmt4a1hVWDRyRWE3LzlZclBrT3ZLTU1uaDM2ODByemJJTHQNCmRCRWJCWWRYT1JmT3lXLzd4MHNOWENJZ2o4WDV3SDRHM284cnllNERMVkxPYVBLZ3B6b1ZFZFl2MWtrMg0KcWVrOXVJNzg2ek01dlYvWUE3R0k0YjF1SGJJRmZIemJPNjlzNG1qclNSK05nVnI4bDlUT1NRdz0NCj1RVURNDQotLS0tLUVORCBQR1AgTUVTU0FHRS0tLS0tDQo", + "size": 165884 + } + }, "raw": { "id": "16e8b01f136c3d28", "threadId": "16e8b01f136c3d28", - "labelIds": ["SENT"], - "raw": "Received: from 717284730244
	named unknown
	by gmailapi.google.com
	with HTTPREST;
	Wed, 20 Nov 2019 14:49:50 -0800
Content-Type: multipart/encrypted; protocol="application/pgp-encrypted";
 boundary="----sinikael-?=_1-15742901895970.7632331896869171"
Openpgp: id=E8F0517BA6D7DAB6081C96E4ADAC279C95093207
From: FlowCrypt Compatibility <flowcrypt.compatibility@gmail.com>
To: "Tom J. H." <human@flowcrypt.com>
Subject: pgp/mime with atts
Date: Wed, 20 Nov 2019 14:49:50 -0800
Message-Id: <CAKbuLTpaq21LbXD0uNo=WZz-Pksej9kAO13FmqBm_5dnPGB2kw@mail.gmail.com>
MIME-Version: 1.0

------sinikael-?=_1-15742901895970.7632331896869171
Content-Type: application/pgp-encrypted; name=
Content-Disposition: attachment
X-Attachment-Id: f_zTzHVMwZqoWutnotOyrvpsWhmwJMNi@flowcrypt
Content-Id: <f_zTzHVMwZqoWutnotOyrvpsWhmwJMNi@flowcrypt>
Content-Transfer-Encoding: base64

VmVyc2lvbjogMQ==
------sinikael-?=_1-15742901895970.7632331896869171
Content-Type: application/octet-stream; name=encrypted.asc
Content-Disposition: attachment; filename=encrypted.asc
X-Attachment-Id: f_InunFaRQRvGwDomujcAuRVrfCZebEL@flowcrypt
Content-Id: <f_InunFaRQRvGwDomujcAuRVrfCZebEL@flowcrypt>
Content-Transfer-Encoding: base64

LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tDQpWZXJzaW9uOiBGbG93Q3J5cHQgNy4wLjkgR21h
aWwgRW5jcnlwdGlvbg0KQ29tbWVudDogU2VhbWxlc3NseSBzZW5kIGFuZCByZWNlaXZlIGVuY3J5
cHRlZCBlbWFpbA0KDQp3Y0ZNQTB0YUwvem1MWlVCQVJBQWkvelNsUXVnbUhYVjNTbXcxRzZyU040
Q0FMd3dxTndxc2M3dDMyNEwNCit6OWZlVkxGVjEzcXVhdG11V3dhTjZla3FlbHhFaXZudnZaQzhV
VlBmbFBqQVVmR2JneW4wVCtpNHVMeA0KK2ZlZ1p6cjAwTlV3akxoaW5QQW1xVzVqZHNmRVF1S2JZ
aEJJV3l5ODBIMEVlcmIzZXl3dmt5c2gyTmNBDQpLd2lwWWdxcGUyZk95UHloZjN5amgxZ05ML3NJ
WWxMRGZhajdUcDZvK2dkRHNoZnladXN5Uk1pdWlnWkYNClBKUzBMaUx6UnVHVGl1K2ZHcHY4Y0NO
UWxUOWpoeVhmWm1UcmZkVmpkY2IrSHR3ZTMzOVJkVmYwRjg1OA0KcTNEekhHcnFYWmFraVhIak9z
VjdVVTc2MzFUVHZuOWN0dzhsMXZKUGovazRXTXQyRDhCY3lDWDZ0WDBsDQpBOVkzR3lvSTBMMC9k
VnFpZ2pWN2JKTWR1aEJmUUpNdFR3bENDUDVsYkdEOFFQdWVUbmpWdzk4eUNZWXMNClNiSlhaaXNL
S3pJTjJmUVhtUHVNeWd1UXdLTGJ5Qjl2QytjU1VBOW5YblVXK3lHL1k0a0ZxMTJEKzB2eg0KUDU1
L1JEOXFvbW5RaUJBbmRxYVJkNEhrd3R4eFdVeGpLS09jaEFmeGdXLy9LaDZNZDBlWUgvY1hRSWEx
DQpQVjNBemRxa1dkQmNNMnlpZUFTTWRVZEZidVNaejR6NGFXd2ZqLzIxNUFhbk1RbmxFZzZoajk2
QVozcjUNClpya1J5TFNDZjdhTTU5MEF6ekgrT1hDZ2lkU0prbkp2QXU4UU1uQjkzSnNnbElqUXJG
MDRpY2JNWFRrQQ0KOWwzanpjMzdkNEdlWGJlZHlsYmV1bStXZ1ZXak1TeTFLWHdlSVc0cWhWekJ3
VXdETUYrQnFhN1JJRFVCDQpELzRra0JIWHpaSjZoTnlmeUtuLzFkZ3gwSGx0WXRCUldvR2VTYVhO
aTVqTzR1WnhqUzRPb05leUhqWWwNCkRjVzZPaTF2ajVJSWZMak5tcW5ZYlh2akJQRFRxS2ZuZTd3
c2VzRlUzcHBnQzFpQlZVQndKMGVGRkV0dw0KYzdpVUh0VGxtaGNRQmJMWTRuZWlVSEg4aHJ6REJ3
dnhYVFZmMU5KTVBLMzlNQmNBaFF0S3JPbmhpWjRuDQplL1MwaUoxUFVCbGZwTnBMQ2FCNHJpbWNm
Nnpqc0R6R0JpRXI5M3prOFpwN000OWZvRG1BVG1NQzBRMngNCnY4cjBuL1RIbENDMHRNTFdDbi9Y
cSt3RFh6d1lBSlVOUm5HYjJ3ZzB4RXFOWXIrZnhMZjFLSjZTS09GSw0KMEl0RVQ1SlJ6YXVId3gr
ODNzYkhsYzN5TzVhNkIyQ3F0ekpOSzNIOXcxSStwN0hKT2xBNkNhcUJBVlZuDQpyMUdSSWtwRmFm
ejMxc1Arcll4QUFOMFhybHBzeDAvSHgzUzg0a2E2a25yMmlxMjhSMEgxOGhVdWlITnoNCm5nL25h
MnNhZFljeDhpY2d1S1BhOU5PanZDVE5HanRJbXZsb0pQQzYwZXZETlZ2SFR2Y2pJM2Y1TnRZOA0K
RlIyN3pld25oZWdFNTVIdlg5dWhGK0V6WnVwMXFHdkd0ckdBTzNCc1BrYkNWT24rVkxRWlZYM053
NXdqDQpqVE9KajhRR0QwSHN4ZDZ5QkdSK21SY1JqYzJyRVFxdmUxOWNqQlJsVWZyNHgvZm9JRkJQ
YmQwVDlIb0gNCk1KMFFEcXE4L1Z3R1RqU1VXVFFHU2hsRG9nUFVmNVJrQ3cvVjhiTzNOQ0luMldB
M3M1blNTa1JWRm9kMQ0KeUJlMG5Td1lWWGFSTjh4MXpieWlJMCtZVWRML0FBSFJ0UUh6QzdYRGRN
M1ozWjFqSjBFWGVQQ3VSNkI1DQpmVDdvYzVWbnI3QVc0TUdhZDJHdmVxVldIaHV2VmVOTGxrYmds
NEFkWHJGQzFhVHpoN2lEbTlnUmJRdSsNCnRQUllRVnlub2ExcDF4VGhMb2xJUXNHRnRTbC94Sitk
ZDBrbUVpL3N1UXZQMCtucE1NZ1czNkFKQWttWg0KdGpPTUFtbjNMSzNwbENGZjlDWmhaMGNBL3c0
L3NDRnJIZzlHU2FvcHM4SVV3NU5tTkJZM00vamlubjFiDQpWaGI0MUtuTVRUVCtDVWIvaUhUNXM0
dXg5NHJ4MFcxcDlpWnhOemFlRnVvOTlkRkE2SmVYbVM3M0JXY3ENClFERW9QeWNVNndNa3FmOE1U
a0dBb1JEbGpWQmYyVUF0ZDhmUmJCZStRU0c0ck1WZG00dW9YeURrbENpYQ0KcUNDT3c1dlF4WjI2
WTJ0SXhzL083aGkvRE16TnlvcGVkeHZYSjUyV1dVRzl0V2pkL0Ezek5pYUhwRXA5DQowaXcwTTVi
dmJzeFZIb0xNT0x5NzRGQzVHZmRFNlJQamJLRzF4dWVjbWFycENJWWFrMFhGZVRoa0tTdVANCmIy
TWF4b0dYVlZmTG9yQ2RYUlMzSUVlWnFUblJNOWQxTEozRkNVSnR1WC9Kc1RObkRIQjFNemY5b0Rl
Tg0KSCtMVCtpcERRcjZvTEFPdVJ1UWFVbDRXYkxrdTJLN0JiUEg1Mlpydjc1c29ycjVERmpzbStk
SkdYdXBEDQpzb3B3a0c2L0duTVJIMG9zd0ZUTkd4UVNtWHgwU3o5Z0NZRnU2OUZNejFHMGljclQ3
NFJuY2JCaFB2VlANCnJRN1pEaFhiSCtoQnRrOHJ5ZFNhZUgwYzRuVC8wY0svUGg0VHdJenNtZTR1
VG1hOWdWVVJ3eVJMV21CVQ0KQVRtdVRXMnZXa28wcUoxUHpGVnI3N3NwaXdkOW96eEljOW56ZW9O
bUZBRXNKYjE4R1hBaXNncWxIQ3o4DQpYbmY1N1NkY2F0anlVbnhJQ3o3VjlQdFhMQktjajBlMDMx
MDB1eGhwTWJJb1U5TUNUcWJKTUtVY3dtb3gNClJZTmVYakxyRHdiQ01EREtlVy9QMnUwRy9tWk85
aWlNN0dWYmR1bGY5ZWZaY3FkKzRmK2lmQjVSekt4Qw0KNzRxdUloWTRRZHRIUGVvcWtsNnZBVW5n
MlJ5RUxTS3pVY2dWQitlb3FmOFRXNlhPY05GODJ0eE5CbHB6DQptNzc4aWt4Nm5ueWtZWUFSb1cx
ZFpPOXJEa2FpRFJscHFKQ3QvZzQxeXJPbmVHcVVWakk5VUFBYUdFSDQNCnYvZEhiTmFDS3dDWWtR
ekFRbnJnSVBuQTdLKzh2NGZPN2FlWGtRY25ZQVd0UG1RYmIzNzRtanJ3YzVvSw0KN1dQUk5ibGx3
SHkrQVBEbGlyMmNPaXVZMGkrbUZSL3RQZ2x2aVJUV05LeU1wMDBVU3V2UFdMdWFxd3prDQpPYnJQ
MWZTSVNOaVFtTnhzRlhuMER0UjMwRHBBeFEwRE5HVytXTDVxQzhhNUNsUVFndnVRZ3orZkk1UWIN
CjNoM3FNWTJjUXRXdlVuVDVucW9nck5SdWIrYkdXTUtZWnBCTTJnY3JkbDhqR0pCdWNsL3YycHlp
V04rMg0KVThNZWFmQzVpYUI0WndKemdweXhTRkpRRlQ2UWIxT2g1Z1NJYlRWekpiOGlvdERGY3Rh
T1VUZEgvYjZxDQp0VElDczMrajZQZ0trb0d2VFBTMjZXN0FWSE9XZHduSWllb2NFU2hNMXgxQy9s
ekw5cXVvU2JZNVNpR1ANCjBmVTl4RE1tRzBFbU52WVluRUNSTXZvQWQvMDFWMXFzMkExcmlUdFVq
VDArdWNLN1NCZlZwd0d6eTkzZA0KckxrQUNOdVQ4VitibUkvNWZITDJ3RzBWMzlwbm9CSk1pWWVm
SThVQTh6V0RJQ3Y3VGJ5dWFoN05lbHV6DQo3Z242cEdtZFVLWUJCWTdST05qTERLL1d2Z1hqTS8r
bjdEejBpRHpNaTRGZGFrQ2IrVWpiK0xYRnFUNWINCmIwaytoLzBKUGFOclloWk96dE05U1owZ21U
dnhHNEI1L2VQYXZiZ29YT0UxM2lkQnJHZCtWUkVZYjM5Tw0KSkVIbDBwenE1UHNVendMMTdMYWRL
K3VDRjY3RFh5aXpKSjVFZzdOZXBoK2ZyblJzcGp3dld6SmVLNDBlDQpxeTMxSUxhWXFERlRsTlY0
Qno5YjBUTDBFRjdYeGRUNUQxcktwZTMyMUFYd0NCZVF3UGdZQkxwdU1ycUQNCmRWVXVNZXhOVndK
anpWbURZTUhuaTE4cWNkRGJxbExjaWd5bEFqaVpoaHhjeEFXZEdYZCtiek5YRk15bw0KMDFsZTM5
T2NuVi9TK0NOQkpNbHRScldLS0ZkdkpXUnFjc1FCT0NNR3ZZN3Nsbkk4ZThZM3drcDI3UTVEDQp0
cWpMTGtqT05Iek5sa29oNHgyaE9Va2tiN2JWenlVSWpUYXEvQnZ6cEFCZDdNSURaeEJ3ZlhySW1V
cWQNClpOV05QZ0FDR3VoSzVwMW1pb25hd0E0RUVqeUl3TEs2WUFDaTFjS2krOC9BU3hVNWN6ZTZv
WnhneVU4QQ0KQzZmSW1SNGN3MU0zcmw4YnFXS2NFaW1aMW0wM2JGV0pxbkl6T1ZCaWgraHI3R0VS
UCsybUU5WUQzNHgyDQpnSHZWcTlSNi96dUE1dlpBYkFMV1pSTjdwc0MrYVcwcUFMSEFZMGxUTDZW
c1FQN2hWSVIzdHo3ZVRtRVgNCjEzUkpmcERib3ZnZ1FRSVo4MFd6Mk1KaHA3Sm5LOGZKamtST0k4
TFBqRVQ2eXB4dHdCQmROZ25nS3A5bg0KbEZOdGlrTUVZTlRvaWdCUEdPbjM0N1JhRStmdkg4YXBQ
elBXa203YmZQWnJrZ1YyS2RCWC80UGRBQmxWDQpOUmxSZW1rQ2w1T3RjOC9JRkVOSlV5ODFRakNN
K0ZPQ2J3b3Z6UnZnSmdDYlpaNC80YUVQRFE1RmZValINCnlCUWp0bnFGZkFYWXdNK2c0bWFzem4z
RlJqQWIxcEl3L2dwbWNtckRuaUlqd3JtQXVacFFWbFVaamEzRg0KeE5kbU5TNW9wdlFONXd4OXFy
NGlMUzd4anBxYmV0QzcyWXduOGlUaDgxdGt2RFB0UmpkUC9oNWV1Vm5IDQpTc0ZEM2FVbEdmdUJJ
ZmpMb3J5N2lxRUtSeUNuQXpTaEN1a1VFVUFtc0RVRCtJSHZNbm03aWJOQ0N0SGMNCmp0eXpQc3I1
VHcyNm9RY2FTVWtNSlNJS253S2ZBTFBRenNia3Z4V21oL1QyMzV2QjRIdzZwSWYzQXhuNA0KeEIw
Mm9tN0cyanBWejgvYVRiYTYxYzRhNUdzeVkzZU03Qis4WUtmRFc0MGQwOVZxemhseFhmVXFwSDMv
DQpPZFFPNC8zUko1ay9oUEtYNWpnaEZGRWdXWCtUNk83Ni9yYTNzNzZZcU1McGpPZXFGZ1lMWjVP
QnZ5MjgNCmFTZDk1QThHcEJFbU5FeCt1bVhJbkdYa01tU2VodTJpMWxyWDdLbjVuQ0tGeWpPZFR0
Y3VFMll6VmcxTA0KclNBSXZSMFdBSWVVUlkrZDJ6cDk3clVKMkxqckJGMEd2VVFaS016UmI0WFpu
bkJTZVhkZVRWaWkwKzFzDQpBYzJpNVd4WUtkUnZxY0hCTCtvaWc3TklRZG5TVGtsYXVGR2tZZnhM
a0xpYzN4b1ppRVd4ckJFa3BJYzgNCjlRbldpRk9mMkNXekY5NFpRdWpDYmlCaXZMemh4blhWTDZ4
bUk4dHlSZ2dZMm5aR2RkNnFCaFBwNjZ6Vg0KZ2xVamxONDhjdWhINXQ4aEJIcUhOaFRVODdSUmtZ
blk4TXFZd3UzQjdBTGU1V2dsTk5SK2lVemZWOC8zDQpnY1M1dmVLdG94cWk5NWl1azB3elVWOUZL
NCtqOU5mWU5yWHdUNHJKUjFWM1BOZ3ZFNDRiYkc5SjArZGkNCkRpZ25FL3pXQXpkS1RpOHNTNEt5
MWYwUXMxYVZXT3l1R2w2eUMvaHRqWExpbWxncGo4NXZXenlpZlNQNg0KWVRqNmU4MnB2ZXhDamti
MDk5ajJzNm0zRnNiZFVPTi9ibXp4SDdXQ3VDR1RXWGQrSjFSR1NULzlpTHpPDQpJSWREK1FKWFo3
M3lwajdPMkt6c05aWlRQUHdUVFYzQWxhV1FtNlBFN2RjSTFpdTJFMDdoM2Y0c0IwWEMNCmZ2Z3Y5
ZDFWL3NsTzgxQW82ODVXbDZ0QWQ0MytwKzZtZTVabzdwekRPeUF1MGNEcGRLQ2pFM1h2VlUzbg0K
T3lqOHBjd2NOTElpWXRocXBkMU5pZmxiRFZBZ01TYmJ0QVFOWkkrcXRoUmxIcUhmbE9FUUlOcmRS
M21iDQo5NENJbGpCTExJOENITlhTUHc4Lzd1WHVQNGtnL3VYQWFlYVNldjQxTWxQT3MvQjdnblZI
Z2pkcDUyS2oNClkraHZYU0dTeXVMRGpRZ1MyM0pPclZtdFo2OU0xSUtUZEFPTVV4bEhGV0RWcWhu
Wjl5cUJZcXZIb1N6QQ0KdDE1NWdmaUNEanhTUmxIVUpLWnVBU3BPd2VVcy93QjdkTU1rTlRXVzdm
Y0NEWG93NUFzR0hPR2llWmNCDQpDbGZpWXowUDd0bDA2bmxJL2dSWjVoNzVxajZyV0pOdGNDOVF2
cC9KellQOTNleXBvN1NwWGlGd01sUUYNCjFjVkV0djd1bVVXNzRPb0RES0l5UG12QUZyWEVOblI4
ODMxUy84UTF4STZFczFyd0owUk5CSURBbmRTWA0KcS9vMm1rQkhkN09zS01xZDJZUkptbS9BaFhu
UTh1UzdXclNJOVdCZDJOQ0FnVFNjUFR2RmFhb2RKY244DQpqTjNoMGdua2w2RHQ0ZmJOSzdaaEFP
dzdXTHdoK29EWVd6YW0rM2ZIb1Z3MFkrMm84TmxNRHo4Nk9BaXYNCmVnUnF4OTZleHRtSFNRRGpO
VlR3d2Y4dDF6RmV5Vzg2WFcxUml1SlRGMkRleHlBMDNhdlJwQmZtTHd2MQ0KOGZadW1KRkpGNk5u
UWVvR2c2T1krMjRjclJmRWd5c0QxZE5XZU1ob0NPREIxZkxvTXlLOFNNR0I5a3ZjDQp4cHNnTXZF
OHVwakpyRjF1MnNwVFZJbGoyYUhxa2VSKzhyQW5pei9CbzF0a1F3M1RlZS9DVEM2TFhTaTQNCi82
ZTcwN2NxOEJsUm50d0Y3aFhQcnQvZFZEQjNjdFpIaUc0OVRHdEU2VHlSdGtSNVZ3NzkzYkxseHFh
Vg0KN3c3bjdxME14ZjlIVzZleGljeStpc3dvbTFSM25ldFhveEFQa01XNDVyOVc4K1hPRkRDVHVY
eGZUWFpRDQp1M1kxc2RqM2hnbWxJWGc1SmYvbndBbG1vVm9sbHVIek9mUDljcU1ycFhUZGI0eHRN
ZHU4VWpUZi9KUngNCnJrZEV0MGs2SDBJK1hYRldsVFFRaXc4UmF6Mk0rQTZkV3JITkhGVGlSelhh
Ym9UMFk0U2VFbGEyMWR6WA0KUHNsczNpSFBNQkdKQ1BhQVVmS3JDNzhFR2E0ckNiVlRXcjVCdFdL
Vkl1RmUxQ3ZINUVyVDNpcnlFam9ZDQozbVM4RVFaRHJmLzlFYUpVV3lGdXZlYUJVd1BrdTZjT2lE
YWFWRGZzZGVNKzYxcUJKOSs0a3U2Z1hnSE4NCmo3MFJJNVRNWkFJQ05tcEFNV0kzZ1ZxRjgzbGxs
aS93OWNQWkhVRDVsSHR4TmJTZVI1djBacnc0Z3lIMQ0KZmJpaXRreFVHSWU3L3MwT3JJVVdpMVZK
Q3IreTdNMDFvZjhkSmh2NFllZSsxOU5sb0J4ZmZaVGNZS1liDQo3dXpMaG85OGFuNVdSMlBQYyt2
UUlYZm51UTYrSEVFU1NJR1hSWmJxQm1rY1NCZDNvdU5SUXgzZXZIc3gNCm90UTdMMmZiWTVHTlUy
ZjM2S1pQc3lETGRqeVRZMnMrQkxrd3E3dGdpUlNYQjVjeEJleklHS0dzVVZiKw0KY3l5QVpoaG5x
MnJOS0VFNTVMdjJKanBQK1BFZStkQ2h4MDEwSnNhNmlXOHh4a3ZyQitPaDhHeTNzclhQDQo4MmJn
Z1ZnbUFONkNJM1BEdnNFSFl2TDdhVXVoOVhzN1EwekttNEEzREJ2bTA2RU1BZWhkMEY0bzV5bUwN
CjMyd1FWWEJZWHpydFZHWHEwVGJWRWhRY204UWswdkFDUTN1dlhZaGp2dEM2Wk1NUERNMHIrTkli
NlhmQg0KNDhON2lFZTFIeFJpaXh4R2tzN1l5TERJaUdSQmJIeWZqbWRta2FlVUZLM1JNT3NvOGtH
dWJFRUk2VzhQDQp1UDN2VnQvTEZnMER3dGZoS3FJbEZJcWxOM3QxUVFpUjdLSmFZM1dLaHNSbW1n
eGxIR290NENkRS9lK1cNClpoRnRWbWN3WUEyWSt2UGVsTTQzaytRMnN3elQ4MmUrK2FEczMxM1NP
RnlWaERvZTlJYWxtbUlCTHVEdQ0KKzhuRGl5YzNpY1kxSXFUczlxMjVSUlJCbE5mKzFYWEtRTTl2
c2JIUzk3bXFzV2thUkJSMXZBNzE3ZWxyDQpySXBwQUlXSTNWRzB6U3I3WFduQld1c2ZpRkMrcjB1
K3ZiSHpJTmdWTFdBRFFDTU9mNWNaZVM1UGJ2WUMNCmhpc0VqNE9weVRaQ2xSVGdWQmlRSVFFandh
Z1B6cVBLdHJTaUlIVHp3UmFoM2g1ZWZxVW9SY1dNSTlqUw0KNFlBWFVzUCtaN0FsQlpTdGV1b3dv
NDNtRUJJWjlUQnB0eTFQU2YyUkpuQkFGM1N1QUpJTWJHYzJod3lWDQpGV1F6YXpqMmthSWJDMUgx
UTJZQW5sdUNlZG1hYUMrblVVWUNSYjhzMDdFWXp3SXV2M0RPYWRRZXg1SjMNCjhUdzZrRFJDdnB0
aWtUcHp2SlJIOFJwRmdLU1QwVnM0eDU1ZjRVV1FMR2lLazBkNnlnOEY4NytldGxGRw0KbHhiVkRy
T08xWkIyREQrMFlSY2Zya3p5TUNkQVVLTU5RUVA5VWs0dWlRbTl5bWZaM1J2a1ZSWnhycU1xDQpT
RXMxRDZuT2J1Y3B2T1pBSzZpVS9EcUJ0RFdEdEs5WmFIZW90OFh3cDA3M1FONGt6amRaYnkvOEhr
Qi8NCjQyRDlxNTU0Wm5QdTEvRWM4TDloakhIOG16QWVyWlY4bG5mNXpueGhVN1RRT1phT0Jvb2Jn
VEtTNEVhZQ0KcTBBTUNMc0RGUDVYUnpiMTVCK0RyM3ZBb1lpenVCUXFUWEw3bGwvT3gyNDJQaGVY
T0ZBNzBBK0IxK3h0DQpUbVI0Y1luM3NSY3B4aVoyTDlsU05NT1NuVzhCRFlXUVVMbjJMaWtzMCtY
aWdlS3ZIaTBkOHhsZ1M3ZUoNCkJ1ZHM5U2Yrb0laL1JsUE1NZFRWaktqOVhRZDdsbUZwODZIL3JO
ZE1YTlE3b1l6S2dxbEtEc1lvOXdYaw0KWW01aDBScXo5Y2FNYTVDT2NpZEFVQUJFY1Q1MG1aWHZ1
UkxTL0FQME1haW5TSGhZbU81d0l1MG5kY2lhDQp4N3YwcFVmcEhLc3NmS3Q4QlU0b1UvYm5aY0tR
U0JnYzZzVEJWdnp5S0s0SUJNWFFHZVNEK25BL3Q2d1UNClRKdTBmeEdXTFh2OTBZOGVWR2VYTU41
K0hwMjV5RjNsaHQ2Z05JNVBPRFRGYWw2RWdJRkF0eW9uRnZMYQ0KMGNMRnhNMFg5UjdiR0tWUXd5
UGpZNTRKS3Y5VE1PQUNIZTVzcGhLVGZ1enZ5U2NaVWljMy9WaVlaMzhqDQpPZTh1d3lmL3d5Mklh
TjR2WktBUDl2Z25KcVlmNjN0akUra1cyRUFGRkg2eWlESTZPNmwycjRqRXUyUTMNCjFIQ21SNmhw
TDN3NzYvamw4T2RhUmhrMHpuZnN5VkVQbzJ5a1RTSS9kK2ZsMndETDliQmk1TFROUWlPLw0KbnIz
MTVxRjNGQ1VKZ20xMzc5bGsrZ0lvNmUrYU5zY0hKOHFPWEc2dXlPYzlGOVhPVnBJWG56T21OQjFF
DQpVL3hQVlRmM3JSOVVjMmFlMS9ZM0grS2VUb1pQOERlRjlvY2JldUo2MEVBWXkvZS9HODIwY29q
V2QxWlYNCjJnOXV6dW1BY1VrKzUzZXhRa1RjMEZ1dWlFaWFyQzZJeDBlR29mWkF1ekxMZEZmOFpo
V0UvOVpXT2ZYSg0KckExSlV2TEpEeE5OWGZOdkN2QitadG9kOUQ5dldJU0hEbHRmaGhSOVU3QUxo
dkVhb2ZRcjJCT2laQ21vDQpqaXNHbmVHVUxxdGU2dUhyRzdjMnNobDVRRVUraGpqd1Rhc3JjOXJw
NE5lMkpsZ3hLditRejAySjJseWsNCnFra2RxWHRyakdRUXpxUW5WdXlyeDNaemVSRVFYd1haQkVx
cnNaN2lkUktCQXR6Rk9nR0MzeDRqYVZ1Tg0KS0hTbTVRKytNQlkzb3NEUWlUK042ekx4cTFxYjgy
NUhJRGF3UUhFeGpQa2NxRllPKzRKTklGdFhpV2ZWDQpTTU0rSEdvZEF4Z1ZIaFZPSUZFMDRJQXdy
KzI1U0Q2eEJpdnhZVURwTnBIM3dOMkQ1VWtiNWMxUVkxVDENCm5GV3VGT1BLaU5BRmxCa1cwV1FG
MnJjKzFEanNiaGpjd2dPV2dqTEpUd2hiSnptbGZZWTl1bU12RGpmdQ0KRGlJZlNQVmUvTEsrSFEx
YUdPSHVLQmFhclZkNjFWbGRNNmJLc2xEeVNqNGNaaUZoWVByNnlkQ09OcEk0DQp1THNZUHRqNUxS
Q1RmaURNT0lOcGYzck1Md3p4SjBONVpIM2JWMWtjaDRWMmVLME9IVTJFUitQZEVGQm8NCnNGTHln
ek5KVGQvd3Y2UURoa25yUFNuTVQ2bDQ1RkppbCtybGloSXlxa0g5T3F6anB4dEN6Z1hxR2srNg0K
amFOdTllVVFIY1NLelUxN0k1emRtb2ttVE5IdkhZU3hyOHN0QXRTbGJQMmxkQldMUmdmVkljVDJE
dWhFDQozRU54M2g2cGZuTFlhd3JDeExYT2c3VEhjZWFGUDJwZEdUaTZJYndGcWVzRW5pL3hjQ1Vk
MUR6U2NoQWYNCjJlMXRQRVlhUGVlMDB1TWZOYTgxcnVVd2wzZU40Tjl4dXgrazR2UzJORTBFazNC
aEJKeVZEWGd4VlAyUw0KNC9vRXZPWFlKaGhJOGdPL2h2LzJGY1ZlQ003MVJWOEdOWkErTE14SnFC
ckE4Ykt5T09OTmJjTkpMUWJmDQp1MkkzRGE4OGtVOEN6cmpHd2tkM0NJVjlHVVVXblplT0l0OVdG
SzhKT2dDd1NnTkVkR0txK0pOYThTc3ANCkw0NXBvWXlIbVdHRnIxU3BDM2lGSkFBdUpnVmxIc2FP
dEZIclREVUFPTWs0S0hvL2lzL1N6R3kybk1PNA0KbjZWcWlrbG5LL0pydXJOMGhkOGFqSFNaS2x2
dkRqbVg2azNJdnhZQ3EyM1hzbnBWUlFPSm9ucWM4aTRYDQoxYW5hU1BLL0k2a1dDR05RaGZnQ01X
WXpWT2IvMGYxUjJ5Y3ppT01VbkVJQktQdk5xa1RXci8yaFA2dXgNCnRUUTRNYk83V1ZlMXd3dkJV
OHdVVW5CT3lMRWxQODlTZFB3c0lUSGVpd2lGT2Irdm1Ic2dYYlcvbDNjdw0KQmtWWTJWV0VWZkRX
WU92eGZ3Y0JCa0Fzc2JMS25wKzFtRFQ5TEdkUHhKckdHT1ZZRndVQnZDZVd5UjZwDQorK0VZNjRw
QS9QaUlDRnRXVmlHT1NTL0FEM2EzTUVYcmR4YjdKQ0dGRXFjNzJSMGVidjhiYmV0QWhUUEINCnNv
MU9XYis1aHNXaDAzcnFVdlNyUHhudThKSHhqOXV0Y2tPUkxyNFRtV0QzMlJ3MGxISVFhTEJJUFMz
Yw0KdFBza0NRNUhpZjBPbkNaLzBwMjBkcjJJZGdmbXE0eTNlV2ZkSlpXVE5wZlJ3V1RUMitzTzc0
ZzhtUVp1DQpBcHhQeXIxM1V6SkVhRnNiZlB6VDlXcEs2L09sY0J2MFY1aFQxUElyZjMxbnROYjlL
cGRJWDk3UUpyWW4NCjV1a3g5dDJpSWV2YnAwUy9aSmJTU0cyRTRxSEM3ZGZKQ3pvbGRScFU3Rmhl
U0l1N3kyOEx2d2JoeHRNMA0KeHI1S1VUMmJraXlTL1JqdnhDeXRubmR3bndFRmgrUlZZK1hjaU8z
TFBrOHFsdE4rVUx1YW9wSitDU2FIDQo3VEdPM0dLd1NYM3BJNXlTV1p1c1ZpMHNNbDNZeDJFTSsr
bncwRVlQR0hBNWdWbyt6WWFDRFl6aUYvWUMNCjJ1bXhCT2RIc0dvNEJ1cHZaZHM1dE9Xa09rZFln
aEZrZjkrMjZESVl1dTVOQ3VWRXZGbVIybURFd0VKSw0KSUN1elhGSFVDcGs0RWZ2UXVjVEZPTXdG
NGgvdC91aGhCRlM4VVZ0cnZJbERLd3FTdHRCV1hSSkxpUC9HDQo0TzdOamdHU0x6V2lGeDlkQlRJ
UU81T0RLOFQ0ZU5hZkRqYkNETmJ6aDViNDF6WDdJSmcwM3hNVWQ5aHcNCjVjZmJ6YTJaeWE5SFFy
VjVWcnp2aW5uR0JtTVhwUWZhaGlRcXQxMWV3YkdRZUNuYTBJRXhtc2FLdWhPVA0KaTN5OFJTSmNv
c2ZXR3NNbllITnJLWFNtRHpFNHpSRDhqY2dZblc0UnVVSEJGTUVKZ2d2UmFSaUY5b3EyDQpiK2Fi
TU01M3U5NEpFK3AwZmpzY3BEdVJpTE9sQ3FJVXJjdm1RdTZ2SjJFckhHNWZObUZKU1pMdnVFTEkN
CjRQU1ZFQWlzakQxUjUrbVZGQ0ovYjFHbkQwN1lrSkRkZTB0dUI3aUJ3bGlrVFRZcFFtbG80cGJj
NEk3Ng0KK3JPNStVM2dPVUtZNUFSRWs1eFJ2bmNoSWJLMEdvTlNTdURnT29YVW13STgzVWhmcnVB
bXRGbU1UUHQ5DQpUWmdQdlV0SXoxSFBWbVIxYWNxc3F0cUk4YU14YnJmbjVWSU9aYnFzc3k5TllR
L09LL0hLWVJ4SjhRbHQNClVrd2ZUMlF1MUxVektPNlZjTUdzK05Rd1dnMWdrd01peXozQnhIdkx6
UVl0UFJRRllQZmxBa2s0V3lnYw0KVmNHZmdRYVd6d1p1SGFXYm55bW5naGlDQTZ2V1JMb3JLYzRx
dWdKeVd6WnMyNk5LTzR3OFZUaDFPM2FJDQpNY3QrYXZldmZpZ2UzRGR0ZHo3aGlrWjFrYTdTZ240
NjBoYi9CNkp4SVZrajZpaThLcVdQamhjUGxhMGoNCmQyYzFIYzU5N1k1RDBMckxXTkc3aEZDdXRq
RXQ3cVlFUVNzaXZ5K2lTVnR1Tm9yaGx4NldiRE1KQ2d0Ug0KUjhGajBCdGwyYWRYMk1ZMTA0Z3VV
d3NDdW5saEsrZndHNVIyZytwTmJRNjNETVBCTFd4QUdiRG5ZTnMzDQppVEZ3TWhNaXpSTlJnaDlp
L292VWlnME9UV0VGbk9ielJvVjBwWXo4anBERjFSN3JrZEgrS1VneHo4RFkNCjIvb1ZIWkdIYjBX
cEVVVCtVVjgvTzQzK21iU3ZydThiUnczN0lGTENmVFZJZnBMN2ZROTRTOXRCTEI3Wg0KbWRISUpt
ZU5XV3JNWTZKSnlPaXVYT25KTHI2c2E3b01rdlIvYUpoMlBuRWRJZEQydFFIVDNRM0xxck00DQpj
eUJSVDZjSkFsVUw3QVRCN3dEd2RCeGJPRUZ1NTFNUjN6cGh5cEhkbDdWUzBqYXdCY3hzbEtWb2ND
eE4NCmFrUWpSbEFIcHgzaEVzUUdMd1d1amlMNlF5QTlmaDBWVmlqMTN2cXhIdHJTZnVJeDdZSGNV
SFh1a1FLTg0KOWNmakNDS0QvVE5CVTU3dk5qbTlDck10cWIwYk5uWmloZGN5cnl4RVR4bHhtS0Jj
M0EvUDZVSmtnUFJJDQpiRVZYYmt6NlloWEd3Nk5kM3BuMlFyUU5BY29wOTlaKzkzTEZEQWdFbVZa
NmlVUDU1SEhPWXNOQ2hCQWQNCm1CV0tVbm5ObG5uV3FzYlp4cGxHeExkV1I5Z1RWRnIzUFRQeWJr
QW5EaDRlVkRhcWgzV0RpdHl2VFEvQg0KYjZYQUE1RHR0OTIwRnZaOHlpa1podzhtZThUd1VyUTVh
dlFRL0xXRDdzWlVJN2Q5T1BvK2Q3Tk5mL1N0DQpmN3JjRzMwdFp3NWVsbGhWQUlNUlV3OG5FS3ZS
NDNPUWpGczVhdENLTTgxUnVYNUMrN2daMzk2QXBwMHENCnJLTVdoNFd1aGdwdWoxVEZURDAyczZM
RVgraGlWMUIxaHZGWndzMCtMNk9BTG15bFhxWXhsNGRwTVpqRA0KazNaNDdoKzEzNWwyNVNjUTcw
WVhUeWs4LzBmam16UXdMY1lQK0c3QlFjTzBnaUVBY2ozTlI1a1lhNUFSDQpXR041eXp1cWRMN256
YldoWElwRitSeFRrRVBHK1QwVVoxV01CblR6N1dRY3M3L1ExVm9UbWwwZEFHNDANCk4zUTAvSkRm
UG9tMjg3c2FVcWVzU29NMk52c1pqTURUTWN3REU1U0pHOHF6VjRKUjhCUVQzZVdhVTBSQg0KVkRk
MXRISTJLOG5LekNrUXIyZTBuQUkyZWZCZVU0V0lXZGRWeXpEZEsrZ3lJYklwODFWYUM4Z0NtWEJR
DQpnNE5ib0VWYzNHR1NuZzFmKzh4eWIvbDQvckI3UXd3RTc4Yk4rUzJIV252UktHUklJTGN4emVz
YmdXTFgNCkZBc000ZnRGczNlZEZ6U2lJSGVXUDJqN25lTWxhVk9lMXdIbkFSWG5JSlZvT2hwUnhD
SkNDUVhRdzBpcQ0KcjBYNzE3dEpYa1NTRG1UUUZSUjd5ek44QmMyMm05M2J6eDdBVURhL2hvdEFm
NisyYXYzRVdxbmdDVElnDQo0TlZWbWpER0N1SnlwQzVZS2hqWDNPQ0cwMkkyL2haNTB0dE9GREV0
VFJ3b1V0Y1dGb0I1VFY3SnNnWkkNCmc5d3YwQm1nZlVPdGE5Tk54cEYxWWExR2tlOFNUU0M4Zzc3
bVUvUTA1VUxiUXQ2QTgwODN0dVZnaFlqeA0KUFUyQ21TRUxjdWJtUFlXNzdyczB5dDdYRTJ3UUx1
S2p5VGlxVytDcXlwU3ZRZCtvOU1SaGNjK1RTM3VMDQpjMGVFN2FMMXF3dk1hTGcyQktoSk1QTXhM
TnVFTmQ1TEVLSVF3bnVJWXZUaXlqWGFVdEVBZExiTllwdUMNCmIrUDcvbDIxVlJ4dGtuSTRZaTh2
VnpGYmUrWHRMT1FlVkFVQlNtS2NvcUd0bUVOc1VBbVErekxXb0dzbg0KRnYwT2ZZZ0Njam9kZzl1
MjZJbmgwa0tWTDBWbDB6VVc1T1Z2NmRHV0FkTTllYnlDMTJmZFBFWVhhMVFsDQpNTVVIeWhWNDBM
ck81MVdSL2RZUWFiTnNLQ2RYQXdlZHN3RnVpS3lkRDI1M3pjWU5ZcXpJZkFnL0toWHkNCmo4Z0Nz
NGtwUW5TVTkrejVNZHhCalg1czRPSGRmYWVpOHJoRjJSUGd2cjhnUVNxaURPaEtNRGxCN1NqMQ0K
aWR5K3I1Zk05dWh5QWdEZ3ZzQU9GQU9VTWxUcDZWZGFpODZPTDVQVkNXOUtCbmVPVEVwT0RjamNp
TnJVDQpmM3AyQUsrMDFjeThmVnJXNi9Zd1BJaER4Tm9VQ24rRHBZaVAvOG1qUHhpdTB5RTBaZTBT
SGRSNDU1M2ENClBJRVFJU2lRQi9wMDRHVW9BZXV4NWRlVjBGblRwcS9nWGk1dnBqV0l4YTBEaWVh
a1BUZEdWUS9GV1ZiUw0KcG9ZUDc1bXROZ2RKYmJmTjMrUzMwUWpmRzRoekxqRjhPb0FoQW5Ob08r
ME5YcmVBWGljUkRKZmRpZldKDQpkcTRUK1l5YnRXbGxXb25kNFIrK2EwV0xNdE1JWHJMQzNQSTVt
R1VoQjVSNVJtT1RrNW02MnhQYzcvQ2MNCnVyZ3BuT1hzNkt6dDNnakJlSDlxYU4xdUJjakw3VGpB
bnRTRkd2dGxSM3IrclRYSklpUjJYWklzMzRoRQ0KYXQ5QUROUlJFVGRKL2lrN2wzNW5FVmErRVpj
R0x1RVIzemVmQUxjbHZLOHRlZ2haRDc4TDJDZnA1dFdSDQp3MXBJRXg2Nys4K0c2c25YQXU3c2JF
MzcvU2xmRXp6aDFXQWV0Mzk4a3FuUExOeHRVQmlBRy8wVEE5L0sNCjJhZlp1Qk5ha1JobEtPSjlY
RjV6N09DWERTUE5JMWF0Zis1VXVyZVVYenVBTkVxcWxFNDlzSlZPVmFzUA0Kait3ektGdlNHYk43
aW9IRWRkdVhETkRSWWxjY01hbUo3MnVvS3VHaXF4OVFQVXZwS1Z1ZjUrUUZ6Z3pHDQpBUER4ejR3
SkJpVU4xZmc4bEIybEZyZUZKRVZqTXNaYVdCWTJyUDQzTnJISThzWGdkNEdlUFBMZ1RIZ1gNCldm
NEV0eFFvN2g2dFM3MDJKOEJiRG44WnhNTlRwZVUvL1ViNUtmOVFWZ2RSSm4wRkVQZjMvcmlvaTBu
NA0KemhnUU5GL3U2Uk1PQndUbnM2cXJiQ0lXQ3ZzeUdlRHY5dUMyaEFFYzBRZXExRGE0M1c4OC9l
blUyNkl0DQpJeTdpR1pRTUR1MHhRVHNidXV0R0c1OEM4M0xKWExZQVFBcVhmVkRwajJZeFkvTHF3
WVZqc1gvemg3bkcNCmdXUjdJc2t3L2g1YS9NMUF5dG9uN1VUOVFOOG9iSmxBdnhCMUcyVjlZczBP
d3JuY2h6R0Y0eE0vTHlXSA0Kd1E2eENHN1VWdE5zem8xbUlybWs5UlZqUlFrdmNGREVrSWxyOVhs
clllaVhsd2xwWE51QW1wZysrR1h4DQpQQWFmNDRraFZ6VW1yQmI1bFAwMzZleko5cjRJc2Z5cmMz
SS9tY1UrUDRHRG03ZTVFTWtkZjlrTTVWUEENCmRSSlh1L1VLVlNtSkFUUEZVNDNmdDNmT2dwY0Fs
eUV6S3JLaGg1VkFvMWF6ZXJKVHptN2RqWTJ4MGRaRw0KbmhLSTVvbUNFd0N3RC9QS0RSbHVadmR6
ZW1QVkh6cFlpSjJtZmluMzEyWDlmTmpxTDFWdURZWkdGS25YDQpzZWxCSHlJUVN3NFZKM3BETTdj
UmYrcFB5QjJRZGRmNjhESmlQa3lwazJEeUNyM09IUHdVQXJOdyswaHYNCkg4MXl1U0taeFR2RG1Y
KzNObTB2R0U4RkNwNW9Xa1ZySUk3VmsvOEJwTDhGa1IzaFlzRHVpS01SblhPbQ0KbVZZMFVrUUNj
anBmaEhoTGxWVVhMNGU2NjZ0bHJPNE5kdTh4RzFtbXVTdGR0TWdtZldBZ3RIa0FyalJvDQpBNUtS
elNaY3BxV2RsVGpGRllsci8vWkRsWHpsV2ZFYVE2Q3IvWjF2anFxUVA2dS9zd05uRHdzcW5sR00N
ClNVa09halg1VzVkdjN3MGM1SExWM2NEUkFuZjNzdHRKbWdIMTdUSTYrcGtqS1hVMjdxenZCZ1c0
Ym9QdA0KeHZFTjFmWkdDaVJ2NHpwOFhoZmhEeXNRZWZPOE9MYU5TdWM1QW9iajE1Znh2anFVTERX
cFNhOVZpNkZRDQoza1RyNHpoWDJoV2p4MnQvblpLWitwZVVkK1A2NElqUXgyS29uc0xlMTdwMEpa
UTNWQU81RUU3ckNRa28NCnB3TWdqZDEwZEl5MXlKbFpiMWJPOEhHR05WZlQ2TnFESVBwbTlYN3A0
a2FLajZBcEVaTjN6YWZsYkRETg0KdklKSzF3UDlSLzEraXVKOGtINzNzTXBlaXJEcHU3V29BdTFp
dmljVklYUGdpckl6ZnBWVFp1SGZMWnlGDQp1L2xRODhrTnc5OEJPVjVWd1VtM0UzNGEydm56cGhX
U1VhMHVYZkRmOElpTEFhV1NYeGdMOHM4ZFVwOUgNCjR1clV2ZHp4by96ZHR5R1JIMFNCdGRRYVFX
VzFubmJPVndtVnJhSmpwSytzMEFwTXJOMXJTNnEybjNoMw0KY3F1S1UycXAyMkhKNnJPWXVVUU5j
WldxWWZDZU5MbXpsTVp2MmRST1hTMHhrZ3Z1QzJMV1RCY3dxa1JkDQp6TG1QOHhEWU9pcTdJWWhT
cG9mYldubk9DNzBTaGxzdkpPSlMveDZUVU1PUFA2cG9ZdndpdVdxbnhJcjcNCk9LQW50M3Q0NVZU
aGcvWjNxRzdTdE9ISG5sTjVnT1RTV1N5alVOVkFvM3dTNkIreG9FUUIrcWxiSW43RQ0KWXp2SjNT
eXpSMFFjU3pUUTkyVCtNU1R4SmNaeVZ1MWZrMXBZVTRna2YzUStKdU5JRG8yYWJyUTRBa0dJDQox
cTAxVVNIeFVOY3lITkdNUXE5Q3hPS2hSK3l1M0gvemNQNWNwUDBnMWd5cDlSQmwveVZlNlNyd1hG
eVQNCkh4NktZWHBVSmtLY1R0RllvWEJuZlpha0tsRVpQaFdvb3NiTTlwbDJJdFlacXh6OUZLbkRT
bGJ2UmZlYg0KRnI2clQvcDliWDhVc3JkeUxTaDdyK3NVK0c0KytHNWJQM0FGM3BJOVZjemRnQm90
d0tGbm1NZ0p0WWQwDQpvbmZsWEpVeXJSbFBGNmUycWpGNUZ5VVQ5THdmUXpMaVUwa3ZBbTB3KzlP
RG5sYUpLQWp1WWlnU3kxWWENCm4rT0R4T0lzSFRHbngxd2VYVDZSSVMwek5zck5pbnBpdXJmKzJM
MTd1bERCYjk1WURmdTNpU2V1WG04Zg0KVmRpK0dzQmZ3cE5wOER4MkllSCs5aEk0WWloZzZYV2tC
MExRVmVBeTBCOUhaeW00b2FUYjJENkFVcnhnDQpXRnZFRDRxVGVES3Z2VDVHbmlVTW9qQXZHeEhS
YkFLS0FaOE50YW5JZ1Mza002dWZjNVBIWkFBVWtobUgNCmhreFc1Mjc2M0l2OVhwdnpsOGpHR3BG
QWhRcWk1WXRCcVBCNXhnQVREZ1EzcHpoN3ZCOW1nYlI5NkI3OA0KaUpVSXNTU28yYi92aXNiL1kx
M1BuZ0RkQUV2NzVjRTVONlFaajhmMGZ2OUg4cFRiR1hvajh1NWtQNnFmDQpDWFdsNGZwUzJQNEVk
TjRnZHZSeXBnU1Rta25DQU5jRlFyUlhqN1BYcVNVMnBXakRQZU5NN3ZzOThpZUoNCjRhVi9FdjFR
YUd6eldEVjJpYzEweG1TYzdxQ1pDeHppQkJKMGRmT3MxdEZzRWJ3azhRcDNUdWFzSGh1Rg0KNUxB
M1Y1VGNZekRaN09DQlVMY1dBc2FQaFFKOWRYTnRqR3M1T05xNXRTeE9ydHpDTUlHNmFPa2N2UU5t
DQo4WjNOVkh1OGJhL21LSUJnYjhDUVRCVmFqcXRVL0U2V0lJenZnTSsxS2xFOTluWk5hNThhUW55
aTZpU2MNCmF1Y1lCakQxdFVGOTJoQkFqRWhTbGw3ZGNIaDdiL3FjckF5R1ROK1dERzdManhzYjFU
TW9WMFhaR2lXUQ0KK1AvOHp4RUVxazZyODlrYTNCTk54QnAvUUFCYVdKWWVsaVZ0bjZqOVRneGVl
bHZydXZ6QUNRVGtod2RXDQpCNUkvd2szS0c1cWZIT2V4MVF5N1pIOXo0SkVmUmZyOHM1V2ZYbkVT
QjZZemp6bUxSVDFpcVQ3cGIzOUcNCkQwUFZRWG8yTGNVTUJTempMR1RlenpXMEV4dkdxUVM2UE9h
emhaT2lvdWlwVHdodXFBNldWUkhOQzQ0VA0KSVVnVTNQNlZWS2k3Ync2L20yS1VGb0xUM0hEQVNF
UDJrVk9ENmFpa0FOWlVRNGprYURvU1lXLzV5ZEF1DQpzWjNBdVRqSk1lamp2bVRZOHBUbVJKLytQ
eVN4WjB1TFZ6NEx3QUIzbUcxNFVOZW1GS21yVjUrOVp5QWcNClhWQjZSU053Ty9KWVVpM0JZcGZE
cmMrNm1LYlY4ZHFtSWZORFQ1U0FmR0wzVGpHSkZBbW9OVzZlMUxUVQ0KNEl1TC81ZG40dkJ3dHRM
MnA0VHhjTC9EUXNIWnpSTStHejViKzJ6c25iM3V6WkN6eEZOQUtUeWtvdnNtDQozNFJnZlBORHpm
VU5jUU9pTTFmV09pQnIyM3RTS2RDUjhhOWtwYUdNZHVmNDdPZFpXZFQxYkg2YzdBSEcNCnFwdmx0
dWxKNGtZU1hIRVhwM2dRT0YybXgvNlJRYkhDVzE3WHl3RnExQTB2K3c4Mm1yUGUxNGdhR1pOWA0K
V0RzRmVIc1BXTWN6MUExakRLYVprY1lhRlhXTVlNVHZ5bExNQkZ6WHJaYWdadFM0NkZaUkhDNlVw
NVFtDQowVVJNN3N5YzJKbFBKN1NETVREZ0J3Q0hPQm1YQ3pwWlRuRmJxZnhwRHA4K3Y1eStLNWFy
WjlacHJNWmsNClBOWkZSTlFSa3dINXN6K2JpMWdLYldIazV2SnFNZEo5disyTHF5NENZVHhDcERm
WVlvTEZJMEVxZWcyMQ0KL0NsU2hCNm51VDdqR2NEdTltOUJCV1kxV0tDaUJyaTB0QlFuY0tYR2pU
WnZsdUF2ckxSTlp6MlI2eEpmDQpTZ2V5Z1RMTmZwOERNRUJXYlVldTNjazd3Ui9QZ1BheE1BZ0Jv
RmNKQTNrYTVKZVlqYnNUQUhuYkZZSm0NCkJ6SGtJTWMvUXlqWmlKYmhzQVVIdTRudjhDYmFiY3dp
Q05IWEFLeE12VW9DanBYWXZEQjRZM0plMDBuYw0KTW9uVitmWXNzekptdlFMWmdLR3VvdEdHMXJq
NmdxRTRqci9FS3hobUN2ZDZOOXl0UDhkT0pUY2xINXdrDQpXRGpmZFlVVnd4TXNPaldDTmlWL0RU
SGJWZTVPODhJMXFoSm90RHVyYWhXdk5lSXVoTHIwb0ZWSDR1K2cNClZucEtySm1RdHlmL3JRMm9z
ZzBkWGlZeHVXa0t3emt0aHRtUFhiQW9YSFZLaWw0c1FycFhmdllOOU9jLw0KdjAwRDBaRk1HQnFV
eEU0UmdseGFmU2tVUVd3eHVOcEJlS3BpK3NaWXlieXVlWnlUQ1RnL1FXcHVITXdNDQpZYzZQMnRr
aUhlYzFjT3FBc1dMbWtrL0dseDZKMnVkNzlFRWhBMU1RU3Q4aUw0QU05RHpjMUM5dlEwd3kNCmFj
dHhlU3JtSEdxL3ZLQy9SL0wvN2xnNHVUcm5vWnlpNkh2NWxHNGNwQWl2RmR5MytCSWVGZGd6L2pp
Vw0KbXpuYi9yUnVwYXRKUkVqZ0F4T0dtcUF4dVpJUmpoU1ZwbmE4TXVlc2hGMU1vNkh2UFMwZ1hE
bWpjeE1IDQpsYU9LM2ZUVlB6M2EzdWk2WEJ3RnV2YWNUbHdkVFNIWnROcDVYTDRDcGx2Y1FpTkxD
WVYrSHR3dHQzT3ANCm1YaytzRC9sQitnNVR3MzRVekNVQXFySG5CYk13cE42UW1xWk9lVWVOWm1F
Y0ltQ3d3eTUyMHpMNjJWbQ0KZUZPcmVoRm1wQlBkbWJvdStMQlU5c2M5QnlhT2VrTER0bEVBaDFi
ZnRub1NrL2lsZndjbFFMNE9qUHFtDQpIUDhIR1NTVmt4S3VpWHhQS1VrZ2l2WEFGcXAyNzlSeEFB
L2k0WHA0MHVOZE04c2NwNmFnaEhnYXE5eTcNCkZNQlE1ZWhiWk50RnREdU43NnE1cG80cDA1NEp5
NTdNNXhhQ2htOUZWK1ZWQitVZTJhVkk2aTYwWG9MbQ0KYWhvdDNyQWhCODNZbkwycWdwY2F0VzZL
UFVsVTJKMlBqQ1lHajZzaEg2SVRocHpPa0ZZVWVha3dDMlF4DQo0MWNUSTFwdWRMUE9rakI0d3VK
dWpHZDBVYS9zMGhRdXpDeEU4cGo5b1pWaXI5TFpxSVdkclBSWFFYL2INCmt2am5PcG9xSjM3MU90
aXUreThNYllLekd4SFgremh0YVVSNklEb04rc3hwNkFoYWRQSk45Q01HM2dKTg0KNFExS2MxQStm
QVBqN3d0OVpJdThCV0FMZ1d3czJPVjFObHVGWmRHN1Q3anBNR0NmV25ZZHdrOHNrdHU0DQpDVW1Y
cXJyaUlmTEpVMDAvbmlmL3dEcmh4VmVlR2cvbzFCSDlmMnd4TDdEZk5PNUdPRVpNVFJlRHdINWoN
CnAxNUMwVlVXcWd6OWRKTHJMNzlvNHU0VU1qWnQ2dG1raldvaFcxZUNSMEh5NXJ3MmxMbUxYNkNs
dzNiRA0KdXhWbTdaZEhUREEvOHZZZUdNWFJDdnVZWDZxRGFyd1J5UVNIS21vUWlmU3NRYlhpQlRm
RWI4K1hSWjdyDQo2THd3dVM3Ym9rOUlrS281T2lBTjh3TTFlN2orcmRzemJWcVY3TW8xNHlaQWZC
dnUrOWlVS1FSQVJDTWkNCmZERG5tZkVneUIvVVR5Q3pFTDF1emxDcGdzR3RXTUVSaVhPRXlkVlN1
djhJZmt2bGpqalBIN0JkZ1pmRw0Ka2JkYjgvT09EemR1bjdtWUYyaG04dFc5bXZBcm1PNW8rVVNO
M1J1SjVHMUJJZ2VYdDFjbklXKzd4czFuDQpYb3FBNmZIbVpTR25XSUtrR2xBR1k1MnFSR0l3d0tn
bjJxeVpCY3J0VzVURGhLNFJyL0MxaDQzcDBSaUQNCnROdVdJSVU0Z2FnMC8zcm9jdnN2LzYvTm42
MlpEL05qWEJvOWRzd1loL2wyUUxaaVFSdEhsbjJrSHcrRw0KaVZLM2tibi9McFIySlRNTTFmcHZR
ODBZR2RpZjlXRjdpaUpicWdGc1B0SE9TdXZ1VVE0YnhUb0txRjhlDQpvdlpSRFpreEZaNnNwSURT
T0NUOFl5Q1FrbEs4S2pCdGxQd2FCeEdWYVRtM3RXUktoREhEUUZRVzBHZ2sNCkcvejFOSGlMWURX
eGhWT3pySFZxbGtPV0N1YWV4OE52TmtiQVU0Z214MEt2L3piOGxEZE1pemw2RlBScg0KZThwQUFp
SDFYT256WFA0V2NUckR6ZGM4SGJ4a1JWNkYweHNrMjFUdTkrL0FKT0I4NDN3TUNRam1hcHRGDQps
ZHZqL3pXWlJjQkRyYk1CZzdNN0t5L09Cck1rYlRVcGx1Mk1udzQvRXN3azBZZWNwVll0SnB1ZGMr
RTENCi9jU0V1NXppM3VPMktsU0tqSlloWHZTYmF2cFZTZWcxNXhKU0oySDJQOGJiNm9Od0xET0Jh
K3B3ZGErbQ0KK2R3YUdiQW41T0U5UXppQnBaYkhKL0s5N1IxZllqb1k4Qk5MQS9JcGNWTHNLRmxH
QkpOYkJBcENqdEZFDQpBa01aMHF2NWZOTU9WRDNqNnpyL0RjY24xVnJrZG1HNUJ0dFlHN3hOSzZK
bGVHc3ZvaFZwaE9BM1FOWkwNClcvU0dtck5ZSGVOYjRIbkxmMzJqaWx1OVpOL3dlV25iZHZvM0or
UFF4a1k3by9vYi9rM3IwNUJ6UFZvRQ0KSGtJeG1PRzlvMkVweWQvN1krdWFuenNIZHJCMlpUMGVB
cUZnb3hhNVJoa1pZL1psaTY1b1BMdUQ2NUpJDQpVc2sxNk92QkFJK3Z3MjB3M3ppcHQrN2tsaHZ0
bmVoTWNCUU9NQklSeGpSSWJOMSttQVBRSU9tREx3bG4NCjgzTWFwZTVhMTdSZTlDZHkrd1RMT1dx
ZW9DNXFiZWVhNjF5VGYvdnJublhRLzM2TGFINkV6Nkd6TGNobA0KdXFiRmEzTE1VVW85NjJpdXRQ
UlRld3MzMklUVzdYK3hFNlo1RjRwYU1uTmJFS0RhdzVJRU9ReExCRjNoDQpTK2tpeXo3ZWNFZHVy
UDFMVExLTkN3WmJ5T2JZVUNRcy9RQnVLOFllRmhQRndmSDFIMmlmRmZ0NW1WY0QNCjhZUVFOOXQ3
emRkS1dHNGQzVWMxRU9tV1Izd25EQUwwckx4ZUs4V1Exa2ZsY2Ewai9HeTJJVVlDNVBpSw0KdTBZ
bndSeFFXS1ZacXNqQnlQaHVWaUNTZ09GaFRuU2pmaHhjc1hQZXJ3bEVHb2Z0dld0WkhVNE9XcDJH
DQpuR1V0T01tY1QwMDRJTTBVVVZwQlIxRVhOT3FhaURaR1U1WGxNRlFDblZZTmcxYktoSTF1WTRh
K2xZRzENCnExTjhkVFlBbkZmc3owU3cwNUN6UTFMNUphVHdLUGpoUHg2ZGVuaVRGelNSeXZaZCtl
alo0OHlwc29nRA0KcVh5WUxOREoxN3RPd1c1Q1ViVVFOdnhJb1NZWkFvTnl3ZXppMWZQb0xrN1pY
cGhnTWhWalVNdmZHTW91DQo5eUNFeTJ5VW1xVFg5WndUaWNpeUQ4ZzdsM1FkQ3lsWXRZUXR2VnJD
Y1pERjJQV01mUTlCamR1N0lJeUgNClQwNjljYUlFdUwyZTUzem1iQ3FkU2VtaUJybTQzRktjTk13
b1N4dXBFRzBlcmxJSTFLWlRvVzF3TmZ6NA0KUkNhd0oxbCswNytaWkZTclIzTjcvZWVxU0tSbWJW
NkNXZFVCOU5zdkRzU3o2QzhVWER4WmRGL2RodzhwDQpIeXYzRTNMTis1THV5YkFPYkRDNVE5SmpO
bW9pOWZkU2ZXdXJHYm5yRm1xbVQ2eUlQZzVjMHpOdjlvQkQNCjNxSjZob3pjMlFHZHpYV0NXVFox
YVRUVDYxSGtWaDc0QUdNN3JwSW1jd0t5U1JQOHJSMjkwRDl3QWNMNQ0KTUd5VGdsQlIzek5JWnQy
cXlyMm5pSHBrVTVxLy9LdHdUU2sya053SGNUNnJTTGlKMVUraWxJVHhyUHVyDQoxSy9SOG9qYVpK
ZGZlZFhPeWsvMzlpZEM5QWV1bWpDWUduWTJmZGlkemlXMGFkRWE4NjBQN2lsd0JnZnYNCjdORU9w
T24vallKazBjOTdlU21Gc0RSL21oMjBYQjhLTVJ3RTBEOFUxSzl4RnNvK0MwdVJHSG9UWFNhbw0K
TVNBamJhNGU0b1ZFQzRrSFByaTJ5eVNEeENCT0dnWndodUZzMXllclF0WjhZWEZvMlFHZEQyQ200
ZS9mDQpPeVNmaTZYZFBMOEFRQXFzN2lJSkJqUm51c2FZa2FWL2JXR21xTzUrS1I0bjFKaUxyNlFj
b0pZakJMYlENCktBckRLS2ZMQVpuaGxtQk5RMVNJd296SDVueWJrelFRMkF2U1pheWpzT2RDUUkx
eitCMHZQN3ZvYUVibQ0Kay9hdms3NTdxQkFTWEw3djRobkVWSGpMdUdtekpjR3JJMGV2dHJySkhW
Wk9KZC96QVc0dEdwemt0OHVpDQpwTWR5MGRuOU9yRHFKVTFKTzNyUmdvb0FPTTQwVnEvUlpSMHA3
MjV0ZVp0Z2pnbFR5SmRqN3kxYmlvcWkNCmpucHRGNWlMd1VMbjBLU3lrOW0wM0ZkZXFqT2xMUjBG
Qmt1cDdtb0FiYzU0MzlXRkd4cDF0MTZhMzF1dQ0KOCtHTnZvWjliaE9Na0ZraGdpdzVMUEMwZXpL
emM1d1pYZkZseGwyZjhRODVlWEoxTUpieG1xaHhBZkVNDQpxc1Fmem5tbzhscHFDRlF6WXFBcmRT
bkMwa2lvWnZYMnFuNDlaSUtHOFRSWVFoUE4rWXZnRUhKYTdSZjkNCi9rNkNQWUY1OEMzY1U2MGtY
MktXRkxiWXo4VUdLeVR0dEozK0t2akFpSWtzR3pBRHNPaG5pWkdlVU1QeA0KOWFYcFB3anZzM0N4
MkszUGNGN24wTzZ0VldIY3FvSnVzSWdkK0MwTFMwbE1hREVLN1NFbzZxNHcxTE1qDQpkNjQ2Qmg3
N3MvRUZVYjYyL0tycXpCKzNmblNCMDRtWDZUR0grZjBBbmsyS2xWR2owZlVoWVNoM0x5SHkNCjcx
VzFxL2ZUTWhiSE1DajFpQTNSaWF5dXBMT1RCUFN0dFZJUk1uVjMza0pTbDZSWDhWTER5TzJlbWhD
Mg0KOXZYcnlHOG1WNjkxSXgyYW93Zk1vZFBhNWRVMFZJZmowT2lMQVBGckQ2M1VqdlRSbFUrSWM2
TGsyZzcvDQpHbUY5Q3c0L0tua3NBSkRQVWFQS2NUZFBjYUhGZWRydHp6VUk0SzYxZDhJVEJtVVpL
N2tNT1pEa3hWSGsNCjExSUFpV3A2MjhjWUNJL3Uxd0FRMTRBaGlwRUh5KzIwZFBsQnR2ZFZDMGM0
QWJ5WXp1MmNIK1NnNTJ0aw0KUi95eVAvVnVQUnAvSTdSWWQra2taenlXb056QS96ZmpzZlJqSEFv
V3pTS1pDQ0h0UDlKZ0o2anBGTXdlDQpXdEN3U1dCWGExdWdoM2pCSXpkaVRtRW9LQVdDRXBWSDlN
RlhJZGFiSjVvaC9tdjhTTlkyNlhvUkJtQ0MNCmU1aUNpcmNOVi9oMUdmKy9EQ3cyallzYzhQSVVX
anFpUXRad3pMa1hYVnorY2wyT2JORWI3MGFsbWF2bg0KMDBxZEhDNm0xTkY2bnZsckoxRjJpV2sv
anRBN2t2bG1SNzZlQ3gxaHZLVkNiOE91SThuelFqYTNwZXpFDQpQeWIyV2QrVHcrL0pDN05ldWov
aUpoNFUyYUl2a0FKZDBDZ294NzdiN0tIL1hRbHIxeDgyS2ZZZW4xTnINCnR6bmVmSmU1MzVpcDZM
UExoSVd4czB2S0ZoYUlWd3hYd0phSGRhejZXWStVYlNYdFNPYXB5Sk9CcFdCTQ0KcitnZFBTRE84
bXZaYmF0UmEyaFdmbkpOSDdlUFlscGdoNUFZeGFURi9NeHNRQmtpeUNDREFPMUErNFZGDQp4Uk93
Yk4xVkZwMlMrY2N6TWRmQXhrVEdIQU4yRWVwZzBzYVY4MTNRMnc2cW83NCszZG04c2NxemFXR2kN
CjlZclRjaWNOYnhMU3I0eVgwYVJxamVTU0N4SlN4UHdYQ1ZSRVFWNkI5R0xxWTJWaHRXSWI1Tmc2
dWI4WQ0KSU1hZzlzVEh1RWIxMEkvYVcyeVpJZC9wYm1zUjZzK0NPZ21pUmRZWkF2WTlITWtkLzJM
T1pKb281RThJDQpJbXJ3TURhMTJyWms2RVliUWdtdEM2SkVFeklIRWY0NWdURTM2OGwrOHVnY3FM
c0ZBQlRZa0g5YXRPK04NCkJGNVVPb1ZaVXlmWmdRSTVIMGZzNGFUNVFVcmxWRVJVUnJBeEFSb2Q3
a1p2a2JLM0U5YzE2c0VNMlJyNg0KUEwvdGNZSG9VL1kwQkl6M3Nib1F4RU5DSzhvR1h5dVRzUE5B
cjVLRWxjcEk2cWgramdSdno0ZjFSbkxaDQpMeGQxWnU1T3pRVXFDRklSbU5hZ2JyVituTS94MVVw
ZE1hYTNjQmsxUTVvVWdDWGx6L0hLK3Vra3JzdEQNCkdyTnh1UlNWWFRZYVd3SmZsZlpGM2g3ckpt
VUpjUkZ3TTV2NmZ3TjdOZEU0OVpjcGQzN1NJMlNSZCtMSQ0KYW1xSSs0MHpycXlWem1SKzlCTDZk
bDkvS3dERmFHTk1EMXlsQTU4SzkwM1FJcWxZek5LYS9xR1cwYitQDQpJWjlweE1qbU1rV1FoRE0x
ZE8yaHFzbGdiNDhJdHoyT09mOWhzRXExcUl4TTRoYmpoMW5Fc3dna1NrMFgNClBZeEV2MmZJUUhP
OUl3eUMxeTllNGQvK09DenFlOHcxd2FBMis3V2Z3VDh4UUoxV0hCUnVNZGZJMk13WQ0KTkhiWWg4
UHdnUkxzeHN0MmlYczdwME5DZWV5a3pKYUowR0JJMjRGemt3SzBUWW9CSzZVUXFhWXFHQk53DQpW
dFFBdGpqVnNMaUF5MlNCMERqbzZaTlJjRjA4TDRPT2M4c1k0NVIrWFd4UGVWUjJmK1EvVTg4Ylda
RjQNCitVY0h1QWplK21uRVpaY0oxMWErWGVrSjJRV0dzaWFSSW9BMXJWN0gvWTcwa2Z4b1ZGcm5G
OVBMYXJLYQ0KcmV3UkFQK1JhVkNzTGRaWnlhOG9TVWo3RXhKNzZ0WEVnQms5S1o1MUQ5WnREVk9y
Vm9lSENudkpsMXZRDQo3eHQ5eno2Y213TkR3R0FMeHlkM0txdXE0S01hZU4yV3JyNGZIUHYvVnNH
eEIwRGxHbVF1UWc5N3Z5VnoNCjJzemVvS1BXWlQ0a0JXQm5tczh3d3UrLzAwZ09HTXpYak94NXBV
SUdObks5akdzUFlUbmxsRnBoY0Y2cw0KRkFIYS9qbTNSaDBGVXhvZzl1c2YwQUNpRnRlZWk5dkQx
UXJxMGRGbkFKYnJGbG5RL3RHL0N6alVHRndVDQo2TTVEZzJsTGFzdy9oM3QxMmtoUmloVGNHQk5r
bzdKOTY0RjdSVW16ZjU5U1Zha0V5ZFlvRzd3S1JtcmQNCnY0WUF1bkdiZUc1bEQvdEhzZFl0c3lZ
azFBUEZRa0h3ZjBZaWNXU1JZaFRUSEU5ZmJHcmFoOVZXNUpGQw0KOE1oV0xlS1RhVGlUSzdsQVJ3
RytKVXAxYS9QaEtQQm5yVWpnZS8vRVpDTDNvdGJ1aGN4aDhwdHFrNzVxDQpTalQrcWVHNU1CdEZK
REtRK2ZGMXlKaTgwNXc3VjNMZ1ArbUtSa1hSc1k2R2JUNmJiQlplUjlmUkdYNVANCkc0VERzZlg3
aFZhaTl6L1VucDlXclo3dkZ1WHFEUGZTa00wVlIzOEhtZGN2S1FsWXY4NnloM0NXOXJKTg0KZHlU
VVZ6a1QxRmhVeWtObHA2ZCszSmtkM1k4VVRGa2tQUjZ0eGJFZTVYcXkvMHNFMnl4aWZnY0pxZ2Nw
DQo2dlhuWHFEOUp5OGQ5dDJTQ29qcHM4N0VzaUNEb1NzUEU3aUV2ampVT1BQbDZNTTA3UFVLc0VU
Z2F5RDENCnBSd3htcnF2NWpQb1NUYVR3UVNicWU0ZUMycFNhaTBHOW80eVJNdkZDWmpPazBnWVVD
UW5IcjcxczQxZQ0KMlBFUVJ3VnM3VExBRVo5U0pNcndQTG1kNVZaWGhLNDB1QmVSN2tyUUd0NXNi
U3htazRkWUdwNHk4UTNUDQpDalFvSTVKSUIrRFdJZUhsUlFDOGoxNm5pQlM0LzdITGdMNEdZT25Y
d0l4R3ZGU2U3V0ZjZ3dEOGh5U1QNCmxrc3JEeTVlZER5VnZWNGRmTUpmODh1c0pLNjBhSzVyQk9q
alZFRUh5M1lnTHIxNlQza09FMi95RXBqLw0KSXJsbXdJRzdRSERwSkFlVHB6L0hqbFltQXJhMGF2
Uk1XZVJXYTBRSW5iQnAzTzA0RlI0THZMRFRaUmlmDQpHRHpEU2U0RDh2OVQwSjFWcW15bWl6SXVs
QVd5NE9uZC8wbE9jRjluYnVyaCtNWC9aTHVkbGl4WE9tanYNCnMzdGtXTE9DK0tuSER0UWlod1B6
YzUrVkpyaWhvUW5QQm1GcWdmTk9oVC93dDNpSG1UaEkzR0ZnQktFMg0KQmpvTmxoZ2RIL3JEWHFK
L0k1VS8wT2ZhcG1LK0dNNkpwWVZyNHhGYUdvSTBCTkxiZ2dqSjJQVm9sWjB4DQprczNEbzE3c2Jo
Tk5aZVVKcnR1OUw5SDExVzAzUUxXU01YRGhFdzV3a2haSUJ1dnlMWnNmamZZK2F1d2kNClZVN1Zy
U0RyR3BQYTllNDBLd1YzK1NqMm1kWEpUbGZ5TXpXRGdjY0lQTkV2Qk45SUlpUWdHWGNRSEhPMg0K
YTB1ZkFhQWFvR0Z4cExVd1JYdnlveExNYS9aeUttTXJFcUtMeERyME04NFI5N1FJQVRqVUU2aTZ6
Ump4DQpTSnhNZzg2dzdKcm9Ub1V1S2NqRkNFYnRJbG1mWWNWd3JrOHZ4YWxsNTRKbytZQXJJY1lv
am1IcWFVZGUNCm5vZEMzOEN0TWhQcytPWW5Ed0tRaGRzRk1wQnRCaUpURW5tNEMzcmpIOU11VzEx
S3ZQQkMwWk1ZQlFKVw0KNDdFR0U2NVZYWThZL3RwYzRQZUczVDFUaGN6RlNTcGtPZmhIM2J3d2Vv
NTAyYW9QVWZ2amt3SURaZXR5DQphY1NROWtwUXZ2SGJteHJFTFVscjZPMHNmalRIMHVDbFJpMWVl
ZmNKeDhWbmxlREd3cVBSNis4RlhFdzYNCjU1TXZvT21FVTVmQUhkKzJqZEhWMHo1L3ZaR1MraThX
MGVkd3BjSjJMTnNUbk8raktLbFBrNENXcVU3Rg0KREtlMU16ZGRjc0pvZ3UyWmE2dTZGTXFPYzFR
NlZhb0J5MWdZdm5DN1FOZjgvYUU0Q0FRMGRSWG9xSTd2DQpmbHp0WG1VOWswcnNzOUFRZVJrVE0v
cTMwN1hydjZSOWtWeTNXMldGQjB0SjF5RHNUcktYcUZqYWNoYjkNCjdUWHBpWkFKNUpIaE1PTk5t
UlhKUnFwdkxMREYxMW5Sc1dnUU5saXJmL2xNYWozcFVqVmJ1VnpwZ3loZg0KR0ErQkR0MHQ0ZDVv
TVZhSStOQ0RaT09DTm1KcjlTUWMrMFRoVlg3Z1AzbC9tYlBvS29zYmtQQlp6WEgxDQpLVWRLYi9y
c0VUdHdMQzZKK2RtNjM5TzNzR0pWUk8zZldVZlRCQzIyb1plRzlQR0VOVkVud1dZaHE1RWUNCmR2
WDdxUmNhYVRYdnl6L2xUbzRsTFNNZWVZL21ucUJZY2JPd1IwRGhQNnkxOEpaZDBubmM0aGEvU2V5
cg0KUVZ6WGZVZXVRTDRSOWprdUMwMTRpdkNxSmtTQ0V3aTBobEQxYnpTTnpjVzNXQldTNzZ0TDdF
TWhzTURNDQoxY0laWGR5Z1pXMEtTOXRxb0czRmIrRFhzZmZWOWFWbGxvL2VXM2haZEFTMkQzVFhD
WXNZK3JWTzl3bU8NClBzR2Z4b2lSa0hVQUwyNXJnNEdseTZLV1NJaUZKTG1wdW9kNjBjZ21kcHJP
QXV6bDJSdGV1Z1hLVGI5Lw0KZHB5RzYvWkFpMlV5dE1NV1FVRE5rRWJxY2t5Ujg4ZURYOFRhTlZn
ajZaNE1VMjZXZWRvaVV2VjBqdTMzDQpONlQzQ0tMbkVBRjNMQnBYQ1NwbTlrRWk2TU8yWUp3SEds
Uk9iUmRkYVB1T09iamRZSVgxNzI5bk9BRHQNCkh5b29YYzAxcjdSK2JxSStySGk5aHJuc0NoVnhr
YVdyc0V5Y3hDWS9xVm1BWFlhMmFJV25FZTM4L3ZlaQ0KR1F2ZXFRSmlJODlVR3k1ZVlkdmk5MVdx
V3BOKzlPVkZLRGVRVmdWRHpSRGltRDVHNkUvWG12SnZMbklrDQpST09GS2ZlaGtYQTc5b0s1TWRZ
bVcySkRNZXB2dHUvd3VsUExZVzRuaVdCRlV3RG9KRXpYbUFCeHkzZ04NCnVac1NvQjRGelBJalpa
eEFkVng0bWRZU29lYmhyZ1Y3ZEt6NnpBbEJuazUvQ0E2R0FPUHhpK1pUWG04Yg0KcjNxNWI0SUVB
YkZITjJ6TUpGaVFZbVBtTXl1aXVzQ1hwRDc5Ymh6OHhXaXcvWXNPU3ZzaGw2eGVFcURYDQpwRnR0
SHdyWW8rVHlWUE5YbGZCZi9JSW1zZThlTGRPN3o5RnhxZC94UEhLNnRsQnBXVFBGYm5ZZVVwT2wN
Ck9oVG9iQXEzQVN5UmJ1VVFZZXQvZnU1ZzVZN3o4NTE2a3dEQkNRMFgrTHc2WktMUVdlZU05WG1I
cHFxKw0KVDFIME5TODZRTlNUdEFHTGo2ZUMrRDZ6TVNIN3N3L2ZjRHZXTUNtZFFwNWcyNFhWQjBa
T2J5WkRVTnQ5DQpOQ2lwN2EwR0ZGVm1sUWpzTzkzZDhwMVZMbUd0TWNrU0ZoTS9UUFVOMU5RbFpE
WHFLRmROVlJGU0M3RWUNCnpJMEV5QjlEOERvMzRERTRkbFE4cDcweUw5d2Z2bExhQ3QrR2ZNUlVp
bmNoc1QzV09IcGtpVklmcEx1bw0KeVZ5RkJKaWNrbWFLS2lrS2hNblByTTlIRVhySGxwWmxhdFJP
TXZROVJZNjhQSmNDbEFzUE5hMkdyZk1kDQpDVFI4MkIyRThUeWRMSGs5akF4RkFUbkVVZllLRnZv
U3dlYWMzUWpLcXZidDZ2aGJiMGxrSjB2TjUxeTINCnRwRnlLang3cHhBMnNTYm5pcGFpaFMyWVRl
dGZQYW85QkVVVmtXQ1prYVhRc0NSaGZ6OFZLK0gxVjdCNw0KdndLVDdFR2tVdjh0OGpEcllpbDNN
RHFqb2JjdUFla0hKUTR5N0NnTDBsYXVVbkxnNnFCditnSnRkc2dmDQp6WmVzR2NoSmlnQkdhQnFP
bGsrOU91OE1Gc29yZkFja2tPcTUxeS9pWUpGM3VDMXhEYjl5RFNJZTRkbW0NCkZibHNtbnlacC9v
a2tBYzBxRFQwVE01MUdVMHM1OWVjMUlncHh4dXFVaWZEZVc4NG5kME84YyswS0x3WQ0KREZQb2Vx
ajZnWUNTQ0Z5ZmkxVHFjM0pJVUtpUm4vbnBuMnFRMmI0TG1jK3ZzSDlOb2d4a0g3RmZnOTVZDQpV
MEpJQmFuY2Vxem9SSWhTMzlqbXlKT0ZLVVRkbVJtcGFNTmFnU3FITldoWW9xNE1uVXRmdkFiRFlq
bmQNClhSYy83bVgvTFpEeGJ1SlhKWHF5YWxFVzhmNklmT01DSUpzT3dKRjZ6WkU3cEZxK2VPT05k
bXBYUDgzYw0KSzZ6VmJJcjdrVXV2WWxJTFQ0OXlhcW9vM1Z1K3RwUU5rTkNFYUJuSUhMMlBodTI3
dXFKNWh2ZVg3c0xvDQpQRVFnamIveUg2bHRqZ1hHemEwdy9nR3c5OTlXUDN1TDJ2bmw0RXBwKy9C
dFlVM3hPOVZQdllNUzl6QkMNCjN3OUJWbUpnN1R2Y1hNTTBudEdxeW9oTUlSdU9XaVpBNVJhbjVN
bVd6L1hpWkxTY2xvU3JDRWxRQzdwdQ0KYTgyMmloVE1kVW1GVDc0WU1nTHlZTnk4MXJPVFJxaFNj
S2p6S1hGWHp1QndKNzFiQ2F2YjFYZWx2UW9EDQpiWXB1d1FWWlhBZ0ZsRGxJVmk5MWc3bWNKTGhx
NXl1a1pEQXBqRTdkT3hnd2dSSFVPbS8vc3RSY0VzYjINCmtUS2t0YWU5djg2akJUbk5RMHNsYUpY
NTRSTi9hYXFwTDA3ekVHNndmUkpOY1NmUktnL1VUZkkzOFR3OA0KbTRDSjU1a2hpRHc2OWFkRlZk
MWRTL3V6UXZQYm1iTHlOa3hSem9wZ3JZR3ByY1VYUzdWZllHUmdNcm80DQpJS0o5Q21md3p5YkRE
Wm5DWTRkVXhZV2pEcHcxZHF6bVBDVEY3S2J1QzFwVDlvaGF2R0xKaW54NkFRaGMNCm5aekgreXYz
anVaaTZWY3hwa1lidUlLVElPRTBFZ3ZSZmRLK2RyK1FSZGtnUG1iMHlvSzlXUXB5dm1XZQ0KVFJk
SUE3S1psdW80d05yTVVOem0vVWIwbndvSWM0UjBQM3BpTVR1cVlsa0xRUDNZVWhCWE1DRCtxVGJK
DQpLcmkvY2tTY29XTDFjQVl0dU1GWCtYWURsQmRxVEdGSkQyNEdtamgyaGx2U3JTUXo3R2FjUS9T
VVBSbTkNCkxjbmVEbWhKRTVhM1lGUXE1bzNVQ1ltWURvSm9NR2FENkVIbVFrMldzaGN6ZkRBTWVU
MUp0d1RCTVo0bQ0KaVA2WkpnY3N1Uld5OFVwS1o3N3hpeXdxM1M5T3NDSkttMEdnK01odmVVSFI1
S21oclphVk9YNlhhckY5DQorVFdRdjJtQVpiaDV0WWxwdU5sS2FxRXRXNEsrNUZSZzJoaEZqQ1U3
ZjdSRW1FU1cray9yd1h3cCtVQkENCm1VRGFCWU5oN2FjbnpIMnAwLzFvTWE2ZXRmSnJpVlkvYk4x
NDZYM0t1b3FMV0lGdTl3dFVwamI5VzlmUA0Kb285NjAwYVRvSWlOOVl1WURDRnlPVDlzZmNVUDN0
V2lDVTNHMHFFc25OWUFLY2VpeWUrZHhYcEs1Z0UwDQozZ1NoTG9VTUFnTFJpYiszL1JXZ3dncEh3
SFlUOGJ2Yi9tNC9QVlBwejZIa0EyNTF0c2E0ak5JSlhFc0INCjZuMHlTNlNBL0JnQnpJQVFsMGsx
MDFab00xYWVHS0VxU1VTa2VPWlNGdFp3YzRxQzhqUC9DbVZLVmFTdA0KbGV2NHVmREhPZlBDcTVC
V0NEUTNpVDBoY3dhdWR3MDFFTFBiM0pIeFkxZVc1NStBaVlCc2h5SXZLNTEzDQpJdy9MUUkrRktK
dlBJNnRUZXR1Z212YUJmeUFhWlp4cVpROENtTy94aEhxRVZ2ZTRueTNnTGRucGI2MUQNCm9qTFhW
R2E2ZnhicWc2dmk2Rjd3SkxCenRyN1BubCtLdk52ei96UzBKU2FhbVV0UFFMMitCUHQ5Q01mTg0K
Mmgzb2cvTnVEMy94ZUpkTVR0M0hhN2NrMVhmTUdRQ1N4Uk80SUp3dEtzK3dKWlFsQVlkeTRxejJu
RU8yDQpuZldGVVkreXZyT2J6UU1VelNtUlVEejBpajdVL0NpTXRXK0Vlbit1dVBnYnFtQ3I4SUFm
cTYvYmF6bWkNCmlkUmhSSXhQbXZucGJ2a3AzaDV3Vm44THdmdWRuejAzZVorNUQ2S2p6cEF1em53
SzdqR1dZdGY0RTRCUw0KZHdHMmVqa0daQWdJcDZCcjRROGR4MG01dkFnMVd6aUhETHdZQW9DTXB1
Wm5YS2VoVjVHVElTNDM4YWtmDQowekFhRFloZHFHaW9vcFdGQXBHYnhJU1FqM0p2djRQcTJHdmJ4
UFRsdTJoNTNKSHpyRFJpM3l0RThXc3kNCm5nODFjK2pmeDlxZ0FQaGUxa1Y0b2JKYjNTZnhhWTJ3
aXVHYWVzcWZROG9aVC91dU5abFdxRysyWFErQQ0KWm01UUs4aVF2K0N0ejRkUHBVZ2MySzVpemd0
cE5xVTI3c0x4U2R0Uy9ycnRycVF1N0xiMkptcjJaQmVzDQpaOGl3SzdqTXJaVk41aFBsc1UwMDRl
bmlhYzFnVVpxUDhlTGwrN1J2M0FPRFE5RGNjeERnMVg4WGRiZ3gNCmxhWEZLR1BDRno5RnZrREQv
R3VsV2Z1Q0JBeXNXZlBGZ21kSFRid3JXWnNTdSsyUGs1TW50UTlvdEFmeg0KWnpRM1RBUnpGSlVP
QXJYamV1WWIxdC9zYitNa2lTZGJrOWpwaUU2REV3YUpkcndhOXo3S0xjTVFGM05IDQpsOE1iaHNP
RTl3V3kxUldxYUpmSEw0cFZqZmMrMnpWSjVnTlRxMThVMFZnbEVmS2JMRlZvVmZyRnFaZW0NCmk5
T0JjWlU2QVp3ekc1WVNpbGkvV2pYYkNuQ0Flc1Rac0lSb2ZlZVFaSjRWVE0rblludGN3TTRNOWty
Lw0KL0lQczMyYjBsM25DakNKSmdkUlhLVThPVVBHNW8vN3pOQndWdFY5c3c4b0NmMWJVTFRWTTlv
MHAvYllmDQpXY1dmN3dFa29pRnVuWkpEYXpYNEdGbXhFdzlOdUFKbGZNbUlxT05EaEdLZ2RXbEkz
V3JaMWZsb1M2em8NCmtjQ29hNys5OHN4N1NYZ1BNZ1ZzNUpScFBZRzRFQnB2Qjk4QzBHSCs4cVg5
NkEzWnd2NHk1TlZxWS9Hcw0KaTNQQll1OEkzdm9XNnFXMWRzb3pQVEV2M2xnWnZlOTdRQ28vYnFB
YWhhQ0tLOEpzSGtsajc3YnQ4d2ZiDQpsVTF5WU5vdWlmRS9mdG5mT1dtUmhFVVV2MzhrUndteXd5
NmxKb1JPbmF0UllUNlRiUkk0aWlOTGxpdEkNClQwQWxDb0wvWWJUV0UvS2h3RllwYmNpZUhWTHF5
eEx6Rlh1djQ0ZXpPQ05oWTJmbG9SSnRGRmdlajlMcA0KcUJjcGNyYktZb2ZnbkdzT1FSY2tmOTJ3
SjVqZkV4NWxpQWcybUxmZjVyN3l0aGZsS2NrR1QxTDAweU1jDQpjM3JzRTIrK2lvcFZrN2s4Mit2
SlUwRm04RzJXWVJYOGFuVHNtcnYzdjhsYlJ3TVhFaW5TQ2FNdEkvVzcNCm10ZE93L1J0Q2lIdXNH
TkRRWW11b2Uvemt3MUxoVHlOSXU2ZlBNVVRDSWRMRVBKc2NSQlRldHBVOEMxRQ0Ka3pIL3hwenh5
b3Y4MDRHRkJORjFET05qOXhQSzdCaUYvNm1yTFpmVjhzR3VkOGkyU1JzUHFkcDJraWM1DQpoR3dO
OWt0MWIzZFM4WVNJemNtNVhCSjRNSEM1Q2cwTmhBNWgyWFV6QTlOTEN0Mkk2SVZMckdXbkdqMUYN
ClBDRHVKSHlHd09tb1ZQVXlsa0Mydm9UVjFraXozYXRGelRyZUUzTUxXbDhnQS8wZUJKbXZjN1lC
WDNGcw0KbGpnQm01cE5PK3Y2c25Fb2dEYWVOS0xkaTdlbVNsSitpSG1rakIzdUhyTThadmEvUDFs
WVhlMXdIbmxpDQpSOHJuVjEwSVN6N3lTVDh6K1VoblNiNEdqT3ZGTUd5MUppU2dYQ2hhYnAwY0ph
Qkg4SktGVk9uTGkxWkoNCmVqdTJHVytTMUJmaHJoc3JqMzZuQ1JTbVlscUFBU0pRRWtFYlBZRVB6
d3dlUUlDSHdPMXNyV24xYStZdw0KQk5xZ1kwRG1xTnoxUU91WjdBemZ4OERhUDJwakRYV3pMOWc3
bS96OHFCOHFrN1IyRlI0dksweTBQZGJzDQpQTFJjNmFGdU13U3pJaGhQRlJSZkdFT3d1Smhnd0Nz
WUptSllGYm9HYWJjbytCM3RkR1ZpMnVQVC9YTHoNCjIrRGRDSjh0NThETXJIc0haTjY1TVJIRzEv
Zjk3ZEJHUDBnVXpGSmdLTDIvR2hKbEQ0WEtzY1hGVmZjTw0KbDNzQzV1dHFabDdiL2VyVkwzV2tG
MTVmUnp3T3VhbXJsdHo3NlNnTE1JZExVZEZLV0tIcElOUm1tSUtjDQo4Z1ZNY3M2WGdVVmtxN2o1
TnlXUDZrakFlUEFHU0V4d3VvcldXWjFCSHJPY2Q1elJ5cXBkZEpsa2dYcHQNClN5NlNZQzlnZFM3
cVFqL2hNUWM4MHR6d3QxWGcrQjlPb25ROGZ4VXBOM3E2b0JHZHpLbGo0blRGRk15dw0KTGFZR3Zr
VTN5YVNJOVkyLzJQRURtMzNEY2xWWUVyNVhueElMQnRrOG5ZUTZPbkExN3NTNjJIOXFtYTNrDQoy
aEJKU1FGc0pBa0VhS3BYbnpqMUdIQ1JIMkxWM3pTV1FvbzJDbWRNZ1A4QWVIazdCNWNGZVI4Vk5D
VkwNCnhiZUhaMml5ak0vM09GSUVBanN4N1ljQXpEK2Q4TXIvakwvd0twUXlWR0hDOTdkNEJWUisr
RDhoT2kzVA0KMGFJQU1Rd25BTERHS1cyM0JDNjdhNlQxak9CaUE5TVBDenFzNXRRTEIvMnpHeUhR
eXc3cGNDdWozVzhiDQo5NkdPS2hQQVJmT09VYVc1aEZuQ1hwa1NqcTNSMlA2cEFLdEpkaDhINzFP
M2NxRXJxaG0zdXFpUVl0RUoNCkRTYjA1VnN6Z0dVUlJFSGhncnZQU0xJbDBhNVpsUmNseTRUTGVI
ZGdBL0xyZTFFNlZpN2dDVHA0c1Bjaw0KQ2t2eHFucTB0YUZDWVRhSUNZVEJvcmFuckZ4cGltQWw4
TU90dWJhYWloYjdpQUVBeHBMd3FWTi9DOG45DQpCeGN2RWk3NzZkb25qVDAreC9XWU1rdHpDZXAx
UGhzanZiTXZPcWs3K2tHc3RLRnQzaG15ZkEvbWVROVYNCmhIdFV5bTJjNndXQU92YjduZHhTUkth
V0RBRzgySTBVQ2FxbTRwQjJ5Sk4zTnNJV2o3QzlvNXdybXY3bQ0KcURLVEIvbXVRTS9wMkRwWThk
Rm5vSHhKbS9sSzNaT1RocTcrU1M0YWlTOWF0R2dHWlFRVG5LaDRqamQvDQpocEJ1LzVRb3l5M1JC
ckF4NDdBdzlaZmZ4UUw2NkxDb1M0NWdxSVl1KzdtNkVVcHF3MXpRaCtiL2dLZmINCnkyZ3EwLzF0
ZFU4dnJZRElLSzBsa2MzSGdVZE40Zzk5SytqU2F6U3U0Wk4zYXVUYlpHT250dlFDTWhkMA0KQi96
L0NyVE85NDBZalNjSEhudHQ1NEErcTZDMUN6Vkc5U2c4eFNudkFVV1g2cUJWUW5LWkd4cmMvbWdt
DQpCNUd5aUNyaFZHRU02bVRZcjhtbjYrWG5jQm5pZXVmTFBudGN3SWZjWTZ5K00xbUZUMStaS3Q0
WXZaRG8NCmlkZ0RiZkhXYnVSMEVwNUVCRVlpcFl0Z2N3VU45VEZkM3RyeEZ4dXFxNCtYY0JmaGxK
b3VUUWFjVk9iYQ0KT2JtME5aMUhadHcydWFaYzluSmtobXdwNUE2THJyRTcrZDhlR2ZkZDAxWWJw
WTZHRitKZm40TWliTjduDQpPak5WLzkzWE1WRmdSYkNCbXBFRVdxRXBBbXpzY0IrbXhrNmkwVGkz
VkltS2srdGN6UDVucitqOGVxVjUNCkhPd21CY25UYnVNQkRtYkdKcXVJNmIyblBwclhtTm9pWnJr
bjJTNkFOc2F0Y0NnTzBjVm13dU1MSU1rUg0KeWh6Z21IS0JmWlhBOE93M25WZ3BqSUlDcVhndXFY
RmpMb3VkNVRob1ozMkdmUHovaFRXeEFueUpsRFl2DQpRQVNGSE55U2lJbTVlVjRRbkhnV1pOcHNp
Mno4S0ZENW5SaDY0SHMvQlA2cTNzZHV3ZTlMTDRCOVZETCsNCjBmcGdWKzM2dTB4UkVvNEQ3ampE
QXphc2tsQ3B2d2NFRjUrMVpqMFFIQjBNVkMzV2c4WCtUYWpybGNQTQ0KdU13NFRMbTFFVm92OTd2
eXVYQml3YkF4WEtmWG9PSm5VRWE4UXNFNytBOXo1OGVOd0pvK21zQXRwS2RODQpSM3JpREFEZlhQ
TnN2bEZoaDJSKzZzWkhGQTdQanR4b2h1VTBHQUtCOEYwR3E1K3FxZ0xPTHNkYXhSQTYNCmFSWGhR
YjFxVGVnZDBiL1p2ZVJLWlhQbDJzak5tRXlNQmdTNmFJTmprTTNpZ3hKYytYSmV4Q2tWWVFaaQ0K
a2xsTlBFeDBmNUV4VGUzalpMY2k4US94M0ZaY1FxOFp2ZHNlOUVMN2g2VTFpSkloME9tdVp1cVZw
RjJrDQpUK0RlLzV0UElCTUFlQlU0Qk5uUEZBUlRDMWhCT2oxWmNQb0NOcHdQa0xoUU5lRG1qNU1n
bFhkbHdhYW0NCmI4T05GRGg0SWpJYnhPU0JFVWprbXpUczhTSTRRcTA4VEhkakZPR0ptSzNTSElF
UGo5Uk1TdlB6cWphUQ0KSG42ekp0T3h5aXV6TSsxMGttR1o2NDdNRTBkaFpjM3RNZEZFUVFpb0R2
Z1FROCtrY3d2ZzQ2UHZUTFRNDQpjTTh6cXMrWVdSSWhvaGdMYW9EMGVTbXU3ZXViZDBUZE14ZWNs
SGgvdU1jOFE4SGFCVjdYVDNnNTBubHENCjNJSlMxUDFoNlFPZm56bENtWnVyZXJnQXFWcnN5RzBo
MFR2VnNkUWl6S3ltcDFiNHN4aU1lVnhKOXY3bA0KVEpGTlh4MUhhYTE2N001UWFXSm90ellpUkdZ
TFlaMFhLdlpUUFJSeU5PdUo4eStGNitPM21jVzh2RlBEDQpzZDY2dkk3V0xlQUxJdE9pSERrSXVx
WWRHeFBObFVLanI2STV3NklwZThVTUE2VTc0TE03TkUzUmY0WXUNCnBzSFV2V3JzcEZOdkpaVjA5
cVZWVkw5Mkl2bCtES1pIYVByWTBuMERpa2srL25FZkxwanlicHVlUzhMSQ0KTjNZYW1FV0pkQWJU
QW1JWHZPNGxxc1VNaGhLMlR6bTlzRGF0ZGFSQzRvNDlpanJpNFFZQ1UxYVIzaTZ3DQplQjZUd0Rq
NURURVo4RGxXakZodllKNlF3QkNqZE5Jay9NUXZjTXd3TERXWHN2dzIvMDhRNW1XWSt0NmUNCnNp
MHhuZXlBdXlqZDNwMGh2aVV2MmJMWlJRVXd6VXhta3VoUldXZCt5TUl2dHlwbjE3VFRDbkJlc3oy
MQ0KZWNTMm91WW5aMXRIMm9nUUgyOTg2MVFObjRIQmxFNlVNNWtLc1lDbmtpRTV5MkYyZE9HekJi
Z2NlOHhYDQpub0VLditlSkx2K1VoZVVoUlM0TlAyaUdzcW9vS3hobzJGSGZYemF6S0hnUDVnYXJo
UEJmVndXLzNwM1kNCllRbkwvUUtuejkwTk5vekgwYzkxVlkyOWd0ejJFK21iR2pwTmdIVGlsTEtq
V3ExdHEvQmFxTmRhRitzUA0KU1V5KzhxRXR6TTBzdHBkUU9qUXJBazg5cXpjcEliTGNWMHZYdHlj
R3NGUkhDOEZ4NVJ1dlVtbktGL0h6DQp6MGQ0a3lHVHZrUTh4MEZTYjQxMTVVeUhPNmpucWRnWW16
amZNZ0Q1Tmh5dm43QnZBZGNhdUFFdXQrdXUNCmRHQUZaMVc2TFRubFpIeGhWcHlDWlZhQms1SmRx
UTVvTExRd2ZiT1FnbGpwU2M1TFVMYTE2aDE4VEFDYg0KWmNadHFwYXBMemttZFo3SGoxb3ZWaVd6
dzN6QkJQcThDd0V1YWtIRlgrWXE2Si9Tb2dETk1ERWNUM0NLDQo2ZHNmZkpaV3AvY0dzZEZBVUdv
UmI4THVqZnJsVGFiWEFybjRQcjUzSzdXbDZ0MEhwUWIzZGU4Y0c4RnoNCnRQV1g0bW5jRnJFMWl0
L1FmcUkzYUhqK2g0SnEzYzRYbWwvUnRMYVhzS3NWU3gzUG5UTDFhU3B4SDU4Zg0Kb1RhMkxsK0t0
QkNiSndCRmpNSUp5Qkw3MGJDMmV6RkZCb0N0NE5LMXpialphYVpqYmg2SFBxZzhLRUx6DQpveW9Y
Y0JVSnhseGhSZmswSHFISE53eDNVQkFUbFc0RTFnd2xyb1RrNEs1V0pDeDh1UkZKaXRuN1FJVjcN
CnpyZGdvVS9KaERYdnd1RElMa0JHOHBxM3FtcDRIQ3MxUkd5UDEvSlpZL3I4azR4d0VETG5qTVEr
azZobg0KZ0psRDNEcEtRamNZQytkTWlSK2wvSjlTbFA1K1BNRDBvbUQ1QWx6V015RWpheEdyM1Zn
Zzc2M3lJSTdVDQpSMWFnK0dYMTZPZk80Q004YllwL0xhYkJvYjNoV2x5M0gvSDltYkt1VTVPN2d2
am5zVitMMHBWdTkxQzINCkNKVUsyYmRCRkNqeWhKWkVzczArakhCTG5MYzN6Y3RjM2dJc05WSEtj
cmpGUnh1L0hxRU1UMjdGc0gyVw0KdFdhcU54Mk1uVDRqeWRkYThNZ1Z6OUpUNFcvMmtJN1A5d1RI
Y0d5NjNYZHpCVG5mN0FPUFNFeGI5eG4vDQplRjZhdFJ0RGR6NXErNjdGNGRobUxIcU9BdWhPQ0Yr
ajlFVXNzanlwbzZpTVJFWW1XL2NwYjNVdkphZzcNClRKQllJL3lqTFI3cDlVcVdWa0pXQ0RoREV1
ZWw1QWE4NTdOekdNTVRuaEQ3NnpvU1FWWVZodnM4RDJxeg0KS0hPYmpERjgyTXkxV2prTzJzL3Zl
Nkd3YXZ4SEpEYkt4ekpsY2IyWllpUXQ0SjIraDdLamQ3NHpyaHV4DQo0UVI1dmIrN0YvbHFsY3N0
a3V5YlNEQmFhVTMwd1hjeitEamd3cC81RFlOeThrVGJTREdLaXRxRmliRmcNCkZRYVZySHhNMDUx
dnlZRm8yQ1BKU1dYR1FvZGlQT2c2eUpJSDZ6SjAyTHRWN2ZUZWM4YjBRZE5QakU4Mg0KRWZuTm1z
UHZxT2RqcW42YzBPWlBtcmRsaWsvSEp5Z3VrYUJPajEyc0luNjNLWEZXb1lnc0M5NGx3MkN3DQp5
YjdEQmxLNFg0Y3g0SmRxUTFSQUhGSUg0TDdUWkhRRFZWUDRuWkNNckRQb2RXRGNHN0F5Rzg4bVFZ
WXENClRIck1oRGcyOGtSWjJOd0FWbzRtZ0dnQVRzSkJTVGJYZG1DTXBxc3B3NFNDWnJpaWdPaVpB
YUFzVTkwQQ0KczBWWk9OKzVXeTIyMmkyc1pFY1RXanF3NHVJWlZNSGVCZXE3Q1RlK1V4ZVBUWjFw
bjJ6UFh2c3ZCREhPDQp0Z2QrbVFwTmVLL2dXWUVVOWNYVmViU1dKSXNqOEREQ0Yzc1JlMzFtRURR
WjFmcXhvUU9ScFJ4ejhacFANClJnWGl1c1Z6T3I0WmJQV2R4MlVqK0p1cXYrZmlqbitEUWk0R1VB
VmYwSS83SEZHMXBSOThRTjVYVnlJbA0KMVhFQ0NvNHE5dWh6RGh0VVhpNFBFU215b0ZWaXhLL0Vj
SlYwZGMyTEVEMFNRVFVRaFk0a2lvWXBZRENlDQpHc2tvOTFvMnppRnEramFMWEhCRWl0bWFhU05L
ZE9iT1VTajJheWsrTVExY0dwU0pyQ3pYSHZUMVFmd2QNCm1PR2xXTFlWZ2NNbSsyZGhhYUpPc3Rt
SUZFWTBVYXpXbFIrUy8vUDNoaTFUYlB2dnFCbGdaSitRUkhNRg0KWDhjNVlrbVdRNkxiUndFbXNx
SWE0cG5vVjY4YWNqWEE4N3J6Ujk5T25uYzcyVmJBV2FLcDJoS1JZN245DQpraHFOQ0lJcEwyNUZJ
VityMzNzeUlHdHpXZm16VWdhZGtWUWt0dTVzVUE2dXlmZ0IyN3hWMzg0ZlNtajMNCkZGQlRydU9E
NG56WFBhem0yV3I1U0RmTk0xaDh0cE5XWGx1Y3BOd1poN1FYZytOWkJqQVV6TFRjUGxEaQ0KQXBT
ME5PTGVkVE9pZmlib1Voc3lma2QvV2ZiZFZkV1lzZW03bitsT1ZjbXdrV1cyZFdsWTVnb3F0SXk0
DQpEL2QyNEo1cXRuMkYzbHJaaWVKaS9RQ3FEaE5rbHMvWi9sYkEwOUJyem5abHVsNHlaa1M1Qklu
TkF4RmoNCkduTEFnRHRJRjFqejNBeWpmVHZ1TVNJenZaVjdRWnlYT1huQlU5U01MS0NFQWlFTHUv
TWNmRW5JZXpwZw0Kdm9sRnQ3Qm9VODBzRFVicENTNzFyTlhQMEVMSExyV0lVV1Y4K3k2TEpkb21r
QzRIWVA4YlNma004c1YrDQpqWUxKZENTdWVma0hHb2RtM3J2Q3ErTW9vc0x4KzFhdEUyWEJPV2pD
M1UrWTNobHpyQWV6QjVta215SXANCnhTSlpLTDR4R0c3Q2d1T2puTzdpTFB6UlRnK2dhZS9kaGRQ
dHZnckFBMlNGNC9aMFQzQjNZWTN6UTdTQg0KVkpINXFyZ0VPNnh5MWFwRC9qandZQjdMd2NjTi85
ZTJpQjhBOE95YlNqTmQweENBT255SDBvbm1nVkdDDQpIU1UzOWgvL1hrWGV5THVxYVJ6VTFBYU8w
eU1hRXkvSk5rUFB2cHNKMnFPK3VsdnpaVWlzOXFwSGFWLy8NCmlXRDU3bE0rVHdwZE5SS0p0K3Br
NkgvNFlLcTRTSmMwQjNTRHN1dG1BV0NwanZQcWpWK2pWbXhHV0FzSA0KdkpYdnFHTUdiL0wybFBz
YzZuMjFLcFVRNEFNSWpLY0NvZUM0MDN2bzZheUwyMDhpMjJtbkdZQmNheDdoDQpycTRZTTNLekpx
VHhEeEU2akRuN25jUm9Ta1h1dWprc2swWXRqOEVDMjJnbjg2ZFdCMVQ3ZkhFa2UzTHoNCjJBMm1T
QXRRcG83bFQ3SUtPSmpVMjBZWU5idVBNZHlZVnljQ0hIZHBXMDl4U0R0eFN1UTFUSmplQUx5Zw0K
VHlpb2ZyU0JNSHdIekhrUHpjRlNYalgycjNwMUk1VTJPeGtsOEVNNG9JNkZXZWljQ0NUdGNMZllJ
NjhUDQovMnpobjJvMkx4bFNnK1M5NHhzVXltU29BQndWMTRUbDRxc1RIR0k2TXpqcE44S0N2YnJB
aUtDZ0ZDY0cNCkdPd201YU9zSUhFRmZWR2RudENPcG01Vmp1NUZubnhDT0tGSVhjWDFNKzZPVzRX
c1FIdWJxUDNZWjIvMQ0KQzFjWlp4UmttUkJHd1p3WlJIZlc5OXNFeHB6aHhnYmtDMXhTQU1SOWt5
SG1lbFlGb1hVUXpWcjZNdHJGDQpMa0V1OXpxS0VnU2g3Q3NoQnlwOWxoSG9zcHFjNkRPMUN0eW9E
NlhxQXY4Q09Ob3NOMnhqcUprUERITUENCjNXV3lGZGM3S2FaSGlsVmV3cWdGWUozdXQwMVRTRTN0
TUp0Yy9uZ2cvUS9wc3pTam5SZjNjN3hycXVFMw0KS2VnRzl6OGRWQ1hmVVFEWHRvMVo4SHF4T0Fr
TzRIWnBxbkFrWHBxRk5QTlZMdDBtRkRZMEJWNlZRTGYvDQpMbERVa1R4czRnbjNpd2R2bEQzdmRN
c1NCWnFnMXhKTmIwVS94K014N2I1VTViTTV5OXY3a0RweWpqazENCjN2WUtUWGl3QmhNRXRjN0VB
TnVpUDVjU1hDWDBKbUFMRHNLdHJ4WFNSSnlud2JNMDQ2eVhXdUVWM3M5Ug0KZ1JXa1A1aS9JUkts
MTRTOHFCTkE2bHJVQWh4WnN2TEI1MFc0bmMzZEs5M3RHcHZ1Ykd3WllxSUZCSUNzDQo0bEJYVDZ1
MDlRb1E0YlpQNmpoZnhyL3FncmhEN3ZQMGRhNk1YVVFrVlNNQkhwVmducldtdDZyTENFVFoNCjJu
a0dXaGtpYjdNbGNUb3NhaDJWeWRmeFU4RnVlcS83SE01Q3VVUlJoV3pJQWhvSElpdGJBMGY4Q1Va
QQ0KcUZWYnVJcFBpTXh6UXB5WldJOXpvbXFCVytzTU9UZDN3T3B2QmtvQzRSMVhEMjlhaFF6cjJV
eHlYTzRZDQorWHhFUlJlN3dERmpJWkxYbXJYeUdJZS9wK0k5UVdDMlYramdlY3dGbXExNmlDWklT
VktwUDFQbFRJUXcNCnVDWE9BTTdwUGw0OHl0V2JpTU1hbDkwZjFDeHBHZzFxY0ZBRmw1MXJkZGtE
QXF2dXZINmtGb2NQWEQ0Ug0KOHFGTWhKb2VUdE9pTXZRWTIrVmhOa0VESWF4cm5venQ0eDByOXhS
N3lBZFlmSytFL2FvTlEyd0RoY1liDQoyVnd4YlBqMEZPM2o4c2lIUFA4bkRLYnlsZXhQUXFZUDlu
ZW9ycmVxcWwzV29qV05TYzRxRVFKMCtZR3INCnFrRE0xb2RzTWpPWENWdjVvRndBOGNOeG5YQjM4
MzkrZlRGdEhjQ0VmZXRadGJteWNkU28xVk9LeXZIVg0KM0ttWWljdGRPSzZ4ODNTK0FvWmtCWjZE
NWwrdDJrTlB0MkJCNCtxOUhwZjBoNXdnaGxoMm5ET2ZyeDkrDQoxb1hySklwc0RwQ2lBOFFha3Qv
SlNDOVBxdnpKY0VhV2RyMmVBRzhUeHpzNTErTUtXZWwyQmRlT3VqOTANCldYUTdFNHNERVZNdWRK
UWIvM1BiMm5wcXBLWmQ1Y1FPUVJPbVFlYUtqMjFVOEt6R0lWSXI0bm82R1EveQ0KZ3B3TGFrYkZr
aTVOdXJEbVllc2sxS0pYMExFS3lBV2c5d2tkbDBlR01kOTdKNThEVkFta1FMQmt5M09WDQpGZmw2
TlVET3dibVZOeTJIcDNDRkZRWmx2SnQrT3ltNjh5RnJMTHhrNEVTNVU2ZTRSTDhlZC82YTVoYVQN
ClRCYmhoRVMwZWpGbWxNUW5tMy9qMHhWSWtLeDRmTjdRSXJmZGRUYUtBWkMyWDY1c2tQa3p2QUNy
ZGtJdQ0KMXo3ZC9sUDV2MWltOTJUL2RjeEZ5c1cxYkJWa0ZmWmIvdGpKUU5oa1NHQ1ZkOVFveVdq
V2gvRXJ5NlJWDQpXVlpQM1h4UDBUWVF0enZqZ0t3cVBKZEhYbFFZQXJzcWdNbmEwNXNmY2piN3hW
VXhnWHpNK0tBd0g0UkENCi9ObjBjdUVxUFZNR2V3QlhPK21kclBIUDJIa2U0N1lDcFEyQ1JPdTY1
c25QL3pjemM4Lzh3TENRU2JkVw0KVFRSNnRPS2VxR3h4VGcySHhldXN3NzZVdTA2c1Y0VFhYODl2
OFFrUmNxbC94aXJaZ2g3QVVheEs2UWp3DQpjeWRWQUJzQmt4cW1VK09BUWFuc2RXUlRmcytzSUxI
MGwwbnFwdWI1VGFPYnJjSFhPOVJ6eitjamVTWGgNCkMram9TMXdTN3ppb2lSdGpNcTRjdlNWLzZX
NTRnS09EN3FBSFlqdm04ZUI1VDNNUUZPbUdjNU03YWlGbQ0KUmkzMUxqaVVGa1UzQmloczYvRWc1
UDFjV0daZVFZQ3oyMFRkQnBLTzRQOGZ4cUtoUklzMkF6UzZvWlFTDQowRWRDdE5HTjRUS2xkWWJN
TDNzMEVhNVVMK29NcUVrSE1KbW1YYjNhSFp4V1ZXWnBiOC9EL3d5WnZ2MGsNCkd1YTNsT1VJT0Yx
bjBpdHZ6UG41K2RIMXkyVUcxTlNQRUZwenVDaWpnRm41cTVXMGdwVThiS29icVFqdw0KckhVRDVK
N04zeHFkcEYxOXQ1L1ZNa3ordjQ0TXhnbVIwb3BJd3VGRU5EOW5jWk9pWG1VNWdCM2E0YzRlDQpj
U0dGL0VYUTRWeHhmems1Zy9MMVBWSWVsRlBXRWtGNDJiakRqaENQU3RTTXR6SVg1L3VTZlB6eWVw
YkwNCmd5VUNySmxqeU83VGhHRUtOVDZOdmlINFNWTDV3WjB1dFBUYm9HMVh3akhPMnpxVXlaeUNq
d2VnNnh0SQ0KcHJqWlFmL29pNmhYcGZpZ0l1R1hBVkMzVzducjByVlJONVhpZTNWdzBhZnpnT0pp
Y1BCcEY4ajVBNDM3DQpjN3RGaTdhc3RVWEk3eGtqdlNFOXBpdzlxaUl4MWU3LzBuL0V2V1MvWWRR
WVJkMkNWemZKRDZhZmNHR2wNCnI5OVR3dWdzNlRTeERxME5JUnY0RHI4cWlkSXJXQTFVZEZUbnBW
cEozTlpDdEZaRVNONUJTVlVCTGZkNw0KSXJVRFdIOWhaaTBJdTgvWGdGcERaa0pJL3ZpNkM5VURG
MjJHZGZBd3pjMW5YUTgwZGlWdGxtaWUxODBBDQo0WXk5Tnh0TVlQM1ludVV6Q2ZCRlgyZE9oWE9I
ZGV1T0NjR1hGeGN3TXE2UXZaYWlyQUdnaXpNbENiTGMNCko1anYyVytDNEp3SGtyWVRjcWJpZ2NX
T1JDd0RJTVV3bzJhY1N3N1RvZGpnaDZjdnhnZW9yRkZlUkdYSQ0KanBPTGI3aUJwdzBXSkNJNFNq
NUFRbnk4UTRzazdvalFmU29DZVdlUktldURvYUZTTStDTVgwZkQ2b0E3DQorV3RIaFZkNDFiMTUr
ZmJvUWVZNjQ0RkpXSmcyWGRTYmxacWJvQ1hvc2k2NWxYeFc4Z0hvSzBIV2RBUEENClgvTFFhMFR4
N2F0VllOanFjZUk2dlpXR3VkaHJnN0l5OW11UE94SDBkckdNNWs4K2N0eWlacjM3azNuMw0KK1pO
eTh4Zm9RbVJ6TzVmdy9waWR0blNsWm03MHVJN3JSdGxUdkhIbXEybFlJK1g4QXcwc3BydTdTR09Q
DQpaYlBBbjZoVkZCTmVOMlA3RDQ2T0lEMERKZThrd1ZRbXphTmF3T1BQbzlISWEvaS9oT0FYN2xN
VDlSNVcNClZ1aDlOOGpuRGZWMWo4bFJ5azQ3d2hHTVMzeXRZQTluRlFWb2xlUEhzdldNejVuSklu
VXlUOUVsR0lRNA0KdWMzclBTNmJ5NzlqbTRSME9oWlNMa3BTMEhEaHBadk1NeVVmeUMwM1pmM2NH
c0Fnb1JOTVhoVHltU3V4DQpCY2ZwcWVUbHJkV0wxRDhMU0J6Mi9peFUvUzZxUmhSOXUvOU9FVGtN
aFN4QzdLNkVCMW1UczJlYXZQY04NCjZVTkhRTVU1SXk1Ym1jWGwrZmFGSit3RjJLSWFZbUs1TTlS
bDlEd2c2RGs5Z25PK1hxbE4rVnExeEtDOQ0KSHN4dDlkdng1UFBMeFdUbTFWUE9OSndrUTBIMFd2
WDFRbUlLZlBUcjNlbUpyNW9rb1R0Y1RWc3BMbFpCDQoyQ1FzRzVqaDNKL2htSUtjV3JMS1JJQTVo
QjRCNmVrbUF2K0pMNHV2a2YvTmdsbG1GTjdtUTdsOWFLcVENCmwrOFJPcU5NRlRNbTMvRjJxM3BJ
T2tWVFlRYVo5ckNIR3l6cUpvVUVJRWkwZWdsVUxlZThTaTM2KzFUdg0KR1pzM1RmVDdwN0dNMDNP
T0NrOU5yOG5sUjNrWXNoZTA0NHdkMXZWdk5zRVJKckNIbTNVOUtGZ0FZNzRtDQpVMkZWcTRVYldW
R3h6bmdvd3JidFBMVFBxSDV6MmJiZlhtSHJYa3lXbGdZVitBMmh1SVAzQ1J6L0llY0YNClR5RTlm
eWN0YzlKOU93MWVSZUhoQXQ4ZXFvS1ZRNmNlRFpIRTBGVm5LTmZZRTJhVTRWV1psaWtKTXNvNA0K
c3hHUmIwMUdiam9WM1dvTWl1UzgyTjE1YWkvU0N6WSs5aC9iRUpLemdxZ2RFRmw3NDN5Yk9KVFBJ
bEVHDQpBVHZMRFp3UFhhbmxRVXlzNU5GWXdzWC96QWs3OEJzQnFNYnlqNXIycW5ieFlXalZyTExC
bFhzU0ZhaVENCmU4Z01SczNGdlNxVDA0TmV0bnZhejcvakhmbXdYNXM3NXFSZ2laOU53L2MrU0or
RDZTNHI1UkdtZndDNg0KTGw2bjQvZzJZRUFkYlVQUXdQSzNuK0RqQTRMSzNpakNKVXV5VmplSk1j
WHlkTmRQeitoWWVJWktiY1ZHDQp4QStwRGdwSUZhZXdsS21pZ1krTFplOE03QmJmWTRtNFplOXhF
a2hpNkkwVnNubEpyTDlPeVF5Vmw0VmUNCkU5MzFKV1R4YnRTcVZtWFA0RHFqUUgvd0RGYlp3cUtQ
YnNGK2lMR3dJcVo1V3FMSTdGcTQ1S3htdkJJaA0KdnRhZHl6ditKblA0ZVJSNStIdVMyT0JydWNJ
OU5wQjV1STEvZEQ3UlNYQjlFUzlUTmtteGFkcHlYM1dBDQprVVBHNUlYTFQ0c05JMXY4OXVvV2N3
TDFMTEVFRDJ5OUxxM1h4VTVjWS9KcjVCcHRZNGdsaklhRWRURTYNCnNaZTF4N3FLTWRpTndHZVR2
UmhrakJWVGFjSkE5ZWFFQ0xqME84SHU4cFhDWUFDdnBnTElFYmxDL0NQeg0KRnR3ZzVwQU5yUkNY
dUUrVnZvNUx0WDBBR3pFS3U2MHR0eGMxdktXSURZa3Q2Snh6a25PamxTaEJyNHpkDQpSRWJreVNz
TlVvZlhya1hnUHQvWjJONzZFUTQxOHF1RU5QTnh6STBieUUxV3VHWjRBeXIwcE92MXhDcE0NCldS
N0k2elJnVEQ0Y3dhNEduZitTUWpaaC9mMUw2ZjhpR0JKc3VMSWhSVDNsMU5sMTRSVExZWmcxdjh3
TA0KTVNZTVVjY3ViNWduWVlFZWp4NzFpa1hqMU43K1BmdWEzYXEvUlR1WWNUelNlNUpjdlc1TmVl
ZVRNd0NsDQp3TWpFQlVGOUVGakpIMm9JUS92VC9tVHZvK3Y5MEhWdS9PdE5ObWllMmFqcldsRkha
SzRoUHU1RVVaN3INCkgwVVpObXloNFRNeStMa0VnaTIxMEx0dWVVVXcycXAzWnAxaElqdUordnNG
dHZKZCtqRFlVYURrK3pQRw0KbFJVRkdoaDg3VlV2eEpTNG8rcXlUbE1JRDVkd0RFc29BWUMwT1RM
eGw2RDFMN2laODBRKzVPODNVcVRCDQpIREowNG1KaW42MHBhSjJoQ1h2dmEwa2VPN3dLN1MvMlN4
aHhhaVJKbHA3T0JwRHltQklsUFNyNXV2RmkNCkQvNVA3OXVJQ1RIbWhHdkZTT3llK3kweEY1V21L
VVZBOExEZFZ4eDhZUHd6S0V0YXByaVZHVjUxN0RTcA0KL050MFdTWC9rU1p6SEI5Tms5aUxiYjhL
U3VQWElVTnhCK0I2djRuc0YyVXlueDhRRVBVa2hVMWk4WE8yDQpTbS9VRmxTekxPZFR6b2ZTM0lI
M1VxSkljYmU0Vkdtc2RXeVlvUVBBalUwNU55dTdQUjRIS0RvcFBIUmUNCmdjQ0VDVkJWaVdZMWhv
Zmd4aHdKRmw2TGQyNlpkcUZoc1F3dXUrcFlHcWdVNVVqUDM0bTZHNFBuTTdMaA0KZEkzOUs0ZlVC
cHBMbm1abWQzTks3azFVVkJyRndvdzBsdXJWdHY5b2x2aGNTZUdmM0o4T1NUd0dsK3VDDQpJRVJQ
WFZSSVpqQTlTb0JIbVRsOEdWOGFXU0xyUjhuYnUrYUNPdVRWZ0pTalFaMytOaE0wR0ppbjZBdGkN
CjRqL3ZHK0lnclVYVG9qS0RmTHR2K2g0bFZaN3k5SEtvaVlydUluUVd0SU56djBaWXZYaG1xM2Er
dFlwRw0KdHdtMS9aK1BhV0hHUDRCZ1ZFNmFjY0s0MXRmaFBvYjUwSnYxNHZQWFQxZUM1bDhVWXNn
VVQ2TlhPdWxIDQo5WDN0cHVwblN1ZE5kbnVRRWtRSTlMam1JMlhRbWVNTVFRa2tNbFdZN2JqOGZU
Vks3eXVFeDVKYVhIdysNCkJHMm1Ed3NKUmpXMEFkOFVLR3pBMTBQemMzYm9NRGZUUlpDVXZtQ1hv
TVNQMzNLYlJWUUZwNWQ1ajh2Zw0KbkpHM1BqcCtOQVE2SU9GSndCODFqdjdaRjJ4aUVTOTF2SytE
U1hvV2lMQ2xrNjExSDB5WlVJdjdiNk1RDQpnZzdzL0djZ1Qwa0RVTXZPTWdEdUQ1c1lFcCs3OTlw
WU9MaDZ0VkZNQ0EzbnEyWWJwd21WU2pMdWcrUzcNClZ4ZWo1c1QyOUc1MW5RVXdDdTdlYnFtN3RZ
a0Z2RVZOOW0yYnRQN21oSEFHcUUxbHQwaC9RcmgxQitpRQ0KMWphN2xYdEhvTzdJb1ZwQmRTWHc3
RjZiSGNaWEF2QVJTTXVab3VnTkVzZDdpZGZEUHRLeUU3em0ySzRoDQozQ3ZPMXRURHA5MUUyQWVJ
b2c2Y3ppWFN2cHl5MkE2Wk54TlZScU43QkVZb3I5ZllRUmEzMEtWZk9SRXQNCnhoQjdGRjkzL0x6
dFVBcExvNHN1NTIzRGdvdS93UkRiQzkxeWg5ckJVMGJMRGxLMW5odVlSU1QxaG01ZA0KcGpSUmpJ
R0dmUTRNZ1FYYmpRL21kYURnNmVkRjZFNlMxd0p3Rk5oMXo3Uk9Dd25naGFjbHVlMmsrUi9oDQpX
Q2ZSelFGTjA5VHM0TlcyRDBPNklnZzlXSExubjBXWmZYb29BVDk2WTg3WGJOclhxaHhXY3B6aTNo
WXcNCmRWT0N4ZjhFRnVCZGZHNFo1Uldta1hoZ1ZGZk9LMUhxZjREalhjelBjbHV2NDZLdGVEYndv
dytKeGV2Rg0KQWNNRFY1ZUhyZml0TXVLNHMwNkVDbE9kRUthT0RsbUNGOVR1VFdDQ2hPRGp6YzRH
a1VWTmwxc04zUmpvDQo4YkVKT0xUSUFhN2V6V0RrQ0k5ekZNQmljY1RwVVpoWWpGbTBDSWl2UTVj
ZkZNWVA3OGYxMlU3ZkhuVHYNCkhyd0x0bjNoN2xCaXRGU0xucHYzSnN5SVdhNGZ3cHkrZjlWcC9x
eTRKSmFMN0Q2Mnc5QS9nZ2RXY01ZMA0KTWZ6QmdEbitYS0p6enRxdkV4eDFQakdEMTlHZkVSNWph
QUcyU0JKWUl4ank2V1hzcDZrRU4xSDA3RkFoDQo5U2N5Sjh6NDI0cGo5SkZPTGVVVmQ5RXc0b0w4
SkFWQVN3dG91cFVOdnJiUkFTV21QMFAxT242TzZwUFgNCllQWnVRb0hINlIvdkU5MmZwVUk0MTBI
QXhwVG1TcTFydGw5UmdMaDc5L2kzdkxIbmhMMlZPeWZ5S3gyRg0KeFhCSmVVOTJJSW9ZekNLbG9G
RURzbVR1VzJTOXluUzJtcVRHMUQrbGpTd1JJNnViRTE5VmVoalFnQ1UzDQorcDd1SklIeUZQNStp
YjdmSk9kNUVWdVJWN2hGS2pjS2Z0cStjQ2FxWVlPMWFtNVJnMEcvNnFGZzlKUk0NCktFYUR3Umlj
NGVmNE5DSVkxRFUvR2dxY1lnL2RzSFpzUUV0SHQrU3ZCcVJHL2g5TGRPSUpnQVhmcGN4bA0KWTJx
bnZIRU5OOHFFWFVvOXZTUVRGSUVWeE5oVE9EblQzMzRGY2U0eUJTMzllTW9DMUhTTTdjaGc1MjZo
DQpVRHBkcUEwcjB6SkhPc25wanFFQmhvUGVTdlRPRHQ4eUY4VWY4TGpjNWVjYk40NExrbmRSdU90
LzVuUzYNCnBBUXNWN0ppL2huRGh1Q1FKaDBFek9FMGZyS0prTyt2SzZuaCsrRTdobGZRY1ltT2tV
a3dYbFE5cFd1QQ0KRDdpLytUSFk2K2JIcFhpNytkY2tpaU44b0daekI2czBBUW8rMXhYY0RMR1Rl
V1NFVG5wZ0RGQWlUakMyDQp6QVdqeHFZRldoaWtKY3o5OXRjUXMvMFE3U0dKb3RibWEzMjVJOGFk
QmRHNktlbkVoS0daZm1PelZxaEoNCm5BejZTMXlnQ1U4citKUjN1RVFRSDR6aWZGWkNxUHhneHZa
bzBGaElkb3oyVTNJTlN1NzVnNDZKSTVXVQ0KKzhiaGZYM0VxSUhwNGhUc3ltdENINnBLQTZ3YUpO
ZjdPWUEzTENOSDF4eGhuSUw3WkdwT3ZGMDlQUFNyDQpCZXVsM3JSQXhBQUZ3ZDNRTkpuQk9EcytI
aExaeHI2WnZTSkNnODl6S2tTNVFoc0l0bmlnZThnalJqbkENCjVWSXppOE1Ecy9YbHI3WGkxZG9l
U0tYeS9hZTdFbVpqMjNTYUhWNkRObFk0UGF0blZkdFI3bWdKbnBnUQ0KaWcyNXRqTHdrczcvbTBR
aFBoT29XTGxOZHZPOUlYUVByTnpIYWtHNEVFQjdoZS9pMGt1aHVLYkZzUERiDQpZaXZjSGZuMm1X
ekRwbFM3WS9XOS9Fc2dCWHZGVHhJTVBqMXpxQjh0V29hOERqNW1xVHZHMXpaUVY3K1oNCmZGdnR2
d3B3LzJybnNSUGR6MmZaTGl2ekpRdWNwcWduNTBQVXFCYnh3b09SL0Z3Smlya0piSW45MUxWZQ0K
bmRMclpoSGx3S2QvZElHRjFWZkVaRTRPYVRiOWFVajdycTB1V0JER3h0M05kYitDWlRvaE41bTI2
SWtQDQp6OG1hK3g2blN1U3oveVdHTlM2M3k2SG5yaFJLL3UzV25xWmJ0cDdxc09ORGFBc05zWW5H
WTZodHV4WWENCkdwaEMzVzh0VlFQeGRCdFRqbzJKaGlwamVrbjNiQTJjbXppU0xzNXVkOUFaV0pD
ZXFBUFAycFZ4Y2Jqbg0Kc1dsYnZyVXRPdXVQMXk5RiswczlGS2Frd1NuSE9EeXhLVDIwczhJSmd6
MDFneXN0MEx6ZElZQzQzQlJqDQpjaVJpT3pIVkM1blZ4dUI5UmQ5Y1RkY1lUTFBLbHg5NGVGK2ky
U2FkSy96a1Y1Wlg0SXljNGlTNjByVmgNCkRIV2ttb3BRbnRjZXNLNkphS1ovS2w0ZnVEN00xaVln
U21PeklKQnoxMEpJQ0wxZExRMmZuVGtSbWRJMQ0KTm15bnBBMHdIa1YrMmEwTXk2a3hxMXcyZ0Fz
QzBOQUZLZlYyc3p6N04wRG4rYmpnSHZ2ZnY1RUsxTERrDQpOdEhHS0ZrMXpPUTFrd09hTDY5RUVq
V0NXeWVDU0EvNFpzQ2hMdFE5dVBBeS85b0VTNU8zekx4MnoyYXkNCkV0b082dTBKOTI5cUFHVkdH
NXAvTmVicTE5dm0vUUEwQlhZaENNcWQvQVluM2QzL3Jya1lEc0FWTGh3dw0KMU5HZE9pOGI4NXZY
SHQ0Z1BaSkhoQmlpTm5XV0plVkNFNHBHL2YwWnpWM3dYZFcxWVowYVI5TWtsQTFUDQpKOWFqS3Jx
dVVTZEcxTHhzS243Q1VZaXpZaTlrYlpPYUEwL200aVhReTdvcW9jSlZFM21ONVgwaW1XUVQNCm5Z
U3kvN1drY1FGMmZHTkhpNXllRU5mT1I0TmRnNlh1Y3RyMitCWmw5NzZ1a0tqRTJXYUN4aGdHdjdE
ZA0KVnBjTFVEV3FPU1Y1WDVyN01vRkJkbk4zeExaQ2hXemJDYUgzZzVyNWUwNkJObFVrL2VJUEdR
UC83TGRHDQpjdGt3ek5BSEYrVlpOelFYL015bkxSNWQrenNic0NiNkVFaHBsZTEyU3BuYzg3VEZi
WEJPL0M3SUZ3eHYNCnRNbHNPVkRpWW9INkR2MjcxZ2pWMjNkK1kyVEpRWG5GNFMxcCtuWG9CdlhU
aS8wQ1FaYU5UYnB5cW5JRQ0KanVyNU5SWE9ubFV0d2hrVHozSS8zNjJReVh5ZzVmZHB5TjU2dThv
K1hNS3NORHV3WTI1MFAzajJMOHJnDQpnTFdIRFFGbC9LY2Q0MmgvcEY5ZnJidnVVd0JMUk1tT284
MmNRaXV1QUJhd093dlQ1R0hGY1JDNVE2ZlMNClJkeFhrdmE4cnhEMHJCNEU0emZSQU1obUFPTXFi
d01nVDhQaWdZUHpyMjZqaGhVejVCWWFxRFRtUG5ibA0Kd09uOWRPc3NHZjh4MG13TG43VXJQMUV1
RTNrZElSRGkzNlE4aHNmOUhBV1cvcTRuM0cxSDRaUkh2VGNWDQpoZjltNDNVZG52eExuUGlrN3Qy
eEwxRVoyQVdyREtTbU9NR0hHRUVobDhxYkx1NHlUamdicVVIOENFUGENCm82NmlmWmI3RU9RQ3FC
VnlGd05wd0NqMHNvemZPYzlRQk1qeFd6eGQ5KzVUdVRGczVVSklTOUQyTHNYeg0KaDhGaHc2Tndu
NlNia0RzUFZucGV4dldHYXRqc2VURjZxbjcwMWRldDBuTmsxdks3SzF6cjc5TElKaUFWDQpHUTFK
NWRPc3hETHNKR2hDdzREZVRkQnFKQWpqbm00RG91MHRKcTdpWi9TcnFNeC92d3czaXdodi8zT3YN
CnhaOHVucWIrQTk0Q2p5UEhkaE5OVkMyK2RzbWhnU2RqYUprTFBnMityNnhFTXpCNjdidG1ESnRx
NnliMQ0KRFh3M1EyRnFueXlWaUtLVDhid1pJNjUzTmllRVJ2SVhOVWYwR1U2NWZnZkpCUEMvVUpM
RmVXUTNzVjJ4DQpFU0h6TkpWKzFtYUFCSEhUTE1nMmRoNzh6aVlGVjM0cUE5SHNOS0dpdHdkeDZO
QVU4ZGpoRDlHeERCaXUNCkFMWHhPTm1MOU1DblhiNmlxZ3VaUG9hT3VLaytDdlp2VS9USVRsaitv
ZFhuZDdZQmRyTWU3U3NueXJ6QQ0KN3BnbkZIb2drZzdSU1NVMmpCRGtqUVlaam9CU1NHN3dpWEYv
eGQwMU02Y1JvbnJGVWhMOS9semZjWC9nDQo5SFhFWWdYenVUeHNxQnhNMEVyZkM0MzczUnVPUDJC
K3UxY21tWU1PaDNMY2d3c2NNdXZQcDl1T0VKQnMNCklHL0hDaGIwNCtuajJsRHlsYURjR09XUWNn
TFpwSkhCb2tzaFU4WXpNaU5vTlNza2dONDVEQTRYTEIzdA0KcnZidW83OFN6SjVQVW1CRE4rdGRZ
RlgvNDNiREFXdzRTNGtZandtcy8yNkwzakR0MmdnZW5PejUyK3ZxDQpyM2J5V0pJSk1kWW9sMDE1
ei9jNmFLRnhOMFRqK1NUcjU3ZXYxSUZyTFgvQy9XV2dTb1dJTGZoKzY1Q3UNCkpTWnRxeU5Vekdq
OXBFQnoyUjZ0b3VSbkFja0UrYUNZYkl4V21pWlU3bmtGckNjb1c5YndqQ2dsbVhDZQ0KOFRlNkcr
U2xFcnR1TEFRdmxaWWVsYlFPVGJObU9uT0Y4RkZrLzBtbzV1WjVoNU5QeW10S2dlMU4rNHAyDQpu
TDRYV0h6OFRIOUtGS1BlQWNDUFVpWjc4RUtDVlN6Tnh1REZmR0h6UzJhOFNkb1hudHNZckg5ckhO
MW4NCjlJL0ZyQ0JweU45V3pWMEVHRlljMThLWXR5NHRHN0N5V2NtcFBZMTlUeXpnV2kxTWJoVGZk
ejJNUkRlZA0KejNkWS8wbVROUUt0d0pubGZleFAyZzFxYWFtYXRZSlNTZ2dlY08yUWNYemV3TnB3
dGlhdUU0cVZXSHEyDQoxUys2ajhUTUhLSFpGOWVPVUpmTmpvRE9VOFdoNjJwMFV5bm1ZSnIrY1hx
bW45RVhCM0EzOFNoLzN2dysNCnNOa0I3NzB6SWFTcitkZ1ArNEdhazRKTVpPaVJ2MDRpWmJUeEtU
aE96SFJEUDNRSWFpK1BqQ2hWZ3h1TQ0KMVZWU2dmb1dxbnhXT2xXWXloQ1ZaT2ZhVC9KT0VJNDNM
YWdFelpnN1ZFbnBaMHQ5eDlIT1BoRktNK3ozDQpqelNYRTZkaEMvYW5QaGpEeGRJS1I3d0FZb3lU
N2lPUTBaV2R1b2h4d0QwL01jOVN0ZWhmbjdQNUZleGoNCk5oUXNCd1ZteUZnM3Y0ZDZYdVg1Z282
NnIxRVgxdzlFZDdMSmRIWTMrcUJMYkcwTDhDSTl2Rnl4OEJEQQ0Kb250Ly9BKzY0V3dFME5CbnRD
R3IyZzZCTTROSFNmTFRRMUZJUk54Vk1PMkVsL0pyNmhtU0lRZ0NSbU5JDQpDdnRnTG5SaUpZd21u
RFVLSUl3YkhBSDQ5ZDRJcEU2TUFESy9FdG5xRFRWdXUyZGVyQlRDS09ZV21mdkUNCnVmNFJjeUdS
UTVSRjVnc3A2YXBmaG5uRXo0L2dycDR4U05SNFVoZENpOXFzSnhhZzY2bzluZnZtaWxrRQ0KV1Zl
Q1Y0MGkzR0IxaCtkSTZUb2p2YTFOK3lFaXhUeE02d1NTQmdSMTdYMEpyY3hXb2loM0V0UXZvRTFC
DQo3WXR4M1dtRnhCTDFGQm5WNCtIb1ptNUtZQnJLZlNPU3lUV2tJK054VUVaZkRiYnVWdXFvOEpN
TWxOK0sNClJsR0tWV3ArTE9zQ0djV3VpcDl3cUdqOTY3b0FIRTBiYWZ6VWZaRVV0aWRHTHJXcmlS
YlBFNWhKVUdENg0KMlB6dWx6cWw0aFZweHAxVXVlMHlDeUQxYytINnFiTEFFTDc1TUh0OW1Bckla
WCtVdkd1L3E2eElHdnlXDQo0aVhrTGZCb2VUWmJrOHc1SUIzV2pvdHR5MVRYMmkxWkEyNjBHUUpx
b3Q3RmVYWWRieDJITWVLVUMzaS8NCm5PSE54dS8zMnpOeTdBUVBqdlNmeXE0Mnl2UlFJRmRBRGF3
SVRTMkJNcTBMcmVhOUNlN3ZoOWNhckJnNQ0KeXJ4R3BNRTZZamcwYnZXbkprMzRMZUNzczZiaVNV
eEJuZ0FnM05zZTdXMzM3RW1va3BHUXlyOWFIVEN6DQo5cENpL2FNSkk5RHlzenpJcmxBTkoyaUQ2
Y1liRU1XMUhlckZCWjlRcFVXNG1rREVjTk5KNGRDOGd5WDINCkdXVWplS0hnTWxEU2VKbEJXV1Zq
VVh3UnRrdFNKcU9wU2V4WXp6T2JkMktTblNFYUNPUDJnZ2owZk1GZw0KUU8zN1ZjalhPenZqcU9Z
MWJkMVNSZWZyS1JwZWl3VW40NEdlL1hWL1oyOFlXZ2tUOGFpWkRrbGEvUXlsDQpqd214N1FLQTZv
TXJkdDZ2Mm1PMVdhT25GcUdJc2FzTlFydEhCMzZsYWdnTlhJdHBMYzdBNzllMURvRHYNCnhPRnl4
SFNBamFVMCtNMEpKWE9WUWRxUlVWbDhCV2dCeDNVUVZyUjN0YkRKVzkzQmlKR3lLMTVyRVVybw0K
LzA4QXlRdDgrUUozeGxJUmRsbmZGWjMySlcyV2FOZlhybjZLNkZTeWplTTM2TlpnQU5Cbjk0WFJv
RmtZDQp0M3dQT3Vod3pJbURJOUlpYllvdGczaFhsdGRienJCNXlxRU1iWnpvNlZ0aENBY0U0d1JO
Q2laUGdnblcNCjVveWZNUWxaN1RPV1FkajFEYlc3RmVlcnFmbVdIZHgyZW5xUHNqRWNwTDZnOC90
blRRNDl6Mk1nVTYvSw0KZHZqM1JMeDRneXFuUnBnMmtJQTdMQndra2picEIwQ3NwWmFrL0lrQ0g1
aHIyd1hOVS9DLzJIV1hOSnRnDQpRV2phZlFHODN2VUlsci9kSDlYYUtQWEdUMGRWZW5YdjR3ZG9p
cFpxUTFienMzamtoOHdvRFRlTXlDOGYNCk5kRE9zVkpaMW8zbEUxUzJkcVhlSENjTGNhMURhMVR5
bElISHk1b0tnUXBUQ1pDd2R4Nm8yNE5Vc3cvVg0KOUFIRlRWTEVaZGx4MFhZVFVrZy96cGhxMmNT
RmR3ZkxyVzVZdXNNdEZHbHJSdzZOdCt5Zk82QW1OY1BMDQpKait5UDd0clFhcXBOZmZmWUJHZWdT
aFNOMGk0K1d6LzU2Y2V1UmFJdkwrbERsMlFZa0RmN2pHZFJOYUENCmtYalgyUHVJanNaRVBDeFdU
NlUzNnF3QnZUQkgzQmwvT3VtYitVbWtvZzdqTUZ6NUM1SFQ4cWVKYU5SYQ0KZTZZanBRdjBtL0lV
QnZ1MmNTOWxBODZqVjMrd0c1U1hGNjhHK2VTRlNBeXY5MCtBVUJaOGRrUmZRN2ZBDQpiSnJQQ3dB
Q3RIb1RSVDVzbVltclZFakZzR29taXhUckxOeFp2dU5vSzZPMmR5bzRMQ0RYVms1TVpQRXYNCjFI
d0psSEJ2c29VaVd3RjZrdDZtRkFCUjRodU1rOTY3d1Vsc0JVRTdvSkcxN2NxM1lSTkp6ZmdsYmxz
TA0KZXV2SmV1aDBOWHRXYlFjMVJzQnlaYUpTdUNpcjJwK0dBTVhrMTN2QTNyOE9MYjVBRmpuS05T
enViSDdNDQpmbDZVSFcySlZwYWp6RVowMHBnZ0lEY3NUNFQxWmc3M1RsRkFyb0lGckpVYW5NcE81
Y1hqL0RjMjRMdDQNClZ2M1dXMk9FQ1dKVW9vU1VqZ0xXMWgyL0tiVUtXQWRwNnpjemk1bGhkUnFF
dnZKUnYveThHQ0tSZ0x0bQ0KUXI1Wmd1QW13SGxWWHNCMHRoMHNXemN1emJSSU82Ly83czdiYy9n
ckZ6YXZ2N2FranRTanQ1emFmeUpPDQpRS2NrTHdlazJESEZublJ4TWs4bkNrTUFQRUdtQlZEb3Jt
TFk5OGlSMnZnU0xFUHhUK1JzNEFUSjFPVC8NCnppNkdMd2VCRnk0eFhLcG1uYkh1RGx1b3Rlc2JG
S2NJMWg3aUw2NnVha0dXdVBoOHpqOENCK2UvVlgyWg0KTk1xNHREQjQ3WlJ2cnI5SlgwN3N4eDZM
SHNIYWFBcTdSVFA0OEdrZEU0VUppckRKWkNGd1JKUlIvMTN5DQowbEl2ZzBZSlprRjBnUWxYRHJK
czgrell1a1pBMUxMVFRuWkFGZWFZU2Z4dElGVXNrREtwYStjZ2ZxN1cNCmQrQlluZjBFMUFBdVB1
VFZzTmU2SzEwd0wwWGNOZTdZZGNEdzVnSDUxMzNXdGVWbGN4QVhnSng5QklUUg0KaTRoUjloeEhH
MW1RSi96bmE4SXlSSEladFZubTdyS3JxYmxtc205YlZPQmVHUmRVUGNBVERrNklKMldGDQpsM3FO
YXBiSDZ5M2VwMDc2TzVCejBiSmpyWFNoZzJwQUlmcm43VVF0cWg2eHlsaUxWdFNjRmJRWks3SjQN
ClByZ1hKRTJneVVoMWNoVjB4SWVoTHB0ekFzWkUvNFlSNHE5MW4xWldpT1U2aXNSK1RnNnozNzZX
TUhJQQ0KNGNQb0NoVUdQSHFTUXU3RFlTbkt5akpwbEJMRmx3VnNOUVhZUzJHQmw1MmRSeXp1cnhC
U3daZTlSNUFjDQpNaE9pTEEzdEFqQ1ZrZDk3cTdIZCtXck1NM0tMTTdDZ09sSVF2U2ExU09vbGND
cDliS3FzNVZNRkVpQmwNCnNKTjQ3cEpra2pDeUY5dkxMQXQvR08rQlNVSXpjRWQzRUZUNytOU1V5
dHZXeUdnc0tNMEQ3MGZCQllIZg0KRnFLRDB6R3dkVk5kaEgybE5odjIvZXNJeEc2WnpUdXl1MW1T
SEVLN1JjbWp3dUx4dFRBYldzQ3hndHI5DQpnWWx2K25CQTcyUjVtVXFJTUwwRVlmTERqWnZMTkFM
bkVMNkFJdTNsN21uYllhQzJUWFNpZndVQzhLUWkNCkZZaFpRSmpZd1IrTkdoNDh0eDJkV05GbEk0
U04rcmtocm9mMjJOaXMwL3FFSlpXV0tUQ3VxZ1g3TkZjUA0KR242K01RTWVhYk5MY3M1MDlKZEkv
dzh4dCtNMlgvMkE4SEtETFZWU2N5RWdrdW14Z1BVbXF3SmhnOThJDQpNN2FlcWJtUXNjUjcvbEFv
dHlXc3liTmdPU1Q5dzZZdnhQVG1nOVlkNmYrWVdJaVRiTTV6VTZSSkxROXINCm5qVW1vQnJnaGo1
aHJNeHFrb05lV0hjYlNPbFNoQUswdkpET3hjaTFzK1NzSktRaEVhYXlmaUVuOG5MSw0KNE9lclVY
WHFoRVdyRE5PRHhETmlGVFBXdlZjOTB2V0dONnZEK1NXbnFRRDhCT2tNcDRJSkk4bkFZT2JqDQpT
RmplOXd0Um15ZjhtSjRobHZodmJwdEFUeUFkenVUNXAyS05yYUd0WGY4ekJaSzVHeThLMnJwQmMr
OUkNClN3RGZwUkdtWURZNG5mbGxsb2VqY0h4K0pVY2tjWnFaeWt1MC9vdVB0MUdQamdzYW05TXBt
N05LT0lyUA0KUlBmeXRWQW5mcXlRcnRlNDZnTER5ZDFLdnhjTE0yV3RFckZqS2xvWlBSaVMwTFN2
UThWZmpkOXFldDU4DQpWaVdzZUc3YnZ4TFRVMWJHM0dTQXA2V215Mmk0ZFdlVWJFSGVJbWFCQi9k
RUtSc2RxeHJodjNoSmZUblANClcrcHJROXBUVkc4bVFyS3NRM25kSFR0elFSTHBsRjZacHpCajk1
ZDQrYnJTeG5NSHNwQkk0ODNsOVFQaA0KaTg3d2plZ0V0VzEranNkNHhmclBobHYzc1NrL0ZqcnEr
MlE3RVZBSm1SdGNKcHRvSlp3emNYS2Voa2VrDQpaSTFuRi9OZ0Q0eGlYa2dkYjhmWkxTd2Q5TFMx
WGMrTVp5cllYMHBLNFBhNlpkdk5oS2lPdkhKbGp3Q3kNCkZKZE8wcWkzczByQjhtTlFDV2VoSCtB
RmZkeWVQSlNLNytwanAyd2VzS3o5YXNlWkRvTEpQcGpoeDZqMg0KcjRBeFFTVUxIRDNVbDRuaXFJ
QzdiSlcwQ0VFSk9qVXRtOE1QOGIraXkvZXJ5Y21nRUNPdmc5VXNZUFJiDQpZWnovdm1vWXdFUkJQ
YnNpR3BtL0hDWWRsT0dmYTFraEVBOWo1NTRmV1lHTHlNOUYyZ2UxLzdRSDg0ZGUNCnIzYzNGQkxz
ajhZZCtiRmhUbXFmTnNrZlZJTjUrcmloOWdZMmdneUFzUWV5aEhqUk9kRGNaNjNBTUMvbg0KM2tS
UG5pdDV3YU0vSlZJR0ViYThJdkV5VUwzWUpVUCtMV0c4RHcvQ1NJdDlUTXFJSC9CU1dOTVVtblBZ
DQpyUzJLRmhnUm5KMVBTU1RWTXA3MmNIaGdHWXVxcmorZzhobnBaYyszbkpuRVNDd0pGTUljZWN1
WkZYbEQNCkh4TGtTbXdzMTdqUDRmUHM1T1RIS0pKclptYm8wNWJIcXVyb2pTUXNPZEVjYWUvMXJT
SDRjQ2hCTDMrMQ0KYXlqdlZoSXMxWmRXcXFLMkxMUXVRVFhEU3RPZFNPcStVSnV6OWNNMDkxcnB6
ZVNwTVFIRkJEUlFuT3hzDQphcmNTZ2RQOGhGSWhwbGVhVDJhejJ3MUl2Uk14VWVEelhoVERTUnht
VlFodzVHQUV3b3ZkRDFNMC9uZVUNCkNqUThBcFFuYk5EQkJuZHl0WStwRExZV0lWdVgyYllEOWRj
eStneDFuY21KOWlrZDYrMXFUZG0wZG9ZRA0KODdEdmtKT0RKZUdnM0JPV0RhaWpjVmhNWXpnNVQw
RkYrUTJxRmFDcmcrWFRNcmp2Z2J1VVptcWtQQzl6DQpjOU5MV1RxMjJ0K1JrL3hFbzNEWHNDSDBO
RnJzRk9mZmM0Z0N6MXQ2S3RURytGNlE3aldwdEloN3A3K1kNCjkybFhValdNVURPRnpvZFF0VGR2
anpLcURvU0ppN1JnOVRDeFdtWE1ieWJZREF0VDh0d09qVFhLS0NjUg0KS1hmK3RTbW55T1kyempS
K2twblZlWEJkdzZucEdDYTZtYlp3aVlRZGcycUhCRFFQbFY0aGpmQzZ5RWcrDQpTTXZ4a0MxYXVu
Q0xrSytBRWo2TWd3dkUyMEl4VWNKRmFaeWVLRXFZYUhmTEp5T3Q3M3VsbDVPWldKd0sNCmE0bGh3
OHZPZGh0VndFUDFyWkQxS3RQa1krZmsrL3h3aGJuYXRlS3Z1M1BROUw5MktHQ0lZWW5IWGxabQ0K
cVBGRC9aRHNNMTZONHR0bjltT1pjc1hpK2ZmY3VXZjBlL3lrNTFGZUZFUS9PNzc2ZnBvalpqNWxy
bzh0DQpkYlJGV2c3U2VDb2RhVml3WDdTVjI3T0xPaFlMQnlCdG5RbDVsQXNvMERBOVpHck9Ic21s
cjRkRnJaOVkNClFVNzhnZklUaEpyQ1psYmdONEJYaks0M0cxL05RUDlST1BWUXcyOXgyZ1d1TUVt
LzBKRkZGSnMxdWkydg0KdFpyb1ZoV1lVRXFocUFRS3cwVkxadE91NUFZbkFEZlgvbTZjdkxSb29C
Ky91WkVnenRKNTlkZlFvUlJWDQpNc0ZrY3o1Yi9qM1dZRjJyQjVIUjNsbzFka3M4ODZGblhhVmhQ
REVscTRaaHNDLysvdFhzZnM3czhZZEUNCmVOUmM1Q0FEUlZPUzhDWlh2WkZwRW1JMVZNSlg2NUhO
Y1JITzFadkRrOTRzWHQrQ0VQWFB4d3NIdnUvLw0KQll5dlRiUVU1WnNrSzNDL3BvNGtxVVdERXVT
cXB0L2VRd01JbHNWYVA2NUx0OWpMVzkvUzI0aGVxY3BVDQpFWTNXRSt5UHplU053b0dnWFl4Wk9R
QU82aUtJVm9mS09DZWx2QjcyczFRb09ETlRORHVxenhxUGliNE0NCkV4SzlSS1kzUkRpaE5wOE1a
NjU2cmhFaUVqVFQ2czNxTEsxMUZ6d1lmN01qQ2tSeTg0aXp6a3Jvc2VYag0Kd3JBNlU2eFh3NHdo
Nlgyclc5WEJiSE5aNWtYb202ZHQwWG1jcndzQitJbndjVlhpbHVoRzJ5dk1JM2hJDQo0UnlVWlhu
UXF2ZEtPZks4dVJlQ1loNmxMdDBhSDdDcW5GdU5oTkpBcFMzYmZtRmdROUhRajE1cHpBcEINCnpP
ajN3QUxlK25PeVB2M2FIRmJJUWtjdFF4cSt4VTBIc21UOTAxaDRiNmZKU1RpRnoyY3N2TmFYays0
Vg0KVkN4bE5FbmlIenhibE8xb3JPdGlUclp6ZEQrcWZPa2tuTXQ0eEMrWWJGZ1RyWmFhVmtGVk9R
MHFFc2JqDQpBT0szUGJ4LzZEUHY1RzRsbVFHNUp2c0FFckFtS3NRbTNIYnhIYSt5TzdrWCtsN0VN
dkNuYmhOV0V4UmMNClFobGNQWExjb1JBeU1nb0RlbXowYzJUNU9yU1d2R1BiaUQxRlVoVC9OTWNo
RTRUSGZoaHorV3pzbFAraA0KcDBQYStQV1FLV0dUR0hNdjViZldVZElCODAxR253cDI2R0tZS1Fi
OXF1aHcvaERuODFLRDJTcERSOTB6DQpqUEUvVFpoaVpwNDFNMTBqSWdyZ3NaN3poZGlELzl6WUVj
K2c0OHg3UXI0UEFYdnY1UDVLUzJZTEsvWkINClJMK1I4MDRDYXl0Sm1hcnlQU09kMGF0OXJRMXRt
ck92eG96djdGa1dkaGx1cGRWb25aeVY1dUJWVnkxbg0KQ2JVUG94VzNOZ3pXTUZsUytPcFl6T3lq
UFpEWWhrME5paTRrYndkUElwbmtnUVJvM0FER29uSkZTVnNhDQpna2dOeUpobndET2ZoSk5xai9s
V2E4Z29UbmszVXE2RjgwMld5OWp2WXJHZEFJUkdRUW1oSzZsY2R0SkoNCnhqVE9raVd0NXB2Q2NT
RlpBZ0p1NlB0OGIrV3A1WkJGcTJLODB5ZjZmelFJMU9uM2ZXcGpKb2MwZ211RA0KQUFVTDRlZEFF
Sjh5UXNzblptNlBQMWR5Y040eTRXUHNIL2MvRFo1MWY4K3crUGRUa2dZRm83NzBHUDdtDQpkVTM5
RU9RWlNhRi9XbWR5M0hEWlZkZWpkZmVnUWlOWElBbFNLd2F6L3JNSWcxQmRWeTREQ1ZtVXEvSUgN
Cm5zTm9ra2lIaWRWNERiRU5xU2hvR3h4WERFSStNeEVvV0JCYXFwNCtWOEIvV253eDRBTDJHVGVZ
cXpZTQ0KMFBLbTFZdXRPTlNQTmI0bUlNWWVsc0JTYWtCTkFkaTMyYVc5N3JvQzBXbjlwZnBSbmdt
aE1hL2xkL05BDQpMSDgwd04vaW1HSU9yQkNWVmhkclBYQzhGWlU4M3c1ZUVrV2dpKy9mVjU3M2Rq
SUdoR2hPLzJ3dU1IemUNCkR4K1M4Qzc0OUJVclVKM2l4dTJKQ1JCSno4WXUzQjNEYnhPYVhMbEhj
RHFXUWZraDc0Z0NzanFVWkNTZA0KRGNZMVNGeHdma21kaFdiMU9CdGxrV1JWRFhLMU9JeFBodlpn
ZDVXL0w4QWRMUFl1NmdyQzBGQ3k3SE9IDQp0Qm5vK1R6NTNWSDNwc0g4dzZLQk5BRThPc3RoU3NG
eDhBR0JWb0NQMFNBRlZxMnNScG5uQnlnT1pxR3ENCmJqUWdTRWlTVGR5UkdIMjFLWkNkcjZVWFJr
djV3ck1XUEhxbVFwK1liRWViREpyWGdvMkVCbFpsMnJqcg0KMVdaNmJLc2FnVi9kMWc4bkZvM2J2
bEZCYW9WZ2Z4NloweDZvREVHaDM0TjI1UVRMV3FOOEJxMHF3NkJPDQo3QWp6a1V2dlN1RVJobTh3
ZUNhNHNwVFdGVVdpR0M2a3VTamU0RWIrSFRZUmpBaU9WejJPdVBLdUZoT0ENCitvUGQxa3dxNHR5
TWZhMWY3aGlpcDNFMWxyZjZNRVowclAxSEh0OVdtN1dYVWpLajhLM3lSMVQrRGkwRw0KZXpCS0Iz
UWw2N2hjMHNrZ0ZsUGRIZGVsNm5JeWdYLzVRUlpjM092cDhzUzgzQ2lKalNnZFBhMzJZNkRGDQpw
RWs5WjdETm1ONkFGVmhXQ01jUUZYa3ZMV1pVU3BBcHJ2Rlp1VXFrdGdDMlF6ME1JSy94OFY2MGJ6
cTQNCi8zYjZIUWtKRDAwcTl1ZGh2dXFsNVQyajUrL2lUbE9xZHBEVytOQUliSzVQY09YR1ZDdzNR
ZTRjd3ZZNQ0Kcnd4N08rYXZ3Z2N6Ry81aWQraVJTL2xueTloSFp0YlR4R0JLdGtpOUQrT3Zpb1Ew
MU9XQjVJTmh2TWJMDQo3dXVqcVNRYXlVWHFvc2VINDMxQ2hXQ201Y0ppVkVsV0hxcFBUWnBsQXZp
TkMxTUU3clkxcC9FNEtONFMNClVDRWxPeExPamN1WUhDSUc0bGtIUUJMaHdJbm1kWDhWbktid1FK
UHp0S3llYTNPamtrckUwbXViZmttMw0KRzlOTU42RUhZdjN0WTZRRGxQWjYyU3dFK1Y2SXcwUHZ4
VFBQdytDR3J5S3d3MkpRMUh4NytLUkttb3N3DQpKY01HZjJEUGdJWlRGY2pETER3THBsQUpqN0I4
SU5oRjZnTVoxaGUvZHlHNnVOeUlydWh1WXdJVC9CcWoNCnoybEJRZWxVb2dTdStNSTlHSmNZcnl5
cEIyb1ZaS1JpOW5aajdZdVI4SW9VdHZ5V2h6YTZYYjZCQVdnbw0KR2Fia2xWSTRIVmZtQVkwV0Nk
UDVhTGhPQXRiUTRBYmZMY3NMclc3YXAyZHArZVRYWGsrUUY5M0lyZjNqDQpjR2paQ2xvbk1QVVdw
YUdCaVRMdTZ3bjJQV05odTI5ckpTUDJ5VWZrNWhwK25QZERldkw3eS9RMVdNdG4NCmhBRmZZS0pY
bjNHYXJ5cHF6REVTeGp1V1I3SVpIbU9lMEdtaWlzOGpMRHJJUDByajZzcFYyUmZ3ZVpVZQ0KMUp6
QmhkbUp0SndxaEVZN2p1a0Y4MHcvQU9oS3kvUGszZEdGa2tieHZXZjBaNytrYzAzUzU4ZzViT0ZW
DQo4R1NlckMyc0c0OUJlUWZiMnJKRlFmQUVWNkpqcFFMTlQrdnJYWmdLdlZ4aks5YUJtT3g4RHd6
R0xhc1cNCjB6Rm85VU1pZHphUWNkSFlJQzdYVndOajRzZUwzRGZ1MVZNeHRMcWs1U2dqN250SG01
c09ZaklxZ2VVMg0KWVdDQmZVU3BDQXJpNmFBWDhycXZqWFlkZUdXd3VlTUJPeDRIb2FQU1Z1a08r
VGpvRVlBNEs1ZzUvWVlwDQp3ZFI5UUl2ZWg1anVpWUVtNjJ4aFhZZ0RJS0VvUTZybkRSMUVvdjEr
QzJQclgwa0JWSHdrY3BzRDRMRFkNCmduZHFvc2Fab2hzT0o1VmRLUWVOK29GbjkwZEd0QVZnUWpO
aVhsUXJRcGpFMVZJanQ1U2hJQVd6c3lLMA0KN3JnZ2llcE4xK2FVbG1TQVVaYTlmeGRrWHUvdHFS
ZWV2cUZGU3JSd1g4Zjk2dUp6TGQ4cWhYb3plOHJaDQp1emJKYnBUZ3lWdDA4VE5zOStoZlRldDI1
eEwvSityc21YS29oaTllcVpOUEhBMTJaOE1xMkdIRkZiYUgNCkRCMEJQSlJpQ3lJQnBzZXB2aEpa
cjFFRVlKZ29tSXhuVXBOMk15NXFtYk5VbmNqMFNSL0VIV3RLaFlKUA0KR0RiTnlzN1FEMnpKaFl1
dEczL05ZcFVkbDlreEcvYy82TnFPN3ROTG52TWM5b09PZDRqd0h5dXdDSHlUDQoxMXBsaEpKTnlx
ZjlNamdBYnFQa1FJc29yWGV6WFhVRmxkU3Z5TXk1VXc3SHRhOURjaXA5YkZ5REpCUzcNCkIvSnhs
dVhFSmRZbEJXanFXeUt6dHU5RTMvcGt0Mk5LSXRoWkdxVWE3MGkrMXhTV05OR09PZUxtWFN6VQ0K
eCtPN1FMMWhMNzV4Y0dWenFJSVR3ZGlneUUreTZsWG85cTZDbitIdVE4NG16VWRiREM0Qlc1TUs1
SUY1DQpxRDZ0UGZnemIxWmowK0M1ZUhvMllXL25KR3hNWlJwSGs5SHZ2aWlzckp3NFpBQVlLbmxk
QTNSZ2V4YUINCkhqMTZJOE5qMmZmSGpyYnl2aWdkbWZrMTNFYWhxeFk3c0ZEZ0piMlZIdlJ1Mmlw
Vm9IeE1XQkNKdUg1SQ0KcTR5dk05UGZPSks2WGMzWVRqZkNxQmdxaFRWa09XU3pyNDMxTUFhczNn
Y25IZEQ4UEZpVVA2VnlCTkJTDQpYTFlBSjUxc2VqTms5SlozRGJKQVRmTk4zbUZvcDFWVGlFVjlD
K1NPZ3hrY2UyN1ZJMWUrbWZSRGN3bUINCnU0NXBJY0wzMER0Y1VHaWZOaS9JdGxxQUhDdFpNVHp1
WHBZSHN5NDZiRGlkME1YWExNb0RrNDMxTEVDTg0KMnlYdkZ6djJNRUxmMlRyTUcvZlY0cU1iaTNr
Y3oreGw2blQrVFVXVFFERm1iMkwzTWNoZ0tibVFhMXFUDQpTcnRyNzJQNCtTdVdvWWJjekV5bnQ0
Uy9aaTlMWGt4RUo0blNmSkhXR1hyNlJWZFVwNnlwb0lIR2x6R2cNClpEa0w1Q2pVZGNHbTJDYUk3
SlZsa0ExRGE1ZlhzRjJtUzZpaWJxNXZOL3ovTDlOMjNuT1JUellMem1uaQ0KaVlXby9NSU1ObHVZ
OWZOMWNjUytiWkM4QitOdkF4V3RXcW5DaGg5dXUwR2ZpallNY3lMRXNQa2hZOG01DQpxYm9ndkNN
ZHE3SDdPOTBrVXFJaUtwRkRrVFloSWJMSko2ZmJzMFpuSjl6Z2pLeWlBUUFiTVFRdkVXemYNCm41
SHFTUnRiZVhmMTFmNytnUGwzOWhFdWc0VmRTZWZVeDRIUWY0UTQ4ZHU4bytjeTZRMmRTUTFETW1G
ZQ0KbmNMVitEMzFsQ3VQU2czZXNRNkVVem5nTHQyN1dWZW5LWmQ1RWpQZEtoZXRsWEg3dVJkTk9C
dWRrdTdRDQpZb20zQnBhdDMyaUpBRFVQNGE0TnNGSm5lLzNpNGErWEJyR3owN3FEWnhIWlJtZUsw
ZlZtK21GWGZnSXANCjlLTHNFUEx4OWt5WHZSVzlUMVd3TlpGWXJRTEI3WE10cEd5azNFSE1UU0VI
d29lTjlyTVpWVGJQYWFFZQ0KUVV3dmNuWTVqTG1ud0t0ME95aWpxdDJETU4vR3VCbWpaQUxiYUoz
YjV1OGp4dE5iOUFhZ1hvU3VUK3IrDQpmV0lUajBkWGhNVHNqdGVEOC9Uc0FDanJWSHVjc0hIWEF3
WmNscWRMS1JPQitkMjNwcXF1bUpFbWp0TUUNClVHS21sUFdIZHZCWko5a0F1RDE3bDQxZDN2ZzdF
d1M4RjRYNlpNbGRqU0pRVDVXTHhDb3k0c2ZJVFRHMg0KOXBjdzVLVU1hMDNvSTdYYklncWpaWnZj
RTFYL0MwM2FrQTAvTVdXcmxMTWo0TzJZMGd0aUFWeVEvdHYzDQpkSFNOUVcwQXRJeW1XZnB3bXBC
clhzV0I3OG5NUHRrVkd4MzdrOXpnTU9RemtacEJseks5UUZBZ000TU0NCmZZeVliNUp5K3p2d09C
b2dwd1BCbG8rUFZVNnBQUlJnN0RBRHBwbktyMGV6eDd3TUZEajhQQlNLeWVSYg0KZlRxTkxaSFlR
NEovWERKelFlcU5yOGJPOWIzN2k3b3BYME1pU2NZaTNJd1ZVbWZDeGh5ZUcrUWZ5QlMvDQpZbHJM
Z3dwelA4NEVoVEhWUnl2c0NKcmc5UTFHV3FpMmRXWmp2MFBRVFhoeS9YWGlKZk1xb1dMd0xvTGUN
ClNwSzB1MTBzU1hyblJlRmhvNW1yWnlMVElxRXVMNnY3bWl0clo3TW5uY096NHFQY2NrM0NDd1Z0
UjBGbQ0KVTc3RGlFa05DUWpvVkJnQ2xaa1lWVnNabkswSk9nYkpKUHBKSWtVVlNBZ2RKbTBEYVp6
eGNYQlJvSlh0DQoyRGJpN2lMZk9ublk0aDl1OGgyR1doWnNhRi82Z0diaGU2ZTVRSTdCdERDdkUw
RnFGb2U1QVAwbGo0amENCkkyZDFHRUFnZjhWSENvMWJyMUFxeFRmZUZHckEvSnZQZFV1ZldoSGpR
Mkt2RWM3cEN1TlZWQ3lscXhDRQ0KUGxka0ZWWUZqUXFrV3NoSmFZQitoem9zVjZKeDFMUm8zMHo3
dkxjWnU5b2VOOHFXaks4cVRRZ20yS0lODQpDSko0OHJ5TE1PemJ6SERUcElPQm9IR04vcXZaSGxE
UFNjZDNpY2YzTjVpMGw4YlBPbGNZT2xrWENxUmsNCjArM2xwdGs5TWVMbzdrWk41NXc5Mk1xT0tS
enA4VnQ5eEJ2WnlpaXgybjFoME4wS0hQNmlPQ0hqRkFWTw0KOHByeFNPYzJNeXVIeXkrYmE5d2JV
d1lwcHltOGxpNm5BaGZIN1ZWUzY2YXV2VUlLZkUvWXMwbGFtL240DQpVUHp0WjNKUkZhSzgwNDlF
bjB6RDQ1UGdGMEcwckUxZGtzcThxc3ZkTXlCdGd4SVFjRjdkSTV4dGdpZnkNCjZHYzJwbWRyOXA0
NG1oVURxa0RuZjE3RlhPcWJzR3FVbkxNcGZIa3VFamJtUnRIZGUyT3YwdTFYUXI4aw0KcnMxQXhp
ZUhEcTZ5ekd0aDJPa0VEQUlEa0VhSXNLTk9tTmxpZkZQRCt6ODBENElpakpKdkJMbmhDNTFwDQpu
QnprMEJHc3UvQkErY09ISEpYTkVUTFZpdE0yM2JSeEtQZzN4UHpQdjUvT1JoVmQ0WnRKbUdWcGdZ
WXENCmRzME9mTnp0QXB5MVZKZWJCb3o0SFNOYUM4MVBNb01aTWJldUxJeWErTGtPZ2pNUHhKTkJY
QnpOL0UrOA0KSVg4V21IaGtzUUxkblBEblpscGphM0xaTWVrdzlHVFNJbXlOLzNnZWlNd2VKbmor
aUNYZ05UcWc5SU9DDQpEWmxIQ09VQkRQYkZ6SWhmMGFZWlpOYXNneXA4TUhnSnJXQktUaitVa21p
NHY4cHZWcGtDSjJLQnBJUWQNCmhXUDFHZjRKN2RtV01YRHhvS0NHWk5vdzRFT203LzNvVlBOaDJH
alhSRXhJT0NuSWgwc2QwcFkxYlp3cQ0KNk5xYUVRVk5LdEpZdG93T05taDRnN1IxUElpekRud1Bv
OVozZFlwRWlaREVVaTNhRHE0M2lWR0E0dTk5DQpFTWRUTHp6WmVNbnhFakRrRjAwWjZPdkViUGlQ
VldFZEpGcmdmTjdNNEdXRUh5YWZrVllHdC8zSWJlM3YNCk5Gbkc5TW1MaG1uVDdsWGVzeFYwWGdn
bEUveGVUOVdYMExhMFhMYnMzcnBrVU9NeVlIc2Z1SU5Qem1tcA0KTzY0VEtrYUl5YkxIc3NPWHpE
NkFibXBlRDBobDQwNmFuTUh6M0trL1VKOEZPaGgxZ1BDU1dibm9ydFZUDQpUZDAyN3ZtSnB5a3Vn
OVVsaUp0UE1Eeng5UStTT3NTaTNMT085bEduK1p5SjViY1JNQkRQUjRpL2k1SEcNCkdsTHBRS2Mw
Yms0ZUhWeis4ZGNVS1pnYXFkRmhZN1drbk1OZ0pRcjluZ0pabHEwRE94bTdkZHp5S0xUUA0Kd01Z
blA3OTJzWXVlMzdJQVZGYWNXM29QY2w5Rm5BN2gwYmxmMER0M2hnWGgvcUs4T3lNdjN2RU9VdE43
DQp6emJUSEU5M1RqaTd1V1RWRGpLdG1Ib1pjWE13N3lCbXZ4NkRJbDRReGtucS9KaDd6YVNvRFRv
MzhZdHANCmRvVEtBUXdPaTJEM0c0alBLY1FZdmpZSWdJQkhLdVlFTTNMWnl4YVNCTSt3VTA4eEli
MEVFUnFoalVMZg0KeUx5eE5mMXhwaTBvSlJoNW9PYm1ML1RudEpkai9ZcVBPTHlXeHRNbTF4RG1P
Q0JKVzhjL0VndlFSeUd4DQpUOU9UV2NEZzAyL3JRYzFaUlhJUmprSHQ4S3JGb0VEVTluZzBsbzF6
bjlZY3U0bks1d1R2RlpBZlB3RFgNClFsbkpYcmtJd2hkWHgySi9MNjB2NUtLaVArZEVhWGNheGNa
dXIzZFd6c1dPNGp3M1B0Y1BKSERIekRtVQ0KTXY3amJlNXJxUXBLUWZJS01SMFJHRXJENnRUVFNO
cU1scjhHenkybURLL3MrTEJ2Z25kdWVEb2tpYWhqDQpXNVNGL3MwanZOZjBEbkNQWVhtSVNuVnNj
ekw0RzRTdExnaEpMb0wwc05ab2dXM2pmUjNnSC9INmVHVFANCngwdUVPUmtKdTRNTXk2TVhCZVNK
aWdIZUNIVFg0S0dGbjlvZ3l0UjRScnc1ZEFwb1laNVFIc3RuZVpCUw0KOEs2eUtzRnVsODFWTHQy
M0J2eWc0REc2WTJqWHE5VTBWd1U5RW00cDJPcWZrdzExcElUNFJlcnZwSE4zDQo4c2ZYMDk1dFNt
bG1oQmpYS3VvOFV5K0Z2OWlsYVVsMStvTE5Relh6SVhkcXl3NUVJS0FZazNlQ2RhSGoNCnZFdkxt
VkFjUEJod00vTHNhcmJ6Nks1YVRGTkh5SG02QmZoVXdxZXk3M2hLUnZ6N2FoZEdPT3RaenlXag0K
RGNYbzBEYnBkZWd0aXRtd0U1cXV5OXJhSTdKaTYyWG5HRS9UM0YvWU5vS0c2Wi9JMzVkTStrK2pD
ZGZ4DQpwU2sxRTB3blVzejlhSjI1R0ZFazczb0ZnSUJYYVo0OVpqMmlCZjZrczZRQnM1SlhGd08w
aXAxdGk3R2ENCkhBVXp2M241NmNITTF3ckJjMmpnNlkxb1REZFlUVU1wMDgyV29oeW1nMU8vczV6
anIweFV0SHJ2NktJRA0Kem9hRUNkYzdqeUlSLzBYTHdmS3RtaGo5c0M5UFJ6S3NSeXE5Y0k5L2tH
Ni9nakJhVTdCdnBDRnZhOTBNDQpmUmpqeW5ScG9kQnFNbXhQYVBESmtEczdRc1AzNVd0Y1FSbTdI
VitxVmdKMVVPZ2N2QUJybEtSdVY0SHoNCmVYT0J4cEdzb3ZJa2dUZE50WGdXYTh3aVpJYzRGaUdv
U091QTgzOXcwVk10L1o0ZkpweDV3Y2JRcE5ZMg0KZDVRNnNvUzBxOTh3d2hoV3lOZ1FDbGZBaWZB
ejllT0trTEVXTmhjWEJndHY2MzNrbHVpV0l3bUJmcEVzDQozV3B3Z0tjdXIwWTRBSTF5NEg5Q3BX
SHpoNS9vSjZFTkJGRzBia0RjVURQMmh0MkVXRjR4ODFWQmpzcjENCk9DazRyMHFubHRkTXNsRm1z
VzFVVjJJUGkxWGdtbzlHa0owdDc2NTBOV25ncjBVSlR3Smp4TnFVL1JCRA0KUU5YVDFjcEZTSHM0
VjhvWnZuWGZWdU8yUU5qUHRJT3hlZGdNeTV2SDhzeW13YmZGcE1yb2NTSTN3TlFDDQpnMVo5Z0pM
bnBxOTBtNS9Cb3lTbDgyL1NqSmZTdG9tM1Mrd1NEYXlJS0h6QXVkYTdZdEtYdDlPK3pYWWINCkhy
a2N0a3Q3Sk5QdUxlRWluQ1NNYlUvWXNrRm9jbDRuQmEvWHNqU0duck40SUxkSFZoYlBSUGpURkhO
aw0KQ1ZVTUVrTnRxNmVzVW8vUkJ0eG5VRTBEeTJPRmxQaTVUbURvSkVBc3J5czNZUGxBdUlRLzBN
ZEMwQnJ2DQo5RXFqTFg4cUd0blBydi9kancyVGZibHNjZkNzQkhycTFESXlialNhTkVZQWtheFJI
YTlnaENra1ZPMjcNCmZvZXVCL1U5RmpSMlY0TElwWXJlREovYngvcEsySmY5ZmR2Z1ZIZUR0NFpz
dHorWDMwVWRMbHNSMmhiVg0KN2Qya3BwWU5CVDFlY1BjV1JHOFgvRUZsTUVURGRGR3N6RTAzSmF2
Vkt4d2FUQ0orNVJVb2N3dy80Z29wDQptRUlSQjJkaU8xV1BHNUlqMngrNWYwSFBqajFJMlZxeE9x
SjVTK0ZrVyt1L1BSKzhwdElOL2JoMm5uR1gNCmZ0Skk4VnJoZ0Z1RG5CaFQ2cjhESXJBaGx0TDAv
aTVtVkxDYmxyN2VxWGpvUzdrd0VnSVI0SG5zSEIzdQ0KdXNGMnA5VmFHZW9IeVVOaDdHMDVkUi9r
UXdBaElaZVBqWEUyRmt1RkVLbzEzcnp1cUxBeGtlMzBhdW9MDQpXWjJ6SnRtelp6dHlmc0RlOEFF
clRlcE5MZUxNdXVUanRCVldrS0FVY01pemZxNEREVVFPUzVZY1BXZkUNClJIR3dtaDlJbGhGVi9K
dmhyckhrc2k1K1Fubjh4c3VjSVpQZ3FCRyswY2ZCK3NKQW9CVW56SWNHOFFPaQ0KSFBvQk14K3E4
UkZSWHBOS2RrQVR5UnVXM3kzbGFvbXk5Y2wzdjJSWFJBRmNjbVFMNEIzVXNYTDd5a1RJDQpqTDZP
eTFxT29EakVFcEFVVmF4RTRTd2RPTHEzcEFvbXBpSW9FcjRMaDdZOTdoQXE1U1I0YkxMRWtUOFcN
ClVtL1JYcFNybHVoTW9iRGdYa0ZUTXN6NUt5ZVFIQ0VDZU1pa1lHMTlEQXA1S1VBL01vNjNoYnQ4
U21HeQ0KVC9UL2MyU21nK21NbXkzU2FhRmJuZGlKWWJvYVZJeDRUdXo1a0E0MHR0NnlxVkNIbm5B
aVZSUkUrejJmDQprbENiVWd3bGU5TTByNEdCaklDa0ZKR0d4aG1KMmRISGJWK1JxemRTUE9wRGY4
Z0QwWkJwYTdURHVwYkENCkNKOG5WSkxQYXNyR2grYWVGRkpHdnRKT1duMS9SQnBXZXNqK2U1UFlK
QlhSWlFVNjRmTFNOYmkyM0QwSQ0KZjEvY3VhWXBXY2h4YzEyM0t3VVcyVUNIdDJkOUo2WHVES1pm
K3ZSYkF6UndLakNueUdobHZ4djBCODYrDQplQWVDbHhOeFROMWJnaEgvSFV0OFEydUFleU5rbVFD
OXpraTFqZW0wQyszY0JER0tmQkhaTHBVMWdWdWENClIvYlVCRS91NjVZTnhRUXB3T2dXNlVGTU9Q
SXhQakIrRzVBRm9lL0ZOOVhvZGlQcGd4ZExTTDVua1lvWQ0KUmxhd25IdW96UjBEMWJTQ1VTQVpi
QnZFVzNWOWpydDBqMHdxejZXVFprZ0ZLc0hRQmtPOTRFTHZEL1NMDQpjYm1sd1pBWTF1YWRIZU9P
SHpvZWs1dzMwQnRsaTJad2djUzVFQXBWU0JiNFh3eTJINEplNmc5dXIxYjYNCkJRL21ka0xmR3dj
TWh1Z1ZyK2RBMFU3WDREZ3FLUUE5TkdpcnJPYmF4Q2hNck0rcDRRbUxsNkVoRWFCSg0KZzBsTWdW
SGZ1aGo3UHpNY1hzMEpZelhjUy9uaGUvcXhxMTFrT0haR3BRYlNKMzkzQkVSS3NVZGJpaXovDQpz
REoyUVhmRlYzOTNVcHo0cVl5OUxGdVBNRWZhMEhXVldlWjI0N3RYVnFFOFNkUy9qTG1PcWhsRk0z
Sk0NCllaUEU3bENGenlQQUwwVXl3SzNqNk5udzFUSWpVMTVyTzA2VXZnK0t0RXdPZlBPY3lBOXdI
OWk2bkxUeQ0KeXQ2K2kwcmxVMExDcTMwTWRSVmQ2K3RUSW1XUlNCZ2o3RHBlZ1hIZWV2a1AwTlB3
eGJvQlJnWXgzcDNvDQpEYUs4a2FaaXMwK1RQYUNaelUyWnE4RUdHREdrK3QvNUpJaXBJK3hsWXBs
VTVOWi9ZaExrQTlEUVBnTWINCnQ1clI1N0hUUUdwUlNXMUxPQ1prdUNHYXk4eUpJZHp4NXpueDIz
K0lyYnBRVlB0bGF3QlFXbHBBcWRFRQ0KblMySE43bk14QjhuNTB3MVptajRoSTBIUm1qK0NQeDZP
UUZ3S2dwZTlaUmFtWFZVUFVsNkx6Z2JpZDFYDQpJUWJ6R3FJTE1MY0I5ZkhqTGdNZ3VkLzlOaEF6
ZGRUajJmdUpEdjdpak5nTmJabjkrd2djTDIyV24vWDANCkltb0FFRjNkOVFEODF0aXpSU05IaVNn
dkw5QmZkMWNYNjMwZit4WFp3V0xGWVRCM3I5UGV4ZDJKSXF5Ng0KNjBoMTNMbzZ3RFIwZTNGNExR
VEpudzRvSEcydCswYXZPVzZiOG5uQzZQV1pxbFp6Y0x4VG5aTzlWSmF1DQppcW9OYjdLRWtGMnJR
WExSdWROcC80NXNNUGEwWm50WUtyU24xbmtCNUJ0SlpvUldoYnBiR3ozZ3NhMGMNCk1zRkxEVDV1
M1NGYm9rVHo4TkVOR3RzT1dkNUMrbURqNWsrb25PajZOQzRGdmF5bVd5bVY3bGNIMHR6VA0KczBz
MXU1a3FGYmU3ZlFIdzdhUVUvTW5ORWExc1ZoWmpmaTBCSzIvVXVvVHBzblo2Z2Vyek9PSW1NeWVX
DQo2aUV0WkU5NWpKdlZPREFrZlhBbjdnRGRqUXE4bTRpSE5MTlJkSU5SWWpYWXFQa3ptY0NDOStR
TWVza0INCldoUXh1WDR1V05IQUx6bHhxczhYV21PNEpxbndmK2ZhR0VXV1RuR2ZLMHhlQ1NmRE9a
SktXQUVQNEhrSQ0KdGhxRXRiODNwSFFrL2pFeWNiaWp2Qm00dW5sd1ZqR2NCbFVVSHhISUVMandM
WU14YytnSXJ6ajNYTlJZDQpGeUpJaHhJelIwWGVOc2ZmOE94L1Voby9XVzBtU2xnS0NNakxEenZx
VndXQk4zRjlISXA5TDZQT2R3bWUNCjVSRUxnM2wwenpOMGNoejNhekpSMHNrQXFmVk42eEpabGlh
UDNaUGJoSU5CQkE3dzc0ZzJXdHBDZzhqTg0KQUlEcWNSSlNyVVovUXE5dHpmZ2tvNzFRU2NJbS9o
QkdKamM3b1BYNWJjZEZ0N2FVY2hXOU5TZ3dhQXdXDQphRE9ROE5OQ3A2SlZRaTRUVWU4eXNnb3Q2
TDNmUUxLT2Z2RkpjemhwbFNMMnQ4b3pkTEx2azZoMTNzRk0NCklZdDhpeVIzSHhNanNaMTFtVkwx
OVdIeFFLN3EyZi81eFdCb09mQ2U4SzBMSkEydmJ4UkZjbmpzSEVhQQ0KUWp0SEo3R0hNUEZ5Q0hF
WlJ2Qk1RUk85ZWIxK1dMNXFZN0lnYjdBZ1YzQmU2MDk1eHgvNGpoZTlpRDhVDQpnUG4zakJhTU5X
bmxCY0FwcjRTZzRsaXRFN0tlbUJ3NGZIbHdwVk9hZUovMkd5enh3cCs5ZmRnMHJ3dFENCmFxZWRr
aE1hWGdpV1IxRmEraGdNUk9kM0NLSDNDZit0UUpZQVlXUzdTUG9ZZDA3ZXhzWTdCMUFUNDloSA0K
NElvT2E0OVdBWTVERWhPZUtDNTZuVXVRVTFaOEJaVG1PbjcydmtPVWg3UG1sdHdjT1YzSDlDdGd2
L3NwDQp3Ymw0M3hTY0doQ2E3VEZKK2NUK1Q3Wnc3UU91U0t2WktkOTl5QmVVa1c1R0VFenJLRGhE
YVB6RnczSC8NCkE3MjU1VmxPTnVuQVFCVTkvU3c5eS9seElTTkNUdXZ4SnFjQTNBM0dxZW9ZSkhB
SldJWXZJRUZ4ZzEyTA0KTWNDTzA2YndreWpqLzNoVEhCbUJVUDNRT3djM3JXTnltVmxVdU85TzNq
RWZhcVVLOHBzc0VUYTlrUjdQDQpCV1IxV0lSQUMwSzFBWmsySXVXdWowdnk1ODdVelJWV0lqKzBj
OURuWXNEM29uckp2MytwMmJwQUZtZXUNCmR6K1VGRHh4UFpBTWxlSUovaUlNVG14U3gwdlNQVExN
TnQvdVhmM0s4R09kN3QxSHRmSldsc0lTajNiLw0KdTl6M0MxaG1yZDBOc2ZpYlo4S21yL0VVanhm
MDhMaE9ZRkgwSEtYYjQwcFdobnNKU0dpZnlsQ3gvNmRpDQpQRGNmVlk2OXE4STRCcjcxaEhXbkk4
UlpBZExNMGVNMUUyZzM4NFhZd3BobStkd0M4Q2VsWkMwV1RwQTYNCmhKQ01XT2VuZUdXRitCRXEr
bUV5QjMyWTNJc0RPOHl6Q05pVVRDYkt2S2hXQlJsdHFkc0hIQzZUZzJSMg0KVzN3MmVaWllpRzJs
TnVWaVlZblZ1MkU4QVhuMkJLK2NybzdQOHltalRLSk02d3lWZU9KQWloaUFvaXVyDQpqS0l2SkFK
ZGFMRlJFYmVYZFcxd1RYd1ZpWTJPSHZPRFluOXB2bllSa2VreTM0UjNHUjFaN3NrV252ZEMNCk5m
SE1WUVVpRy9hai9FNGg4WVdrRjlKdnpOWk5YckpxckVDaGxrQVJ1aEYxQi9JL1AyZDdCeFNHMGEz
Zw0KV3VqdmF2U0JJTStMMzZjbWg0cGtOUXVMeFRIdUNQUU5Fb3RZVktjcEp0WjNVYk5ESFIzc3U3
UjFPRXU2DQpGblNCZHBxRDMyY2dZSWJMcGlnaVZjTlNSb2tBYnFkSXMzSy81VmtNUWRYaEphblgw
NTNKMkxxYVBsNGwNClhsQXBZZkVqM1VWRW4yRVg0M0dZZEZZaWduTmpJYXplTFFPa0FjMU9abzZw
UGZXUW9laU9xSHFhYjZ2Ug0KdzM0NW5YK1gvRURtVHN0ejBjdEJEajRoK0RYcnovREJ1dm11cE01
b3NiVUhIQTNic1dUWVhtd3h3YmpXDQpOdnpnRWlsZWMxS3VoVUU4bjQ4YzhqeUhWcjFLZDRwWmFV
QVJ2UDBFVnV1Z3hBKzRkQ3l5NlZvb0lBSzgNCjlVcHArb1I2cWxjei9sdmNhMzZIYlZGMklQbUpq
SFB2Z0NObkExSlNVZ1BFbzhyT3BQaHhISVhHM1pJag0KVWM5VlRXODY2cW9YSGdUNkcxYjBxcjU3
dGNIcTA1NjIwUStlVkVFeDd4UkZZZ0dEK09KTDJhMXlKZzRnDQo4T2NaWTVpZm1EM3lrV25PVWJR
MXhNSFBZK1lYR1hQcFRjUUVCaUhMTk5BNGZ4amFxVWhQdkdTdFdSMmgNClFVK1E5N05NNUxrMHZR
Y2E0b1BDb09DL0tWTEI5aU9UQXJnQTdvQlV6OXY4amJ1L0ExTjdUZEdiZm5jYw0KUXl3djVpb201
emRhMEd4SnllNGszTDJ2L1ZXZWdsOU1JbHV5Yzl2b1NGUU9wUEUyK3JFdHc4QXhUQ01ZDQpwd3g1
SlpWT0JPTDVLYzE5Nk9ldUxyYkY3VVlhZHpvd3hkcitvTkNhT0F6Sk5uclRnVWdEcmxGeVFTbGoN
Cm8zbkJNaGo2OGE0d1krelRlN2FuV3VJVS83bEhiS2pLeHIxaUt6ZnN5R0pjRUM2WEVxT2I1NlFm
cVFGSA0KT3MvUGQ3RmV6ZEtnc2NvMzJVK0liaGpGOTBLWWR6OUxndVd0c3BEUlh2bXB6TTFXTng0
YmdzdEdwbVhGDQovTGJzcTZKRWNnZHQyc3AwL1o4b2hOakdrSXZzKzNScndDc2tDQ3hDNGlaZUtL
dVMraXR6RktPelRKek4NCm1Vd1pQbUtFcURWNlFvUGp4eDYrNFFIYzU4SU5aRWRjVkdGSnZlYm5a
QkUvMStKVWNiTml4Y0QzdFpnaw0KUlh2bEkrbXY5aSsycFByWkdmK1R0UmIrQVpCYmg2b1czcmY3
VmsreUM0QlAyTkovTFpPOVFwRTdQWjJDDQpmT2VhMUtINURBTFFMcWNsM3diWGR2bllmRytSYzFY
WEsxYVlob1pVRHpzNWNINmp4b1hEeDYxSG5HNzkNCjllVjRJRXJmUkF6Z3RUTWZHVEJDTVJha3FZ
WnJQMUNEOWNZSFNsd2luZXY4YS83aU1vZUcrU0pSU0Vvcg0KcDZYOWxNZStHRmtXUkUrbmJhOHRk
OS9DNDZhWW8xYk5YWEJISnBibXI4TEMwaDVWS3ptZExxbTYvbkVwDQp5UVZJdkdsSTNnMlpVSENQ
TENVdi95SmZWM1ZSNXN5REdFQnBsR3RFWURESW16aUpkb3BxVWt3azFjQVMNCk5SaU44MjFXelRx
Y2JXODBtMDZ3VUlQUEhBOExhL21TWnZnZ25kazBocks0eFQ4d1dPUmQ0bHhwZXU1cg0KUkc5NGZi
U0F5L2pwZXk3WGhWSlozL1drSkZFOWx3QzYwWTJjeUtVM01UdlBYdnJKWGhwNmhWa05MMFlkDQpn
cUFnMC83ckhEKzgzdUNrTFBLdms5YVFLZ1E4VWF1OExwelpRTTJlN2kvdXgxcmtQSitNWkp4V1Fz
WnUNCloxYnlhS29NTzY1Y00zMU9NMGdXRGpQWlErSlRkLzVicUhJQ2ZBajVRQ0QxZVV1THFFa1NC
Zk01L0U3eQ0KUmRvT1FNNVlMRStNd2R6d2RZV0pab3BGVVprdFdoWXM3UnA5OSsyOEpzdTdzQ3FH
a3dYWXJSM0RWRnhIDQppVlhKbmdiUTEra2xuRVp1c29lZmZnUGg3Y0VUdHRFYXhYK1pGSkZ3WHRp
OGRyOGxjUndRdzFtQzZRVVUNCndXblFOcFBwT1BHbmU2dHRBN0YvR2pqYkF1OWNVNDRZbEZnUVBm
RStPUDhyazBJNy9DTnNmcXgrMzhsTA0Kd0pVZUlHWGJnOXpaWjhkRWRUNWhTME9LdWNtUytreXF1
WWlwU2pYMzBGcm9KYWV1aWx3WnJkWUIwaXUwDQpYUFFibWlac21sN2QyQ3M4QWgwL1BJd3R0QW9s
ODVPNXNOcHB4a3FoN0swVHNsMENlK0ZQTDdpTVpsdncNClNiY05yd214cG5qTGUwbExUMVUxUEdL
ZWRvVnRkYXpRLzJHZDZoK3YxUVhjVGo4bmc4c0tCdGsxeEdhcA0KT1FreW00Z0JXK1Jnb2hHdzJ2
bnR1ZmliMnRIeFFxaVo3NG1RTUVxWm8rVUFiWHlyZUdsOXY0MUZ3aHg2DQowaVFVZFd5am9ob0l6
MUxyOUU3NGg2RkxYZ0hQejdvVzd3K3V1NDY0WG5XVmtIYjU1anc1R0p1UUk1WS8NCmNWRjRjc0ty
bkErMUQ0N0tUM2xEZVo1ekxndkF4d1paaS9vc2NIK3RwSHdWOVNzNUNNRVh1OVl5Z1hleQ0KYkxH
Yko5enRvODhxUlREeldSeUdWbGEwN3c1bHFsNXZOTG9uZmxjMUlnOEYvendJejhSU256ajZFUzlZ
DQpsNnRrN0E1N25lRkdhMWFkYVQ2TUsxNFpYMFk2NXVENWZWVnFJd0ZmSmhMRjRobWlvUGxXdkZw
TGFQREMNCjE4V1lmeHlSUUQzKzN2K29XZC9uTWtFTHdBcDd5aUZrYVdwdUhiMlpPUzJkcUxuUVY5
OVkzUXp4VFlMTw0KZWJ1RFJTNTNwcm5hS1JZMkJTbDhYZjVCMndYUFN1Y0UrNVBtS0hjb2lPYjFh
NytNRkdETkdCc3ZrY0FpDQo0ZVJ1d1B4bFNYclBxNE51cVA5VjkrSzB3LzlqZGk5UTlkNFlPV0ZO
WUVPWWN1UmZob3M2WjBNdnFzVnYNCmliQ2U4aGc5aWNJRHRPb25ua0ZqcWxqZUVOQVFmU2o5ejRO
MHN4bThqOXo4ckdLYjUxbncxYXhrL1NMYQ0KQkQ4cWpOZUFNakFqVDk4NzZ5ZmZDd0JNOWw5cUE0
Z2ZMSSs4bkw0Rmg2bllZa0kzdG1qMFc2aGZvcWZhDQp6WkhvSjNobGU2SEdwdWhTaWgxaDBPR0VM
cUQvcHBZQ2ZIUEZEaCtwNy9GQzNpdW8vOGkxWndQRTJtNkwNCjQyekdScGN2WG9hWk5CNitXNkdy
VUpEaGovR2dvS21rM0ZGbnkwWVNIWi9Ubzk2SnJPNlJ2VkxpTXhwVQ0KZ0E2b0VGaEVYejNkTmZy
a2pGZVQwRy9TOVh5RUFKNm8relFCMzR4NWdiU0lwTGhmT2lKYVBTOUxuRlp2DQpVdXNGMTNWM3hL
Q1B2U3BqRHF5OXFnQytjREQ5Q2JHUllBV0dtMHE2NGRMYXkraGJkc21sZWpWNzNLbkgNCndnSWcz
TFVkOXNOWnUwR1JlMlNuVmF4TEdXRmhZMGRlZThxdGxRMWl3bEJ6dWxtY0NNcGNMQ3hzR1JYeA0K
Sk1POEVXNHI1ckNCNGVPM0dqT0c4TzFzVE1JS05lL0ViTG52NTJjcXIrYUdzU011Ty9jenpZMkRL
NzBHDQpGeDVVM1pPMmFXQ2JkQitsbEY4dkh1SGVteDlCUEFBUEx4QXhmR3pxdEFIREtHNWExQmNz
aExraUZsdjYNCmlwN25BOStXVWlFVVJ4REJaN0tkUitWMGxPQXIxZm1HM3NyN1lvYm1WSnR0cEVI
UTJvV1pDcit0M0dhRw0Kd0ovWVRFMjZPRFV5bzNhOWFvUUtYeUlkWUFSc2dPM0s4dnlHZ3NTMmUr
ajBoYkdxNXpSVmc1Y1FLMDJpDQpjeEpNNkljTEhXS2l1bkxoNE9JMjlSd2VDMElxcWdUa240aG5Y
WUFSWTZYUHFZYmxhdU9yeWVmTVJ3QXANClVNVEQ4OFpTNXpKZ1h6SkQ2aWUvR1h3UUNRR3Z4YlJl
U3A3RWE4bnJUaWt2NzE1R3dtcDhaRXdYcG4vNg0KSUVJb01HVnNnOHoxZmJHd0lrTks2S3Nyc3pS
RDNGNE1heE9iamNseVpTdUhEVUdZMFh5QUVrTjZ2QkExDQpNT2ZYVGFMU3Z2cGRYWGhObW5OVndm
YUN5ckRYNmZhVVA1UzBzcDJFMDQ2eXg2NDZCd0VwQXpnZ2JQZlgNCjhqaC9Rbmx6THpZbU1KNTVF
TGhyTDdOWEd6WTh4QzZ2UVZiTzgvL2pnSFRrYXdOelFCcTJWME5wc3ZZUw0KSDUrNGlNRDMzaU96
RXB0REFiWHM1ZldEdytqR3pteVNHS3NOZjVmcU04dUE5RHJIUXR6MkNCVG9ESTRKDQpKT3h2dDI0
Sm9MNk50WjgxK1pMWEpuVHVTM1VRa3RZQkMvcFhpcUt3dTlsK05zZEtZRStGY1U1V3pzUEwNCkVl
bHBvVEdHSm9qT291cUFJOTdjWnRZNWFxTGN0WGVEVFpmZFpyM2s2SUJ5bjRCeU92eWY0czFzWmVE
Uw0KYUxQTk85YUM5ajZVdGVSMGExazhDWkRrc3B5RDJpb3JQNllDcURUYTdpVEdSdU9RdzMvTGVs
Sk1TeWl6DQpiS01vTVdwUlU4ditGVHFKcWl1TURrV0VrZGpNS1Z1R2UraElQb3Yyc0EyVTZLOG9x
ZUo0QmtiYkVOQmMNCjZJcXk3bEZwQ1pQZFUyZk12eDBIbVJMRmxlSE5pai9ydG4rRTBXSFBIMVU5
aGZkblpmWHdaUGVOdjRjdw0KRnJCcEZlSDB1VXdhQTJxdnFKYUNBRGN2TllvYkxGQmE3Mi9TRm0y
djI2WmVQczh2Ull4a3ErbVBxTXNGDQpSVSt3RHB0VEw1OHRQWHdwaE5pL2hLNkZMd1A0UDRDVWhw
TVlRZG5yY2w0ZVk0dVdZVVJSYi9PdTRxbmgNCnpsb25CaUxaNUhKdno5UEZxQmFjM0x3RHlMTGdC
WjRqcXc0VFI2cmdOd25FRUV4dE9PT0x6R0pTZVZ2Rw0KMVM2bU5TUXNtY1JMaWF0RDFoUi93L2tv
d1NWYU12YUtTeGZHZENGcGVtajN6NVl1U1dJMzRCOGNaL3o4DQpMTFlDNnRWOVZWYUV6MGMzRVFM
WkQ4ZjRwUTRNUVhLbDFTUGw2YUFvYStWYTdSMVJZbDF2RUM2T2tBWGINClN0ZTNLTEZUNWUxRFFj
dTZQWG9FeFcxVGgyRnFJbXlHZE1NbXNncktFVysveHV1ZDhOQldaVkNiQWVOMg0KZkxGcy95c3F1
WjF0azBZdk0vdFhBOUN2cVJmcFR1RkZtRGtVdGV5aG83M2Zybm1kK09hd0ZqWXhLYzlYDQpFbGNl
MnBiazNnVnVpbzl5QWJBSmtpaDdEMkJRSXZhMkFTbGtUZnE3cE9XSTlaT2tHTjBlUDNTdzlKRk4N
CkFIUkFOM0FIendEa3VqOWJzQWJiWldYTGtLZnBJRHFjMlQwa0kyRDgyYmJYTHhUNHlzQmlqWG16
TFIvNA0KVTY5NWROTjNmTUZVYUFGZitrdFNENFpvbG1OcWVqNUhORThJSFU1aURTZnk4eVM0Y1dk
VEVQaFpOL3ZBDQpVMXBrTkMvOTdBcEtiek91NUZVcnR1L0pYS2ZuWnF2UlZ3Wi80Wk1GdGNFSDhn
czNMR1hoYmwvbDlqNVUNCmRoTVpDbVNWa1RjSkRualJBQXZORWVYVDJNWUpqUllCTys2UWFmQ3dp
ckwzUUdtRUFqcysxczVvT200ZA0KMTBMcG8reEVyVEw2TEZueFg0WHFud1FzQTFzaHpDdlZpVTZO
UGZtK1U1amZYZW9QOXJ0NUdENWNOcStHDQp0a1hvWmoxT0c4czZ1QTZ6WnlQVnRGOGFpYXdVQkln
SkFQc2VTa1djbGJjZk1DelE5d01Nend0bklpeWUNCnljd2VCbGJWQW5mSjNkWDU4WGVLS0xVTGJn
RW5ZTldmb3lic3lUa0RlVi93YXI5STJJck41SWFWRi9haA0KMUEvMnl5N1h6UEh0UzVRcnRSZDJI
alFzWU1QbzFFVVlaVzZ5eTA2T2NCdE10a0V5OGtkNjg1cGZyOTNODQpBZTMwblIrMzl1R1RyMVlE
dWRodEtha1g1YkNXNlJUWVZXQ1B1TlIwbzJkdWZNQUpidVBDekMvb2JhT20NCm9ETUsyalFMNmtU
TWhGb3BDOWgzeHdjNHVpUlVXS2RRZkFmQ0MyV0d4YjV3bFQyTWllTCtuWjBrdlJmZw0KYnIvUUdX
N0RCUzEvbjYzNndnUmRCOGp5WmU0aVR2NEJ3bUhEcStZczNJd1U0Mm1Wbk5PY1NRQXdGaEgyDQpj
TVArS1BnVkFkWlhWR3gxU2JyY1AyWkZXWHdPektjNjZySDQ3MWlmdG9WNy95eFB0R2h6OEtsL1U4
dUMNCk9KTWozR0QvN1pkdkNOL25JSmNsdnlPaE5ybzhZZUhhYy9sNXdJaFA2VW8xUnl6VzZoNXZD
WEdWaU52aA0KNzlucmdlb0VONHJDSVA1WGFTSWZtOEhTL014MUJ0VHpTVTV0bnkzeHNiRHZjZE5E
N2lsWEtnQ2ZKOHpxDQpRWDRSd3JQQUJoa1JRazZKdXNYVFRRNDhNRFRLV09KeHVWRkJXbGFwUVVk
bm9UaWhiZFNCdGF3TndlbkkNClE0bzFqQks1SVh0ei8rZXY4WkF3aGpiUnVWSXR2cmNFMGFtN3hZ
a0tGbytDLzlpOHA1Lyt2dXcrT1ZvVA0KR1lhekhDQ3pkalpJWFRQK1htVm1JQjdHdDlxUWdpNTNq
RW1kaHlwNHFvTXYrbk5UVmZqT2JnTHdXeFY2DQp5WUE1L3dwblg2UHdsVWtKOWw2NGpKVmtDVWcx
VUZTcWxyRDZRNWNMYm9IN0VFMkpmQnUvdVJGNWptOEYNCk5UaWNNalJ2MXVVYU1ydHYzUFFzZEc2
YnlndjNVNlZjbzVmaVRUc1BBa3dqNW5GWmFqeE5iU3UzWHphbA0KS2xyNUN0N1g2Wm96RllSdmRN
bHpPTituS1VvaXErR3lBREhoMXVvUW4zQzVtQkNTNk1LaUZ6TGRLV3BVDQp2Q2lSWW9idmJVbE5D
Znc0SDdQVVEveFNvUldiakZpa09LY0o1WUlMM2ZOakZuME5xNE96WisvQXdIeS8NClNCZXpjU0w5
N3VzUkNhamxyK3hkWG9VVHJJRHNNbXdIYkRoVS81OHF5Qy9jSFF2czFxR1hxYW1Yc3ZieQ0KanNq
TnNtL1JxN2VYU25pc1oxOHhiWXBpOC9KWm8yUUJORFVmMXdDVm1GOVcrRHVWd3BOSjlYd0psdnhH
DQp1MDB1ZVZHdWF0emt0NStGQnNaRGsySnMzRnpadkdpSkhuSmNjYUdERnVwcGl4d25XUm9oL0Zj
MS9DNW4NCktMbkRUTnNjTkFCL29aRFN2ejFLQm9lL0hoY1ZTR2dHeFByZlJXaGxvaDZiYzRtRFF4
K1NTMXpkTnZIYQ0KWTdyVllsc1lNYXNFb0lXQWdYbUE3SjZBN3hQeGhaRmNhd0dPZGlqNlpualFN
UnR1Tjd6dm1JSEJFQm9jDQppZFU4VXp1alEyekVXQWpXS0psWi91KzJWVkp1UnVSK1p0UGUxVXpE
NlhTUmt4UUl1WDBZSkdYeDRPSU8NCk9pSUZ0emszMWgzZWZvc09FcmlBS2dFWWFXK1l5ZHJUSzdI
VEhkQjN6VENiVUFia0NEV3pYZDhYTnIvTQ0KZ1c5a2ZKWlhELzJUQldTYm01UjZxbURpSHlQSHdw
L1F5cVlibDlqSnRTR09UMktpOVh2QjluV0RHaVlyDQowQ0daNkh5REk3WWVmMXY4VmhwYm53RFNN
akhSMEtYclo2QmxCbXVCNi9KaUFBNm1rSlNrbWRLeW9rSi8NCnJvWlVmM2NmY1dqdytQZFZQcjdo
WEViMEhXV3h2QjRUU09zYTJhdXdMUCtuOEN6bmdIdkQyb0c0VGxsbw0KL0ROTmJ1ZnZnc3Y4K3dB
MklvNE1yb0xCODN0bHJ0Ly9QOUhoLzNUUlBKeUVrcmYvUXRFb1VyT29qb1hlDQpEaVNMYXZnNENs
Q3czc1FaMU5vVExCUUlUZzY2UU9hZTJsZGZHZHF2U29JaisrdnByd25oaWV6cjhXS1MNCndqU2ZH
VnI4UW1MaWh6WEk3aENBeEZMRXNjWjVQV09lUjh5Z21qMzRkb2oyazJWWTNMNUlXeGNVMFRrUg0K
a3VvWXp3U0F0Wmhsb0Z1dEdNdEpLQVdpNTBCT1M4SFFoVkZZbVl5NXhLaXd1VHJqeEZWY0tRSnRG
UERJDQphSlVHek4rT1U3K20yVFlWa2tFbXRRdmdKb1hpQ3o1d1ZwNVJWZzFQdlZKNkJGZzBxL01S
QzBOWGN1S0cNCmFlZW9QNFFnZldWd0REME9uUGJxRGUrZzVUZW5qcFpuQzQ4N3FaUmVXa1M0Rkxt
WDAwQjNIbUg2azFEdg0KNVdQeUp5cGtURmpUcjUxN0tEWng2RGdNMVNyNHVRRllUWUpPdEpHMXQw
VXlMbkN6ZTE3NmNYdU1tM0EvDQptT3FNdFJaaWVNTmc3SHcvaVpsZmtYcUk4NzdBWGRKakFYWXV2
bEVBVnZmOEdHRk0xUVBia0c0TXhsOEkNCmhWQ2F4aGViMUJ0eGx0U3lLZE95OXFlR2RXQWh1K2Mw
VWJMcHhSb3pGS1dEa0RzcFZ2S1NGMS9YZC9UZw0KQW9Ram52cXY5VWFOQ3VmOU50WG5zMFRQRDNJ
Z2ZQVitlbFF2TC9zNWE5YzZRbldYcThiZ21DUlNqS2tmDQpPVk1HeEVXQVY5dzlMYWFnb2pwZVFs
L2xMNlovTTlseWdndVB4ekhsc3piN3VoSTJnNnQ4UGpGQjRXTU4NCnpNNis4QWc0aWN1Q1hnSVZa
YzVXMUNTamtKL0VCbXdGSGdGSXdJdUp4MW5pN0EwMmlOLzRQSXZ4NFY2dg0KRThxVm1tNWVxL0F3
U0NXNHZuSEI2THpaZEI5UURocWFudFBGeUlwQU0xZWptQWhaS0FSbGErMlpDWkhEDQp0aTV4WG5y
czN6LzNUVElyaTJpaEdJNlI2bmhDMlhTcC9ZYVg0Vmt1aENxZGtvQUlQR0hDQkxiUlVxeFANCjZn
Zk5KYndtYkxlelhKMEZhc1VoU2t1enVtMWdhRXVWNExHUzNwaVdPZEVvdm9aV1dGZS80bHRURWxJ
bg0KMlFncnhtSWRpOFZwU0RkNHE1bnZxS3c4aDhydmVvYnFIMUk5eU03ZkpyYWhFWk1NMmFIMnhz
aGlOeUNWDQpKbEhWNUtwV3ZUWkJ4ekNReCszQlpGQnd0ZnAwT2poY0hveFZKVU0zbG9wRzBBSEtq
Sjk4dWRiaWxZMisNCk55elNNZDIvWjZNOEJCVDJ2YkRKSFFBaXcxYjBiRnk5TXdCc3laU09ZNU1y
RkJKK0tLL3NHTVRyd3VQNQ0KL1VZS3NuS1hYQ3hMNk15N3Mzc09BSDBaVGFNTDhjUGxTTzl3Y1Jp
Q1Jwdzl4aFhHUUFRY1NkeEo3bG96DQpxZVg5QlF3VG5YL2VTQ29jUGNwdXpmc3ozMlpRYUI5dHht
TWVNTVg3RmZ4UU5NdHBTQ0NnMkhBY3VSakgNCkZudThRL2FZNFFIRWZFMVlQVnBQOVlXZ1JPSW9h
Y3VJSHdXN3loNTNOUnkrbkppRlArUHRWNGl4R3BDVQ0KRlF0Nk1jRWlYQjZxczEwaCtsTzdiZUVR
ejN2c0hDc3lGc1A0azBPL25sRjVLUi9UVUY0c0p6bHRUREpBDQpmQ1BFR3JoTlBXQzRjQnEwS2d3
K0tydDF6MmMzUWVUL1RxMThpdThpSUlrS0xZQ3NWTUxiU01IYUlybFgNCmZCd0tjaSs2MWdOYTVk
YTFwbVQ1UmRkL2tNMWNmVTUyK3BEbG1iQWppeHhJRG8rN05lM05rREhIeDNDRw0KTDdEUDlQc1Bi
OGw0SHlJY0Vka0g0Z3NLQmEzOVc3b0RZS0xYR3IybCtOMjNPVGhUcFVvc3pXV2l5dThBDQoyMU9r
b1p0N3dJb29xYVJpbWVmREp0Qm4yQWFyMzhHL3c2ZC8vUnJzZlZzdnVhR0p4SkE3QTVDMXl1bngN
CmdlTjdHZlc1djhGK2VGU0hXZ3hSL3JLM1FOZVowV2R3MldYR29TYkpwUmZIbWRVNWlwd2Zqciti
WGNtVg0KSmFFM0JIU0RaeVZuUjVPczZ5TDRvQnhQOVY2NnRMQXc4L2VMeEp4b3JTTXluVDNDRDZJ
c1pFREFmWnhhDQpSMnhZankyQVpaZlcvZTVrK0lzdzlwYUlrbUVxTTlHVm5OWDhuWWxadTFPbE93
Um9EZVViTGkvc0EyMWkNCnBSSllTWG16WWpzQ3lpL0RaT2t2NWFzNkpTMTlPMWVISjJFbmwvMml1
aUpLZ1NGY3FSdHJFQ202Uyt5dw0KUnJBM1Uxc2N1T1huSzBxMDYreTJpU2VabHVLdHZEUDBzQUdI
dXhKMEhWK0lzRVNTeFlmQ210Mi8yTFhuDQo5ejRadEZadG5WK0lNUVptRWpmRC9FMkd5VG9iQ0dE
SUJlVHA5UXJkYmJqRmVhWGtlVEJQcWY4b2JFYXINCnNSNEFWNjFQTFlPbzJIelFkOXR0OEhjdk9t
TWhDc2JzWEdtbUFEQmlyK0RtN012QWN1TGRLN09BOTI0RQ0KT0dIdkdKcWpTZXkrQmJkdTRFOTFC
ei9seHBxK0tvV0ZGQnZGR2IxZHUwWTF5aVBMTHRvM2xjbzAwU0NoDQpHR2J1eXZzbU1qN2VGZEwy
YmJHWStubnVsbVZFVXF5T2oxMTVvVlpCblc0Zm9aUjVzL2g2NXhQcTYvSlMNCnAxV2ZoaXIvMlpq
cTk4VmQ5eEhTU0JQN2hsWHVEMDg2S3ZPY3hiT1JjWW1Rbi9BSWlaWEY5cDE2T1RxYw0KMXVwNjJG
NWljc2hLUUFBY2pXajhIbjlXY2lUT2tTdmpXUkxPSzY5dGpZMEhVUUw3OFdLWlUyNWZhaTdKDQo3
d0V4M2cvNWM4ZVl2WE9ESlVXcXFmV1hoK3FLTmVEcnRGaEZuOStFQ0cxUGNpMjkwbEFISmgwWkFo
eGMNClNHSDE1K01CZWg2emdPVXNqTlhQd0RLVmhjY1o1czFpamRxOXNST25XVUhnS1UxQTR0Nk1C
Z3lhV3NicQ0KMWtYWGJmUEJGS0NiUW9Ba0NmeGdrdDdqOVQyMVN2MVExK2RIZk9BY1V3VmZSUG9w
bUVUYnhJNmNiK0FMDQpHYkZyQ0crY3doMEJnWlhkdWp6OHo3L2c1bmZYMllFdjVGdkUwa3FLQzVS
U1ZDQW1MZmdhcWtrNEJ6TkQNCmcrZ2pSZnA3QmRkN05wSDczNUhHMWlUeHkwL2pxVTlqYnRHOTVk
UlVpaVZ6K0gzbXVOM0xRUXpxajJMMw0KUHU2dlRCMm1LZWR6RFNJNnhHMy81V2FZcWJ5NUU3eEFq
OEplbTNTUmJSRnhwODBaNWthUkp1bkowQ0oxDQprckN2KzNFOVNwU1F5bHArR2x6ZFlzWngrTkVH
Wm1Va05RSzhvNlpRTDB5VnFIaWg0c0luTzFZYkMzamsNCmorUlQ4UnJ4U1pXdmRlL2k0eXdUdkMx
RUcvVUlLUittQkdjT1UyY285a1h5ckpPY0xkMUR2VUpRM0VZaQ0KeENYcTYwL2wyODJ6cEVWbC9P
WmhMQmZ1eWxUdzR0aXdPYU9hSm5Kc0EwbytzcWgwU293VGR2WnNuT1FTDQpKSnNFU01aUGhxcjdX
b2sycDUvajA4c2tFVjlJRklNTzhWVFdBTFNPeXVSVXhkUGZkek42RUxqRUszR0YNCmoybmtlNlJp
WmN2YVd3RWxxWXVlalR4dkRsaENlK3V6clZndVlUYWphaUJ2Y1o4Y3FyQmU5WGM2cFFpRQ0KTHhm
cG8wb2tyYVB6K1Zwc3dMbFgvZURsNU5vdTBuSUw5UlF5YTg2U25iVitQOEJkNXAwTFdnbFV4NlBo
DQpRaExkOXlxV2F2eXUzelZXcUxVMEZ4ZWtCWkJkZUVSQXJyNFRFbXAzcnZrK2xQWllURnYva2g2
ejQ4T28NCm55MzJCb0RUOFg2TU9ZNkJURHFpMG0yRmNzaXlRY0lKWXpITWgwZ2gxZ01IMGtLOWZV
SlZHTzdTeVBWYg0KWkxGbUZQREJaaHYvWHZiQmlHRVQ2UjZMc0F4Z1lMbGMvOGdyMThIZys3WFdJ
NTVNRXUvWWdENGlZKzUwDQprTmVXWmdyc1FFSWFuYkh3RklZM1JBeWlRVDA3VjBBaUFGYWgvM0ll
NzdLdVAwQk5aTjM2Si82T2NNdWgNCi9IN1FUcHROeVR2eXRKdnVPOUZOZnB1N2k4UjhYalY4b3RM
NGhMMXI1Z3owbHBUYnBWakhvdk1sSE1HUw0KakVyQ1hUZ3hiN21FUytvOGZ2T0JzT3ZEWmwyaklK
elN1MkQ0ZWEvU3lnZGlVeFpRT2hPdUtFSFVXMGFEDQpDb0ZTVkNCdEdWb3BtYS9VczdGRncrbXQ2
K2RGeG80UjBUL09PV1pPYWRsWnFva0RtaENDaW5qRHd3ZlQNCjJOUFgrRWN4Ynd1WmsxQzFOMmVu
VUU3dzNvdEdLWjU3dTY0UWxyRUFBNnFORy9qakJwSFlXdVdRSFlwOQ0KUFh0dXBtV3NhdVlyckVJ
blVOa0Zqbk1XUTdVaEY5dUsyVHowWDBjbWJ4bER3cFBMV0Fqei8yeFpSOGJ0DQpjNzhBR1praUpo
K0c4MDRqcDkxZjRUeENwUHRlV1QxcC9rS1dUZzdOVHZJMUFQTVlZTC9QT0s5R1JnangNCnVsOVRx
ZHNXODdVZ2U5dkNGL2FCaUtLelhxNnIzMWtHa3hDVm5UNnNXRng4OTJFK29PNjhwUmVaUW56SQ0K
dUJCajB3OEpUR1MySWJtUGVuVlJ1Y3NkZG8zTjJ5VWJwRkprQ3FDZUJjaDR2dWQrY09Nd1pRUTdG
ck9WDQpORDVYR1grTUxlem9UMkdHd2tVWVhVTk0ySzkrK1RzaWhmQXN0blBWOTRZcGlYSFVpWjc5
MlJITS9wWW0NCmxLTnFXbGZBL0l1RjBLcis4c2JlUDdLazYrclMzV1EyaWlURmNQWml4WStZVUJH
b1V0VWJCb3NvZ1NEZg0KWjJOSXk2S3ZMQy9jNEJDTzl5TzVGYzBUeTNLekJYNmRjbHdpUDdkVXBw
NmJDdDZVbE1IbzRCS1ArcVNRDQpoTVJicXNES3dkb092ZmY1RmhkQUkzakgvN1lPbGpSVW11OXZN
aExHL0JkcGRMcTFIdGxjbnlJd1RVUVQNCmVlR3VPWEZKc3NGa01OSS9ZZE5RMjB6YWJKeGl0K1k4
dDNJRkhvMk5NZ0xnZW8rYW5namdsQm1pclQrUQ0KZ2hZb1pOMTNmV3VUZnRwT09KYUNVdzllait5
NXBhQ3N5K2xPMktjUXR5T0g5NnNid0NoQ3RkdEFmWGpxDQpwRGNwSmZXeHByODlGcGhaSzRjblBs
QVIyTmMzRm5DU1htWE9nRmtXd21sdC9vQVY5OTNkUm84UjRzaisNCnpSWURnWER2dy8wbXIxSGhi
K1A1dFlHUXNkaWtPeHZ2QTMrOTZwOVI4RjlSNmxkUzlFSzQ0eUZXNjRuSA0KbVJmVVE0bUtTUUhp
a290OUdBc2FZd1Jsd3ZpSStaYnZYMHZWN2NVK1p6eGxTRzBhaS9MUlNGUWRWdlRODQpwMFZoTXRW
U3dXNVBpZTdnckx2YWZWRG1WZUs0NlJuYUVhQ0ViUGhyeWZmUE5CdGZ6R2NqdDNtR0VDNkYNCnNP
RUZLbEdHbHU1c3VEc1hLQjdRREVUZ3lvdVVhTmRSKzNkSXR2QzY0Sk5zVndJcVdvYmkrUTBxdzlV
Rw0KZTBpU0djL3JSSTFhWVNVbUdkMExjSlU3UkErVTNxajQvc25LejJ0bnVYTzJNdDFxMFZDRldV
SVpxcXJ0DQpOYlJINk9WV3hBVWxpYnZVRkk0SjVxN3BlQW9JRzMvS3p3eDlEZUpJUGVnTmRsOTVQ
bG5iVHNOd3loaUINCmY0REo2SmdHSmo0cnRxYU5OeUE0VEtUdjhTT1VYbXJmMWVyZUtpRGNDdFgy
aGt5WkJQQ090Ri8vWi8rTQ0KOW1mS0F0YmN4STk1OTIxcHV3YWttTzdFQUN6UXRMcFkwOEx4YnZi
VFdFUHNQMXpQUEwzaDlFbWlUbWMyDQpKbFZIZ1BxbTF4TTAzMnNKa3BzdW5mTjFKcWpVS3B6TXR5
ZGtjV3ZJZElCVlJpWktjVlAxeDF0SlhVV2YNCkR5c0xDY1RDTDdpNTR0U0J2NUk1YzF6VWtSWHRS
d1pPeGNUVTdWNUVUZXlDRHNRWENnazFBNEgxOHJnOQ0KY1UzaVA0YkNmZUplRnZwQjB0NW5pN1Nt
QmZLT1FmRVVzMVRTNitENk9lMVlBTThQRWh4SXZJaDR5NEV6DQprbzJ5ZUJva3U5R2Fic1BFRHpt
SnhJYmVDQjZic3JHZnVuWFdOYWViODBITEVGZkNYOEwwcTFiaEl0dXINCnJJUE1nT1lqTHFmdHoy
azdacGhHcnpvSkl1T1pUdTJpd3lLbys5RFpJMEZjRWo2L243ck56SElCYmkwZg0KOTQrZ1VhZVV3
aTZNbDZJK1BaK2NKdlBlaHJqckEvMW5sS0hUL0VOVHdBZmxpWi80dFk3eFJnMXo3M1N0DQp4NFlh
SWRGSXpMQWJnTkpiNG9EMGxXVEc0TG5MUEsxY1NZdEIvNVg2MUo0V1ZSeWI3Z3V3bnA2UEJyRWwN
CnhhU1pxa2JoZENUbHcyRC96K2NZY1Zxd3ludVdGTFc4ZVR2VXdjT21DK2Z6emtyUk9VK0prUWEz
Vll6eg0KZ3FuaU9uc1JpcmZvNnZhNWhaL3RPaDlxYUpnUFdka0VRZFoxNVAxN3hheG1vbk9wQ2ZT
VGZsYmY1Vml3DQp4azIxamdpNkozTW9ieWtwVDdPbzdQOGZSaFdvTDlSdTlKL240VmxmcnFCdGtL
a2duZXZTc1FocXBxUk0NClBBbEFSOTRQbTV2dnQyVDRybnAyMHZ4dlpaY3RVYmZPRDVmenh0ZnN3
cEl1WStSSml1ZlpSTVJ4Qk9NMQ0KMHNxb1RDeTN2djJOcndyYXdsaUJSa05VZnJsMVBKTDQ2Y05Z
cTA3QlE0bE5rQzVpVjZrYjQ4bkl1c1NQDQppTWhtK1RkcmpPM2xwVlI5TC9EK0lwWjNyRDVFRjhU
WUEzUmp4WjIzMVYyZHRpaTluY1g5OFN4c2IveUUNCmFNTGdlM0hnY1AwVzlIZXN2VUVyS2xUU2hx
S0orNHI5d2Y0eFFxUFFYRWh0bUtXait0OVBVeVk1OTFpWg0KYzQzbU1yY0hodlA2S3ZEM1pIZjQ3
Qk1RV0NnV3YwS3hXMmxkZDMxZDAxY3k2V21ZUlVVOFNiSDdPR0MyDQpNd3ZiTkVrcFpsTlF0OHRL
Q0JEKzVWUnhENHFESXA5S1BOay8vbjQxcHRMY2VPZHFTSkV3czl0UDlOQzkNCjY4VW9uNjd4dzZF
MlJMcnJuamQ4TE1hQVZiUlVEQXYzdVpEN1FuTXA3QXVoWjVFcGowRGRNZERWL2RhYg0KNWRKU0c3
SlZJaHNOMXNOdGVaWDY4aEJzZUF6eEdRTDNWUzRDS3p5bTk3eTFXcVNOVHhmcTlndDlYZGZsDQo2
N3hyYlAxNVFBUm42bVcySm5pM1JORkdHOHVzSVZNM1F5NFpnQTFYaXEwaDdpeTdDRTNPeE1HZVR2
aHMNCjAzWnJOS0pHMFFVcUF2dGVLbXpxZGNQRCtyTTRZaEYvb2ZKV3hWYVhCUTQ2WWE5ZmhzUkRU
SVkwYTIvSg0KWXBMMzIyaUdzc3pOM1EwZmxycWVUR0NjUC9zMGx6bS8xb0c4RzU4RGtFNWxQc2hj
TEIzNGRPeWxVVXRwDQpEdm1BTy9jVmZDaWh0bUpiMGIvV2tIUEU0QlB3MVAvMVo2SEUrN0ZIQkxP
dytUdXZjaG92WVBKeGZJeWENCmFIRldWSW5oME1Fc0QzMUx5cCtTM3ZGNjlScXJEQWdjeCtIUTNM
dVNYdmpBMWNWUDgxUTFlOXFSdFJENQ0KTjNGcWUyOUZnQkJ3QWMxbVZqK3VCbzNSUi9Fdkp4SWFp
UUFBZU5UZzdTVXNFcGVLSStlQlhhSzdwL3JUDQpLZHZwUmhsMnRlbUZDZFZHdXM1QXlGMTlXMitu
UUltczdtWXdTdzZ6dWRSUkZaamdCekpoMXZwTVNIZ3oNCnNtZFhaMisyNm1wTWM5YjZYWkkva1ZD
NXZXK0ZIcEltNjBLTjJNUmoxTkxqbk1HTXFVU293NGtSQmJLSQ0KTGc0VENpLzZpSTJ5NkVsU1M3
eURCaDk2a1h2Q1RRUWNsd3kvck4rSWlOazNHSEhYTFpudnk0dHRRaGs2DQpzeUFhbUgzNHVhSW1a
OTFyYW5oMmM0K0sxaFZaV0RpczAvSGp1bitYTUorejJESnNLODh6Qm9yUVdSWVUNCmhadzJYSzJO
K1ZOeU8xWUViejM2bEVNYUVFMVdob2lUd1F3eEN5bndHZkNObmRxQ21BN1F5eHJLN2JmUw0KeW0w
Yk5oTEFsVlRYTTg4cndIK09UVzJsOUE5YzJJMTYxeTdscmxnbkdKSlFacmxsOE1nbVFyUHladUVs
DQpoUHIrOW02NUVvellUaXh6ekE1eGpMOUo3dC9rNWwyV1puVEllcEt6SVFQVHEyYzhCeVpueGFm
Um9sNkwNCnJpOGt1UzlnZ1B0MWNNZytzOC8yQXhmWTVIT2h6bVk0V0o3RTJUeUExTXhidjZaN1Yr
STViL1FKSnNrYQ0KbXg0anZlTmc5QjR3dmxyUnRPd25PWGtVRDJVQ2NKMDFUS3JJODdWOXh2TGpN
M1BMaU83NElFZU1ZK0VZDQpVVzNtdGZ3WG1IOGdJdVk2L2tpdGRhUy9XZlhtTUVUQlRHbXVoYWxw
Ti96M0xqK09DVC9BUmVnTjlnOFANCnl2UXEyR2p3dW04UGZsa0JxOEFtRG5RcFZJVnN0SE8rNlNJ
Q2JpWHZJaDN4dStXRjRhaFg1LzA1MnpNOQ0KY3BuUllPcDFXWHRIclNLUjdlYXI4KzRqdm1JQ2JP
alR1VDBBMXJzeko3Rm1scWxab015S1R1aXo4UHBIDQpYcXZ1UkI3dW9mOFI4VFZwVGo4NzZoZ0J3
MW1KZUd4MWdETjlJREx0ZTV6bnMyQ0N4ZHpKR3F0MWFCREkNCmJBM0ozajhmaHk0bzltNjdnOGhP
QlRSREZiZTV5ajYzNXN3SEdVUlQvTTRpOGNWaGRub0R5VHIxc3VHaQ0Kd0haOUhEUmRKK3ZDV1Y3
dFlqNFpPOHlXSytORW0yREVZT3QzZm1KVFNmR2dZeSt5ZEhueGtRT3d0VERaDQptcWU1MFlkSEND
RWM3dURKT1laVkV4aHpJeXcwb0ZNbk1nZnY3Q3ZMK2lJZElhdWtydEFlVVpxMmNaOUgNCklYQWVV
Q0JETGhQdzViaEpBQTE0ZjVzbG15MzNDNmlJcjN0T2hzYi9SNHUrdjdEODlsdk5EYTk4T2lzZw0K
Q3hVc0l2aVJPaFhXTmN4b3QwUVIyUzhqSDVPeWtXOG42UlJUYnFUNnNlWTZNVVVWcVRkeVo4VEFm
R0RuDQowN1dnY0xMTWJ0SVRRUUhvSFZaOHI4U0szVzFYcER5V0EyckJPYU1qV29QcHZBZlhldUtL
clV2QUxUU0wNCkIvRHpiTWFWaFdCM3YvVmQvUDBrYlhSZk53cHV5SEdtMFUyYmNpUWY5aTZGektT
TUJLN1ppTkV2Zlhuag0KVVZmUEtSMGYvRkZoNlh3VGZvRHNTQVAxQ3FwdkJhK0x3VjkzL05HMmpt
cFBMUm5rN2lXeWJ5WmhHQUpLDQpDdmFxV0lURWNVcHdteEV6RlZyeHEzSEtOaytzMzNhN25CRWE1
cmQ4dDVJSlp5Kyt2aEZpUDU0UmI0QmQNCllHRzN6UDk5MVdHYjhBTjVJeU1CellINlFNcytQNWts
c1hjbVRpeGxnVi9pRFd4TjAycUVsNVF0R1ZkNw0KemNPRVJEaTVwVUVSbDFlbTh6V0lsVkpBTkZp
NVR5MnhwdzNPWUN6cXp2UUxaZ1RKZElIdy9KN2JqdGNyDQpZUnErUzFXVFQ1cDMxMGl5SDhQRmpU
T2g0RnV3dUJZcG5LSlB1dG1HT3VVUmMvczFyQUdEZmpFYlZPdnkNCjBNejUzYlRXelRhdFVpVTRv
Uit4ZHFvTG5UZ3p5UWZRZzdvcnU2dEM5SHlJM0pTbElic1VvRXFpSSt4eg0KVGJUWk9zTWxZYXF3
NDF1SjdLbG1ndC9lL21KY1dFaGlOa09EU2R2Y1lmdWx6bE9wWWtIT2hNc1JkdTBoDQpYenI5Z0E3
dnEzRS95SmVzdzBxeE40eGExQVQ1U1ZHM3VVcmhFUFJkRVdpZkNhLzFvaFplcitzcnVoc0UNCml1
OWJGNThKWlF3ZVM1ODAyM1g5Vmh0b0RDWTdNbDJHbjg3VTkyaU9uSjBUdWJpbkd4R29DU1NuR1hC
ZA0Kb3FyOTdMbzZGZi9DRVFGeEVTSm5pVnZTZXlpcndtSkZsc1N0SVlXVS9UMHArU1prb3RhbHFt
Uk9DZ0dtDQp1MXJ1bnVQQ0k2OHAyUjU0b2FyQ2dWTWJxa25LbmV5cTVXU283YTZ4eS82OU1NeXRu
azBSdTg2cDczazkNClljUW9mRG13ZWY3ZGRFQzdJaUxTWmk1WkQzVlgrV1pQRUV5S1prbWRLVUsy
MTBmQkQ5VTZPNDNTODNkdA0KaUVHUGp2S3V5SzI0cVJuMEFGWk8zZHo1R0hMbWJQOWZaVTBpSERG
akZRNDNKOEp3c3NMOU5TOURSUEU1DQpSRzZsUDgrTDhramNyM29qWERaZ3Njc3JEc0dKdmwvU1J0
YTZ4d2hESkYvbHZ0ZjdYNDFRcThtSUtiWjkNCjJlNldTeHppWngwcmpQcFd5SlZ2U0lYcmVJM3Ny
Q1M3Y0RIblVRMWxKVzhIWUEyejJjZVdpU3R0czRKbg0KRlZiRitndUtucDFMbk44TFlaWUtLRnhw
NkJtbGxoeUpNUlpnSTJhT0VBUEFtYS9RRUNQNkxRYy9iSm9hDQpqL05ZR1FxaWl4Z0F2SmhuZXpR
Ty93VXk1K1FkYnlUZ1FjWFF5MkF6N3Q1b2lzS0gyNDdoQXRCWm1BWE8NCnE5OW1BQnBhbm5YUUpD
R242QitFTXRqQnYrUHZ5dzFSMENaUm95bXAycUp0U1AzTnE1YWNiUS9FWjhwZQ0KM1cvMXFweEZD
a2VKTTJUZ1VDSHdwNTFvWHpGZ2YwM1ZkVzhYUmsyaGg3c1U5cnlWanIxL2dSc2RvK25YDQpuVllL
SHY3Mk9DQkxyclpleHBVZURsOWF1a1hSK3YrZW8vTlI5QisrYlJ6emZtZTI0L0hlRXlpWGpLSnEN
Ci9QeHJzMktRMENoQjBHalJGUTk1SERUSGMxK091TG1qdVcxd2p1YUFLaXF3WW5za0VqNkVLeUtF
blUxRQ0KVTZGZEhFSTh6cGRWSkFFOFh2dkxlamUrTG9vZ3FLdFJDMDdEbzhuVjNTQ0NtSGZUbUwr
d1R5MkFUZnMxDQpNRlNrYTdLUmZnL01oY2JFc0paL1FTeDRXdDJqVVFqRG1FMUNFdU5KN0Q1cGFl
WC80eUF6ZjNjNDlRRzINCmhOcC90YkxZalgwdUNVa1ErejZ4NHJtUEdidTFuZlk1K0RZMzY2QU5M
dndaRzJlK1JzUzZHMFFPT2RZZQ0KQ0dxTmxvQTJCdmsyQkJQQkQ5UHEzUkFqcGE2ZWNiSnRFV1BN
QlF4VjY1OE9OSWpUeVJNbnJlbkdiL1Q1DQp6L0UyS0VMNFpiRk5MZmN3S1l5UURwU0NWcnM2Q0hh
MGlGVjY3ODd6S0NWTUE5bm5BZG9VcnVyellvc3ANCmtabWd6YXNUYXhST1U0YlUwYlFUWnlYRjNU
dnpkb2RyR1I1WElJdjAwUjlGdnUybWl2SUgzaE5YZ3BqOQ0KdHBMUk1LeWMvT25XTEhMYUhHL1Y2
Qk1yMzAyVSs2cEZiS0dkbVFIS2htbEpET1BZVFhPaFJycFpGQW1tDQpON0tmWFRscEhlL1E3WUNJ
NG0zR1lMcE9vZnIyWFNCQUJwZWJaYmVTR3Y0dnN3OXQ3U0RLRFdiN3JUOTkNCkl4MkhMNndNbDIy
eitmdkt1UVFtdHNVZVhzdExVVVVPdzQ0WmpDR1lnbXI0cE4yV1hwSkdua2Z6U082eg0KUW1TODNT
SmRRMWV2dmdQUDJ4SWh3MExRT0txb3JPQWVveG5VR2p1a3ZWbVJxa0F2TUZkQW94eHFaUHBrDQpG
TElUYWxUeDZlMXdTWXJKaGVJQXZyVysvQmVtRzZVbytwK1lSWjh3OFlxektGWUQ4Z2RGN3paTHBR
UmwNCnFMRU9rRHlGZ2dTaUo0RWNmanhUaE1IMy9NN3NNaDhZbTN4N3pMN0ZCMHl4dG9idmZyUUFJ
UHdsMkcrYw0KVlhWZ2tjWGE5ZTFhaDFtM1FyZnExTEsyTjdzTnJRUVpocFp1VEY5Tk5ySEZ2Qy9C
WlVydW1SVUNPdlQ4DQp1ZG9ONEJQVU11YmNlYmhIL2NQek12VTRFYjZ6ZGF0NFB1cXZKcmFjR2lV
eS85dVJ1eEphSUlZeG9VWDgNCkt3UVlYUEVqVk5wQUpjTHlPb1NUVWU4TEYvNWtKa0RRZ3BLN2hK
WXU4UTFCQWllQXRqcU5LeEdOMGRRbw0KTHo3U2k3eHIxS1JFQlR6SExpeWRLVUI4QzVqY3FGUEtT
dDhSV2hBRkhTbDRRRnVFd1lINytESXFxSnFPDQoxVzdMTGl5V1JKQ3A5ekd6Wmc1U0kwYVFCNDBi
USsycnNrY0tvaXR6bmhPWGZZemZSV2xZZFM3YkNZakQNCkd3S0JGR09WVGcxek8xcDV3Q25QUzJI
akd5T1kwYWV5dUxsd0NFcnE2b1ZVZ3ZSdFA5bVVXUDRBNHplUQ0KcHU4eWczb0cxR2RrNEJCTlg0
ZW5ubnc5NkphZGo3cEpQWWpEcWdpUDVSUzBMaXNiazBPMmlxeUVkRXN1DQpId1BHRWtla09Fb08z
VTBoak90V1gyVHB3dmIrdWR1Sk9XWEpTam45eElYblZnUlhKNnFCbHVIdGxpZksNCldzNWhQSzhn
M2hmczdORWMyVUpidU5Rd2lVbkQ0NGNjcGwvVFBhR1ZqRmMrZklQcExDUkpBVWdLNmE4dQ0KWUp3
K3pDWURVeW95Z1ZKaEtOWVlra3FXcW94NmljQVNsbjh1SXl2VlR2ckZqT2E2SlFkQmZFK1EzaUEw
DQp0VUNlc3BONVJUV1hGejRQNWxiNWlBMFl1TWFLTXp1T0h0ZHdqZXlpbHRUY1J4c1NLVTNTQW5F
bTRVdHkNCmVISWdqUlJDenYzR2xjVDZZcnlaajdnSlc4REE4YnBTbE9lV05Cci8wMmFnZjFoK0hI
eUVTNk1jc2EycA0Ka1BLUUJTYUFMMWhWL25GdE5mVlRCYnUwNjJycWswTEZTcXBCZVFYN1J4dFZK
OVB4ZGFQVXByV2ZrSDBQDQpOSjVOTjZDL01telNLelo5c2ZjZkpNcGdkL1ZORTMxanpkeDhYQUJr
c0lmSGZOVVhBRENzWDRIT21HWEINCmMxeTVBdHF4QjN6Y1R5MUJSL3krZmE0Sk4vekU3Q0k0ZWdV
cGNWZlZPZHhwOE0rSE1QTXREVUFscFpiOQ0KcHdUa3pseE5NRlFyZEhxWEZwN3dGWUY2U0hDdUpj
NkdQTTdhTzM4UFArY01vZ1EwYVAxdmx1UzdkWWdDDQo2MXVFKzI2ZytIaEdocGZHRlBqYW5ySzVN
YzZpNk5YL3RXVGhxdjhNOEJ2TXlUbXg2dHdXWk9ZMlVSOUENClZEZERPci8rWWtXTWtuMkpPNVMz
dUs3NVU4VGtweHlkdmpScEw3TCsxNENWQm9HUlFhcWNYSVhZT2J0UQ0KaWsxWVZwcVJFb1dlT0Js
TzluR1J3ZFpFa1VUQ3V1Y3pMaHh4RlVFQUhORURmYlY3Y3R3RU8xWUZmTTVWDQo0NEFoaDhHSjJD
c2VNYmNBazVzVUxkdVExL1FlSmJYRXhTNnNyVkNybVd0Y0NjcXJ2R3ZqNjRkNU5JN0QNCk1aZEJ0
QmtGVW9hajFPRDVUbXhqZ3FsUHo1dUJBZmVIRkNBSUJNcEgvb0Q0VnIvQUhhV3lwOEZtY1BveA0K
aVdUT0ZxcVJ6aUIxN1cvR09KNGlGV3ZjaDM0alpBNHFGcWhnTEtwL0FHNGdLbVZrZklOVmdMazNC
cmRFDQpKSkRCK0dObk56cDlWSFIzYmo2VjZseE1GZldNMjY2UWhxaWdZZlh4VnQ4MHdJUDMwejI5
Mjh2MEVLMEMNCmtZbitDcjZ5dzEzRk91Y0NiaTVhYjNlcjZNV2xybEI1NXJsMHhjckxvWUNLQ0Nk
ZXI4UXdTSWVKaVlwMw0KY3pIRk1kN3YxVXFTUjArbVR4N3k2Z2JpVlNXbW1ES1pNdHJIUHE2ZFAy
bjNDbDN3ckcyY1liVVRwTitHDQpDNDBDaUdyWndCS2UrUVEyVWZFbGZRNm9Mc0xTdTFmeGM3ek5l
YUFUWjVJblhTc3FCck5QbFZtVmpmbW8NCjBpWnE4YURKc0ZRa3BUWVJPL3RKTXpuQ1k3dGJ3cXZ3
WlFSenNBamFvalpCRmxEYUJNZGYwY3JYVjFSTg0KTFpmbkdSTDM2MkF0NjBPNytpWDYvSGxURUI0
SGlyaVhkMDJ6SXQxVmRsaFFicHdrTWxUMVhQMUFHMmo3DQpSRDlHYll3c2VHRjdZd1YzRWU2Rzhy
S0trMFkvbC9tUXZuRjdGRFZEU2lSZUlweU5HYUVHSFJEaWZWMXgNClNpeE5icVJjZmNFUFcycHNp
ejJ3UGpWR05yNnM0MW45VFdDOUZVcXhCaXVQWHdkblQ1RnpRTW9iREhpUw0KMmZScU5adnFGakow
bmxzeVFUbjBUbVRoNWF5dXF1SkhTWUlQTWFMWXdZQWZvRVFBekxEN2w0NDJidEIrDQprbkYvYS8x
bUd1MnV2Q2U1Tzl0c0VzSmNUMVJzeHB3YmxWeU5vWDRDd3JOTjZmRTQ5eUF4YWgwZGovQWUNCnNX
M29rcXJ1SWdudW9jR2Q2WW83YldPbS9iZ1RIbFpKWmFiVVFYaWdnUUNWVFV6bmcza3dnOFF3T0lS
NQ0KRTB3UDA3QmlGRVpvQ1pjZVFzVkpMMmVId1NLTThEOHVVbi9HYzM3aWFZMWZhNW1wUVdZMmZi
NGFvTEpCDQpwbzAxSldIQVpiSG9sbmNvRjF1eFJidEMvQktYaHlRS0hDT3VDcUNrVGw1dTN1VGdI
eW1rYzdRRExHQUkNCkgwTnJ3Z013K1A2NkQyQjI1ZEs5ZW9PYlpPSE9HTVM3RmR1VlAvZW5CSTBz
ZDZjWTk2VEJzK1NYbjlmdQ0KcVBwSjdDZnNDd2xuSFVneUlOK1crYVkzY0hHUzhoM0RnNG9rWDVi
MU56cFFvY2paZUpNZG9BaHl4aDVsDQplQ0I5K2NDYndjQzNtRnhSc3NFbW1UNkNWUnF2NEVqOWlN
aG5uK3gzVDIvaDA1OE9scXRnVEFMNWJxbkgNCnhONzFsVVVWOCtXdVdLMkFqaUNYZVdiTSsvZG9z
a0ZuQ1E0dFRkeXQ0S0Nlb1hLd2lmK2h3MkY0MWhIcg0KYWpjWDVNTTZ0ZXgrK0FvODVISUo0ZDB0
NTd0d1VDUkk2UU8xU1c4SHUrbjBsOXN6U2l2Zit2d0l6eUV0DQpvQ25zUW1IRlp2ZFc0N0JYcFlr
elpzU3RSbnZSR3NiQVhDTXRscGdyNUNhR293ODFOUmdzZ0pEWUVSZnANCnRnaXhBU2RPNWdhaWpw
YnhoTENBeFBHRnZEdVJGSmU4UUZ6WWRrR1pFN1p1b2M3VlBpRlJQZlFVNVFYMw0KZWhnOFRjaWZF
TFdIUVA0dzNmSXJSWXdKbFRCM3d6enhMQXIzTXFqeUhkVUxVdzR6VGIwUVpOb1dLK0NPDQpPMVBF
VTR3M1hBOXAzR0JEaVRtQ2g5c3NvdzNra1lBYzFjb3ZESHpSTGlNZzVoKzl1K3UrR21tNlg3OGMN
Ckt4anoxcW5haENjcWRmcGhxRFRDVnVWWlZLc1V6TlVwNzNjekJlOGF5bkxwNS9KSHFqRmVleldI
ZlhLNg0KSUl6T0NJWjl2V1ZETmdOQWFGWDEyWmxvZXBMcEJ0S1ZMS2l2NXByRXVDNTRzUlRkSnpI
WDB2Ukt4MzJRDQpHWHJyMGhYQ1BEVlJ3SG0wTngxQ0dObFpWVUMyZ2xlZmpvbGpid2FaUml4M0N1
YUhuMnhhWVVSR2tTMFINCnQ3akpScHFtYUd0R0d1cnkvT3hoZ01TVXVEMFYvL2JWcitoamI1L0ov
cVhNN0pJS1UxcHh6bFZrdDgzUw0KMTRCUnlybXJ6SGhIeHlaWTF1RWJ6Ry9YZ2dMb3ZmdmRmSnZa
NzNJTFRhcm9tZmJlajV4bXlsVUJlRHpvDQpZUi9VZmpiWjhPaUQrKzhqMmdkeDVxV3JJNnVTNG5U
V2FkWWhBbnViOXNPejkzOVpHRmJsVmlwdFY3Q1ENCjFvd0xMWXJCRjU0TzV6VXc2cFNWWEs5Wkdt
a0hha2syMjlMOThkM2NYN3Y3cWhkd3hBaWtJR1NTeW5Ccw0KVzJDNmF1bDB0cWlIN0VpM3hqdXh0
eDhZSjBua0N6KzFuaXpUc29xNlpvbmZjbFlxNUhNdXhEdmNtRTZqDQo0VFFBczk0WU1KdGhwMjFC
N2twYndJdC9GRGtOR3EybFpTMlJiREtoMUJWMXp2ZWhacHRvVGRhMkpLMEUNCkpLWTQvdCszZHpv
M2JjMS8wTHljUmFmY0podUN6ZkZqaWlYcDhnTlA4MzNjbXBWalI4RWlNOGRIUEs2Yw0KbzRFdFVr
MStKS01RdHhOMVdGa1BETFA4OFdvV0h3bzc4cFEvdk5OOWVhdWpPV3h1em1Nc0k1UXdIMVUyDQo1
YWFrV1UxTldlbE9jWktKSVZ3aHBlcHpIcTFEQVRZd1c0cGpPZnFqWmhqSWpVcEFVN3FIais4OGZT
T0kNCm4reHp0aWNub0h6dGNScXRVUXo1SFY2WXNhdng3UkpIT1JDTmZGZGJPVHRaNXhRTWt4d3lu
SHQvTmdNUA0KbTRVWS91WmxpT1Q1YmFJeGRmdkFjRVZ3Mi84VHIwZVRSNHJQZEpBVllEL253UGlE
NDI4NTE0Q1hXWFRiDQpRVGFaYlFBL2h1dWJqZzk3dGU0UGVEQjY4MytIYlp4M3NLaFV4cFZwTCtn
M0tPY3JseDBxd2MxYjg0ZloNClF5YlVJMS9HR0syRURIeVhaaU5HVjU1UVdZSDBSZlBsT0FBMUc0
QWZCOGtCL1I4UUVNS0VxQlJFNmZqZg0KNHhmbGZGSHFyR1MwMlg2emZpYVFmYmlBNEJtVW9iTE5y
UzkxSlEvc25Nck51cVUrcmRBT2hMTSs4bEowDQpvZlhFWnZWbW9RZVN4ZlFMd2xZNzBQVVFJaGIv
OU5zTURvTXNJek16enVjU1ZoRTl0YUdCYW5nOHl3V1ANCnA5bmNYRUtCaGpHZ1UzSzJlWjVweG5a
RS9tT25Na1hNalFrMmNBWVhzcHBDQm0vWkdYalliY0ZGa01seQ0KS3Qwc1NJcHVxaGN0MWUrNGow
aU9Hd1NZL1dSQWhnd2M2d2xKaSt0aFlsS0N3Vk5iMWxOWEdVWmZkY2FODQptdElHZXM1ckMxUkp4
R2xGY01hR2JicWNYMFVWNWRyRVBxelZNR2JJRXBZbUdrSEllSkcrOEgzc1p5TFoNCkFrZkRNdE9q
bUtxR1E3Yy9mRXRmU2NqcGlpdWhyaUZCZDBSbDdGN1lYekIrcnBFaHJ1U2NIb2w3bHZsRg0Kb2Ru
MUFScm9tZ216alRsUEtzVVdhYlY5SGVTWUdPaEdjNUlGa24rNEpWakpwSEFxa1ljcVY2L1R5ZjJD
DQpKNVBiNzc1WDJOTFhVcUpCejFZWW5aWXlqM1NiVGRmcDBYU1JVWlIrbWZzRVlMQk43RzA4MlBV
LzJrc2gNCkI2K3lPK0dhdUFMb21UNEF5YUFmNHQ2VDFWODNnUTBRS1BnbHFRbHdiWkFWK2lhODZT
Q2ZYTjRVT2NuRg0KNHFDZEtlVUtpcVgvdDNLT1ZjaTkzWEErUUJJTWQ0eXltVmppYURnSmRPTUpK
ak9Sc1JVM1h5anVkWEc3DQpTU1N0M1cwKzAwT25JZGk2eGQ5TTJHcE4rU2xoN0tFbFpXM2k4YnRQ
SU5PU0FURnUxSHhRWXBhRThPeEUNCjZncHN5QU9kRHpyeHRCZjZpRXJWK3V0ejk3d3grUktOKzJP
NUlDdUl4c2t3TXhBWUNNNTBxa3h6VTRmTg0KeE5TUTdjbDRnSXpUUUNTdHhNN29YTjJOeDk3R2E2
dkhBcmpENlM2bFBTMU5NTXkvU1oyeVk5OGMvOENMDQovWHdUSitSajVqL0xhZkZTN1k1b3g0U2Ja
S29CU3ZXeUFLcVYrL3lBU2crcjUyZkwwdzE4YnNmeDZpSEYNCkJVUjRaVEFQNXNma0YwS1FEcHN2
SjMxWklKY1poSklybGtlY1JPZDVVSUQ4enhBQTU2V1k4MWFRVjM2OQ0KWklPUDBJeTNIaGZJY3BM
cldvQVp4R0pGTG40VVNzQ05zektZS1dKYkJQUTJNb3Awajc1ZFd6N0RxYTQ0DQo4VEcyUGtOYXJO
RDdwMW9xYVJjU0t2eCt3ZnpBeGtINE1ILy9CTTNndDBoTmtrUStoSktBTXN2bzN1a2wNCjUwTDds
emZuSFptR2pBYXo4OXVwUlNnQXJ3L09XZDBubjlFZU1UUUh2TjBYbmhhVVYxcytFZklIZ3FYdQ0K
VjVTQnpTTnBBb0xMV2crLzhmdUt6eHBqdmN4QkJLYW44N3JaTkg5aW96SE02aXczZFZvWGlnQ0ti
RzFYDQo2ZHZzUjBlM0J2aWpENVpzVkhkdUJlUUs5NmJiWndZeVl3eGQzZ3pQY1dYVXQ3VE91bytB
eG1zWUtsdGwNClhubWRDZ3lsNXlqcmw3UmV2R2RyOFNVMWs0VzcvY1FTZzJ5NFRjV2V0ODkwdkVH
WUdPNFVzaTRqOVZ5VA0KZUlXeWlaTllyTlBZTXRCWDRSbmpYTGNrSGdaL2pkbUpuZ3c4TkdQVGJX
c1NUUGJTNVBvZ3R3T3pUcVB5DQpqdHNGRHhLWEExaGJnMEhTUzVTMWpXMXhHTktaQ3VSOEhOR1RW
eUJrY0tYdDRxZThIYXhTaHluV3NsVFgNCk1pZ0RDcmo4a1Fpd0VGNkloQ1pDZmdJUDhYT0NrbHBD
dWVQRFc2WXh6cHhKcS95UUFNUmFqWkREMlJmYQ0KRWJrM0dlMnorcDJDYVdHNE5LWldxQzQvREE5
UVBmeDEzblhMMmdsNWtDMUx4WWp3K3YxRm5OaWxrRjBIDQpxOTlyWEd3UnhzTjg2QUhIVXU0Mngv
M0tCb2k1RkxKMnVaVTQ1SjZyYXZhTFRPWkhzc2t0L3VXdERuV2ENCnJZa01QVmRhVndrM1BYcUxz
UDJVTVN1ZjlxKytaZEpkRVdRYkN3WUJ3RzJETVhoWUZPL3hQdktDenpKNQ0KeGVhV0Y4UmtWTE5y
R3R3cVhlY0xaWW1uZjdtbFlIamRGRi8waGJXYkhCWE9iTnViREZpNmZkNW9KazN2DQowR2dmaUIx
MVd6WDhDbEp4a21MRmNlUG9vQ1daQmlOQ1FrTUdyTnNpclozUGdSZGVUNDZFWVJWeGNGb3QNCnM0
T3g5NnZiMXpTQmNsenF4T1dseGlzUkMraTlPYXYxMG1TUm5iNW5FSnE1c05SMXQ4RUdkc0FTR3hB
OQ0Ka2JmWFBhMDBiaGpzVlBQQVBla3VCaEhZdUFZNWRoM25BeGcyVkdab3NaQkFsNHFNSnBpSnZ3
M0l6OUlyDQppRU9TbzNDRGNZOEt4aVhTdnZMYjF0Q0R5ZU9KY3czUnFCZFNmcWxVYzQ1RjBnQ2Fy
NFE4NUJRMTdPOVkNCno1OGlwOE5sTkYwNkRSVVRkVHhCakViWEtUNFJaemVqNkhBWGNwNEtFWTBS
WEh5SmV4YmV2dzMzUWtPdw0KdGFHM2d3NFdsaysyUlNQeWF6TU1HdlB6WDd6TVY2TUFqZm1WZ3RN
N0V1MGMyU2pIeXdSOGVuSW0yRndFDQpLMlZmdVNsZzZzTkkva3d4cTRzVjFYQndYUDIxcmh4Ylp5
UW85YnFhQW1VaVphakg0L2VqczlHOTF6REsNCnd0Wkl6YjAvR2kwcE44a1I5bEtkbG91Umt4MTg5
TmZYN25xbCt1a0VNWmE3S05TeVNpTURBanhGaG1uLw0KOUVGei9ucm5yNjhOOUVhalJjUDQ4cGZS
MFFmb25OMDJDbFpZWnhwQWdHbC9taHpsQzdpL1FwKzJZRFJmDQpVZlJ1dS9EZ0N1TDlDeUJRRThz
S08vZ1FzaWJ5ajg5dVM2UXgvTEFnUjJxbTZPWFNaMHJKV1czaXE0NnMNCjl3eld2b3BQUDVicTAz
NkZKR3R2d29KQUJkNC9pUURKSHgzTXZsQ0JTVmtSVVFuWGk4dDdUMENrcXNNWQ0KcTE3QlpYUnFH
UmJaUlZNaVVQQVNPZUxkMDhuR3d3NHREYStCQkZxRXZ3Ny9jQmFLcDhSQTJsMUpGSzhpDQo5UHc3
N2tIQVpGdG40aThZbW1lVGtucHU5dlgzcXpOd2YrSGhLa1YyYXB1TFlnVTdzWWxqRW85N3J4ZGIN
CjdUczg3K3UvaDBiVzB5VFNSNmI3b3g2NG5FZ3hlSTJJVFlHODZUNjUvaTYxbGVsZjl0NFA3M0ZK
aURRRA0KamJ4Q0R2UXVvTnVLVm1OZkZYVW5KUmNnUnlZNFdkUndJM0VOU3pick56aTFrVHdZNVJZ
bVYvanZsME9nDQowL08zekR2bUxFRTFXckpFZ1hTMTQ2Z0NRWUJ6YUxXTm1DdW9zSWN0SlFDMERj
elB0TkhZMHhaTnQvcHQNCkVaWml6bE42Yko4TGw0WW9weHFoNkJveFozLy9POTIzMFJTbUZYbE9K
c3RYSGExSlRMNHErbnFrYXhDSA0KNUJkK0dlSFlKWStEbXphZGMxdm9ROGk4WDdZVWk4VFRHdDF1
RE5NUXRRY1U5ejVWdThTYVp4YWtUcFA0DQp6Q0NZK2NPOW0xOFhRTGg5Q3J3MXZscm1LM1lXSEZO
eVNpWFlWVEg5Nm0rTGhXM2xJKzkyQ3dWeHkvZGwNCnJZRjhXZzVPTWQ3c253VFYrNHl5TCtpSGMv
dkk0OVA4WVdBUFJFMnNvcUVIL1ZwSHU2aUxUcksxcVpScQ0KbUhJL0Z0OWkzcE9xamdia2ZLb1ZD
MDVoellSWDJqa0tYUXlrcXB2aU54RExqdzR1RHZtWElmenFza1hTDQp2aTE0RFhFV2lXQ1Bxay9a
L3k3blpLR3NIZHRBSFU5RW42QWZkZERpM3RhV1A2b2l5bmFRa01FVXhERkcNClQweVRpeFBjQWky
NktYckw5ZUVlR1BZTjFrUXBzMzZURlVOak9FYTN2S0R2Q3JJOUFtYXpWM2R2cE1oNg0KaWFZUXJH
MUxrK0FUTzBoMUZwZ0xVTkt6WUt5Uyt5L09vV0x6M0ZLK0dMbWVqbXNIWDZDM1h6WlhUakdaDQpH
MTRZd1QyMjJYTmhwSksrRVFYYTV2eUNvS09YUlFleUdYZzVObnZFYWtWZjAxWjMzcWF1a1pvMTdS
dzgNCk5TQzVrTDNFcy9OejhqWTNDWllBNzdBR202aTVwZ0NFZmFKMEFzOHFLd1JDcTRBYXVjZHQ0
SDZOcWk0OA0KNnd3enNNczRUK0I1NzZIeGJRZUl3czFxbFNrS25JUkxta21pdWg3L3NLaC9FenN0
SlRIZzNWbmpzbC9nDQpDYmRRN3M0NU8yMUxUMDBrajNUQ1ZITERlZU5OVnFCNlRXRGpRNDFRd1dV
end0aUxhb1BmczVkeEN5Mm8NCmhxSCtTazIzaHNZQmoxSjRVKzFEMzE4bFhYaVFCMGFaYW5iQmhH
a2RFMHFoaTVEUy82c2hQQ0hMcUdKNg0KTXB3dWdSOVdPSzdpcWVmOGlIakcrRUtPRHlNSVRqVVk3
WW5MekNnNzA1ODBpcUM3TlZLT09DOGx2NnlrDQpOZ1JYNFVNM1RoTTRaUTZQdHJlVmhDVWVmanZF
WU5qN1BRQUxGa1o5MFJKclpkTVhOQmVvWnBweFlrV2YNCnEyVnhEQzR5Y0E5NldFY3piME15SmNH
aGdZazFzNy9LRjBkR1dBUk40b3JwL1pIUlN4TkE0OG11aGQyQw0KZTBPRm5FWVAreDQvM2x1c1pv
WE04RmtXeitIQzVTdDNYNm9KNktJWXpHclVPOHhNRWRZQnJtdGZhV2pqDQpmS3pxTVNaNXhTOU8x
eC9FY2VSaGV2ejRtc1BnSThxVHh5ZFkzeWMvNVE3NVNSRkRYY3JUT3Z1OUQyMGQNCldZTGhlUTA1
elBJT05qVzRQTi9Jd2xpa2gyck1JTkhBQW1iZElFb0lxWWlyUnI1MlhlYitlZ2Z0a3p6Nw0KUzB2
cjNWaldGU0wvOHQzNVA0WjN1UDRGeTl0anV0eVZTOUYwd2owalFiK0o2b1RpL0FtTGc2clpQWWdX
DQpMUnB6RGxocFQ0L0dLb3Q1NHJHcTA4N3hkZFpNRGtyYWg3QzBuWDZaMHRiSHZZemFRWTRlbkxB
YXk0R0ENCm5ndUZUNStmL1hXVGxLVXIxdmY0bTdFTVNsWjRkaDRJb0p1RC8rTjVwZGptRHltdmFx
Z3ZaZE81UG04VA0KWGlySk56SDhTOGg3STdHVnBPQTJlU3FkTnBWSW1MeTdhWXhrMnpzODhJV2p1
VXhVWW05K2JVeWpTbkU4DQo2ZDR5TktTNUxjZjBvQWxmanpIMlVDZ1ViRm5vcHpOUmdGUUMwOFpI
bzNRTVo2eTMrOWpTYmVDWDdaKzgNCmhaa0trUVJHN3lRQ3BXY1hjZGNkcWF2eWVWQnBMWnEzOXVv
SjlFaEJjZlMyL0RGRFdpZnpmUE5JU01ISg0KQ2V2bTFkcXVPUm9jbWsxNi9OZEQvQUM0bkEvWHg3
aFBoc1hIeWxWNGpKYTc0TmhJd3g3b1Z5djBXVHlLDQphMUhZQ09DZ1Z2VzVoT2I3elZnRk9SUzBG
RzIyNlJnNFp1NTFYWUQ5N21jb0YvV2ovU0kybmtZMWdGdk4NCjBzQVBhMDFWek04bFpyTk5tc2k1
V1RSa1JSWGJPWE00d2FHMURuNXFOcEJSZVZSdmZaZ3c5dkI5d2lUSA0KWjN6eGhSYzVHM1lDMWJa
cDRwb05lU1ZlM0ZXa2xSNFp3Vk5Idlh0Uy9uekJKcERac25ZWDJ6SnRDYzlnDQpWeDFCUnNQTnNq
d09JRUdiR0VYUXRxYmVRSlNmL1pRN2V6ZjZFek1EZmI4ZnFuZzVuTU13bkZWdm1uT0sNCms4Y1Vt
TG9YVHdCRG54MEo4ZUF6a2RMWmZMWFNGZkdCaHdGSERQN3FhZURNQkVjelYvTkV3clRGMWlZdw0K
MDFOQy9JNGM0Y0d2dHoyMm9hSzFrOUpvWE92bXpEODcrOFA1cG1WNURTeFVYNExhQlI2MjdrNGFI
QXNHDQowMHZUbG8yME5aNHNHSm94NnBYTXBUam8wTGZlVzlDZy9sZnErMkZ2R2xyNDBvVWI4Tmxs
UEptY0t2TS8NCkVjRkZxckFCWDRiZEdETTArNDd3andhc0xtTVdsK2lZdWFlbm9LSEJ6c1h3RFNv
V0phdURLWWp2YW9PSA0KQlBxbS91bWdranlJKzZiUGhwLzQ1NTlqdHJoUDg5YjNmVTVyZUZNcnE3
OVIzTUZuY3g4VWdiaVhhWFpMDQplT043OTYxODVodUVBMWRxb2VrbGxuazRndmxvUzV5Q2hNZDg5
UGlnTCtITmt2VHpnRTBhbTFGQ21CWE0NCnhCYld6OFNBUEVISmk2SjJyUVdwWkl2M3J0UWFod21v
dHIvUHJlMjljVVV6aDg3WXFCUytINHJBc2RtOQ0KeG9EVE9BMVB1RjlNT0xuazlodXN3aW1oeUZT
ZTA5dTZMZGVLd0Nwd0k2S09ScE82Z0Fna3ByRWVUM1VsDQpWRUJ4UlNJWUlCa2J0VGRCSWhkZDFr
NmdaaU8zaVU0RnJQcmJtbnpVY1JqaXE2eS9mNFQya3JNeVZ2c0UNCjJaeVl3M1VrQmdXeWtPeWhC
T0Q3djF5ckZjcWxCelJLWE5rWG1YZGhIZVhuNFkrNGsrM2YxTVExak9KKw0KQ21zK3VacVhBdExP
SDlvQ2xZK25ZVTRDU0I2Wk5iclpya3FBMGhLL3F5TmhwS1d4bC84bTJHQzhjakE1DQp5cVdPNUdL
eFFRMEcxUEVjTGdwRFN0Ym03VldEMWxmd29XY1RRVTIwT1RWdjJ4RVFTckVVYktnQ0NEVi8NCnlT
YmsydWdJaHlDQnkxYVA2MWJSQUsrdStDalR4cUx3OGZmdWtqQnY3anFvUHZwOHlhbWhoa29rVlZx
VQ0KMkhqSFlxWXBDMXVzTm42elB3dDB5STc0ZTgvVHlSMnpLNkNGWFdiMy9UdFl3VXFNeHhlQTlI
c2hDNERzDQpvRmh1eUhSc0VHc2I4bmZSSkt2T0ZpVVBhMTJpSDBMVnV4Slh1MkxOejFYTkZydkdJ
WEZMUnlHWHlsMlMNCnZyODQ0Z0xvc3k2OHZIT2RyNFNtVGx4YkpTdk1ZY0tzQlF2bG9OLzRzblRz
LzdjdVhJNTF3bXFUc1E2VA0KWTFXUm1yeWUzeHVUZzRtOFVtS3ZWb3NYcENUZzZWRS9mQ3AyZGVP
d2ZINXV4SjdMVm0vNFhaRHh2dDFZDQpNZllyanYvbVdaWW1WQWNTa2hMRVE0Z0Y3RGZubUxXL3RD
TGdodWFQUm03ay8vQmZQUVhxdnZzT2dnb1QNClBLbk5COWVESnoyWk1VWTMyZnVOR0xFcE5mdWpT
R3ZDU1R1eUorM3g1U0VvaVJ2b3lSS2c0L2dpdXMwNQ0KVFFnMjRQV2VqS0dhNVF4Y3pTVFcvZkR3
T2dCcnJwUHZHVTh3SmZndGZKRC8zYlptUUN6d1ZsRG42ZHRDDQpwU3djdFB1NjdtQ2p2VGhjdmFq
WVFYdnYrajc4QTZGZGQwQkRiWHVsdXFOcDhrNWQyNFBra282ZnBwRmQNClZ6ZVZLajBRWDFoaDNj
RWRGaXBRbmQrNTN1OUUwS0UyS0hSbjc3RStnaHFTVEZOa05LSkRLcFdxcmpmWA0KU3c5TzVhYVZ0
M3d4YTR5U21qS1JWdHlONTB5Q1E3a01EZ2hyc2pLdnFKbjRadVlWeThaVWlaODZic3dNDQp0UmNH
dURvWEFaSnNsTTNudFhRTUo3bituczJ6QUoyMlhuZ2lTUFNXSGVmRWdvcW5UdFB5ZnlWcThicUcN
CmNKVmZhYzV1dzNZTWQrSnFKcVRrWUNhcDV0dU93czN6WCtxQUhRWStIdkMrZWhoNWJsaHB4cFFJ
aXB3Mg0KazlNVVd3T1dXOWtpQ1R0ZkNlZGRZMDJLQjllTENyd2FkU1Rwekt5NTBzWEtndmovUVZk
d2pmVnp3QzhKDQowTWRyYkF4WEIrOFowdmVEVGpKU3hDWDdDa2VQTmJwUDhPYzg4WmZQejlFQlps
dUp6MFkxeU9MWGc1YnQNCkNvWHY3V2lYVzBjc2tlOUttbmpySHZsczNWS2paTXJqN0Jubzgrc3A1
RjZmTnkxTytNTmxqQm9qMEQrWA0KRER1eTg0VWFyd1hXd3M4WDFyL1RPbW84aCsvT1I2K0ZCbXNU
OGhHZUpNZllUUzEzVVBYNzlhN0VTRTlhDQpqMnVPNks5UWsrUjlwVkhMZU9YRXpDaXpNbkF0Nzh4
RC9mcEJmdnRIbmo5MWdSaHdKVUJGNXdhSDVSemMNCmttL0xxMmpLTUFOTWRSR3RvcFVkUWx2TmRs
UllHcVNQdU9IUTRPdlB2Yk1vcS82NVlNdFg2alRHVjlNaQ0KSE5uRWh0RFJGekhNMTNvL3EvbDJs
Sm9KYkFjOHFrZ2psWllWcUZUdkRHZjNpM1owZHlHZDZudWZSZXp6DQphQkZFSWlaWGtvOEViem9U
elpQZW9UWU1rbEtTeTgwa2tMS3pUaVpCQ25zRGlETHhaaHZybktuSWF5dkYNCjQ1eldGSUhRbUxB
WUhUQThOZllrQVpPWURzVzlMVUgrd2J6ODJUQzhUNFgyU1N2SGNKZFo2VkMrbEgyMA0KSjI1VmpS
Y1pIUmlwZW9udk5rVzBrWUtVQk5zLzZIU1R2QVg4WWJYVHliSVdlQ1VKb3dXdzl5bWRDajVPDQpn
eHU4SHdiOENBV0lTOWZwYklYdGh4V1Q0Sm0xRWFvWkhSeTc1UUlYWHcxMWhqeStsMmhkUHlweWNu
QVMNCkRCSytsK2FIT2pSSGw4SUc2bGtRdzgvOWhWLytDN0VQVjVqd1ZqU3pFTkhSNnYzYzVHdHEy
T1M3bElyRA0KQmpidm9FQ3NhajRRdkdLdUJtVHhWQUUzTUpybnlaNTB6REYyc0FWcGU3ZzdPWlV3
OXdZWDkwc21sK3FmDQpOa25TcFlkNGxvODNZbHcwMWV1YU5JWnMwQmVQOTlhOW1sTEFFWThGb0N4
R2JWTm9uUy8vRUJTbm1DSmoNCmNEcXUyM0xrU1hTNUhQa28xeDQxNDZQQWJzbkZtRmgwMGp3S29x
UStsTXNsb0tyd2hoUnBDRlBBM29jQQ0KanFqaHpjejBIMG1jS0NQRUJrYWcwNUJqZE9URzdHa2h0
WEcrSlFVQ1hYWWpvbzFvWHVsU0hWVnJwL3FzDQprbkkwVnprL3VaQlpLOWM4VHl3QW9Nb004MjMv
VmhSc0xpU2xaclB1WUZXUUcxOTF2aDJQMWJOQndFZngNClNOYjRxdjUzU21ybmJmbnIvc0VjcVhF
UkhEUWxjQTNGQWUwajJsRjNqZkY3ZjgzRTlIdEFoc0pObzdHVg0Kc0ZkKzdHU0pwRVBCTUUxTUQy
OWRVLzdrekRxcjkrZmU5cG9HVGR4L25WMGt5cWdIVnBIYUovV0prUWNSDQpNdnJKQThFajdoY01h
OHFaMzE1czNJYWJZaFRkNXFRUkFsbjlvRWNRdk96WUw0eWQ2b1Uzb3IrTm1wRnANCmRzamgwSjVC
dUlFS0FMYXlhM0VreDNhQ011TjFLakh4ejR0TXB4OVhoTzZRY3NGR1FxSjM2UVNhTkUveQ0KNlI0
SDM5dm5tenM1aCtJUkptTTN4eUtNS0pMUDZyaXlsWVRhUzl2cEVoeXYxZHk0KytVcXpIV2hxTExw
DQpIem1UUndwdTd3UDR1VkcwZ25CMUNJc3JvWVlZekdadjIyK3RHS3ZxWkg1MG5zMkFaaTVnS1pZ
Tk1ZWEUNCmtwV3N3V2NyM3JHZzFEcTY3RG9hQ1A0NTlNTlFnSDYrd2p2SWtxRFpOZEdTZ1J0Q214
bjlXcEV1S2NZdA0KRWJjK3V6VlJaN3Zqcld3YTJ4aWJOajluYjBBOXAzS2Jkc3hBd0RqWkgrUXNS
amRhYisrMTA0THNEZ0VFDQp5RmZUZmhOQmd1WHVnRDk2KzlJVHRaS1VYdmc2SFUxWE82UXF0NXUz
Tlh5UjVOY3dJaTJvVnZsU2ZMbXoNClZNc0FaV29TQjdxMVFCMVl1ckF5SWhTZ2hqcGZ4YzIwTGZQ
UWY4MndhUmxZRDl4ZlZQTXpJek1qOVpSSw0KTURuTFB6elQ5L2RyTDRSSW9JN0tFQjVCb0tjYk1s
SndVNk1CdUFyVmR6a0NWL0p2Q1dYcitwczlicEUrDQpFdi91WlVtQlAwekRKbDRPYnVxa3c1TytU
QXFTdklUNlV2QS82ODVhQ1d3bXJ1OFc0ZVlPa0lidXpjaVENCm1jT3hCMEZ6S2JvdWZqTW1zMmUr
VlJUYmwyR2c1WCt1T0hPTnd6MUF2K0NOQ3NzT09XSWp1UnpjeEx0dA0KbVpHTGpmekJUQkltbmFE
d1NaOXRJUEZrNlhzaCt4b044dmp4ZnhjeXA3dndYejgxb3RTWFhBemRiWll1DQpERFFmWmlWeWxN
WDFDS2srd0NPWHMzZklnUi96VTJyQ242UmN3OUZaMU1MMkRzL1h4bVhFREFURjFpOGQNCnZVTVNP
T0dOSnFkd2JYNytKbk1KVWJ4ZGdWb0FmcXdjL0NTZzB1disrN091VUR1aDBkTkJKWkxueURmWQ0K
Vlp1R1NDMElHWkg1Ym83bEJmMjZudkdNeXlhNlpQMGtmNExZWkFDTGZwK1luTzVZcDF6bE9xWllK
QW53DQpGYW44TW93WGRDbWxLODdySmdOa0dkWVRDRnE4NDUzZDMwQnBITUFWb2QvS0JUNGxOaWxz
UVJwYlltOCsNCk03VGZ2eXJsYnJENGdHdXNPR1N5YXdwNWF4bVkzRGV2bWpzVEJJOWVmTlR2VDJ1
S3lWdDlrd015cm42Mg0KOENuNW10NUVYVk5pejI2L2lSa3U3enUxbU5SUmRrTmpHWW1vbk94RHFn
cUM5WUZQWkZaWlpmUUJIVkdTDQpuN2xXejVvdENDbHoyWUN1dEFwYkdYMWxJd05jNTEwRG9CQVBx
VjJIaktiZW9qbklaRURKUlV4eHdJcUINClMxcEJUSFIwbElqaGtMWkp4Yi9ObTFKSXRLV2VNNHRO
RHlHeEtreHdVZUtyUVhMTjBuZW5mVXVMbEFvSA0KT1ZIZ2VGMzYvQjd3eFlwUE9NYVUwbCtWd3lQ
UktIcU5oTmErNVBpYndmYkMraUpqNmtWbDlWT2dqNUVZDQo0QndjbTZERUNKallCelladEtsZGZ2
VFFBdEpub3c2SG96SHZ6RkJVUTVtTHJxQmIyb2l3Y2FxczJxT1QNCkVnMVRabWluaHdha1RPNEdO
enh1R1hVTVg3T0JiMGljTS84dG1nVHlmbTBOQWFNNFJUakkyK0dZOFdGVQ0KR2FyNEVmQ010a05N
T2NVbHY2RkUvQkU0OG9mclNWMzdVdSs1UEcxcUs1UXZ2SFgrVnVWZTJqZHBaMGpGDQpkN0NIQTQ3
Z1BHaXI1MVlka2w5WmJ0TkpHTXdkcE9kM0N0bjJvL2c1MWRpOW84MDhmakNZUVhtLy8xeXQNCjVR
NmRmV1FCZXpBTnN6bjBPRlJYNVhHMXhMK1hqWjh5RTZEMmtMQUxtbnd5bFp6aEtUZnZoUUR6Zytx
Kw0KNE40NmxxQTNPMXY3SlpkQmxJMlprN3IwcmhmWVlkTU5HM0cvNERBbmdKSG5zQzFqcHkrdlhp
Y0xablNYDQpkaFRsWTdyRnNTZldNZHhseWNWaUx4aTBmMzBXOHRqMTZteTdvL3pJZlJ0dnRYMnZC
cUNsQTRKMXhhL1cNCnhUNFF4c2ZFOEdjcHhPVnlZK0IwNkJ6enNtNlI2VTUrMi9pNEVPcmJqV0lP
dFlpcE5JdVZNRHR1RFZ6VQ0KMDVodFRDc1NPeUYzeUpwRUV5UFJkRHU1TFdwUVY0UjlkKzgxeDBn
Y2t1Vi81Ny9uWVBkeEkyUFZqZ3hqDQpOSGdxWVNQdVdkOXB1MUpCeXRWOStVZUlnck5HU000d1U3
SkZpaUJRL1NZL01IZzN2d1E3SW02NTBSSDUNCkVJRUpNN25LaTJ6UWYyWVRDRFBHTW5YNUg1WGIx
ZElzTGs5V0haenR5dXh1TFdOT25HdVBqdkhha1FUNA0KYzVMNUh0S2R5TEtCa2djVGNoRW9RZzBU
d0JkUWRWcUQ2ZnFqdkVqSDFRY2lrazJtOTdNcUNJTis5SGN6DQpDRGtVZUtpdUxGcDMvOTVOOWFB
N1BYNGtaYUtEOEdmalFTS2xUaCtFQ05kVi8xRHJYS205V0wxMi9sNlYNCnoxWktNdmFxckhMRHJP
M2tnUlYrczVuaWhJaklGWWlqcWhhMGpscTJlUFhyaHBUazZReG1jSzdmRWhVOQ0KUUFFb0JKM1Nu
SzRmbFlBV29nbmttZE1SZlBlVUNKRE9VeUYxK1pUSGlUbjYvT3ZkTGwvdFIwb2ZUMXRFDQpIeE42
Sjl6Z1k4QklYVEpOV0NUOEg0RGo3bFBVM2M0U2VQNXRTSDNrSjc1b202VFlPNGtTT25BeDBGczIN
CjJKY3lpVkZLNFJVdkJ3Y3diS0RvUXNjaVNtQkdYbTU1VUVJU0ZFRTZxcEdBVHZHWmtpaG4yTUNx
Ly9HdA0KWFdCN3I3cGVyaFlqL3pjb1lvY2I4QlFQMU9jNDlQQk0zZ0d0M3FXRUtOd2ttVUpUZTdW
T3JxVStiUko2DQpNbEJQUVJ6ODhLUERRSk5rZm91Y3M0TUtQUGRkdXBUVlFUOXNwK0NMdDEyRGhM
eFp4ajMvZ0xnT2RPcU0NCnppN3JieTBvekx6b2ZoZmFxUERMdEd1ZHFpMC9tTUU5TlozdWU0LzRT
RGdVT1RIZHVvODVpQmZzc1k0Mw0KZ04wYytGS0UvaEN3S0FCaVB0WnNPbThNOVh2bDNGQnRrdUVW
bDd5ZnA1bmNRNktGZU9sSWdxOUl2Z1pIDQpCL1oyMnJCcXZCUWlHOUhEbG56VnAwK3FqL08yQWJ2
VG13dHA0TTRUTWV5L29BeDhseFVCVXlxUVRtYlINCkhtTXU1UkRVUGcwR09oc0R5OE5JVjhNdlBW
ajg1N0RxRGJvYVREd0dIdnpyT0RuL0cyejZLOGx4TlFKMw0KWU9LT3F6QkVLT3R2V2FVNngyY0F5
cTMvL3BmZ0JQMG1rSTVPSHQweWE5Q1NIdkRhbUVNSWVRWE9CVWhJDQp6WWV5NFZZRWNNejZ3MzBt
WjlIQ0p3d0NtR1pRNWN2M25lb0dBYkd1bWNJTSsyaDNUV2pINTBId0dIMEoNCnhVc2ZwTloxY1VD
aFhma2cwZHdSV1lCNU9YSC9lNTV3bllBSTRQZDUrVGw4NnN3dnFaTlY2c0NLWUpldg0KSVY0Vmlv
c20xdnIyWkI0QWxKbS9tNTR4SVV6Vk1Pb1VFL1VzZGpBelNPa2JKLzJvaGJXNmt6V1d6Y3lwDQpO
R2JWOVV5L2dkdXprWWpSbU53M2x1cTNzaUo2RktjZm9JdGtMSWhkb1N2eXNncmtHZFBHcmlzTGFh
NHoNCjV6dk51aG9jZHl3TW9va3RqWHcxV1VXWFhKK280VkJKcC9Ea3ovbmMrRi9BMnF0RUdNektn
YUhjUmZvcQ0KYVNCK2o5dGR0MzJmcE1BSnlFNTZCbFVoRDROdWFoWFdHWldCZTlORlVSb2g4MFI3
VmZLSFViNW1QQXp3DQpDWnFPNU5ZbzRSM2o2emFIa1pydnVxWW1yblFNV3RQOVVWN0hMU05TVlYr
bE9YUTFzMUh5R1EwU0RSNnENCnpma2IwakVTbjZjOVZ1SkZtVEU5SDA0b1RlNjBmS2FwcnZFSWc0
Z2hpMzFqS1dxYWdEV0FKOS9rZGxScw0KcnFzNDFkRVViYVllOExkMmZncCtnc0Zpc0lOSjRWMU4w
bXNSQzRHTkxsb3hQdW9ZeGhaeW9GR1lMVUViDQpZSmdXYVlGbmZKNHpUbVFzb1kzK09rR2JaL3Jk
SlpRNUVTazFYNEUwaFRTb2VMVGdLZ1hjT3ExVnRtV3YNCng2bXBEZ2VUVklqU0pISDRIT3dkQVlW
M2p3OStYT3pvSVBIK0RuMGduaEhNSmlhT2hUdVpLNE5ieEE5YQ0KQUp0QWpxMDRwZ3VISkdUVjk0
eUdMZG5EOWkwcGQvcHpGNUJzTmlNbzcyZlZkWkp0UVBPQzdFNjVZbXEzDQprSmJ4eldQREhZQU0w
bDlBN240MGtQMFlQc0x3eUhmTTlsTXZVTTNnbDlRUElBUWF1dEI1UTN6bEt1SVMNCnU5YWJ3bGtk
OFhWTklKT3AreDJacy8rYVkvbmd2bVNJQlpIMWRZRWJLV2lFaStkV0hrVlZ1blJsWlVvNA0KWmd6
Z2JoRnZxZ1VjbSt3eUtqcVFXMUNTTllGNmFkLzIzS0Q4VFd4LzJFbUtIeGNmbVNaMEF6dCtMbFVM
DQpIMnNJbm0yNlJPK3ZVbEhQRTFGYndjUkFOOWlnNlpIS043ZEZYWEE0R0pYZWZnRWU1cHBYMWxi
RHJKajENCjdKRHNZdGgyaXFoUWxpRlVyYjJLUkFBaEdJWWw1V0s3QlZNWW1acnBYb2ZqYmpySzIx
ZHp4Y2ZBekNjVg0KRXhMRFFJOUNWdUtTMzF3R3B2SDlxc3hYUWR6MnJUR0hIeGJLMXJHa0QvVVdW
MzJ0K3BLaHAvY09ObWxJDQpyeXdrckF6NGtqY3E2U1V0dEhhOGhTN3JlZktwdkk2SjJGcDVXbjFV
MU9ZVGlObStoaWVCZVNoaGtpc2wNClJicXY1STFjVzRmTmliT29rL3dNUmhwcEtQNXhmb3FqMFFk
bk5JUW1pU0xOaGlnVzJXM0RFMDdIbTRQVg0KRVZyYllMQzdjR1MzVUpncEJTT2lYWWk1eHArT0RK
czk4Q3ZZcE1XWXJtN201Y2luaXhpbWIycE41WC84DQpsV2hjNEtOUnc4aWNHWFd6dXhOQ2o4ckVu
N2ZXK3pXR3hWUmJGbFZVUFhUU1gwTHA1YmYzNTJpS00vTWQNClhkaGdLZDlxL3NKdEk0MTRJL3Zi
Ni9Ldks4bmdDaXJ2Zkt6M3Nrd3Z1MDRXSWxBRkNqSFF2am9JVjkrLw0KRHVYQTM0Y2kvNHVyQzlr
SUhGQ2NUamEyYlBOTS9Wb21CR05EaDYrR2NaZjZiY3liVFVuTDJ6L2ROVW41DQoyb0hYdWdGQTJi
YlpibW9uVDZqUzhqMkU1bnZoNXVSTU9CRDdaRC9XNVM4Y2F0VFBtSzJPTzdsOHp3cVcNCjdMR3Br
S0ltdnFldW1hY21UQjhHRmNINkJtRTQ4L1lWOHBJSmJCWnpCRmNnK0F0MWFYZm5LbU9BUTNEaw0K
Qk5yejJXL0hWSWxFeExXcytXUzE0RTZveUZkQ2MwRjdTSCsyM2cydmkvVmp1amZNdFVWVEthNS9N
dWdhDQpBU0liSWlBMjFwWWJXdHhmZ3NML1BYRjEyZzJwSFY2eFRDelhUZW1mUm1RbWM3ajdjRlFi
eE10RXFQcDMNClpXRHNPYWc1N1Bjb3ROdDhMa1czWk52NmZ6aDNIR2tuK2JITlU0d3hZczYxY2ha
VkFCenl5S2wzOG1XWg0KOW5sY0tMeklKUHZxcUUwUzYrYkV0Y0dCNXVYb3EwRnRtUm0ybWMrb2Fz
ZE1RVDRxTkRleWE1TEQvOGUrDQowdUswd0JnZ0FlWHBEczI0QmdkVVE3WUpiTms3cjNrdnFuUFRo
NzVyRUhjNmpEV0J4RGxpSGlFN2NJL1ENClUxR3oyWmt0MHliejVTK3E0dUpYMmU0NHhGMGF5UE02
MUdYSzNuekNFOFhxK0hFTkRNUnduZDZwWlNHag0KM0FqOVFvNUIvY0QyaXRjbmp3K2FJK1pqdFhj
aG4zRG45T1l2R3FxNDBZK1ZOSGpySkJPeEg3WTZueU1wDQp5NU1QczErQzhpQjlBdzhMeW9zQkZT
MHVtdmVwQlJxSytnSFNvTHdhKzBOZXRQZFBDNkZoZURiNXJkYVYNCnRGKzZCMFd2dW9MOGRpZTRO
Rkh2aWtmUVRzWUFUcHd0Ynh0eEpmcDFFdm53YmcvOWdKMmlhc2xjcU5teA0KMWtFcWxDcWQwbWpB
ZWtNQTh3MkErUHovNFZoWmVWdEJTZ085ZFJKZ25za2hmbEI3K2ZxNzV1cy9WTVRKDQp4TFZycmpD
dlE1clZhSHVjSm9GUko4Wlo4ZS8rcG9oMVVFODBsdTlKQ1NjTWd4MFNCYjcvZmJDM2IzOEcNClV5
T05iRnZtZWtiTktPVkxwb3ZPWVlRdVF6eGdraXQyWGEyVUxjV3VrbnMrQ1NqeHJnT1hQY2lXWktW
SQ0KdEtQUkRmR2Q2U0xOV1A0UCtPT3JCSGEvL1VTTHpLZmUxdjhYWXlzYXB4MEJqU2NpcHkzTVBF
SXp3Ni9YDQptSXFrV1lhQVlSQytpR3VKa0FHVFJyb2RCSmZyNFFDRU9FbnlFT050SUsrOUQvamxR
Y2xSRTZKM3pCWjMNCkdzSHJpSDVQenNiSlFBdWwzb0pKV0pkN3dIVkxzUStLU0JyWkJLS2prUklj
V05INVZCeWZiU3doc2FpUg0KVS9xYmQ5TXd4TzhOZlJGM0NKc1FuSm4waWVLdHJZeC9BeWtjeEJS
VWkvd2YzK2Mzamd3WlZrbGNQa1VhDQpmMUYrTktva3JuQVBzRFEvMW5aUmN4UzN1NThYNjhhQW1t
dk0vRHNRazFzVm1CWjJLYi91Yy9vMEwrUTINCjlTTXBCS09rOUN0LzVKRUJEZU5FQVMwVzM3ME45
bVl5VmxNT2l5WE5VTDlRNDhWNFA5NmNmc2F5bU44dQ0KSTc1WkkzejBKUjZHcDB6S2ptb1dxbXA3
NjNOMWJKclpDN25aaG9vRTdDZjA2TWREZ2tHejZoMHl5ZGQ3DQpBakFEV2NmZTNkMTFWdHlDUVFF
SzlPaHIzMFM4YXhzRHdhTFNmZWNqWEpmM0VUYnFBTzRNTmsydkQ4aXoNCnRReERBQmQ5eG45UEQ3
bVpnOTY3MVAzV1BKcEFvdVRHNWJ4bkdRZ2dyd1NPaWJlazZObFVwU3lJdGYxQg0KYjdpREh1Rnow
WGFTNXhaVXRMUm9TczNOVC9PbUFBSFQ4R0xYNm50Z0E0RjZPUE50cmFoRFVmZnpXMjBoDQpwT3Bn
cTJralB6RWVMMDREVFVDZVcvYUxEcWorQStDblB5Z3A4RXBac0xiRm1EK1ExTldlSWhrOHU2aDYN
Clk1WXAwdDNuWUJPLzdYRGhzZHhZR0lja000dmZQZ1VXU2poRXRML29ROC9XZjY2RWhGMWxobi90
dm9qNQ0KcUZNbnZrNnJhL0xmT082WFZHWUtBdFdvQkpwNXNMd2RBd2wzSVFOR2xlakdxKzJSaWpz
NnZIRFJLTUhODQpTMzhEbUxsd2NYdGdjQlMyVVVPc2wxd3hEaXBXYSt6dkdXek55SVNabGF4TjRa
SnBZNlpuQVFjaWR6ZG0NCm9lYk00RW5sOENEVUVuaTgxNDFzS3dZOXBrTnNFQ3Fld2sxRlRQVFBn
ZHErQ1VlQ1lKWmdjby9WYnd4Yg0KeEFTUFZLZHM3aHpsbTFZV3pKdU5PU1pEZ0FjUnhRY2pVNGlJ
Z1NhOStrL1lSbmdzdWNPd1VBZngvTDgrDQoxT3N1YVpyRVlzUkFmTEFQWlVMZXh5aU5oQURTWm1l
VWVyQkNZMEVDK0E0RWoycHA0K09oNXYzQUR2VWINClpTM1lRL3l4ZTh4dGo1RVFDSzVtdTZjNSs4
T2RxelFPdTY4aERCTVluOFprSk0yQjRhbjZ3Z3RPQ251WQ0KZFVWMmhYeWhuS0RuVDcrOVl6c3hh
VjNlMzFnRW9VZ2ZtdHptMEJUOWZnV01MUHVpQitWMm5VMWxyeVRnDQpRamdCNXpQV1ltWFBMaGNH
Q1dnWkVXOThIcmliTXlVb3VTeldDTnRlcllKZUlRSGgya2JZVXIyb2haSGENCm1JRkRvWjRnRzNj
TkdFQ0VyRXRrMFBZbWtadUNpWDRQTXZ6cThGbzlVZXd5OEZsNjE2ZzNVbmUxY1FERA0KcUpzelRN
Qzc5bHhueG5rRFhvN2E5TTdsdHU3VStPdEZSZVFmd0RoeWhIcENUbXRqOWJHWnZZR3R1cll2DQp4
bE1jMEZtNkFOZlpIWi9RVGhzQnpCTjBPMmhQTWlHTlF2Wk9JS08wUHM3S2tUK3BGaFFjeklZTFhT
cjgNClZXSWtLN1NuckhqNnF1YkFGRU5hbW50ektkM2wzNndwZGhBMHNWemxxSWhtbTFKNzN6ZFEw
SmRCbkxINw0KY2VIU1NNYkJJSXJudndHclRhcE50cEkyZE9ZVlVYalFjeTRpQW54cDVCYWYzZFdv
ek9aRTJsL1FXSmZYDQo1M1NNQTdjZ01NOVpvbHVucmxwK0Rrcm9ibGdEUU51Sy9QRldlaGdFTFVZ
NkxTTHE4czhNaWpIU21icnANCmNwMVV4ZXVyUnRiYnRwd0hWSE02SUkrRHhYR0svMjdidzdUQ3Bi
WnVlbDgwd1htK3YweUg5ZGRFU0dGcA0KZC9qQkl6cmNhZHB1c0lYamMxems2SnA4cUlpQjd3N1RH
QVNTQXI5dURaeSs4SElmS3lIdWRkZVNwMWY2DQpIdm1OM253cFVqY2c4d0Y3VnR0Zm9vN3ZHblVH
c2k2TVJXTzBnWllsSnFUMXBqUU9hUnAreU5xWmRYWHENCmdPekhPNlV4REkweDhFeWhLTjR4TXo3
dUpnZlh2WW5CRkxxbGEvMVRvUlFTais0QWJrZlplWUJrZnFWUg0KcWdEVkxMUCtwVXFJSUtmeFZz
WHQxMXdyMCtnRllUNG8zc3ZJaFVNTDZ2dmpXNVNDWmMraVlHTzJzZnJIDQpsS3l5dG5GTVpIbXRE
dWVLK3VlTmVJRUhVOTJxT016dExiQ1VoNTd5dnR5ZU1xVjdNb25XU2NnckxKbE0NClFLT0ZwUnlj
dkRkRng2a1h2WWhIWXMrYjMvRElMd2QzWHZKOHpJTnRPMkx6MEJSN3B1Ymw0Zk9rM1dNag0KS1dP
d2w3cWQzVzhTRkRZTm1VbDJWRTJhQTVMSy9MVzVUODF4VXNUeHFSS1JaMCsweVlBUjgwTFpaTUJk
DQo2WGxtMThsM3VaMDRrOW9VbERpb1VwU2p2LytrN1hyY0pKeVBqQVFJMTJrdEZVNHFlc3VOWi8z
ZjAvYnUNCmJ1dDZDNnREVEdaUHJDaCszRU9jYlp6cHBzV0xrSGJHYXZaMWFNQnRETFIvd25ic3FZ
Tmx3eGFXQmtJaw0KSXN0eVZiM1VmYzF4Um1jR2h2c3ZTQmRjSlFQVHJpSHIyVG5UdDN4MmM1S2hv
Z3lSNHV0dlB6dTV3NVQyDQpVTVpza1FJRGhienVwdUpqVWR5c3M5Q29kcjR5UVErYVI4ZjNGV2tH
bm9MZGEwOTk5dHZtODZ0RzEyY1INCjNkQlhvOWdFNW1JUG1ZVUxCeVdLQkRkK1J3cUlpQ0xxdFA0
dWNHUThKZ09VdVlabDNrelJxTUlqWHRHYQ0KRmdJQWYzUk9idmpma3RHTEgzKzViaE53UDdsS0FF
YjNJc2E3b21ad3JHRFVETnRJanZsM0QzRXFNcUs0DQp5QXJnWHpmdDhNSnRpeGgxMjRRY1l4RENR
MVdkYUNQM004RHZBQUcwTkU4M0ljNndBbGg2a0hnc0g5N24NCk5tbGpBdnNwaGNRSnovRGhZU3hu
Tm9uMTVTSUYwb2F5V3dON0hJbU93R3ZpNEc4enJLUll3VUoxRlpEbg0KUTFkSE9xTGlrSjhNRTZZ
dktkYXY4VFI1c0tRRS9HQit3QVZtSXlEVEZrWEFJb1AxR1gvRHhmNHcyaTAzDQpSWE1WU3lMMXd2
d3ZEYThtUE1hbS85WlZLNk0xRy9zVWNOUDlWUGZoNmFaV2tzMyt0TUJjVURZR3ZQYnkNCmRVaVFQ
Qjh6Y2dNeW4yZHBLSDZmRzdtTXV1UkNCZzY5Y01KdnF2d3I4elFmUmRQMlRMdUpWeEd2eFFZbQ0K
QThiR0NOWGtWcXRnOWhyR3diRFJCMHpqYmR1RFlkOFJOMkZTS01kNWEyNXc4ZklmNWZrVlhCbnFo
eVBMDQpmVGYyUkdmVnhQMklROGpuUVlicDhqYUl1cW5wQWJjcy9FWnJMWUtkZ082bjlPSVhySFRa
aUtNc1ZlcXUNClBJV0pkYkVtbXJJRVFiMkVQNTNPWEFlOXB1NktremlmRGNhTzE5SWpYRXljYXdK
Rmo1bGxFeThINThYcA0KUkUyRE1FSlp6bnBlMldZQjBUT3hrY2prNUsrSUhQWklxYjRJZ2tmSVlK
d3V2bEwrNkpUYnl0TXBabVhwDQpPQWhFNTJnaThRWWc1eStxUExRbnFaWkhyb014TE12NEd6ZnAy
dmhIa2pVTjFpQ3dzZW4yYWJSaG5CdmkNCkJnTEtXYTJsY2hmZSt0MkFvaEVQbVBjTWFaNWdhVldK
QVNPK3NCbndJRG13WkNSbkdKZ0ZTc0hnZ1JNYQ0KckVnTjNkNmRqd3E1OTFjNzZNSnIraWMycVha
NVVXanJ5SkdJalA5OTdVdExTVk9NMGFmUjZyR2szR1dsDQpvUEUvRmdnbzVsYjV6OUpRZStzV1Jk
cFIxNityN3JmSXFKeEFwaEVST2xCOFV6cS9jK1RuaGR5TjQ2a1MNCnNETHcwbDNIOUhCYmFwTWg5
cGhCYWtWSEZEL1g1NnpuZkQxUGpDMG5BblhBWStWOXNSRzVRVitxS1BBNA0KeVI4elRZdmVJUzNa
MkpmVzBqdlovVEdlMElLN2hxYkJmTHZxNTZlT1JFZjhyUUE5WXRhb3RqSFJacXo5DQpOT0NLZEZ0
MHNDZE5abmx2Z1ZYMW5XSFF5RG1hbHlOZU5SOW44QVpTcVZQb3VEUVdrMmdtVVBUZnltc1gNClVN
SkYxRXQwOWYxd2dEckw3NkdVcXlFRENsTUhJcVprVVlydjBrMzhZeUFQaEM0MkRHMFBPbFhZVE55
MQ0KRGZEVFZ6SDIyTHZDSkliT2ZnL1NqcWJOWFJRSDJ3K2NiNlM1K3kvZFBnbGFVa2EwdXRNLzEw
bXBTejFzDQpJeXJtNWp0SVZqOVR2RS85aEJvamFyNmhTcWU1TjdyUnFHR0Q0bzU5dEJIYVZkM09x
VlJCckQxWEc2T3QNCjhqMGdiaXhra1N1T1dJOEtnUEZqZGl6WUhndGJ0bUc1VXhucllpdHJmQndi
cmFGYWl1NjlHSDBjZkhxWQ0KWU9STXpuaWtyMmg5VG8wNml2YmdSN284eHVJemRNZmJPcDlnbnVn
R2QvWUFnWmlPOUQyVitQT1J6a0FVDQppUUN5d0NOaG8xdXZQOXZ6bnNGY3FnUXd5RVJ1Z0xUeFdZ
OWE0cWRVSXp2ZER2enJHSGdOaHB0eElHSnMNCjNKZ0RyTEc0eEZrbTFlYzJvUEozNVU5bm8zbENR
NXU4UGFRN2Z2c213SmZrSThCVGV5NTVjTWdha21peA0KTmcrTnpxNlFlOTh0VlE4MDQzL3g5cTg2
eDAwSzRrWXV4cHJtY0l2dmVCa3dyUmpTTVdhWElEWlV0Z3NODQpiMjVFTjRkbDlOZWlhNmNpYi8w
NGt4SjZUMlhWT2lnME9kalN5TWIrYU4yaVVGejgzeUFKNWxjT1dIdnUNCkdyUE9vK05PcnNqMk1l
VGJBcVh4OWsyNmh1eTRXbnRDb2MyVksrUm1BRXIyUjBpb2lWYXMrNC9SWUpGNw0KWHJiZ1lFQWNC
NVVSOG9MOG10ZDZONEVXSVh3YmF6YXBqTlJid1lGUUFxdE1rb0RCenpsRXo2SHdNUS9CDQpvQ0Nu
dHEvcWY1Q1YrNjducXlpWDhTS1FQZ0poM1lyTStuT0YvVmU2VjZwYS9nbEUycDgya2xIRFZhZUIN
CkFUcWJiU3RFbHlNY293Wkkxa1BvRkovcEJLZ0ttelY4V1NqYmNxNzdBRFN0WDgrWHc2YU1oZmtG
VW1FQg0KR2kxam1yeUt4UEhSTlB2anBZek5ML2t4Q29QZWtLSG0xTHJkK1g1TkJHVS9Qb3RZVFd0
YXdCQndkK1hKDQphYmo0dER4am5teWFWZ0dLeGpSdnFYb3Vjc1ZqaDJxL3pFTWR0WWVCWEJ4eUda
S1E0blliMzRyaGRZbzANClNLWFE2TlVKejNWci8yQzlTMm5uQnRHR3JJWnVvUG9VRTlIWThESElv
RmZGUWU4bUxhU0hXQmJsaDFSMA0KYk51bUFBVTB6Y2JySS9MTzRxZTY5SXlmcmNuUlUzZ2N2dHYx
ZG9UUXRRcGkremZvR1F0c1NJSlgzWGNzDQpVWnVzUmZMdlRFZ1hURDFyblFwTHgwRHBjRXhZY2VZ
d0FYenFkemFyN2FzNFBnT0hvMlMwcWc3R01ucysNCnEwNXVwTEJnenlrM1F4WnZ2Tm5PMzgvelgr
Nm1iQjNQQ2RjeWhNQ2I3RHBTOExIWFR0aGhqTjIraEVTOQ0KaVRvUXlIQUMxS2hSbmlvZzdBcjUx
blo1elJ4V0ZtSjI3VWNGVW9QUnBlMDhDWThhZHV5YUhsU1lVdklODQovZSt2dVNFNDRncUY3ek1M
d0hCRE1iai9BNDVjbHZCTGwxZEJmMmc3cmc4aldCME5vdFhqT21SYllmSVgNClhEbmphanFRcWZN
UkVJWVl5R3V2MnRlTm9pdlg1aE9WSnQzZmdqTFFSYWc3MmtuemRya2xLVFpsZ29uRg0KMysxZGZL
YXQveFdGM3dZQm1GVGxLeFN3ZlhNZVhNa3VwU09RblE1a21LTjZIeWt0YlF1dDRleGlFbW5zDQph
U01INzBqblVtaG5LS1V1a0R4U1M5YWgvQnN1V2V2cUlPcU8zaW15eGdsR3pTTkVLMzVIQUJBLzN6
Y3ANCjZWTWMvMHJSU2hNaXFGcVl1Y2lVTjVXSTJuSStVdTBqd3duMVRLbU9aVzlTZkZNaHNTUzhs
a0hySnNQcQ0KMzVYY3R2TmNCeFRNZm55RU9Gb1JMQTBkWENLbUtZMFdrMGtSN0Jja2VYMEUwaXdo
S3YxQmNsbmt4VDd6DQp0YnMzS21jYVdvNjNFSkp3WkJsemh2V04rbVRRazc2Sk0rT1BseEh3dVQ3
d1hXQUxsTDZKdWRGSDJDS2gNCnJraTdRejRxd3l5OGRYZ3lTZFp0NGpaM205bk9kYUs5M0VzZ3Fv
Rzc0OGNZTUt2TmI3blQzVVA3WU1QVg0KVlgzcDZBR29kaFIyRVdVbEpWc1huV3VrRGJWVDIyUStU
Nnd2eklxeWU2YzVDaHhNbW1HUHRJdDI2SUpUDQpnR1NNU3BKU21TSzkxWmZzeVB5c1RHbGlKaTBx
cWRBTDZ3dWcwYVVGeTRQc1hVM3czeGhsOURha1pIRmoNCkVxRlhVOGt2Z3FDYXZNU2s0bXN5cFIw
b3NiMlBEWUNHVlVHbG1XclQrY0ZoclRWQWllZWRUaWF5M0pKNA0KVlVZR0lrQUNoazRyL2dlVVVp
NWdIN1l2Y1duNjdaKzhkcFNXRjErT2VPYlROOWpDeDcyakx4U1BocVFUDQpwT010aUh1Vkc4Tnpy
VHlOVXN2MnZaOGZKY1ZGVE05MUg3UlRVY3lFNDB4WEQ5ckROZW95OW5IUHZYZ3cNCjg3cG1Rd29J
UFUyaEVQQjB4TXRnTkwvSEd6ZWxJYnovQ1lXUDJPMnJ3QTFqQnptUS93RjU5eTdGdlo0SQ0KMlVz
NTh1U2hveXV6RlZMYndmclI0VUU0ckZDQWo5ZkE1OFlqSFI5dHdNT3Nka1B3K245RWU5aFQ0eUY2
DQozOWNnRnR6NFlhOE15Q3VtZUpNUTZZUjBHUHhUQTN5ejd6M0RocnVqcXBJMk05eUR1TEVtVzFu
aEtwMlYNCkZLay9iUkJ4SDYrcEluZ3hTUytxNnRWNERKWktCUGwzQU9ScDBEZzBwNlRMZkNnczI2
V1NTZ1c2amdMeQ0KVWF4eXluV0IwQ1k0TDRRcVJlMFo3ci8wbjZPSldtd0ZMRWtzdS9keTErWTMy
bUY4b2dacXRNTVhtbjNYDQpKNGpNb2ExS0VTb2dKTmZQemhZU1RGS3d2U0hFaWN1bDFFQ1owdlB0
SDhIVUI2cGJVTlI3QVd5UG9CTlcNCkxSU2tDem5tU0tyZ200bzFDdGt1TjJBQ2lNbndld0VqTDY0
d3g0ZzBIZHF0L2xPSGdxVkRXYk9IZW9pag0KaEFCZDNCZlJpYkFPNUdvRWJjMkQ1MjlHczlmZHJp
UmFndnlOUE1qN0xXK2J6TjZJUXN5UXRIT2pVd0pGDQp4ejIxRnllU283VHFtbTBUUG5FWFZWdmhX
eHVYKzV3NGZDMzRSSXNSWU9ZU2NtY2JnYzVGMXlSK284OVQNClRxbmtmMnRLWVE5RGhBWGxHbzV5
TnJ4Y0txVkhMelp3b2x4QkhhaW1DU1RUTm9rWGE2aXJJcCtrUGxxOA0KZ0JjR3ZUZ3lBUlJneEFO
YTNLalkzemw5Yk14eGNYN1NqUU0wS3hZOHp0Y0hoNTQ5bFA4cG1DUmM5L2tIDQpZQXJJMVhxYi9P
K2k2ak5GR3ZmZlRXZTZiUE1nWUtmV3dHbU1sMWlhVTk4K1d1dU1Ka1k2MXpKS2JWaFMNCnhZbVUr
dXFxSzVjaVNqWldPanllUDBZRDlnSkpPbzZpdzZ4SGtyWFhjNENqYjFsY0VIOEhORTZ4RjF3Ng0K
WnRsNC8rQ2YzWUpvMlhEeEQ3Rm8yWW9pZU9sQkRPNjdudUN5NHNzMnJGVDZHa3NyMzRBNFNRZ3Ar
VUJsDQpkYTVFbS9wRnpsVUJrQ3dJSFpHYTZPYWNJUUd2VW4zdTJlUkZxdkVmdjJiRDh3ZnVITlY0
clVlNkpueDANCk5DLzV2em9heUwzYVBONTB5RVdvWTcxaks4Um5nSkVTellmdjFKWUQ3TUNpeWxK
Sk5MMzBrQ2IzR1VsVg0KYk9mYnAwTEk5dHpuTXA3VEdjSnNXZ0JzTmdldms3MnhQYWVNVUl3REJW
UTJ5eFBVODgyNldPcTUvWEk2DQpweGRVSDZtMWhVWTl2WlQ1Y2dNV2RtS3M0QzIrN0xGSHEvM0lZ
c1huajh4M3RxM3YyUUhsVk8wVWQ0bXgNCllGZTNSK0kxbjZ0Zm82TlZYMUhEMHJVTEtDVTRpV2p4
QkpGL3pNa1BEZlVSR1NKRU04MnZDR1c1cjNjcA0KZDhNaVpTVWpyd0U1YitLSm41UjdsU2dBU1Iv
UGY2aWpuSXQ4QWZySzZyUmZiQkF2NXdsaG9tMUV4MzBpDQpNanJWdllpbUVFOE52WHBBcEN3SmUx
UGk0cVZaMENXM3BsY1ZYb2tkZUZVWHczeVNpQ1VXa3ZxK0lDclQNCjhENmIvSG1Sc1M3MHJKZnFt
TmtmM0NBcEEyOFJQRFErcXhLZjVFTkE0QWxBbGhkeDE5L2RkQUZUb1doOQ0KVld4RmdJZW05VkR6
YjJYanFLRS9UNndCOFJ0dUlKZGNFdzRta3FudStteHA3TXBobjUvVU5lYVNNcFpkDQpFbzc4cXhj
Q1FGWVVZZzgzamhnRkxyWGZFYVVMWmFLcVBzRlNuVWkra2FJcmREUW9Bdklpc0JGN1dlOWUNCmkr
TFU4aXJPbklnYmI5TjVPM285dGh0dzhuRW1wYTRYaHpqa040NWJPdlhmRzBEUHg4Q2Y5WGZLdjJW
Qg0KQkUrUFYzWEpDaVZaS2F3QVNKTGR4b2Zsb0FBdmVGWE1mRlZQbU5sQ09GMVI0aXJqRHpueEhB
cVZrRXVqDQpOKyttbzdnTlY3QllFc3lvaTRSeHpJeW0ySWJURnZhR1FRREpHcFZYNUYzc2xyV3RZ
anBFVGQwL2hYOE4NClBnUW9iMVV1MEVyWlR2Q01GTVN1V3FMTEVYRWhSR09ScmMrUTNDZUgyNkp1
cE16RkdzVnJPRmgxMyt0OQ0KeUNnNjhSZ2Mzc0VXWWFTQmNBRmVQd3RoSFJlZmxwWUMyYXRaYmVU
WWJsdFYyeW05VWxzb2g3WUplaXFrDQpabUtIOGltNUZFSlFEbWwydjR2V3A0ZzZSYnFGVXJUby9E
dGtyT01OR2FyMzlyMjV2amZIclpLUkFvSDgNCnJwTXp3NnJPUytWV0tFWVRKdVZaNEIrRU9FYW1n
S0ZjWDA0OFdpUkh1a2Z4MURzQkZHUTJHcXQ4cjlUTQ0KaWp0TldQai96NWh6YUhNWFc0L2h0cTdZ
a00xbGZwUmZuY2RxelViZWhrNTU3REJhYUF1ZURTZ2drdGlZDQptSXp5M29aKzNPTDV5blhLc0pj
bFU0dWdLU1BqVmVxNjA5Sm1BYytmV1ovbDBQRlVrenp4SDJwRnpZdkINClFrV0dBdzFQY29lYW9W
cUptK1k5c2ZnaFlxb2NUUlZJVkNCbzZEV3lZMUF4T1dmeW1PemF4VjFBZFlFaw0KRmpDNE1nalZy
WXFXbytUZTlqTlNhMjhrVVo3VXdMaVpjWVdPb2lDRjFzUnRqQUZsQmZCSVdHL0QwTGhmDQpqSWV6
VlU5Ly9pUVVkQnorTG9kRjBWTTV3NlFlUUVHNGNlSXdZVktRQWRhTlRpNGdmU1I3NmZTWW9uZFIN
CmhWenRaTmh5WFpZblMzVWMxNE9UQS82RXJCKzNjaERFeVFWS242SE5zb0cyKytBeFA1UWhsTzV0
SGRZLw0KSUZTUFh6YXZmdTBiTi9tU3hiL0o3YWU1SUxpakNuRGFKK25NSEJ5eTdaZ1BFVWVSenlJ
KzB3NjRoRmhhDQptTkFobkpZS05Qa0RSVWxaclVPMktqZVVIcnYrR3VkelZTRlJteksydVgzamxl
SGZRekxIeE5BVzIvVUwNCmRHcTF1ZFhFK29yRE9zbXd1ZEhnWFVrSitZUGYva3EwVUpNZjBqZ1ND
MXlwSTM0UGZDUXJadHdHelVTcQ0KNUxxMjRFTWpJbW9BRU5EOHFLNE5wQVUvbmhxbDhlK1pNczBM
ZVROQm1VeEFabHBNMHpSTXMrSkcrTEgvDQpQRUozMWI1c0o3YkE4UTZxMndIRkVYOEw4Q2tMZDA4
Y1p0dHc2RU9ROW1KOXc2VzE2ZHVWSmRxQ1lOcFcNCnBYK211NW5ITEZJZ1BIWU9CRjcyN0tCdWQ2
NENZcDBaMXVSenJmcFB0d1lEdGtFeW1SbjVsVk53V0d0Sw0KcUppKzVnaHg2N01mOHlpd2JmQ1VG
ODYvODhXb0ZTS3RwbjN0NG9OeG85dnBYVlA2VmZpc2l5dkZMZlhDDQphUU4yQ1RWc3hCbGNYWThG
VU1Edkw3WSt1SWZVblFVZ3g5c0xVUDYvbWMwWEYrUzlwM29JSmcxSVR4cGkNCk5qd3g2MndCUENz
Q0tqMUNTRkJITEZpejNQWnU4cmk4bVZaSC9UTkdvZGpQa3EwTVdjbktQcW9aYnl4Uw0KMVJaekJR
aXhOYTBvVFZ1NVhkOWV1ZmRjeTNJekVEc0NLaHhsLzVHNUVRMGhOQkZ0NkNUQVZDU2tPc3pvDQpC
Sy9NMG1pWnEvNWJhU0lrbm1YcnBOVXNaT3hYeFBSdFE1RDVjT0c3akNLMnVaQlNMbTJSN3prZXNu
Q3gNCklyU1FROVNzTHhtaWgwb296d2pZbGs2UFVHbVRBNXpjUnhTMU5LSHdZekEzRWd1QjVrSVZs
K2Z3eHo3Mg0KZ1NyNkltV0x3L2hsVmdNaFZSQVcvL2YydXFqYlV3Mm9NQ2RERThEem0rczlHZkFJ
LzBzWmtMWkV4M0YvDQp5ZnJwcnRvbjFUQnVySTIvZ1VnN3pINU0xL3U0Y05RaDFscnVNV25maHYw
Zkl3eXBrSmlDVmRQdXNFTDENCnBUa0hERm1rWXNtNWhQTXZ5MzR3Y1FxSlh2VmNvUXhkclk0ZWRq
V3YwQTd6OGg5WGtzOUZGL1RabFRmNg0Ka1B0ZnNIbzdXaUdHV1JEMDBWQXVBMmdLcUEyUlhlenlH
R3lIU2EwU2VRN2U2RU9JL3o4eTkzTUV0NThYDQpjdVhuc25hVXBwVWtxMEhsNEwzRVBwVjRDMG9T
MDRjMW5RVXVXbTV6S0RUVjVmWEkvNDF1VWdZM3lMc00NCjBhZm96Zktod013a0pRSERZQS94V2wz
TmVJMnJtQ1U0THU1SXE0K05pZEFoZnVwejlkZXA0cVpoWFJpeQ0KS2wvc1pYSENaRzcrdGtzVE0v
YmZBcllHQy9DSmFLVkg1SEtmUW5pU0sxT0hST3pWRmlOR2t3K096WHRODQpzL1BieUxmdGNINmdZ
OUJPT0w4STQ3OFltR0Q0NUNJcXJXekFWZitKZWtzZEFlcHc4WW1WUFg5aWZGUVoNCmdobXdaOE9X
UFNJZ2lhcENBemtuY20vU0tPbHhxallkWjB2YU5kT3ZLQkRVbEFBQ1ZlQ1c0VXlGN2srZw0KdTdC
TnFFaHlyMXJBQytTTUh5L3paRWFad0g5dlF6WDA5a05lUlo0SHhjTFNLRm5UaEp5Q2V6a2o4RGdK
DQphV2N4ZFNXbTJBZmdxWkUxQXJUNkMycGhrOHNreTJFN0crVlZwVzEwUlBGcWpaSDJFdGRFQi8r
ajJLb1QNCjhUWnlxcnJRZ1U4RFp3dER6K0VpNTZPR3loeE5oUkZhdk1hTWlORWFjWGFaQTRFM3Bq
NkF3M1lybEkxdA0KY1hKUTZNQzczN2hzNUJlRWRsRmhkK1FYZHp6R2QwdlBZQUlIL2tuK0h3UC9y
QThOVE5TdStnZFNSS1FuDQpoU1F3UTczWlQ1dlEwd3RFN1djTjlPLzlJZ053ekpWMUM1b3o1YU5a
UUlOYU02MFlRUVpoOG5HQitGK0sNCmFYRU1FaGpITzU5amdTUXNZdmJVZ0hTUkNIMklxMEl6aFlV
cXN6VFlWUCtnd2lmSnVDbktISXlyYjJmWg0KVndsdjNKQUZQOUVqRDBETEtycUprdUtIdXU5NndC
TEVqaGdqbzl0d0FaaWs3T2pQL0dNNkpoZmNwdy8zDQpCSUdWZ3g5bEZwNGlKY0tRakFHeGF3a1Vz
NzV5ZDlSUW1IZWhzZkRyTE9ZYWU1V0hjUmNkZmFmYk9iWUYNCmczNENkL0VBa1g0Yko4ZVowZlNR
bEZweTNJWUhJZ3dFUGg4REhMMzFSQkVRL3R2VlNGTElndmlXZ0EyTQ0KWGE2Zm4rVkZIalcxbEhy
VGpLbjFtVXRuY1Q1bmd4NkE1cUYrWWNHam1ITVk1SmFEbDEzRmc0by9ERUVjDQpoaHlpNk5pa0FH
bjdBR29LLzY2eFNCcGgvTVFYK2pNVjhYUzUwc2hPT2x2V1k5YW1veGR4TzJtbVluMUQNCnJWT01n
U28zeG5BOWR2d3oxS2tDa3dkRmdHbDVsMXp6V0Job3Y0QW1YT0pVNGdWQk1SUy9xay83cmxiRQ0K
SC93ZVV5ZndQSUc3QW81Y0xtRENlVzljazRJTkFwb1JIWk9zRG9JSDNLcnZGd0pmTnBrTkNOWWVr
aFhHDQo5Y0hCQXlwNVNyMHdZT1czT3ZiV21BM2FObTltM0VPM2dKVXpVRi9PUnIxNFV0Y0xIdTJ2
SjNsQ2p1azcNClU2aTFFVlVPWDJqaXZNMTdYNmVXMmdzMTMwbmZFdk9zS3QvNGVaQ29vVFZvQXht
NHJwZFArSUZWcTNPaw0KZHMyWUt0TEQ4L0E5Uk9zNWx3RkRQWE9iQ1hsUXpzZkpFb0JzUU1jR2tF
WEdOQWhjZmNiVFJpYjVQYmVODQo4Z1pra1FudUdrOFRHc2ttemFRUzlkYXZ4UURVQjBRSEoxZmZR
UkhibjVnaHlVTW05Z05DNnB3OXFvSkUNCjMvdFhOVEpveXBrWGoxZjFqdUlTMml0Vis5Vlgya3VL
MDkwY3VMSU9nOUxiR1pvVzV1T2hqanBGNjFRNw0KTmN2TjNITDN6MXpyVzFicnlzSFdxbzhaaEVv
cS8xc2k2RWpTeThGRzE1WW5VRVdoRERQMEJmL25jQTI2DQpQK3lhZGc4VU56QTRBdkZ6VHp5MmNV
Z3ljZnBtcTlvL2VsbnpmL1h1VHVZQmlUWTJVeDh2MTJxcXk2RXQNClhVWGV4ZkNKMm1DdHJnWEFL
V0R2NVZvRlluL3Z1THZtVGRzRFZCbXEzRE14MjVLcTcxMXErTFNyTDRacg0KWVZ4OFA3U0o5UVpX
bUpyeHhkQUdDdTdPeGJYeVBKY0tLY2tHNTVQOHh5OHowL1U5OXRsekpFcU9xalZ1DQpKTXhDektv
Vkhab04xRWFaYng0eUR1TGJzdUhYZGdvYTNIVXh0Mk42WTQxdVJ4elA4aUdxaFpPNGU5SnMNCkpm
UDl4S2VjVEJTdHgxQnZYbk9lOFVtSXkzR2xNb3pWc3FRQzJsTzRIRHFYR2ZTTnM0dDk4cGY5eXVj
ZA0KTUFCYmlqbC9nb0NhYWZtRUpZRnRRbDNZL01PY0NydnpPVmFEakJheFJ2T0I0N28wTUZqeXdj
MTc0UXpSDQpyWElISG9WUEJQWUw5RFdoQXZIVHQ0MTdGVUFLaC9QQUhYUzN3bFRhbW5iY2U2Qlly
TkVDdjNvckhjWDMNCkZUdnNQaDNYdEVneVpsclpid092SFI4ZUx2SVFzVUJUT01CSTNWRkFnTWlm
K0ZVS09DZTRXeWRuVnRVMg0KSksxY3Q1dTRUMHF6c25mUFk1RFdNUUtqTExUWHpOemNnVFNZQjdB
MW9xMWdvSHVTSFJwbm5YNC81ckVIDQpnYXFxaXNjNm5sVWVacHptSWt0a08vTXg5MmxqVTA5WFFJ
UW4yeXFLWUw0dm1qb1ExbXB0dVFMTEdFMFgNCmxKM1Zva2duWW0zWWpRT0tOZ3U4Sng2eHlML1Q4
aFpPZlVyVmZLOU90eDg2SHd6a1hXN2t3OXROaFlhdw0KVmNxMUFTMWdHV1p0MUJIaUR3eUxJQUxQ
WUVBMmZsVmxZKzNyZHZmcjRORFU4dkxDdmhNREZHV3JDbU1LDQpZWkFEMlI1d20wUjUxckZJSkR6
aGVqemtQbDMwRmVxMUJYTHlKd2dRZTdjUXYrbWs1SGxhbzR5Zk81NDcNCjRRZGZRQS96cEtwY25j
NGpSMmNSY1NOcGQra0VrYVZocW9TTWNJRmZYRFlUMCs2V2RHZ2FscWs4ZUdaTw0KSmFYdlovamY5
U0Mzay8zN3BaeVI3ZGtLb1NMOXcxcE8zNVg5SVliak0yTFRpdytmYk51aEJ6dHI2enY0DQpHRE5N
MVZ2bFZXcW5QUjlKQTJaaHpvZjVrcHI3QU5CUEFPQWViNzNaQldtWitwZGxsdHROZWczd2Rjb1kN
CkFYL3M5NWlWVFVXcTQwWlVjNm56U2dZSDJDVFNTY2tOYkwzd25USU9rQ0JaRU01Z1djajRyazNx
U3pqYw0KaXVMbjAxZDJYWW5iVWJQOTB0UEptRGxycDMrMkRZZFd3eHN4c1JZWENJVzZsWnVtbzUz
SkdzNWRibk5LDQpTalYxUGVjWnBQTldFRjhUM0pvOC9TdXhNRHQxSFUwWis5VWVuR2JETTRXM3V4
ZnE1T0REMXJWSmVnT2ENCnhFVUhLWmIwaGVRb3RTalN0NVRPOEpUc2IzNXFqNHRyakhBSU54dFpq
dFRFM1ZSbkJGYXZkblFtdnVyVw0KanQraUN5enBQK253NEFsL0dPaDA4dkUyWXVmT1JXbVJ1cGtD
MWY4NE5PdGFDbDFTa0NzcEIyTDZJb2RCDQpUYlpwKzVDN01RSUlqTFdLSWF0M0VrYnBKMnYwZ0xz
WGlOM3dPYUJxZWRYU3FQZXpRUXQ3VlRYNTdSWGwNClFrNkhZcE1CTUhDTkFiNTFFVk9MQndVMWR0
YzZURW9iQjcyWGJJSXM4dHZqQ3Fmcmdvajk0SG1VWVJ3cQ0KUnFSQzc1SURSNUpmTnQwVHRHY3Ir
QXU4SVlsU0E2Vko1Sld1WlMwNkV2ZENlQ09JaXVhOE9tZmtUajZsDQpuU3lWMjdYUGxJRzJTT1hR
c3piMlVQbkdXd3FxY1ZyM3EyVGxsUFBlL0l6dFhEVEwwRDk3TWVIaXNjOXUNCmw5U2pyRWhvVUZN
ZEN0TEQrRkFZMndvOXhJc0JEd1pHRUtLc2FlUWdDM0ltQkt5QmVUL1M2WFVsb0Z6NQ0KZHpMQkZr
RHNkb3ptR1ZlZTRSbmFLUW5OMElEYVVpZy92QmpITnNVYXlSbHJhVytGV1JGRzNUa1laSGNYDQps
RnVDVHVUenpTc3ByUlNYSjBydkpVcFZyb1kwdjVoRlpJVExKeXpibFpUN2cyUE92QlR1ZmhPaHMr
LzcNCm9rL0NVbEdNTk1XK1dBajRiVkRLRFppQmFPVWN2a1kzN0RzSUFXNUM0dHhRaDRCa2p2L2Fu
Y21adWNtdQ0KSk9GR3VOZk5pVEExUWxxem9HcW5oM28zalVUTTNZSlc1ZU4rN2NNZnlmVEVRaDJm
QlZocXY4Q1RmQjcxDQpnYnFDcElGcnJBVFRxRk01TGQ1RjIySDdDZjBwUHR5UVh0V3duZ0NRY1Fv
b0FwRXFmbnZQTytxSE9TVDcNCkVjc0Z2NjVoOXhIRjIwWWJJMmdvSTdzUGMrNVlWaVh0ZDdlTG40
NXU2c3hRZXQrYzFtQnNsWFVUSktGbA0KTTBzWnRIK21GTEFPNGpxdVlZQ1kzSDlSYVM3NG1KZ3A4
d1d4OE80N3B6ZVhxLzRUQWJQTTI2cC95YzgxDQpJeDZ5QTB6N0FxZmFOeWFhR2JTdDJoc2xoRGlG
bUx5Rm0wMldYb0hrNG5yQ095dmJ4eVp2eUJ3dnB2RmMNClcxcE14M3BoNFhGeHo5cCttMUdMTVky
ckt2amh3NERpQytncDlyVEx3U0ZhNjQ2TUVLSGpaQ1ZPWG0wVA0KbXlKSVRUSmZZVXNteHhkYThm
NFRHbEJIeHM4Z094dkJBdXdJUzVMTEcxOGpnc1U0SlpLNjBrMFNJMFNYDQplaU9GUTRrZ3Zjbjhv
ZExGMzFFdXR5aEU1ZXRydjN0OW56OUltWFV2bDkvMytvcG4xN0cxUUNBVm9TUFUNCkxQdVJCaitG
R2RheGl0R3ZIZDJoTFRJQ1lPYkNxSUlZZlVKRDkrbC9lSE1OaHpYZkt3bUFCOXpneWNzQw0KZk5Z
dTlNRVUxR1hEWi9aOGhlWkhVbTJUVldyNFk0NnpyNjJWTWxUdEV5U01ncllMbjdtb0NKZUc5NWdT
DQp5eThvWVR5L1l1bGFmbGtQRTZ5T2doMUJ2cUh2aXZuZDQ1TkxXZ1BmNU9OODVQcTlnM01OTzVK
SlhsTncNCk5OZm9Cczg1N28wYVpHOVZaSVRVV2grR2NSRGwrZHJqUGx2emVSdDkxSFA3QXFrdjkw
UjhCNlcwUGwzSQ0KZ3RjeXljU01ORHFhK1VjbGVzV2JFNkYxUGtZYjFpMEoyNytDSU9ITjh4dTZO
Zjg3NDFRQmk4dzZMTE9GDQp2LytzYlFMV1czc29nMmY1ZzZDcEhpUlBTNFgyaFF4VEo5Z2JFL1Rv
akNYSUlsRUJ1c3U2VUcxNkNNc3kNCklOQTJVZXg0clR6WElCVkc3dEcrZHRTU0xzeVJMdmlVVWhN
VUhrQnlsVTE2WnE0R0RFZUdHQkhzVzJXTg0KNDdpSFdoaTJlYUVSaXdIREFHTDkyQ1JCWE5mc0dt
N3FkYkFrUmZFZTF6cGpOVDhTVVJkY1RDam9IQjhRDQpDWnFQeUxpeXRGWWZJVnl5SzZiWXVzYUtZ
N1FzZThEOXlXOTZINGdnOXVEdldKNVRnSit4dU0ycXNjTk0NCjZBU1ZyZlVQK3NaNjVvcHNZUkdi
TXVsb21aZEliN04rSUplcGJQTEhUYTFhSzVhWkNUMk52c20xN0JUSA0KM1AyRGJ5Yk5CNFRWSVFB
SmVzOUZkNnU3QlNBN3BJTGtLbksxU2ZzT096MkZDdFBHam0vTmhzMk5LQ0RLDQp3ZWJ1UmpONmxj
U2RvRlpXNThVdUhuYlI3REkxNFkxSTR4eW9sL3pnajhoNVc0QkhUOFdtZHZJTHlqR08NCjFXaFlk
NzdHOTZIVjZQVHNGc3dnN2kzblhTRzE1N1Q2Q3FwY0x4UE1kV0daOEtGaWRjU1grMUlQazRRNw0K
TjRjMGRvaENjeXVyekZmWGhQZXVPSGZabE5nY1RSZWw4NWdjWnBiUkU0eW1MNjRoWHE1Smx5SWI0
RDZaDQpVTjQwcVdBaGhUVFlQbTgzOWNPUDJwZGt5akhQT1NZR2t6UUY1R29lWkxPOUFwcHNETEgr
MWJnWUF4NEkNCmUwODFhTUZZS3FnWmplY1hRV0tXVFpteFRrdndJTGtnU2FreDhIMmxab09xc3BV
UTlNS040VjNTelB1cg0KTmw3Q0ZOSnZsV0ZsR0doNTdib2RrVitsa01WZU1BVlRwVHFqN0FOUW45
KzdYMkJYT1JXMXhwQUFSRFRrDQphbEVXcmVnS2FaM3NxS2FIRzA2M0tNdnJ4Q0pLM1o2QVN4aitl
VzV3ajVHQk9Jc2RXYlBzQm1DbTBBeS8NCk1jWU05SkJ4STBvNUxmdHdqaTZZY3hEeFhQV081OG9G
OGRzbm9qTGFZTWRmaHRiQkxqMVpxVndyQmJmZw0KMzYvMm9mengrYmUvR3VocVhYSUkzMXp4UGFa
bXdPRGJqa1ZCRmYzQlpvR1ArQ09HQVBqNDZkd2lMZm5nDQpNQWpwTzFhZkZndHprbTZvQ25FZlhC
QktGOW5WOTl3RTNRaUUxUjlMZG0wU1ZVSHoxYWhrTzM0RXJ2MHQNCkxkUHd3eGJwaXNncmxDN2NW
QXk0eGZzTDFPZ3hNS0I0WUx6QzYwaVkvbGJyOWEzQk1sVDdHeU04OGdPUg0KRzdXdFRRbFNQUFIr
N3JLZThlYlR5dnVXK1NmdnZPY0V5b3JpVjRpMHQzUERLd1Z1OFFPVjhUR0tUc0N4DQpnSXhCQUtt
d3hicFhZcDcrSHFLbmhkcURoVUZoQ0dUQ1ZTZFVLcCsvZEs5bjIzY2o0L2R1TUh5dlRLQlYNCmpy
SmU0QXNvU0d0M0lmMUdiV3BWTGx2ajU0R1czN2U2cXBsUHBubWJBZTlMTmczMm52c3pBSEg3WHhs
SA0KVnlRMlZaMmM3aEpZSUlXeW8vb29uMCtxR1RSckcxbjduUlMzTktMUVIxdHZwbUNieHZTZm16
N3IvRk55DQpTQXJJODZ1S0tNR3N0OFFDWk1rU2xMT0hhNzk3ZWFrWGpWbkh5bktOSy9uc0JjRG1T
SGcySklGRGpwZXENCk56VVNyMmRrdDZ5TmNkRFlPNTBPeUtNZkpoQlBuRS8rbFZRbGxPeEkyQU52
KzdReWRLWFJsZGpWRGg2dg0KL1BTcUJnTUwrZ25PZTZqcUMzNjg2SnkvVExaZnBKdk92Q1A0UnJk
ZkRLSU1HaUtveWJKKzUxU3NKcE5mDQpVODlyZzVaVU5icW53bTNLSVh6UGFjNEdYelNCelFRcDBM
emVJandiSjVWK2FOd3Rtd0dQSTU3ZjFYekMNCm0rTmM5RmhnVnRldnN6Zm13aWZQS081SFRIM2U2
WGhENUNkOVJHSXA5UDMxV3Y2bGtHVy9NMHMzSVRIbw0KVXovY2luOEJ3WXo1eDlYM2llLzNGdzJK
Y21ldFpURml4SUN3L1dMcVdidDBWdFF6K0xudlJXL3Rqd0c2DQpsZXNhOUhYb2tSQitZTnpMQzNC
azRnZCt1R2JiczM5THpJT1hMZXpVRXdqV2VlYzNqdGlyQ2QrUFRxOWkNCmxyNDNSOXBPZmhNaElV
c3JQOGNkNFIvTVhvQSt4cjlKeFB0SU5zTU9qVXRLZWJHNnBzTGJwOXhxRlc4bQ0KSWFwNnVRbFZv
a3J6YjB5YW4xUDFjVUVHc1VIOFBjakJHRjcvL1ZTU3hkVnJDMys5YzRzNitPL2pDNEl4DQpTVUda
SEVKTkNoUHhsYW1ZQ0hYNUYrTlNYN2ZGbFJsZ0p0MGJoOGRhcnh1ajBpVklodmxNZVVSYXVIL08N
ClFDMWFqTkl5N2dCR08zM216dzlXR3ZoNHh6MEIrRzY3S1FKNEsxakpseC8zY3l0TGxhSWNEREMy
bkxQQg0KZ3RDbDVDOEFBN1cwQnJ5R281djhqeUhhU3RyaTZSa3JzK3dRUDRON3VORE9UUGc4cE1E
L3RXbmszN2c2DQpYZEFtUGpleUJFc1kvOEF5aHFZUTZEUEcrUHFUbEFobVBqQzlBQmRPRnRQNW1I
Ulk5QVJrZXNaWWw5eWQNCmJic1dsZ0k0MVd2d2FTMWY2TEovSlFSRUVmNU9CdmpJQ3Z0VXVtM3Bo
cXVFRUhOQzR1VjlIdDBNYm9ZVQ0KNkhSYTlwTzlmL1docHFYb05rRTJVWU1HUnJDcG9WSSt6cGtp
VUphOUZlSGp0Tit6T1pjNzlMb0hHRkMzDQp0WExOcHpMT0J6YzVYMm1vUWxSdW01U0hJZCt6cWxN
OHNDUEp5V1lRTi9Pc1BDQ3RMb0orL3VnOTV0WGgNCjFkbGZoWFNjZ3dNczJsQzNiV3YxYSswTis1
djBFbVQ5ZjhkVy9iZldoNDJpK3pDbVRmbUhJdENvMmRrbQ0KK0hxaGlwQldidUdpVGlQeDBHTnNv
ZFhJMUtvL1ZJWUlPWUZMajlnTnlPbFJqNEQwTjZ4bE16TUJnYVFvDQpEUWl0MVBXMm5uUUJRZGlH
LzNtbnZ0UVVCWFpEVE4xdWpoY21DM1BNd1hTOHNDaG1odHc1Q2lSNzEzNncNCjZOS3Z0cVp3NkRK
Um9zRlYyZFRlSGkvL0g5d0gwdDhXTVBlS0IvcmtBdmdhWVBkTkNPd3ZUZXk1TUY3OQ0KNStpdUFE
TlRmYVFIWDkrd3VSbWFwRlM5c1pCZkQ0WXA5TUpONEQ5SXJIaVlKV29Nd0ptbGM5SjJvV2JYDQp2
Uy9XQzlXOXBDOWFtWCtlZW5ITlhweXBWR1craWs5ZW9sdGJkMmliOXRMbEQ1aUozV3BsR0ZNQklm
YnUNClN5Y25tajFGWHd6ODhpam9scWZjQUZXck1WNnZGaUtTYVkxVzl1a2pxcFM3RTI4Ui9LeUNi
bnZCM0xnRQ0KYWY2OFFSMlNlSWFDM25lWG40S0hlZmhpSG1HSWpod1RlQ3JhblI5YXVpNk1sNVJS
dS85RzdJZ3U5V2F2DQpSTVA4RUNlM0Q1cWpjU0FXeFdiSldNMk5SVTdBRFh6aUJTWTgrVW54aVRh
S0krWXViQXpsNTloWXdCTVgNCmtTcUd6ZStvODhaeDFzNUNRa1p3ZDFxNnhWOTFmWTU5a2tkRlg0
emlxYjRCR3huYWY5Y1orTThVTW1kYw0KQ0U2VE0xRTFYTVBjUWNIMnd2aTRlUG9oeVFFYS9oM1N5
WFYzRlVXb3NxZWdQVzVIZmdhREdiN2JSZ1pPDQpnaFYwNWxZTVBtbWZLTndPdWI2VjZWSG5MQ3Jo
NlBlZDB6eFBsMGc5aWdYbTlKbkdqQXMwZDQ3NE1sSy8NCllUUHFESStEdllHNVMyYkluNzZ3Mi8z
N3phU3lyUDdoVUo4eUNJMWNrQzhsTUQyUWVKczJXL3hYTUxRQQ0KTW9HQk8zRytKeTZQejB0WTVP
d254YnlYUWppQTdmMiswVjZUU3dEVVFCdUxvVUpaL0FpZWY3SG9ETUNDDQo1Z25CSkJoQTRNV2Jj
ZTgrdFhiVmhDMnNCM1RzSUwxVzRnZGxSQkRFRWJtRkIxdTVBR1B5emhwaG5ST2wNCnZhc1J4YjdL
OGQ2OVMwWmRuQWFtVXdRWEZkZmI5azdQNkl6OUJNb0kzd2YxaGlXVk5jSmc3RGQvci96eA0KL2lD
N1N5bEQ2K1kwZCtZeHdZQk1ZM2xIZ0kxVEpTSWQyRUZUUDhwWnZwWFdROWtrOGloay9PS2JFQTRp
DQp6R3ZHcmdGdHZhOFJBWU1nQjFKZ1cyZ1NEbXJ5MldacSs4eWF3Rm1pZFd0Qy9oSElaQVpLSGVS
RUx6MncNCkRwWjAvTWlOS0kxeFNZOXRkWkdFbVN5TmNiVmFObWZ2NmhsNW1RR3VvTERwcUlhSHZ1
RCtJSFJwNWZ6eA0KYTZacG0zY3FINGZ2blBjc09RcGQ3Z1dqaC9IMnYrOVkyZzBaUkZlVm1HeXdz
T0NFL0Q5MGZwSWMxaktODQpZK2ZPNUtzcnQxVC9RblBLUEJBaGxHbkFCS1pOYjlBdFNMZmZXQTVW
RlNDYmlnK0UreVB4RUVWRFhENTgNClYyUUhrTlNCbklzTEgrc1NQVXE2ZFU4VFJ1NS9JeTJVck8w
c0dNeVhhbDRCZmY0M216RUVCRG5aWU1FVA0KWFZVcU1ZUkJzc0tiL2VmSHkySnIxSGhTVksxM1Q0
UkI0dmQ2d00wSElHMlZXMXdIL1Zpb1JkUjk1K1AwDQptcEdpeFdJWjBJOFZGRGNVbEY1d1pvd1kv
OEdaRHZGSUVpOXl1cHVkcWkwbWlVY3AzRjBmL2RJN0R5RG8NCnQwbXFIVXpmN3RhQXowbS9qLzFk
UHBtdmFnNUFSaTAzR0NVdkRsc0ZhNjBuNmtlUVhwTk1Iby9uNzYrVg0KakVzMjhreTArRXF0UTRT
dzJUYll4MmhVcEdBemNUUncyaTNXS0RnUkpWbFlodjdLdC93czgzcFpRamp3DQpTaGtTakkrV1pr
djBiRXZTYmZocEFhZWp2QklNL2FNdFMzS1BUQWljV2xON2plTUVRbW5YUXd3M25yZTYNCldFcEUr
WEQ2bkZOMmtpRjUyQ0pod1ZvOEt5YVNkU2QvelR4RlBoQkRSc2E5ZFNsWlo4aHpUUkhxbVdkaQ0K
TG5HYW9HYXpGMHVaSTBWUnkrdERXR3d3SmxOY0FwNVZxUENsV2FVTnY5QkdBY083R3pHdHZHb013
RWd1DQo2UlpkRjZnMWpJT3Y0NTQ2RnBxN1RBdEN6LzA1YmV4QlNhZGs4SVJSMG0xQ20wRk55RHFt
bHRjMkhZR3kNCk4wajhrNUJpbk1ZOEU3ZHNvT1I3ZVZ6VktOUjRZWS9ualRkMmdOazBlTWpPaDVx
bEljaGlEOEdqUlMrUw0Kb2JnRjFndVpvd3U0anV0dnFoMWlSUjl6RHU0TU1QQjFXSXZ0cFRBZ1VS
RCtvQVFxbE40ckNLUGptSmpsDQp5TURVclFFRERVMkx3dElEcHRaRlp5aTBKdk4vRnhaaVc4bkhF
dnBRVVJBdGpJNm9EaGFpYlg4Qk5SU3oNCjNKVHNFSUdSTVRLTnMvaDlSbklnNjJzUm5wMXV5a3ZO
TTRYRUIvMThDbFUzLzNrNStJcys4LzNNNS9TZQ0KL3JLZE9UZWFxTGliaHNtYmYzUUVRRkppL3c5
dU1DaG9qME9CN25DUU5LdDA3R1dGQjVLUDd0WkJWTkpuDQpzem1Jbi90M2FkZ2lOQVp2SmVpZG1L
RWVMaTBQQ29ieHFkMVJDcGtwem1hb25ONm1HdEgxYkkxOTI2ZHUNClVKYTlGRFV0UlYzYnk5blMw
dWNoUEQxUlNISjNSbTloNzVvWmlMS0RpbXBRV3A0ZDJkU2pRcTlrWmFNOQ0KQWcxYk9zOHo3cnFr
WmRDWjJYeGJtQ2xsZ3d3cEJIVEN0alBkZlZiK1U4dGlXdlhlQ3N4QTFGdkhlMlJPDQp3LzJYVzA2
cHpRZEpwaEw4MVJqRHJ5b2dISzJPVE8rVXRRdnJXUG5YbzV3TzQvM3V2MElPVVFCOHNzQU4NCmlw
b3k4OEF0VE4yc3lJSmVrZVUvc1JaSlhlUXlPQVJ4UHlTVDJ0QkwzcjUzZk1DNHRYTUJMbXhnSWEy
Kw0KakZsMG80YTE4ck5xT1I3TnI4ZGJFTzZkVHcxVm1VN0Y1M2Q0ZkEvRGRwcGJUR2pmRThSL1Rr
d0d1cHVLDQpYWDgzdW1QaWthbkZBaElaWkFIcGdMUmk0WnNPZHNvdDhvcW1zeTFZNTdtN2N1WGJT
WHJ3TmNxdkxXYmINCm9RNUdWcVorV2ZEb2lnVit1eG5GaEhGMndKZ2N5Zys5VFF3emdMcmVXVXI4
bjRsRzZvVjlRVjF3STdRSA0Ka2FwQmoyMHAvYlEzTnFweFRERnVaaExyUGVESU9zQ2ppTExxZUQ1
bzBKQUZoZjdLV3pPTDhTc3FVNXNPDQpIczhaZUhHam82U3A4NFZHSzZ6bzZ3TllwUjZYV2ova0Fa
T1B5a2Y2U3ZTcDNQbnBPc3dXcVlCRWVBZW0NClNSS2JPQUpRVjY2TllrQ3RDOUNhT0hYQ2YrOXox
VWl4ajRUOFFFODB2aG53TStIZi9EbmdRUWJwYkNJdw0KQ3FuK0RUdzFDWTl5RTNMekNQdWQrbmZx
Q3hZaHdKY1J1MWx5OExMVXZiZWl1OU5ITkFvY1liRDZUa2pzDQpZbCtET3ozbi9mbkJGbkREOFlw
ZFM0NUNTWTZzb0ZCQW5hWndpWjdRR2Z4VXZIdHY1R3ZGU05admREaGcNClhvM3h6ckp1U1lLQk90
eWE0MlRMdFZ1eVI2dG1rK3RuQXFRWldCcEZoUWtkQVZpNStHbDlJVGQvby9YNw0KMGo4ZDNFeFNM
d2IvTFFuOVgvQkdBZktkSzJTell2MThhVk9rdDhCK0xYdHYwaUgrdHZoMUlEUTBETjdUDQpOL3Nj
eHZkQ0JBZ2FKUWJ4TGxDaDdWWEJLMWVUL214Vk9WcEhsN0RpcnpWeFgzblZUV3ZoZEthK1ZrcDYN
CmtKVUFiRlpEb2FReVdmTzVBY3lRdHlqZGRudGNleHEwTmlIQzVySStyakpyYTZDZE9YTk1aTUJ5
Rlozeg0KbjFNUEcyakp1eDNnL0tSamVOR3N3MnJLYVQyMThid1lTU2hJbUtFRm5vK2dJbGhoNWZM
OXdabkdWemQwDQpxMWZJb3BhaUVsOEJRVG5aaG51TUFhTjFIR1BremxRTFRvVFVNVzZYYzV6ZTZa
T1VRaS9ITUFqTUM1UEkNCkhUeTlpSmRTaktZdzRoc1VxeWNPRFFKclUwL3ZjL2VaeHVGdFRZYWVH
UXFrdmNQT1ZJNEdtS3cxRUtEMQ0KNUt6Z2dFVzJNN29vYlg4ZytVZUw1NGlLQ0t6THhXaXJGR29N
QTBGSlBiVjlrQzRmUkNkTnpIOGg2Z1NoDQpvNmN1dTN6dUtOU05HTDNOWEVMcHBHRlliSFErNFlE
bWNQT0ttSjJRMmhvVy9XbzVPYVhhRXo4SG5HRHYNCjZSVC9la0ZuS0pRTEhmdjhqbE5HOFBXS29F
RzB4bm1hazh2TU9ScU1JUEk4L29HWFRNZkUrdW5lRGdGWQ0KZlQxUGZSQlJWZVBuTnhwbnFZTm9E
RmlVclJyWFlQRHdnOS9mQk4zQWRkdUNxOUJkeU1GQ0ZrdnYyUWtrDQpVbWNiajlKWDY3aHBFL0lK
cmZ0YXpsQVkrTmoyS1NtODc4RWhtSU8xUFZ6QXZhWlg5TzB5K0p6WURLSXYNClZOS3ZzdUN3TXJ0
WUMvWHRoRU1zTkF2VXhuTExLU0Z0WmdEeG1tMEJpOEJXUFhiV3hJMkt6SUw2ZER5cw0KeFcyT0lG
ai9mazdsdVZ0eXZKMDFwakN4TzlYblBYVVAxeVBHcHo4Mkl6dWJZTUZQOWJsVDFWS1BLK1lzDQp2
QnRldW5ReTA0c2dTaDFCdllzUFBhbXhHd2w1V2NyTUhUM0wyZHNvd3ovdmFwR1Y0V0lmVnR1WFkv
UTANCk5PTE9kMjJIMHJDTlJ0OTNETTVCTit0M1dYTjZtNUFhcnh0cmdlWGJxUmxZMExwTnU0K2ll
WC9rbWliTA0KNnI2YzRuQU5RVmFra1MxMXpCL20wSHI2ZGcxbE1DaE9yb3NCdDdLSWFMWXlMV0s4
V3VRaWhBby9jMWtjDQpiZEt6OXNnK3gvam9Udnd3TkwxT1RLclRWVW96OXQyZENlR2hKL01HWnlB
bDE1bXozbEFKK0srTkFISFoNCkg4T3MydkhWT21qdjhTMmoxSFk0ZzAraVVtS3dxMFZvREJNR1dm
cDhJNXNzTS9jZUZCeTYxcUR1TVdBYw0KM1JWK1A1VTB4anhOOTJoTFFVaE15V3JYUVB1Nk5vSzJw
U0ovQ0xlcjBadExlUEVtWE5PK2tncEh5WFFKDQpGd2M1VncyRGhSN2QvSXF5eGNNMlBSMHhjZ05Y
alFxc3loV2wydGxKcjFVdHEwZHB4Zms2RzlvdUdRVXgNClZYemNqQlRvVCtnSmhLRHcvdkhUbzRZ
Q3pvWSs2WVJoSFdWWHdvclRxVGNFNWx1WkJIUDNscjdoblp4ZA0KZkhKcmJEaFUwVW9BMVlZeTZI
Q2NBdDFSUHYyNCsvNDBIV1RHMEFFbG1KZlFWbVQwdHJxY3h0eFoveG5nDQptck52bkNhT1YzbnZS
dGlRU1h0K0h5T25yOU9xVTFVRmJ0SWU2VFcwZ2VCa3JnMXpDR0t6YlZpaFhucmINCnZLUTU4OWZD
RCswRkNXUDVjc3FvWmFKZmZqYlgwR0FCcXRLSHB3L1VnNS9mS2tCUS9NV2pwdkE4MFpLeg0KdmVK
dUROZmdrdklod09lUmRSbWRzZ1pYelJVU3B3NFFOVGN2cWhMUWsvU0pKNWl0UEhubGMrRnFvZitj
DQpraEY3RTZQVGVYYmRNOE1VV1ZDalNhR0tnNkx5Ry83Q3ZjbFpEREVKMDRFLzJtUFVuOEU3UjJK
dHRGYi8NCkNpaWNTVWh6VHl4TC9WY0hKYVcyUGh5eFhMYTFnKzdHZE16cUh0MG5vNk1iYTZEYU5P
cDlFSmJPOTNFYQ0KS2l0TUN1NGNPRklVTklpaSthMFlNZ21LTHAyWEdGSjZXUjhaUGljWk5HY2c2
SGNNa2hqTDVzbzdoRUYzDQpsUDYxR1h6T0RTVjVhM1hJRFZFOFpOYXMvbExtdWp1WFFKZEw3UHda
OVFJVDM3RFhnVTY1bk1EYm13dTMNCjMwU1pjT3ovSm16MVdqeHNiaTFnZ3MrYjM0R0xSK01LR2hR
Tm9qck1abDhQc01oQzMybVVjU0hiRlZVcQ0KYXhOUXVWWGFKZ3cvdjFMcjF3S0Jpc1VGS0IwNUpl
UWlwMjdQR1NMVXY3LzNHRGRXUENJT2hLbWh0L1JrDQpBbGF3OGZZcHpydTJRMDgvV25XUzZyUzBq
cjhIQkNmdlNFK2xFWFlUdnVxSHl2T0xjTTJ3R1VSamhlUysNClJHdGlHM2lpZGttYWVJbEViSEp6
cVZReFEzRlM3MUY3SGYyZFo2cW4yeDhoTWEyeVlCM0xIQzhlOHdRSA0KcTBURGh1UDRXQ0drL0RE
L1hNQldUdVBtUVpVQ29FcDQxNGZ5dEpXRkFIeUIxR2RmUlJoa2VaT1VCVHExDQp1by9XNVVqeHQ3
V1Nwbjk5aUJld1BvTnVIUEsvUkhxY0JaV20xbTZsRXhxdjlWWnJNUVFYeXQ3TUhiWmMNCnVPZFJa
cnFRaUR0Vy9jZjRKd3VsSGxTdlZpTGNCU3NxdzV6QWUwY1Rrb09nTnVNeTVxaCtGNWUvNm5QTQ0K
cDNYR051cnF5WnBDRGpOdVBudFdaSk5mdmhTb2NHZ3JObjJOVERHbEFicEtYRHB3WTREL3lVTFpS
Zi9iDQoyTDVNS3B5U3NOMVB6d2tUcHVURW1jZnBTZGR3THc5eFlqTSszck8rNUF4UHVBc0pJZXFC
bnFkRDFJY3INCkpoa09iSHRLNkxPOStSNDFFanlHclloalRDa1AvdVlRRVRZRXAxb1JTVFYyaVJY
UEFTTTJEWXlDM3NMMA0KQk9DYkdjWUl4OUZqSzl4WCs5UkE4SkpCVUgyRktQSmQxK1hGamZlbjE5
NFUrTmJLUEtrencxdVR6ODluDQpLOXUrSXRpS21VNUdicEtTb0VmRURVWmFOb2lkUDUwMjAwZUFS
Y0RSRmRpeUNUUzVTSVlhWXRjYkE2YXMNCkdQRzFRamJzdVpYT2ZhUERkM0R4ZHRMZjNQZ2xaYStG
aC9UUjlWWlJ5eFl6ekN0ZzhvTUlMYWc2MHNXcA0KYVR5OC9jc1Z3MzdhUXFWWHBMTU5qVmF1QnZH
aU50dzR6THFjdGh1aW90VWJYWHVkakl6VEJpN1N1a29qDQo2UHhXZlh2N1NKNVhHRVUvQzB0aDJT
UHpzMTBScDZKcEhiT0dRNmhBU0xxNTdONHVRenI5VWk5UkhsYWYNCmQwaE1lR0hUWVdNbHF3SUNu
aHQzNkRPUnNXVk1wU0c4WWdoVDR3dkhrSGdpTkRscVVYc1VBTHd0Z1p1Yg0KTEErTjdkTWdKM2g3
QU80YXlBWlZXZzV3cFljVjZIZTFNV0k3RnV3ZnJmVDFVbEdzbUhKd29KRjNPRFdqDQpBQmNuUnV0
K3Y5RXEyOWtDbWpxRU0vTERvcG5hRW9VT3NPckx6cWQ4Nm1Cc0x6K1c2QWJ3aDRQSitDdkwNCldR
YW5QSmxrWVhSaDJXL1ZKYU8zZHFqNGh4U1paMWxXaVdBbzU0OVZkOXljQ2RvV3h1MHVpdnJ6cnJO
RQ0KKzgrVXNHYWptY0JwQUhGUFk2R3AwcGQxWW55TWd6RFRLdktJS0g5Y0xhd05CVnJpZjRvZU1t
cGdHQTV6DQp6eGRabG55ZUN2c0Y2dm1hemc5ZTVTMTNmeDJqdFVuYWQ2UnVOZTRwT2NtWjdIcUkw
aXNNajIvaWhuSnMNClNjdU0rSkNwU2VUOXdPQnJIOEMzRzNTMk1PNTJLRzlOcXlmYTNzNXp1Q2dV
T3pnQXRMVktOZElMdkZyYg0KV0lnK0tlMTB0SDU1N1A0UzdQZ1loOFFXN3JBRk5rbEFRcHdKay94
MG9vN0pUQlNKSTQwVUQrS1M1MHBTDQpPdStRTE0rZDQ5NTBqVEVZNUpJbXNzU2kxbHBmZjJwMlI4
K1VKWjdsT2pXR09xWUVqUE9Pb1Y5S0hPTkINCmI4VTRXS0hwMEpVL2FzUDdUOE5iQithSjA3QTFa
ajExS1R6S0ttWmorWHViS3lxd0UzVzdqNDNiZWQ4bA0KT3R2Q0VRbEhSdGNBUTVmWERjNTBUbk90
MXZ6c29wNXR6WVVvN0hBMy82Q1NaMTlJcTNrMXVreWRsMEFwDQpIZitlcSsybzdlV0w5WG5Ec29s
aVZWTGxLaUlaeEFZc0JZVkpPa3Z1d1Z1Q0JPVm1HdkU2WU52RkxDVk4NCkh0YzZ2UzExdXcydTJB
WUFQclFlSjFBRlltS0dsWFpuVVV0ZWc0cUpsRnB4SG9jNktCK0sxQ1ljeE9OTg0KTElObFk4Z0lx
d3MyNUZsYTBRTGtDeHd2UHF4TXhwMDZ2WXFqYUtrc0FGdkdIbDI1a2UxeS9uRElDcVNuDQp3YmFr
SGFKTzZ4aU9IanVUWXg3ZmdIcmlGWkdrb1ZVZEhFdXFxV1BQZ3Y1UW9Dd0hjOFIxWGZUTUZIbzIN
CnhJKytoaU4wRzFxeVNqaHJQTitSaTdTcjV2L0VBRVA4WDhWbndwY2MvNHA3TVQxamF0NmF4QWhY
RDNEbA0KRjh4cVpKd0o3UXhHMmQvNFIyVVlxTlBhRDNnOWpjNTdrSnlmRnU4ZTlYZ0JhR3o2VE1L
eTJoc0VsVndwDQpvTWx6RmFFRnlFaFVHaDV5TWQyRlhEazhIdWxEb1BscWRXQVJBNHZNMDEvejAy
ZDFCYXMwUUtFSWNkQUUNCmNzVGsrT2RFVGtmOU55c0FyMTNlTnZpdFlLOW9JanUzTFpvRy90Zno4
NmMwMkhaZlprQVJNcjI5NFl0aw0KeVlOYTBQMFE5cFp0bjFWWnJwQWcvRWNDUnZqdmI1bkdRODcv
QW0wMTQ5MjdDSjU3QUtJME1Ea3FFTTlIDQpZcXlDMDlLWjNYRWhIaXJwelRZU0xZcXZwNTZzNGg1
SmJTeVR0aWlBS2xmQ2I5T0t1anIrUUxBTUhjdlQNCjMxY2VZUDdZeExQZnRnU1RtcURHRjc3U3pm
dW95eEZ3SEFzbTBRQmpSQWk5eGdaNlpBcGtZQzFRbUhmMg0Ka0dKNUFUMExURVYrdThiYjNyS3lk
cDNDY0RjKzAwcjhxd3pxekZUandRd2VSakF1QVovWkpLSzVhNVhCDQpwcy9HS2Uwd3Rlblo0dkoz
YklUU0dOQndkbmxjOURqNkI0QTA5bDRBZDRXYmwvSkdtMHA5ejNWSUxqSWwNCnV1ZTNqNXBRY085
WXpOL2RaSFo2cFhxN3RYVmxvb3dlVjJGc3pXQnN5OExvZ21uWmVISGFkcjlkbmw1WQ0KWDBzbnhl
OUMwR2lKemNLK3gybVhseUhSM0FQS1V0RStJWXNiRHhncTVaMy9ucmc2bFlnNzFaT25HWnZXDQp5
RUV5VHRGK25mUVF6Ynl2ZkwvaWQwQkpvUDN0WXRRS25QTEprYU4vS2VwOUg1c2tKWkV1WHU5YkU2
REUNCnRIanRNc3JTWUxRa2lTN1pmSWVTTFJxNktEbVhpVkVQVE85K2UrcmVVb0hGa2pCWThBWUVm
amNBRExDLw0KRzhZanFkY2wxRjd0YnZGNlh5Y1BHd3BvSlRYa09sZ2xtbmo3RFhnVjBySXhBNlNy
S0VER3RPaEtJMUpRDQpwaUxNQkQ1aWFac0RHNSs5Ti9HMHZzaU5MNTNxOTNSSDdKUzBDa2lDb3J0
cktoMnFRTE5rekRwTVo1M2gNCkVFcVJGY2VsWFFkbUJaQURPMm9nQXA4czdJWWFQTmZnMlhWbHRr
eXZVRVZEYW5hMy9GVGJtTDQxNW5ibA0Kd0pwZXp0LzA0SVJ3NnA4RTJEbUhqMUZPWVl0UjlJdFRp
cmM4c0pNZXNXK3JUMG85SzNySnhyUkVubUtqDQpXS2tMVEV4aDZPOVp3OHFiNDZFeXA0WkUwVmwz
R0NQT21ZZmRJNEJZNnV1QTRlR1hWVi95QlR1SWtYS0oNCkluN2xic0Y5c3I3U1V4U0NVOE5MbVQz
cjlZUUk5eW9WOGgycmRwc2JlOStGMFo1SEFGcjVBb2tuZjBDcg0KMzFEZEg5QU56ckdNR1NKU0VF
Wi91Tk51dXBya1Z1WEtkOWNYUEFHN1pQcG9WWVpXaGs1M2t3ZzRWKzV3DQp5bXorV24wVVlnZXZE
VXRxb1FIcUpyNkpBVDl3RzNLUmxFMndVRm9sTnVMelh0ZkhZSlB0d0lidDB0TkUNCndCQlFMblZk
L1Bya3poM045c1BOOUZsM0JQb21qclB5ZlJGdE5va3g2ckFUaFJ4UXdTU3o3MUlMcWF4YQ0KU1F4
eUxZNkFYT0RCL2RiZ1MraXlrMFN4V2hma0tQM1pXRzFHdVAyWjY1RnV0OFUwQVcwb1ZOeUE4cGZs
DQpla3djMHl6OTA3ZmhXdTRwN2w4MzFXU2daMWhXTUxrMDZsTXdyakJLN0lzbFVNbXk3d2tVOElB
Z2dPWkcNCnZwM3Y4c3hKdlloaW5rKzhsMTVWbkNCcDhXcHl0cjJlbkNZeitNTFN3bUgxaW9ILzBp
d3BIbEMrQmY2ZA0KeGxVNzdtKzFOaEYvRFFKSUhuU0FYcnJXbFZHZzZuSlNKNlFwU3lFOUNOajRv
bFdqY05WVTc5SnZKSUZ3DQpSRWpqMlN1L3pIV2tBZERLNThkcDFwVG1xcS9ydkZDR0FjbFpXMHNx
YW1Da3diSFFkOXA2LzlZbEJQMk4NCklkNXFyUysyZU5MREtuMHBrcW5zQWYrWHN1R3d0S0lHQXl2
dTdFeldpNFIvSG13OEZlVTVFTHVoRFBDMQ0KT0VJazR0UzRYcHZPTndUMDZXaWRPWVNTdE9qT1RM
UE1vZXd2cGxwcHBESmJWYWp6MXZMVHhMeDhqRlRtDQpSVThhNXVNNHBXTlZOMTg3SmR1VUJXS2tJ
dUZsbGRad3BRc291enZsWDBYNzFTUy9teEV5cDRLSVc4M2ENClgvcURhdmRPT0NzdlNZcC9pMXNS
elpYd2lrcEVKc0RnNHNEckxrZTMvTDk2TzhkNlN6SzRuQ2tnWWwrYw0KUkFZUmlScHRXamJLQzdM
K2JEbXp6Q2RtL0FEOXplUXR5YmpybU9uTUVFYUpGMkNUOEJ6U1FMeVRKdGJXDQp6bWJqakxWUUkz
aUdMRWxzNUJKV3huWi9Eazc5M3JBSldZZUcxUEI2cEFOLzY4UC94LzFReVZOcnovRXYNCjd6VnQr
UEpLd0YzZkU4ZXJObVdKRURlc3c2dVZaQVk3Zk1aR1BCL0gyVE5saWxneTFEdkIrSVNIS1lDRg0K
dlIxUEJKNDRBVGRrdkFuOVFSR0ZSemVROVkxY3FRckJXdkkvazdaNzRrM3ZWdTU2TGY2N0JrdlVy
S3NNDQpmKzUxUnVYL3BmVWUvM1RMV0d6aGkzUDZRRGd5a0lYOGx5eGhxYksrSFZGR1h3a2U5bTBi
WVI4UzhGekcNCitjZ2duSWF2bEF4L0tnVXV6YVpISmJrSEUvKy82YjVmc0VFaUN0dXVPenpmZ2pi
akswME1UdEZxeGhFRA0KcEJZZVE4WFVYVnVoUHlBQURJdXVwd1BYaWhOcEdwZlQ5Y3Z3N1NSRjZF
bTI5OFBDVXJkR0lTYmRDVnU4DQpOL1pGS3UwQVJFNS9uY1ZkM1AxZVIyR2prZ3JiSGNaN2w5SFhv
NGpWMU1vbFByekR0WDdCSlFKN3hrd00NCnNhSjhCS3IrYmcxejhXVzRacW4rTm5JWFIxN1h0bVQ4
ZU44Wk1mM21idWlIa1NDUkl1WDVUU1FZdWlhMw0KSTVMaklGWFZIY1dkNWxnNHcrR093aTFPN3Jw
ZCt4Z3lPSHI3WVM4Skl1b25BWWowOE93QW9yZTgyN0lpDQpYeFUvMk4yTEVIY1ZiQ0hJazV0RXZ2
eFB0WFFoUkh5WFFodXB6L1RvZ05qUUpuUU5uajhsUkFKVkJHQ0UNCi9XT2xwMzVKTytDeU95WEFB
eU5NUlVsT3VOdkkwc0VRRys1Q0pZVDNYSnQwSmUvcDJoVi9sd2w0TkZURQ0KMWwrUnNCbDNZNmhD
T3hMLzdaWXlmaDJNUVRPTW9mQWEzNWdwWVAzREc3bGYzemVvV0xzWFhKSDRLM284DQpKaTJpZCto
U2tTT1NzYS9UZnBKTTJ0M0JsakZnSWgyQS84QzNrdzZVMVBLdmhVRWVFMzF1bXhaT0tFZXkNCnFQ
aTVSTTNLWk1GaHdOZkhCRUJRU2Rqa09aZXVRVGxsclBYaHd2Q1dsWlNIdUNiMmQxTGdVUWtaT0JL
Uw0KalExNnk0dEF6a2ZKd3ZFcEZjRG9SSkhvbDkyc2VkZjlJaUVKSS81WG15OEZIQUt3L3R5K0RX
YkdrcGwyDQpxZ3hCdjRJN1pjd2xXalAxTTJFVVM3NEF0d2YrNzd0bHpEcjh3VnNjTWR3eE9JZnRr
cmlMZ0k3RkR3K2kNCm9nWnJycDdodm4vSGZRVUR4eTBwL25MbmxLRXpMMEhlMnlNRWVhaTVLRGlj
MStDNTlXYklFK3pWUVE5ag0KNlJwdFNDenhvSGJhMkV5cHd6WjA3MUhBak9icVdGeTdydzFMcVB2
azRWTC82ZUdNQWpETnJqNmpTSUhYDQo2MVVwNkgrR3JqT09KaGxEZXdBN3IydjhINHRSR2J5Vi96
c3p2Z0hXM3pONGlQMkZBNUhpQ1gyeHlzY3ANCnhrck8yd1JaQkVxQ2M0dmozV05zNk5tSzB3QmV5
c3MyOFJZczZXaEVWd21pa2Zlc3NWVmh6N1hqYTJLSg0KazlYMDNxUFg2WUk3THpaSnRscGFPZVFP
NUI0T0Z2NHdLMmd6WnRVMkg5elNMbndjekpRMjJMdG1EQTJJDQpkU0tSNjBCOEZkUTlPM01iS1Yz
NXJoa2Fwb1hScUY3TEVJQ1FnczZCS3dRdlJxQTJkN2NjRDdKcCtTU3ANClljR1F2dktaQ2tTRDhB
dkJZcm8vTnkwUGlPMUxNckhWZzBJb3FLRTNLbDBZSXdmNGxkWFUrWkVLV2lSQw0KZzJNclU4cFQy
V3piMnJRZ1N4RGRvQkxUY243WFVpK0JZVyswRGhVaXFqTzFYQUMycjY1U2Z0Nm1QQUlsDQo5YS90
Qmk0cS8weGl6ejFnci9CK0lWNWd4S1JXb003YUZtbDhWaWF0eFRtY0FMOUQ0NzVKcDY4aFFqM1MN
Cityd3UzY2tFakVnQnh0MjlOZURiWDZMZW9wUGMwRnN4TjlCdXhpT3pONmV6S2F4eWduWlhwbzFj
ZTd0eA0KaGxFSVFMWkVvb1VSQVNBZE5BK0QzbnRUaVZGZTNJaFlKeThIN3IwVnExSVl3OVRVbUVq
TndBTXlyRzRSDQppeE1STUNReDMrZ1NJa3I0MlRnLzFiSHpHYWh2NmQyQkVNay94UHE0QmVJaVRM
OTNxVm5NUFgyd1BOZXkNCnV6NThQYitBbFNhR0hBcG5FTEMyazhiRHRJZkRwc1I0ZE5OUHlydXpx
cTVsSVdhdlI2MlB2Vmt1aTVNZA0KUmtseXBuWS9pY2xRZitGeE5CMk1OWVdpSldUZkIxYUkzYzRF
QnFmc1dQSE9YQ0oyUTlZalFKMTBRVERHDQpiSVlnYmJhVHI4Uk0vNytGMkEvV29oRWRzWWY3OEVL
R0RBUURhaG56c0FoTFZpWVptQ1RCYmtkZDM1ZXYNCkRZWXNaUndJT1RtbWhVRk5CUzcyckpUTGpG
N2NhUHcvSFF3M2RBczdyM0gvZ0dLbHA1K1Fkc2NUTC9XTA0KYkYyK2RpQW5seGVaZ21yeVQ1eXd0
YmY1OVlobXVVaDF1UStXMXhBeTBHOG5jR0xXTWJCdkg4QWNTMXE1DQpyUHhDZ0VVN1poU3luaUFQ
NXNPN0dkeS9ybk56WUlwdW9aRlNyTXJZUGhQeWRlSno3UVlwaDVwcjVReXQNCjZlN1ZLcGVoUE95
QlhKOUVwcEJZeWx0VjNHZVp3b1Z1SzF4VDJGZ0dRYzNlV09UK1ByalBzdFJhWFpENA0KMlQra3Ez
dWFub2xSRTZ0M1lGSytqVWtpR1lubnJMU09XWE04MElKKzJFdHJTZGE0a3JzbVRLUStNQlA3DQpQ
RE9nZnBUUHBGSmFwTldZYUlJa3hKb0NxYnFYSkhBbFhSTUNwUVQvVHVrM1dIOWhTa2dGTFVQSWRZ
VnMNCkxXSWRHbFJFNHRHZG10ZVVSS2tWa1RKZTZIWjlKdmYrdkVWRnJGMkEwakMrcUN2dGVhWWFq
Sk5tM1hJOA0KLzJqQVBROXExalpVc0NkZWhKbEpEYmNteiszcEhNU3Z4eTJ4dlpISGRTM25GN2Yw
Mzg3bUl0SDZSQXB4DQpEY2plMTY3RjZkcmo4UDhNL2F3L1RPWVlUbVVIeEN0bFpRSkRiS1hLSkZi
RHZUbUtiVTBCVExSTENHOFoNCkYyQytpM1cyUWpLaU90bWFJenJjU3libGV5cy92UnpIeXYvZFQ1
bmVVQWNaYWYwdFVsbndoUmdWcUZBeg0KaCtmMWNrOWtocURXU3l0dmxKNGwrcEpQY3FPblE4T0FH
bVU4WEJzbVlwSFUvL3pDblYxKzFKK1JxRHBaDQp6cDNWU25DREZneldBa3I5WXdjdy92YlVueVBL
WTdGRHdhRDdMWnJ2ZmVrWDlnbFZ3TmdwZDgwdmdmd2wNCk1uUFFRRFRsdHNOTHNFbHIrZFZVS0hW
Q1VXQVRtQVJXTWYvN1daVlUvNjJHb29lT2JTb3lrN0pqQ3BjNQ0KM0xyT3BLS3VSSTVzK2NVYWpU
ZnBTZUpqQ1dxUkhISTE3UGdHSXlvam9GZUR4VzJDV1NLNnd0K2RIQkQ2DQp0SFFvbjZLZlpKOEJn
ajBlMHZlb253UzdJamhWZW9vdUpyVi92QTBtYU9Fa1BCTjNtQUpBdEhPdjNiUU8NClJXb0IyN0lD
YWRucFJWTzVaUVllZWd0NXpvTzhkYTlVTVVGN3BzcHN6c3h5TCtTdXFpcVFCMHBybTNIdQ0KM2Fv
N1FLelJkUWFWZUc3b2pxc0xnUkduUmVNcklwUjFBUUpYVi9nUmhKdHJKMnpYWUQyeHpzVjN5SENS
DQpObUZaLy9samV0TVR3eWRJN25ucGZtYXFDWE1ZZ3JkNjRmZ2ZQK0FTTmV3S3J2UFUraWduQmZm
OE0zTFQNCm9TeFM2cHVVNFpVSHVCV0hDQXoxM0Z4RHR2VEd0N0FXYjhtR0dsNU9JM0hlNDJOVXEz
S2xzbjRSZ0RKOQ0KL09DZ08zMnd1anFLQUxCYU4rWnpjU2VxL3hCWm55d2VFWWxhRTlMeGJlNkxG
VU5OR1lzSVcyTkJyU3VlDQpldW5sbEE1TUQ1Z2xNbXo3eEVCaXNuUTVLYzZhK3NkNHNaM0N4aWh2
K21BM0t3UXZFZ1MzSzYzZHlOelUNCjlWbVJybmkzWWZKSTZqbHM0TUNIeC96cnlWTmMyWldrUm52
a2ViajJ2YVpOaHBqR3JiQU02ZWxxWHRPRg0KZ254eXRiUHdBYkRrZ1RWK3R5Z1gyZTI1YzRwREpr
VnpVaGJzbFM5TEd3blh3VEVOVm84MUtRRDNGTUpqDQpGMTRoU1ZRWG1BUS92dzQvMzRzL3AzN0VP
Z0ZBejVqS0gyL1VXbjVYUDRPNDRjRllieHVrZXVKdmxhd0YNCk1HWFNQb1JvTW1KeG1sWFRvdndn
V1hqVVdCbUZZMDBaa2tqOXBlaEpGdFBkSFBsNEFkQUl6Z2Y1b1R2Tg0KMVB5RmRKckpQMm1KUDZM
ZDlIWU9qSlhjTVp0NS9nb0JMbzlYZ2JRMDcreTBzWnBzTXVWOUw3MWFlbXZEDQovcW1NM2pIREVs
anRBa0tHQkVpNXl1cXZrZUdIQTByRkRvVXBJeVRZM1EzbXJKUjVENUIxem9kalJjNDUNCmI3YmRZ
aGd6UEZTQkQ2Um1jbStxWmxOSUtWdVFNT0xjRHkwdUNTVDV5eks0SFVHaXlmVTk0eEpPWHVjSg0K
Y1ZIYXBvTkM0c04vLzkydFhQdHNiOTVVdFdGaVdNNG9oWDJnNzVNanpubDg0dkN0bTh1UU9KU3NO
VXRPDQpXTnFZNHJJdmNHNTVsREdDakRyWjlvTTBMY2hISmRmNEVIY1ZPWjVkUDJwOS9xWC91cTN2
L1pJVFZjdjQNCkZxMzFtNE9hVm1nVDM2NUhuTG9lQ1F4NjlCVTAwMjJWdkEyL21GZFFDVWJtVm01
TlMyWWZLZXdqaFh5NA0KbEhrNzNJMms4YUZpaWwrUEpLemZFRzUyV3JXWldoTjh4dUhmbTZQUEdF
VUZ0VlVUSVVnd1MvdlM3UThUDQpwMHQ4STd1VHRTUCtkY0hSdWVtdUtqOTlLQkxHbnZmSWtYek1n
djdqWlpuZE15T2REeDlrQjV5KzhaZkENClRlVGhLbVdiNGo4UUdFbVdpUXo1eGlUMzdic293NUdB
YWgyZ3FoSzJoaC93czhUNWdyVU9rKzkxREJ0Vg0KcWdmbTM2WFRic0VvSVZTbGZIK25ERDhiTTFs
RFdhZjBzWUZNU2t4OENnRUd1N0tMdTFlK0xFL3dkQ3BHDQprM0YxN2VPbGJ2cTBnT3BlblhrNkhG
azlzeFN3N05IZ3NFZlAveEt2alFRN2F0aVp1OXRzRGFwS2pvQXkNCkxrTm1vY3pZQS9yQ05OVjBm
c3RPTFhJVUZBbnV4TmdDS2thamowWk9ET0dzUzhOV0xJY3AzY0IwNXpJNw0KZmFXWFdjaDNhOTY3
TVJvVUI3cFQzUVpOclNldE5ad1V6NW04S09YSWdmYTU2cUFhNzIzSEVBTkU0VVJEDQp3UmtuaExY
T2tHOUZuNnJ2ZGNIYU9JODlhdHVPa2V3N0hHNnJYWGhuUS82TmVaMm5scHhlSEVBMEpHVlENCmpX
S1ZTRjljOGF5eXEwbGsyVktlOHc2YXg1a21NMGZqczROS0V6Uy8yTmlRSHdHOHZGMkUvd2pNd0Ur
Lw0KQ0hGNVJkZGtpbWdYc2pPVE5ZMkhDWWJWQkZGcEhDNjRxOEZtZ0lxUk1RaWY2bW9SY0F2MDcw
UnNCdVpPDQpWcSsxczcvbGdPWmJrMm9GRTczcVUzQzJTZ0RTZXk5WDd5VnBDV3RoRGMrRXRDd0c2
T2RkdnpzR3NqckoNClpocUU4MStnZ0RIUnRJVHNLRStIcTliU0lPTkdhRFpJaU9YR3dPWERaTW41
OXZrTDloWUFTc29QOC81cQ0KZXVMRXJEcW10Ny91ZldLTzVyRVRvTy9ya1FybUVxUHd4TW85QzBH
bXlMbHNDRC8rMURlcGFzOHZGOE01DQp4SmhTZWlJMWlVc0ZiUStjNVpmKzN1WUtQN2x2dzNZeEJo
UEx0ZTh0cDg5aisxRVhkSWJ6TXIzOFFzWUwNCm56U1NSZk9KRWFsOXFIYzdORG1TMzYzZUx1U1hL
Y21KY0J6KytQQXVNU2dwWHBvZUtGaXl5T2hjVnRpTQ0KUjFWckJ1UVV6U2E4Q3ZvZjVtazZDS1RL
eWx0WE5MWXZ1WDFCZlRmYVRYcjkwZ2lYdG5oVVZUZGtEeGtIDQpxVFgzaG1Ka3JiVitKMzNsSUts
WUhPSDUvaGczWE9oNnZFaTZSY3BvQXRyU29iZnlYWGV1M3VONnUxQnINCmMyVHRwWEJVcDZycFVH
NmV5UXJaSmUrVXZ2UmRiWkpUeDdNTGtnWVpWSUpCWVlCdWdGL0xzc0MwZGFiKw0KZC91WVBhUkpL
V05XUVdNZDZIMGQzQmxtRGhUb0FKRlA5WFowMGFlTjIza3pMZzQ3ck9XWmllSzZBWEtQDQpwNTBB
QjdMQnAzckRQZ1dTa0xRVTUrMS9GMjBOeDJWa0RYTXpsRlZiYStwQlZQbWs0aFFoR3RDUzM5Nm0N
Cmk2dkZzUnQ3dGFOa1BwV3hoSTN0S0xjRG4vVjVuUWU2OEp6TnNSc2hSQW9OeGRKbmFrYTlQSXhy
Ry9sTg0KNnQ0cnBYRHVsQkZrc2pMOEJoOWE4ZlB2NjFBM1hNT0VZZTFqbDlxNVNsRW9pRFpNTlBP
elQ5aFJ2VnJHDQorMnp1aDNGQXdrOGJZVmdySFl6RnNaMVR1NUZINld2U0Noa0UydnpEc1BDNFBM
ZXJMdUNvZm84VjJ1QlQNCldKYmJuUFcxa1k1NjErZGFWZXBCc0JaMDNIWjZRakVkYytDRk05U1I4
eXJXS3gwK3pCaXJDeTVLVjQxOQ0KSUdqNDRHc0dRZk1OdktrNzVBN1VaZnNVb1ZxeTdpK0ROOG9I
M2N3dmVzZjBHTFJhek5WdEtlSkdIZjhyDQpOQXZWclk5NVRSazhMLzN2c1RQdVc0dGJBU1hrNTlC
dXZLYU9JTHdoK3BKby9Oc3dGMkNkV203L3U0eUQNClpWVk5vNElzd0x5TTNJMUpwbU83UWZTU290
eTR1RzMvNmpmU3g3UnJ0bWFQVWJUZ2NqQnBPSytCQ0lPaA0KUm5XY01BeStzZnhBajRMdzltTzky
M2tteHBPUkF2SGRxaHFWcC8xSDBXMHBEVVc5UU5abitDNDE1SGxODQp4VXlMWm9FQXJubmRJaXFF
Um9NT1pxemZ5TzZodXcrazJHU3lOMzBZN1d2d3NyOWNyZEF0ZjFHL20yeWYNCkR4ek5qelAwTlUx
YVpyWFFkRThRM1RKS0g2bWlVUlpYQ1N3T1VRbll3YU9pNjdFYnFlRTFienhNejhVQg0KNk9EL1BK
eFRxQi84OHhVc3ZNV3FqQnJVQTFaU20vZldMb1R4S0U0UFRqN0hnSldmRURRVFdlbjBuTVRCDQpk
Q3hHSXlGWTU1bTQ4TEtZTW56cmJGdHNGZXllbFRzREM1YjIxaU8wSUhTS1BZUDFxUDBvTGRXeFcr
UVYNCkxuTjBVZGVwTWlteUk2czdnNEJ5U2tJUTlpRlo1QUQ3NElIcGV6ZXdzdTdmS3lqMm5NajhN
b2dFMDR5aA0KbWI5aHp6T3puM2pKaFpDbGlFcDkwNjJtK0lHN0JWa29mM1FnazdtcmtSYWcrNEdh
endIcGZDOXlTaFpLDQpPTmdMbDBSQXlPWWM2dFcyUlpvUEVxc3VMN1Q5UUR4Z01uaUhvN2x2MzhY
eVJLRXZyTW93K0gxVnBDOGcNCmtzVmFTNFUzeFB4Vk9RQlp5QTJTSytzdFZ4dVdyNndaaG9EeW1F
N1hSeGRDbjJMaU5pZkt2WTB4OHZndA0KNXpxVkoyQkMwMnhydjFYVnZzNXFTb3FYOEROVC9CdEIx
a2xuTmdGOWpsTzY0OTRtYUR1ZFFuM0w3QUJtDQpiVWtMOURVbVh3ZDNZancxUlVOV0dwZFlXalgw
MHZKL0NLU1UxWi90R1hCUjkvVnZhNlZ6cVB6RWE5NWMNCkI5YW5HL1hVd0wzWDJ3OENRT3c1eWpy
dGp1ZjIvenJHV1ozempjMUFmUG0wTk1OZStnbDVISUNnZDJJeQ0KQVJBTlAvQk9qekJONUN6Mldh
VDBuNnlIQXFWMUdmaVVzRWtpSXE2dXVQMGw4YUNnWFl6cGJweld0MEUwDQpISU85WjFmajRyemhz
czJLYUx6dFREc1pKWGtrYnBZb3F5dlFwQzV6Q0xXWUNhbGpnaGJkbHdwNFZkTloNCit3cCtmN2pR
UE01NG1LUWNaQkVXbU1OMVRENC9XdUFyNWVYNDVTWW5NVE15QjJCTnZ6UjVYNTg0a05wNA0KRXht
bFFVQjlHam42aVEzd00wMG9hTjJvTFNWSVppZ1lzQ25VUGNyNkVpc29qbkNZekJQSU9EUWZ6c0tv
DQpIWTlJUnVFcEVlcVovU0UxWVRFa3JNQ0wxeGxIWWZHQ2cvNHIwaTdIblpqTXBpSExXcmVmSTVU
dXJZMEoNCjJGVlAzbERjeHo0NVJkdTRKaHpxVVkxcjZSVW15NWp2ejJDaTYxTC9CUCszRVNqQVNT
bWkxL0dUeEtudQ0KK2xwVVU4TEt0dWJSaUp1Q21DZ21hSURUN1NEZGtUTWFNMXZPd3hJRlFzMjJm
QjlOTWUzQ0VsTnBpbzR4DQovQjVNSU45NFhTNFk1SmNvQXdTdFpLTzZrS0ZFbVg5QTFyb1hQY0Fq
b2Y2S3V1SHVnTUpPd2twditjNmMNCkVkR2NjY2NmdjBlK0NXcVM0Yk1YM09hekI5Z2R0OHQyeTVs
T0JMR1RSSDllQ1NzTmZpeC9Cek5jekMrcQ0KUi9VODA2WjNDcnZNZHJyQW9ualpLUm82L3FvRzRD
cG1ESlZYSVNkYWViQzFRL1k0VVAyL1NRQzNUZTIxDQpGNkQ4UHc0bGxYV21SRXFhd0lOampSaE83
bkdzMEptVnpCWnVuekxkbXhBdXBKQUpZcWI3TWRVSFRYdDcNCkozd3lKRWpNMjFOWmlPdkVQVzh1
dWFUWTJvbXRrbXVSTlVOUDQyM0hjeXhpd0hTRjJQb21jVVpkdGhQdA0KZm1iaktFc1pNbm5NYWZs
cUZTV1Z1TUJxYmRDMndwbm5MVUg4ZkhhVldSOEZoSHN6cGNRRHQwUEdScGlUDQpKSmpCck1Ybzdi
WGltVTdSWUNUUVNiSmQ3VUpUVW4vYTdTNTZMTWplWHVBY2NNMmZYZVYrY241bW5KcHENCm9tUXEw
a25LQ2M4UkVYcloyTVlreDM0Zy9PM2FqVitUb0JFdHcxR0NNcm1xNTJmY05OYTZHT2Y0ZlRTUQ0K
SEVkdVAxQUF0b3VqaTRnQ1VObSsrbC93dzI4T3pUZWY5djhTQmtmMXpCSFErMExVWnpQdU1maW5l
TWFJDQpBaHFKTWR3NkRNSEIxTlgzU09GUm1qbUtmUFVYazN6RHB1aXZzYi9PdFlmZ2s3WXIyNTIy
Q3RFeVJPNUsNCnJUNWZhRTJSc0JoeVJTRFNsVlBwQ2ZQbmtGRnYyNHVqMDkxKzdHUHZsM082OWpq
RUo1dTVJTE91VDRXUQ0KQ0Q2c2ppV1BPamNkdHBxWWdHWi8wVlZrVks2a0FwOHJTc0lYNDk2RDdV
SHdMQUdkUW5zbU5oNm8ra29BDQpteVNRZWlhWGx2eERkUHZONldHRnR3czVtdGlEMWhUMGMxaU5C
enBYUHdCMklOb3RJY25WLzE2U2c2VE8NCnhUMkYvVWduVzE0OUcxa0lxcjNRMEdxdWtGaUEvWnll
bCs2SjVHeVpra2RaSXNVQmJmVkw0VjZ6cHdPeg0KMDRTOS9KNkFwRVZ4dWdhR1JTR2luK1pEQ3hY
UmhtWm5iNU1hV0h5ZWczSXdlWTlQVGNXQis4cGVUTkhLDQp3ZzcxbEQzYmg2VzZUbmVScmVtMUQv
WkxRd0tyaGwyeTAxTVFZenZ4T1JqdW51RkNUZWdVY05USnZnYjUNCmlaYWxLT0Z6WWFTMWRRYjd2
U1l3RGxJZTRHNnRvZncyWlZVZUllaEFDZFJ1RmNPMkZkb3gyeTBNZVNRdQ0KOEdQSVFSNWtqeGxr
WFJhWVNGVEgrYlV4Qm1Id1o0d0lHVnZDQWZvSmY4UzFGKy94OEdOYS9ZUEppaUQ5DQo2NWY1MFRp
cTdhMUVsekhFbGZQYmJrZHNGYWJDMlFKQTloc1h4amNhUzA4RmVkRWl4bWp1UkdrZEU4Z3UNCitS
NCtDNmMxbng5bU5kZHNxMnhaWHNDQ1lWeUkxZ0w5RExMcUFFaUNRVHBEbWtaYUI0S2RpOGRMT2cy
YQ0KVVhkTnJwV1RubStZMjROUG9nSGw3QnkrdlRCcXhBUWZpT0FWRk1TZU5YKzZ3alRHalBmallL
TzlpTGhNDQpGcENodjdsTFhudXJrbDlBVWdzTThJTHJBME5lZ2V4ZlkxRFhBYVJkRkl6cE5TTEtW
T3A5QjVMdmkvaUsNCmJSOGdZUkcyampTZ2lnZWJYeVU2RnhSamxTVmozekxHUVg3bHM5Rm1DM1VL
MUZRdVBDSlJaTW0yVUY3dA0KVkN3bG82WFZKY2xxZTBzWkVxY0tHQVBiczhsckxDSzQ5RC9HRDlR
MzFDQmJCSGxXdDdudk9mSStrdmJSDQpaVTBPdUpEWHdMcWlHbXc5S1ZRZXc2SW1RM1pmTWdxcC9B
Mm9OeVozUzYyc2I0cWFISjZFV1paaDl1TXoNCmlIWFZrdzd4dVRyMXZGN1dnRUdHakZ6TDROc3Zq
bW1FTmdkck5VS3RHL1hLdzR1OWlnMW1kSGxBWnFpbw0KZkhiMkJWZisxZ0tiSmpPUENWcFJOVTFQ
MDdTbGJoYnFpRjhsVzNVYXA0dFJDZFYvOG81R1VuUC9zWjVsDQphNE1ZdDlLY2NNanFEbElGZUIz
dE9sbFAyclkzNFdRUHhrTjFWVFVnd2JhVnhXd1g3Q08wMk1vZHltWnINCjlkYzBsV3FQM2ZtdEJ0
U0JmSzdEZEZmYUNIMHlMek1SbE9HbWkxbmxHQzVsMWE5MXUrTDkzcmp5N1ZKcQ0KN3E5U1dhUFRU
ajBjNWlYOEpSbGFjWHZaZWZjOVVJT0p1UkxGZDNZZzNsWmdCTWxvYzhtQzNacXFPd2piDQppek1J
dmxNSll6c0MydS92RWZWNVBUWDIzN0pZcGJpMHFhUUhGTkUvb3JUd2dWT21BeldIMjlEMmREVXYN
ClVHakRjdGFyN0VyNERxZGh4UDdlYTlmZFlhcnAyWXlCSG1ERUVRMDRRYzYrNE85QU5rc05lc1hW
ekk2dA0KWlBwME5rK0NiVmEyUDNWYXRGS1VORE5aTm1pNXhvNXJKRDJPYkRoY2lNTGZlSDFXRk1x
N2JkY1NCNjF1DQo2Y2U0cDZMSGNTbUpWWTV1NDZ3OEZjOWVmRHZRQkVzQlRYaGJ4d1IyRE8rbWh3
QlhhVitRa3M4OWdxWUYNCjVWcnZ1dW9seERRZGJodlRXN3hVanZncGZ2MGN6dStqT3J0TS9HMVZp
SlV0WEN2a0ZwVDFkVUJGSUJjZA0KaXdqbWFiZTNsTzgrekg5SHpGVXhwc0U0VG1tSWhFeDRHSGI0
YlFCL3BjSVJaMHJmNUV3YkNHRWo4dS9BDQpXTGlrYUdjYTdCR1VWTHgrdmsxcFhxU3lDK3pqQmNU
R3dNdmZrY1p4N2J1dGg5cjRxaGxLMnlDZkh4d2UNCllaR3ZmcjJWayt3a3EwR0tBcFh1VGdDZHZa
bjZ3QmdoOUJkb3ljMUMzbGVGYnd6d1dUdXNWVlAxak1XZw0KOHh5ZXp4bVAxbXpBQWt6UCs1dkpv
VmhGUmZURW1pTDBmb24rSFhYME43b3JVRHlPNE44RmQxaFZ4VjRKDQpZTXhjL3l0NCt0QlkzTkVz
V0xleC9aTUZZeFQ0YWRJd0ZLSzN6bzJqK25OWDJoQ1R0eUdQRGRGdjMzTFgNCjVHalFUeWJ0eER5
a2djRUQ1USs3Y2U2SGdQRnQvYmM3UEcxeGo3YTdaWDkwSERNTmdnTkQwc201UGQ2bQ0KUE1DTGdp
eDc1elBpTjFEbUlKNGwveWhpWGJsR3M4NjBoaFFITG85UEp3MFI0UGU3b1NZd1N4OGlFV0taDQpG
QVBIOHVsaDlrbmlRNnlzSFluTFZtQmh4VHBxRWd3d0pWUGdHcVFSdlBZN1FQRVJCc0cvZ2k4dXBv
UGENClVLdnZ1aUFqeFNSeWt0bE5sTENGbDZ5cjFTdDhiM0Z6K2tTd01CQXgwYityd2Vqc0NaYmQ2
Mnd6Sldtbw0Kc2dUa1pqM1NNM0ZhalA0eHd3TDEvNnpqNUp0YlErSVpvUzEvREZ0dGtaTksvVHE3
ZCt1SWx4YWx1QlhTDQpla2d2S2NWTjNUSlA3YmRUN3BXWUR3RHRoNHhNNnRFTkx2UDd6dDBUMnV0
dEdieHV5RW1tVCt4UW9DNjANCktqRUp5RWhrQzd0bWxtWVhTTlFJd096R2VuMENEQnBMTWFkbjhW
azBPclQ4VUg5ZWE0ZEpnOEJsTE56Tg0KaXdJc0k0UVNlVHpWa080SlVqT0pxRUc0Zm5SeXRvd2JW
SkswakpxZjh4U3JOcDMvZXVWemxlMk8reHV1DQpQaHBJVXRFTUIxVFJDWHZRSzJncHB1QWxGNU9m
V09Qc0JuOWYwREI2RVREajE0N2ZUd3gyL0duSjFhVloNClc5S0FQUFI2RWxuZys3ayt3VkJ4alJk
UHNNTERoaVN6cHRYU3VrQmsyRUFHNFBYTU5WNzUrcmVBOGoySg0KR1c1RFkyakZaWnJCeVo4ZzY2
SkM2UEZFSjhlbkUvZGtzMXdNZUdCQ0F5S1hmK2tLRzNFN2dHbFpaL0VODQpzRWJpZC9UT2ZveTdj
VEl1UG1GbXhvSnJ5bVdmeWVxOHlnZDQwaHM5bi9uK3kwWGZlbStoeHRDT2pMd2sNCkZhbTdOSEJa
ME5McjlIaHk4enhFbGx6clhwczNoNnJUa2VNdEJua2xSWm9zQ1pIcVZTUzBSREI0QTlJUA0KRnpt
bTkvOWVPN1JZbUpjdGdXdUIvNmdwaDdHdGtKWGhKaHZZSXduVVFTWmVQcnBObTZwS0YxVFlkeGty
DQpBMHhveDVpR0FWdFZCQ1FoUU5jOGVIV2w1RUMyVjJhWjd3cEo3NnR4R0dHQ1ZvUTVycHhCV2Fl
UGN3cWcNClhNZFRoYWo4SmZMTzMxZVhsbStkdjU0QnFFSFh1VlVyeTJFRHp0bVBVajdlSHB4ZDU5
dklXd0RYdjMxTg0KdXROM2h2MEs5ZGRHWE53QUtHbkZCUm1LWDczM1cyWHhBWThJbDl5TkhkUHNJ
QzV0cXZDRVlCenJYd3orDQpES2Ivb25zc1BXUm8zV2N5LzNGcWM1Y2dDSTk5U1F1dGZyNXFrQ25Q
R1hqRGJRYi9Wam9wdWtUb3pHTlANCi9iUlFVOXd0Vlk1cUwvS09Jb2wyaDVKdzk4bWNMYVpXMWlN
MUtVa1VKb1VpMlpxdTZTRTdJTVB4NnQrRQ0KSVNWaGZLMlVkUHVYMXBmVkhVREVDejBvaFE5WXZD
bllRMDJOVHJmcTFnSDRQTmtFZXBORUU0WjZEYy9oDQpITUhnTTdpS2gxbWY0RkYrOWsxZkh3VTQ4
UUl3OUlueHNLZGhaTWRwWXk3b3ZTVnFBRkxMRmRSTm1xdFANCmhCb3FJRmNJcm1vRDZVZmErdUpN
R0x6MjYyT01XUkt4b01oeFMzMzZVcHJqM1FSQ2xWd2hxeDdDcmJLRw0KajU3dStvcVg5QXp1dHhN
cmM1Rjh2OXhkVzR1UitiNVd6Um9NcUNIYjRsM2UyS0RTdFQ2L1QwVi9RekpuDQpoSTVPQThTMU92
aUErNVplT0UzZlZWWGRZYisxd2FUZW9hUXo2MVdTODhlN3UwcGY0ek1xZzhzaUJtRWUNClJ5VkFh
VjY3K3BLQmxXY3pCZHdZaW5jZ2F1Q0NqT1BUYWgxeDludUJBK2JJM1pDR2FEM3I4NUtIb05QWQ0K
OGI2REx4cTNucUxnU0xTSmdSNC9xMmUrWTE4d1dQL0t0OTcvZWdhODNqb215V0JQUlBjOHB4S1J6
NHlnDQo1dzlNNFQ0VUhaVi9zcTZjR2FQU3lpZXB2NkNDNktGWnJPd3pzNkRZczVQZ2h2L2N1ZUNJ
QTZDdjZvN3UNCllMNEU2czUzbTNFMXdVWnkyMHl6NEluZ28xa215SGg1dk9BVTZ5UjFXdC9SQ25K
ZnRyRERPeTdwa1pkRw0Ka2I0ckZaZnJES1BDOUJodU0rb3M2OGJiV0dzUFQ0cnI4M283aThtY1Bl
ZHNCNzU0TlIzcVEvNGJ1UUpyDQpndlMyUzJGRmdhNzJjaW55N0dJOExHOUg3Z3E5UXlzWkJyNG9n
endxOEgydHFmYWdzSldZTVVJOXJPaGMNCm5Yc1M1U1Z6cDZiTUpiYXUvT2txU0U5cW9pUE5UdEtM
UE1kdjQvaDFDMW1iL294VExjSEhqN2xmVVdWSw0KM1Y0bldBVWZrcHRuU3NlZ1BncS9zWVc5OEhD
NVR6V1Qzd1d5WENrdStOZHp1Rm1WRzBzK0VYQW83WUJZDQpscHk4WkcxSERRL0lvRjhsNGhiQzFo
eGs4RUcwZDdrc3pOVElmVnRSMFJKRkkwd2dnMjY5b0c3TUt2ZzcNCkw0OHRvZnZ0V1FFWG0wdVlq
cFBtekEzSXdYRHExc1ZsUFZGVHlmN3hoYzRVTFhaWmlJcXhFd2krb2xHVg0KRlluNHFveDNCWU9x
K0ZnczA1N2JpL2YzajMwSmhKVzlWZWRUZGRVbTBsYzlidHVDK3lUY0UvS3BmNk02DQp1Q1RVUm1L
dm01Y1lwZzdmcVg4dXdxeFRidjFpRW81T1hkWFU1M1J1K0JUQm1aeXZhRGVHelYzMVVOWW8NCjEz
VXB0dS8rUlNiZHVDUlZ0RXNGMUZkcGFMT29rZnNWSUZlK0tqZ2NrUEFHejd3U0ZYdmF2N0RaRm14
ZQ0KeGFoL2VZaGYyTjhpWDJVc0V6NUNydDJ0a05VbWdFM0RyMENrVGRoenlkM0dudVFZbCt5aXBM
MVd2RWtjDQp4SHBHM25nN3pIditBdmVLbnNmK1JudFBvNWJKeVR3VjlsUDQxUWZGSkx5ekpVWGtQ
Tm9Odm5OaE5JakgNCk9yU3c5UWJpUXZLZnpHWDFLUlg3QU9SU0JSVTA1RkhPN0JxeUNDbDVjUmox
RVV2TzRLWUJBcTRUM1FSYg0KVDAzVDdXcThtSjRGQkxDM2drWklBRkJYakJldENTK0lZUTZGM1Z1
OTYxQ1JYM3kxQVE1QUlPMWpzMGF3DQppdTdxbk5uUzRXRXFOaEJKOTFGdVZncG5mam92VmZmQzZj
VlFmZXBncXFrelZNZThCWnM5TWpRbUxVcnkNCmdTMDJ0czFjMjFPdHdHUE1FS1F2RUEySFUvYlRU
SXd6LzRVajNWNTJBN2Z5MUxUU0tBVUx6SFN6c0VlVQ0KVzluR2cyVDVqQTBkckhwdzdOTHpnNzFz
bXozMFFINVZycGptaTFIY1BpaEFGRmdEbHJvNDkrQW9IcDMxDQpOcytEM3pUUmRLZFRnMHVWRWpR
SkRUeVk3dklQSW9xMFJQNFdrdTUrRUVzTExrOW95cit2WE1Bc1FUKy8NCkduajI0ak9mZlJDOTc4
bHZrSlZpU3pLWTVOWEV3UHdmZlNkT3hVWHJyQ0xZUERwVXV6Y1F3UjJ3Y0xrbw0KUllZOGppaGQ4
UmVjeU1UVG02VUU4Y1p1RlhzbHB5ZGxvUXRoV2EwZzhiWFNKZXNRUFdwY0RkS2FBTzcrDQpCQlR3
S0lIRE94dm1obDliWDA2V2V4TTFadTBNcmQ2UUx6cWRsTTcyQUZyU3cwWGlXUDA3QWRmME0wWWsN
CjBxemhEQTNwZkZ3a0dOb1ZscmhnTWNCOEVWNUVDaU04VWNTUjQvdGt3V3YxanA2L2RUR0szT09t
NlhVYg0KdzE1UWdXRmFMOVNLSzdLL3RVM3RhUDBFVTBQWFgrNkVZWTdLMytSSUhNS0Y4c2dzK01J
ZnB6c0J1WDBuDQo5NDdmeG1vNjdrZ1ZHZS9VS3RRaHpEUlZpZzVGYkpma2VQOEY0T0h2YnNKcCt4
TkxkcTQ2UUZVVzNhTmUNCjBrUFc5RXlndTFocnFGbkZUelJlQXcxdlVHQWpERXc0MitqdHhFcStT
d21JZWFiOHdpMWdqK1dXa1YxbQ0KTngwamVXMUx1VGRzV3JLejJtU053Y2ZrU2lEcjhkYnpScS9H
TzBmVVVkZWNzNCtnNGFkaGlFRURpU0pjDQpQTjV4bHQxVEZZZ2N2UTJIZWVRa2tiZWtBN1JEcTlk
ZXJTSm1mWWFXb3ZnMFU0TC9WM1VXdTU2RHgyS2INCk95STFDVVlOL2UxNi9adEYwbWxnNWhCcVR4
b1FXYUdzZ0tKbG9wNjd1QSt2UlVGWXNaWnMrVG16NndWWA0KaS92LzlDcDg3Sy9yaUo3THVxMHJX
elhWc3hxWXp1R3VaVWhjT0FaN3I4dlZQa1ZvektSMzRGbTRoM0FGDQpCd0ZuQUVCL29xam9oRWgr
Z2NNT3Q3em1SRUtDM295UXAzdmpGQVE0MFIrWHhxT0FHeHU2N2phTmRjOHcNCkEvM3F5OUpDRE5D
bFQ4SitmYlFqRXhpMEhPSlR1TlEweWNPWklHS2VySGwvRlN3OEtuZXdCZmwxUXlteQ0KT2N3VUFW
OFR5UHZ3NFNNN2hKOVYxbnkvSTR3Y29VeXlKZVVOMkVONWwwYklqR1pFR1ZYL3VVSGVrR05oDQpy
VXFReDAyeXN2QnNsY01DYXpJVzJSYnNYbnFpM0ZWbkgxalJwUEkxaEc4cGNPeTFtZFdCd3ZoRWF3
dE0NCm9STGNaUHNsM1h5Qi9jWWNlVk9FY2hqd1FoKy9DanZaWGtkZUcrWGRsbFJkRm80T0kzeHhN
a3B3RmlqKw0KTjBCdEZwMmJuZVh3LzBVbmhOS2o5M2xrcXoyM0F0YU5mR0tMbXZvK0FWa0Nwc3M1
SzF1TDdkazZiRzBEDQpDcjUxL1BMeSt0dTBEZmRBbVQvVU1Yd0NLbm5mSjgzbmVRcmNHYkV5ZUxR
aFlmL3RvQlJyUlY1YUs2ZVMNCjcxT1o2d3hMSmNoVUN4VGZKWDhpTStXSDRtRG9ITWwvc3VobVlF
SjJ4KzZrQy8vWitzc3cwK2w1YlpQUQ0KTXhqbU1KaU9nMm5JVWxiNEw1cVJFOTdic0lVb0M2Z3ZI
eVJySEpBTWhiVEVEZUFzejBQNWZOMEdybzFPDQp0V3F0cDlMeWdHeUN5Z0NUbElIamFjUmFibWVn
eTN5UWlyT0VNYTlObVJEdHVtVnVXRjFYZGlmb2JPeDMNCndVMUVEU2VKa2NRL2ZCWlZRS2p5eUZC
Qkl5bUd6cFJKVFozQ0l6V09mM0lzTmtBb3dwN3NYYzZUTDlLNA0KckxrMCtjQVVaMVBBSVROMnVK
aVlFQlNlMEZ4bDh5SjRFTlMyYk1ZSk1kWUp3SEhpa3BUZ0xuMThCL2s2DQpsQ0hTdC9TTWIzRVdN
SkZJUnRIRHlSVmZVNXcrQjVGekF3M0VnaERYNzdiWTVnSU91dUJzRzVnUlNjUUENCnYzQWtyRHFJ
TVBMUjFhVnVNb0hBaHovMlh2QVBiM2pnRy81ckF6WmczaTlpMVo3dDBiQVd5WlpFUEZzRA0KVUVW
NnpyZmNuZFp4V25GRlNBeVh6RW5NcHNIcUY2TE1vZUlHUVIzZHBDeks5ekplSXVWMXVtODVxMmpI
DQpDbWpuNnh5d2dvZW16NVFhV0NIR0ZTajNhbnNMOENrRUYzRDNTLzZFMzAwUWJxaDU1cDJ3U2ow
cHR1L3cNCncyd2s0MytDUFhwUmE5RksrTXZvMk50b2F2aUNmTHl4aGxHL1pqWW9wTzdhT1UrTHNm
RlFId2lERmRBdw0KbmZ3SSszYXdLTW5TOGdUeGVVUnNTck9kblhzUnY5RFZYTUpMNnlDaEhlV0ND
UEtYdDE4U0J6eTE2MkVMDQp2OFQ2VEdCbG1Ba3FVTVQwc0pPRDRsWVRRakkwbnBZeVlLTG45amVH
TGtOYnk2WWFIQlByUFkrU3E3Wk4NCndTc3VNZ3hvTEE2bjIzTHJ5d3VDWmdPbHlVV1pvSlh5U0lx
V0t1ejlaZ1U1dGNxaTdJZk9mS1R4VThDTQ0KbGVObmoxRC9pK20yZ1E1TmtJdm96YU1KL252a1dJ
VkNWcGF6dkNWMTNDRVJ6RGN5Vlo0bWhCdzl3c2grDQpCSnoyNEVQdjE1NUJOU2FYU0xnZWRnTzZl
TU5halJSaE9TdGdsMWFqUmlTQnJIaGxUaHM0UmhXYU0rMlUNCnhkWjdUWnJXdFNWSnVoaTV1TWZ5
OFhPTlBmbVhCWGlpNHNaamszZE9ydnQxZEVjeDhSdUsxbHNScXlIVw0KNmRVVjlTbVE5NHhYUHJr
RytDTTJqZ3ZnVVNPR1NzZmlXTS9Xdkp4WFNMVzhib2ZJQW5SR2xNYXJWYjgwDQpHbGpWdzdLWi9o
MGJOY0svUWJ4bHdjU3B2cC80L3kvVW80UHAybjlZUWtGSmFwSlphYVEwMmZ6c2lPUVANCm1tUE9I
Mk1zc1VMWGYydkliUm5FQ3I0Q0YzNEVnbzJYMTZBQXEzcnZDQUgyWjJTWlNQREdWdS9VSEtLZw0K
NklNWFRybzVHNmNuVW1sd0xWVU00cDMyUVpYRDk0SWphYTJuYTdzNDd4dlVtei9hTmdPalFSTFk3
YnBTDQo0cnVZa29lamFONEhmcXRVV1J0RnltUXFqMlo4cFBzbmlmZE9mMWhkeXZpZEdxSVY1b09H
ZXlEMVA0RHMNCnRsTlpYR2toTFdQbjkwcXJ3YXp1YnNoa0VJdGZCblkxNFNQTTlBWXlEUVkzRlVW
U2Y0eVVxKytHcDB3RA0KOHRQMExHRWl2UE5ZTXpmbVRzNVUvNVhTeUdkdmM5YXNGeDE5aTEveFlh
VkVvTjVSajdOTmJmTUFuSDJFDQpKejRxa1JNRkhFVUsrakFRanJjWjBBMnlwOXNOYjJabWoxQkJX
NFlqcWMyZlMxM3JDYklIeC95aGgraXUNCml3V1BTYWloek1GYnBaUVZhem5VdEFQMnJDNnNjNW14
a2x5ZmV4bzY1L3pEODVrYm9pSFNiUmNnV245bg0KampzcmNwQWhQYnp2REtxZ0FKS2p4UUhCclo2
eEpISmNhMGYwbnhHOGxJaXIzU1ZTY2RIZDc3SzhxblF5DQoydzl5dGhmeUQzK0xramJKdzYyRHpO
enFGeS8rTUc4RC9zQTZHdFRKaXlpOTdYWTBQcG9YS1hKVE9JMVANCk5mbkNseG0zVFhzNlNjWWN6
VU9uR0NNYitnQVpCY0hCM0xIK3NqdVI1QUpjeWk1SjByY0FnWUlGajJBZA0KMnM5bVYvOUUrS1hU
SnZOdnpRTzlxRW9heWxYU2lGbTFCYnBncHdoV0FjanpKSmw0QWxPQzVQREpvNGZkDQpqOFZaZGdR
TnRjV2dYSUZhem1SbCtQK3BBWHNJTDJDN3VzT0MxeDhxZTlvbUl0RWI2eTJGQmpmNHNqUzUNClVS
cG80Q3JBSnhpM2ZGTG1zY3Q1cmNvSVIyZkZENENKa1RpRk9CODkxYnFra0tRUHozT2VvRGUzTWY5
Qw0KcW10WkdFd2xLYU1PbVZJeVRQSXI5eFQreEFkM2hJMHREazdjbFVkc3lxTzFDR2FPOU4wK01v
NE5VeHdaDQpNWFdFTFBGem93UWZDMzNKdHVEcHU2YkdXUldXSXJzcDA2M1k0UElTRmRwenNjSWh6
Z3JGUHJteXBVZmwNCnpHSXF6Z1dGV2RMWDBmai92bzgwUTJOQmdQaUNrNlR6bU05T042bkcvL2pW
NXFuTHN6MCtjRmFzM044dg0KdU5na0lCN25BalZBQ3hiUTNNQ0dFZkw2V21xTXYySGxnNUVPaEpn
elZCMk54OVB2STdOV3FFYmRJVGR2DQpFNTZOa1UzSVFvSWZMY1Fhck52aVg0SmFmdXBiN2FPWmVt
dmRLUGM1a0NZRm1HSWhkU3R2c2ZQVmpEbkwNCmh3YWZ4aUkxbWZtTTlJVG5XVmhqUWpTNTFGOFVv
NTM3MmczcHRKYjBnSHdPRWlERW0zbWM3aUV3L1ZMZw0KbzVUVWxEWjNwVGFTSSt3ZHlmVnkrRk56
eWt4eWhnRXNydFhNN0FSRGprVW1oODhWa21EYVZTUDdzdTQyDQpZeElmdW91SkNsWjJyNmZZMkVt
R05zdjlnNXFpcFlHNW9mdFIzalg1TGdqdUtpOEY1UHhXZCtrWWdVaDYNCjh6RnZkbjZacFNiTlAz
aStBVVh1Mll4QjM1ZkhoWHdaTy9OZlBwaTg5TVFXVW5KLysvN2cwTzJsQU1XSQ0KUGdYQkI2WUJP
aUNBWVlwZHE5YlZ2K1Q2WVJOdlFVQ05Nc1FsdVBmU0dVam00OU9DMkViSkxDbTIyb3F6DQpYZ29s
bVhuZldzY1lwSmdDUzhOZ1NpNDkzQWFOYUgwU09qZVZydEgyL2VIb2pwMnRRZlVZWHJHU1BYTEUN
CmxKMFhKazFrQ0NEOHVVU0R1MjNyd2lzQXN1NGlrTHY2THdQVTdyOWVneTVDa3JHb2hqYmdPUGlU
ODJtTg0KaDVkUE9QdEw0TmJOV3RubnNuc0tXTDQxcXBQSGM4VlZhK1lyYzl3WkwrTXQxSmVSTkJo
K3VxeUNhM21LDQozWjRGQ2ZoZUFTZmpoR3VOWTdWOUVxRmk0TDFkQmUwM3V6Z1RYd2k3L3NUb2dS
TDNSMFB3SXJtcmFHRUQNClAvMWJvaWdFazBDMHE5L08xdGIySnNDbnl3VWR3eEU0VXEwWVBFcGhp
dDhpcVRvUGVKMlBRVmpsakx5Lw0KZFdiYTk3M0ZDMmhQL2xIRWtJeVBmN2VXbGRaT3Q3R2dPYmhP
MXpjRy9MUWxGWTNkcWV1UWZqUDIzemM3DQpkY2Zkekh1KzNVNDNDc1d5dEVQSS81WENFczAySmJJ
Vis0SGpGR1hveURVQnkraGtNL1VSTFdEU0Uva3YNCnhyYjBnNHR1czZSL0xrRFBuYjFJQjQvNjdr
elRwYlZPdERPdUFzZWQrZFY1V1hVM243Q0VtQWxHcC9jSA0Kb3J6Q0dNMjJsS2ljSG9PWDU3YUNi
MEpVZmhKbDZpb2JBUk9yZ0I1dDBLYTdEeWFrbFhBQ1NtVVBIRG1aDQo1czhuTE1hVGdHaDJQSVVH
SXFvdFRjSkFJRGc4NW53Y3BCL0VSdlczY0hLNitWMHlRU09WbnhXN0w1WkwNCjJjanovN1doUnp0
ZDVsSWZXTys5dTdtTHpHNGhWTitrQWd2d0ZEVFlWeEhySnZrQ3lZR1lXTlh2S3JVUQ0KWFZ0bDFG
YUtSSE1KMGhsK09zaWptaHFieGZjbE9qWVF1empIM09QUjF2aDNFWHRHcytwdmZaMkc5QlNmDQpM
YUIwMnFvczl4bTc0Z3lWbkpvRlNHZzAxREpwajd3WktDVTNaSHlxVmYzcFRpN21OTlpOTDhjcWVh
ZkMNCmlHRThPZGl6Vm9SNlFOSTFFMzZubVJtTkhRMGZvblFFRmtuWGdXYWdlOXQ4aWg5cjVNQVNT
LzZmRTF5RQ0KWGpyN3hyNkJKS0ovWVRMVmdZY1pveXNJL3BqZ0lLM04xN2dxOHQ3WVJDdnBocjZy
UTJWMExFUU8rNDJPDQpuNlN6dGpVazhoVlFLZVhiYmFxSlpJU21NYUd1S1lSRExHUit5QVBYK1lt
TnVKUGJSZmFrQ0lLVTE5Sm4NCjF2UEdYYjIvcE1lZVNMTnBxVkRkemRId01UQ1BVbVkxZ0orR0N5
cDRyamVTbWoxOWR3ckNTN0RaR2k4Qw0KTkY1L2c5UExNdG1kZ1ZVMDlkTVBKbDVwdDBGaEFaWnA1
THVyRlBOWHVyN3ZpeEtRNUdpbVBZYW5OeVpjDQovMXBiRE1qUkU2UUVLMXlXRlJQcXYzbW9KOENi
a3dzcTA1YVJ1K1JycmJjdHFORFJhMGtBelVGTGNrLzYNCjZqWngreFp2d3lkYm9TMkpCRGVoazh0
NkhJVGpra1lXbVQ4WllLbUVLaGN3ckZJS3VNSnd3S0tSYS9oRg0KT0V6eXgzbno0Tnc5STZ6RCt2
SU4xSEJadDhuUDc5WnE0L0c1cEllcmV4QUdlL3hzWHdCSmovUlFvU1BODQpsRitVVjJuVDM0L0FY
L3QvdXp1VXhHQmM2QTFOUC82dUFLdTdpLzhYUXB4Z21ZK0sycndIOVlNb3BTOHkNCmhhdlArNzF1
QXZMZTBuVnZhWVRuTG13V0lOZzRZMUxFZEFMZGtBWTlxZ1Mza2c0N2kxdmg0NHNlbWVHWg0KLzdK
NmRGTHdNTXJJOThRYVBDd0lHa0hpb3pUOXJQRk5ONWdWbUhDMVhLNXFvN29lZDRueFdQUEl3dFBB
DQpVbXFqNHpaZE5YSlkvK3RLNUlvQXd3TzRrMm84Y2RMUVh4bVFMdGIwQVQwdjFrREdjbmdReFkv
NFVyanENCmVHMkNmOEJ2aTV5YVBYWm54M0JORlhoT3NtOTFoK2Q5cDZhM0JUNHJvNEp1WmU3cnR2
NVVheDNucFpLVA0KeDlxTlVMUi9iUmdoMHRFc3pnY2FiZXFPQUV0d1NVVUVuVlJxZ2wwZEVQL0R0
NHRubkZOeTZtdllyT0h3DQpoNWRqZzdtMmk0RXNGNkRFMlMwQktyTmRKL1FOd2RmV1h3WUV2eWVS
aDlDT2xZZjl4OWh3Z3IxZ1hFSE8NCmp5RTUrNXRjUTk5SW9ManpYeld0K0dqTFBrd1ExUXowM1JR
WjZpeGFqdXlZK29hSUR4VE9ILzZGRWlJMw0KbnVHT05mZlpIcllRdTNGNTRTVlNrWGUySG83OE8r
Ky9NZ281T2h5ZlBvTTMvblZVOUJtYm9MSVg3NTlPDQpYamZWcnh0RGI5SkVTbE9KN2JRQUdnYUZQ
SW41b216Nm5YQmszcmM4aHBFZkhnVHNWa0g5eGl6QXVoMVANCmxYQkd4ZXFGYmZNS01hV2VUNVpF
dWZsMUdtb0dsaXY1dk9KTzNIcGhDUXdTcm9rQ3JQeXlQVFV6cVl5Mw0KdEJLUjJYdTRwdHcrbVRY
dFVBZG9QQXhLRThZL1gwSmh2MnFkcHAyM2d1dkpJT3Fndjh4ZG9oZzdYaE9rDQozQnBJT0xhaFRo
eGp3NDJaSFptMFE4OGVsWnd3N293RlpjWGRCTXp0S0o3NFRSV0lub2VHekJncHdHVHoNCnZHSzUz
R1lmUWtxWVFtWXNTcVVIcVdzT3VqTmF5YU5rZUhLNnp2RmxQRHM3MmF2UzQyeGlWVzVEM0NCag0K
VDVHUFZmNFluLzNrdEMyU2FZakZYZVVrN2xXZis5cmorWk12VHo4aFZnYkpSbldPTG83dW5uYmRE
NndEDQp0ZWlUekI0MG1OSi9QUUprRDkrOENudnpIdk5HS0MvMEJSeEtHY2dPVWduT05KZEhieDBK
eEkzZFoyOXQNCmhmdlBmVS9zbDRyZnVSQUhLbGpUU1ZERFgxbVN4S2NIdEtHR0FkdkltU3ZNQ0Jw
RE1tc1E0MXBkMTNuaQ0KMmVLV25oKzllRkU0UXhFaXlEVVJuWjFTYmZhOGZNTGZYV1V6ZndNcTNh
WHA4MEIrZFdxNHFCZnZ1cjlkDQpLSlVHa1pmVExxdGVlVHBTNU15U051U0t6RnhGKy9mcUtYYUdx
SFI1a2dkZUljcm14QmdLMDhkMEgrWVMNClJCU0tmQTlwK0FvNkhpSHNLWHBIeEk1blRkWHhCSTVM
VlYveXorZXlFQUpRR2tralpqZ2tLMU5wRXQ4Ng0KYVhlc0tySzNOK2NOQndkbVRXcldQNFZlWjhh
Q2sxem15TVNCMURteDdlOVUrMWpJUzYwVFJsZGQzVnRrDQo4SG41dDhQdCtVelk4aFN4c3JRdmtG
cStEeG5mTkQ2VVRoUjA1b0x4Y1JsYjRoVmlXYnlQMXZPVXZTc20NClhJTW1PbVZXV0FxRkVkVGp3
K1owNi9JU1J2TThYSmhQd1ZIanF4ckU4Mm4xS1hhQy8wZ3ErZVJtYmdDZQ0KVFZFUFErZnpESmdr
QjZVTjk3TzJnQ2hCNk1QUWlFZlQ3dmVJZ2ViRTEvOE1HRkhBSk55NmNsWURCemhaDQo3ZmQ3TXI5
M01LZXBDdVlIYVdaMmlTb3RGYjJueDRnRU9xT2JiK2ZXWCsxbURNdTBnNFFOTVF1NzM3dGwNCnMz
VkE5akFHUVVVMFpNNVlPaGxjZ2xzMklVeVFhd3k1TlhSaXhLeXArR3hPY0svcVlFN3QwVTBZWUZk
bA0Kc3RqTWxNeThwSE1TVmtPckRaR0xUd2ZBeXZ5QS9VU1NScC9tNXdpa0pBcG01QmlYN3RXRzBC
Ly9leVIyDQpnUUY4UWl3TzZaVUlxNEo3MXBlTVZHSUt1RlBhTWNnNGkvdzRJcFpld21rbjh4UEM2
MzlRNDBqbU9aUC8NCjVzTXd4Yy9WZmJJMm5ZM0xoM2tHcVpkK1I3bFJ0b1B3OVRzOEM4bWROQlB1
bDRYMm5oMUk3TzZKU2dqVw0KNFRwdFBqd2ViZE45WG5RKzNQajcyMDh0NzJrRGpXSWN5VldDYThJ
U1VsODg2TXFxa0lQdmZaU0FiOS8xDQordFcrd24vQmFkVThQeG1LZGRZbDd1dnJBQmZwZlpzNWlS
UVhJejJJN2FhcXBCeE84RmZjWlViY0tYN0YNCnl3aE1WM00rYitraWNOaGlvNVN3WlIrRmNhMFhB
QWxYQXVGSVF3eFFhQzFjak5iaEx0ZDdOSE9iLzhXUw0KYmREWnZvN0trclRmOGVsS1YyaGdSblE1
czRhaC9vZW1jYTg3MjhzaEpldFF0U0lFckRmclpzRmdybVdYDQpLai9NdTlFdEhzNkNhRmhkcVkw
cWVlUHRLVXgwWXJBZXoyWU9Md0FBU2p3MzBwN0pwYWlMS3lUOXhFb2cNClhpMjNBSmNyOWZ2empC
R0RnaGxVQVJ5RXV3WFpIZVAvYW5wSUtBS0owUTljbjlVYTlzMjFQRklobW1tQg0KVkl5MTkyZ2xQ
TnlXY3ZVM2RGSnBFWE4rZnc5elFSemx6NUE1YURrNWJManNCR0hLTFNqS0I1SkI1dXZxDQozNDE1
VmovOXJ0K253SHFPeHBXTFAvK2ltYllucmhLbnZCdjFlUUFRd0t4N1lRQVFaa1hlSGxPcHN2ankN
CmN5c0ZJL2dyRUN4cHpXdHRQdHVGekpIZXpiY3ZaQ2NhSGVRNUU1QTY2VlpCV09KSmJXMEkvVWUz
M0VnNw0KZEh1Nk53VXVXVmRsL1lob0doNGRQMGxDaTdtRG1mbitZL0w0QndMY2Q4MDUyaHEzTUVH
VkFLRHRwQzdUDQpZUThNUktGbjlDT3JMc2ZCMUpCVUw5aG1rTnl6S0wwci9vMGI3cHQrbjJRdWJm
K1A1V1dNSGdSeXNKVU8NCk9uQlFmV2JQSXFpVGpHVkF2Y1QrU0wvZG5aN2VudWRVckxyVUlpODRm
YXh6SkRMQ3dKWmhuY2RnSlBtbg0KeFJuU2RDakZTWUl4c0xBMkk0aXp1UUxoaG9vSWxMUk1QczBo
aFUvSDdTVWdCQUpDVmw4WFN4QWpFZ3pJDQpobVRyVmFtMWdXeVRpbmxQZWpHSGt5eTR2ME11ZlRN
bjhHT2FvdTAwS0NkVEtrRUg1MXduWVBOWE1lMk0NCnRnQTVOK1g2ZzNUMisxK0IxNFVsY3JYb3JN
c0FCNW4vOEFjcFhpQndFVFdVREw1WkY5Y3FONUlOZzRtRw0KUVdzRnF4aytSWjFBS2xwVnpLTU9O
M0dmbEc4bWw5eUp4cmxmYjc2V1VvbzR3RTgxbGdHZGtFZzRCbjBFDQp6b0VPNEQ1WWJwZllWVDI4
TWp3SXBRQmRsM3RycW10eUFBTGZJbXhtS0dpejlnbk9kR0pwYXpHWEliSkENCnR3Z3VZcE13anZz
cHE5L0RFaGtVQkIzcjYxZHRBVGJHTGZEVnJkZU9GSWFvMXRXVHRwb1RlV1JPSUdTZQ0Kc1hWZkxU
Q1hNelJwaDdLMytjejBTV3FKcWppUDRWMCtlOVh0UmdRYTdNQjRCN1pPWHJhMVU1eDEyazB4DQo4
MmdabExpOENJQ0w2REZuMnRGYlVZb29NQ05tNDZJN2dTeE41K0hXbUh6SnJpT0pwWUk3RGRZUGRp
UmoNCjdVK0FpUCtEZ2pGQ2Y2T0FMRHNyckhpTG5QeGIwZ2J5T0d1dE4yT3N5S0ZLaWs5ZVN6WUFz
ckl5ZXU5bw0KT2JsMWpxZmZUZ2doRG1NQmt4SGxLTGV0MVlqQnJWYXV3djUrVlgwV2pUV3A4ZjND
TU1JVFRPVHhaYXI4DQpsSHo0RC9vMnVLYlc4SHRST1pJbjhDTk9UWFVjK0d6bFR3Z2syTUFuNVZS
RTVuMUFDNUExd1U2cTQ0NGgNCmJuT2FpVWQyTWtiTDE1K1NYR3lHSytzLytHMDFHV1ovSXZWd3k0
czhQUHZIQmxzMW82VHM4L3dnNEdIdg0Ka1hJV1c4OWJTTkZhaEszcmxqN2IvMGk5MWw1VWZmQ0J2
Vzh4dys2TXVSWHVHeWM4d2hUVnlVanF6ektzDQpUTzd6TmVlZlFROXhKYVhVQ2VNc05PVG14a1VN
M2Fob0JaZm5ldm94bTJpaG54M1ROOTgycm9OM2NoRUMNCnBmblFFeGg1eG1ZR0dPVGpYY2RmbFdx
NlBsOTUxRGJiUG56OGV3MlJFeEdlaUdWY3VGVlpxMzIvK0tMSA0KQ2NReE0xZHcvT2RtbGhpRG9V
SXB0U3ZUZUhhMFl0bWNNa2E4QXBSREFBaVRxQ1lzOXc5c1pjWlc5MjIxDQpDME5aMS9FUDlQQklS
RlEyZEJiL3FpVVRTMVNFL3BLaGVKQkVlb1dxTzJGeEkzdy9xWlp0ODlWcVBsaFANCmlGMzl1bDBP
YTgydDY0RStVZU5ESFA5VTVFcWx3YWJ4T3NDWGRHSHh6QURXdzdLUy9FVy9vWWVVR1VrNg0KWjFm
cW5GZUhDMXpKZ2Y1VGxXL29SK0JDQWQwWXZKVlpxQ2JOYVZncVVQTkpxVmp5WFBMWldaTHhIb25X
DQp4UThhdTdwY1hZSFk1TEVaeVNaWndWNnY0NFFqVC81VS9lUjNZSnB3S016MVRGUk44RmRoeDVO
UGNQTXgNCmhKQ3JJRS95SEVkdFhWaCt5S3lQaXdESmR1ajRlcWMrWjdidlpnRy9GZ1ZMMUt2bDVO
T0VsSXV2OGVHcQ0KengvSis4MDg1OUpIQXN1R0ZLKzBKVWZKNEc3TW0vMlhFZHp5bGF0U1Q5MmhO
REt4OXFxZFZYcTlUZk1TDQpxZ0k2TVVERjE4WFl3U05JNk0veFVPa0NSWlRKaEU0eDI0Q0REY2R0
ZDBMNUVKbHkvNy82ZElCRkF6OTUNCllheHNLenlPU2d5M1JWY1JxeWFUbWRZZ2FPbjFramt3TjFz
UXpUQkpUMUpuMTlUZGt2MXcyc3NMMnVjZw0KMXFCdzBzR0h6UTVFWXg0ck5zenVmMVYySk0rS2Zq
T09uaDlwUDNxY0lHMW0yQXh0OVc2YXBWREs3aUpYDQp4MG02QTdrK2NETHJqdlhIdUt3YUFiTXBP
WkdZdlZOUkZlZFhmanRFVG51UzdiYk5Kb2JtUXF5Q1VUNHUNCnRjSDdZNnk5anh2SUhBS1pUdlhV
L1FiMVpTNTlNUEk4M2tCN1ByVGdzVDQ1QlZTa3lnWjRiY21oSVN3Tg0KcGhTL1k1d0xhYTc1OG1t
Mk9nS0RneTRSSjF0c3pDSit3eHNRdExCRzhDc0x2ZlkzTjRVTVlXOHp0Y3FwDQorSTNkUnlRMEQr
RkZ2T1FkdGh1b1FVcDhRZmNndWFmd3pqTktGSGtZWm1WR2NtSlRWZkwyQ04xNnJNdjUNCk93MnM2
QzloSzFhejRuaFFuUjJVZEpRVlh4Z0dESmNuOElGOWJqZFpOMk9pUk1wTFQvVzFPeUs3YXhmYw0K
V0YrNEVWd3czTmtmOGhmWm5LRkZDdzlHdjJmTXZtdHN4OEpuV2JuMlJvOVFBeEVoOWVXK24yUFJO
cDRNDQpoeTdOYU10Ri9FMEx1ZUVPV2RQRkRqSStlSmtaQ0lWS0pPbDA1K2EzZTlzVHRyOTg2YSs0
R0o5QmJzb04NCmR2RnlIQWZyTzM5ME41WWxvdnZ6MlBpMDRRQ0pRTUFGSm84ZDJ1UjJ3dHBwQmxN
WmkxY2RpOFM4azdPVA0KZHhmcjE4RVJjZ0dCWjB0S1NhZytPYmZzUllqYkc3THpVRzBNM2xKYUFn
OEgrQXQ5MTFOQTVsdW9hWkZjDQo4dU40Y1ArNk1iRXVpVmtoZzBMaDRjZjRseXlOb2VjYXZycWU2
eUJ6aHNZY1BUTE9jVVR0eVRINC9RKy8NClhwc2pOYURaMEVQbWtGTzhvNUlsOGMzd2RzY1h1N25y
ZlZXeW9JcFJmZ2xxVlhDRFViZlhFOHUyZ2dDNA0KVG9pUkFrVUM1Rkl3MVZkaW1HVCtaY3B4ZVcy
MmJUM2pBbjRieU82andvTkhlY0dudk1BYVE1bXF6eXVaDQpvMjlPSkdvZXV2bERjOWwzbnZNT3hm
Qi9CUnRIdTNWdEUvb0wvK2EvQlRGSXVHa2VWdlRlOW9lRVIwazMNCjRlSjV5enBTU3NOWThpZ29t
dkYwRGZEMGIyKzZqekI0eGJORGw2a0dQWURKMkJoRG5vTnZjNmNCRFpmRg0KSDlxb1hxaEJ1S0Z2
MEpaVFFkMGkxdzNPYXN6WGhrTUdqU2p3UTNlQ0xudWJPZGYwVU5MSU5kRForR1FnDQpqRkR4SnNU
UVBDSWJMY1hNQys0My9sTkJ2STI1YzdaT2thaUlna1NCSTlTSGZvWktkVC9Kdk1WdkdOc08NCnBp
dnBlNDQ2dDFIM2wxV2JsVUlUZ2F2NlhlM21VbXFaclRVOGVuclFvRXdwYnJsRWRJY29ZSTEzMDNo
TQ0Kb1hmVkpkeVlRVHN5aHJpNHNQbUVBbWxkY3YrK3FUUjhlZVVkTFpLclFHYlgxbkk2YzRSK3JM
Y2Q4NzVCDQpKeTV3N0c2WWV2WVlURmdqWWZuNnhDcGMwOVA0ekpzbWgwRVpsRExPNlRzOElpcHFj
Y3E3V1Rtdis1OXoNCmEwb2pzd1RNTFFxc012ZmxyelJaNDMwQ3lTelBLSGdraTNEK1VrZk56M3p0
U1Z3MjZiZmtZeFI3clFQOQ0KSGRLREtVd3hLVEdjQ2RVQkE1N1FLTlRrdTN4ZkdoTGthdlIzbUlj
THNSTkxaazdVMTJjVzFqblNtOXlxDQpURkxSeHJTZkYraU5kUng4SkIwVUZ3VmI2WnptV1czRlJx
aGVvK0RTQUpnRTRKVlV6S2J1SkpNbUZuMzgNClhXZzhxSzJZSWZ5cFJISmpOLy9RT2FEMzVCa0VR
Wkt5NlB1NjJmOWFjV0ZuMzJpTGlBRGlXcjg5OFlHbg0KNzV1MitwQWFYR0ZjUm82ME0vMmQ2bTNl
SXZmWVJUNHdLbmhZaHRTS0xCS1dleTVpOXQyMnJ1OFZZRVBSDQpuWjR4blFDVjB3YVVqczB4MDlk
T0FXNERJUUozZHg0WDViQXJJMTBEOEVRcjJhZk5LTEQ1R3R0a0hNRUsNCjdWRGpDUm4va3pvWmdo
R09sM2Y0cEZuajIrUTI5YWswY2JDSjFmMWNWYUNWYWpQVk9qWHlXd1IvNmhqLw0KRnZuR09SaklN
QVFabkdaOGtEWDM5ZUxFbVMxV1JPc0Rxa0tnMFNKOUQ4NlR1RURPRGM4bVdLdkxwNzRXDQptYzFm
Y1NkQTcxYTE1UVZNK1lqd3lTWlN1WFl0VjRJc2RlVHlLQlU2Q3ZaUDlWOUZSb04vNU96QlFxTzcN
CmIvY2FmWm5CYkZ3bVd6TU1McDEzS2RHc0tyYmt4eWovVWJqblRlaFNlR3lQNFhrNllNUzBZTXAx
R3U4Yg0KV0YyZ2ViWFZablZxSzJnazk0Nk8vRVEzclJqV0c1dXJEdnBGWXduSCt1NklEVHRVZU9Z
NW02ckZyZ1d1DQpBcXJSdWpRQ0YvanM0NDdOVWNDVzBENm92YjhFNG9VTGNVMUljTWxpZ3hnMzJF
aXNhRlhyY201ZTFMMDYNCkZaU1dyTVNMaTBWQjkwdlF1bzQ3NWZpTEJOMkJPK2dFbjJTbXRURjNS
bGxud0gwaWV0Z0NMT05wMFZYbQ0Kd1FKMHN0bVBxcmJyb280bk1wcTB4dVJQTWNuMlZVR3JHajU2
bGxoam1HdzhZcjFLVDRqVFdmZThOaFIxDQpGVUtEUlZMZFMzcUlqUU4xL2M1ZlRYWE9jS2hPbjcz
aUY3N0RtTXdmVGJLUktXNG96RzlraytUbGNVNG4NCkY0cEtlWDY4d2lkVlN6aEhXNUMvVW1WOWRs
YWZiQkZmb3NtNzlXUFppV25TckNqOFVhYjcxWGZ0cHR1MA0KTHZuM05SY1pjaVhLZFpadjRzTnA0
N0hvTm5pR1JnOUsrTzNObVk3bkV0dmN4WEhuNWg4WlFXWXJWc3d2DQoyRUhZSUlqWVplTGZ5WDNW
QUZLOElGMzFDYnlRcGUyUFJCeUhQUnVDTkNvV1lhOEhpelpqRW9WSEVQa2kNCmJNU0tGdkF2TU95
ODc5MlJ3emZvZkRxOGJ5Q2tncndJaGtSbjRiQk1WQXFtalltMGdJWGluODQzU0Y1TA0KNTFGby9X
d2Nla1NLejNRM0tPRXpJY2k5MXRxcDFtY3JVcVc1VGVuUklaMFZTcFFYMFovTi9SbkwxWFhvDQor
cy96K0VNOVRXSGVuWVpxUmJJY256NXo0MnFybEhjNktlODgzQ0tjSC84SVkyc3Z4L0dFQkhGUW1x
dDgNCllCTHNQVjYraXFiM2hvQjlVaHZBYjRHdEhNRTAyNmdObXNRcU1HVi9KY3F6ejVnWCsrc21s
alRDc3FDRw0KRGlBNzltYTBlazU4bThEaVllc25yNUtqRnFzNjhxN0dLZVJIelAxZm5pRUsvdXlr
VW9NOXltQmh1WHlODQpBZzc0L1NsRStmQUZQUHM3dXdEV2N2K1BlUUNLRkdRd3hDcytvL2VrY2ky
T1hscTEyd2xRaVFDUWl5ak0NCjRWZmczMXgrc3RraE8zU2RleVhVdVVySWp3OThJZUVHNXlDbmxW
RFFuZE1MNGlOSXNDR0ZjTVNGaStpOQ0KWTA1WXlwRXZzK0grTjBwbThtR2U2VFFhOGljM0Vnc0xH
eFlTN3F3SWpORS9jditTdTRPRzRRSFBwSGNmDQpKRXIrNmoxMWpIZ2E4UFQzUHloTWREamlHa2pS
c3dyNXIrU1g4bFhMNWs0TDF5eUo2M05EdGlQR0MwNUcNClkrSEdTUUlJd21nZUM1a09RTjdJOGdO
Rm5vcmtOM1dGRU8rOUU1K2lXbzY0ZytyMW5ZUWhHUVRDamdjdw0KS3R6Z0JUK1ZnTElVUGZXQm9v
VFAzbkFJakFGUm1uYTVpUGJyclZMb0M2R25FTWhuZzRlSlRMNWRuM1hKDQphWG5uNUhRc3BHUmR5
REFMUWU1RHNUbnN5aEpYOHdGYWNzcjg0dDZ0a0NFV1dhYWJldXE2TGRQV2RuUUsNCitZYWJZcjVv
MzlHeWtZOEhEeEVVaU9MUWF5SjJIaThnd01hWC84Sy9LRlVrUUlrNVlraFd5N0Z6dk15Ug0KYXdv
aWdrNXhzT3FJVzFMd3k3Qytjb1FVUFZpZFpnbFdrb2lzMFVXUmRJVmVneWI2L2JNUzcybWpWQUUw
DQpMaW9KVExLTnpDOGJpdUJMUnNvTEQzY2JQK01BOENiczdxR0VNRGFwV0tDTzdCTlA3OXF0MlR3
UGFmbWkNCnJHVFQ3UUJoaCtGMUc5aEhlZG1odGFEVmFOTDhISmV5UGhQNTJFRjBWZ1dwcHBja0I5
QTkxNEpIUVo3dg0KSUF4Y0Jja3VqZlJmZjhCZVVtMTBEa0NsS2tORVA3NjBUcWxYbmErM0d4Qm1H
SkhHQ0FieE9FMHlvenZDDQpwb2dST3RxNjEzQmg3VXBINkNzdXVvNlkyZG93cGRvUVZaSVJsWlBm
VXlTU3lDL3BHdFlqb3NJYjEvUDANCjJiVDRNVXlyRmorbWhjTjd4bFhxNC9KYjhWRzMwTkZibStV
V3VLNllvZkgybWFvdUVITTdyaE85b3QzeA0Kd1F5SExhY1FoQk5JTGN5NzZMd1p4VmJWWjdEUlFX
LzNtOTVmSS9Ub1FRTWR6NWRpdUYwSVJjQ1NIK1hLDQpqT2ROSzRTYks5SU9HY3o1TUdGWXNiMUto
UThLaEFBbWYrQml1MklWTm9Jb2lFQnU1RFNaL3lMdDJWOW4NCkR0NTVIQXVFTHFmYTBVN2EzQllu
d01TRjdvNXlrMDNHdG5lMUE2Vk5GNHFOa0FhY0tlaWRBT1BjR3k4WQ0KT2xIaERxMjJOeDRiWDFD
Nm9oQUk0dXRxVzBFRlEyTFAyNzlROVNMVUtTdHlyM2t3eXRJWngzMHFVT1NGDQp1WDUvbWtCWXF5
RlpUMHp2VFNuSHB5MkVkSnk1Y2FhWUJoMHREOUVrSk1aVjlHT1NOb29LWUk4NFJWRUoNCkpTN2dp
QStxVFpHMWtFUkhUMllsSzZ5MU1SeU9OZmI4VnhYeHhTYW9kcytoVk1nQVJkSFJneWJGc1YzcQ0K
Z2hDeHplV0hZbjhZcVRpLzhJa3l5bEJHZlNtS1FJTnBQZTJ4MXVVMm4vV3MvcStaVFg2TXB6bDFB
TjY0DQpsVzJCS3ZLVzEzS244RytzUFpkY1NmbDJoTDhpRjRSNDR0SUdQSHB1K3pWVmJZM0tuS2tS
RnB3NUNJT2kNCkprRHNMZ3JsbjJjOUxyR2Zzd0FJMnN1MkhEUTBYMDN2U2d4QjhXWkpVcjR5VXJU
QWtkMlcvNEQ2YTNQVA0KTG1oME5MYkpCcC9iYnE0R1NXM2lnYitSODcwVTFoNjkrMUtKTjBVbnpu
T3dwdEtGa0N3emFBd3RkR2R2DQpVWjNUZ1ZrRUNwZDZoY3FyZmczcHE2dFRQbWxzRC9EV2lzbE1w
Y2Fub3hRTUVEVGhmSmIybm83U05FeEINCmlxM0xIbUp1aUNIR3NTTHlRd0xrcXNzUkZ2anltRTZq
SWk0My8yckEzK2NaVGJDNUpaMzdJTWR3SCtnMg0KaXluUHhrZjBvcnJDU01SUTgvbk5TaEhvWEZy
dFpGWUg1bUhwUG9mNUFxby9RYWlkUEFRN3FuVkhIZzdpDQpBMEdrZ1Bac2ZJY0tLWWZWaDJ4L2Ix
WkpTcnlLT21UK2xMNC9Odm5jVG9JUWkrdnh3clRQRjdYWlk4Nm8NClQ4MlVLSzVoNmpaazFCYkhm
MFRLallaWjZ5QXhSYUhCZisrcGIzUGt5eW85c1RHVHdpa2lwUWZXNi9UYg0KZ3YzRzkyenNjaXM2
bEVaR0dsOHlsUjc1czl6OWJzZlNlQURZVXdMNTMyZndZT1RsUjV2M3Q3Tk9KVVFlDQpPRDNOT01T
OGhkaE5mR2NCY3c3ZVk2UzVTb1VtSTdOOFpSVHFYQklxOVJKcUlTQkwzb1QyN2kyci9tNEMNCmRN
MnJKL2xWK0pMOGJ6VnpMS0pybTJNaC9ZMDIya3I2a3pmR1Ric2VqOUd6eGNFRFRqenl3N1FQbE1n
Mw0KRmY2OWx6RHJ6ZVFVMkxnTHgveVl0NnFHLzlIeStPaGJjNzU1a3NkNDN5MFJ2NjZuKzhXd1Rz
NmU5ZzNyDQpqL3kzOWFlakI0ZWUzRlVuMDBsdXA4MGV1TWhBRjFocFRhRkhXZnhPNjZ3bnRqb1J5
Q2U1eDFnNjJFRVENCjdETzkycm1KR21JZGx6bjRPWGtYaWJpRmpOaFFJWk54Z2xSZnY2V2dLc3Vo
K2NTV0pyem1iWTVNUzRvNw0Kd0lpWFRKWi9rNjQycEFWaXZaR0g1S3ljT1Q5N2ZHOEYxejVXSVl5
NHNjL2JpKzhuVWgzeWJGQjI4WkxiDQpRWEIxK052UHFMTkJLT1FsblFiNGkrd21PY2k0ZGRHK3kz
YmFPdkxVWWdNSTJhbzVwdnJEK0NUdG02aXYNCmJNejhXZWFyVnpVeXc2RnlTbXR4WnZCOUdHSFRr
LytnK0FTb2dsQm9iOXlxNkhXQzMvYUJ6UTN6UmJCRQ0KQmIrRloyREo5M0VLTEh5dkVtZnRHM2Rj
bk02clR0TDR2Z21YN2xoWHFOck1MSkFoV3ZDbW1oRWNvWUV1DQpORStJak02emYwdXRMOGRvbDFm
MWd0ZFVFSkc4OWdEekxBbjZUakN6VjRYOHZYd2xBa2RST0NpM2MveGQNCjl6K216NHd6YUdKaElw
UkRvS3prWWdRWDhTczNCV3RpdnZaN2Y5ZlFCK25LWE1sdnBLL3k2VWhHb2JUdg0Kb1J1bEtvUktJ
R0daTkM5c1ErdWgvTjdrblpvRDdTMHJQT2VSZVNyZ2ZjWFByRUFjMVlsRUFmWTBSY0hwDQpGaFNn
MS9nbWVnOUcvNVR3SWJXUnFYQmhrcG5YUEs5Ky8vaDBOc0o4eVVaQUJiSHpRK1hBdThHNlFta1cN
CktLZ3JKWFd6VzF1L1BLK3hhMUJKUjJnZnVFY3BuV1ZWSlE3VDZBeEF4Ny8zR0xhOUg1WE0xWURD
OFBaVQ0Kcm5CanoyVm9wT3Z5TkZ2Qmt2TGZlMzNqRWphcCtaM3VXbmpxQk1ENXBwb2V1bXAyNjRO
eHN5bzVVV21IDQpaRCswR01WYmhUbElocU4xV29tNmJyalM3SGlYMUV4WE1OMnNkN2x3dHcvVFdV
U2JvV2pLWStnQUc4eFoNCk03c1VJSm1xcU1YOUpFTFNCdGdwbENab2swcXl0aFJzaFZ6QzdvMEhK
eTlKRVVaK1pNcUI1dHJMaEZDMw0KTFZheUU2Yi9MUDQ4cFpjYUluQWh5QzQ4SGpkT1plejFHaUxX
d1NoaTA5eTY0amRoUzlNWHZwU0JFNklDDQpNUlFqT29OaENGRFkyQlJ0Qk9rc2hldHZzQlFsekRo
SWVSMk5HWXFObzh2ekNleXJVdW9rYWg1aERWbysNCit6RnJJaWlzVE01N2prb2FLcmp6OGp4MTlN
WEUzSEkwTVFJSlJMTVJqaFdES3JlUUIxeEQ2K3h2WVR3dQ0KaXZsTUdKMDlSVGNvZkpTNjJ6TGZo
V3pCa3ltaW0yMktoM3RtYjI3cnR0aVpXdXVYQUQ0RTAxMzhHUVIyDQpBNU9DQVByR08wUUZVTGNI
Z2UzVy9xY3pJTEZRN1Jxb2did3N6cDVyeFBXZzFsZUJpYjkxWTBmL0FTc0cNClhhKzhZOVpMRi9q
MDZkcGt6dEtGaVFRR2RhZkxiejQ0dXZ6VmtRYVhwU25LWUMzZ2RKK3VLbzErRmU4Qg0KR3F4aWJq
b1F6Zm00cHR1WHk0VmlBRlp4amtYQVRrNHNJK2M5R1dHNFNpOFA2YWdkT0x0bHVmanVtdVVnDQpU
YjlVd05DUzN1d3lSOEM5T2dSclc2M1Y0VDZrNFFmaFB6VVFVMEpDYld3WVE1MldNY2JJd2d1UjFp
d2cNClBhYkxSNUJoUlBHLytwNkVyTVVLRllJM3ovelBPcGlXU3NSQmJiT2F0OXFLYVVJbG51cjAw
U2RsTTJmUA0KdmQzT1V2REZnUVMxSHhPdnIxUEhNZFkreEdqazV1N3Z5S0MzWXU4aHJBNFkvbzF3
d05XOG8vTDlQMjlwDQpUYVJPTzRsWXNnTXJUUmZVTzVJQ0JyVENZU2RPUDF3TnBIdlVXeXovdStH
QXNRb2tCejkySWxmYzZIa1UNCnpxWjZ3Y05RQTNUWDdoem10YjhUenRYc1Z4a2xCMWMzUXVDSGtl
amR0cy9BQTJnK1BNbitEOFF4RkxERQ0KYVRhZWZvbkIyZkFPRFBEZ3dLSlJaNmFZdkllRDNleE5Y
VEdKN0lWTWJEeWFOSnVLQUUwY3hZK1VpZE5QDQovNlBMZGtwcUpvWmUwODZPOWtVT1VBaXRCN1k2
T3dVR2wwNVM3cEVjL1RrNThmL0g2VGtRY1cwaEhIbTINClBrMXdnN3dYMkhCME1SMS9XbTc2Smxo
R0pGS2xNZXRnem5RMXZ3OXBQMUtTeERYQUk5OVcvcGV2dEllaA0KVGRjRnpFeWFxV0RRaXhqODc3
VUFvWU1Bd05SaGEvUzFyMjJ0Y1dzRWdHTkJCMHVEenZ4ODlHNXIvZE1tDQo4Zys4d0tZY0ZJbTl3
NVc5cFRJZ2dCcStiY3NqdUt1d1FZY3U3aTBXNWVXWTBCSTl6N0RIbWsvRURFWmUNCktrQm9DQmMw
Szk3K1kxbHEvNm92WDVrRXJSUlFEeHhtc1UwM0hIeUl3N3djME05OXJBMXJzMVp5aFZKZg0KSG5U
TWMyZDVYTnd1MjdLTjhsYTk3U2lnOGR4aW9veWpNYUJORTFiem9hUGRZa0RqN2pidDF6UHI2SHY2
DQpoMDBIakxUUklmTzd3ZEFGVGdlVXMzeEhxNU0rOWl1Qk9FQm14OTN0aVhmc3R5U0MxRXRiZnkx
RlY3UGcNCkV1alRRbThBRTRyblBXSURvM2tsRDBKbjZPUmowRHhQdHNqTW9raW9MMVE2ZDJUUTEz
b0dld2xhV0ZJeg0KZ2R0OVFPaDlZZllUYTRCQUdmdFRKOHJPSHRkaGVkYVc0Y2h5NitWU1J5MDNL
VnQrYmI4OHc3SllQNnVQDQppRkNpanFxV0lSZW9pdmVKTlM3dWd5Z001a2d1clpEeXBQeU5JVERR
Ti91cHZYdWJMRmZ2NE1vM3FlTSsNCmxPQVM4VjFlMjVnNFVSbUdLMFQwc2tVV1ZSTytCbUpGYnJy
WGJGVzRxRkIzVWk5Vkp0d0dNTGw2aEgyUw0KOGdUMGtERzdKREticVhmajY4ZWQrcUJmRTh1QkZw
MFZTOWphWUgvWVEwS2w2QkhLVXJZSGVhekNtTkJYDQo4aFRaekIxNDkySmRBRDR6cnA3ZCs5N1Jn
NWVWeUkzOSsrNmtYTHhlcVhoaVJxMDlRcXpieEZjdDN1NmUNCm15SXYva1FLTitPencrZlNyN1F4
VHRDbmc3MHY5S3JXR3gwQnhhTDZsd1JCT0Z2YUo5QmtkdFFDWm9wVQ0KNmluOVRjVjZ1UHZXV3VK
ckNiTkgyOWZTVEFjQlNpUUV3YzRjajMvRnZQNzhzQTRKL0VFVFluRDNCa1FHDQpUanhKcVhpNHFj
b2wvSC9RU0VBV2dqbTBQUU9aY3JYVk1oZFVRWGxMenJ5SVgrekFEdmZQbWs0OE52Q3kNCkk3RVZK
cHhOVmFLQ2hBaVlHT0s3a0NKbUJYQ1cxcGlrajcwSXcwbGNBRFZqYjViVlJtcXRzRGR3N2x2ZQ0K
d2dCUEx3b1AyZFZCbVQxbW14dHBmcXdFL0p0dVRTNE8wOG1BSitodlR4eEw2MGQxdnZKTzBmaUlt
cFFZDQpCUjlqRUlaU2ZFUmo2dmtIam0vY0xPQXA4V2FvOWRxTG01Y0s3UEduQWxCK3hyZHRVTmkv
ZElEdm1LeEoNCi9hcmhCcjQ5RnBHVElqcFJYL0ZJYTFUN2lvL2hjcjFhUXEveWFEU0pTVlR5aVZ2
NFRIM1RMWHlQbHowag0KOU1NYTNwM0tYWFdyVTZjZ3A2ZmVXVmtVUkpUTGV0ZlJIemNtUlE4TUUy
b29WNmlqaSt2RzZuSTRoSSsxDQoxNzdvemltajZtZzlOeEs3QmFtbjk4TWlFUUZxcHlBbDZ3dFNI
bEpicU1pY2tiQ1c5a28zZGx0VHhwZ0INCk85UEFLc1E0S242QlByRC9YN0MvRk43S2I2d0dENXhC
WU40NkJhbmRLMm16K2ZJTWZNODM1M0hITUV3bQ0KZ1dQMG5zalF6NzNwb21CNk43MUVZcWd0VzBl
ZUdKVnB6Z3dRRVJxblAzalM1WHRBT280RitLMHphdzczDQpydjliRE0wTStjMXNDQVRaVnMzK2dH
QzJpc25IZ2RzdGxZNE51TWQ1YUFFN2d4YlVITDluNStZQWN6aysNClN4NkJRSnZXRzlSbWpiU1lQ
NmpsVmV5L0ZmRUx5QlVOSWh3UDNaOFRJdHRKNWhYWVdwWVZYcCs5M1pRTQ0KbmFaWWFONHJjTGpH
L3M2RURNU3NyVFc0RXNnRmZBTTVKc2p2TlAxcTB3TlA0dHVLWW1ONFoveGErZUE2DQo3MmxLWTNF
cGhSbDlRTEZ1bXN0dWozQ3ZtaE5ZbkxoVXZwTC9jbUJYblczeG1kL3BrZHRoN2prbU1NSDANCkx3
QWpWanFzbmR4UUNiRDdWeThOVjNDSFRkdTlqRFdBS0RlV0JQcEpkeXhpNTdXWXB2WEJMeDVjcVNm
ZA0KUWUrc1BTendNZ3BTaVhucnBzaU8rbmk0dkVEVHhQbXA4TW04K3hIVzJ2aXhXV3YrcEk4cGdJ
eXM2QUdLDQpWVHJOenBjN2p3R0lWQkdhY1hHWUVpeEZKbmVFSXFzcHhXMjQ3eEM1cTNMQkpSbENQ
dUF5dGJWenZLODINClJESCtQZlUzQThHV2FEWWpUZWcvMEc5UkZETnE4VkdQdjkwL0NCRWljaFlo
K2Z3ZlJKQytEUXpnWG1XSQ0KOU5ENlM4NExqWWVwYnd5VFZwbjNmTW9Wc010L1A3bzNkZ054M3dK
bjM3QnJXL1VFWnU2NUd0bnluamYyDQpHOHdpWEUwZ3lQbkpEdjhORGF0ajhNSGR6R3ExU3N5bkJX
bGFjdmtIODE3TG9SZnoyUnZXM0NxNmwwNFQNCjY0Q25yZnVFMzROTUtNV3ZtMmlRcUdYdTFvZnlz
QTY4WEM5WkE4T2R2TFZVU1pIa0M5RDFGRGFTK3R5VA0KVFhIM2J6cFZ2aE9xamY3Q3JmSG9ic3VU
ZTJNZXNvSUZJMGl4Zk9WZlhBbEFGMHJIdStvbE9uNFprZ09TDQpIdUtjTXNDWUtqU09sWFpScUpl
TVhDc0Z1QjQzbFJVTXBUZ2t4Y1dBQy9qUlVnS0tGdVNTazYrWDZwNHINCmhIYVd6WDYzU05VMGZs
cmFLSm9hVStaT21PMFV6U0xrb05PQ1ZRai8xQk5lenl5d3VkdFRVWFptYVdOOQ0KZVg0Rzkyd24z
NGNoY01sb252cnFGR0ErcmVmTE1iQ2tMN3diUnMxRGdVV0xuU05Eclp3UU9xMGJMeGQ4DQpqTVhT
SFBXRHN0dVgvREp1bDd4UUxVakNWMlZBc3M2dFlzTEpDZFNqUEdTTDIwWnBEbFBZWUwxQnJOa0wN
CmhGR1o0YlM1U1J0ZWtrczI2Vm5ONkJmRHZmcTNKVFpGL0J0SDgvdGJYZGJ5MS9xejFZZG1KenhE
VkJRaQ0KNWtQcGh4RkNyTmltYXVva0s1SGVtaTB6RmtoTWU4YXV4VDcyN2JXRndsVXcvSXJSMGtF
a3dLQkNpZXZjDQpJWmVFaUlZeE5kTVhPOUJPRjk1OEM3THNQSDcwaWdBSlFRS1czZzhOQ3pzSkh2
MWQzaUVnUXVXYlZCekgNCld3a3lLV1hYZVlmSXJ1M3V6cnhmV2VsWFlreXh4dGxPbmdjNU1CZndk
MTl3M2k1V0NYbVY0Y1ozaWd6Ug0KUUFQYTFyOWI3ZzFycjA0WW42cmtHWlhrM2ZUQ2p0ZkoxMVc1
Vmoxc2o3ZG5wNGV6bUY2bmNNblB4a2h0DQowZHc5cit6MVdOMEdNWjFmUDhoUUtOOUFhUkdjM3d3
TksyWmU1RGdaTHl0V2VWbXd6bFNyRVZBbVd3TWYNCm9GbmxiUkljVTNZd3RjZU1IMi9pSE15dmx0
bU80TmtnbVNaSVBHTkk3K2lZbG50R3l3UXJTdyt3NU1yVw0KZ21INUdiTXY3UnZocmQ4cGdGOS93
ZUhITG51N204eXFIZzBCL1gzREpZdDhYVWdPZWhSVW8xSGZibmxtDQpiYmRla2NCeE0yMTJVYmRl
cFp1MG1jcUNCOXdYVjlicXhIM0FxbitQTXVHZnRhM2k3QUF5M1huWlc1SXgNCnFMS3BsOEpaSVRU
a0t6MlJvck9RU0Era3ZzMzJrbG5WNDVsazM3TExyaCtXWEdzY2F0YkVJdmt0cGZQSw0KQ2xSaUwr
ODQ2dkpCR1ZOUmo5c21vUVFra2Zva1IxMTl1aFBoNHpCV0tUKzhyekYvS0V6ZkRIKzhEWURQDQpB
eDRtOU40OW50Q285RlZxRWRKSUFEUlhnK0o3akVaVVY3eEI1UVRzTW1pVVlyc2tGNkR1OTFQK3lI
MWwNCmZCbHBMai9pYUdnd3RJbE54SGlyRlhsYUxRTmR4L2NzM2N5ZlQ5QWNuYUI5MHJSSkNXTWIx
dkZPTUNBVg0KaWMxMEI2OFhkbytyVlgyeVJDYjdnN2Erc0tmYjBjclNuT0oxc2owNTBweTRGbW11
S2lIQ3BVWnlCOW13DQpWWEJOMnVTdEFiV2JnT3hnYWVsbm4vN3RxbDU4Uk9jWTMwOHZlL0ZmZHFM
RUlFd0V1c1JNdzQvSmV6cm8NCnhsbFZ1cnp6YjZJb25Fc0ZLUmY1RmRmRDdySmI2aUVHQzlkUTNo
TVRLaE1DQytIVlBpOHZIVkFpTU4rNg0KUGlxdmVmNkVmYmszbkZkcGtLSXpkWTFKcW9TNElhd0Rl
cWJpSDJWYnhEODhyTXpSZ1Mwa0EyeDh6R3pXDQpkOTE4a1VNUGQ1T1pPMlA4WDl4YUdQTTBnOWtD
R2V4MTJTK3NnTGpOOFdDSnhMdlFuSlpEU0s2Tnlud3gNCk00V25RMlRGRmRPZHV4OHJnRE1JTmlw
T2Z6dWV0OC81cmZHdVEwUlZDQit0Z3dnT2NORFQ1WXdMVDI3Rw0KU1pES09LWUFHY3dUWHlGMjBN
bUxZaDFFMG9DRXl3dnZTdStoOEVJb2dPcDQ3c3N5YnZUR0U5aGdRbkNUDQpPZC9CMWhvT01XaDJ1
ZXovdDBpRU5IV1AveU9ReDRrL0lJalZ2U2dHVnVjQlVXeXhYSThRLzZORGI2R1oNCjNaMEsyNmZT
bk1HMkE4clVBTFY4VlQ4c0taV012bHNpUVhxd0Y5UXdESUlicFkyOGRYYUd6NnFxaWczSQ0KZExs
aEppaklaVmtUTmM5cjJrTksyNkQ2bWU5K01nR3Z1cm0xY1NvbXZpYUJRR04xWjllY3VWdTlGSVc2
DQpsR2tiam9GUURkYmd1cVpUSGtiUkF3ZzRnM2pQdFlWZGNGamkzRWdNNldzOG1jVTV1cHNiNmVW
ZkdMbHYNCnBMQ3dJVWJJYmxCV3pFQ1VhV25DNTR6WU0xbVZJMGE4dDRaYm4zT0kzZGdsS3h5cEtJ
blhqdjMwa2tVcg0Ka1JNTi9KT1gwamYxdXRjQjZYU2dmN0hwMm5EWFVOZkF4a0xFUlBZMHhQMEQ4
aXlLM3BPbjQxZW9CMTd1DQpORWx6R25rZ2t5MDBLVTRGRjhqN04vaTlYT1J1QklVNGVPTFRzRm1I
WDZxS1pSODlNY3BVclVKZ2dRaFMNClZSbU5qeDVjQ3hwWHFLYkdDSWdFL1puVERFb3dpZTRMYkJs
a1FYYVRWYWdDOTlITGNRRWxkb1NyLzQrUA0KZjNmRTlxUHRibGNTZHhKUU94NUc4T3Q4eHNXeWhK
Z3JQMldrT0Y1UFVPUTFGTUdkQmZIRVluL1M2VUVZDQpReXkzNEQ3ZXdMMlMxU0IzZFAzVWRWdWVs
T0tmMmVnU3VXK1Zzek1XQkNCUFRYV1lLaXRrSnZTdlBWbU8NCm9XUTlMSXR3T0t4WHlSaEo5c1RB
M1pYbjFLQ05ZUEVXUUZ6MG9zZkR1bWRWdWVjVGRzYUhKWGszcHVjZQ0KV1NQOHBsS1VrUndXMUhR
ampsWFdjaU15dVpYUSsvMEVGRlllaXlEeG52VzVMQkFuWUhpSFhNYUN3UHVKDQp6dVpvVjVFZkhO
YkhrazZKRkt4YzRPZmNPUmtYS0NRNGNLWUVKSGFVbWJwZUxsQ1lmV0NZbVR6clk4b24NCmtSaGxt
RU10R3QyR0NIMjA5K0Zqdjd2Z3RuKyt3SHc3alBRYTFmNGFzdWV4OFNhVytmRll0QzZIL1NJdg0K
U0hmejFrTGwvcktGbDlKOFBDNjUwdlpSd0FUZkdaby8rT05zelZSUjR3bHJwbTJGZnliZWFXMDRm
Qm40DQpPSmN0aHlNNms1eXhVRTFPVlZDN3MwVXluUkhSbHdJVGZqdytpOEVqT3o1WUIwTXllY2FB
RThpUWtmU3ENClk4VElGRit1b1FocGFramV3K3V6MkZJaGtxTGRtODg0VUF4MXUwc3Z2bFR2Q2d1
YjJPOWl2djhBV1FIVA0KZnBaQy80MUtBMHJHZVQ1Y0tlS29XTkJjQW9tQ2kzWm1Yd0FxYm9vd3Jx
ZkZDZVZ6endvdmsyUmlyUE5ODQpQUXBjZERrYjJZcmh3NkMzaklBNTNIUE1MSkNnOWh1anI2WFpm
cGs3bVd4U1ZDK3JwQ0M2UUhPOURDMEMNClE4ZytyQTdjQUduVlRFdjQ3M2dmMDBPL2YyeUdmQ0dj
R0pwNHhlMWdHYTVxMEZydGpleUx1OU9ScmVGbQ0KRkNUbHl3dWhERG9Lb1NXaGErdHptempPZUZl
VllXRldjdjRTbVEydXFXQ0JrMHlmZytiZHcvQllqUVpIDQpJdk53VHdyRGRYazlIR3NNaTZnOFU4
V3Y3STZKeVhuRzFaQ0xLSCt0Vzh0SWpSYldRdjF3M3dENXdwVC8NCjhsQ2JYRkYrdkdGbTN5amFG
MFBsYXdYZUFIZXhyd0ZJdUpySEZYNzk3VFN2Z085RVg0NWJOT3NVdThTRQ0KT3RsYTg3NFpsOEhQ
OWJsNXUrYkpuQ09obHRpQk9RU1ZveU42OEsvYVRCTUpXZFBqU3BBQmZjbzhUbDY2DQplMTNjRlRi
OEpSODFZamhpRGkwM29GMlZua1RlOXB6RGhZL1ZiKzdyMXkxVTZ5YVJSNTlXdzlzMWVYRTYNClFx
M0hPYzFDVzJYZEtoNmRuR3YvYkk0b21KZ0dNSlByNktpU3kyb3FFZURFYUJhMTY1RDZwWVg2elUr
YQ0KN0RFZUljNGZWNm13UDI2R2ljWUN2Tnk3Q3FoTHE4SUlXeEVpNWJOcWJJcUluZTRDTlp4alQw
REFSZFFVDQpTcW0xYWRDc2taM2QraFc5NkZjOXViaFdoM1ZnbVpxQVR6Qjc2cll5SlRZYWpodkk3
OWNiOVE2R0FEZ1ANCnRWR3JoSW5Vb2VSVjNNUDdObFRjOFQrVG5pVERXTUFDZG9SZXBIem5OeEpy
TC9XSC8rQ2dROC9QUVRKOA0KN1h2bHhFaWJnTzlxQitxY3plK2JnN09xd08wclV3dTA0L1gvdlMv
NXpSdllRUitzVVZ0WVVLWGVwZUU5DQoyNC9IZjVHdmU5NUNZN1R1V01KSXdKWDhRT1YwWlB3SnZj
RUlQbTRsY2RFeWtjZWVkZ1FWQlBRc1QvLzcNCjNUMjJPRlRreXFIdzcxa21qMzNsTkZiTWE0NHZy
dXdRZkkxTDNDZk0reWdmVVBzc0RudlNjSktzYk5zYw0KbzNKNzVIOHI3NEVwejBZeGo3cnhVenhu
dTh5UUNaSEY5YzFuYStjODR0M2t2WkpWcHI5MlhLYm9LUHgvDQpHYVRBVTZpZ204UDhSWk5aMlh0
azRtRTNlYVFmbXRTWmhxUFNrQjVzUE5qWjJSYnFCd2Q0RUljY042S3cNCmQxRjdsdE1FNVROWk1q
VjhUWDBKSVNmb3hFMTNQWGtzUmpsb0RlOGtZUmROalRYem9uWnAyTnBUTmlEbw0KR1lyd0tyeFgw
VjBPRmpSRUxOV0g0bHkzd252RUZScndYNkszWE5ablF5YTlRNlY1ak96bVkrNjBCL1pXDQp0Zldi
U2F5TWZVM093YnVvdlYzOUdjK3VsWjlpU0lFejI0d29GZnVLTnorL0VPWnM2d3Z1VmFOTXYreGgN
CnhaeDRJWUI2a2ZnZ1pHSHVqcVZWd1FpOUVlWlZtbVpwQnIxb2JQZ2xueWN0L0FSYlRFenh0WEN2
Z1N5ag0KTDBia3JHRTE4bWpRdVRLcFJOMnlKOFdzYVJLZ2ZoelpPS3pndDJCSU1zSzNvUCtQTk40
N0ltVHp3Z0RJDQpnek5HZCtiTVEvbTNFa0NVTnRQZFh4b1dOdU9jSmtWa0QzYkNUNWJiZnFNbmRW
TTE4d3UybW1aYVo1WUsNCkU2M3RoZ0dpK2RyM1hMNkM1NURMSmszMEhFdmZ5TGpweXp0eFBWMXlI
QkVZZWpDRFpxWnNTWHF4TDJIKw0KazhTSGFjcDNQR0RJdy9DRVd3bGM0TklkVVNDTElZZHJOeGVx
dVFHcGptODhGd1RlVXdSSzRoNCtPcmx4DQo0RnF5ZW55cks3eHEwT1NvdlpqYzlDRXlXTTR0M01K
ME1aWDV1c284cjdpMmFmS1hldkhMVE5WNFEyQ1UNCnZTY1pWdUtDTlVpR0MzdWNDNHBsdWJEODN5
M2MrWlVJRlBka3FOd2Vyb0lMOGRrUFZrcnRzTStGdmlCeA0KL0FWVjJVaVk0MXRYSlpXcUhBdncy
dTlHVWhraVYzVzRSL2dMZmpXbkVZRmt2WlEzT0liZXpnckFGYjAzDQowb1BYWTFwOGw1QzByOHls
RS9lekRuYWN6NEM5VENWc2ZzdGpQMFUvK2cxblNiNXI5ZTUvSjNCMHVKSWYNCmFTSEZucUpzVnZy
VWpGT2xTakRpRGpFZmsvdVFxVjlmSFFQMnk3NUpaWnZIODVxaXlhUU5ST0N3M0QreQ0KeU1kbHNF
SU1YMzI1VGN2VytNTGt5ZnJVMlg2SlpsNXE2dXFZL2dXSVZ5T2hrSmtpQWdGNytJN3Myb1hlDQpn
aDdQVnZkZWpDd2VJa0cxZlJnb285d3Mwako0UE00MGhoVUhpSW90UGRTM3pBejZ4Mk4vQkFuRmVY
NDUNClpNVG5raTNxbnkvYWxTcVhZcTZYbGJqdDdqNXRBM0s4Z1BUUXRZUlFCVVd2MzFybEt6SzVT
SnhZWGx1Nw0KT3RvM05Ja1hGYVZLeW5tNkpPNHByQ3lvNHU2N1JNdTI1R0hDM2djSEMzd3k0aEhw
cUVheHJ1L1p0MGh0DQpqLzdtSTBucWowdnkzZWZzSmV2ejFCYXdYeTlSdG5VckxzRWhzMnBHeXA1
NVpmOExEMnlBQlViajNwUWoNCnJMc3RQMXpENVBWdHFHdnd0UmFwYWwyOEEwUmxJRDFxc3M5RndI
WkxDYjAxZ2tPWWw5Y1FJZS9CcVV4Yg0KWldIUHZqN2FRY0xvalVqay9mZlUwMlFEQzFvRCtGSkZl
a3M1a0YrKzVjQllBSUVwTExVdzVRUEVMekQrDQpTKzluMjMwY0Y1SVhMQzQyeE1HbElHNFpjMlNy
QWpXcVVvY3BrcFB2anlaN1JoUW1MZW41OEdlNjdETjQNCnVnS2YwVUF2TVhWWWM1Q3Z1RnU5OHk2
NlRMMXA3ajhyUFZDWkRTbnBJWk9GZzNCRnFTbk1Da3pzNVV6dg0KbGlNU1ZVeVNmend0ajZ2Rnlw
bDZnQmQxUmk2Z2ViK0YyZ1RaU3RYd1JsL0VvYW45ckRhUWZiMGExZUwzDQpubFVqMGJ2czdOUTFG
NGM0Yk5ZQlhhVmZJdUlhQzRCdlRZZmJGMGR4UFNObFlwL2U0VlZrRjRNMHYzUDQNCkhvc091MFh3
Q2RYRG1HZHFWT054MHR5cXJzREIyYVpwWlpoaFdtb2JvL3hEYzh5SHZhdjMzMFhUaUpqaA0KUHVq
Y2JWRTFUWU11MFNyMmwwTmtUK1hZZVZpZktsNUFsZ2ZPTkFXK0NUa1kwbE1wY3g2bmFxV3E1Q3lp
DQoyZTVJZ08xV291a1hTcG5rcmNhb2JweDBIZHo0UkVROE0yQ0JxdnExb09FbU0vZ0h2TFNkTFdy
THpGV1kNCkJEZzh0SzhpSzRtNDJDZ05HbXI4NGdOK3BDcVBaZk0vQ1RoUS9ia1pBeURNU1VGM0Rp
Z0pydUlSRklERw0KZUhCbjRjN0ZQK05sUkVQaWJXcC84U0VWOTBHYS9mWnRVbTdETE9zeFE4dzZP
RWE5NjNMZEM5MUcvTUIwDQpXY3NZRzdhdVVzZGN2R2xGSm9sM3lJUkhDQUh5UWg4alM3ZnQzQkgr
Um8veEtpR1VxVzgwWDVOU0NUOW4NCi9oNXZScmpDaXgwdnJQRXRoSUtYMmFWYVA0S1ZCZVdVa1Ru
Ym9uRW0za3RmQ1d5Y2E1UXFRMlZpcE5iMg0Kc2c0cmhFdVJsV1lNSHdkN0RrQXN0OS9pdjV6N0h4
ZHBXRXBEczIwRm5UNzlHUVNDVWdYRFYzN3JvUEJDDQpYQk84UnBEbWIyUktNT1k2ZEpXd1g0UXc5
V1R3MXY4My8yTmI2VjNyTmJMejlIbWhrbGV4WUdNVUNjNlANCnFJdGJyOEt4akptVE5OVGgrR09C
VmRRdXJIYU9pbHo4aDlxQ2lXVXlLbm4zOFZYKzdkUjcrTUl4Z2V6Uw0KZnpvejYzdFFGZ0JTc2pW
blkvRWxFUUZRLytSbXVMdm9nV21aejBFdllSMWhudG1FV1VLQTZ3OXEwcjltDQpQT0hQRkkvYlo4
ZllkdTZvQmlEZHYvL0pmdG1UTWRpVG16aTFzTDNCNHYyV3FoQVZLY1lUaldUSVJiSTYNCmxKMERN
SDVBSk1Qa3B6L0FuZ0tnWXhaTjgyS1lOSGludmpOWWxBam5nQzJlMWxPeE92YWJJRG9VNzFaMw0K
RkxyK042eXZ2cUhQT3N0cmZid1J5RWd1NmszYzRFRTNRNHRLL0JNdFN2RTBFcHI2Qy93U244ZzlV
dkNmDQpvSkN1V29IVE1LQzJaa1BGc3J2eHF6Wk5saWxtN3V3elJrNkhqMEY3YUJSNXBHYnNUY2o1
OCs1WGxCVjINCmJpMElmcng3ZWpmTnJxeXFXSm02U1pub1lnM2craTM1SE9MRk1jTkZ4MklGNDZN
dGFoS1dreWFaN0I2ZA0KVnVwS3dCN0RkS2ZaR280UThwcXJwVGVtVHV5WE92UEJ4ZVUxWUFXVjlO
Slpmem4yaHl5S09UMEg2cVdhDQpPRUZncmxaSVJ0eCtraFEvV09QKzZTamZCNWFySlNhMDhicDF6
b0RZN2t3RThhUGE1M1Z3QTRFclNFcnYNCjYyQ3IvQWJ5OEI3RjV6OTZ2OHJYdWpHcC9TWk9SekI2
Yi8ycVRNcmZxWk9XaHh6YTcvZVFwQ3JqMUlmeQ0KZ08xb1V5aU9ETThBQ1RFY0dXcC93YXh4SVR0
eTRqWTg5SDMvSzFLdXNweldwZUtOMzdKcDEvT2NDTXBEDQoyVDhkUmlmb1pJMXZRbUdncUk1L2kx
M3k1WlVKR0x6aDRIcUo0YUlqeWs2NHRqNGFZbks1WGZpMm9zWFgNCjJ6MFdveEtqTHNuWmZySmFU
Z3BsdUtncHhkUFZxL0F6MVVoeXlURDRzbmZhMk42Z1NsMk9XVFhXR21SQg0KQ29sZzRzbk5LTTl4
OVR2SlVCVDUyNDFMWUFyS0RIbUgycFI0WDhONEkyQzZjOUxwU2dWRFRYdHZVN1ZFDQpGWURldSsz
WlJwbWEwVWFTeVZISWtTVFFYZkpjY1RacG1IME1yeXVzb3FuTVo4MG9XNk5GUi9jdWFUTisNCkFL
M250QkVuNGZoNElEWVJhRVFVQ29hUVVOSnY0MStyMlJSa0lTTnR1NW8ramNhTXpmelYzNGVQWUFE
bw0KNkVGVDR2cEJXWDVUbGVENUlTcURqd2lkTWppM3hPcHRJWXhKRzhQN0VQbHdlSXYwYWNVS3Fv
akJ0a1IvDQpNMmtGN3lScGdlbE1JLzJUbXZjaFFmbitSNzVPVmwxVUhIU0ZUTHp2b0tMaGZhNmkr
cjRlWmdCa1djck0NCkdlZHozbWQyOHQ5Tk4vRWpubERpNnlhTThEQU8vOTVWVlVDNVl4S0daT3ZG
N2lJSjdKUFhINVBhY0VsYQ0KNys4VVJhNG5QWXdBbEZSWHZyL1NvUTNFdkdCTmhZU0Yrd01vcjJj
L2tTajZNcGNremVLWGVGeGwxQkFHDQpicjkxZThJOXBTcW5MOEQwc3I5cG5YUHlnVk9oS3BBcGRK
a3lETXU0RHNnRXVTZ1JGeE1na0tHSWF5cmgNCkFpWkF6OEJlZjFKMXVQOThJTGVZdGdoV01KSnJT
TkxiczJQZ04wbDFyZlp2dmVFMytsM2hZS0ZCZkkvSQ0KQkR3WFJZNThNbWptSE1nTXJ6VkJIcGti
VlVQZUEzS2pSUmc5bm1sZHJSTVZHVkRGOG1JaVpkY3A0VjlJDQo2aHNPYlFzWjRETUVraXdPY0Vm
dklvNURaVGtNbHZLbEMvZUtjbWhHb0RzUE1kVTJoSjFRbWJ2QWZRck0NCmdBN1RKbU5jT3RWVEtY
Wkg2bWNmVExiZ0FZL3lHNk5abm10VHNCallkSDdyT2FNVVozWGU1MG9JSmtRbw0KdGhtV3A4MEU3
YVN5VUtXRktVcThrN29wT29BaWRvMzN6Smh3djNzamMyYkVhdW90WTdKQnVJS0NBOExsDQo0S09q
WlY5QjYzaUtxUWg4bFNyOEw0OTcyUHFIMm0wQ1RWbHd4VHpFZTZwZHpUdkRSNWZVM0RpUDE5RVQN
CloxMDYwZGhJdDNYTGxLdklrMElOOERONkpVYUN4WlBrR0NLTHlSZlJNWHZJUlNYeCt5S3k1bkZ1
TG53bQ0KQjkyeVlDSnpyeXBXaG1teU5vMVdUU2cxU1NOREtXbW1hRG1renBYVjFId2xOVnYrdlJl
bm15MWNlUE1SDQo4eVhzOE5PcUtiSmRrSGFUWUlra0V0Z3NiZElpS0ZnT3VqaFF2RzZSWnNvSzYz
Q1JzeTZJaElTSXVNWFQNCnpTcUNqZ3NKR3BYbXNBeE1oVnlLd3hxa0xLNUhjYTE4dUhQVGVmVzh1
cGlVY2hKTFd3cTBaMW1OSkQxUQ0KYU5UdjhQREttckZFTTZ5TFFYV3ZyK1JuemtuZ1hRdTlGazU3
YVgwNVliaGszU2ZhdlpxMEFUcGc5YS9ODQpBUURjNGFNSjVJM2hLa3dwcE4xa0Z2MUE0d1IrRnFp
NWtzSjZuazMxNGE5cSs1OUtVNTFPM28zVHhVRTgNCk9NQm1ka2lKMFRVc3JXMW43NHlreU5ETmVY
TjZVeTltVS8zcFdaZkF2eVFxQm5QbjZqN21mUURnNkNTNw0KU2EzaUdtNVJMWncxNHVCRWkvVnZp
dkhEZ3Q3N2pNemFBSUduNnVLTTVuNGxJZEZmNER0QVZCRXhqd1BqDQpjb3VYbGxId1R3T1FHYmdS
QWNHYWU4T29oeGF4SGV5Q0xhSFhYRXlVbElzNTVwb003ZUkzWk14SlVxWnkNCjNIYmVaNzZRQ0Z6
YjV0MGZOZEN5bVNCK0hGbUJtK1RsT2Y3OUQ3WTJ4cmxHbW16aDNJVldIb1BiOS8yWg0KbFZZSjVi
Q1I3SG5qaHNUUGx3c0VjY1RTL3NOMzdDUVp1RUViMnF0T0JjWnRwWVI3YW5XRklwRWVFeXpFDQpX
YUU3b0dROTcxNWRaTWt6ZnRoQUdtUmJBWDNxcTNFNk94VDRzOWlMOTVtMTk0WnhoTlJKZktnUzd1
ZFkNCksvWmZwUC9hdjVTb21OQ2NlQ1RqdjZ2KzlYRWkzSjdTUnltaTJEOUFhbUEvTmpxNEMwT0Np
OXpQZ0NSMw0KQXBpbXJiWEdLTjZLWWVqN3ZaMnduNmI2UHI3dkF1SEEwK1drbS84T0FDRFc5NFI5
L2FuOEpYT3czT285DQpKSUZzSGo3VFJpVXZsSndHYWIrMGxCMFU5R3ZiWVI5R296bHdhS20yeHB5
TnpFN2ZCMkV2TUUzSU14RGsNCkpJL2w3SHFVQldMQUFUMlUxVFFiVkV5TmRrckpsenVVNEpMcmg0
UU9FekxoM1psMUd5ZW1UMDJpK1NUNQ0KYUVZWnV4L2d5di91V3o2MU9LTzlNNzBIM0cyWEZPaGxl
YW1aRk4rcHhDTHp0cmxwUlk4MGoxRnRzOVUzDQo5SFl6MXZGUnlBOE5xZmQvRXBTZDhxTFNFbVNk
STNDTnRUZGtneHBWblY1YkxEUTcvbGdVR0lVNkFYWjYNCmRLRlRwNGRBaXhxZ0hXU2R2U2NrTkJ0
RXBHNC9Ddit3ZnljUFVtNDladW9jVjMzc0ZuNHMrYzFOTW1BSA0KQVlHWTlCSDZNV1U0bFNwMVJh
QkIvTGlZMDJyLzZzQVdUOWJXQVl3cWliZDVmZ0Q2ZnJQR0JReTBlM3hJDQpaTjJMMkdPUWxsdnNR
NHdMM2I3VjlhL0tTMDIvZFo1OU9RNjlxZVc0UWlDYjdUcWtqazBwbjhuaTVYNmUNCkFsem1Ea0NS
MlNrSDJxMnhUbUFjVVhPODI0ZG1GMnluTGZzT1BaSWxEdEMrSDNiMVdDbmF1TEpXM2pkaA0KVEJD
dHNYNXpDYy9SKzcrN3lvdW1JSlFjazlvN0JyL0JqN1hwOE9ESDF0RFVkSW0wb3ZIRThjbXRvbk1i
DQo3OGZBaHJxM0grY1NsUFlxSFFPTTVyL1ZLb3NjM0cvWVY2MDJ6cDY2d2Y4Yk5UYzFGVmF5TGZR
K0xHanYNCmp4TmtSY0FpOFBwOHBBWm1zcFlWMzBWdTV1d1Y3TmFyZVUxRGl1bytDNjVPT1NkWGZF
bTExYTRUQTFDUA0KcVQ4NVloTHJHUm1XdGJ1NkJ1ZlpkQ2lkdmFEbThEQm1JQ2NoTWNvUEZpSWU1
ZlpPd2pPWnk2dzZ0TllCDQpjNTBKYy9HZGNLUTFaWjZTakVEZm9sM085V0NxTFR5TWZtWW5VckJ4
bjZvSERHc0tFUjVYNFZNeGZLTjkNCkJENkIvSG44eVkyN1gzTFFrbVE0VnNlVHgvdVV0T0Y5SUVt
NzBWMEZFOVNOZmozTjJ0NFFUY0VzcmdrcA0KK3BGZkVTMytUc28xVDRNK0pBTzZ1L2dmNXRqMDF3
a1BWM2RqUHB2YVpsWUVnOG9OaG4xdjFrSVYvNmZBDQpDL0tHTmR4SzhPd1M2YnNHbVJneG9VeGhn
QnF6cmE1eFZkazd0Z3pCeXc2djNXRFoxVDg2N1dXeUdmclQNCk1hY0RST2xZR1JlcHdlWFE0M3Jv
OXVJZDA3K25ZWXVzSGx1alFJZ0FPL2FWSzdIMmVTS1ZpZDl4dkVCag0KM2VHYVlJUE5KR1VCRXQw
bDZRZUZuVVBZbkw3RTlZbldwUXRvUkhBa3MvaW1DSjFZVVZzZm5xd1IzZEh2DQptQTF2MVlZR29K
bG5VMVVZKzZzMHE1N3NQeXRYa1ZENGE3SThxNnpUVXMyOUwzV0VVeUYxcWJYQ0Exd1ANCm95ZGEy
Wk5idFdrWWRQd0NGY1hmQkVOTGJJdTN0L1ByUGZ4TUpOUVdIOVZjSEdhTkdDVnRWNng3S0IyZw0K
eVJTUkEycEV2ajNIdUlPVGZBTmgvcTFTS0FBcytTQmtiYUFvaUNodEIyK2Q3c0Jpc1h2MHNpOGVp
WGZLDQoyVkxiSWNob0FvUndXUC9kNHQzcU1kY2E0TnpzeG5iMm56VHBDQW11UVlScEZobzgwWkVn
UGhHR09RblYNCk8yU1p6bnc3ZXJzRmROVXpobHpXSm5rcEtkaVJNVVZRalhMNnhIN3l2TCtPR09z
S2pLQXIxK2kvdnI3Kw0KU00xOW1iTTc1SllOdHhYZVVqaGl0bFZBNHB0UW1CVG5pdFBDU1A0RmVh
SmoxVDY1OHIvNEhDMlJmc2EwDQp3WjdJTVlEYXZrRzVEL1RMNjFSelZMVVFLaWlycnVia24xUThH
Znd4cjJmUE1PbnV1cm0ySkZwaDQ4Q3QNCm1iUVltTDFQSGw5OXNqekNyZk5uOHZwWlVReVViakMz
SGwrYXgxQkV4QVJhb3pvNGd0M3JqZTkzYlFYRw0KTE55TmR1NlhhdDBNVU1aVXo0S3MrQmRIYUVq
RDhXcldoVU50MWk1Nkp5WTREbDV0S2hQSUtOWUEzV0VHDQp0aFdGQ2hsRnhvRzNRbk95amNLWkZ1
dDBvNWdjbU1qckppUmlLTHltcXQwbjV4SVc5TU82d2hqNzNvVjMNClFhdHhJU0pXQWZHL2VwWnZt
a0NtSE5TWFpGaFdZaFl0N1RyZWpFakVDY2k3RmlXVUV2c2JzZ2wzSmxKNg0KRkpPZEpqK21qcjRO
dVVhZUxQa3F2bXRidVFKQmRqemNzRUY5d1h1b0tKYmhnQUpGUVRWaVBENlJuZGlnDQovVDMyWnh4
L0dibVcrRS92cWpSTXpUeXlrV0NoYzZReGY3Y3lrZjY2ek5hbUZmUmI4ckptS0ZsV1BzbmMNClJa
a3dIUkRGVlJlOHBjWTM1WGw3L3gzbWVrYmZWRER3dGhsWU5XcUlTVTF6bUlGMUhYeFJQRzlqY05a
RA0KUnZmcGFjZ3drZVJMVE5JblgvS3RoWVArOXAxWWdXRDhhemNUYlFrSW1PeWlzb2tjb3hHYzJp
S1F3Vi9BDQpKN3lncm1oRFpzM2MwZTVFTXFLUVNkNkcvMFo1V3dmNDdaVDhrWEQzV3k4L09QanJU
VUVuaWpyZ3pCOTUNCjltc0ZNWVVyRy9XSEdKZVBneVlTYkpVY0JhUGlmSytsQ2lnQmhrYUlESStI
S0g4UE9XWXZ4OW9FTXNvMw0KZnppQndzQzdiZjhzU1JBNWV4Umxvb2xZWC9mSjRhKzE2aXI3bVVI
bFdoZG1mZ2FnejRSU2h3MEZENWxYDQplalZsajFEc0ZybEtabnNaZE9Ecy8zV01pb3pWR052Sm4v
UGdZamFZR3hubEwyTjBtOGdrVWxNK2EzS1oNCnpVeUNoL3A0clpnbjhWQnVXMEV0cFA0L1l5dXA3
K3hRMFo1K1BxVkV5NVl2Y09hSGhUN2NjWlppcGpoVg0KYlRQckx4RkpFeTI3ZmhPL2pWNWV2Ny9n
WTgzQTluRGlranByaXdiMTFneU5uVVJEekFUSE8wN3E0Q0wvDQp0LzdLSUlXZWwrYVYxMWxzYXJT
ckZ2VWY5cnBobzQzTWF5WFRwclkzU3FDcEpnRTNadXdZK0dTZjBHUlkNCjM2QTJ4ckVxMTlrTUcy
VEVFQ3o5ZzZsQThxZXVQdzdXZnlCcC9OblpleTcxUU9BQkt6T1F2WjIzVFY5dA0KRDVHMGlXVms4
ODJaOUovMDh3Ym4veDlIK0w4b2JzYVhaaFp4UjgzeVJSdmR0WlkrRUw4SnZDeWpMRWo5DQpBcm5I
bkJpcUgzZGNzL09GTHZPcWJ3Z1U3cHRybGNFNFNkT09LYXp1c2pyWnVzZGFZMjZaeEFBakNQbUQN
CmFSdXVleEM1Q21qakxwSmdTNFUrMUo1TVNndzNTVjR4SEhuWXF0bnErWUlKTzE4NUUrb2VXcytj
c1VCZw0KR1o0MWRaTWQ4MFhERWFCcFJjOXJtbHBhdndIM01zazdWNUZaQTFCWjVUNTc3TFM0L2ti
czRJSTYzMjhrDQpNVFpNRngwZTJEeTRwak5ucnZDY1loc25USUh3QUxEVUZ1Z3FacEo2MjU0bzB6
R1lhc0Z0TFNhcW4zTm8NClVhM09jMGdXTVJDTDBDa2ZLT2Fnc28rTG9Wa25wNk51OG54Sk5PVWVw
dEY2SzhFdTcxbTUyOFYzZXllLw0KK0ZEUjNWcUkydk1pRUpUTk9UbVBka3FTUEJMVi9SM3BmZUht
VUtTdEhTc1NKeXNla3J3a0kyZjNHZE5uDQpZdDRYMG84ZThrQ3FEa2FTMUZHaGpJbHVWODFyemhh
VW82MjgwUnpYRlJvOXMyZ1V3K2lLNncyYmdQZHANClYxTUx2UCtjdk1CQXlpYncvREV0MVBkU3gx
cnJyd3NOTWVacUtRaE5ocUFReGgybTZuK2lVOEx2U1E4MQ0KNlNGWGhJMkp3TXVtZFIxUk9lSE1s
dEVubzg1V3VQZExESlRZNk1XRXlXMDVtMUY3RzhJWXdHbjlkdldoDQo5cklqMXc1MHYyWVRiejR3
WFZQZTUzWG9WNXdaTDcvS3UreDZML0M5NHoyTVJXRElHdUhJU3JYanhuVG0NCnQxTGZZR1htOHIx
a3JHT0dBUEd0UDk5cFduOFY0dkZCZGFaYlphYjEvQi9yQ285Y0x0czdnREt1MmRKQw0KcC8zOGZj
bDVyQnVPakJjTytxKzFiaG53NDc3bm1NU0Fzci9Yd1E3STBqK3cvY3NQL3N4ckhUZGNxN0pUDQpV
RkhzbUdKazNCeXNXREN4Zks2WjN2Nnh0ZUZyTjUxK0xtMHNDdG9iL1RIS2k0b2FoUlJvSnE2VWdF
OW8NCmoxcENqK0phT0ZqOHEvMnhLZWVjOUFjTmhyR3p4OHYvT2ZuaXpyN01wTEFqNUV5UGRCQzRU
VSt6VG5ncg0KdzhWYXlTbmxlWHIraWNLUlF2VU1PRlE0Z0pzd1Y3MlpPZmlKU3BhVlBkUCtXM0Vl
cW5MM2F5a01aTm5mDQpDQjRMK3I0Z3AxSEJ6MmtmWHpyZXZrZGJtSWdQRnhwS3EwZFZMOUFTaGla
OGZkUThwRjl4ZUgwZ051S3ENCnV3NkJBNTFmWmFTejk5MCtWNG5FVFdpTmVaL0VUbHVCQngvSTZM
R0czZDgwdXF6L3JiQ290ditpNGRjNQ0KdTIzUUtQb0hOYTVkamZ2cVJtYjFoTVRTYUdXRHQ2TVpB
NkQ5N3ZnTDJ3ZTVEMkM4TnlqanRoek11S0ZkDQphbFZnVU84WUdvRFM4UlRvRnNuTFcvSlJYNzhM
eHRlM3diMmZRT1RBaENVTE1QTG56YkJDa2kwR1hUYTgNCmdSbWxiVlNVL0ZSSU5Zbjg3Ri9XWEhW
aG50YUU0VGM0cjJqWlBkM2EzY1hRT0NVL1liYTNnVUcvSVNTaA0KeXRMbDdyWWRWVXI5RWlMVDdX
QVpjWG5JS1kvbGhGeDBLWHBUWHp6K0lKZWdDSW51WkVMTERmYktBb295DQpUamc1NkptUWtEUHk1
VCtZcVFONExGY1gvSkovVS9pb2l1STZ4Mmw0bGRTZHg5OXJhaXZzaVIvTGg1aWoNCjNaSVhxUHlU
S2M2SkI5OVZweERxYjJMT2hWZG9JY0FOaFFuS2RkZ0VZYm9CYkRNUU4zRG0rU1B6ZTV1Zw0KU1JP
WWJaN3phQ3ZIZlJ2MVZzT3RvWVM5Rzh2amZ6b0x6TVdiS1ljZTJzUHBYNHYwTldrZmh4Mmc3RStF
DQpzdUpOTkVxRXBSUGFpd1VROG16Y25vK1A1TnhlWTdPKzZlQkF3dHVIR2RGOUFmNkhJUXArWmRt
SVRKMDkNCnNGSE9lTmVTaEZGZGxtRTRXaEpOTVFCYkZyUlp5SkEvYVM4RXN1U1NJcHUwbU1QVHN3
N1g4YkVtYUxGZw0KZmZORjhpZlNiZHdPWEFNQitrc3hnZlVzYklMa0J6Q3kzTVRBMmZDUGJzd2c5
bzhOYUtvRVFJTHZCWXZLDQpuM09CdzMzUHhqRGdDUWI4MkNYaDBwRUswVzNUSVRPZVN5VElURmky
dWxObjhPY2R4L2ZjWmZ0b0JuK2QNCnJENEkxYW5BNzJXdmFWeDZNanFEV0c5ekZqSDJZbEpCanZJ
cVpyRk1uKzZaNC90c1JFVXdDQkFkdUk3ag0KNU91S2QxalBhWXNQSUx0ZjNtY1U1blE1cTlLaDM5
MkR5dWtEdFpXNGlSWHpuLzdWME92S3NTeUFPWTBEDQpHZnVwU1krTzZIUEpzZHkxczJaakFFejBm
d1hIb0VLeGc4Yk02RXNOMm5kNmRIOUxjNlpPZHRHUktqNloNCm5DQUVPM1MzWEV4cThjeWVXOHRu
MHdwdlhDTmF6QXlHUDhKdCtBSk55RFFkSWY5dTZPNUZhNGROb3VTNA0KR21aWkZya3YxTGxxcjRy
SG1NUFhic1g5Wnh5b01Pc3l2RTljQXlCT2FUQ1FIZ2UwYXdnT0dGMjU3VTlvDQp5aVRNbHpQOEx6
ZEJ4akNRdlRsMEhDTllCNjFWVnFvYVpacnJ4UjFNTUlYWG8valpYNnJVNnl0OEVRTW0NCjBpYmNj
YkV1YVJwWVptNndhZDNEV0ZScFFIcDF6MURHcG5qbUxyWXZ0TFpjaXdnQjZDU2dLUXhGRkV0Zg0K
SW0zWEtPSEd2TlVjaTRieHNXNkR5Yk5YNVVBeGxPeW9oc21NZ05TTmYxRURsdDRycWN3c2J3d3NR
VlJBDQpkdk5WM2hSN1FHWU1FWjcxTWhSUzdpU2R1ZlFjcStPVDBDUjFBci9ReHM2eXFSOTFFb2xn
ejdvL1VjSUsNClEwbC9FZmI1TjdzZ1VKRzNnZkc3RVF3dmo1eTNOOTltanBpVnA0eUFHOW9pZnlT
aC95cmxaNkZIdzlWdw0KV0xlZzlFdnRwNlNDM3ZrbXFSL05kZTBrVzk3bjNLY1pCTldod1VjNzhn
TjBDbUR3dHhiQ3RlNU9qRWJ3DQo0QTRSM3JJenhrczVWSDN5WTMrQ0VDNmhWOHhrbGo4Ym1pYmtr
QmZtMkUySnFIaEtZMEp0OWZWTms5Wm4NCjc0WkQ1MzFjakMwUUoxcnN2eHE0UXZBdVdCMU43c095
MWJrSWFFK090QzdWSSs1NllTL3NlRHdMM2JuOA0KZDNkNnZiaFl6OU9zSW9OY1hNY2tMakd1YWRP
eTFYcXEzZ3FkekpZTTFyUC9EOUphcjkxTmRRT25xSjkwDQorMjh1bUQvc2hCNEhkWnNHOEdUY2hO
a2VTQWQrVXBlQ1g2UzBlektyL1lNZXFETlZYZjVoNXJ2SzhIOWgNClFjQjRyNEd4TTB6OSs2UHVN
TDNhTS9IakxRRHhxS2FGcmRLQW41eURsamhxVDQwaGhQVVpUb3hDYzJoVg0KeUpmOFlQcE5teVVJ
bjhHZDFMcWE3VUJDRHVaUkNhcjFWM1JOWjJZVE5CZTJwbWtON05DMnlBdktvSVV2DQpqemhEaDUz
Q2RCOTQ2OVJhREhwUS8wZE4yajM3SmczUkhhS29nUzE3LzBLQzdoeVpFUHZ3RnJ6dWpqZ24NCk5w
OXltZ1M0Q2dwc0JERFZpRVpDT0NFSFV3d1dobFR2enJHUGJvOEtNM1h4L3p4OUV1ME53U2t5a0pl
eg0KQnFKNFhGN1loczF0QzNuOTd3b3p5cGxvaDdYTzFrQWoxMktTakF3S1dzWXU0RkdhSGxsUXQv
SmhlaUNoDQp0dzA0RlJMbWQ3Y04yemN3TnEwTklIbCtJVjJFVHYycFJiZjgxSVFGL0ZWTFFSNng1
alVvRGw1ZEhDeVYNCkxoTlE3cWJ3a3dwdnBNaitERHJWTzVlc2dydE51VkQ4ekJheFcrNTVIREFr
RVBuNmNkaXVIVFBwVFBEWg0KeEhBNE5ZellLRnI4ek5DK3F3Y2xHeEZxeEtRSmM5RHdyWThlTit6
ZFYvQnkvbFFIS1lkMlkyRmZVZmpiDQpoaUVuUitRaEhUZlpwdHBOVzFDRjJ0S1QyeVVCd05CUENl
RGxML2xrZHpUNTJ6REVNdW1lSXZWU0FhN2YNCktZaVltQlc2d3RIeStPWll5ZlpuZGQ1Vi9BYmc0
MC85YUt5dG9YQzRPNWNXYmUyYVUvaGVXMGhkQUttKw0KUDNFSWRXZnFBSEwrM3h1OXR5Sm1kYVIw
eUFNREJteVVYME4rbEpjQUxLSlpMdm5JZWd1b2lCOGJQQUUyDQpCN2FwRjlINENnQ1ZnMlZuQ2R3
VzRCNnphbXkyUHpHVk9PRGl0SjV0TzgxOHV6Z29zRUpXTWtrZDJlZUQNCitMQkFnc0ViZTdMWk02
RnJ0ei9RRjl6UWcrOHZGck9xMStsQTJQWjRSVEhRSDAwdmdpZlUvVjVmc3Rpbw0KKzFHSlc0SE1H
NVBEbVY2VnRwNWFuaUFjbUUvMWRqQjhPd0gzVmJzYUNZS3JDcnlmemZRVEdGdEp5ZVBHDQpQMHgr
d3hRWDVLcGRoRlZaZmFYckVhbkYwZWdBNUpka2JPd3VlUU1QTEw1cFBPbDNTeTV0YkV1enVoZHkN
Cm40NUErbW9oMk5rYWZ0ZCtvQXo1Y1Q4OHFSTkpxYzJTN0VNakxqSHpRZnFJUFJZQnJkMER6MDMw
elhPRg0KRXN0blltTUFna0hOd2lEZUZLQ0h5cndyUEo4LzdaMFlnT1NwVDFKdWxYbVRBMi92SmZH
cGp3MG5zT1lCDQp0ZjU3dUw4bEZ1NEJJcDI5N1NXU2REdE5QWFhNVHNucldFaW9XRzR3c2xFRGwy
eEZWTXpOczhMOHFHYzMNCmVpSmlHVjI5RUhwREJTSU5hOWVmQzBIbVJjVU5QMEpSdGhrNlNQMStO
Ty9wUVRwaXBudENNdlZXcTF0VA0KbTVYTFRIL1M3M1F3NEFrQXV3V0dwYTFsK3pJTXBHQXRwbFd6
VlA4dC94ejdXam5FRTUvclI4MVJ5WE40DQpvR0o5T3MxeWNqeTdSWkVZVGlvQVBIMGMralE2Ymww
SHRDdWZCWWZUV1p2OXg0U0R1eUJVQ1RTNGJ1dXINCmI4dWt0RnJydTcrL0k4ZU9VVkgxb2NxODI1
QnY4R05xK3BCbzEzL2RPT3hJL3lQdnJ6Q1J6SlN6ell5Kw0Kb3ZPditwWmlUTmhlRWl5R2Q4N2NX
KytVYlp3NkxmSXM3ZDRoSERuVmgxOHNLUGRvZFViWVBsdDJSVm5WDQpiancxOUtHL3ovQUZIWnFS
TGRlZE8zUThHcmJqb3B1NFMwU0JPalgxVnRmeXIvQVVZR1JYZXNmSWR6dkcNCjZUTExuSmdtZXVS
L2ZDUmRCd2crUDZ4V0dpYmw5anBZNDZIMkdON1VlQzIyV2Q3RjBYN1czNEY2c0RmMw0KTGJMbXpJ
dEdsTGJRR24xenI3aWU5cTB4YWZCcjFsZy9XVTl4SnlaREllRWJQWHBKV1QyK2FwRlIvYVBwDQo3
UE5yb0h3OFk0ejlWeUxxcUIvbjYxSGFIejVBTjdqd0Q4bEE5eUdvaVRXQ2M1dmF0aENERk0xV0RF
c0cNCkJYQkpkQzViV3lIQjErbmh2b2VZS3ZPSjlSampFWkdkc2laUjJmclU4eXRhbGMzUGFuUExO
TkJrWStwcQ0Kdk04bkI1SmtWSllWeXovb0Y3OUJ2b2dOSUplREJ4cFhyeFdUeGI3cTV3c1lJN0NR
cEplbEkzRXI2T1piDQo4cEEyM053dVhTNVhzakIxL2Z6UUVZY1pRY05QSFpmUVhGcTdFQURnWHVu
VnRLbXhNNW1QVE1Db1lRdUYNCmdZcDBBOGc1N0FMaWY2TG8vNjlDWjRpSjc2aGtjcUZMRTEyNlZU
aUh1OUtPMXlXRnJyR242OE83THQvYg0KYXlBUHdXRHpzNW4yMSs5T0gwTmdsVHdUMHVpTzZVMGVO
VURVYVkrdG9oV29wL25jYkxLcENZL0gwZm1yDQpwVCtGVlBKV2FvUFZGcThmL2pXQ0Vwb0JZVVZT
OVk1a0NNcFNxQUxpeW1GV3JpS0RxWklXYnRQeU9QSm0NCkduN0p6MXNBTDJkUkVkZnYvcW0yUnc1
YVdMQ1duMXE4djZObkVPWTkybnBoK2FuVGpjdjkrbVR1U05sMw0KYnpBN3FHNU5WYUgrWTBmaGli
eDNwU1JzZHJVYTcwSndUc29RZWxzTGVXYjV1akIrODhXREZTa3N1Wld3DQpJWTROU1VUWll1emFJ
NG04ZkR3L1lOVzdTRWJJTWJLamhPb3dkTEpnZFh2SFJpdzkwRVR4Zzl4VkFZbTENCnVNbmJXSCtU
ZXBpU204OW5Ydkh3VGVqVzBhMXRqUHU1c24vY0xWTmlQc1VMejFLRVFjQ1ozQXJLaVRvNw0KU3RN
MFpBTnEyeU54ZWdFcUNhVlh6NnRMNDdEM2ptQm9lTkRidGJyUzVSOXlYZUxRUUE5L05WSHBwSnRn
DQpXOGhhUXlOUWxXSVg1NXlBelVKOEdROFhCeVprYTFWRjJJREk2STdIbTlnRm5IQVBoMGNGYVU2
YXhQOFQNCnR3K0VETUMvOGRZQktXUTdKRDdaVFBMU2h5elBRSjlDUnBTTlh6YnA1Q3RtRURQWStq
a0x4WElKMFBrSg0KaDRsRE5hQmJNV1NLd3J1K0toVk5uTGpNcXNnZ1YyNnkwckIvaEtpQVdRQXBp
bFNmRXljZVZ3bURzdCtoDQpzU2R1K1JGenhCMVNVTTdwb0NSNE13UjNFNEV6a2YwbWNTVDhmYzE5
UStzTFV0bVJETXkxRzRBcFN5Ti8NCm1zS3JTSnkrU01VUmZGSHZ6YVpLL1U2V0tEMm51QjZIeHRk
WDB6UExYWTV6NFJZbHlrQTU2TFVLek1vQQ0Kc1Y2U0NIcXFJWTNyaE01YllIcjFSblJzeUVNZys0
TEl2VnFnbmVRNHY1NlhSclg0dWxSMHRWenhLaUxTDQpnemJRVjlMQkVvQ3VGaXRueW1sL09xeDAz
NSswd0Q1SWZkS1dRZnFBWFhtZEoxY3VqQkRGRmpPdU5yT3ENCklvQXh3R1hNTllNc0I2Y2VmcGpG
Y1kyenhSNVpWK3U1NXplSFZrSVNXaFU2WXVRMWJlV2N0RGljZm1acg0KWVl0d1RERituVlhib0Rl
Q1dTRlN1ak5YTGVjcDNseWNSWjcwd2pSK3hvZWszTXBUb3ZKWHRnRWJRb3ZoDQpOcTNKYWZRa2Nz
NHdvVTNMSjlUUnJwR1Q5N01hQjc4b1JCd2RsaEgrNkdmMFI4d0RUMHFNOW1Ic2toSjcNCnN3NU5I
OElBRHRVT2F3V1N1QzlpOFNQYzdWZ1pZZlRLWFBvdHYyMUlQNFl6YUJtSWFrVnQwQ0NVRFZieg0K
VzFTL0dhTzljeHpGNUtrVjBJcjQzNWIvWlBjeWlUeURLUkhJdnZWMHkvR3MxVUlFd25pM1FZYnBt
TWFjDQpuSElvZlh1SllRNzg2OHNUcDFSVitSeHl6TnRBZDFtUUZWalE0QVU0VWJMYTdLOTFhZXNO
MitRU1NJdEsNClYrMFRHa0F3anNKQ3kxbDI3dXNLZi9rZGQ5OGdSb2hTblVYcnNtSnJVVmVGRk1C
aXhndWJKVFd4VisyWg0KdzNtYXFORjZaTG95K1VGTFg3eXJhNFRqclhmMnR3TU1vMnJpa0t4eGRT
cmFFMWJsY2xwclNzN2RnUnY5DQpFNEJSZ1FoaC9zQkxtU2Faa3hzUEVkeEV1NEpkeWRTQlgwMlR1
ZVNNOTRGSm53KzlvTTlFMkxnNitXa0cNClJQeDc0WGp4YlNtUDdUd1pnaDlnaXluRk1za3FRaDZt
QnhSRGZKbXdaRnQ1QkMyVDkrQVJYdTEzQTZhZA0KTjRPQkgzYjUxZnFoZGVjeFRXNmdhUnUvNmdD
TU0zTFNoQzRCNWVWSU1acDRnUXU5YVhXZ3RES3ZXK2ZPDQo2TVNtTjhSM3VVUzZHeTNPTnBORncz
RHFURkRQa2V0ZFczaDAvbmZZdEFuK1FFQ3hraWlwLzdMd2dlS2sNCkoxMHMwVnBIR1VoQkMxM1lL
Ulo2d252Y2FJc3RSNXpodUs2dWlLb0krdW5yTmZzc29FNzA1UjVKTnZKUg0Kc1ZjZ2o1ZE85QmQy
TVhianI0ZWR4eVlBUSt0VnpLMkd3WFdsdzM0dVdLYTVJVDRJSExXV1BQNFpJbVkzDQpWZE1ZZEJC
RmdGRy9rMmRxcnR3TEhJODdCbXBSUThxREF5cFR3alRxS2RLZjZZZUs4aGxUN0RhNllkc3oNCld4
Rkx6WmRrQUtyb2szdTRFWGZPOXNydjZSd2tBTUQvM2RZSlQ2TmtqL1R1REdMSkVSdXk0S2EreWcw
cA0KM0ZjVUJaOXd1S3JybEplNnFGVVRHSGpNWHBRbHFneENWTVE5NmF5Q2Vob0EvcjArRTFLSHVX
R29XNHhBDQpNaHlyeWJmNVRjdHkwOTdyN1I5N29tdFE4eUdHeldmb3F0TFd2czBqVzRqTGpxNlha
YzlwVUxES3ZEV3kNCmFnckRlS0gyUGdyM20vWDBncEQvNW5scm5Dc2JOQVNSTE5HZjRhRThFZits
Vkx3ZU1DbDNOR3JxdzQzcA0KK3g0Z2R2Vk8vWGpvL2xZYkJRYmVTSGI3YmR3cHFzb3UxN0xIckxk
MXRGSGQ4cTUxa1RETkFFTGJMWjZnDQpGOG96MWdnRFZiRXl1RzJ0Y1FqQytXbDZWeXU4dkpYdUs2
clp1RkdkZjBKM3haZ2lVTlBaS3MvUnEzQmsNCmUxNVRPSlFiR2NtQUpmOER1aEUwckJPVTY3S0Np
bWVDZDQ4TUlpdHNEOTdVWmZ4dVpkMGFUNkRtdk8wdA0KNmFZV202Rk80Y21IUmllVG94V20rN1A4
OTRMT3AzL0FiaEhQcHpwdnR0aDlQanNYSjBoUWhUb1B1bWFhDQo5VEM5a2JvSXZuQ1ZocTVCVUFG
SVB2ejRvbmlId2NHZjEwU1ZtVGE5V1NvODlFa2Z3VFV2YXRIMTlWRFUNCkM4dTl1VGNQb1h0VFNH
b2NLSm9vbS8zY0ZZNGlZY1hBZHllQ0RLdnR4SHpkdU9jMHI4YWhQSjE0b3JHSA0KV29kQkdSL1FX
MzVLb0pKK05HdEYwQTdyTnRkMUJpRXJVdGFFSFVaUDNVa285bHlRVTNJY1pWNHRLWTFjDQo1ODdZ
dHFmNDlOdm00UnkvOTRjd1N6MUU3cld5c0ZwYmJJSVdYWjU0clZ4elBMS1paSkY1SmNXQy8rM1EN
Ck1vOWFKREdkUjNuNS93L0NBdnJWSFlqNEVVNVRNOVhna1U2cFc0UzJGb1g2VFh0L1VpY0EydlNy
b2krZg0Ka08veUpIS1VNaDhRcnN5YzZ6R2FsM2RWZEpnQ3F4emFsaWNwc1VHZGFsRzMrdmhvZ1Zj
WjU0dlAxSHVYDQo4RXpYRHF5elE5UXlwNjBhUTdwWU5kUmJqc1c5QzZLb0xkVDAyUFQ3UmNZYSsx
SWRlaDFNQmRhamZhdFoNClJGcXNIdWVqbSsvU0ltUzZXSnU2akNCYm1nYUpNS3BFRmpyZE1PMkpK
ZUxOd3pLdlRFMTJtL0VTam1CRg0KRlRpV3BVVDVmbkFGMXpxaDFsdWgvQmJXTDI4TkRzeDZkUUJN
Tks3WDk5ZFVKbGZxcCs0a2dCekZRVWcxDQpPQTZTTmE4bFBWQkF4UlVKcG9CZC9yVDh6czFDNmJu
WGtwT3l1UlhHN215OWV6OG1Id2E4cWNlbkJudzgNClNKbGNSQ2tSVkhxY0NBek83UUdWZmp0U204
anpMQ2FBR3N3S0tGT0ZlUkx0aHhtYkFLd3RhSUcxRVRrRA0KTVRaTjJTVk82aU5lVkhOZ0hKWjNS
UjJHcC9tMWlQR2lHWGhjdE9OQWJUbmJaZngydk9BM3hySW9LbFZYDQpMbWoxYkFta1IwZWpMdnNa
Z2tGNE9vaVZTZDBGSG1CS3dpcCtXN0JyZ1FQRm9HNytCSEMyRUtxaTBpWEENCmJZMjlqYWR0MzVJ
eXpPMk1zWmIxMHFRM01hNnZ4WVpraG55QjZ1WVdXSGVwUjZVNlRETUNCbXhUYVpYag0KWHVwUnRD
VHBVeFR2UmE0b3dtcVlKY1B3UEUvZzRwM0Y1cGVXUEVMMmNUK1k1aU9Nd2liNjFmYW1kanlnDQpR
SkRudEtaMW01dHQ5U2tibUVrR2JOS0Z2cGtBR05mWnlUK05mOHlnT0JQazgzWjhnQXpXRDNTbmJH
OTENCkRzNnJJR3U4SjVFNEYrclpHTEI5UjVWN25SbTI0ZHRWam5IUHpQdGRJa254V05oOVYwOGhP
aTlnZmw5SA0KVTgxd2pQcENtSEdRVDFoZXpFNzNCVVZncVA1Umc3QWUzTVBTUlBUdlAyVU9ORnFS
U3NiT29LSDVQTHp6DQpIRXhWblcyTDNlWjNDWGhhUWR6ZW90Z2FJMVNBTi9RZTlYdHBqUWpscTRm
UzlLNHBtYWJhbFVKOTdHY3INClgyaEVHYk1pbWhOY1NvazliWkN3dzJlekRYTXhrMGxZODljM05u
SlN2eHQ5M2hxVFl4am9aWlB6cnpPNA0KalQ4YTd3dUJ1MzN1bmhaQVZtRFNYb1AzVzV5M1ZsVm95
M0NYKzlKdGt5S0d2bHFRakRFUlhuaUJ4YWM2DQpkNXNKRXRKdnRNZ3lNcnBlUFR4MVZMdzlqRDF4
NE1iTW9vNWdnVGE1U0piZ3IxODhkakpUVEtXb0lYZXINCjgzcUdXMjlJMEdMTUg1eDFOVzdBeU4z
bzl5emhMVFloMEVndzJFNVEzV1JUYThBZkpLeVJOcnpPTGtNNA0KUWE5R2tiSHY2SFE3K21LdERz
RlRJQTNzb1FNUkhFSFNVWWxWenQ1N2FjMEZGbzRWMTR3amlsQzZNZ3RjDQplVmJJSXlIQnJ0THpp
dWNvTVBwUmpzbGdTSDlZalB0a29HamlYUEhjYTZGMHRmS0xXYVlOT1V5ejVrRE0NCnVKUGNnZms0
MSs0M0RPd2I4MXVrY041WHU0bFBHQjI0dVNReXpYM29lKzJLUUkzMENhS2QyOXFoeC8zSA0KVWN2
dXhrNE9rVTYwS2JUSUZHR2RRejlMaUdYdHVRTFlneGFqREFmNDU5SnlJeFlYMnhWRFprRUc0YXZi
DQo1SHRLd0VQT2d1a2x1V1cwbkh2Y3E1SDVXeUxxQnV2cHZLbnhQMFdqZWhKaldqa0hFdDBDbWVY
bTVTMWcNCjNpYXZTK1pJZWhlMExlSzBMVkZYMjZQbjAvK2RmZ1RUWnpITHNseVlDa256VFAvalAz
ZDd1NGszS1AzTg0KSmYwbDg0YTQ1Rm1UNlJkMmxmUlQ3ekVlYzBrNy9GZ242ZWtsRkVmOUZZTDdp
cFNUeTlwVGVRM2d0VnU2DQo0a1lTM2JJUHdtYjlvL284cW5Jcnc5Z0NGUTIwaSthYXcxanZHVEY3
UEpMWm1vZVBGRHVrVS9vVURvc3MNCmlkNjRac1IvZ0lnaVVzRWd4OC9SaHFna2VQRWI3ZGkzUlBm
bUcrcEpGZmJ2dzlJTVhNUExtY2tlU3NDaw0KeUxJaWRzSmJvZG1WL3FHbFJJZUFENW5LaStTbk9E
bXhJVTd2RGZpT3krb25ZYWZLbE00bmljaVRCQkRCDQpiRGZMWlJtRnJtTFBHRldyUWxpakcrVTND
c2xSWllqV01nZGpxQXoxeU9JaEd4SmVxVUgyOFlBTVZHa1QNCmc1NnNUeXJhN3RzRmJJb2V1Nzlv
M2UzdExwUjltdzdjdk1nMkZwcGh1MUpEU3hkT1NvTEJqVHp4MENUYw0KWEhueGoybXpuSFJON0NE
c1lxQnhMb3JKNk1zRjl1Z29Ed0hKYjBCZDFuZnRhbnh3eXpXa01pbHNLSjJ0DQpzeGNtWFQ3WUVF
QnBaRmlETXBNKzY1bS9Lb1l4SldRNDI5QjVwQ2k5QjB6ZUhmMm5JSmRJR3RrdCtqZ3QNCkFHbEJF
NFNWWGpFSkdJMG1tOWxHQnZsN3FNbTF5QnJmNHBDbDhpSFdienVvcEowRXFxQzRmVnYyc3Vpdg0K
Q0FydXdYeXdZVnZONDB2YWZVREtKQXVNckpIV01tVDllMTcxSHhXaUp1OVFQZURWSWRlalUxdVpE
dlN2DQpmWUtOcXpEb25NZGowUWRnVnA1L2ZFakRhZFFUZUpBNENuTnVNNEZwT21nRzRPNlA1aGNm
Rmwwa0srVzENCkhndDlORzdxSzAwUFJSdHd5WlFmUnJnOUhhTVVjNmtqVmlQZzdkUkN4a1FoRnR6
QzdNQndTWlN3Y1p6WA0KQVcxYTkvMmFMTGVGcDhxMjBMcTlNN29SZThmNUh3eFhsU29UVjlkalkw
YnNNSDZTdTNFd1hPc0tjdDdhDQovc3lLUjVGOEh6L1ZFbnk2YUxtY3dHNDVLOXlWSUhMMmJIRDR0
dDBDL2RrOXB3OUlFeUU0ZFUzSGJIRnkNCm83WTFqUGFCVjFJRWkvVGRsQlpuT1F5d0N2aWd3M1Vr
R25KemNKMlRrVmpEZndTVmo1OGdpaWRKMUQwTg0KUWwxb2daNzdFakFaSUU4MSt6N2pnNnE2ME5m
bVNoQjhHbXlPYnFKVnVCRGFESklMRWtFdkxMVFZHVE1mDQp0OWhUdzNPV09LRnVPcTQxM2dhdEdp
V1RPTy9WWHZDNlVvcGg1TzFQaXVYejZUckZSQnJqcTI0SkNnUWUNCkd1aTFMemZEc041dHdyVXZ5
S1lzaFk2OWdocC9xVUE1Q1N0bDJxbkFpRkNCMjM5VnNJY08wVFIwYnJ0eQ0KdzFXdTlTc1EwMXhs
TmVER04ralB1RG1YYUVJelpST0xhMDU5eHYyMUJHaU5VQkNGODZWZUk0dzBZamFoDQovaXFZSWxM
c2dlY1BQRUhzbjRGUUh3RllST2lTcklLOWhadFhXZEVBV0dpd2pMbzJwU0lwVmdpTmd4cFgNCjYz
RjdOeUFjMHZIeEw4TkgybjE4dFMyUUUvbzNBVVhCN1BwZk1CSGwzVVRqTkdPV21zT1JoeTZpVHdD
Uw0KeGltSEQyYjZEYzJzamZsZlROTWRuUHVva25VdjlTWDJGbEUyMWg1UEtyOXovOE5jek9HZVhX
ZzM5UzJzDQpXK0dZSjJsMjdHSFRjR2xUeldKOUpycEFEUWlEWW1DWGhJR2lHMWRWYjlCZHNDTWpS
MjVsVTYrOTJwWE8NCjZXdDQrL3VMcXlrYTA1b3R6bVFMeFVCRjlkdUZpM0pFUmVUeDFHbm81bWEr
SGxHL2RJeVhWREZwb2JUQg0KT1p2K1h3UWVQWjBwNjRhSjlQWDRDc1hiMzNuaXpiL0FHTEVmV2g2
NlN4M3o4cXlFa1dHOGp4eHNnWkpNDQpBb2I3N3NRWFNudWJyMEViZzdwc05SWkRDVWNscFlxSVdE
dGRvUWRUd2RHcnVRTDJZcmQ2RUVpc0syRHgNCmRLTjhMUi8xZzRIQ3RZR0VTTDNEdDBqL0RHRDFk
T0hHZXhlV0xRR2o1OGlvekF6WGRwZUFxaDdodk5iVw0KYUExWjJIUS9kK1ZHaEhtZGNReGpmTGZz
THFQdWtsRUt6RUcxYVZWUFdKMTd3UkVlY2QxWkZEbjFQUFI3DQp4a2txZDd3Y2YwYUhSbmJuSk1R
VkRtR0kzL0hUZ1BPdkpQSk5EMkt4Z3BkYlFCTzhlL2FNazRuVlZmckENCnBaeWdIQWVvVzR4UnU3
TTJNUTlOYUZHZmxFelVLNGN6QmVnYjlGdXRyTCs1UVQ4c3NMYjQrdG9GdFBlbQ0KMEg4SUZPSmR5
dTJjakZBMjl2WXVyMVhVVmRSU0RwSjMwdGc5Z0MrN21EV2kxMXRZdkdGaTRnelVqN2JkDQpvSVJa
L2Z4VW5jSGJvVWc1d3VkOXg5NWtWcGRUcUJkclRsbWk0WDJXekZGcVU3Q3JSandXWkRxNkFJRXQN
CmkxSFJpdzB2OEJySk1idllUc3dZdWN5VHR0RGFHZGZvb0J2d09MQm5ZdmZuRytwek1GRlRPb281
NktXeA0KWkViWHFxWGtDL2lpQjdxdFMzYS9hN3JiZE55OWtEWllQRDJaNUJZcmVXTy9tdlhLNGZP
VkRQcmxYVnJtDQpRZ0NtaktDaDg4UVEvYXcwYUtPbkRqY0x6MWpabkptdmlGWFRZTktHc0dlTm9U
NmhhS21JV2t2S0hFd2ENCnJGZm5KNExqaDJrQTVJTFMyOTM2R3V1Yitwd1E4clV2cmFSN0JJQlY5
eThnMitSMjlxU1RtaUREQU9TWQ0KR3lQcGNuSjN2Mkdxd3Z5ekJRc2I4NGhqVDI1WVFKVjJOU3V6
cEZWWHQvS3EzUGprckRzYkg4N1VpTUJvDQpTNkFuRmVzQ3FqUy8rS2hLbUdNdlRMZ0t3cmt4a1hV
WDRyRWE3LzlZclBrT3ZLTU1uaDM2ODByemJJTHQNCmRCRWJCWWRYT1JmT3lXLzd4MHNOWENJZ2o4
WDV3SDRHM284cnllNERMVkxPYVBLZ3B6b1ZFZFl2MWtrMg0KcWVrOXVJNzg2ek01dlYvWUE3R0k0
YjF1SGJJRmZIemJPNjlzNG1qclNSK05nVnI4bDlUT1NRdz0NCj1RVURNDQotLS0tLUVORCBQR1Ag
TUVTU0FHRS0tLS0tDQo=
------sinikael-?=_1-15742901895970.7632331896869171--
" + "labelIds": ["SENT"] } } From d1e5ee9ca6253524f2631cc2a2e308d91bb5adb0 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 11 May 2023 19:37:12 +0100 Subject: [PATCH 054/147] simplify test and test gmail mock as well --- test/source/browser/controllable.ts | 3 ++- test/source/tests/settings.ts | 41 +++++++++++++---------------- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/test/source/browser/controllable.ts b/test/source/browser/controllable.ts index 753933cedd6..6ccbb0aca5e 100644 --- a/test/source/browser/controllable.ts +++ b/test/source/browser/controllable.ts @@ -505,8 +505,9 @@ abstract class ControllableBase { const resolvePromise: Promise = (async () => { const downloadPath = path.resolve(__dirname, 'download', Util.lousyRandom()); mkdirp.sync(downloadPath); + const page = 'page' in this.target ? this.target.page() : this.target; // eslint-disable-next-line @typescript-eslint/no-explicit-any, no-underscore-dangle - await (this.target as any)._client().send('Page.setDownloadBehavior', { behavior: 'allow', downloadPath }); + await (page as any)._client().send('Page.setDownloadBehavior', { behavior: 'allow', downloadPath }); if (typeof selector === 'string') { await this.waitAndClick(selector); } else { diff --git a/test/source/tests/settings.ts b/test/source/tests/settings.ts index 550e0611b67..56ecf7fe6e6 100644 --- a/test/source/tests/settings.ts +++ b/test/source/tests/settings.ts @@ -20,7 +20,7 @@ import { Buf } from '../core/buf'; import { GoogleData } from '../mock/google/google-data'; import Parse from './../util/parse'; import { OpenPGPKey } from '../core/crypto/pgp/openpgp-key'; -import { BrowserHandle } from '../browser'; +import { BrowserHandle, ControllablePage } from '../browser'; import { AvaContext } from './tooling'; import { ConfigurationProvider, HttpClientErr, Status } from '../mock/lib/api'; import { singlePubKeyAttesterConfig, somePubkey, testMatchPubKey } from '../mock/attester/attester-key-constants'; @@ -758,27 +758,24 @@ export const defineSettingsTests = (testVariant: TestVariant, testWithBrowser: T t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acct, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - const downloadedAttachmentFilename = `${__dirname}/7 years.jpeg`; - Util.deleteFileIfExists(downloadedAttachmentFilename); - const inboxPage = await browser.newExtensionPage( - t, - `chrome/settings/inbox/inbox.htm?acctEmail=flowcrypt.compatibility@gmail.com&threadId=16e8b01f136c3d28` - ); - const pgpBlockFrame = await inboxPage.getFrame(['pgp_render_block.htm']); - // check if download is awailable - await pgpBlockFrame.waitAll('.download-attachment'); - // and preview - await pgpBlockFrame.waitAndClick('.preview-attachment'); - const attachmentPreviewImage = await inboxPage.getFrame(['attachment_preview.htm']); - await attachmentPreviewImage.waitAll('#attachment-preview-container img.attachment-preview-img'); - await (inboxPage.target as any) // eslint-disable-line no-underscore-dangle - ._client() - .send('Page.setDownloadBehavior', { behavior: 'allow', downloadPath: __dirname }); - await attachmentPreviewImage.waitAndClick('@attachment-preview-download'); - await Util.sleep(1); - expect(fs.existsSync(downloadedAttachmentFilename)).to.be.true; - Util.deleteFileIfExists(downloadedAttachmentFilename); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + const checkPage = async (page: ControllablePage) => { + const pgpBlockFrame = await page.getFrame(['pgp_render_block.htm']); + // check if download is awailable + await pgpBlockFrame.waitAll('.download-attachment'); + // and preview + await pgpBlockFrame.waitAndClick('.preview-attachment'); + const attachmentPreviewImage = await page.getFrame(['attachment_preview.htm']); + await attachmentPreviewImage.waitAll('#attachment-preview-container img.attachment-preview-img'); + const downloadedFiles = await attachmentPreviewImage.awaitDownloadTriggeredByClicking(() => + attachmentPreviewImage.waitAndClick('@attachment-preview-download') + ); + expect(Object.keys(downloadedFiles)).contains('7 years.jpeg'); + await page.close(); + }; + const msgId = '16e8b01f136c3d28'; + await checkPage(await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${msgId}`, undefined, authHdr)); + await checkPage(await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=flowcrypt.compatibility@gmail.com&threadId=${msgId}`)); }) ); const checkIfFileDownloadsCorrectly = async (t: AvaContext, browser: BrowserHandle, threadId: string, fileName: string) => { From f49f6e62ce7609b3973ebd1da1e34c4673e9e12f Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 12 May 2023 11:10:07 +0100 Subject: [PATCH 055/147] plain text rendering in inbox --- .../inbox-active-thread-module.ts | 24 ++++++------------- extension/js/common/downloader.ts | 3 ++- extension/js/common/message-renderer.ts | 19 ++++++++------- test/source/tests/decrypt.ts | 1 + 4 files changed, 20 insertions(+), 27 deletions(-) diff --git a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts index 5054f261cb9..618fd7c91ae 100644 --- a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts +++ b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts @@ -19,7 +19,6 @@ import { ViewModule } from '../../../../js/common/view-module.js'; import { Xss } from '../../../../js/common/platform/xss.js'; import { Browser } from '../../../../js/common/browser/browser.js'; import { Attachment } from '../../../../js/common/core/attachment.js'; -import { MsgBlock } from '../../../../js/common/core/msg-block.js'; import { Mime } from '../../../../js/common/core/mime.js'; import { LoaderContextInterface, bindNow } from '../../../../js/common/loader-context-interface.js'; import { BindInterface } from '../../../../js/common/relay-manager-interface.js'; @@ -150,33 +149,24 @@ export class InboxActiveThreadModule extends ViewModule { private renderMsg = async (message: GmailRes.GmailMsg) => { const htmlId = this.replyMsgId(message.id); try { - const msg = await this.view.gmail.msgGet(message.id, 'full'); + const msg = await this.view.messageRenderer.downloader.msgGetCached(message.id).download.full; const mimeContent = MessageRenderer.reconstructMimeContent(msg); const blocks = Mime.processBody(mimeContent); const printInfoHtml = await this.view.messageRenderer.getPrintViewInfo(msg); // todo: review the meaning of threadHasPgpBlock this.threadHasPgpBlock ||= blocks.some(block => ['encryptedMsg', 'publicKey', 'privateKey', 'signedMsg'].includes(block.type)); // todo: take `from` from the processedMessage? - const messageBlocks: MsgBlock[] = []; - const attachmentBlocks: MsgBlock[] = []; - for (const block of blocks) { - if (block.attachmentMeta && ['encryptedAttachment', 'plainAttachment'].includes(block.type)) { - attachmentBlocks.push(block); - } else { - messageBlocks.push(block); - } - } - const { renderedXssSafe, blocksInFrames, printMailInfo, from } = await this.view.messageRenderer.msgGetProcessed(message.id); - + const { renderedXssSafe, singlePlainBlock, blocksInFrames, printMailInfo, from } = await this.view.messageRenderer.msgGetProcessed(message.id); + const senderEmail = from || 'unknown'; const exportBtn = this.debugEmails.includes(this.view.acctEmail) ? 'download api export' : ''; const loaderContext = new LoaderContext( this.view.factory, renderedXssSafe, - attachmentBlocks.map(block => - XssSafeFactory.renderableMsgBlock(this.view.factory, block, message.id, senderEmail, this.view.messageRenderer.isOutgoing(senderEmail)) - ) + blocks + .filter(block => block.attachmentMeta && ['encryptedAttachment', 'plainAttachment'].includes(block.type)) + .concat(singlePlainBlock ? [singlePlainBlock] : []) + .map(block => XssSafeFactory.renderableMsgBlock(this.view.factory, block, message.id, senderEmail, this.view.messageRenderer.isOutgoing(senderEmail))) ); - const senderEmail = from || 'unknown'; for (const a of mimeContent.attachments) { await this.view.messageRenderer.processAttachment( a, diff --git a/extension/js/common/downloader.ts b/extension/js/common/downloader.ts index d801f57667d..1eac87d833b 100644 --- a/extension/js/common/downloader.ts +++ b/extension/js/common/downloader.ts @@ -15,7 +15,8 @@ export type ProcessedMessage = { blocksInFrames: Dict; attachments: Attachment[]; printMailInfo: PrintMailInfo; - from: string | undefined; + singlePlainBlock?: MsgBlock; + from?: string; }; export interface MessageCacheEntry { diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index 4cda0e1bc76..6672505a507 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -36,7 +36,7 @@ import { isCustomerUrlFesUsed } from './helpers.js'; export type ProccesedMsg = MimeProccesedMsg; export class MessageRenderer { - private downloader: Downloader; + public readonly downloader: Downloader; public constructor( private readonly acctEmail: string, private readonly gmail: Gmail, @@ -351,9 +351,8 @@ export class MessageRenderer { if (msgDownload.processedFull) { return msgDownload.processedFull; } - const fullOrRawMsg = await Promise.race(Object.values(msgDownload.download).filter(Boolean)); - // todo: what should we do if we received 'raw'? - const mimeContent = MessageRenderer.reconstructMimeContent(fullOrRawMsg); + const fullMsg = await msgDownload.download.full; + const mimeContent = MessageRenderer.reconstructMimeContent(fullMsg); const blocks = Mime.processBody(mimeContent); // todo: only start `signature` download? // start download of all attachments that are not plainFile, for 'needChunk' -- chunked download @@ -372,16 +371,18 @@ export class MessageRenderer { } let renderedXssSafe: string | undefined; let blocksInFrames: Dict = {}; - const from = GmailParser.findHeader(fullOrRawMsg, 'from'); - if (blocks.length === 0 || (blocks.length === 1 && ['plainText', 'plainHtml'].includes(blocks[0].type))) { - // only has single block which is plain text - } else { + let singlePlainBlock: MsgBlock | undefined; + const from = GmailParser.findHeader(fullMsg, 'from'); + if (blocks.length === 1 && ['plainText', 'plainHtml'].includes(blocks[0].type)) { + singlePlainBlock = blocks[0]; + } else if (blocks.length) { ({ renderedXssSafe, blocksInFrames } = MessageRenderer.renderMsg({ blocks, from }, this.factory, false, msgId, this.sendAs)); } msgDownload.processedFull = { renderedXssSafe, + singlePlainBlock, blocksInFrames, - printMailInfo: await this.getPrintViewInfo(fullOrRawMsg), + printMailInfo: await this.getPrintViewInfo(fullMsg), from, attachments: mimeContent.attachments, }; diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index 9232a5edadc..76f586b7ff7 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -203,6 +203,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te expect(urls.length).to.equal(0); await inboxPage.close(); const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${threadId}`, undefined, authHdr); + await gmailPage.waitForContent('.a3s', 'Plain message'); expect((await gmailPage.getFramesUrls(['pgp_render_block.htm'])).length).to.equal(0); await gmailPage.close(); }) From ca4494d5a5993467095c70874b36af56c2e43b38 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 12 May 2023 11:39:37 +0100 Subject: [PATCH 056/147] test fix --- test/source/tests/decrypt.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index 76f586b7ff7..ba34337c185 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -579,7 +579,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te { content: ['Message encrypted and signed as a whole using PGP/MIME.', 'cape-town-central.jpg', '185.69 kB'], encryption: 'encrypted', - signature: 'could not verify signature: missing pubkey, missing sender info', + signature: 'could not verify signature: missing pubkey CBD1C3466E9C437F', }, authHdr ); From 354dea81b619fc867e3dcb3aa54d46d6aa087e39 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 12 May 2023 19:47:27 +0100 Subject: [PATCH 057/147] updated mock to store sent message and extract it in full format --- test/source/mock/google/google-data.ts | 29 +++++++++++++++++--------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/test/source/mock/google/google-data.ts b/test/source/mock/google/google-data.ts index 5cc13926082..ef11cefecfd 100644 --- a/test/source/mock/google/google-data.ts +++ b/test/source/mock/google/google-data.ts @@ -333,9 +333,9 @@ export class GoogleData { public storeSentMessage = (parseResult: ParseMsgResult, id: string): string => { let bodyContentAtt: { data: string; size: number; filename?: string; id: string } | undefined; - const parsedMail = parseResult.mimeMsg; + const { html, text, attachments, from, subject, messageId } = parseResult.mimeMsg; const parts: GmailMsg$payload$part[] = []; - for (const attachment of parsedMail.attachments || []) { + for (const [index, attachment] of attachments.entries()) { const attId = Util.lousyRandom(); const gmailAtt = { data: attachment.content.toString('base64'), @@ -348,26 +348,34 @@ export class GoogleData { bodyContentAtt = gmailAtt; } parts.push({ - partId: attId, + partId: index.toString(), mimeType: attachment.contentType, filename: attachment.filename, + body: { + attachmentId: attId, + size: attachment.size, + }, }); } let body: GmailMsg$payload$body; - const htmlOrText = parsedMail.html || parsedMail.text; - if (htmlOrText) { - body = { data: htmlOrText, size: htmlOrText.length }; + let mimeType: string | undefined; + if (html) { + body = { data: Buf.fromUtfStr(html).toBase64Str(), size: html.length }; + mimeType = 'text/html'; + } else if (text) { + body = { data: Buf.fromUtfStr(text).toBase64Str(), size: text.length }; + mimeType = 'text/plain'; } else if (bodyContentAtt) { body = { attachmentId: bodyContentAtt.id, size: bodyContentAtt.size }; } else { throw new Error('MOCK storeSentMessage: no parsedMail body, no appropriate bodyContentAtt'); } const headers = [ - { name: 'Subject', value: parsedMail.subject || '' }, - { name: 'Message-ID', value: parsedMail.messageId || '' }, + { name: 'Subject', value: subject || '' }, + { name: 'Message-ID', value: messageId || '' }, ]; - if (parsedMail.from) { - headers.push({ name: 'From', value: parsedMail.from.text }); + if (from) { + headers.push({ name: 'From', value: from.text }); } const barebonesGmailMsg: GmailMsg = { // todo - could be improved - very barebones @@ -376,6 +384,7 @@ export class GoogleData { historyId: '', labelIds: ['SENT' as GmailMsg$labelId], payload: { + mimeType, headers, body, parts, From 3c8af29bae192b82f096f6b53af47b29c0e6cc5c Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sat, 13 May 2023 12:48:53 +0100 Subject: [PATCH 058/147] base64 decoding in mock tests --- test/source/tests/compose.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/source/tests/compose.ts b/test/source/tests/compose.ts index 93909706503..fc15a0b2823 100644 --- a/test/source/tests/compose.ts +++ b/test/source/tests/compose.ts @@ -34,6 +34,7 @@ import { } from '../mock/attester/attester-key-constants'; import { revokedPrv, twoKeys2 } from '../mock/key-manager/key-manager-constants'; import { flowcryptTestClientConfiguration, getKeyManagerAutoImportNoPrvCreateRules, getKeyManagerAutogenRules } from '../mock/fes/fes-constants'; +import { Buf } from '../core/buf'; export const defineComposeTests = (testVariant: TestVariant, testWithBrowser: TestWithBrowser) => { if (testVariant !== 'CONSUMER-LIVE-GMAIL') { @@ -2177,7 +2178,7 @@ export const defineComposeTests = (testVariant: TestVariant, testWithBrowser: Te /* eslint-disable @typescript-eslint/no-non-null-assertion */ // get sent msg from mock const sentMsg = (await GoogleData.withInitializedData(acct)).searchMessagesBySubject(subject)[0]; - const message = sentMsg.payload!.body!.data!; + const message = Buf.fromBase64Str(sentMsg.payload!.body!.data!).toUtfStr(); const encryptedData = message.match(/\-\-\-\-\-BEGIN PGP MESSAGE\-\-\-\-\-.*\-\-\-\-\-END PGP MESSAGE\-\-\-\-\-/s)![0]; /* eslint-enable @typescript-eslint/no-non-null-assertion */ const decrypted0 = await MsgUtil.decryptMessage({ kisWithPp: [], encryptedData, verificationPubs: [] }); @@ -3696,7 +3697,8 @@ const sendImgAndVerifyPresentInSentMsg = async (t: AvaContext, browser: BrowserH // get sent msg id from mock const sentMsg = (await GoogleData.withInitializedData(acctEmail)).searchMessagesBySubject(subject)[0]; if (sendingType === 'plain') { - expect(sentMsg.payload?.body?.data).to.match(/Test Sending Plain Message With Image/); + const data = Buf.fromBase64Str(sentMsg.payload!.body!.data!).toUtfStr(); + expect(data).to.match(/Test Sending Plain Message With Image/); return; // todo - this test case is a stop-gap. We need to implement rendering of such messages below, // then let test plain messages with images in them (referenced by cid) just like other types of messages below From 3bd4a286fd374782919181cd770c0680e18475f4 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sat, 13 May 2023 13:33:47 +0100 Subject: [PATCH 059/147] base64 decoding in one more test --- test/source/tests/compose.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/source/tests/compose.ts b/test/source/tests/compose.ts index fc15a0b2823..aa51f9b6cf3 100644 --- a/test/source/tests/compose.ts +++ b/test/source/tests/compose.ts @@ -2256,7 +2256,7 @@ export const defineComposeTests = (testVariant: TestVariant, testWithBrowser: Te /* eslint-disable @typescript-eslint/no-non-null-assertion */ // get sent msg from mock const sentMsg = (await GoogleData.withInitializedData(acct)).searchMessagesBySubject(subject)[0]; - const message = sentMsg.payload!.body!.data!; + const message = Buf.fromBase64Str(sentMsg.payload!.body!.data!).toUtfStr(); /* eslint-enable @typescript-eslint/no-non-null-assertion */ expect(message).to.include('-----BEGIN PGP MESSAGE-----'); expect(message).to.include('-----END PGP MESSAGE-----'); From ac5b006fa55cfbce2ccc59ea13b8f066f41a3333 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sat, 13 May 2023 13:35:27 +0100 Subject: [PATCH 060/147] don't allow incomplete blocks where we don't need them --- extension/js/common/core/mime.ts | 6 +++--- extension/js/common/core/msg-block-parser.ts | 8 ++++---- test/source/tests/decrypt.ts | 14 ++++++-------- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/extension/js/common/core/mime.ts b/extension/js/common/core/mime.ts index b3dbbfa513e..2526434b9f2 100644 --- a/extension/js/common/core/mime.ts +++ b/extension/js/common/core/mime.ts @@ -67,7 +67,7 @@ export class Mime { public static processBody = (decoded: MimeContentBody): MsgBlock[] => { const blocks: MsgBlock[] = []; if (decoded.text) { - const blocksFromTextPart = MsgBlockParser.detectBlocks(Str.normalize(decoded.text)).blocks; + const blocksFromTextPart = MsgBlockParser.detectBlocks(Str.normalize(decoded.text), true).blocks; // if there are some encryption-related blocks found in the text section, which we can use, and not look at the html section if (blocksFromTextPart.find(b => ['pkcs7', 'encryptedMsg', 'signedMsg', 'publicKey', 'privateKey'].includes(b.type))) { blocks.push(...blocksFromTextPart); // because the html most likely containt the same thing, just harder to parse pgp sections cause it's html @@ -111,13 +111,13 @@ export class Mime { signatureAttachments.push(file); } else if (treatAs === 'publicKey') { attachmentBlocks.push( - ...MsgBlockParser.detectBlocks(file.getData().toUtfStr()).blocks.map(block => { + ...MsgBlockParser.detectBlocks(file.getData().toUtfStr(), true).blocks.map(block => { return { block, file }; // todo: test when more than one }) ); } else if (treatAs === 'privateKey') { attachmentBlocks.push( - ...MsgBlockParser.detectBlocks(file.getData().toUtfStr()).blocks.map(block => { + ...MsgBlockParser.detectBlocks(file.getData().toUtfStr(), true).blocks.map(block => { return { block, file }; // todo: test when more than one }) ); diff --git a/extension/js/common/core/msg-block-parser.ts b/extension/js/common/core/msg-block-parser.ts index f8200371c60..2fcff8b4095 100644 --- a/extension/js/common/core/msg-block-parser.ts +++ b/extension/js/common/core/msg-block-parser.ts @@ -23,12 +23,12 @@ type SanitizedBlocks = { export class MsgBlockParser { private static ARMOR_HEADER_MAX_LENGTH = 50; - public static detectBlocks = (origText: string) => { + public static detectBlocks = (origText: string, completeOnly?: boolean) => { const blocks: MsgBlock[] = []; const normalized = Str.normalize(origText); let startAt = 0; while (true) { - const { found, continueAt } = MsgBlockParser.detectBlockNext(normalized, startAt); + const { found, continueAt } = MsgBlockParser.detectBlockNext(normalized, startAt, completeOnly); if (found) { blocks.push(...found); } @@ -165,7 +165,7 @@ export class MsgBlockParser { ); }; - private static detectBlockNext = (origText: string, startAt: number) => { + private static detectBlockNext = (origText: string, startAt: number, completeOnly?: boolean) => { const armorHdrTypes = Object.keys(PgpArmor.ARMOR_HEADER_DICT) as ReplaceableMsgBlockType[]; const result: { found: MsgBlock[]; continueAt?: number } = { found: [] as MsgBlock[] }; const begin = origText.indexOf(PgpArmor.headers('null').begin, startAt); @@ -211,7 +211,7 @@ export class MsgBlockParser { // identified end of the same block result.found.push(MsgBlock.fromContent(armorHdrType, origText.substring(begin, endIndex + foundBlockEndHeaderLength).trim())); result.continueAt = endIndex + foundBlockEndHeaderLength; - } else { + } else if (!completeOnly) { // corresponding end not found result.found.push(MsgBlock.fromContent(armorHdrType, origText.substr(begin), true)); } diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index ba34337c185..d34a8c4a133 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -36,16 +36,14 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitForSelTestState('ready'); await inboxPage.waitAll('iframe'); - const expectedMessage = { - encryption: 'not encrypted', - signature: 'not signed', - content: ['-----BEGIN PGP MESSAGE-----\n\nThis is not a valid PGP message'], - }; - await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame(['pgp_render_block.htm']), expectedMessage); + const plainMessage = /-----BEGIN PGP MESSAGE-----.*This is not a valid PGP message/s; + await inboxPage.waitForContent('.message.line', plainMessage); + // expect no pgp blocks + expect((await inboxPage.getFramesUrls(['pgp_render_block.htm'])).length).to.equal(0); await inboxPage.close(); const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${msgId}`, undefined, authHdr); - await gmailPage.waitAll('iframe'); - await BrowserRecipe.pgpBlockCheck(t, await gmailPage.getFrame(['pgp_render_block.htm']), expectedMessage); + await gmailPage.waitForContent('.a3s', plainMessage); + expect((await gmailPage.getFramesUrls(['pgp_render_block.htm'])).length).to.equal(0); await gmailPage.close(); }) ); From 13cb67761a89d1d9a97058efdaf339d165c5e757 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sun, 14 May 2023 20:55:21 +0100 Subject: [PATCH 061/147] render download progress initiated by content script --- extension/chrome/elements/attachment.ts | 2 +- extension/js/background_page/bg-handlers.ts | 24 ++++++++++- .../common/api/email-provider/gmail/gmail.ts | 41 +++++++++++-------- .../api/email-provider/gmail/google-auth.ts | 4 +- .../common/api/email-provider/gmail/google.ts | 20 +++++---- extension/js/common/api/shared/api.ts | 8 ++-- extension/js/common/browser/browser-msg.ts | 5 ++- extension/js/common/message-renderer.ts | 16 ++++---- .../webmail/setup-webmail-content-script.ts | 13 +++++- 9 files changed, 89 insertions(+), 44 deletions(-) diff --git a/extension/chrome/elements/attachment.ts b/extension/chrome/elements/attachment.ts index 1e3885eae86..f57c6253f41 100644 --- a/extension/chrome/elements/attachment.ts +++ b/extension/chrome/elements/attachment.ts @@ -164,7 +164,7 @@ export class AttachmentDownloadView extends View { this.attachment.setData(await Api.download(this.attachment.url, this.renderProgress)); } else if (this.attachment.id && this.attachment.msgId) { // gmail attId - const { data } = await this.gmail.attachmentGet(this.attachment.msgId, this.attachment.id, this.renderProgress); + const { data } = await this.gmail.attachmentGet(this.attachment.msgId, this.attachment.id, { download: this.renderProgress }); this.attachment.setData(data); } else { throw new Error('File is missing both id and url - this should be fixed'); diff --git a/extension/js/background_page/bg-handlers.ts b/extension/js/background_page/bg-handlers.ts index 4674a8cdcbb..38bbdff27d7 100644 --- a/extension/js/background_page/bg-handlers.ts +++ b/extension/js/background_page/bg-handlers.ts @@ -4,7 +4,7 @@ import { Api } from '../common/api/shared/api.js'; import { BgUtils } from './bgutils.js'; -import { Bm } from '../common/browser/browser-msg.js'; +import { Bm, BrowserMsg } from '../common/browser/browser-msg.js'; import { Gmail } from '../common/api/email-provider/gmail/gmail.js'; import { GlobalStore } from '../common/platform/store/global-store.js'; import { ContactStore } from '../common/platform/store/contact-store.js'; @@ -29,7 +29,27 @@ export class BgHandlers { return await dbFunc(db, ...request.args); }; - public static ajaxHandler = async (r: Bm.Ajax): Promise => { + public static ajaxHandler = async (r: Bm.Ajax, sender: Bm.Sender): Promise => { + if (r.req.context?.frameId) { + // progress updates were requested via messages + let dest = r.req.context.tabId; + if (typeof dest === 'undefined') { + // detect tabId from sender + if (sender !== 'background') { + if (typeof sender?.tab?.id !== 'undefined') { + dest = `${sender.tab.id}:0`; + } + } + } + if (typeof dest !== 'undefined') { + const destination = dest; + const frameId = r.req.context.frameId; + const fallbackTotal = r.req.context.total; + r.req.xhr = Api.getAjaxProgressXhrFactory({ + download: (percent, loaded, total) => BrowserMsg.send.ajaxProgress(destination, { percent, loaded, total: total || fallbackTotal, frameId }), + }); + } + } return await Api.ajax(r.req, r.stack); }; diff --git a/extension/js/common/api/email-provider/gmail/gmail.ts b/extension/js/common/api/email-provider/gmail/gmail.ts index 991567999f7..fd3276203df 100644 --- a/extension/js/common/api/email-provider/gmail/gmail.ts +++ b/extension/js/common/api/email-provider/gmail/gmail.ts @@ -3,7 +3,7 @@ 'use strict'; import { AddrParserResult, BrowserWindow } from '../../../browser/browser-window.js'; -import { ChunkedCb, ProgressCb, EmailProviderContact } from '../../shared/api.js'; +import { ChunkedCb, ProgressCb, EmailProviderContact, ProgressDestFrame } from '../../shared/api.js'; import { Dict, Str, Value } from '../../../core/common.js'; import { EmailProviderApi, EmailProviderInterface, Backups } from '../email-provider-api.js'; import { GMAIL_GOOGLE_API_HOST, gmailBackupSearchQuery } from '../../../core/const.js'; @@ -123,15 +123,9 @@ export class Gmail extends EmailProviderApi implements EmailProviderInterface { return await Google.gmailCall(this.acctEmail, 'GET', `labels`, {}); }; - public attachmentGet = async (msgId: string, attId: string, progressCb?: ProgressCb): Promise => { + public attachmentGet = async (msgId: string, attId: string, progress: { download: ProgressCb } | ProgressDestFrame): Promise => { type RawGmailAttRes = { attachmentId: string; size: number; data: string }; - const { attachmentId, size, data } = await Google.gmailCall( - this.acctEmail, - 'GET', - `messages/${msgId}/attachments/${attId}`, - {}, - { download: progressCb } - ); + const { attachmentId, size, data } = await Google.gmailCall(this.acctEmail, 'GET', `messages/${msgId}/attachments/${attId}`, {}, progress); return { attachmentId, size, data: Buf.fromBase64UrlStr(data) }; // data should be a Buf for ease of passing to/from bg page }; @@ -243,16 +237,18 @@ export class Gmail extends EmailProviderApi implements EmailProviderInterface { const responses = await Promise.all( attachments.map((a, index) => // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - this.attachmentGet(a.msgId!, a.id!, (_, loaded) => { - if (progressCb) { - loadedAr[index] = loaded || 0; - const totalLoaded = loadedAr.reduce((a, b) => a + b); - const progressPercent = Math.round((totalLoaded * 100) / total); - if (progressPercent !== lastProgressPercent) { - lastProgressPercent = progressPercent; - progressCb(progressPercent, totalLoaded, total); + this.attachmentGet(a.msgId!, a.id!, { + download: (_, loaded) => { + if (progressCb) { + loadedAr[index] = loaded || 0; + const totalLoaded = loadedAr.reduce((a, b) => a + b); + const progressPercent = Math.round((totalLoaded * 100) / total); + if (progressPercent !== lastProgressPercent) { + lastProgressPercent = progressPercent; + progressCb(progressPercent, totalLoaded, total); + } } - } + }, }) ) ); @@ -261,6 +257,15 @@ export class Gmail extends EmailProviderApi implements EmailProviderInterface { } }; + public fetchAttachment = async (a: Attachment, frameId: string) => { + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + const response = await this.attachmentGet(a.msgId!, a.id!, { + frameId, + total: a.length * 1.33, // todo: remove code duplication + }); + a.setData(response.data); + }; + /** * This will keep triggering callback with new emails as they are being discovered */ diff --git a/extension/js/common/api/email-provider/gmail/google-auth.ts b/extension/js/common/api/email-provider/gmail/google-auth.ts index d6154dbf168..c4cf721fa5f 100644 --- a/extension/js/common/api/email-provider/gmail/google-auth.ts +++ b/extension/js/common/api/email-provider/gmail/google-auth.ts @@ -5,7 +5,7 @@ import { Str, Url } from '../../../core/common.js'; import { FLAVOR, GOOGLE_OAUTH_SCREEN_HOST, OAUTH_GOOGLE_API_HOST } from '../../../core/const.js'; import { ApiErr } from '../../shared/api-error.js'; -import { Api } from './../../shared/api.js'; +import { Api, ApiCallContext } from './../../shared/api.js'; import { Bm, GoogleAuthWindowResult$result } from '../../../browser/browser-msg.js'; import { Buf } from '../../../core/buf.js'; @@ -122,7 +122,7 @@ export class GoogleAuth { ); }; - public static apiGoogleCallRetryAuthErrorOneTime = async (acctEmail: string, request: JQuery.AjaxSettings): Promise => { + public static apiGoogleCallRetryAuthErrorOneTime = async (acctEmail: string, request: JQuery.AjaxSettings): Promise => { try { return await Api.ajax(request, Catch.stackTrace()); } catch (firstAttemptErr) { diff --git a/extension/js/common/api/email-provider/gmail/google.ts b/extension/js/common/api/email-provider/gmail/google.ts index d28ad3eb925..5543c8deec7 100644 --- a/extension/js/common/api/email-provider/gmail/google.ts +++ b/extension/js/common/api/email-provider/gmail/google.ts @@ -2,7 +2,7 @@ 'use strict'; -import { Api, ProgressCbs, ReqMethod } from '../../shared/api.js'; +import { Api, ProgressCbs, ProgressDestFrame, ReqMethod } from '../../shared/api.js'; import { Dict, Str } from '../../../core/common.js'; import { GMAIL_GOOGLE_API_HOST, PEOPLE_GOOGLE_API_HOST } from '../../../core/const.js'; @@ -20,12 +20,12 @@ export class Google { method: ReqMethod, path: string, params: Dict | string | undefined, - progress?: ProgressCbs, + progress?: ProgressCbs | ProgressDestFrame, contentType?: string ): Promise => { progress = progress || {}; let data, url; - if (typeof progress.upload === 'function') { + if ('upload' in progress) { url = `${GMAIL_GOOGLE_API_HOST}/upload/gmail/v1/users/me/${path}?uploadType=multipart`; data = params; } else { @@ -39,8 +39,14 @@ export class Google { contentType = contentType || 'application/json; charset=UTF-8'; // eslint-disable-next-line @typescript-eslint/naming-convention const headers = { Authorization: await GoogleAuth.googleApiAuthHeader(acctEmail) }; - const xhr = Api.getAjaxProgressXhrFactory(progress); - const request = { xhr, url, method, data, headers, crossDomain: true, contentType, async: true }; + let context: ProgressDestFrame | undefined; + let xhr: (() => XMLHttpRequest) | undefined; + if ('frameId' in progress) { + context = progress; + } else { + xhr = Api.getAjaxProgressXhrFactory(progress); + } + const request = { xhr, context, url, method, data, headers, crossDomain: true, contentType, async: true }; return (await GoogleAuth.apiGoogleCallRetryAuthErrorOneTime(acctEmail, request)) as RT; }; @@ -93,11 +99,11 @@ export class Google { // todo - this could probably be achieved with emailjs-mime-builder const boundary = 'the_boundary_is_' + Str.sloppyRandom(10); let body = ''; - for (const type of Object.keys(parts)) { + for (const [type, content] of Object.entries(parts)) { body += '--' + boundary + '\n'; body += 'Content-Type: ' + type + '\n'; if (type.includes('json')) { - body += '\n' + parts[type] + '\n\n'; + body += '\n' + content + '\n\n'; } else { body += 'Content-Transfer-Encoding: base64\n'; body += '\n' + btoa(parts[type]) + '\n\n'; diff --git a/extension/js/common/api/shared/api.ts b/extension/js/common/api/shared/api.ts index 450b69a5759..6e2fae9a2fd 100644 --- a/extension/js/common/api/shared/api.ts +++ b/extension/js/common/api/shared/api.ts @@ -25,6 +25,8 @@ type RawAjaxErr = { status?: number; statusText?: string; }; +export type ProgressDestFrame = { frameId: string; total: number; tabId?: string }; +export type ApiCallContext = ProgressDestFrame | undefined; export type ChunkedCb = (r: ProviderContactsResults) => Promise; export type ProgressCb = (percent: number | undefined, loaded: number, total: number) => void; @@ -58,7 +60,7 @@ export class Api { }); }; - public static ajax = async (req: JQueryAjaxSettings, stack: string): Promise> => { + public static ajax = async (req: JQuery.AjaxSettings, stack: string): Promise> => { if (Env.isContentScript()) { // content script CORS not allowed anymore, have to drag it through background page // https://www.chromestatus.com/feature/5629709824032768 @@ -105,7 +107,7 @@ export class Api { }; public static getAjaxProgressXhrFactory = (progressCbs?: ProgressCbs): (() => XMLHttpRequest) | undefined => { - if (Env.isContentScript() || Env.isBackgroundPage() || !progressCbs || !Object.keys(progressCbs).length) { + if (Env.isContentScript() || !progressCbs || !Object.keys(progressCbs).length) { // xhr object would cause 'The object could not be cloned.' lastError during BrowserMsg passing // thus no progress callbacks in bg or content scripts // additionally no need to create this if there are no progressCbs defined @@ -191,7 +193,7 @@ export class Api { } else { throw new Error('unknown format:' + String(fmt)); } - const req: JQueryAjaxSettings = { + const req: JQuery.AjaxSettings = { xhr: Api.getAjaxProgressXhrFactory(progress), url: url + path, method, diff --git a/extension/js/common/browser/browser-msg.ts b/extension/js/common/browser/browser-msg.ts index 1bd5a42ff8f..b7f6a4909e0 100644 --- a/extension/js/common/browser/browser-msg.ts +++ b/extension/js/common/browser/browser-msg.ts @@ -3,6 +3,7 @@ 'use strict'; import { AuthRes } from '../api/email-provider/gmail/google-auth.js'; +import { ApiCallContext } from '../api/shared/api.js'; import { AjaxErr } from '../api/shared/api-error.js'; import { Buf } from '../core/buf.js'; import { Dict, Str, UrlParams } from '../core/common.js'; @@ -78,7 +79,8 @@ export namespace Bm { export type PgpMsgDiagnoseMsgPubkeys = PgpMsgMethod.Arg.DiagnosePubkeys; export type PgpMsgVerifyDetached = PgpMsgMethod.Arg.VerifyDetached; export type PgpKeyBinaryToArmored = { binaryKeysData: Uint8Array }; - export type Ajax = { req: JQueryAjaxSettings; stack: string }; + export type Ajax = { req: JQuery.AjaxSettings; stack: string }; + export type AjaxProgress = { frameId: string; percent?: number; loaded: number; total: number }; export type AjaxGmailAttachmentGetChunk = { acctEmail: string; msgId: string; attachmentId: string }; export type ShowAttachmentPreview = { iframeUrl: string }; export type ShowConfirmation = { text: string; isHTML: boolean; footer?: string }; @@ -267,6 +269,7 @@ export class BrowserMsg { addToContacts: (dest: Bm.Dest) => BrowserMsg.sendCatch(dest, 'addToContacts', {}), reRenderRecipient: (dest: Bm.Dest, bm: Bm.ReRenderRecipient) => BrowserMsg.sendCatch(dest, 'reRenderRecipient', bm), showAttachmentPreview: (dest: Bm.Dest, bm: Bm.ShowAttachmentPreview) => BrowserMsg.sendCatch(dest, 'show_attachment_preview', bm), + ajaxProgress: (dest: Bm.Dest, bm: Bm.AjaxProgress) => BrowserMsg.sendCatch(dest, 'ajax_progress', bm), }; /* eslint-disable @typescript-eslint/naming-convention */ private static HANDLERS_REGISTERED_BACKGROUND: Handlers = {}; diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index 6672505a507..5392b734f00 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -262,8 +262,8 @@ export class MessageRenderer { loaderContext.prependEncryptedAttachment(a); return 'replaced'; // native should be hidden, custom should appear instead } else if (treatAs === 'encryptedMsg') { - await this.setMsgBodyAndStartProcessing(loaderContext, treatAs, printMailInfo, renderModule => - this.processEncryptedMessage(a, renderModule, senderEmail) + await this.setMsgBodyAndStartProcessing(loaderContext, treatAs, printMailInfo, (renderModule, frameId) => + this.processEncryptedMessage(a, renderModule, frameId, senderEmail) ); return 'hidden'; // native attachment should be hidden, the "attachment" goes to the message container } else if (treatAs === 'publicKey') { @@ -492,12 +492,12 @@ export class MessageRenderer { factory: XssSafeFactory, frameId: string, printMailInfo: PrintMailInfo, - cb: (renderModule: RenderInterface) => Promise<{ publicKeys?: string[]; needPassphrase?: string[] }> + cb: (renderModule: RenderInterface, frameId: string) => Promise<{ publicKeys?: string[]; needPassphrase?: string[] }> ) => { const renderModule = relayManager.createRelay(frameId); loaderContext.bind(frameId, relayManager); renderModule.setPrintMailInfo(printMailInfo); - cb(renderModule) + cb(renderModule, frameId) .then(async result => { const appendAfter = $(`iframe#${frameId}`); // todo: late binding? won't work // todo: how publicKeys and needPassphrase interact? @@ -509,7 +509,7 @@ export class MessageRenderer { await PassphraseStore.waitUntilPassphraseChanged(this.acctEmail, result.needPassphrase); renderModule.clearErrorStatus(); renderModule.renderText('Decrypting...'); - result = await cb(renderModule); + result = await cb(renderModule, frameId); } // todo: wait for renderModule completion: the queue has been actually flushed, // and then remove the frame from relayManager.frames @@ -644,7 +644,7 @@ export class MessageRenderer { loaderContext: LoaderContextInterface, type: MsgBlockType, // for diagnostics printMailInfo: PrintMailInfo, - cb: (renderModule: RenderInterface) => Promise<{ publicKeys?: string[] }> + cb: (renderModule: RenderInterface, frameId: string) => Promise<{ publicKeys?: string[] }> ) => { const { frameId, frameXssSafe } = loaderContext.factory.embeddedRenderMsg(type); loaderContext.setMsgBody(frameXssSafe, 'set'); @@ -663,12 +663,12 @@ export class MessageRenderer { return {}; }; - private processEncryptedMessage = async (attachment: Attachment, renderModule: RenderInterface, senderEmail: string) => { + private processEncryptedMessage = async (attachment: Attachment, renderModule: RenderInterface, frameId: string, senderEmail: string) => { try { if (!attachment.hasData()) { // todo: common cache, load control? renderModule.renderText('Retrieving message...'); - await this.gmail.fetchAttachments([attachment]); // todo: render progressCb + await this.gmail.fetchAttachment(attachment, frameId); } // todo: probaby subject isn't relevant in attachment-based decryption? // const subject = gmailMsg.payload ? GmailParser.findHeader(gmailMsg.payload, 'subject') : undefined; diff --git a/extension/js/content_scripts/webmail/setup-webmail-content-script.ts b/extension/js/content_scripts/webmail/setup-webmail-content-script.ts index 9425a40797d..6acce5bf7b5 100644 --- a/extension/js/content_scripts/webmail/setup-webmail-content-script.ts +++ b/extension/js/content_scripts/webmail/setup-webmail-content-script.ts @@ -25,6 +25,7 @@ import { GlobalStore } from '../../common/platform/store/global-store.js'; import { InMemoryStore } from '../../common/platform/store/in-memory-store.js'; import { WebmailVariantString, XssSafeFactory } from '../../common/xss-safe-factory.js'; import { RelayManager } from '../../common/relay-manager.js'; +import { RelayManagerInterface } from '../../common/relay-manager-interface.js'; export type WebmailVariantObject = { newDataLayer: undefined | boolean; @@ -154,6 +155,7 @@ export const contentScriptSetupIfVacant = async (webmailSpecific: WebmailSpecifi inject: Injector, factory: XssSafeFactory, notifications: Notifications, + relayManager: RelayManagerInterface, ppEvent: { entered?: boolean } ) => { BrowserMsg.addListener('set_active_window', async ({ frameId }: Bm.ComposeWindow) => { @@ -233,6 +235,13 @@ export const contentScriptSetupIfVacant = async (webmailSpecific: WebmailSpecifi BrowserMsg.addListener('show_attachment_preview', async ({ iframeUrl }: Bm.ShowAttachmentPreview) => { await Ui.modal.attachmentPreview(iframeUrl); }); + BrowserMsg.addListener('ajax_progress', async ({ frameId, percent, loaded, total }: Bm.AjaxProgress) => { + const perc = percent ?? (total > 0 ? Math.round((loaded / total) * 100) : undefined); + if (typeof perc !== 'undefined') { + // todo: ignore messages after something else is rendered + relayManager.relay(frameId, { renderText: `Retrieving message... ${perc}%` }); + } + }); BrowserMsg.listen(tabId); }; @@ -416,7 +425,8 @@ export const contentScriptSetupIfVacant = async (webmailSpecific: WebmailSpecifi await showNotificationsAndWaitTilAcctSetUp(acctEmail, notifications); Catch.setHandledTimeout(() => updateClientConfiguration(acctEmail), 0); const ppEvent: { entered?: boolean } = {}; - browserMsgListen(acctEmail, tabId, inject, factory, notifications, ppEvent); + const relayManager = new RelayManager(); + browserMsgListen(acctEmail, tabId, inject, factory, notifications, relayManager, ppEvent); const clientConfiguration = await ClientConfiguration.newInstance(acctEmail); await startPullingKeysFromEkm( acctEmail, @@ -425,7 +435,6 @@ export const contentScriptSetupIfVacant = async (webmailSpecific: WebmailSpecifi ppEvent, Catch.try(() => notifyExpiringKeys(acctEmail, clientConfiguration, notifications)) ); - const relayManager = new RelayManager(); window.addEventListener('message', e => { const regex = new RegExp(`^(chrome|moz)-extension://${chrome.runtime.id}$`); if (regex.test(e.origin) && typeof e.data?.readyToReceive === 'string') { From 401a6537c6b2ff636cc3a0676b12c6b83aaee500 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 15 May 2023 10:53:42 +0100 Subject: [PATCH 062/147] don't enqueue progress updates --- extension/js/common/relay-manager-interface.ts | 2 +- extension/js/common/relay-manager.ts | 9 ++++++--- .../webmail/setup-webmail-content-script.ts | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/extension/js/common/relay-manager-interface.ts b/extension/js/common/relay-manager-interface.ts index 59858a4ec3f..51917d03da5 100644 --- a/extension/js/common/relay-manager-interface.ts +++ b/extension/js/common/relay-manager-interface.ts @@ -5,7 +5,7 @@ import { RenderMessage } from './render-message.js'; export interface RelayManagerInterface { - relay(frameId: string, message: RenderMessage): void; + relay(frameId: string, message: RenderMessage, dontEnqueue?: boolean): void; } export interface BindInterface { diff --git a/extension/js/common/relay-manager.ts b/extension/js/common/relay-manager.ts index 06c9e3c73e0..cee120f70e1 100644 --- a/extension/js/common/relay-manager.ts +++ b/extension/js/common/relay-manager.ts @@ -11,10 +11,13 @@ import { RenderRelay } from './render-relay.js'; export class RelayManager implements RelayManagerInterface, BindInterface { private frames: Dict<{ frameWindow?: Window; readyToReceive?: true; queue: RenderMessage[] }> = {}; - public relay = (frameId: string, message: RenderMessage) => { + public relay = (frameId: string, message: RenderMessage, dontEnqueue?: boolean) => { const { frameWindow, readyToReceive, queue } = this.frames[frameId]; - queue.push(message); - if (readyToReceive && frameWindow) { + const canFlush = readyToReceive && frameWindow; + if (canFlush || !dontEnqueue) { + queue.push(message); + } + if (canFlush) { this.flush({ frameWindow, queue }); } }; diff --git a/extension/js/content_scripts/webmail/setup-webmail-content-script.ts b/extension/js/content_scripts/webmail/setup-webmail-content-script.ts index 6acce5bf7b5..88d4a7f8292 100644 --- a/extension/js/content_scripts/webmail/setup-webmail-content-script.ts +++ b/extension/js/content_scripts/webmail/setup-webmail-content-script.ts @@ -239,7 +239,7 @@ export const contentScriptSetupIfVacant = async (webmailSpecific: WebmailSpecifi const perc = percent ?? (total > 0 ? Math.round((loaded / total) * 100) : undefined); if (typeof perc !== 'undefined') { // todo: ignore messages after something else is rendered - relayManager.relay(frameId, { renderText: `Retrieving message... ${perc}%` }); + relayManager.relay(frameId, { renderText: `Retrieving message... ${perc}%` }, true); } }); BrowserMsg.listen(tabId); From ac30f6f0676133e99ffbffe782b24524ba9fb7e2 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 15 May 2023 15:49:11 +0100 Subject: [PATCH 063/147] reimplemented key mismatch and removed Gmail.extractArmoredBlock --- .../pgp-block-error-module.ts | 29 ----- .../inbox-active-thread-module.ts | 7 +- .../common/api/email-provider/gmail/gmail.ts | 70 ------------ extension/js/common/browser/browser-msg.ts | 9 +- extension/js/common/downloader.ts | 8 +- extension/js/common/message-renderer.ts | 103 +++++++++++++----- extension/js/common/render-message.ts | 5 + .../webmail/gmail-element-replacer.ts | 20 ++-- .../tests/browser-unit-tests/unit-Gmail.js | 30 ----- test/source/tests/decrypt.ts | 25 +++++ 10 files changed, 124 insertions(+), 182 deletions(-) diff --git a/extension/chrome/elements/pgp_block_modules/pgp-block-error-module.ts b/extension/chrome/elements/pgp_block_modules/pgp-block-error-module.ts index 4241a9a0718..fe50b7ff9de 100644 --- a/extension/chrome/elements/pgp_block_modules/pgp-block-error-module.ts +++ b/extension/chrome/elements/pgp_block_modules/pgp-block-error-module.ts @@ -4,7 +4,6 @@ import { Browser } from '../../../js/common/browser/browser.js'; import { BrowserMsg } from '../../../js/common/browser/browser-msg.js'; -import { Lang } from '../../../js/common/lang.js'; import { PgpBaseBlockView } from '../pgp_base_block_view.js'; import { Ui } from '../../../js/common/browser/ui.js'; import { Xss } from '../../../js/common/platform/xss.js'; @@ -54,32 +53,4 @@ export class PgpBlockViewErrorModule { console.log(`[${this.debugId}] ${msg}`); } }; - - public handlePrivateKeyMismatch = async (armoredPubs: string[], message: Uint8Array | string, isPwdMsg: boolean) => { - // todo - make it work for multiple stored keys - const msgDiagnosis = await BrowserMsg.send.bg.await.pgpMsgDiagnosePubkeys({ armoredPubs, message }); - if (msgDiagnosis.found_match) { - await this.renderErr(Lang.pgpBlock.cantOpen + Lang.pgpBlock.encryptedCorrectlyFileBug, undefined); - } else if (isPwdMsg) { - await this.renderErr(Lang.pgpBlock.pwdMsgOnlyReadableOnWeb + this.btnHtml('ask sender to re-send', 'gray2 short reply_pubkey_mismatch'), undefined); - } else { - const startText = - msgDiagnosis.receivers === 1 - ? Lang.pgpBlock.cantOpen + Lang.pgpBlock.singleSender + Lang.pgpBlock.askResend - : Lang.pgpBlock.yourKeyCantOpenImportIfHave; - await this.renderErr( - startText + - this.btnHtml('import missing key', 'gray2 settings_add_key') + - '   ' + - this.btnHtml('ask sender to update', 'gray2 short reply_pubkey_mismatch') + - '   ' + - this.btnHtml('settings', 'gray2 settings_keyserver'), - undefined - ); - } - }; - - public btnHtml = (text: string, addClasses: string) => { - return ``; - }; } diff --git a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts index 618fd7c91ae..6c99a4c72be 100644 --- a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts +++ b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts @@ -152,11 +152,11 @@ export class InboxActiveThreadModule extends ViewModule { const msg = await this.view.messageRenderer.downloader.msgGetCached(message.id).download.full; const mimeContent = MessageRenderer.reconstructMimeContent(msg); const blocks = Mime.processBody(mimeContent); - const printInfoHtml = await this.view.messageRenderer.getPrintViewInfo(msg); + const printInfoHtml = await this.view.messageRenderer.getMessageInfo(msg); // todo: review the meaning of threadHasPgpBlock this.threadHasPgpBlock ||= blocks.some(block => ['encryptedMsg', 'publicKey', 'privateKey', 'signedMsg'].includes(block.type)); // todo: take `from` from the processedMessage? - const { renderedXssSafe, singlePlainBlock, blocksInFrames, printMailInfo, from } = await this.view.messageRenderer.msgGetProcessed(message.id); + const { renderedXssSafe, singlePlainBlock, blocksInFrames, messageInfo, from } = await this.view.messageRenderer.msgGetProcessed(message.id); const senderEmail = from || 'unknown'; const exportBtn = this.debugEmails.includes(this.view.acctEmail) ? 'download api export' : ''; const loaderContext = new LoaderContext( @@ -167,6 +167,7 @@ export class InboxActiveThreadModule extends ViewModule { .concat(singlePlainBlock ? [singlePlainBlock] : []) .map(block => XssSafeFactory.renderableMsgBlock(this.view.factory, block, message.id, senderEmail, this.view.messageRenderer.isOutgoing(senderEmail))) ); + // todo: test else if (this.view.showOriginal) { r += Xss.escape(Str.with(block.content)).replace(/\n/g, '
');} for (const a of mimeContent.attachments) { await this.view.messageRenderer.processAttachment( a, @@ -174,7 +175,7 @@ export class InboxActiveThreadModule extends ViewModule { loaderContext, undefined, message.id, - printMailInfo, + messageInfo, senderEmail ); } diff --git a/extension/js/common/api/email-provider/gmail/gmail.ts b/extension/js/common/api/email-provider/gmail/gmail.ts index fd3276203df..bbae2232c1a 100644 --- a/extension/js/common/api/email-provider/gmail/gmail.ts +++ b/extension/js/common/api/email-provider/gmail/gmail.ts @@ -15,13 +15,9 @@ import { Buf } from '../../../core/buf.js'; import { Catch } from '../../../platform/catch.js'; import { KeyUtil } from '../../../core/crypto/key.js'; import { Env } from '../../../browser/env.js'; -import { FormatError } from '../../../core/crypto/pgp/msg-util.js'; import { Google } from './google.js'; import { GoogleAuth } from './google-auth.js'; -import { Mime } from '../../../core/mime.js'; -import { PgpArmor } from '../../../core/crypto/pgp/pgp-armor.js'; import { SendableMsg } from '../sendable-msg.js'; -import { Xss } from '../../../platform/xss.js'; import { KeyStore } from '../../../platform/store/key-store.js'; export type GmailResponseFormat = 'raw' | 'full' | 'metadata'; @@ -312,72 +308,6 @@ export class Gmail extends EmailProviderApi implements EmailProviderInterface { await this.apiGmailLoopThroughEmailsToCompileContacts(needles, gmailQuery, chunkedCb); }; - /** @deprecated should not be used by pgp_block frames - * Extracts the encrypted message from gmail api. Sometimes it's sent as a text, sometimes html, sometimes attachments in various forms. - * As MsgBlockParser detects incomplete encryptedMsg etc. and they get through, we're handling them too - */ - public extractArmoredBlock = async ( - msgId: string, - format: GmailResponseFormat, - progressCb?: ProgressCb - ): Promise<{ armored: string; plaintext?: string; subject?: string; isPwdMsg: boolean }> => { - // only track progress in this call if we are getting RAW mime, - // because these tend to be big, while 'full' and 'metadata' are tiny - // since we often do full + get attachments below, the user would see 100% after the first short request, - // and then again 0% when attachments start downloading, which would be confusing - const gmailMsg = await this.msgGet(msgId, format, format === 'raw' ? progressCb : undefined); - const isPwdMsg = /https:\/\/flowcrypt\.com\/[a-zA-Z0-9]{10}$/.test(gmailMsg.snippet || ''); - const subject = gmailMsg.payload ? GmailParser.findHeader(gmailMsg.payload, 'subject') : undefined; - if (format === 'full') { - const bodies = GmailParser.findBodies(gmailMsg); - const attachments = GmailParser.findAttachments(gmailMsg, gmailMsg.id); - const textBody = Buf.fromBase64UrlStr(bodies['text/plain'] || '').toUtfStr(); - const fromTextBody = PgpArmor.clip(textBody); - if (fromTextBody) { - return { armored: fromTextBody, subject, isPwdMsg }; - } - const htmlBody = Xss.htmlSanitizeAndStripAllTags(Buf.fromBase64UrlStr(bodies['text/html'] || '').toUtfStr(), '\n'); - const fromHtmlBody = PgpArmor.clip(htmlBody); - if (fromHtmlBody) { - return { armored: fromHtmlBody, subject, isPwdMsg }; - } - for (const attachment of attachments) { - if (attachment.treatAs(attachments, !!textBody) === 'encryptedMsg') { - await this.fetchAttachments([attachment], progressCb); - const armoredMsg = PgpArmor.clip(attachment.getData().toUtfStr()); - if (!armoredMsg) { - throw new FormatError('Problem extracting armored message', attachment.getData().toUtfStr()); - } - return { armored: armoredMsg, subject, isPwdMsg }; - } - } - const plaintext = PgpArmor.clipIncomplete(textBody) || PgpArmor.clipIncomplete(htmlBody); - if (plaintext) { - return { armored: '', plaintext, subject, isPwdMsg }; - } - throw new FormatError('Armored message not found', textBody || htmlBody); - } else { - // format === raw - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - const mimeMsg = Buf.fromBase64UrlStr(gmailMsg.raw!); - const decoded = await Mime.decode(mimeMsg); - if (decoded.text !== undefined) { - const armoredMsg = PgpArmor.clip(decoded.text); - if (armoredMsg) { - return { armored: armoredMsg, subject, isPwdMsg }; - } - // todo - the message might be in attachments - const plaintext = PgpArmor.clipIncomplete(decoded.text); - if (plaintext) { - return { armored: '', plaintext, subject, isPwdMsg }; - } - throw new FormatError('Could not find armored message in parsed raw mime', mimeMsg.toUtfStr()); - } else { - throw new FormatError('No text in parsed raw mime', mimeMsg.toUtfStr()); - } - } - }; - public fetchAcctAliases = async (): Promise => { const res = (await Google.gmailCall(this.acctEmail, 'GET', 'settings/sendAs', {})) as GmailRes.GmailAliases; for (const sendAs of res.sendAs) { diff --git a/extension/js/common/browser/browser-msg.ts b/extension/js/common/browser/browser-msg.ts index b7f6a4909e0..e5de98d8505 100644 --- a/extension/js/common/browser/browser-msg.ts +++ b/extension/js/common/browser/browser-msg.ts @@ -8,7 +8,7 @@ import { AjaxErr } from '../api/shared/api-error.js'; import { Buf } from '../core/buf.js'; import { Dict, Str, UrlParams } from '../core/common.js'; import { ArmoredKeyIdentityWithEmails, KeyUtil } from '../core/crypto/key.js'; -import { DecryptResult, DiagnoseMsgPubkeysResult, MsgUtil, PgpMsgMethod, VerifyRes } from '../core/crypto/pgp/msg-util.js'; +import { DecryptResult, MsgUtil, PgpMsgMethod, VerifyRes } from '../core/crypto/pgp/msg-util.js'; import { NotificationGroupType } from '../notifications.js'; import { Catch } from '../platform/catch.js'; import { AccountIndex, AcctStoreDict } from '../platform/store/acct-store.js'; @@ -76,7 +76,6 @@ export namespace Bm { export type StoreAcctSet = { acctEmail: string; values: AcctStoreDict }; export type ReconnectAcctAuthPopup = { acctEmail: string; scopes?: string[] }; export type PgpMsgDecrypt = PgpMsgMethod.Arg.Decrypt; - export type PgpMsgDiagnoseMsgPubkeys = PgpMsgMethod.Arg.DiagnosePubkeys; export type PgpMsgVerifyDetached = PgpMsgMethod.Arg.VerifyDetached; export type PgpKeyBinaryToArmored = { binaryKeysData: Uint8Array }; export type Ajax = { req: JQuery.AjaxSettings; stack: string }; @@ -102,7 +101,6 @@ export namespace Bm { export type StoreAcctSet = void; export type ReconnectAcctAuthPopup = AuthRes; export type PgpMsgDecrypt = DecryptResult; - export type PgpMsgDiagnoseMsgPubkeys = DiagnoseMsgPubkeysResult; export type PgpMsgVerify = VerifyRes; export type PgpKeyBinaryToArmored = { keys: ArmoredKeyIdentityWithEmails[] }; export type AjaxGmailAttachmentGetChunk = { chunk: Buf }; @@ -119,7 +117,6 @@ export namespace Bm { | _tab_ | ReconnectAcctAuthPopup | PgpMsgDecrypt - | PgpMsgDiagnoseMsgPubkeys | PgpMsgVerify | InMemoryStoreGet | InMemoryStoreSet @@ -162,7 +159,6 @@ export namespace Bm { | StoreAcctGet | StoreAcctSet | PgpMsgDecrypt - | PgpMsgDiagnoseMsgPubkeys | PgpMsgVerifyDetached | Ajax | ShowAttachmentPreview @@ -226,8 +222,6 @@ export class BrowserMsg { ajax: (bm: Bm.Ajax): Promise => BrowserMsg.sendAwait(undefined, 'ajax', bm, true) as Promise, ajaxGmailAttachmentGetChunk: (bm: Bm.AjaxGmailAttachmentGetChunk) => BrowserMsg.sendAwait(undefined, 'ajaxGmailAttachmentGetChunk', bm, true) as Promise, - pgpMsgDiagnosePubkeys: (bm: Bm.PgpMsgDiagnoseMsgPubkeys) => - BrowserMsg.sendAwait(undefined, 'pgpMsgDiagnosePubkeys', 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, @@ -332,7 +326,6 @@ export class BrowserMsg { }; public static addPgpListeners = () => { - BrowserMsg.bgAddListener('pgpMsgDiagnosePubkeys', MsgUtil.diagnosePubkeys); BrowserMsg.bgAddListener('pgpMsgDecrypt', MsgUtil.decryptMessage); BrowserMsg.bgAddListener('pgpMsgVerifyDetached', MsgUtil.verifyDetached); BrowserMsg.bgAddListener('saveFetchedPubkeys', saveFetchedPubkeysIfNewerThanInStorage); diff --git a/extension/js/common/downloader.ts b/extension/js/common/downloader.ts index 1eac87d833b..5fecdb3a7fd 100644 --- a/extension/js/common/downloader.ts +++ b/extension/js/common/downloader.ts @@ -6,15 +6,15 @@ import { GmailRes } from './api/email-provider/gmail/gmail-parser'; import { Gmail } from './api/email-provider/gmail/gmail.js'; import { Attachment } from './core/attachment.js'; import { Buf } from './core/buf.js'; -import { Dict } from './core/common'; -import { MsgBlock } from './core/msg-block'; -import { PrintMailInfo } from './render-message'; +import { Dict } from './core/common.js'; +import { MsgBlock } from './core/msg-block.js'; +import { MessageInfo } from './render-message.js'; export type ProcessedMessage = { renderedXssSafe?: string; blocksInFrames: Dict; attachments: Attachment[]; - printMailInfo: PrintMailInfo; + messageInfo: MessageInfo; singlePlainBlock?: MsgBlock; from?: string; }; diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index 5392b734f00..201c5d31daa 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -23,7 +23,7 @@ import { PassphraseStore } from './platform/store/passphrase-store.js'; import { Xss } from './platform/xss.js'; import { RelayManager } from './relay-manager.js'; import { RenderInterface, RenderInterfaceBase } from './render-interface.js'; -import { PrintMailInfo } from './render-message.js'; +import { MessageInfo, PrintMailInfo } from './render-message.js'; import { saveFetchedPubkeysIfNewerThanInStorage } from './shared.js'; import { XssSafeFactory } from './xss-safe-factory.js'; import * as DOMPurify from 'dompurify'; @@ -210,6 +210,37 @@ export class MessageRenderer { return parsedPubs.map(key => KeyUtil.armor(key.pubkey)); }; + private static handlePrivateKeyMismatch = async (renderModule: RenderInterface, armoredPubs: string[], message: Uint8Array | string, isPwdMsg: boolean) => { + // todo - make it work for multiple stored keys + const msgDiagnosis = await MsgUtil.diagnosePubkeys({ armoredPubs, message }); + if (msgDiagnosis.found_match) { + renderModule.renderErr(Lang.pgpBlock.cantOpen + Lang.pgpBlock.encryptedCorrectlyFileBug, undefined); + } else if (isPwdMsg) { + renderModule.renderErr( + Lang.pgpBlock.pwdMsgOnlyReadableOnWeb + MessageRenderer.btnHtml('ask sender to re-send', 'gray2 short reply_pubkey_mismatch'), + undefined + ); + } else { + const startText = + msgDiagnosis.receivers === 1 + ? Lang.pgpBlock.cantOpen + Lang.pgpBlock.singleSender + Lang.pgpBlock.askResend + : Lang.pgpBlock.yourKeyCantOpenImportIfHave; + renderModule.renderErr( + startText + + MessageRenderer.btnHtml('import missing key', 'gray2 settings_add_key') + + '   ' + + MessageRenderer.btnHtml('ask sender to update', 'gray2 short reply_pubkey_mismatch') + + '   ' + + MessageRenderer.btnHtml('settings', 'gray2 settings_keyserver'), + undefined + ); + } + }; + + private static btnHtml = (text: string, addClasses: string) => { + return ``; + }; + public isOutgoing = (senderEmail: string) => { return !!this.sendAs[senderEmail]; // todo: remove code duplication }; @@ -220,7 +251,7 @@ export class MessageRenderer { loaderContext: LoaderContextInterface, attachmentSel: JQueryEl | undefined, msgId: string, // deprecated - printMailInfo: PrintMailInfo, + messageInfo: MessageInfo, senderEmail: string ): Promise<'shown' | 'hidden' | 'replaced'> => { // todo - [same name + not processed].first() ... What if attachment metas are out of order compared to how gmail shows it? And have the same name? @@ -262,8 +293,8 @@ export class MessageRenderer { loaderContext.prependEncryptedAttachment(a); return 'replaced'; // native should be hidden, custom should appear instead } else if (treatAs === 'encryptedMsg') { - await this.setMsgBodyAndStartProcessing(loaderContext, treatAs, printMailInfo, (renderModule, frameId) => - this.processEncryptedMessage(a, renderModule, frameId, senderEmail) + await this.setMsgBodyAndStartProcessing(loaderContext, treatAs, messageInfo.printMailInfo, (renderModule, frameId) => + this.processEncryptedMessage(a, renderModule, frameId, senderEmail, messageInfo.isPwdMsgBasedOnMsgSnippet) ); return 'hidden'; // native attachment should be hidden, the "attachment" goes to the message container } else if (treatAs === 'publicKey') { @@ -272,7 +303,7 @@ export class MessageRenderer { } else if (treatAs === 'privateKey') { return await this.renderBackupFromFile(a, loaderContext, this.isOutgoing(senderEmail)); } else if (treatAs === 'signature') { - await this.setMsgBodyAndStartProcessing(loaderContext, 'signedMsg', printMailInfo, renderModule => + await this.setMsgBodyAndStartProcessing(loaderContext, 'signedMsg', messageInfo.printMailInfo, renderModule => this.processSignedMessage(msgId, renderModule, senderEmail) ); return 'hidden'; // native attachment should be hidden, the "attachment" goes to the message container @@ -296,37 +327,38 @@ export class MessageRenderer { public processInlineBlocks = async ( relayManager: RelayManager, factory: XssSafeFactory, - printMailInfo: PrintMailInfo, + messageInfo: MessageInfo, blocks: Dict, from?: string // need to unify somehow when we accept `abc ` and when just `email@address` ) => { const signerEmail = from ? Str.parseEmail(from).email : undefined; await Promise.all( Object.entries(blocks).map(([frameId, block]) => - this.relayAndStartProcessing(relayManager, new LoaderContextBindNow(), factory, frameId, printMailInfo, renderModule => - this.renderMsgBlock(block, renderModule, signerEmail) + this.relayAndStartProcessing(relayManager, new LoaderContextBindNow(), factory, frameId, messageInfo.printMailInfo, renderModule => + this.renderMsgBlock(block, renderModule, signerEmail, messageInfo.isPwdMsgBasedOnMsgSnippet) ) ) ); }; - public getPrintViewInfo = async (metadata: GmailRes.GmailMsg): Promise => { + public getMessageInfo = async (fullMsg: GmailRes.GmailMsg): Promise => { const fullName = await AcctStore.get(this.acctEmail, ['full_name']); // todo: cache - const sentDate = GmailParser.findHeader(metadata, 'date'); + const sentDate = GmailParser.findHeader(fullMsg, 'date'); const sentDateStr = sentDate ? Str.fromDate(new Date(sentDate)).replace(' ', ' at ') : ''; - const from = Str.parseEmail(GmailParser.findHeader(metadata, 'from') ?? ''); + const from = Str.parseEmail(GmailParser.findHeader(fullMsg, 'from') ?? ''); const fromHtml = from.name ? `${Xss.htmlSanitize(from.name)} <${from.email}>` : from.email; /* eslint-disable @typescript-eslint/no-non-null-assertion */ - const ccString = GmailParser.findHeader(metadata, 'cc') - ? `Cc: ${Xss.escape(GmailParser.findHeader(metadata, 'cc')!)}
` + const ccString = GmailParser.findHeader(fullMsg, 'cc') + ? `Cc: ${Xss.escape(GmailParser.findHeader(fullMsg, 'cc')!)}
` : ''; - const bccString = GmailParser.findHeader(metadata, 'bcc') ? `Bcc: ${Xss.escape(GmailParser.findHeader(metadata, 'bcc')!)}
` : ''; + const bccString = GmailParser.findHeader(fullMsg, 'bcc') ? `Bcc: ${Xss.escape(GmailParser.findHeader(fullMsg, 'bcc')!)}
` : ''; /* eslint-enable @typescript-eslint/no-non-null-assertion */ return { - userNameAndEmail: `${fullName.full_name} <${this.acctEmail}>`, - html: ` + printMailInfo: { + userNameAndEmail: `${fullName.full_name} <${this.acctEmail}>`, + html: `
-

${Xss.htmlSanitize(GmailParser.findHeader(metadata, 'subject') ?? '')}

+

${Xss.htmlSanitize(GmailParser.findHeader(fullMsg, 'subject') ?? '')}


@@ -337,11 +369,13 @@ export class MessageRenderer { ${sentDateStr}
- To: ${Xss.escape(GmailParser.findHeader(metadata, 'to') ?? '')}
+ To: ${Xss.escape(GmailParser.findHeader(fullMsg, 'to') ?? '')}
${ccString} ${bccString}
`, + }, + isPwdMsgBasedOnMsgSnippet: /https:\/\/flowcrypt\.com\/[a-zA-Z0-9]{10}$/.test(fullMsg.snippet || ''), }; }; @@ -382,7 +416,7 @@ export class MessageRenderer { renderedXssSafe, singlePlainBlock, blocksInFrames, - printMailInfo: await this.getPrintViewInfo(fullMsg), + messageInfo: await this.getMessageInfo(fullMsg), from, attachments: mimeContent.attachments, }; @@ -519,9 +553,14 @@ export class MessageRenderer { .catch(Catch.reportErr); }; - private renderMsgBlock = async (block: MsgBlock, renderModule: RenderInterface, signerEmail?: string) => { + private renderMsgBlock = async ( + block: MsgBlock, + renderModule: RenderInterface, + signerEmail: string | undefined, + isPwdMsgBasedOnMsgSnippet: boolean | undefined + ) => { // todo: 'signedMsg' also handled here? - return await this.renderEncryptedMessage(block.content, renderModule, true, signerEmail); + return await this.renderEncryptedMessage(block.content, renderModule, true, signerEmail, isPwdMsgBasedOnMsgSnippet); }; // todo: this should be moved to some other class? @@ -581,7 +620,8 @@ export class MessageRenderer { encryptedData: string | Uint8Array, renderModule: RenderInterface, fallbackToPlainText: boolean, - signerEmail?: string + signerEmail: string | undefined, + isPwdMsgBasedOnMsgSnippet: boolean | undefined ): Promise<{ publicKeys?: string[]; needPassphrase?: string[] }> => { const kisWithPp = await KeyStore.getAllWithOptionalPassPhrase(this.acctEmail); // todo: cache const verificationPubs = signerEmail ? await MessageRenderer.getVerificationPubs(signerEmail) : []; @@ -611,13 +651,14 @@ export class MessageRenderer { return { needPassphrase: result.longids.needPassphrase }; } else { if (!result.longids.chosen && !(await KeyStore.get(this.acctEmail)).length) { - renderModule.renderErr(Lang.pgpBlock.notProperlySetUp /* + todo: this.view.errorModule.btnHtml('FlowCrypt settings', 'green settings') */, undefined); + renderModule.renderErr(Lang.pgpBlock.notProperlySetUp + MessageRenderer.btnHtml('FlowCrypt settings', 'green settings'), undefined); } else if (result.error.type === DecryptErrTypes.keyMismatch) { - /* todo: await this.view.errorModule.handlePrivateKeyMismatch( + await MessageRenderer.handlePrivateKeyMismatch( + renderModule, kisWithPp.map(ki => ki.public), encryptedData, - this.isPwdMsgBasedOnMsgSnippet === true - ); */ + isPwdMsgBasedOnMsgSnippet === true + ); } else if (result.error.type === DecryptErrTypes.wrongPwd || result.error.type === DecryptErrTypes.usePassword) { renderModule.renderErr(Lang.pgpBlock.pwdMsgAskSenderUsePubkey, undefined); } else if (result.error.type === DecryptErrTypes.noMdc) { @@ -663,7 +704,13 @@ export class MessageRenderer { return {}; }; - private processEncryptedMessage = async (attachment: Attachment, renderModule: RenderInterface, frameId: string, senderEmail: string) => { + private processEncryptedMessage = async ( + attachment: Attachment, + renderModule: RenderInterface, + frameId: string, + senderEmail: string, + isPwdMsgBasedOnMsgSnippet?: boolean + ) => { try { if (!attachment.hasData()) { // todo: common cache, load control? @@ -678,7 +725,7 @@ export class MessageRenderer { throw new FormatError('Problem extracting armored message', attachment.getData().toUtfStr()); } renderModule.renderText('Decrypting...'); - return await this.renderEncryptedMessage(armoredMsg, renderModule, false, senderEmail); + return await this.renderEncryptedMessage(armoredMsg, renderModule, false, senderEmail, isPwdMsgBasedOnMsgSnippet); } catch { // todo: render error via renderModule } diff --git a/extension/js/common/render-message.ts b/extension/js/common/render-message.ts index 9f6fe89d570..ace0a746c1f 100644 --- a/extension/js/common/render-message.ts +++ b/extension/js/common/render-message.ts @@ -9,6 +9,11 @@ export type PrintMailInfo = { html: string; }; +export type MessageInfo = { + printMailInfo: PrintMailInfo; + isPwdMsgBasedOnMsgSnippet?: boolean; +}; + export type RenderMessage = { setTestState?: 'ready' | 'working' | 'waiting'; resizePgpBlockFrame?: true; diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index 348f6cbe2f8..93b4c6e03ad 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -24,7 +24,7 @@ import { SendAsAlias } from '../../common/platform/store/acct-store.js'; import { ContactStore } from '../../common/platform/store/contact-store.js'; import { MessageRenderer } from '../../common/message-renderer.js'; import { RelayManager } from '../../common/relay-manager.js'; -import { PrintMailInfo } from '../../common/render-message.js'; +import { MessageInfo } from '../../common/render-message.js'; import { LoaderContextWebmail } from './loader-context.js'; import { JQueryEl } from '../../common/loader-context-interface.js'; import { Mime } from '../../common/core/mime.js'; @@ -166,7 +166,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { console.debug('replaceArmoredBlocks() for of emailsContainingPgpBlock -> emailContainer added evaluated'); } const msgId = this.determineMsgId(emailContainer); - const { renderedXssSafe, blocksInFrames, printMailInfo, from } = await this.messageRenderer.msgGetProcessed(msgId); + const { renderedXssSafe, blocksInFrames, messageInfo, from } = await this.messageRenderer.msgGetProcessed(msgId); if (renderedXssSafe) { $(this.sel.translatePrompt).hide(); if (this.debug) { @@ -178,7 +178,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { } const senderEmail = this.getSenderEmail(this.getMsgBodyEl(msgId)) || from; // todo: const isOutgoing = !!this.sendAs[senderEmail]; - this.messageRenderer.processInlineBlocks(this.relayManager, this.factory, printMailInfo, blocksInFrames, senderEmail).catch(Catch.reportErr); + this.messageRenderer.processInlineBlocks(this.relayManager, this.factory, messageInfo, blocksInFrames, senderEmail).catch(Catch.reportErr); } } }; @@ -380,11 +380,11 @@ export class GmailElementReplacer implements WebmailElementReplacer { if (this.debug) { console.debug('processNewPgpAttachments() -> msgGet may take some time'); } - const { attachments, printMailInfo } = await this.messageRenderer.msgGetProcessed(msgId); + const { attachments, messageInfo } = await this.messageRenderer.msgGetProcessed(msgId); if (this.debug) { console.debug('processNewPgpAttachments() -> msgGet done -> processAttachments', attachments); } - await this.processAttachments(msgId, attachments, attachmentsContainer, printMailInfo, false); + await this.processAttachments(msgId, attachments, attachmentsContainer, messageInfo, false); } catch (e) { if (ApiErr.isAuthErr(e)) { this.notifications.showAuthPopupNeeded(this.acctEmail); @@ -408,7 +408,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { msgId: string, attachmentMetas: Attachment[], // todo: these are not Metas! attachmentsContainerInner: JQueryEl, - printMailInfo: PrintMailInfo, + messageInfo: MessageInfo, skipGoogleDrive: boolean ) => { if (this.debug) { @@ -432,7 +432,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { loaderContext, attachmentSel, msgId, - printMailInfo, + messageInfo, senderEmail ); if (['hidden', 'tomessage'].includes(renderStatus)) { @@ -453,11 +453,11 @@ export class GmailElementReplacer implements WebmailElementReplacer { attachmentsContainerInner.parents(this.sel.attachmentsContainerOuter).first().hide(); } if (!skipGoogleDrive) { - await this.processGoogleDriveAttachments(msgId, loaderContext.msgEl, attachmentsContainerInner, printMailInfo); + await this.processGoogleDriveAttachments(msgId, loaderContext.msgEl, attachmentsContainerInner, messageInfo); } }; - private processGoogleDriveAttachments = async (msgId: string, msgEl: JQueryEl, attachmentsContainerInner: JQueryEl, printMailInfo: PrintMailInfo) => { + private processGoogleDriveAttachments = async (msgId: string, msgEl: JQueryEl, attachmentsContainerInner: JQueryEl, messageInfo: MessageInfo) => { const notProcessedAttachmentsLoaders = attachmentsContainerInner.find('.attachment_loader'); if (notProcessedAttachmentsLoaders.length && msgEl.find('.gmail_drive_chip, a[href^="https://drive.google.com/file"]').length) { // replace google drive attachments - they do not get returned by Gmail API thus did not get replaced above @@ -480,7 +480,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { console.info('Missing Google Drive attachments download_url'); } } - await this.processAttachments(msgId, googleDriveAttachments, attachmentsContainerInner, printMailInfo, true); + await this.processAttachments(msgId, googleDriveAttachments, attachmentsContainerInner, messageInfo, true); } }; diff --git a/test/source/tests/browser-unit-tests/unit-Gmail.js b/test/source/tests/browser-unit-tests/unit-Gmail.js index 2407bbbc34b..c9029aa58f5 100644 --- a/test/source/tests/browser-unit-tests/unit-Gmail.js +++ b/test/source/tests/browser-unit-tests/unit-Gmail.js @@ -19,33 +19,3 @@ * the async functions. For the rest, do not change the structure or our parser will get confused. * Do not put any code whatsoever outside of the async functions. */ - -BROWSER_UNIT_TEST_NAME(`Gmail.extractArmoredBlock helps detect bogus PGP message`).acct(`compatibility`); -(async () => { - const gmail = new Gmail('flowcrypt.compatibility@gmail.com'); - const extractedFull = await gmail.extractArmoredBlock('17d7a337b7b87eb9', 'full', undefined); - if (extractedFull.plaintext !== '-----BEGIN PGP MESSAGE-----\r\n\r\nThis is not a valid PGP message\r\n') { - throw Error(`extractedFull.plaintext unexpectedly equals ${extractedFull.plaintext}`); - } - const extractedRaw = await gmail.extractArmoredBlock('17d7a337b7b87eb9', 'raw', undefined); - if (extractedRaw.plaintext !== '-----BEGIN PGP MESSAGE-----\n\nThis is not a valid PGP message\n') { - throw Error(`extractedRaw.plaintext unexpectedly equals ${extractedRaw.plaintext}`); - } - return 'pass'; -})(); - -BROWSER_UNIT_TEST_NAME(`Gmail.extractArmoredBlock detect inline bogus PGP message`).acct(`compatibility`); -(async () => { - // original message - An OpenPGP message starts with this header: -----BEGIN PGP MESSAGE----- example - const gmail = new Gmail('flowcrypt.compatibility@gmail.com'); - const extractedFull = await gmail.extractArmoredBlock('17fbb5f1cd2010ee', 'full', undefined); - if (extractedFull.plaintext !== '-----BEGIN PGP MESSAGE-----\r\n\r\nexample\r\n') { - throw Error(`extractedFull.plaintext unexpectedly equals ${extractedFull.plaintext}`); - } - const extractedRaw = await gmail.extractArmoredBlock('17fbb5f1cd2010ee', 'raw', undefined); - console.log(encodeURIComponent(extractedRaw.plaintext)); - if (extractedRaw.plaintext !== '-----BEGIN PGP MESSAGE-----\n\nexample\n') { - throw Error(`extractedRaw.plaintext unexpectedly equals ${extractedRaw.plaintext}`); - } - return 'pass'; -})(); diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index d34a8c4a133..4ec985dba0a 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -48,6 +48,31 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te }) ); + test( + `decrypt - detect inline bogus pgp message`, + testWithBrowser(async (t, browser) => { + const threadId = '17fbb5db49ddc1eb'; + const msgId = '17fbb5f1cd2010ee'; + const acctEmail = 'flowcrypt.compatibility@gmail.com'; + t.mockApi!.configProvider = new ConfigurationProvider({ + attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), + }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); + await inboxPage.waitForSelTestState('ready'); + await inboxPage.waitAll('iframe'); + const plainMessage = /An OpenPGP message starts with this header:\r?\n-----BEGIN PGP MESSAGE-----\r?\n\r?\nexample/s; + await inboxPage.waitForContent('.message.line', plainMessage); + // expect no pgp blocks + expect((await inboxPage.getFramesUrls(['pgp_render_block.htm'])).length).to.equal(0); + await inboxPage.close(); + const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${msgId}`, undefined, authHdr); + await gmailPage.waitForContent('.a3s', plainMessage); + expect((await gmailPage.getFramesUrls(['pgp_render_block.htm'])).length).to.equal(0); + await gmailPage.close(); + }) + ); + test( `decrypt - show remote images`, testWithBrowser(async (t, browser) => { From adde79afb98949663976b534bbcd1e3c33ed93a9 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 15 May 2023 15:50:14 +0100 Subject: [PATCH 064/147] test fix --- test/source/tests/gmail.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/source/tests/gmail.ts b/test/source/tests/gmail.ts index ff2810ca6ac..2feae588cc2 100644 --- a/test/source/tests/gmail.ts +++ b/test/source/tests/gmail.ts @@ -140,13 +140,13 @@ export const defineGmailTests = (testVariant: TestVariant, testWithBrowser: Test ); test( - 'mail.google.com - decrypt message in offline mode', + 'mail.google.com - back button works in offline mode', testWithBrowser(async (t, browser) => { await BrowserRecipe.setUpCommonAcct(t, browser, 'ci.tests.gmail'); const gmailPage = await openGmailPage(t, browser); await gotoGmailPage(gmailPage, '/FMfcgzGkbDWztBnnCgRHzjrvmFqLtcJD'); const expectedMessage = { content: ['this should decrypt even offline'], signature: 'signed', encryption: 'encrypted' }; - await BrowserRecipe.pgpBlockCheck(t, await gmailPage.getFrame(['/chrome/elements/pgp_render_block.htm'], { timeout: 10000 }), expectedMessage); + await BrowserRecipe.pgpBlockCheck(t, await gmailPage.getFrame(['/chrome/elements/pgp_render_block.htm'], { sleep: 10, timeout: 25 }), expectedMessage); await gotoGmailPage(gmailPage, '/FMfcgzGkbDRNgcQxLmkhBCKVSFwkfdvV'); // plain convo await gmailPage.page.setOfflineMode(true); // go offline mode await gmailPage.page.goBack({ waitUntil: 'load' }); From be0f9b9e362ec3361ad52b464f26f8063db790a3 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 15 May 2023 15:51:24 +0100 Subject: [PATCH 065/147] MsgBlockParser fix --- extension/js/common/core/msg-block-parser.ts | 29 +++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/extension/js/common/core/msg-block-parser.ts b/extension/js/common/core/msg-block-parser.ts index 2fcff8b4095..aa1a294237d 100644 --- a/extension/js/common/core/msg-block-parser.ts +++ b/extension/js/common/core/msg-block-parser.ts @@ -177,8 +177,9 @@ export class MsgBlockParser { if (blockHeaderDef.replace) { const indexOfConfirmedBegin = potentialBeginHeader.indexOf(blockHeaderDef.begin); if (indexOfConfirmedBegin === 0) { + let potentialTextBeforeBlockBegun = ''; if (begin > startAt) { - let potentialTextBeforeBlockBegun = origText.substring(startAt, begin); + potentialTextBeforeBlockBegun = origText.substring(startAt, begin); if (!potentialTextBeforeBlockBegun.endsWith('\n')) { // only replace blocks if they begin on their own line // contains deliberate block: `-----BEGIN PGP PUBLIC KEY BLOCK-----\n...` @@ -188,10 +189,6 @@ export class MsgBlockParser { // this will actually cause potential deliberate blocks that follow accidental block to be ignored // but if the message already contains accidental (not on dedicated line) blocks, it's probably a good thing to ignore the rest } - potentialTextBeforeBlockBegun = potentialTextBeforeBlockBegun.trim(); - if (potentialTextBeforeBlockBegun) { - result.found.push(MsgBlock.fromContent('plainText', potentialTextBeforeBlockBegun)); - } } let endIndex = -1; let foundBlockEndHeaderLength = 0; @@ -207,15 +204,21 @@ export class MsgBlockParser { foundBlockEndHeaderLength = matchEnd[0].length; } } - if (endIndex !== -1) { - // identified end of the same block - result.found.push(MsgBlock.fromContent(armorHdrType, origText.substring(begin, endIndex + foundBlockEndHeaderLength).trim())); - result.continueAt = endIndex + foundBlockEndHeaderLength; - } else if (!completeOnly) { - // corresponding end not found - result.found.push(MsgBlock.fromContent(armorHdrType, origText.substr(begin), true)); + if (endIndex !== -1 || !completeOnly) { + // flush the preceding plainText + potentialTextBeforeBlockBegun = potentialTextBeforeBlockBegun.trim(); + if (potentialTextBeforeBlockBegun) { + result.found.push(MsgBlock.fromContent('plainText', potentialTextBeforeBlockBegun)); + } + if (endIndex !== -1) { + // identified end of the same block + result.found.push(MsgBlock.fromContent(armorHdrType, origText.substring(begin, endIndex + foundBlockEndHeaderLength).trim())); + result.continueAt = endIndex + foundBlockEndHeaderLength; + } else { + result.found.push(MsgBlock.fromContent(armorHdrType, origText.substr(begin), true)); + } + break; } - break; } } } From 428c92e8af910d15093d36cfd12996d975d4c254 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 15 May 2023 16:06:10 +0100 Subject: [PATCH 066/147] fixed gmail mock --- test/source/mock/google/google-data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/source/mock/google/google-data.ts b/test/source/mock/google/google-data.ts index ef11cefecfd..40caca183fc 100644 --- a/test/source/mock/google/google-data.ts +++ b/test/source/mock/google/google-data.ts @@ -328,7 +328,7 @@ export class GoogleData { }; private static htmlFromText = (textData: string): string => { - return Xss.escape(textData); // this is skewed, as we should replace \r\n with
etc., but it should be good for tests + return Xss.escape(textData).replace(/\n/g, '
') + '

'; }; public storeSentMessage = (parseResult: ParseMsgResult, id: string): string => { From c89a7c80ef907cc753c4073faa6a12c8272a7e8c Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 15 May 2023 16:13:15 +0100 Subject: [PATCH 067/147] cleanup --- .../inbox/inbox-modules/inbox-active-thread-module.ts | 2 +- extension/chrome/settings/modules/contacts.ts | 8 ++------ extension/js/common/message-renderer.ts | 5 ++--- extension/js/common/xss-safe-factory.ts | 2 +- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts index 6c99a4c72be..d4f35bd818b 100644 --- a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts +++ b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts @@ -165,7 +165,7 @@ export class InboxActiveThreadModule extends ViewModule { blocks .filter(block => block.attachmentMeta && ['encryptedAttachment', 'plainAttachment'].includes(block.type)) .concat(singlePlainBlock ? [singlePlainBlock] : []) - .map(block => XssSafeFactory.renderableMsgBlock(this.view.factory, block, message.id, senderEmail, this.view.messageRenderer.isOutgoing(senderEmail))) + .map(block => XssSafeFactory.renderableMsgBlock(this.view.factory, block, this.view.messageRenderer.isOutgoing(senderEmail))) ); // todo: test else if (this.view.showOriginal) { r += Xss.escape(Str.with(block.content)).replace(/\n/g, '
');} for (const a of mimeContent.attachments) { diff --git a/extension/chrome/settings/modules/contacts.ts b/extension/chrome/settings/modules/contacts.ts index b20ebb55e2d..fe4fad513ab 100644 --- a/extension/chrome/settings/modules/contacts.ts +++ b/extension/chrome/settings/modules/contacts.ts @@ -282,12 +282,8 @@ View.run( const container = $('#bulk_import #processed'); for (const block of blocks) { if (block.type === 'publicKey' || block.type === 'certificate') { - const replacedHtmlSafe = XssSafeFactory.renderableMsgBlock( - this.factory!, // eslint-disable-line @typescript-eslint/no-non-null-assertion - block, - '', - '' - ); + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + const replacedHtmlSafe = XssSafeFactory.renderableMsgBlock(this.factory!, block); if (replacedHtmlSafe && replacedHtmlSafe !== value) { container.append(replacedHtmlSafe); // xss-safe-factory } diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index 201c5d31daa..03462cbd3a8 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -129,7 +129,6 @@ export class MessageRenderer { { from, blocks }: { blocks: MsgBlock[]; from?: string }, factory: XssSafeFactory, showOriginal: boolean, - msgId: string, // todo: will be removed sendAs?: Dict ) => { const isOutgoing = Boolean(from && !!sendAs?.[from]); @@ -146,7 +145,7 @@ export class MessageRenderer { r += frameXssSafe; blocksInFrames[frameId] = block; } else { - r += XssSafeFactory.renderableMsgBlock(factory, block, msgId, from || 'unknown', isOutgoing); + r += XssSafeFactory.renderableMsgBlock(factory, block, isOutgoing); } } return { renderedXssSafe: r, isOutgoing, blocksInFrames }; @@ -410,7 +409,7 @@ export class MessageRenderer { if (blocks.length === 1 && ['plainText', 'plainHtml'].includes(blocks[0].type)) { singlePlainBlock = blocks[0]; } else if (blocks.length) { - ({ renderedXssSafe, blocksInFrames } = MessageRenderer.renderMsg({ blocks, from }, this.factory, false, msgId, this.sendAs)); + ({ renderedXssSafe, blocksInFrames } = MessageRenderer.renderMsg({ blocks, from }, this.factory, false, this.sendAs)); } msgDownload.processedFull = { renderedXssSafe, diff --git a/extension/js/common/xss-safe-factory.ts b/extension/js/common/xss-safe-factory.ts index 850abafdf7b..68ef6ff4b80 100644 --- a/extension/js/common/xss-safe-factory.ts +++ b/extension/js/common/xss-safe-factory.ts @@ -59,7 +59,7 @@ export class XssSafeFactory { * * When edited, REQUEST A SECOND SET OF EYES TO REVIEW CHANGES */ - public static renderableMsgBlock = (factory: XssSafeFactory, block: MsgBlock, msgId: string, senderEmail: string, isOutgoing?: boolean) => { + public static renderableMsgBlock = (factory: XssSafeFactory, block: MsgBlock, isOutgoing?: boolean) => { if (block.type === 'plainText') { return Xss.escape(Str.with(block.content)).replace(/\n/g, '
') + '

'; } else if (block.type === 'plainHtml') { From c92a21ea38c26948685e6ead8a88b8ded4936275 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 15 May 2023 16:28:19 +0100 Subject: [PATCH 068/147] removed unused BrowserMsg messages --- extension/js/common/browser/browser-msg.ts | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/extension/js/common/browser/browser-msg.ts b/extension/js/common/browser/browser-msg.ts index e5de98d8505..466311c4953 100644 --- a/extension/js/common/browser/browser-msg.ts +++ b/extension/js/common/browser/browser-msg.ts @@ -8,12 +8,11 @@ import { AjaxErr } from '../api/shared/api-error.js'; import { Buf } from '../core/buf.js'; import { Dict, Str, UrlParams } from '../core/common.js'; import { ArmoredKeyIdentityWithEmails, KeyUtil } from '../core/crypto/key.js'; -import { DecryptResult, MsgUtil, PgpMsgMethod, VerifyRes } from '../core/crypto/pgp/msg-util.js'; +import { DecryptResult, MsgUtil, PgpMsgMethod } from '../core/crypto/pgp/msg-util.js'; import { NotificationGroupType } from '../notifications.js'; import { Catch } from '../platform/catch.js'; import { AccountIndex, AcctStoreDict } from '../platform/store/acct-store.js'; import { GlobalIndex, GlobalStoreDict } from '../platform/store/global-store.js'; -import { saveFetchedPubkeysIfNewerThanInStorage } from '../shared.js'; import { PassphraseDialogType } from '../xss-safe-factory.js'; import { BrowserMsgCommonHandlers } from './browser-msg-common-handlers.js'; import { Browser } from './browser.js'; @@ -76,7 +75,6 @@ export namespace Bm { export type StoreAcctSet = { acctEmail: string; values: AcctStoreDict }; export type ReconnectAcctAuthPopup = { acctEmail: string; scopes?: string[] }; export type PgpMsgDecrypt = PgpMsgMethod.Arg.Decrypt; - export type PgpMsgVerifyDetached = PgpMsgMethod.Arg.VerifyDetached; export type PgpKeyBinaryToArmored = { binaryKeysData: Uint8Array }; export type Ajax = { req: JQuery.AjaxSettings; stack: string }; export type AjaxProgress = { frameId: string; percent?: number; loaded: number; total: number }; @@ -84,7 +82,6 @@ export namespace Bm { export type ShowAttachmentPreview = { iframeUrl: string }; export type ShowConfirmation = { text: string; isHTML: boolean; footer?: string }; export type ReRenderRecipient = { email: string }; - export type SaveFetchedPubkeys = { email: string; pubkeys: string[] }; export type ShowConfirmationResult = { isConfirmed: boolean }; export namespace Res { @@ -101,11 +98,9 @@ export namespace Bm { export type StoreAcctSet = void; export type ReconnectAcctAuthPopup = AuthRes; export type PgpMsgDecrypt = DecryptResult; - export type PgpMsgVerify = VerifyRes; export type PgpKeyBinaryToArmored = { keys: ArmoredKeyIdentityWithEmails[] }; export type AjaxGmailAttachmentGetChunk = { chunk: Buf }; export type _tab_ = { tabId: string | null | undefined }; // eslint-disable-line @typescript-eslint/naming-convention - export type SaveFetchedPubkeys = boolean; export type ShowConfirmationResult = boolean; // eslint-disable-next-line @typescript-eslint/no-explicit-any export type Db = any; // not included in Any below @@ -117,7 +112,6 @@ export namespace Bm { | _tab_ | ReconnectAcctAuthPopup | PgpMsgDecrypt - | PgpMsgVerify | InMemoryStoreGet | InMemoryStoreSet | StoreAcctGet @@ -125,7 +119,6 @@ export namespace Bm { | StoreGlobalGet | StoreGlobalSet | AjaxGmailAttachmentGetChunk - | SaveFetchedPubkeys | PgpKeyBinaryToArmored; } @@ -159,12 +152,10 @@ export namespace Bm { | StoreAcctGet | StoreAcctSet | PgpMsgDecrypt - | PgpMsgVerifyDetached | Ajax | ShowAttachmentPreview | ShowConfirmation | ReRenderRecipient - | SaveFetchedPubkeys | PgpKeyBinaryToArmored | AuthWindowResult | ConfirmationResult; @@ -223,12 +214,8 @@ export class BrowserMsg { ajaxGmailAttachmentGetChunk: (bm: Bm.AjaxGmailAttachmentGetChunk) => BrowserMsg.sendAwait(undefined, 'ajaxGmailAttachmentGetChunk', 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, pgpKeyBinaryToArmored: (bm: Bm.PgpKeyBinaryToArmored) => BrowserMsg.sendAwait(undefined, 'pgpKeyBinaryToArmored', bm, true) as Promise, - saveFetchedPubkeys: (bm: Bm.SaveFetchedPubkeys) => - BrowserMsg.sendAwait(undefined, 'saveFetchedPubkeys', bm, true) as Promise, }, }, confirmationResult: (dest: Bm.Dest, bm: Bm.ConfirmationResult) => BrowserMsg.sendCatch(dest, 'confirmation_result', bm), @@ -327,8 +314,6 @@ export class BrowserMsg { public static addPgpListeners = () => { BrowserMsg.bgAddListener('pgpMsgDecrypt', MsgUtil.decryptMessage); - BrowserMsg.bgAddListener('pgpMsgVerifyDetached', MsgUtil.verifyDetached); - BrowserMsg.bgAddListener('saveFetchedPubkeys', saveFetchedPubkeysIfNewerThanInStorage); BrowserMsg.bgAddListener('pgpKeyBinaryToArmored', async (r: Bm.PgpKeyBinaryToArmored) => ({ keys: await KeyUtil.parseAndArmorKeys(r.binaryKeysData), })); From 28c103920f9797853b6844598abfeba57dd92ae4 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 16 May 2023 17:17:32 +0100 Subject: [PATCH 069/147] wire progress to inbox via shortcut callback --- extension/js/background_page/bg-handlers.ts | 4 +- .../common/api/email-provider/gmail/gmail.ts | 8 ++-- .../common/api/email-provider/gmail/google.ts | 10 ++--- extension/js/common/api/shared/api.ts | 6 +-- extension/js/common/browser/browser-msg.ts | 2 +- extension/js/common/message-renderer.ts | 10 ++++- extension/js/common/relay-manager.ts | 37 +++++++++++++++---- .../webmail/setup-webmail-content-script.ts | 11 ++---- test/source/tests/decrypt.ts | 23 ++++++------ 9 files changed, 64 insertions(+), 47 deletions(-) diff --git a/extension/js/background_page/bg-handlers.ts b/extension/js/background_page/bg-handlers.ts index 38bbdff27d7..59dc42fb99c 100644 --- a/extension/js/background_page/bg-handlers.ts +++ b/extension/js/background_page/bg-handlers.ts @@ -44,9 +44,9 @@ export class BgHandlers { if (typeof dest !== 'undefined') { const destination = dest; const frameId = r.req.context.frameId; - const fallbackTotal = r.req.context.total; + const expectedTransferSize = r.req.context.expectedTransferSize; r.req.xhr = Api.getAjaxProgressXhrFactory({ - download: (percent, loaded, total) => BrowserMsg.send.ajaxProgress(destination, { percent, loaded, total: total || fallbackTotal, frameId }), + download: (percent, loaded, total) => BrowserMsg.send.ajaxProgress(destination, { percent, loaded, total, expectedTransferSize, frameId }), }); } } diff --git a/extension/js/common/api/email-provider/gmail/gmail.ts b/extension/js/common/api/email-provider/gmail/gmail.ts index bbae2232c1a..e7a1cb1d541 100644 --- a/extension/js/common/api/email-provider/gmail/gmail.ts +++ b/extension/js/common/api/email-provider/gmail/gmail.ts @@ -253,12 +253,10 @@ export class Gmail extends EmailProviderApi implements EmailProviderInterface { } }; - public fetchAttachment = async (a: Attachment, frameId: string) => { + public fetchAttachment = async (a: Attachment, progressFunction: (expectedTransderSize: number) => { download: ProgressCb } | ProgressDestFrame) => { + const expectedTransferSize = a.length * 1.33; // todo: remove code duplication // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - const response = await this.attachmentGet(a.msgId!, a.id!, { - frameId, - total: a.length * 1.33, // todo: remove code duplication - }); + const response = await this.attachmentGet(a.msgId!, a.id!, progressFunction(expectedTransferSize)); a.setData(response.data); }; diff --git a/extension/js/common/api/email-provider/gmail/google.ts b/extension/js/common/api/email-provider/gmail/google.ts index 5543c8deec7..6b7bac05796 100644 --- a/extension/js/common/api/email-provider/gmail/google.ts +++ b/extension/js/common/api/email-provider/gmail/google.ts @@ -39,13 +39,9 @@ export class Google { contentType = contentType || 'application/json; charset=UTF-8'; // eslint-disable-next-line @typescript-eslint/naming-convention const headers = { Authorization: await GoogleAuth.googleApiAuthHeader(acctEmail) }; - let context: ProgressDestFrame | undefined; - let xhr: (() => XMLHttpRequest) | undefined; - if ('frameId' in progress) { - context = progress; - } else { - xhr = Api.getAjaxProgressXhrFactory(progress); - } + const context = + 'frameId' in progress ? { frameId: progress.frameId, expectedTransferSize: progress.expectedTransferSize, tabId: progress.tabId } : undefined; + const xhr = Api.getAjaxProgressXhrFactory('download' in progress || 'upload' in progress ? progress : {}); const request = { xhr, context, url, method, data, headers, crossDomain: true, contentType, async: true }; return (await GoogleAuth.apiGoogleCallRetryAuthErrorOneTime(acctEmail, request)) as RT; }; diff --git a/extension/js/common/api/shared/api.ts b/extension/js/common/api/shared/api.ts index 6e2fae9a2fd..cd7a5ecd954 100644 --- a/extension/js/common/api/shared/api.ts +++ b/extension/js/common/api/shared/api.ts @@ -25,7 +25,7 @@ type RawAjaxErr = { status?: number; statusText?: string; }; -export type ProgressDestFrame = { frameId: string; total: number; tabId?: string }; +export type ProgressDestFrame = { frameId: string; expectedTransferSize: number; tabId?: string }; export type ApiCallContext = ProgressDestFrame | undefined; export type ChunkedCb = (r: ProviderContactsResults) => Promise; @@ -106,8 +106,8 @@ export class Api { } }; - public static getAjaxProgressXhrFactory = (progressCbs?: ProgressCbs): (() => XMLHttpRequest) | undefined => { - if (Env.isContentScript() || !progressCbs || !Object.keys(progressCbs).length) { + public static getAjaxProgressXhrFactory = (progressCbs: ProgressCbs | undefined): (() => XMLHttpRequest) | undefined => { + if (Env.isContentScript() || !progressCbs || !(progressCbs.upload || progressCbs.download)) { // xhr object would cause 'The object could not be cloned.' lastError during BrowserMsg passing // thus no progress callbacks in bg or content scripts // additionally no need to create this if there are no progressCbs defined diff --git a/extension/js/common/browser/browser-msg.ts b/extension/js/common/browser/browser-msg.ts index 466311c4953..1a40faa0208 100644 --- a/extension/js/common/browser/browser-msg.ts +++ b/extension/js/common/browser/browser-msg.ts @@ -77,7 +77,7 @@ export namespace Bm { export type PgpMsgDecrypt = PgpMsgMethod.Arg.Decrypt; export type PgpKeyBinaryToArmored = { binaryKeysData: Uint8Array }; export type Ajax = { req: JQuery.AjaxSettings; stack: string }; - export type AjaxProgress = { frameId: string; percent?: number; loaded: number; total: number }; + export type AjaxProgress = { frameId: string; percent?: number; loaded: number; total: number; expectedTransferSize: number }; export type AjaxGmailAttachmentGetChunk = { acctEmail: string; msgId: string; attachmentId: string }; export type ShowAttachmentPreview = { iframeUrl: string }; export type ShowConfirmation = { text: string; isHTML: boolean; footer?: string }; diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index 03462cbd3a8..187a59038d2 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -713,8 +713,14 @@ export class MessageRenderer { try { if (!attachment.hasData()) { // todo: common cache, load control? - renderModule.renderText('Retrieving message...'); - await this.gmail.fetchAttachment(attachment, frameId); + this.relayManager.renderProgressText(frameId, 'Retrieving message...'); + await this.gmail.fetchAttachment(attachment, expectedTransferSize => { + return { + frameId, + expectedTransferSize, + download: (percent, loaded, total) => this.relayManager.renderProgress({ frameId, percent, loaded, total, expectedTransferSize }), // shortcut + }; + }); } // todo: probaby subject isn't relevant in attachment-based decryption? // const subject = gmailMsg.payload ? GmailParser.findHeader(gmailMsg.payload, 'subject') : undefined; diff --git a/extension/js/common/relay-manager.ts b/extension/js/common/relay-manager.ts index cee120f70e1..a8b19eacbda 100644 --- a/extension/js/common/relay-manager.ts +++ b/extension/js/common/relay-manager.ts @@ -2,6 +2,7 @@ 'use strict'; +import { Bm } from './browser/browser-msg.js'; import { Dict } from './core/common.js'; import { BindInterface, RelayManagerInterface } from './relay-manager-interface.js'; import { RenderInterface } from './render-interface.js'; @@ -9,15 +10,21 @@ import { RenderMessage } from './render-message.js'; import { RenderRelay } from './render-relay.js'; export class RelayManager implements RelayManagerInterface, BindInterface { - private frames: Dict<{ frameWindow?: Window; readyToReceive?: true; queue: RenderMessage[] }> = {}; + private frames: Dict<{ frameWindow?: Window; readyToReceive?: true; queue: RenderMessage[]; progressText?: string }> = {}; - public relay = (frameId: string, message: RenderMessage, dontEnqueue?: boolean) => { - const { frameWindow, readyToReceive, queue } = this.frames[frameId]; - const canFlush = readyToReceive && frameWindow; - if (canFlush || !dontEnqueue) { - queue.push(message); + public static getPercentage = (percent: number | undefined, loaded: number, total: number, expectedTransferSize: number) => { + if (typeof percent === 'undefined') { + if (total || expectedTransferSize) { + percent = Math.round((loaded / (total || expectedTransferSize)) * 100); + } } - if (canFlush) { + return percent; + }; + + public relay = (frameId: string, message: RenderMessage) => { + const { frameWindow, readyToReceive, queue } = this.frames[frameId]; + queue.push(message); + if (readyToReceive && frameWindow) { this.flush({ frameWindow, queue }); } }; @@ -35,6 +42,22 @@ export class RelayManager implements RelayManagerInterface, BindInterface { } }; + public renderProgressText = (frameId: string, text: string) => { + const frameData = this.frames[frameId]; + frameData.progressText = text; + this.relay(frameId, { renderText: text }); + }; + + public renderProgress = ({ frameId, percent, loaded, total, expectedTransferSize }: Bm.AjaxProgress) => { + const perc = RelayManager.getPercentage(percent, loaded, total, expectedTransferSize); + if (typeof perc !== 'undefined') { + const { readyToReceive, progressText } = this.frames[frameId]; + if (readyToReceive && typeof progressText !== 'undefined') { + this.relay(frameId, { renderText: `${progressText} ${perc}%` }); + } + } + }; + public bind = (frameId: string, frameWindow: Window) => { const frameData = this.frames[frameId]; frameData.frameWindow = frameWindow; diff --git a/extension/js/content_scripts/webmail/setup-webmail-content-script.ts b/extension/js/content_scripts/webmail/setup-webmail-content-script.ts index 88d4a7f8292..8f7d57baada 100644 --- a/extension/js/content_scripts/webmail/setup-webmail-content-script.ts +++ b/extension/js/content_scripts/webmail/setup-webmail-content-script.ts @@ -25,7 +25,6 @@ import { GlobalStore } from '../../common/platform/store/global-store.js'; import { InMemoryStore } from '../../common/platform/store/in-memory-store.js'; import { WebmailVariantString, XssSafeFactory } from '../../common/xss-safe-factory.js'; import { RelayManager } from '../../common/relay-manager.js'; -import { RelayManagerInterface } from '../../common/relay-manager-interface.js'; export type WebmailVariantObject = { newDataLayer: undefined | boolean; @@ -155,7 +154,7 @@ export const contentScriptSetupIfVacant = async (webmailSpecific: WebmailSpecifi inject: Injector, factory: XssSafeFactory, notifications: Notifications, - relayManager: RelayManagerInterface, + relayManager: RelayManager, ppEvent: { entered?: boolean } ) => { BrowserMsg.addListener('set_active_window', async ({ frameId }: Bm.ComposeWindow) => { @@ -235,12 +234,8 @@ export const contentScriptSetupIfVacant = async (webmailSpecific: WebmailSpecifi BrowserMsg.addListener('show_attachment_preview', async ({ iframeUrl }: Bm.ShowAttachmentPreview) => { await Ui.modal.attachmentPreview(iframeUrl); }); - BrowserMsg.addListener('ajax_progress', async ({ frameId, percent, loaded, total }: Bm.AjaxProgress) => { - const perc = percent ?? (total > 0 ? Math.round((loaded / total) * 100) : undefined); - if (typeof perc !== 'undefined') { - // todo: ignore messages after something else is rendered - relayManager.relay(frameId, { renderText: `Retrieving message... ${perc}%` }, true); - } + BrowserMsg.addListener('ajax_progress', async (progress: Bm.AjaxProgress) => { + relayManager.renderProgress(progress); }); BrowserMsg.listen(tabId); }; diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index 4ec985dba0a..a5d9d5659b7 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -657,18 +657,17 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent( - t, - browser, - '1622ea42f3654ddc', - { - content: ['This will will have a larger attachment below', 'image-large.jpg'], - encryption: 'encrypted', - signature: 'not signed', - expectPercentageProgress: true, - }, - authHdr - ); + const msgId = '1622ea42f3654ddc'; + const expectedMessage = { + content: ['This will will have a larger attachment below', 'image-large.jpg'], + encryption: 'encrypted', + signature: 'not signed', + expectPercentageProgress: true, + }; + const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${msgId}`); + await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame(['pgp_render_block.htm']), expectedMessage); + await inboxPage.close(); + await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, msgId, expectedMessage, authHdr); }) ); From 57ceb17052d501267e34e25a944f9e657f3969ff Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 17 May 2023 12:14:33 +0100 Subject: [PATCH 070/147] offline message decryption fallback --- extension/js/common/message-renderer.ts | 14 +++- extension/js/common/render-message.ts | 4 +- .../webmail/gmail-element-replacer.ts | 24 +++++- .../message-export-17b91b7e122902d2.json | 82 +++++++++++++++++++ test/source/mock/google/google-endpoints.ts | 6 +- test/source/tests/decrypt.ts | 29 ++++++- 6 files changed, 148 insertions(+), 11 deletions(-) create mode 100644 test/source/mock/google/exported-messages/message-export-17b91b7e122902d2.json diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index 187a59038d2..7abe68558b0 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -200,6 +200,10 @@ export class MessageRenderer { renderModule.setFrameColor('red'); // todo: in what other cases should we set the frame red? }; + public static isPwdMsg = (text: string) => { + return /https:\/\/flowcrypt\.com\/[a-zA-Z0-9]{10}$/.test(text); + }; + private static getVerificationPubs = async (signerEmail: string) => { const email = Str.parseEmail(signerEmail).email; if (!email) return []; @@ -374,7 +378,7 @@ export class MessageRenderer {
`, }, - isPwdMsgBasedOnMsgSnippet: /https:\/\/flowcrypt\.com\/[a-zA-Z0-9]{10}$/.test(fullMsg.snippet || ''), + isPwdMsgBasedOnMsgSnippet: MessageRenderer.isPwdMsg(fullMsg.snippet || ''), }; }; @@ -524,12 +528,14 @@ export class MessageRenderer { loaderContext: LoaderContextBindInterface, factory: XssSafeFactory, frameId: string, - printMailInfo: PrintMailInfo, + printMailInfo: PrintMailInfo | undefined, cb: (renderModule: RenderInterface, frameId: string) => Promise<{ publicKeys?: string[]; needPassphrase?: string[] }> ) => { const renderModule = relayManager.createRelay(frameId); loaderContext.bind(frameId, relayManager); - renderModule.setPrintMailInfo(printMailInfo); + if (printMailInfo) { + renderModule.setPrintMailInfo(printMailInfo); + } cb(renderModule, frameId) .then(async result => { const appendAfter = $(`iframe#${frameId}`); // todo: late binding? won't work @@ -683,7 +689,7 @@ export class MessageRenderer { private setMsgBodyAndStartProcessing = async ( loaderContext: LoaderContextInterface, type: MsgBlockType, // for diagnostics - printMailInfo: PrintMailInfo, + printMailInfo: PrintMailInfo | undefined, cb: (renderModule: RenderInterface, frameId: string) => Promise<{ publicKeys?: string[] }> ) => { const { frameId, frameXssSafe } = loaderContext.factory.embeddedRenderMsg(type); diff --git a/extension/js/common/render-message.ts b/extension/js/common/render-message.ts index ace0a746c1f..c2663ca2394 100644 --- a/extension/js/common/render-message.ts +++ b/extension/js/common/render-message.ts @@ -10,8 +10,8 @@ export type PrintMailInfo = { }; export type MessageInfo = { - printMailInfo: PrintMailInfo; - isPwdMsgBasedOnMsgSnippet?: boolean; + printMailInfo?: PrintMailInfo; + isPwdMsgBasedOnMsgSnippet: boolean; }; export type RenderMessage = { diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index 93b4c6e03ad..3f74872de62 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -28,6 +28,7 @@ import { MessageInfo } from '../../common/render-message.js'; import { LoaderContextWebmail } from './loader-context.js'; import { JQueryEl } from '../../common/loader-context-interface.js'; import { Mime } from '../../common/core/mime.js'; +import { MsgBlock } from '../../common/core/msg-block.js'; export class GmailElementReplacer implements WebmailElementReplacer { private debug = false; @@ -166,7 +167,17 @@ export class GmailElementReplacer implements WebmailElementReplacer { console.debug('replaceArmoredBlocks() for of emailsContainingPgpBlock -> emailContainer added evaluated'); } const msgId = this.determineMsgId(emailContainer); - const { renderedXssSafe, blocksInFrames, messageInfo, from } = await this.messageRenderer.msgGetProcessed(msgId); + let renderedXssSafe: string | undefined; + let blocksInFrames: Dict = {}; + let messageInfo: MessageInfo | undefined; + let from: string | undefined; + try { + ({ renderedXssSafe, blocksInFrames, messageInfo, from } = await this.messageRenderer.msgGetProcessed(msgId)); + } catch (e) { + // fill with fallback values from the element + const blocks = Mime.processBody({ text: emailContainer.innerText }); + ({ renderedXssSafe, blocksInFrames } = MessageRenderer.renderMsg({ blocks, from }, this.factory, false, this.sendAs)); + } if (renderedXssSafe) { $(this.sel.translatePrompt).hide(); if (this.debug) { @@ -178,7 +189,15 @@ export class GmailElementReplacer implements WebmailElementReplacer { } const senderEmail = this.getSenderEmail(this.getMsgBodyEl(msgId)) || from; // todo: const isOutgoing = !!this.sendAs[senderEmail]; - this.messageRenderer.processInlineBlocks(this.relayManager, this.factory, messageInfo, blocksInFrames, senderEmail).catch(Catch.reportErr); + this.messageRenderer + .processInlineBlocks( + this.relayManager, + this.factory, + messageInfo ?? { isPwdMsgBasedOnMsgSnippet: MessageRenderer.isPwdMsg(emailContainer.innerText) }, // todo: print info for offline? + blocksInFrames, + senderEmail + ) + .catch(Catch.reportErr); } } }; @@ -504,7 +523,6 @@ export class GmailElementReplacer implements WebmailElementReplacer { return $(this.sel.msgOuter).filter(`[data-legacy-message-id="${msgId}"]`).find(this.sel.msgInner); }; - // todo: should we use it? private getSenderEmail = (msgEl: HTMLElement | JQueryEl) => { return ($(msgEl).closest('.gs').find('span.gD').attr('email') || '').toLowerCase(); }; diff --git a/test/source/mock/google/exported-messages/message-export-17b91b7e122902d2.json b/test/source/mock/google/exported-messages/message-export-17b91b7e122902d2.json new file mode 100644 index 00000000000..b1eda7f5a2e --- /dev/null +++ b/test/source/mock/google/exported-messages/message-export-17b91b7e122902d2.json @@ -0,0 +1,82 @@ +{ + "acctEmail": "ci.tests.gmail@flowcrypt.test", + "full": { + "id": "17b91b7e122902d2", + "threadId": "17b91b7e122902d2", + "labelIds": ["SENT"], + "snippet": "-----BEGIN PGP MESSAGE----- Version: FlowCrypt Email Encryption 8.1.4 Comment: Seamlessly send and receive encrypted email wV4DeWfgCtVtdnoSAQdAczt+hbsxnSHPx74G4dlCg1FgCaur5a5UST3gyRGo", + "payload": { + "partId": "", + "mimeType": "multipart/mixed", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "multipart/mixed; boundary=\"----sinikael-?=_1-16302373515050.421932310810367\"" + }, + { + "name": "Openpgp", + "value": "id=07481C8ACF9D49FE" + }, + { + "name": "From", + "value": "ci.tests.gmail@flowcrypt.test" + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "Subject", + "value": "[ci.test] encrypted email for offline decrypt" + }, + { + "name": "Date", + "value": "Sun, 29 Aug 2021 07:42:32 -0400" + }, + { + "name": "MIME-Version", + "value": "1.0" + } + ], + "body": { + "size": 0 + }, + "parts": [ + { + "partId": "0", + "mimeType": "text/plain", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "text/plain" + }, + { + "name": "Content-Transfer-Encoding", + "value": "quoted-printable" + } + ], + "body": { + "size": 738, + "data": "LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tDQpWZXJzaW9uOiBGbG93Q3J5cHQgRW1haWwgRW5jcnlwdGlvbiA4LjEuNA0KQ29tbWVudDogU2VhbWxlc3NseSBzZW5kIGFuZCByZWNlaXZlIGVuY3J5cHRlZCBlbWFpbA0KDQp3VjREZVdmZ0N0VnRkbm9TQVFkQWN6dCtoYnN4blNIUHg3NEc0ZGxDZzFGZ0NhdXI1YTVVU1QzZ3lSR28NCnIxTXdMeTYyakNrRjYweHFOa2NFdXE3RDRISS9zUCs0bzdVajRqQ0xQVXZHa1l0VlVSUFFwYml6V3JFKw0KSFJxaW9kRmt3VjREZVdmZ0N0VnRkbm9TQVFkQUpSWjZZbmljbWUyOHNYZklHT3h4dlpmL1JZaEhHd2tHDQorQ09vbnEvdGFVSXdFZ1BTcjZMV2RUeWQ3QzV5eTdPRmFtc0UvUkhNRndnTHFJWU1wME1wQkh2b1c3YkkNCnN2TlJabkxRVFlWaHRscTcwc0FlQVgzY0kxVGE1MVRpVERiZ1BsMHFZdTN4aktraWxaU0NlQXNiSTVOUQ0KbldtRDZKZjdTNlQyVy81L3JXZ0FMMXlYWWNseXdHUU9ra2xodi9vS2pjTXJZZ0tGOC9RNWxBK3R5MkYzDQp4cFNubE1FL0hxaGF0bTVRekhHWElEOUZsdzlXYTFyaTRKMkpqQ205RVhhR0FVVVh0WmM1cGViN25SYjENClAxWi85aVlXemVRSUxqZm12YmFDNnB4MUNrVlRXcW5ZeW1vbmNkNVFaazl0Wk5HeGwzWGtIdWNITUQzOQ0Kc0FzdVQyUkVCaWJxbFdVeFd3bTBIUWI0RVpkaTFNNUdkQ3JaRFl6Sm8vcVZGYWxCS3dxVTV1bVhDQW9JDQplUkRvR2FYRU5GSS9JWHJEDQo9Z2tLcQ0KLS0tLS1FTkQgUEdQIE1FU1NBR0UtLS0tLQ0K" + } + } + ] + }, + "sizeEstimate": 1466, + "historyId": "2625887", + "internalDate": "1630237352000" + }, + "attachments": {}, + "raw": { + "id": "17b91b7e122902d2", + "threadId": "17b91b7e122902d2", + "labelIds": ["SENT"], + "snippet": "-----BEGIN PGP MESSAGE----- Version: FlowCrypt Email Encryption 8.1.4 Comment: Seamlessly send and receive encrypted email wV4DeWfgCtVtdnoSAQdAczt+hbsxnSHPx74G4dlCg1FgCaur5a5UST3gyRGo", + "sizeEstimate": 1466, + "raw": "UmVjZWl2ZWQ6IGZyb20gNzE3Mjg0NzMwMjQ0DQoJbmFtZWQgdW5rbm93bg0KCWJ5IGdtYWlsYXBpLmdvb2dsZS5jb20NCgl3aXRoIEhUVFBSRVNUOw0KCVN1biwgMjkgQXVnIDIwMjEgMDc6NDI6MzIgLTA0MDANCkNvbnRlbnQtVHlwZTogbXVsdGlwYXJ0L21peGVkOw0KIGJvdW5kYXJ5PSItLS0tc2luaWthZWwtPz1fMS0xNjMwMjM3MzUxNTA1MC40MjE5MzIzMTA4MTAzNjciDQpPcGVucGdwOiBpZD0wNzQ4MUM4QUNGOUQ0OUZFDQpGcm9tOiBHbWFpbCBDSSBUZXN0IDxjaS50ZXN0cy5nbWFpbEBmbG93Y3J5cHQuZGV2Pg0KVG86IEdtYWlsIENJIFRlc3QgPGNpLnRlc3RzLmdtYWlsQGZsb3djcnlwdC5kZXY-DQpTdWJqZWN0OiBbY2kudGVzdF0gZW5jcnlwdGVkIGVtYWlsIGZvciBvZmZsaW5lIGRlY3J5cHQNCkRhdGU6IFN1biwgMjkgQXVnIDIwMjEgMDc6NDI6MzIgLTA0MDANCk1lc3NhZ2UtSWQ6IDxDQU85Rlk5dVFHSFcyX3FBR0NlM054NGVWQ3hZcFRFWFc4WUpuOVpQdit6YUtERUJHWndAbWFpbC5nbWFpbC5jb20-DQpNSU1FLVZlcnNpb246IDEuMA0KDQotLS0tLS1zaW5pa2FlbC0_PV8xLTE2MzAyMzczNTE1MDUwLjQyMTkzMjMxMDgxMDM2Nw0KQ29udGVudC1UeXBlOiB0ZXh0L3BsYWluDQpDb250ZW50LVRyYW5zZmVyLUVuY29kaW5nOiBxdW90ZWQtcHJpbnRhYmxlDQoNCi0tLS0tQkVHSU4gUEdQIE1FU1NBR0UtLS0tLQ0KVmVyc2lvbjogRmxvd0NyeXB0IEVtYWlsIEVuY3J5cHRpb24gOC4xLjQNCkNvbW1lbnQ6IFNlYW1sZXNzbHkgc2VuZCBhbmQgcmVjZWl2ZSBlbmNyeXB0ZWQgZW1haWwNCg0Kd1Y0RGVXZmdDdFZ0ZG5vU0FRZEFjenQraGJzeG5TSFB4NzRHNGRsQ2cxRmdDYXVyNWE1VVNUM2d5UkdvDQpyMU13THk2MmpDa0Y2MHhxTmtjRXVxN0Q0SEkvc1ArNG83VWo0akNMUFV2R2tZdFZVUlBRcGJpeldyRSsNCkhScWlvZEZrd1Y0RGVXZmdDdFZ0ZG5vU0FRZEFKUlo2WW5pY21lMjhzWGZJR094eHZaZi9SWWhIR3drRw0KK0NPb25xL3RhVUl3RWdQU3I2TFdkVHlkN0M1eXk3T0ZhbXNFL1JITUZ3Z0xxSVlNcDBNcEJIdm9XN2JJDQpzdk5SWm5MUVRZVmh0bHE3MHNBZUFYM2NJMVRhNTFUaVREYmdQbDBxWXUzeGpLa2lsWlNDZUFzYkk1TlENCm5XbUQ2SmY3UzZUMlcvNS9yV2dBTDF5WFljbHl3R1FPa2tsaHYvb0tqY01yWWdLRjgvUTVsQSt0eTJGMw0KeHBTbmxNRS9IcWhhdG01UXpIR1hJRDlGbHc5V2Excmk0SjJKakNtOUVYYUdBVVVYdFpjNXBlYjduUmIxDQpQMVovOWlZV3plUUlMamZtdmJhQzZweDFDa1ZUV3FuWXltb25jZDVRWms5dFpOR3hsM1hrSHVjSE1EMzkNCnNBc3VUMlJFQmlicWxXVXhXd20wSFFiNEVaZGkxTTVHZENyWkRZekpvL3FWRmFsQkt3cVU1dW1YQ0FvSQ0KZVJEb0dhWEVORkkvSVhyRA0KPTNEZ2tLcQ0KLS0tLS1FTkQgUEdQIE1FU1NBR0UtLS0tLQ0KDQotLS0tLS1zaW5pa2FlbC0_PV8xLTE2MzAyMzczNTE1MDUwLjQyMTkzMjMxMDgxMDM2Ny0tDQo=", + "historyId": "2625887", + "internalDate": "1630237352000" + } +} diff --git a/test/source/mock/google/google-endpoints.ts b/test/source/mock/google/google-endpoints.ts index 4629919114b..c3c9cc8e3d9 100644 --- a/test/source/mock/google/google-endpoints.ts +++ b/test/source/mock/google/google-endpoints.ts @@ -10,6 +10,7 @@ import { TestBySubjectStrategyContext } from './strategies/send-message-strategy import { UnsupportableStrategyError } from './strategies/strategy-base'; import { OauthMock } from '../lib/oauth'; import { Util } from '../../util'; +import { Dict } from '../../core/common'; type DraftSaveModel = { message: { raw: string; threadId: string } }; @@ -57,7 +58,8 @@ export type MockUserAlias = { export interface GoogleConfig { contacts?: string[]; othercontacts?: string[]; - aliases?: Record; + aliases?: Dict; + getMsgErrors?: Dict; } export const multipleEmailAliasList: MockUserAlias[] = [ @@ -215,6 +217,8 @@ export const getMockGoogleEndpoints = (oauth: OauthMock, config: GoogleConfig | if (!id) { return {}; } + const err = config?.getMsgErrors?.[id]; + if (err) throw err; const data = await GoogleData.withInitializedData(acct); if (req.url?.includes('/attachments/')) { const attachment = data.getAttachment(id); diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index a5d9d5659b7..ca475f07fcb 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -18,7 +18,7 @@ import { somePubkey, singlePubKeyAttesterConfig, } from '../mock/attester/attester-key-constants'; -import { ConfigurationProvider } from '../mock/lib/api'; +import { ConfigurationProvider, HttpClientErr, Status } from '../mock/lib/api'; // import { onlyOnWkdPubKey } from '../mock/wkd/wkd-constants'; export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: TestWithBrowser) => { @@ -248,6 +248,33 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te }) ); + test( + 'mail.google.com - decrypt message in offline mode', + testWithBrowser(async (t, browser) => { + const acctEmail = 'ci.tests.gmail@flowcrypt.test'; + t.mockApi!.configProvider = new ConfigurationProvider({ + attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), + google: { + getMsgErrors: { + '17b91b7e122902d2': new HttpClientErr('RequestTimeout', Status.BAD_REQUEST), + }, + }, + }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'ci.tests.gmail'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '17b91b7e122902d2', + { + content: ['this should decrypt even offline'], + encryption: 'encrypted', + signature: 'signed', + }, + authHdr + ); + }) + ); + test( `decrypt - without a subject`, testWithBrowser(async (t, browser) => { From 2a60a29a36130d40d24c5bb30a6f24b09589e898 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 17 May 2023 13:41:04 +0100 Subject: [PATCH 071/147] added message for testing encrypted MIME without a subject --- .../message-export-1600f39127880eed.json | 208 ++++++++++++++++++ 1 file changed, 208 insertions(+) create mode 100644 test/source/mock/google/exported-messages/message-export-1600f39127880eed.json diff --git a/test/source/mock/google/exported-messages/message-export-1600f39127880eed.json b/test/source/mock/google/exported-messages/message-export-1600f39127880eed.json new file mode 100644 index 00000000000..5dc28d7900b --- /dev/null +++ b/test/source/mock/google/exported-messages/message-export-1600f39127880eed.json @@ -0,0 +1,208 @@ +{ + "acctEmail": "flowcrypt.compatibility@gmail.com", + "full": { + "id": "1600f39127880eed", + "threadId": "1600f39127880eed", + "labelIds": [ + "IMPORTANT", + "STARRED", + "Label_25", + "Label_3", + "CATEGORY_PERSONAL", + "INBOX" + ], + "snippet": "", + "payload": { + "partId": "", + "mimeType": "multipart/encrypted", + "filename": "", + "headers": [ + { + "name": "From", + "value": "sender@domain.com" + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "Subject", + "value": "Compatibility test email" + }, + { + "name": "Thread-Topic", + "value": "Compatibility test email" + }, + { + "name": "Thread-Index", + "value": "AdNqL2dEjOWpYlfLRJy0MJqgS/rz/w==" + }, + { + "name": "Date", + "value": "Thu, 30 Nov 2017 23:18:05 +0000" + }, + { + "name": "Accept-Language", + "value": "en-US" + }, + { + "name": "Content-Language", + "value": "en-US" + }, + { + "name": "X-MS-Has-Attach", + "value": "yes" + }, + { + "name": "X-MS-TNEF-Correlator", + "value": "" + }, + { + "name": "x-ms-publictraffictype", + "value": "Email" + }, + { + "name": "x-microsoft-exchange-diagnostics", + "value": "1;DM5PR05MB3321;6:m2nvFEcpnALTj6KYk8A3Z8/wSex5pOST96zQv+PgzJPP0ecX1RGS6+qzfmQ7UfFkBHN7eS2HgGtg1/Bcu78HASoo7yewtRp5+OrUHvcQ0Qi4DbSOz/JomqyINLzRvWFh0CIFWpF/ENAwIRjUck3BsVC7l2ni4FsJomfQYmRibAOm+XY1Xh8OCa+thEeLnk21l3fEBez9CtK6uwCk/4bh+TqW0DPjZ2CU36w9VJjTD4IBoqnVlWCAoV728OIxFtJ7;5:gV3DgQE/HMBBDE08qVManBvw/p5HVcs6D60IxPhVSs+4nVvrK1EyqIa6hMmaCKX2uPqEjUvnBXbfsFY+o4D/3hoQVAWHzx/b81lC638s4o+e362u9jvGe/DqMLazn+1IT6GgECxjEKMY0sb79xzLXvbnVwS/4G/9vKTE8dhPi+Y=;24:tx2+YH3CVZdyGARf9hdmBe5y4/VTcQ2a0RXmkGUEp+7Ht2jD1HzgPJMfmBvqT2RQ2s+msq9x5M9pqxeglrweN934ZYa5aod2wbxDo3EkRFo=;7:h2eQsleuWf1xW7cvr6Hx198W9iuz2pLRNFZNL9gdQkwGmv8A8FY3hK1bGBixTLUkdjMydv3zfDTuTycYFEWW8PX3Gxviq/eL/1r3FpsBJ3EflzoJ8lUeLMkshmJf+XsMwWchUqB77O3R0NDdbhSSgpYIxS8G7xc7IYhswp3oYmrKUHsmsrnkYwX3oy3G7dHjZowXdfF5jEcMH9pVoGPKKZYi0IDd96VxUs7dv34EeIuq1LsE0R9b3sZWofVRQdi5" + }, + { + "name": "x-ms-exchange-antispam-srfa-diagnostics", + "value": "SSOS;" + }, + { + "name": "x-ms-office365-filtering-correlation-id", + "value": "919ee7c6-e026-40fe-b29c-08d538489c53" + }, + { + "name": "x-microsoft-antispam", + "value": "UriScan:;BCL:0;PCL:0;RULEID:(5600026)(4604075)(4534020)(4602075)(4603075)(4627115)(201702281549075)(2017052603286)(49563074);SRVR:DM5PR05MB3321;" + }, + { + "name": "x-ms-traffictypediagnostic", + "value": "DM5PR05MB3321:" + }, + { + "name": "x-microsoft-antispam-prvs", + "value": "" + }, + { + "name": "x-exchange-antispam-report-test", + "value": "UriScan:;" + }, + { + "name": "x-exchange-antispam-report-cfa-test", + "value": "BCL:0;PCL:0;RULEID:(102415395)(6040450)(2401047)(8121501046)(5005006)(93006095)(93001095)(3231022)(3002001)(10201501046)(6041248)(20161123558100)(20161123555025)(20161123564025)(20161123562025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(2016111802025)(6072148)(6043046)(201708071742011);SRVR:DM5PR05MB3321;BCL:0;PCL:0;RULEID:(100000803101)(100110400095);SRVR:DM5PR05MB3321;" + }, + { + "name": "x-forefront-prvs", + "value": "05079D8470" + }, + { + "name": "x-forefront-antispam-report", + "value": "SFV:NSPM;SFS:(10009020)(6009001)(39830400002)(376002)(366004)(346002)(199003)(189002)(1361003)(3280700002)(99936001)(3660700001)(478600001)(53936002)(6506006)(6436002)(2351001)(105586002)(106356001)(8676002)(7116003)(316002)(81156014)(81166006)(2501003)(621065002)(2906002)(14454004)(101416001)(6916009)(54356011)(97736004)(74316002)(305945005)(7736002)(9686003)(39060400002)(3846002)(102836003)(7696005)(6116002)(86362001)(4270600006)(99286004)(73894003)(25786009)(55016002)(33656002)(5640700003)(66066001)(3480700004)(2900100001)(77096006)(8936002)(68736007);DIR:OUT;SFP:1101;SCL:1;SRVR:DM5PR05MB3321;H:DM5PR05MB3324.namprd05.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en;" + }, + { + "name": "spamdiagnosticoutput", + "value": "1:99" + }, + { + "name": "spamdiagnosticmetadata", + "value": "NSPM" + }, + { + "name": "Content-Type", + "value": "multipart/encrypted; protocol=\"application/pgp-encrypted\"; boundary=\"=-=r0qLQ2SG/GIupk=-=\"" + }, + { + "name": "MIME-Version", + "value": "1.0" + }, + { + "name": "X-OriginatorOrg", + "value": "stresearch.com" + }, + { + "name": "X-MS-Exchange-CrossTenant-originalarrivaltime", + "value": "30 Nov 2017 23:18:05.2918 (UTC)" + }, + { + "name": "X-MS-Exchange-CrossTenant-fromentityheader", + "value": "Hosted" + }, + { + "name": "X-MS-Exchange-CrossTenant-id", + "value": "ef5b6252-b9a8-467b-a557-2d798f439afd" + }, + { + "name": "X-MS-Exchange-Transport-CrossTenantHeadersStamped", + "value": "DM5PR05MB3321" + } + ], + "body": { + "size": 0 + }, + "parts": [ + { + "partId": "0", + "mimeType": "application/pgp-encrypted", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "application/pgp-encrypted" + } + ], + "body": { + "attachmentId": "ANGjdJ_GdXJpH7b_3NKyEcUFEgGYxm0cwHupRPMyQQn0dDpjU8kmCGVBVoMRwRkt4EUvyNuCBjB7hRz3i-41LCg8mYB3X1cMcrD2FTnXp0g0NNimL2DFOxtbV6b6QxCfV_JkUjrBaHKPMSI7EjK9_goCoOIxO2wVAHW3hPP_vXCerlRVoyXY7WqHMAxUTqMivhiZR-7cOhqtDH3E9z0jnhY8ydx1zBv0lhRfPE89g4dNnvBZxEvJa8QazNOCmxNdCWA_QfrF5YWxb-qK9cIQOWkHZ0bJpddqF6HcGcYPe0NNSrwlhIb9Yh3jWTqf7pwDvoE_0FBnDImzIsBK0p-oStPV9sLv-89cjgBW4f_oPa1Fa8hcQRWCocY5Tp1H8ZM", + "size": 12 + } + }, + { + "partId": "1", + "mimeType": "application/octet-stream", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "application/octet-stream" + } + ], + "body": { + "attachmentId": "ANGjdJ8vunEUe0k10JJkf5HxHDeVHInEKQK46jXFdoeea-Xh_Bung2AB9D8mpws24YdrULk_1tLWOURBX0nDwS-YYmIKU_3K2u8prrrH6PSiQ1AuUSGj5U1wFvsENbMNsVp7n9Ljupz4zL74uE3ycGDME2RZDTIOIARSSD-IZeyk2yM9n2ZtI_ZNGTEWNoDS8bfllpakH3bbBdkodXTBY5Z1bAMD4yprhXDSN1-HDfR4WMyoE1rHLU-UzJIbssGmlg46ZL5P4Y6UwexbZxwayHyVAn3Yi1UGcfXImwtswIYj113ScKZrSf19HGocU3DAMUNfdP4A1IfH45oLivQdIDEBZwmdsyhh7DI7dVecu4HA_LndGPL8PlqyEgmbcv0", + "size": 2565 + } + } + ] + }, + "sizeEstimate": 10353, + "historyId": "1405857", + "internalDate": "1512083885000" + }, + "attachments": { + "ANGjdJ_GdXJpH7b_3NKyEcUFEgGYxm0cwHupRPMyQQn0dDpjU8kmCGVBVoMRwRkt4EUvyNuCBjB7hRz3i-41LCg8mYB3X1cMcrD2FTnXp0g0NNimL2DFOxtbV6b6QxCfV_JkUjrBaHKPMSI7EjK9_goCoOIxO2wVAHW3hPP_vXCerlRVoyXY7WqHMAxUTqMivhiZR-7cOhqtDH3E9z0jnhY8ydx1zBv0lhRfPE89g4dNnvBZxEvJa8QazNOCmxNdCWA_QfrF5YWxb-qK9cIQOWkHZ0bJpddqF6HcGcYPe0NNSrwlhIb9Yh3jWTqf7pwDvoE_0FBnDImzIsBK0p-oStPV9sLv-89cjgBW4f_oPa1Fa8hcQRWCocY5Tp1H8ZM": { + "data": "VmVyc2lvbjogMQ0K", + "size": 12 + }, + "ANGjdJ8vunEUe0k10JJkf5HxHDeVHInEKQK46jXFdoeea-Xh_Bung2AB9D8mpws24YdrULk_1tLWOURBX0nDwS-YYmIKU_3K2u8prrrH6PSiQ1AuUSGj5U1wFvsENbMNsVp7n9Ljupz4zL74uE3ycGDME2RZDTIOIARSSD-IZeyk2yM9n2ZtI_ZNGTEWNoDS8bfllpakH3bbBdkodXTBY5Z1bAMD4yprhXDSN1-HDfR4WMyoE1rHLU-UzJIbssGmlg46ZL5P4Y6UwexbZxwayHyVAn3Yi1UGcfXImwtswIYj113ScKZrSf19HGocU3DAMUNfdP4A1IfH45oLivQdIDEBZwmdsyhh7DI7dVecu4HA_LndGPL8PlqyEgmbcv0": { + "data": "LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tDQoNCmhRRU1BK2E1ekpsdWNST25BUWYrSmMza2tRUElrbzVnbnEwYk41MTBlMTZway9CTnEzdzAwQldaWm1xZThRWjMNCjJDRGkxaThtSkNUZjBheDl6Q2pKbU5Fb0s0c29uWDg4WnRRM25EWDgxOUFUZXU4Z2k2Y1dUYWFUcmR0Zkk1d0YNCkdvRDNJZ1Jpd09HSmYzTkFVU2E4WUI3Ny9weDZBTDM1amU0NHVYSHZzdG1tV3J0NExNUUJRYVJVR0hHNTF2eGYNClFLTng5aEJITE92ODN3R2pqS29ET0J5YjBMZjJzR0lsRUNnZU9IR2Zvd0tHM2ZINE5OTzBrV2JhTGNWdk05RGgNCmdXalFRV1dBV2haQ3VGbXBZZElrdFl6QzRDTjdKYVRSZEdieXVLMnN5cnNpV3ljMXR0eS9sVjFYTTA2ZHdZTzgNCjd4Z2RYVERibVZ3dWpFdFFKVzFiSnVPb0k4RGl1UmJZZkVnR1NHQURtSVVDREFOTFdpLzg1aTJWQVFFUC8xcVINCmlZTEc1SU1TNjBLSmY4OUdLMTNQTmVvMVF6Yk5OWXJOanhXeWlFWk95N24wcVoxWDdKV2ZHclJTeDJXcXRlc2gNCnZ6WTVEdC9XUVdWRVMvNHNsNTRHTzhQamxoaTZZakluM3dGeVpyeWZ0T0Y0ZVhqb1E3ZGJicG9Pc0hoT2l6Y0QNCnAzbDR6WFBSbmc4aEM0Z0YvWjZYeENzRlJITFhnRFJzSkt1NWJaOFZFSnZLMm0xc29HK0NEbDlzL0RpZmpmL1UNCkpWYzNEV2g3bFFQR3krOFR4a3ZIdHZhRDFaYk5Tak9JZmRtc3liQlMzSGsrU29hTGIzTUkrdjJjbEhNWW5TS3MNCjFaMnpFbjIxU0J4ckxkK1lLV0Q1bUJFOVVaR3lhckFOdnZiTWtpUEdWa0h6elVyZnU2TmpGOXNWS29OTERKbXUNCmVnanI2UldOdjJDckhyK1JFUVdSYVE0MDA0WGZ1MldSWmtjWkg3RExhT3ZJTWx2aThtSE5XMUVwbEwyU3J2RjkNCm9IN1lNZXYwajJ4MEJMRWtyT1d0RmZSRzdOcGdNVS9PMWJEejNERDd1REhJZ2kzMktKK1VoU1lYcWlNT2xJUEsNCjh3QjM5bUNxZ1kxdkQ1Ymt3N2wvVkhYK2Z3VTdRVEFLMkxnNytVR0QyOVZtSmhzbzQ2TXB6MXBiTDBIWml1Q1kNCjlKUnIxQ3hpL1h3S1dYZ25nOGlqSVVoUTgvc0RkVXh1Ukl4L3hnTENuK055NjlNcmpablhFMlQwVzUrZ0JwdVgNCmM3S1VkSndDVUVrZGlCL1dsejRpemRQVUNCVW5jMFFBcUN0N0l4eDRTNEhuK1UxbE5mckVDcUpJMTRrYmYyN3INCkxtTGlacUVCNVdKSExCdFVrZWd5RldyNld3SG1xUUZ4dHV1MlRnL3owdWtCa1pEek9ETnowZVZRQU5FYi9rV24NCnhhYUgvRGh2a3grRHhLZXloaTZMRGZBdFU3b09PbzhDMytpVEZ6aytTc3IyVGw2TWI2ZnVTU3h4VmMvaTFZWmINCkVPV0V1dytUTEdoSDNueldHMXJlTTdOMHE3bE5WeTVtejNWOWNYUmN2UlVqN3dZQmh4ZjRMeUJSdENxM2xPVWwNCmhmSGY3VTN6azZacElVQ3ExNDZDYldWQXk4M2puS2JKd3ptbE9DV295MXJWZmJSZzYrZW1TaG1sM3VnT0NqZnANCkpWVml1VzMzWlVFR1lJZURIYThDaWhHbjNhaTBhTjRDSFFpdURlL0E5dGxqRnNlWWkrSWRmVmhJejEwVlJQQk8NCmJSVFcvbkZEa1ZqSTlFM0JkK0g1K3lqNExFYkdGWWZjU0hNamdvTWpTNTc4cDVkbWJsL1ZlTnQvd1M5ZHhQRjgNCjhpUlYydGNTdTVIYkxoV0daSjFsK2NuNk4xUHdXNlJzOU5yZGZzTUQ3UU5zeURVNzFoT3oxMGFzT2dlYnhZTk0NCmdGaGh3L2x4SGlnOWl1TndPOEdFMEhCRG1SditIS3hMWHVlMHBIUFd0OVV0L21ZNHIvK3J1WGxveFJzVThnakcNCmh6U2FtVjVJZHZmUXkweENvZzJiV0RDTDRyQ25naDFJa3JGaTBDdE5ObDFtUHNraG9acU1aanNvMjkweU5hVWMNCkhlRklkeVB5dmpqeHlvSGQ5SzNCdVh4NmZQdlliWnpGUno5WWlrTXFIeHo2QXlIQWlNSm5sOE9QRkg2WE9Ua2kNCk8xbGlVOUxJK01zTENtZURxR2xpTmFwOVZNdnBCa0pLNmxXb0MwUkR0cUhNNDhzSTRCcUhCZ1c2blV3bkd2NUgNCnRLYkRUZ0ZmTVp3NWMra2xPV0lVSE1FNGVGTnlSZWo2OXVvb2ZGeWIyck5qWEJxdktsTDJnMGRVWGJtMm5tWUcNClVXNEpQSFdyaWE2ZGp2NnpnMGgwMzdjL1A2K0RoVmRtMk84aW44YitCZ3FzZHI3Q2hZUHAyalVYOHJvdUZOd2QNClU0eEFYWW83aUxvRE43QVhIVWIrRzE5cXJ4M2MvWEJyYjVtc1ZsbGZqRGZLc3BYOWZ0VEJ1a2wxL0p2MlFkRTANCkcwa0VWekFWQjNhbXQ5S0hOWCtmTUMyOHJCbGE2MGdmeG1wRUo5UTdmWkNBT3FUSlBQY1MxRDlBS1ZtM3dwb2gNCk5XTkpYWXN0YmxWR05CR3VZZUp1dkh5amNHZnMyM1JQZ3kxUEkvQXFKSmN1bVVDY0diOEFhNEJ1ZnN5Wkx3NEwNCkNrTjZ5YUN1dzVEZG1lTmtsa20vTlZESkpKcHZrTFlyVFJyNlY1VkllTzF1c3ZtVFl3QWc1MzAxRGpHL0k2cVANClZSSlE3R2VVWEI5RzZyNmcxNUtiTmZJQUx6MFNVdDZ3S3JGbjZIMzlhVmxCWHpGTzVZNkVtbUQrWWFwZkpIMG8NCmhPSGlJYldIWHFVOXJQVG9MQzJQbjlXRHE5RklVTXgrMHdMMEVuMTcyZTIrVU9mRW9QcmNveWtWRlhlbUdDVnANCkliQjlIc0lVVnJzWXlxdnM3SExRZk1kUi9Tancrc0ZpbEt6SUlCRmpnTldIaXlPd3NoVk1rSENVSG9oY3c2bUoNCjNjeDAxeFdnSmFHNDJnZ0dTWXZrYjRCdlpFZmdLbXNsd0lWNzlwYndReHVheUtOTnFDcFB3SHVxQTFmZGxaMkUNCmhSOERuK1NocTJlUDVsU3RsSzBWK0dZVDlmQmNmdXFBcGRVS05tSkExUGtzK2o5aDBDenNlV1lBDQo9SFJ1aQ0KLS0tLS1FTkQgUEdQIE1FU1NBR0UtLS0tLQ0K", + "size": 2565 + } + }, + "raw": { + "id": "1600f39127880eed", + "threadId": "1600f39127880eed", + "labelIds": [ + "IMPORTANT", + "STARRED", + "Label_25", + "Label_3", + "CATEGORY_PERSONAL", + "INBOX" + ], + "snippet": "", + "sizeEstimate": 10353, + "raw": "Delivered-To: flowcrypt.compatibility@gmail.com
Received: by 10.176.25.97 with SMTP id u33csp565464uag;
        Thu, 30 Nov 2017 15:18:06 -0800 (PST)
X-Google-Smtp-Source: AGs4zMZjuzoUgsSI9GrfbhMtob1L1sEs9xhjeTDWMxdisU4l9LJ42Wlp2s7Bkko4tblZNPiivLwg
X-Received: by 10.55.104.135 with SMTP id d129mr5127946qkc.349.1512083886817;
        Thu, 30 Nov 2017 15:18:06 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1512083886; cv=none;
        d=google.com; s=arc-20160816;
        b=cCvmOzN3wc774WG8k0oNW5a3cF/mt1r46GSRNNfQiEPE4itPcCGVlmC0UAhQIvjea9
         fIKuSu3QOBDrCPvSzp7pI9wir1qn++vzCCeDspazwflqFYkNRjBchEOOgBrkMc9zTqz3
         5/YN86rnAbOUNkGqGS4WYZJcRodNrryOncKm1GjGOruf8hSZakrIlcY7umnMdMEsUlUQ
         bhhgfZjAGw46+UUXfb6Uo43p8bAEWZlHMMA2ixhkP43VgI62GPSVm0+/a1v/meP6OBNQ
         kS1YV0pA3YdErf52WzmHd80on1tVp/GfMDOZ8sk09o3LWuEew4XSXjaSQGrVlIqPQUWV
         0xjQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
        h=mime-version:spamdiagnosticmetadata:spamdiagnosticoutput
         :content-language:accept-language:message-id:date:thread-index
         :thread-topic:subject:to:from:dkim-signature
         :arc-authentication-results;
        bh=xVFmjzjELW/0+GYAZlLZ65uUBuQUkDJLrU8ssbUStDE=;
        b=FHx0mmb1mFlUfxVhnFhFNAoHxuujlWJKPWbP8rRiirvd56g8+BjuTEfHBuWNrBzLcH
         zJLugPvQnibMr8NnQY/1Ewbux7FOlsD7G92+zXBocdjfZ4ooRU1uoFdnq26NQC9p9B8f
         XZX1wm55IqjV7xG1QuQNyIc28GVhylDaLvXK95psJ/Bjc1B6NWlwj1dqeA7QUXzip4DX
         DEbkpxmctv8d+GNJ8rQjW8MbXPZYcKg1aqk3rYMAT/zRZa0kwLvJGtiFWJzUvYs1RqzA
         Pm5MWNvPIxcPxgj8Pya99babrAiaXo4MmY7YJrly7zJ1usFQrJ4NUNy4jXEN4PR7nxtO
         6JdQ==
ARC-Authentication-Results: i=1; mx.google.com;
       dkim=pass header.i=@systechresearch.onmicrosoft.com header.s=selector1-stresearch-com header.b=Taw64/am;
       spf=pass (google.com: domain of paul.ilardi@stresearch.com designates 104.47.33.71 as permitted sender) smtp.mailfrom=paul.ilardi@stresearch.com
Return-Path: <paul.ilardi@stresearch.com>
Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0071.outbound.protection.outlook.com. [104.47.33.71])
        by mx.google.com with ESMTPS id m13si4059171qtf.75.2017.11.30.15.18.06
        for <flowcrypt.compatibility@gmail.com>
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
        Thu, 30 Nov 2017 15:18:06 -0800 (PST)
Received-SPF: pass (google.com: domain of paul.ilardi@stresearch.com designates 104.47.33.71 as permitted sender) client-ip=104.47.33.71;
Authentication-Results: mx.google.com;
       dkim=pass header.i=@systechresearch.onmicrosoft.com header.s=selector1-stresearch-com header.b=Taw64/am;
       spf=pass (google.com: domain of paul.ilardi@stresearch.com designates 104.47.33.71 as permitted sender) smtp.mailfrom=paul.ilardi@stresearch.com
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=systechresearch.onmicrosoft.com; s=selector1-stresearch-com;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version;
 bh=xVFmjzjELW/0+GYAZlLZ65uUBuQUkDJLrU8ssbUStDE=;
 b=Taw64/amqjeQJyPDexifhe9CqOED9uDhFRHdubmHhGRjm/ANV97CROULVOBqAtdmdyTGpm4NlS2JkqIVzcEs73LmVekXqys19f8eD1+MJKzIKDX4Z8jezJHzWjf2Dl9Dh3r8yWkbn8NxHqYxBlW5cFLXxw1fqJ7+H+yUhO/uH8Q=
Received: from DM5PR05MB3324.namprd05.prod.outlook.com (10.174.191.39) by
 DM5PR05MB3321.namprd05.prod.outlook.com (10.174.191.36) with Microsoft SMTP
 Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id
 15.20.282.3; Thu, 30 Nov 2017 23:18:05 +0000
Received: from DM5PR05MB3324.namprd05.prod.outlook.com ([10.174.191.39]) by
 DM5PR05MB3324.namprd05.prod.outlook.com ([10.174.191.39]) with mapi id
 15.20.0282.006; Thu, 30 Nov 2017 23:18:05 +0000
From: Paul Ilardi <paul.ilardi@stresearch.com>
To: "flowcrypt.compatibility@gmail.com" <flowcrypt.compatibility@gmail.com>
Subject: Compatibility test email
Thread-Topic: Compatibility test email
Thread-Index: AdNqL2dEjOWpYlfLRJy0MJqgS/rz/w==
Date: Thu, 30 Nov 2017 23:18:05 +0000
Message-ID: <DM5PR05MB332491C43342165FE04215C496380@DM5PR05MB3324.namprd05.prod.outlook.com>
Accept-Language: en-US
Content-Language: en-US
X-MS-Has-Attach: yes
X-MS-TNEF-Correlator:
authentication-results: spf=none (sender IP is )
 smtp.mailfrom=paul.ilardi@stresearch.com; 
x-originating-ip: [40.139.55.99]
x-ms-publictraffictype: Email
x-microsoft-exchange-diagnostics: 1;DM5PR05MB3321;6:m2nvFEcpnALTj6KYk8A3Z8/wSex5pOST96zQv+PgzJPP0ecX1RGS6+qzfmQ7UfFkBHN7eS2HgGtg1/Bcu78HASoo7yewtRp5+OrUHvcQ0Qi4DbSOz/JomqyINLzRvWFh0CIFWpF/ENAwIRjUck3BsVC7l2ni4FsJomfQYmRibAOm+XY1Xh8OCa+thEeLnk21l3fEBez9CtK6uwCk/4bh+TqW0DPjZ2CU36w9VJjTD4IBoqnVlWCAoV728OIxFtJ7;5:gV3DgQE/HMBBDE08qVManBvw/p5HVcs6D60IxPhVSs+4nVvrK1EyqIa6hMmaCKX2uPqEjUvnBXbfsFY+o4D/3hoQVAWHzx/b81lC638s4o+e362u9jvGe/DqMLazn+1IT6GgECxjEKMY0sb79xzLXvbnVwS/4G/9vKTE8dhPi+Y=;24:tx2+YH3CVZdyGARf9hdmBe5y4/VTcQ2a0RXmkGUEp+7Ht2jD1HzgPJMfmBvqT2RQ2s+msq9x5M9pqxeglrweN934ZYa5aod2wbxDo3EkRFo=;7:h2eQsleuWf1xW7cvr6Hx198W9iuz2pLRNFZNL9gdQkwGmv8A8FY3hK1bGBixTLUkdjMydv3zfDTuTycYFEWW8PX3Gxviq/eL/1r3FpsBJ3EflzoJ8lUeLMkshmJf+XsMwWchUqB77O3R0NDdbhSSgpYIxS8G7xc7IYhswp3oYmrKUHsmsrnkYwX3oy3G7dHjZowXdfF5jEcMH9pVoGPKKZYi0IDd96VxUs7dv34EeIuq1LsE0R9b3sZWofVRQdi5
x-ms-exchange-antispam-srfa-diagnostics: SSOS;
x-ms-office365-filtering-correlation-id: 919ee7c6-e026-40fe-b29c-08d538489c53
x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(5600026)(4604075)(4534020)(4602075)(4603075)(4627115)(201702281549075)(2017052603286)(49563074);SRVR:DM5PR05MB3321;
x-ms-traffictypediagnostic: DM5PR05MB3321:
x-microsoft-antispam-prvs: <DM5PR05MB3321F7EF8F67F0AE9B8063B096380@DM5PR05MB3321.namprd05.prod.outlook.com>
x-exchange-antispam-report-test: UriScan:;
x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(102415395)(6040450)(2401047)(8121501046)(5005006)(93006095)(93001095)(3231022)(3002001)(10201501046)(6041248)(20161123558100)(20161123555025)(20161123564025)(20161123562025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(2016111802025)(6072148)(6043046)(201708071742011);SRVR:DM5PR05MB3321;BCL:0;PCL:0;RULEID:(100000803101)(100110400095);SRVR:DM5PR05MB3321;
x-forefront-prvs: 05079D8470
x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(6009001)(39830400002)(376002)(366004)(346002)(199003)(189002)(1361003)(3280700002)(99936001)(3660700001)(478600001)(53936002)(6506006)(6436002)(2351001)(105586002)(106356001)(8676002)(7116003)(316002)(81156014)(81166006)(2501003)(621065002)(2906002)(14454004)(101416001)(6916009)(54356011)(97736004)(74316002)(305945005)(7736002)(9686003)(39060400002)(3846002)(102836003)(7696005)(6116002)(86362001)(4270600006)(99286004)(73894003)(25786009)(55016002)(33656002)(5640700003)(66066001)(3480700004)(2900100001)(77096006)(8936002)(68736007);DIR:OUT;SFP:1101;SCL:1;SRVR:DM5PR05MB3321;H:DM5PR05MB3324.namprd05.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en;
received-spf: None (protection.outlook.com: stresearch.com does not designate
 permitted sender hosts)
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: multipart/encrypted; protocol="application/pgp-encrypted";
	boundary="=-=r0qLQ2SG/GIupk=-="
MIME-Version: 1.0
X-OriginatorOrg: stresearch.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 919ee7c6-e026-40fe-b29c-08d538489c53
X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Nov 2017 23:18:05.2918
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: ef5b6252-b9a8-467b-a557-2d798f439afd
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR05MB3321

--=-=r0qLQ2SG/GIupk=-=
Content-Type: application/pgp-encrypted

Version: 1

--=-=r0qLQ2SG/GIupk=-=
Content-Type: application/octet-stream

-----BEGIN PGP MESSAGE-----

hQEMA+a5zJlucROnAQf+Jc3kkQPIko5gnq0bN510e16pk/BNq3w00BWZZmqe8QZ3
2CDi1i8mJCTf0ax9zCjJmNEoK4sonX88ZtQ3nDX819ATeu8gi6cWTaaTrdtfI5wF
GoD3IgRiwOGJf3NAUSa8YB77/px6AL35je44uXHvstmmWrt4LMQBQaRUGHG51vxf
QKNx9hBHLOv83wGjjKoDOByb0Lf2sGIlECgeOHGfowKG3fH4NNO0kWbaLcVvM9Dh
gWjQQWWAWhZCuFmpYdIktYzC4CN7JaTRdGbyuK2syrsiWyc1tty/lV1XM06dwYO8
7xgdXTDbmVwujEtQJW1bJuOoI8DiuRbYfEgGSGADmIUCDANLWi/85i2VAQEP/1qR
iYLG5IMS60KJf89GK13PNeo1QzbNNYrNjxWyiEZOy7n0qZ1X7JWfGrRSx2Wqtesh
vzY5Dt/WQWVES/4sl54GO8Pjlhi6YjIn3wFyZryftOF4eXjoQ7dbbpoOsHhOizcD
p3l4zXPRng8hC4gF/Z6XxCsFRHLXgDRsJKu5bZ8VEJvK2m1soG+CDl9s/Difjf/U
JVc3DWh7lQPGy+8TxkvHtvaD1ZbNSjOIfdmsybBS3Hk+SoaLb3MI+v2clHMYnSKs
1Z2zEn21SBxrLd+YKWD5mBE9UZGyarANvvbMkiPGVkHzzUrfu6NjF9sVKoNLDJmu
egjr6RWNv2CrHr+REQWRaQ4004Xfu2WRZkcZH7DLaOvIMlvi8mHNW1EplL2SrvF9
oH7YMev0j2x0BLEkrOWtFfRG7NpgMU/O1bDz3DD7uDHIgi32KJ+UhSYXqiMOlIPK
8wB39mCqgY1vD5bkw7l/VHX+fwU7QTAK2Lg7+UGD29VmJhso46Mpz1pbL0HZiuCY
9JRr1Cxi/XwKWXgng8ijIUhQ8/sDdUxuRIx/xgLCn+Ny69MrjZnXE2T0W5+gBpuX
c7KUdJwCUEkdiB/Wlz4izdPUCBUnc0QAqCt7Ixx4S4Hn+U1lNfrECqJI14kbf27r
LmLiZqEB5WJHLBtUkegyFWr6WwHmqQFxtuu2Tg/z0ukBkZDzODNz0eVQANEb/kWn
xaaH/Dhvkx+DxKeyhi6LDfAtU7oOOo8C3+iTFzk+Ssr2Tl6Mb6fuSSxxVc/i1YZb
EOWEuw+TLGhH3nzWG1reM7N0q7lNVy5mz3V9cXRcvRUj7wYBhxf4LyBRtCq3lOUl
hfHf7U3zk6ZpIUCq146CbWVAy83jnKbJwzmlOCWoy1rVfbRg6+emShml3ugOCjfp
JVViuW33ZUEGYIeDHa8CihGn3ai0aN4CHQiuDe/A9tljFseYi+IdfVhIz10VRPBO
bRTW/nFDkVjI9E3Bd+H5+yj4LEbGFYfcSHMjgoMjS578p5dmbl/VeNt/wS9dxPF8
8iRV2tcSu5HbLhWGZJ1l+cn6N1PwW6Rs9NrdfsMD7QNsyDU71hOz10asOgebxYNM
gFhhw/lxHig9iuNwO8GE0HBDmRv+HKxLXue0pHPWt9Ut/mY4r/+ruXloxRsU8gjG
hzSamV5IdvfQy0xCog2bWDCL4rCngh1IkrFi0CtNNl1mPskhoZqMZjso290yNaUc
HeFIdyPyvjjxyoHd9K3BuXx6fPvYbZzFRz9YikMqHxz6AyHAiMJnl8OPFH6XOTki
O1liU9LI+MsLCmeDqGliNap9VMvpBkJK6lWoC0RDtqHM48sI4BqHBgW6nUwnGv5H
tKbDTgFfMZw5c+klOWIUHME4eFNyRej69uoofFyb2rNjXBqvKlL2g0dUXbm2nmYG
UW4JPHWria6djv6zg0h037c/P6+DhVdm2O8in8b+Bgqsdr7ChYPp2jUX8rouFNwd
U4xAXYo7iLoDN7AXHUb+G19qrx3c/XBrb5msVllfjDfKspX9ftTBukl1/Jv2QdE0
G0kEVzAVB3amt9KHNX+fMC28rBla60gfxmpEJ9Q7fZCAOqTJPPcS1D9AKVm3wpoh
NWNJXYstblVGNBGuYeJuvHyjcGfs23RPgy1PI/AqJJcumUCcGb8Aa4BufsyZLw4L
CkN6yaCuw5DdmeNklkm/NVDJJJpvkLYrTRr6V5VIeO1usvmTYwAg5301DjG/I6qP
VRJQ7GeUXB9G6r6g15KbNfIALz0SUt6wKrFn6H39aVlBXzFO5Y6EmmD+YapfJH0o
hOHiIbWHXqU9rPToLC2Pn9WDq9FIUMx+0wL0En172e2+UOfEoPrcoykVFXemGCVp
IbB9HsIUVrsYyqvs7HLQfMdR/Sjw+sFilKzIIBFjgNWHiyOwshVMkHCUHohcw6mJ
3cx01xWgJaG42ggGSYvkb4BvZEfgKmslwIV79pbwQxuayKNNqCpPwHuqA1fdlZ2E
hR8Dn+Shq2eP5lStlK0V+GYT9fBcfuqApdUKNmJA1Pks+j9h0CzseWYA
=HRui
-----END PGP MESSAGE-----

--=-=r0qLQ2SG/GIupk=-=--
", + "historyId": "1405857", + "internalDate": "1512083885000" + } +} \ No newline at end of file From 43a69822158db768f4a155a1b08257901006c5ff Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 17 May 2023 14:44:06 +0100 Subject: [PATCH 072/147] more tests restored --- .../message-export-16f431a0b9056562.json | 138 ++++++++++++++++++ .../message-export-16f66f1da9d50d05.json | 136 +++++++++++++++++ test/source/tests/decrypt.ts | 44 +++--- 3 files changed, 300 insertions(+), 18 deletions(-) create mode 100644 test/source/mock/google/exported-messages/message-export-16f431a0b9056562.json create mode 100644 test/source/mock/google/exported-messages/message-export-16f66f1da9d50d05.json diff --git a/test/source/mock/google/exported-messages/message-export-16f431a0b9056562.json b/test/source/mock/google/exported-messages/message-export-16f431a0b9056562.json new file mode 100644 index 00000000000..878d03cb134 --- /dev/null +++ b/test/source/mock/google/exported-messages/message-export-16f431a0b9056562.json @@ -0,0 +1,138 @@ +{ + "acctEmail": "flowcrypt.compatibility@gmail.com", + "full": { + "id": "16f431a0b9056562", + "threadId": "16f431a0b9056562", + "labelIds": [ + "Label_17", + "IMPORTANT", + "STARRED", + "CATEGORY_PERSONAL", + "Label_15" + ], + "snippet": "", + "payload": { + "partId": "", + "mimeType": "multipart/encrypted", + "filename": "", + "headers": [ + { + "name": "X-Gm-Message-State", + "value": "APjAAAVMuPOPVQcpHvoy2szKblT6tIIFsIYUPLUU+RfBHmZoOeGvZ9fm Ta0F87t7nephJLVeq/PsS0Tn93MIcMo=" + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "From", + "value": "sender@domain.com" + }, + { + "name": "Subject", + "value": "Encrypted Plain Text ISO-2022-JP (Enigmail)" + }, + { + "name": "Openpgp", + "value": "preference=signencrypt" + }, + { + "name": "Autocrypt", + "value": "addr=michael.flowcrypt2@gmail.com; keydata= mQINBFz7l+kBEAC7DOpjvJ3wILWhQFEWfDWnjXZLEfieiLQ6NZX8ej3IGUGapIf71J99cQAF akDkX1NF2BVNRxTqjzQ4wx6st4zxAcwTFKXmVjIDU6XMLVFAEl1eP5VybY0dvv7uYQN8Vchf QpbLzOfCz6Oc2X+JNnIIaKKEcae46hgfV+eU9ktDVhQgb1OXH/ny/8GDdwQUjwysOuAR9364 9lnxiibZJNmd7qfxMmjN1Lwz5yGaoPHHn+8it+oyMx+z36Zt+v2He9sRHtPGIEY2rdDszdER Wv1ftjHYg1O+q/irAP3xzZ578fZKlaTz205zOVQhlkWIyXA1Wuj7yjjPrOe4QF6hcJ4jGoN6 YvgVWxxvqwdNAKBxTQPLyqbrAa1nH/svnuoX4mczngW5npBm4+PSBbLo3ADBu1boGhGl1QaE vIG7L+Gvb9Iw3ZyDKSertB0ZQZ6IE782k/D0sSbT8mniY5CrGO0oNaGvqrFuaOErNhGQ6fH0 GOU44WVvYiVXdh3CyFQ90P0hpmlcNpShCNEaA94+ne7BXmMJnvAl9cP98giAmQlXx4cGy+JB cyCs5LdtvFml5/D99pd8oinCQWWAvjZI6diQDNrkw2kQVHqaCBerV21eB/eee3aIMzvCurcq TDDJa1CEoHX3INV4aivq4/6Ys6Z4i4tilD0wicKzezu9ENFcmQARAQABtC9NaWNoYWVsIFZv bHluZXRzIDxtaWNoYWVsLmZsb3djcnlwdDJAZ21haWwuY29tPokCNQQQAQgAHwUCXPuX6QYL CQcIAwIEFQgKAgMWAgECGQECGwMCHgEACgkQAJIVTI1IIzVqUA//UNgj6py7juui0EwPOwNF IC9p40qaDvjqfNVdfmcr/39odm8yzdx/0eZTRIGZDWC3BBM5gSFF9ZNGcVFTMe0N3OZZPxGm Y9XN79jobeVvE0WoLEZEHI9IY86HLAC8yc/SeiQsbKp6ZiJyDuY4gUQ07yq4Bc/HfgTyITsi aoFvWXEHcLuw1ZOimCpQg1+XqGwWhAnNhXGFe6tvw41uehafPEN+8Lj/NqMrFQ5qVOslXUUv vkpfNvAm7LBVIY79YAe5su1XMuKcrxW/7nZBKa3mbFYcnjtbW+LJqcEfAl4NNDND1ho7Guls P2JFxlxy+YqXJ6oG88Hxb5mdlVyWSkuGG+BY75D1fgenv4ntZoumCdCaDIlKFOwfCF7EToZX tedSyzs0+DRfiVg9Yp8w3IIxFn+KhN3x12NXvkNm+ZOC+I7sac/bvX7KJ3ThUf/C1QysbpmS wfmlSqk9SjthbdlrWZ20OG5yvIiCS1Bixjo2lTJLA6QSqQmcMwjd5rQrut5GkTHqxnQQb42u eO+n/GV4c6x0QT1hfKV7thE3U7XPvzUK5E8Ti9CLkDd6KE4hAct2jhlE7zYHrSbkJnWIUInr QefPQ0EG2qJzdZXniBXj2Orwk2UVsertkLD3y6Iwv7Xk9pp3zXWOPKxFK3LbnfLwmIQCd3VQ 14uh/hR3aRZfN/25Ag0EXPuX6QEQAK7/8UKmcuTNHz+mPfoOdMkxgdzikx9zgwASubc2Nhq0 +b+P4yiWOJgbmULLXnpVEH3I+XyqgcUi42wZ3KWx04Wbg1dlsSiMN/9ojdXfhn+K2V5QnrUR lgZrz2xLCcMNgbVpdsLv8tnwb1rIQapq/b12RJKU9ZBwX/5W7za9UAjwibWgrVsFCUR5omlO e7Zg1z+37DmIIUGwnDN7nHH+LOyZxu2STdKx7EZQ7glqi/WnE85doRidARrM9lPibGJlxLQ0 XnTrgPkKd/A+D6aidTS+NUSK+HSLOJzOuWnz9MHExYuQG/f2WCNVabAYNnIl9fJEcCduz/SR LbzxH8iL25H3ptonWajhkv/vFzfzzAFhXMJNehFR6QuZFlBQA078SuPb57ZYgXBA8KP9uN2x 2/Td+O7vTuYAsnyHwhZyCFtLtMP5jyt+ObR8wWW1OrVUVxOxvW4zcMBdCft07C03aIoOsvwA Fie/eJhte2czdtGPN8IlUZM5ZtKop4YephIxWd4yXqPbtQNuCQlzYRaLO7A6v1lLkKSxIESb XbMd5ez86JohqFbSLnxE3O8+WhLcYEa8v6tPsI1HfxkUGYexWJ9QBnFKtW5pjMMoJv17s8Wt sekjXmGhsje452Ma7IHfnEcrm4p/GO9AFvP06+fkZvjPb2rtxkwmG2oMUptVoO43ABEBAAGJ Ah8EGAEIAAkFAlz7l+kCGwwACgkQAJIVTI1IIzVOgQ//QT5Spj15y10bhSCJXc5amoRUG/yj ljrPLkR++9YiwsUvcZgKesMKgKp/cqOPmptD5C66c9oG1FyvHclYujki/SKhpnruRKSnvDW/ lpZnYo1QnNx1Khxu4XTcjtycAKfijBVuuR/maToR9DP9n4/5seH5TeLIGJg+YUczL4HI+kJm 8iHanmPxZQR69Cr1xDB9FwliLl9BaTFbs0lWOguEkqwl84EACuGQTLOGI4u1EN/9RgAx8JX6 JqA5l1rplC4N8HPgJ6zBp7ydzdSofoxGctSATJVmoweeWwL585GdsE0Fs+cWVSb8/tqFXGGR /oB95rb5d169vF7vbcb+h6ZidsPZqqnz85O2EgI5LkusyCG+GbKIiawkB56QA3NtT7ZotC2L 6FVzb00YezkLNu/ZtGq6vVk7qzBw4z+bu6xUWEJYTbnVa1Kaop3cu4mVl8pfEXQAd7WchgdM ULln2cdmoxNi63r7dUjEIv6QIQysCsf7EjxFzkvlw4V4fYrodWkisuamd1BqkWLlHneKaqx3 nzV35omhvvVNQyA9gqMAkxadJhD4PxS7KvPGNejQsmhME4OoI8yeg/iOGR/OTpMhk/rrQWtF 2wrCBExh2EKOkRCx0xVvyOjjStFEKc7SkuY5Nr5Fe365elDkXSr7LmEcjdR1fhFV7cG4TLMe x6aRXsA=" + }, + { + "name": "Date", + "value": "Thu, 26 Dec 2019 18:46:14 +0200" + }, + { + "name": "User-Agent", + "value": "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0" + }, + { + "name": "MIME-Version", + "value": "1.0" + }, + { + "name": "Content-Type", + "value": "multipart/encrypted; protocol=\"application/pgp-encrypted\"; boundary=\"jn0WXJHqHVQT9hrvug28B8ufD3cTpWZ0t\"" + } + ], + "body": { + "size": 0 + }, + "parts": [ + { + "partId": "0", + "mimeType": "application/pgp-encrypted", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "application/pgp-encrypted" + }, + { + "name": "Content-Description", + "value": "PGP/MIME version identification" + } + ], + "body": { + "attachmentId": "ANGjdJ-9nYcG6Lig4If4SpiBbo-riJdNnaw3QUxtqkQn-0gd9HkbKfg81mTNAPr3kwOPFraccuH_8RXzJGKzqAXIC_t_O4hvt9Ou5s08EzxF_45Iq0laqjJr_LCn-6TH-_lJ3fbqpSb9a6mp5IbcwKfsWFa8h7T7RNQIJcUv-N-7zaHWkrE_Xm2oeu6LiJuZVNxdqr-my8Uwb4HjNiuZmlqREd0umhZ2_UyZVec-vMsmRohZQqFVnUODxsZW2OJgUWQ4IoDKOdv2dqLV-Osn_GiVN34SDDiKtam8WTHxQnjGB9VguML5T6doZW7i4IwHfIZTvKUIjtDlpRjCwghS0O1mCcmwQzcSOSdIUjb4SIo7EGjTUx6EmYGbyp9TmGo", + "size": 12 + } + }, + { + "partId": "1", + "mimeType": "application/octet-stream", + "filename": "encrypted.asc", + "headers": [ + { + "name": "Content-Type", + "value": "application/octet-stream; name=\"encrypted.asc\"" + }, + { + "name": "Content-Description", + "value": "OpenPGP encrypted message" + }, + { + "name": "Content-Disposition", + "value": "inline; filename=\"encrypted.asc\"" + } + ], + "body": { + "attachmentId": "ANGjdJ9lJupG_5HtgB0e7ov4Id63J0OieJIaru78PsE26ACBS72qINR266EXKBpDAh1IlZh6lyvy82c6CH_zNNCMR4IHo8FShQzj8h-YpxDXI02eSoUoA9AlG6-bga4KCRR1YsGCZdh2ODiyFzazkE_qUb6QI1K4EGgANeK5dSqxh9imW3SiDZpOmkVuW0F_ovLx27kCIbabOxF5z4F3lVuljeHNVOkUGeNAzRxqpbMFNqElmTWwi2zP_MeL_uYF-8he1h6N4tNyILNU70p_PYxpeygCPU0qoywhDqRL489l80zEhB_vIVvvDj9zSRwAGer-Jty-yUBkdrIwO3efS6zT8qUNBO59k0agDGCNFjTX6WU4mK9w5BGTjJfuEAI", + "size": 2059 + } + } + ] + }, + "sizeEstimate": 10880, + "historyId": "1405889", + "internalDate": "1577378774000" + }, + "attachments": { + "ANGjdJ-9nYcG6Lig4If4SpiBbo-riJdNnaw3QUxtqkQn-0gd9HkbKfg81mTNAPr3kwOPFraccuH_8RXzJGKzqAXIC_t_O4hvt9Ou5s08EzxF_45Iq0laqjJr_LCn-6TH-_lJ3fbqpSb9a6mp5IbcwKfsWFa8h7T7RNQIJcUv-N-7zaHWkrE_Xm2oeu6LiJuZVNxdqr-my8Uwb4HjNiuZmlqREd0umhZ2_UyZVec-vMsmRohZQqFVnUODxsZW2OJgUWQ4IoDKOdv2dqLV-Osn_GiVN34SDDiKtam8WTHxQnjGB9VguML5T6doZW7i4IwHfIZTvKUIjtDlpRjCwghS0O1mCcmwQzcSOSdIUjb4SIo7EGjTUx6EmYGbyp9TmGo": { + "data": "VmVyc2lvbjogMQ0K", + "size": 12 + }, + "ANGjdJ9lJupG_5HtgB0e7ov4Id63J0OieJIaru78PsE26ACBS72qINR266EXKBpDAh1IlZh6lyvy82c6CH_zNNCMR4IHo8FShQzj8h-YpxDXI02eSoUoA9AlG6-bga4KCRR1YsGCZdh2ODiyFzazkE_qUb6QI1K4EGgANeK5dSqxh9imW3SiDZpOmkVuW0F_ovLx27kCIbabOxF5z4F3lVuljeHNVOkUGeNAzRxqpbMFNqElmTWwi2zP_MeL_uYF-8he1h6N4tNyILNU70p_PYxpeygCPU0qoywhDqRL489l80zEhB_vIVvvDj9zSRwAGer-Jty-yUBkdrIwO3efS6zT8qUNBO59k0agDGCNFjTX6WU4mK9w5BGTjJfuEAI": { + "data": "LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tDQoNCmhRSU1BMHRhTC96bUxaVUJBUS8vZW1iRkdWUFJ1VmZpVXVqaExlc1FhNmE0c2JwL1BPUWNBc3krK082dEQvVkENCndyUXRQaEplbmlZVkZlT3MrMzdNV3kxUGtPVW42QUF2Z2FzSHRsTUNWbnRoeGF2RzFvbkltQ0pXeUMwTmRnWW4NCmhySU45YVBtT1k3VUdoVnpwVS9HVHhFMVdISkhHTU1HU2htS2J0K0pUaHRBdm11ZnVESzFEU2hvM2tjakdFczkNCndwWTBEVTArOUk3eEVtb2JnUXFLNGp5ekxCTE54NGFIbDJxdXJLU21qZ2htazFaTVc0b2x1Y2tyRG1tUTNBV1QNClovcTdibmJQMUdETkpWOGN4UjdlZDRrNkhDemtyWCtCeEwzMDhFOHNvTHRnODdvY2MxOFFvSkFJUkFIVTBreDUNCkpsUzkrZmgvak53S2FuWkpqQ1d2NmhxWkt6OWlVb2NSWkQ5aVBxaDlkaGpzS2FscWtSYXh1UE0yZUprWlkrOTENCmpHOHRzSFlUTGVZMzNBNGFVcGRBNkZwTlI4VXl6OEFndit4OC9hRnA4R3hTTkl1VXVtZjZiU0lrMk91ZHQvYTYNCnJXdlpPK00rVUs1M2E0azRpYnhya3Y0enNFOENiaWpqQ1A4QnZVckEzNzAyM0dFV2tPSEl5TW9GRnkwbzA2VzENCjU2d1RQMmJMbUtidWplRVMrZGt6anJyMXI5WDZvREJ3cG9QQUJLU0FqSUtGUUtjeFd2aE1nejRXTzN3NjFnM0YNCkU4VTBSbHg0bEI0Q2UxSTBxenU4UzRoa2FaN3NZY0tKLzIxMXB6c2FmMEJmeFpRZHJmeXU1a3NlMjc1WWdUVUENCmJPYm5vVzJzQVdnOGZYOUp3dUw5SlZBcm5KKzZBT1Fqdk5HOWZyL3VNNHRoVi96d3FCVVdmUTBzYXNEamp4U0YNCkFnd0RxbjBNRzkrVUh5d0JELzliTXJITmsvcWlyeHBmSVJhOXZaY1pzc1h2N0E2MVhVWnkySVZ1bTkrcDljNFcNCnN3ZDIza1FPZkMvODJGeDc1Q3dNUSt6emRQNys1dHFlTmZtMy80dmZPYkxDbXN6ZjErK2ozblZ4RUVYOHNXcEMNCm1nSG9iRDN1WlB3Z1NodmdjeTZaSGtmeitCcnhxcVRKSVo2eEQwM1Znem1OZzJjdUFIRDFZVlVLYlRIR1ljS00NCkNZMGIrMVZHNmx2NGY3OHhpQjB2OGF3L2FQVHZ0eDByWTJnMFlaSGFFMEpYVDU5Y01OVE1PUk5pRThoOGd1TEINCmxmNmhjd2N0Uk4rc0p3NW9XL3NhWHBnRkpTelZiUXJ3cDBhMWI2RnR6cXYrcXlKTDIreWF5ODNSYVBYK1I3TFINCkp5OWpQcndCYnp3Q1ZiSkJCU2ZlUTB6WGtlTkFPc284M3JFMTNVanhQc2wra1UwYWp4eTU1Sy9QL2NMTzZLS3MNCkt0Rk43VUdvMmpHZWxwcURvR1U1RndPb0dlRWFZVytJbnJacnl5Vi9BMmJqdzZabWZiaDBHTXpsczI1ZksvOU8NCk9KcC9EMHlxRW1ua1U2ME82ZUR3d3d4WTdWTnFtdHVPVFo0ejhQSWFWOUxXdWZ0Vk9lT0c5OSs5ZzYyODBDS0YNCllZSEF4Z2I1NTl2NzBWNTBiaytaOTFyZEExU254U3E5d09rVXUySzFCbWtUZHFFTzVqeFdmMDRNR3J2Uk9aVUENCmRJS1ErUFlpYm5SbytTT2JCVW40T3RsZmhlbDF0Sjl3V1dqSkxwR0oxWm0zRmFvQ1ZIL01ubnZoRjQ4UTVKTlINClNEbnFUZzR3V2Q1MVRva2NuejJQb1ByeFJOM2phY0k0ZDBHWmlBdHNtQjI4bWNLamRCNVVZb1hFeTJNYXpOTEENCnlBSHpDSFJ0T0o3ZU9jU3R3bHR3bmJoNjcvUkNLOU9DZWdhaVNPTUFjc0VjaVZYVXBUK2hWbDhvTWw2SXZKRGsNCkZxMUN3T0w4dDNPajNXMmlnUGttMkVlakhsMWRrejJKWFBIamZIcXQyNHRUdFdSYTN4dW90b1N2TUF5K3RmS1QNCkN3ZzY3blFhbi8xM2hsM2VGMFhYTENEKythb3RHU2FoVWVQc2daVTc5b2VkWTJ2bWNvZlVmNzQzc1ovTjZhTVANCmdFTHp3eUxtN0x6Y0ZMamVva2hOVURZcEJnckg1K0ZjRlpxcGlUUWhJTE9OU3Zlbm5jUDRrM0ZEakM4N0RHNUoNCnlJY2tCTjFLZVUyMTl2YVlIRWttU21VM2VnZkVZUk13Mkh6bkZBYWlNRUFuRG9HczBaVHFOT3g3NWt0WkxwZlMNCjc3OUFQU1REbVMvaHNYWG83RDgvbXlZV081Uk14RnpHTDdTSWNYa29zcWErVFMzRko1MTk4ZXBIMHhMTnJEaE0NCjFsTU8yWlU1cWIyVE5BK1d2U3ZpaXdXc1oreWo2a0QxcnpydkVnKytxMWI2N3Mzb29nUDA4d3dIY2ZYK1VpTkQNCnZkR2VWZDJZRlBYMGtzemh0ZkpERVlBa0o4RVJlNVJLUXFlTlhkazhYTVlxMmlycDNBVkJUQkRrZ1RnTURQU1UNCkNJM2c4OVMzZWxkVA0KPVA0TzgNCi0tLS0tRU5EIFBHUCBNRVNTQUdFLS0tLS0NCg", + "size": 2059 + } + }, + "raw": { + "id": "16f431a0b9056562", + "threadId": "16f431a0b9056562", + "labelIds": [ + "Label_17", + "IMPORTANT", + "STARRED", + "CATEGORY_PERSONAL", + "Label_15" + ], + "snippet": "", + "sizeEstimate": 10880, + "raw": "Delivered-To: flowcrypt.compatibility@gmail.com
Received: by 2002:ac8:1953:0:0:0:0:0 with SMTP id g19csp10672104qtk;
        Thu, 26 Dec 2019 08:46:18 -0800 (PST)
X-Received: by 2002:a2e:86c4:: with SMTP id n4mr26198078ljj.97.1577378778109;
        Thu, 26 Dec 2019 08:46:18 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1577378778; cv=none;
        d=google.com; s=arc-20160816;
        b=qkzTcKO2KlrxvPwe3cmyCVwEiGmy6TjxEMrk9dHeG8AkQ5AYxxXDz5Yin9Yjq8pjvJ
         SjSXFNmRD3adaijAwvAB71bF58KXKKiRijO6k1hJVLHtF5Mg1Q0bIZTc05g65I5LhDZg
         imCsDm+DrYg9Prpsyyv253tDr3EsftHHkpImbqV0mLx+NaqlEreKORQ+iomudVwOmgaU
         BsIm3v+SUbCpx3kyW+H0JqRPTMxLN9ykaCRWIsq4uWmsgWk4iBT1F29TDeOrq56Rqh7q
         7dMYnd6Go8amQfBQNZPvEZtIoHIOYJZl10+tDghwf1CR4tlztTwAmvPAOdOoYkUSPgX2
         YinA==
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:openpgp:subject
         :from:to:dkim-signature;
        bh=WXm/BTEdazl3ru5iqGjwUEMmp0Ag58YtdrLanlzNw5g=;
        b=yCi6VgA4r/wL2Pt5cFBN7gGYbY6ts+67YT9yJaArx0KWRaV3qVSGBZEQwtI1zYaeph
         I9xBMHfuKoPQP6qNqQAkri9dF2oJbEPkw5s4JLYq/qdvHz1N4CYXF7n0CV7J2Xft8s2A
         FTivjQj006+4EhUSI1QIvXl+49w89ktxZIoLAmqG7OdsIEGtptInnip2Ab9Rs8bbVgjo
         y5HD3q3nZ24JbDr8v+NOKxvQIuAC3mVEaYXfImsBXGfRPJhLtAfCnRLCW6NCcnK4yCA+
         dqIeKpV4ucqUu4ni+khw1u6z40ZqJUYo8AGHlY2i65fG9BXvAmvkWR3ms+P7KiFv3Qas
         Claw==
ARC-Authentication-Results: i=1; mx.google.com;
       dkim=pass header.i=@gmail.com header.s=20161025 header.b=SWnZF5AP;
       spf=pass (google.com: domain of michael.flowcrypt2@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=michael.flowcrypt2@gmail.com;
       dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com
Return-Path: <michael.flowcrypt2@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 c4sor7373219lff.49.2019.12.26.08.46.17
        for <flowcrypt.compatibility@gmail.com>
        (Google Transport Security);
        Thu, 26 Dec 2019 08:46:18 -0800 (PST)
Received-SPF: pass (google.com: domain of michael.flowcrypt2@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=SWnZF5AP;
       spf=pass (google.com: domain of michael.flowcrypt2@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=michael.flowcrypt2@gmail.com;
       dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20161025;
        h=to:from:subject:openpgp:autocrypt:message-id:date:user-agent
         :mime-version;
        bh=WXm/BTEdazl3ru5iqGjwUEMmp0Ag58YtdrLanlzNw5g=;
        b=SWnZF5AP7EEcz3V/rCfUfRITxwrfG5njKpX0n+n0nXZAddsCq7zaZhE1HU7QEiqmUp
         8Cfd06WzrooVpPPe2YomuKPcLPIfKDGANQHKQJ/CuiNP7cApSZCNHmnSM5JAzZFedCmI
         YnDmpiaLzLhviyW4nAh567mZ4YmO364fchnX1/cCjGQ0J0J0xvEaBwD3QrM4xF87gJGe
         HhSvuqVXgu+X9dYpDR3ATziHeIU6LbsRCW3viCcl/HGkNV4rPr2umPPZq4KUdoOY5aVT
         +04+/4AiUySkRN7S203o96nMY2wfNKT3he/RXPT4IXnYGDLFNba14dQat8Lkxg7IvR5Y
         tEsw==
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:openpgp:autocrypt:message-id
         :date:user-agent:mime-version;
        bh=WXm/BTEdazl3ru5iqGjwUEMmp0Ag58YtdrLanlzNw5g=;
        b=NU6VjEhv3RyFDmVuR7WFykprjKYg/FFPaVt3zIP9hls5SxzG7dFEJLEqM6TBsMAvjq
         3XFUNO4UOukQA1Pc39JrW5P1iZ0Th/ySmnjB0Rq1dcw56j9qp1b08fBk3mnSOF4g71MT
         LM92aPp0gynkdbPITfFa2d9I22jMwmIoEZB6FMyWkGy0uOR5dfMwxaUwUIUsOoomenzN
         0cqVmjjR16IAB2GCbq/nb3b72j7YEa6//GoVio4UBBHXoYXlmAv7NOLkw4bQIp+0aZGF
         qPnqU9TGvpaJV4H9EOHUNM9d6XYb6rDRtI86dWREDhplE+Mh08pR7DeslKx5GGHMwDz1
         jXYQ==
X-Gm-Message-State: APjAAAVMuPOPVQcpHvoy2szKblT6tIIFsIYUPLUU+RfBHmZoOeGvZ9fm
	Ta0F87t7nephJLVeq/PsS0Tn93MIcMo=
X-Google-Smtp-Source: APXvYqygs6+e1popxcbqHbB3tHvrKf1IWN/F73XpOMropGOit9sER8pMxbYvDX5olsG90LJLR3oT1w==
X-Received: by 2002:a19:3f16:: with SMTP id m22mr25559707lfa.116.1577378777412;
        Thu, 26 Dec 2019 08:46:17 -0800 (PST)
Return-Path: <michael.flowcrypt2@gmail.com>
Received: from [192.168.88.22] (23-123-207-82.ip.ukrtel.net. [82.207.123.23])
        by smtp.gmail.com with ESMTPSA id 192sm13351335lfh.28.2019.12.26.08.46.16
        for <flowcrypt.compatibility@gmail.com>
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Thu, 26 Dec 2019 08:46:16 -0800 (PST)
To: flowcrypt.compatibility@gmail.com
From: michael <michael.flowcrypt2@gmail.com>
Subject: Encrypted Plain Text ISO-2022-JP (Enigmail)
Openpgp: preference=signencrypt
Autocrypt: addr=michael.flowcrypt2@gmail.com; keydata=
 mQINBFz7l+kBEAC7DOpjvJ3wILWhQFEWfDWnjXZLEfieiLQ6NZX8ej3IGUGapIf71J99cQAF
 akDkX1NF2BVNRxTqjzQ4wx6st4zxAcwTFKXmVjIDU6XMLVFAEl1eP5VybY0dvv7uYQN8Vchf
 QpbLzOfCz6Oc2X+JNnIIaKKEcae46hgfV+eU9ktDVhQgb1OXH/ny/8GDdwQUjwysOuAR9364
 9lnxiibZJNmd7qfxMmjN1Lwz5yGaoPHHn+8it+oyMx+z36Zt+v2He9sRHtPGIEY2rdDszdER
 Wv1ftjHYg1O+q/irAP3xzZ578fZKlaTz205zOVQhlkWIyXA1Wuj7yjjPrOe4QF6hcJ4jGoN6
 YvgVWxxvqwdNAKBxTQPLyqbrAa1nH/svnuoX4mczngW5npBm4+PSBbLo3ADBu1boGhGl1QaE
 vIG7L+Gvb9Iw3ZyDKSertB0ZQZ6IE782k/D0sSbT8mniY5CrGO0oNaGvqrFuaOErNhGQ6fH0
 GOU44WVvYiVXdh3CyFQ90P0hpmlcNpShCNEaA94+ne7BXmMJnvAl9cP98giAmQlXx4cGy+JB
 cyCs5LdtvFml5/D99pd8oinCQWWAvjZI6diQDNrkw2kQVHqaCBerV21eB/eee3aIMzvCurcq
 TDDJa1CEoHX3INV4aivq4/6Ys6Z4i4tilD0wicKzezu9ENFcmQARAQABtC9NaWNoYWVsIFZv
 bHluZXRzIDxtaWNoYWVsLmZsb3djcnlwdDJAZ21haWwuY29tPokCNQQQAQgAHwUCXPuX6QYL
 CQcIAwIEFQgKAgMWAgECGQECGwMCHgEACgkQAJIVTI1IIzVqUA//UNgj6py7juui0EwPOwNF
 IC9p40qaDvjqfNVdfmcr/39odm8yzdx/0eZTRIGZDWC3BBM5gSFF9ZNGcVFTMe0N3OZZPxGm
 Y9XN79jobeVvE0WoLEZEHI9IY86HLAC8yc/SeiQsbKp6ZiJyDuY4gUQ07yq4Bc/HfgTyITsi
 aoFvWXEHcLuw1ZOimCpQg1+XqGwWhAnNhXGFe6tvw41uehafPEN+8Lj/NqMrFQ5qVOslXUUv
 vkpfNvAm7LBVIY79YAe5su1XMuKcrxW/7nZBKa3mbFYcnjtbW+LJqcEfAl4NNDND1ho7Guls
 P2JFxlxy+YqXJ6oG88Hxb5mdlVyWSkuGG+BY75D1fgenv4ntZoumCdCaDIlKFOwfCF7EToZX
 tedSyzs0+DRfiVg9Yp8w3IIxFn+KhN3x12NXvkNm+ZOC+I7sac/bvX7KJ3ThUf/C1QysbpmS
 wfmlSqk9SjthbdlrWZ20OG5yvIiCS1Bixjo2lTJLA6QSqQmcMwjd5rQrut5GkTHqxnQQb42u
 eO+n/GV4c6x0QT1hfKV7thE3U7XPvzUK5E8Ti9CLkDd6KE4hAct2jhlE7zYHrSbkJnWIUInr
 QefPQ0EG2qJzdZXniBXj2Orwk2UVsertkLD3y6Iwv7Xk9pp3zXWOPKxFK3LbnfLwmIQCd3VQ
 14uh/hR3aRZfN/25Ag0EXPuX6QEQAK7/8UKmcuTNHz+mPfoOdMkxgdzikx9zgwASubc2Nhq0
 +b+P4yiWOJgbmULLXnpVEH3I+XyqgcUi42wZ3KWx04Wbg1dlsSiMN/9ojdXfhn+K2V5QnrUR
 lgZrz2xLCcMNgbVpdsLv8tnwb1rIQapq/b12RJKU9ZBwX/5W7za9UAjwibWgrVsFCUR5omlO
 e7Zg1z+37DmIIUGwnDN7nHH+LOyZxu2STdKx7EZQ7glqi/WnE85doRidARrM9lPibGJlxLQ0
 XnTrgPkKd/A+D6aidTS+NUSK+HSLOJzOuWnz9MHExYuQG/f2WCNVabAYNnIl9fJEcCduz/SR
 LbzxH8iL25H3ptonWajhkv/vFzfzzAFhXMJNehFR6QuZFlBQA078SuPb57ZYgXBA8KP9uN2x
 2/Td+O7vTuYAsnyHwhZyCFtLtMP5jyt+ObR8wWW1OrVUVxOxvW4zcMBdCft07C03aIoOsvwA
 Fie/eJhte2czdtGPN8IlUZM5ZtKop4YephIxWd4yXqPbtQNuCQlzYRaLO7A6v1lLkKSxIESb
 XbMd5ez86JohqFbSLnxE3O8+WhLcYEa8v6tPsI1HfxkUGYexWJ9QBnFKtW5pjMMoJv17s8Wt
 sekjXmGhsje452Ma7IHfnEcrm4p/GO9AFvP06+fkZvjPb2rtxkwmG2oMUptVoO43ABEBAAGJ
 Ah8EGAEIAAkFAlz7l+kCGwwACgkQAJIVTI1IIzVOgQ//QT5Spj15y10bhSCJXc5amoRUG/yj
 ljrPLkR++9YiwsUvcZgKesMKgKp/cqOPmptD5C66c9oG1FyvHclYujki/SKhpnruRKSnvDW/
 lpZnYo1QnNx1Khxu4XTcjtycAKfijBVuuR/maToR9DP9n4/5seH5TeLIGJg+YUczL4HI+kJm
 8iHanmPxZQR69Cr1xDB9FwliLl9BaTFbs0lWOguEkqwl84EACuGQTLOGI4u1EN/9RgAx8JX6
 JqA5l1rplC4N8HPgJ6zBp7ydzdSofoxGctSATJVmoweeWwL585GdsE0Fs+cWVSb8/tqFXGGR
 /oB95rb5d169vF7vbcb+h6ZidsPZqqnz85O2EgI5LkusyCG+GbKIiawkB56QA3NtT7ZotC2L
 6FVzb00YezkLNu/ZtGq6vVk7qzBw4z+bu6xUWEJYTbnVa1Kaop3cu4mVl8pfEXQAd7WchgdM
 ULln2cdmoxNi63r7dUjEIv6QIQysCsf7EjxFzkvlw4V4fYrodWkisuamd1BqkWLlHneKaqx3
 nzV35omhvvVNQyA9gqMAkxadJhD4PxS7KvPGNejQsmhME4OoI8yeg/iOGR/OTpMhk/rrQWtF
 2wrCBExh2EKOkRCx0xVvyOjjStFEKc7SkuY5Nr5Fe365elDkXSr7LmEcjdR1fhFV7cG4TLMe
 x6aRXsA=
Message-ID: <730885c7-a1e2-60ed-8697-688c403bfcd8@gmail.com>
Date: Thu, 26 Dec 2019 18:46:14 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101
 Thunderbird/60.9.0
MIME-Version: 1.0
Content-Type: multipart/encrypted;
 protocol="application/pgp-encrypted";
 boundary="jn0WXJHqHVQT9hrvug28B8ufD3cTpWZ0t"

This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
--jn0WXJHqHVQT9hrvug28B8ufD3cTpWZ0t
Content-Type: application/pgp-encrypted
Content-Description: PGP/MIME version identification

Version: 1

--jn0WXJHqHVQT9hrvug28B8ufD3cTpWZ0t
Content-Type: application/octet-stream; name="encrypted.asc"
Content-Description: OpenPGP encrypted message
Content-Disposition: inline; filename="encrypted.asc"

-----BEGIN PGP MESSAGE-----

hQIMA0taL/zmLZUBAQ//embFGVPRuVfiUujhLesQa6a4sbp/POQcAsy++O6tD/VA
wrQtPhJeniYVFeOs+37MWy1PkOUn6AAvgasHtlMCVnthxavG1onImCJWyC0NdgYn
hrIN9aPmOY7UGhVzpU/GTxE1WHJHGMMGShmKbt+JThtAvmufuDK1DSho3kcjGEs9
wpY0DU0+9I7xEmobgQqK4jyzLBLNx4aHl2qurKSmjghmk1ZMW4oluckrDmmQ3AWT
Z/q7bnbP1GDNJV8cxR7ed4k6HCzkrX+BxL308E8soLtg87occ18QoJAIRAHU0kx5
JlS9+fh/jNwKanZJjCWv6hqZKz9iUocRZD9iPqh9dhjsKalqkRaxuPM2eJkZY+91
jG8tsHYTLeY33A4aUpdA6FpNR8Uyz8Agv+x8/aFp8GxSNIuUumf6bSIk2Oudt/a6
rWvZO+M+UK53a4k4ibxrkv4zsE8CbijjCP8BvUrA37023GEWkOHIyMoFFy0o06W1
56wTP2bLmKbujeES+dkzjrr1r9X6oDBwpoPABKSAjIKFQKcxWvhMgz4WO3w61g3F
E8U0Rlx4lB4Ce1I0qzu8S4hkaZ7sYcKJ/211pzsaf0BfxZQdrfyu5kse275YgTUA
bObnoW2sAWg8fX9JwuL9JVArnJ+6AOQjvNG9fr/uM4thV/zwqBUWfQ0sasDjjxSF
AgwDqn0MG9+UHywBD/9bMrHNk/qirxpfIRa9vZcZssXv7A61XUZy2IVum9+p9c4W
swd23kQOfC/82Fx75CwMQ+zzdP7+5tqeNfm3/4vfObLCmszf1++j3nVxEEX8sWpC
mgHobD3uZPwgShvgcy6ZHkfz+BrxqqTJIZ6xD03VgzmNg2cuAHD1YVUKbTHGYcKM
CY0b+1VG6lv4f78xiB0v8aw/aPTvtx0rY2g0YZHaE0JXT59cMNTMORNiE8h8guLB
lf6hcwctRN+sJw5oW/saXpgFJSzVbQrwp0a1b6Ftzqv+qyJL2+yay83RaPX+R7LR
Jy9jPrwBbzwCVbJBBSfeQ0zXkeNAOso83rE13UjxPsl+kU0ajxy55K/P/cLO6KKs
KtFN7UGo2jGelpqDoGU5FwOoGeEaYW+InrZryyV/A2bjw6Zmfbh0GMzls25fK/9O
OJp/D0yqEmnkU60O6eDwwwxY7VNqmtuOTZ4z8PIaV9LWuftVOeOG99+9g6280CKF
YYHAxgb559v70V50bk+Z91rdA1SnxSq9wOkUu2K1BmkTdqEO5jxWf04MGrvROZUA
dIKQ+PYibnRo+SObBUn4Otlfhel1tJ9wWWjJLpGJ1Zm3FaoCVH/MnnvhF48Q5JNR
SDnqTg4wWd51Tokcnz2PoPrxRN3jacI4d0GZiAtsmB28mcKjdB5UYoXEy2MazNLA
yAHzCHRtOJ7eOcStwltwnbh67/RCK9OCegaiSOMAcsEciVXUpT+hVl8oMl6IvJDk
Fq1CwOL8t3Oj3W2igPkm2EejHl1dkz2JXPHjfHqt24tTtWRa3xuotoSvMAy+tfKT
Cwg67nQan/13hl3eF0XXLCD++aotGSahUePsgZU79oedY2vmcofUf743sZ/N6aMP
gELzwyLm7LzcFLjeokhNUDYpBgrH5+FcFZqpiTQhILONSvenncP4k3FDjC87DG5J
yIckBN1KeU219vaYHEkmSmU3egfEYRMw2HznFAaiMEAnDoGs0ZTqNOx75ktZLpfS
779APSTDmS/hsXXo7D8/myYWO5RMxFzGL7SIcXkosqa+TS3FJ5198epH0xLNrDhM
1lMO2ZU5qb2TNA+WvSviiwWsZ+yj6kD1rzrvEg++q1b67s3oogP08wwHcfX+UiND
vdGeVd2YFPX0kszhtfJDEYAkJ8ERe5RKQqeNXdk8XMYq2irp3AVBTBDkgTgMDPSU
CI3g89S3eldT
=P4O8
-----END PGP MESSAGE-----

--jn0WXJHqHVQT9hrvug28B8ufD3cTpWZ0t--
", + "historyId": "1405889", + "internalDate": "1577378774000" + } +} \ No newline at end of file diff --git a/test/source/mock/google/exported-messages/message-export-16f66f1da9d50d05.json b/test/source/mock/google/exported-messages/message-export-16f66f1da9d50d05.json new file mode 100644 index 00000000000..199df8b0635 --- /dev/null +++ b/test/source/mock/google/exported-messages/message-export-16f66f1da9d50d05.json @@ -0,0 +1,136 @@ +{ + "acctEmail": "flowcrypt.compatibility@gmail.com", + "full": { + "id": "16f66f1da9d50d05", + "threadId": "16f66f1da9d50d05", + "labelIds": [ + "IMPORTANT", + "STARRED", + "CATEGORY_PERSONAL", + "Label_12" + ], + "snippet": "", + "payload": { + "partId": "", + "mimeType": "multipart/encrypted", + "filename": "", + "headers": [ + { + "name": "X-Gm-Message-State", + "value": "APjAAAXdsAjPOBidLuhLC2z83Q695hzN4Md1IQuuKGiGKOJwveCtLqQ7 ugKhTSO6lLNGEFPtYzcJl/kjupx6stw=" + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "From", + "value": "sender@domain.com" + }, + { + "name": "Subject", + "value": "ISO-2022-JP, PGP/Mime" + }, + { + "name": "Openpgp", + "value": "preference=signencrypt" + }, + { + "name": "Autocrypt", + "value": "addr=michael.flowcrypt2@gmail.com; keydata= mQINBFz7l+kBEAC7DOpjvJ3wILWhQFEWfDWnjXZLEfieiLQ6NZX8ej3IGUGapIf71J99cQAF akDkX1NF2BVNRxTqjzQ4wx6st4zxAcwTFKXmVjIDU6XMLVFAEl1eP5VybY0dvv7uYQN8Vchf QpbLzOfCz6Oc2X+JNnIIaKKEcae46hgfV+eU9ktDVhQgb1OXH/ny/8GDdwQUjwysOuAR9364 9lnxiibZJNmd7qfxMmjN1Lwz5yGaoPHHn+8it+oyMx+z36Zt+v2He9sRHtPGIEY2rdDszdER Wv1ftjHYg1O+q/irAP3xzZ578fZKlaTz205zOVQhlkWIyXA1Wuj7yjjPrOe4QF6hcJ4jGoN6 YvgVWxxvqwdNAKBxTQPLyqbrAa1nH/svnuoX4mczngW5npBm4+PSBbLo3ADBu1boGhGl1QaE vIG7L+Gvb9Iw3ZyDKSertB0ZQZ6IE782k/D0sSbT8mniY5CrGO0oNaGvqrFuaOErNhGQ6fH0 GOU44WVvYiVXdh3CyFQ90P0hpmlcNpShCNEaA94+ne7BXmMJnvAl9cP98giAmQlXx4cGy+JB cyCs5LdtvFml5/D99pd8oinCQWWAvjZI6diQDNrkw2kQVHqaCBerV21eB/eee3aIMzvCurcq TDDJa1CEoHX3INV4aivq4/6Ys6Z4i4tilD0wicKzezu9ENFcmQARAQABtC9NaWNoYWVsIFZv bHluZXRzIDxtaWNoYWVsLmZsb3djcnlwdDJAZ21haWwuY29tPokCNQQQAQgAHwUCXPuX6QYL CQcIAwIEFQgKAgMWAgECGQECGwMCHgEACgkQAJIVTI1IIzVqUA//UNgj6py7juui0EwPOwNF IC9p40qaDvjqfNVdfmcr/39odm8yzdx/0eZTRIGZDWC3BBM5gSFF9ZNGcVFTMe0N3OZZPxGm Y9XN79jobeVvE0WoLEZEHI9IY86HLAC8yc/SeiQsbKp6ZiJyDuY4gUQ07yq4Bc/HfgTyITsi aoFvWXEHcLuw1ZOimCpQg1+XqGwWhAnNhXGFe6tvw41uehafPEN+8Lj/NqMrFQ5qVOslXUUv vkpfNvAm7LBVIY79YAe5su1XMuKcrxW/7nZBKa3mbFYcnjtbW+LJqcEfAl4NNDND1ho7Guls P2JFxlxy+YqXJ6oG88Hxb5mdlVyWSkuGG+BY75D1fgenv4ntZoumCdCaDIlKFOwfCF7EToZX tedSyzs0+DRfiVg9Yp8w3IIxFn+KhN3x12NXvkNm+ZOC+I7sac/bvX7KJ3ThUf/C1QysbpmS wfmlSqk9SjthbdlrWZ20OG5yvIiCS1Bixjo2lTJLA6QSqQmcMwjd5rQrut5GkTHqxnQQb42u eO+n/GV4c6x0QT1hfKV7thE3U7XPvzUK5E8Ti9CLkDd6KE4hAct2jhlE7zYHrSbkJnWIUInr QefPQ0EG2qJzdZXniBXj2Orwk2UVsertkLD3y6Iwv7Xk9pp3zXWOPKxFK3LbnfLwmIQCd3VQ 14uh/hR3aRZfN/25Ag0EXPuX6QEQAK7/8UKmcuTNHz+mPfoOdMkxgdzikx9zgwASubc2Nhq0 +b+P4yiWOJgbmULLXnpVEH3I+XyqgcUi42wZ3KWx04Wbg1dlsSiMN/9ojdXfhn+K2V5QnrUR lgZrz2xLCcMNgbVpdsLv8tnwb1rIQapq/b12RJKU9ZBwX/5W7za9UAjwibWgrVsFCUR5omlO e7Zg1z+37DmIIUGwnDN7nHH+LOyZxu2STdKx7EZQ7glqi/WnE85doRidARrM9lPibGJlxLQ0 XnTrgPkKd/A+D6aidTS+NUSK+HSLOJzOuWnz9MHExYuQG/f2WCNVabAYNnIl9fJEcCduz/SR LbzxH8iL25H3ptonWajhkv/vFzfzzAFhXMJNehFR6QuZFlBQA078SuPb57ZYgXBA8KP9uN2x 2/Td+O7vTuYAsnyHwhZyCFtLtMP5jyt+ObR8wWW1OrVUVxOxvW4zcMBdCft07C03aIoOsvwA Fie/eJhte2czdtGPN8IlUZM5ZtKop4YephIxWd4yXqPbtQNuCQlzYRaLO7A6v1lLkKSxIESb XbMd5ez86JohqFbSLnxE3O8+WhLcYEa8v6tPsI1HfxkUGYexWJ9QBnFKtW5pjMMoJv17s8Wt sekjXmGhsje452Ma7IHfnEcrm4p/GO9AFvP06+fkZvjPb2rtxkwmG2oMUptVoO43ABEBAAGJ Ah8EGAEIAAkFAlz7l+kCGwwACgkQAJIVTI1IIzVOgQ//QT5Spj15y10bhSCJXc5amoRUG/yj ljrPLkR++9YiwsUvcZgKesMKgKp/cqOPmptD5C66c9oG1FyvHclYujki/SKhpnruRKSnvDW/ lpZnYo1QnNx1Khxu4XTcjtycAKfijBVuuR/maToR9DP9n4/5seH5TeLIGJg+YUczL4HI+kJm 8iHanmPxZQR69Cr1xDB9FwliLl9BaTFbs0lWOguEkqwl84EACuGQTLOGI4u1EN/9RgAx8JX6 JqA5l1rplC4N8HPgJ6zBp7ydzdSofoxGctSATJVmoweeWwL585GdsE0Fs+cWVSb8/tqFXGGR /oB95rb5d169vF7vbcb+h6ZidsPZqqnz85O2EgI5LkusyCG+GbKIiawkB56QA3NtT7ZotC2L 6FVzb00YezkLNu/ZtGq6vVk7qzBw4z+bu6xUWEJYTbnVa1Kaop3cu4mVl8pfEXQAd7WchgdM ULln2cdmoxNi63r7dUjEIv6QIQysCsf7EjxFzkvlw4V4fYrodWkisuamd1BqkWLlHneKaqx3 nzV35omhvvVNQyA9gqMAkxadJhD4PxS7KvPGNejQsmhME4OoI8yeg/iOGR/OTpMhk/rrQWtF 2wrCBExh2EKOkRCx0xVvyOjjStFEKc7SkuY5Nr5Fe365elDkXSr7LmEcjdR1fhFV7cG4TLMe x6aRXsA=" + }, + { + "name": "Date", + "value": "Thu, 2 Jan 2020 17:48:40 +0200" + }, + { + "name": "User-Agent", + "value": "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0" + }, + { + "name": "MIME-Version", + "value": "1.0" + }, + { + "name": "Content-Type", + "value": "multipart/encrypted; protocol=\"application/pgp-encrypted\"; boundary=\"zAAof6AQi3Kw0jH3WNdRvGF30kCCq1qjt\"" + } + ], + "body": { + "size": 0 + }, + "parts": [ + { + "partId": "0", + "mimeType": "application/pgp-encrypted", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "application/pgp-encrypted" + }, + { + "name": "Content-Description", + "value": "PGP/MIME version identification" + } + ], + "body": { + "attachmentId": "ANGjdJ-c7s05r91FzBL7wxqkxZBrXiSb0l0sEjxD2w-BJUi8hh3o-923E_8mJvKyv3EJUY0diTffMjMUtmyXooJ-CwOWyYdGzVMIu1ib_O-i_dfE8NY8Z-855qUomEJ0cOP_WYyCBA4s0WPo-TeH2vUiWyjOO293C4a-sBVB8wd-smwywns-i1yEHo3NKPVsq7XXiigKfk9c_gaJto37wXUu_agG25ZYC4WsInkt33KBTbD70tDVPcYA6hd4NIkynag3caFUKWUNHyHEK3oGMGcSvJngAxvAtYmb0RdAajNsWhitQotCrWNFeRJNwVKoWG1KCxth33F21vztibcHKD2rrDwvTMlz8wsLrFtD4CH_lM6yvfrlJWTf9NFbgq8", + "size": 12 + } + }, + { + "partId": "1", + "mimeType": "application/octet-stream", + "filename": "encrypted.asc", + "headers": [ + { + "name": "Content-Type", + "value": "application/octet-stream; name=\"encrypted.asc\"" + }, + { + "name": "Content-Description", + "value": "OpenPGP encrypted message" + }, + { + "name": "Content-Disposition", + "value": "inline; filename=\"encrypted.asc\"" + } + ], + "body": { + "attachmentId": "ANGjdJ_EpFVdTxzU9ZSdKpmGLZ9o4RHipy3-JGfeDRa7TOvVUMnrUTUN1nXwfgFfoVTLOgbXPJmxiD-83hBkhOG6jSx2NRt5A_dOGP4vPbgDx6_41R8DxUgQS8I-SJMvWTQJBCaddPwiXJLyO74s5TnynGrOn38F2furwWahX8qGy27aHcYMOFmZVMZw59NR_Zq5AW7GDWGC_S8h1bveKhbBU7haJFTXHwWt0OIpUsOaNkBsjde56weqQ60i6hqANUTc4x1ku8NpePI2fYPwSOu-A7h0P0mU5gykRujr70yWjxnfz-tGQZvP4cDB94uiHj50A3UT8xe_x0vMLo1VQgdPaWc7PExTQNCTveRNz8Ih3FH9WexQ-gTDaOpOfDs", + "size": 2833 + } + } + ] + }, + "sizeEstimate": 11634, + "historyId": "1405869", + "internalDate": "1577980120000" + }, + "attachments": { + "ANGjdJ-c7s05r91FzBL7wxqkxZBrXiSb0l0sEjxD2w-BJUi8hh3o-923E_8mJvKyv3EJUY0diTffMjMUtmyXooJ-CwOWyYdGzVMIu1ib_O-i_dfE8NY8Z-855qUomEJ0cOP_WYyCBA4s0WPo-TeH2vUiWyjOO293C4a-sBVB8wd-smwywns-i1yEHo3NKPVsq7XXiigKfk9c_gaJto37wXUu_agG25ZYC4WsInkt33KBTbD70tDVPcYA6hd4NIkynag3caFUKWUNHyHEK3oGMGcSvJngAxvAtYmb0RdAajNsWhitQotCrWNFeRJNwVKoWG1KCxth33F21vztibcHKD2rrDwvTMlz8wsLrFtD4CH_lM6yvfrlJWTf9NFbgq8": { + "data": "VmVyc2lvbjogMQ0K", + "size": 12 + }, + "ANGjdJ_EpFVdTxzU9ZSdKpmGLZ9o4RHipy3-JGfeDRa7TOvVUMnrUTUN1nXwfgFfoVTLOgbXPJmxiD-83hBkhOG6jSx2NRt5A_dOGP4vPbgDx6_41R8DxUgQS8I-SJMvWTQJBCaddPwiXJLyO74s5TnynGrOn38F2furwWahX8qGy27aHcYMOFmZVMZw59NR_Zq5AW7GDWGC_S8h1bveKhbBU7haJFTXHwWt0OIpUsOaNkBsjde56weqQ60i6hqANUTc4x1ku8NpePI2fYPwSOu-A7h0P0mU5gykRujr70yWjxnfz-tGQZvP4cDB94uiHj50A3UT8xe_x0vMLo1VQgdPaWc7PExTQNCTveRNz8Ih3FH9WexQ-gTDaOpOfDs": { + "data": "LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tDQoNCmhRSU1BMHRhTC96bUxaVUJBUS8rSmdwbWtnc2NKRUI5dUFpRlQ2VGJlWnNCcUQvclJESW5hYjlPZXZyUkJXT1oNCndRN1V4UzRPa004TTFqb2ZsRWd0UDFaak5rQ0N1T0c1UlhSM0paRmtVZVFidnRNYzRtcHgrT09qWWJ3SHdOTkUNCjA1d2JjSUhuMzgwYXhOUFdNWXFlOC9pQ0s5d0ZXaE1Ed3RwRGZKMFB6TEtBaG5qRmh5bU1Xam1YQjJhdmVqYVMNCmlhS1FSZWxtVWlOdDVUazZGQXU4VW5PQWJyNyt1THZGQnp6anlFTEwzcEd6REJMa2F3aFVUMlFaMm5xckMxTnMNCko4SEVYbmwwVEJJNVQ5cmxLNWk2WVFpMmkyNlNXazhRa00wb3Y1T1dWSzFxSVNmMTVWSGVQNXVMWGNoM01mSHUNCkVmUUV1Ym8zNzhKYmthOVFNbzEvRS84dWJsR1FSZU1wc3Zicld0bzlIcWZQU1hVR2UzaFVRY0lSaTNuS3VRQngNCm5iTVdvbm5ORTdVRWhCRnl0TEwydytNbUJEbGtlUGE3ekRuZ09qUXdMcFlOVnZyeEpuQ2prNlNrY3JuK3gyMEQNCllrR3ppRXVicWhxdU1STHhKaHQ0VVRMdVJTTEk4ajFOdElSWjVROUJpKzFrclNKejUyN2NicS9JRkJVK0VtTlYNCmZDY1IxblliRjUvaHlUd0I3YVpReXhDVmxSV0tsWWZ3djQrN3E5Y2o1d0NCdUxDWTdaS3VjRWJ6b2RlaFJjRXQNCjRDOFR4ZzJLa0Q3LzgrVHQ2MEtjcWp2eUR0UWtRWU5TYXVidWdzRzJCQW1KcFlSVTZLRlZHRGxwTmU2Z0dFUUkNCmhuVlFxNVVhWjl6MERjZXZFMjVYcjdmZzJtTE43eUhSUlNhdXZPR2xNblA5OGQzZ0RsdVFsYnZBems1cU9NcUYNCkFnd0RxbjBNRzkrVUh5d0JEL3NIRjU4b2d4SzNrQWJJVGpBNDUzVTE1S2tSNGJBcWNIMzQzbVBmalBPUFR5QWINCjNJTW9ZYlFWOVNiSHVwdGF2NnQ5cmh0ckdFa05WdW5MUUxyR1lOYndyUXgyNTN5cWdOK2RSWUQ4bW4xMDF5Sk0NCkZjTjNSNlBEQ3hBTDRoVzBjWGpTc3BhcWUxbXg4VTdweitMbjFEckM0WDhPOUhIZ01yUHZVbDE4VWMxNGZBa3cNClptK3drNXZ6Vll4SHA4V3NRWGI5eHBlMWltbGV3N2pQdUhaa05TQTRrNllEb0duL3dwTjNtRU9LRTNCWXE2Um8NCmhuVGFhcEllK0pJenNhL0gwSFhLY0QwenRGZVJVRXl5amQrZEUzdmRKWWVoWnJFUUlqc00wb2NxYm41dGNmMVcNCjlEUDBPWEd5bFRmTmJCTVQ2UFE0TjVnZnlRRGV4dDlaM1FPVDBjM0hjbVVZSEpkODY1alI1blhIR3pzR1crVXINCmQwWjZBYUNzU0NQOFdQVU5peEx6Z0NkQjdFUTZaNVBCNGV0ajkrRm1LWXZFYkZpYU9yOWhyWTQ4bnkraU9KanENCnMwZHVkaGdaa0U4WHBBOWpjSmFHbk00VVpkRm5zc2lUeWRscWFGV1l3alZrOGQ0Q3NqcnNUeCtKTlJXT1NWSHkNCjlXQmJVRlFjMWVIMDFydjFzZkw0NjdFeXpoaDkyU0NmSG9vSE45bEx0RjJtRGg0M1pRdTBSZVc4YUJkN1J6SGMNCktKQzhFMHdjc2x6THFmRit4N3JoMFZ0NTRZM2kwUFM5SDlSRFdBVHNzQ3gwVjN5U3dibnhxbWU2eklhNXFLVU4NCmtiU3FrdWNtelpLbmFrc2I0NlMwekp5T0IrUVYvOG50WUVybUxzWDFwR0Z2UEZCbTArR1EveVFncFVpSmh0THANCkFXOGpLQ0ZNeVFCSGhCS3lHMGs4RG45ZjVtTzhyRTB4Rzk4Mm0rbkd3bE1LSnVubitpaXl6NTYxVi8yZWJiNWUNClJQQ2oxMlJVQUl6S2ljUHFSYVBDYVhoRXlEMzB5MXJEQ0hPN3ZwQ0IxQ2duYlZmUmNQdlRPT3VVbEdsck1ZV2ENClpsQXlyYzVSa0FpU0NMVUphYjlaVGYvL1QzNGRtUDFwMGJtSU4zTW53dTNYc2JFZFpub1F4cVBTbDBVeWZxaUwNCjRlNXVHZTJaYS9yeHlrTTlDdUcwZjh2dEZXc29OaEprVHVnZFpqZktVWmRueWZkc21aaE5iS2xKY3VCN3BydmINCjBHbDAvM2ZObnM2cXYrK1IvRUdOSGJaaFN4dy9xWlhHQndHYTBZN2h3d3NBMVE2T2JYZ25aQTFURHFGVWhGazYNCi9jRGE4RmxSRDFqajlyS3lldXd3THJ5UnkvTGhvcTFMTC9XVitPaVVCLy9TbGRHYUhrcVh2OStDSk5obU53RVUNCmlDNW1aWXloR0dic1ZjQnh1UWlnaWx5TXBEUUpKZmNVaXFmTjhLTCtOOElDcG51UEdnYU1ROTdTTGVIcTJNbW0NCmVoY0Vad1ZRWkdsQ25RSk5LbWhicXF4SkI3V21kQlJLVERpQnhFNXF6NXIzZ3JCLzV2K01ieU02RzZNeUFua1ANCkEvVUtYMFFVWnNQRFI0MVhWV2haUFREby8vWjZhSUtKd2xnQjNFOXZhazJKa0Q0L3BkZ3p5QU0yOEhPVFV5Si8NClNmQlZMZCsvanhISVZsbTFJYUxVQXp2SmpHME5GbFh2RDdQa3pzNXBYbVVmLy9iVGRGWE5BM3VoN1ZCU0dRTWwNCmthZXl1ZW1Rd2lXMlJheTR0WWJVcS9GQ3psKzg4NjJKQlk5OHczOG5hdHJBKytXTUxISW94MHJoTUlHL3ZveUsNClUxKzJLS2dFRDQxNE1zQzMwOWpuK1A2V0NaR0t0MzRCWFNmRHAvUmJnd1AzWDBRSXhTWU94dG1YOGZqS2xWUFINCjlGUG1rd0Z2SVlzRTE0TVNCMTZ5MnZ4U0V0OEpGS29HaFhSdVZ4bEdvWXV1WnJwRVJmaHlubmt3U0xrdzB6bG4NCk1OVVVpaHc5QWVQaXZpNkgwcXkrN0RwVXkrNDFDVzhueGt4L2RlUGNkYkFxODRZNzFGeWZNN2diTHUwNEVQWjANCmhUenpnU0xEU1d2TGM3dldSR2JxSTFlclFoZmFkUXdpVXpNZDBZQXlJbVdtbm0wMDNkeGZSTk5DMG9DWURFOFYNCjNRR0ZxT21yNEFxY2JNR0lXQkdpUDBMYWptZWhKRXYrOEdrSWt1RHdRUnRrZ2FBa0h3RE1pZ3VqRnRyYXFHRW4NCm1kdVltWUJXODhZRHNYRDlKdjI0ZDRQdDJDZTdQNGxjNERFQVUzdnFVTVpGZEl3SGFuaktTTnI4TzZhWFhkMGUNCndyRmpjNzF0VVROR0Ywc3VOaSs3NG9sMHJsUzFzZVFOaWlqdWxFVzUzbmdLOHo1YnJOU2QxTjU2SC93Y1l4ODENCnFTeWVxbkdZSHBoTmJwd2hCVHFIa1VSQmx3eWd4STIrQ3VNU1I5Nmo0OWtvOUFaWkhZbDZEQkFxSExLWVdIR2kNCnZxdnBHLysrRkZ5MEFNU3hqcy8vQ2U1bFRTM3kzc2tmbmVhWjlzZ0g3bytVWENKN09wK210TGRIR2puNg0KPUdBT1MNCi0tLS0tRU5EIFBHUCBNRVNTQUdFLS0tLS0NCg", + "size": 2833 + } + }, + "raw": { + "id": "16f66f1da9d50d05", + "threadId": "16f66f1da9d50d05", + "labelIds": [ + "IMPORTANT", + "STARRED", + "CATEGORY_PERSONAL", + "Label_12" + ], + "snippet": "", + "sizeEstimate": 11634, + "raw": "Delivered-To: flowcrypt.compatibility@gmail.com
Received: by 2002:ac8:1953:0:0:0:0:0 with SMTP id g19csp18631271qtk;
        Thu, 2 Jan 2020 07:48:44 -0800 (PST)
X-Received: by 2002:a2e:2c04:: with SMTP id s4mr50657787ljs.35.1577980124025;
        Thu, 02 Jan 2020 07:48:44 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1577980124; cv=none;
        d=google.com; s=arc-20160816;
        b=ZUNbeW6EEEB4UQiBB5FrK7myTDO4wr+6zqcLbamA++33Snt55XJsRBndCuNjth1xZI
         gSJf05swFJWc4Gygf68RXOOU6WWOsTaeU2TK+0rMx7sqaC876EYmmwPjE4QC1Ct9R9ha
         zDKeByCQuYiWFZStxWc3/N+JngFhDoTzuze/5SDt5Q1S6yvMWJSFgnbCeO02YLP4nOpJ
         gG0zLmNEQYjCHtANCd1Zoy1t89xMytKe+4pV3FSrCIHbcW6RxUZg1INY4xZSE4A2qEw+
         JB0V25ysXBa9Da+lwGtdu0Nokt0qz4euFT2lPwO5zM5C6X0TsJKV3sMQQyH7Hk/y7LEz
         oFrg==
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:openpgp:subject
         :from:to:dkim-signature;
        bh=VpsKZb7QSsVY78wzYvJKSguc3YMyOhasycmYUZNtPV8=;
        b=zWKmaEiE8v7IkTMLSBWLRTPCg3BMjyWi7f2p5m/SSD8lSMZRDoP39AYFDL2xyH59oK
         QQ9NL/YvuqW+ZZrhiKVmrCuRcJIQYnI2tAW/rA7pKouG7ZlwtBIRUTcXPK6/blME6jil
         FvHJvyZO0IO7A495NulCQPX3erhHkFG9dWiPVj3SrgBFvsbSqwB83NZyYnsxous+sjv/
         shydX16khyp+scck5VwuZ3YN/1kWIurFyTPJqI7sDZn9FH7tafbmyLgXDJK2BDQLr16I
         auMoh+mKYh2r7x88hE1BoVcXHe8nMdc0SZD88AFUT+vrPX4awWVZ/SJddX2jLKxJX0Ws
         cFzg==
ARC-Authentication-Results: i=1; mx.google.com;
       dkim=pass header.i=@gmail.com header.s=20161025 header.b="Tpmzk9/V";
       spf=pass (google.com: domain of michael.flowcrypt2@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=michael.flowcrypt2@gmail.com;
       dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com
Return-Path: <michael.flowcrypt2@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 l17sor11630912lfj.8.2020.01.02.07.48.43
        for <flowcrypt.compatibility@gmail.com>
        (Google Transport Security);
        Thu, 02 Jan 2020 07:48:44 -0800 (PST)
Received-SPF: pass (google.com: domain of michael.flowcrypt2@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="Tpmzk9/V";
       spf=pass (google.com: domain of michael.flowcrypt2@gmail.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=michael.flowcrypt2@gmail.com;
       dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20161025;
        h=to:from:subject:openpgp:autocrypt:message-id:date:user-agent
         :mime-version;
        bh=VpsKZb7QSsVY78wzYvJKSguc3YMyOhasycmYUZNtPV8=;
        b=Tpmzk9/V+6Ild8FPyH7qV3G9lFOsx+wMd3DmbO8S2cf7JbD1uiGNblXi4neQsr//Qi
         s+Dfq2gF3wjSyimq1S2ZxmY6eecazAgOTSnybeVG1GxVAOgtBEsX/jWN7lNyl99xiPel
         HH55d+uPQHDt/R9gtZ/IGv5c7okRBg1PvFwfjxNOXUhDc6TGtDXg5pku1DuKcTt1JmIP
         oqJfyB3N88eDjRg8DvXJH8lH0SmH8tIvUoJnoElaGLp7PzTRZVcBVOrp6nr++jMpv3O2
         DS38V/0fGJtjjnTSLFH1O4f/cmusyBB1isaxX6zLsBxCOzBWLfS33GwPzXEgrI//eBZz
         lyUQ==
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:openpgp:autocrypt:message-id
         :date:user-agent:mime-version;
        bh=VpsKZb7QSsVY78wzYvJKSguc3YMyOhasycmYUZNtPV8=;
        b=B264N5K8+Nogd/2XmlZ4AXobygjOU2RNm5hMIDVIHMZTfd5hDeh6rbdEJ/6oVUQXNL
         8HEdgbdNjkT7lyolHQny3l6uBb/3t0PVZeTYmylEL8o8n65ORmIm4mAw0l6J07ttynpn
         5FpJbnTjFhANvIKIv7bDJJhGnrwnBhcbo//WX/75S7ek9nY4tyjdXpSISGtHQcUKdwLz
         Jt0YiH0tZHvwZ16WgEQYBWnWPyk8TZzm5kzX1PDVi97TsrZGqx+U3VHqluGk3d8QcGTX
         NSalUUs5LgjKFe7INJrlIwRFvxfqcgmmEr5llRBctDIdvOXOMCHlfQ+xS3tkjnB4udZg
         yusw==
X-Gm-Message-State: APjAAAXdsAjPOBidLuhLC2z83Q695hzN4Md1IQuuKGiGKOJwveCtLqQ7
	ugKhTSO6lLNGEFPtYzcJl/kjupx6stw=
X-Google-Smtp-Source: APXvYqyNIhhPrZ9Wr8wYVATbpEJl48m+kKrj8sXwyx5kjuQj06OUCfn/+GihRp7abA14v80xAq9JXg==
X-Received: by 2002:ac2:5605:: with SMTP id v5mr48538413lfd.136.1577980123268;
        Thu, 02 Jan 2020 07:48:43 -0800 (PST)
Return-Path: <michael.flowcrypt2@gmail.com>
Received: from [192.168.88.22] (23-123-207-82.ip.ukrtel.net. [82.207.123.23])
        by smtp.gmail.com with ESMTPSA id w9sm22904411ljh.106.2020.01.02.07.48.41
        for <flowcrypt.compatibility@gmail.com>
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Thu, 02 Jan 2020 07:48:42 -0800 (PST)
To: flowcrypt.compatibility@gmail.com
From: michael <michael.flowcrypt2@gmail.com>
Subject: ISO-2022-JP, PGP/Mime
Openpgp: preference=signencrypt
Autocrypt: addr=michael.flowcrypt2@gmail.com; keydata=
 mQINBFz7l+kBEAC7DOpjvJ3wILWhQFEWfDWnjXZLEfieiLQ6NZX8ej3IGUGapIf71J99cQAF
 akDkX1NF2BVNRxTqjzQ4wx6st4zxAcwTFKXmVjIDU6XMLVFAEl1eP5VybY0dvv7uYQN8Vchf
 QpbLzOfCz6Oc2X+JNnIIaKKEcae46hgfV+eU9ktDVhQgb1OXH/ny/8GDdwQUjwysOuAR9364
 9lnxiibZJNmd7qfxMmjN1Lwz5yGaoPHHn+8it+oyMx+z36Zt+v2He9sRHtPGIEY2rdDszdER
 Wv1ftjHYg1O+q/irAP3xzZ578fZKlaTz205zOVQhlkWIyXA1Wuj7yjjPrOe4QF6hcJ4jGoN6
 YvgVWxxvqwdNAKBxTQPLyqbrAa1nH/svnuoX4mczngW5npBm4+PSBbLo3ADBu1boGhGl1QaE
 vIG7L+Gvb9Iw3ZyDKSertB0ZQZ6IE782k/D0sSbT8mniY5CrGO0oNaGvqrFuaOErNhGQ6fH0
 GOU44WVvYiVXdh3CyFQ90P0hpmlcNpShCNEaA94+ne7BXmMJnvAl9cP98giAmQlXx4cGy+JB
 cyCs5LdtvFml5/D99pd8oinCQWWAvjZI6diQDNrkw2kQVHqaCBerV21eB/eee3aIMzvCurcq
 TDDJa1CEoHX3INV4aivq4/6Ys6Z4i4tilD0wicKzezu9ENFcmQARAQABtC9NaWNoYWVsIFZv
 bHluZXRzIDxtaWNoYWVsLmZsb3djcnlwdDJAZ21haWwuY29tPokCNQQQAQgAHwUCXPuX6QYL
 CQcIAwIEFQgKAgMWAgECGQECGwMCHgEACgkQAJIVTI1IIzVqUA//UNgj6py7juui0EwPOwNF
 IC9p40qaDvjqfNVdfmcr/39odm8yzdx/0eZTRIGZDWC3BBM5gSFF9ZNGcVFTMe0N3OZZPxGm
 Y9XN79jobeVvE0WoLEZEHI9IY86HLAC8yc/SeiQsbKp6ZiJyDuY4gUQ07yq4Bc/HfgTyITsi
 aoFvWXEHcLuw1ZOimCpQg1+XqGwWhAnNhXGFe6tvw41uehafPEN+8Lj/NqMrFQ5qVOslXUUv
 vkpfNvAm7LBVIY79YAe5su1XMuKcrxW/7nZBKa3mbFYcnjtbW+LJqcEfAl4NNDND1ho7Guls
 P2JFxlxy+YqXJ6oG88Hxb5mdlVyWSkuGG+BY75D1fgenv4ntZoumCdCaDIlKFOwfCF7EToZX
 tedSyzs0+DRfiVg9Yp8w3IIxFn+KhN3x12NXvkNm+ZOC+I7sac/bvX7KJ3ThUf/C1QysbpmS
 wfmlSqk9SjthbdlrWZ20OG5yvIiCS1Bixjo2lTJLA6QSqQmcMwjd5rQrut5GkTHqxnQQb42u
 eO+n/GV4c6x0QT1hfKV7thE3U7XPvzUK5E8Ti9CLkDd6KE4hAct2jhlE7zYHrSbkJnWIUInr
 QefPQ0EG2qJzdZXniBXj2Orwk2UVsertkLD3y6Iwv7Xk9pp3zXWOPKxFK3LbnfLwmIQCd3VQ
 14uh/hR3aRZfN/25Ag0EXPuX6QEQAK7/8UKmcuTNHz+mPfoOdMkxgdzikx9zgwASubc2Nhq0
 +b+P4yiWOJgbmULLXnpVEH3I+XyqgcUi42wZ3KWx04Wbg1dlsSiMN/9ojdXfhn+K2V5QnrUR
 lgZrz2xLCcMNgbVpdsLv8tnwb1rIQapq/b12RJKU9ZBwX/5W7za9UAjwibWgrVsFCUR5omlO
 e7Zg1z+37DmIIUGwnDN7nHH+LOyZxu2STdKx7EZQ7glqi/WnE85doRidARrM9lPibGJlxLQ0
 XnTrgPkKd/A+D6aidTS+NUSK+HSLOJzOuWnz9MHExYuQG/f2WCNVabAYNnIl9fJEcCduz/SR
 LbzxH8iL25H3ptonWajhkv/vFzfzzAFhXMJNehFR6QuZFlBQA078SuPb57ZYgXBA8KP9uN2x
 2/Td+O7vTuYAsnyHwhZyCFtLtMP5jyt+ObR8wWW1OrVUVxOxvW4zcMBdCft07C03aIoOsvwA
 Fie/eJhte2czdtGPN8IlUZM5ZtKop4YephIxWd4yXqPbtQNuCQlzYRaLO7A6v1lLkKSxIESb
 XbMd5ez86JohqFbSLnxE3O8+WhLcYEa8v6tPsI1HfxkUGYexWJ9QBnFKtW5pjMMoJv17s8Wt
 sekjXmGhsje452Ma7IHfnEcrm4p/GO9AFvP06+fkZvjPb2rtxkwmG2oMUptVoO43ABEBAAGJ
 Ah8EGAEIAAkFAlz7l+kCGwwACgkQAJIVTI1IIzVOgQ//QT5Spj15y10bhSCJXc5amoRUG/yj
 ljrPLkR++9YiwsUvcZgKesMKgKp/cqOPmptD5C66c9oG1FyvHclYujki/SKhpnruRKSnvDW/
 lpZnYo1QnNx1Khxu4XTcjtycAKfijBVuuR/maToR9DP9n4/5seH5TeLIGJg+YUczL4HI+kJm
 8iHanmPxZQR69Cr1xDB9FwliLl9BaTFbs0lWOguEkqwl84EACuGQTLOGI4u1EN/9RgAx8JX6
 JqA5l1rplC4N8HPgJ6zBp7ydzdSofoxGctSATJVmoweeWwL585GdsE0Fs+cWVSb8/tqFXGGR
 /oB95rb5d169vF7vbcb+h6ZidsPZqqnz85O2EgI5LkusyCG+GbKIiawkB56QA3NtT7ZotC2L
 6FVzb00YezkLNu/ZtGq6vVk7qzBw4z+bu6xUWEJYTbnVa1Kaop3cu4mVl8pfEXQAd7WchgdM
 ULln2cdmoxNi63r7dUjEIv6QIQysCsf7EjxFzkvlw4V4fYrodWkisuamd1BqkWLlHneKaqx3
 nzV35omhvvVNQyA9gqMAkxadJhD4PxS7KvPGNejQsmhME4OoI8yeg/iOGR/OTpMhk/rrQWtF
 2wrCBExh2EKOkRCx0xVvyOjjStFEKc7SkuY5Nr5Fe365elDkXSr7LmEcjdR1fhFV7cG4TLMe
 x6aRXsA=
Message-ID: <b377d740-da6b-b151-a720-b48d2e9cb697@gmail.com>
Date: Thu, 2 Jan 2020 17:48:40 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101
 Thunderbird/60.9.0
MIME-Version: 1.0
Content-Type: multipart/encrypted;
 protocol="application/pgp-encrypted";
 boundary="zAAof6AQi3Kw0jH3WNdRvGF30kCCq1qjt"

This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
--zAAof6AQi3Kw0jH3WNdRvGF30kCCq1qjt
Content-Type: application/pgp-encrypted
Content-Description: PGP/MIME version identification

Version: 1

--zAAof6AQi3Kw0jH3WNdRvGF30kCCq1qjt
Content-Type: application/octet-stream; name="encrypted.asc"
Content-Description: OpenPGP encrypted message
Content-Disposition: inline; filename="encrypted.asc"

-----BEGIN PGP MESSAGE-----

hQIMA0taL/zmLZUBAQ/+JgpmkgscJEB9uAiFT6TbeZsBqD/rRDInab9OevrRBWOZ
wQ7UxS4OkM8M1joflEgtP1ZjNkCCuOG5RXR3JZFkUeQbvtMc4mpx+OOjYbwHwNNE
05wbcIHn380axNPWMYqe8/iCK9wFWhMDwtpDfJ0PzLKAhnjFhymMWjmXB2avejaS
iaKQRelmUiNt5Tk6FAu8UnOAbr7+uLvFBzzjyELL3pGzDBLkawhUT2QZ2nqrC1Ns
J8HEXnl0TBI5T9rlK5i6YQi2i26SWk8QkM0ov5OWVK1qISf15VHeP5uLXch3MfHu
EfQEubo378Jbka9QMo1/E/8ublGQReMpsvbrWto9HqfPSXUGe3hUQcIRi3nKuQBx
nbMWonnNE7UEhBFytLL2w+MmBDlkePa7zDngOjQwLpYNVvrxJnCjk6Skcrn+x20D
YkGziEubqhquMRLxJht4UTLuRSLI8j1NtIRZ5Q9Bi+1krSJz527cbq/IFBU+EmNV
fCcR1nYbF5/hyTwB7aZQyxCVlRWKlYfwv4+7q9cj5wCBuLCY7ZKucEbzodehRcEt
4C8Txg2KkD7/8+Tt60KcqjvyDtQkQYNSaubugsG2BAmJpYRU6KFVGDlpNe6gGEQI
hnVQq5UaZ9z0DcevE25Xr7fg2mLN7yHRRSauvOGlMnP98d3gDluQlbvAzk5qOMqF
AgwDqn0MG9+UHywBD/sHF58ogxK3kAbITjA453U15KkR4bAqcH343mPfjPOPTyAb
3IMoYbQV9SbHuptav6t9rhtrGEkNVunLQLrGYNbwrQx253yqgN+dRYD8mn101yJM
FcN3R6PDCxAL4hW0cXjSspaqe1mx8U7pz+Ln1DrC4X8O9HHgMrPvUl18Uc14fAkw
Zm+wk5vzVYxHp8WsQXb9xpe1imlew7jPuHZkNSA4k6YDoGn/wpN3mEOKE3BYq6Ro
hnTaapIe+JIzsa/H0HXKcD0ztFeRUEyyjd+dE3vdJYehZrEQIjsM0ocqbn5tcf1W
9DP0OXGylTfNbBMT6PQ4N5gfyQDext9Z3QOT0c3HcmUYHJd865jR5nXHGzsGW+Ur
d0Z6AaCsSCP8WPUNixLzgCdB7EQ6Z5PB4etj9+FmKYvEbFiaOr9hrY48ny+iOJjq
s0dudhgZkE8XpA9jcJaGnM4UZdFnssiTydlqaFWYwjVk8d4CsjrsTx+JNRWOSVHy
9WBbUFQc1eH01rv1sfL467Eyzhh92SCfHooHN9lLtF2mDh43ZQu0ReW8aBd7RzHc
KJC8E0wcslzLqfF+x7rh0Vt54Y3i0PS9H9RDWATssCx0V3ySwbnxqme6zIa5qKUN
kbSqkucmzZKnaksb46S0zJyOB+QV/8ntYErmLsX1pGFvPFBm0+GQ/yQgpUiJhtLp
AW8jKCFMyQBHhBKyG0k8Dn9f5mO8rE0xG982m+nGwlMKJunn+iiyz561V/2ebb5e
RPCj12RUAIzKicPqRaPCaXhEyD30y1rDCHO7vpCB1CgnbVfRcPvTOOuUlGlrMYWa
ZlAyrc5RkAiSCLUJab9ZTf//T34dmP1p0bmIN3Mnwu3XsbEdZnoQxqPSl0UyfqiL
4e5uGe2Za/rxykM9CuG0f8vtFWsoNhJkTugdZjfKUZdnyfdsmZhNbKlJcuB7prvb
0Gl0/3fNns6qv++R/EGNHbZhSxw/qZXGBwGa0Y7hwwsA1Q6ObXgnZA1TDqFUhFk6
/cDa8FlRD1jj9rKyeuwwLryRy/Lhoq1LL/WV+OiUB//SldGaHkqXv9+CJNhmNwEU
iC5mZYyhGGbsVcBxuQigilyMpDQJJfcUiqfN8KL+N8ICpnuPGgaMQ97SLeHq2Mmm
ehcEZwVQZGlCnQJNKmhbqqxJB7WmdBRKTDiBxE5qz5r3grB/5v+MbyM6G6MyAnkP
A/UKX0QUZsPDR41XVWhZPTDo//Z6aIKJwlgB3E9vak2JkD4/pdgzyAM28HOTUyJ/
SfBVLd+/jxHIVlm1IaLUAzvJjG0NFlXvD7Pkzs5pXmUf//bTdFXNA3uh7VBSGQMl
kaeyuemQwiW2Ray4tYbUq/FCzl+8862JBY98w38natrA++WMLHIox0rhMIG/voyK
U1+2KKgED414MsC309jn+P6WCZGKt34BXSfDp/RbgwP3X0QIxSYOxtmX8fjKlVPR
9FPmkwFvIYsE14MSB16y2vxSEt8JFKoGhXRuVxlGoYuuZrpERfhynnkwSLkw0zln
MNUUihw9AePivi6H0qy+7DpUy+41CW8nxkx/dePcdbAq84Y71FyfM7gbLu04EPZ0
hTzzgSLDSWvLc7vWRGbqI1erQhfadQwiUzMd0YAyImWmnm003dxfRNNC0oCYDE8V
3QGFqOmr4AqcbMGIWBGiP0LajmehJEv+8GkIkuDwQRtkgaAkHwDMigujFtraqGEn
mduYmYBW88YDsXD9Jv24d4Pt2Ce7P4lc4DEAU3vqUMZFdIwHanjKSNr8O6aXXd0e
wrFjc71tUTNGF0suNi+74ol0rlS1seQNiijulEW53ngK8z5brNSd1N56H/wcYx81
qSyeqnGYHphNbpwhBTqHkURBlwygxI2+CuMSR96j49ko9AZZHYl6DBAqHLKYWHGi
vqvpG/++FFy0AMSxjs//Ce5lTS3y3skfneaZ9sgH7o+UXCJ7Op+mtLdHGjn6
=GAOS
-----END PGP MESSAGE-----

--zAAof6AQi3Kw0jH3WNdRvGF30kCCq1qjt--
", + "historyId": "1405869", + "internalDate": "1577980120000" + } +} \ No newline at end of file diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index ca475f07fcb..1011611ad33 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -297,7 +297,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te ); }) ); - /* + test( `decrypt - [enigmail] encrypted iso-2022-jp pgp/mime`, testWithBrowser(async (t, browser) => { @@ -305,14 +305,18 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - content: ['ゾし逸現飲'], - encryption: 'encrypted', - signature: 'not signed', - params: - '?frameId=none&message=-----BEGIN%20PGP%20MESSAGE-----%0A%0AhQIMA0taL%2FzmLZUBAQ%2F%2BJgpmkgscJEB9uAiFT6TbeZsBqD%2FrRDInab9OevrRBWOZ%0AwQ7UxS4OkM8M1joflEgtP1ZjNkCCuOG5RXR3JZFkUeQbvtMc4mpx%2BOOjYbwHwNNE%0A05wbcIHn380axNPWMYqe8%2FiCK9wFWhMDwtpDfJ0PzLKAhnjFhymMWjmXB2avejaS%0AiaKQRelmUiNt5Tk6FAu8UnOAbr7%2BuLvFBzzjyELL3pGzDBLkawhUT2QZ2nqrC1Ns%0AJ8HEXnl0TBI5T9rlK5i6YQi2i26SWk8QkM0ov5OWVK1qISf15VHeP5uLXch3MfHu%0AEfQEubo378Jbka9QMo1%2FE%2F8ublGQReMpsvbrWto9HqfPSXUGe3hUQcIRi3nKuQBx%0AnbMWonnNE7UEhBFytLL2w%2BMmBDlkePa7zDngOjQwLpYNVvrxJnCjk6Skcrn%2Bx20D%0AYkGziEubqhquMRLxJht4UTLuRSLI8j1NtIRZ5Q9Bi%2B1krSJz527cbq%2FIFBU%2BEmNV%0AfCcR1nYbF5%2FhyTwB7aZQyxCVlRWKlYfwv4%2B7q9cj5wCBuLCY7ZKucEbzodehRcEt%0A4C8Txg2KkD7%2F8%2BTt60KcqjvyDtQkQYNSaubugsG2BAmJpYRU6KFVGDlpNe6gGEQI%0AhnVQq5UaZ9z0DcevE25Xr7fg2mLN7yHRRSauvOGlMnP98d3gDluQlbvAzk5qOMqF%0AAgwDqn0MG9%2BUHywBD%2FsHF58ogxK3kAbITjA453U15KkR4bAqcH343mPfjPOPTyAb%0A3IMoYbQV9SbHuptav6t9rhtrGEkNVunLQLrGYNbwrQx253yqgN%2BdRYD8mn101yJM%0AFcN3R6PDCxAL4hW0cXjSspaqe1mx8U7pz%2BLn1DrC4X8O9HHgMrPvUl18Uc14fAkw%0AZm%2Bwk5vzVYxHp8WsQXb9xpe1imlew7jPuHZkNSA4k6YDoGn%2FwpN3mEOKE3BYq6Ro%0AhnTaapIe%2BJIzsa%2FH0HXKcD0ztFeRUEyyjd%2BdE3vdJYehZrEQIjsM0ocqbn5tcf1W%0A9DP0OXGylTfNbBMT6PQ4N5gfyQDext9Z3QOT0c3HcmUYHJd865jR5nXHGzsGW%2BUr%0Ad0Z6AaCsSCP8WPUNixLzgCdB7EQ6Z5PB4etj9%2BFmKYvEbFiaOr9hrY48ny%2BiOJjq%0As0dudhgZkE8XpA9jcJaGnM4UZdFnssiTydlqaFWYwjVk8d4CsjrsTx%2BJNRWOSVHy%0A9WBbUFQc1eH01rv1sfL467Eyzhh92SCfHooHN9lLtF2mDh43ZQu0ReW8aBd7RzHc%0AKJC8E0wcslzLqfF%2Bx7rh0Vt54Y3i0PS9H9RDWATssCx0V3ySwbnxqme6zIa5qKUN%0AkbSqkucmzZKnaksb46S0zJyOB%2BQV%2F8ntYErmLsX1pGFvPFBm0%2BGQ%2FyQgpUiJhtLp%0AAW8jKCFMyQBHhBKyG0k8Dn9f5mO8rE0xG982m%2BnGwlMKJunn%2Biiyz561V%2F2ebb5e%0ARPCj12RUAIzKicPqRaPCaXhEyD30y1rDCHO7vpCB1CgnbVfRcPvTOOuUlGlrMYWa%0AZlAyrc5RkAiSCLUJab9ZTf%2F%2FT34dmP1p0bmIN3Mnwu3XsbEdZnoQxqPSl0UyfqiL%0A4e5uGe2Za%2FrxykM9CuG0f8vtFWsoNhJkTugdZjfKUZdnyfdsmZhNbKlJcuB7prvb%0A0Gl0%2F3fNns6qv%2B%2BR%2FEGNHbZhSxw%2FqZXGBwGa0Y7hwwsA1Q6ObXgnZA1TDqFUhFk6%0A%2FcDa8FlRD1jj9rKyeuwwLryRy%2FLhoq1LL%2FWV%2BOiUB%2F%2FSldGaHkqXv9%2BCJNhmNwEU%0AiC5mZYyhGGbsVcBxuQigilyMpDQJJfcUiqfN8KL%2BN8ICpnuPGgaMQ97SLeHq2Mmm%0AehcEZwVQZGlCnQJNKmhbqqxJB7WmdBRKTDiBxE5qz5r3grB%2F5v%2BMbyM6G6MyAnkP%0AA%2FUKX0QUZsPDR41XVWhZPTDo%2F%2FZ6aIKJwlgB3E9vak2JkD4%2FpdgzyAM28HOTUyJ%2F%0ASfBVLd%2B%2FjxHIVlm1IaLUAzvJjG0NFlXvD7Pkzs5pXmUf%2F%2FbTdFXNA3uh7VBSGQMl%0AkaeyuemQwiW2Ray4tYbUq%2FFCzl%2B8862JBY98w38natrA%2B%2BWMLHIox0rhMIG%2FvoyK%0AU1%2B2KKgED414MsC309jn%2BP6WCZGKt34BXSfDp%2FRbgwP3X0QIxSYOxtmX8fjKlVPR%0A9FPmkwFvIYsE14MSB16y2vxSEt8JFKoGhXRuVxlGoYuuZrpERfhynnkwSLkw0zln%0AMNUUihw9AePivi6H0qy%2B7DpUy%2B41CW8nxkx%2FdePcdbAq84Y71FyfM7gbLu04EPZ0%0AhTzzgSLDSWvLc7vWRGbqI1erQhfadQwiUzMd0YAyImWmnm003dxfRNNC0oCYDE8V%0A3QGFqOmr4AqcbMGIWBGiP0LajmehJEv%2B8GkIkuDwQRtkgaAkHwDMigujFtraqGEn%0AmduYmYBW88YDsXD9Jv24d4Pt2Ce7P4lc4DEAU3vqUMZFdIwHanjKSNr8O6aXXd0e%0AwrFjc71tUTNGF0suNi%2B74ol0rlS1seQNiijulEW53ngK8z5brNSd1N56H%2FwcYx81%0AqSyeqnGYHphNbpwhBTqHkURBlwygxI2%2BCuMSR96j49ko9AZZHYl6DBAqHLKYWHGi%0AvqvpG%2F%2B%2BFFy0AMSxjs%2F%2FCe5lTS3y3skfneaZ9sgH7o%2BUXCJ7Op%2BmtLdHGjn6%0A%3DGAOS%0A-----END%20PGP%20MESSAGE-----&msgId=16f66f1da9d50d05&senderEmail=michael%20&isOutgoing=___cu_false___&acctEmail=flowcrypt.compatibility%40gmail.com', - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '16f66f1da9d50d05', + { + content: ['ゾし逸現飲'], + encryption: 'encrypted', + signature: 'not signed', + }, + authHdr + ); }) ); @@ -323,17 +327,21 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - content: ['ゾし逸現飲'], - encryption: 'encrypted', - signature: 'not signed', - params: - '?frameId=none&message=-----BEGIN%20PGP%20MESSAGE-----%0A%0AhQIMA0taL%2FzmLZUBAQ%2F%2FembFGVPRuVfiUujhLesQa6a4sbp%2FPOQcAsy%2B%2BO6tD%2FVA%0AwrQtPhJeniYVFeOs%2B37MWy1PkOUn6AAvgasHtlMCVnthxavG1onImCJWyC0NdgYn%0AhrIN9aPmOY7UGhVzpU%2FGTxE1WHJHGMMGShmKbt%2BJThtAvmufuDK1DSho3kcjGEs9%0AwpY0DU0%2B9I7xEmobgQqK4jyzLBLNx4aHl2qurKSmjghmk1ZMW4oluckrDmmQ3AWT%0AZ%2Fq7bnbP1GDNJV8cxR7ed4k6HCzkrX%2BBxL308E8soLtg87occ18QoJAIRAHU0kx5%0AJlS9%2Bfh%2FjNwKanZJjCWv6hqZKz9iUocRZD9iPqh9dhjsKalqkRaxuPM2eJkZY%2B91%0AjG8tsHYTLeY33A4aUpdA6FpNR8Uyz8Agv%2Bx8%2FaFp8GxSNIuUumf6bSIk2Oudt%2Fa6%0ArWvZO%2BM%2BUK53a4k4ibxrkv4zsE8CbijjCP8BvUrA37023GEWkOHIyMoFFy0o06W1%0A56wTP2bLmKbujeES%2Bdkzjrr1r9X6oDBwpoPABKSAjIKFQKcxWvhMgz4WO3w61g3F%0AE8U0Rlx4lB4Ce1I0qzu8S4hkaZ7sYcKJ%2F211pzsaf0BfxZQdrfyu5kse275YgTUA%0AbObnoW2sAWg8fX9JwuL9JVArnJ%2B6AOQjvNG9fr%2FuM4thV%2FzwqBUWfQ0sasDjjxSF%0AAgwDqn0MG9%2BUHywBD%2F9bMrHNk%2FqirxpfIRa9vZcZssXv7A61XUZy2IVum9%2Bp9c4W%0Aswd23kQOfC%2F82Fx75CwMQ%2BzzdP7%2B5tqeNfm3%2F4vfObLCmszf1%2B%2Bj3nVxEEX8sWpC%0AmgHobD3uZPwgShvgcy6ZHkfz%2BBrxqqTJIZ6xD03VgzmNg2cuAHD1YVUKbTHGYcKM%0ACY0b%2B1VG6lv4f78xiB0v8aw%2FaPTvtx0rY2g0YZHaE0JXT59cMNTMORNiE8h8guLB%0Alf6hcwctRN%2BsJw5oW%2FsaXpgFJSzVbQrwp0a1b6Ftzqv%2BqyJL2%2Byay83RaPX%2BR7LR%0AJy9jPrwBbzwCVbJBBSfeQ0zXkeNAOso83rE13UjxPsl%2BkU0ajxy55K%2FP%2FcLO6KKs%0AKtFN7UGo2jGelpqDoGU5FwOoGeEaYW%2BInrZryyV%2FA2bjw6Zmfbh0GMzls25fK%2F9O%0AOJp%2FD0yqEmnkU60O6eDwwwxY7VNqmtuOTZ4z8PIaV9LWuftVOeOG99%2B9g6280CKF%0AYYHAxgb559v70V50bk%2BZ91rdA1SnxSq9wOkUu2K1BmkTdqEO5jxWf04MGrvROZUA%0AdIKQ%2BPYibnRo%2BSObBUn4Otlfhel1tJ9wWWjJLpGJ1Zm3FaoCVH%2FMnnvhF48Q5JNR%0ASDnqTg4wWd51Tokcnz2PoPrxRN3jacI4d0GZiAtsmB28mcKjdB5UYoXEy2MazNLA%0AyAHzCHRtOJ7eOcStwltwnbh67%2FRCK9OCegaiSOMAcsEciVXUpT%2BhVl8oMl6IvJDk%0AFq1CwOL8t3Oj3W2igPkm2EejHl1dkz2JXPHjfHqt24tTtWRa3xuotoSvMAy%2BtfKT%0ACwg67nQan%2F13hl3eF0XXLCD%2B%2BaotGSahUePsgZU79oedY2vmcofUf743sZ%2FN6aMP%0AgELzwyLm7LzcFLjeokhNUDYpBgrH5%2BFcFZqpiTQhILONSvenncP4k3FDjC87DG5J%0AyIckBN1KeU219vaYHEkmSmU3egfEYRMw2HznFAaiMEAnDoGs0ZTqNOx75ktZLpfS%0A779APSTDmS%2FhsXXo7D8%2FmyYWO5RMxFzGL7SIcXkosqa%2BTS3FJ5198epH0xLNrDhM%0A1lMO2ZU5qb2TNA%2BWvSviiwWsZ%2Byj6kD1rzrvEg%2B%2Bq1b67s3oogP08wwHcfX%2BUiND%0AvdGeVd2YFPX0kszhtfJDEYAkJ8ERe5RKQqeNXdk8XMYq2irp3AVBTBDkgTgMDPSU%0ACI3g89S3eldT%0A%3DP4O8%0A-----END%20PGP%20MESSAGE-----&msgId=16f431a0b9056562&senderEmail=&isOutgoing=___cu_false___&acctEmail=flowcrypt.compatibility%40gmail.com', - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '16f431a0b9056562', + { + content: ['ゾし逸現飲'], + encryption: 'encrypted', + signature: 'not signed', + }, + authHdr + ); }) ); -*/ + test( `decrypt - iso-2022-jp, signed plain text`, testWithBrowser(async (t, browser) => { From ceca09740af43c47cbd57748c26cf1adc7f44c9e Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 17 May 2023 16:09:18 +0100 Subject: [PATCH 073/147] temporary test fix --- test/source/tests/settings.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/source/tests/settings.ts b/test/source/tests/settings.ts index e288b2a2880..08232a2d24a 100644 --- a/test/source/tests/settings.ts +++ b/test/source/tests/settings.ts @@ -835,7 +835,7 @@ export const defineSettingsTests = (testVariant: TestVariant, testWithBrowser: T // `what's up?.txt` becomes `what's_up_.txt` and this is native way and we can't change this logic // https://github.com/FlowCrypt/flowcrypt-browser/issues/3505#issuecomment-812269422 await checkIfFileDownloadsCorrectly(t, browser, '1821bf879a6f71e0', "what's_up_.txt"); - await checkIfFileDownloadsCorrectly(t, browser, '182263bf9f105adf', "what's_up%253F.txt.pgp"); + await checkIfFileDownloadsCorrectly(t, browser, '182263bf9f105adf', "_what_'s_up%25253F.txt.pgp"); // todo: #5150, should be "what's_up%253F.txt.pgp" // should not strip .gpg or .pgp extension when downloading original file after unsuccesssful decryption // // Check if bad pgp attachment file got downloaded with original file name await checkIfFileDownloadsCorrectly(t, browser, '18610f7f4ae8da0a', 'test.bat.pgp'); From 861e22cac55a6d4dd08952d2ae37019648c82b5e Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 19 May 2023 10:30:30 +0100 Subject: [PATCH 074/147] restored tests with messages --- extension/js/common/message-renderer.ts | 4 +- .../google/exported-messages/corrupted-1.json | 16 - .../message-export-15f7f5e966792203.json | 71 ++ .../message-export-15f7f5f098d6bc36.json | 73 +++ .../message-export-15f7fcace2d72246.json | 124 ++++ .../message-export-15f7fcb7fabc7511.json | 80 +++ .../message-export-15f7fd2fd072cff2.json | 81 +++ .../message-export-15f7fd3ba3f37cf3.json | 125 ++++ .../message-export-15f7ffbebc6ba296.json | 98 +++ .../message-export-16180866d0ae26c3.json | 131 ++++ .../message-export-161b2ac5a73d4097.json | 167 +++++ .../message-export-1639b8ceb6c44a4c.json | 147 +++++ .../message-export-163dee87a4bfed45.json | 82 +++ .../message-export-163df1bf12034b9d.json | 82 +++ .../message-export-1645e37647db32f8.json | 67 ++ .../message-export-1663ac8b70e22517.json | 86 +++ .../message-export-16b7fce1c1589c0a.json | 70 ++ .../message-export-16d558cb71e8d510.json | 118 ++++ .../message-export-16ff09b1baca2051.json | 134 ++++ .../message-export-1707b9c96c5d7893.json | 63 ++ .../message-export-1882fa9e2b996242.json | 92 +++ test/source/mock/google/google-data.ts | 5 +- test/source/mock/google/google-endpoints.ts | 13 +- test/source/mock/wkd/wkd-constants.ts | 18 - test/source/tests/decrypt.ts | 619 +++++++++--------- 25 files changed, 2214 insertions(+), 352 deletions(-) delete mode 100644 test/source/mock/google/exported-messages/corrupted-1.json create mode 100644 test/source/mock/google/exported-messages/message-export-15f7f5e966792203.json create mode 100644 test/source/mock/google/exported-messages/message-export-15f7f5f098d6bc36.json create mode 100644 test/source/mock/google/exported-messages/message-export-15f7fcace2d72246.json create mode 100644 test/source/mock/google/exported-messages/message-export-15f7fcb7fabc7511.json create mode 100644 test/source/mock/google/exported-messages/message-export-15f7fd2fd072cff2.json create mode 100644 test/source/mock/google/exported-messages/message-export-15f7fd3ba3f37cf3.json create mode 100644 test/source/mock/google/exported-messages/message-export-15f7ffbebc6ba296.json create mode 100644 test/source/mock/google/exported-messages/message-export-16180866d0ae26c3.json create mode 100644 test/source/mock/google/exported-messages/message-export-161b2ac5a73d4097.json create mode 100644 test/source/mock/google/exported-messages/message-export-1639b8ceb6c44a4c.json create mode 100644 test/source/mock/google/exported-messages/message-export-163dee87a4bfed45.json create mode 100644 test/source/mock/google/exported-messages/message-export-163df1bf12034b9d.json create mode 100644 test/source/mock/google/exported-messages/message-export-1645e37647db32f8.json create mode 100644 test/source/mock/google/exported-messages/message-export-1663ac8b70e22517.json create mode 100644 test/source/mock/google/exported-messages/message-export-16b7fce1c1589c0a.json create mode 100644 test/source/mock/google/exported-messages/message-export-16d558cb71e8d510.json create mode 100644 test/source/mock/google/exported-messages/message-export-16ff09b1baca2051.json create mode 100644 test/source/mock/google/exported-messages/message-export-1707b9c96c5d7893.json create mode 100644 test/source/mock/google/exported-messages/message-export-1882fa9e2b996242.json diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index 7abe68558b0..15147c14c53 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -613,11 +613,11 @@ export class MessageRenderer { } } } - /* todo: await this.view.errorModule.renderErr( + renderModule.renderErr( 'Error: could not properly parse signed message', parsed.rawSignedContent || parsed.text || parsed.html || mimeMsg.toUtfStr(), 'parse error' - ); */ + ); return {}; }; diff --git a/test/source/mock/google/exported-messages/corrupted-1.json b/test/source/mock/google/exported-messages/corrupted-1.json deleted file mode 100644 index 4ec8933e97c..00000000000 --- a/test/source/mock/google/exported-messages/corrupted-1.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "acctEmail": "flowcrypt.compatibility@gmail.com", - "full": { - "id": "corrupted-1", - "threadId": "corrupted-1", - "historyId": "corrupted-1" - }, - "raw": { - "id": "corrupted-1", - "threadId": "corrupted-1", - "labelIds": ["INBOX"], - "sizeEstimate": 2, - "raw": "RSo", - "historyId": "corrupted-1" - } -} diff --git a/test/source/mock/google/exported-messages/message-export-15f7f5e966792203.json b/test/source/mock/google/exported-messages/message-export-15f7f5e966792203.json new file mode 100644 index 00000000000..3598213d1a0 --- /dev/null +++ b/test/source/mock/google/exported-messages/message-export-15f7f5e966792203.json @@ -0,0 +1,71 @@ +{ + "acctEmail": "flowcrypt.compatibility@gmail.com", + "full": { + "id": "15f7f5e966792203", + "threadId": "15f7f5e966792203", + "labelIds": [ + "IMPORTANT", + "STARRED", + "CATEGORY_PERSONAL", + "Label_4", + "INBOX" + ], + "snippet": "-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Standard message signed inline should easily verify This is email footer -----BEGIN PGP SIGNATURE----- Version: FlowCrypt 5.0.4 Gmail Encryption", + "payload": { + "partId": "", + "mimeType": "text/plain", + "filename": "", + "headers": [ + { + "name": "X-Gm-Message-State", + "value": "AMCzsaULbONjxuOMpEc2a1JkbQC/SVGvvFoKC15wLWI6HWy+gneXeEFG RMLGsUQPi33rBmNVhp84pNfWPZX2+ZpMF/RNM3M=" + }, + { + "name": "Openpgp", + "value": "id=6D24791A5B106262B06217C606CA553EC2455D70" + }, + { + "name": "From", + "value": "sender@domain.com" + }, + { + "name": "MIME-Version", + "value": "1.0" + }, + { + "name": "Date", + "value": "Thu, 2 Nov 2017 17:53:45 -0700" + }, + { + "name": "Subject", + "value": "signed with FlowCrypt Extension (inline signature)" + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "Content-Type", + "value": "text/plain; charset=\"UTF-8\"" + } + ], + "body": { + "size": 1071, + "data": "LS0tLS1CRUdJTiBQR1AgU0lHTkVEIE1FU1NBR0UtLS0tLQ0KSGFzaDogU0hBMjU2DQoNClN0YW5kYXJkIG1lc3NhZ2UNCg0Kc2lnbmVkIGlubGluZQ0KDQpzaG91bGQgZWFzaWx5IHZlcmlmeQ0KVGhpcyBpcyBlbWFpbCBmb290ZXINCi0tLS0tQkVHSU4gUEdQIFNJR05BVFVSRS0tLS0tDQpWZXJzaW9uOiBGbG93Q3J5cHQgNS4wLjQgR21haWwgRW5jcnlwdGlvbiBmbG93Y3J5cHQuY29tDQpDb21tZW50OiBTZWFtbGVzc2x5IHNlbmQsIHJlY2VpdmUgYW5kIHNlYXJjaCBlbmNyeXB0ZWQgZW1haWwNCg0Kd3NGY0JBRUJDQUFRQlFKWis3NFlDUkFHeWxVK3drVmRjQUFBZkFrUUFLWXdUQ1FVWDRLMjZqd3pLUEcwDQp1ZTYralN5Z3BrTmxzSHFmbzdaVTBTWWJ2YW8weEVvMVFRUHk5elZXN3pQMzlVQUpaa041RXBJQVJCekYNCjY3MUFBM3MwS3Rrbkx0MEFZZmlUSmRrcVRpaFJqSlpIQkhRY3hra2Fqd3MrM0JyOG9CaWVCNHppMTlHSg0Kb09xanlpMnV4bDdCeTVDU1AyMzhCNkNYQlRnYVlraC83VHBZSkRnRnp1aHRYdHgwYVdCUDloN1RnRVlODQpBWU5tdEdJdFQ2VzJRL0pvQjI5Y1ZzeHl1Z1ZzUWhkZk04REE1TXBFWlkyWmsvK1VIWE4wTDQ1ckVKRmoNCjhISmtSODN2b2l3QWU2RGRrTFFIYllmVnl0U0RaTitLODB4Ti9WQ1FmZGQ3K0hLcEtiZnRJaWcwY1htcg0KK09zb0RNR3ZQV2tHRXFKUmg1N2JleldmejZqbmtTU0pTWDltWEZHNktTSjJ4dWozMG5QWHNsMVduMVh2DQp3UjVUM0wya0R1c2x1RkVSaXEwTm5LRHdBdmVIWkl6aDd4dGptWVJsR1ZOdWp0YTBxVFFYVHlhanhEcHUNCmdaSXFaS2pEVlpwN0NqS1lZUHp2Z1VzaWhQemxneXFBb2RrTXBsL0loWWlkUE1CMTM1bFY0QkJLSHJGMg0KVXJiYjJ0WE1IYTZyRVpvajZqYlMwdXcvTzFmU0JKQVNZZmxySjFNOFlMc0ZDd0JIcE1XV0wzOG9qYm1LDQppMUVIWUlVOEEveTBxRUxQcEtvcmduTE5LaDh0MDVhMDFuclVXZC9lWERLUzFiYkdsTGVSNlIvWXZPTTUNCkFEanZneXdwaUdtcndkZWhpb0t0UzBTckhSdkV4WXg4b3J5MGlMbzBjTEdFUkFyWjNqeWNGOEYrUzJYcA0KNUJuSQ0KPUYyb20NCi0tLS0tRU5EIFBHUCBTSUdOQVRVUkUtLS0tLQ0K" + } + }, + "sizeEstimate": 5805, + "historyId": "1405939", + "internalDate": "1509670425000" + }, + "attachments": {}, + "raw": { + "id": "15f7f5e966792203", + "threadId": "15f7f5e966792203", + "labelIds": ["IMPORTANT", "STARRED", "CATEGORY_PERSONAL", "Label_4", "INBOX"], + "snippet": "-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Standard message signed inline should easily verify This is email footer -----BEGIN PGP SIGNATURE----- Version: FlowCrypt 5.0.4 Gmail Encryption", + "sizeEstimate": 5805, + "historyId": "1405939", + "internalDate": "1509670425000" + } +} \ No newline at end of file diff --git a/test/source/mock/google/exported-messages/message-export-15f7f5f098d6bc36.json b/test/source/mock/google/exported-messages/message-export-15f7f5f098d6bc36.json new file mode 100644 index 00000000000..3a9b97a37b4 --- /dev/null +++ b/test/source/mock/google/exported-messages/message-export-15f7f5f098d6bc36.json @@ -0,0 +1,73 @@ +{ + "acctEmail": "flowcrypt.compatibility@gmail.com", + "full": { + "id": "15f7f5f098d6bc36", + "threadId": "15f7f5f098d6bc36", + "labelIds": [ + "IMPORTANT", + "STARRED", + "Label_8", + "Label_3", + "CATEGORY_PERSONAL", + "Label_12", + "INBOX" + ], + "snippet": "-----BEGIN PGP MESSAGE----- Version: FlowCrypt 5.0.4 Gmail Encryption flowcrypt.com Comment: Seamlessly send, receive and search encrypted email wcFMA+ADv/5v4RgKAQ/", + "payload": { + "partId": "", + "mimeType": "text/plain", + "filename": "", + "headers": [ + { + "name": "X-Gm-Message-State", + "value": "AMCzsaWhLvT1I9D3MUtiK8AZOkKOcQaoGSd2mq5SCZCIGDakUB3Ii8Cg kyxMVL3SBmcv2IZIUPpj1E6axOuKWlqu68U9dHU=" + }, + { + "name": "Openpgp", + "value": "id=6D24791A5B106262B06217C606CA553EC2455D70" + }, + { + "name": "From", + "value": "sender@domain.com" + }, + { + "name": "MIME-Version", + "value": "1.0" + }, + { + "name": "Date", + "value": "Thu, 2 Nov 2017 17:54:14 -0700" + }, + { + "name": "Subject", + "value": "encrypted utf8" + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "Content-Type", + "value": "text/plain; charset=\"UTF-8\"" + } + ], + "body": { + "size": 1916, + "data": "LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tDQpWZXJzaW9uOiBGbG93Q3J5cHQgNS4wLjQgR21haWwgRW5jcnlwdGlvbiBmbG93Y3J5cHQuY29tDQpDb21tZW50OiBTZWFtbGVzc2x5IHNlbmQsIHJlY2VpdmUgYW5kIHNlYXJjaCBlbmNyeXB0ZWQgZW1haWwNCg0Kd2NGTUErQUR2LzV2NFJnS0FRLzhDaGduYmhHWm9QV2x1cmdZSUl2MlFyWTE5aGphVXMzY3B1S01EbER1DQpWRXRSUmt0S3RYMmFRM1VvYThVdWpjNXhiUC90ajRQSTJUcTdIcTJKNmUrZXZKODNRT2tLaFQ5empmYUoNCk1xdXROZVA2VEZEZHRCc3VtZG9MTUVQWGVHUkw1aVExUXBJbGlmZW5JTXNHSTBKUlJZWm5aSklhK2V6Zg0KQWhwL0tyd0swNmJuVDdtb3BtNHpOUmFpMkpSRHBwQ2JzNDg2WGs5RXJPTXRDTEV6V0RaY1ZQRDc2YWdDDQpvVGlSUWpYK0hlSXlQZ0FxWVRGZ1M0bjVPeU9sMjRhbHdId1BBdllWOXVNRW1LZm9XWkFPYzg3bFo1M3YNCm1xbXlqMTRrV010SHdOaGdROEFuY296R2J2KzBqNTIvSkFUSzlVNjA1Y0Y2ZjAvdWM0d3ZkMmpxcGZXWQ0KK3lKdzhFMXdMUjkzb0h2cDBvc3lySFBxNVRGZVFPMkN5THpPaGhac1Q1MGt5WEp1RCtRZmdqN2J1TmVkDQpRUVkyVmU0bnJrWVBnSElNdWtmWFFEajhXMFpDbHVjdDNXQ2c3TTBZV0ppekRuSTlHRTJVTjlWTjRPSG4NCmRmbGUvQWpCQ2lqeFdMeFFxV0NTeXV3Tm1abDJRYUhTK1RyR2o3KzI3R3RzUWMzSlB1MjZENTBhM1BSZw0KSFo5c3JPWUhWUlIxOFBnb1NmdW55U05pbzZGdU1DcmVnK3RQZHMwZE4vWWFwQ2tYbk9TcklXVUdoT3YvDQo1WGFsSXBNSzRJQ2E3bUNtdGdHVjdDOUJXL2x2RHIyakw0by9FMGp5SkhNRjdlVWlteWxHTFU1RVR1MGUNCjN3SkZlbWxMTWxDbGNmc29vN0RqcHYvWkx2N004U3ZCTHdTenI4L2tGMW5Cd1V3RFMxb3YvT1l0bFFFQg0KRC8wWUc0UUdJa2t4TGpLNXBITGxXR0Q5azRWSjB2eE1qZ1Azekk1aExHM1Y5ajltUjNkbTd6bWlVTHBODQoveWVEbFU3djFzZG1oMnM4eDR5Slo1eEphaUw2Z0RQR294S2cwMTdMMUd5Tnpxdm5hOXFvRGMySHhCTWoNCmVnczhSUjZEbzhycWs5cDhFQlhpSTNGbEhIbi81aEc0OU5pL0xOTnhjcWY2ZE9leHRUV3BtNHRGZU1IeA0KOW5BK1BPMk1vRjZvR2tyZ2JPTURVdEtad25RR0N4QTMvWVhndjd3eWEvb0FTMUhZVnZSeDZMYmwxWU1FDQpITTdlNG5ZaUFPZmx3VTJnZXRFdFNYZnUxQ0Q4cDMwRi9Ba08rcUthaXRaRjJMWG1TLzQxeUlqRDY5b1ENCnNZNUVSS1JkTlFUQmtyNWVVaFM2ckZYSUk4U1h0SlZ3K0RZMjlBQWVsWlRJeElKL3pMVzZBaVB5ZFJTcA0KbXU0dmkxL3k3WVdUUTFiV2x2eUlqSFdEUnB3VnY0SzdWTVdJazh3VXEzdVJGNS8yKzRoL2VtY1hjN3BHDQpMdVgrd2lxTVd3OEhqdjM0LzhIbGx0clFSRzM4SnRzVEtDOURQS1RxZXpySWNkUHZ2NFBrVlhHSEx4WWcNCmRGeWZrWXIvYjNtS2lHVnBwdEdFRTFyQ1B6ZzBUQ2Q4Sk5RZ0ZyMDRYcTVnRWxQUDZYQmN2czNKNStoKw0KdUhsYUZzb1BNenRobjgrZU5tdnhpQ0hwZDkyVklibDlWcTYvWnRTUGNKbjRkcnJmdG4zVjF6dlVDNzEyDQo0TE5wMmlpcGRTQXluZmtCUUUwRkp2N205bWJ1bkNhNWFBRVZRN2J4aGdOWDFDcUF0Um1lc2hkOHc3U0ENCm95VHd4TitWc1FVaHg4T01LQi92UTRTUU5OSzJBVmdhS25WWEV0UFdKc3lqMEhVbHdIQjlqalY1TDRJLw0KaTRPb1ZFeTVBTkwyZjA5Y1BlSEdrYmFLYjhzNExUcVpBVTZaeitMZkRmVGp6UHJSRDNxVmNuM0tjd2ozDQo0ZUN2a0JJRXQ4Tko1K1pWSUtoTjNsR0NDYWIrRkpPdGxYYUNMMG9rczdKR2xRbjU3SVBtdG1XQ2FHS2ENClZSaHA0V1Uzb0lWWmtLakkyM3NJV2R0MGwwejFIMXhLaEZWRitMRTRraVEvQ0l3aWZHWUoyUjVlUWk1SQ0KcXRGeFZXeThUNFk0YVdQY2l2NzNQK1JML25EZDNKVT0NCj13bVNXDQotLS0tLUVORCBQR1AgTUVTU0FHRS0tLS0tDQoNClRoaXMgaXMgZW1haWwgZm9vdGVyDQo=" + } + }, + "sizeEstimate": 6617, + "historyId": "1406105", + "internalDate": "1509670454000" + }, + "attachments": {}, + "raw": { + "id": "15f7f5f098d6bc36", + "threadId": "15f7f5f098d6bc36", + "labelIds": ["IMPORTANT", "STARRED", "Label_8", "Label_3", "CATEGORY_PERSONAL", "Label_12", "INBOX"], + "snippet": "-----BEGIN PGP MESSAGE----- Version: FlowCrypt 5.0.4 Gmail Encryption flowcrypt.com Comment: Seamlessly send, receive and search encrypted email wcFMA+ADv/5v4RgKAQ/", + "sizeEstimate": 6617, + "historyId": "1406105", + "internalDate": "1509670454000" + } +} \ No newline at end of file diff --git a/test/source/mock/google/exported-messages/message-export-15f7fcace2d72246.json b/test/source/mock/google/exported-messages/message-export-15f7fcace2d72246.json new file mode 100644 index 00000000000..1b39392540e --- /dev/null +++ b/test/source/mock/google/exported-messages/message-export-15f7fcace2d72246.json @@ -0,0 +1,124 @@ +{ + "acctEmail": "flowcrypt.compatibility@gmail.com", + "full": { + "id": "15f7fcace2d72246", + "threadId": "15f7fcace2d72246", + "labelIds": [ + "Label_17", + "IMPORTANT", + "STARRED", + "Label_3", + "CATEGORY_PERSONAL", + "INBOX" + ], + "snippet": "", + "payload": { + "partId": "", + "mimeType": "multipart/encrypted", + "filename": "", + "headers": [ + { + "name": "X-Gm-Message-State", + "value": "AMCzsaVCahez44KcMFESFt+eUr6/bxGK0QniBj+Znt7jhbtmbulBwEiU 6wWUlJgNQktMrrNNsMOqq5kJDLFJ" + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "From", + "value": "sender@domain.com" + }, + { + "name": "Subject", + "value": "[enigmail] encrypted PGP/MIME" + }, + { + "name": "Date", + "value": "Thu, 2 Nov 2017 19:51:56 -0700" + }, + { + "name": "User-Agent", + "value": "Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0" + }, + { + "name": "MIME-Version", + "value": "1.0" + }, + { + "name": "Content-Type", + "value": "multipart/encrypted; protocol=\"application/pgp-encrypted\"; boundary=\"gTs1bjSPE0g6EP73GHCSwKUV373k4TIBx\"" + } + ], + "body": { + "size": 0 + }, + "parts": [ + { + "partId": "0", + "mimeType": "application/pgp-encrypted", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "application/pgp-encrypted" + }, + { + "name": "Content-Description", + "value": "PGP/MIME version identification" + } + ], + "body": { + "attachmentId": "ANGjdJ8EH4iYMPUGqyh7OK5tJ_-hBTIbule8WQ41oXO0bJVeSyawwCnFBk2lBop0XCWMvMDgoxm7n4dbr5FCl85cLv2pPaK4Wzpfir3BEgaAkIfZhLGxmy6yl7nFLNW4h5YVI1rveoMtl4nsUQeAeYxTs5veh-hmFJIb0yGLs-bPC-gMzFwNLKSM7G2BUkxa_S-n55VdZPbTK8js7xgPyxlqJzJWVWGtCjNgFQOgoSF2VoLPdT96dlL_sYJqPf0Rhri5dbmu3rhxq8BnRXLULqT-_p8cc6kNFyQgGGYvGOTnMQLMQh9mZRHLuqifIn47sJbxdibutWn1DK0Vdf7o3eHNy1JWHmwpzWpyGHSftmnpKzlleKbFUf2IHCOTzaM", + "size": 12 + } + }, + { + "partId": "1", + "mimeType": "application/octet-stream", + "filename": "encrypted.asc", + "headers": [ + { + "name": "Content-Type", + "value": "application/octet-stream; name=\"encrypted.asc\"" + }, + { + "name": "Content-Description", + "value": "OpenPGP encrypted message" + }, + { + "name": "Content-Disposition", + "value": "inline; filename=\"encrypted.asc\"" + } + ], + "body": { + "attachmentId": "ANGjdJ_ZMdRmdVaPWjkUVEHPIAu5TzxAzffEgX_0Y40hQnFWJymuadXf4UJBeX_L6dZC0dCBPzdsfUlKO3eLtomPhMHIDScpg8OyzKiaft07iniPA21cNLsrFxwfxF0eovsJfMMxW3qnGovigbdwxcT5zsykhysMb6STbZWlzKK4cbLCw6FNmP1daHfV4ht8MpTfQfYK-_UhUhk-CaWBDVxbYap8Ozx92SJPwPj9gxKTUZikWP4kUCfR7gqfopb4uHsM9M7g3A5cLwQwBIkB4fB-9xIfLbY1OT8ExoQcyfDJZybLq61iMQwAvoQ_yDTjDumzAlVEZyaDFLe6EFdaN2IQzbWLWXNl_BIGbPbXD1Km7XfxgDmRDfVMUB0ts2c", + "size": 2164 + } + } + ] + }, + "sizeEstimate": 7695, + "historyId": "1406055", + "internalDate": "1509677516000" + }, + "attachments": { + "ANGjdJ8EH4iYMPUGqyh7OK5tJ_-hBTIbule8WQ41oXO0bJVeSyawwCnFBk2lBop0XCWMvMDgoxm7n4dbr5FCl85cLv2pPaK4Wzpfir3BEgaAkIfZhLGxmy6yl7nFLNW4h5YVI1rveoMtl4nsUQeAeYxTs5veh-hmFJIb0yGLs-bPC-gMzFwNLKSM7G2BUkxa_S-n55VdZPbTK8js7xgPyxlqJzJWVWGtCjNgFQOgoSF2VoLPdT96dlL_sYJqPf0Rhri5dbmu3rhxq8BnRXLULqT-_p8cc6kNFyQgGGYvGOTnMQLMQh9mZRHLuqifIn47sJbxdibutWn1DK0Vdf7o3eHNy1JWHmwpzWpyGHSftmnpKzlleKbFUf2IHCOTzaM": { + "data": "VmVyc2lvbjogMQ0K", + "size": 12 + }, + "ANGjdJ_ZMdRmdVaPWjkUVEHPIAu5TzxAzffEgX_0Y40hQnFWJymuadXf4UJBeX_L6dZC0dCBPzdsfUlKO3eLtomPhMHIDScpg8OyzKiaft07iniPA21cNLsrFxwfxF0eovsJfMMxW3qnGovigbdwxcT5zsykhysMb6STbZWlzKK4cbLCw6FNmP1daHfV4ht8MpTfQfYK-_UhUhk-CaWBDVxbYap8Ozx92SJPwPj9gxKTUZikWP4kUCfR7gqfopb4uHsM9M7g3A5cLwQwBIkB4fB-9xIfLbY1OT8ExoQcyfDJZybLq61iMQwAvoQ_yDTjDumzAlVEZyaDFLe6EFdaN2IQzbWLWXNl_BIGbPbXD1Km7XfxgDmRDfVMUB0ts2c": { + "data": "LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tDQpWZXJzaW9uOiBHbnVQRyB2Mg0KDQpoUUlNQTB0YUwvem1MWlVCQVJBQW1TZm9hWEZiQTB0djB1bEZ4VmlUd3JEVmNiUEhhUFF4eDN2YVgyY0hMQUJlDQpLUzJQMndPZWtxKzhxRC83Mk1NV01VK3Z4MWZiVnUrME1Ea0FFY3lnQ1AxbzU0bUlSOHZZR2twTDcwSmFMeU1GDQowanF5OExLZmhlSk81bytkQllNdjNyazU1L1FsTWdyS1NyWFVtR3IvRUFNNmtMaDZVd1dTL0swMFRGcndtUEF4DQoyYzRuZ1JRTHF5SHlnOURPTEw4eDJTa0JvUFlMSFR5Y0tZMW9NMUNnZHdjTnFqeTVSWER3ck40NFdzOEhSWDU3DQpQS0xnckFNK3ZVdjU4YlRoWVQyb1MxTDJsN3JJcThTMG4yZUZJMjFISFVRRkRBM3JCSkp5dm1oVjRKQXk5QkxpDQpVWXFtQkRqdk10ZGZuOWlCa0ZoemFwT1JxaWdBVWRzNGFUaUJud1dpamdmdXppbFhxOTdPVG1iL0hOVnZQZDBBDQpzWFk4dTFjNnNuQnF1OXZ1c3B1LzJxWFBMWWgwNkgxYVFsTVAxMXEvaFdWZlZMbmo4dkZtWXB3UVJFVmU4Y1hkDQpLVldOOCtoWWlxS29TbXU1bkticXdYTXFlSGpTOUwrRUdaTXlpUmxTd0ltVXErQjlnR01jVEJGUjJFQytPRDNVDQp3ZVdoc2VLOWpJT2lvMG90RjFFRjRwVi8rVlVVMmdQQ1poVXJ5dEdJdHdmY0R4eW8yRFBXVXVuMlNBOUVESDMvDQpwR2Y2T0RVd0NiNjdnTkRERm9SK1krV3hmR0NLSzFDU1BBRUhIbktYVFVQMTQ4M0l6VUhXeFA2UjAreGhneXBRDQovdWZFaFhPVndFamRWK0NUTWxFTmVTTnBRZE50MXR5eTJUTWhsTmQxQTBkblJNaXZ2Z1ZwcWsyaEhIMzhpR2VGDQpBZ3dEbHVBT2xLWFFvNXNCRC93TGVOWmlLSnpuTGE2NVZOekpvdDI4VGM3Qk9aUXlmbXRiakY5SDQ2UlJCOGE4DQpJQ3F1NzhLOFBhZjlRQlAvL1djUEwwUkZ2V2Y0Mms0ZlozZHkzRGdQY3dab3VyWUtKcHZGa2RhaUl1RlExdWE3DQpJZ0g2c0pqVHJ2K2JzQmJDTmxvRlRNZ2xqQmxkbWlTWFNaUGRPamYvQXQ4RVUvRzQ0SXU5Tld6dW93TURnWGlaDQpVZlRVbTNSWGRXWVlpODRXbEwxb01XZE1UckhtdnBkM3MxeWF0NFk3eWFCR3JseHIwVmVwNmhtVUFYdERxRWVwDQpjalByK0JsMHR6WEM5WEo5UkpzQXAwM3BEd0VrZlhpU2ZJUUI5eW9yR0Y0NlhPVCtkUm5pY3drN0hnVVFJa3cxDQpiUDN4c09GcFA0Ujh4ZGEzUVoweVNEbW4zRTRiQWM5VDZMdTBxS0VCcjZjRUNnWlhwN05mSnhwam9RYm5IeGQxDQpxUzBGWG1iVHVIV2FnSmJFU0hxWHRyQkJ6NlVnK0ZvVmg0ZnV4eTUvdTNRRk1hVkZSb0F5QTNQYlVUYk9maUphDQpQTWlXMW5USkc3b2ZzcEtnbXNnK3hGcWc5L2RMZXBnQncyUVUwYXpzYlhQbW1TWEdKRXdsenJydmtLejFFaUs0DQovcDNyNUFnajdTNGpYU1VzREVoV0Ztcm1xWG1qNVN2M0VjQzJKZXcvenlrV0c1Tk9NeHVxNG1QVFd4MWNLMVB1DQpQMWVCbnpYbEhNWldOQnZuNmxEd1B2MUN5UytUNVNyVGp4dUZtSllzNnNQR2lvVklUL2lWbUFWZ2g3Y3RxVjJhDQozZGFQVTViTEVWVkgybTRtY013VUxiUTkrVmMxbElidUc1UGxKdkFZdVJUeTNRRXNHczJWRmQydDhsRytFTkxCDQpCZ0c2RThMbjN6aXFFQ3FRWlY0V0xUbjVmUkd0dEt1QTMvK29zUUJDNTUrdGNQc0trNmoySjRweGFVOEt3SzR6DQpUNDBNS0ZScEJUTlhaUU9FV0V2Tm5ndjNSc00zZHA2RnZWV2dVb1VodTYzNDBIN09xQVN1S2Q5UW9pcUlaalh6DQo0TzcrcVZ6anBKeWtpSnlYb0pEVFhCQ0Y5Qk85U3Z4QURHOUlEVFVzSjFpRllSRGtXSDNqamYyOUUzbDQ3enJ1DQo0UEZuS01Rc0RSVDlVcnRBak5SK0hEMUFaYWtaY3pobGpjUnFsODNyRzdoRFNPakJ3VU1ML2NrcEozSEE0d3gyDQpiZUFONHk4eXdKUEhXYlp4Y1Qvd1psTFp6SW4vMXVzL1FoWXRJZlU4L2hQYVUwTjQ5b01WeTZTVTY0S0E0cmdUDQpqVVZoVW9CSVEzaXZpNmhzMEdBVUFhcGN3ZHVsRWN1dlFFSjFKYlBYTXN0NmFVNUg3M01iaGpZVE5kdUszUVpjDQpYcG9rUU44QVpZTDlwcWJVY1ZpTUxXQnF6bnVGK2JPSU1LTmZ0RW9qOU1WUGJIVkt2SElaWlFyS1ZaYjdVTWNsDQpUY1NzSTBKbSs1ZldrZHJIa0k1MVl4Y3JWYXBOa1QrcEdvK01CelRWdHc3b1o4NDRlVllVbkY0NEFqYURFcjh4DQpSM2xRL0hTaDRIeTZpYlJKMFpHUVpzYkFnMVNMQWcraGc4aHpnMXV1eTlFME1EYUkxNW1kejdGcnNJd2JiaThPDQp1UlRXRFFnTFF0eENZNDV4dlNtVkpxYW5nSWc4cGtRPQ0KPXY2dnMNCi0tLS0tRU5EIFBHUCBNRVNTQUdFLS0tLS0NCg", + "size": 2164 + } + }, + "raw": { + "id": "15f7fcace2d72246", + "threadId": "15f7fcace2d72246", + "labelIds": ["Label_17", "IMPORTANT", "STARRED", "Label_3", "CATEGORY_PERSONAL", "INBOX"], + "snippet": "", + "sizeEstimate": 7695, + "historyId": "1406055", + "internalDate": "1509677516000" + } +} \ No newline at end of file diff --git a/test/source/mock/google/exported-messages/message-export-15f7fcb7fabc7511.json b/test/source/mock/google/exported-messages/message-export-15f7fcb7fabc7511.json new file mode 100644 index 00000000000..86f75abccd9 --- /dev/null +++ b/test/source/mock/google/exported-messages/message-export-15f7fcb7fabc7511.json @@ -0,0 +1,80 @@ +{ + "acctEmail": "flowcrypt.compatibility@gmail.com", + "full": { + "id": "15f7fcb7fabc7511", + "threadId": "15f7fcb7fabc7511", + "labelIds": [ + "Label_17", + "IMPORTANT", + "STARRED", + "Label_3", + "CATEGORY_PERSONAL", + "INBOX" + ], + "snippet": "-----BEGIN PGP MESSAGE----- Charset: utf-8 Version: GnuPG v2 hQIMA0taL/zmLZUBAQ//RO4wLVr52Zf0v6/fa19/noJFsFLIEqsWkX3OPOZfiRew tcI17dq5u854lbuXwSELEAUkhX0NJ2ZM+jNPRyW4dqhcuFBebBXN10/pzBaG+nKi", + "payload": { + "partId": "", + "mimeType": "text/plain", + "filename": "", + "headers": [ + { + "name": "X-Gm-Message-State", + "value": "AMCzsaU9vkCt3G0OQkWukzGyeozyKVL+YaGn4UCf994KxLSIox7PmP9r m91Xndv+3hZSjwvowIz53KCGETEe" + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "From", + "value": "sender@domain.com" + }, + { + "name": "Subject", + "value": "[enigmail] encrypted inline" + }, + { + "name": "Date", + "value": "Thu, 2 Nov 2017 19:52:42 -0700" + }, + { + "name": "User-Agent", + "value": "Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0" + }, + { + "name": "MIME-Version", + "value": "1.0" + }, + { + "name": "Content-Type", + "value": "text/plain; charset=utf-8" + }, + { + "name": "Content-Transfer-Encoding", + "value": "quoted-printable" + }, + { + "name": "Content-Language", + "value": "en-US" + } + ], + "body": { + "size": 1716, + "data": "DQotLS0tLUJFR0lOIFBHUCBNRVNTQUdFLS0tLS0NCkNoYXJzZXQ6IHV0Zi04DQpWZXJzaW9uOiBHbnVQRyB2Mg0KDQpoUUlNQTB0YUwvem1MWlVCQVEvL1JPNHdMVnI1MlpmMHY2L2ZhMTkvbm9KRnNGTElFcXNXa1gzT1BPWmZpUmV3DQp0Y0kxN2RxNXU4NTRsYnVYd1NFTEVBVWtoWDBOSjJaTStqTlBSeVc0ZHFoY3VGQmViQlhOMTAvcHpCYUcrbktpDQpDSzNCNG1BaHFZZUZBelZlSW5GUzlNUGJwMStYemN5UG0va1BzMm94SVNrNENVR2FGQ2xTVEdGVWRSamR3Vnl0DQowNkJFVng0bzBkdnUwZW01TzRzYm1BcUFpY3RMOUtjN2MrQllSbXZJQkJhdDJ4a0p0b09peDNIbUpCY05SMHczDQpBUXhvQjFwS2tienFPdHdlT2hjUDlvcFN2TzhHWHgrOXZYelNpODhQSjR1TUtPU0ZVYnRLR2F2TXlYWWtLcElzDQpOL2hZaUs0TDBCOC9xY0pTNkxzTTI2bzBrWnNWTWc5cHorQkszWnNwQXlxM1FuTVJHYVZlenpyQStlQTIvR3o4DQpvdTVDVTB0QlhNTGJ1QlBqOHFXQkJnYURKeldCSnlROVZSTnd4MU9FNHlXTitSLzVIMzhmeTZaL0JqOE5pdWVXDQpiU1ZWaFhWZHdQellvRzZXZzA2Q1VTL3V5alRVdFVrR0d5N25vaWk2MTBYTHNPaGZPY3NCY1lPRXdGdVE5RlluDQpuOXgycU1mbzcxY3VXd3REY3hkVUJmR3NvWnpKa24xYXVENlhmSHJKWTVmdXgwSmkrYXYrbmtXdGdSc3UyL0plDQpCRUZpa3VCWUZaeGpXT2lBckdHeWJ6blZaWEU4bThvZ1pXWU1seVFZeWJTaHMrY3RwKzRXeDVvTldCUDRFMEpiDQpUM3FXNkdYU3JlUC9FQ2ZaTlVnZ1BnT05VWW04WUtUWm9XZ3dMK3N4eURsTDZzblpNaWRQNEZyQzM1Qm52UStGDQpBZ3dEbHVBT2xLWFFvNXNCRC85aDZONEtXbEw0MWUwakhKWC8yS2JQWGcxL2NVL1c0dXJkRnhteC9IdTF5OVkvDQpKOVZLWXhuZTNId0piOUJ4TnU2ZzFRSmlyR1NMK040ZEgvYmFSOUJsMDF1UGRSNktaZzA2bHlnV2VWUklNUE8rDQoyeXRsYTlHeDlsditHOGJYTTFhZE5WYkNlUlgvSUx2VTEzU000ck8yZUh2Wm9kQlEvWXlhUWZVT2M1OWlkTkh4DQphWFNEVDE5L2lCVkI2N1h4cS90NEo1bjh4V3QwYjBnQjZwRXpBRG5KOTJpSzFzbzdpdmlTeFdibjBsZDRFOWpmDQpjemFsRkNaQmIySGxxbHQ3cVV5T1F2cVBJdzVZUjVSMjRvNFRGZHRxOER6akxkTmZhejhlSWxIanVoL3J2cHJxDQp4QmhkcWdXRk1jMlY4Yk9QSWtRU21ZZlZRWFBMV2ZsbldWME1IdW9vN1JnVzMzeEQyQVNQS0hwVVgxYnI2NUM0DQpoc3ExZTNSMzJ0WGNPTy9iaDlTb0pLajd2TCtOUDYxUVlrYXJtaDMweWg1WXhOY0pWMzNsa21aLzRBdkY4ZlJhDQplZVRRZEhLZHZKdGdtTWdXdVJTZVIxektTSWFkdnlsR1pvdHFUSTY2MnBmbS96R2pkVmo4Z0pXdmNONFhuQXFJDQprdGczbXBJOG1SUzZ5ekRMY2JXSStxRmtjQWtCZmtLM0hUdzlLcWo1OTZqUXVXYmQwOE9SbTZOeEgyTDQ3QlpFDQpmVjRPaVRtNW1KRm4yZVJha3JTOVVtWWhWa3ZMOWpJVFh3aHFNeTFNajcycXhaVm54NFBTbm44d2dNdDBKZDA0DQozNlFLd3Ntc2w0b2F4QkF0OTVRUVZ1NWEzVVFhOFAvMnZUZGluS2FMVjl2b1FkRlc1bGNPVVBWTzk1NW1zOUp3DQpBUkxJbTI5cHRCa1ZLNk4zZnF1RVFRdHNzUjRadDk3SEs0TzdsL1lpbFJhNW05aVFGYVBJcWFzSEhKYVZ4aEtNDQpaazN6ZlRUTlI4dDMvbW9hU2JvNDViWFFrNFZnbXV4MUFUck5jS2p5SVJpTnFQUnoydGJKSWMySDA1bmFpanNiDQp5VHUzczdDblNFQ01XRjI4M3MyRHRnPT0NCj1sM1dQDQotLS0tLUVORCBQR1AgTUVTU0FHRS0tLS0tDQoNCg0K" + } + }, + "sizeEstimate": 6935, + "historyId": "1406044", + "internalDate": "1509677562000" + }, + "attachments": {}, + "raw": { + "id": "15f7fcb7fabc7511", + "threadId": "15f7fcb7fabc7511", + "labelIds": ["Label_17", "IMPORTANT", "STARRED", "Label_3", "CATEGORY_PERSONAL", "INBOX"], + "snippet": "-----BEGIN PGP MESSAGE----- Charset: utf-8 Version: GnuPG v2 hQIMA0taL/zmLZUBAQ//RO4wLVr52Zf0v6/fa19/noJFsFLIEqsWkX3OPOZfiRew tcI17dq5u854lbuXwSELEAUkhX0NJ2ZM+jNPRyW4dqhcuFBebBXN10/pzBaG+nKi", + "sizeEstimate": 6935, + "historyId": "1406044", + "internalDate": "1509677562000" + } +} \ No newline at end of file diff --git a/test/source/mock/google/exported-messages/message-export-15f7fd2fd072cff2.json b/test/source/mock/google/exported-messages/message-export-15f7fd2fd072cff2.json new file mode 100644 index 00000000000..73addec5a58 --- /dev/null +++ b/test/source/mock/google/exported-messages/message-export-15f7fd2fd072cff2.json @@ -0,0 +1,81 @@ +{ + "acctEmail": "flowcrypt.compatibility@gmail.com", + "full": { + "id": "15f7fd2fd072cff2", + "threadId": "15f7fd2fd072cff2", + "labelIds": [ + "Label_17", + "IMPORTANT", + "STARRED", + "Label_3", + "CATEGORY_PERSONAL", + "Label_4", + "INBOX" + ], + "snippet": "-----BEGIN PGP MESSAGE----- Charset: utf-8 Version: GnuPG v2 hQIMA0taL/zmLZUBAQ/9FX0uRThi4ZT1KmNEZYS3WC+Noqommn5szVhI72E03HUp 3JMub2XMmU80Oe6WybHancEZw3w/oWR5CvdQx9414jub4uXxaE91wBuqlS3Ow6/o", + "payload": { + "partId": "", + "mimeType": "text/plain", + "filename": "", + "headers": [ + { + "name": "X-Gm-Message-State", + "value": "AMCzsaWRAkVD71Q6REZLpGHEsGNfrwfkle+cXoaIDcHAGIqem63MLBlU stIcRQKcw2Ly0r+n23F/BzvuQiZr" + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "From", + "value": "sender@domain.com" + }, + { + "name": "Subject", + "value": "[enigmail] message encrypted+signed inline" + }, + { + "name": "Date", + "value": "Thu, 2 Nov 2017 20:00:53 -0700" + }, + { + "name": "User-Agent", + "value": "Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0" + }, + { + "name": "MIME-Version", + "value": "1.0" + }, + { + "name": "Content-Type", + "value": "text/plain; charset=utf-8" + }, + { + "name": "Content-Transfer-Encoding", + "value": "quoted-printable" + }, + { + "name": "Content-Language", + "value": "en-US" + } + ], + "body": { + "size": 2566, + "data": "DQotLS0tLUJFR0lOIFBHUCBNRVNTQUdFLS0tLS0NCkNoYXJzZXQ6IHV0Zi04DQpWZXJzaW9uOiBHbnVQRyB2Mg0KDQpoUUlNQTB0YUwvem1MWlVCQVEvOUZYMHVSVGhpNFpUMUttTkVaWVMzV0MrTm9xb21tbjVzelZoSTcyRTAzSFVwDQozSk11YjJYTW1VODBPZTZXeWJIYW5jRVp3M3cvb1dSNUN2ZFF4OTQxNGp1YjR1WHhhRTkxd0J1cWxTM093Ni9vDQpYZlhaQXpUMGFFejdqWGtoOXJBWkR6S2p3cUpqRC9VSUNIbVpzZ1ZzeDEvWlpCWU5CcGJoMmVzREZHY0NFK24wDQpoZ2Q1K2VrYk5xWFUxQnlVMGVaUk1vMzB1M2h3NFJBcDNkUGNmSUpPM21UTlVUWGJBdW5IenRidkdGazFUSTJzDQphU3h2SlEvUU50NElSTWFWRzdwbCtHd2MyOHltV2JOT3Y5dlZRUUI4MFRKdDV4N3hKOFM2TWl0b0F6VFowS1RhDQp3ajJCUTlKUE8xZmd4VHc3WmVoYWI1VWhRTEpYc29mZTBXblU3WEl4ekZZeVpkWlNHTnE2dStjSStEZlVIODM2DQpVRFl5RU9obElPeVlmOFNDZDdCM0FUN1dkNC81YzMzM0VDL1duRzdXN2Y4UnNkV0FRdGY4RTZpV0VEZ25HbXZ1DQoydHJ4SFpkVElPaEVxd2d3UFdrVlgwVWpCZEo3VThuQmhQKy9jc24yaDZicHhPQVJGcFhPd2dtbG1qakEvUVFMDQpSZ2FLMFRDeTdKY25RL3Q5U0NHdzYyWVlRc2dGOFJDVVB2bXorS3BaVis5Y2t3T2xqOHZONzVzeEZ0aXRkL0hxDQpoU1ZNVWVJc2dCR3ZvK094RkErTkZMUVR4ZDhUOWhVTnBVMlk3Uld2MEdMcWdRdGo2R0U3eWtoNEk0ZGNiL2dmDQpJQXBGNFhLbnpHbE9Jb0hOVWY5dE9uWThKVitUTGJRbDNoblJYNjRRQ05pbWdsYWdRMHl4ZTNwNWp6WDF1SW1GDQpBZ3dEbHVBT2xLWFFvNXNCRUFDVTNyeDZ1OVhoKzYxRGNwVUhNeGdRNDNLcUVYV3dNcHprOFl1ZFdybU5LTDIzDQphNjUvT1lweUNCc0wvRDArYlZLdkxNaG15ZmF6MDlNM3E1bGg4Nm9OcnZISEZzYkRPS3pIbEFlQkY5eDgrSE9SDQpMQU5qMFRDdHROUjA4ZTRpM0hQYlVUNnVLL2ZLbEhicUE2K2lLZ2JCYWZiZEhKcmVYdEtLUzdnOWVyRVlnQlllDQpFZzE0czdYOHErbkhYWjVzUzgvcHRXVWgzQ29WdFJnQnNZZTZBZ0grNnVEdnRRV3UrbTNOUlpaclRCVWo5NC92DQpCbGtBVjZwdFJiVHNCV1FKWmpSYUtHUXVOMTE1V0JyS0FvUHpJWG9Jay8zTEpTZTF6WlU5a3BtZEo0d3Jhd3NFDQp3Y01SSlNqWVdSMm1qcElLWlphMlVFTWFIU05LRDB0Zk1ZbnQyZXR2bURycnQxZUxNZnpkOE56Mlo0cmo3N2M5DQpyZkk4blFnVG1YNUVhSEpRMFBjSjBIMEpuNTE0Z3ozd09oMUI4ekNEMzRLbFMvd1JsNHYyYmM3TW9kTjBwVFVJDQplb2hOQTRqKzlHYW1KTm9NUGJMR2k3bzBKcWFnTFRQaUY0SnV1RW1WME11L3BqV0tpaWsrU2k2SElkZFhzUDRzDQpXYlBmSVZ3ZU9oQ0tma04xNjFUd1N3KzFjZEhPdytEK1BBeE1PQ3BTRFU4R09WOTR1b1RMMEp0SkVkQWFaSHNqDQpaWmJNR0MrekFUSUt4cG9YSU9OcjVRd3k1MGhIZituWlJRZnZmbjhpbC9GME5veWcwOHBNYWZabUFValdRZ1NtDQp1OWJFM05rVEY3RlhZckorWDI2ODdpLzFLSjdVcmpoSlFGY3oxKzB3YlJtbVNtSmxxcXc3QUpLeHpPN3dSTkxwDQpBWmxZVDJmbDdqTFV2bnEvS2VFaHBVL0hJUThraUhDMzFKOC9TWUJ2dDFzNC8vMCtjeWtBOGJLRUM0M1ZLWjNSDQpwbmNPNVAzTGFzeENNbTZkUGNyV3VSL29OOFVNOHVUUWpVc3hoSmxGNmZOVXYzZ0RxdDBlbTI0Wm9nS3VLcHpTDQpJUFhYOUVHb3RONVh4S2diQ1k2bEFPaUhPakhKMHRmTXBQUXZ0cVAxWTI4bUpqcC94M2tiOHVsNWg0SDZVaWdyDQpCN3U4dEhJYlI4MmdoYnF6RTd2S3JHbGQrMzFoUDdzUkt0aHRkMTdxSlBFdkRmdndXLzZDN3E4RG8yUE9iVnFZDQpScXd6VlduczhtcmtUdXpKZ3pTVWdXQ0hCVS9yRFZ4ZjN1Y1Z1N2JEcUNZa1dWa203YmQ4R3B5MCtha284N1VNDQo5M0ZhL2YvVGVncldHYkZxajJtYW9QZ0JWSENlL2FFTjJNMmR5amVsdHFXOUFUSHllZWxxNFBncU82aTdDRTAwDQpSQzVaS3BkUGtNcnVyb3ZpUCtXcjU5b0l4RVU5WXpUVnd2N0I0aklyM0k5WnhGcnJkejV4SVd3QTNrZkhvQnMwDQp5OEgwMXRrekpWRmxMMHRSVGQ2U1pPQ01hbzlTWEZhMTZTQWQ2Ym9MMnJ6QjRLaFFQbDJLWW9wNGpGUUdQdkJhDQpadGxHZ0k4bWpMNVVIOTRZQU8vcE1RYjVlQjBmWXhuWjVXQ3JqcjNQTWpnL3c5T0I4eTZETDdjcEkxLzlreHFQDQpmUGxuRHYrNlUrOCtjKzk2czUyQzRRSXBkZGVBcXN5RGJpVXYzRDdLZmFqaEYwV0RhZjU5OVlLMVRBeU9SM3RYDQp0bUNxNEp0S1E5K0hlaHp0dndETS92V2YyS3UwaGsvSGpQd0owMWN0L0pMQUdtMVVlWi9qdWhhcVFsZG1PTUJKDQpiaFNIVDlVL2Z5NzJHV05pREFlWDZmNEZhNmFKdU9WS1lqRFVTQWhkZ0dzZmRmclBKN2tKUGNPT3lJKy9jQzFwDQphc3ZmYzlPdkpXeVo3MTZNZDVqMGhUVmZLV2ZYdG5oektjR2w4bnJBNFhZWkdBOCtsWllhbWVmS3pJVm00Nmt3DQpvd3NCMTVOVUk3NzNaRFRkZFNDTDhjNkpRdU90NUswRzYwdzlNMHF4WW91WkVuV1Q0TEU4ZWcxUzYxVnJibDZQDQozeWlHN01EeTJwNi9GbG1DWmdESFFSVXFraXVDR1VWcEN3S2lad056RU1xZS9NTng5ODhkTWtud2FkWEVBdCtJDQpSMXhwa2t5VUREOGNkYmIxDQo9V3JNaQ0KLS0tLS1FTkQgUEdQIE1FU1NBR0UtLS0tLQ0KDQoNCg==" + } + }, + "sizeEstimate": 7799, + "historyId": "1406019", + "internalDate": "1509678053000" + }, + "attachments": {}, + "raw": { + "id": "15f7fd2fd072cff2", + "threadId": "15f7fd2fd072cff2", + "labelIds": ["Label_17", "IMPORTANT", "STARRED", "Label_3", "CATEGORY_PERSONAL", "Label_4", "INBOX"], + "snippet": "-----BEGIN PGP MESSAGE----- Charset: utf-8 Version: GnuPG v2 hQIMA0taL/zmLZUBAQ/9FX0uRThi4ZT1KmNEZYS3WC+Noqommn5szVhI72E03HUp 3JMub2XMmU80Oe6WybHancEZw3w/oWR5CvdQx9414jub4uXxaE91wBuqlS3Ow6/o", + "sizeEstimate": 7799, + "historyId": "1406019", + "internalDate": "1509678053000" + } +} \ No newline at end of file diff --git a/test/source/mock/google/exported-messages/message-export-15f7fd3ba3f37cf3.json b/test/source/mock/google/exported-messages/message-export-15f7fd3ba3f37cf3.json new file mode 100644 index 00000000000..7401e8cf753 --- /dev/null +++ b/test/source/mock/google/exported-messages/message-export-15f7fd3ba3f37cf3.json @@ -0,0 +1,125 @@ +{ + "acctEmail": "flowcrypt.compatibility@gmail.com", + "full": { + "id": "15f7fd3ba3f37cf3", + "threadId": "15f7fd3ba3f37cf3", + "labelIds": [ + "Label_17", + "IMPORTANT", + "STARRED", + "Label_3", + "CATEGORY_PERSONAL", + "Label_4", + "INBOX" + ], + "snippet": "", + "payload": { + "partId": "", + "mimeType": "multipart/encrypted", + "filename": "", + "headers": [ + { + "name": "X-Gm-Message-State", + "value": "AMCzsaXJgc3mefFxateCLQYptuBMVOZ4fh6PUIFRw1lEiVDQt/Fl51CV ENzcJNCxaDl1Sqvp5dwNXthnbH66" + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "From", + "value": "sender@domain.com" + }, + { + "name": "Subject", + "value": "[enigmail] encrypted+signed PGP/MIME" + }, + { + "name": "Date", + "value": "Thu, 2 Nov 2017 20:01:41 -0700" + }, + { + "name": "User-Agent", + "value": "Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0" + }, + { + "name": "MIME-Version", + "value": "1.0" + }, + { + "name": "Content-Type", + "value": "multipart/encrypted; protocol=\"application/pgp-encrypted\"; boundary=\"H2AmhlIW7oAFHfcmukpDpEd1f6QdrFED5\"" + } + ], + "body": { + "size": 0 + }, + "parts": [ + { + "partId": "0", + "mimeType": "application/pgp-encrypted", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "application/pgp-encrypted" + }, + { + "name": "Content-Description", + "value": "PGP/MIME version identification" + } + ], + "body": { + "attachmentId": "ANGjdJ_CxJsNjFWOK3LuGZUd4ov1tt3sMEWvH5JfoQX9qGaPwGycuPXIMfYOFe41deBBdK3x6lgzZHJBNxHiZjFKRa0ZALcqWBzPBEkNiB2yIZ-PXGcIZBeReZ4f1knicXsL03yjkVfYY5lVb2kTQ12ypu9xlDsj5mQ3e27Ee4Bo1nWIP4gR4bp0g-jgS0McFi8NEhULCkvqDE84IoYdyNFnP0QPU7tC65Z_IH5F5u15fiPlhpYtMIhxJxzGmiXNiByRV6ykp38yFlPLNLNHWBZCuOy_7Pe9ZxZM71dBvXWF6ToIQmfaYl-F_c8_0bkVdEA1weUpmHhAvFGJ4hZEQ9AVNQSm6CR03mymrp2YAzOq2YcYNHrow6fFvG4j4y4", + "size": 12 + } + }, + { + "partId": "1", + "mimeType": "application/octet-stream", + "filename": "encrypted.asc", + "headers": [ + { + "name": "Content-Type", + "value": "application/octet-stream; name=\"encrypted.asc\"" + }, + { + "name": "Content-Description", + "value": "OpenPGP encrypted message" + }, + { + "name": "Content-Disposition", + "value": "inline; filename=\"encrypted.asc\"" + } + ], + "body": { + "attachmentId": "ANGjdJ_OEr3mZHLHkK7tsButwfhCTjjspi3QtJPzeWkOIiyd_AJvj5YgCBckucdcclPg63sVkny3VKDsKZIXQ4IsaunagImnZlXZVkAPNr1q-ZruMyBMDymcvM39n4t9c3KjzmoU10sDQVfs8ixTp0TpXqmcq9eRJZ0QAtZG_3fVa0otn_k0wAXm3L4NV7Ht6QMQ4qgKTYJEJY3F0YUkAYCmqP6y_FlIj5d_LCoWrecJdzxx1LWm4E6aBhBjxTJjpFRdWfSLG0nSNS8VI7p_4l44Lk4J3e-Prfb17bKAByXfcF9jUl4bLIkCiRwMmcRhl2ePmRGAPtUROgWIHKwTVRiKm0Nd2zw7qOK4_0vQOVvzm3jUXaskKnDra7LQ4fM", + "size": 3050 + } + } + ] + }, + "sizeEstimate": 8587, + "historyId": "1405999", + "internalDate": "1509678101000" + }, + "attachments": { + "ANGjdJ_CxJsNjFWOK3LuGZUd4ov1tt3sMEWvH5JfoQX9qGaPwGycuPXIMfYOFe41deBBdK3x6lgzZHJBNxHiZjFKRa0ZALcqWBzPBEkNiB2yIZ-PXGcIZBeReZ4f1knicXsL03yjkVfYY5lVb2kTQ12ypu9xlDsj5mQ3e27Ee4Bo1nWIP4gR4bp0g-jgS0McFi8NEhULCkvqDE84IoYdyNFnP0QPU7tC65Z_IH5F5u15fiPlhpYtMIhxJxzGmiXNiByRV6ykp38yFlPLNLNHWBZCuOy_7Pe9ZxZM71dBvXWF6ToIQmfaYl-F_c8_0bkVdEA1weUpmHhAvFGJ4hZEQ9AVNQSm6CR03mymrp2YAzOq2YcYNHrow6fFvG4j4y4": { + "data": "VmVyc2lvbjogMQ0K", + "size": 12 + }, + "ANGjdJ_OEr3mZHLHkK7tsButwfhCTjjspi3QtJPzeWkOIiyd_AJvj5YgCBckucdcclPg63sVkny3VKDsKZIXQ4IsaunagImnZlXZVkAPNr1q-ZruMyBMDymcvM39n4t9c3KjzmoU10sDQVfs8ixTp0TpXqmcq9eRJZ0QAtZG_3fVa0otn_k0wAXm3L4NV7Ht6QMQ4qgKTYJEJY3F0YUkAYCmqP6y_FlIj5d_LCoWrecJdzxx1LWm4E6aBhBjxTJjpFRdWfSLG0nSNS8VI7p_4l44Lk4J3e-Prfb17bKAByXfcF9jUl4bLIkCiRwMmcRhl2ePmRGAPtUROgWIHKwTVRiKm0Nd2zw7qOK4_0vQOVvzm3jUXaskKnDra7LQ4fM": { + "data": "LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tDQpWZXJzaW9uOiBHbnVQRyB2Mg0KDQpoUUlNQTB0YUwvem1MWlVCQVEvL2ViNDBBbXNSOGRqWkFOaTYzY0N4NHNrMlRJbE5hdVo5T2RucU1FYklJN3NCDQpZb0svMEtEUm5INUkwY05md3BGY21Ya1VoclNMS3RuMCtmeUNyeHJ4by9RWlpPOGZENzhPcVV1M1p3QzNoRlBtDQpPaUxseDlvSTQ4aGozSHJ3LzRDVThGUXRib01BL3FQUExxdGpuSUpMREhRaVpheUNGNlhub2tITkY0Q2ozd3FuDQo0K0duOEFha1VHc0FyN2lVeUlrWisvcFIwVmJQU2dlakZnZGR1OEg5Mjk2bzIxTVIvdEIrRk43REsvTDdmYTY5DQpEWnlMTGRHcDV2UEhVQjNHaWtBdVMvcG95Z2dSYytsU1VhNFQ2anRqVVNBVUd0T1VXdFJnQkZMQWVldUhvc2tYDQo2dHc1QTdPeURCVEd5UVNXSVJiMUo1TjdQNWRYclUvdnQ5N3BRaHJWZ1JYeGZiZXEwT0xrTG05Rzk4dGhFKy9HDQptd3c1Q1ErWk5mUk1vdVB6QkRQVDA1MFRHQjIzSk1UeFR4OG8zYlBMYi9VQ21CMlFodGI5MFhOY1VpeVUzZ3lKDQpQbmtJOTFmS0dmdFQ2YkcvOWxrNzZSdXNabkVxV2hORXN2WFM4S0Y1OXBqM0VhMWNWZW93d1FacS81N0M2cFdRDQpOU0tNUUpJMFczVkNDeXJ4TVhiZWRxYlhmVnVJK21PWXQ0K3lSS3AwbVBXY2VkNGQ1blY2TzhxSUNyZnIzL2trDQpuZDdWdFdxUkw3bkRUYmNQV1pOU1BPUC9ESGo1eVo0dytjcStyT2o1QXRqUnNiV0l0M05SL3BvK2h5eXUzekhEDQpNNEdrdFhxUHh0RFpsMkhzVEM2Z2MwMENGUDh6cVRLcW5EcFFSWitLbDZ4ZnZlbVBRTG16NHBucnpFeUVzYlNGDQpBZ3dEbHVBT2xLWFFvNXNCRC85RU9iTXREYlducXRScElJWVhwM2VzNDdGUEJLZ1I1T3VjL2NydGYzSzluMTY4DQpNcDdLL3R0MUpzckNuTzRvM29qaUlLNk80MElpbHFuaEJOM2hGWWNSUEoybFcyamVmSnZLTzFrc2ppMXE3azZIDQpkbVR6K2pFM21vdytQQW43RCt5MUNWZ1RwdnkrTmcyRG8vNlVSMGRueTRNbTdsWmhIMmwyc0NUSDZGRlhza0JWDQozSXpBd1NPTnR3a3hwdlQ3K01xY3E3azlENVA1aFpUUHVpcDhjaytJRnIvRUtVYUptOGZBblRjYmY1dFJxZ2VwDQpjK1Z5NFF4S1h1NkdnVERId1l3SEx6VmJpUEQ4R0c1Y0FwYnBuOGMrbmZLcWdqR3VhMHp5WWwwRlVkMDIza1p5DQo5YzRXZWJpODNOVk1aRG04LzVTQ0h2Vkp0aUtKYTBicXV4eTFhQk81bkxseHhuSU02SDNvQjFVclFwaWo1b0MxDQprdGFXMDhyd0JTa0RIbmFGTGZXOGJ4ZHlBa2pzaWJhaHZJVzNlcElLNWFMb09pRGtoTUloa0thQnZCT09TVmV0DQpPMDRYSmF1RzJyQWVZRjlKRlY4RnhleE9uY1hCU1pmQkZXSGplTjNiK2NyaUt1RDQxRndMeDFuSWtWSVpZZDZhDQpZWHh2Ynk3aktUTzQrOFh5KzZRdURGUEttVUlSYlNaWjA3bjhENlpzSnp3Y1U0TUlCQ3RoTTMyMG9JRm5EOVc0DQpxNmRrNTZKbWErcldzTGJRb3FoNEkxckoya0ozeVQxalFXQnVBd0xXejVIemRvbXoxUTlpZitTRGxReTlzamwrDQpPK3pLQjM0dmNxZmV0M3diQTQ0UDNST2htYW5CYTFUT29CRyt3a2hoOHh1c0h5SmQ1YVU2QWJ1RW9pNlhydExxDQpBUzMxRjlOVm5Fam5DeWtyQlpJajJCNVRsQzFtVDB5RU5SeUNrcUV2bUJXVmpNL3hmaVcydkJwbUVqLzdySS8zDQpwMGVRYWJieVZTSFhuZ3owSWxBY2gvY1Y4d3A1OHRYa1ZVcFd6bjZHVTBCMUtDeHVjN0Z5UGNkQUFUaE56WlAwDQpSRWh1SVJnakpTUitqNG9rSGdKaEtueGZ2SXhxbHJuS1lOeUdXRXZ2TDYxRDJuQmlSbENQR2wzOENNU2xUOGVQDQo4N2hVMmtzMkk5enR2NGw5WjlPYjYzOW5ZRkJMUTVVbGVzVWdRTkQ2ZCtmSHFrM21kQzZIem0ya0hIQmR1amdsDQpGdWo2NmVHcmZnSHdjTkN0UWlOa1lYY2doNlRtY0lNdkZnT2lFMVB5RTN2NngwNE43STcxY0ZnVU5rb2VvNGtlDQo0ampPZ0dKSkhSRG9mV3ZUR3ZUNEp0Q25vcUxQYWhRV3F0UitCTk1ZNXBoRkVWdHNmdU1ORDZmSlRrellFRHBRDQpCVk0zTm11a1BhdzZMSWpsTjFFbW9lU1gyQmxlcXZ2RElrOXJBdDNpZWtPbGlvWUtxdmsrN3hqUzJPOW90V1g2DQoxNW1IV1J4NjJFdDRSU0FydlJKZEdpVVA2VVRMcUdkODlJbDU3NHBvUVhCTUJEZmtUdmYrRVF3Z3BlYjhXRWhhDQordEZJMmFUTWozbWxnc2tFVVhTeHRPMFpCN2FPUmZDUWl5MkprZjM2cHVFZkh3T3kwbDVZblFzaFhhL3lKQ1FSDQpDSWM0SDhkblN1UWxrZ1JuU09ET25ZR3FwU3FmVS83K01jTTJuYTFqaHNWTFg2TVB6U3I2Yk9TQjNRd1RiR1RrDQpMZE84OWREM2RuTWVIbVZqYUtUZzV3bzZpN2sxRVJFMVVtMmdITWxydFc1OEFaTjRLUEFCcDA3QlhnVjRIN1A5DQpya0lCUDQyY2ZrUG9VTkpYZDBCQ0dFaU9nNC9OY1RqU2cxL3ZXdUF2bVdFTjI4c0FCZk84MWQ3dWNHWnR0MUpzDQp1eUhwVm11bW9TRC9pMXdvUjU4aXdTUGQ1TDNhNEF4K0JDZzd0MHlUUC9QSlJ0WDdodlNoM0Zhak5rRStleFNxDQpKWlBMcTVDWUFQTmFnQldZK1l6UldUSkN6OW5DK3B1T3B4WjA4eC9kelg0QUVjd3ZBRzhwZzArK0JvN0p3RGQ2DQo4dG0wSTVMVVhYbS8vVmYzQVFmMEdUZnBNNjFicnUrVHl2anZSaG1RSjhTNXF3b3phelp0ckpVcERRSkRLaFBZDQorZU1IZ3JsQkRUSHRYVkxYZlQwcUtoZnQxVU5YQ1kydi9VVXE0QzUvTmptMUtIZk1ueWRoSGcrdnpFZzltRTRXDQoybWRiV1ZTejUzWGRmekJzcEFZRTg4RUlULzhXMmJpZWJsbFdJdXhiMS9JYklwbmtWMHU1R2phME9CNWNWVm15DQo2NHpOT09rNXNnT0lsc0VncGd4QVU4bkhybm1nOTU4NVhpU2pUU01BZmI1aDJ6YlFVMHNFa09IdkFEbm44QXN4DQpFV00waXF1SzdscE1hUUtwRTU1NFVnQmNETWpiWm5oc3MxdFpmNXV6NlNYNFlFSTJ5NjRrSUhYaVRFTDZzcWorDQpvMVhXa3E5U0RaT3V2YnErVU9nQjZ5YVh3WnIrQjFmajZmR3Fvenl5K0hiVGRnMVkyYS9iVE9HNytyTS9kbCs5DQo3QlVWWnNDaUY1Q3MrVlJMTm1JcGZwSDgwVTRBR0hvVHlBVHN5YmlIOVpDWm44cXNGbVoyaE5wZVdHck0vYlFVDQo5M1dlMEc1bG11bjFxZDM0N1VobmNFdmZodHl0NDQ5aUh5dFdlYmV4ekRxRE1MZnVvNUJadFZmZS9YSkZocmlQDQoyekZMZTlnWnUvT2pNK2w2VGg2VUdKMDFqclVtcUtJMXZlYWkyeTRqcXpxUlpiU2cyRWluQkFwKzFoST0NCj1GZ01SDQotLS0tLUVORCBQR1AgTUVTU0FHRS0tLS0tDQo", + "size": 3050 + } + }, + "raw": { + "id": "15f7fd3ba3f37cf3", + "threadId": "15f7fd3ba3f37cf3", + "labelIds": ["Label_17", "IMPORTANT", "STARRED", "Label_3", "CATEGORY_PERSONAL", "Label_4", "INBOX"], + "snippet": "", + "sizeEstimate": 8587, + "historyId": "1405999", + "internalDate": "1509678101000" + } +} \ No newline at end of file diff --git a/test/source/mock/google/exported-messages/message-export-15f7ffbebc6ba296.json b/test/source/mock/google/exported-messages/message-export-15f7ffbebc6ba296.json new file mode 100644 index 00000000000..59dfe182cc6 --- /dev/null +++ b/test/source/mock/google/exported-messages/message-export-15f7ffbebc6ba296.json @@ -0,0 +1,98 @@ +{ + "acctEmail": "flowcrypt.compatibility@gmail.com", + "full": { + "id": "15f7ffbebc6ba296", + "threadId": "15f7ffbebc6ba296", + "labelIds": [ + "IMPORTANT", + "STARRED", + "Label_3", + "SENT", + "INBOX" + ], + "snippet": "-----BEGIN PGP MESSAGE----- Version: FlowCrypt 5.0.4 Gmail Encryption flowcrypt.com Comment: Seamlessly send, receive and search encrypted email wcFMA+ADv/5v4RgKAQ/+K2rrAqhjMe9FLCfklI9Y30Woktg0Q/", + "payload": { + "partId": "", + "mimeType": "multipart/alternative", + "filename": "", + "headers": [ + { + "name": "MIME-Version", + "value": "1.0" + }, + { + "name": "Date", + "value": "Thu, 2 Nov 2017 20:45:37 -0700" + }, + { + "name": "Subject", + "value": "missing checksum" + }, + { + "name": "From", + "value": "sender@domain.com" + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "Content-Type", + "value": "multipart/alternative; boundary=\"001a113e58a0117b3a055d0bf06a\"" + } + ], + "body": { + "size": 0 + }, + "parts": [ + { + "partId": "0", + "mimeType": "text/plain", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "text/plain; charset=\"UTF-8\"" + } + ], + "body": { + "size": 2905, + "data": "LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tDQpWZXJzaW9uOiBGbG93Q3J5cHQgNS4wLjQgR21haWwgRW5jcnlwdGlvbiBmbG93Y3J5cHQuY29tDQpDb21tZW50OiBTZWFtbGVzc2x5IHNlbmQsIHJlY2VpdmUgYW5kIHNlYXJjaCBlbmNyeXB0ZWQgZW1haWwNCg0Kd2NGTUErQUR2LzV2NFJnS0FRLytLMnJyQXFoak1lOUZMQ2ZrbEk5WTMwV29rdGcwUS94ZTcxRVZ3NldPDQp0VkQvVksreHY0Q0h6aStIb2p0RTBVMkYrdnFvUFNPMHE1VE45Z2lLUE1UaUsyNVBuQ3pmZDdRK3pYaUYNCmorNVJTSFRWSnhDNjJxTEhodEtzQVF0QzRhc3ViOGNRSUZYYlp6M05zNCs3akt0U1dQY1JxaEtUdXJXdg0KWFZIMFlBRkpEc0ZZbzI2cjJWOWMrSWUwdW9RUHg4Z3JhRUdwS085R3RvUWpYTUtLMzJvQXB1QlNTbG1TDQpRK254eXhNeDFWK2d4UDRxZ0dCQ3hxa0JGUllCL1ZlNnlnTkhMMUt4eENWVEV3OXBnbnhKc2NuODlJaW8NCmRPNnFaOUVnSVYwUFZRTjBZdzAzM01UZ0FoQ0h1bmxFL3FYdkR4aWI0dGRpaG9Oc0xOMHE1a2RPZWlNVw0KK250bTNrcGhqTXBRNlRNQ1VHdGRTN1Vtdm5hZForZGg1czc4NU04UzlvWTY0bVFkNlF1WUEyaXkxSVF2DQpxM3pwVzQvYmEyZ3FMMzZxQ0N3L09hcnVYcFE0TmVCcjNoTWFKUWpXZ2VTdU1zUW5OR1lVbjVObjErOVgNCnd0bGl0aE84ZUxpM00xZGcxOWRwRGt5OENhY1dmR2dIRDdTTnNaMnpxRnF5ZDFxdGRGY2l0NXluUVVIUw0KSWlKS2VVa25HdjFkUUFuUFBKMUZkWHl5cUMvVkRCWkc2Q05kbnhqb25tUURSaDFZbHFOd1NubXJSL1N5DQpYN24rbkdyYSsvMEVISlc2b2hhU2RlcDJqQXdKRGVscS9ESTFscWlOMTZaWEoyL1dINnBJdEE5dG1rTFUNCjYxUVV6NnF3UEFuZDB0Nml5L1lrT2kyL3MxK2R3QzBEd09jWm9VUEY4YlRCd1V3RFMxb3YvT1l0bFFFQg0KRC80NnJDUFJaclgzNGlwc2VUa1p4dHczWVBoYk5rTkhvOTVNemg5bHBlYWFaSXF0VWcyeWlGVW5od0xpDQp0WXd5QkNrWENiOTJsMUdYWHhHU212U0xEU0tmUWZJcFowclY1ajUwTVlLSXBqU2VKWnlILzNxUCtKWHYNClo0N0dzVHAwejUvb05hdTVYUXd1aExoVXRSb1pkMVdTOWFoU0oxYWtpS2VZSnJvTGJUZzEwZmpMMjV5cA0KaWFvVjE2U3FLQTFIL0pPdWo2bFQ1ejFudWV6MzVKamVTcFVjN2tzZG90NjBab3ZNZldDK09HUm5rWUtiDQo3S3hGZDd1YXhMNnVPQk9GeXZSeFllb2hLZDczYVZraUtwY1dkNG9ySTE4RmhsZnRGTkF3SWRzbWZ6TmMNCm16VEhaYVVsODlpWXhFS1I2YWU2QUt3czF3ekxxMG5vYXJzZjJlS0JWYlRTZm1LM1MzeEZxZHVLSU5uYw0KZTVZYjNGNWFkU2oxZFVqbTFCWjRhcXpzZ0t5QmIrSjhrZUc5RVNzbkZPeXhPSVVYRE0xbklvMUlPZ3pDDQpNOTI4SmI5R1ZhK3VoZFhScmI1Y0xqVGloVHVzSk4wSThvSnJ3S2t3SXBDSlZnUE1kRExrZXVick1CUTQNCmZicGw0Vjc2c09VMk54KzZuRzJGbkZCRkJGb2hPTCswblRLNS82TnM5YXRlTjdLOVZQKytRY29lcWZQaw0KSVVPMytsQ1pXK3RyVFN2dkZJZDN6aVVWc1BUZXVBUys3bnhTTWZXWi9LOUNpNlFWL1hueDNGL3FTbXVTDQpBVW00elBRMUVqWmYxTi81Syt2aGNDVE40TU14NDA2VmxxdGVka1hMMktQd1o2akRTL3d3OFJmY21QbkQNCnM5NGN0MFdDWlp0TmxuUXErNWgweWJ3VEpOTEMyUUZ5cmhoUHF6dFZZOTVuOUxhMk13NVdJVENXemcvZA0KSUJVY2VXL093SFl0ZVB5YVNRa0NuZWdEdy8ybU4yL0dDOGQwT2x3VUxjVFlHNnVWZW5HdjJVT1ViQ3IzDQpQZnkvRWIvVnFVRVpLMDBQZHZWUVY3RldZQXNodVRGUFRxaWRwaDA0Q2dRdkJwaTNTREVFbzhTa0VJRlMNCi9pRWVSUWFXakZFWEtVSTNGd0tYUEpRV3ZGcGJyWEJPQWpueFhYYkFGWU9MeGR5ZG1xMUdWbDlNbTNHVQ0KQ2xjOWc2dDl2YVlEQlB4MmdONTYyL0NNL25UOFZxNDVWSGU3OVhrcnJjSER3TG43eWVISlNjTkZzaWIrDQpWdndUUG9VZnRsaEMvYWkyMUQ0MDNUc0pwbTdabVBjRGphZ29JY1hyUy9sTjAzejc5UkJtU0tGdFlpWFcNCjRvYmtLU0dvdzYxdk1CaDIvWExWWUtKS3BZS20vR25WbEp4QTB6UVZsNTU4eDhJL25BTWF4U3p3eCtaWQ0Kd2FWVS9zNVBMWjdHaGczTU9ndWlSVGxmbEtVUXlMMEE3TlI0Nk9qRmdVbkhBWlJ4cjRLTzNHb3hWUHk0DQpYTGVTNCtXbDY4czdRbFY2V0YxSUtDSFdFVU1FZVJSZWEyL092dmxTL29MczJNTk5XRGVtbEo0U2lYSGYNCnhJTlUzOFR4bzg0QTAwTkFMYktwcHNTeXk5R3dqLy9yTy9GY2VydXBrZmV1T205bkhGd0lRZWVDNWJXRA0KbW1SbEM5MHIyalk4Z00vdjNKank5aDhQYlhXeGg5TVVwYzcva0FjVHdkR2xNeGlWakUyOXAwNjVxVFJyDQpPaTZzSjdwV3VZVGZXbGRacVRWbWFCamx2MHp1WFE4RW84by9VU3ZvVHMrb2loWUlNY3FSZXFkZXFyL04NCmUrc0R0WUtSZy9MS3AvSko1bkFRelZNUDY3RHhrZ3dMTnh4MGlqQkx5c2FRbXZSbHNpWVdheXhaQjFYZA0KQnhBMmJqWlJ2c213dytoZ1NLTmxjc2l1YkpHQnFmcXZnbWxlYlp1SkhIU0MxTDZtZE1ZZ2NpaEttWUFqDQpwK0hGTHlxZ3llUlZNZGpSSGNyRWR4TlBHNGZKbWxrMWJZaVZRUTRYQWQ3MncrQUhTL3NlWjVIemJBSzANCm9tdUhZVUQ1UFRFcVoxSzlKT2JTc2gzWE1Va0pLK3ozQm5yT3huVE9PeUcycis0Rnhpekg2cmZ6L1BnZw0Kc1B4cXhFOUVMVWxnUWU4cGxjUEZnZTZhTjl0VW9TZSt2TXREYUVBcUt3OUp3b2ZCRjdqbHhUcU1NdlFDDQpnV2JuOXgzVzVvNFZybnBqWUd0UGw4c2gxUVJFdTBBKzBQVUpBS0w0QTNHU01ZUm91R2V3TFNNTkpsT2cNCi8wcFBGNnFCK0ZpNEdKN2p1NUMwN3Rmcjl6OVVxUmowOWtEWEp1b0pkOTVOZFNpQ3o2bmR1Z242Z3M4Qg0KUWYvWFB4WlZlZmVNTGlCNnA4cEcwaVovamNKanlZSkx0VGc2a0ErMS9mZm1KUGZILzc2WkE5ZGdFSkxqDQovVzJ1MExwNE5ZOGN3cWNYdUdLZ2w3MlRWSjM0SWF3bDM1WTB5cjQ3ay83WTF2RVE1UTNiVDdIUDVBPT0NCi0tLS0tRU5EIFBHUCBNRVNTQUdFLS0tLS0NCg==" + } + }, + { + "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": 11313, + "data": "<div dir="ltr"><span style="font-size:12.8px">-----BEGIN PGP MESSAGE-----</span><br style="font-size:12.8px"><span style="font-size:12.8px">Version: FlowCrypt 5.0.4 Gmail Encryption </span><a href="http://flowcrypt.com/" rel="noreferrer" target="_blank" style="font-size:12.8px">flowcrypt.com</a><br style="font-size:12.8px"><span style="font-size:12.8px">Comment: Seamlessly send, receive and search encrypted email</span><br style="font-size:12.8px"><br style="font-size:12.8px"><span style="font-size:12.8px">wcFMA+ADv/5v4RgKAQ/+</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">K2rrAqhjMe9FLCfklI9Y30Woktg0Q/</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">xe71EVw6WO</span><br style="font-size:12.8px"><span style="font-size:12.8px">tVD/VK+xv4CHzi+HojtE0U2F+</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">vqoPSO0q5TN9giKPMTiK25PnCzfd7Q</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">+zXiF</span><br style="font-size:12.8px"><span style="font-size:12.8px">j+</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">5RSHTVJxC62qLHhtKsAQtC4asub8cQ</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">IFXbZz3Ns4+7jKtSWPcRqhKTurWv</span><br style="font-size:12.8px"><span style="font-size:12.8px">XVH0YAFJDsFYo26r2V9c+</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">Ie0uoQPx8graEGpKO9GtoQjXMKK32o</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">ApuBSSlmS</span><br style="font-size:12.8px"><span style="font-size:12.8px">Q+nxyxMx1V+gxP4qgGBCxqkBFRYB/</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">Ve6ygNHL1KxxCVTEw9pgnxJscn89Ii</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">o</span><br style="font-size:12.8px"><span style="font-size:12.8px">dO6qZ9EgIV0PVQN0Yw033MTgAhCHun</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">lE/qXvDxib4tdihoNsLN0q5kdOeiMW</span><br style="font-size:12.8px"><span style="font-size:12.8px">+ntm3kphjMpQ6TMCUGtdS7UmvnadZ+</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">dh5s785M8S9oY64mQd6QuYA2iy1IQv</span><br style="font-size:12.8px"><span style="font-size:12.8px">q3zpW4/ba2gqL36qCCw/</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">OaruXpQ4NeBr3hMaJQjWgeSuMsQnNG</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">YUn5Nn1+9X</span><br style="font-size:12.8px"><span style="font-size:12.8px">wtlithO8eLi3M1dg19dpDky8CacWfG</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">gHD7SNsZ2zqFqyd1qtdFcit5ynQUHS</span><br style="font-size:12.8px"><span style="font-size:12.8px">IiJKeUknGv1dQAnPPJ1FdXyyqC/</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">VDBZG6CNdnxjonmQDRh1YlqNwSnmrR</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">/Sy</span><br style="font-size:12.8px"><span style="font-size:12.8px">X7n+nGra+/</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">0EHJW6ohaSdep2jAwJDelq/</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">DI1lqiN16ZXJ2/WH6pItA9tmkLU</span><br style="font-size:12.8px"><span style="font-size:12.8px">61QUz6qwPAnd0t6iy/YkOi2/s1+</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">dwC0DwOcZoUPF8bTBwUwDS1ov/</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">OYtlQEB</span><br style="font-size:12.8px"><span style="font-size:12.8px">D/</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">46rCPRZrX34ipseTkZxtw3YPhbNkNH</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">o95Mzh9lpeaaZIqtUg2yiFUnhwLi</span><br style="font-size:12.8px"><span style="font-size:12.8px">tYwyBCkXCb92l1GXXxGSmvSLDSKfQf</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">IpZ0rV5j50MYKIpjSeJZyH/3qP+JXv</span><br style="font-size:12.8px"><span style="font-size:12.8px">Z47GsTp0z5/</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">oNau5XQwuhLhUtRoZd1WS9ahSJ1aki</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">KeYJroLbTg10fjL25yp</span><br style="font-size:12.8px"><span style="font-size:12.8px">iaoV16SqKA1H/</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">JOuj6lT5z1nuez35JjeSpUc7ksdot6</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">0ZovMfWC+OGRnkYKb</span><br style="font-size:12.8px"><span style="font-size:12.8px">7KxFd7uaxL6uOBOFyvRxYeohKd73aV</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">kiKpcWd4orI18FhlftFNAwIdsmfzNc</span><br style="font-size:12.8px"><span style="font-size:12.8px">mzTHZaUl89iYxEKR6ae6AKws1wzLq0</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">noarsf2eKBVbTSfmK3S3xFqduKINnc</span><br style="font-size:12.8px"><span style="font-size:12.8px">e5Yb3F5adSj1dUjm1BZ4aqzsgKyBb+</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">J8keG9ESsnFOyxOIUXDM1nIo1IOgzC</span><br style="font-size:12.8px"><span style="font-size:12.8px">M928Jb9GVa+</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">uhdXRrb5cLjTihTusJN0I8oJrwKkwI</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">pCJVgPMdDLkeubrMBQ4</span><br style="font-size:12.8px"><span style="font-size:12.8px">fbpl4V76sOU2Nx+</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">6nG2FnFBFBFohOL+0nTK5/</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">6Ns9ateN7K9VP++QcoeqfPk</span><br style="font-size:12.8px"><span style="font-size:12.8px">IUO3+lCZW+</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">trTSvvFId3ziUVsPTeuAS+</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">7nxSMfWZ/K9Ci6QV/Xnx3F/qSmuS</span><br style="font-size:12.8px"><span style="font-size:12.8px">AUm4zPQ1EjZf1N/5K+</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">vhcCTN4MMx406VlqtedkXL2KPwZ6jD</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">S/ww8RfcmPnD</span><br style="font-size:12.8px"><span style="font-size:12.8px">s94ct0WCZZtNlnQq+</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">5h0ybwTJNLC2QFyrhhPqztVY95n9La</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">2Mw5WITCWzg/d</span><br style="font-size:12.8px"><span style="font-size:12.8px">IBUceW/OwHYtePyaSQkCnegDw/</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">2mN2/</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">GC8d0OlwULcTYG6uVenGv2UOUbCr3</span><br style="font-size:12.8px"><span style="font-size:12.8px">Pfy/Eb/</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">VqUEZK00PdvVQV7FWYAshuTFPTqidp</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">h04CgQvBpi3SDEEo8SkEIFS</span><br style="font-size:12.8px"><span style="font-size:12.8px">/</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">iEeRQaWjFEXKUI3FwKXPJQWvFpbrXB</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">OAjnxXXbAFYOLxdydmq1GVl9Mm3GU</span><br style="font-size:12.8px"><span style="font-size:12.8px">Clc9g6t9vaYDBPx2gN562/CM/</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">nT8Vq45VHe79XkrrcHDwLn7yeHJScN</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">Fsib+</span><br style="font-size:12.8px"><span style="font-size:12.8px">VvwTPoUftlhC/</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">ai21D403TsJpm7ZmPcDjagoIcXrS/</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">lN03z79RBmSKFtYiXW</span><br style="font-size:12.8px"><span style="font-size:12.8px">4obkKSGow61vMBh2/XLVYKJKpYKm/</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">GnVlJxA0zQVl558x8I/nAMaxSzwx+</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">ZY</span><br style="font-size:12.8px"><span style="font-size:12.8px">waVU/</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">s5PLZ7Ghg3MOguiRTlflKUQyL0A7NR</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">46OjFgUnHAZRxr4KO3GoxVPy4</span><br style="font-size:12.8px"><span style="font-size:12.8px">XLeS4+</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">Wl68s7QlV6WF1IKCHWEUMEeRRea2/</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">OvvlS/oLs2MNNWDemlJ4SiXHf</span><br style="font-size:12.8px"><span style="font-size:12.8px">xINU38Txo84A00NALbKppsSyy9Gwj/</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">/rO/FcerupkfeuOm9nHFwIQeeC5bWD</span><br style="font-size:12.8px"><span style="font-size:12.8px">mmRlC90r2jY8gM/</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">v3Jjy9h8PbXWxh9MUpc7/</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">kAcTwdGlMxiVjE29p065qTRr</span><br style="font-size:12.8px"><span style="font-size:12.8px">Oi6sJ7pWuYTfWldZqTVmaBjlv0zuXQ</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">8Eo8o/USvoTs+oihYIMcqReqdeqr/N</span><br style="font-size:12.8px"><span style="font-size:12.8px">e+sDtYKRg/LKp/</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">JJ5nAQzVMP67DxkgwLNxx0ijBLysaQ</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">mvRlsiYWayxZB1Xd</span><br style="font-size:12.8px"><span style="font-size:12.8px">BxA2bjZRvsmww+</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">hgSKNlcsiubJGBqfqvgmlebZuJHHSC</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">1L6mdMYgcihKmYAj</span><br style="font-size:12.8px"><span style="font-size:12.8px">p+</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">HFLyqgyeRVMdjRHcrEdxNPG4fJmlk1</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">bYiVQQ4XAd72w+AHS/seZ5HzbAK0</span><br style="font-size:12.8px"><span style="font-size:12.8px">omuHYUD5PTEqZ1K9JObSsh3XMUkJK+</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">z3BnrOxnTOOyG2r+4FxizH6rfz/Pgg</span><br style="font-size:12.8px"><span style="font-size:12.8px">sPxqxE9ELUlgQe8plcPFge6aN9tUoS</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">e+vMtDaEAqKw9JwofBF7jlxTqMMvQC</span><br style="font-size:12.8px"><span style="font-size:12.8px">gWbn9x3W5o4VrnpjYGtPl8sh1QREu0</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">A+0PUJAKL4A3GSMYRouGewLSMNJlOg</span><br style="font-size:12.8px"><span style="font-size:12.8px">/0pPF6qB+</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">Fi4GJ7ju5C07tfr9z9UqRj09kDXJuo</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">Jd95NdSiCz6ndugn6gs8B</span><br style="font-size:12.8px"><span style="font-size:12.8px">Qf/XPxZVefeMLiB6p8pG0iZ/</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">jcJjyYJLtTg6kA+1/ffmJPfH/</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">76ZA9dgEJLj</span><br style="font-size:12.8px"><span style="font-size:12.8px">/</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">W2u0Lp4NY8cwqcXuGKgl72TVJ34Iaw</span><wbr style="font-size:12.8px"><span style="font-size:12.8px">l35Y0yr47k/7Y1vEQ5Q3bT7HP5A==</span><br style="font-size:12.8px"><span style="font-size:12.8px">-----END PGP MESSAGE-----</span><br></div>
" + } + } + ] + }, + "sizeEstimate": 15939, + "historyId": "1406074", + "internalDate": "1509680737000" + }, + "attachments": {}, + "raw": { + "id": "15f7ffbebc6ba296", + "threadId": "15f7ffbebc6ba296", + "labelIds": ["IMPORTANT", "STARRED", "Label_3", "SENT", "INBOX"], + "snippet": "-----BEGIN PGP MESSAGE----- Version: FlowCrypt 5.0.4 Gmail Encryption flowcrypt.com Comment: Seamlessly send, receive and search encrypted email wcFMA+ADv/5v4RgKAQ/+K2rrAqhjMe9FLCfklI9Y30Woktg0Q/", + "sizeEstimate": 15939, + "historyId": "1406074", + "internalDate": "1509680737000" + } +} \ No newline at end of file diff --git a/test/source/mock/google/exported-messages/message-export-16180866d0ae26c3.json b/test/source/mock/google/exported-messages/message-export-16180866d0ae26c3.json new file mode 100644 index 00000000000..42071721848 --- /dev/null +++ b/test/source/mock/google/exported-messages/message-export-16180866d0ae26c3.json @@ -0,0 +1,131 @@ +{ + "acctEmail": "flowcrypt.compatibility@gmail.com", + "full": { + "id": "16180866d0ae26c3", + "threadId": "16180866d0ae26c3", + "labelIds": [ + "STARRED", + "Label_3", + "CATEGORY_PERSONAL", + "Label_12", + "Label_13" + ], + "snippet": "", + "payload": { + "partId": "", + "mimeType": "multipart/encrypted", + "filename": "", + "headers": [ + { + "name": "X-Facebook", + "value": "from 2401:db00:3020:711e:face:0:73:0 ([MTI3LjAuMC4x]) by async.twshared3533.11.lla2.facebook.com with HTTPS (ZuckMail);" + }, + { + "name": "Date", + "value": "Sat, 10 Feb 2018 08:22:25 -0800" + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "Subject", + "value": "Зашифрованное уведомление от Facebook [AROPDhu-27jIg2Gx]" + }, + { + "name": "X-Priority", + "value": "3" + }, + { + "name": "X-Mailer", + "value": "ZuckMail [version 1.00]" + }, + { + "name": "From", + "value": "sender@domain.com" + }, + { + "name": "MIME-Version", + "value": "1.0" + }, + { + "name": "Content-Type", + "value": "multipart/encrypted; boundary=\"b1_2e2bc7e41369e9360a472f5d8c0b2b4c\"; protocol=\"application/pgp-encrypted\";" + } + ], + "body": { + "size": 0 + }, + "parts": [ + { + "partId": "0", + "mimeType": "application/pgp-encrypted", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "application/pgp-encrypted; charset=\"UTF-8\"" + }, + { + "name": "Content-Transfer-Encoding", + "value": "7bit" + } + ], + "body": { + "attachmentId": "ANGjdJ_MjDMtBZhTbeoOQN24sw9IV72HLqeem7NZ2zQsDdF99nYGvDjVrPpoOfUuUYTGQTgOyxYlxtHCflj-twndVugY6sZwunVyNAMpX6KbZD9d34PryucAtqdDiMMiEVOwZumY-VZlz2KM9fFwIgTVAVMbomlo2u4dzkEdzHh667JFpcjan1qk1bfL4PlpfqIyYMNT_gQx4heGZF-yrdIkH5R3yddX4-NiXOilBO1SFCf3BBRJpEDsH3R52rBJHVOF_JidvuwLRWLj2EertiMvv9BGW23j0cMR3eMpUqUprTTKSkbSmhLjEnqurZuG13oy4gyHqIm02kAO7uDyDR1F0dy8uQEzjNfYAkBHgxrIDV_PhDz5qL47KrQjjAI", + "size": 69 + } + }, + { + "partId": "1", + "mimeType": "application/octet-stream", + "filename": "encrypted.asc", + "headers": [ + { + "name": "Content-Type", + "value": "application/octet-stream; name=\"encrypted.asc\"" + }, + { + "name": "Content-Transfer-Encoding", + "value": "7bit" + }, + { + "name": "Content-ID", + "value": "<0>" + }, + { + "name": "Content-Disposition", + "value": "inline; filename=\"encrypted.asc\"" + } + ], + "body": { + "attachmentId": "ANGjdJ-PAjID8jtrg440tldl7XeGD8GrVkXIOkoqqh9KNxFA7vny6s1K2EeQauEKGXFoCRlcaGZIv-wDlYQ-JpMpOo-9TGMbHJd_iiU0i0MpsulGgn7RtjEDwI7Z1_e-OVg-bzk8s7kX_9jh1sfYEfPow1O-Af0L5g9jzy2UZJlTnFoqUzKjg7kiZoCJS_UiHv3ZbMO0KMmoS9jHS6v_kdxHeY78XPTTRdjb_oB1HP0HaPJWuT_1waMEMXve6sxofdU2SIT9PVSS8qZwzPMwU_AB4dzMEogmJcDnNCd8u2le37R7TVe7vN2cVfqMud8pV0hUTOa2JbVF7Zy4_y6xMqjyy62WpShe5SpiAFyKzOM7J69-CsRlmbgZzRKj-98", + "size": 9213 + } + } + ] + }, + "sizeEstimate": 13957, + "historyId": "1406156", + "internalDate": "1518279745000" + }, + "attachments": { + "ANGjdJ_MjDMtBZhTbeoOQN24sw9IV72HLqeem7NZ2zQsDdF99nYGvDjVrPpoOfUuUYTGQTgOyxYlxtHCflj-twndVugY6sZwunVyNAMpX6KbZD9d34PryucAtqdDiMMiEVOwZumY-VZlz2KM9fFwIgTVAVMbomlo2u4dzkEdzHh667JFpcjan1qk1bfL4PlpfqIyYMNT_gQx4heGZF-yrdIkH5R3yddX4-NiXOilBO1SFCf3BBRJpEDsH3R52rBJHVOF_JidvuwLRWLj2EertiMvv9BGW23j0cMR3eMpUqUprTTKSkbSmhLjEnqurZuG13oy4gyHqIm02kAO7uDyDR1F0dy8uQEzjNfYAkBHgxrIDV_PhDz5qL47KrQjjAI": { + "data": "Q29udGVudC1EZXNjcmlwdGlvbjogUEdQL01JTUUgVmVyc2lvbnMgSWRlbnRpZmljYXRpb24NCg0KVmVyc2lvbjogMQ0K", + "size": 69 + }, + "ANGjdJ-PAjID8jtrg440tldl7XeGD8GrVkXIOkoqqh9KNxFA7vny6s1K2EeQauEKGXFoCRlcaGZIv-wDlYQ-JpMpOo-9TGMbHJd_iiU0i0MpsulGgn7RtjEDwI7Z1_e-OVg-bzk8s7kX_9jh1sfYEfPow1O-Af0L5g9jzy2UZJlTnFoqUzKjg7kiZoCJS_UiHv3ZbMO0KMmoS9jHS6v_kdxHeY78XPTTRdjb_oB1HP0HaPJWuT_1waMEMXve6sxofdU2SIT9PVSS8qZwzPMwU_AB4dzMEogmJcDnNCd8u2le37R7TVe7vN2cVfqMud8pV0hUTOa2JbVF7Zy4_y6xMqjyy62WpShe5SpiAFyKzOM7J69-CsRlmbgZzRKj-98": { + "data": "-----BEGIN PGP MESSAGE-----

hQIMA0taL/zmLZUBAQ/9FG/DQ01YvjE9jIzCRSPJ392q28yexjq5PIyFnmUb/SOk
boeh8Xs1zMmsgcT2rtMN2Fw79MQdqhhsSS8GSU47MJ7MdMLaWBdrF8oR1ChpsCMp
wMAqdy31b/RE95Pzp78VJnmZp5qDqqCNbnLVD+Zzev4ElGan58YhpfnMFsdz0tk+
gTr6CQVDKOprvbskaFanG+jpLWo/9LzPu1eWrX/Q5SwUVcaVKSdbLm5DVRSU1qnt
/ItTiRueMaOPwZgqXJS3GeqT0C/CVxCDd0ZKwfP/BuhVTKv77l+qnxuNj83I/ak1
0CJw1J5jTe/NEwU8ZdcJO8hDWo900zU90oqUoYUsH1yf7SKL8qSJ8/GMW9GSz3cX
FhsbE1FiJZ0CG6sUAYtMFWX2rhMwuz8vPLXlj3q6iYQ6s/CxqJvuHSbIK26XYMWX
nsCkuJjKm3cKe3KONeyxOyizlQaA+eQB21U33Bap1FSFdJ0APK3HVJ4B6ZICsLiF
VX0iml03ezvhC4qRv/0Xb2AdYZm/1HSgVUuCvX6bnoLDpRYq+aiy+HeO79/u2Z0T
9Dv0YUAopO5it8cEAWBz1eQvKmkNMQC1W+3dZ04Z8bZZ95UwQpcVZLLlvxc8ubwK
/h55B8g2ExlAFKtkuEfTtsDzAE/PUkgzZ/mcyT6clvPrGG4NZGpHxEvl/shWRjzS
7AHgElrFBgyBD/3EhQGy3Lb4pf0helGHuMFjEWHb0NocxyKhLLi63rLVZrDPSPWb
M4gtE44bMp0HZ1kF150X8F/fXX243M7EVf88zv7uFJaKThbK6tqhl+yuegUFiDUO
DXOwDkj3aPKM5tOpkkR2ECOOsNZiHQXkfvED4yNhx4sRGAEiw7iXuIJp8mRYQKxW
frmbl4yxUSgWii0s8VQOagwRjcYq9PL1Qn2gujfeNDk6SSfDHh2vIEr6by/9y6MG
eIvbI9VVke/UWtZE75yn4XlVROou/UmfERyR6+zsQBoMp+Py3bG/Z1pS42jk+6YM
TVoGz5SEpch1RH41Kokgn9gRvlbUN64jwsAHbWi3CDEtik81TXNhE9GbPidbB49N
ihy172mP0U0MoeAdF5T9Y8GEdDu2+TBJYzzpjhGszi6pHjyh/qFE2stuNCV44YDc
JRnWW35gzD1PU+gVOWcx/PEAMLmY1VN3RMuuFW951BlNtjg6B1E7GBhMHm+n9l8R
w4++zjnV8t6ZqIo6OjJgiQkEh85pOq4yq+qGrQAJYOwpnJ4hZ65IB3rsqUrlCeeh
XU9n+8DCgtfmxuodQWqcRDjwADXc8bWFYifHvTehBly1pIrFLvNq+BfrE85vbJmv
Dn/GIa+cu9celM8/uu9pKN5Um8sK//HRWo4vFzTXRkBUDuK5p0xWMM/YVtSV9PN4
f51wBMyaY20YOXLYdyAy31/NGh61vSRd+/zjuzresZ2ghvlecZdQy9fnSqUSvbIt
JLYa1tK7H7UjmzauZccKcQqKgaXXAQJt+XYZYYlwGcCBzHzMCD65fMwcHit+H5Gs
jMKjBh/itsQP3FV50zO/kFq6k4fy9j7ib+REQqFyeb0JZp3tnqTxpUPPV21wa/ws
Z87kxWPN4ckwVClciZMDXtESxRXm2xmlwvQY76Kjw5vvvGgizxEBvMafD59bB/dO
Fwa8tlPqlwCnI3SSB5WHEdV2Rfu5O9SU1ao5X+zFpZLSeMMgnysY5VBJzFa6EdEP
pu16Hl94RX3aONOD4Mq1DGZQg0ZZ5qFZ9ZXCgf/J6mqFo+aHCnT4ETNRotN4bIvO
dQROF7yiZxKl+ue74pfAfgDLPyYBSmOB00IA11dPsml/eI+VU4MpDdKNWHI6a4lw
rqoeoxaKaSg8lx58SeLW5VuRiEZ2PlNnf1aFzfew5lb/MBmTrNQLikTkKgRNUzUe
paobFtSnXDabV0Yqg4A2AYoCKErk/0R0lyrUitaUgAl6s3e76QRzf4Ao7r5HTXF3
snwFAD4O6ijuQQz0FnszF3VjHwO++fxZRoUAVhovPMN8sUxAXbPUq4Lui9vHbGHO
xN0CAY+Aj3qgtrZE5nUt8rTRwiW/kVCyDDLY3kbPdZwdOvyeWkSNOijRcdy99ZZG
3OXoT8ja60yMmtRvbrSvXQ2KoyM1+eLaFOqap6elGGmkZbKvuDR3b4KZElZCvB62
ryd4v+tsEcCMsTTpo7ekZqtlcs98LA+jCFjVUWGxBz5SavUmcVWCy6QzjG0RaXMx
ImDGQWiom/XD8hACE+41HYwGrTvKsW33yM/JEsDb2dRN+rbCQ6RGTjX7tiRV8BGk
0MIY3EejIgQkZMZRAzh4ZbGbZhBUZgfUUzsTmNu+/fppZPQtwRsXvunF+qFCvXWT
g5ZVUcZeBqd6awLJe2nr4i1sYKfHLztKjSXnxbN1Gofnvh4NbPRN+h3Q1vB/hCgg
fjPjdojEiHk1QcUG4Vw3N5IUSWdeYnC+CGsO/RX9f0u00TnVpgkkQTfj2FPOE0fr
Yd90TYhegXykYtzjigAkSMgnasd7zg23MLH0kZQxQCdj7+Eq5JF0zB/gbGbKPdId
xxWhSPoAU3y0i/lyN0541uqlHxX4i+cXdlsTSrAg1QBAquCf3we7b7IMaku72aBp
XInSLj1bbnWeRmeuKWh/IDnk0xvPN7eTIzi+0wYkYfuwKLd5QSn6CGLgk9VRHzsC
Y2PwwSX58Yo0JK+YE9DCvMVMNUeJAxpdIkq+V0jwjdER/zpv/LUy6MKh4X62dKMh
yU9MpvqeMYkfFjbVnFlV9bJnWutYKbtNpzRegY5wIGEOXtpRxuFuhQoGkGH423rD
cWDEzNuQ3CYqxY+yVATpElBiEYbfx3KKZ1+G8aLajv0tI6NnN9qkmCIbjv1e+FlS
uA5WutrCrIgHrMhREC1R6woUh/tlcwGpn9gumNZvmvqUY1GY3jQ5UgY5VFgwBycv
vM4kbEbk241xt1/8/9FZBwvjfW9Lyt0CSw+9dqYuRAEbXSaAvvqPL8mUUjG2/YuD
/eStuJYwOn1e9gNYX/iUYJD8SqPx89DgGSOcSPOefcURbqLF2yQGl5si2PonVNW0
jCsLc6iREfLO/28qn9Wd1ORBI6VdcRKHmAxRf517IZDAzO4aay45T04hU5xFL2eA
UZ9TC8kx56rdNFvrL670XfOa1er7MaprUBhWfdtgbIQ+YTYjzVVi5954ivMEV7J+
yBLgCKUUJYI++vWJ+i7X07Kzt0ZHXebLRCCljiM124dkhncGVUM6QXb1qK4hQG5Q
FhxrOjGUrNq7zExBPYEihmd4zf3e3kQXPb1DmldTrwRz+usBSB4kSi+KjW/iKrte
0+GXgDaJUIL28XLPTYZHPwE3mB7tw4YImSxeSfC9FnRw66JF+2Eoae/O52G7BoEl
qPVRTvVu2DgXxb/DljorSrWa00iJSZKeasXDrHSCKcUexkZ21D8Fmr+Nib3KhQRY
a/zgNO9lg+g4JWu2KbVyjECcjToS1sS1TOXWFpGUFMJ5WXMUgZGD1Kk7m09fZF/2
Rbgm6mDWFzG4gNbz+qpRmZUCfKwvEDEWtCw7lc0AtAZitjZW1OfATo7oCuqSYQyb
4A+PibAme7a3kJ3pn5puGQ11hYY33iYv0Jk5/MEWVztwkwYc4rweS71YxatIrJiT
6SaD2jSzZwAvyqeEWZbYOByIZaRmm6rTmGpE0yGB+7zWJ0ZpbCvqQcyTrCZBMlp9
kselQeRaxDpkcmlP60Hb0b3emrbDtRliVrTpw3WJbafI4kMSv9kuozBqAavPkhjm
KH/R6bvuuYzG0fhr9O1CT7wdn85hILepQoIAiLkkjpx9t0x2GS4els2LQm3fRU9h
aXP4YKsIoe/JjSmdyvs5orSHbNEIsS8MpLBRTKzpl9y7SOFaGp82Vz8/Lh6yrey0
XV8Oz1tQZguU23/NkEkgSFjWeJwEB6LCKzMnBOXmFPi+Fqx5S7JphhAJdu6sCTXK
ZjYkkNP/UGsbWIFCkqzId9CRPzR2Q5Db16bkjJmxNzSnYXUP/RzI/ILbvFTtA5uU
S9/YPTcTXyVQWuU0uPUl504M6Vz7uMtj6XFFbU9yAOlBrimZpJPYHygFvkS7MoNu
uV5pwAADkNFxzoW9GxBeZW9fwouL3KrHw52Nl1AkFWmoIshdXqTOpNgi7Xxj8XqA
MF56BJYMjxRbQtnGHZoj8jrIwUTDTIYvms7xxJHm5YOv+tvAlcBMcaRX/pKYtoz8
QYrOZATUQs6OjXuWWzydltx4Z334iZqtJPwlJ4tp9AkLVPjhHwB64pAdrVLOwlDz
oYXccYJsqWPZhp2ygkQ06IMPT/SVKs0poKdchaaHTo8BRDvzC1PoudjoB4SusL5F
WG0mZrv3N6yPk7V/CajURwrf2i14SV58swwiS05xZDhUX4IOVBFDQEF4EEHbjWvR
biYyr48NZCqQKIUUX7Ol5aO4ogv7ZFW/LsviCh7iYENRHcF0RKRXCLnpFNdULXFA
/AIm3TOX0vp+tjpM/19+H7wmqj1DLTGWk8xX/rBsgTbuqhPaT4otQxcwkA/zppMh
J9iUYOdWrnHs4DLX7cHoKjwcHkemF7GT6F0ufyQI4MimLp9YJioy0Vs7seZiGBnA
yBSFIFn827tgGN/bEqNT5JAUcRn3VClhmgA25mPeHtJ0Qm+rF2rOddfXJ9yLGJcd
cLQK6yPf3T1wqd1rWdgJ/LCj+NrWWfOgp/L9qDrzdTJoTOQZtSw5KVnQ683Y/Jr9
wX3j5B2mgMwT5EfJb+QzDiD/02Pnitzn42v9FMZct9260HIGWsnfVu2dhXPwbE69
jh8ccj6E1Pz+fRcheJCnyMD7YDNO5palOGNQgjtMaFIoMORiX4UYyWsgQVkB7gDw
/H8TdhsYCi06Z8LCj1XF4qkiTVseikyih3Ro9sypUUeln9QhNrEglpj12xrUcNZ3
rap4C4inie/MrxZ3IaEKP930QkaGWmP8IdQ3gykz8+WVBXwu1OyJdZERjbsoZVTy
iO1eE/o2jSpol9KcBD0s9DobHWcFlDhzExdk+Vb9pS/6a37lrQvj59bBQ2aVt41b
bTngwnCrMeOWYChecnu078YEeyRVlOItsB/Tl5qbq4HyLPYfMj53nJtGh6IbDN+T
BgbKJbmrjpbiXUEWryNJYVNu/E1CS9X0AXb3or+BBzVqdwioO07m3GUYyMV2hlnm
kk0o6Qlxb1VR7CB3PuJOgeUK/n3cqzZcG7q3EdYobjfkM1bGiuXpuIzkOPsD8Gbn
DYKjvLts0yO3CF4EdYEKBGnZ7Mo4IL4G0xZjAKqg6jVb9DhiWyVp5R3dcoOBZik2
qcQ3iY5cE40SddK0jQYgWRhPFyi9V8n0fElhef0OJL2jLKYRHbxpLM5lgKpnmH9Y
2ti/v8l2n5z7wSVBIpHbpYq5LrRdlAwyvSITglf6IHFXiagyJTcL3mx7eJSfscQT
dH9RYoAO650vDfhXZd/rVgbZsUjr8vHf5SHIS16yZE2mXxIPSBpKJZpTMXJwc9h5
YAxwukFXP0k2SUZN/goKg+Q7rtL5LbgmOAcPInVxQILv5HqSsgZFwunQ3v8TWtzx
RYmdHDGQSyfpAmOEJ5Kpnzqxon59tUdudNSgut9FL8SCy9nC0sB8SxPKO/qtLM5i
4n/PqMutwPsqTW4ugiFuBKvwDQbLhUtlr6BuVP61dhv970TBNZfrfO5mptxdxjey
Prj+P6uKi6RODHHdE8jVvZSrxGRowBYyPN8GpY7pfchKdU27AfGP6p/95oboSnQN
2MTOmCYO+W2aaqVO7xaBHB6slY8OZ0a+b9fk7w5m5zE28RfJIp/FNRZXzUmvR5Ek
Xln/x141yHEl9go1RnWX+KuRjptFPN293SXQZCubQqJ7MMAWixTGcyKb8L6V2KoZ
WMqzP54Ud/+t3ddHC7BxSPkVAgDY/rWqu5kBJOTbuHFCrTTFPEQBEs4WZRfiR1FH
C+KZH3GWBoi6tVGVCVjapGQR9pwzTUpWQ9txN7XC3a9A/GUxCgCPDSDKPjjuoBwY
reJvP27UiyWnHR2QjcCXAC4lbAC41Gc7Q6ejTfd0HZ803V9bDTrcvsb933rM45+/
YM5mbp2VkugZbSQ9fTNXP/iSsZRjhk96I38n/w2ZH0np6m5YcfCdj+d15tYQKe9M
yjqTsaxEvncLT9M9RcRgzgnq8gmetEf4ntUC0P6dk4TcSfhqCfg03KgixRNqJEOk
YTR7t/+iV7efS42ppR1XwJXAOVy7S8EGY5iKnoJtxSKMgcWBKUng9v7cPLvuJJ7M
/w379Bo4+pgXtRJKEQX5wBwbs/+V67rZAppCJfyrA/0k3UwqF7s6/1wG/PHjpAlf
Wco17A5UW/4PAL4ASUzhSijcdl4P/ulalCyL7zz0CE9szDTxvGoQcUjyFz4X7k9d
Q4h6mFdJGXnAc6KxXUo8hgKzcoP1uUU+b+ZzMV7iaX6JIA1bq0l1wCqogF6A7Xqn
MXzZXfOO3k3w6FWqSIpSwGMo/ZgdApvQdzsLdcI4WpKQYcvv1kkNQHJsMzp0Av3p
wf3e5Yi3cS9c6D68CPiinSKaz5Hh4TWhYdEogKehW4cBYchjst9Q5PpC4+lC4gRP
vBT5QW6i9XTDprdUhHZxeNtefsZz57kgJTr/haf1kbiH1ZTcGOsM1R/Qtl2RB85n
r0RNRxFC+6S0B6HbTQFjD0Kfy+cuYJY9/tvevLRLSlGFjqgOjJmBjr7fmUCCJSIP
Zkp/LF7jBBt/taoUjLNOGQfSYBot9Fhi6DMoQYQ4SJZL9FXpTA7SsugjSvULxXPh
6AAmevooajrYvrbQfTlZ1uKoUwZXb4/z6iGgtDuXtilmx+04SO/7j507HDm4WooP
H191ZiH/PYEVt3BLERNzVqg5C1orr8yMpeuKvib6YQRk1heXiGPpJEWiSAHKYx5r
SkRtowOSymL4PfUdcUzeWtNp7kjpBDX548KWZbmROBM2326ecxKzr2UdaLcYi5Tg
BpmJhxP3pySowMOBQOg8Qgls6LJZwLePLBpDS6h6kI67pZlR2P+MVpzfN8G/Dd77
G5yC0rMNGhCaLGAbNZYHhHq8z9EqoxCzvVKEyeqh9OTDGUmuytRLnKSijukxEuvy
GHXRpkO/JWTc0z6IgLh6uvGaHxcswLWd7++PoUsU/WuFLyt0VtzcjkMFfriRhYWm
HmbSVDfZsz3JEJGPRFJb0eU4qgc0qj+zFmpSGSeDroZhwFBqVwu/Xp/9dPYJRebd
lwFJ9fTjFJkkv+sWE17wAjRcHDqdbWk1+XjjZ1lnLRCPGLalK9IB/IATibk/mMe0
oQnVGuYABhvpa1CldSy8A907jt1grqx2foQfJLvCMUp0yCmTjdtO3b3fLwySrHh8
wuD4V2RxRjjjkzivPyBBA6Cr7rkwra/6MofokiUXFNrZZq8PQaoxifwcKMXmmqtA
gv18sY+c7gCeQJcFz3VTLCrI22RYoKYuQHCZ0Pp8tQlAkMjcpkxfWR0tQLxpDNqe
jvtqf3hNNW2qu5amEUGXs0Mq+v5v6aRfr9Xy+Lb0ZNhz8+ks7eAax+4IsaDbrGs7
eIzvp413pFwO/unARcBXn//E9AVXWXARVqIWFHrYO/H2ll9GR0Pe/OAPwuEGG0QH
907r7dbHe/aWQw+mMdK5j53PbDYinm+FVcTEUklzJ5n1rc/vMIyqseGl6MoT+KXu
uBlSIedJ/nNwsu1Oa9l55lklFtV8bHOg5NPj530BIAC4tAnbRhdtoWa0O+z8SYmc
dXUdf+2vF6BA/63YjinYUOX8PreIJVnD8qFpJCtBTT5HRBhaHYV5L6A60lq1+1Mh
NWmNckKVG6pZDZrNAYfkm0tdYJ8wJOR5XjAstbHFRwbRqWWNJU283v5wuZQtpMt2
NXWbUCjMVsO8IVh2VYwftrb1HV1mZYrN0+xdGc7mjPlHGU8G12ci4K0BqMqNv9Bq
Xtu7RO3iZHNc1Ir2Xy9FJBd9ysr3SoZc6C0NmWzFOQ8oMKtg+C5HK6joO2Wced8v
d16ghltn0WxLck8/loqUMaJZ58GCaJws/xip45PQeWBAWJRvXlqWkQfdiPGp1G2I
ct29btIAixOGMplReIuwPlCg7R5RaFn28Mt7QFk8NK2kVBd3pWzWtgodeGyo6jG5
ZG8uZpg872hENmTZYKg4TQDdlCSzX/jEAX5VBPFTNUYKSw73/CAHZgtHWE/3Hdv9
5rSokViBqIOrmU5Xpy+DfOsRaMEkv+pSzElKU7wBY+VRDV/CBis7bOei70IBsaUw
wKfoz9NemxHR7gTi46l/5fBjWtubx8TO+btZWd0845hvvSTroP5E0KtUWiqCwq9h
WV+kBlpu06aHue6abPcbQ2P+EXLEVg8r2SzKMq6br/3O3NF2uiUIygM6OV81yiqR
d/s7Op8dnVXlnQ5CYViOGMKjuFHReQNCeIUx2TDtlKm61F2/zMrqIOopJqbZrQrp
peZNe0YSUlPGzxlAV9+lbACf3ZCO6pigogIdoGELUqg2aStQ8482FHupSeSubSD8
wIVVJC5bX/EB2xY2EImJ+qS+v5VjGRTwcW8srEJL3qq2zgn3Llc+0k7nabjZTPVg
W+I9YphTDpfAvXE0rUAocquP2bxjHavW3J3tVLQ8HFCQxxcWFGg686JNDxVqleJ2
IBmraou9mLQMU33YLJP1Yc8gRvkOyhP9NkK52mvQDeshYkb7Q+mjGnHAD/MiAE5S
RncixlzbGkGWXFZ2Hk2NQqvWnflt98zU8RDHeqTGss6KL/effmpM8gxK3WIvvnWW
fNHuSVUgYjEKhnuouaAY+KSjvUhxeF1l/eCHYcvtWABl+4Q6y4EhzGfubgqbcIav
VNF+2yF1q5m4c9stoYjzalg4oExlepAdzQ==
=zHlX
-----END PGP MESSAGE-----

", + "size": 9213 + } + }, + "raw": { + "id": "16180866d0ae26c3", + "threadId": "16180866d0ae26c3", + "labelIds": ["STARRED", "Label_3", "CATEGORY_PERSONAL", "Label_12", "Label_13"], + "snippet": "", + "sizeEstimate": 13957, + "historyId": "1406156", + "internalDate": "1518279745000" + } +} \ No newline at end of file diff --git a/test/source/mock/google/exported-messages/message-export-161b2ac5a73d4097.json b/test/source/mock/google/exported-messages/message-export-161b2ac5a73d4097.json new file mode 100644 index 00000000000..1727b3832f4 --- /dev/null +++ b/test/source/mock/google/exported-messages/message-export-161b2ac5a73d4097.json @@ -0,0 +1,167 @@ +{ + "acctEmail": "flowcrypt.compatibility@gmail.com", + "full": { + "id": "161b2ac5a73d4097", + "threadId": "161b2ac5a73d4097", + "labelIds": [ + "IMPORTANT", + "STARRED", + "Label_20", + "Label_3", + "CATEGORY_PERSONAL", + "Label_12" + ], + "snippet": "-- ------------------------------ 1io | Sales & Marketing 1io GmbH | Mozartstr. 5 | 87435 Kempten | Germany 1io | Development & Support kuhnert GmbH | Mozartstr. 5 | 87435 Kempten | Germany", + "payload": { + "partId": "", + "mimeType": "multipart/mixed", + "filename": "", + "headers": [ + { + "name": "X-Gm-Message-State", + "value": "APf1xPCxciCfd6O0F+1olzt+I0cOOeHfFRnDKxwaEyuBo/4TUau/6j4N jt9UG35NptarCR+NGqxteQDDSrAIZD8PR2xa/IBn2xdfGNTacwjBbppv+wIBI8uqRJesF0FOFT5 8f1xl2yValBuWm2cDQG7WtHDnozgx1A==" + }, + { + "name": "From", + "value": "sender@domain.com" + }, + { + "name": "Mime-Version", + "value": "1.0 (Mac OS X Mail 11.2 \\(3445.5.20\\))" + }, + { + "name": "Subject", + "value": "Encrypted email - sent with GPGTools" + }, + { + "name": "Date", + "value": "Tue, 20 Feb 2018 11:04:52 +0100" + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "X-Mailer", + "value": "Apple Mail (2.3445.5.20)" + }, + { + "name": "Content-Type", + "value": "multipart/mixed; boundary=\"001a114b3ae8345d1b0565a1f1af\"" + } + ], + "body": { + "size": 0 + }, + "parts": [ + { + "partId": "0", + "mimeType": "text/plain", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "text/plain; charset=\"UTF-8\"" + }, + { + "name": "Content-Disposition", + "value": "inline" + } + ], + "body": { + "size": 273, + "data": "DQotLSANCiANCg0KLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQoNCjFpbyB8IFNhbGVzICYgTWFya2V0aW5nIA0KMWlvIEdtYkggfCBNb3phcnRzdHIuIDUgfCA4NzQzNSBLZW1wdGVuIHwgR2VybWFueQ0KDQoxaW8gfCBEZXZlbG9wbWVudCAmIFN1cHBvcnQNCmt1aG5lcnQgR21iSCB8IE1vemFydHN0ci4gNSB8IDg3NDM1IEtlbXB0ZW4gfCBHZXJtYW55DQoNClBob25lOiArNDkgODMxIDI1MSAzMTAwDQpFbWFpbDogc2FsZXNAMWlvLmNvbQ0Kd3d3LjFpby5jb20NCg0K" + } + }, + { + "partId": "1", + "mimeType": "multipart/encrypted", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "multipart/encrypted; boundary=\"Apple-Mail=_19110F11-27E3-4802-AEB0-70E542C2C0C6\"; protocol=\"application/pgp-encrypted\"" + } + ], + "body": { + "size": 0 + }, + "parts": [ + { + "partId": "1.0", + "mimeType": "application/pgp-encrypted", + "filename": "", + "headers": [ + { + "name": "Content-Transfer-Encoding", + "value": "7bit" + }, + { + "name": "Content-Type", + "value": "application/pgp-encrypted" + }, + { + "name": "Content-Description", + "value": "PGP/MIME Versions Identification" + } + ], + "body": { + "attachmentId": "ANGjdJ8bsFiV_sB88rlsx5EzArsngSpwuckzEKevIhhfyW8KEH9yTe29g-SUJ7laBGggj04VAGzOobVkcg-1ear1i9XyLvYCnddUeeflZrwzgJDuos4ISBvcvoyZPaUwkldn5KFLF21YSvtzAb4waBTP6W-G3A4CFD2iA8TezHI_p3ybr375VlSrQfJONA6flEgwd239PFbJ50RCfa1vMhO26K3_qf1QB-ayHhR8e3CrTNoKnsukAPAKL0QLXq7I0mG3l7s5updKuT01PiPRT6l0J_sZJV4qZsEiVSgeibAJaHbDvftyKEA2aBaTHPc6xk1L8mQy8ZLtzNgfAN524fZsDjW1uzYh9vhXVbUVpTj9gpttFpB4QHp1xUL_Uio", + "size": 12 + } + }, + { + "partId": "1.1", + "mimeType": "application/octet-stream", + "filename": "encrypted.asc", + "headers": [ + { + "name": "Content-Transfer-Encoding", + "value": "7bit" + }, + { + "name": "Content-Disposition", + "value": "inline; filename=encrypted.asc" + }, + { + "name": "Content-Type", + "value": "application/octet-stream; name=encrypted.asc" + }, + { + "name": "Content-Description", + "value": "OpenPGP encrypted message" + } + ], + "body": { + "attachmentId": "ANGjdJ9FU1bpT2FkvAKH1lNX0PD6wW_rm7vR0ycZ0pdP_VcspoqtkmiugTEVs3XuxvO8D7bKuWo9HUEy_VhEKhQQGVpkgtqlrJH2rExNrnKX7L7dsE8jacNXTS6c4Pv_SyBdL8-cZ46mZd1L_hQqSQQqfNIP21ltKZLTBceWt58pOxGCBtxmd0bmuLjgBP6hRICrMk7hwhT4No0z_xxkhUI2gh9X9wq34VOXTxgjnUtM3TpmTyIvsKi9swI_pGMBvqaxHx75ftY9lVz4m-STUEb7uITLhmw6__IFbdhxbTZo0feKebGKZKVs6iVGiC5T4-WcwmHgL4mDFriV7TyJ-gN7pdQRQ09eUKtAQI9PH9Gfj8rFeVd8QTKdUvfK3t8", + "size": 3123 + } + } + ] + } + ] + }, + "sizeEstimate": 9242, + "historyId": "1406133", + "internalDate": "1519121092000" + }, + "attachments": { + "ANGjdJ8bsFiV_sB88rlsx5EzArsngSpwuckzEKevIhhfyW8KEH9yTe29g-SUJ7laBGggj04VAGzOobVkcg-1ear1i9XyLvYCnddUeeflZrwzgJDuos4ISBvcvoyZPaUwkldn5KFLF21YSvtzAb4waBTP6W-G3A4CFD2iA8TezHI_p3ybr375VlSrQfJONA6flEgwd239PFbJ50RCfa1vMhO26K3_qf1QB-ayHhR8e3CrTNoKnsukAPAKL0QLXq7I0mG3l7s5updKuT01PiPRT6l0J_sZJV4qZsEiVSgeibAJaHbDvftyKEA2aBaTHPc6xk1L8mQy8ZLtzNgfAN524fZsDjW1uzYh9vhXVbUVpTj9gpttFpB4QHp1xUL_Uio": { + "data": "VmVyc2lvbjogMQ0K", + "size": 12 + }, + "ANGjdJ9FU1bpT2FkvAKH1lNX0PD6wW_rm7vR0ycZ0pdP_VcspoqtkmiugTEVs3XuxvO8D7bKuWo9HUEy_VhEKhQQGVpkgtqlrJH2rExNrnKX7L7dsE8jacNXTS6c4Pv_SyBdL8-cZ46mZd1L_hQqSQQqfNIP21ltKZLTBceWt58pOxGCBtxmd0bmuLjgBP6hRICrMk7hwhT4No0z_xxkhUI2gh9X9wq34VOXTxgjnUtM3TpmTyIvsKi9swI_pGMBvqaxHx75ftY9lVz4m-STUEb7uITLhmw6__IFbdhxbTZo0feKebGKZKVs6iVGiC5T4-WcwmHgL4mDFriV7TyJ-gN7pdQRQ09eUKtAQI9PH9Gfj8rFeVd8QTKdUvfK3t8": { + "data": "LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tDQoNCmhRSU1BMHRhTC96bUxaVUJBUkFBcFNPRW9XWlNwdkJOTUZQZ3loYm5NZDNKZHYyK3NRUlNzM2lYMjh6NlRzT3ANCnhxN0dxbTF4aC8yN0VlSmZpc0NaSDlBZjFhQjlPU1FYRHpmWkc5TnF2WFhRY3NNc3A2R2NxeXpVaHhwMzNWRHENCjV4V1JBb1M4TTRXdkVNR09LeDJxNENob0JocGw4d2xvRFF0UHRuazdjRHYzWVJneEYwSlNrd1R5LytzNndBT0oNClgvVUx5QWF5SjhNZ0VUa1JwRmd6WXBXYVdUbXJKc2RzeTkxQVNKQVArS3VqR242Qk5zczBMZHVmV3J6T1pteHcNCkozc1gvU2FzdXJNd3dhZnRSY1FkOUNWemNrckFGZXV3bjRmQ3NyNGtGZFIrUkRTTTdHUlBNNXJ4V25UaXVsZ2gNCjlTUlR5ZWt2SmxwbndibjlLNnFQTzZvaVhWRFptQjVHcGwzT3VCbDVWL1BhelNIcG0relB6Tnhpd2xRT29iZ04NClAzNVBmYnBKQWkvcStwU0VyYTBkbVUxSnRlazdzL05oL3NSZWJKRWdBWHdadnVVaVRCdTJ6ZEl5Z1crSXRzYWENClFxdmZmeVpxY3JZODVRMEtGK3o1ajdNT1lYTDBFM2JraEV0cG91MHBqZE9FSlRzYk5sQXNGdTY0b3hSalVqa0QNCnMrZnBndjNoblcrdllIUXk5OEIxVkV6MVErMkczc3htQXJlcG5hRDdLeWxqNm1ORS9JMlFQWUNsL0RxeEJkWnYNCi9TS0w5RDV0NkRLcWowY3U2VHNpdFdOYlQ4U09xMW9KUDk3WlVjcitOZzlZSERZbmI2djNtWGRLWjJVeHRxVkcNCm1YekdVOXJjMlFXK2x0UUlOcGowdVl6S05RaVl4WG5WYU8wZVlGNHdKUTVFa0plaXhMbHRVUUtTVGxhclFLT0YNCkFnd0RCbEF4OTliMW10WUJELzl5QWNteXJ2bEFHRXZuNWJTY1FYVjBrNEtZMG4yZ3BYcDZBODF1eUpBdjRpRm8NClV5ZTRMZFJsWkVkeDlXT3hwdWpmTENpR0FLYU40dGZEb0R3NEcvQWxMZWxPd0c4N0FjdUswMUVZUU9tdFZXbU8NCjBqUGtRSmttUWU2OFo2OEtSVWxTN0Jwc0xyaUMrZlNqYlQ5d09saFZBNnhhQTBEUWZpZy9oTWt2WnAvQTJ2Q1QNCng3T0U0OXNpRzZseVdIaFRRWEVtWGZsR20yM2EzRXphMSsxNkxuOFREVUV0M3VGaVBGQWc4V2s0YXJiMk5NdGgNCmx6UE92THREak9tVmpwYlBEdEdqbVVlQ2psdDNtLzNJQjJIcklJOUtaclQvblhCYjI5WGVuWGE0ejNSdjh6aUYNCnRCTldPWHFLajRFMGFZelhKS05Edkd0SzdEZG40Z01nZExmc1NlSjR6TDl2d2FtK0wvSmk3V1BiM1NHU2V3NkgNClBLR25PSmoyZkJNWFVuV3h6TERmN0taczhaNk9ONjlQMjZrWXJ3ZCtNcEwyaGtoRWk1ZllrcEhEYW03dkJVVWINCll3QlVwR0YyTXN4MllIN3N1Q3dhTlZlWFgvYWtOemV1Nit4Z3lvY1BURGxJUE4zQytKc1pJZWdsdzdsc1dzK24NCjNFY1R2Uy9DNnpJT0xUSDBmWUFFUzVkemMxc1NJWVBKK0U4Nm5oQzhzbnhuU0lzSnlhQjhPSnhTZlZVcmVNbU8NCncxa2lCZE11QXRVUE9VczNNRTlYYXFpYzJ6UXJjWDFHL0tTTmpzWENORWYvait5L05wZVZQOGp0eUdGbUhkaTINCklhQkZlejZyTU9RV21FaW1UaHo4cjc4MDVqdmZZSGxDV1JOMUFEU3Z4dGQ2cGp6VWdyZG5tR3U4bXFmWjM5THENCkFUNVB3THp0YU9qYUkvaENPZFB6amI3LzVPTHZBaDh2b2M2RWJFWEVIUnZnMFV0N3ZpV25TbEx3MlZyZ0hYTTQNCnVCRUVNVXRSVGFGUXIxOUZLeXA2OThWK25Nb2k2aTAwYW94Vll4NUswZmhSMjhlVGl5WkZSQVlMcG80alY0cDcNCkc1d3VTMkJsL2V0TERaK0tsV2pOME9kWm4xM09JTVYwaE8xMlJpYkI3aXhLMGRSNmFGeHNyRHZMMDVSSWw2Q3gNCjlvTGFCVFFzK1FjSFRHTDg4K0owZHhZOVEwOS9Ca3o4VkpjSWRNOEJJSlNQRGoyWjk3RnNNUGdvMjFOTlI3RVcNCmFLWS8xNy96dEZIWFhzaDRMUFl4cjh4ZS9qejhpOVBZUENvM1ZUZTRFOGxXN3IwWGJYQ3NpbkZ0bW91Ty9hd1gNClpGMHBnTUNuU2ZUK0Zhamk2VEh4ZmVNQ1FFWEgvQTdITGUzMmw3Qi9uaGw5cTdIYjZ2RUlKcmF2N3lmU1NwcDQNClc5UDBRb3o1eFhSdHBoY3FFNzhUWEdObE1ZR09aalp0TUtrOXFQZVJBZkJsZjlvMEIxVEFQQVZiL2NhWWJwaDYNCkNlK2QybVJQU0h2L0ZabEh0azNhVmhMYkVWQmRmYndjdWxpOE9ZKzEzRWlVdXpHYWhyaldYSlU4L1ZqMzhVOFYNCkd0OGdsbVVrc2haRFgrMDIzWUo0ZS9CZzNtMUNsbmF2WG5XK29LRHNVZnZIT2pJQndIMVBHamtobmFFcXFYdzQNCmhITStxbjIxS1ZpeURlbWd4aGlmZjlydXZOcTB3MGZXaytkRDFiQ3VTOUpKTTNMcmdwcTdFZHVCaFAwOTI0RHANCmxRdkROSE1PWHFkbTV4NmNlYzRaREpVSlZLTnQwUk0yaGkrejFaV3VaS3NObm0yV2tWNVZNakU1bTRrVmtMS1cNClJ6Sk9wWis4Q3pNaTNvWU8yUjlCUllwY05qTkVUWE44Nm1ZYU1KT0J4WHlVTTFwK2NOVnRxakUyTDdFTWh5K1INCnM2c0tpRFBYMVZIWC9VcklvQmlzY0FKc1JPekZKMkRvTFMyMW9tTDZWMW9wQ3A1eWc2NnQ5UDRrc25aQy9QVFQNCjVqbmRxV2JORlZ6Q3N5YUdqSDlza0h3SGxGYmd3bnVvbnZod1NoSklmakVuRzlDSUtVbHNJc0hJSHh1VUtPMGoNCjRkbUNtZnBRVlVZZ1dOc3c2dTZGWjRtWGFUd3grZzhlNUJqUDB4Vy92UWttc09sdFpueHQ5MHpwOGF1anRHeUgNCk03NDFyektBcDQwd1I3bW1kOHFpQWltMzk5eXlMdGhOU3JKT0dJNExZYml4SU1FazBJZGlVN0JvSHZPa05qcUYNCkU2Y1pCZ0hJc3RDbE96NnJZSUptek1lSlNENWtuakhCTzNPNE9JbEZPdE9hNDdqT3JVNXlDVjJNYVV0TGNJOEENClMxWVo3NWJnem5WUVpFSFM2cU5IN2xmdUx3M0RQbTVvdHZZSlF3WDlOZjJFZk5oZHA0WEtpU3lOOUdzbHpweEwNCnRSNUZNQTIrOTdNQUM0clVnNklyRUYvc3ZNMEkzMDdnL0VLR0NKcDlLMU11dVZtclV2T3VSeERjYmR6d1RSTUENCllzN0JqZjlqYXNPMWd3OUNYRS9vV1BRQ0VSbFpNc2UrMzlEbUprZldwYzNqeFlMbzI5T3F3S056eWpvaHI5N3oNCi9mZk05OGR3bWtMSllyOEhoL1NWbEtydnE5OGtBNDAwLy9ZbzlaaE9xdlhoeEFDNTFkbjdJZGxQTDBoclJWRTINCjdFNGNIWlE2azVSQmk2bVJzMXY2czQ3cWdVZWtRQUZmaE93TlVFQ3ZLenVLQkZZRHRVcHdnUzMyUmt5dGRjUmYNCk13aHFhdTBGNXJiZ2hkV3BKQ1k5dmZmaXczcXBUaDNxMmJNVm0wWlJSMlNDVXRKOUwrUkM3OFBTdGJOdTl4cjINCm52Q2dxeVhKVWwwcDUvUWJxTFVkdExyNVpSc09zUG5LbzNDcW1lZHBrdjlwNzVVZGEwVkFTaXNPVmY2NEZjMzUNCk1hN016ZnFMVHJQU1FTcE5mTExjDQo9b0tyZA0KLS0tLS1FTkQgUEdQIE1FU1NBR0UtLS0tLQ0K", + "size": 3123 + } + }, + "raw": { + "id": "161b2ac5a73d4097", + "threadId": "161b2ac5a73d4097", + "labelIds": ["IMPORTANT", "STARRED", "Label_20", "Label_3", "CATEGORY_PERSONAL", "Label_12"], + "snippet": "-- ------------------------------ 1io | Sales & Marketing 1io GmbH | Mozartstr. 5 | 87435 Kempten | Germany 1io | Development & Support kuhnert GmbH | Mozartstr. 5 | 87435 Kempten | Germany", + "sizeEstimate": 9242, + "historyId": "1406133", + "internalDate": "1519121092000" + } +} \ No newline at end of file diff --git a/test/source/mock/google/exported-messages/message-export-1639b8ceb6c44a4c.json b/test/source/mock/google/exported-messages/message-export-1639b8ceb6c44a4c.json new file mode 100644 index 00000000000..86476c4a904 --- /dev/null +++ b/test/source/mock/google/exported-messages/message-export-1639b8ceb6c44a4c.json @@ -0,0 +1,147 @@ +{ + "acctEmail": "flowcrypt.compatibility@gmail.com", + "full": { + "id": "1639b8ceb6c44a4c", + "threadId": "1639b8ceb6c44a4c", + "labelIds": [ + "IMPORTANT", + "STARRED", + "Label_3", + "CATEGORY_PERSONAL", + "Label_12" + ], + "snippet": "", + "payload": { + "partId": "", + "mimeType": "multipart/encrypted", + "filename": "", + "headers": [ + { + "name": "X-Gm-Message-State", + "value": "ALKqPwcx1oXzx19z5EjJncv36k+s6fxt+8pVuyeSe4qOem2re+syU5vo j60gxZGp+tedOa0BYXf1kIPUwg==" + }, + { + "name": "Reply-To", + "value": "roman.pavlovsky@gmail.com" + }, + { + "name": "Subject", + "value": "TEST: FlowCrypt Feedback from roman.pavlovsky@gmail.com" + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "References", + "value": "<20180525211411.1.D3D12EE92DD69B59@cryptup.org> " + }, + { + "name": "From", + "value": "sender@domain.com" + }, + { + "name": "Openpgp", + "value": "preference=signencrypt" + }, + { + "name": "Autocrypt", + "value": "addr=roman.pavlovsky@gmail.com; keydata= xsFNBFsIbl0BEADhTf3ad+Qp0+oYP5lXspAlpjy6NROztYJV5zL7mgGm5FmPLQw6xNsjzuSK ojfx1W75dx2ZBga9hXsiAi+smSJZ6Qqt+O32eQ9emoz/DmPyfZfAlFlyUKJB0OFsr/tbp074 p+oU/glnKwBPrX4fRjcVU7vLm9g9J0+vO8j01j0JxmGwGRxwMuGxmVc+PtpnKLxhEveCBygh YrO1Y6lGGviowcdPEvdGQ863N35cSb6escIiEnffPONJhIzbhY3YU33N2LEhbCDzBTdkdSYi xe/0d8cwdpyaXcOTdptVD6hpXuatPB3otQBMVZ/GeELWYwO+wIw2XHodBAh645woZomq+q2O lpmgUfGVPNyzpPjm5LMMJHWoHNTsIQ7HZko1G3sfzm/lTUg7rVQa5XH3TAaE9L1z/Z1/OT4p k3/PH6M47/XJ7CoouXob2f/4tpm63RWccnyVKYUcy0Sp7IT+6AJjhatNY8BDzuXrbqQXlAAV F/bdh6vCXDnWiOvDrFEe0efR253fxznyO98+3Tjbtokkf89PWulKXkjoVNsFm3hjRsdOxCB+ swSzNX0I3ySJS5Tw2roZG9URsSQH0PbkYVmtjJDU7Zf7mi4tl2iBTPQLqBFlMAhOTzdtgScM j9N+W1hfTxgrYHiiYmfR+zR9mpf7BrtGwntB+iiJ6AYlXgC9wwARAQABzUzQn9Cw0LLQu9C+ 0LLRgdC60LjQuSDQoNC+0LzQsNC9INCe0LvQtdCz0L7QstC40YcgPHJvbWFuLnBhdmxvdnNr eUBnbWFpbC5jb20+wsGOBBMBCAA4FiEEw7NZ/6+9/kMk6WAVsJQNQpMBojwFAlsIbl0CGyMF CwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQsJQNQpMBojyyCg/+Lf+PiTwMPIkNiTB6FF36 9ML3O5X7mSXRUZZr8EFSqmO+ggn7LjCYEJvuzPeKhASHyUTuHQgoogaiRB8F4nLk8L72T5RQ AxTU/9sOZbGzwESX3kFNTM+CbueZlry1p0tpCKPsKtFaigxOIQGM5z01+VUh6iwou+6HobEy YQ/y+JXC5iA/KPc1fLPnDsRT1V3OUaI7z/y7P4kiD7WTb7vL8brRV3A7mMOf4kAHB6wLzRpL uWroHonM5SeRrzKfqivSK9fswnYUSuFRj0I3gxYUszRI33EZwTQkKCU6Sf56lqQHX+5Il6gY jo8SmfrOyNnHVP85apToD21jnShipGUUOkmIDocOZKnb5Fs/ahLmmdE8TRlMBpdXeAi55TSk 5O/W+xUYg6tYpMBytag9gHou/6FIckg2Hv6SyY0KzeHXfiKUCwcH903oaejlyNcD1FJU/E9X sJfzCodrYzY7fXjsex5XGPxqXbUWg83aOOiFcoKpRGm7KzL8Et7AVu2MsEZqF9UtBVhegL5a YKdegCgAR1WJO0EgGQD9/He3eb9Rcn2E0XDf4vxmxCyLi1O1V2V/tAjk79XLEA1D+ypraFBP AReX7Lh/BHHz5QObMkgga7sBGSj0gKec6bC9ZDm1+mzfP28MimYeYbbD5l4t//QrAiT3JXjj Ey6NMPDexcFRTGPOwU0EWwhuXQEQAMXNujPA8X3Pk8D+lFoPT9OQvR2EAC3bvKUrYIjzR4ds lstV6iM/4zSAvYYcTbrpNRacc3cHWpbVn2BI4mm8jN4LArB7YLsD/GKKxj/MmgDdI00JHGeO qfUvMePvoexSo2PNvzVDesUgt0W/whbixvPSh2TmsrBhbRSgMyUh4WSQJM7o9/pcrjAYV8aW ZmDTzx1RTlt8kSqw6rpTelWkG3rmxUgzSKtjt3wY21ZaP3/Awhk9OLWvWWanLci6qdC5Ehyb NuHbmKowgD7SKbVRri48P2ewsBj//gU+PvsnTkIZ1MxVkVzNUhCJOLRtO5iL/Naxfan4hmcj FmB98yYVXLmXmcmistHQwSciMqPbqJ3NOlOZogshHCZS5ov3W1oW4+Mf2TPVNNWuR7gMzhtM 7iwWKpBb+xbcMD+VjnRpWIpZ5Um694kBdrx6wUeAfObnSAvb2WEb5KVt2zZk7m1UTmKG9zQZ isaI44V2G8SJcuQ8EwzvQo/Qi/mfYOsQ/2GCM9uM8h4n+amD3V3icTYngOiDiSz2tHXXw/7w n5DGzWlqeFcvUv2LPDgyQXrWnyYIQV0krOPpPUSZMly/r8YzxFKvfS5ooSqDotvTrkBIM+Ef x8QrvDQDCmOdFVhs0RQbjsl/hjC9uhrhnWTSBnh/kpNrAc+KsGIaMJjjhWqVoOGrABEBAAHC wXYEGAEIACAWIQTDs1n/r73+QyTpYBWwlA1CkwGiPAUCWwhuXQIbDAAKCRCwlA1CkwGiPNjC EACU0S//2Q3KUCy9NEZo/1ybKa5ui451WXtw4lTxA1mcXJe0krZmuG9DzlzwaGcgIaT1dOo/ njlvSdj1jzajH1IWPT2klxOiAzNSvd8PLyWsTbdPEXb36qYHWxkvda917GOQtNFgeBdKIgdg VN0P9Q3ymgMoJ8t1yE1TSk639BLNR3TthIKpyFZF6aKKuwVjZk0fhRDhYAvyxULK+DR07Chr hAvFaoUDDfUaLPt+AUI8BW8RNRvbpGDOnzpi57t0bYDKl5yIEcH34ZO5R/4F8a+vHdss/nLj v1x/yf8lZLfRQYFl3VzLb/gky6AAo7LaOwnHc7BX4s9VEzIKOKuQSQG3P3/hMQD08q+sAl9k sO4TmqgAwxZ7BYglKGl7joQK3IgFPeeK5E6iFLxpqKrfUdDQ5ZACOw8kWWGP+R4s6kZNR2CE i/3C4Mk+c+kEQh/MZvtyclj3uAkf1TvH1gJIOfq315zhVjbuYZoGa3n1MrvKF0OEIBeOCXHH CXOmWzvgdgxcdWq1DtoBHDuNHsEicOSZukiEvzxB8cJEBMAchn6PuxeCuO9oBLJvOk9PyiVr YJn3d1303SDviRDkx1FV1Cu6odjBuf2kY0yFGQjkrPoyrpwk3Q01SCCSd/iDTWOn5NOPLtVb O9StKYFIU1Qd5AQlOSrrT+vdhv34Zq3tkqOIDQ==" + }, + { + "name": "Organization", + "value": "Персональный адрес" + }, + { + "name": "Date", + "value": "Sat, 26 May 2018 11:24:44 +0300" + }, + { + "name": "User-Agent", + "value": "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0" + }, + { + "name": "MIME-Version", + "value": "1.0" + }, + { + "name": "In-Reply-To", + "value": "" + }, + { + "name": "Content-Type", + "value": "multipart/encrypted; protocol=\"application/pgp-encrypted\"; boundary=\"aafyY6D5NubFNNLknwYOHu6rn8XVpZr1F\"" + } + ], + "body": { + "size": 0 + }, + "parts": [ + { + "partId": "0", + "mimeType": "application/pgp-encrypted", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "application/pgp-encrypted" + }, + { + "name": "Content-Description", + "value": "PGP/MIME version identification" + } + ], + "body": { + "attachmentId": "ANGjdJ_BS5zM2kqj9xiVbALserSxB_gj3ZnpwfT-arMVjz_MTqQPAkdiQCseLVy5PnAVmnKyEnLhRRdheO6Fop5a2r3uRWLiKI9ON6JEapgo7kb6mk-97KNQBrOWJJE1Nfagwxq5PSK7XbRz1U_st8Cse984h--AKrEVatTci-t1SWtPMGBurk1MuzJ52MNke_mL5ChwSULoWaiZ3hBg1kDbkZFTR1G9NmoTKQpKiMGup_G48iBG1IJ07nzLR-X81b3yqgcJL9RMxwXEsptLpx56ViAdm6dRZF9tnTAF3D5bqRcn-oQBYeZNLXQyXfImtBZtz42OTsD3_igDeSwhhkWl9EKw_O0H6TGaQ4golwYCGnpJE2XVxaxJEYHSVvA", + "size": 12 + } + }, + { + "partId": "1", + "mimeType": "application/octet-stream", + "filename": "encrypted.asc", + "headers": [ + { + "name": "Content-Type", + "value": "application/octet-stream; name=\"encrypted.asc\"" + }, + { + "name": "Content-Description", + "value": "OpenPGP encrypted message" + }, + { + "name": "Content-Disposition", + "value": "inline; filename=\"encrypted.asc\"" + } + ], + "body": { + "attachmentId": "ANGjdJ92Gg4TbYWa036rwJiMmNqkzmEFqitlWlWQ2vlzuEOibaL4LbUv2Ia2mkHa_IKCDnj72Snq82-t4SYF9Ksk-9XZeR-SIo1qoKeXvPZltg3D6fX9DdW2tskp-JFnpIupKG7-CO8eBLklpMHCBOG-PsILZrjzWHZCNJ6IUROP7pDO8c4vAyaayvpPlw6QSbTyuEdPchvQp5pAeNv3heGeKUDuVNnkaDbs8Oyhu-UjIM4wRkCOjwrJpa2UmYSbTQ_zBhHR9jLqKoGc4q62L_nfDDrW_jHNCcrBSmuclH-O2a-W7gLDRVGK3WmoHRQHgcnrGaXQF_oV36R-qZlg_NXABmrBTbEs9HKtMrRYK8kEkn70rPkv8oUD-46hsb0", + "size": 7309 + } + } + ] + }, + "sizeEstimate": 16976, + "historyId": "1405978", + "internalDate": "1527323084000" + }, + "attachments": { + "ANGjdJ_BS5zM2kqj9xiVbALserSxB_gj3ZnpwfT-arMVjz_MTqQPAkdiQCseLVy5PnAVmnKyEnLhRRdheO6Fop5a2r3uRWLiKI9ON6JEapgo7kb6mk-97KNQBrOWJJE1Nfagwxq5PSK7XbRz1U_st8Cse984h--AKrEVatTci-t1SWtPMGBurk1MuzJ52MNke_mL5ChwSULoWaiZ3hBg1kDbkZFTR1G9NmoTKQpKiMGup_G48iBG1IJ07nzLR-X81b3yqgcJL9RMxwXEsptLpx56ViAdm6dRZF9tnTAF3D5bqRcn-oQBYeZNLXQyXfImtBZtz42OTsD3_igDeSwhhkWl9EKw_O0H6TGaQ4golwYCGnpJE2XVxaxJEYHSVvA": { + "data": "VmVyc2lvbjogMQ0K", + "size": 12 + }, + "ANGjdJ92Gg4TbYWa036rwJiMmNqkzmEFqitlWlWQ2vlzuEOibaL4LbUv2Ia2mkHa_IKCDnj72Snq82-t4SYF9Ksk-9XZeR-SIo1qoKeXvPZltg3D6fX9DdW2tskp-JFnpIupKG7-CO8eBLklpMHCBOG-PsILZrjzWHZCNJ6IUROP7pDO8c4vAyaayvpPlw6QSbTyuEdPchvQp5pAeNv3heGeKUDuVNnkaDbs8Oyhu-UjIM4wRkCOjwrJpa2UmYSbTQ_zBhHR9jLqKoGc4q62L_nfDDrW_jHNCcrBSmuclH-O2a-W7gLDRVGK3WmoHRQHgcnrGaXQF_oV36R-qZlg_NXABmrBTbEs9HKtMrRYK8kEkn70rPkv8oUD-46hsb0": { + "data": "LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tDQoNCmhRSU1BMHRhTC96bUxaVUJBUS82QTdnNXZ0OWppL3AxN1RFdEorTjBTTEtqMy9TVkNCR3NVQjFPUG9HNWpYS2QNClVSZktQRFoxd3dsQU5vcGlhcW5QT0ZtWFFhM21mTG5vbnZvSGxSNG9LN0xCQkpucXhhRFIrMWFweFhlS0pkOU0NCjl6YjFRVEhtR2lvT0dlZ0ppY2M5Yi9PdEwrWEsra0I4a2J5MC95WVZXSXR3Z2hmMzJWakZCNzZVVmZUbk12aDUNCkkvKzA0enhMSjh5ZWx0OW0yYzZURXBqUDhsWWpuNThPRFFnZFhyN29ZR2ZxTnJvOXVOS0RGSmY5bXdvZzdXM0wNCkdhQTFmR2VQV3ZhVG53cHU5VVo3MnFzUm44T044dm1JMjdncVAreVcxZHJsVVlsMGdQamhsV3k5eFI2TDFyaTENCmtPRDU2Z0xoTCtpeTk3RWFlcjZqVEt0dXk5M2VzdmVoS3FSbGRCbUlCK2lzUUZUUjFUVjhVZ2YzRXpUbFRXNVENCjBqV2d4OStnbDk4QitrNVR6aDhWb0NvaytYYVF4ZmtLSzcxTEVxTlR0QWpGSUhwekV6MVFmU1dQNDlrWUJNaVoNClE4SDM5TktZUGpMYzh2Zk9XZ2REa0s0dHdOVUFwYmpDNnBsSWExaGZRb2lrdEZOTjdpUk5wMHNEaVNoMkJZM3YNCmtEaW1hM1BsMUlCbExTWnlqWlJWbHNsZWJ6eHRYb3JKU2dESGRvWkxpeVBMREV1enVBSFQ1dkQzMkhVbUJWQk0NCmpzQjBOMk5sdlB1OUFJWnZMdFliU2V2aVREeHJpNWJpeTFuN2dCTmFPNnVkcWwvRjBIT2JJaW5tNlcvQWRLK0oNCm5oOHptVytXRWg4eEppVHVvY3JtQ0lvYnE3K055ZGhBT05WNDA2WDUrdkxXTmJFcTROT3AvZ084M3ZyUGVGYUYNCkFnd0R1TCt5YnI5R2JXUUJELzllV0lvbStvcENUT1lzM2VtZFF0cDNTekpnVEdnWWVjVXBkYzA5dnJaUkdEbDUNClVEb3pqN3hldWxYa1Q2QTdoSmxnN3NlNTA1Q1lFdFpOR2RvWlZCSEtReFFzcXlEQlhWUmVORFMvRE9mMUJJUDMNCjVnVUltOVNET0ZjMnNybzdVNzRIVGhTUGVQRlBzbEljbDlXQ0Y3L1piaHdJUS9YMWdrN0ViZFJFY3Q3ZjFueGgNCkVzSDlFbGRyTkZUNzlMdDZnWlo1am1lRTJZZGdTQ3VGb2Y2NGNJbVJlTVUvczh5NUpJNng2NUlFd3hUTkhpUEcNCkp3L1I4NUJoM2JsME44Vmx4SktnQlcwWk55SmlGOC83SnVCdnNaM3U4U2g5akg5cVNFMGYvSVhZdlpFZk1tMDANCkh6TWF4N2pGL3ZjL3RXOHJUZlp6SEx4Z1lDSmFJSkhBZXFua3NtZjJtZmdpaUNyeVZVK2tPWU1OT1ZZdjRQWW4NCkVhUUxYL1kzNERrb2VGRFFKbkNuQzJWbnk5Q0dXNnF6MVV1YUNLZXMvbmJRcjhzcGhwZnZGNytPMWRWRnFpYjENClN6MjV0VFdRcWZuVnFvaVphVm5RcDlSYlJOMkxsUTZqNlltVmFwOGhMTVhQdHUyZW5JdnJhSDl0U0trRWladTENCjQ2MTVPeWJuSVZoWWpQU2d6clpqaWhZejhoZ3hsOUV6bkNLbkordkRUVU1sNHN4eEJud0YrcjRyRHRBcy8vV1UNCmVHN1FmcnVUeUxaLzQwdFRnMTZXZHJqSzRBV0h3Y1FOdWYveTIyWUhQMTNHM091aFdhRkxZTHFwZ3dPNUN3RisNCmxrUk90WGRJWmNtRDhkVi9qRnkvbXVyTUl1bHlSQ0FIS0RHVUpjamtsQTAzQ1cvVVRlMUEvWDVzSUE1R0xkTHMNCkFYZmtsMWxOVkhRRnlHb1ZxU1hXMHpVS0lpNTNFa1VBQzNmYkVJSys0bGpmM093ajlJNE0xNFliRjYyRG4xZnoNCm1rNktHUE95QXBPOGpIM3E1cFNUMmNXR25sQWwySnJ3bW0ybU1QdFlLV01TYklIYXVmTURYNjhzdVdTMVpOMysNCjF0OUxlaHhHOXJ1VENyZzgwdDFIOUxsYXo0ckhwaG85dlhPbUlGeFBIbVJFTitxbzZkcTBjd1ZiNVRrTEFhbFQNClU3OTV0bW1taUk0bitTUUE4b3VQYnUvdm5kRlFHWDFJSkM2WjFibG4yaCt4UzJIWHpTOFdUMTdzV3hHS1pZaXENCnZpTCs4NVFNSDVvTTdtUUdXMmcrbTZMeG1BaWJqbWN2WUlFUGNzT0pwNVdCTXR2KzZVMC9ITVhKa0xXUzROVFUNCmcyYmVLam1SSTl3eVQwVEhrUUVCV0owbGNZMUNtYnYzazF5N1R1aE84MEZTQmg2TVVsZkZLUk9zYmJnSjUwRzENCms2K3VDdzJVT0gzeFdpdmozMC92QlU3M2YrRkx0OTlmWDhsMnhmSXhSdXQzdWQ2OHRqVllFdHE3ajJtNWlKNEUNClptWmRqUGJmV2E4enBKclNpTCtUbUpVVHRySXpwM3Z1RDJZSS92WjcwK3R3L2NpUlVuQ2s4K3ZzTnovTEtHOG0NCndLejlubW5jNHFXbVJHazNUcUVqQzQ3bzNOOXIwTExUblloNW5wZW5hMG5zMEFJWDMzdzQ1YWZqa2IwUThDc2INCkJ3enVlZGdPanJ1VXZPYWNVbzA3bU5yZ2pVVkRtc0dPWkpMdVFBNEtwWUE5bzJvYlp3NEZoR1hyZE1nWW1wNHANCm5EZlRyOW5QYXNmZzdMdytxbi94a3djcGMwOTBCQkpBL0F6dUNyell0aUtURUgrN0ZvakJSNkFVYU9mc0pTdmINClZ2WXY4TjNUaWtxWVQyZ1RrUWdyd2QvRnRDU2tHVTQvckNJUFF6Y05kTmF1TCt3dmF5QUZWU0pFMWwwQUNsUmgNCm0xL1VOdnZKK2t6U3l1UlRqV1pVSFoxME8vWGRsZHRMYnc1RkVSdUxUSStOVjJqdTFVaCt5YitQQlQzVytXWlANCjBrY0RGcjlNRnUwTnoxeGczSDl1cjFkVStRYU5JUjB2aEV2Q2JRd3N0aGRkSXUwaXJYMzhHcC9LYkwxZjBMaEcNClcvQ2l6UnVVM0lIY25FNkZHcUFpcmJNVTNNMHowYkY3dWYxMGJkQ3g3UTVvYkVyNlVjdkhaYldFcDB6dUhTem8NClZsN014bkVKT1phcXM3OWZhVFAyTjNaWFBydVpLNU8vVThzL0Z2bTBRT0Fobk5NR3pDUnczdEtPUEZKWWkrb0cNCjJqcGZseWFBN1BXNWFQSFJNWmpYUHFOOXBjVk5yK29DRUNORk5uMWJ0QkNMbHFRajRhSjYwWFFQWlBLcTRsSDkNCkVpY0ttaG5VMjUvUDlVN2hXcExqU1Zxbkd0SldMc0pVcXl3K1FuTGg3NVp0K2ErVTE2cTZHOU1hWUlCMmJFa3ANCmpMUHRVeEEwUllWZlhuOWR2d3JxNnJMR1JYbzZkZzVWY2tSa0FWTi9EeGk1WlNGZmh3L3BtTFJ3RCt3VEFRMlcNCkNtUmtvTXdFcHZTQUIxdHJaZVowaUtUUDd2bC93TDVkYUNnZy9tcHFFajVGc2wzdWZYWmNXckErcXFnVEtpSysNCktzaFM1WkZuUG5rQzZTV0I3WEVSaXplS1VEeDhWK1hNR0QvNzRGQlhsQ3p3MC83d0xVMldhbDVlUlJTYUtlQ2YNCk03ZW1pN2lXUjdYMHBCUW9RQ0hLNlNEN3BRc1JOb3dqQzU0ekZta3NOTTB1OXRjd1FtT1I3aHduNjVuS21NYlINCklWMkRMSHV3Yi9DNS9ZQ3FnTlNjRU52bnE1V1JPNVRXVUtkYzV2aHBEZC91THNyU0tCOERncXdUbndLeExpeVINCjdaOGFiVXMybWRvYUVCU0ZRajRNbVpIUDg3dms3d204TURrWitaOHlDNVBOQzlhRXFGdk5WYXZvVHZmU3pPKzgNCkhJaktyQ3FaNTZRbkVGbE0ycUNmRVJFUnp2bFZWL1dZYWo5NUtFVjlOMm5lSnJDaDhrcHdIbWFCaXMyMUk2S0oNCnBac2JRVjlZS0VqMnNFQnRuZEVUWFdyOWRzYU56eStsYVVVblJ6YnJIN09jT3ExSlEwR3hXNHNHSG1va3kwR0UNCm1udW8vWVRCTHpQcWhUcm5BV2FTTW9SaFVEbFFiSGR6OGx5TnlRRW1TTkFFYm1COHpmSXpWOVF3MzFOSWE2UXoNCkZJU29ZUjFUZW8ra2JYUnZBQkdxdmxhRDBWblMyZ2RnU29DVzkyUHZFd2dCdmZkS05tT2FuODBQRUxGYXF1akcNCmg3NlJ0MDhnMFVHY1ArR25VMGlDeWRqYm1UT3RYQnlwRk9wWFFoN3BoZDBSbGtubExocm83ZmhNbE50SE82SmYNCjZvMnkwemNFRXUyQ3ptTmlOUzdHNGs0T3Awbzh0eFpqQmZDUmswSlJtemw4SUJpV0VrMWVhVXMxMUFIbFZ1bjINCmhQOWlWeUYxUEFhRC94MnNpRWk3WTZQK01VbUxJcFpVSFF0U2FydEFJc3VkaHF0a2J5aDlyVFdUNE4rMXlhOG8NClFoYTlPNDA5SExDZFZrMUorRGo5Uk1EaHc0bzVvVlowSHJ5SHZ3MjlsLzdDVWUzNC93UnowZnAvOTdTbHJ5YzINClY4NXd6UmlVRWpXTkRxT2xyZ3J1U2h5d2lrMWkxWURLMFpvVUR5MlY1b3RncldSTitGblYxZXpiYmtwOFY0Y1oNCmxPUGJuUlRyMFFRUWNvSHliNWxIb2xSbGhoakhOeThGd0VpNXk3cnRZdWVkMWxCQmMzdGppTnQxQVcyUXJxSDINCjNRSENhVVJRVmtuUytXM2t2VWxmRkJTa1dIVlhldUwyTXRLWjIwNCtqeWs3dDRoejV6Skk3UDBaTXNJVFBDZloNClZnbDdWVEVZeVRCVkRJMTNUNWJBeFh6eUJMYWZjN0tPcVdtbzdSbXdoaDVrc29tRUtBM3M5OENiU0FUY1JlbTcNCkgvZDBDV3BCSVdZRFFoNkdoUVV3QWZxb3FGTWIrMnBhSm95U0QzSTdvdWtRN01qZjYxTjlaVXN2Yjg1eGZEb2cNCjZFMFg3b2N5UE1zT09KdVpVVCtJTzEzV0R4SU9BSWVkSjlBWjErZHFRU0RTZFlkM1I3YmZCSmFKODMxRVNSODANClBlcjJSbGtPbTVLd0htUEJqK2lieTJxWDFORnRmVXdGYUlpWnZpbERpcGl3TzN2ZGlRTjh0cXdDUUdVWFV3Yy8NCmNnaklVZndzUUlaSUQvQzA1YUZoNFRPSHB4RUhHaDF6aWh3L2pPS21nbnRaQU01QkJ4RktSb0xSYi9pem14WGcNCjdXcG5Qd1lQcWgzTlpvZ0IvTHpUMXY0R240TGZEWEI0OS8rUHBXaXltcXlpdGVwamZDQ0xJNEllemdwejRETkkNCmZ0SXA3MWdJMEdDRUhIMlpWMmZXa1p0aU1tQ3VYNEJScTJDazRFNGQ1NUFVYW1sajBPcC9IL3p5SmVhY0laenINCmdNazRnZUtPNTExMTJ4R3c1aENXRjBWUnUwSHlvcUg0NGZvT3NCN0pEdGgyazhXb1MvejRhV1hHaTEyYVQwMzYNCmd0cHF3dzNaRFhqYjltVzVRZHNSUS8wMEh5ZTEvNGlDRUo5N3JCMksyWHJXQkRxejJBWlFEQzl1WGZkeU9GRHgNCk1HVHF3ZGNRQ044dkR0SURPWkdYb0lqMzlIS0QwS2pDd054ekZNYmRRbmdvNXk5Y0JYckJoQStBeUtPUUNOb1cNCjFIcTdPUk9vbFBmcmVxaGVJSXF2MnpaS05CemtKeXNFdUpiTWdIZ1BKS3JlQkphLzdtSzZ5T1JhUzkxT29mTTYNCnpVT2luZ2NOalIwUW1MV2R4UFg5UGNvSUhzSXBRUEE4azhLRWUvdElXaFFTY2l5MVp5eXFXckw5UHQ4TGV1cEINCitabytBU2d3b1BTdVFwSUtkQk9jbm1xWmZtL1IwVjZjYVEyZjgwYklLd2FmQSs3S2dBaVltaTBVUmlyYUlUU2sNCnpBVjZCUjQ0SWpuNmRCUjRNSkZyeFkzVldYd2FKcjA3RWZHdU9ra1k3WU1uZFFOb3ZIdGxaTld0RlBtSDZrQmgNClRIQmhOdUhSZHBMM1ozMWdZU0V2NGJLYVhqZmtYekc1Zm90VUw1d0RVVG5pdDlqdEF6Z3IvazNpMUpsR0FIbXANCjBBUVFxdUVRUWY4YUtZMGdDTHhCMTN0NmpoT1NHQXJpTUFtKzVCWWtFSVBUZGl0bks3dkNHMXk0K2hPN3NIWUwNClhLS2ttNHlvT2FydDMvVVV0alpTeHJJano5N0hkNjFWN0hlODV6YkZtZXZhblhRN0JMQlUrQWg3cHB5SzRpTVYNCjJ2V2NaR01zVTExaU8vU2ZzYnVxb3RaWVFMUXRhY3BUUDdJWXROZmxXZXZTK1BJTGIvaDEzRG1MM09XKzllYlMNCnJ3UnNQNTloTkZMZXNKS1ZoL1BXYTFPcnozcnliT2hza000VC83alQ5T0gyRHlHZ2FNbkdFTDlFSVNrWjVtOXENCk5UVkQrSG1lanRhMXlmLzNBTWhnWVMycnpHcUpyakJJZlkreGNpT0VSYVRtVjRvOHg4cmFucmkvc1VQRURkVXINCnprK2NuVHNmdnVyd2paTnlyZlJwQjVKY2c3di9UdEFrbWZ0Q1FLWldQWENRRkx3QU85SHNMTGFRNVBzVlBaNk8NCjhPS1hLcXJBUnlodUg5ME9CL2FlUkJxWmVpc2ZNcEYzQ2dQMStoVWtzbmNNR211ZmhEdFRXL3MvWnlJcEtOMUUNCjg3UmQzNEVHOCt6Y0ltN1l0bEVxSmpKS3N4b2hmbTRieDZPcUdiYVVWck9panFLMEc0M1pXZFhadEYxK200bjQNCmI5TlpXYkc4bDQ2L0lSZzBMcmxOQWFOd3lKVmNtekxoRjBET3YxSjgvbXJWczdmWEpXS2dSdzZ1NUJseG12QzcNCjB6SnNhcnd5cVFOaGNJTkYrMnN4b1ZOTWkwc3RjTjNoNmNVbGFtZlg4US9yclJ4SkxJa1UxR3pUcjFKdEVRemYNClVIeEwyK2wrY1RpWVRLT0ZVK2k1cElQTG8zSzBlSCtXZGlHNG4xanVVVU45dWZoQXp3MWoxZUR5eFo4UG1LYk0NCm1ISXBacmFvOHIxbGdobmk4ZUZUSnduaDhLMEtMUWNwMkRFWUdIYS94K3F6Wk9aV1dyZ1FUd0ZSWjR3ZHAyREgNCnNNNVhYOU1HdTV3bDFIR0YzYnpLTlFDL1NveVdGc3JwQ0VTRmRUT09NQWpCQzBCTDFBcDZwTHRrMkFzTWxuV1QNClBveG1sWi9iZWpDa0xSRENKTWdjREtYSkwxdUhmMTZjanlqVGJzdERQRE54emNWTUlTc2ZCeHVZaGNQRElDc2UNCitYSjRyeFFMOENXeW0wNUpFRzlPc3BlbmpIdXVESzA3bUxOa3lEY3YwanJ1Rmh5L1ZmdEpuR25td2hlTUdrMmINClNGQzJMTXFZRWR1WUlsYzV2U1FZYWpGWm5XanpPdHhoNkNtQ0R5S1BEaGhQM2piRkVLSml4MG04amVGbHhsbU8NCnFzWE5WQU83NUZLWnhUcXBCeFBwaU4zK0xqN0FhOWsySlBHWjBCQ1Q1VGRxeExtSVV6eUtXeUlWQjdEL2cxYy8NCmE3cUxMdFZod1FWM2wwY2tjN3R4SFZYWE1QeWh2SksvVEMzRThRbm1od2I5dDBBamRjUXBXMG1oZFFxQjZkNEkNCjZOZm9XRVRqdXl4aUN4bkpHZG5nMS9KaHhsUkFrR255T2N1V0l5Y3YxNG5mWHl5WlRSM1dHc2lDTnJ2OG1yTEINCmRZUmk5ak1CSC9TTmg3d080eHhZSkw1SXpwYTl1Q0dQQkpDRVI2TGFkVi9yalduMExPUFNxMUhUMlpxemdaR1ENCk50WkJ1UXUvQjcxNFNVM004eUwxeVNFUEFxbXdBdHZrZTZ5NG9NZEpvZ1NTVU1pWUdOajh3MVNuQzU4S2luNWoNCjNOVCsvMU81OEViWjd1L2thdWJnbWdReDZrTXM3YVJPOVJpN0xjYWxndCtBNkZrQWVDbnlpdVEyeGJlaFgyb3oNClBaLzZESWVqWDVkUTM2MnJGRDFSTWVtTGhpN2JoNW1Jb3lRZ0R6NUR6aVZqNFNGSWlvTnY1K242SW02QTNpWWINCjh4c2d4bEtCT2IyUkVkcmljNlJmVVB1SVg4dHE3eWhUR1ZIN2EvSVhMeGhhSkhVWUpRVVFWbWhRbUxWYVF2QjQNCnU4enB3Vm1kcjBZSjZCOElhZ3VEd29GN1pyNW0zZlVWWkg4L3UrcVZFK2huOFhHeldOY3h1VXdiVThhTkU0RzkNCmRBS1ovVHhDcmgrQmlic1RBN0xrVCtPRGFMM1Q0aW5KWXJGMHhjSmE4aDFTU290NDdtYzc0SXh6NmlVb1pJZVgNCkpJUmJJOXdjd29KZmxRdlNPeTU1dkhFR0JWY1lvb3dhYjhWMVdZNCtQbVFmcFpLa1NxUHVocVRvcTdQdnBTcFINClJHZUhMMXYxSDNmNXNRSWJaQ0tmN2ErQ3ZvV3djRWRzTGhLVThtVnlyRGhMYlZqNmtMeStpM3hBREJMWjB5NjgNCjlrTWRlZ2I0YnBwQU1KbkZMZ0h2b2dxTUtyWFJUelJMR0MwOWNsbEs5MGk0R3AwNWV6L2FjY2lYRDNvVmVjdm8NCjBpY1E3Znozc2pwcWhnaHhvdFM3V3FYSFlKdW9nWGRlRmpTVUZLZzJiaU1SUFpORWh0b04yeWJncFpjV0w1WWkNCmVURnpDdklQMEpBN1UzZU11QnBGYlpyNmhFenpGYnFvUGNTL2VPa3MxaDlOaU1MZ2dMY1pVV3JyYjVaU3MwNUkNCktnS0ZOTHFrUU5UZUswcjJYL1AwM3FGYjdZRDRTYi9ReEdxWmFhbjBjTmo4bUw1QmNsd0JaS00zUW91RXNiZU4NCnFVUTBtZFBmN2RxUnU3S083ckNRRllXWVU3bklET3JzcHBiSjhtNHIyc09LWFAvN1lTeG9pSzVndFg5bFREcHkNCmxVR21rUjFQM3l1U3VwcDAvSS9mUGRSUVptVlY2eWl6Rk5QbHVEa1dDODNUVGprMzlXZDQ0UVYyWkZ3QUdJMngNClJuMytUWm94dW54WVdQYU95OHdiTWlPMGk5T0lBeEFQVm5HRmpRQjRXM2VKTFZka3dqQkd1amRYL2sxTXNidEcNCmw3NWxXNUhBYm41RUd2bXlSb1M0TzNKN0xGN01GaVZ4RVdicW5iRzUzMnc4Wi9JSllKMkRjNDJxOG5SMnAyZFENCmx4UTgvSTRJMTY2VEhoK1RtVVlBKzZ3aThVZVRCdEh4NjlmWUszWHQ4eDJaSlFoK2ZqV0dHZVZOUnlMWDZqMWoNCklqTXpzRVIvTGlpaDkxQnFrZWtXQ0MxZVJtUEprQzJBWlZhV2xXYnV0WmdiWmxNPQ0KPVYzWFQNCi0tLS0tRU5EIFBHUCBNRVNTQUdFLS0tLS0NCg", + "size": 7309 + } + }, + "raw": { + "id": "1639b8ceb6c44a4c", + "threadId": "1639b8ceb6c44a4c", + "labelIds": ["IMPORTANT", "STARRED", "Label_3", "CATEGORY_PERSONAL", "Label_12"], + "snippet": "", + "sizeEstimate": 16976, + "historyId": "1405978", + "internalDate": "1527323084000" + } +} \ No newline at end of file diff --git a/test/source/mock/google/exported-messages/message-export-163dee87a4bfed45.json b/test/source/mock/google/exported-messages/message-export-163dee87a4bfed45.json new file mode 100644 index 00000000000..ee4b5172cb8 --- /dev/null +++ b/test/source/mock/google/exported-messages/message-export-163dee87a4bfed45.json @@ -0,0 +1,82 @@ +{ + "acctEmail": "flowcrypt.compatibility@gmail.com", + "full": { + "id": "163dee87a4bfed45", + "threadId": "163dee87a4bfed45", + "labelIds": [ + "STARRED", + "Label_14", + "SENT", + "INBOX" + ], + "snippet": "-----BEGIN PGP MESSAGE----- Version: FlowCrypt 5.5.9 Gmail Encryption flowcrypt.com Comment: Seamlessly send, receive and search encrypted email wcFMA0taL/zmLZUBAQ/+", + "payload": { + "partId": "", + "mimeType": "multipart/mixed", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "multipart/mixed; boundary=\"----sinikael-?=_1-15284531674610.9527266626955255\"" + }, + { + "name": "From", + "value": "sender@domain.com" + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "Subject", + "value": "encrypted - MDC hash mismatch - modification detected - should fail" + }, + { + "name": "Date", + "value": "Fri, 8 Jun 2018 03:19:27 -0700" + }, + { + "name": "MIME-Version", + "value": "1.0" + } + ], + "body": { + "size": 0 + }, + "parts": [ + { + "partId": "0", + "mimeType": "text/plain", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "text/plain" + }, + { + "name": "Content-Transfer-Encoding", + "value": "quoted-printable" + } + ], + "body": { + "size": 1822, + "data": "LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tDQpWZXJzaW9uOiBGbG93Q3J5cHQgNS41LjkgR21haWwgRW5jcnlwdGlvbiBmbG93Y3J5cHQuY29tDQpDb21tZW50OiBTZWFtbGVzc2x5IHNlbmQsIHJlY2VpdmUgYW5kIHNlYXJjaCBlbmNyeXB0ZWQgZW1haWwNCg0Kd2NGTUEwdGFML3ptTFpVQkFRLytLdlNFRDJ2YjlmSk1RZDZsUlRoMGlkQzdzcmhnNEVTU2Y0Z2dDWEZFDQpkZU9xMklrVjVkTmhnV0dHYXdGVlZVVGV3TWgzTDNKa2xEb09ObGF0QnRoYzJPR051K0Z5dTVObzdoaEcNCjNKcTFHa053Q3FleDArRytHVmhsWmZOMkxPQXg4NTVIOW0vQUd4WW82S0xVK1JPbVBaVjhQWm81WUpQcg0KcjhUcmhoZkhGL1BHNFptUUljdXZQSTFlMGl2Z0Y3NHdQNGNHMHFhUEVhY3ZTeFExWnVEd3pkcUMxa0d2DQpzZU9USkVocEJHL0Q4WWZielVYVnJYNEdpT3pJdTJPaG5sS2ZVNmMwQkpDVHorcW1RUnFZT1pYTHZLZ2QNCm5VMFJ6ZkxnTXNkN1N5MWxDcGxkMXN5WTNiVDRsMEZJUldVdFZ4MU5ySjdjbHVpY0VQRGlxSnNFWm50Uw0KWXkxVmlpUlpsbmsyWHZ4MVFwc2g3ZmlmVVM4ZTlnZndQZXZZRmhaL2I2U2VxcFJGUkRGR2EwdVA5TDVDDQovQ2NXcWlVYUxVTDhuRjUxQ1l6ZklNZUlFR0JrMFRpVlVBbjE5bWtRVEZidGJJQjlLM3VRSGpGemduckwNCm5MYUowOEVtZTVOdWd0Sk1VSVc3YmdvNENBZGRSamowaXNGc29lc1V2NzUvbUVzSEo3SlJQSUNuV3g0Yg0KTFBLT3lQMGFuTjZUWURnVEM2SXF2TU9vTmkwWlBFSXBtR21mN1pPV2pSNGVVVCs5dUJtQkhFUHdHYkxRDQo4NU1jankxQzdYKzB1VWtJUHNxWGdGN1lhL3B3VHVaOG1EdEYvRlUza1I4N3kzamxEWiszbHRxK1krNUENCkJKeU1HWEdmMjQrU3F1RTFRK09OSXpCd0Jxd1h1WXZSSndxQTl2T3RaMVBCd1V3RFMxb3YvT1l0bFFFQg0KRC8wUjZMTVdGUUhaUUNJRmt2WGNCNXI0WDNKNjh0Y0xmZkFJVnMrSm5veVI2SkVDVXVDWkpkS0xjNEFhDQpGK0ExNUdLaU9uZjVaOFJJZzNGbjNuWHV5TjVybFdPdTB5T08vWHJuQ1NNSGlZRXJUTFVPNis2VjYrYnkNCmkrUE9BdEFXcHRuSjdyR1NBeTE3WmdJWUQ5V05QZFg4QnYxZldFT0pJSTJyais1Q1Z5QnNPWldybmxuUA0KSGpIT1E2Z0hvcDdiblFscnBtcEE5NVBMaHlvVzFMa0VJb0MwamdyR0YrMFFYUnFFZmR3cFFCQ2tsWnlMDQovV0FzRzJHSkxySFVnUUFMZ3BUeXM2LzVQN1ZQK1ZTT2FFbk9KSkV4SVpQa1JWUkZ6V2xZcTFhdmdKV3cNCkVGR21LZWczMzUvaVRoS0JGUThKc0g5VTIyRzVERDFCY2ZYK3F0bTRuNjQwekM1cEhScExKTzZnZ2lDSg0KWkExU0N0cTZUQlNGMUZUYTE1OFpOZ2praUdaZlMrb1p2ck1XK1MxNjkxdk1tSnJ3cWlSbFBnOVBYQ0ErDQpvdUdyVS8xRlZ5UktHeDEvVWtpL2g5U2F4RFgvM3VIT093Snp5dE54R01KUC80WTFZNmhiRHdEemNyQ00NCkZsRkhYaU5iZkIzdXhpSEQ5d1dIRTQ0ejkxTWtxT2I3L2Fqb0xYQThKOFUzS0pHRmErOEprWmxlUlZucQ0Kci9VVDhwcHYwL296V3pWNTltVHVsWXpSZElQU3k2cjRWMGJIMTZYR3dadEhWcmxqT2k0VHJrRXhCOWNTDQpUZGNYOTZSTU1ZcEo3cDdkR2N4b0hhUkJZMTIwQkQrc0o1MWpHaS9ZdXBvWkJkYmc3S2NPQUVlbEQyL0YNCkxNMUx6UjlmM0hVYVl5S3ZkUEwrQzBPd0lOS0NBWkJQU2hmRUNaT2lxck5XZ0hMV2RkQWRYcWV4WkZMSA0KMHk3dGQxMUU3VU5jQ1plZ0lsd09Za3NXN3l1dUNaMlpMTG5meC91MUcxOG5LQkNlYWxxTmthb3cvUGo3DQo0cSswVVl4ZlpuQWwvckZ1VEs5bmRkOHRXTVNtLzZ4eldFYnFlLzhOS0pyQ3drL251K3B2RitNdVJ2ZjUNCjlEdXpaRmlOUlFTalN4U1l2a3lMdXc9PQ0KPXZ4T2oNCi0tLS0tRU5EIFBHUCBNRVNTQUdFLS0tLS0NCg==" + } + } + ] + }, + "sizeEstimate": 2527, + "historyId": "1406311", + "internalDate": "1528453167000" + }, + "attachments": {}, + "raw": { + "id": "163dee87a4bfed45", + "threadId": "163dee87a4bfed45", + "labelIds": ["STARRED", "Label_14", "SENT", "INBOX"], + "snippet": "-----BEGIN PGP MESSAGE----- Version: FlowCrypt 5.5.9 Gmail Encryption flowcrypt.com Comment: Seamlessly send, receive and search encrypted email wcFMA0taL/zmLZUBAQ/+", + "sizeEstimate": 2527, + "historyId": "1406311", + "internalDate": "1528453167000" + } +} \ No newline at end of file diff --git a/test/source/mock/google/exported-messages/message-export-163df1bf12034b9d.json b/test/source/mock/google/exported-messages/message-export-163df1bf12034b9d.json new file mode 100644 index 00000000000..9e87117adc6 --- /dev/null +++ b/test/source/mock/google/exported-messages/message-export-163df1bf12034b9d.json @@ -0,0 +1,82 @@ +{ + "acctEmail": "flowcrypt.compatibility@gmail.com", + "full": { + "id": "163df1bf12034b9d", + "threadId": "163df1bf12034b9d", + "labelIds": [ + "STARRED", + "Label_14", + "SENT", + "INBOX" + ], + "snippet": "-----BEGIN PGP MESSAGE----- Version: FlowCrypt 5.5.9 Gmail Encryption flowcrypt.com Comment: Seamlessly send, receive and search encrypted email wcFMA0taL/zmLZUBAQ/7Bwida5vvhXv5Zi+qJbG/", + "payload": { + "partId": "", + "mimeType": "multipart/mixed", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "multipart/mixed; boundary=\"----sinikael-?=_1-15284565398080.6365395020974245\"" + }, + { + "name": "From", + "value": "sender@domain.com" + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "Subject", + "value": "not integrity protected - should show a warning and not decrypt automatically" + }, + { + "name": "Date", + "value": "Fri, 8 Jun 2018 04:15:40 -0700" + }, + { + "name": "MIME-Version", + "value": "1.0" + } + ], + "body": { + "size": 0 + }, + "parts": [ + { + "partId": "0", + "mimeType": "text/plain", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "text/plain" + }, + { + "name": "Content-Transfer-Encoding", + "value": "quoted-printable" + } + ], + "body": { + "size": 1802, + "data": "LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tDQpWZXJzaW9uOiBGbG93Q3J5cHQgNS41LjkgR21haWwgRW5jcnlwdGlvbiBmbG93Y3J5cHQuY29tDQpDb21tZW50OiBTZWFtbGVzc2x5IHNlbmQsIHJlY2VpdmUgYW5kIHNlYXJjaCBlbmNyeXB0ZWQgZW1haWwNCg0Kd2NGTUEwdGFML3ptTFpVQkFRLzdCd2lkYTV2dmhYdjVaaStxSmJHL1FQc3QxMWpXZmxqRFFsdzFWTHpGDQpvdThvZm9JRUhwdm9GZ1hlZ1pVbm9RWEJtbEhHRCtYTHM5akcvVFYxbXRFMlJXcTRoRHRxaVRRNnJFSWENCmJyTjNOeDc3WXIrNEVOMWFLSTIwYVRMRVBUSWpWVTJHSDJpOURBbWpIdGVCVTNua0w5WjN5ZWNCOFBuOA0KRWRocENSWTZjajJ5cmhKNU1Qd21YcnVzOU9GdjM5d0EyRHFZcHFXNUJlK0tEOG1pcFoyQ3RKbzV4dGluDQphZUVocFdTRHNkZzI2cmp4MW56NGRBME5jRnpaSzJwL0JQZlBJRnpSdm1vWG9XRmlncFVud3J5RW9DcVgNCi90Z21jcnY3UHFpWVQ1b3ppUG1NdUJjMWxiN2ljSS9BcTY5dVh6Mno2KzRNSkhPbGNURUZ5Z1YzNkorMQ0KMW9wY2pvWCtKS0pObjFudkhvdkJ4dWVtY013cmlKZG1EajRIbWZvNHprZDZyeVV0R1ZyTVZuOERiUnA2DQpUV0IvME1TRThjbWZ1aUE1RGd6ZEdicmV2ZEw2UnhuUURtYWxUSEo1b3h1ckZRVm9Md3BtYmdkMzZDNFENCnhNZkcxeEVxRm41enZyQ1RHSGcyT2ZTMmN5bmFsOENRREcwWlFDb1d3ZGIwa1Q1RDZieDdRS2N1eXkxLw0KMVRYS25wMU5hbUQ1VWh1MStYdXhEN0VidkRZVVdZaDNia3Fnc2xzb1grT1VsK09OZHRNRDVQc3dBcmQ1DQpLaXNEOVVKdWRkSlNoTDRjbEJVUG9YZU5yUnhyVTZIcWpQNVQ0ZmFwSzY4NE1laXppY0hJUnBBd3c3ZnUNClo4WXRheVNaL2hvT0FLV3N4MHJWNGdyZ0pWN3ByeWo0QVJCUmExcExMOXJCd1V3RFMxb3YvT1l0bFFFQg0KRC80N2Z5RC82QnZlcHFXbVpYajdWTGwyeTYzZUUwYi82aGY1SytJenY1QS8rNWwvRW5qRngwcnErcWVYDQo2aGZ0WVpCVUFiYkJ2S2Z4cTlENXhzV2czdG5oRnYyc1lJRTNZcGtDU3pacFdKbWFoSHdRT1ZOVDBBU3cNCmdiTzI1T2lUUGxZUHFmU2tHWWUwcGFsYkwrNFQ1ZExPd1ZpbG1yWjJiUWYvckxlUHdBNFJRcFdEUFlpbw0KTkRVMFhmaTdUUWNIUXJaVHB3RmJWek5QWGdDSG5Ra3FGK3MwdjhSREpIbnQ5dlZzMktFcGk0OVYvWWdODQorZ1puWk9lQURMMHJicmUvUHJJY2sxWVNqWkxicld0UVZrNCtzQ2YwVGp2aXhKN01OakE0TmdkWlBvME0NCkhrZS85WEJGaWUzTmlaYVcvY0VJVlo3V25qQjNJYmhrbU9NSmQ0TGdkSEtnbXN3SndDWW0rWHZwT0kxOQ0KRnpVMXZ6Wm1mT0ExbkVKU3V1Q0ROVlVvS1lJUUE1VUVZSnJWSmVHblZONXNVNWprZGxYOXhQdFljZXd3DQpZRm1MaXN1ZjlFdjBIQzd2MjdLd1lRUkRQTllSQThHZUsvalk2YVpkZytWY2NzbnpFaWdkWUw1VG00SkkNClpyeHAvRzgwN2JadnQweVp3V2gwZ3BXT0ZnYlZncm00SHBqaTVpbER5dWxaU1crOG5KeEI1dERvUHpMNA0KajR3OW1hbGplMGM2MEdXTnRpeUNQTFVSeU42M0MycTE0NFVwUWpTVTVyNjZvUDF5RjJBOTdhWEtiZjRwDQpxTzdjU05XRU9UcHFKa0pyTkZWS1FkV3ZYWittdlcxUFFGbWtrd2lzaDJIaVFJWG1XYjA0dVYxcEk4aFINCjZZV2syb3g5YVppSjY2NE1wbmNneUo1dUlNbHpWZllyWCtBWlJ0QlczNlJnQ1Rwckl2NmwxTTVOY0hNeQ0KekVzY1RhU1kvZStwTTVIelFLU3pYK3pITGE1a2s1TDd2ZVgrMUczM3NhaXFTSi9mSzEzK2s3cUROWlFEDQpuYnRhZWJmaDJKUzBQZGJ1YjZGVUZqUEhSNVB5ZFU5bHR1cHBHRWVZck9lMVN4d2laNkJaZklYTzIvOE0NCmhBPT0NCj1CL05FDQotLS0tLUVORCBQR1AgTUVTU0FHRS0tLS0tDQo=" + } + } + ] + }, + "sizeEstimate": 2517, + "historyId": "1406330", + "internalDate": "1528456540000" + }, + "attachments": {}, + "raw": { + "id": "163df1bf12034b9d", + "threadId": "163df1bf12034b9d", + "labelIds": ["STARRED", "Label_14", "SENT", "INBOX"], + "snippet": "-----BEGIN PGP MESSAGE----- Version: FlowCrypt 5.5.9 Gmail Encryption flowcrypt.com Comment: Seamlessly send, receive and search encrypted email wcFMA0taL/zmLZUBAQ/7Bwida5vvhXv5Zi+qJbG/", + "sizeEstimate": 2517, + "historyId": "1406330", + "internalDate": "1528456540000" + } +} \ No newline at end of file diff --git a/test/source/mock/google/exported-messages/message-export-1645e37647db32f8.json b/test/source/mock/google/exported-messages/message-export-1645e37647db32f8.json new file mode 100644 index 00000000000..e4d8a7a9b5c --- /dev/null +++ b/test/source/mock/google/exported-messages/message-export-1645e37647db32f8.json @@ -0,0 +1,67 @@ +{ + "acctEmail": "flowcrypt.compatibility@gmail.com", + "full": { + "id": "1645e37647db32f8", + "threadId": "1645e37647db32f8", + "labelIds": [ + "IMPORTANT", + "STARRED", + "Label_3", + "CATEGORY_PERSONAL", + "Label_12" + ], + "snippet": "-----BEGIN PGP MESSAGE----- Version: FlowCrypt 5.7.1 Gmail Encryption flowcrypt.com Comment: Seamlessly send, receive and search encrypted email wcFMA1DaD5CEIgc5ARAAoUfZ+9NZCeiIQKQK25+", + "payload": { + "partId": "", + "mimeType": "text/plain", + "filename": "", + "headers": [ + { + "name": "X-Gm-Message-State", + "value": "APt69E1dv+Y5u4dl0c4q9tp60bP9y4PewnMgBqBIRC+tItwK+KYOaunM osQgEC/azGqWDaAiF3htxCgt+sB7qyoyQS/gTz93HgNU" + }, + { + "name": "From", + "value": "sender@domain.com" + }, + { + "name": "MIME-Version", + "value": "1.0" + }, + { + "name": "Date", + "value": "Mon, 2 Jul 2018 20:37:24 -0700" + }, + { + "name": "Subject", + "value": "Encrypted Thai text" + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "Content-Type", + "value": "text/plain; charset=\"UTF-8\"" + } + ], + "body": { + "size": 1950, + "data": "LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tDQpWZXJzaW9uOiBGbG93Q3J5cHQgNS43LjEgR21haWwgRW5jcnlwdGlvbiBmbG93Y3J5cHQuY29tDQpDb21tZW50OiBTZWFtbGVzc2x5IHNlbmQsIHJlY2VpdmUgYW5kIHNlYXJjaCBlbmNyeXB0ZWQgZW1haWwNCg0Kd2NGTUExRGFENUNFSWdjNUFSQUFvVWZaKzlOWkNlaUlRS1FLMjUrZFN2eEIwODVnT1R2MFhub0FscVBFDQpqZGhLcDdYWG9qcTdjY1VTYWVFVzhEcVRlbDVQNzRGWjhHd3VoRk5qKzZHOFpFY09heG8rVktnb09rZlgNCnpoKzVCc0FCdUNEUnhvRVVpdlZWTTMrQzJTQkJHa3FnYmo0N1JKVUZPV1lrUUlsd0JoU0ErNGJWWGFJQw0KN1RFWUx4Tnk4ODQ1L3RUTERvU2pReU1BMnFYeDVLZ0ZhaUQvWk5EUWVXTTZ3Y1llSENjemJSQkxCSjl6DQpPdkh5NmhEZG8rczBQMU40anFHQ1VLcE9ScnJDeXF1cEtrVmlXSVl3aGtyTkU3NEJHelNHdFdwNFBENGQNCnUwYlNnQ2NLTkpJNEQ1NnZPbDdWUHBObHF1bU5hTTFERmdXQ1JkR2NRZGZlSHl3MTBQdUxyV0I4UW1TSQ0KdHpodjdTTHhHUUJjMG8wdHZlVEtmdWdWWmxEcTNGaTNlbzZHRHpLSFcrMk5rT2pNb1I3bU5Ddkk4WnJnDQpjWlZGd21TRUNsTlRuQlY1UXdEU2V2RWtPWWRoYzZURWk4cDNHbmd2K09NTFptUE8xVFNBUTE1S2d6ZUgNCks2QnpUZmYvZVRKZ2dYdlI0Z2JZT3Z5U0lyb3cyZVVROEYrTEpWMmpLZm1PSklKQk9VS0VoK1JRQ3VJVw0KYzFUVXhyQU5ETTZRMFpNUHJROXV2S1VRdURqT1JtaXpCcVhvMVl2akRFYkdIaDIrZHdhVFNOcjYwMy9mDQo0UkRPZ2FTTWhNV052VHgyTVhrKzVWOHVxb0FxWlFaM3RTTGtQR3RHVHVtbENuTGl2Ui9jS1RlTDB3SWINCnVlRVZURFcvZjduUWZodVBYTCtmVkw0aTJISXRRZ2w2OFlRUWcxUHh1Q0hCd1V3RFMxb3YvT1l0bFFFQg0KRC85NjV3K1RZNmhxRXR6Z1FhSHIwUzJBeU5kZ0xVMkhrS0kyNi8waVo2bTVWOVM2S2QzOXI1SG1WT2NZDQp1TkxEbE53bFhqSzNvaGJtRWczVm1MaXJMdDR0aXE4bWVONndwQ0tMdjI5R0wxcWtOWHNyZkEwMWRkOE0NCml6WUZYbWYwYzdkN0hrVjlKUW1VcjB4YmwzSXkxbU5sM3FjWG9vUjJPb2NpV3lrSzBaNEVTTEtOVjJEbw0KVUFQNno3WDdqVkhMc3RyaTVCT3FNS1RSaWh2RkIyck1HZEpUSXpINlh1TWxTbkpYU2E4TEJIRTNGWlpyDQovU3F4U1Y0cHNlZzJWWG91c2NkRGtNcTk1OFpBYUx0ZXB0clFUN3JxTzJxY0pvRTNYb29uNVJKYUZ2L2wNCk0vVlN6ZmdmY1hDZkpGMzRITXJaR2pySGRkZUFHRys3azlFL2lFR2NaK2t4eDRUb3J1emR4R2RlbkFOdg0KUThXNWwzQWtUMXFsdlY1R1NCMHV3cEptMUZhdm9BdGl3UWZMWDBmK0RDMWpJL3dMNjU4K256TnA3MEJZDQpsTDdNWE45UGdMTFkyMndTSVlYRzdaSGxiV0FiczhXRDY3Z0J3N1c5NDNydzAvbUN6dWhRR0g2c0pTTGMNCkVNaG9DQS9lUGszb0wyTHFVOUYxSW0wNHR6KzBGQlArdFBaRGV5K285NlRsLzBXOHdCVXhMQ3EwU0Fkdg0KUm9HK3RtL3FmRnBKbkN2S01PbFcyVU1UMmRZeEZHQXNUZGdIVTJ4V0JQN3YvbnNVc1JCTStGMm1HY3hoDQoxT09WenhzMDFTdllxemE3alBoZlczTllCVzVRaHRuSXg2dzRiNmg4YUZyd093Z0gwQitodUd2RHJwcFINCkw1VGd0SzMvSnFvbU90Yms1bjdUMllJRDhkTEFJQUZ6dUJtZEZ3TXR5elUzTkZ1Y2M0ZWtmK1pZTGlSMw0KMGVkbXNQaHpBRmhIeGJhYVVpbUNmZTBpcFhpdVdNeU9UZ0dyL2VRSEtUNVRheDlRYkdxNmo1WFZ6QXIzDQpzQUorWWhvMlh2QS8rajBYZFZIRHczbTY4SEpjSnpjSmZFU0lIb2Q4YXNpa0pTcHI2bC8yYTdlN1A3eWsNCm81c1E3b3doaS83RFhUUGRTeWpCN3JJTzM4OVdyUnkzQUhCeTJUNzBxRWNYTC9aY1JYMUhnMDBkcU5aMQ0KejZyOE4xZENwNkVuNzFtaWU5anhOMzdpZWpHSmdEN3lneXIrUm00UThyMGRzTDgrOHdmRGNieFdwSlp1DQoyWm12N2E0TWRQWUo2YkZpVkpZcEZhdTI2elAzDQo9YWFxRQ0KLS0tLS1FTkQgUEdQIE1FU1NBR0UtLS0tLQ0K" + } + }, + "sizeEstimate": 6480, + "historyId": "1406184", + "internalDate": "1530589044000" + }, + "attachments": {}, + "raw": { + "id": "1645e37647db32f8", + "threadId": "1645e37647db32f8", + "labelIds": ["IMPORTANT", "STARRED", "Label_3", "CATEGORY_PERSONAL", "Label_12"], + "snippet": "-----BEGIN PGP MESSAGE----- Version: FlowCrypt 5.7.1 Gmail Encryption flowcrypt.com Comment: Seamlessly send, receive and search encrypted email wcFMA1DaD5CEIgc5ARAAoUfZ+9NZCeiIQKQK25+", + "sizeEstimate": 6480, + "historyId": "1406184", + "internalDate": "1530589044000" + } +} \ No newline at end of file diff --git a/test/source/mock/google/exported-messages/message-export-1663ac8b70e22517.json b/test/source/mock/google/exported-messages/message-export-1663ac8b70e22517.json new file mode 100644 index 00000000000..4cfc83fa1b0 --- /dev/null +++ b/test/source/mock/google/exported-messages/message-export-1663ac8b70e22517.json @@ -0,0 +1,86 @@ +{ + "acctEmail": "flowcrypt.compatibility@gmail.com", + "full": { + "id": "1663ac8b70e22517", + "threadId": "1663ac8b70e22517", + "labelIds": [ + "STARRED", + "Label_3", + "SENT", + "INBOX" + ], + "snippet": "-----BEGIN PGP MESSAGE----- Version: FlowCrypt 6.0.2 Gmail Encryption Comment: Seamlessly send and receive encrypted email wcFMA0taL/zmLZUBAQ/+MC4kEIaAIdbuApd3CIf72DSEy9+A9+KlcXbhbFiP", + "payload": { + "partId": "", + "mimeType": "multipart/mixed", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "multipart/mixed; boundary=\"----sinikael-?=_1-15385845241750.7333033959651614\"" + }, + { + "name": "Openpgp", + "value": "id=E8F0517BA6D7DAB6081C96E4ADAC279C95093207" + }, + { + "name": "From", + "value": "sender@domain.com" + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "Subject", + "value": "wrongly removed < and > contents as if it was a tag" + }, + { + "name": "Date", + "value": "Wed, 3 Oct 2018 09:35:24 -0700" + }, + { + "name": "MIME-Version", + "value": "1.0" + } + ], + "body": { + "size": 0 + }, + "parts": [ + { + "partId": "0", + "mimeType": "text/plain", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "text/plain" + }, + { + "name": "Content-Transfer-Encoding", + "value": "quoted-printable" + } + ], + "body": { + "size": 1738, + "data": "LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tDQpWZXJzaW9uOiBGbG93Q3J5cHQgNi4wLjIgR21haWwgRW5jcnlwdGlvbg0KQ29tbWVudDogU2VhbWxlc3NseSBzZW5kIGFuZCByZWNlaXZlIGVuY3J5cHRlZCBlbWFpbA0KDQp3Y0ZNQTB0YUwvem1MWlVCQVEvK01DNGtFSWFBSWRidUFwZDNDSWY3MkRTRXk5K0E5K0tsY1hiaGJGaVANCmg2YlQweDdQU3pLTUFyYUFnSVJhVW11WDNXb2p5WW1lQTNzWk90Rnc1STFUWG8yd1gwV1VZbFdHdFhBOA0Kc2dzUXZmM3ZveTQ2REVoRllLanBrMzhPcUs3N0dXblUxdDRRck5VcWpRSjZwQmpzbG85OXl4OVJ2WXB2DQp0MVgrTjBPTGNJZXZUaDBSN3RqaWRQc2pReDhQUmVqaHVJQWdNNm1JMzluNVlVQi9WQ01xRFJycVF6cmoNCmNENy8vNFgwZUpoVFlqREd6clNkTHRLL24yekRjYTJYZUhlM2plNE90TEdxWVAxOW40WWdtamNFVnZpdA0KUXNEb3JUZFh3b0RLcDNnWjI3Vm1qa0w0dWErQTRqK2VONzhIWEFiS0NmM0hrMHh4T2xPYURtQWRLdlphDQpYVmIxS1pOTGFBZUU2MkdpRW9tYnZGaHlpaHZLQmZYeG1CQ3ZYQno1eDZnODNyNWlkTGQ3VTZOZGFmeXgNCm5aTVB2eHM3dXV0eGVKM0hHMm9NdldQT2hyMDBGeWlKdk1HOG1mSEpoNkNvaDRSa0svZThveGVaaW9TOQ0KTDBaWU5wbXVrZmZjeFR5RCt3bTEzZCtmZXUvNURGQThTYkJmbmhFT1c4MGR6cEE3Q09xeDQySGtPbFJ0DQpiQVBuOUFvK3Y5aHpoRG1PckhUWWlHQkdCelJPNTNiNVd5cDU1cHlZQ1k2cjRMeVIyK3M2K1JyQ1ZCbzANCkQ3eWplejlBcVB3NjVzWWkxcWVUNFVIdEJ6VGJpLzdsbDNFanRwaHpMeFR2MUR5eXRNanFEVUhjZzdRaQ0KdnJxTFkybWZGbSt1ZHFiZFI5OVdYMld6SmlqSlJCd3Q1aEV4Sk1NQTgrYkJ3VXdEdmIxMllQYVpqY1FCDQpFQUNkVzcrSUszUmd0TGpKbW8zVjk2NEpSOENRa1hxNTBYemdpQStjSk9YVE45SnNjNzJXM1ZzMXhaRTINCnA1RCtJM2I5cVFPTWd6V05wWUY2TjVOaXlXRkR0S2hHeWVYTDJ6b0c4eDRDT3laYjI1YWwrK1BNdFRrVA0KS29vVlNicFlhUmlmNlEzdldWWjlDMjlhZURxeGEvTXd4b0k4OXErQjBtTzFvQXdlTmdrNytabWpPZVlHDQpmd3hrWW0rT0dldmFiRFdacnhLTHIzTGhoV0lGZWV3UHhmenlpM1RxQVpqRW5Fd2tEMEZZc3NSK0x0U1gNCklzYlhUZGtWNmozL2N1REhMZEo0eDluRXIwbWVmcFNOZnpJd3E0aURZZFdSN2h1R2pFL1Rrdy9TRjd0Ng0KTHQ3T3dzTytEVnI0MGZZT2kwdm5GNWg2R014Q2dzSHBNeTdMQzlpQ3BkMGpMOXdXdlI2SXVrSE9WRXdqDQpXUG1aMzRNNjI3SUMvT2dpdUZsbFZtWGRKL2J0QlZFbkxPeXI2aHZzTUt0S3FEMGNTODNGb2FZMmgrbjUNCi9HOVd6U1dqQUJJWmdzUWlqb0FJSmMxQzkrd3dOM3VVRm9jcmdkRjU0WjlwYndaSFVybkJ2Q1lyTC9UUQ0KQU43aUJ2UU5ra29GQVdlUzFKTW1HS3ltUjN0cWlCOHBTUVU5U1A4cllKaE9NY2owb2V6dVp4RVpHOGdlDQoveVVpamFGOFgvN05nZnFMb0J5bTJtZm9MeGsycEVHRnVoazJCYnR4aTJMZVJsNW56cEN2TzZvRVlkWWkNCkkxRVJ5T0EzOUJlemFOMWt3K1FybXBxRVRLbStJbnByQ3hHQTF2VU9WbU9ITy8wWUhaQmFZT0l2azJYag0KamtxNmtWRm1ReGpGRTlMMUlmeGJhR2tRNzlKVkFVVjl3NjZ3Y1N6MHlVTHIyL1U2a25RUEJuRU5vYmw0DQo2ZndpQmtpU0dBdktkOSt1dTZ3SmFaNXRZUFdVUDBIQXVLY2Nhd3l0Tm1HUkVXQXNmZnorbnJNc0VEVUcNCkppMDlKaUxUUVU0QUNDYWNNM2hQVnc9PQ0KPWUrOHoNCi0tLS0tRU5EIFBHUCBNRVNTQUdFLS0tLS0NCg==" + } + } + ] + }, + "sizeEstimate": 2479, + "historyId": "1406092", + "internalDate": "1538584524000" + }, + "attachments": {}, + "raw": { + "id": "1663ac8b70e22517", + "threadId": "1663ac8b70e22517", + "labelIds": ["STARRED", "Label_3", "SENT", "INBOX"], + "snippet": "-----BEGIN PGP MESSAGE----- Version: FlowCrypt 6.0.2 Gmail Encryption Comment: Seamlessly send and receive encrypted email wcFMA0taL/zmLZUBAQ/+MC4kEIaAIdbuApd3CIf72DSEy9+A9+KlcXbhbFiP", + "sizeEstimate": 2479, + "historyId": "1406092", + "internalDate": "1538584524000" + } +} \ No newline at end of file diff --git a/test/source/mock/google/exported-messages/message-export-16b7fce1c1589c0a.json b/test/source/mock/google/exported-messages/message-export-16b7fce1c1589c0a.json new file mode 100644 index 00000000000..533d0b02096 --- /dev/null +++ b/test/source/mock/google/exported-messages/message-export-16b7fce1c1589c0a.json @@ -0,0 +1,70 @@ +{ + "acctEmail": "flowcrypt.compatibility@gmail.com", + "full": { + "id": "16b7fce1c1589c0a", + "threadId": "16b7fce1c1589c0a", + "labelIds": [ + "IMPORTANT", + "STARRED", + "Label_3", + "CATEGORY_PERSONAL" + ], + "snippet": "-----BEGIN PGP MESSAGE----- Version: FlowCrypt 6.8.5 Gmail Encryption Comment: Seamlessly send and receive encrypted email wcFMAzBfgamu0SA1ARAAuHXRxM9k+XfQ8iPNconAE62s5pP1PdO5iS01/OB+ 3+", + "payload": { + "partId": "", + "mimeType": "text/plain", + "filename": "", + "headers": [ + { + "name": "X-Gm-Message-State", + "value": "APjAAAV2VQGZ/GnkRwlfU7wqlXjnSbYRV3j+fOC3xwgvpC4eW0yB8WZ3 x5OqG2MC0UiCvhP+pzK1NdTWiEvnuAamIw==" + }, + { + "name": "Openpgp", + "value": "id=6BF16EE1ECE7A66C4B6636DF0C9C2E6A4D273C6F" + }, + { + "name": "From", + "value": "sender@domain.com" + }, + { + "name": "MIME-Version", + "value": "1.0" + }, + { + "name": "Date", + "value": "Sat, 22 Jun 2019 11:28:58 -0400" + }, + { + "name": "Subject", + "value": "quoted content should not crash the extension" + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "Content-Type", + "value": "text/plain; charset=\"UTF-8\"" + } + ], + "body": { + "size": 6160, + "data": "-----BEGIN PGP MESSAGE-----
Version: FlowCrypt 6.8.5 Gmail Encryption
Comment: Seamlessly send and receive encrypted email

wcFMAzBfgamu0SA1ARAAuHXRxM9k+XfQ8iPNconAE62s5pP1PdO5iS01/OB+
3+6xUX5oWemiwXjmKetzMvYvSA4ltQ7fWxwY/RznfUqxiWQAMQflWINMlmrq
pv1iznuVrkdXiyhSLvHuhN3F6ZrWFBn3UL5xDHPHYaFsg2azvqgF6QXK9i37
wYbZZzJ9OU5yqAdzdTAk2Il5V/G7dh0Su9qrY7NAa46DIqbgdlbLYy6qLcvx
iI1yaliUg/mCbiVj+6kgb/Fs87peaHg0z/pcngOB0a7x1ofbIW/rcTbhsEjH
g6I+7XST3RmKcOv0PgCtEDU6HnRINbbKrwr9M/7xjjBKN8iyDs0Z/dOXDKKC
FuUmD10ut8/3d4jJfTIb5FEiPUNsChM7lidHadKjMoEg55iQgUTp2FeWXyIl
F0UlmWRZziljUURdDU02z0F+Ng9wJkCNrdaCHZeULWfU4+zhvobb/aTQfS9C
IDC9Qo1jPw1U1nojFMQdBMQQ8P9xsD8vHkeG0f3FOzvj8xWm2oJEvBDpsP6Z
3tGf5vV0uRFWuTE2xWbV3cMdvsL2rVJanmGnsddJP4p2WS5at7UDdm7DxyKR
zUJnuvITlydd78pSXmqUrw9W+y0oOdIfwWz1A2V9pdaYwBolPGt7UKUeSK6A
MYELv6Ac6Yt9TBJ2B7pLu/w0Wtvjw8IGGA/YxKX2t4rBwUwDvb12YPaZjcQB
EADRrSJiXzDXVdM+GbHBW/rdKcDoHq6n3f0mUSbwumiz51pQrtKmNgWFQZuM
rkV2O76foEDpUn8m3Gwcoo0MvCxJKWQN3U7dzrMzKd79egDQr8mCQIUqPDbJ
4gxVCy9pMAI51oIFM4bOD51MdOgrU1uITZDtaapswiIMywmjxYGRGLDsQ+gB
VaGF86QgHSgH2M7KdWtN9MSqDs28z7N9kdr0bVWAmVauSchqBeGEZAOq90d+
pXET/bEm0Y0l+qpOFEfkbWGoAsjOdOa0rSmBcfZoSh/tYWDpPwJDT+Ip4XLp
C3C/FSQ11gPt0+Ab8/YouGYmICTzMVUkiHxHGs24n6Tww26qBwQFDzXUAwxL
7LENsgsebLDOW8RjCn3EUuH0vZID7T13Xa9R1YQQHmIebVN4/grz/qGDYaZ0
4Ub+pMWpNYIhDWiQRkj3u39m4hCWa2Lo9d2avgUqmdghCDKZkfMtNRAMyLt5
LSDnh16yrl1p4P4e7IMDFp6Yt+eSCjH55HaDGeq5Z/3PhlbD+VFY17v72cBN
uyqsecJpTacESxX0Q4Psgahr7htG71KvIjaRBeN05I80IXjrMcTY6c8r0qhz
72rW2rfNRuwjIGtJOUfFK6vAovR/6kMJMTM4elJ4Q/EZIN7zd0OY5z/zZ+kP
oyC8hwFHgwhhx1/u+j8Ira7DXtLMIAFT2PriDTi4aGUjforTVKCh9DifU8Bp
UvpEUJl71EdFZ5ic++6pkGKhyAFbNvJS3dvZWE50/Cf+m8iUvZCs63aikTON
djBOpQgE32ig39oM9ggHit0zIZPtZl6XTJHytxNoydnT1bp2qJNj81ZyTlQB
NTusbMcY3usDMzIbgFdiNFLrRTaZ6KPuXIzljP7Xw2Lm+TcVFGRUmDkadFF9
Y4RC7q3isJz9h8i5Q6sbaWJu6Ylc305FDKH9XensyR0lXGEX7ishe5Mg8MBp
OeSyw20GEejrxUHOp5daUA1XKFX6+vZbekqZ57Z+JFrB+U3cWN2b7ADHkxol
hfnCymupqLmoOj+U8sx2omWE5KBehRiSpWIF01Mx3j0KKwVpJo8wisB9WXg4
G3V2LduE+BTZves/0A0FTUg0m5ZWeqUm1MAOUkQOdf3+C8sKVEUUUeW6/chL
yQXhKCfgpDHFmYKiTUr7ybPmQZ/2hll49a0xkndGPi92kmne5dz3X7tHtPH2
cgRAluAt2GU7nPYxu3jqWURfeIZvGRLPd4Ty3CfQDAymEQr+mMvkgFdfn2pj
lhDGntJgUmNzgwmpD60y4eEZhYCnDFQUdEACHb8OTFZ7sZhKO41po/CV7Sip
pv9ryn/5QJJkoDPD1Yy56NqzoaAZxSfm5Uh0mr1wqCjk4yBHrvu8naYpnQMw
f+0NM0BffntPx6jUr58uUh4GF9bwThLYtFY8SRVMRbz2R2Vfgn5nxnD3EwrV
GZo4YnzXXkryrD2V2uwTc8iOhIc47h8LcN7Riz4mvg6wlc2B04skZKknRgBN
wtPXB0cjKy5vi5/mBTnyHGnCVxhGAtaCsGFBLNmIAoVuu8Te0o0whDyA+Nly
9aBJunBjkfLWol1Xc4wO1PKOE1xQAS9EzE3B//GujyzoL6311HgABCjMQeCL
3Nv7YQSgp5meoBXX3+CqKiPDEaKY++ftr8YomcIYQJyDUuRhXoHynv7LcepI
/QUdYKxem7XECg9rVsjkz+P0xtPtTCW1/9wWFBkZJP+l6V5zV29Q4ROAIKhN
uNmcekI7gUYKhpMp2AGt6MalswUoqhV0aMIpRPdVzN2xrygGtv3LEfOXV/lR
BdW3J5I/h0AcbR1cteMVZfFX0DInDtJ+eOUj236HFWuJ7+c5+aj+fN+IAubQ
EinGN1n7KPRtd7s1W/T/t7m3ECTCt2bjOGu4E7kcetNuROV0cRpISC40KylC
WDhCY0T0jRheyP0n0QA46UHCMvWsFPc8wh03MI9dvDuBf4olzFX3UfCd/JC0
p9KlzxRG6CMlJZaDykP3rbCMatUsioMcCubma63ZGUJ0/s8zaOhh5wM8fLLg
VJJ0z0cxZJOOaNyulIrCcMonQ42IAiqNr3lQO9dQ4TeR2qCrai90UK+DbyH/
ptuxG3Z1D7RWn3KTMoL4lybbcD82HsQvzayNKqFKs3ePRpJ2bHyrb1ehhfuR
D1tBuLY3qjk9Ah/bPvck/wWpzui/+wanfLRHkl0n7TtZIqA6U87OSQCIGQpN
OZfhNSzyFYHwfdHTXon2lyyBXwRAm4WVvb4hYU/3ZtVheUevqjDW0gau4KSo
a+nbXYYziOrWZ1HtYJYuuDS43I2f/fmNpv8PC01OO4b2FOt9QNuHnFzTPnI8
gFy4dXj5W9WU/wS6eLTBZqftSa5zM8lxEM1ZLQHOtgH3FUwvNJOddujHtJ5V
5rsXxFNNYV9WKPxVa1fB9tWvmtXHVLr39djsL92rQTGTgniViHNJRAGk2eCC
MoheMqVnBHwv+1fIy4YoeWZmmbWnpIq/l7Zi0aKmhsgu5EeJ66R7g3zL2srC
Iu9OVyVCiCzb1j+m4wSTiLzLlc8iPREdsTt+F1cpbB1b9euEDA1l4OIIEcLa
0oxZICpvBcrrZkVxayPjsPzz1y/3+m+2ylEZbew30kaHFxet0abd3NWRYzxO
DRSNl+ZGG6ThAqKcmxPrHNv2gUIqt+vo8O8f6REaPMqRpZRdCesBc1XD5FMi
JREzoOCLrFdMO/f6SOe6w7Q/tzQqVR/7YQJJ4aafqCgclckF7DW//JKkAo2x
nV63/nHrv7zCeurdFLs7iYu7Zrjd9/ZEZ0DWzI7MKCf7rulwLr9Z1M4s+zJy
NeV2Qx5HIZ7DBxQxj7PE5AVKgQntVyS4fYIfc4giUDvFb3++aTJ+/PxEW8o0
W7kd/b9Y/UoIwo1gTA1vL8OQtAmN5/izO23APj2+k1Yxa6seaVbGUfgtehde
Pko9tgcRBPr+nQMFuiWxzgUb5HFH/iibg1sXZ32re+rKJkD6eUQBZF5gFdCS
O4UbO9GCEvOCNoAFlatkYEOhA4i25cRW9FmBfmJyCZ/ot4vqR5bHYvkddZLp
vUCYx9XQn6+TsZwaRB6MDPFABqAqFrsJnjzOfjO/wchn10vo9zf3x3dQcKc1
GwJECb4v/awAayNzqQgmAjmT8JqkcHDGrbUvjVJYvfVA57V3L7Ohd5iceicO
Pb4VEPh2X6/2xQKsXgpDqF4aC+T9mJ96olqTnFsqKwib+m5+dJa9PCAKEKxB
uPzU8j7llXBChJt7qwzPNShVV5kYTWpnrUJLyvjCP9qBZ+H/9UACHQvsrP6Z
JERvjq5sUuLpSOvqdUcTACHyEZWHZjXArGLmpCdTsyeHv2UF6/G2RVXrwDVk
l8xL4pBQkgG1HSA+Ch2dDTaFyNZcZuF6EtwjfGOyJ0a2dX7sOTSXVggIpXwf
HxLB7KZg8GOTr7LRgjMl3h2bCOQJ8K4fOCYLw8yAK+Mw8dQHwvtYUKcB8jCl
2eg3NAgDfqquKS0V06usPmSbXjgYyXTwYFM8NkOglAidnMKE+mzJRPsmInxs
B90SL2vu7+R5+X8tbLfCf2AMDd96cgCDB3TCxgaUbo3SU+m6d97ALpiF/Y6I
AUkl+5fcUdk8pPXkWzs/Gyy/zpSmSF3I/6O0/S5RkCGVZ70Ig5+feU89RZCW
d+jz0r8plMUn7lDBmouUkHGIkmXYHM+zf6q9C17VWBwJCx/XddGmYTsPHmnL
9uHOIVNpDluf6cUvp/JlZ7t28f4fCqMFLF1Ebi87zVJBXmyvgue4WEcHVnAD
8ZNTpVvc03ZGba9UchGdWt5Y3kauldSFPN/4ziCPOeC+L50M84irXUevO5Es
wAFJtm+RI6FycBz7CLlZKjxz8I97+XxsjA7ZyuvUNRhORwv9HZx2BJ0OFM01
z/60Keq+QTXPzpzL0xAJNdrrYi3CtWf7gC5hTUlO8ocnx4qnwGOPyo+RmMGk
qKXLCeeb6OkS+/PfoGXm+9mBpPiskdMhhDD6gEfP6Z6oX/hf/nlI9JEMKECN
QpPzOcFqDPyBjyBhTo3VSQClqBV2K1dQNL5GLgXa8tkHaXlPtVJR4S0WHCVh
a3vcT/ossJijMIR01HrM1jhbj+mFo6wc0o2XTG003IZih9T6ZZvCnGV6v31/
JZ2LOWfBReStcSrFZ5ZinS7fWcG/5JbuokKZVUxWqJq3jolD6nKpfEcBPaga
/c6SujlXKQ2Gr58cmdCrN7JTty5F7lFtZlZRcG7QHtr01RXrrqCGU++29/B7
cS4jpPvX8of3zwaPiBsi68YfkfAlyhQhbWIYYmWFjtyC2aduiGGcPudnRzVk
YG3li130yRvD+xeS4f4oficXUdB7SvloRbYvNuT+taCPJ15ncSUXwLLOFWk2
7PY5r5h6PwPVxhxEtmUgcihbBP59WWViL+ijxPCBoPxDknREjeJOgKxoswyK
LuOj5R2D6SU0Zs/v4kWwXCz3wTTdU+ph019Z6SvLnm4XFbJTx1MI90XYzydD
2HFYgMuAEae72Hmv8qDO8SOat+3EkNw9e4DAT/RGOmwuPR95gMucqJLcP/u2
JxLNQLSUnlfABSGiAA68Gym6ykDKYMrt4v2JOFNE7j457Iq0U6fKKRxVGNdc
nF4KmIyA08QIc1YKoR794+/gNYmb78PCsBQbXOmgldOAKQQl8+5Cz6Y2Mu1U
duXWUmcAi/IEb1w815jTzedtoIQ2GdW5gGIcWSLiLztV/z35gDPxXb0HUGuO
J6THAR4mc87euWzcBhUBxdfNaEiTdUgcfx5M/h9YFuhS5VJjK1rjX9I2jwP/
gUBlWVwmG3mE0thoVxpSFHICI7uw00PjTNRA3qiXe1sEB6D9/WRuqUvKfkak
6ukzJBHJA2buKyZqOGE1R9ZJniRImpJN9sPVF2joSvHPB3cSb1JWENeF2T5H
gXMhFY2jbgpcXucMHapqDLJ3WMXCCR6R0pCGxWnYcY0O8klv2r/TPfdptVJO
aEib8XRAgxR7FfctRKmfrf0d/9UQQRYsBnN7fn3baHFG1UUVUEYHTr+iXpMM
CFontBV4pK+Gl1bYAvYWLVXeL01drpVTgU24FZp4yTPC
=qLXa
-----END PGP MESSAGE-----
" + } + }, + "sizeEstimate": 11577, + "historyId": "1405919", + "internalDate": "1561217338000" + }, + "attachments": {}, + "raw": { + "id": "16b7fce1c1589c0a", + "threadId": "16b7fce1c1589c0a", + "labelIds": ["IMPORTANT", "STARRED", "Label_3", "CATEGORY_PERSONAL"], + "snippet": "-----BEGIN PGP MESSAGE----- Version: FlowCrypt 6.8.5 Gmail Encryption Comment: Seamlessly send and receive encrypted email wcFMAzBfgamu0SA1ARAAuHXRxM9k+XfQ8iPNconAE62s5pP1PdO5iS01/OB+ 3+", + "sizeEstimate": 11577, + "historyId": "1405919", + "internalDate": "1561217338000" + } +} \ No newline at end of file diff --git a/test/source/mock/google/exported-messages/message-export-16d558cb71e8d510.json b/test/source/mock/google/exported-messages/message-export-16d558cb71e8d510.json new file mode 100644 index 00000000000..186484ea06a --- /dev/null +++ b/test/source/mock/google/exported-messages/message-export-16d558cb71e8d510.json @@ -0,0 +1,118 @@ +{ + "acctEmail": "flowcrypt.compatibility@gmail.com", + "full": { + "id": "16d558cb71e8d510", + "threadId": "16d558cb71e8d510", + "labelIds": [ + "IMPORTANT", + "STARRED", + "Label_3", + "CATEGORY_PERSONAL" + ], + "snippet": "", + "payload": { + "partId": "", + "mimeType": "multipart/encrypted", + "filename": "", + "headers": [ + { + "name": "X-Gm-Message-State", + "value": "APjAAAUb15chLaGd9+iPy/5kyuzk0uvDvHUSiCnfo//1m9xKY+PIuvRU AGrPyRjvHl46DBkwQtZn5vssrzCELOc=" + }, + { + "name": "From", + "value": "sender@domain.com" + }, + { + "name": "Date", + "value": "Sat, 21 Sep 2019 13:39:02 -0700" + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "Subject", + "value": "encrypted message sample from EverDesk" + }, + { + "name": "References", + "value": "EDSK201909161405190000048B" + }, + { + "name": "X-Mailer", + "value": "EverDesk 5.8.6" + }, + { + "name": "Mime-Version", + "value": "1.0" + }, + { + "name": "Content-Type", + "value": "multipart/encrypted; boundary=\"=ENCR201909161405190000048D\"; protocol=\"application/pgp-encrypted\"" + } + ], + "body": { + "size": 0 + }, + "parts": [ + { + "partId": "0", + "mimeType": "application/pgp-encrypted", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "application/pgp-encrypted" + } + ], + "body": { + "attachmentId": "ANGjdJ-LpRu6X4T3_0sc6w75k2ue7zu-GmlYGSw3NN4J3mw-t2iBu6PbCcofWxMypG-E1uzZJZDPBMGL05aUnRPsxstoTxctnTo5iebpaVO1aOJDVmlyoZsATpNHwKT7rl9eJiXmiLqr1gtnXIf1hoBdP-C0DDztVcKW3cpzDNH_RIn7KnMigJHIk9n_saMf-JbOkvx_UkzLdmJpgUJJ70b4QZ_Cu8Rs6-DYxbYJz6a1Xm6syxwpLafdUXZbKdoUnWC52LsM2u7nmMWkoEQCiphXghW3opq359hsGXW6K9YU0SA60YDyNrqEkW2n80GmGZwH9sxhfA-x0h0pWNwZu2lvAlFKg5oTRzmt1CDN-HOIYetXDmbtahVgsA-EQFA", + "size": 12 + } + }, + { + "partId": "1", + "mimeType": "application/octet-stream", + "filename": "encrypted.asc", + "headers": [ + { + "name": "Content-Type", + "value": "application/octet-stream; name=\"encrypted.asc\"" + }, + { + "name": "Content-Disposition", + "value": "inline; filename=\"encrypted.asc\"" + } + ], + "body": { + "attachmentId": "ANGjdJ-lyVfCmgIskxdLKmIegNuvv14Gk66bGGTw4Pwdphd62Iw_AV59LJPL6S2zv7Qc8za1fhtJo1WtNJncnqpO8rpe9QpS_LxMXZBJ5gIxLkPf8XvzBtB7P_w9qCrxKX8kYZWGWm4SRKo_N2OKk6LLCvrL7HqU07DZcivykaZYNzgt9PKb0aKb2wzoDV7ZgE6BH7HLwDgfFBq0VoFzKYoI33W0amaqC1_MZaMYd1x1Q0Onpsq9YHnkCHXSUPFni1Cv07u9oH4vhKRYgaolbZ9JxKmVNu7hrHD8z5Xt5TFue7r6yKx49VhoVB3R6uMM7nisHNTx9qFD9YK0qqX184VpQSsfJIU-SskEdkE3bdacefa9rqZaRLxjut4dyYw", + "size": 1777 + } + } + ] + }, + "sizeEstimate": 7157, + "historyId": "1406352", + "internalDate": "1569098342000" + }, + "attachments": { + "ANGjdJ-LpRu6X4T3_0sc6w75k2ue7zu-GmlYGSw3NN4J3mw-t2iBu6PbCcofWxMypG-E1uzZJZDPBMGL05aUnRPsxstoTxctnTo5iebpaVO1aOJDVmlyoZsATpNHwKT7rl9eJiXmiLqr1gtnXIf1hoBdP-C0DDztVcKW3cpzDNH_RIn7KnMigJHIk9n_saMf-JbOkvx_UkzLdmJpgUJJ70b4QZ_Cu8Rs6-DYxbYJz6a1Xm6syxwpLafdUXZbKdoUnWC52LsM2u7nmMWkoEQCiphXghW3opq359hsGXW6K9YU0SA60YDyNrqEkW2n80GmGZwH9sxhfA-x0h0pWNwZu2lvAlFKg5oTRzmt1CDN-HOIYetXDmbtahVgsA-EQFA": { + "data": "VmVyc2lvbjogMQ0K", + "size": 12 + }, + "ANGjdJ-lyVfCmgIskxdLKmIegNuvv14Gk66bGGTw4Pwdphd62Iw_AV59LJPL6S2zv7Qc8za1fhtJo1WtNJncnqpO8rpe9QpS_LxMXZBJ5gIxLkPf8XvzBtB7P_w9qCrxKX8kYZWGWm4SRKo_N2OKk6LLCvrL7HqU07DZcivykaZYNzgt9PKb0aKb2wzoDV7ZgE6BH7HLwDgfFBq0VoFzKYoI33W0amaqC1_MZaMYd1x1Q0Onpsq9YHnkCHXSUPFni1Cv07u9oH4vhKRYgaolbZ9JxKmVNu7hrHD8z5Xt5TFue7r6yKx49VhoVB3R6uMM7nisHNTx9qFD9YK0qqX184VpQSsfJIU-SskEdkE3bdacefa9rqZaRLxjut4dyYw": { + "data": "LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tDQoNCndjRk1BNjJzSjV5VkNUSUhBUS84Q2tjV2VMbUN5OGx2QU5sbDBLYkE5eW1UaE5PbVpqYmxCTlJadmdUOERxYUwNCmhhR1h6SGFNR0h2aTBkNjZQMzhSWGZEYytIOWwvakd0ZFMxemdpTUpNcENVRnREYzNPUGdPdUE5M3NSZXFCc3ENCjdmdjVhK0xTZGZGWlVQZ1VrWE0ydXIwZUErbmlORStHM21iRGNyL2N1SUxZSTh4VHM2eGJIUklLVmwyRzA5ZVMNCkJaTUV5cUgzZHVJQWkwTTQycjRML3V2QUJUY0V5Vkt2WS9RSEZtRlRqMXRTenFTRDVQRHYrbk4waWhOUjE2UjkNCk41NlBNY1phenZUZENoaFh1QTNNTmNpS29KdGJaNzg1Yy9kd1JMOGJ6OHJyN1dqNmlGKzNRbTZrZ2JrZWYvbzQNCjZEOHU4RzFlRGZTV3V3dFhWcUlPdW9rZC9tWWdOSVZad3Qxc0p1a3VHdjNlTDc2YjdNaGszbENFakU4dVNPZjkNCk45bWJMRXJlbDVWVVR6TlRWcEEzMzZhQm5NS2pFc0pVSU9nMHNVMHE4WEFLZVNqY3JJdUJyc2FLcGpxN1dEWHANCkZBMmVRa3BIcHdabmxXalZNT1lSUkVkamkzRy90MzJBVFRjaE5YbDl6aFFzaW9xUWJmVXRXa2oyV3ZsdEU1b3oNCk84NWRkVlVuaXFwUVBkUWFvalo1K2RQWjhTQkMvNGVVcDN6NEo0L2IwZldTVFBsL3RMYmxGeTFISnMwbEtHNVoNCjhBYW9DR0Y1VExQb3lnWGpCazBJbWlrZUlHbFlJU2hWT3FHMzZSSmxNaDR4T1FDbVkwZzluejlMZENFSEordUMNCmtXaC9vUkVCaFNNbnFsbW4xaWMvREcxNmgxN0UvdGlPdU94c3FUZklHbGtMU1NoWERvaVRqeGdtNTI3RkE1SEINCndVd0RTMW92L09ZdGxRRUJELzlmNmp3SnhZamRCbzJwVXk1YytnQTQ3QnRXL3p6MTJNS2hSQUhkKy9iVmJUdjYNCjVKaGxCdzFKb3cwY2tqY2JuRFJxQlA5RUwrRXJBbGMyVXpHYSs0MkFocmMySGxEdnlNSkNjeEx0MEZhMm5oWEcNCllXR0hzUWJIeGdiZVBXSG96d3VuMlJYYUF2dkJvbmhCYVl0Y24wUVBORXRBckI5dXlPNFlxWFhvSDEvbDAvZ2gNCklBenVSK0xOeW13ZE9CWHB5aVZGTUpiNnh5UUY0MGFUMzFrSThHZStVa0Jia1dEcGhjRVBvZ2Q1OWtyQkVwd3oNCmZCZlBkbEdvVHJTd2ZiS2JzaE0wa2lFYlBoK0VTTVZ2eXBnK1BabzFRcDBlWFl0N2dqbFlZcU56UUhXb2JUVHINCklRalkzVDh2bWw3WGxjUHp4TEZxdlFsaXVJWnlSTGN6dm0rd0RoVGorSi9kWEFLMFNIRS85WGRxS1kwMTRqNXQNCldqVWZ5OWlENnNlWjg1bnRBV2R4SG1Pa3l0QU5lM1FmeVZ4Yk8zTjMxbkZlNHVxSm1XMFJhRUR4MGVtM2s5WU0NCllMZTVPd0svNDlJcFVqNWdWMVIzd25OMHVOT1pOT2Roa3lWSnluTERKWFY1RExvV08zeUdNUE0zaU0rWkd1amsNCjRRcnBYalZGc2NmVEh5LzUrYk5GR0huYXBsanpsaTljYktxdDNqNjEwd0xRYTFwSGo2SzN4Sk9BTndyMFZkankNCkJGR3dwUkVRRFBjZVNOUkVGQSs3RmRQaDdXUWU3UDVOYmZZdUJYR1paZUl2Ulo2UjBFSGk4QWd4bjE0MjZxWUoNCkVKTnIrcU8ycjQ5RWhmQ2R3Yml6UkxoQnNxTUpRSWlya2Y1c0k0dzVSSWdwSTlnZ2t2L2dRaXF4dnFGY0RkSzcNCkFWSytlWmlCMmJ2WTNTVmFINDloV2FDRTFPWjI4Z0RZUGxjZTZBUnh6bnExZXFRaHZnVXlPZmZqcERqUGdTa0YNClFoUUNqNi9sZTlsdW5Qa05LRVlVaEZyMmVCQmFiQmVqUkFzZExUT3NsRzN5bHRJQ3BCakhHcU9CMkNhRGxIZ0wNCmE1ZW9lcUh1c0JBeDlmbVl0ZDBaaTQ3NGNHYXk4UmpHdHEvRSs4d0RUc3VwbllHYnNIRjVwRFhDN2VyVzlneVoNCk16SUU4d0FaK0l4YmhHN0pYVnRIYVBXQWJ2bDFhYzdZQlY3cnBCWVJLdXZadkRROUJML3RZeTU5SEE9PQ0KPXQxQ1kNCi0tLS0tRU5EIFBHUCBNRVNTQUdFLS0tLS0NCg", + "size": 1777 + } + }, + "raw": { + "id": "16d558cb71e8d510", + "threadId": "16d558cb71e8d510", + "labelIds": ["IMPORTANT", "STARRED", "Label_3", "CATEGORY_PERSONAL"], + "snippet": "", + "sizeEstimate": 7157, + "historyId": "1406352", + "internalDate": "1569098342000" + } +} \ No newline at end of file diff --git a/test/source/mock/google/exported-messages/message-export-16ff09b1baca2051.json b/test/source/mock/google/exported-messages/message-export-16ff09b1baca2051.json new file mode 100644 index 00000000000..7fc8723494d --- /dev/null +++ b/test/source/mock/google/exported-messages/message-export-16ff09b1baca2051.json @@ -0,0 +1,134 @@ +{ + "acctEmail": "flowcrypt.compatibility@gmail.com", + "full": { + "id": "16ff09b1baca2051", + "threadId": "16ff09b1baca2051", + "labelIds": [ + "IMPORTANT", + "STARRED", + "CATEGORY_PERSONAL", + "Label_8913178789750967510" + ], + "snippet": "", + "payload": { + "partId": "", + "mimeType": "multipart/encrypted", + "filename": "", + "headers": [ + { + "name": "X-Gm-Message-State", + "value": "APjAAAXc2Oakugn0C1wr5b228i6WIc85JK6I32KrV+H0YT3IA82bdNv+ ZkpOfZYN8hv/ulNLYgjHMWWVFNL/wyM=" + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "References", + "value": "<1580289291228-c657eac3-e90d4c75-aeb60c41@gmail.com>" + }, + { + "name": "From", + "value": "sender@domain.com" + }, + { + "name": "X-Pep-Version", + "value": "2.0" + }, + { + "name": "Date", + "value": "Wed, 29 Jan 2020 20:21:30 +1100" + }, + { + "name": "User-Agent", + "value": "Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1" + }, + { + "name": "MIME-Version", + "value": "1.0" + }, + { + "name": "In-Reply-To", + "value": "<1580289291228-c657eac3-e90d4c75-aeb60c41@gmail.com>" + }, + { + "name": "Subject", + "value": "p≡p" + }, + { + "name": "X-Pep-Version", + "value": "2.0" + }, + { + "name": "Content-Type", + "value": "multipart/encrypted; boundary=\"508b4bf627c9138e40bb096a2f0b837f\"; protocol=\"application/pgp-encrypted\"" + } + ], + "body": { + "size": 0 + }, + "parts": [ + { + "partId": "0", + "mimeType": "application/pgp-encrypted", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "application/pgp-encrypted" + } + ], + "body": { + "attachmentId": "ANGjdJ-t4z_rM_ipvCfEPnmjX-sy5iNW19GTbJSj9mEhLY6UxAswF4QDRCcdVehYqECo30MEMEYdNtq-FQJe-MMwvOjBDJXiQFRH04_SY28pg7Zfe2GM5MfgmDuxgb8qtAKEeIacESyIjPDkSXhTiHu23amNAR8R7Atv7hhnrp1texBq3hHEnGXfFgl-tWI1aeFXqz8DHSmWWRNQTx6eHBrq9S9HD_gNEPxXbmtuzTy4WLPcnlAbdcrfqgWuKCDXw_QxekhqPwX-lqmR2uDDS4GWyXc9odUt_3aZb5NHkbqByDSyLSp3T4ydmjIyBLYGJP-RT_UrsnqTKVI52eZhuXQiQmAOKiVOFySs_Z3S723WEzXqiIC4G_waliIU5ps", + "size": 10 + } + }, + { + "partId": "1", + "mimeType": "application/octet-stream", + "filename": "msg.asc", + "headers": [ + { + "name": "Content-Type", + "value": "application/octet-stream" + }, + { + "name": "Content-Transfer-Encoding", + "value": "7bit" + }, + { + "name": "Content-Disposition", + "value": "inline; filename=\"msg.asc\"" + } + ], + "body": { + "attachmentId": "ANGjdJ-pAfqIJg-y3Fk7lFzhr3PrQwBkEmnwizfqBCl_SvMb5bmxU7wib3104Mouj6fNxw8LFSlQyKP5J7wkETD9cKR-G5I1Gp8j0oRbhP2f-1Z0mD7zSyDuZVQ6-aY1mcfslQDTBKWz4k_xl-FXSBtujSIgcv3GzeQ1-t8c0j5VnQj0AmIPQ4KvqxtuLXolGVJroD1ubAZO6GppsMQnbpRliQv4HPKZooLAs3W7lT7tWh14FUOjt5o_vf25HpVET8YP9BaXUDyMUxySHW6KiysvTXHm87xw-GVylrlaLZ5moL3FFEEsEwV7peWINSuCpWseUbpd2NKk3WRvdAwLKkZp2o3XkoG81EuMUF1xiS6JOCDSGPVIGf8yptVo66M", + "size": 4167 + } + } + ] + }, + "sizeEstimate": 9733, + "historyId": "1406373", + "internalDate": "1580289690000" + }, + "attachments": { + "ANGjdJ-t4z_rM_ipvCfEPnmjX-sy5iNW19GTbJSj9mEhLY6UxAswF4QDRCcdVehYqECo30MEMEYdNtq-FQJe-MMwvOjBDJXiQFRH04_SY28pg7Zfe2GM5MfgmDuxgb8qtAKEeIacESyIjPDkSXhTiHu23amNAR8R7Atv7hhnrp1texBq3hHEnGXfFgl-tWI1aeFXqz8DHSmWWRNQTx6eHBrq9S9HD_gNEPxXbmtuzTy4WLPcnlAbdcrfqgWuKCDXw_QxekhqPwX-lqmR2uDDS4GWyXc9odUt_3aZb5NHkbqByDSyLSp3T4ydmjIyBLYGJP-RT_UrsnqTKVI52eZhuXQiQmAOKiVOFySs_Z3S723WEzXqiIC4G_waliIU5ps": { + "data": "VmVyc2lvbjogMQ", + "size": 10 + }, + "ANGjdJ-pAfqIJg-y3Fk7lFzhr3PrQwBkEmnwizfqBCl_SvMb5bmxU7wib3104Mouj6fNxw8LFSlQyKP5J7wkETD9cKR-G5I1Gp8j0oRbhP2f-1Z0mD7zSyDuZVQ6-aY1mcfslQDTBKWz4k_xl-FXSBtujSIgcv3GzeQ1-t8c0j5VnQj0AmIPQ4KvqxtuLXolGVJroD1ubAZO6GppsMQnbpRliQv4HPKZooLAs3W7lT7tWh14FUOjt5o_vf25HpVET8YP9BaXUDyMUxySHW6KiysvTXHm87xw-GVylrlaLZ5moL3FFEEsEwV7peWINSuCpWseUbpd2NKk3WRvdAwLKkZp2o3XkoG81EuMUF1xiS6JOCDSGPVIGf8yptVo66M": { + "data": "LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tDQoNCmhRRU1BMUhOU1UrenpqUUZBUWY5R0ZISXRuVUQ1QS8yQWJiaDFxd2RVZHNsOGkvaHNnUHdoT05lczJGSUt4VGcNCnNLOVFiWlNFQldoNEdQM3BQQWFNODROdldFSS9aRlBSNk95L1lFT2Frek82ODFvMm1rN21uZjZkb0duQXk1UDQNClVxT29SQ1l1TXh6aXlvb01zV213TnFRTGRhenYzYjVDa3BUMXVRakdqdzlubys0MDM4ZzJVWmR5Vnc0dzltL24NCks2NU9IZzU0NFBjUjN2dUxaVGlWK3VqUWl3RHNVZGRYWWNiRU91MmpaajMrd1Q2UVozVW9Bbmk0VkhRZ1NqQmoNCmFWQmdWSHBHbkJ2VGlNZi9WM3JFQjBidFBiQkgySTRwRTBaRWtsWEJDTDJzTUx6K0dQUW9nbzNGQ1RjVCtCcUwNCkxKNUFGRm0vaFhCTllnNFpYUmwrZ09oU2k5TnN3UGJReVdRMk9lSmREb1VDREFOTFdpLzg1aTJWQVFFUC9BNS8NClFxYTI2cWNwMXllTS9HQk5NWDdOZWFabzBSckNxdkJVaG83WTdud3V3ZE14cHlOOW1uRHpjSFBkZ3hlNDFPWjUNCm1LREQrZ2psN1JIQ2xFWkJGcFN4aGM3cGk0d0lpb2RsSVorR28zZzkvN1o3WEM3ZXJld25jNkJIU1RyRTVBSmENClcvcnl4c1JEcnI5RnpSMVAzYUhxc3NHWGZENEo3KzNCRkFTem5RS1BQYVM4ZStCajJpYjZaZEtDeVFMUkZIWmENCjE4UlpQRjZQcHJRNG90eStwcUI4SnY4WVRGQ1dRYVlRWWZWSkxnTzZwcXdaelJlT3djU3draXBJcmFNb0JTVm4NCnNxQWV1cDRCeU9WWVdtQWh4dk41SlA2MjFjSFBKYlJjUmdYcUM1K1J2U1c4SDBseE5WbGE3WDc1NVBoSDByZXQNCktqNEhSMW8xUEFKdVB0ZGgwSk1nMExTTGl1T2FIamZnMXc1UnRHRTdaeUQxQ2JuRjNFZkxSbVJUWTNjTFJkVlYNCkpCdktqNDFsU2QwRVN0bkd4QzJZYVJUYzUwZHp3RThaRi92VHpRYkhjNDY5QVl2Q09qRUNRVzRrWU5ndXNVaWENCmlwN2wweTJMWXRtN1MvV2tOS0NEb0ZGN2dWR05PZ3RJTTRuUmxtUHFwNEQydEFHcjM1MjNSZHpsUmE4a1FvcG8NCnFBSG1MclM3KzhIR0VTZ3psNDUyUGkyY3JtM0o4d09UbTNTeVpPRjJFZzdjeXZiQzc1dE5EV3pLNWl4czg4MVgNClNLTkEydGk1NkpZZDNNZzZRaStzcWRnSkxMdFhic0cwSkIxKzdHY0JFVmxkbUZCZDFWQWxNOGN3SnQ2Vk5iL3INCkRYNFNkNVhwRjlXeVFiUXVNOU5wMFFpMDRVQ3JzbnBsRzZaYWVKeFEwdXNCcjhpOVdLZ3I2RVpnOUN0Tk1EMmkNClJ0eDZ3c2pxYko5OG9NRnNEd0dUNHhhdUltVmVqOGZpWml5aUw0YUpXYjlSd0xUd2hOT2pkK2d2OUNjdzF6YUYNCkFiLzNFQ2MvNGsvUWd2UHpXbDBlcG9teVpNTmZZbnc2S1MvTGZZQVJ4SkMzY2tTRnhyZXZQQ2ZYMTk1MjhXVUMNCmRaODhiWEFqMUoya3RkRGVnTU5sYWx0ZGV2Z3o2dVArMWRBL0lZcnIxNjlBdU96MHFzR2h1WFlTcm9hMWtFaHMNCnZ2WUIvcFI1NWdtZS81VG91S0g4YmF3MXJLOHRDSHRuOE4vVWQwcGpyYzJQMTY5TFJ0NlNZb1ZxdnZ1ZVlLZGgNCjlycys4S01kcWx2enQ5OVFqOU9jYmpSSURlNFRhb0tjT2FTRmwyVWh1TURXVkhrZ0hEb0VmNEo1UHhiKzEySFcNCktheGtLQUlFWjdyT0M1elM3Rk8zUmZ4UnRRa1hROVRTWkdRbDFsUlk3OElKdURBOUpCeVVLcG1kN0x1Q01MSkwNCmpFNGI2bUZ4MmxLQ0JGd29EVnlQb3JyL2tNdmFBOGlkWVYvYmo0Z21pcWFWTUVMakw1OGxPbWUvTFJGRmtWNEYNClBYaWZYU2VaRzNvZDliekN3Ti9iai9WdjFJbFZMNXRtaDAvMEZYaW5VTTFMdklxNHdrNTZLdUR4Q0VNN0xjVHoNCkR5QnpSdCtXM3FHaUVlcTRnNk9LYitaTDZpenhCUVRWOVFXK0JGZTFvSEJ5dzlISWI0SFN0b2kyZzRwdFVEd3YNClYwYnZKcUJHWWZzVGthci9Vdy9tNXg2Q2NXMGhxZDBwZnpxVE1JYWg4N3ROcENnODdYVGwwRitDdDBaYm9ueTkNCnpLOUVtZXc0T0I4UWJWdWE0RWhRbGsxbEZUdzNrUXpzbVJLcHVGclBhYzR2REk4amx0eklmejYrQ3pOTkU4NW0NCkRNaVpVa1lTZ3Z1djZDUlYyZzFyYUFrVkd4L05ka0RkcmM3d3ZNMDk1QTNuYmZxblRiTFlaOTE2MldScm9DdUsNClc0MjhtenBaMkFCTHJSS1l3R3BFN2lTL0luWGp5aHJTb1dSV1hhSGJVcXB6OUpTK3VMaEtPdFd1b255OFQxdG0NCkdlekd2cVpHbnViY3VHa1JGZ2pFTER4c2daRzlHSjI5cjU2VVozSW1zTVhxMTQ4Qjl0NjN5VzhWYWZWUitKdnoNCnl3dXNhNUZnQU82OW5MRTM4ZUFXOFlwT2dSeTRzd2tvd0M1U28yT1dmQW9abFRWeFpwanBVU0RUd1hhNFVhZ3MNCnJuYWZ3WXRuVStSNGZGdDlGSW9jNlR5M0h2bXdWR0RWK2ZjTVBydnpBZkx1UGdqTlhQUzdsQjVCdVoyZm9QUVANCjE1OFdEKytRb28ydkRlVEU4SE9WcFpCYWs1OTVxSi9BMjdrTUpySFBxS0xjRTl0VldwbEoxNi9EVlg0Y2VDcy8NCkowdmlCdGFQQTE5SUhuQm1rS3lLdlgzVTVpWG5MbHdObHh3RWRBQ09OV2JEM1kvd2NwQUJ3emVRYURKbUZub1INCkRRNzdMdHZSSm9kbzM0QldMWXB4ODA0ZlZxaFEwWHlNYXV4M1Y5RWVJaG5UakZndVdRemUrQTNnQ1liS3BWdTUNClFCeEpzWmFnQk9XdHlWaTh1L0l1L3hmYVp6cisrek5QVTlDQ091RVFISzNINk9ZakJTV0xZT2RZRzZsMmlyVVANCjRBUkRVMFVLdVdyUkJRSXVwM3kxRVVKemRkNnpZWEJjNVkvVXJrMFZzaWtDellPaFh4QzlIOVczRm4wcFlDZnQNClc1UmxLM3A4eEtsUmFjSFRscDR3dEFDdkl1SWh3aEdEdlhGZTFpVTUzR2ZhS204WkZhSGNBN2NiRHBOVEV2azUNCnJNTy8wdmxWeEtteU9tZ3Rua0ZjZ3hkeWk2dndwNmhWTWE1OXRvUFlxdlpZaXRZUlBjeU9HeC8vQUlURENQSGwNCnlsVFFHbTlKQ2VHM2t0czhIQzA1TjJRWEtlVXhoakhvck93aFJjNmFuam1PZEJiYTl6KzZhSzRQdi9KcDU2OTMNCjI0dlZOQkllNEhsR21mNGZBYlBMaCtHNkdtTjdRQUQzejc2Ull1YlBtbEZGa3FxaElrRENjMWF3U3lTbnNiMDYNCjlaclMxa3pjbnpLOElmMmVqeUwxbi91SXgya29RcDNMUVR6WnlDdG9xOGhvN3liZEJoeFZLNVVmU3hiQW5Kb2oNCmdiN3VUSzFDNnFoN2lxZVl2cHR0OXRtY2FRS1BCT0xJazFjcFM5a1NjZlRIVHRkRTl2cW5hNzMzcngwa2pFSzENCmpsZElLd3h4aTVjYy9oZDNEZnNXUTRnSG9wclpkWGRpVU1MSnFRVHBEbVZ1YngydklpUkFhcmtNTnBkOGhzeTINCllGWFVmYS9HaU5sMmF4M1VJWDl6TURrYVBFU0JMY2pJY1VidS8wQzJZcERCQkxLaXd4bTZRRjF2Ym41eE9HZE4NCkZ0b3JhSXpXc045M3ZKc2thTkF6aTU0ZGQyR0wvQUlWTmcvaG9wRzA3QjZJd241WlZZSUJvY0FDNDBGbXVRejINCnlMcHBsSUdxZVE2V1NlZ1JmUm44ZHBiaWk4SUJwZ1lGcnhpQUQ3dWlDclo5eVAxN2h6L01oblhCZ0JCUzl3SWwNCnVyZlBhVGl0bUVQN1RhWVFUcHU5R0tQdE5qbVJFQzBQTitvVjdqdklvZkYxWjNzK0pTbldhWnZtTHByY3ZDcUQNCkxZcGxyK3ZDUGVNeXVTZ0x5QW5Ha21IQ2xpS1RHb3FGK0hRWVhsUE11UWN5b0E0MXJJY1FsVkN2K2xndXpTREYNClFOaEJtOE1LSTJ2YVBUbTBZN2hYZ3NEWjFzdFlmdEtDK3RpMGdlNHZjZWxoSkxpc0VZRWVFTUROZ29TL3crTHQNCmlsUlM4ZUppc3B5a0RXN0dXZE1vZzJMYTh3WlJlMFJIL2tjdWowNElaVGpZY0xNeHZtZ2s2ekNGT2x4eHlGN0kNCmNVSlQvcUtxMExzSHlNQUJ6aUVyU3NISkhpajFiT3c2c0NhUkVYdlRmNnRESzg2dk56dXlCSFRXVkdxcDFyWjkNCnl1aFJ1SjM2RWRienVWRWQwTjZaM1JYNFBRdUcrNHVlQmZoYmtmZ0xKckdKZFRmTk5ocFZYdWFqdjJpeEpkVTkNCmZWdDROUXIyekljZFY5WE5BZExSTHVoTFU1czVrbDhFKzJsQjQvVldlYjRaQTFvcTNoQ1VJcEpuWmdSSmdxU0cNCjgvWEQ5L2xaZHp2ZWloTWFJSlVSUUJXazJOYkduQUxRVnJrMkFqenNwQm9uTTJUYkg5VnVncXpXTlM2NkhVWWYNCkUxdE4weGUrYWhVaFBEbEQzR21wRTUvZ0JuU1V0K2tRTlptMVRPUDdnb2NzT3RlTEhmRzMxdUFiWFhBQ3NNNTINCjVCWCtQcnNuYVRvaG1YbmtGaGtxSll0RWpsc0hJMHJjVU5RZjArdWV1Y3RNeXNrYjgxTXhDcFA0YW9kcEV1TkMNCnRnRXF3aGdud2JpTDY4SlJhYW8zWjZ5N2xiZlJFdkowUDdnZXZuMGl3Z3RnZHJQMm5KZFM4ZVVOUXVtUkNZTXMNCm03cUtRMjhwOGZ1WjZmOTRvSU5IQW9PSk9lMXdNRDRqOXZSZnRQdEpVNnNLVDM5eW5IczJjeWxiWWtGQXFUT3oNCmkrUmhkUmJldUt5Yk1vRXgvU3hmb0VIaDdSQUJXek40REk5dzJXaGRIN0wwaEJ5dUJUMkdSb2NaRFRZalllcmgNCmFSclA2WkM0bWVlb29GekdudXJxZ0tJZEVkNWU3NmlZanFuVk1MMUUrdytDSlNSRHFoZ0c1NXo0NjVld1pCZHANCkZFQi95UT09DQo9Vk1lYg0KLS0tLS1FTkQgUEdQIE1FU1NBR0UtLS0tLQ0K", + "size": 4167 + } + }, + "raw": { + "id": "16ff09b1baca2051", + "threadId": "16ff09b1baca2051", + "labelIds": ["IMPORTANT", "STARRED", "CATEGORY_PERSONAL", "Label_8913178789750967510"], + "snippet": "", + "sizeEstimate": 9733, + "historyId": "1406373", + "internalDate": "1580289690000" + } +} \ No newline at end of file diff --git a/test/source/mock/google/exported-messages/message-export-1707b9c96c5d7893.json b/test/source/mock/google/exported-messages/message-export-1707b9c96c5d7893.json new file mode 100644 index 00000000000..719a0f94f7a --- /dev/null +++ b/test/source/mock/google/exported-messages/message-export-1707b9c96c5d7893.json @@ -0,0 +1,63 @@ +{ + "acctEmail": "flowcrypt.compatibility@gmail.com", + "full": { + "id": "1707b9c96c5d7893", + "threadId": "1707b9c222f75ad8", + "labelIds": [ + "IMPORTANT", + "STARRED", + "Label_15", + "SENT", + "INBOX" + ], + "snippet": "-----BEGIN PGP MESSAGE----- owGbwMvMwMVYfy8j1GPd8g7GNXlJHCWpFSV6JRUlcSH3akoyMosVyhOLFVLzkosq C0pSUxTKM0syFNIL0rm4gISCrm5xZnoekEosys0vUtAtUkjLyS8Hq9VLzs8tSCzJ", + "payload": { + "partId": "", + "mimeType": "text/plain", + "filename": "", + "headers": [ + { + "name": "MIME-Version", + "value": "1.0" + }, + { + "name": "Date", + "value": "Tue, 25 Feb 2020 09:10:23 +0000" + }, + { + "name": "Subject", + "value": "gpg: signed only but armored" + }, + { + "name": "From", + "value": "sender@domain.com" + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "Content-Type", + "value": "text/plain; charset=\"UTF-8\"" + } + ], + "body": { + "size": 1027, + "data": "LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tDQoNCm93R2J3TXZNd01WWWZ5OGoxR1BkOGc3R05YbEpIQ1dwRlNWNkpSVWxjU0gzYWtveU1vc1Z5aE9MRlZMemtvc3ENCkMwcFNVeFRLTTBzeUZOSUwwcm00Z0lTQ3JtNXhabm9la0Vvc3lzMHZVdEF0VWtqTHlTOEhxOVZMenM4dFNDekoNClRNck15U3lwZEVqUFRjek1BWWtwNk9uRHJPRHFaREptWVdEa1lwQVZVMlFKVlRoMVRtZWIzSExocHh0WVlRNWkNClpRSzVnb0dMVXdBbVlsOG13REMzeXFKM1JxWGVheDJuMTA4YjQyc2MrSTI5ekUxZkx2ZGdxMVR6M1pMMGEyWjUNClhTVERvYlh5b2lHbmo3NDhrLzhpWDdkSlljNUMrVFRtUE1YdFBtWUpLbWQ3Vjd2Mng2Njc1QmZSK20yNWVkbnINClBmRUI5ays0N2lROXlOc2d1OVRHOE5DL2hoY2NhbE1rVDFVVWN2N1YwN21XMlpSYmZ2U29wMVpTVS9iWG0zYy8NCjhuZCtaU2hmbXJIUVlNTWZlM1htaWxkbWJoczJmN1M2SThHK3lhbWhySDFYc25YS2xjL2NhNjNTNTNUVTd1NWUNCitYN3ZpbDk3elRjM2NEZ3RQL3V3NkdCNm1tVG84bXFsYjIwR3l0RzFMdVl6WmZ0UDU1WFlMN1h5TzVNOFJ6eDINClpjTEJQVHNmenM4bzZiZ3h0MGZCdWNJbGRzN256TE95S2xkK0cydSt1U3F6dWo5d2dwZU9TWDE0OWYrOHk3Ti8NCmhsNW5iWElvM3FMM1FYYVd3c1h2aDdmSVRWcDE1NS9ieFNYS1g2NWZ1TG1oK0VUMjRaOUM3VjhpR2Y5TTd2NzYNCnRJK2pTTlJ1N2NuQXR0eGxYNHRPR0hodHVNSCtUVThuTnYxY1BFYzFYL0gxVlJ2OTVtV2FibDNsUCtIVm1vdS8NCnJreU4xL3NXbDd0Uy9mWlAzdlZscDNNU1B2cXkvUDZUM1ZLaFhTWWRXRnpoeWJsQjZLaHF6QWJCdXVWZi8yYlkNCktSeDEyMzl2OXVack0zeUVaT2MwSnR6Tno3TGg3eGI2ZTg5dEluZTRibHg4MWFSVDdiODZZcm9VSEdmZTBQRjQNCnNIalJuUVdkbWVVMmtnY21IK0xVRWR4ZDRiSmd4L1NRd1ByYis2emllUTBtTGJEc3ZabTdnSEZQZXE1WlcrL2UNCkJVOC9jTmMyYmQ0OUtXcmRUOC96S3BKOUttdlY5dXo0QVFBPQ0KPXI4U28NCi0tLS0tRU5EIFBHUCBNRVNTQUdFLS0tLS0NCg==" + } + }, + "sizeEstimate": 1384, + "historyId": "1405958", + "internalDate": "1582621823000" + }, + "attachments": {}, + "raw": { + "id": "1707b9c96c5d7893", + "threadId": "1707b9c222f75ad8", + "labelIds": ["IMPORTANT", "STARRED", "Label_15", "SENT", "INBOX"], + "snippet": "-----BEGIN PGP MESSAGE----- owGbwMvMwMVYfy8j1GPd8g7GNXlJHCWpFSV6JRUlcSH3akoyMosVyhOLFVLzkosq C0pSUxTKM0syFNIL0rm4gISCrm5xZnoekEosys0vUtAtUkjLyS8Hq9VLzs8tSCzJ", + "sizeEstimate": 1384, + "historyId": "1405958", + "internalDate": "1582621823000" + } +} \ No newline at end of file diff --git a/test/source/mock/google/exported-messages/message-export-1882fa9e2b996242.json b/test/source/mock/google/exported-messages/message-export-1882fa9e2b996242.json new file mode 100644 index 00000000000..0e733c9d668 --- /dev/null +++ b/test/source/mock/google/exported-messages/message-export-1882fa9e2b996242.json @@ -0,0 +1,92 @@ +{ + "acctEmail": "flowcrypt.compatibility@gmail.com", + "full": { + "id": "1882fa9e2b996242", + "threadId": "1882fa9e2b996242", + "labelIds": ["IMPORTANT", "SENT", "INBOX"], + "snippet": "-----BEGIN PGP MESSAGE----- yMCxATvCy8zAxHhitbJOfXrcEcbTKkkMIOCRmpOTr6NQkpFZrABEiQolqcUlCrmpxcWJ6alchw5U sjAwMjEoiymyhJfeapohyXRUYeazxTBjWJkSeOtDWJnBRnFxCsDEv33mYDjmdsuGPyx68g7tMwe3 tqlevvUo5EIap+", + "payload": { + "partId": "", + "mimeType": "multipart/alternative", + "filename": "", + "headers": [ + { + "name": "MIME-Version", + "value": "1.0" + }, + { + "name": "Date", + "value": "Thu, 18 May 2023 19:20:42 +0300" + }, + { + "name": "Subject", + "value": "SHA1 test inline" + }, + { + "name": "From", + "value": "sha1@sign.com" + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "Content-Type", + "value": "multipart/alternative; boundary=\"0000000000009dfa5f05fbfa2faa\"" + } + ], + "body": { + "size": 0 + }, + "parts": [ + { + "partId": "0", + "mimeType": "text/plain", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "text/plain; charset=\"UTF-8\"" + } + ], + "body": { + "size": 575, + "data": "LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tDQoNCnlNQ3hBVHZDeTh6QXhIaGl0YkpPZlhyY0VjYlRLa2tNSU9DUm1wT1RyNk5Ra3BGWnJBQkVpUW9scWNVbENybXB4Y1dKNmFsY2h3NVUNCnNqQXdNakVvaXlteWhKZmVhcG9oeVhSVVllYXp4VEJqV0prU2VPdERXSm5CUm5GeENzREV2MzNtWURqbWRzdUdQeXg2OGc3dE13ZTMNCnRxbGV2dlVvNUVJYXArd21abTZtUlhjT0dCcGx2SnkxbWZ1cTFwbHJ0MDhxczk3WTJ6dEIrL1hidXlHM0lyNDh1N0kzcG1EK1RXYWUNCldTZDVkMjZRWVhjdXVzYXVjMFh5L2ZTMS9GWGJQSmFZSGxDZU1DZm5ockY5ZDJqeUgzM1YrZXI2cjNsUzVpL21jaE9LZmZwZ2xrdFQNCmQ2WjM2Ly9Nc21jek4wMFdkNjB0OVQrcXlMejBUNC9VRzJZOWxnZjM2N2YzZCtrWVBFMExTN21YdUZtamxQWGZ3MG5LeVZzU2VGaXUNCjNkdXorVmZ6VTNIVlo2NUw0eGM1UEJZd1dMbHNoZGNHOTRWVHQyb0szY3VMQzV6dXkvM2tzMHN3MStNR3ptS3RqTWVKcnFYcGgrOHANCjVXNUptSEwyOHFhcmJRdnYrNzFWM25pNm9kazhaMk5EYmFuMnkxa0ENCj1SdXluDQotLS0tLUVORCBQR1AgTUVTU0FHRS0tLS0tDQo=" + } + }, + { + "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": 1266, + "data": "PGRpdiBkaXI9Imx0ciI-PGRpdiBzdHlsZT0iY29sb3I6cmdiKDAsMCwwKTtmb250LWZhbWlseTomcXVvdDtEcm9pZCBTYW5zIE1vbm8mcXVvdDssJnF1b3Q7bW9ub3NwYWNlJnF1b3Q7LG1vbm9zcGFjZTtmb250LXNpemU6MTRweDtsaW5lLWhlaWdodDoxOXB4O3doaXRlLXNwYWNlOnByZSI-PGRpdj48c3BhbiBzdHlsZT0iY29sb3I6cmdiKDE2MywyMSwyMSkiPi0tLS0tQkVHSU4gUEdQIE1FU1NBR0UtLS0tLTwvc3Bhbj48L2Rpdj48YnI-PGRpdj48c3BhbiBzdHlsZT0iY29sb3I6cmdiKDE2MywyMSwyMSkiPnlNQ3hBVHZDeTh6QXhIaGl0YkpPZlhyY0VjYlRLa2tNSU9DUm1wT1RyNk5Ra3BGWnJBQkVpUW9scWNVbENybXB4Y1dKNmFsY2h3NVU8L3NwYW4-PC9kaXY-PGRpdj48c3BhbiBzdHlsZT0iY29sb3I6cmdiKDE2MywyMSwyMSkiPnNqQXdNakVvaXlteWhKZmVhcG9oeVhSVVllYXp4VEJqV0prU2VPdERXSm5CUm5GeENzREV2MzNtWURqbWRzdUdQeXg2OGc3dE13ZTM8L3NwYW4-PC9kaXY-PGRpdj48c3BhbiBzdHlsZT0iY29sb3I6cmdiKDE2MywyMSwyMSkiPnRxbGV2dlVvNUVJYXArd21abTZtUlhjT0dCcGx2SnkxbWZ1cTFwbHJ0MDhxczk3WTJ6dEIrL1hidXlHM0lyNDh1N0kzcG1EK1RXYWU8L3NwYW4-PC9kaXY-PGRpdj48c3BhbiBzdHlsZT0iY29sb3I6cmdiKDE2MywyMSwyMSkiPldTZDVkMjZRWVhjdXVzYXVjMFh5L2ZTMS9GWGJQSmFZSGxDZU1DZm5ockY5ZDJqeUgzM1YrZXI2cjNsUzVpL21jaE9LZmZwZ2xrdFQ8L3NwYW4-PC9kaXY-PGRpdj48c3BhbiBzdHlsZT0iY29sb3I6cmdiKDE2MywyMSwyMSkiPmQ2WjM2Ly9Nc21jek4wMFdkNjB0OVQrcXlMejBUNC9VRzJZOWxnZjM2N2YzZCtrWVBFMExTN21YdUZtamxQWGZ3MG5LeVZzU2VGaXU8L3NwYW4-PC9kaXY-PGRpdj48c3BhbiBzdHlsZT0iY29sb3I6cmdiKDE2MywyMSwyMSkiPjNkdXorVmZ6VTNIVlo2NUw0eGM1UEJZd1dMbHNoZGNHOTRWVHQyb0szY3VMQzV6dXkvM2tzMHN3MStNR3ptS3RqTWVKcnFYcGgrOHA8L3NwYW4-PC9kaXY-PGRpdj48c3BhbiBzdHlsZT0iY29sb3I6cmdiKDE2MywyMSwyMSkiPjVXNUptSEwyOHFhcmJRdnYrNzFWM25pNm9kazhaMk5EYmFuMnkxa0E8L3NwYW4-PC9kaXY-PGRpdj48c3BhbiBzdHlsZT0iY29sb3I6cmdiKDE2MywyMSwyMSkiPj1SdXluPC9zcGFuPjwvZGl2PjxkaXY-PHNwYW4gc3R5bGU9ImNvbG9yOnJnYigxNjMsMjEsMjEpIj4tLS0tLUVORCBQR1AgTUVTU0FHRS0tLS0tPC9zcGFuPjwvZGl2PjwvZGl2PjwvZGl2Pg0K" + } + } + ] + }, + "sizeEstimate": 2501, + "historyId": "2634857", + "internalDate": "1684426842000" + }, + "attachments": {}, + "raw": { + "id": "1882fa9e2b996242", + "threadId": "1882fa9e2b996242", + "labelIds": ["IMPORTANT", "SENT", "INBOX"], + "snippet": "-----BEGIN PGP MESSAGE----- yMCxATvCy8zAxHhitbJOfXrcEcbTKkkMIOCRmpOTr6NQkpFZrABEiQolqcUlCrmpxcWJ6alchw5U sjAwMjEoiymyhJfeapohyXRUYeazxTBjWJkSeOtDWJnBRnFxCsDEv33mYDjmdsuGPyx68g7tMwe3 tqlevvUo5EIap+", + "sizeEstimate": 2501, + "historyId": "2634857", + "internalDate": "1684426842000" + } +} diff --git a/test/source/mock/google/google-data.ts b/test/source/mock/google/google-data.ts index 40caca183fc..8a4161e61db 100644 --- a/test/source/mock/google/google-data.ts +++ b/test/source/mock/google/google-data.ts @@ -229,7 +229,7 @@ export class GoogleData { .reduce((a, b) => a.concat(b), []); }; - public static getMockGmailPage = async (acct: string, msgId?: string) => { + public static getMockGmailPage = async (acct: string, msgId?: string, htmlRenderer?: (msgId: string, prerendered?: string) => string | undefined) => { let msgBlock = ''; let attachmentsBlock = ''; if (msgId) { @@ -245,6 +245,7 @@ export class GoogleData { } else { ({ htmlData, processedParts } = GoogleData.getHtmlDataToDisplay(payload.parts!) ?? { htmlData: undefined, processedParts: [] }); } + const updatedHtmlData = htmlRenderer ? htmlRenderer(msgId, htmlData) : htmlData; const otherParts = GoogleData.getFileParts(payload.parts, processedParts); if (otherParts.length) { attachmentsBlock = @@ -265,7 +266,7 @@ export class GoogleData { msgBlock = `
Mock Sender -
${htmlData ?? ''}
+
${updatedHtmlData ?? ''}
${attachmentsBlock}
diff --git a/test/source/mock/google/google-endpoints.ts b/test/source/mock/google/google-endpoints.ts index c3c9cc8e3d9..4340e469f3c 100644 --- a/test/source/mock/google/google-endpoints.ts +++ b/test/source/mock/google/google-endpoints.ts @@ -3,7 +3,7 @@ import { HttpClientErr, Status } from '../lib/api'; import Parse, { ParseMsgResult } from '../../util/parse'; import { isDelete, isGet, isPost, isPut, parsePort, parseResourceId } from '../lib/mock-util'; -import { GoogleData } from './google-data'; +import { GmailMsg, GoogleData } from './google-data'; import { HandlersDefinition } from '../all-apis-mock'; import { AddressObject, ParsedMail } from 'mailparser'; import { TestBySubjectStrategyContext } from './strategies/send-message-strategy'; @@ -59,7 +59,8 @@ export interface GoogleConfig { contacts?: string[]; othercontacts?: string[]; aliases?: Dict; - getMsgErrors?: Dict; + getMsg?: Dict<{ error: Error } | { msg: GmailMsg }>; + htmlRenderer?: (msgId: string, prerendered?: string) => string | undefined; } export const multipleEmailAliasList: MockUserAlias[] = [ @@ -217,8 +218,6 @@ export const getMockGoogleEndpoints = (oauth: OauthMock, config: GoogleConfig | if (!id) { return {}; } - const err = config?.getMsgErrors?.[id]; - if (err) throw err; const data = await GoogleData.withInitializedData(acct); if (req.url?.includes('/attachments/')) { const attachment = data.getAttachment(id); @@ -227,7 +226,9 @@ export const getMockGoogleEndpoints = (oauth: OauthMock, config: GoogleConfig | } throw new HttpClientErr(`MOCK attachment not found for ${acct}: ${id}`, Status.NOT_FOUND); } - const msg = data.getMessage(id); + const found = config?.getMsg?.[id]; + if (found && 'error' in found) throw found.error; + const msg = found?.msg ? found.msg : data.getMessage(id); if (msg) { return GoogleData.fmtMsg(msg, format); } @@ -344,7 +345,7 @@ export const getMockGoogleEndpoints = (oauth: OauthMock, config: GoogleConfig | const acct = oauth.checkAuthorizationHeaderWithAccessToken(req.headers.authorization); if (isGet(req)) { const id = parseResourceId(req.url!); // eslint-disable-line @typescript-eslint/no-non-null-assertion - return await GoogleData.getMockGmailPage(acct, id); + return await GoogleData.getMockGmailPage(acct, id, config?.htmlRenderer); } throw new HttpClientErr(`Method not implemented for ${req.url}: ${req.method}`); }, diff --git a/test/source/mock/wkd/wkd-constants.ts b/test/source/mock/wkd/wkd-constants.ts index 91953c4d31f..2250cbe9d95 100644 --- a/test/source/mock/wkd/wkd-constants.ts +++ b/test/source/mock/wkd/wkd-constants.ts @@ -92,24 +92,6 @@ nmusEeYtrrMytL4oUohBVZk= -----END PGP PUBLIC KEY BLOCK----- `; -// only.on.wkd@signing.test -export const onlyOnWkdPubKey = `-----BEGIN PGP PUBLIC KEY BLOCK----- -Version: FlowCrypt Email Encryption 8.3.2 -Comment: Seamlessly send and receive encrypted email - -xjMEYwSypBYJKwYBBAHaRw8BAQdAemcNzRPSZIEa5LnljFUCjpDaYKE+NIzb -8/HdulmYTlbNH1Rlc3QgPG9ubHkub24ud2tkQHNpZ25pbmcudGVzdD7CjwQQ -FgoAIAUCYwSypAYLCQcIAwIEFQgKAgQWAgEAAhkBAhsDAh4BACEJEPtcd1B2 -gxxRFiEELyOUpuDorKxUIF1D+1x3UHaDHFG6bQD/QhRpAMQf0XNWcICs4yGj -buOprbmk1jbXveNvjM3xm68A/Rw4xKpYTcBwvnnFk8DRk8UUd1Tyby9nCUM5 -Rxyj75IKzjgEYwSypBIKKwYBBAGXVQEFAQEHQAeZ33tlMW1POXw7duxkZreg -+m8aHebGrIWdoAt0GSUMAwEIB8J4BBgWCAAJBQJjBLKkAhsMACEJEPtcd1B2 -gxxRFiEELyOUpuDorKxUIF1D+1x3UHaDHFH9AAD8DbMt2efR80LWUse6Zj9L -wWzzLlqxcoNz8vHQegOJcwgA/1YymI8CeDGKXCmext6mL6295e5tjUySwItc -lU5tXucF -=zRyT ------END PGP PUBLIC KEY BLOCK-----`; - /* // use for signing or decryption when defining tests const onlyOnWkdPrv = `-----BEGIN PGP PRIVATE KEY BLOCK----- diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index 1011611ad33..e614f23d8e1 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -5,6 +5,7 @@ import test 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 { TestWithBrowser } from './../test'; @@ -14,12 +15,11 @@ import { get203FAE7076005381, protonMailCompatKey, mpVerificationKey, - // sha1signpubkey, + sha1signpubkey, somePubkey, singlePubKeyAttesterConfig, } from '../mock/attester/attester-key-constants'; import { ConfigurationProvider, HttpClientErr, Status } from '../mock/lib/api'; -// import { onlyOnWkdPubKey } from '../mock/wkd/wkd-constants'; export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: TestWithBrowser) => { if (testVariant !== 'CONSUMER-LIVE-GMAIL') { @@ -255,8 +255,8 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), google: { - getMsgErrors: { - '17b91b7e122902d2': new HttpClientErr('RequestTimeout', Status.BAD_REQUEST), + getMsg: { + '17b91b7e122902d2': { error: new HttpClientErr('RequestTimeout', Status.BAD_REQUEST) }, }, }, }); @@ -363,7 +363,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te ); }) ); - /* + test( `decrypt - quoted part parsing will not crash browser`, testWithBrowser(async (t, browser) => { @@ -371,15 +371,19 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - content: ['point to them directly', 'free cert through', 'will honestly soon', 'dropped significantly'], - encryption: 'encrypted', - signature: 'not signed', - params: - '?frameId=none&message=-----BEGIN%20PGP%20MESSAGE-----%0AVersion%3A%20FlowCrypt%206.8.5%20Gmail%20Encryption%0AComment%3A%20Seamlessly%20send%20and%20receive%20encrypted%20email%0A%0AwcFMAzBfgamu0SA1ARAAuHXRxM9k%2BXfQ8iPNconAE62s5pP1PdO5iS01%2FOB%2B%0A3%2B6xUX5oWemiwXjmKetzMvYvSA4ltQ7fWxwY%2FRznfUqxiWQAMQflWINMlmrq%0Apv1iznuVrkdXiyhSLvHuhN3F6ZrWFBn3UL5xDHPHYaFsg2azvqgF6QXK9i37%0AwYbZZzJ9OU5yqAdzdTAk2Il5V%2FG7dh0Su9qrY7NAa46DIqbgdlbLYy6qLcvx%0AiI1yaliUg%2FmCbiVj%2B6kgb%2FFs87peaHg0z%2FpcngOB0a7x1ofbIW%2FrcTbhsEjH%0Ag6I%2B7XST3RmKcOv0PgCtEDU6HnRINbbKrwr9M%2F7xjjBKN8iyDs0Z%2FdOXDKKC%0AFuUmD10ut8%2F3d4jJfTIb5FEiPUNsChM7lidHadKjMoEg55iQgUTp2FeWXyIl%0AF0UlmWRZziljUURdDU02z0F%2BNg9wJkCNrdaCHZeULWfU4%2Bzhvobb%2FaTQfS9C%0AIDC9Qo1jPw1U1nojFMQdBMQQ8P9xsD8vHkeG0f3FOzvj8xWm2oJEvBDpsP6Z%0A3tGf5vV0uRFWuTE2xWbV3cMdvsL2rVJanmGnsddJP4p2WS5at7UDdm7DxyKR%0AzUJnuvITlydd78pSXmqUrw9W%2By0oOdIfwWz1A2V9pdaYwBolPGt7UKUeSK6A%0AMYELv6Ac6Yt9TBJ2B7pLu%2Fw0Wtvjw8IGGA%2FYxKX2t4rBwUwDvb12YPaZjcQB%0AEADRrSJiXzDXVdM%2BGbHBW%2FrdKcDoHq6n3f0mUSbwumiz51pQrtKmNgWFQZuM%0ArkV2O76foEDpUn8m3Gwcoo0MvCxJKWQN3U7dzrMzKd79egDQr8mCQIUqPDbJ%0A4gxVCy9pMAI51oIFM4bOD51MdOgrU1uITZDtaapswiIMywmjxYGRGLDsQ%2BgB%0AVaGF86QgHSgH2M7KdWtN9MSqDs28z7N9kdr0bVWAmVauSchqBeGEZAOq90d%2B%0ApXET%2FbEm0Y0l%2BqpOFEfkbWGoAsjOdOa0rSmBcfZoSh%2FtYWDpPwJDT%2BIp4XLp%0AC3C%2FFSQ11gPt0%2BAb8%2FYouGYmICTzMVUkiHxHGs24n6Tww26qBwQFDzXUAwxL%0A7LENsgsebLDOW8RjCn3EUuH0vZID7T13Xa9R1YQQHmIebVN4%2Fgrz%2FqGDYaZ0%0A4Ub%2BpMWpNYIhDWiQRkj3u39m4hCWa2Lo9d2avgUqmdghCDKZkfMtNRAMyLt5%0ALSDnh16yrl1p4P4e7IMDFp6Yt%2BeSCjH55HaDGeq5Z%2F3PhlbD%2BVFY17v72cBN%0AuyqsecJpTacESxX0Q4Psgahr7htG71KvIjaRBeN05I80IXjrMcTY6c8r0qhz%0A72rW2rfNRuwjIGtJOUfFK6vAovR%2F6kMJMTM4elJ4Q%2FEZIN7zd0OY5z%2FzZ%2BkP%0AoyC8hwFHgwhhx1%2Fu%2Bj8Ira7DXtLMIAFT2PriDTi4aGUjforTVKCh9DifU8Bp%0AUvpEUJl71EdFZ5ic%2B%2B6pkGKhyAFbNvJS3dvZWE50%2FCf%2Bm8iUvZCs63aikTON%0AdjBOpQgE32ig39oM9ggHit0zIZPtZl6XTJHytxNoydnT1bp2qJNj81ZyTlQB%0ANTusbMcY3usDMzIbgFdiNFLrRTaZ6KPuXIzljP7Xw2Lm%2BTcVFGRUmDkadFF9%0AY4RC7q3isJz9h8i5Q6sbaWJu6Ylc305FDKH9XensyR0lXGEX7ishe5Mg8MBp%0AOeSyw20GEejrxUHOp5daUA1XKFX6%2BvZbekqZ57Z%2BJFrB%2BU3cWN2b7ADHkxol%0AhfnCymupqLmoOj%2BU8sx2omWE5KBehRiSpWIF01Mx3j0KKwVpJo8wisB9WXg4%0AG3V2LduE%2BBTZves%2F0A0FTUg0m5ZWeqUm1MAOUkQOdf3%2BC8sKVEUUUeW6%2FchL%0AyQXhKCfgpDHFmYKiTUr7ybPmQZ%2F2hll49a0xkndGPi92kmne5dz3X7tHtPH2%0AcgRAluAt2GU7nPYxu3jqWURfeIZvGRLPd4Ty3CfQDAymEQr%2BmMvkgFdfn2pj%0AlhDGntJgUmNzgwmpD60y4eEZhYCnDFQUdEACHb8OTFZ7sZhKO41po%2FCV7Sip%0Apv9ryn%2F5QJJkoDPD1Yy56NqzoaAZxSfm5Uh0mr1wqCjk4yBHrvu8naYpnQMw%0Af%2B0NM0BffntPx6jUr58uUh4GF9bwThLYtFY8SRVMRbz2R2Vfgn5nxnD3EwrV%0AGZo4YnzXXkryrD2V2uwTc8iOhIc47h8LcN7Riz4mvg6wlc2B04skZKknRgBN%0AwtPXB0cjKy5vi5%2FmBTnyHGnCVxhGAtaCsGFBLNmIAoVuu8Te0o0whDyA%2BNly%0A9aBJunBjkfLWol1Xc4wO1PKOE1xQAS9EzE3B%2F%2FGujyzoL6311HgABCjMQeCL%0A3Nv7YQSgp5meoBXX3%2BCqKiPDEaKY%2B%2Bftr8YomcIYQJyDUuRhXoHynv7LcepI%0A%2FQUdYKxem7XECg9rVsjkz%2BP0xtPtTCW1%2F9wWFBkZJP%2Bl6V5zV29Q4ROAIKhN%0AuNmcekI7gUYKhpMp2AGt6MalswUoqhV0aMIpRPdVzN2xrygGtv3LEfOXV%2FlR%0ABdW3J5I%2Fh0AcbR1cteMVZfFX0DInDtJ%2BeOUj236HFWuJ7%2Bc5%2Baj%2BfN%2BIAubQ%0AEinGN1n7KPRtd7s1W%2FT%2Ft7m3ECTCt2bjOGu4E7kcetNuROV0cRpISC40KylC%0AWDhCY0T0jRheyP0n0QA46UHCMvWsFPc8wh03MI9dvDuBf4olzFX3UfCd%2FJC0%0Ap9KlzxRG6CMlJZaDykP3rbCMatUsioMcCubma63ZGUJ0%2Fs8zaOhh5wM8fLLg%0AVJJ0z0cxZJOOaNyulIrCcMonQ42IAiqNr3lQO9dQ4TeR2qCrai90UK%2BDbyH%2F%0AptuxG3Z1D7RWn3KTMoL4lybbcD82HsQvzayNKqFKs3ePRpJ2bHyrb1ehhfuR%0AD1tBuLY3qjk9Ah%2FbPvck%2FwWpzui%2F%2BwanfLRHkl0n7TtZIqA6U87OSQCIGQpN%0AOZfhNSzyFYHwfdHTXon2lyyBXwRAm4WVvb4hYU%2F3ZtVheUevqjDW0gau4KSo%0Aa%2BnbXYYziOrWZ1HtYJYuuDS43I2f%2FfmNpv8PC01OO4b2FOt9QNuHnFzTPnI8%0AgFy4dXj5W9WU%2FwS6eLTBZqftSa5zM8lxEM1ZLQHOtgH3FUwvNJOddujHtJ5V%0A5rsXxFNNYV9WKPxVa1fB9tWvmtXHVLr39djsL92rQTGTgniViHNJRAGk2eCC%0AMoheMqVnBHwv%2B1fIy4YoeWZmmbWnpIq%2Fl7Zi0aKmhsgu5EeJ66R7g3zL2srC%0AIu9OVyVCiCzb1j%2Bm4wSTiLzLlc8iPREdsTt%2BF1cpbB1b9euEDA1l4OIIEcLa%0A0oxZICpvBcrrZkVxayPjsPzz1y%2F3%2Bm%2B2ylEZbew30kaHFxet0abd3NWRYzxO%0ADRSNl%2BZGG6ThAqKcmxPrHNv2gUIqt%2Bvo8O8f6REaPMqRpZRdCesBc1XD5FMi%0AJREzoOCLrFdMO%2Ff6SOe6w7Q%2FtzQqVR%2F7YQJJ4aafqCgclckF7DW%2F%2FJKkAo2x%0AnV63%2FnHrv7zCeurdFLs7iYu7Zrjd9%2FZEZ0DWzI7MKCf7rulwLr9Z1M4s%2BzJy%0ANeV2Qx5HIZ7DBxQxj7PE5AVKgQntVyS4fYIfc4giUDvFb3%2B%2BaTJ%2B%2FPxEW8o0%0AW7kd%2Fb9Y%2FUoIwo1gTA1vL8OQtAmN5%2FizO23APj2%2Bk1Yxa6seaVbGUfgtehde%0APko9tgcRBPr%2BnQMFuiWxzgUb5HFH%2Fiibg1sXZ32re%2BrKJkD6eUQBZF5gFdCS%0AO4UbO9GCEvOCNoAFlatkYEOhA4i25cRW9FmBfmJyCZ%2Fot4vqR5bHYvkddZLp%0AvUCYx9XQn6%2BTsZwaRB6MDPFABqAqFrsJnjzOfjO%2Fwchn10vo9zf3x3dQcKc1%0AGwJECb4v%2FawAayNzqQgmAjmT8JqkcHDGrbUvjVJYvfVA57V3L7Ohd5iceicO%0APb4VEPh2X6%2F2xQKsXgpDqF4aC%2BT9mJ96olqTnFsqKwib%2Bm5%2BdJa9PCAKEKxB%0AuPzU8j7llXBChJt7qwzPNShVV5kYTWpnrUJLyvjCP9qBZ%2BH%2F9UACHQvsrP6Z%0AJERvjq5sUuLpSOvqdUcTACHyEZWHZjXArGLmpCdTsyeHv2UF6%2FG2RVXrwDVk%0Al8xL4pBQkgG1HSA%2BCh2dDTaFyNZcZuF6EtwjfGOyJ0a2dX7sOTSXVggIpXwf%0AHxLB7KZg8GOTr7LRgjMl3h2bCOQJ8K4fOCYLw8yAK%2BMw8dQHwvtYUKcB8jCl%0A2eg3NAgDfqquKS0V06usPmSbXjgYyXTwYFM8NkOglAidnMKE%2BmzJRPsmInxs%0AB90SL2vu7%2BR5%2BX8tbLfCf2AMDd96cgCDB3TCxgaUbo3SU%2Bm6d97ALpiF%2FY6I%0AAUkl%2B5fcUdk8pPXkWzs%2FGyy%2FzpSmSF3I%2F6O0%2FS5RkCGVZ70Ig5%2BfeU89RZCW%0Ad%2Bjz0r8plMUn7lDBmouUkHGIkmXYHM%2Bzf6q9C17VWBwJCx%2FXddGmYTsPHmnL%0A9uHOIVNpDluf6cUvp%2FJlZ7t28f4fCqMFLF1Ebi87zVJBXmyvgue4WEcHVnAD%0A8ZNTpVvc03ZGba9UchGdWt5Y3kauldSFPN%2F4ziCPOeC%2BL50M84irXUevO5Es%0AwAFJtm%2BRI6FycBz7CLlZKjxz8I97%2BXxsjA7ZyuvUNRhORwv9HZx2BJ0OFM01%0Az%2F60Keq%2BQTXPzpzL0xAJNdrrYi3CtWf7gC5hTUlO8ocnx4qnwGOPyo%2BRmMGk%0AqKXLCeeb6OkS%2B%2FPfoGXm%2B9mBpPiskdMhhDD6gEfP6Z6oX%2Fhf%2FnlI9JEMKECN%0AQpPzOcFqDPyBjyBhTo3VSQClqBV2K1dQNL5GLgXa8tkHaXlPtVJR4S0WHCVh%0Aa3vcT%2FossJijMIR01HrM1jhbj%2BmFo6wc0o2XTG003IZih9T6ZZvCnGV6v31%2F%0AJZ2LOWfBReStcSrFZ5ZinS7fWcG%2F5JbuokKZVUxWqJq3jolD6nKpfEcBPaga%0A%2Fc6SujlXKQ2Gr58cmdCrN7JTty5F7lFtZlZRcG7QHtr01RXrrqCGU%2B%2B29%2FB7%0AcS4jpPvX8of3zwaPiBsi68YfkfAlyhQhbWIYYmWFjtyC2aduiGGcPudnRzVk%0AYG3li130yRvD%2BxeS4f4oficXUdB7SvloRbYvNuT%2BtaCPJ15ncSUXwLLOFWk2%0A7PY5r5h6PwPVxhxEtmUgcihbBP59WWViL%2BijxPCBoPxDknREjeJOgKxoswyK%0ALuOj5R2D6SU0Zs%2Fv4kWwXCz3wTTdU%2Bph019Z6SvLnm4XFbJTx1MI90XYzydD%0A2HFYgMuAEae72Hmv8qDO8SOat%2B3EkNw9e4DAT%2FRGOmwuPR95gMucqJLcP%2Fu2%0AJxLNQLSUnlfABSGiAA68Gym6ykDKYMrt4v2JOFNE7j457Iq0U6fKKRxVGNdc%0AnF4KmIyA08QIc1YKoR794%2B%2FgNYmb78PCsBQbXOmgldOAKQQl8%2B5Cz6Y2Mu1U%0AduXWUmcAi%2FIEb1w815jTzedtoIQ2GdW5gGIcWSLiLztV%2Fz35gDPxXb0HUGuO%0AJ6THAR4mc87euWzcBhUBxdfNaEiTdUgcfx5M%2Fh9YFuhS5VJjK1rjX9I2jwP%2F%0AgUBlWVwmG3mE0thoVxpSFHICI7uw00PjTNRA3qiXe1sEB6D9%2FWRuqUvKfkak%0A6ukzJBHJA2buKyZqOGE1R9ZJniRImpJN9sPVF2joSvHPB3cSb1JWENeF2T5H%0AgXMhFY2jbgpcXucMHapqDLJ3WMXCCR6R0pCGxWnYcY0O8klv2r%2FTPfdptVJO%0AaEib8XRAgxR7FfctRKmfrf0d%2F9UQQRYsBnN7fn3baHFG1UUVUEYHTr%2BiXpMM%0ACFontBV4pK%2BGl1bYAvYWLVXeL01drpVTgU24FZp4yTPC%0A%3DqLXa%0A-----END%20PGP%20MESSAGE-----&msgId=16b7fce1c1589c0a&senderEmail=&isOutgoing=___cu_false___&acctEmail=flowcrypt.compatibility%40gmail.com', - quoted: true, - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '16b7fce1c1589c0a', + { + content: ['point to them directly', 'free cert through', 'will honestly soon', 'dropped significantly'], + encryption: 'encrypted', + signature: 'not signed', + quoted: true, + }, + authHdr + ); }) ); @@ -390,17 +394,21 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - content: ['Standard message', 'signed inline', 'should easily verify', 'This is email footer'], - encryption: 'not encrypted', - signature: 'could not verify signature: missing pubkey 06CA553EC2455D70', - params: - '?frameId=none&account_email=flowcrypt.compatibility%40gmail.com&message=-----BEGIN%20PGP%20SIGNED%20MESSAGE-----%0D%0AHash%3A%20SHA256%0D%0A%0D%0AStandard%20message%0D%0A%0D%0Asigned%20inline%0D%0A%0D%0Ashould%20easily%20verify%0D%0AThis%20is%20email%20footer%0D%0A-----BEGIN%20PGP%20SIGNATURE-----%0D%0AVersion%3A%20FlowCrypt%205.0.4%20Gmail%20Encryption%20flowcrypt.com%0D%0AComment%3A%20Seamlessly%20send%2C%20receive%20and%20search%20encrypted%20email%0D%0A%0D%0AwsFcBAEBCAAQBQJZ%2B74YCRAGylU%2BwkVdcAAAfAkQAKYwTCQUX4K26jwzKPG0%0D%0Aue6%2BjSygpkNlsHqfo7ZU0SYbvao0xEo1QQPy9zVW7zP39UAJZkN5EpIARBzF%0D%0A671AA3s0KtknLt0AYfiTJdkqTihRjJZHBHQcxkkajws%2B3Br8oBieB4zi19GJ%0D%0AoOqjyi2uxl7By5CSP238B6CXBTgaYkh%2F7TpYJDgFzuhtXtx0aWBP9h7TgEYN%0D%0AAYNmtGItT6W2Q%2FJoB29cVsxyugVsQhdfM8DA5MpEZY2Zk%2F%2BUHXN0L45rEJFj%0D%0A8HJkR83voiwAe6DdkLQHbYfVytSDZN%2BK80xN%2FVCQfdd7%2BHKpKbftIig0cXmr%0D%0A%2BOsoDMGvPWkGEqJRh57bezWfz6jnkSSJSX9mXFG6KSJ2xuj30nPXsl1Wn1Xv%0D%0AwR5T3L2kDusluFERiq0NnKDwAveHZIzh7xtjmYRlGVNujta0qTQXTyajxDpu%0D%0AgZIqZKjDVZp7CjKYYPzvgUsihPzlgyqAodkMpl%2FIhYidPMB135lV4BBKHrF2%0D%0AUrbb2tXMHa6rEZoj6jbS0uw%2FO1fSBJASYflrJ1M8YLsFCwBHpMWWL38ojbmK%0D%0Ai1EHYIU8A%2Fy0qELPpKorgnLNKh8t05a01nrUWd%2FeXDKS1bbGlLeR6R%2FYvOM5%0D%0AADjvgywpiGmrwdehioKtS0SrHRvExYx8ory0iLo0cLGERArZ3jycF8F%2BS2Xp%0D%0A5BnI%0D%0A%3DF2om%0D%0A-----END%20PGP%20SIGNATURE-----&senderEmail=none@flowcrypt.com', - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '15f7f5e966792203', + { + content: ['Standard message', 'signed inline', 'should easily verify', 'This is email footer'], + encryption: 'not encrypted', + signature: 'could not verify signature: missing pubkey 06CA553EC2455D70', + }, + authHdr + ); }) ); -*/ + test( `decrypt - [gpgmail] signed message will get parsed and rendered (though verification fails, enigmail does the same)`, testWithBrowser(async (t, browser) => { @@ -422,41 +430,27 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te ); }) ); - /* - test( - `decrypt - [gpg] signed fully armored message`, - testWithBrowser(async (t, browser) => { - const acctEmail = 'flowcrypt.compatibility@gmail.com'; - t.mockApi!.configProvider = new ConfigurationProvider({ - attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), - }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - content: ['this was encrypted with gpg', 'gpg --sign --armor -r flowcrypt.compatibility@gmail.com ./text.txt'], - encryption: 'not encrypted', - signature: 'could not verify signature: missing pubkey, missing sender info', - quoted: false, - params: - '?frameId=none&message=-----BEGIN%20PGP%20MESSAGE-----%0A%0AowGbwMvMwMVYfy8j1GPd8g7GNXlJHCWpFSV6JRUlcSH3akoyMosVyhOLFVLzkosq%0AC0pSUxTKM0syFNIL0rm4gISCrm5xZnoekEosys0vUtAtUkjLyS8Hq9VLzs8tSCzJ%0ATMrMySypdEjPTczMAYkp6OnDrODqZDJmYWDkYpAVU2QJVTh1Tmeb3HLhpxtYYQ5i%0AZQK5goGLUwAmYl8mwDC3yqJ3RqXeax2n108b42sc%2BI29zE1fLvdgq1Tz3ZL0a2Z5%0AXSTDobXyoiGnj748k%2F8iX7dJYc5C%2BTTmPMXtPmYJKmd7V7v2x6675BfR%2Bm25ednr%0APfEB9k%2B47iQ9yNsgu9TG8NC%2FhhccalMkT1UUcv7V07mW2ZRbfvSop1ZSU%2FbXm3c%2F%0A8nd%2BZShfmrHQYMMfe3Xmildmbhs2f7S6I8G%2ByamhrH1XsnXKlc%2Fca63S53TU7u5e%0A%2BX7vil97zTc3cDgtP%2Fuw6GB6mmTo8mqlb20GytG1LuYzZftP55XYL7XyO5M8Rzx2%0AZcLBPTsfzs8o6bgxt0fBucIlds7nzLOyKld%2BG2u%2BuSqzuj9wgpeOSX149f%2B8y7N%2F%0Ahl5nbXIo3qL3QXaWwsXvh7fITVp155%2FbxSXKX65fuLmh%2BET24Z9C7V8iGf9M7v76%0AtI%2BjSNRu7cnAttxlX4tOGHhtuMH%2BTU8nNv1cPEc1X%2FH1VRv95mWabl3lP%2BHVmou%2F%0ArkyN1%2FsWl7tS%2FfZP3vVlp3MSPvqy%2FP6T3VKhXSYdWFzhyblB6KhqzAbBuuVf%2F2bY%0AKRx1239v9uZrM3yEZOc0JtzNz7Lh7xb6e89tIne4blx81aRT7b86YroUHGfe0PF4%0AsHjRnQWdmeU2kgcmH%2BLUEdxd4bJgx%2FSQwPrb%2B6zieQ0mLbDsvZm7gHFPeq5ZW%2B%2Fe%0ABU8%2FcNc2bd49KWrdT8%2FzKpJ9KmvV9uz4AQA%3D%0A%3Dr8So%0A-----END%20PGP%20MESSAGE-----&hasPassword=___cu_false___&msgId=1707b9c96c5d7893&senderEmail=&isOutgoing=___cu_true___&acctEmail=flowcrypt.compatibility%40gmail.com', - }); - }) - ); test( - `decrypt - [flowcrypt] encrypted hello`, + `decrypt - [gpg] signed fully armored message`, testWithBrowser(async (t, browser) => { const acctEmail = 'flowcrypt.compatibility@gmail.com'; t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - content: ['hello'], - encryption: 'encrypted', - signature: 'not signed', - params: - '?frameId=none&account_email=flowcrypt.compatibility%40gmail.com&message=-----BEGIN%20PGP%20MESSAGE-----%0D%0AVersion%3A%20FlowCrypt%205.2.0%20Gmail%20Encryption%20flowcrypt.com%0D%0AComment%3A%20Seamlessly%20send%2C%20receive%20and%20search%20encrypted%20email%0D%0A%0D%0AwcFMA0taL%2FzmLZUBARAArdbyWcgwf3B0LjUD0ephMVsbwKMqETPnpCZiXnuk%0AXWEfNv0IbbuH3Z3MT%2FDmMQuzjltFOx7ggKAg3z452JZI%2FZ74vxaMtiWL%2F4NB%0AbDERSYIsLe%2FqaG0r9bLSFgju2JpToUGY6yiEYg9ciE1vitUwzurx%2BwFi7WIq%0AsO%2Bzra46rp76rUKk%2Fvss6CtPlqScNyJTBmv%2FSz%2BL4zbMESkdiR5qBVqm5ah6%0A65TXO1KIH2ZjdOBmLOEi4p3%2FJM6IQ2iPQQIsxWHjqtMQyOZA9Q40GpRT5kQ7%0ADCUXsRsGB5YjfgsBw2r8HUt2eLKmUThPC%2FQZlu8yLO1AAIAPJJtwAw6OOJTR%0ATxBTwMAhcJxtFRKPYtUD87xuydctGhoLy6mJiPk3q2Z4BP5hctnuSsaUQPl%2F%0ACsZnSyobQIde5MnS3GyEQ%2BMUc0oq94aTS8OdXrX3EJJU1EU3Zy1P38n3V%2Bgy%0AW1qH5CR1D8otQ8Ed9Ks%2BSRiNm%2FQPBo8hu3df5RGQycwVe%2Bbmx3EDCSBq%2BzbD%0ASbaViUJaKxJnqJ%2BUKEruouuhli1EkzVgSj%2BnpQjJ1EcVIjPGNE57BDC0qIF9%0AbcHcCsyT%2B8VMtrCB9aMAUGNXr%2BbyhY8SIv0xFdTshjx5M6PWu7e6yFrRiT2d%0A4mMUJjYMWcEyXd3RH9pn1QLEWZK1Fpaclb8oPi4PwHzSPQEeLXuhArWpS%2Fsv%0AkqaG2U1x8qUu3yM3vkxWWRRMtmRuPTvFfLhoJRqxGV%2FihBIEQXwlKvgG5qcW%0AjP%2FPXN0%3D%0D%0A%3DNyoF%0D%0A-----END%20PGP%20MESSAGE-----%0D%0A&senderEmail=flowcrypt.compatibility@gmail.com', - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '1707b9c96c5d7893', + { + content: ['this was encrypted with gpg', 'gpg --sign --armor -r flowcrypt.compatibility@gmail.com ./text.txt'], + encryption: 'not encrypted', + signature: 'could not verify signature: missing pubkey 7FDE685548AEA788', + quoted: false, + }, + authHdr + ); }) ); @@ -467,14 +461,18 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - content: ['გამარჯობა.', 'こんにちは。', 'Здравствуй.', 'Chào bạn.', 'Dobrý deň!', '여보세요?', '你好。'], - encryption: 'encrypted', - signature: 'not signed', - params: - '?account_email=flowcrypt.compatibility%40gmail.com&frame_id=frame_CdqnkNWgHP&message=-----BEGIN%20PGP%20MESSAGE-----%0AVersion%3A%20FlowCrypt%205.0.4%20Gmail%20Encryption%20flowcrypt.com%0AComment%3A%20Seamlessly%20send%2C%20receive%20and%20search%20encrypted%20email%0A%0AwcFMA%2BADv%2F5v4RgKAQ%2F8ChgnbhGZoPWlurgYIIv2QrY19hjaUs3cpuKMDlDu%0AVEtRRktKtX2aQ3Uoa8Uujc5xbP%2Ftj4PI2Tq7Hq2J6e%2BevJ83QOkKhT9zjfaJ%0AMqutNeP6TFDdtBsumdoLMEPXeGRL5iQ1QpIlifenIMsGI0JRRYZnZJIa%2Bezf%0AAhp%2FKrwK06bnT7mopm4zNRai2JRDppCbs486Xk9ErOMtCLEzWDZcVPD76agC%0AoTiRQjX%2BHeIyPgAqYTFgS4n5OyOl24alwHwPAvYV9uMEmKfoWZAOc87lZ53v%0Amqmyj14kWMtHwNhgQ8AncozGbv%2B0j52%2FJATK9U605cF6f0%2Fuc4wvd2jqpfWY%0A%2ByJw8E1wLR93oHvp0osyrHPq5TFeQO2CyLzOhhZsT50kyXJuD%2BQfgj7buNed%0AQQY2Ve4nrkYPgHIMukfXQDj8W0ZCluct3WCg7M0YWJizDnI9GE2UN9VN4OHn%0Adfle%2FAjBCijxWLxQqWCSyuwNmZl2QaHS%2BTrGj7%2B27GtsQc3JPu26D50a3PRg%0AHZ9srOYHVRR18PgoSfunySNio6FuMCreg%2BtPds0dN%2FYapCkXnOSrIWUGhOv%2F%0A5XalIpMK4ICa7mCmtgGV7C9BW%2FlvDr2jL4o%2FE0jyJHMF7eUimylGLU5ETu0e%0A3wJFemlLMlClcfsoo7Djpv%2FZLv7M8SvBLwSzr8%2FkF1nBwUwDS1ov%2FOYtlQEB%0AD%2F0YG4QGIkkxLjK5pHLlWGD9k4VJ0vxMjgP3zI5hLG3V9j9mR3dm7zmiULpN%0A%2FyeDlU7v1sdmh2s8x4yJZ5xJaiL6gDPGoxKg017L1GyNzqvna9qoDc2HxBMj%0Aegs8RR6Do8rqk9p8EBXiI3FlHHn%2F5hG49Ni%2FLNNxcqf6dOextTWpm4tFeMHx%0A9nA%2BPO2MoF6oGkrgbOMDUtKZwnQGCxA3%2FYXgv7wya%2FoAS1HYVvRx6Lbl1YME%0AHM7e4nYiAOflwU2getEtSXfu1CD8p30F%2FAkO%2BqKaitZF2LXmS%2F41yIjD69oQ%0AsY5ERKRdNQTBkr5eUhS6rFXII8SXtJVw%2BDY29AAelZTIxIJ%2FzLW6AiPydRSp%0Amu4vi1%2Fy7YWTQ1bWlvyIjHWDRpwVv4K7VMWIk8wUq3uRF5%2F2%2B4h%2FemcXc7pG%0ALuX%2BwiqMWw8Hjv34%2F8HlltrQRG38JtsTKC9DPKTqezrIcdPvv4PkVXGHLxYg%0AdFyfkYr%2Fb3mKiGVpptGEE1rCPzg0TCd8JNQgFr04Xq5gElPP6XBcvs3J5%2Bh%2B%0AuHlaFsoPMzthn8%2BeNmvxiCHpd92VIbl9Vq6%2FZtSPcJn4drrftn3V1zvUC712%0A4LNp2iipdSAynfkBQE0FJv7m9mbunCa5aAEVQ7bxhgNX1CqAtRmeshd8w7SA%0AoyTwxN%2BVsQUhx8OMKB%2FvQ4SQNNK2AVgaKnVXEtPWJsyj0HUlwHB9jjV5L4I%2F%0Ai4OoVEy5ANL2f09cPeHGkbaKb8s4LTqZAU6Zz%2BLfDfTjzPrRD3qVcn3Kcwj3%0A4eCvkBIEt8NJ5%2BZVIKhN3lGCCab%2BFJOtlXaCL0oks7JGlQn57IPmtmWCaGKa%0AVRhp4WU3oIVZkKjI23sIWdt0l0z1H1xKhFVF%2BLE4kiQ%2FCIwifGYJ2R5eQi5I%0AqtFxVWy8T4Y4aWPciv73P%2BRL%2FnDd3JU%3D%0A%3DwmSW%0A-----END%20PGP%20MESSAGE-----&message_id=15f7f5f098d6bc36&senderEmail=&is_outgoing=___cu_false___', - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '15f7f5f098d6bc36', + { + content: ['გამარჯობა.', 'こんにちは。', 'Здравствуй.', 'Chào bạn.', 'Dobrý deň!', '여보세요?', '你好。'], + encryption: 'encrypted', + signature: 'not signed', + }, + authHdr + ); }) ); @@ -485,14 +483,18 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - content: ['ทดสอบ', 'นี้เป็นการทดสอบ', 'ภาษาไทย'], - encryption: 'encrypted', - signature: 'not signed', - params: - '?frame_id=frame_vsaWCVStjY&message=-----BEGIN%20PGP%20MESSAGE-----%0AVersion%3A%20FlowCrypt%205.7.1%20Gmail%20Encryption%20flowcrypt.com%0AComment%3A%20Seamlessly%20send%2C%20receive%20and%20search%20encrypted%20email%0A%0AwcFMA1DaD5CEIgc5ARAAoUfZ%2B9NZCeiIQKQK25%2BdSvxB085gOTv0XnoAlqPE%0AjdhKp7XXojq7ccUSaeEW8DqTel5P74FZ8GwuhFNj%2B6G8ZEcOaxo%2BVKgoOkfX%0Azh%2B5BsABuCDRxoEUivVVM3%2BC2SBBGkqgbj47RJUFOWYkQIlwBhSA%2B4bVXaIC%0A7TEYLxNy8845%2FtTLDoSjQyMA2qXx5KgFaiD%2FZNDQeWM6wcYeHCczbRBLBJ9z%0AOvHy6hDdo%2Bs0P1N4jqGCUKpORrrCyqupKkViWIYwhkrNE74BGzSGtWp4PD4d%0Au0bSgCcKNJI4D56vOl7VPpNlqumNaM1DFgWCRdGcQdfeHyw10PuLrWB8QmSI%0Atzhv7SLxGQBc0o0tveTKfugVZlDq3Fi3eo6GDzKHW%2B2NkOjMoR7mNCvI8Zrg%0AcZVFwmSEClNTnBV5QwDSevEkOYdhc6TEi8p3Gngv%2BOMLZmPO1TSAQ15KgzeH%0AK6BzTff%2FeTJggXvR4gbYOvySIrow2eUQ8F%2BLJV2jKfmOJIJBOUKEh%2BRQCuIW%0Ac1TUxrANDM6Q0ZMPrQ9uvKUQuDjORmizBqXo1YvjDEbGHh2%2BdwaTSNr603%2Ff%0A4RDOgaSMhMWNvTx2MXk%2B5V8uqoAqZQZ3tSLkPGtGTumlCnLivR%2FcKTeL0wIb%0AueEVTDW%2Ff7nQfhuPXL%2BfVL4i2HItQgl68YQQg1PxuCHBwUwDS1ov%2FOYtlQEB%0AD%2F965w%2BTY6hqEtzgQaHr0S2AyNdgLU2HkKI26%2F0iZ6m5V9S6Kd39r5HmVOcY%0AuNLDlNwlXjK3ohbmEg3VmLirLt4tiq8meN6wpCKLv29GL1qkNXsrfA01dd8M%0AizYFXmf0c7d7HkV9JQmUr0xbl3Iy1mNl3qcXooR2OociWykK0Z4ESLKNV2Do%0AUAP6z7X7jVHLstri5BOqMKTRihvFB2rMGdJTIzH6XuMlSnJXSa8LBHE3FZZr%0A%2FSqxSV4pseg2VXouscdDkMq958ZAaLteptrQT7rqO2qcJoE3Xoon5RJaFv%2Fl%0AM%2FVSzfgfcXCfJF34HMrZGjrHddeAGG%2B7k9E%2FiEGcZ%2Bkxx4ToruzdxGdenANv%0AQ8W5l3AkT1qlvV5GSB0uwpJm1FavoAtiwQfLX0f%2BDC1jI%2FwL658%2BnzNp70BY%0AlL7MXN9PgLLY22wSIYXG7ZHlbWAbs8WD67gBw7W943rw0%2FmCzuhQGH6sJSLc%0AEMhoCA%2FePk3oL2LqU9F1Im04tz%2B0FBP%2BtPZDey%2Bo96Tl%2F0W8wBUxLCq0SAdv%0ARoG%2Btm%2FqfFpJnCvKMOlW2UMT2dYxFGAsTdgHU2xWBP7v%2FnsUsRBM%2BF2mGcxh%0A1OOVzxs01SvYqza7jPhfW3NYBW5QhtnIx6w4b6h8aFrwOwgH0B%2BhuGvDrppR%0AL5TgtK3%2FJqomOtbk5n7T2YID8dLAIAFzuBmdFwMtyzU3NFucc4ekf%2BZYLiR3%0A0edmsPhzAFhHxbaaUimCfe0ipXiuWMyOTgGr%2FeQHKT5Tax9QbGq6j5XVzAr3%0AsAJ%2BYho2XvA%2F%2Bj0XdVHDw3m68HJcJzcJfESIHod8asikJSpr6l%2F2a7e7P7yk%0Ao5sQ7owhi%2F7DXTPdSyjB7rIO389WrRy3AHBy2T70qEcXL%2FZcRX1Hg00dqNZ1%0Az6r8N1dCp6En71mie9jxN37iejGJgD7ygyr%2BRm4Q8r0dsL8%2B8wfDcbxWpJZu%0A2Zmv7a4MdPYJ6bFiVJYpFau26zP3%0A%3DaaqE%0A-----END%20PGP%20MESSAGE-----&message_id=1645e37647db32f8&senderEmail=&is_outgoing=___cu_false___&account_email=flowcrypt.compatibility%40gmail.com', - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '1645e37647db32f8', + { + content: ['ทดสอบ', 'นี้เป็นการทดสอบ', 'ภาษาไทย'], + encryption: 'encrypted', + signature: 'not signed', + }, + authHdr + ); }) ); @@ -503,14 +505,18 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - content: ['Сергій Ткаченко'], - encryption: 'encrypted', - signature: 'could not verify signature: missing pubkey, missing sender info', - params: - '?account_email=flowcrypt.compatibility%40gmail.com&frame_id=frame_CdqnkNWgHP&message=-----BEGIN%20PGP%20MESSAGE-----%0A%0AhQIMA0taL%2FzmLZUBAQ%2F9FG%2FDQ01YvjE9jIzCRSPJ392q28yexjq5PIyFnmUb%2FSOk%0Aboeh8Xs1zMmsgcT2rtMN2Fw79MQdqhhsSS8GSU47MJ7MdMLaWBdrF8oR1ChpsCMp%0AwMAqdy31b%2FRE95Pzp78VJnmZp5qDqqCNbnLVD%2BZzev4ElGan58YhpfnMFsdz0tk%2B%0AgTr6CQVDKOprvbskaFanG%2BjpLWo%2F9LzPu1eWrX%2FQ5SwUVcaVKSdbLm5DVRSU1qnt%0A%2FItTiRueMaOPwZgqXJS3GeqT0C%2FCVxCDd0ZKwfP%2FBuhVTKv77l%2BqnxuNj83I%2Fak1%0A0CJw1J5jTe%2FNEwU8ZdcJO8hDWo900zU90oqUoYUsH1yf7SKL8qSJ8%2FGMW9GSz3cX%0AFhsbE1FiJZ0CG6sUAYtMFWX2rhMwuz8vPLXlj3q6iYQ6s%2FCxqJvuHSbIK26XYMWX%0AnsCkuJjKm3cKe3KONeyxOyizlQaA%2BeQB21U33Bap1FSFdJ0APK3HVJ4B6ZICsLiF%0AVX0iml03ezvhC4qRv%2F0Xb2AdYZm%2F1HSgVUuCvX6bnoLDpRYq%2Baiy%2BHeO79%2Fu2Z0T%0A9Dv0YUAopO5it8cEAWBz1eQvKmkNMQC1W%2B3dZ04Z8bZZ95UwQpcVZLLlvxc8ubwK%0A%2Fh55B8g2ExlAFKtkuEfTtsDzAE%2FPUkgzZ%2FmcyT6clvPrGG4NZGpHxEvl%2FshWRjzS%0A7AHgElrFBgyBD%2F3EhQGy3Lb4pf0helGHuMFjEWHb0NocxyKhLLi63rLVZrDPSPWb%0AM4gtE44bMp0HZ1kF150X8F%2FfXX243M7EVf88zv7uFJaKThbK6tqhl%2ByuegUFiDUO%0ADXOwDkj3aPKM5tOpkkR2ECOOsNZiHQXkfvED4yNhx4sRGAEiw7iXuIJp8mRYQKxW%0Afrmbl4yxUSgWii0s8VQOagwRjcYq9PL1Qn2gujfeNDk6SSfDHh2vIEr6by%2F9y6MG%0AeIvbI9VVke%2FUWtZE75yn4XlVROou%2FUmfERyR6%2BzsQBoMp%2BPy3bG%2FZ1pS42jk%2B6YM%0ATVoGz5SEpch1RH41Kokgn9gRvlbUN64jwsAHbWi3CDEtik81TXNhE9GbPidbB49N%0Aihy172mP0U0MoeAdF5T9Y8GEdDu2%2BTBJYzzpjhGszi6pHjyh%2FqFE2stuNCV44YDc%0AJRnWW35gzD1PU%2BgVOWcx%2FPEAMLmY1VN3RMuuFW951BlNtjg6B1E7GBhMHm%2Bn9l8R%0Aw4%2B%2BzjnV8t6ZqIo6OjJgiQkEh85pOq4yq%2BqGrQAJYOwpnJ4hZ65IB3rsqUrlCeeh%0AXU9n%2B8DCgtfmxuodQWqcRDjwADXc8bWFYifHvTehBly1pIrFLvNq%2BBfrE85vbJmv%0ADn%2FGIa%2Bcu9celM8%2Fuu9pKN5Um8sK%2F%2FHRWo4vFzTXRkBUDuK5p0xWMM%2FYVtSV9PN4%0Af51wBMyaY20YOXLYdyAy31%2FNGh61vSRd%2B%2FzjuzresZ2ghvlecZdQy9fnSqUSvbIt%0AJLYa1tK7H7UjmzauZccKcQqKgaXXAQJt%2BXYZYYlwGcCBzHzMCD65fMwcHit%2BH5Gs%0AjMKjBh%2FitsQP3FV50zO%2FkFq6k4fy9j7ib%2BREQqFyeb0JZp3tnqTxpUPPV21wa%2Fws%0AZ87kxWPN4ckwVClciZMDXtESxRXm2xmlwvQY76Kjw5vvvGgizxEBvMafD59bB%2FdO%0AFwa8tlPqlwCnI3SSB5WHEdV2Rfu5O9SU1ao5X%2BzFpZLSeMMgnysY5VBJzFa6EdEP%0Apu16Hl94RX3aONOD4Mq1DGZQg0ZZ5qFZ9ZXCgf%2FJ6mqFo%2BaHCnT4ETNRotN4bIvO%0AdQROF7yiZxKl%2Bue74pfAfgDLPyYBSmOB00IA11dPsml%2FeI%2BVU4MpDdKNWHI6a4lw%0ArqoeoxaKaSg8lx58SeLW5VuRiEZ2PlNnf1aFzfew5lb%2FMBmTrNQLikTkKgRNUzUe%0ApaobFtSnXDabV0Yqg4A2AYoCKErk%2F0R0lyrUitaUgAl6s3e76QRzf4Ao7r5HTXF3%0AsnwFAD4O6ijuQQz0FnszF3VjHwO%2B%2BfxZRoUAVhovPMN8sUxAXbPUq4Lui9vHbGHO%0AxN0CAY%2BAj3qgtrZE5nUt8rTRwiW%2FkVCyDDLY3kbPdZwdOvyeWkSNOijRcdy99ZZG%0A3OXoT8ja60yMmtRvbrSvXQ2KoyM1%2BeLaFOqap6elGGmkZbKvuDR3b4KZElZCvB62%0Aryd4v%2BtsEcCMsTTpo7ekZqtlcs98LA%2BjCFjVUWGxBz5SavUmcVWCy6QzjG0RaXMx%0AImDGQWiom%2FXD8hACE%2B41HYwGrTvKsW33yM%2FJEsDb2dRN%2BrbCQ6RGTjX7tiRV8BGk%0A0MIY3EejIgQkZMZRAzh4ZbGbZhBUZgfUUzsTmNu%2B%2FfppZPQtwRsXvunF%2BqFCvXWT%0Ag5ZVUcZeBqd6awLJe2nr4i1sYKfHLztKjSXnxbN1Gofnvh4NbPRN%2Bh3Q1vB%2FhCgg%0AfjPjdojEiHk1QcUG4Vw3N5IUSWdeYnC%2BCGsO%2FRX9f0u00TnVpgkkQTfj2FPOE0fr%0AYd90TYhegXykYtzjigAkSMgnasd7zg23MLH0kZQxQCdj7%2BEq5JF0zB%2FgbGbKPdId%0AxxWhSPoAU3y0i%2FlyN0541uqlHxX4i%2BcXdlsTSrAg1QBAquCf3we7b7IMaku72aBp%0AXInSLj1bbnWeRmeuKWh%2FIDnk0xvPN7eTIzi%2B0wYkYfuwKLd5QSn6CGLgk9VRHzsC%0AY2PwwSX58Yo0JK%2BYE9DCvMVMNUeJAxpdIkq%2BV0jwjdER%2Fzpv%2FLUy6MKh4X62dKMh%0AyU9MpvqeMYkfFjbVnFlV9bJnWutYKbtNpzRegY5wIGEOXtpRxuFuhQoGkGH423rD%0AcWDEzNuQ3CYqxY%2ByVATpElBiEYbfx3KKZ1%2BG8aLajv0tI6NnN9qkmCIbjv1e%2BFlS%0AuA5WutrCrIgHrMhREC1R6woUh%2FtlcwGpn9gumNZvmvqUY1GY3jQ5UgY5VFgwBycv%0AvM4kbEbk241xt1%2F8%2F9FZBwvjfW9Lyt0CSw%2B9dqYuRAEbXSaAvvqPL8mUUjG2%2FYuD%0A%2FeStuJYwOn1e9gNYX%2FiUYJD8SqPx89DgGSOcSPOefcURbqLF2yQGl5si2PonVNW0%0AjCsLc6iREfLO%2F28qn9Wd1ORBI6VdcRKHmAxRf517IZDAzO4aay45T04hU5xFL2eA%0AUZ9TC8kx56rdNFvrL670XfOa1er7MaprUBhWfdtgbIQ%2BYTYjzVVi5954ivMEV7J%2B%0AyBLgCKUUJYI%2B%2BvWJ%2Bi7X07Kzt0ZHXebLRCCljiM124dkhncGVUM6QXb1qK4hQG5Q%0AFhxrOjGUrNq7zExBPYEihmd4zf3e3kQXPb1DmldTrwRz%2BusBSB4kSi%2BKjW%2FiKrte%0A0%2BGXgDaJUIL28XLPTYZHPwE3mB7tw4YImSxeSfC9FnRw66JF%2B2Eoae%2FO52G7BoEl%0AqPVRTvVu2DgXxb%2FDljorSrWa00iJSZKeasXDrHSCKcUexkZ21D8Fmr%2BNib3KhQRY%0Aa%2FzgNO9lg%2Bg4JWu2KbVyjECcjToS1sS1TOXWFpGUFMJ5WXMUgZGD1Kk7m09fZF%2F2%0ARbgm6mDWFzG4gNbz%2BqpRmZUCfKwvEDEWtCw7lc0AtAZitjZW1OfATo7oCuqSYQyb%0A4A%2BPibAme7a3kJ3pn5puGQ11hYY33iYv0Jk5%2FMEWVztwkwYc4rweS71YxatIrJiT%0A6SaD2jSzZwAvyqeEWZbYOByIZaRmm6rTmGpE0yGB%2B7zWJ0ZpbCvqQcyTrCZBMlp9%0AkselQeRaxDpkcmlP60Hb0b3emrbDtRliVrTpw3WJbafI4kMSv9kuozBqAavPkhjm%0AKH%2FR6bvuuYzG0fhr9O1CT7wdn85hILepQoIAiLkkjpx9t0x2GS4els2LQm3fRU9h%0AaXP4YKsIoe%2FJjSmdyvs5orSHbNEIsS8MpLBRTKzpl9y7SOFaGp82Vz8%2FLh6yrey0%0AXV8Oz1tQZguU23%2FNkEkgSFjWeJwEB6LCKzMnBOXmFPi%2BFqx5S7JphhAJdu6sCTXK%0AZjYkkNP%2FUGsbWIFCkqzId9CRPzR2Q5Db16bkjJmxNzSnYXUP%2FRzI%2FILbvFTtA5uU%0AS9%2FYPTcTXyVQWuU0uPUl504M6Vz7uMtj6XFFbU9yAOlBrimZpJPYHygFvkS7MoNu%0AuV5pwAADkNFxzoW9GxBeZW9fwouL3KrHw52Nl1AkFWmoIshdXqTOpNgi7Xxj8XqA%0AMF56BJYMjxRbQtnGHZoj8jrIwUTDTIYvms7xxJHm5YOv%2BtvAlcBMcaRX%2FpKYtoz8%0AQYrOZATUQs6OjXuWWzydltx4Z334iZqtJPwlJ4tp9AkLVPjhHwB64pAdrVLOwlDz%0AoYXccYJsqWPZhp2ygkQ06IMPT%2FSVKs0poKdchaaHTo8BRDvzC1PoudjoB4SusL5F%0AWG0mZrv3N6yPk7V%2FCajURwrf2i14SV58swwiS05xZDhUX4IOVBFDQEF4EEHbjWvR%0AbiYyr48NZCqQKIUUX7Ol5aO4ogv7ZFW%2FLsviCh7iYENRHcF0RKRXCLnpFNdULXFA%0A%2FAIm3TOX0vp%2BtjpM%2F19%2BH7wmqj1DLTGWk8xX%2FrBsgTbuqhPaT4otQxcwkA%2FzppMh%0AJ9iUYOdWrnHs4DLX7cHoKjwcHkemF7GT6F0ufyQI4MimLp9YJioy0Vs7seZiGBnA%0AyBSFIFn827tgGN%2FbEqNT5JAUcRn3VClhmgA25mPeHtJ0Qm%2BrF2rOddfXJ9yLGJcd%0AcLQK6yPf3T1wqd1rWdgJ%2FLCj%2BNrWWfOgp%2FL9qDrzdTJoTOQZtSw5KVnQ683Y%2FJr9%0AwX3j5B2mgMwT5EfJb%2BQzDiD%2F02Pnitzn42v9FMZct9260HIGWsnfVu2dhXPwbE69%0Ajh8ccj6E1Pz%2BfRcheJCnyMD7YDNO5palOGNQgjtMaFIoMORiX4UYyWsgQVkB7gDw%0A%2FH8TdhsYCi06Z8LCj1XF4qkiTVseikyih3Ro9sypUUeln9QhNrEglpj12xrUcNZ3%0Arap4C4inie%2FMrxZ3IaEKP930QkaGWmP8IdQ3gykz8%2BWVBXwu1OyJdZERjbsoZVTy%0AiO1eE%2Fo2jSpol9KcBD0s9DobHWcFlDhzExdk%2BVb9pS%2F6a37lrQvj59bBQ2aVt41b%0AbTngwnCrMeOWYChecnu078YEeyRVlOItsB%2FTl5qbq4HyLPYfMj53nJtGh6IbDN%2BT%0ABgbKJbmrjpbiXUEWryNJYVNu%2FE1CS9X0AXb3or%2BBBzVqdwioO07m3GUYyMV2hlnm%0Akk0o6Qlxb1VR7CB3PuJOgeUK%2Fn3cqzZcG7q3EdYobjfkM1bGiuXpuIzkOPsD8Gbn%0ADYKjvLts0yO3CF4EdYEKBGnZ7Mo4IL4G0xZjAKqg6jVb9DhiWyVp5R3dcoOBZik2%0AqcQ3iY5cE40SddK0jQYgWRhPFyi9V8n0fElhef0OJL2jLKYRHbxpLM5lgKpnmH9Y%0A2ti%2Fv8l2n5z7wSVBIpHbpYq5LrRdlAwyvSITglf6IHFXiagyJTcL3mx7eJSfscQT%0AdH9RYoAO650vDfhXZd%2FrVgbZsUjr8vHf5SHIS16yZE2mXxIPSBpKJZpTMXJwc9h5%0AYAxwukFXP0k2SUZN%2FgoKg%2BQ7rtL5LbgmOAcPInVxQILv5HqSsgZFwunQ3v8TWtzx%0ARYmdHDGQSyfpAmOEJ5Kpnzqxon59tUdudNSgut9FL8SCy9nC0sB8SxPKO%2FqtLM5i%0A4n%2FPqMutwPsqTW4ugiFuBKvwDQbLhUtlr6BuVP61dhv970TBNZfrfO5mptxdxjey%0APrj%2BP6uKi6RODHHdE8jVvZSrxGRowBYyPN8GpY7pfchKdU27AfGP6p%2F95oboSnQN%0A2MTOmCYO%2BW2aaqVO7xaBHB6slY8OZ0a%2Bb9fk7w5m5zE28RfJIp%2FFNRZXzUmvR5Ek%0AXln%2Fx141yHEl9go1RnWX%2BKuRjptFPN293SXQZCubQqJ7MMAWixTGcyKb8L6V2KoZ%0AWMqzP54Ud%2F%2Bt3ddHC7BxSPkVAgDY%2FrWqu5kBJOTbuHFCrTTFPEQBEs4WZRfiR1FH%0AC%2BKZH3GWBoi6tVGVCVjapGQR9pwzTUpWQ9txN7XC3a9A%2FGUxCgCPDSDKPjjuoBwY%0AreJvP27UiyWnHR2QjcCXAC4lbAC41Gc7Q6ejTfd0HZ803V9bDTrcvsb933rM45%2B%2F%0AYM5mbp2VkugZbSQ9fTNXP%2FiSsZRjhk96I38n%2Fw2ZH0np6m5YcfCdj%2Bd15tYQKe9M%0AyjqTsaxEvncLT9M9RcRgzgnq8gmetEf4ntUC0P6dk4TcSfhqCfg03KgixRNqJEOk%0AYTR7t%2F%2BiV7efS42ppR1XwJXAOVy7S8EGY5iKnoJtxSKMgcWBKUng9v7cPLvuJJ7M%0A%2Fw379Bo4%2BpgXtRJKEQX5wBwbs%2F%2BV67rZAppCJfyrA%2F0k3UwqF7s6%2F1wG%2FPHjpAlf%0AWco17A5UW%2F4PAL4ASUzhSijcdl4P%2FulalCyL7zz0CE9szDTxvGoQcUjyFz4X7k9d%0AQ4h6mFdJGXnAc6KxXUo8hgKzcoP1uUU%2Bb%2BZzMV7iaX6JIA1bq0l1wCqogF6A7Xqn%0AMXzZXfOO3k3w6FWqSIpSwGMo%2FZgdApvQdzsLdcI4WpKQYcvv1kkNQHJsMzp0Av3p%0Awf3e5Yi3cS9c6D68CPiinSKaz5Hh4TWhYdEogKehW4cBYchjst9Q5PpC4%2BlC4gRP%0AvBT5QW6i9XTDprdUhHZxeNtefsZz57kgJTr%2Fhaf1kbiH1ZTcGOsM1R%2FQtl2RB85n%0Ar0RNRxFC%2B6S0B6HbTQFjD0Kfy%2BcuYJY9%2FtvevLRLSlGFjqgOjJmBjr7fmUCCJSIP%0AZkp%2FLF7jBBt%2FtaoUjLNOGQfSYBot9Fhi6DMoQYQ4SJZL9FXpTA7SsugjSvULxXPh%0A6AAmevooajrYvrbQfTlZ1uKoUwZXb4%2Fz6iGgtDuXtilmx%2B04SO%2F7j507HDm4WooP%0AH191ZiH%2FPYEVt3BLERNzVqg5C1orr8yMpeuKvib6YQRk1heXiGPpJEWiSAHKYx5r%0ASkRtowOSymL4PfUdcUzeWtNp7kjpBDX548KWZbmROBM2326ecxKzr2UdaLcYi5Tg%0ABpmJhxP3pySowMOBQOg8Qgls6LJZwLePLBpDS6h6kI67pZlR2P%2BMVpzfN8G%2FDd77%0AG5yC0rMNGhCaLGAbNZYHhHq8z9EqoxCzvVKEyeqh9OTDGUmuytRLnKSijukxEuvy%0AGHXRpkO%2FJWTc0z6IgLh6uvGaHxcswLWd7%2B%2BPoUsU%2FWuFLyt0VtzcjkMFfriRhYWm%0AHmbSVDfZsz3JEJGPRFJb0eU4qgc0qj%2BzFmpSGSeDroZhwFBqVwu%2FXp%2F9dPYJRebd%0AlwFJ9fTjFJkkv%2BsWE17wAjRcHDqdbWk1%2BXjjZ1lnLRCPGLalK9IB%2FIATibk%2FmMe0%0AoQnVGuYABhvpa1CldSy8A907jt1grqx2foQfJLvCMUp0yCmTjdtO3b3fLwySrHh8%0AwuD4V2RxRjjjkzivPyBBA6Cr7rkwra%2F6MofokiUXFNrZZq8PQaoxifwcKMXmmqtA%0Agv18sY%2Bc7gCeQJcFz3VTLCrI22RYoKYuQHCZ0Pp8tQlAkMjcpkxfWR0tQLxpDNqe%0Ajvtqf3hNNW2qu5amEUGXs0Mq%2Bv5v6aRfr9Xy%2BLb0ZNhz8%2Bks7eAax%2B4IsaDbrGs7%0AeIzvp413pFwO%2FunARcBXn%2F%2FE9AVXWXARVqIWFHrYO%2FH2ll9GR0Pe%2FOAPwuEGG0QH%0A907r7dbHe%2FaWQw%2BmMdK5j53PbDYinm%2BFVcTEUklzJ5n1rc%2FvMIyqseGl6MoT%2BKXu%0AuBlSIedJ%2FnNwsu1Oa9l55lklFtV8bHOg5NPj530BIAC4tAnbRhdtoWa0O%2Bz8SYmc%0AdXUdf%2B2vF6BA%2F63YjinYUOX8PreIJVnD8qFpJCtBTT5HRBhaHYV5L6A60lq1%2B1Mh%0ANWmNckKVG6pZDZrNAYfkm0tdYJ8wJOR5XjAstbHFRwbRqWWNJU283v5wuZQtpMt2%0ANXWbUCjMVsO8IVh2VYwftrb1HV1mZYrN0%2BxdGc7mjPlHGU8G12ci4K0BqMqNv9Bq%0AXtu7RO3iZHNc1Ir2Xy9FJBd9ysr3SoZc6C0NmWzFOQ8oMKtg%2BC5HK6joO2Wced8v%0Ad16ghltn0WxLck8%2FloqUMaJZ58GCaJws%2Fxip45PQeWBAWJRvXlqWkQfdiPGp1G2I%0Act29btIAixOGMplReIuwPlCg7R5RaFn28Mt7QFk8NK2kVBd3pWzWtgodeGyo6jG5%0AZG8uZpg872hENmTZYKg4TQDdlCSzX%2FjEAX5VBPFTNUYKSw73%2FCAHZgtHWE%2F3Hdv9%0A5rSokViBqIOrmU5Xpy%2BDfOsRaMEkv%2BpSzElKU7wBY%2BVRDV%2FCBis7bOei70IBsaUw%0AwKfoz9NemxHR7gTi46l%2F5fBjWtubx8TO%2BbtZWd0845hvvSTroP5E0KtUWiqCwq9h%0AWV%2BkBlpu06aHue6abPcbQ2P%2BEXLEVg8r2SzKMq6br%2F3O3NF2uiUIygM6OV81yiqR%0Ad%2Fs7Op8dnVXlnQ5CYViOGMKjuFHReQNCeIUx2TDtlKm61F2%2FzMrqIOopJqbZrQrp%0ApeZNe0YSUlPGzxlAV9%2BlbACf3ZCO6pigogIdoGELUqg2aStQ8482FHupSeSubSD8%0AwIVVJC5bX%2FEB2xY2EImJ%2BqS%2Bv5VjGRTwcW8srEJL3qq2zgn3Llc%2B0k7nabjZTPVg%0AW%2BI9YphTDpfAvXE0rUAocquP2bxjHavW3J3tVLQ8HFCQxxcWFGg686JNDxVqleJ2%0AIBmraou9mLQMU33YLJP1Yc8gRvkOyhP9NkK52mvQDeshYkb7Q%2BmjGnHAD%2FMiAE5S%0ARncixlzbGkGWXFZ2Hk2NQqvWnflt98zU8RDHeqTGss6KL%2FeffmpM8gxK3WIvvnWW%0AfNHuSVUgYjEKhnuouaAY%2BKSjvUhxeF1l%2FeCHYcvtWABl%2B4Q6y4EhzGfubgqbcIav%0AVNF%2B2yF1q5m4c9stoYjzalg4oExlepAdzQ%3D%3D%0A%3DzHlX%0A-----END%20PGP%20MESSAGE-----&message_id=15f7f5f098d6bc36&senderEmail=&is_outgoing=___cu_false___', - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '16180866d0ae26c3', + { + content: ['Сергій Ткаченко'], + encryption: 'encrypted', + signature: 'could not verify signature: missing pubkey 6859679E2F20BEF4', + }, + authHdr + ); }) ); @@ -521,13 +527,18 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - content: ['Prozent => %', 'Scharf-S => ß', 'Ue => Ü', 'Ae => Ä'], - encryption: 'encrypted', - signature: 'not signed', - params: `?account_email=${acctEmail}&frame_id=frame_CdqnkNWgHP&message=-----BEGIN%20PGP%20MESSAGE-----%0A%0AhQIMA0taL%2FzmLZUBARAApSOEoWZSpvBNMFPgyhbnMd3Jdv2%2BsQRSs3iX28z6TsOp%0Axq7Gqm1xh%2F27EeJfisCZH9Af1aB9OSQXDzfZG9NqvXXQcsMsp6GcqyzUhxp33VDq%0A5xWRAoS8M4WvEMGOKx2q4ChoBhpl8wloDQtPtnk7cDv3YRgxF0JSkwTy%2F%2Bs6wAOJ%0AX%2FULyAayJ8MgETkRpFgzYpWaWTmrJsdsy91ASJAP%2BKujGn6BNss0LdufWrzOZmxw%0AJ3sX%2FSasurMwwaftRcQd9CVzckrAFeuwn4fCsr4kFdR%2BRDSM7GRPM5rxWnTiulgh%0A9SRTyekvJlpnwbn9K6qPO6oiXVDZmB5Gpl3OuBl5V%2FPazSHpm%2BzPzNxiwlQOobgN%0AP35PfbpJAi%2Fq%2BpSEra0dmU1Jtek7s%2FNh%2FsRebJEgAXwZvuUiTBu2zdIygW%2BItsaa%0AQqvffyZqcrY85Q0KF%2Bz5j7MOYXL0E3bkhEtpou0pjdOEJTsbNlAsFu64oxRjUjkD%0As%2Bfpgv3hnW%2BvYHQy98B1VEz1Q%2B2G3sxmArepnaD7Kylj6mNE%2FI2QPYCl%2FDqxBdZv%0A%2FSKL9D5t6DKqj0cu6TsitWNbT8SOq1oJP97ZUcr%2BNg9YHDYnb6v3mXdKZ2UxtqVG%0AmXzGU9rc2QW%2BltQINpj0uYzKNQiYxXnVaO0eYF4wJQ5EkJeixLltUQKSTlarQKOF%0AAgwDBlAx99b1mtYBD%2F9yAcmyrvlAGEvn5bScQXV0k4KY0n2gpXp6A81uyJAv4iFo%0AUye4LdRlZEdx9WOxpujfLCiGAKaN4tfDoDw4G%2FAlLelOwG87AcuK01EYQOmtVWmO%0A0jPkQJkmQe68Z68KRUlS7BpsLriC%2BfSjbT9wOlhVA6xaA0DQfig%2FhMkvZp%2FA2vCT%0Ax7OE49siG6lyWHhTQXEmXflGm23a3Eza1%2B16Ln8TDUEt3uFiPFAg8Wk4arb2NMth%0AlzPOvLtDjOmVjpbPDtGjmUeCjlt3m%2F3IB2HrII9KZrT%2FnXBb29XenXa4z3Rv8ziF%0AtBNWOXqKj4E0aYzXJKNDvGtK7Ddn4gMgdLfsSeJ4zL9vwam%2BL%2FJi7WPb3SGSew6H%0APKGnOJj2fBMXUnWxzLDf7KZs8Z6ON69P26kYrwd%2BMpL2hkhEi5fYkpHDam7vBUUb%0AYwBUpGF2Msx2YH7suCwaNVeXX%2FakNzeu6%2BxgyocPTDlIPN3C%2BJsZIeglw7lsWs%2Bn%0A3EcTvS%2FC6zIOLTH0fYAES5dzc1sSIYPJ%2BE86nhC8snxnSIsJyaB8OJxSfVUreMmO%0Aw1kiBdMuAtUPOUs3ME9Xaqic2zQrcX1G%2FKSNjsXCNEf%2Fj%2By%2FNpeVP8jtyGFmHdi2%0AIaBFez6rMOQWmEimThz8r7805jvfYHlCWRN1ADSvxtd6pjzUgrdnmGu8mqfZ39Lq%0AAT5PwLztaOjaI%2FhCOdPzjb7%2F5OLvAh8voc6EbEXEHRvg0Ut7viWnSlLw2VrgHXM4%0AuBEEMUtRTaFQr19FKyp698V%2BnMoi6i00aoxVYx5K0fhR28eTiyZFRAYLpo4jV4p7%0AG5wuS2Bl%2FetLDZ%2BKlWjN0OdZn13OIMV0hO12RibB7ixK0dR6aFxsrDvL05RIl6Cx%0A9oLaBTQs%2BQcHTGL88%2BJ0dxY9Q09%2FBkz8VJcIdM8BIJSPDj2Z97FsMPgo21NNR7EW%0AaKY%2F17%2FztFHXXsh4LPYxr8xe%2Fjz8i9PYPCo3VTe4E8lW7r0XbXCsinFtmouO%2FawX%0AZF0pgMCnSfT%2BFaji6THxfeMCQEXH%2FA7HLe32l7B%2Fnhl9q7Hb6vEIJrav7yfSSpp4%0AW9P0Qoz5xXRtphcqE78TXGNlMYGOZjZtMKk9qPeRAfBlf9o0B1TAPAVb%2FcaYbph6%0ACe%2Bd2mRPSHv%2FFZlHtk3aVhLbEVBdfbwculi8OY%2B13EiUuzGahrjWXJU8%2FVj38U8V%0AGt8glmUkshZDX%2B023YJ4e%2FBg3m1ClnavXnW%2BoKDsUfvHOjIBwH1PGjkhnaEqqXw4%0AhHM%2Bqn21KViyDemgxhiff9ruvNq0w0fWk%2BdD1bCuS9JJM3Lrgpq7EduBhP0924Dp%0AlQvDNHMOXqdm5x6cec4ZDJUJVKNt0RM2hi%2Bz1ZWuZKsNnm2WkV5VMjE5m4kVkLKW%0ARzJOpZ%2B8CzMi3oYO2R9BRYpcNjNETXN86mYaMJOBxXyUM1p%2BcNVtqjE2L7EMhy%2BR%0As6sKiDPX1VHX%2FUrIoBiscAJsROzFJ2DoLS21omL6V1opCp5yg66t9P4ksnZC%2FPTT%0A5jndqWbNFVzCsyaGjH9skHwHlFbgwnuonvhwShJIfjEnG9CIKUlsIsHIHxuUKO0j%0A4dmCmfpQVUYgWNsw6u6FZ4mXaTwx%2Bg8e5BjP0xW%2FvQkmsOltZnxt90zp8aujtGyH%0AM741rzKAp40wR7mmd8qiAim399yyLthNSrJOGI4LYbixIMEk0IdiU7BoHvOkNjqF%0AE6cZBgHIstClOz6rYIJmzMeJSD5knjHBO3O4OIlFOtOa47jOrU5yCV2MaUtLcI8A%0AS1YZ75bgznVQZEHS6qNH7lfuLw3DPm5otvYJQwX9Nf2EfNhdp4XKiSyN9GslzpxL%0AtR5FMA2%2B97MAC4rUg6IrEF%2FsvM0I307g%2FEKGCJp9K1MuuVmrUvOuRxDcbdzwTRMA%0AYs7Bjf9jasO1gw9CXE%2FoWPQCERlZMse%2B39DmJkfWpc3jxYLo29OqwKNzyjohr97z%0A%2FffM98dwmkLJYr8Hh%2FSVlKrvq98kA400%2F%2FYo9ZhOqvXhxAC51dn7IdlPL0hrRVE2%0A7E4cHZQ6k5RBi6mRs1v6s47qgUekQAFfhOwNUECvKzuKBFYDtUpwgS32RkytdcRf%0AMwhqau0F5rbghdWpJCY9vffiw3qpTh3q2bMVm0ZRR2SCUtJ9L%2BRC78PStbNu9xr2%0AnvCgqyXJUl0p5%2FQbqLUdtLr5ZRsOsPnKo3Cqmedpkv9p75Uda0VASisOVf64Fc35%0AMa7MzfqLTrPSQSpNfLLc%0A%3DoKrd%0A-----END%20PGP%20MESSAGE-----&message_id=15f7f5f098d6bc36&senderEmail=${acctEmail}&is_outgoing=___cu_false___`, - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '161b2ac5a73d4097', + { + content: ['Prozent => %', 'Scharf-S => ß', 'Ue => Ü', 'Ae => Ä'], + encryption: 'encrypted', + signature: 'could not verify signature: missing pubkey 9BBE40BC1E8CE4A3', + }, + authHdr + ); }) ); @@ -538,15 +549,19 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - content: ['TEST, ПРОВЕРКА', 'C увaжeниeм, Пaвлoвcкий Poмaн Oлeгoвич.'], - encryption: 'encrypted', - signature: 'not signed', - quoted: true, - params: - '?frameId=none&message=-----BEGIN%20PGP%20MESSAGE-----%0A%0AhQIMA0taL%2FzmLZUBAQ%2F6A7g5vt9ji%2Fp17TEtJ%2BN0SLKj3%2FSVCBGsUB1OPoG5jXKd%0AURfKPDZ1wwlANopiaqnPOFmXQa3mfLnonvoHlR4oK7LBBJnqxaDR%2B1apxXeKJd9M%0A9zb1QTHmGioOGegJicc9b%2FOtL%2BXK%2BkB8kby0%2FyYVWItwghf32VjFB76UVfTnMvh5%0AI%2F%2B04zxLJ8yelt9m2c6TEpjP8lYjn58ODQgdXr7oYGfqNro9uNKDFJf9mwog7W3L%0AGaA1fGePWvaTnwpu9UZ72qsRn8ON8vmI27gqP%2ByW1drlUYl0gPjhlWy9xR6L1ri1%0AkOD56gLhL%2Biy97Eaer6jTKtuy93esvehKqRldBmIB%2BisQFTR1TV8Ugf3EzTlTW5Q%0A0jWgx9%2Bgl98B%2Bk5Tzh8VoCok%2BXaQxfkKK71LEqNTtAjFIHpzEz1QfSWP49kYBMiZ%0AQ8H39NKYPjLc8vfOWgdDkK4twNUApbjC6plIa1hfQoiktFNN7iRNp0sDiSh2BY3v%0AkDima3Pl1IBlLSZyjZRVlslebzxtXorJSgDHdoZLiyPLDEuzuAHT5vD32HUmBVBM%0AjsB0N2NlvPu9AIZvLtYbSeviTDxri5biy1n7gBNaO6udql%2FF0HObIinm6W%2FAdK%2BJ%0Anh8zmW%2BWEh8xJiTuocrmCIobq7%2BNydhAONV406X5%2BvLWNbEq4NOp%2FgO83vrPeFaF%0AAgwDuL%2Bybr9GbWQBD%2F9eWIom%2BopCTOYs3emdQtp3SzJgTGgYecUpdc09vrZRGDl5%0AUDozj7xeulXkT6A7hJlg7se505CYEtZNGdoZVBHKQxQsqyDBXVReNDS%2FDOf1BIP3%0A5gUIm9SDOFc2sro7U74HThSPePFPslIcl9WCF7%2FZbhwIQ%2FX1gk7EbdREct7f1nxh%0AEsH9EldrNFT79Lt6gZZ5jmeE2YdgSCuFof64cImReMU%2Fs8y5JI6x65IEwxTNHiPG%0AJw%2FR85Bh3bl0N8VlxJKgBW0ZNyJiF8%2F7JuBvsZ3u8Sh9jH9qSE0f%2FIXYvZEfMm00%0AHzMax7jF%2Fvc%2FtW8rTfZzHLxgYCJaIJHAeqnksmf2mfgiiCryVU%2BkOYMNOVYv4PYn%0AEaQLX%2FY34DkoeFDQJnCnC2Vny9CGW6qz1UuaCKes%2FnbQr8sphpfvF7%2BO1dVFqib1%0ASz25tTWQqfnVqoiZaVnQp9RbRN2LlQ6j6YmVap8hLMXPtu2enIvraH9tSKkEiZu1%0A4615OybnIVhYjPSgzrZjihYz8hgxl9EznCKnJ%2BvDTUMl4sxxBnwF%2Br4rDtAs%2F%2FWU%0AeG7QfruTyLZ%2F40tTg16WdrjK4AWHwcQNuf%2Fy22YHP13G3OuhWaFLYLqpgwO5CwF%2B%0AlkROtXdIZcmD8dV%2FjFy%2FmurMIulyRCAHKDGUJcjklA03CW%2FUTe1A%2FX5sIA5GLdLs%0AAXfkl1lNVHQFyGoVqSXW0zUKIi53EkUAC3fbEIK%2B4ljf3Owj9I4M14YbF62Dn1fz%0Amk6KGPOyApO8jH3q5pST2cWGnlAl2Jrwmm2mMPtYKWMSbIHaufMDX68suWS1ZN3%2B%0A1t9LehxG9ruTCrg80t1H9Llaz4rHpho9vXOmIFxPHmREN%2Bqo6dq0cwVb5TkLAalT%0AU795tmmmiI4n%2BSQA8ouPbu%2FvndFQGX1IJC6Z1bln2h%2BxS2HXzS8WT17sWxGKZYiq%0AviL%2B85QMH5oM7mQGW2g%2Bm6LxmAibjmcvYIEPcsOJp5WBMtv%2B6U0%2FHMXJkLWS4NTU%0Ag2beKjmRI9wyT0THkQEBWJ0lcY1Cmbv3k1y7TuhO80FSBh6MUlfFKROsbbgJ50G1%0Ak6%2BuCw2UOH3xWivj30%2FvBU73f%2BFLt99fX8l2xfIxRut3ud68tjVYEtq7j2m5iJ4E%0AZmZdjPbfWa8zpJrSiL%2BTmJUTtrIzp3vuD2YI%2FvZ70%2Btw%2FciRUnCk8%2BvsNz%2FLKG8m%0AwKz9nmnc4qWmRGk3TqEjC47o3N9r0LLTnYh5npena0ns0AIX33w45afjkb0Q8Csb%0ABwzuedgOjruUvOacUo07mNrgjUVDmsGOZJLuQA4KpYA9o2obZw4FhGXrdMgYmp4p%0AnDfTr9nPasfg7Lw%2Bqn%2Fxkwcpc090BBJA%2FAzuCrzYtiKTEH%2B7FojBR6AUaOfsJSvb%0AVvYv8N3TikqYT2gTkQgrwd%2FFtCSkGU4%2FrCIPQzcNdNauL%2BwvayAFVSJE1l0AClRh%0Am1%2FUNvvJ%2BkzSyuRTjWZUHZ10O%2FXdldtLbw5FERuLTI%2BNV2ju1Uh%2Byb%2BPBT3W%2BWZP%0A0kcDFr9MFu0Nz1xg3H9ur1dU%2BQaNIR0vhEvCbQwsthddIu0irX38Gp%2FKbL1f0LhG%0AW%2FCizRuU3IHcnE6FGqAirbMU3M0z0bF7uf10bdCx7Q5obEr6UcvHZbWEp0zuHSzo%0AVl7MxnEJOZaqs79faTP2N3ZXPruZK5O%2FU8s%2FFvm0QOAhnNMGzCRw3tKOPFJYi%2BoG%0A2jpflyaA7PW5aPHRMZjXPqN9pcVNr%2BoCECNFNn1btBCLlqQj4aJ60XQPZPKq4lH9%0AEicKmhnU25%2FP9U7hWpLjSVqnGtJWLsJUqyw%2BQnLh75Zt%2Ba%2BU16q6G9MaYIB2bEkp%0AjLPtUxA0RYVfXn9dvwrq6rLGRXo6dg5VckRkAVN%2FDxi5ZSFfhw%2FpmLRwD%2BwTAQ2W%0ACmRkoMwEpvSAB1trZeZ0iKTP7vl%2FwL5daCgg%2FmpqEj5Fsl3ufXZcWrA%2BqqgTKiK%2B%0AKshS5ZFnPnkC6SWB7XERizeKUDx8V%2BXMGD%2F74FBXlCzw0%2F7wLU2Wal5eRRSaKeCf%0AM7emi7iWR7X0pBQoQCHK6SD7pQsRNowjC54zFmksNM0u9tcwQmOR7hwn65nKmMbR%0AIV2DLHuwb%2FC5%2FYCqgNScENvnq5WRO5TWUKdc5vhpDd%2FuLsrSKB8DgqwTnwKxLiyR%0A7Z8abUs2mdoaEBSFQj4MmZHP87vk7wm8MDkZ%2BZ8yC5PNC9aEqFvNVavoTvfSzO%2B8%0AHIjKrCqZ56QnEFlM2qCfERERzvlVV%2FWYaj95KEV9N2neJrCh8kpwHmaBis21I6KJ%0ApZsbQV9YKEj2sEBtndETXWr9dsaNzy%2BlaUUnRzbrH7OcOq1JQ0GxW4sGHmoky0GE%0Amnuo%2FYTBLzPqhTrnAWaSMoRhUDlQbHdz8lyNyQEmSNAEbmB8zfIzV9Qw31NIa6Qz%0AFISoYR1Teo%2BkbXRvABGqvlaD0VnS2gdgSoCW92PvEwgBvfdKNmOan80PELFaqujG%0Ah76Rt08g0UGcP%2BGnU0iCydjbmTOtXBypFOpXQh7phd0RlknlLhro7fhMlNtHO6Jf%0A6o2y0zcEEu2CzmNiNS7G4k4Op0o8txZjBfCRk0JRmzl8IBiWEk1eaUs11AHlVun2%0AhP9iVyF1PAaD%2Fx2siEi7Y6P%2BMUmLIpZUHQtSartAIsudhqtkbyh9rTWT4N%2B1ya8o%0AQha9O409HLCdVk1J%2BDj9RMDhw4o5oVZ0HryHvw29l%2F7CUe34%2FwRz0fp%2F97Slryc2%0AV85wzRiUEjWNDqOlrgruShywik1i1YDK0ZoUDy2V5otgrWRN%2BFnV1ezbbkp8V4cZ%0AlOPbnRTr0QQQcoHyb5lHolRlhhjHNy8FwEi5y7rtYued1lBBc3tjiNt1AW2QrqH2%0A3QHCaURQVknS%2BW3kvUlfFBSkWHVXeuL2MtKZ204%2Bjyk7t4hz5zJI7P0ZMsITPCfZ%0AVgl7VTEYyTBVDI13T5bAxXzyBLafc7KOqWmo7Rmwhh5ksomEKA3s98CbSATcRem7%0AH%2Fd0CWpBIWYDQh6GhQUwAfqoqFMb%2B2paJoySD3I7oukQ7Mjf61N9ZUsvb85xfDog%0A6E0X7ocyPMsOOJuZUT%2BIO13WDxIOAIedJ9AZ1%2BdqQSDSdYd3R7bfBJaJ831ESR80%0APer2RlkOm5KwHmPBj%2Biby2qX1NFtfUwFaIiZvilDipiwO3vdiQN8tqwCQGUXUwc%2F%0AcgjIUfwsQIZID%2FC05aFh4TOHpxEHGh1zihw%2FjOKmgntZAM5BBxFKRoLRb%2FizmxXg%0A7WpnPwYPqh3NZogB%2FLzT1v4Gn4LfDXB49%2F%2BPpWiymqyitepjfCCLI4Iezgpz4DNI%0AftIp71gI0GCEHH2ZV2fWkZtiMmCuX4BRq2Ck4E4d55AUamlj0Op%2FH%2FzyJeacIZzr%0AgMk4geKO51112xGw5hCWF0VRu0HyoqH44foOsB7JDth2k8WoS%2Fz4aWXGi12aT036%0Agtpqww3ZDXjb9mW5QdsRQ%2F00Hye1%2F4iCEJ97rB2K2XrWBDqz2AZQDC9uXfdyOFDx%0AMGTqwdcQCN8vDtIDOZGXoIj39HKD0KjCwNxzFMbdQngo5y9cBXrBhA%2BAyKOQCNoW%0A1Hq7OROolPfreqheIIqv2zZKNBzkJysEuJbMgHgPJKreBJa%2F7mK6yORaS91OofM6%0AzUOingcNjR0QmLWdxPX9PcoIHsIpQPA8k8KEe%2FtIWhQSciy1ZyyqWrL9Pt8LeupB%0A%2BZo%2BASgwoPSuQpIKdBOcnmqZfm%2FR0V6caQ2f80bIKwafA%2B7KgAiYmi0URiraITSk%0AzAV6BR44Ijn6dBR4MJFrxY3VWXwaJr07EfGuOkkY7YMndQNovHtlZNWtFPmH6kBh%0ATHBhNuHRdpL3Z31gYSEv4bKaXjfkXzG5fotUL5wDUTnit9jtAzgr%2Fk3i1JlGAHmp%0A0AQQquEQQf8aKY0gCLxB13t6jhOSGAriMAm%2B5BYkEIPTditnK7vCG1y4%2BhO7sHYL%0AXKKkm4yoOart3%2FUUtjZSxrIjz97Hd61V7He85zbFmevanXQ7BLBU%2BAh7ppyK4iMV%0A2vWcZGMsU11iO%2FSfsbuqotZYQLQtacpTP7IYtNflWevS%2BPILb%2Fh13DmL3OW%2B9ebS%0ArwRsP59hNFLesJKVh%2FPWa1Orz3rybOhskM4T%2F7jT9OH2DyGgaMnGEL9EISkZ5m9q%0ANTVD%2BHmejta1yf%2F3AMhgYS2rzGqJrjBIfY%2BxciOERaTmV4o8x8ranri%2FsUPEDdUr%0Azk%2BcnTsfvurwjZNyrfRpB5Jcg7v%2FTtAkmftCQKZWPXCQFLwAO9HsLLaQ5PsVPZ6O%0A8OKXKqrARyhuH90OB%2FaeRBqZeisfMpF3CgP1%2BhUksncMGmufhDtTW%2Fs%2FZyIpKN1E%0A87Rd34EG8%2BzcIm7YtlEqJjJKsxohfm4bx6OqGbaUVrOijqK0G43ZWdXZtF1%2Bm4n4%0Ab9NZWbG8l46%2FIRg0LrlNAaNwyJVcmzLhF0DOv1J8%2FmrVs7fXJWKgRw6u5BlxmvC7%0A0zJsarwyqQNhcINF%2B2sxoVNMi0stcN3h6cUlamfX8Q%2FrrRxJLIkU1GzTr1JtEQzf%0AUHxL2%2Bl%2BcTiYTKOFU%2Bi5pIPLo3K0eH%2BWdiG4n1juUUN9ufhAzw1j1eDyxZ8PmKbM%0AmHIpZrao8r1lghni8eFTJwnh8K0KLQcp2DEYGHa%2Fx%2BqzZOZWWrgQTwFRZ4wdp2DH%0AsM5XX9MGu5wl1HGF3bzKNQC%2FSoyWFsrpCESFdTOOMAjBC0BL1Ap6pLtk2AsMlnWT%0APoxmlZ%2FbejCkLRDCJMgcDKXJL1uHf16cjyjTbstDPDNxzcVMISsfBxuYhcPDICse%0A%2BXJ4rxQL8CWym05JEG9OspenjHuuDK07mLNkyDcv0jruFhy%2FVftJnGnmwheMGk2b%0ASFC2LMqYEduYIlc5vSQYajFZnWjzOtxh6CmCDyKPDhhP3jbFEKJix0m8jeFlxlmO%0AqsXNVAO75FKZxTqpBxPpiN3%2BLj7Aa9k2JPGZ0BCT5TdqxLmIUzyKWyIVB7D%2Fg1c%2F%0Aa7qLLtVhwQV3l0ckc7txHVXXMPyhvJK%2FTC3E8Qnmhwb9t0AjdcQpW0mhdQqB6d4I%0A6NfoWETjuyxiCxnJGdng1%2FJhxlRAkGnyOcuWIycv14nfXyyZTR3WGsiCNrv8mrLB%0AdYRi9jMBH%2FSNh7wO4xxYJL5Izpa9uCGPBJCER6LadV%2FrjWn0LOPSq1HT2ZqzgZGQ%0ANtZBuQu%2FB714SU3M8yL1ySEPAqmwAtvke6y4oMdJogSSUMiYGNj8w1SnC58Kin5j%0A3NT%2B%2F1O58EbZ7u%2FkaubgmgQx6kMs7aRO9Ri7Lcalgt%2BA6FkAeCnyiuQ2xbehX2oz%0APZ%2F6DIejX5dQ362rFD1RMemLhi7bh5mIoyQgDz5DziVj4SFIioNv5%2Bn6Im6A3iYb%0A8xsgxlKBOb2REdric6RfUPuIX8tq7yhTGVH7a%2FIXLxhaJHUYJQUQVmhQmLVaQvB4%0Au8zpwVmdr0YJ6B8IaguDwoF7Zr5m3fUVZH8%2Fu%2BqVE%2Bhn8XGzWNcxuUwbU8aNE4G9%0AdAKZ%2FTxCrh%2BBibsTA7LkT%2BODaL3T4inJYrF0xcJa8h1SSot47mc74Ixz6iUoZIeX%0AJIRbI9wcwoJflQvSOy55vHEGBVcYoowab8V1WY4%2BPmQfpZKkSqPuhqToq7PvpSpR%0ARGeHL1v1H3f5sQIbZCKf7a%2BCvoWwcEdsLhKU8mVyrDhLbVj6kLy%2Bi3xADBLZ0y68%0A9kMdegb4bppAMJnFLgHvogqMKrXRTzRLGC09cllK90i4Gp05ez%2FacciXD3oVecvo%0A0icQ7fz3sjpqhghxotS7WqXHYJuogXdeFjSUFKg2biMRPZNEhtoN2ybgpZcWL5Yi%0AeTFzCvIP0JA7U3eMuBpFbZr6hEzzFbqoPcS%2FeOks1h9NiMLggLcZUWrrb5ZSs05I%0AKgKFNLqkQNTeK0r2X%2FP03qFb7YD4Sb%2FQxGqZaan0cNj8mL5BclwBZKM3QouEsbeN%0AqUQ0mdPf7dqRu7KO7rCQFYWYU7nIDOrsppbJ8m4r2sOKXP%2F7YSxoiK5gtX9lTDpy%0AlUGmkR1P3yuSupp0%2FI%2FfPdRQZmVV6yizFNPluDkWC83TTjk39Wd44QV2ZFwAGI2x%0ARn3%2BTZoxunxYWPaOy8wbMiO0i9OIAxAPVnGFjQB4W3eJLVdkwjBGujdX%2Fk1MsbtG%0Al75lW5HAbn5EGvmyRoS4O3J7LF7MFiVxEWbqnbG532w8Z%2FIJYJ2Dc42q8nR2p2dQ%0AlxQ8%2FI4I166THh%2BTmUYA%2B6wi8UeTBtHx69fYK3Xt8x2ZJQh%2BfjWGGeVNRyLX6j1j%0AIjMzsER%2FLiih91BqkekWCC1eRmPJkC2AZVaWlWbutZgbZlM%3D%0A%3DV3XT%0A-----END%20PGP%20MESSAGE-----&account_email=flowcrypt.compatibility%40gmail.com&senderEmail=none@flowcrypt.com', - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '1639b8ceb6c44a4c', + { + content: ['TEST, ПРОВЕРКА', 'C увaжeниeм, Пaвлoвcкий Poмaн Oлeгoвич.'], + encryption: 'encrypted', + signature: 'not signed', + quoted: true, + }, + authHdr + ); }) ); @@ -557,14 +572,18 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - content: ['This is an encrypted message.', 'Not much going on here.'], - encryption: 'encrypted', - signature: 'not signed', - params: - '?account_email=flowcrypt.compatibility%40gmail.com&frame_id=frame_tGCJGTMBdi&message=-----BEGIN%20PGP%20MESSAGE-----%0AVersion%3A%20GnuPG%20v2%0A%0AhQIMA0taL%2FzmLZUBARAAmSfoaXFbA0tv0ulFxViTwrDVcbPHaPQxx3vaX2cHLABe%0AKS2P2wOekq%2B8qD%2F72MMWMU%2Bvx1fbVu%2B0MDkAEcygCP1o54mIR8vYGkpL70JaLyMF%0A0jqy8LKfheJO5o%2BdBYMv3rk55%2FQlMgrKSrXUmGr%2FEAM6kLh6UwWS%2FK00TFrwmPAx%0A2c4ngRQLqyHyg9DOLL8x2SkBoPYLHTycKY1oM1CgdwcNqjy5RXDwrN44Ws8HRX57%0APKLgrAM%2BvUv58bThYT2oS1L2l7rIq8S0n2eFI21HHUQFDA3rBJJyvmhV4JAy9BLi%0AUYqmBDjvMtdfn9iBkFhzapORqigAUds4aTiBnwWijgfuzilXq97OTmb%2FHNVvPd0A%0AsXY8u1c6snBqu9vuspu%2F2qXPLYh06H1aQlMP11q%2FhWVfVLnj8vFmYpwQREVe8cXd%0AKVWN8%2BhYiqKoSmu5nKbqwXMqeHjS9L%2BEGZMyiRlSwImUq%2BB9gGMcTBFR2EC%2BOD3U%0AweWhseK9jIOio0otF1EF4pV%2F%2BVUU2gPCZhUrytGItwfcDxyo2DPWUun2SA9EDH3%2F%0ApGf6ODUwCb67gNDDFoR%2BY%2BWxfGCKK1CSPAEHHnKXTUP1483IzUHWxP6R0%2BxhgypQ%0A%2FufEhXOVwEjdV%2BCTMlENeSNpQdNt1tyy2TMhlNd1A0dnRMivvgVpqk2hHH38iGeF%0AAgwDluAOlKXQo5sBD%2FwLeNZiKJznLa65VNzJot28Tc7BOZQyfmtbjF9H46RRB8a8%0AICqu78K8Paf9QBP%2F%2FWcPL0RFvWf42k4fZ3dy3DgPcwZourYKJpvFkdaiIuFQ1ua7%0AIgH6sJjTrv%2BbsBbCNloFTMgljBldmiSXSZPdOjf%2FAt8EU%2FG44Iu9NWzuowMDgXiZ%0AUfTUm3RXdWYYi84WlL1oMWdMTrHmvpd3s1yat4Y7yaBGrlxr0Vep6hmUAXtDqEep%0AcjPr%2BBl0tzXC9XJ9RJsAp03pDwEkfXiSfIQB9yorGF46XOT%2BdRnicwk7HgUQIkw1%0AbP3xsOFpP4R8xda3QZ0ySDmn3E4bAc9T6Lu0qKEBr6cECgZXp7NfJxpjoQbnHxd1%0AqS0FXmbTuHWagJbESHqXtrBBz6Ug%2BFoVh4fuxy5%2Fu3QFMaVFRoAyA3PbUTbOfiJa%0APMiW1nTJG7ofspKgmsg%2BxFqg9%2FdLepgBw2QU0azsbXPmmSXGJEwlzrrvkKz1EiK4%0A%2Fp3r5Agj7S4jXSUsDEhWFmrmqXmj5Sv3EcC2Jew%2FzykWG5NOMxuq4mPTWx1cK1Pu%0AP1eBnzXlHMZWNBvn6lDwPv1CyS%2BT5SrTjxuFmJYs6sPGioVIT%2FiVmAVgh7ctqV2a%0A3daPU5bLEVVH2m4mcMwULbQ9%2BVc1lIbuG5PlJvAYuRTy3QEsGs2VFd2t8lG%2BENLB%0ABgG6E8Ln3ziqECqQZV4WLTn5fRGttKuA3%2F%2BosQBC55%2BtcPsKk6j2J4pxaU8KwK4z%0AT40MKFRpBTNXZQOEWEvNngv3RsM3dp6FvVWgUoUhu6340H7OqASuKd9QoiqIZjXz%0A4O7%2BqVzjpJykiJyXoJDTXBCF9BO9SvxADG9IDTUsJ1iFYRDkWH3jjf29E3l47zru%0A4PFnKMQsDRT9UrtAjNR%2BHD1AZakZczhljcRql83rG7hDSOjBwUML%2FckpJ3HA4wx2%0AbeAN4y8ywJPHWbZxcT%2FwZlLZzIn%2F1us%2FQhYtIfU8%2FhPaU0N49oMVy6SU64KA4rgT%0AjUVhUoBIQ3ivi6hs0GAUAapcwdulEcuvQEJ1JbPXMst6aU5H73MbhjYTNduK3QZc%0AXpokQN8AZYL9pqbUcViMLWBqznuF%2BbOIMKNftEoj9MVPbHVKvHIZZQrKVZb7UMcl%0ATcSsI0Jm%2B5fWkdrHkI51YxcrVapNkT%2BpGo%2BMBzTVtw7oZ844eVYUnF44AjaDEr8x%0AR3lQ%2FHSh4Hy6ibRJ0ZGQZsbAg1SLAg%2Bhg8hzg1uuy9E0MDaI15mdz7FrsIwbbi8O%0AuRTWDQgLQtxCY45xvSmVJqangIg8pkQ%3D%0A%3Dv6vs%0A-----END%20PGP%20MESSAGE-----&message_id=15f7fcace2d72246&senderEmail=&is_outgoing=___cu_false', - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '15f7fcace2d72246', + { + content: ['This is an encrypted message.', 'Not much going on here.'], + encryption: 'encrypted', + signature: 'not signed', + }, + authHdr + ); }) ); @@ -575,14 +594,18 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - content: ['This is inline-encrypted message from Enigmail.', 'Yay.'], - encryption: 'encrypted', - signature: 'not signed', - params: - '?account_email=flowcrypt.compatibility%40gmail.com&frame_id=frame_vCSPFGeIod&message=-----BEGIN%20PGP%20MESSAGE-----%0ACharset%3A%20utf-8%0AVersion%3A%20GnuPG%20v2%0A%0AhQIMA0taL%2FzmLZUBAQ%2F%2FRO4wLVr52Zf0v6%2Ffa19%2FnoJFsFLIEqsWkX3OPOZfiRew%0AtcI17dq5u854lbuXwSELEAUkhX0NJ2ZM%2BjNPRyW4dqhcuFBebBXN10%2FpzBaG%2BnKi%0ACK3B4mAhqYeFAzVeInFS9MPbp1%2BXzcyPm%2FkPs2oxISk4CUGaFClSTGFUdRjdwVyt%0A06BEVx4o0dvu0em5O4sbmAqAictL9Kc7c%2BBYRmvIBBat2xkJtoOix3HmJBcNR0w3%0AAQxoB1pKkbzqOtweOhcP9opSvO8GXx%2B9vXzSi88PJ4uMKOSFUbtKGavMyXYkKpIs%0AN%2FhYiK4L0B8%2FqcJS6LsM26o0kZsVMg9pz%2BBK3ZspAyq3QnMRGaVezzrA%2BeA2%2FGz8%0Aou5CU0tBXMLbuBPj8qWBBgaDJzWBJyQ9VRNwx1OE4yWN%2BR%2F5H38fy6Z%2FBj8NiueW%0AbSVVhXVdwPzYoG6Wg06CUS%2FuyjTUtUkGGy7noii610XLsOhfOcsBcYOEwFuQ9FYn%0An9x2qMfo71cuWwtDcxdUBfGsoZzJkn1auD6XfHrJY5fux0Ji%2Bav%2BnkWtgRsu2%2FJe%0ABEFikuBYFZxjWOiArGGybznVZXE8m8ogZWYMlyQYybShs%2Bctp%2B4Wx5oNWBP4E0Jb%0AT3qW6GXSreP%2FECfZNUggPgONUYm8YKTZoWgwL%2BsxyDlL6snZMidP4FrC35BnvQ%2BF%0AAgwDluAOlKXQo5sBD%2F9h6N4KWlL41e0jHJX%2F2KbPXg1%2FcU%2FW4urdFxmx%2FHu1y9Y%2F%0AJ9VKYxne3HwJb9BxNu6g1QJirGSL%2BN4dH%2FbaR9Bl01uPdR6KZg06lygWeVRIMPO%2B%0A2ytla9Gx9lv%2BG8bXM1adNVbCeRX%2FILvU13SM4rO2eHvZodBQ%2FYyaQfUOc59idNHx%0AaXSDT19%2FiBVB67Xxq%2Ft4J5n8xWt0b0gB6pEzADnJ92iK1so7iviSxWbn0ld4E9jf%0AczalFCZBb2Hlqlt7qUyOQvqPIw5YR5R24o4TFdtq8DzjLdNfaz8eIlHjuh%2Frvprq%0AxBhdqgWFMc2V8bOPIkQSmYfVQXPLWflnWV0MHuoo7RgW33xD2ASPKHpUX1br65C4%0Ahsq1e3R32tXcOO%2Fbh9SoJKj7vL%2BNP61QYkarmh30yh5YxNcJV33lkmZ%2F4AvF8fRa%0AeeTQdHKdvJtgmMgWuRSeR1zKSIadvylGZotqTI662pfm%2FzGjdVj8gJWvcN4XnAqI%0Aktg3mpI8mRS6yzDLcbWI%2BqFkcAkBfkK3HTw9Kqj596jQuWbd08ORm6NxH2L47BZE%0AfV4OiTm5mJFn2eRakrS9UmYhVkvL9jITXwhqMy1Mj72qxZVnx4PSnn8wgMt0Jd04%0A36QKwsmsl4oaxBAt95QQVu5a3UQa8P%2F2vTdinKaLV9voQdFW5lcOUPVO955ms9Jw%0AARLIm29ptBkVK6N3fquEQQtssR4Zt97HK4O7l%2FYilRa5m9iQFaPIqasHHJaVxhKM%0AZk3zfTTNR8t3%2FmoaSbo45bXQk4Vgmux1ATrNcKjyIRiNqPRz2tbJIc2H05naijsb%0AyTu3s7CnSECMWF283s2Dtg%3D%3D%0A%3Dl3WP%0A-----END%20PGP%20MESSAGE-----&message_id=15f7fcb7fabc7511&senderEmail=&is_outgoing=___cu_false___', - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '15f7fcb7fabc7511', + { + content: ['This is inline-encrypted message from Enigmail.', 'Yay.'], + encryption: 'encrypted', + signature: 'not signed', + }, + authHdr + ); }) ); @@ -593,14 +616,18 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - content: ['This message is both encrypted + signed.'], - encryption: 'encrypted', - signature: 'could not verify signature: missing pubkey, missing sender info', - params: - '?account_email=flowcrypt.compatibility%40gmail.com&frame_id=frame_NYYEYtuCVf&message=-----BEGIN%20PGP%20MESSAGE-----%0ACharset%3A%20utf-8%0AVersion%3A%20GnuPG%20v2%0A%0AhQIMA0taL%2FzmLZUBAQ%2F9FX0uRThi4ZT1KmNEZYS3WC%2BNoqommn5szVhI72E03HUp%0A3JMub2XMmU80Oe6WybHancEZw3w%2FoWR5CvdQx9414jub4uXxaE91wBuqlS3Ow6%2Fo%0AXfXZAzT0aEz7jXkh9rAZDzKjwqJjD%2FUICHmZsgVsx1%2FZZBYNBpbh2esDFGcCE%2Bn0%0Ahgd5%2BekbNqXU1ByU0eZRMo30u3hw4RAp3dPcfIJO3mTNUTXbAunHztbvGFk1TI2s%0AaSxvJQ%2FQNt4IRMaVG7pl%2BGwc28ymWbNOv9vVQQB80TJt5x7xJ8S6MitoAzTZ0KTa%0Awj2BQ9JPO1fgxTw7Zehab5UhQLJXsofe0WnU7XIxzFYyZdZSGNq6u%2BcI%2BDfUH836%0AUDYyEOhlIOyYf8SCd7B3AT7Wd4%2F5c333EC%2FWnG7W7f8RsdWAQtf8E6iWEDgnGmvu%0A2trxHZdTIOhEqwgwPWkVX0UjBdJ7U8nBhP%2B%2Fcsn2h6bpxOARFpXOwgmlmjjA%2FQQL%0ARgaK0TCy7JcnQ%2Ft9SCGw62YYQsgF8RCUPvmz%2BKpZV%2B9ckwOlj8vN75sxFtitd%2FHq%0AhSVMUeIsgBGvo%2BOxFA%2BNFLQTxd8T9hUNpU2Y7RWv0GLqgQtj6GE7ykh4I4dcb%2Fgf%0AIApF4XKnzGlOIoHNUf9tOnY8JV%2BTLbQl3hnRX64QCNimglagQ0yxe3p5jzX1uImF%0AAgwDluAOlKXQo5sBEACU3rx6u9Xh%2B61DcpUHMxgQ43KqEXWwMpzk8YudWrmNKL23%0Aa65%2FOYpyCBsL%2FD0%2BbVKvLMhmyfaz09M3q5lh86oNrvHHFsbDOKzHlAeBF9x8%2BHOR%0ALANj0TCttNR08e4i3HPbUT6uK%2FfKlHbqA6%2BiKgbBafbdHJreXtKKS7g9erEYgBYe%0AEg14s7X8q%2BnHXZ5sS8%2FptWUh3CoVtRgBsYe6AgH%2B6uDvtQWu%2Bm3NRZZrTBUj94%2Fv%0ABlkAV6ptRbTsBWQJZjRaKGQuN115WBrKAoPzIXoIk%2F3LJSe1zZU9kpmdJ4wrawsE%0AwcMRJSjYWR2mjpIKZZa2UEMaHSNKD0tfMYnt2etvmDrrt1eLMfzd8Nz2Z4rj77c9%0ArfI8nQgTmX5EaHJQ0PcJ0H0Jn514gz3wOh1B8zCD34KlS%2FwRl4v2bc7ModN0pTUI%0AeohNA4j%2B9GamJNoMPbLGi7o0JqagLTPiF4JuuEmV0Mu%2FpjWKiik%2BSi6HIddXsP4s%0AWbPfIVweOhCKfkN161TwSw%2B1cdHOw%2BD%2BPAxMOCpSDU8GOV94uoTL0JtJEdAaZHsj%0AZZbMGC%2BzATIKxpoXIONr5Qwy50hHf%2BnZRQfvfn8il%2FF0Noyg08pMafZmAUjWQgSm%0Au9bE3NkTF7FXYrJ%2BX2687i%2F1KJ7UrjhJQFcz1%2B0wbRmmSmJlqqw7AJKxzO7wRNLp%0AAZlYT2fl7jLUvnq%2FKeEhpU%2FHIQ8kiHC31J8%2FSYBvt1s4%2F%2F0%2BcykA8bKEC43VKZ3R%0ApncO5P3LasxCMm6dPcrWuR%2FoN8UM8uTQjUsxhJlF6fNUv3gDqt0em24ZogKuKpzS%0AIPXX9EGotN5XxKgbCY6lAOiHOjHJ0tfMpPQvtqP1Y28mJjp%2Fx3kb8ul5h4H6Uigr%0AB7u8tHIbR82ghbqzE7vKrGld%2B31hP7sRKthtd17qJPEvDfvwW%2F6C7q8Do2PObVqY%0ARqwzVWns8mrkTuzJgzSUgWCHBU%2FrDVxf3ucVu7bDqCYkWVkm7bd8Gpy0%2Bako87UM%0A93Fa%2Ff%2FTegrWGbFqj2maoPgBVHCe%2FaEN2M2dyjeltqW9ATHyeelq4PgqO6i7CE00%0ARC5ZKpdPkMruroviP%2BWr59oIxEU9YzTVwv7B4jIr3I9ZxFrrdz5xIWwA3kfHoBs0%0Ay8H01tkzJVFlL0tRTd6SZOCMao9SXFa16SAd6boL2rzB4KhQPl2KYop4jFQGPvBa%0AZtlGgI8mjL5UH94YAO%2FpMQb5eB0fYxnZ5WCrjr3PMjg%2Fw9OB8y6DL7cpI1%2F9kxqP%0AfPlnDv%2B6U%2B8%2Bc%2B96s52C4QIpddeAqsyDbiUv3D7KfajhF0WDaf599YK1TAyOR3tX%0AtmCq4JtKQ9%2BHehztvwDM%2FvWf2Ku0hk%2FHjPwJ01ct%2FJLAGm1UeZ%2FjuhaqQldmOMBJ%0AbhSHT9U%2Ffy72GWNiDAeX6f4Fa6aJuOVKYjDUSAhdgGsfdfrPJ7kJPcOOyI%2B%2FcC1p%0Aasvfc9OvJWyZ716Md5j0hTVfKWfXtnhzKcGl8nrA4XYZGA8%2BlZYamefKzIVm46kw%0AowsB15NUI773ZDTddSCL8c6JQuOt5K0G60w9M0qxYouZEnWT4LE8eg1S61Vrbl6P%0A3yiG7MDy2p6%2FFlmCZgDHQRUqkiuCGUVpCwKiZwNzEMqe%2FMNx988dMknwadXEAt%2BI%0AR1xpkkyUDD8cdbb1%0A%3DWrMi%0A-----END%20PGP%20MESSAGE-----&message_id=15f7fd2fd072cff2&senderEmail=&is_outgoing=___cu_false___', - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '15f7fd2fd072cff2', + { + content: ['This message is both encrypted + signed.'], + encryption: 'encrypted', + signature: 'could not verify signature: missing pubkey CBD1C3466E9C437F', + }, + authHdr + ); }) ); @@ -611,17 +638,21 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - content: ['Message encrypted and signed using PGP/MIME.'], - encryption: 'encrypted', - signature: 'could not verify signature: missing pubkey, missing sender info', - params: - '?account_email=flowcrypt.compatibility%40gmail.com&frame_id=frame_POsACRbHGk&message=-----BEGIN%20PGP%20MESSAGE-----%0AVersion%3A%20GnuPG%20v2%0A%0AhQIMA0taL%2FzmLZUBAQ%2F%2Feb40AmsR8djZANi63cCx4sk2TIlNauZ9OdnqMEbII7sB%0AYoK%2F0KDRnH5I0cNfwpFcmXkUhrSLKtn0%2BfyCrxrxo%2FQZZO8fD78OqUu3ZwC3hFPm%0AOiLlx9oI48hj3Hrw%2F4CU8FQtboMA%2FqPPLqtjnIJLDHQiZayCF6XnokHNF4Cj3wqn%0A4%2BGn8AakUGsAr7iUyIkZ%2B%2FpR0VbPSgejFgddu8H9296o21MR%2FtB%2BFN7DK%2FL7fa69%0ADZyLLdGp5vPHUB3GikAuS%2FpoyggRc%2BlSUa4T6jtjUSAUGtOUWtRgBFLAeeuHoskX%0A6tw5A7OyDBTGyQSWIRb1J5N7P5dXrU%2Fvt97pQhrVgRXxfbeq0OLkLm9G98thE%2B%2FG%0Amww5CQ%2BZNfRMouPzBDPT050TGB23JMTxTx8o3bPLb%2FUCmB2Qhtb90XNcUiyU3gyJ%0APnkI91fKGftT6bG%2F9lk76RusZnEqWhNEsvXS8KF59pj3Ea1cVeowwQZq%2F57C6pWQ%0ANSKMQJI0W3VCCyrxMXbedqbXfVuI%2BmOYt4%2ByRKp0mPWced4d5nV6O8qICrfr3%2Fkk%0And7VtWqRL7nDTbcPWZNSPOP%2FDHj5yZ4w%2Bcq%2BrOj5AtjRsbWIt3NR%2Fpo%2Bhyyu3zHD%0AM4GktXqPxtDZl2HsTC6gc00CFP8zqTKqnDpQRZ%2BKl6xfvemPQLmz4pnrzEyEsbSF%0AAgwDluAOlKXQo5sBD%2F9EObMtDbWnqtRpIIYXp3es47FPBKgR5Ouc%2Fcrtf3K9n168%0AMp7K%2Ftt1JsrCnO4o3ojiIK6O40IilqnhBN3hFYcRPJ2lW2jefJvKO1ksji1q7k6H%0AdmTz%2BjE3mow%2BPAn7D%2By1CVgTpvy%2BNg2Do%2F6UR0dny4Mm7lZhH2l2sCTH6FFXskBV%0A3IzAwSONtwkxpvT7%2BMqcq7k9D5P5hZTPuip8ck%2BIFr%2FEKUaJm8fAnTcbf5tRqgep%0Ac%2BVy4QxKXu6GgTDHwYwHLzVbiPD8GG5cApbpn8c%2BnfKqgjGua0zyYl0FUd023kZy%0A9c4Webi83NVMZDm8%2F5SCHvVJtiKJa0bquxy1aBO5nLlxxnIM6H3oB1UrQpij5oC1%0AktaW08rwBSkDHnaFLfW8bxdyAkjsibahvIW3epIK5aLoOiDkhMIhkKaBvBOOSVet%0AO04XJauG2rAeYF9JFV8FxexOncXBSZfBFWHjeN3b%2BcriKuD41FwLx1nIkVIZYd6a%0AYXxvby7jKTO4%2B8Xy%2B6QuDFPKmUIRbSZZ07n8D6ZsJzwcU4MIBCthM320oIFnD9W4%0Aq6dk56Jma%2BrWsLbQoqh4I1rJ2kJ3yT1jQWBuAwLWz5Hzdomz1Q9if%2BSDlQy9sjl%2B%0AO%2BzKB34vcqfet3wbA44P3ROhmanBa1TOoBG%2Bwkhh8xusHyJd5aU6AbuEoi6XrtLq%0AAS31F9NVnEjnCykrBZIj2B5TlC1mT0yENRyCkqEvmBWVjM%2FxfiW2vBpmEj%2F7rI%2F3%0Ap0eQabbyVSHXngz0IlAch%2FcV8wp58tXkVUpWzn6GU0B1KCxuc7FyPcdAAThNzZP0%0AREhuIRgjJSR%2Bj4okHgJhKnxfvIxqlrnKYNyGWEvvL61D2nBiRlCPGl38CMSlT8eP%0A87hU2ks2I9ztv4l9Z9Ob639nYFBLQ5UlesUgQND6d%2BfHqk3mdC6Hzm2kHHBdujgl%0AFuj66eGrfgHwcNCtQiNkYXcgh6TmcIMvFgOiE1PyE3v6x04N7I71cFgUNkoeo4ke%0A4jjOgGJJHRDofWvTGvT4JtCnoqLPahQWqtR%2BBNMY5phFEVtsfuMND6fJTkzYEDpQ%0ABVM3NmukPaw6LIjlN1EmoeSX2BleqvvDIk9rAt3iekOlioYKqvk%2B7xjS2O9otWX6%0A15mHWRx62Et4RSArvRJdGiUP6UTLqGd89Il574poQXBMBDfkTvf%2BEQwgpeb8WEha%0A%2BtFI2aTMj3mlgskEUXSxtO0ZB7aORfCQiy2Jkf36puEfHwOy0l5YnQshXa%2FyJCQR%0ACIc4H8dnSuQlkgRnSODOnYGqpSqfU%2F7%2BMcM2na1jhsVLX6MPzSr6bOSB3QwTbGTk%0ALdO89dD3dnMeHmVjaKTg5wo6i7k1ERE1Um2gHMlrtW58AZN4KPABp07BXgV4H7P9%0ArkIBP42cfkPoUNJXd0BCGEiOg4%2FNcTjSg1%2FvWuAvmWEN28sABfO81d7ucGZtt1Js%0AuyHpVmumoSD%2Fi1woR58iwSPd5L3a4Ax%2BBCg7t0yTP%2FPJRtX7hvSh3FajNkE%2BexSq%0AJZPLq5CYAPNagBWY%2BYzRWTJCz9nC%2BpuOpxZ08x%2FdzX4AEcwvAG8pg0%2B%2BBo7JwDd6%0A8tm0I5LUXXm%2F%2FVf3AQf0GTfpM61bru%2BTyvjvRhmQJ8S5qwozazZtrJUpDQJDKhPY%0A%2BeMHgrlBDTHtXVLXfT0qKhft1UNXCY2v%2FUUq4C5%2FNjm1KHfMnydhHg%2BvzEg9mE4W%0A2mdbWVSz53XdfzBspAYE88EIT%2F8W2biebllWIuxb1%2FIbIpnkV0u5Gja0OB5cVVmy%0A64zNOOk5sgOIlsEgpgxAU8nHrnmg9585XiSjTSMAfb5h2zbQU0sEkOHvADnn8Asx%0AEWM0iquK7lpMaQKpE554UgBcDMjbZnhss1tZf5uz6SX4YEI2y64kIHXiTEL6sqj%2B%0Ao1XWkq9SDZOuvbq%2BUOgB6yaXwZr%2BB1fj6fGqozyy%2BHbTdg1Y2a%2FbTOG7%2BrM%2Fdl%2B9%0A7BUVZsCiF5Cs%2BVRLNmIpfpH80U4AGHoTyATsybiH9ZCZn8qsFmZ2hNpeWGrM%2FbQU%0A93We0G5lmun1qd347UhncEvfhtyt449iHytWebexzDqDMLfuo5BZtVfe%2FXJFhriP%0A2zFLe9gZu%2FOjM%2Bl6Th6UGJ01jrUmqKI1veai2y4jqzqRZbSg2EinBAp%2B1hI%3D%0A%3DFgMR%0A-----END%20PGP%20MESSAGE-----&message_id=15f7fd3ba3f37cf3&senderEmail=&is_outgoing=___cu_false___', - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '15f7fd3ba3f37cf3', + { + content: ['Message encrypted and signed using PGP/MIME.'], + encryption: 'encrypted', + signature: 'could not verify signature: missing pubkey CBD1C3466E9C437F', + }, + authHdr + ); }) ); -*/ + test( `decrypt - [enigmail] encrypted+signed+file pgp/mime + load from gmail`, testWithBrowser(async (t, browser) => { @@ -643,7 +674,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te ); }) ); - /* + test( `decrypt - encrypted missing checksum`, testWithBrowser(async (t, browser) => { @@ -651,17 +682,21 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - content: ['400 library systems in 177 countries worldwide'], - encryption: 'encrypted', - signature: 'not signed', - params: - '?account_email=flowcrypt.compatibility%40gmail.com&frame_id=frame_DfGthWpEth&message=-----BEGIN%20PGP%20MESSAGE-----%0AVersion%3A%20FlowCrypt%205.0.4%20Gmail%20Encryption%20flowcrypt.com%0AComment%3A%20Seamlessly%20send%2C%20receive%20and%20search%20encrypted%20email%0A%0AwcFMA%2BADv%2F5v4RgKAQ%2F%2BK2rrAqhjMe9FLCfklI9Y30Woktg0Q%2Fxe71EVw6WO%0AtVD%2FVK%2Bxv4CHzi%2BHojtE0U2F%2BvqoPSO0q5TN9giKPMTiK25PnCzfd7Q%2BzXiF%0Aj%2B5RSHTVJxC62qLHhtKsAQtC4asub8cQIFXbZz3Ns4%2B7jKtSWPcRqhKTurWv%0AXVH0YAFJDsFYo26r2V9c%2BIe0uoQPx8graEGpKO9GtoQjXMKK32oApuBSSlmS%0AQ%2BnxyxMx1V%2BgxP4qgGBCxqkBFRYB%2FVe6ygNHL1KxxCVTEw9pgnxJscn89Iio%0AdO6qZ9EgIV0PVQN0Yw033MTgAhCHunlE%2FqXvDxib4tdihoNsLN0q5kdOeiMW%0A%2Bntm3kphjMpQ6TMCUGtdS7UmvnadZ%2Bdh5s785M8S9oY64mQd6QuYA2iy1IQv%0Aq3zpW4%2Fba2gqL36qCCw%2FOaruXpQ4NeBr3hMaJQjWgeSuMsQnNGYUn5Nn1%2B9X%0AwtlithO8eLi3M1dg19dpDky8CacWfGgHD7SNsZ2zqFqyd1qtdFcit5ynQUHS%0AIiJKeUknGv1dQAnPPJ1FdXyyqC%2FVDBZG6CNdnxjonmQDRh1YlqNwSnmrR%2FSy%0AX7n%2BnGra%2B%2F0EHJW6ohaSdep2jAwJDelq%2FDI1lqiN16ZXJ2%2FWH6pItA9tmkLU%0A61QUz6qwPAnd0t6iy%2FYkOi2%2Fs1%2BdwC0DwOcZoUPF8bTBwUwDS1ov%2FOYtlQEB%0AD%2F46rCPRZrX34ipseTkZxtw3YPhbNkNHo95Mzh9lpeaaZIqtUg2yiFUnhwLi%0AtYwyBCkXCb92l1GXXxGSmvSLDSKfQfIpZ0rV5j50MYKIpjSeJZyH%2F3qP%2BJXv%0AZ47GsTp0z5%2FoNau5XQwuhLhUtRoZd1WS9ahSJ1akiKeYJroLbTg10fjL25yp%0AiaoV16SqKA1H%2FJOuj6lT5z1nuez35JjeSpUc7ksdot60ZovMfWC%2BOGRnkYKb%0A7KxFd7uaxL6uOBOFyvRxYeohKd73aVkiKpcWd4orI18FhlftFNAwIdsmfzNc%0AmzTHZaUl89iYxEKR6ae6AKws1wzLq0noarsf2eKBVbTSfmK3S3xFqduKINnc%0Ae5Yb3F5adSj1dUjm1BZ4aqzsgKyBb%2BJ8keG9ESsnFOyxOIUXDM1nIo1IOgzC%0AM928Jb9GVa%2BuhdXRrb5cLjTihTusJN0I8oJrwKkwIpCJVgPMdDLkeubrMBQ4%0Afbpl4V76sOU2Nx%2B6nG2FnFBFBFohOL%2B0nTK5%2F6Ns9ateN7K9VP%2B%2BQcoeqfPk%0AIUO3%2BlCZW%2BtrTSvvFId3ziUVsPTeuAS%2B7nxSMfWZ%2FK9Ci6QV%2FXnx3F%2FqSmuS%0AAUm4zPQ1EjZf1N%2F5K%2BvhcCTN4MMx406VlqtedkXL2KPwZ6jDS%2Fww8RfcmPnD%0As94ct0WCZZtNlnQq%2B5h0ybwTJNLC2QFyrhhPqztVY95n9La2Mw5WITCWzg%2Fd%0AIBUceW%2FOwHYtePyaSQkCnegDw%2F2mN2%2FGC8d0OlwULcTYG6uVenGv2UOUbCr3%0APfy%2FEb%2FVqUEZK00PdvVQV7FWYAshuTFPTqidph04CgQvBpi3SDEEo8SkEIFS%0A%2FiEeRQaWjFEXKUI3FwKXPJQWvFpbrXBOAjnxXXbAFYOLxdydmq1GVl9Mm3GU%0AClc9g6t9vaYDBPx2gN562%2FCM%2FnT8Vq45VHe79XkrrcHDwLn7yeHJScNFsib%2B%0AVvwTPoUftlhC%2Fai21D403TsJpm7ZmPcDjagoIcXrS%2FlN03z79RBmSKFtYiXW%0A4obkKSGow61vMBh2%2FXLVYKJKpYKm%2FGnVlJxA0zQVl558x8I%2FnAMaxSzwx%2BZY%0AwaVU%2Fs5PLZ7Ghg3MOguiRTlflKUQyL0A7NR46OjFgUnHAZRxr4KO3GoxVPy4%0AXLeS4%2BWl68s7QlV6WF1IKCHWEUMEeRRea2%2FOvvlS%2FoLs2MNNWDemlJ4SiXHf%0AxINU38Txo84A00NALbKppsSyy9Gwj%2F%2FrO%2FFcerupkfeuOm9nHFwIQeeC5bWD%0AmmRlC90r2jY8gM%2Fv3Jjy9h8PbXWxh9MUpc7%2FkAcTwdGlMxiVjE29p065qTRr%0AOi6sJ7pWuYTfWldZqTVmaBjlv0zuXQ8Eo8o%2FUSvoTs%2BoihYIMcqReqdeqr%2FN%0Ae%2BsDtYKRg%2FLKp%2FJJ5nAQzVMP67DxkgwLNxx0ijBLysaQmvRlsiYWayxZB1Xd%0ABxA2bjZRvsmww%2BhgSKNlcsiubJGBqfqvgmlebZuJHHSC1L6mdMYgcihKmYAj%0Ap%2BHFLyqgyeRVMdjRHcrEdxNPG4fJmlk1bYiVQQ4XAd72w%2BAHS%2FseZ5HzbAK0%0AomuHYUD5PTEqZ1K9JObSsh3XMUkJK%2Bz3BnrOxnTOOyG2r%2B4FxizH6rfz%2FPgg%0AsPxqxE9ELUlgQe8plcPFge6aN9tUoSe%2BvMtDaEAqKw9JwofBF7jlxTqMMvQC%0AgWbn9x3W5o4VrnpjYGtPl8sh1QREu0A%2B0PUJAKL4A3GSMYRouGewLSMNJlOg%0A%2F0pPF6qB%2BFi4GJ7ju5C07tfr9z9UqRj09kDXJuoJd95NdSiCz6ndugn6gs8B%0AQf%2FXPxZVefeMLiB6p8pG0iZ%2FjcJjyYJLtTg6kA%2B1%2FffmJPfH%2F76ZA9dgEJLj%0A%2FW2u0Lp4NY8cwqcXuGKgl72TVJ34Iawl35Y0yr47k%2F7Y1vEQ5Q3bT7HP5A%3D%3D%0A-----END%20PGP%20MESSAGE-----&message_id=15f7ffbebc6ba296&senderEmail=&is_outgoing=___cu_true___', - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '15f7ffbebc6ba296', + { + content: ['400 library systems in 177 countries worldwide'], + encryption: 'encrypted', + signature: 'not signed', + }, + authHdr + ); }) ); -*/ + test( `decrypt - pgp/mime with large attachment - mismatch`, testWithBrowser(async (t, browser) => { @@ -750,7 +785,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te ); }) ); - /* + test( `decrypt - [flowcrypt] escape and keep tags in plain text`, testWithBrowser(async (t, browser) => { @@ -758,17 +793,21 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - content: ['thispasswordhasainit'], - encryption: 'encrypted', - signature: 'not signed', - params: - '?frame_id=frame_ZsfVUZsdjN&message=-----BEGIN%20PGP%20MESSAGE-----%0AVersion%3A%20FlowCrypt%206.0.2%20Gmail%20Encryption%0AComment%3A%20Seamlessly%20send%20and%20receive%20encrypted%20email%0A%0AwcFMA0taL%2FzmLZUBAQ%2F%2BMC4kEIaAIdbuApd3CIf72DSEy9%2BA9%2BKlcXbhbFiP%0Ah6bT0x7PSzKMAraAgIRaUmuX3WojyYmeA3sZOtFw5I1TXo2wX0WUYlWGtXA8%0AsgsQvf3voy46DEhFYKjpk38OqK77GWnU1t4QrNUqjQJ6pBjslo99yx9RvYpv%0At1X%2BN0OLcIevTh0R7tjidPsjQx8PRejhuIAgM6mI39n5YUB%2FVCMqDRrqQzrj%0AcD7%2F%2F4X0eJhTYjDGzrSdLtK%2Fn2zDca2XeHe3je4OtLGqYP19n4YgmjcEVvit%0AQsDorTdXwoDKp3gZ27VmjkL4ua%2BA4j%2BeN78HXAbKCf3Hk0xxOlOaDmAdKvZa%0AXVb1KZNLaAeE62GiEombvFhyihvKBfXxmBCvXBz5x6g83r5idLd7U6Ndafyx%0AnZMPvxs7uutxeJ3HG2oMvWPOhr00FyiJvMG8mfHJh6Coh4RkK%2Fe8oxeZioS9%0AL0ZYNpmukffcxTyD%2Bwm13d%2Bfeu%2F5DFA8SbBfnhEOW80dzpA7COqx42HkOlRt%0AbAPn9Ao%2Bv9hzhDmOrHTYiGBGBzRO53b5Wyp55pyYCY6r4LyR2%2Bs6%2BRrCVBo0%0AD7yjez9AqPw65sYi1qeT4UHtBzTbi%2F7ll3EjtphzLxTv1DyytMjqDUHcg7Qi%0AvrqLY2mfFm%2BudqbdR99WX2WzJijJRBwt5hExJMMA8%2BbBwUwDvb12YPaZjcQB%0AEACdW7%2BIK3RgtLjJmo3V964JR8CQkXq50XzgiA%2BcJOXTN9Jsc72W3Vs1xZE2%0Ap5D%2BI3b9qQOMgzWNpYF6N5NiyWFDtKhGyeXL2zoG8x4COyZb25al%2B%2BPMtTkT%0AKooVSbpYaRif6Q3vWVZ9C29aeDqxa%2FMwxoI89q%2BB0mO1oAweNgk7%2BZmjOeYG%0AfwxkYm%2BOGevabDWZrxKLr3LhhWIFeewPxfzyi3TqAZjEnEwkD0FYssR%2BLtSX%0AIsbXTdkV6j3%2FcuDHLdJ4x9nEr0mefpSNfzIwq4iDYdWR7huGjE%2FTkw%2FSF7t6%0ALt7OwsO%2BDVr40fYOi0vnF5h6GMxCgsHpMy7LC9iCpd0jL9wWvR6IukHOVEwj%0AWPmZ34M627IC%2FOgiuFllVmXdJ%2FbtBVEnLOyr6hvsMKtKqD0cS83FoaY2h%2Bn5%0A%2FG9WzSWjABIZgsQijoAIJc1C9%2BwwN3uUFocrgdF54Z9pbwZHUrnBvCYrL%2FTQ%0AAN7iBvQNkkoFAWeS1JMmGKymR3tqiB8pSQU9SP8rYJhOMcj0oezuZxEZG8ge%0A%2FyUijaF8X%2F7NgfqLoBym2mfoLxk2pEGFuhk2Bbtxi2LeRl5nzpCvO6oEYdYi%0AI1ERyOA39BezaN1kw%2BQrmpqETKm%2BInprCxGA1vUOVmOHO%2F0YHZBaYOIvk2Xj%0Ajkq6kVFmQxjFE9L1IfxbaGkQ79JVAUV9w66wcSz0yULr2%2FU6knQPBnENobl4%0A6fwiBkiSGAvKd9%2Buu6wJaZ5tYPWUP0HAuKccawytNmGREWAsffz%2BnrMsEDUG%0AJi09JiLTQU4ACCacM3hPVw%3D%3D%0A%3De%2B8z%0A-----END%20PGP%20MESSAGE-----&message_id=1663ac8b70e22517&senderEmail=&is_outgoing=___cu_true___&account_email=flowcrypt.compatibility%40gmail.com', - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '1663ac8b70e22517', + { + content: ['thispasswordhasainit'], + encryption: 'encrypted', + signature: 'not signed', + }, + authHdr + ); }) ); -*/ + test( `decrypt - [symantec] base64 german umlauts`, testWithBrowser(async (t, browser) => { @@ -879,7 +918,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te ); }) ); - /* + test( `decrypt - [security] mdc - missing - error`, testWithBrowser(async (t, browser) => { @@ -887,13 +926,18 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - error: 'decrypt error', - content: ['Security threat!', 'MDC', 'Display the message at your own risk.'], - unexpectedContent: ['As stated in subject', 'Shall not decrypt automatically', 'Has to show a warning'], - params: `?frame_id=frame_obvAUTGAJU&message=${testConstants.encryptedMessageMissingMdcUriEncoded}&message_id=166b194b21a0997c&senderEmail=&is_outgoing=___cu_false___&account_email=flowcrypt.compatibility%40gmail.com`, - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '163df1bf12034b9d', + { + error: 'decrypt error', + content: ['Security threat!', 'MDC', 'Display the message at your own risk.'], + unexpectedContent: ['As stated in subject', 'Shall not decrypt automatically', 'Has to show a warning'], + }, + authHdr + ); }) ); @@ -904,16 +948,20 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - error: 'decrypt error', - content: ['Security threat - opening this message is dangerous because it was modified in transit.'], - params: - '?frame_id=frame_obvAUTGAJU&message=-----BEGIN%20PGP%20MESSAGE-----%0AVersion%3A%20FlowCrypt%205.5.9%20Gmail%20Encryption%20flowcrypt.com%0AComment%3A%20Seamlessly%20send%2C%20receive%20and%20search%20encrypted%20email%0A%0AwcFMA0taL%2FzmLZUBAQ%2F%2BKvSED2vb9fJMQd6lRTh0idC7srhg4ESSf4ggCXFE%0AdeOq2IkV5dNhgWGGawFVVUTewMh3L3JklDoONlatBthc2OGNu%2BFyu5No7hhG%0A3Jq1GkNwCqex0%2BG%2BGVhlZfN2LOAx855H9m%2FAGxYo6KLU%2BROmPZV8PZo5YJPr%0Ar8TrhhfHF%2FPG4ZmQIcuvPI1e0ivgF74wP4cG0qaPEacvSxQ1ZuDwzdqC1kGv%0AseOTJEhpBG%2FD8YfbzUXVrX4GiOzIu2OhnlKfU6c0BJCTz%2BqmQRqYOZXLvKgd%0AnU0RzfLgMsd7Sy1lCpld1syY3bT4l0FIRWUtVx1NrJ7cluicEPDiqJsEZntS%0AYy1ViiRZlnk2Xvx1Qpsh7fifUS8e9gfwPevYFhZ%2Fb6SeqpRFRDFGa0uP9L5C%0A%2FCcWqiUaLUL8nF51CYzfIMeIEGBk0TiVUAn19mkQTFbtbIB9K3uQHjFzgnrL%0AnLaJ08Eme5NugtJMUIW7bgo4CAddRjj0isFsoesUv75%2FmEsHJ7JRPICnWx4b%0ALPKOyP0anN6TYDgTC6IqvMOoNi0ZPEIpmGmf7ZOWjR4eUT%2B9uBmBHEPwGbLQ%0A85Mcjy1C7X%2B0uUkIPsqXgF7Ya%2FpwTuZ8mDtF%2FFU3kR87y3jlDZ%2B3ltq%2BY%2B5A%0ABJyMGXGf24%2BSquE1Q%2BONIzBwBqwXuYvRJwqA9vOtZ1PBwUwDS1ov%2FOYtlQEB%0AD%2F0R6LMWFQHZQCIFkvXcB5r4X3J68tcLffAIVs%2BJnoyR6JECUuCZJdKLc4Aa%0AF%2BA15GKiOnf5Z8RIg3Fn3nXuyN5rlWOu0yOO%2FXrnCSMHiYErTLUO6%2B6V6%2Bby%0Ai%2BPOAtAWptnJ7rGSAy17ZgIYD9WNPdX8Bv1fWEOJII2rj%2B5CVyBsOZWrnlnP%0AHjHOQ6gHop7bnQlrpmpA95PLhyoW1LkEIoC0jgrGF%2B0QXRqEfdwpQBCklZyL%0A%2FWAsG2GJLrHUgQALgpTys6%2F5P7VP%2BVSOaEnOJJExIZPkRVRFzWlYq1avgJWw%0AEFGmKeg335%2FiThKBFQ8JsH9U22G5DD1BcfX%2Bqtm4n640zC5pHRpLJO6ggiCJ%0AZA1SCtq6TBSF1FTa158ZNgjkiGZfS%2BoZvrMW%2BS1691vMmJrwqiRlPg9PXCA%2B%0AouGrU%2F1FVyRKGx1%2FUki%2Fh9SaxDX%2F3uHOOwJzytNxGMJP%2F4Y1Y6hbDwDzcrCM%0AFlFHXiNbfB3uxiHD9wWHE44z91MkqOb7%2FajoLXA8J8U3KJGFa%2B8JkZleRVnq%0Ar%2FUT8ppv0%2FozWzV59mTulYzRdIPSy6r4V0bH16XGwZtHVrljOi4TrkExB9cS%0ATdcX96RMMYpJ7p7dGcxoHaRBY120BD%2BsJ51jGi%2FYupoZBdbg7KcOAEelD2%2FF%0ALM1LzR9f3HUaYyKvdPL%2BC0OwINKCAZBPShfECZOiqrNWgHLWddAdXqexZFLH%0A0y7td11E7UNcCZegIlwOYksW7yuuCZ2ZLLnfx%2Fu1G18nKBCealqNkaow%2FPj7%0A4q%2B0UYxfZnAl%2FrFuTK9ndd8tWMSm%2F6xzWEbqe%2F8NKJrCwk%2Fnu%2BpvF%2BMuRvf5%0A9DuzZFiNRQSjSxSYvkyLuw%3D%3D%0A%3DvxOj%0A-----END%20PGP%20MESSAGE-----&message_id=166b194b21a0997c&senderEmail=&is_outgoing=___cu_false___&account_email=flowcrypt.compatibility%40gmail.com', - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '163dee87a4bfed45', + { + error: 'decrypt error', + content: ['Security threat - opening this message is dangerous because it was modified in transit.'], + }, + authHdr + ); }) ); -*/ + test( `decrypt - [security] signed message - maliciously modified - should not pass`, testWithBrowser(async (t, browser) => { @@ -999,7 +1047,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== ); }) ); - /* + test( `decrypt - [everdesk] message encrypted for sub but claims encryptedFor:primary,sub`, testWithBrowser(async (t, browser) => { @@ -1007,14 +1055,18 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - content: ['this is a sample for FlowCrypt compatibility'], - encryption: 'encrypted', - signature: 'not signed', - params: - '?frame_id=frame_obvAUTGAJU&message=-----BEGIN%20PGP%20MESSAGE-----%0A%0AwcFMA62sJ5yVCTIHAQ%2F8CkcWeLmCy8lvANll0KbA9ymThNOmZjblBNRZvgT8DqaL%0AhaGXzHaMGHvi0d66P38RXfDc%2BH9l%2FjGtdS1zgiMJMpCUFtDc3OPgOuA93sReqBsq%0A7fv5a%2BLSdfFZUPgUkXM2ur0eA%2BniNE%2BG3mbDcr%2FcuILYI8xTs6xbHRIKVl2G09eS%0ABZMEyqH3duIAi0M42r4L%2FuvABTcEyVKvY%2FQHFmFTj1tSzqSD5PDv%2BnN0ihNR16R9%0AN56PMcZazvTdChhXuA3MNciKoJtbZ785c%2FdwRL8bz8rr7Wj6iF%2B3Qm6kgbkef%2Fo4%0A6D8u8G1eDfSWuwtXVqIOuokd%2FmYgNIVZwt1sJukuGv3eL76b7Mhk3lCEjE8uSOf9%0AN9mbLErel5VUTzNTVpA336aBnMKjEsJUIOg0sU0q8XAKeSjcrIuBrsaKpjq7WDXp%0AFA2eQkpHpwZnlWjVMOYRREdji3G%2Ft32ATTchNXl9zhQsioqQbfUtWkj2WvltE5oz%0AO85ddVUniqpQPdQaojZ5%2BdPZ8SBC%2F4eUp3z4J4%2Fb0fWSTPl%2FtLblFy1HJs0lKG5Z%0A8AaoCGF5TLPoygXjBk0ImikeIGlYIShVOqG36RJlMh4xOQCmY0g9nz9LdCEHJ%2BuC%0AkWh%2FoREBhSMnqlmn1ic%2FDG16h17E%2FtiOuOxsqTfIGlkLSShXDoiTjxgm527FA5HB%0AwUwDS1ov%2FOYtlQEBD%2F9f6jwJxYjdBo2pUy5c%2BgA47BtW%2Fzz12MKhRAHd%2B%2FbVbTv6%0A5JhlBw1Jow0ckjcbnDRqBP9EL%2BErAlc2UzGa%2B42Ahrc2HlDvyMJCcxLt0Fa2nhXG%0AYWGHsQbHxgbePWHozwun2RXaAvvBonhBaYtcn0QPNEtArB9uyO4YqXXoH1%2Fl0%2Fgh%0AIAzuR%2BLNymwdOBXpyiVFMJb6xyQF40aT31kI8Ge%2BUkBbkWDphcEPogd59krBEpwz%0AfBfPdlGoTrSwfbKbshM0kiEbPh%2BESMVvypg%2BPZo1Qp0eXYt7gjlYYqNzQHWobTTr%0AIQjY3T8vml7XlcPzxLFqvQliuIZyRLczvm%2BwDhTj%2BJ%2FdXAK0SHE%2F9XdqKY014j5t%0AWjUfy9iD6seZ85ntAWdxHmOkytANe3QfyVxbO3N31nFe4uqJmW0RaEDx0em3k9YM%0AYLe5OwK%2F49IpUj5gV1R3wnN0uNOZNOdhkyVJynLDJXV5DLoWO3yGMPM3iM%2BZGujk%0A4QrpXjVFscfTHy%2F5%2BbNFGHnapljzli9cbKqt3j610wLQa1pHj6K3xJOANwr0Vdjy%0ABFGwpREQDPceSNREFA%2B7FdPh7WQe7P5NbfYuBXGZZeIvRZ6R0EHi8Agxn1426qYJ%0AEJNr%2BqO2r49EhfCdwbizRLhBsqMJQIirkf5sI4w5RIgpI9ggkv%2FgQiqxvqFcDdK7%0AAVK%2BeZiB2bvY3SVaH49hWaCE1OZ28gDYPlce6ARxznq1eqQhvgUyOffjpDjPgSkF%0AQhQCj6%2Fle9lunPkNKEYUhFr2eBBabBejRAsdLTOslG3yltICpBjHGqOB2CaDlHgL%0Aa5eoeqHusBAx9fmYtd0Zi474cGay8RjGtq%2FE%2B8wDTsupnYGbsHF5pDXC7erW9gyZ%0AMzIE8wAZ%2BIxbhG7JXVtHaPWAbvl1ac7YBV7rpBYRKuvZvDQ9BL%2FtYy59HA%3D%3D%0A%3Dt1CY%0A-----END%20PGP%20MESSAGE-----&message_id=166b194b21a0997c&senderEmail=&is_outgoing=___cu_false___&account_email=flowcrypt.compatibility%40gmail.com', - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '16d558cb71e8d510', + { + content: ['this is a sample for FlowCrypt compatibility'], + encryption: 'encrypted', + signature: 'not signed', + }, + authHdr + ); }) ); @@ -1025,18 +1077,22 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - content: ['Subject: Re: Test from Tom iOS', 'test again', 'A message', 'Testing'], - encryption: 'encrypted', - signature: 'could not verify signature: missing pubkey, missing sender info', - quoted: true, - params: - '?frame_id=frame_obvAUTGAJU&message=-----BEGIN%20PGP%20MESSAGE-----%0A%0AhQEMA1HNSU%2BzzjQFAQf9GFHItnUD5A%2F2Abbh1qwdUdsl8i%2FhsgPwhONes2FIKxTg%0AsK9QbZSEBWh4GP3pPAaM84NvWEI%2FZFPR6Oy%2FYEOakzO681o2mk7mnf6doGnAy5P4%0AUqOoRCYuMxziyooMsWmwNqQLdazv3b5CkpT1uQjGjw9no%2B4038g2UZdyVw4w9m%2Fn%0AK65OHg544PcR3vuLZTiV%2BujQiwDsUddXYcbEOu2jZj3%2BwT6QZ3UoAni4VHQgSjBj%0AaVBgVHpGnBvTiMf%2FV3rEB0btPbBH2I4pE0ZEklXBCL2sMLz%2BGPQogo3FCTcT%2BBqL%0ALJ5AFFm%2FhXBNYg4ZXRl%2BgOhSi9NswPbQyWQ2OeJdDoUCDANLWi%2F85i2VAQEP%2FA5%2F%0AQqa26qcp1yeM%2FGBNMX7NeaZo0RrCqvBUho7Y7nwuwdMxpyN9mnDzcHPdgxe41OZ5%0AmKDD%2Bgjl7RHClEZBFpSxhc7pi4wIiodlIZ%2BGo3g9%2F7Z7XC7erewnc6BHSTrE5AJa%0AW%2FryxsRDrr9FzR1P3aHqssGXfD4J7%2B3BFASznQKPPaS8e%2BBj2ib6ZdKCyQLRFHZa%0A18RZPF6PprQ4oty%2BpqB8Jv8YTFCWQaYQYfVJLgO6pqwZzReOwcSwkipIraMoBSVn%0AsqAeup4ByOVYWmAhxvN5JP621cHPJbRcRgXqC5%2BRvSW8H0lxNVla7X755PhH0ret%0AKj4HR1o1PAJuPtdh0JMg0LSLiuOaHjfg1w5RtGE7ZyD1CbnF3EfLRmRTY3cLRdVV%0AJBvKj41lSd0EStnGxC2YaRTc50dzwE8ZF%2FvTzQbHc469AYvCOjECQW4kYNgusUia%0Aip7l0y2LYtm7S%2FWkNKCDoFF7gVGNOgtIM4nRlmPqp4D2tAGr3523RdzlRa8kQopo%0AqAHmLrS7%2B8HGESgzl452Pi2crm3J8wOTm3SyZOF2Eg7cyvbC75tNDWzK5ixs881X%0ASKNA2ti56JYd3Mg6Qi%2BsqdgJLLtXbsG0JB1%2B7GcBEVldmFBd1VAlM8cwJt6VNb%2Fr%0ADX4Sd5XpF9WyQbQuM9Np0Qi04UCrsnplG6ZaeJxQ0usBr8i9WKgr6EZg9CtNMD2i%0ARtx6wsjqbJ98oMFsDwGT4xauImVej8fiZiyiL4aJWb9RwLTwhNOjd%2Bgv9Ccw1zaF%0AAb%2F3ECc%2F4k%2FQgvPzWl0epomyZMNfYnw6KS%2FLfYARxJC3ckSFxrevPCfX19528WUC%0AdZ88bXAj1J2ktdDegMNlaltdevgz6uP%2B1dA%2FIYrr169AuOz0qsGhuXYSroa1kEhs%0AvvYB%2FpR55gme%2F5TouKH8baw1rK8tCHtn8N%2FUd0pjrc2P169LRt6SYoVqvvueYKdh%0A9rs%2B8KMdqlvzt99Qj9OcbjRIDe4TaoKcOaSFl2UhuMDWVHkgHDoEf4J5Pxb%2B12HW%0AKaxkKAIEZ7rOC5zS7FO3RfxRtQkXQ9TSZGQl1lRY78IJuDA9JByUKpmd7LuCMLJL%0AjE4b6mFx2lKCBFwoDVyPorr%2FkMvaA8idYV%2Fbj4gmiqaVMELjL58lOme%2FLRFFkV4F%0APXifXSeZG3od9bzCwN%2Fbj%2FVv1IlVL5tmh0%2F0FXinUM1LvIq4wk56KuDxCEM7LcTz%0ADyBzRt%2BW3qGiEeq4g6OKb%2BZL6izxBQTV9QW%2BBFe1oHByw9HIb4HStoi2g4ptUDwv%0AV0bvJqBGYfsTkar%2FUw%2Fm5x6CcW0hqd0pfzqTMIah87tNpCg87XTl0F%2BCt0Zbony9%0AzK9Emew4OB8QbVua4EhQlk1lFTw3kQzsmRKpuFrPac4vDI8jltzIfz6%2BCzNNE85m%0ADMiZUkYSgvuv6CRV2g1raAkVGx%2FNdkDdrc7wvM095A3nbfqnTbLYZ9162WRroCuK%0AW428mzpZ2ABLrRKYwGpE7iS%2FInXjyhrSoWRWXaHbUqpz9JS%2BuLhKOtWuony8T1tm%0AGezGvqZGnubcuGkRFgjELDxsgZG9GJ29r56UZ3ImsMXq148B9t63yW8VafVR%2BJvz%0Aywusa5FgAO69nLE38eAW8YpOgRy4swkowC5So2OWfAoZlTVxZpjpUSDTwXa4Uags%0ArnafwYtnU%2BR4fFt9FIoc6Ty3HvmwVGDV%2BfcMPrvzAfLuPgjNXPS7lB5BuZ2foPQP%0A158WD%2B%2BQoo2vDeTE8HOVpZBak595qJ%2FA27kMJrHPqKLcE9tVWplJ16%2FDVX4ceCs%2F%0AJ0viBtaPA19IHnBmkKyKvX3U5iXnLlwNlxwEdACONWbD3Y%2FwcpABwzeQaDJmFnoR%0ADQ77LtvRJodo34BWLYpx804fVqhQ0XyMaux3V9EeIhnTjFguWQze%2BA3gCYbKpVu5%0AQBxJsZagBOWtyVi8u%2FIu%2FxfaZzr%2B%2BzNPU9CCOuEQHK3H6OYjBSWLYOdYG6l2irUP%0A4ARDU0UKuWrRBQIup3y1EUJzdd6zYXBc5Y%2FUrk0VsikCzYOhXxC9H9W3Fn0pYCft%0AW5RlK3p8xKlRacHTlp4wtACvIuIhwhGDvXFe1iU53GfaKm8ZFaHcA7cbDpNTEvk5%0ArMO%2F0vlVxKmyOmgtnkFcgxdyi6vwp6hVMa59toPYqvZYitYRPcyOGx%2F%2FAITDCPHl%0AylTQGm9JCeG3kts8HC05N2QXKeUxhjHorOwhRc6anjmOdBba9z%2B6aK4Pv%2FJp5693%0A24vVNBIe4HlGmf4fAbPLh%2BG6GmN7QAD3z76RYubPmlFFkqqhIkDCc1awSySnsb06%0A9ZrS1kzcnzK8If2ejyL1n%2FuIx2koQp3LQTzZyCtoq8ho7ybdBhxVK5UfSxbAnJoj%0Agb7uTK1C6qh7iqeYvptt9tmcaQKPBOLIk1cpS9kScfTHTtdE9vqna733rx0kjEK1%0AjldIKwxxi5cc%2Fhd3DfsWQ4gHoprZdXdiUMLJqQTpDmVubx2vIiRAarkMNpd8hsy2%0AYFXUfa%2FGiNl2ax3UIX9zMDkaPESBLcjIcUbu%2F0C2YpDBBLKiwxm6QF1vbn5xOGdN%0AFtoraIzWsN93vJskaNAzi54dd2GL%2FAIVNg%2FhopG07B6Iwn5ZVYIBocAC40FmuQz2%0AyLpplIGqeQ6WSegRfRn8dpbii8IBpgYFrxiAD7uiCrZ9yP17hz%2FMhnXBgBBS9wIl%0AurfPaTitmEP7TaYQTpu9GKPtNjmREC0PN%2BoV7jvIofF1Z3s%2BJSnWaZvmLprcvCqD%0ALYplr%2BvCPeMyuSgLyAnGkmHCliKTGoqF%2BHQYXlPMuQcyoA41rIcQlVCv%2BlguzSDF%0AQNhBm8MKI2vaPTm0Y7hXgsDZ1stYftKC%2Bti0ge4vcelhJLisEYEeEMDNgoS%2Fw%2BLt%0AilRS8eJispykDW7GWdMog2La8wZRe0RH%2Fkcuj04IZTjYcLMxvmgk6zCFOlxxyF7I%0AcUJT%2FqKq0LsHyMABziErSsHJHij1bOw6sCaREXvTf6tDK86vNzuyBHTWVGqp1rZ9%0AyuhRuJ36EdbzuVEd0N6Z3RX4PQuG%2B4ueBfhbkfgLJrGJdTfNNhpVXuajv2ixJdU9%0AfVt4NQr2zIcdV9XNAdLRLuhLU5s5kl8E%2B2lB4%2FVWeb4ZA1oq3hCUIpJnZgRJgqSG%0A8%2FXD9%2FlZdzveihMaIJURQBWk2NbGnALQVrk2AjzspBonM2TbH9VugqzWNS66HUYf%0AE1tN0xe%2BahUhPDlD3GmpE5%2FgBnSUt%2BkQNZm1TOP7gocsOteLHfG31uAbXXACsM52%0A5BX%2BPrsnaTohmXnkFhkqJYtEjlsHI0rcUNQf0%2BueuctMyskb81MxCpP4aodpEuNC%0AtgEqwhgnwbiL68JRaao3Z6y7lbfREvJ0P7gevn0iwgtgdrP2nJdS8eUNQumRCYMs%0Am7qKQ28p8fuZ6f94oINHAoOJOe1wMD4j9vRftPtJU6sKT39ynHs2cylbYkFAqTOz%0Ai%2BRhdRbeuKybMoEx%2FSxfoEHh7RABWzN4DI9w2WhdH7L0hByuBT2GRocZDTYjYerh%0AaRrP6ZC4meeooFzGnurqgKIdEd5e76iYjqnVML1E%2Bw%2BCJSRDqhgG55z465ewZBdp%0AFEB%2FyQ%3D%3D%0A%3DVMeb%0A-----END%20PGP%20MESSAGE-----&message_id=166b194b21a0997c&senderEmail=&is_outgoing=___cu_false___&account_email=flowcrypt.compatibility%40gmail.com', - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '16ff09b1baca2051', + { + content: ['Subject: Re: Test from Tom iOS', 'test again', 'A message', 'Testing'], + encryption: 'encrypted', + signature: 'could not verify signature: missing pubkey A4556258EFD7EE07', + quoted: true, + }, + authHdr + ); }) ); -*/ + test( 'decrypt - by entering pass phrase + remember in session', testWithBrowser(async (t, browser) => { @@ -1239,35 +1295,42 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== await pgpBlockPage.waitForContent('@pgp-signature', 'signed', 10, 10); }) ); - /* + test( 'verification - public key fetched from WKD', testWithBrowser(async (t, browser) => { const acctEmail = 'flowcrypt.compatibility@gmail.com'; t.mockApi!.configProvider = new ConfigurationProvider({ - attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), + attester: { + pubkeyLookup: { + [acctEmail]: { + pubkey: somePubkey, + }, + }, + }, wkd: { directLookup: { - 'only.on.wkd': { - pubkeys: [onlyOnWkdPubKey], + 'some.sender': { + pubkeys: [await get203FAE7076005381()], }, }, }, }); await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - const senderEmail = 'only.on.wkd@signing.test'; - const message = encodeURIComponent( - '\r\n-----BEGIN PGP SIGNED MESSAGE-----\r\nHash: SHA512\r\n\r\ntest signed msg\r\n-----BEGIN PGP SIGNATURE-----\r\nVersion: FlowCrypt Email Encryption 8.3.2\r\nComment: Seamlessly send and receive encrypted email\r\n\r\nwnUEARYKAAYFAmMEtG8AIQkQ+1x3UHaDHFEWIQQvI5Sm4OisrFQgXUP7XHdQ\r\ndoMcUf2WAP0RJ7mXIPJUWSKIi3OCfddHlDX/y3rv+Kwabyjm5/dZMQD/TcUa\r\nrqxUmshPoZbQBgFPwpS0V/8nHTNj0b2ugcvnIQ4=\r\n=eCak\r\n-----END PGP SIGNATURE-----\r\n' - ); - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - content: ['test signed msg'], + const threadId = '17dad75e63e47f97'; + const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); + await inboxPage.waitAll('iframe', { timeout: 2 }); + const urls = await inboxPage.getFramesUrls(['/chrome/elements/pgp_render_block.htm'], { sleep: 10, appearIn: 20 }); + expect(urls.length).to.equal(1); + await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame([urls[0]]), { + content: ['1234'], encryption: 'not encrypted', signature: 'signed', - params: `?frameId=none&acctEmail=flowcrypt.compatibility@gmail.com&message=${message}&msgId=&signature=___cu_true___&senderEmail=${senderEmail}`, }); + // todo: plainText duplication + // todo: check gmail mock }) ); -*/ test( 'decrypt - fetched pubkey is automatically saved to contacts', testWithBrowser(async (t, browser) => { @@ -1535,64 +1598,47 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== await gmailPage.close(); }) ); - /* - test( - `decrypt - corrupted text in "incorrect message digest" scenario`, - testWithBrowser(async (t, browser) => { - const acctEmail = 'ci.tests.gmail@flowcrypt.test'; - t.mockApi!.configProvider = new ConfigurationProvider({ - attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), - }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'ci.tests.gmail'); - const params = `?frameId=none&message=-----BEGIN%20PGP%20SIGNED%20MESSAGE-----%0AHash%3A%20SHA512%0A%0A%0Athis%20is%20message%201%20CORRUPTED%20for%20flowcrypt%20issue%204342%0A-----BEGIN%20PGP%20SIGNATURE-----%0A%0A%0AwnUEARYKACcFAmPwp3kJEAdIHIrPnUn%2BFiEEm6Oc4HXwg5swNA%2FIB0gcis%2Bd%0ASf4AAGFcAP4%2FB%2FjbpeERlTNqorb5x6sXUFhfPHP6PZAXvVnpuaFdJQD%2FZ510%0AeYDnbx25XRLsdWoerPpG23tgqK45zOHjaIoveAo%3D%0A%3DHAkD%0A-----END%20PGP%20SIGNATURE-----&msgId=1866867cfdb8b61e&senderEmail=ci.tests.gmail@flowcrypt.test&isOutgoing=___cu_true___&acctEmail=ci.tests.gmail@flowcrypt.test&parentTabId=0`; - // should re-fetch the correct text/plain text with signature - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - params, - content: ['this is message 1 for flowcrypt issue 4342'], - unexpectedContent: ['this is message 1 CORRUPTED for flowcrypt issue 4342'], - encryption: 'not encrypted', - signature: 'signed', - }); - }) - ); test( - `decrypt - missing pubkey in "incorrect message digest" scenario`, + 'decrypt - signed-only PGP/MIME message is processed from API, rendered html is ignored', testWithBrowser(async (t, browser) => { - const msgId = '1766644f13510f58'; - const acctEmail = 'ci.tests.gmail@flowcrypt.test'; + const msgId = '17daefa0eb077da6'; + const acctEmail = 'flowcrypt.compatibility@gmail.com'; + const signerEmail = 'some.sender@test.com'; t.mockApi!.configProvider = new ConfigurationProvider({ - attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), - }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'ci.tests.gmail'); - const signerEmail = 'sender.for.refetch@domain.com'; - const data = await GoogleData.withInitializedData(acctEmail); - // eslint-disable @typescript-eslint/no-non-null-assertion - const msg = data.getMessage(msgId)!; - const signature = Buf.fromBase64Str(msg!.raw!) - .toUtfStr() - .match(/\-\-\-\-\-BEGIN PGP SIGNATURE\-\-\-\-\-.*\-\-\-\-\-END PGP SIGNATURE\-\-\-\-\-/s)![0]; - // eslint-enable @typescript-eslint/no-non-null-assertion - 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'], - encryption: 'not encrypted', - signature: 'could not verify signature: missing pubkey 2864E326A5BE488A', + attester: { + pubkeyLookup: { + [acctEmail]: { + pubkey: somePubkey, + }, + [signerEmail]: { + pubkey: await get203FAE7076005381(), + }, + }, + }, + google: { htmlRenderer: () => 'Some corrupted message' }, }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + msgId, + { + content: ['1234'], + encryption: 'not encrypted', + signature: 'signed', + }, + authHdr + ); }) ); test( - 'decrypt - re-fetch signed-only message from API on non-fatal verification error', + 'decrypt - signed-only PGP/MIME message - text is rendered only once in inbox', testWithBrowser(async (t, browser) => { const msgId = '17daefa0eb077da6'; const acctEmail = 'flowcrypt.compatibility@gmail.com'; const signerEmail = 'some.sender@test.com'; - const data = await GoogleData.withInitializedData(acctEmail); t.mockApi!.configProvider = new ConfigurationProvider({ attester: { pubkeyLookup: { @@ -1606,26 +1652,17 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== }, }); await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - // eslint-disable @typescript-eslint/no-non-null-assertion - const msg = data.getMessage(msgId)!; - const signature = Buf.fromBase64Str(msg!.raw!) - .toUtfStr() - .match(/\-\-\-\-\-BEGIN PGP SIGNATURE\-\-\-\-\-.*\-\-\-\-\-END PGP SIGNATURE\-\-\-\-\-/s)![0]; - // eslint-enable @typescript-eslint/no-non-null-assertion - 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 + const inboxPage = await browser.newExtensionInboxPage(t, acctEmail, msgId); + await inboxPage.waitAll('iframe'); + await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame(['pgp_render_block.htm']), { + content: ['1234'], encryption: 'not encrypted', signature: 'signed', }); + expect(await inboxPage.isElementPresent('.message.line')).to.be.false; }) ); -*/ test( 'decrypt - protonmail - load pubkey into contact + verify detached msg', testWithBrowser(async (t, browser) => { @@ -1862,36 +1899,28 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== ); test.todo('decrypt - by entering secondary pass phrase'); - /* - test( - `decrypt - don't allow api path traversal`, - testWithBrowser(async (t, browser) => { - const acctEmail = 'flowcrypt.compatibility@gmail.com'; - t.mockApi!.configProvider = new ConfigurationProvider({ - attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), - }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - const params = - '?frame_id=frame_TWloVRhvZE&message=&message_id=../test&senderEmail=&is_outgoing=___cu_false___&account_email=flowcrypt.compatibility%40gmail.com'; - const pgpHostPage = await browser.newPage(t, `chrome/dev/ci_pgp_host_page.htm${params}`); - const pgpBlockPage = await pgpHostPage.getFrame(['pgp_block.htm']); - await pgpBlockPage.waitForSelTestState('ready', 5); - await pgpBlockPage.waitForContent('@container-err-text', 'API path traversal forbidden'); - }) - ); test( `decrypt - signed only - parse error in a badge`, testWithBrowser(async (t, browser) => { const acctEmail = 'flowcrypt.compatibility@gmail.com'; + const msgId = '175ccd8755eab85f'; + const data = await GoogleData.withInitializedData(acctEmail); + // eslint-disable @typescript-eslint/no-non-null-assertion + const { id, threadId, historyId, payload } = data.getMessage(msgId)!; t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), + google: { + getMsg: { + [msgId]: { msg: { id, threadId, historyId, payload, raw: 'RSo' } }, // corrupted raw part + }, + }, }); const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); await BrowserRecipe.pgpBlockVerifyDecryptedContent( t, browser, - 'corrupted-1', + '175ccd8755eab85f', { content: [], error: 'parse error', @@ -1900,7 +1929,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== ); }) ); -*/ + test( 'decrypt - prevent rendering of attachments from domain sources other than flowcrypt.s3.amazonaws.com', testWithBrowser(async (t, browser) => { @@ -1918,23 +1947,6 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== await pgpBlock.notPresent(['.preview-attachment', '@download-attachment-0']); }) ); - /* - test( - `decrypt - try path traversal forward slash workaround`, - testWithBrowser(async (t, browser) => { - const acctEmail = 'flowcrypt.compatibility@gmail.com'; - t.mockApi!.configProvider = new ConfigurationProvider({ - attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), - }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - const params = - '?frame_id=frame_TWloVRhvZE&message=&message_id=..\\test&senderEmail=&is_outgoing=___cu_false___&account_email=flowcrypt.compatibility%40gmail.com'; - const pgpHostPage = await browser.newPage(t, `chrome/dev/ci_pgp_host_page.htm${params}`); - const pgpBlockPage = await pgpHostPage.getFrame(['pgp_block.htm']); - await pgpBlockPage.waitForSelTestState('ready', 5); - await pgpBlockPage.waitForContent('@container-err-text', 'API path traversal forbidden'); - }) - ); test( `verify - sha1 shows error`, @@ -1952,30 +1964,21 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== }, }, }); - await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); - const msg = `-----BEGIN PGP MESSAGE----- - -yMCxATvCy8zAxHhitbJOfXrcEcbTKkkMIOCRmpOTr6NQkpFZrABEiQolqcUlCrmpxcWJ6alchw5U -sjAwMjEoiymyhJfeapohyXRUYeazxTBjWJkSeOtDWJnBRnFxCsDEv33mYDjmdsuGPyx68g7tMwe3 -tqlevvUo5EIap+wmZm6mRXcOGBplvJy1mfuq1plrt08qs97Y2ztB+/XbuyG3Ir48u7I3pmD+TWae -WSd5d26QYXcuusauc0Xy/fS1/FXbPJaYHlCeMCfnhrF9d2jyH33V+er6r3lS5i/mchOKffpglktT -d6Z36//MsmczN00Wd60t9T+qyLz0T4/UG2Y9lgf367f3d+kYPE0LS7mXuFmjlPXfw0nKyVsSeFiu -3duz+VfzU3HVZ65L4xc5PBYwWLlshdcG94VTt2oK3cuLC5zuy/3ks0sw1+MGzmKtjMeJrqXph+8p -5W5JmHL28qarbQvv+71V3ni6odk8Z2NDban2y1kA -=Ruyn ------END PGP MESSAGE-----`; - const params = `?frame_id=frame_TWloVRhvZE&message=${encodeURIComponent( - msg - )}&message_id=none&senderEmail=sha1%40sign.com&is_outgoing=___cu_false___&account_email=flowcrypt.compatibility%40gmail.com`; - await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, { - params, - content: ['test'], - encryption: 'not encrypted', - signature: 'error verifying signature: Insecure message hash algorithm: SHA1. Sender is using old, insecure OpenPGP software.', - }); + const { authHdr } = await BrowserRecipe.setUpCommonAcct(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '1882fa9e2b996242', + { + content: ['test'], + encryption: 'not encrypted', + signature: 'error verifying signature: Insecure message hash algorithm: SHA1. Sender is using old, insecure OpenPGP software.', + }, + authHdr + ); }) ); -*/ + test( 'verify - Kraken - urldecode signature', testWithBrowser(async (t, browser) => { From 2ce040dd9202f7057f5c0386f8e5764001601d01 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 19 May 2023 17:24:06 +0100 Subject: [PATCH 075/147] update test --- .../inbox/inbox-modules/inbox-active-thread-module.ts | 2 +- test/source/tests/decrypt.ts | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts index d4f35bd818b..e9d5e3a67bc 100644 --- a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts +++ b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts @@ -282,6 +282,6 @@ export class InboxActiveThreadModule extends ViewModule { }; private wrapMsg = (id: string, html: string) => { - return Ui.e('div', { id, class: 'message line', html }); + return Ui.e('div', { id, class: 'message line', html, 'data-test': 'message-line' }); }; } diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index 45bf2c9debd..5d70bb994e0 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -33,7 +33,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te await inboxPage.waitForSelTestState('ready'); await inboxPage.waitAll('iframe'); const plainMessage = /-----BEGIN PGP MESSAGE-----.*This is not a valid PGP message/s; - await inboxPage.waitForContent('.message.line', plainMessage); + await inboxPage.waitForContent('@message-line', plainMessage); // expect no pgp blocks expect((await inboxPage.getFramesUrls(['pgp_render_block.htm'])).length).to.equal(0); await inboxPage.close(); @@ -54,7 +54,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te await inboxPage.waitForSelTestState('ready'); await inboxPage.waitAll('iframe'); const plainMessage = /An OpenPGP message starts with this header:\r?\n-----BEGIN PGP MESSAGE-----\r?\n\r?\nexample/s; - await inboxPage.waitForContent('.message.line', plainMessage); + await inboxPage.waitForContent('@message-line', plainMessage); // expect no pgp blocks expect((await inboxPage.getFramesUrls(['pgp_render_block.htm'])).length).to.equal(0); await inboxPage.close(); @@ -184,7 +184,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te await inboxPage.waitForSelTestState('ready'); await inboxPage.waitAll('iframe'); expect(await inboxPage.isElementPresent('@container-attachments')).to.equal(true); - await inboxPage.waitForContent('.message.line', 'Plain message'); + await inboxPage.waitForContent('@message-line', 'Plain message'); // expect no pgp blocks const urls = await inboxPage.getFramesUrls(['/chrome/elements/pgp_render_block.htm']); expect(urls.length).to.equal(0); @@ -1091,7 +1091,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== encryption: 'not encrypted', signature: 'signed', }); - // todo: plainText duplication + expect(await inboxPage.read('@message-line')).to.not.include('1234'); // todo: check gmail mock }) ); @@ -1363,7 +1363,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== encryption: 'not encrypted', signature: 'signed', }); - expect(await inboxPage.isElementPresent('.message.line')).to.be.false; + expect(await inboxPage.read('@message-line')).to.not.include('1234'); }) ); From fe3a3d0efdcdde541f34d885552c314da7d64804 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 19 May 2023 17:26:37 +0100 Subject: [PATCH 076/147] temporarily increase test timeout --- .semaphore/semaphore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index dbb84eb35fb..b3521e196d8 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -60,7 +60,7 @@ blocks: run: when: branch = 'master' OR branch =~ 'live-test' OR branch =~ 'gmail-test' execution_time_limit: - minutes: 45 + minutes: 55 task: secrets: - name: flowcrypt-browser-ci-secrets From 36af973a8a30fa0b3dc412b4cb86a4c90bc2ca6e Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 19 May 2023 18:05:24 +0100 Subject: [PATCH 077/147] refactor threadHasPgpBlock and processed message --- .../inbox-active-thread-module.ts | 53 ++++++++----------- extension/js/common/downloader.ts | 2 + extension/js/common/message-renderer.ts | 6 ++- extension/js/common/xss-safe-factory.ts | 6 ++- 4 files changed, 35 insertions(+), 32 deletions(-) diff --git a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts index e9d5e3a67bc..40c68fb9877 100644 --- a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts +++ b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts @@ -13,13 +13,11 @@ import { Buf } from '../../../../js/common/core/buf.js'; import { Catch } from '../../../../js/common/platform/catch.js'; import { InboxView } from '../inbox.js'; import { Lang } from '../../../../js/common/lang.js'; -import { MessageRenderer } from '../../../../js/common/message-renderer.js'; import { Ui } from '../../../../js/common/browser/ui.js'; import { ViewModule } from '../../../../js/common/view-module.js'; import { Xss } from '../../../../js/common/platform/xss.js'; import { Browser } from '../../../../js/common/browser/browser.js'; import { Attachment } from '../../../../js/common/core/attachment.js'; -import { Mime } from '../../../../js/common/core/mime.js'; import { LoaderContextInterface, bindNow } from '../../../../js/common/loader-context-interface.js'; import { BindInterface } from '../../../../js/common/relay-manager-interface.js'; @@ -65,7 +63,6 @@ class LoaderContext implements LoaderContextInterface { export class InboxActiveThreadModule extends ViewModule { private threadId: string | undefined; - private threadHasPgpBlock = false; private debugEmails = ['flowcrypt.compatibility@gmail.com', 'ci.tests.gmail@flowcrypt.dev', 'e2e.enterprise.test@flowcrypt.com']; // adds debugging ui, useful for creating automated tests public render = async (threadId: string, thread?: GmailRes.GmailThread) => { @@ -80,14 +77,25 @@ export class InboxActiveThreadModule extends ViewModule { const subject = GmailParser.findHeader(thread.messages[0], 'subject') || '(no subject)'; this.updateUrlWithoutRedirecting(`${subject} - FlowCrypt Inbox`, { acctEmail: this.view.acctEmail, threadId }); this.view.displayBlock('thread', Xss.escape(subject)); + let threadHasPgpBlock = false; for (const m of thread.messages) { - await this.renderMsg(m); + threadHasPgpBlock ||= await this.renderMsg(m); } - if (this.threadHasPgpBlock) { + if (threadHasPgpBlock) { $('.action_see_original_message').css('display', 'inline-block'); if (this.view.showOriginal) { $('.action_see_original_message').text('See Decrypted'); } + $('.action_see_original_message').on( + 'click', + this.view.setHandler(() => + this.view.redirectToUrl({ + acctEmail: this.view.acctEmail, + threadId: this.threadId, + showOriginal: !this.view.showOriginal, + }) + ) + ); } const lastMsg = thread.messages[thread.messages.length - 1]; if (lastMsg) { @@ -111,18 +119,6 @@ export class InboxActiveThreadModule extends ViewModule { }; public setHandlers = () => { - if (this.threadHasPgpBlock) { - $('.action_see_original_message').on( - 'click', - this.view.setHandler(() => - this.view.redirectToUrl({ - acctEmail: this.view.acctEmail, - threadId: this.threadId, - showOriginal: !this.view.showOriginal, - }) - ) - ); - } BrowserMsg.addListener('close_reply_message', async ({ frameId }: Bm.ComposeWindow) => { $(`iframe#${frameId}`).remove(); }); @@ -146,32 +142,27 @@ export class InboxActiveThreadModule extends ViewModule { BrowserMsg.addListener('reply_pubkey_mismatch', BrowserMsgCommonHandlers.replyPubkeyMismatch); }; - private renderMsg = async (message: GmailRes.GmailMsg) => { + private renderMsg = async (message: GmailRes.GmailMsg): Promise => { const htmlId = this.replyMsgId(message.id); try { const msg = await this.view.messageRenderer.downloader.msgGetCached(message.id).download.full; - const mimeContent = MessageRenderer.reconstructMimeContent(msg); - const blocks = Mime.processBody(mimeContent); - const printInfoHtml = await this.view.messageRenderer.getMessageInfo(msg); - // todo: review the meaning of threadHasPgpBlock - this.threadHasPgpBlock ||= blocks.some(block => ['encryptedMsg', 'publicKey', 'privateKey', 'signedMsg'].includes(block.type)); // todo: take `from` from the processedMessage? - const { renderedXssSafe, singlePlainBlock, blocksInFrames, messageInfo, from } = await this.view.messageRenderer.msgGetProcessed(message.id); + const { blocks, isBodyEmpty, renderedXssSafe, singlePlainBlock, blocksInFrames, messageInfo, from, attachments } = + await this.view.messageRenderer.msgGetProcessed(message.id); const senderEmail = from || 'unknown'; const exportBtn = this.debugEmails.includes(this.view.acctEmail) ? 'download api export' : ''; const loaderContext = new LoaderContext( this.view.factory, - renderedXssSafe, + singlePlainBlock ? XssSafeFactory.renderPlainContent(singlePlainBlock.content) : renderedXssSafe, blocks .filter(block => block.attachmentMeta && ['encryptedAttachment', 'plainAttachment'].includes(block.type)) - .concat(singlePlainBlock ? [singlePlainBlock] : []) .map(block => XssSafeFactory.renderableMsgBlock(this.view.factory, block, this.view.messageRenderer.isOutgoing(senderEmail))) ); // todo: test else if (this.view.showOriginal) { r += Xss.escape(Str.with(block.content)).replace(/\n/g, '
');} - for (const a of mimeContent.attachments) { + for (const a of attachments) { await this.view.messageRenderer.processAttachment( a, - a.treatAs(mimeContent.attachments, Mime.isBodyEmpty(mimeContent)), + a.treatAs(attachments, isBodyEmpty), loaderContext, undefined, message.id, @@ -184,13 +175,13 @@ export class InboxActiveThreadModule extends ViewModule { GmailParser.findHeader(msg, 'Date') ?? '' } ${exportBtn}

` + (loaderContext.renderedMessageXssSafe ?? '') + - (loaderContext.renderedAttachments.length // todo: we always have data on this page (for now), as we download 'raw' + (loaderContext.renderedAttachments.length ? `
${loaderContext.renderedAttachments.join('')}
` : ''); $('.thread').append(this.wrapMsg(htmlId, r)); // xss-safe-factory loaderContext.completeBinding(this.view.relayManager); this.view.messageRenderer - .processInlineBlocks(this.view.relayManager, this.view.factory, printInfoHtml, blocksInFrames, from ? Str.parseEmail(from).email : undefined) + .processInlineBlocks(this.view.relayManager, this.view.factory, messageInfo, blocksInFrames, from ? Str.parseEmail(from).email : undefined) .catch(Catch.reportErr); if (exportBtn) { $('.action-export').on( @@ -198,6 +189,7 @@ export class InboxActiveThreadModule extends ViewModule { this.view.setHandler(() => this.exportMsgForDebug(message.id)) ); } + return blocks.some(block => ['encryptedMsg', 'publicKey', 'privateKey', 'signedMsg'].includes(block.type)); } catch (e) { if (ApiErr.isNetErr(e)) { Xss.sanitizeAppend('.thread', this.wrapMsg(htmlId, `Failed to load a message (network error), skipping. ${Ui.retryLink()}`)); @@ -210,6 +202,7 @@ export class InboxActiveThreadModule extends ViewModule { const printable = Xss.escape(e instanceof Error ? e.stack || e.message : JSON.stringify(e, undefined, 2)); Xss.sanitizeAppend('.thread', this.wrapMsg(htmlId, `Failed to load a message due to the following error: 
${printable}
`)); } + return false; } }; diff --git a/extension/js/common/downloader.ts b/extension/js/common/downloader.ts index 5fecdb3a7fd..2986ec6fe68 100644 --- a/extension/js/common/downloader.ts +++ b/extension/js/common/downloader.ts @@ -11,6 +11,8 @@ import { MsgBlock } from './core/msg-block.js'; import { MessageInfo } from './render-message.js'; export type ProcessedMessage = { + isBodyEmpty: boolean; + blocks: MsgBlock[]; renderedXssSafe?: string; blocksInFrames: Dict; attachments: Attachment[]; diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index 15147c14c53..6f70d8f45bd 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -344,6 +344,7 @@ export class MessageRenderer { ); }; + // todo: private public getMessageInfo = async (fullMsg: GmailRes.GmailMsg): Promise => { const fullName = await AcctStore.get(this.acctEmail, ['full_name']); // todo: cache const sentDate = GmailParser.findHeader(fullMsg, 'date'); @@ -391,10 +392,11 @@ export class MessageRenderer { const fullMsg = await msgDownload.download.full; const mimeContent = MessageRenderer.reconstructMimeContent(fullMsg); const blocks = Mime.processBody(mimeContent); + const isBodyEmpty = Mime.isBodyEmpty(mimeContent); // todo: only start `signature` download? // start download of all attachments that are not plainFile, for 'needChunk' -- chunked download for (const a of mimeContent.attachments.filter(a => !a.hasData())) { - const treatAs = a.treatAs(mimeContent.attachments, Mime.isBodyEmpty(mimeContent)); + const treatAs = a.treatAs(mimeContent.attachments, isBodyEmpty); if (treatAs === 'plainFile') continue; if (treatAs === 'needChunk') { this.downloader.queueAttachmentChunkDownload(a); @@ -416,6 +418,8 @@ export class MessageRenderer { ({ renderedXssSafe, blocksInFrames } = MessageRenderer.renderMsg({ blocks, from }, this.factory, false, this.sendAs)); } msgDownload.processedFull = { + isBodyEmpty, + blocks, renderedXssSafe, singlePlainBlock, blocksInFrames, diff --git a/extension/js/common/xss-safe-factory.ts b/extension/js/common/xss-safe-factory.ts index 68ef6ff4b80..3ae816185c3 100644 --- a/extension/js/common/xss-safe-factory.ts +++ b/extension/js/common/xss-safe-factory.ts @@ -16,6 +16,7 @@ import { Ui } from './browser/ui.js'; import { WebMailName, WebMailVersion } from './browser/env.js'; import { Xss } from './platform/xss.js'; import { SendAsAlias } from './platform/store/acct-store.js'; +import { Buf } from './core/buf.js'; type Placement = 'settings' | 'settings_compose' | 'default' | 'dialog' | 'gmail' | 'embedded' | 'compose'; export type WebmailVariantString = undefined | 'html' | 'standard' | 'new'; @@ -61,7 +62,7 @@ export class XssSafeFactory { */ public static renderableMsgBlock = (factory: XssSafeFactory, block: MsgBlock, isOutgoing?: boolean) => { if (block.type === 'plainText') { - return Xss.escape(Str.with(block.content)).replace(/\n/g, '
') + '

'; + return XssSafeFactory.renderPlainContent(block.content); } else if (block.type === 'plainHtml') { return Xss.htmlSanitizeAndStripAllTags(Str.with(block.content), '
') + '

'; } else if (block.type === 'publicKey') { @@ -80,6 +81,9 @@ export class XssSafeFactory { } }; + public static renderPlainContent = (content: string | Buf) => { + return Xss.escape(Str.with(content)).replace(/\n/g, '
') + '

'; + }; /** * XSS WARNING * From d1c75b01fe7c063b1b87a4b1f8cb622d0c1ced03 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sat, 20 May 2023 11:26:17 +0100 Subject: [PATCH 078/147] 'SEE ORIGINAL' functionality --- .../inbox-active-thread-module.ts | 15 ++-- extension/chrome/settings/inbox/inbox.htm | 2 +- extension/js/common/downloader.ts | 3 - extension/js/common/message-renderer.ts | 72 ++++++++----------- .../webmail/gmail-element-replacer.ts | 55 +++++++------- test/source/tests/settings.ts | 30 ++++++++ 6 files changed, 95 insertions(+), 82 deletions(-) diff --git a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts index 40c68fb9877..66432305a88 100644 --- a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts +++ b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts @@ -81,7 +81,7 @@ export class InboxActiveThreadModule extends ViewModule { for (const m of thread.messages) { threadHasPgpBlock ||= await this.renderMsg(m); } - if (threadHasPgpBlock) { + if (threadHasPgpBlock || this.view.showOriginal) { $('.action_see_original_message').css('display', 'inline-block'); if (this.view.showOriginal) { $('.action_see_original_message').text('See Decrypted'); @@ -146,14 +146,13 @@ export class InboxActiveThreadModule extends ViewModule { const htmlId = this.replyMsgId(message.id); try { const msg = await this.view.messageRenderer.downloader.msgGetCached(message.id).download.full; - // todo: take `from` from the processedMessage? - const { blocks, isBodyEmpty, renderedXssSafe, singlePlainBlock, blocksInFrames, messageInfo, from, attachments } = - await this.view.messageRenderer.msgGetProcessed(message.id); - const senderEmail = from || 'unknown'; + const { blocks, isBodyEmpty, messageInfo, from, attachments } = await this.view.messageRenderer.msgGetProcessed(message.id); const exportBtn = this.debugEmails.includes(this.view.acctEmail) ? 'download api export' : ''; + const senderEmail = from ? Str.parseEmail(from).email : undefined; + const { renderedXssSafe, blocksInFrames } = this.view.messageRenderer.renderMsg({ blocks, senderEmail }, this.view.showOriginal); const loaderContext = new LoaderContext( this.view.factory, - singlePlainBlock ? XssSafeFactory.renderPlainContent(singlePlainBlock.content) : renderedXssSafe, + renderedXssSafe, blocks .filter(block => block.attachmentMeta && ['encryptedAttachment', 'plainAttachment'].includes(block.type)) .map(block => XssSafeFactory.renderableMsgBlock(this.view.factory, block, this.view.messageRenderer.isOutgoing(senderEmail))) @@ -180,9 +179,7 @@ export class InboxActiveThreadModule extends ViewModule { : ''); $('.thread').append(this.wrapMsg(htmlId, r)); // xss-safe-factory loaderContext.completeBinding(this.view.relayManager); - this.view.messageRenderer - .processInlineBlocks(this.view.relayManager, this.view.factory, messageInfo, blocksInFrames, from ? Str.parseEmail(from).email : undefined) - .catch(Catch.reportErr); + this.view.messageRenderer.processInlineBlocks(this.view.relayManager, this.view.factory, messageInfo, blocksInFrames, senderEmail).catch(Catch.reportErr); if (exportBtn) { $('.action-export').on( 'click', diff --git a/extension/chrome/settings/inbox/inbox.htm b/extension/chrome/settings/inbox/inbox.htm index 7c7a42ce4ce..d94e9758708 100644 --- a/extension/chrome/settings/inbox/inbox.htm +++ b/extension/chrome/settings/inbox/inbox.htm @@ -37,7 +37,7 @@

- See Original + See Original
diff --git a/extension/js/common/downloader.ts b/extension/js/common/downloader.ts index 2986ec6fe68..6553d10aeb8 100644 --- a/extension/js/common/downloader.ts +++ b/extension/js/common/downloader.ts @@ -13,11 +13,8 @@ import { MessageInfo } from './render-message.js'; export type ProcessedMessage = { isBodyEmpty: boolean; blocks: MsgBlock[]; - renderedXssSafe?: string; - blocksInFrames: Dict; attachments: Attachment[]; messageInfo: MessageInfo; - singlePlainBlock?: MsgBlock; from?: string; }; diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index 6f70d8f45bd..c298adb3fc1 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -125,32 +125,6 @@ export class MessageRenderer { }; }; - public static renderMsg = ( - { from, blocks }: { blocks: MsgBlock[]; from?: string }, - factory: XssSafeFactory, - showOriginal: boolean, - sendAs?: Dict - ) => { - const isOutgoing = Boolean(from && !!sendAs?.[from]); - const blocksInFrames: Dict = {}; - let r = ''; - for (const block of blocks) { - if (r) { - r += '

'; - } - if (showOriginal) { - r += Xss.escape(Str.with(block.content)).replace(/\n/g, '
'); - } else if (['signedMsg', 'encryptedMsg'].includes(block.type)) { - const { frameId, frameXssSafe } = factory.embeddedRenderMsg(block.type); - r += frameXssSafe; - blocksInFrames[frameId] = block; - } else { - r += XssSafeFactory.renderableMsgBlock(factory, block, isOutgoing); - } - } - return { renderedXssSafe: r, isOutgoing, blocksInFrames }; - }; - public static renderPgpSignatureCheckResult = async ( renderModule: RenderInterface, verifyRes: VerifyRes | undefined, @@ -244,8 +218,29 @@ export class MessageRenderer { return ``; }; - public isOutgoing = (senderEmail: string) => { - return !!this.sendAs[senderEmail]; // todo: remove code duplication + public renderMsg = ({ senderEmail, blocks }: { blocks: MsgBlock[]; senderEmail?: string }, showOriginal: boolean) => { + const isOutgoing = this.isOutgoing(senderEmail); + const blocksInFrames: Dict = {}; + let r = ''; + for (const block of blocks) { + if (r) { + r += '

'; + } + if (showOriginal) { + r += Xss.escape(Str.with(block.content)).replace(/\n/g, '
'); + } else if (['signedMsg', 'encryptedMsg'].includes(block.type)) { + const { frameId, frameXssSafe } = this.factory.embeddedRenderMsg(block.type); + r += frameXssSafe; + blocksInFrames[frameId] = block; + } else { + r += XssSafeFactory.renderableMsgBlock(this.factory, block, isOutgoing); + } + } + return { renderedXssSafe: r, isOutgoing, blocksInFrames }; + }; + + public isOutgoing = (senderEmail: string | undefined) => { + return Boolean(senderEmail && !!this.sendAs[senderEmail]); // todo: remove code duplication }; public processAttachment = async ( @@ -255,7 +250,7 @@ export class MessageRenderer { attachmentSel: JQueryEl | undefined, msgId: string, // deprecated messageInfo: MessageInfo, - senderEmail: string + senderEmail?: string ): Promise<'shown' | 'hidden' | 'replaced'> => { // todo - [same name + not processed].first() ... What if attachment metas are out of order compared to how gmail shows it? And have the same name? try { @@ -408,21 +403,10 @@ export class MessageRenderer { // todo: this.downloader.queueAttachmentDownload(a); } } - let renderedXssSafe: string | undefined; - let blocksInFrames: Dict = {}; - let singlePlainBlock: MsgBlock | undefined; const from = GmailParser.findHeader(fullMsg, 'from'); - if (blocks.length === 1 && ['plainText', 'plainHtml'].includes(blocks[0].type)) { - singlePlainBlock = blocks[0]; - } else if (blocks.length) { - ({ renderedXssSafe, blocksInFrames } = MessageRenderer.renderMsg({ blocks, from }, this.factory, false, this.sendAs)); - } msgDownload.processedFull = { isBodyEmpty, blocks, - renderedXssSafe, - singlePlainBlock, - blocksInFrames, messageInfo: await this.getMessageInfo(fullMsg), from, attachments: mimeContent.attachments, @@ -588,7 +572,7 @@ export class MessageRenderer { }; }; - private renderSignedMessage = async (raw: string, renderModule: RenderInterface, signerEmail: string) => { + private renderSignedMessage = async (raw: string, renderModule: RenderInterface, signerEmail: string | undefined) => { // ... from PgpBlockViewDecryptModule.initialize const mimeMsg = Buf.fromBase64UrlStr(raw); const parsed = await Mime.decode(mimeMsg); @@ -600,7 +584,7 @@ export class MessageRenderer { const sigText = parsedSignature.replace('\n=3D', '\n='); const encryptedData = parsed.rawSignedContent; try { - const verificationPubs = await MessageRenderer.getVerificationPubs(signerEmail); + const verificationPubs = signerEmail ? await MessageRenderer.getVerificationPubs(signerEmail) : []; const verify = async (verificationPubs: string[]) => await MsgUtil.verifyDetached({ plaintext: encryptedData, sigText, verificationPubs }); const signatureResult = await verify(verificationPubs); return await this.decideDecryptedContentFormattingAndRender( @@ -701,7 +685,7 @@ export class MessageRenderer { await this.relayAndStartProcessing(this.relayManager, loaderContext, loaderContext.factory, frameId, printMailInfo, cb); }; - private processSignedMessage = async (msgId: string, renderModule: RenderInterface, senderEmail: string) => { + private processSignedMessage = async (msgId: string, renderModule: RenderInterface, senderEmail: string | undefined) => { try { renderModule.renderText('Loading signed message...'); const raw = await this.msgGetRaw(msgId); @@ -717,7 +701,7 @@ export class MessageRenderer { attachment: Attachment, renderModule: RenderInterface, frameId: string, - senderEmail: string, + senderEmail: string | undefined, isPwdMsgBasedOnMsgSnippet?: boolean ) => { try { diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index 3f74872de62..f83c0265928 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -167,38 +167,43 @@ export class GmailElementReplacer implements WebmailElementReplacer { console.debug('replaceArmoredBlocks() for of emailsContainingPgpBlock -> emailContainer added evaluated'); } const msgId = this.determineMsgId(emailContainer); - let renderedXssSafe: string | undefined; - let blocksInFrames: Dict = {}; + let blocks: MsgBlock[] = []; let messageInfo: MessageInfo | undefined; let from: string | undefined; try { - ({ renderedXssSafe, blocksInFrames, messageInfo, from } = await this.messageRenderer.msgGetProcessed(msgId)); + ({ messageInfo, from, blocks } = await this.messageRenderer.msgGetProcessed(msgId)); } catch (e) { // fill with fallback values from the element - const blocks = Mime.processBody({ text: emailContainer.innerText }); - ({ renderedXssSafe, blocksInFrames } = MessageRenderer.renderMsg({ blocks, from }, this.factory, false, this.sendAs)); + blocks = Mime.processBody({ text: emailContainer.innerText }); } - if (renderedXssSafe) { - $(this.sel.translatePrompt).hide(); - if (this.debug) { - console.debug('replaceArmoredBlocks() for of emailsContainingPgpBlock -> emailContainer replacing'); - } - LoaderContextWebmail.updateMsgBodyEl_DANGEROUSLY(emailContainer, 'set', renderedXssSafe); // xss-safe-factory: replace_blocks is XSS safe - if (this.debug) { - console.debug('replaceArmoredBlocks() for of emailsContainingPgpBlock -> emailContainer replaced'); - } - const senderEmail = this.getSenderEmail(this.getMsgBodyEl(msgId)) || from; - // todo: const isOutgoing = !!this.sendAs[senderEmail]; - this.messageRenderer - .processInlineBlocks( - this.relayManager, - this.factory, - messageInfo ?? { isPwdMsgBasedOnMsgSnippet: MessageRenderer.isPwdMsg(emailContainer.innerText) }, // todo: print info for offline? - blocksInFrames, - senderEmail - ) - .catch(Catch.reportErr); + if (blocks.length === 0 || (blocks.length === 1 && blocks[0].type === 'plainText')) { + // only has single block which is plain text + continue; + } + if (!from) { + from = this.getSenderEmail(this.getMsgBodyEl(msgId)); + } + const senderEmail = from ? Str.parseEmail(from).email : undefined; + const { renderedXssSafe, blocksInFrames } = this.messageRenderer.renderMsg({ blocks, senderEmail }, false); + if (!renderedXssSafe) continue; + $(this.sel.translatePrompt).hide(); + if (this.debug) { + console.debug('replaceArmoredBlocks() for of emailsContainingPgpBlock -> emailContainer replacing'); + } + LoaderContextWebmail.updateMsgBodyEl_DANGEROUSLY(emailContainer, 'set', renderedXssSafe); // xss-safe-factory: replace_blocks is XSS safe + if (this.debug) { + console.debug('replaceArmoredBlocks() for of emailsContainingPgpBlock -> emailContainer replaced'); } + // todo: const isOutgoing = !!this.sendAs[senderEmail]; + this.messageRenderer + .processInlineBlocks( + this.relayManager, + this.factory, + messageInfo ?? { isPwdMsgBasedOnMsgSnippet: MessageRenderer.isPwdMsg(emailContainer.innerText) }, // todo: print info for offline? + blocksInFrames, + senderEmail + ) + .catch(Catch.reportErr); } }; diff --git a/test/source/tests/settings.ts b/test/source/tests/settings.ts index 4e6ad5815eb..1b3f863d296 100644 --- a/test/source/tests/settings.ts +++ b/test/source/tests/settings.ts @@ -740,6 +740,36 @@ export const defineSettingsTests = (testVariant: TestVariant, testWithBrowser: T await attachmentPreviewImage.waitAll('#attachment-preview-container img.attachment-preview-img'); }) ); + test( + 'settings - inbox - show original', + testWithBrowser(async (t, browser) => { + const threadId = '15f7f5e966792203'; // signed inline + const { acctEmail } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'compatibility'); + const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); + await inboxPage.waitForSelTestState('ready'); + await inboxPage.waitAll('iframe'); + expect((await inboxPage.getFramesUrls(['pgp_render_block.htm'])).length).to.equal(1); + expect(await inboxPage.read('@message-line')).to.not.contain('BEGIN'); + expect(await inboxPage.read('@see-original')).to.equal('SEE ORIGINAL'); + + // switch to original + await inboxPage.waitForNavigationIfAny(() => inboxPage.waitAndClick('@see-original')); + await inboxPage.waitForSelTestState('ready'); + await inboxPage.waitAll('iframe'); + // expect no pgp blocks + expect((await inboxPage.getFramesUrls(['pgp_render_block.htm'])).length).to.equal(0); + expect(await inboxPage.read('@message-line')).to.contain('BEGIN'); + expect(await inboxPage.read('@see-original')).to.equal('SEE DECRYPTED'); + + // switch back to decrypted + await inboxPage.waitForNavigationIfAny(() => inboxPage.waitAndClick('@see-original')); + await inboxPage.waitForSelTestState('ready'); + await inboxPage.waitAll('iframe'); + expect((await inboxPage.getFramesUrls(['pgp_render_block.htm'])).length).to.equal(1); + expect(await inboxPage.read('@message-line')).to.not.contain('BEGIN'); + expect(await inboxPage.read('@see-original')).to.equal('SEE ORIGINAL'); + }) + ); test( 'settings - pgp/mime preview and download attachment', testWithBrowser(async (t, browser) => { From 85b37b5fc36eb41064984e10780bbfb89d42482b Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sat, 20 May 2023 13:07:11 +0100 Subject: [PATCH 079/147] deleted code related to successfully_received_at_leat_one_message flag --- .../elements/pgp_block_modules/pgp-block-render-module.ts | 8 -------- extension/chrome/settings/modules/debug_api.ts | 1 - extension/js/common/platform/store/acct-store.ts | 2 -- 3 files changed, 11 deletions(-) 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 7f69ce24288..9d0edf640d0 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 @@ -48,14 +48,6 @@ export class PgpBlockViewRenderModule { }; public renderContent = (htmlContent: string, isErr: boolean) => { - /* - todo: - if (!isErr && !this.view.isOutgoing) { - // successfully opened incoming message - // eslint-disable-next-line @typescript-eslint/naming-convention - await AcctStore.set(this.view.acctEmail, { successfully_received_at_leat_one_message: true }); - } - */ if (!isErr) { // rendering message content $('.pgp_print_button').show(); diff --git a/extension/chrome/settings/modules/debug_api.ts b/extension/chrome/settings/modules/debug_api.ts index dd0d312b6ee..d5d132d3c57 100644 --- a/extension/chrome/settings/modules/debug_api.ts +++ b/extension/chrome/settings/modules/debug_api.ts @@ -43,7 +43,6 @@ View.run( 'full_name', 'cryptup_enabled', 'setup_done', - 'successfully_received_at_leat_one_message', 'notification_setup_done_seen', 'rules', 'use_rich_text', diff --git a/extension/js/common/platform/store/acct-store.ts b/extension/js/common/platform/store/acct-store.ts index 2a78478396f..136632c5bc9 100644 --- a/extension/js/common/platform/store/acct-store.ts +++ b/extension/js/common/platform/store/acct-store.ts @@ -38,7 +38,6 @@ export type AccountIndex = | 'full_name' | 'cryptup_enabled' | 'setup_done' - | 'successfully_received_at_leat_one_message' | 'notification_setup_done_seen' | 'picture' | 'outgoing_language' @@ -67,7 +66,6 @@ export type AcctStoreDict = { full_name?: string; cryptup_enabled?: boolean; setup_done?: boolean; - successfully_received_at_leat_one_message?: boolean; notification_setup_done_seen?: boolean; picture?: string; // google image outgoing_language?: 'EN' | 'DE'; From e319f30c9f93746f6f8c03331e3daaef8a204015 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 22 May 2023 12:22:56 +0100 Subject: [PATCH 080/147] minimize pgp_pubkey when outgoing message -- fixed and tested --- extension/chrome/elements/attachment.ts | 1 + extension/js/common/core/attachment.ts | 2 +- extension/js/common/message-renderer.ts | 14 ++- extension/js/common/xss-safe-factory.ts | 2 +- .../webmail/gmail-element-replacer.ts | 1 - .../message-export-1869220e0c8f16de.json | 105 ++++++++++++++++++ test/source/tests/decrypt.ts | 25 ++++- 7 files changed, 139 insertions(+), 11 deletions(-) create mode 100644 test/source/mock/google/exported-messages/message-export-1869220e0c8f16de.json diff --git a/extension/chrome/elements/attachment.ts b/extension/chrome/elements/attachment.ts index f57c6253f41..b1891a43a82 100644 --- a/extension/chrome/elements/attachment.ts +++ b/extension/chrome/elements/attachment.ts @@ -248,6 +248,7 @@ export class AttachmentDownloadView extends View { private processAsPublicKeyAndHideAttachmentIfAppropriate = async () => { // todo: we should call this detection in the main `core/Attachment.treatAs` (e.g. in the context of GmailElementReplacer and InboxActiveThreadModule) + // and we'll also be able to minimize the pgp_pubkey block if isOutgoing // should be possible after #4906 is done if (((this.attachment.msgId && this.attachment.id) || this.attachment.url) && this.attachment.isPublicKey()) { // this is encrypted public key - download && decrypt & parse & render diff --git a/extension/js/common/core/attachment.ts b/extension/js/common/core/attachment.ts index 5e5f4f3b91f..531bfd1b82b 100644 --- a/extension/js/common/core/attachment.ts +++ b/extension/js/common/core/attachment.ts @@ -125,7 +125,7 @@ export class Attachment { ); }; - /** @deprecated attachment and pgp_block frames won't be performing this analysis + /** @deprecated should be made private * */ public isPublicKey = (): boolean => { diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index c298adb3fc1..6b1f59a0d78 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -240,7 +240,7 @@ export class MessageRenderer { }; public isOutgoing = (senderEmail: string | undefined) => { - return Boolean(senderEmail && !!this.sendAs[senderEmail]); // todo: remove code duplication + return Boolean(senderEmail && !!this.sendAs[senderEmail]); }; public processAttachment = async ( @@ -291,7 +291,7 @@ export class MessageRenderer { loaderContext.prependEncryptedAttachment(a); return 'replaced'; // native should be hidden, custom should appear instead } else if (treatAs === 'encryptedMsg') { - await this.setMsgBodyAndStartProcessing(loaderContext, treatAs, messageInfo.printMailInfo, (renderModule, frameId) => + await this.setMsgBodyAndStartProcessing(loaderContext, treatAs, messageInfo.printMailInfo, senderEmail, (renderModule, frameId) => this.processEncryptedMessage(a, renderModule, frameId, senderEmail, messageInfo.isPwdMsgBasedOnMsgSnippet) ); return 'hidden'; // native attachment should be hidden, the "attachment" goes to the message container @@ -301,7 +301,7 @@ export class MessageRenderer { } else if (treatAs === 'privateKey') { return await this.renderBackupFromFile(a, loaderContext, this.isOutgoing(senderEmail)); } else if (treatAs === 'signature') { - await this.setMsgBodyAndStartProcessing(loaderContext, 'signedMsg', messageInfo.printMailInfo, renderModule => + await this.setMsgBodyAndStartProcessing(loaderContext, 'signedMsg', messageInfo.printMailInfo, senderEmail, renderModule => this.processSignedMessage(msgId, renderModule, senderEmail) ); return 'hidden'; // native attachment should be hidden, the "attachment" goes to the message container @@ -332,7 +332,7 @@ export class MessageRenderer { const signerEmail = from ? Str.parseEmail(from).email : undefined; await Promise.all( Object.entries(blocks).map(([frameId, block]) => - this.relayAndStartProcessing(relayManager, new LoaderContextBindNow(), factory, frameId, messageInfo.printMailInfo, renderModule => + this.relayAndStartProcessing(relayManager, new LoaderContextBindNow(), factory, frameId, messageInfo.printMailInfo, signerEmail, renderModule => this.renderMsgBlock(block, renderModule, signerEmail, messageInfo.isPwdMsgBasedOnMsgSnippet) ) ) @@ -517,6 +517,7 @@ export class MessageRenderer { factory: XssSafeFactory, frameId: string, printMailInfo: PrintMailInfo | undefined, + senderEmail: string | undefined, cb: (renderModule: RenderInterface, frameId: string) => Promise<{ publicKeys?: string[]; needPassphrase?: string[] }> ) => { const renderModule = relayManager.createRelay(frameId); @@ -529,7 +530,7 @@ export class MessageRenderer { const appendAfter = $(`iframe#${frameId}`); // todo: late binding? won't work // todo: how publicKeys and needPassphrase interact? for (const armoredPubkey of result.publicKeys ?? []) { - appendAfter.after(factory.embeddedPubkey(armoredPubkey, false)); + appendAfter.after(factory.embeddedPubkey(armoredPubkey, this.isOutgoing(senderEmail))); } while (result.needPassphrase) { // todo: queue into a dictionary? @@ -678,11 +679,12 @@ export class MessageRenderer { loaderContext: LoaderContextInterface, type: MsgBlockType, // for diagnostics printMailInfo: PrintMailInfo | undefined, + senderEmail: string | undefined, cb: (renderModule: RenderInterface, frameId: string) => Promise<{ publicKeys?: string[] }> ) => { const { frameId, frameXssSafe } = loaderContext.factory.embeddedRenderMsg(type); loaderContext.setMsgBody(frameXssSafe, 'set'); - await this.relayAndStartProcessing(this.relayManager, loaderContext, loaderContext.factory, frameId, printMailInfo, cb); + await this.relayAndStartProcessing(this.relayManager, loaderContext, loaderContext.factory, frameId, printMailInfo, senderEmail, cb); }; private processSignedMessage = async (msgId: string, renderModule: RenderInterface, senderEmail: string | undefined) => { diff --git a/extension/js/common/xss-safe-factory.ts b/extension/js/common/xss-safe-factory.ts index 3ae816185c3..5a29b3f956e 100644 --- a/extension/js/common/xss-safe-factory.ts +++ b/extension/js/common/xss-safe-factory.ts @@ -70,7 +70,7 @@ export class XssSafeFactory { } else if (block.type === 'privateKey') { return factory.embeddedBackup(PgpArmor.normalize(Str.with(block.content), 'privateKey')); } else if (block.type === 'certificate') { - return factory.embeddedPubkey(Str.with(block.content)); + return factory.embeddedPubkey(Str.with(block.content), isOutgoing); } else if (['encryptedAttachment', 'plainAttachment'].includes(block.type)) { return block.attachmentMeta ? factory.embeddedAttachment(new Attachment(block.attachmentMeta), block.type === 'encryptedAttachment') diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index f83c0265928..69d30a049e4 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -194,7 +194,6 @@ export class GmailElementReplacer implements WebmailElementReplacer { if (this.debug) { console.debug('replaceArmoredBlocks() for of emailsContainingPgpBlock -> emailContainer replaced'); } - // todo: const isOutgoing = !!this.sendAs[senderEmail]; this.messageRenderer .processInlineBlocks( this.relayManager, diff --git a/test/source/mock/google/exported-messages/message-export-1869220e0c8f16de.json b/test/source/mock/google/exported-messages/message-export-1869220e0c8f16de.json new file mode 100644 index 00000000000..0adec63e0e4 --- /dev/null +++ b/test/source/mock/google/exported-messages/message-export-1869220e0c8f16de.json @@ -0,0 +1,105 @@ +{ + "acctEmail": "ci.tests.gmail@flowcrypt.test", + "full": { + "id": "1869220e0c8f16de", + "threadId": "1869220e0c8f16de", + "labelIds": ["IMPORTANT", "CATEGORY_PERSONAL", "INBOX"], + "snippet": "-----BEGIN PGP MESSAGE----- Version: ProtonMail wV4DeWfgCtVtdnoSAQdAPNQhPJG8if4F6R6Dneng7TfppSVPQYHsKYCqoKKD 9W8wDO6xf08jS+Sn7QJcs/N/5so8bfppkTmx9xgEly5JIhwyrcIGp7R/ClN6 0hW9YzzB0sHjAeNkIAPLOMRhW+", + "payload": { + "partId": "", + "mimeType": "multipart/mixed", + "filename": "", + "headers": [ + { + "name": "Date", + "value": "Mon, 27 Feb 2023 09:07:46 +0000" + }, + { + "name": "To", + "value": "ci.tests.gmail@flowcrypt.dev" + }, + { + "name": "From", + "value": "ci.tests.gmail@flowcrypt.test" + }, + { + "name": "Subject", + "value": "Inline signed and encrypted" + }, + { + "name": "MIME-Version", + "value": "1.0" + }, + { + "name": "Content-Type", + "value": "multipart/mixed; boundary=\"b1_APtjrArD3xyvepenMGInm3lxJB3YfIvNBM8MvjwSkc0\"" + } + ], + "body": { + "size": 0 + }, + "parts": [ + { + "partId": "0", + "mimeType": "text/plain", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "text/plain; charset=utf-8" + }, + { + "name": "Content-Transfer-Encoding", + "value": "base64" + } + ], + "body": { + "size": 1154, + "data": "LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tDQpWZXJzaW9uOiBQcm90b25NYWlsDQoNCndWNERlV2ZnQ3RWdGRub1NBUWRBUE5RaFBKRzhpZjRGNlI2RG5lbmc3VGZwcFNWUFFZSHNLWUNxb0tLRA0KOVc4d0RPNnhmMDhqUytTbjdRSmNzL04vNXNvOGJmcHBrVG14OXhnRWx5NUpJaHd5cmNJR3A3Ui9DbE42DQowaFc5WXp6QjBzSGpBZU5rSUFQTE9NUmhXK0F2WW41aEx3UXphZWNBK0pmbXZIY0pzWlZESlNVbGxTNUUNCk9ENnBUdUtHb0tVUEF1RGdpbkF5cXVvRlI4WlFOSVFwUUk5ZUt5U2JXMXpWemNMWmVsMS9XeEZ4VWdXZQ0KTndFMHhRUWl2Kys4Z0FWcUQ1UkJEZDZGdjY5RlpCMVBNbHc1QmpDaTdpQnp3VXZzZ3UwVW1nZFErZ1ozDQplSTZXMkxSTVZYUUNEd0t3OTcxZDBMMWpxNmZEYmtLTklYVHVRbEY4b2xXeVRmd20zK3BYdmdidVFCdEkNCmhkaW9ndWEwcElEQkdQbDlScmdENFNUcjJnTUJFMk8yWWVJZG5NQVVWZE5ZelVSOUFxYkpnQm5NdTU2Lw0KOHJkcS9oTFpRWEpyL3hzdTVEeUgxbkd1Z1JLU0Y2dDVkSlpZSkQvN1hNNENKWkJ6OHZrWENjcTdtTmdSDQp3MWsrMGZZVUJjeXNxWFFNdTNOWlo5OVU0NHQxY25WcW9KNnowblFHSmJLZGhIditFQTMxU1VpV3lJQnANCmxWOUVnTmViM0s4TG9KUE9icGdqVWswTjJuS0JhRXl4UDhRZ2FDQ1psajV6ZDVYbEtFRE5IdUMzR2kyUw0KbkQvYmt4Y2ZsTkhsWkR2MGIxWEdNcUlCZExEalVXTUV2ZXdzR3VwdFRBQ25IazR4SDB6MWVRckNNT3pPDQphbHkrYWY4anRFMVo4NDBMbzJRb1U3M2VEUjdaVCtlV2hOQ1hYVDNSZ2w2VmVSRWRteVp2VG1FTXVPMkINCmluTG91MU1JeWxoc1lPZC9vVzcwUW9OcUtMU3EzRG9nOElNM2pqaGpNN0s0ZEZBVFF0cnVaWC9BVXFRSg0KNG00VDZRclBEL21lOFR5SzBRV1Y0UzREZGJhVVVxUVViUndKa2hIN0d6VGxmSDVHNnQycnFmaWRyczhjDQp4bkVtSXZvVUc3Wkp0UEFtWW9USlRDZ24zOHc2SWMxVElMTWZKRFlQMWZkYjI5S25lZXpOSHI1QkwzR08NCndmbTZ1aTM3VGZTNmMvaFI2WDEvalB6dDQ0R09Yb3l0N0RnaFgvVXFYcTJ0cDJjcjFBTUhRWlEwSXFxTA0KdUpEakVhWHZpOHFzZStvRGdTWityaDRQNEsrL01vS1phdUZwOUtrYjZjd0VEU2JvUkxZSFFOYkdOL25xDQpQZkJYN0hDN1N6dXoNCj1WUGd5DQotLS0tLUVORCBQR1AgTUVTU0FHRS0tLS0tDQo=" + } + }, + { + "partId": "1", + "mimeType": "application/octet-stream", + "filename": "0xA5140005.asc", + "headers": [ + { + "name": "Content-Type", + "value": "application/octet-stream; name=\"0xA5140005.asc\"" + }, + { + "name": "Content-Transfer-Encoding", + "value": "base64" + }, + { + "name": "Content-Disposition", + "value": "attachment; filename=\"0xA5140005.asc\"" + } + ], + "body": { + "attachmentId": "1869220e0c8f16de-part1", + "size": 3291 + } + } + ] + }, + "sizeEstimate": 11617, + "historyId": "2491473", + "internalDate": "1677488866000" + }, + "attachments": { + "1869220e0c8f16de-part1": { + "data": "LS0tLS1CRUdJTiBQR1AgUFVCTElDIEtFWSBCTE9DSy0tLS0tCgp4c0ZOQkdQOGIxSUJFQUN2WTk1bkVZRUZDOUpFZVA0NzVCWTRGSERaSzhITE5TTWJ4c2tRZGNSYXV3eXUKNEpyVm5Yb3UvOFFmdEtaejNheVVGbEswbVJ5NWFHZytEMW1jTjJFRHVmd0E3ZnVPb3dHWk1yOVdxeE9sCm1SK21YL0I3eWM4RmZNTHNIWjhrOVQzRncrcy9QbTR0dEdBaHVBSUpkMEx5bzZZTGdaVGFoL0hNK1MyOApQUUhFcGZPQWdtYk52YjdXYUxRd2gwb1RNR01Mb3NYSENoOE5PdlNXOVRTNHpCK2JNaEVuZkY1MytYTTUKUlVac0RRU3M4cDU5aXRjbjdrVTNMNDVDSzhWamc2UzQ5bWlHcFo2eFBESitmS04vWmhMelRrVDVhSFZ2Ck9qVUpMQ0NYcFluRzh1cVUvMXhYTGRBTk0xRk5LSFRrNEV1dUdpSEZBNlhZZWlQVnd4L2ROdytJdmVQUgpjYmd0a0dvTWZkZXQ0eXdmVWZyRnlkRlV1WEhmNTlYSm9hUzB0azNuVS9nUkMwZlJnZVN3ZFFhbVoxaXMKeEFzeXBydDlwUFNIbVZWQ3lGRU95Qk5ELzhsaWxCOFpMNS8xYmxPQmdyWkdqMXpNUm5VSkhEanM2VGtQCmhBcXc5ZEw2ais0cE4ybzNnalVGY2JQQng5TGZiZldicnFhWk1Xd2tEYi95c0E0cFNDZUxCbkdZSXc3OApoRExjaWpDZStSSkxsdTJzbkhmUnFjQ0kyd2FiK01NVUhDMTF4VHA1bHpBNHUwZW9xdWZwK0xPdWREWHoKemF3c2RqeitvalJ4ZjBZaUVkNGpZVmtJOS9xUDRXVmtPM1FtSlBOV3JEdzNYRGpTU3Z3cHo1ZWxyRTBsCjI0cE9IMXBHTE4vNkNEWnAwaDF3TnRMaEVBWDBhSWYva2N5cGp3QVJBUUFCelN0elkyaHNaVzFoZW14bApRSEJ5YjNSdmJpNXRaU0E4YzJOb2JHVnRZWHBzWlVCd2NtOTBiMjR1YldVK3dzR0tCQkFCQ0FBK0JRSmoKL0c5U0JBc0pCd2dKRUdGdFdXdkNCbDFJQXhVSUNnUVdBQUlCQWhrQkFoc0RBaDRCRmlFRXBSUUFCVmRTCnRFKzU2Z2lWWVcxWmE4SUdYVWdBQUpzVkVBQ0N3TzkwaC9qZldLMEtKMjAzejlmUm5EVCtpWDFhaFRFbgpJdnpzR1VYd281b3BUSzhrOGZ6L3daRE5sOWl0cmQ5YzY1ZldPa2VpVllNMGpESU54ZUV2aFR3SndUcVkKeWljK3lmbm5IOUVNSUJsVUNkMzZkaCt4SUsyR3dkbXRkcVlCRHd5S3pPcVdHUlFiM3pFOUk2YUhhakk3Cnl6YUp5eEVCTHYybXJOSWQyVnRyejEySmJKSnY0Uk80RHYzc1pQSm9KZmJrdVY1eGc2dUVVdElrOWFBTQppRGROVWhrdzNKdlBxL2NLbmg2QUFIUEJTeHhWOGRSWE9UZ0lnZjVuY29YTm9keUd0YnBQemlzN0h4eisKNUt3b3lma0R6UVl0QUtWcFhSbHloK0YwNkM1alVDVXZtb0Z4Wm9INDBPZlNCcEhLY3U0RUtxSUJoMjhiCm9JMG9meFFDSVd2TWlZa2NmWWVLam53ZzI1TWRwWXZhdHhTNE5RVmVnenEwRGhpVkVpc08wY0t0S2F3bgpWR1BYVFVzZXZHc3dJQ3NKQlM5RFJ2M0ZNa0dKSURxUjFTL0UyR1daYTMrVTZBNFR3UHJjbXpmWHZ6cVEKK3Z4UGRxMDNmTUV4SUhlWWxjbmV4eXBGVU45Sy9MdExnWEVHMzQvTFhYSTlnTkJqeWZZVXdqTFpBdWVoCllxc01xTTA1d2FKM1psZ2JaRXNlUEswTE1mUk85ZzZscTdMc0Z0QjBxMjh1NUl3SzZNN0Zub3g1YnpRcgpoSURYQUZwVTRydzdHV1dLRjcxVWp3OXI2UDhyWTBSY1JhVzJSR2xZOCt0UXZ4blNIY0svS2k2b3psV1EKQ3Y1YmxIdXIvRW1UTzluZU84NGRIc3BDOGQ1R2d3djhxREZSNWRlb2htL1RMbGtoM2M3QlRRUmovRzlTCkFSQUF2OEFaZHNad1d0eEU3K05NWCtDQXVyaEZ3dkl4ZURPanJYZTVMZUJoeklFVVZYa1ROSXBmL3VkcQpCZkgzNExjZW1tb0I2cFBucGF4UzBHcmcvYThGTGs3VFJVMldrdWNybmJUOG51djlHaWhKQ3l1Y0M5Q28KNVpvVm1Od0lGcnhhU2tDNW9RdnNRb3l0VXlrNVRKOTVlZ1RzN3Fjc0lDb3VDcGNJSmZNK3NlTnRwYzI2ClhEV1ZyZitMM0ZXR0s0N0xCRXhIaFVySWJnRWlVakxmSHdDR1pFUXNjdGZUSXM0VzJQSmhmRi9lZ2lQRQpERExoZldnRFFBcGxacnI2dlpsQ3dQbUd5NUpZallNcTR1MzYzKzllVS9wM2pCYUswa0pnM08xS3ZEeG4Kb20vcDRvdUE2NFVia0I2NWdCVzU4WENFQ1dHSmkrQXNLVTRubUJUWHU2RHVGWlVTZWRMbDdMRW1tRnZjCkFIZDVQcDlXRnZuN1VLYWU3cVpSZExUOFFEbFJ1dG4xSWlWUUxubG9jSTNkSFMxQXcwdXpiYzgra2RFOApTTmJEQlpZa0xiN2ViK2FMc1F0U2VnQ3UyMSt5SWZNT0JjQlNvUWE5dUIzTDlaQzF4dm9vR3pXS1djQ1AKakV5a1FjM2FrcUFDSEdBc1hYU09Xdmxmeng0ZHI5b0RRQVNvcWRRZFpiM2ozdkROcVlZSzAwQUp5UTlSCmN6aWM0dHFEbmdVWDhpblRTQXN3a2VRL04vWklUSTJZM2x3RDBLRi92WVRPU2w3U0swd1ZMSFp5NTROWApWaVpjdVJKd1l6cVBvQnBmajJJTEdUYTVvL1duVHpXQVFsK0hIbEQweFhoc0xDMEVleWlLTWtCaTBYLzAKTW9IcmRFdnd2alNWSUg3bUdvKzFoQzJQaXBFQUVRRUFBY0xCZGdRWUFRZ0FLZ1VDWS94dlVna1FZVzFaCmE4SUdYVWdDR3d3V0lRU2xGQUFGVjFLMFQ3bnFDSlZoYlZscndnWmRTQUFBbGZBUC8xTXN6T0toa29xUQpLNkpRSEt5ZkJ4WGsrTUtocDFUVEF3dHorMVgxT0FPa3JtLzBRaTlTOGtKVTFMTFFVWFFXQ05Bc1lNN0gKODRsTGZ1OVhUdUhtMzkvUWh1cFVManQxU0F6YzlIZnJpMDBpU2ZXQkI3ZGlKWDZVTWpSTU9BdU5waUorCi9uS084bTdRSnA2MXR2V2R4WUpVQVhvSjBuaVpzblhrMktrSkpIdGNlcVZGR0l1Vmp5RlpWelozWjJJMQpRVk9BOHJ4TVo5YlNwbmx6SkZiSGl5Rm1tQXhMam4wVXNyL3dES09QT3ViYVZndDMrVlZvbjZpNE1XUG4KQ2dKK0t5dVhJOE9tOTl2UkkzL2QvZkgwWnJCZUsxVnljOHYyVFRYdFpIdE93cHFjekRuMEpENHQrVi90CnY1MTJjTWVYR0hqWDFmMGJORGtlUko3Y3p5WDkyRmJ5TGhlUHVDZzNveEV2Qjd5a25TT3pPMEIvZ21HYQpyQ0JzM01sdGtFM2ZTOXA4aGFhc2pCWDFRTGRrUUFDNHZUMzFCSXJoeUZGYlF4bkJlRkd3L1BLMFJvZ2EKM2dVSDRXUmtZMjR4ZEo1Wk9rdGo3RjZ5NW1oeHY2OXhiYUpldDRXQi82TUdtMzZaYzlNMFQwdGNKbHJHClhUWEZFdy9Qd1JCMVFKbHVNL0t4bGlMMldjSFNwcjFyZ1JER0JtR0NPR1lZclBramlIdUJvM0pxc1ZtMApXTkE1c05RS3hnN1BPKzc4V2RLOW5EQ2w4WlZpbVdMb3daUjc3NkVoUThuQ3FuOGNraWs5WStBbEpMUVkKbVpqL25wNE5oaWZvYklqdzRNR2NmOGgyWU9xNmZXaGh5WlFLazFJT3hWdjB3Wm5xeWpjSHAzL0hxbEVxCmRVRGRsRE5HWWFNTgo9ZWZDbgotLS0tLUVORCBQR1AgUFVCTElDIEtFWSBCTE9DSy0tLS0t", + "size": 3291 + } + }, + "raw": { + "id": "1869220e0c8f16de", + "threadId": "1869220e0c8f16de", + "labelIds": ["IMPORTANT", "CATEGORY_PERSONAL", "INBOX"], + "snippet": "-----BEGIN PGP MESSAGE----- Version: ProtonMail wV4DeWfgCtVtdnoSAQdAPNQhPJG8if4F6R6Dneng7TfppSVPQYHsKYCqoKKD 9W8wDO6xf08jS+Sn7QJcs/N/5so8bfppkTmx9xgEly5JIhwyrcIGp7R/ClN6 0hW9YzzB0sHjAeNkIAPLOMRhW+", + "sizeEstimate": 11617, + "historyId": "2491473", + "internalDate": "1677488866000" + } +} diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index 5d70bb994e0..6a94be76c00 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -1253,7 +1253,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== let inboxPage = await browser.newExtensionInboxPage(t, acctEmail, threadId); await inboxPage.waitAll('iframe'); expect((await inboxPage.getFramesUrls(['pgp_render_block.htm'])).length).to.equal(1); - expect((await inboxPage.getFramesUrls(['pgp_pubkey.htm'])).length).to.equal(1); + expect((await inboxPage.getFrame(['pgp_pubkey.htm'])).isElementVisible('@action-add-contact')).to.be.true; expect((await inboxPage.getFramesUrls(['attachment.htm'])).length).to.equal(0); // invisible await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame(['pgp_render_block.htm']), { content: ['Sent with Proton Mail secure email.'], @@ -1273,7 +1273,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== inboxPage = await browser.newExtensionInboxPage(t, acctEmail, threadId); await inboxPage.waitAll('iframe'); expect((await inboxPage.getFramesUrls(['pgp_render_block.htm'])).length).to.equal(1); - expect((await inboxPage.getFramesUrls(['pgp_pubkey.htm'])).length).to.equal(1); + expect((await inboxPage.getFrame(['pgp_pubkey.htm'])).isElementVisible('@action-add-contact')).to.be.true; expect((await inboxPage.getFramesUrls(['attachment.htm'])).length).to.equal(0); // invisible await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame(['pgp_render_block.htm']), { content: ['Sent with Proton Mail secure email.'], @@ -1284,6 +1284,27 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== }) ); + test( + 'decrypt - public key is rendered minimized for outgoing messages', + testWithBrowser(async (t, browser) => { + const { acctEmail, authHdr } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'ci.tests.gmail'); + const threadId = '1869220e0c8f16de'; + const inboxPage = await browser.newExtensionInboxPage(t, acctEmail, threadId); + await inboxPage.waitAll('iframe'); + expect((await inboxPage.getFramesUrls(['pgp_render_block.htm'])).length).to.equal(1); + expect((await inboxPage.getFramesUrls(['attachment.htm'])).length).to.equal(0); // invisible + const pubkeyFrame1 = await inboxPage.getFrame(['pgp_pubkey.htm']); + expect(await pubkeyFrame1.isElementVisible('@action-add-contact')).to.be.false; // should be hidden because the sender matches acctEmail + await inboxPage.close(); + const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${threadId}`, undefined, authHdr); + await gmailPage.waitAll('iframe'); + expect((await gmailPage.getFramesUrls(['pgp_render_block.htm'])).length).to.equal(1); + expect((await gmailPage.getFramesUrls(['attachment.htm'])).length).to.equal(0); // invisible + const pubkeyFrame2 = await gmailPage.getFrame(['pgp_pubkey.htm']); + expect(await pubkeyFrame2.isElementVisible('@action-add-contact')).to.be.false; // should be hidden because the sender matches acctEmail + }) + ); + test( 'signature - cleartext signed messages from HTML are re-fetched when needed', testWithBrowser(async (t, browser) => { From 9019080930173e226009bf39560514ef343abc4a Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 22 May 2023 14:23:57 +0100 Subject: [PATCH 081/147] check origin of message --- extension/chrome/elements/pgp_render_block.ts | 3 +++ extension/chrome/settings/inbox/inbox.ts | 4 ++-- extension/js/common/browser/env.ts | 4 ++++ extension/js/common/core/const.ts | 1 + .../content_scripts/webmail/setup-webmail-content-script.ts | 3 +-- tooling/build-types-and-manifests.ts | 5 ++++- 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/extension/chrome/elements/pgp_render_block.ts b/extension/chrome/elements/pgp_render_block.ts index 1dfc387f616..c3077a190b4 100644 --- a/extension/chrome/elements/pgp_render_block.ts +++ b/extension/chrome/elements/pgp_render_block.ts @@ -10,6 +10,8 @@ import { PgpBaseBlockView } from './pgp_base_block_view.js'; import { RenderMessage } from '../../js/common/render-message.js'; import { Attachment } from '../../js/common/core/attachment.js'; import { Xss } from '../../js/common/platform/xss.js'; +import { GMAIL_PAGE_HOST } from '../../js/common/core/const.js'; +import { Env } from '../../js/common/browser/env.js'; export class PgpRenderBlockView extends PgpBaseBlockView { public constructor() { @@ -37,6 +39,7 @@ export class PgpRenderBlockView extends PgpBaseBlockView { }; private handleMessage = (event: MessageEvent) => { + if (!(new RegExp(`^http(s)?://${GMAIL_PAGE_HOST}$`).test(event.origin) || Env.getExtensionOriginRegExp().test(event.origin))) return; const data = event.data as RenderMessage; // todo: order better if (data?.renderEncryptionStatus) { diff --git a/extension/chrome/settings/inbox/inbox.ts b/extension/chrome/settings/inbox/inbox.ts index b61c567537a..ef2d70bd3ea 100644 --- a/extension/chrome/settings/inbox/inbox.ts +++ b/extension/chrome/settings/inbox/inbox.ts @@ -24,6 +24,7 @@ import { XssSafeFactory } from '../../../js/common/xss-safe-factory.js'; import { AcctStore, AcctStoreDict } from '../../../js/common/platform/store/acct-store.js'; import { RelayManager } from '../../../js/common/relay-manager.js'; import { MessageRenderer } from '../../../js/common/message-renderer.js'; +import { Env } from '../../../js/common/browser/env.js'; export class InboxView extends View { public readonly inboxMenuModule: InboxMenuModule; @@ -62,8 +63,7 @@ export class InboxView extends View { this.inboxActiveThreadModule = new InboxActiveThreadModule(this); this.inboxListThreadsModule = new InboxListThreadsModule(this); window.addEventListener('message', e => { - const regex = new RegExp(`^(chrome|moz)-extension://${chrome.runtime.id}$`); - if (regex.test(e.origin) && typeof e.data?.readyToReceive === 'string') { + if (Env.getExtensionOriginRegExp().test(e.origin) && typeof e.data?.readyToReceive === 'string') { this.relayManager.readyToReceive(e.data.readyToReceive); } }); diff --git a/extension/js/common/browser/env.ts b/extension/js/common/browser/env.ts index 8646daffd40..04b80f34748 100644 --- a/extension/js/common/browser/env.ts +++ b/extension/js/common/browser/env.ts @@ -20,6 +20,10 @@ export class Env { return undefined; }; + public static getExtensionOriginRegExp = () => { + return new RegExp(`^(chrome|moz)-extension://${chrome.runtime.id}$`); + }; + public static isContentScript = () => { return Env.isExtension() && window.location.href.indexOf(chrome.runtime.getURL('')) === -1; // extension but not on its own url }; diff --git a/extension/js/common/core/const.ts b/extension/js/common/core/const.ts index e0475aff902..99919ad1311 100644 --- a/extension/js/common/core/const.ts +++ b/extension/js/common/core/const.ts @@ -5,6 +5,7 @@ export const VERSION = '[BUILD_REPLACEABLE_VERSION]'; export const FLAVOR: 'consumer' | 'enterprise' = '[BUILD_REPLACEABLE_FLAVOR]' as unknown as 'consumer' | 'enterprise'; export const OAUTH_GOOGLE_API_HOST = '[BUILD_REPLACEABLE_OAUTH_GOOGLE_API_HOST]'; +export const GMAIL_PAGE_HOST = 'mail.google.com'; export const GMAIL_GOOGLE_API_HOST = '[BUILD_REPLACEABLE_GMAIL_GOOGLE_API_HOST]'; export const PEOPLE_GOOGLE_API_HOST = '[BUILD_REPLACEABLE_PEOPLE_GOOGLE_API_HOST]'; export const GOOGLE_OAUTH_SCREEN_HOST = '[BUILD_REPLACEABLE_GOOGLE_OAUTH_SCREEN_HOST]'; diff --git a/extension/js/content_scripts/webmail/setup-webmail-content-script.ts b/extension/js/content_scripts/webmail/setup-webmail-content-script.ts index 8f7d57baada..23dea2aa56f 100644 --- a/extension/js/content_scripts/webmail/setup-webmail-content-script.ts +++ b/extension/js/content_scripts/webmail/setup-webmail-content-script.ts @@ -431,8 +431,7 @@ export const contentScriptSetupIfVacant = async (webmailSpecific: WebmailSpecifi Catch.try(() => notifyExpiringKeys(acctEmail, clientConfiguration, notifications)) ); window.addEventListener('message', e => { - const regex = new RegExp(`^(chrome|moz)-extension://${chrome.runtime.id}$`); - if (regex.test(e.origin) && typeof e.data?.readyToReceive === 'string') { + if (Env.getExtensionOriginRegExp().test(e.origin) && typeof e.data?.readyToReceive === 'string') { relayManager.readyToReceive(e.data.readyToReceive); } }); diff --git a/tooling/build-types-and-manifests.ts b/tooling/build-types-and-manifests.ts index 5068fcaefb4..7559c84477a 100644 --- a/tooling/build-types-and-manifests.ts +++ b/tooling/build-types-and-manifests.ts @@ -114,6 +114,8 @@ const updateEnterpriseBuild = () => { const makeMockBuild = (sourceBuildType: string) => { const mockBuildType = `${sourceBuildType}-mock`; + const mockGmailPageHost = 'gmail.localhost:8001'; + const mockGmailPage = `https://${mockGmailPageHost}`; exec(`cp -r ${buildDir(sourceBuildType)} ${buildDir(mockBuildType)}`); const editor = (code: string) => { return code @@ -121,6 +123,7 @@ const makeMockBuild = (sourceBuildType: string) => { /const (OAUTH_GOOGLE_API_HOST|GMAIL_GOOGLE_API_HOST|PEOPLE_GOOGLE_API_HOST|GOOGLE_OAUTH_SCREEN_HOST) = [^;]+;/g, `const $1 = '${MOCK_HOST[sourceBuildType]}';` ) + .replace(/const (GMAIL_PAGE_HOST) = [^;]+;/g, `const $1 = '${mockGmailPageHost}';`) .replace(/const (BACKEND_API_HOST) = [^;]+;/g, `const $1 = 'https://localhost:8001/api/';`) .replace(/const (ATTESTER_API_HOST) = [^;]+;/g, `const $1 = 'https://localhost:8001/attester/';`) .replace(/const (KEYS_OPENPGP_ORG_API_HOST) = [^;]+;/g, `const $1 = 'https://localhost:8001/keys-openpgp-org/';`) @@ -131,7 +134,7 @@ const makeMockBuild = (sourceBuildType: string) => { edit(`${buildDir(mockBuildType)}/js/common/platform/catch.js`, editor); edit(`${buildDir(mockBuildType)}/js/content_scripts/webmail_bundle.js`, editor); edit(`${buildDir(mockBuildType)}/manifest.json`, code => - code.replace(/https:\/\/mail\.google\.com/g, 'https://gmail.localhost:8001').replace(/https:\/\/www\.google\.com/g, 'https://google.localhost:8001') + code.replace(/https:\/\/mail\.google\.com/g, mockGmailPage).replace(/https:\/\/www\.google\.com/g, 'https://google.localhost:8001') ); }; From 0fd350723f59064dbda22fe4bcfd39de51c57ca9 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 22 May 2023 14:44:17 +0100 Subject: [PATCH 082/147] fix: escaped strings for RegExp --- extension/chrome/elements/pgp_render_block.ts | 4 ++-- extension/js/common/browser/env.ts | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/extension/chrome/elements/pgp_render_block.ts b/extension/chrome/elements/pgp_render_block.ts index c3077a190b4..a06beb7f077 100644 --- a/extension/chrome/elements/pgp_render_block.ts +++ b/extension/chrome/elements/pgp_render_block.ts @@ -2,7 +2,7 @@ 'use strict'; -import { Url } from '../../js/common/core/common.js'; +import { Str, Url } from '../../js/common/core/common.js'; import { Assert } from '../../js/common/assert.js'; import { Ui } from '../../js/common/browser/ui.js'; import { View } from '../../js/common/view.js'; @@ -39,7 +39,7 @@ export class PgpRenderBlockView extends PgpBaseBlockView { }; private handleMessage = (event: MessageEvent) => { - if (!(new RegExp(`^http(s)?://${GMAIL_PAGE_HOST}$`).test(event.origin) || Env.getExtensionOriginRegExp().test(event.origin))) return; + if (!(new RegExp(`^http(s)?://${Str.regexEscape(GMAIL_PAGE_HOST)}$`).test(event.origin) || Env.getExtensionOriginRegExp().test(event.origin))) return; const data = event.data as RenderMessage; // todo: order better if (data?.renderEncryptionStatus) { diff --git a/extension/js/common/browser/env.ts b/extension/js/common/browser/env.ts index 04b80f34748..351d560a765 100644 --- a/extension/js/common/browser/env.ts +++ b/extension/js/common/browser/env.ts @@ -5,6 +5,8 @@ 'use strict'; +import { Str } from '../core/common.js'; + export type WebMailName = 'gmail' | 'outlook' | 'settings'; export type WebMailVersion = 'generic' | 'gmail2020' | 'gmail2022'; @@ -21,7 +23,7 @@ export class Env { }; public static getExtensionOriginRegExp = () => { - return new RegExp(`^(chrome|moz)-extension://${chrome.runtime.id}$`); + return new RegExp(`^(chrome|moz)-extension://${Str.regexEscape(chrome.runtime.id)}$`); }; public static isContentScript = () => { From 54e1ff5ed32831832b2974ea61013cde85e8fa43 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 22 May 2023 15:26:46 +0100 Subject: [PATCH 083/147] renamed to pgp_rendered_block to pgp_block --- .../chrome/elements/pgp_base_block_view.ts | 31 ------- .../{pgp_render_block.htm => pgp_block.htm} | 2 +- .../{pgp_render_block.ts => pgp_block.ts} | 36 ++++++-- .../pgp-block-attachmens-module.ts | 4 +- .../pgp-block-error-module.ts | 4 +- .../pgp-block-quote-module.ts | 4 +- .../pgp-block-render-module.ts | 4 +- extension/js/common/xss-safe-factory.ts | 2 +- extension/manifest.json | 1 - test/source/tests/compose.ts | 2 +- test/source/tests/decrypt.ts | 88 +++++++++---------- test/source/tests/gmail.ts | 16 ++-- .../tests/page-recipe/inbox-page-recipe.ts | 4 +- test/source/tests/settings.ts | 8 +- test/source/tests/tooling/browser-recipe.ts | 2 +- 15 files changed, 97 insertions(+), 111 deletions(-) delete mode 100644 extension/chrome/elements/pgp_base_block_view.ts rename extension/chrome/elements/{pgp_render_block.htm => pgp_block.htm} (96%) rename extension/chrome/elements/{pgp_render_block.ts => pgp_block.ts} (67%) diff --git a/extension/chrome/elements/pgp_base_block_view.ts b/extension/chrome/elements/pgp_base_block_view.ts deleted file mode 100644 index 842d9218704..00000000000 --- a/extension/chrome/elements/pgp_base_block_view.ts +++ /dev/null @@ -1,31 +0,0 @@ -/* ©️ 2016 - present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com */ - -'use strict'; - -import { View } from '../../js/common/view.js'; -import { PgpBlockViewAttachmentsModule } from './pgp_block_modules/pgp-block-attachmens-module.js'; -import { PgpBlockViewErrorModule } from './pgp_block_modules/pgp-block-error-module.js'; -import { PgpBlockViewPrintModule } from './pgp_block_modules/pgp-block-print-module.js'; -import { PgpBlockViewQuoteModule } from './pgp_block_modules/pgp-block-quote-module.js'; -import { PgpBlockViewRenderModule } from './pgp_block_modules/pgp-block-render-module.js'; - -export abstract class PgpBaseBlockView extends View { - public readonly quoteModule: PgpBlockViewQuoteModule; - public readonly renderModule: PgpBlockViewRenderModule; - public readonly attachmentsModule: PgpBlockViewAttachmentsModule; - public readonly errorModule: PgpBlockViewErrorModule; - public readonly printModule = new PgpBlockViewPrintModule(); - - public constructor( - public readonly debug: boolean, - public readonly parentTabId: string, - public readonly frameId: string, - public readonly acctEmail: string // needed for attachment decryption, probably should be refactored out - ) { - super(); - this.quoteModule = new PgpBlockViewQuoteModule(this); - this.renderModule = new PgpBlockViewRenderModule(this); - this.attachmentsModule = new PgpBlockViewAttachmentsModule(this); - this.errorModule = new PgpBlockViewErrorModule(this); - } -} diff --git a/extension/chrome/elements/pgp_render_block.htm b/extension/chrome/elements/pgp_block.htm similarity index 96% rename from extension/chrome/elements/pgp_render_block.htm rename to extension/chrome/elements/pgp_block.htm index c6659042175..5c31063f288 100644 --- a/extension/chrome/elements/pgp_render_block.htm +++ b/extension/chrome/elements/pgp_block.htm @@ -38,6 +38,6 @@ - + diff --git a/extension/chrome/elements/pgp_render_block.ts b/extension/chrome/elements/pgp_block.ts similarity index 67% rename from extension/chrome/elements/pgp_render_block.ts rename to extension/chrome/elements/pgp_block.ts index a06beb7f077..f36755d597a 100644 --- a/extension/chrome/elements/pgp_render_block.ts +++ b/extension/chrome/elements/pgp_block.ts @@ -6,23 +6,41 @@ import { Str, Url } from '../../js/common/core/common.js'; import { Assert } from '../../js/common/assert.js'; import { Ui } from '../../js/common/browser/ui.js'; import { View } from '../../js/common/view.js'; -import { PgpBaseBlockView } from './pgp_base_block_view.js'; import { RenderMessage } from '../../js/common/render-message.js'; import { Attachment } from '../../js/common/core/attachment.js'; import { Xss } from '../../js/common/platform/xss.js'; import { GMAIL_PAGE_HOST } from '../../js/common/core/const.js'; import { Env } from '../../js/common/browser/env.js'; +import { PgpBlockViewAttachmentsModule } from './pgp_block_modules/pgp-block-attachmens-module.js'; +import { PgpBlockViewErrorModule } from './pgp_block_modules/pgp-block-error-module.js'; +import { PgpBlockViewPrintModule } from './pgp_block_modules/pgp-block-print-module.js'; +import { PgpBlockViewQuoteModule } from './pgp_block_modules/pgp-block-quote-module.js'; +import { PgpBlockViewRenderModule } from './pgp_block_modules/pgp-block-render-module.js'; + +export class PgpBlockView extends View { + public readonly debug: boolean; + public readonly parentTabId: string; + public readonly frameId: string; + public readonly acctEmail: string; // needed for attachment decryption, probably should be refactored out + + public readonly quoteModule: PgpBlockViewQuoteModule; + public readonly renderModule: PgpBlockViewRenderModule; + public readonly attachmentsModule: PgpBlockViewAttachmentsModule; + public readonly errorModule: PgpBlockViewErrorModule; + public readonly printModule = new PgpBlockViewPrintModule(); -export class PgpRenderBlockView extends PgpBaseBlockView { public constructor() { + super(); Ui.event.protect(); + this.quoteModule = new PgpBlockViewQuoteModule(this); + this.renderModule = new PgpBlockViewRenderModule(this); + this.attachmentsModule = new PgpBlockViewAttachmentsModule(this); + this.errorModule = new PgpBlockViewErrorModule(this); const uncheckedUrlParams = Url.parse(['frameId', 'parentTabId', 'debug', 'acctEmail']); - super( - uncheckedUrlParams.debug === true, - Assert.urlParamRequire.string(uncheckedUrlParams, 'parentTabId'), - Assert.urlParamRequire.string(uncheckedUrlParams, 'frameId'), - Assert.urlParamRequire.string(uncheckedUrlParams, 'acctEmail') - ); + this.debug = uncheckedUrlParams.debug === true; + this.parentTabId = Assert.urlParamRequire.string(uncheckedUrlParams, 'parentTabId'); + this.frameId = Assert.urlParamRequire.string(uncheckedUrlParams, 'frameId'); + this.acctEmail = Assert.urlParamRequire.string(uncheckedUrlParams, 'acctEmail'); window.addEventListener('message', this.handleMessage, true); // todo: capture? window.addEventListener('load', () => window.parent.postMessage({ readyToReceive: this.frameId }, '*')); } @@ -92,4 +110,4 @@ export class PgpRenderBlockView extends PgpBaseBlockView { }; } -View.run(PgpRenderBlockView); +View.run(PgpBlockView); 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 800283bf425..6ea48a4cc26 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 @@ -6,7 +6,7 @@ import { Api } from '../../../js/common/api/shared/api.js'; import { Attachment } from '../../../js/common/core/attachment.js'; import { Browser } from '../../../js/common/browser/browser.js'; import { BrowserMsg } from '../../../js/common/browser/browser-msg.js'; -import { PgpBaseBlockView } from '../pgp_base_block_view.js'; +import { PgpBlockView } from '../pgp_block.js'; import { CommonHandlers, 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'; @@ -19,7 +19,7 @@ declare const filesize: { filesize: Function }; // eslint-disable-line @typescri export class PgpBlockViewAttachmentsModule { public includedAttachments: Attachment[] = []; - public constructor(private view: PgpBaseBlockView) {} + public constructor(private view: PgpBlockView) {} public getParentTabId = () => { return this.view.parentTabId; diff --git a/extension/chrome/elements/pgp_block_modules/pgp-block-error-module.ts b/extension/chrome/elements/pgp_block_modules/pgp-block-error-module.ts index fe50b7ff9de..c0075b4c06c 100644 --- a/extension/chrome/elements/pgp_block_modules/pgp-block-error-module.ts +++ b/extension/chrome/elements/pgp_block_modules/pgp-block-error-module.ts @@ -4,7 +4,7 @@ import { Browser } from '../../../js/common/browser/browser.js'; import { BrowserMsg } from '../../../js/common/browser/browser-msg.js'; -import { PgpBaseBlockView } from '../pgp_base_block_view.js'; +import { PgpBlockView } from '../pgp_block.js'; import { Ui } from '../../../js/common/browser/ui.js'; import { Xss } from '../../../js/common/platform/xss.js'; import { Str } from '../../../js/common/core/common.js'; @@ -12,7 +12,7 @@ import { Str } from '../../../js/common/core/common.js'; export class PgpBlockViewErrorModule { private debugId = Str.sloppyRandom(); - public constructor(private view: PgpBaseBlockView) {} + public constructor(private view: PgpBlockView) {} public renderErr = (errBoxContent: string, renderRawMsg: string | undefined, errMsg?: string) => { this.view.renderModule.setFrameColor('red'); diff --git a/extension/chrome/elements/pgp_block_modules/pgp-block-quote-module.ts b/extension/chrome/elements/pgp_block_modules/pgp-block-quote-module.ts index dc51b979c79..850f247ffae 100644 --- a/extension/chrome/elements/pgp_block_modules/pgp-block-quote-module.ts +++ b/extension/chrome/elements/pgp_block_modules/pgp-block-quote-module.ts @@ -4,10 +4,10 @@ import { Str } from '../../../js/common/core/common.js'; import { Xss } from '../../../js/common/platform/xss.js'; -import { PgpBaseBlockView } from '../pgp_base_block_view.js'; +import { PgpBlockView } from '../pgp_block.js'; export class PgpBlockViewQuoteModule { - public constructor(private view: PgpBaseBlockView) {} + public constructor(private view: PgpBlockView) {} public separateQuotedContentAndRenderText = (decryptedContent: string, isHtml: boolean) => { if (isHtml) { 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 9d0edf640d0..4e457df9346 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 @@ -7,14 +7,14 @@ import { Ui } from '../../../js/common/browser/ui.js'; import { Lang } from '../../../js/common/lang.js'; import { Catch } from '../../../js/common/platform/catch.js'; import { Xss } from '../../../js/common/platform/xss.js'; -import { PgpBaseBlockView } from '../pgp_base_block_view.js'; +import { PgpBlockView } from '../pgp_block.js'; export class PgpBlockViewRenderModule { public doNotSetStateAsReadyYet = false; private heightHist: number[] = []; - public constructor(private view: PgpBaseBlockView) {} + public constructor(private view: PgpBlockView) {} public renderText = (text: string) => { // eslint-disable-next-line @typescript-eslint/no-non-null-assertion diff --git a/extension/js/common/xss-safe-factory.ts b/extension/js/common/xss-safe-factory.ts index 5a29b3f956e..f63d828fa81 100644 --- a/extension/js/common/xss-safe-factory.ts +++ b/extension/js/common/xss-safe-factory.ts @@ -167,7 +167,7 @@ export class XssSafeFactory { const frameId = this.newId(); return { frameId, - frameSrc: this.frameSrc(this.extUrl('chrome/elements/pgp_render_block.htm'), { + frameSrc: this.frameSrc(this.extUrl('chrome/elements/pgp_block.htm'), { frameId, }), }; diff --git a/extension/manifest.json b/extension/manifest.json index 7d1b7fc67b0..757607ad905 100644 --- a/extension/manifest.json +++ b/extension/manifest.json @@ -81,7 +81,6 @@ "/img/logo/flowcrypt-logo-19-19.png", "/chrome/elements/compose.htm", "/chrome/elements/pgp_block.htm", - "/chrome/elements/pgp_render_block.htm", "/chrome/elements/setup_dialog.htm", "/chrome/elements/attachment.htm", "/chrome/elements/attachment_preview.htm", diff --git a/test/source/tests/compose.ts b/test/source/tests/compose.ts index a242481fe12..4d1b2a85aa7 100644 --- a/test/source/tests/compose.ts +++ b/test/source/tests/compose.ts @@ -3413,7 +3413,7 @@ const sendImgAndVerifyPresentInSentMsg = async (t: AvaContext, browser: BrowserH const authHdr = { Authorization: `Bearer ${accessToken}` }; // eslint-disable-line @typescript-eslint/naming-convention const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${sentMsg.id}`, undefined, authHdr); await gmailPage.waitAll('iframe'); - const pgpBlockPage = await gmailPage.getFrame(['pgp_render_block.htm']); + const pgpBlockPage = await gmailPage.getFrame(['pgp_block.htm']); const img = await pgpBlockPage.waitAny('body img'); expect(await PageRecipe.getElementPropertyJson(img, 'src')).to.eq(imgBase64); }; diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index df57437701a..71724ca1ed3 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -35,11 +35,11 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te const plainMessage = /-----BEGIN PGP MESSAGE-----.*This is not a valid PGP message/s; await inboxPage.waitForContent('@message-line', plainMessage); // expect no pgp blocks - expect((await inboxPage.getFramesUrls(['pgp_render_block.htm'])).length).to.equal(0); + expect((await inboxPage.getFramesUrls(['pgp_block.htm'])).length).to.equal(0); await inboxPage.close(); const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${msgId}`, undefined, authHdr); await gmailPage.waitForContent('.a3s', plainMessage); - expect((await gmailPage.getFramesUrls(['pgp_render_block.htm'])).length).to.equal(0); + expect((await gmailPage.getFramesUrls(['pgp_block.htm'])).length).to.equal(0); await gmailPage.close(); }) ); @@ -56,11 +56,11 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te const plainMessage = /An OpenPGP message starts with this header:\r?\n-----BEGIN PGP MESSAGE-----\r?\n\r?\nexample/s; await inboxPage.waitForContent('@message-line', plainMessage); // expect no pgp blocks - expect((await inboxPage.getFramesUrls(['pgp_render_block.htm'])).length).to.equal(0); + expect((await inboxPage.getFramesUrls(['pgp_block.htm'])).length).to.equal(0); await inboxPage.close(); const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${msgId}`, undefined, authHdr); await gmailPage.waitForContent('.a3s', plainMessage); - expect((await gmailPage.getFramesUrls(['pgp_render_block.htm'])).length).to.equal(0); + expect((await gmailPage.getFramesUrls(['pgp_block.htm'])).length).to.equal(0); await gmailPage.close(); }) ); @@ -73,7 +73,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitForSelTestState('ready'); await inboxPage.waitAll('iframe'); - const pgpBlock = await inboxPage.getFrame(['pgp_render_block.htm']); + const pgpBlock = await inboxPage.getFrame(['pgp_block.htm']); await pgpBlock.waitForContent('@remote-image-container', 'Authenticity of this remote image cannot be verified.'); await pgpBlock.checkIfImageIsDisplayedCorrectly('#pgp_block img'); // Chceck if forwarded message contains img url @@ -94,7 +94,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitForSelTestState('ready'); await inboxPage.waitAll('iframe'); - const pgpBlock = await inboxPage.getFrame(['pgp_render_block.htm']); + const pgpBlock = await inboxPage.getFrame(['pgp_block.htm']); await pgpBlock.waitForContent('@pgp-block-content', 'This message contains inline base64 image'); await pgpBlock.waitAll('#pgp_block img'); await pgpBlock.checkIfImageIsDisplayedCorrectly('#pgp_block img'); @@ -111,14 +111,14 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitForSelTestState('ready'); await inboxPage.waitAll('iframe'); - await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame(['pgp_render_block.htm']), { + await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame(['pgp_block.htm']), { encryption: 'not encrypted', content: [expectedContent], }); await inboxPage.close(); const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${threadId}`, undefined, authHdr); await gmailPage.waitAll('iframe'); - await BrowserRecipe.pgpBlockCheck(t, await gmailPage.getFrame(['pgp_render_block.htm']), { + await BrowserRecipe.pgpBlockCheck(t, await gmailPage.getFrame(['pgp_block.htm']), { encryption: 'not encrypted', content: [expectedContent], }); @@ -134,7 +134,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitForSelTestState('ready'); await inboxPage.waitAll('iframe'); - const pgpBlock = await inboxPage.getFrame(['pgp_render_block.htm']); + const pgpBlock = await inboxPage.getFrame(['pgp_block.htm']); await BrowserRecipe.pgpBlockCheck(t, pgpBlock, { encryption: 'encrypted', signature: 'signed', @@ -186,12 +186,12 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te expect(await inboxPage.isElementPresent('@container-attachments')).to.equal(true); await inboxPage.waitForContent('@message-line', 'Plain message'); // expect no pgp blocks - const urls = await inboxPage.getFramesUrls(['/chrome/elements/pgp_render_block.htm']); + const urls = await inboxPage.getFramesUrls(['/chrome/elements/pgp_block.htm']); expect(urls.length).to.equal(0); await inboxPage.close(); const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${threadId}`, undefined, authHdr); await gmailPage.waitForContent('.a3s', 'Plain message'); - expect((await gmailPage.getFramesUrls(['pgp_render_block.htm'])).length).to.equal(0); + expect((await gmailPage.getFramesUrls(['pgp_block.htm'])).length).to.equal(0); await gmailPage.close(); }) ); @@ -607,7 +607,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te expectPercentageProgress: true, }; const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${msgId}`); - await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame(['pgp_render_block.htm']), expectedMessage); + await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame(['pgp_block.htm']), expectedMessage); await inboxPage.close(); await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, msgId, expectedMessage, authHdr); }) @@ -947,7 +947,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== const { acctEmail } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'compatibility'); const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitAll('iframe'); - const pgpBlock = await inboxPage.getFrame(['pgp_render_block.htm']); + const pgpBlock = await inboxPage.getFrame(['pgp_block.htm']); await pgpBlock.waitForSelTestState('ready'); await pgpBlock.checkIfImageIsDisplayedCorrectly('#pgp_block img'); const replyFrame = await inboxPage.getFrame(['compose.htm']); @@ -963,7 +963,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== const { acctEmail } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'compatibility'); const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitAll('iframe'); - const pgpBlock = await inboxPage.getFrame(['pgp_render_block.htm']); + const pgpBlock = await inboxPage.getFrame(['pgp_block.htm']); await pgpBlock.waitForSelTestState('ready'); const urls = await inboxPage.getFramesUrls(['pgp_pubkey.htm'], { sleep: 3 }); expect(urls.length).to.be.lessThan(2); @@ -979,7 +979,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== // todo: test mock gmail page const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitAll('iframe'); - const pgpBlock = await inboxPage.getFrame(['pgp_render_block.htm']); + const pgpBlock = await inboxPage.getFrame(['pgp_block.htm']); await pgpBlock.waitForSelTestState('ready'); const printPage = await browser.newPageTriggeredBy(t, () => pgpBlock.click('@action-print')); await printPage.waitForContent('@print-user-email', 'First Last '); @@ -998,7 +998,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== const { authHdr, acctEmail } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'compatibility'); const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitAll('iframe'); - const pgpBlock = await inboxPage.getFrame(['pgp_render_block.htm']); + const pgpBlock = await inboxPage.getFrame(['pgp_block.htm']); await pgpBlock.waitForSelTestState('ready'); const expectedMessage = { signature: 'could not verify signature: missing pubkey 203FAE7076005381', @@ -1011,7 +1011,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== await inboxPage.close(); const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${threadId}`, undefined, authHdr); await gmailPage.waitAll('iframe'); - const pgpBlockFromGmailPage = await gmailPage.getFrame(['pgp_render_block.htm']); + const pgpBlockFromGmailPage = await gmailPage.getFrame(['pgp_block.htm']); await pgpBlockFromGmailPage.waitForSelTestState('ready'); await BrowserRecipe.pgpBlockCheck(t, pgpBlockFromGmailPage, expectedMessage); const frameUrlsFromGmailPage = await gmailPage.getFramesUrls(['pgp_pubkey.htm'], { sleep: 3 }); @@ -1026,7 +1026,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== const { acctEmail } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'ci.tests.gmail'); const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitAll('iframe'); - const pgpBlock = await inboxPage.getFrame(['pgp_render_block.htm']); + const pgpBlock = await inboxPage.getFrame(['pgp_block.htm']); await pgpBlock.waitForSelTestState('ready'); const urls = await inboxPage.getFramesUrls(['pgp_pubkey.htm'], { sleep: 3 }); expect(urls.length).to.be.equal(1); @@ -1041,7 +1041,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== const threadId = '17dad75e63e47f97'; const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitAll('iframe', { timeout: 2 }); - const urls = await inboxPage.getFramesUrls(['/chrome/elements/pgp_render_block.htm'], { sleep: 10, appearIn: 20 }); + const urls = await inboxPage.getFramesUrls(['/chrome/elements/pgp_block.htm'], { sleep: 10, appearIn: 20 }); expect(urls.length).to.equal(1); await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame([urls[0]]), { content: ['1234'], @@ -1063,7 +1063,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== delayInSeconds: 5, }; const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${msgId}`, undefined, authHdr); - const pgpBlockPage = await gmailPage.getFrame(['pgp_render_block.htm']); + const pgpBlockPage = await gmailPage.getFrame(['pgp_block.htm']); await pgpBlockPage.waitForContent('@pgp-block-content', '1234', 4, 10); await pgpBlockPage.waitForContent('@pgp-signature', 'verifying signature...', 3, 10); await pgpBlockPage.waitForContent('@pgp-signature', 'signed', 10, 10); @@ -1084,7 +1084,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== const threadId = '17dad75e63e47f97'; const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitAll('iframe', { timeout: 2 }); - const urls = await inboxPage.getFramesUrls(['/chrome/elements/pgp_render_block.htm'], { sleep: 10, appearIn: 20 }); + const urls = await inboxPage.getFramesUrls(['/chrome/elements/pgp_block.htm'], { sleep: 10, appearIn: 20 }); expect(urls.length).to.equal(1); await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame([urls[0]]), { content: ['1234'], @@ -1151,13 +1151,13 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== const { acctEmail, authHdr } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'compatibility'); const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitAll('iframe'); - const urls = await inboxPage.getFramesUrls(['/chrome/elements/pgp_render_block.htm'], { sleep: 3 }); + const urls = await inboxPage.getFramesUrls(['/chrome/elements/pgp_block.htm'], { sleep: 3 }); expect(urls.length).to.equal(1); await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame([urls[0]]), expectedMessage); await inboxPage.close(); const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${threadId}`, undefined, authHdr); await gmailPage.waitAll('iframe', { timeout: 2 }); - const frameUrlsFromGmailPage = await gmailPage.getFramesUrls(['/chrome/elements/pgp_render_block.htm'], { sleep: 10, appearIn: 20 }); + const frameUrlsFromGmailPage = await gmailPage.getFramesUrls(['/chrome/elements/pgp_block.htm'], { sleep: 10, appearIn: 20 }); expect(frameUrlsFromGmailPage.length).to.equal(1); await BrowserRecipe.pgpBlockCheck(t, await gmailPage.getFrame([frameUrlsFromGmailPage[0]]), expectedMessage); }) @@ -1174,9 +1174,9 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== // todo: test with gmail mock page const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitAll('iframe', { timeout: 2 }); - const urls = await inboxPage.getFramesUrls(['/chrome/elements/pgp_render_block.htm'], { sleep: 10, appearIn: 20 }); + const urls = await inboxPage.getFramesUrls(['/chrome/elements/pgp_block.htm'], { sleep: 10, appearIn: 20 }); expect(urls.length).to.equal(1); - await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame(['pgp_render_block.htm']), { + await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame(['pgp_block.htm']), { content: ['How is my message signed?'], encryption: 'not encrypted', signature: 'signed', @@ -1202,7 +1202,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== // todo: make sure pubkey2864E326A5BE488A isn't present in ContactStore yet const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${threadId}`, undefined, authHdr); await gmailPage.waitAll('iframe', { timeout: 2 }); - const frameUrlsFromGmailPage = await gmailPage.getFramesUrls(['/chrome/elements/pgp_render_block.htm'], { sleep: 10, appearIn: 20 }); + const frameUrlsFromGmailPage = await gmailPage.getFramesUrls(['/chrome/elements/pgp_block.htm'], { sleep: 10, appearIn: 20 }); expect(frameUrlsFromGmailPage.length).to.equal(1); const expectedMessage = { content: ['How is my message signed?'], @@ -1214,7 +1214,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== // todo: remove pubkey2864E326A5BE488A from ContactStore const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitAll('iframe', { timeout: 2 }); - const urls = await inboxPage.getFramesUrls(['/chrome/elements/pgp_render_block.htm'], { sleep: 10, appearIn: 20 }); + const urls = await inboxPage.getFramesUrls(['/chrome/elements/pgp_block.htm'], { sleep: 10, appearIn: 20 }); expect(urls.length).to.equal(1); await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame([urls[0]]), expectedMessage); }) @@ -1235,7 +1235,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== await dbPage.close(); const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/1869220e0c8f16dd`, undefined, authHdr); await gmailPage.waitAll('iframe'); - const pgpBlock = await gmailPage.getFrame(['pgp_render_block.htm']); + const pgpBlock = await gmailPage.getFrame(['pgp_block.htm']); await BrowserRecipe.pgpBlockCheck(t, pgpBlock, { content: ['Sent with Proton Mail secure email.'], encryption: 'encrypted', @@ -1252,10 +1252,10 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== const threadId = '1869220e0c8f16dd'; let inboxPage = await browser.newExtensionInboxPage(t, acctEmail, threadId); await inboxPage.waitAll('iframe'); - expect((await inboxPage.getFramesUrls(['pgp_render_block.htm'])).length).to.equal(1); + expect((await inboxPage.getFramesUrls(['pgp_block.htm'])).length).to.equal(1); expect(await (await inboxPage.getFrame(['pgp_pubkey.htm'])).isElementVisible('@action-add-contact')).to.be.true; expect((await inboxPage.getFramesUrls(['attachment.htm'])).length).to.equal(0); // invisible - await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame(['pgp_render_block.htm']), { + await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame(['pgp_block.htm']), { content: ['Sent with Proton Mail secure email.'], encryption: 'encrypted', signature: 'could not verify signature: missing pubkey 616D596BC2065D48', @@ -1272,10 +1272,10 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== await dbPage.close(); inboxPage = await browser.newExtensionInboxPage(t, acctEmail, threadId); await inboxPage.waitAll('iframe'); - expect((await inboxPage.getFramesUrls(['pgp_render_block.htm'])).length).to.equal(1); + expect((await inboxPage.getFramesUrls(['pgp_block.htm'])).length).to.equal(1); expect(await (await inboxPage.getFrame(['pgp_pubkey.htm'])).isElementVisible('@action-add-contact')).to.be.true; expect((await inboxPage.getFramesUrls(['attachment.htm'])).length).to.equal(0); // invisible - await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame(['pgp_render_block.htm']), { + await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame(['pgp_block.htm']), { content: ['Sent with Proton Mail secure email.'], encryption: 'encrypted', signature: 'signed', @@ -1291,14 +1291,14 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== const threadId = '1869220e0c8f16de'; const inboxPage = await browser.newExtensionInboxPage(t, acctEmail, threadId); await inboxPage.waitAll('iframe'); - expect((await inboxPage.getFramesUrls(['pgp_render_block.htm'])).length).to.equal(1); + expect((await inboxPage.getFramesUrls(['pgp_block.htm'])).length).to.equal(1); expect((await inboxPage.getFramesUrls(['attachment.htm'])).length).to.equal(0); // invisible const pubkeyFrame1 = await inboxPage.getFrame(['pgp_pubkey.htm']); expect(await pubkeyFrame1.isElementVisible('@action-add-contact')).to.be.false; // should be hidden because the sender matches acctEmail await inboxPage.close(); const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${threadId}`, undefined, authHdr); await gmailPage.waitAll('iframe'); - expect((await gmailPage.getFramesUrls(['pgp_render_block.htm'])).length).to.equal(1); + expect((await gmailPage.getFramesUrls(['pgp_block.htm'])).length).to.equal(1); expect((await gmailPage.getFramesUrls(['attachment.htm'])).length).to.equal(0); // invisible const pubkeyFrame2 = await gmailPage.getFrame(['pgp_pubkey.htm']); expect(await pubkeyFrame2.isElementVisible('@action-add-contact')).to.be.false; // should be hidden because the sender matches acctEmail @@ -1313,7 +1313,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== await settingsPage.close(); const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/1866867cfdb8b61e`, undefined, authHdr); await gmailPage.waitAll('iframe'); - const pgpBlocks = await Promise.all((await gmailPage.getFramesUrls(['pgp_render_block.htm'])).map(url => gmailPage.getFrame([url]))); + const pgpBlocks = await Promise.all((await gmailPage.getFramesUrls(['pgp_block.htm'])).map(url => gmailPage.getFrame([url]))); expect(pgpBlocks.length).to.equal(3); await BrowserRecipe.pgpBlockCheck(t, pgpBlocks[0], { content: ['this is message 3 for flowcrypt issue 4342'], @@ -1379,7 +1379,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== t.mockApi!.configProvider!.config.attester!.pubkeyLookup![signerEmail] = { pubkey: await get203FAE7076005381() }; const inboxPage = await browser.newExtensionInboxPage(t, acctEmail, msgId); await inboxPage.waitAll('iframe'); - await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame(['pgp_render_block.htm']), { + await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame(['pgp_block.htm']), { content: ['1234'], encryption: 'not encrypted', signature: 'signed', @@ -1524,7 +1524,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'compatibility'); const inboxPage = await browser.newPage(t, 'chrome/settings/inbox/inbox.htm?acctEmail=flowcrypt.compatibility%40gmail.com&threadId=16f0bfce331ca2fd'); await inboxPage.waitAll('iframe.pgp_block'); - const pgpBlock = await inboxPage.getFrame(['pgp_render_block.htm']); + const pgpBlock = await inboxPage.getFrame(['pgp_block.htm']); await pgpBlock.waitForSelTestState('ready'); const content = await pgpBlock.read('#pgp_block'); expect(content).to.include( @@ -1539,7 +1539,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'compatibility'); const inboxPage = await browser.newPage(t, 'chrome/settings/inbox/inbox.htm?acctEmail=flowcrypt.compatibility%40gmail.com&threadId=1762c9a49bedbf6f'); await inboxPage.waitAll('iframe.pgp_block'); - const pgpBlock = await inboxPage.getFrame(['pgp_render_block.htm']); + const pgpBlock = await inboxPage.getFrame(['pgp_block.htm']); await pgpBlock.waitForSelTestState('ready'); const htmlContent = await pgpBlock.readHtml('#pgp_block'); expect(htmlContent).to.include('rel="noopener noreferrer"'); @@ -1552,7 +1552,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'compatibility'); const inboxPage = await browser.newPage(t, 'chrome/settings/inbox/inbox.htm?acctEmail=flowcrypt.compatibility%40gmail.com&threadId=1762c9a49bedbf6f'); await inboxPage.waitAll('iframe.pgp_block'); - const pgpBlock = await inboxPage.getFrame(['pgp_render_block.htm']); + const pgpBlock = await inboxPage.getFrame(['pgp_block.htm']); await pgpBlock.waitForSelTestState('ready'); await pgpBlock.click('#pgp_block a'); await Util.sleep(5); @@ -1602,7 +1602,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== const { acctEmail } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'compatibility'); const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId1}`); await inboxPage.waitAll('iframe'); - const pgpBlock = await inboxPage.getFrame(['pgp_render_block.htm']); + const pgpBlock = await inboxPage.getFrame(['pgp_block.htm']); await pgpBlock.waitForSelTestState('ready'); await pgpBlock.waitForContent('@pgp-block-content', '[skipped attachment due to invalid url]'); await pgpBlock.notPresent(['.preview-attachment', '@download-attachment-0']); @@ -1656,7 +1656,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== const expectedErrMsg = 'This executable file was not checked for viruses, and may be dangerous to download or run. Proceed anyway?'; const { acctEmail, authHdr } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'compatibility'); const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); - const pgpBlockPage = await inboxPage.getFrame(['pgp_render_block.htm']); + const pgpBlockPage = await inboxPage.getFrame(['pgp_block.htm']); await pgpBlockPage.waitAndClick('@download-attachment-0'); // check warning modal for inline encrypted attachment on FlowCrypt web extension page const downloadedFile1 = await inboxPage.awaitDownloadTriggeredByClicking(() => @@ -1678,7 +1678,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== expect(Object.entries([downloadedFile1, downloadedFile2]).length).to.equal(2); await inboxPage.close(); const inboxPage2 = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId2}`); - const pgpBlockPage2 = await inboxPage2.getFrame(['pgp_render_block.htm']); + const pgpBlockPage2 = await inboxPage2.getFrame(['pgp_block.htm']); // todo: glitch? it shows "not encrypted" and "not signed" await pgpBlockPage2.waitAndClick('@download-attachment-0'); // check warning modal for inline signed attachment on FlowCrypt web extension page @@ -1692,7 +1692,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== await inboxPage2.close(); const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${threadId}`, undefined, authHdr); await gmailPage.waitAll('iframe'); - const pgpBlockPage3 = await gmailPage.getFrame(['pgp_render_block.htm']); + const pgpBlockPage3 = await gmailPage.getFrame(['pgp_block.htm']); await pgpBlockPage3.waitAndClick('@download-attachment-0'); // check warning modal for inline encrypted attachment test on Gmail page const downloadedFile4 = await gmailPage.awaitDownloadTriggeredByClicking(() => @@ -1715,7 +1715,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== expect(Object.entries([downloadedFile4, downloadedFile5]).length).to.equal(2); await gmailPage.close(); const gmailPage2 = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${threadId2}`, undefined, authHdr); - const pgpBlockPage4 = await gmailPage2.getFrame(['pgp_render_block.htm']); + const pgpBlockPage4 = await gmailPage2.getFrame(['pgp_block.htm']); // todo: glitch? it shows "not encrypted" and "not signed" await pgpBlockPage4.waitAndClick('@download-attachment-0'); // check warning modal for inline signed attachment test on Gmail page diff --git a/test/source/tests/gmail.ts b/test/source/tests/gmail.ts index 2feae588cc2..9533e9858a7 100644 --- a/test/source/tests/gmail.ts +++ b/test/source/tests/gmail.ts @@ -133,7 +133,7 @@ export const defineGmailTests = (testVariant: TestVariant, testWithBrowser: Test await gmailPage.waitAndClick('[aria-label^="Inbox"]'); await gmailPage.waitAndClick('[role="row"]'); // click the first message await gmailPage.waitForContent('.nH h2.hP', `Automated puppeteer test: ${subject}`); - const urls = await gmailPage.getFramesUrls(['/chrome/elements/pgp_render_block.htm'], { sleep: 1 }); + const urls = await gmailPage.getFramesUrls(['/chrome/elements/pgp_block.htm'], { sleep: 1 }); await GmailPageRecipe.deleteThread(gmailPage); expect(urls.length).to.eq(1); }) @@ -146,11 +146,11 @@ export const defineGmailTests = (testVariant: TestVariant, testWithBrowser: Test const gmailPage = await openGmailPage(t, browser); await gotoGmailPage(gmailPage, '/FMfcgzGkbDWztBnnCgRHzjrvmFqLtcJD'); const expectedMessage = { content: ['this should decrypt even offline'], signature: 'signed', encryption: 'encrypted' }; - await BrowserRecipe.pgpBlockCheck(t, await gmailPage.getFrame(['/chrome/elements/pgp_render_block.htm'], { sleep: 10, timeout: 25 }), expectedMessage); + await BrowserRecipe.pgpBlockCheck(t, await gmailPage.getFrame(['/chrome/elements/pgp_block.htm'], { sleep: 10, timeout: 25 }), expectedMessage); await gotoGmailPage(gmailPage, '/FMfcgzGkbDRNgcQxLmkhBCKVSFwkfdvV'); // plain convo await gmailPage.page.setOfflineMode(true); // go offline mode await gmailPage.page.goBack({ waitUntil: 'load' }); - await BrowserRecipe.pgpBlockCheck(t, await gmailPage.getFrame(['/chrome/elements/pgp_render_block.htm']), expectedMessage); + await BrowserRecipe.pgpBlockCheck(t, await gmailPage.getFrame(['/chrome/elements/pgp_block.htm']), expectedMessage); }) ); @@ -172,9 +172,9 @@ export const defineGmailTests = (testVariant: TestVariant, testWithBrowser: Test await BrowserRecipe.setUpCommonAcct(t, browser, 'ci.tests.gmail'); const gmailPage = await openGmailPage(t, browser); await gotoGmailPage(gmailPage, '/QgrcJHrtqfgLGKqwChjKsHKzZQpwRHMBqpG'); - const urls = await gmailPage.getFramesUrls(['/chrome/elements/pgp_render_block.htm'], { sleep: 10, appearIn: 25 }); + const urls = await gmailPage.getFramesUrls(['/chrome/elements/pgp_block.htm'], { sleep: 10, appearIn: 25 }); expect(urls.length).to.equal(1); - const pgpBlockFrame = await gmailPage.getFrame(['pgp_render_block.htm']); + const pgpBlockFrame = await gmailPage.getFrame(['pgp_block.htm']); await BrowserRecipe.pgpBlockCheck(t, pgpBlockFrame, { content: ['test that content from msg.asc renders'], encryption: 'encrypted', @@ -191,7 +191,7 @@ export const defineGmailTests = (testVariant: TestVariant, testWithBrowser: Test const gmailPage = await openGmailPage(t, browser); await gotoGmailPage(gmailPage, '/FMfcgzGkbDZKPJrNLplXZhKfWwtgjrXt'); // validate pgp_block.htm is rendered - const pgpBlockUrls = await gmailPage.getFramesUrls(['/chrome/elements/pgp_render_block.htm'], { + const pgpBlockUrls = await gmailPage.getFramesUrls(['/chrome/elements/pgp_block.htm'], { sleep: 10, appearIn: 25, }); @@ -217,7 +217,7 @@ export const defineGmailTests = (testVariant: TestVariant, testWithBrowser: Test const gmailPage = await openGmailPage(t, browser); await gotoGmailPage(gmailPage, '/FMfcgzGkbDZKPKzSnGtGKZrPZSbTBNnB'); // validate pgp_block.htm is rendered - const pgpBlockUrls = await gmailPage.getFramesUrls(['/chrome/elements/pgp_render_block.htm'], { + const pgpBlockUrls = await gmailPage.getFramesUrls(['/chrome/elements/pgp_block.htm'], { sleep: 10, appearIn: 25, }); @@ -242,7 +242,7 @@ export const defineGmailTests = (testVariant: TestVariant, testWithBrowser: Test await BrowserRecipe.setUpCommonAcct(t, browser, 'ci.tests.gmail'); const gmailPage = await openGmailPage(t, browser); await gotoGmailPage(gmailPage, '/FMfcgzGkbDZKPLBqWFzbgWqCrplTQdNz'); - const pgpBlockFrame = await gmailPage.getFrame(['pgp_render_block.htm'], { sleep: 10, timeout: 25 }); + const pgpBlockFrame = await gmailPage.getFrame(['pgp_block.htm'], { sleep: 10, timeout: 25 }); await BrowserRecipe.pgpBlockCheck(t, pgpBlockFrame, { content: ['Encrypted Subject: [ci.test] Thunderbird html signed + encrypted', '1234'], encryption: 'encrypted', diff --git a/test/source/tests/page-recipe/inbox-page-recipe.ts b/test/source/tests/page-recipe/inbox-page-recipe.ts index 50d0776cd96..bebebc44b3e 100644 --- a/test/source/tests/page-recipe/inbox-page-recipe.ts +++ b/test/source/tests/page-recipe/inbox-page-recipe.ts @@ -35,7 +35,7 @@ export class InboxPageRecipe extends PageRecipe { await InboxPageRecipe.finishSessionOnInboxPage(inboxPage); await inboxPage.waitAll('iframe'); } - const pgpBlockFrame = await inboxPage.getFrame(['pgp_render_block.htm']); + const pgpBlockFrame = await inboxPage.getFrame(['pgp_block.htm']); await pgpBlockFrame.waitAll('@pgp-block-content'); await pgpBlockFrame.waitForSelTestState('ready'); if (enterPp) { @@ -79,7 +79,7 @@ export class InboxPageRecipe extends PageRecipe { const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await InboxPageRecipe.finishSessionOnInboxPage(inboxPage); await inboxPage.waitAll('iframe'); - const pgpBlockFrame = await inboxPage.getFrame(['pgp_render_block.htm']); + const pgpBlockFrame = await inboxPage.getFrame(['pgp_block.htm']); await pgpBlockFrame.waitAll('@pgp-block-content'); await pgpBlockFrame.waitForSelTestState('ready'); await pgpBlockFrame.waitAndClick('@action-show-passphrase-dialog', { delay: 1 }); diff --git a/test/source/tests/settings.ts b/test/source/tests/settings.ts index 1b3f863d296..8edd2df38ec 100644 --- a/test/source/tests/settings.ts +++ b/test/source/tests/settings.ts @@ -748,7 +748,7 @@ export const defineSettingsTests = (testVariant: TestVariant, testWithBrowser: T const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitForSelTestState('ready'); await inboxPage.waitAll('iframe'); - expect((await inboxPage.getFramesUrls(['pgp_render_block.htm'])).length).to.equal(1); + expect((await inboxPage.getFramesUrls(['pgp_block.htm'])).length).to.equal(1); expect(await inboxPage.read('@message-line')).to.not.contain('BEGIN'); expect(await inboxPage.read('@see-original')).to.equal('SEE ORIGINAL'); @@ -757,7 +757,7 @@ export const defineSettingsTests = (testVariant: TestVariant, testWithBrowser: T await inboxPage.waitForSelTestState('ready'); await inboxPage.waitAll('iframe'); // expect no pgp blocks - expect((await inboxPage.getFramesUrls(['pgp_render_block.htm'])).length).to.equal(0); + expect((await inboxPage.getFramesUrls(['pgp_block.htm'])).length).to.equal(0); expect(await inboxPage.read('@message-line')).to.contain('BEGIN'); expect(await inboxPage.read('@see-original')).to.equal('SEE DECRYPTED'); @@ -765,7 +765,7 @@ export const defineSettingsTests = (testVariant: TestVariant, testWithBrowser: T await inboxPage.waitForNavigationIfAny(() => inboxPage.waitAndClick('@see-original')); await inboxPage.waitForSelTestState('ready'); await inboxPage.waitAll('iframe'); - expect((await inboxPage.getFramesUrls(['pgp_render_block.htm'])).length).to.equal(1); + expect((await inboxPage.getFramesUrls(['pgp_block.htm'])).length).to.equal(1); expect(await inboxPage.read('@message-line')).to.not.contain('BEGIN'); expect(await inboxPage.read('@see-original')).to.equal('SEE ORIGINAL'); }) @@ -775,7 +775,7 @@ export const defineSettingsTests = (testVariant: TestVariant, testWithBrowser: T testWithBrowser(async (t, browser) => { const { authHdr } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'compatibility'); const checkPage = async (page: ControllablePage) => { - const pgpBlockFrame = await page.getFrame(['pgp_render_block.htm']); + const pgpBlockFrame = await page.getFrame(['pgp_block.htm']); // check if download is awailable await pgpBlockFrame.waitAll('.download-attachment'); // and preview diff --git a/test/source/tests/tooling/browser-recipe.ts b/test/source/tests/tooling/browser-recipe.ts index 5c9b56903b5..fca385fd218 100644 --- a/test/source/tests/tooling/browser-recipe.ts +++ b/test/source/tests/tooling/browser-recipe.ts @@ -221,7 +221,7 @@ export class BrowserRecipe { ) => { const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${msgId}`, undefined, extraHeaders); await gmailPage.waitAll('iframe'); - await BrowserRecipe.pgpBlockCheck(t, await gmailPage.getFrame(['pgp_render_block.htm']), m); + await BrowserRecipe.pgpBlockCheck(t, await gmailPage.getFrame(['pgp_block.htm']), m); await gmailPage.close(); }; From 92b78a3f5bfbb0ddd84b7f16a4b4d813cc700430 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 24 May 2023 18:13:02 +0100 Subject: [PATCH 084/147] removed todos, simplified code --- extension/js/common/lang.ts | 4 - extension/js/common/message-renderer.ts | 127 +++++++++++------------- 2 files changed, 58 insertions(+), 73 deletions(-) diff --git a/extension/js/common/lang.ts b/extension/js/common/lang.ts index f110682a896..10a8b5b2e05 100644 --- a/extension/js/common/lang.ts +++ b/extension/js/common/lang.ts @@ -130,10 +130,6 @@ export const Lang = { contactForSupportSubsentence, contactForSupportSentence: (isCustomerUrlFesUsed = false) => contactForSupportSubsentence(isCustomerUrlFesUsed, 'for support.'), writeMeToFixIt: (isCustomerUrlFesUsed: boolean) => contactForSupportSubsentence(isCustomerUrlFesUsed, 'to fix it.'), - restartBrowserAndTryAgain: (isCustomerUrlFesUsed: boolean) => - `Unexpected error occured. Please restart your browser and try again. If this persists after a restart, ${contactForSupportSubsentence( - isCustomerUrlFesUsed - )}.`, emailAliasChangedAskForReload: 'Your email aliases on Gmail have refreshed since the last time you used FlowCrypt.\nReload the compose window now?', }, passphraseRequired: { diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index 6b1f59a0d78..25f9afe6c56 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -48,6 +48,10 @@ export class MessageRenderer { this.downloader = new Downloader(gmail); } + public static isPwdMsg = (text: string) => { + return /https:\/\/flowcrypt\.com\/[a-zA-Z0-9]{10}$/.test(text); + }; + /** * Replaces inline image CID references with base64 encoded data in sanitized HTML * and returns the sanitized HTML along with the inline CID attachments. @@ -56,7 +60,7 @@ export class MessageRenderer { * @param attachments - An array of email attachments. * @returns An object containing sanitized HTML and an array of inline CID attachments. */ - public static replaceInlineImageCIDs = (html: string, attachments: Attachment[]): { sanitizedHtml: string; inlineCIDAttachments: Attachment[] } => { + private static replaceInlineImageCIDs = (html: string, attachments: Attachment[]): { sanitizedHtml: string; inlineCIDAttachments: Attachment[] } => { // Array to store inline CID attachments const inlineCIDAttachments: Attachment[] = []; @@ -91,7 +95,7 @@ export class MessageRenderer { return { sanitizedHtml, inlineCIDAttachments }; }; - public static getEncryptedSubjectText = (subject: string, isHtml: boolean) => { + private static getEncryptedSubjectText = (subject: string, isHtml: boolean) => { if (isHtml) { return `
Encrypted Subject: ${Xss.escape(subject)} @@ -102,7 +106,7 @@ export class MessageRenderer { } }; - public static decryptFunctionToVerifyRes = async (decrypt: () => Promise): Promise => { + private static decryptFunctionToVerifyRes = async (decrypt: () => Promise): Promise => { const decryptResult = await decrypt(); if (!decryptResult.success) { return undefined; // note: this internal error results in a wrong "Not Signed" badge @@ -111,7 +115,7 @@ export class MessageRenderer { } }; - public static reconstructMimeContent = (gmailMsg: GmailRes.GmailMsg): MimeContent => { + private static reconstructMimeContent = (gmailMsg: GmailRes.GmailMsg): MimeContent => { const bodies = GmailParser.findBodies(gmailMsg); const attachments = GmailParser.findAttachments(gmailMsg, gmailMsg.id); const text = bodies['text/plain'] ? Buf.fromBase64UrlStr(bodies['text/plain']).toUtfStr() : undefined; @@ -125,19 +129,13 @@ export class MessageRenderer { }; }; - public static renderPgpSignatureCheckResult = async ( + private static renderPgpSignatureCheckResult = async ( renderModule: RenderInterface, verifyRes: VerifyRes | undefined, + wasSignerEmailSupplied: boolean, retryVerification?: () => Promise ) => { if (verifyRes?.error) { - /* todo: if (not raw) { - // 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; - } */ renderModule.renderSignatureStatus(`error verifying signature: ${verifyRes.error}`); renderModule.setFrameColor('red'); } else if (!verifyRes || !verifyRes.signerLongids.length) { @@ -146,17 +144,18 @@ export class MessageRenderer { renderModule.renderSignatureStatus('signed'); } else if (retryVerification) { renderModule.renderVerificationInProgress(); - await MessageRenderer.renderPgpSignatureCheckResult(renderModule, (await retryVerification()) ?? verifyRes, undefined); + await MessageRenderer.renderPgpSignatureCheckResult(renderModule, (await retryVerification()) ?? verifyRes, wasSignerEmailSupplied, undefined); return; + } else if (!wasSignerEmailSupplied) { + // todo: unit-test this case? + renderModule.renderSignatureStatus('could not verify signature: missing pubkey, missing sender info'); } else { - // todo: is this situation possible: no sender info in `from`? - // renderModule.renderSignatureStatus('could not verify signature: missing pubkey, missing sender info'); MessageRenderer.renderMissingPubkeyOrBadSignature(renderModule, verifyRes); } renderModule.setTestState('ready'); }; - public static renderMissingPubkeyOrBadSignature = (renderModule: RenderInterfaceBase, verifyRes: VerifyRes): void => { + private static renderMissingPubkeyOrBadSignature = (renderModule: RenderInterfaceBase, verifyRes: VerifyRes): void => { // eslint-disable-next-line no-null/no-null if (verifyRes.match === null || !Value.arr.hasIntersection(verifyRes.signerLongids, verifyRes.suppliedLongids)) { MessageRenderer.renderMissingPubkey(renderModule, verifyRes.signerLongids[0]); @@ -165,19 +164,15 @@ export class MessageRenderer { } }; - public static renderMissingPubkey = (renderModule: RenderInterfaceBase, signerLongid: string) => { + private static renderMissingPubkey = (renderModule: RenderInterfaceBase, signerLongid: string) => { renderModule.renderSignatureStatus(`could not verify signature: missing pubkey ${signerLongid}`); }; - public static renderBadSignature = (renderModule: RenderInterfaceBase) => { + private static renderBadSignature = (renderModule: RenderInterfaceBase) => { renderModule.renderSignatureStatus('bad signature'); renderModule.setFrameColor('red'); // todo: in what other cases should we set the frame red? }; - public static isPwdMsg = (text: string) => { - return /https:\/\/flowcrypt\.com\/[a-zA-Z0-9]{10}$/.test(text); - }; - private static getVerificationPubs = async (signerEmail: string) => { const email = Str.parseEmail(signerEmail).email; if (!email) return []; @@ -339,8 +334,43 @@ export class MessageRenderer { ); }; - // todo: private - public getMessageInfo = async (fullMsg: GmailRes.GmailMsg): Promise => { + public msgGetProcessed = async (msgId: string): Promise => { + // todo: retries? exceptions? + const msgDownload = this.downloader.msgGetCached(msgId); + if (msgDownload.processedFull) { + return msgDownload.processedFull; + } + const fullMsg = await msgDownload.download.full; + const mimeContent = MessageRenderer.reconstructMimeContent(fullMsg); + const blocks = Mime.processBody(mimeContent); + const isBodyEmpty = Mime.isBodyEmpty(mimeContent); + // todo: only start `signature` download? + // start download of all attachments that are not plainFile, for 'needChunk' -- chunked download + for (const a of mimeContent.attachments.filter(a => !a.hasData())) { + const treatAs = a.treatAs(mimeContent.attachments, isBodyEmpty); + if (treatAs === 'plainFile') continue; + if (treatAs === 'needChunk') { + this.downloader.queueAttachmentChunkDownload(a); + } else if (treatAs === 'publicKey') { + // we also want a chunk before we replace the attachment in the UI + // todo: or simply download in full? + this.downloader.queueAttachmentChunkDownload(a); + } else { + // todo: this.downloader.queueAttachmentDownload(a); + } + } + const from = GmailParser.findHeader(fullMsg, 'from'); + msgDownload.processedFull = { + isBodyEmpty, + blocks, + messageInfo: await this.getMessageInfo(fullMsg), + from, + attachments: mimeContent.attachments, + }; + return msgDownload.processedFull; + }; + + private getMessageInfo = async (fullMsg: GmailRes.GmailMsg): Promise => { const fullName = await AcctStore.get(this.acctEmail, ['full_name']); // todo: cache const sentDate = GmailParser.findHeader(fullMsg, 'date'); const sentDateStr = sentDate ? Str.fromDate(new Date(sentDate)).replace(' ', ' at ') : ''; @@ -378,42 +408,6 @@ export class MessageRenderer { }; }; - public msgGetProcessed = async (msgId: string): Promise => { - // todo: retries? exceptions? - const msgDownload = this.downloader.msgGetCached(msgId); - if (msgDownload.processedFull) { - return msgDownload.processedFull; - } - const fullMsg = await msgDownload.download.full; - const mimeContent = MessageRenderer.reconstructMimeContent(fullMsg); - const blocks = Mime.processBody(mimeContent); - const isBodyEmpty = Mime.isBodyEmpty(mimeContent); - // todo: only start `signature` download? - // start download of all attachments that are not plainFile, for 'needChunk' -- chunked download - for (const a of mimeContent.attachments.filter(a => !a.hasData())) { - const treatAs = a.treatAs(mimeContent.attachments, isBodyEmpty); - if (treatAs === 'plainFile') continue; - if (treatAs === 'needChunk') { - this.downloader.queueAttachmentChunkDownload(a); - } else if (treatAs === 'publicKey') { - // we also want a chunk before we replace the attachment in the UI - // todo: or simply download in full? - this.downloader.queueAttachmentChunkDownload(a); - } else { - // todo: this.downloader.queueAttachmentDownload(a); - } - } - const from = GmailParser.findHeader(fullMsg, 'from'); - msgDownload.processedFull = { - isBodyEmpty, - blocks, - messageInfo: await this.getMessageInfo(fullMsg), - from, - attachments: mimeContent.attachments, - }; - return msgDownload.processedFull; - }; - private decideDecryptedContentFormattingAndRender = async ( signerEmail: string | undefined, verificationPubs: string[], @@ -501,8 +495,8 @@ export class MessageRenderer { this.getRetryVerification(signerEmail, verify) ); } - renderModule.separateQuotedContentAndRenderText(decryptedContent, isHtml); // todo: quoteModule ? - await MessageRenderer.renderPgpSignatureCheckResult(renderModule, sigResult, retryVerification); + renderModule.separateQuotedContentAndRenderText(decryptedContent, isHtml); + await MessageRenderer.renderPgpSignatureCheckResult(renderModule, sigResult, Boolean(signerEmail), retryVerification); if (renderableAttachments.length) { renderModule.renderInnerAttachments(renderableAttachments, isEncrypted); } @@ -558,9 +552,7 @@ export class MessageRenderer { }; // todo: this should be moved to some other class? - private getRetryVerification = (signerEmail: string | undefined, verify: (verificationPubs: string[]) => Promise) => { - if (!signerEmail) return undefined; - const { email } = Str.parseEmail(signerEmail); // todo: we can also store name if contact doesn't exist + private getRetryVerification = (email: string | undefined, verify: (verificationPubs: string[]) => Promise) => { if (!email) return undefined; return async () => { const clientConfiguration = await ClientConfiguration.newInstance(this.acctEmail); @@ -621,10 +613,7 @@ export class MessageRenderer { const verificationPubs = signerEmail ? await MessageRenderer.getVerificationPubs(signerEmail) : []; const decrypt = (verificationPubs: string[]) => MsgUtil.decryptMessage({ kisWithPp, encryptedData, verificationPubs }); const result = await decrypt(verificationPubs); - // from decryptAndRender - if (typeof result === 'undefined') { - // todo: renderErr(Lang.general.restartBrowserAndTryAgain(!!this.view.fesUrl), undefined); - } else if (result.success) { + if (result.success) { return await this.decideDecryptedContentFormattingAndRender( signerEmail, verificationPubs, From 4b20e149945572978c55c7db28bffaa75b1a22de Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 25 May 2023 07:17:04 +0100 Subject: [PATCH 085/147] fixed from -> email conversion --- .../js/content_scripts/webmail/gmail-element-replacer.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index 69d30a049e4..478bfbabc6c 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -181,7 +181,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { continue; } if (!from) { - from = this.getSenderEmail(this.getMsgBodyEl(msgId)); + from = this.getFrom(this.getMsgBodyEl(msgId)); } const senderEmail = from ? Str.parseEmail(from).email : undefined; const { renderedXssSafe, blocksInFrames } = this.messageRenderer.renderMsg({ blocks, senderEmail }, false); @@ -438,7 +438,8 @@ export class GmailElementReplacer implements WebmailElementReplacer { console.debug('processAttachments()', attachmentMetas); } const msgEl = this.getMsgBodyEl(msgId); - const senderEmail = this.getSenderEmail(msgEl); + const from = this.getFrom(msgEl); + const senderEmail = from ? Str.parseEmail(from).email : undefined; const loaderContext = new LoaderContextWebmail(this.factory, msgEl, attachmentsContainerInner); attachmentsContainerInner = $(attachmentsContainerInner); attachmentsContainerInner.parent().find(this.sel.numberOfAttachments).hide(); @@ -527,8 +528,8 @@ export class GmailElementReplacer implements WebmailElementReplacer { return $(this.sel.msgOuter).filter(`[data-legacy-message-id="${msgId}"]`).find(this.sel.msgInner); }; - private getSenderEmail = (msgEl: HTMLElement | JQueryEl) => { - return ($(msgEl).closest('.gs').find('span.gD').attr('email') || '').toLowerCase(); + private getFrom = (msgEl: HTMLElement | JQueryEl) => { + return $(msgEl).closest('.gs').find('span.gD').attr('email')?.toLowerCase(); }; private getLastMsgReplyParams = (convoRootEl: JQueryEl): FactoryReplyParams => { From 5f18b4492f42dedf53d6063b9c9124144f2b7a96 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 25 May 2023 11:10:30 +0100 Subject: [PATCH 086/147] fixed senderEmail parsing --- .../inbox-active-thread-module.ts | 21 +++------ extension/js/common/downloader.ts | 1 - extension/js/common/message-renderer.ts | 43 +++++++++---------- extension/js/common/render-message.ts | 5 +++ .../webmail/gmail-element-replacer.ts | 33 ++++++-------- 5 files changed, 45 insertions(+), 58 deletions(-) diff --git a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts index 66432305a88..0cf10c07d29 100644 --- a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts +++ b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts @@ -5,7 +5,7 @@ import { Bm, BrowserMsg } from '../../../../js/common/browser/browser-msg.js'; import { FactoryReplyParams, XssSafeFactory } from '../../../../js/common/xss-safe-factory.js'; import { GmailParser, GmailRes } from '../../../../js/common/api/email-provider/gmail/gmail-parser.js'; -import { Str, Url, UrlParams } from '../../../../js/common/core/common.js'; +import { Url, UrlParams } from '../../../../js/common/core/common.js'; import { ApiErr } from '../../../../js/common/api/shared/api-error.js'; import { BrowserMsgCommonHandlers } from '../../../../js/common/browser/browser-msg-common-handlers.js'; @@ -146,9 +146,9 @@ export class InboxActiveThreadModule extends ViewModule { const htmlId = this.replyMsgId(message.id); try { const msg = await this.view.messageRenderer.downloader.msgGetCached(message.id).download.full; - const { blocks, isBodyEmpty, messageInfo, from, attachments } = await this.view.messageRenderer.msgGetProcessed(message.id); + const { blocks, isBodyEmpty, messageInfo, attachments } = await this.view.messageRenderer.msgGetProcessed(message.id); const exportBtn = this.debugEmails.includes(this.view.acctEmail) ? 'download api export' : ''; - const senderEmail = from ? Str.parseEmail(from).email : undefined; + const senderEmail = messageInfo.from?.email; const { renderedXssSafe, blocksInFrames } = this.view.messageRenderer.renderMsg({ blocks, senderEmail }, this.view.showOriginal); const loaderContext = new LoaderContext( this.view.factory, @@ -157,20 +157,11 @@ export class InboxActiveThreadModule extends ViewModule { .filter(block => block.attachmentMeta && ['encryptedAttachment', 'plainAttachment'].includes(block.type)) .map(block => XssSafeFactory.renderableMsgBlock(this.view.factory, block, this.view.messageRenderer.isOutgoing(senderEmail))) ); - // todo: test else if (this.view.showOriginal) { r += Xss.escape(Str.with(block.content)).replace(/\n/g, '
');} for (const a of attachments) { - await this.view.messageRenderer.processAttachment( - a, - a.treatAs(attachments, isBodyEmpty), - loaderContext, - undefined, - message.id, - messageInfo, - senderEmail - ); + await this.view.messageRenderer.processAttachment(a, a.treatAs(attachments, isBodyEmpty), loaderContext, undefined, message.id, messageInfo); } const r = - `

From: ${Xss.escape(from || 'unknown')} ${ + `

From: ${Xss.escape(messageInfo.from?.full || 'unknown')} ${ GmailParser.findHeader(msg, 'Date') ?? '' } ${exportBtn}

` + (loaderContext.renderedMessageXssSafe ?? '') + @@ -179,7 +170,7 @@ export class InboxActiveThreadModule extends ViewModule { : ''); $('.thread').append(this.wrapMsg(htmlId, r)); // xss-safe-factory loaderContext.completeBinding(this.view.relayManager); - this.view.messageRenderer.processInlineBlocks(this.view.relayManager, this.view.factory, messageInfo, blocksInFrames, senderEmail).catch(Catch.reportErr); + this.view.messageRenderer.processInlineBlocks(this.view.relayManager, this.view.factory, messageInfo, blocksInFrames).catch(Catch.reportErr); if (exportBtn) { $('.action-export').on( 'click', diff --git a/extension/js/common/downloader.ts b/extension/js/common/downloader.ts index 6553d10aeb8..7357041002c 100644 --- a/extension/js/common/downloader.ts +++ b/extension/js/common/downloader.ts @@ -15,7 +15,6 @@ export type ProcessedMessage = { blocks: MsgBlock[]; attachments: Attachment[]; messageInfo: MessageInfo; - from?: string; }; export interface MessageCacheEntry { diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index 25f9afe6c56..19df9eb65e2 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -244,8 +244,7 @@ export class MessageRenderer { loaderContext: LoaderContextInterface, attachmentSel: JQueryEl | undefined, msgId: string, // deprecated - messageInfo: MessageInfo, - senderEmail?: string + messageInfo: MessageInfo ): Promise<'shown' | 'hidden' | 'replaced'> => { // todo - [same name + not processed].first() ... What if attachment metas are out of order compared to how gmail shows it? And have the same name? try { @@ -286,18 +285,18 @@ export class MessageRenderer { loaderContext.prependEncryptedAttachment(a); return 'replaced'; // native should be hidden, custom should appear instead } else if (treatAs === 'encryptedMsg') { - await this.setMsgBodyAndStartProcessing(loaderContext, treatAs, messageInfo.printMailInfo, senderEmail, (renderModule, frameId) => - this.processEncryptedMessage(a, renderModule, frameId, senderEmail, messageInfo.isPwdMsgBasedOnMsgSnippet) + await this.setMsgBodyAndStartProcessing(loaderContext, treatAs, messageInfo.printMailInfo, messageInfo.from?.email, (renderModule, frameId) => + this.processEncryptedMessage(a, renderModule, frameId, messageInfo.from?.email, messageInfo.isPwdMsgBasedOnMsgSnippet) ); return 'hidden'; // native attachment should be hidden, the "attachment" goes to the message container } else if (treatAs === 'publicKey') { // todo - pubkey should be fetched in pgp_pubkey.js - return await this.renderPublicKeyFromFile(a, loaderContext, this.isOutgoing(senderEmail), attachmentSel); + return await this.renderPublicKeyFromFile(a, loaderContext, this.isOutgoing(messageInfo.from?.email), attachmentSel); } else if (treatAs === 'privateKey') { - return await this.renderBackupFromFile(a, loaderContext, this.isOutgoing(senderEmail)); + return await this.renderBackupFromFile(a, loaderContext, this.isOutgoing(messageInfo.from?.email)); } else if (treatAs === 'signature') { - await this.setMsgBodyAndStartProcessing(loaderContext, 'signedMsg', messageInfo.printMailInfo, senderEmail, renderModule => - this.processSignedMessage(msgId, renderModule, senderEmail) + await this.setMsgBodyAndStartProcessing(loaderContext, 'signedMsg', messageInfo.printMailInfo, messageInfo.from?.email, renderModule => + this.processSignedMessage(msgId, renderModule, messageInfo.from?.email) ); return 'hidden'; // native attachment should be hidden, the "attachment" goes to the message container } else { @@ -317,18 +316,17 @@ export class MessageRenderer { } }; - public processInlineBlocks = async ( - relayManager: RelayManager, - factory: XssSafeFactory, - messageInfo: MessageInfo, - blocks: Dict, - from?: string // need to unify somehow when we accept `abc ` and when just `email@address` - ) => { - const signerEmail = from ? Str.parseEmail(from).email : undefined; + public processInlineBlocks = async (relayManager: RelayManager, factory: XssSafeFactory, messageInfo: MessageInfo, blocks: Dict) => { await Promise.all( Object.entries(blocks).map(([frameId, block]) => - this.relayAndStartProcessing(relayManager, new LoaderContextBindNow(), factory, frameId, messageInfo.printMailInfo, signerEmail, renderModule => - this.renderMsgBlock(block, renderModule, signerEmail, messageInfo.isPwdMsgBasedOnMsgSnippet) + this.relayAndStartProcessing( + relayManager, + new LoaderContextBindNow(), + factory, + frameId, + messageInfo.printMailInfo, + messageInfo.from?.email, + renderModule => this.renderMsgBlock(block, renderModule, messageInfo.from?.email, messageInfo.isPwdMsgBasedOnMsgSnippet) ) ) ); @@ -359,12 +357,10 @@ export class MessageRenderer { // todo: this.downloader.queueAttachmentDownload(a); } } - const from = GmailParser.findHeader(fullMsg, 'from'); msgDownload.processedFull = { isBodyEmpty, blocks, messageInfo: await this.getMessageInfo(fullMsg), - from, attachments: mimeContent.attachments, }; return msgDownload.processedFull; @@ -374,8 +370,10 @@ export class MessageRenderer { const fullName = await AcctStore.get(this.acctEmail, ['full_name']); // todo: cache const sentDate = GmailParser.findHeader(fullMsg, 'date'); const sentDateStr = sentDate ? Str.fromDate(new Date(sentDate)).replace(' ', ' at ') : ''; - const from = Str.parseEmail(GmailParser.findHeader(fullMsg, 'from') ?? ''); - const fromHtml = from.name ? `${Xss.htmlSanitize(from.name)} <${from.email}>` : from.email; + const fromString = GmailParser.findHeader(fullMsg, 'from'); + const from = fromString ? Str.parseEmail(fromString) : undefined; + const fromEmail = from?.email ?? ''; + const fromHtml = from?.name ? `${Xss.htmlSanitize(from.name)} <${fromEmail}>` : fromEmail; /* eslint-disable @typescript-eslint/no-non-null-assertion */ const ccString = GmailParser.findHeader(fullMsg, 'cc') ? `Cc: ${Xss.escape(GmailParser.findHeader(fullMsg, 'cc')!)}
` @@ -404,6 +402,7 @@ export class MessageRenderer {
`, }, + from, isPwdMsgBasedOnMsgSnippet: MessageRenderer.isPwdMsg(fullMsg.snippet || ''), }; }; diff --git a/extension/js/common/render-message.ts b/extension/js/common/render-message.ts index c2663ca2394..7ea26aedd63 100644 --- a/extension/js/common/render-message.ts +++ b/extension/js/common/render-message.ts @@ -12,6 +12,11 @@ export type PrintMailInfo = { export type MessageInfo = { printMailInfo?: PrintMailInfo; isPwdMsgBasedOnMsgSnippet: boolean; + from?: { + email: string | undefined; + name: string | undefined; + full: string; + }; }; export type RenderMessage = { diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index 478bfbabc6c..6c18945dcad 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -169,22 +169,22 @@ export class GmailElementReplacer implements WebmailElementReplacer { const msgId = this.determineMsgId(emailContainer); let blocks: MsgBlock[] = []; let messageInfo: MessageInfo | undefined; - let from: string | undefined; try { - ({ messageInfo, from, blocks } = await this.messageRenderer.msgGetProcessed(msgId)); + ({ messageInfo, blocks } = await this.messageRenderer.msgGetProcessed(msgId)); } catch (e) { // fill with fallback values from the element blocks = Mime.processBody({ text: emailContainer.innerText }); + // todo: print info for offline? } + const setMessageInfo = messageInfo ?? { isPwdMsgBasedOnMsgSnippet: MessageRenderer.isPwdMsg(emailContainer.innerText) }; if (blocks.length === 0 || (blocks.length === 1 && blocks[0].type === 'plainText')) { // only has single block which is plain text continue; } - if (!from) { - from = this.getFrom(this.getMsgBodyEl(msgId)); + if (!setMessageInfo.from) { + setMessageInfo.from = this.getFrom(this.getMsgBodyEl(msgId)); } - const senderEmail = from ? Str.parseEmail(from).email : undefined; - const { renderedXssSafe, blocksInFrames } = this.messageRenderer.renderMsg({ blocks, senderEmail }, false); + const { renderedXssSafe, blocksInFrames } = this.messageRenderer.renderMsg({ blocks, senderEmail: setMessageInfo.from?.email }, false); if (!renderedXssSafe) continue; $(this.sel.translatePrompt).hide(); if (this.debug) { @@ -194,15 +194,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { if (this.debug) { console.debug('replaceArmoredBlocks() for of emailsContainingPgpBlock -> emailContainer replaced'); } - this.messageRenderer - .processInlineBlocks( - this.relayManager, - this.factory, - messageInfo ?? { isPwdMsgBasedOnMsgSnippet: MessageRenderer.isPwdMsg(emailContainer.innerText) }, // todo: print info for offline? - blocksInFrames, - senderEmail - ) - .catch(Catch.reportErr); + this.messageRenderer.processInlineBlocks(this.relayManager, this.factory, setMessageInfo, blocksInFrames).catch(Catch.reportErr); } }; @@ -438,8 +430,9 @@ export class GmailElementReplacer implements WebmailElementReplacer { console.debug('processAttachments()', attachmentMetas); } const msgEl = this.getMsgBodyEl(msgId); - const from = this.getFrom(msgEl); - const senderEmail = from ? Str.parseEmail(from).email : undefined; + if (!messageInfo.from?.email) { + messageInfo.from = this.getFrom(msgEl); + } const loaderContext = new LoaderContextWebmail(this.factory, msgEl, attachmentsContainerInner); attachmentsContainerInner = $(attachmentsContainerInner); attachmentsContainerInner.parent().find(this.sel.numberOfAttachments).hide(); @@ -456,8 +449,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { loaderContext, attachmentSel, msgId, - messageInfo, - senderEmail + messageInfo ); if (['hidden', 'tomessage'].includes(renderStatus)) { nRenderedAttachments--; @@ -529,7 +521,8 @@ export class GmailElementReplacer implements WebmailElementReplacer { }; private getFrom = (msgEl: HTMLElement | JQueryEl) => { - return $(msgEl).closest('.gs').find('span.gD').attr('email')?.toLowerCase(); + const from = $(msgEl).closest('.gs').find('span.gD').attr('email')?.toLowerCase(); + return from ? Str.parseEmail(from) : undefined; }; private getLastMsgReplyParams = (convoRootEl: JQueryEl): FactoryReplyParams => { From 598caab0a3bd53d4e20ac4ea9acc127c1ce96b59 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 25 May 2023 11:19:03 +0100 Subject: [PATCH 087/147] mock fix: escape from address --- test/source/mock/google/google-data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/source/mock/google/google-data.ts b/test/source/mock/google/google-data.ts index 8a4161e61db..80cfa3b9a6d 100644 --- a/test/source/mock/google/google-data.ts +++ b/test/source/mock/google/google-data.ts @@ -236,7 +236,7 @@ export class GoogleData { /* eslint-disable @typescript-eslint/no-non-null-assertion */ const payload = (await GoogleData.withInitializedData(acct)).getMessage(msgId)!.payload!; const fromHeader = payload.headers!.find(header => header.name === 'From')!; - const fromAddress = fromHeader!.value; + const fromAddress = Xss.escape(fromHeader!.value); let htmlData: string | undefined; let processedParts: GmailMsg$payload$part[] = []; if (payload.mimeType === 'text/plain') { From 6f131daa9dc0faaa639cba66655bbe27a51be666 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 25 May 2023 11:36:12 +0100 Subject: [PATCH 088/147] simplification --- .../compose-modules/compose-draft-module.ts | 4 +- .../compose-modules/compose-quote-module.ts | 10 ++-- extension/js/common/core/mime.ts | 51 +++++++------------ 3 files changed, 24 insertions(+), 41 deletions(-) diff --git a/extension/chrome/elements/compose-modules/compose-draft-module.ts b/extension/chrome/elements/compose-modules/compose-draft-module.ts index 13f2abf8e75..e10cc81b481 100644 --- a/extension/chrome/elements/compose-modules/compose-draft-module.ts +++ b/extension/chrome/elements/compose-modules/compose-draft-module.ts @@ -310,13 +310,13 @@ export class ComposeDraftModule extends ViewModule { }; private decryptAndRenderDraft = async (encrypted: MimeProccesedMsg): Promise => { - const rawBlock = encrypted.blocks.find(b => ['encryptedMsg', 'signedMsg', 'pkcs7'].includes(b.block.type)); + const rawBlock = encrypted.blocks.find(b => ['encryptedMsg', 'signedMsg', 'pkcs7'].includes(b.type)); if (!rawBlock) { return await this.abortAndRenderReplyMsgComposeTableIfIsReplyBox('!rawBlock'); } const decrypted = await MsgUtil.decryptMessage({ kisWithPp: await KeyStore.getAllWithOptionalPassPhrase(this.view.acctEmail), - encryptedData: rawBlock.block.content, + encryptedData: rawBlock.content, verificationPubs: [], }); if (!decrypted.success) { diff --git a/extension/chrome/elements/compose-modules/compose-quote-module.ts b/extension/chrome/elements/compose-modules/compose-quote-module.ts index 65a144c5fca..42efd492a55 100644 --- a/extension/chrome/elements/compose-modules/compose-quote-module.ts +++ b/extension/chrome/elements/compose-modules/compose-quote-module.ts @@ -104,14 +104,14 @@ export class ComposeQuoteModule extends ViewModule { decryptedBlockTypes.push('decryptedAttachment'); } const readableBlocks: MsgBlock[] = []; - for (const block of message.blocks.filter(b => readableBlockTypes.includes(b.block.type))) { - if (['encryptedMsg', 'signedMsg'].includes(block.block.type)) { + for (const block of message.blocks.filter(b => readableBlockTypes.includes(b.type))) { + if (['encryptedMsg', 'signedMsg'].includes(block.type)) { this.setQuoteLoaderProgress('decrypting...'); - const decrypted = await this.decryptMessage(block.block.content); + const decrypted = await this.decryptMessage(block.content); const msgBlocks = await MsgBlockParser.fmtDecryptedAsSanitizedHtmlBlocks(Buf.fromUtfStr(decrypted)); readableBlocks.push(...msgBlocks.blocks.filter(b => decryptedBlockTypes.includes(b.type))); } else { - readableBlocks.push(block.block); + readableBlocks.push(block); } } const decryptedAndFormatedContent: string[] = []; @@ -156,7 +156,7 @@ export class ComposeQuoteModule extends ViewModule { return { headers, text: decryptedAndFormatedContent.join('\n'), - isOnlySigned: !!(decoded.rawSignedContent || (message.blocks.length > 0 && message.blocks[0].block.type === 'signedMsg')), + isOnlySigned: !!(decoded.rawSignedContent || (message.blocks.length > 0 && message.blocks[0].type === 'signedMsg')), decryptedFiles, }; } catch (e) { diff --git a/extension/js/common/core/mime.ts b/extension/js/common/core/mime.ts index 2526434b9f2..33256521b5e 100644 --- a/extension/js/common/core/mime.ts +++ b/extension/js/common/core/mime.ts @@ -54,7 +54,7 @@ export type SendableMsgBody = { /* eslint-enable @typescript-eslint/naming-convention */ export type MimeProccesedMsg = { rawSignedContent: string | undefined; // undefined if format was 'full' - blocks: { block: MsgBlock; file?: Attachment }[]; // may be many blocks per file + blocks: MsgBlock[]; // may be many blocks per file }; export type MimeProccesedFromRawMsg = MimeProccesedMsg & { @@ -93,7 +93,7 @@ export class Mime { }; public static processAttachments = (bodyBlocks: MsgBlock[], decoded: MimeContent): MimeProccesedMsg => { - const attachmentBlocks: { block: MsgBlock; file: Attachment }[] = []; + const attachmentBlocks: MsgBlock[] = []; const signatureAttachments: Attachment[] = []; for (const file of decoded.attachments) { let treatAs = file.treatAs(decoded.attachments, Mime.isBodyEmpty(decoded)); @@ -105,26 +105,17 @@ export class Mime { if (treatAs === 'encryptedMsg') { const armored = PgpArmor.clip(file.getData().toUtfStr()); if (armored) { - attachmentBlocks.push({ block: MsgBlock.fromContent('encryptedMsg', armored), file }); + attachmentBlocks.push(MsgBlock.fromContent('encryptedMsg', armored)); } } else if (treatAs === 'signature') { signatureAttachments.push(file); } else if (treatAs === 'publicKey') { - attachmentBlocks.push( - ...MsgBlockParser.detectBlocks(file.getData().toUtfStr(), true).blocks.map(block => { - return { block, file }; // todo: test when more than one - }) - ); + attachmentBlocks.push(...MsgBlockParser.detectBlocks(file.getData().toUtfStr(), true).blocks); // todo: test when more than one } else if (treatAs === 'privateKey') { - attachmentBlocks.push( - ...MsgBlockParser.detectBlocks(file.getData().toUtfStr(), true).blocks.map(block => { - return { block, file }; // todo: test when more than one - }) - ); + attachmentBlocks.push(...MsgBlockParser.detectBlocks(file.getData().toUtfStr(), true).blocks); // todo: test when more than one } else if (treatAs === 'encryptedFile') { - attachmentBlocks.push({ - // todo: fromAttachment return complete record? - block: MsgBlock.fromAttachment('encryptedAttachment', '', { + attachmentBlocks.push( + MsgBlock.fromAttachment('encryptedAttachment', '', { name: file.name, type: file.type, length: file.getData().length, @@ -136,12 +127,11 @@ export class Mime { id: file.id, msgId: file.id, cid: file.cid, */ - }), - file, - }); + }) + ); } else if (treatAs === 'plainFile') { - attachmentBlocks.push({ - block: MsgBlock.fromAttachment('plainAttachment', '', { + attachmentBlocks.push( + MsgBlock.fromAttachment('plainAttachment', '', { name: file.name, type: file.type, length: file.getData().length, @@ -149,9 +139,8 @@ export class Mime { inline: file.inline, id: file.id, // todo: cid: file.cid, // todo: - }), - file, - }); + }) + ); } } if (signatureAttachments.length) { @@ -160,23 +149,17 @@ export class Mime { // todo: data may not be present if (signatureAttachment.hasData()) { const signature = signatureAttachment.getData().toUtfStr(); - const blocksToRevisit = [...bodyBlocks, ...attachmentBlocks.map(x => x.block)]; - if (!blocksToRevisit.find(block => ['plainText', 'plainHtml', 'signedMsg'].includes(block.type))) { + if (![...bodyBlocks, ...attachmentBlocks].some(block => ['plainText', 'plainHtml', 'signedMsg'].includes(block.type))) { // signed an empty message - attachmentBlocks.push({ block: new MsgBlock('signedMsg', '', true, signature), file: signatureAttachment }); + attachmentBlocks.push(new MsgBlock('signedMsg', '', true, signature)); } } else { - // debugger; + // todo: is this possible while we always load 'raw' for detached signature messages throw new Error('No data.'); } } return { - blocks: [ - ...bodyBlocks.map(block => { - return { block }; - }), - ...attachmentBlocks, - ], // todo: check how compose-quote-module works, previous version made 'plainText' and 'plainHtml' invisible if a 'signature' block is present + blocks: [...bodyBlocks, ...attachmentBlocks], // todo: check how compose-quote-module works, previous version made 'plainText' and 'plainHtml' invisible if a 'signature' block is present // by changing their types to 'signedText' and 'signedHtml' respectively rawSignedContent: decoded.rawSignedContent, }; From 5631a0e4a90451d3e0387acddd09d06d831e9855 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 25 May 2023 16:24:26 +0100 Subject: [PATCH 089/147] tidy up --- extension/chrome/elements/pgp_block.ts | 25 ++++++++++--------- .../pgp-block-quote-module.ts | 2 +- .../pgp-block-render-module.ts | 6 ++--- .../webmail/gmail-element-replacer.ts | 9 ++++--- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/extension/chrome/elements/pgp_block.ts b/extension/chrome/elements/pgp_block.ts index f36755d597a..36e4b6a128f 100644 --- a/extension/chrome/elements/pgp_block.ts +++ b/extension/chrome/elements/pgp_block.ts @@ -4,8 +4,6 @@ import { Str, Url } from '../../js/common/core/common.js'; import { Assert } from '../../js/common/assert.js'; -import { Ui } from '../../js/common/browser/ui.js'; -import { View } from '../../js/common/view.js'; import { RenderMessage } from '../../js/common/render-message.js'; import { Attachment } from '../../js/common/core/attachment.js'; import { Xss } from '../../js/common/platform/xss.js'; @@ -16,31 +14,34 @@ import { PgpBlockViewErrorModule } from './pgp_block_modules/pgp-block-error-mod import { PgpBlockViewPrintModule } from './pgp_block_modules/pgp-block-print-module.js'; import { PgpBlockViewQuoteModule } from './pgp_block_modules/pgp-block-quote-module.js'; import { PgpBlockViewRenderModule } from './pgp_block_modules/pgp-block-render-module.js'; +import { Ui } from '../../js/common/browser/ui.js'; +import { View } from '../../js/common/view.js'; export class PgpBlockView extends View { - public readonly debug: boolean; + public readonly acctEmail: string; // needed for attachment decryption, probably should be refactored out public readonly parentTabId: string; public readonly frameId: string; - public readonly acctEmail: string; // needed for attachment decryption, probably should be refactored out - public readonly quoteModule: PgpBlockViewQuoteModule; - public readonly renderModule: PgpBlockViewRenderModule; + public readonly debug: boolean; public readonly attachmentsModule: PgpBlockViewAttachmentsModule; + public readonly quoteModule: PgpBlockViewQuoteModule; public readonly errorModule: PgpBlockViewErrorModule; + public readonly renderModule: PgpBlockViewRenderModule; public readonly printModule = new PgpBlockViewPrintModule(); public constructor() { super(); Ui.event.protect(); - this.quoteModule = new PgpBlockViewQuoteModule(this); - this.renderModule = new PgpBlockViewRenderModule(this); - this.attachmentsModule = new PgpBlockViewAttachmentsModule(this); - this.errorModule = new PgpBlockViewErrorModule(this); const uncheckedUrlParams = Url.parse(['frameId', 'parentTabId', 'debug', 'acctEmail']); - this.debug = uncheckedUrlParams.debug === true; + this.acctEmail = Assert.urlParamRequire.string(uncheckedUrlParams, 'acctEmail'); this.parentTabId = Assert.urlParamRequire.string(uncheckedUrlParams, 'parentTabId'); this.frameId = Assert.urlParamRequire.string(uncheckedUrlParams, 'frameId'); - this.acctEmail = Assert.urlParamRequire.string(uncheckedUrlParams, 'acctEmail'); + this.debug = uncheckedUrlParams.debug === true; + // modules + this.attachmentsModule = new PgpBlockViewAttachmentsModule(this); + this.quoteModule = new PgpBlockViewQuoteModule(this); + this.errorModule = new PgpBlockViewErrorModule(this); + this.renderModule = new PgpBlockViewRenderModule(this); window.addEventListener('message', this.handleMessage, true); // todo: capture? window.addEventListener('load', () => window.parent.postMessage({ readyToReceive: this.frameId }, '*')); } diff --git a/extension/chrome/elements/pgp_block_modules/pgp-block-quote-module.ts b/extension/chrome/elements/pgp_block_modules/pgp-block-quote-module.ts index 850f247ffae..531458902d7 100644 --- a/extension/chrome/elements/pgp_block_modules/pgp-block-quote-module.ts +++ b/extension/chrome/elements/pgp_block_modules/pgp-block-quote-module.ts @@ -2,9 +2,9 @@ 'use strict'; +import { PgpBlockView } from '../pgp_block.js'; import { Str } from '../../../js/common/core/common.js'; import { Xss } from '../../../js/common/platform/xss.js'; -import { PgpBlockView } from '../pgp_block.js'; export class PgpBlockViewQuoteModule { public constructor(private view: PgpBlockView) {} 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 4e457df9346..de4c7934676 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 @@ -3,15 +3,13 @@ 'use strict'; import { BrowserMsg } from '../../../js/common/browser/browser-msg.js'; +import { Catch } from '../../../js/common/platform/catch.js'; +import { PgpBlockView } from '../pgp_block.js'; import { Ui } from '../../../js/common/browser/ui.js'; import { Lang } from '../../../js/common/lang.js'; -import { Catch } from '../../../js/common/platform/catch.js'; import { Xss } from '../../../js/common/platform/xss.js'; -import { PgpBlockView } from '../pgp_block.js'; export class PgpBlockViewRenderModule { - public doNotSetStateAsReadyYet = false; - private heightHist: number[] = []; public constructor(private view: PgpBlockView) {} diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index 6c18945dcad..9d3ef78ee6c 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -395,11 +395,11 @@ export class GmailElementReplacer implements WebmailElementReplacer { if (this.debug) { console.debug('processNewPgpAttachments() -> msgGet may take some time'); } - const { attachments, messageInfo } = await this.messageRenderer.msgGetProcessed(msgId); + const { attachments, messageInfo, isBodyEmpty } = await this.messageRenderer.msgGetProcessed(msgId); if (this.debug) { console.debug('processNewPgpAttachments() -> msgGet done -> processAttachments', attachments); } - await this.processAttachments(msgId, attachments, attachmentsContainer, messageInfo, false); + await this.processAttachments(msgId, attachments, attachmentsContainer, messageInfo, isBodyEmpty, false); } catch (e) { if (ApiErr.isAuthErr(e)) { this.notifications.showAuthPopupNeeded(this.acctEmail); @@ -424,6 +424,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { attachmentMetas: Attachment[], // todo: these are not Metas! attachmentsContainerInner: JQueryEl, messageInfo: MessageInfo, + isBodyEmpty: boolean, skipGoogleDrive: boolean ) => { if (this.debug) { @@ -445,7 +446,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { // todo: shouldn't call `treatAs` in too many places ? const renderStatus = await this.messageRenderer.processAttachment( a, - a.treatAs(attachmentMetas, Mime.isBodyTextEmpty(msgEl.text())), + a.treatAs(attachmentMetas, isBodyEmpty), loaderContext, attachmentSel, msgId, @@ -496,7 +497,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { console.info('Missing Google Drive attachments download_url'); } } - await this.processAttachments(msgId, googleDriveAttachments, attachmentsContainerInner, messageInfo, true); + await this.processAttachments(msgId, googleDriveAttachments, attachmentsContainerInner, messageInfo, false, true); } }; From 31026a79793de09b2ecc21b481c475fd3c647cc4 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 25 May 2023 17:10:41 +0100 Subject: [PATCH 090/147] converted Dict to Map to avoid potential vulnerabilities --- extension/js/common/relay-manager.ts | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/extension/js/common/relay-manager.ts b/extension/js/common/relay-manager.ts index a8b19eacbda..070b2f1c41b 100644 --- a/extension/js/common/relay-manager.ts +++ b/extension/js/common/relay-manager.ts @@ -3,14 +3,15 @@ 'use strict'; import { Bm } from './browser/browser-msg.js'; -import { Dict } from './core/common.js'; import { BindInterface, RelayManagerInterface } from './relay-manager-interface.js'; import { RenderInterface } from './render-interface.js'; import { RenderMessage } from './render-message.js'; import { RenderRelay } from './render-relay.js'; +type FrameEntry = { frameWindow?: Window; readyToReceive?: true; queue: RenderMessage[]; progressText?: string }; + export class RelayManager implements RelayManagerInterface, BindInterface { - private frames: Dict<{ frameWindow?: Window; readyToReceive?: true; queue: RenderMessage[]; progressText?: string }> = {}; + private readonly frames = new Map(); public static getPercentage = (percent: number | undefined, loaded: number, total: number, expectedTransferSize: number) => { if (typeof percent === 'undefined') { @@ -22,7 +23,8 @@ export class RelayManager implements RelayManagerInterface, BindInterface { }; public relay = (frameId: string, message: RenderMessage) => { - const { frameWindow, readyToReceive, queue } = this.frames[frameId]; + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + const { frameWindow, readyToReceive, queue } = this.frames.get(frameId)!; queue.push(message); if (readyToReceive && frameWindow) { this.flush({ frameWindow, queue }); @@ -30,12 +32,12 @@ export class RelayManager implements RelayManagerInterface, BindInterface { }; public createRelay = (frameId: string): RenderInterface => { - this.frames[frameId] = { queue: [] }; // can readyToReceive message come earlier? Probably not. + this.getOrCreate(frameId); return new RenderRelay(this, frameId); }; public readyToReceive = (frameId: string) => { - const frameData = this.frames[frameId]; + const frameData = this.getOrCreate(frameId); frameData.readyToReceive = true; if (frameData.frameWindow) { this.flush({ frameWindow: frameData.frameWindow, queue: frameData.queue }); @@ -43,7 +45,8 @@ export class RelayManager implements RelayManagerInterface, BindInterface { }; public renderProgressText = (frameId: string, text: string) => { - const frameData = this.frames[frameId]; + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + const frameData = this.frames.get(frameId)!; frameData.progressText = text; this.relay(frameId, { renderText: text }); }; @@ -51,7 +54,8 @@ export class RelayManager implements RelayManagerInterface, BindInterface { public renderProgress = ({ frameId, percent, loaded, total, expectedTransferSize }: Bm.AjaxProgress) => { const perc = RelayManager.getPercentage(percent, loaded, total, expectedTransferSize); if (typeof perc !== 'undefined') { - const { readyToReceive, progressText } = this.frames[frameId]; + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + const { readyToReceive, progressText } = this.frames.get(frameId)!; if (readyToReceive && typeof progressText !== 'undefined') { this.relay(frameId, { renderText: `${progressText} ${perc}%` }); } @@ -59,13 +63,19 @@ export class RelayManager implements RelayManagerInterface, BindInterface { }; public bind = (frameId: string, frameWindow: Window) => { - const frameData = this.frames[frameId]; + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + const frameData = this.frames.get(frameId)!; frameData.frameWindow = frameWindow; if (frameData.readyToReceive) { this.flush({ frameWindow, queue: frameData.queue }); } }; + private getOrCreate = (frameId: string): FrameEntry => { + const frameEntry = this.frames.get(frameId); + return frameEntry ?? { queue: [] }; + }; + private flush = ({ frameWindow, queue }: { frameWindow: Window; queue: RenderMessage[] }) => { while (true) { const message = queue.shift(); From 6144c131889ec73431023b92e8eb7179ab2bcc84 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 25 May 2023 20:28:35 +0100 Subject: [PATCH 091/147] fix --- extension/js/common/relay-manager.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/extension/js/common/relay-manager.ts b/extension/js/common/relay-manager.ts index 070b2f1c41b..561e26cc49b 100644 --- a/extension/js/common/relay-manager.ts +++ b/extension/js/common/relay-manager.ts @@ -73,7 +73,10 @@ export class RelayManager implements RelayManagerInterface, BindInterface { private getOrCreate = (frameId: string): FrameEntry => { const frameEntry = this.frames.get(frameId); - return frameEntry ?? { queue: [] }; + if (frameEntry) return frameEntry; + const newFrameEntry = { queue: [] }; + this.frames.set(frameId, newFrameEntry); + return newFrameEntry; }; private flush = ({ frameWindow, queue }: { frameWindow: Window; queue: RenderMessage[] }) => { From 7e0b99108135b2024b905071631aba6b02d38c9c Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 26 May 2023 13:07:39 +0100 Subject: [PATCH 092/147] origin control for messages --- extension/chrome/elements/pgp_block.ts | 2 +- extension/chrome/settings/inbox/inbox.ts | 2 +- extension/js/common/api/key-server/key-manager.ts | 4 ++-- extension/js/common/api/key-server/sks.ts | 3 ++- extension/js/common/browser/env.ts | 7 ++++--- extension/js/common/core/common.ts | 4 ++++ extension/js/common/relay-manager.ts | 3 ++- .../webmail/setup-webmail-content-script.ts | 2 +- 8 files changed, 17 insertions(+), 10 deletions(-) diff --git a/extension/chrome/elements/pgp_block.ts b/extension/chrome/elements/pgp_block.ts index 36e4b6a128f..7b2126eee28 100644 --- a/extension/chrome/elements/pgp_block.ts +++ b/extension/chrome/elements/pgp_block.ts @@ -58,7 +58,7 @@ export class PgpBlockView extends View { }; private handleMessage = (event: MessageEvent) => { - if (!(new RegExp(`^http(s)?://${Str.regexEscape(GMAIL_PAGE_HOST)}$`).test(event.origin) || Env.getExtensionOriginRegExp().test(event.origin))) return; + if (!(event.origin === Env.getExtensionOrigin() || new RegExp(`^http(s)?://${Str.regexEscape(GMAIL_PAGE_HOST)}$`).test(event.origin))) return; const data = event.data as RenderMessage; // todo: order better if (data?.renderEncryptionStatus) { diff --git a/extension/chrome/settings/inbox/inbox.ts b/extension/chrome/settings/inbox/inbox.ts index ef2d70bd3ea..c75541bdd9f 100644 --- a/extension/chrome/settings/inbox/inbox.ts +++ b/extension/chrome/settings/inbox/inbox.ts @@ -63,7 +63,7 @@ export class InboxView extends View { this.inboxActiveThreadModule = new InboxActiveThreadModule(this); this.inboxListThreadsModule = new InboxListThreadsModule(this); window.addEventListener('message', e => { - if (Env.getExtensionOriginRegExp().test(e.origin) && typeof e.data?.readyToReceive === 'string') { + if (e.origin === Env.getExtensionOrigin() && typeof e.data?.readyToReceive === 'string') { this.relayManager.readyToReceive(e.data.readyToReceive); } }); diff --git a/extension/js/common/api/key-server/key-manager.ts b/extension/js/common/api/key-server/key-manager.ts index c4d6430b7f2..27943fcf1d7 100644 --- a/extension/js/common/api/key-server/key-manager.ts +++ b/extension/js/common/api/key-server/key-manager.ts @@ -3,7 +3,7 @@ 'use strict'; import { Api, ReqMethod } from './../shared/api.js'; -import { Dict } from '../../core/common.js'; +import { Dict, Url } from '../../core/common.js'; type LoadPrvRes = { privateKeys: { decryptedPrivateKey: string }[] }; @@ -12,7 +12,7 @@ export class KeyManager extends Api { public constructor(url: string) { super(); - this.url = url.replace(/\/$/, ''); // remove trailing space + this.url = Url.removeTrailingSlash(url); } public getPrivateKeys = async (idToken: string): Promise => { diff --git a/extension/js/common/api/key-server/sks.ts b/extension/js/common/api/key-server/sks.ts index 3bed26eee37..4cdd2bbcf81 100644 --- a/extension/js/common/api/key-server/sks.ts +++ b/extension/js/common/api/key-server/sks.ts @@ -6,6 +6,7 @@ import { Api } from './../shared/api.js'; import { ApiErr } from '../shared/api-error.js'; import { PgpArmor } from '../../core/crypto/pgp/pgp-armor.js'; import { PubkeySearchResult } from './../pub-lookup.js'; +import { Url } from '../../core/common.js'; export class Sks extends Api { private static MR_VERSION_1 = 'info:1:'; @@ -13,7 +14,7 @@ export class Sks extends Api { public constructor(url: string) { super(); - this.url = url.replace(/\/$/, ''); // remove trailing space + this.url = Url.removeTrailingSlash(url); } /** diff --git a/extension/js/common/browser/env.ts b/extension/js/common/browser/env.ts index 351d560a765..730c8590902 100644 --- a/extension/js/common/browser/env.ts +++ b/extension/js/common/browser/env.ts @@ -5,7 +5,7 @@ 'use strict'; -import { Str } from '../core/common.js'; +import { Url } from '../core/common.js'; export type WebMailName = 'gmail' | 'outlook' | 'settings'; export type WebMailVersion = 'generic' | 'gmail2020' | 'gmail2022'; @@ -22,8 +22,9 @@ export class Env { return undefined; }; - public static getExtensionOriginRegExp = () => { - return new RegExp(`^(chrome|moz)-extension://${Str.regexEscape(chrome.runtime.id)}$`); + public static getExtensionOrigin = () => { + const url = chrome.runtime.getURL(''); + return Url.removeTrailingSlash(url); }; public static isContentScript = () => { diff --git a/extension/js/common/core/common.ts b/extension/js/common/core/common.ts index 73fe5206f83..7183a0fe503 100644 --- a/extension/js/common/core/common.ts +++ b/extension/js/common/core/common.ts @@ -366,6 +366,10 @@ export class Url { return `${urlParts[0]}?${params.toString()}`; }; + public static removeTrailingSlash = (url: string) => { + return url.replace(/\/$/, ''); + }; + public static replaceUrlParam = (url: string, key: string, value: string) => { const regex = new RegExp(`([?|&]${key}=).*?(&|$)`, 'i'); return url.replace(regex, '$1' + value + '$2'); diff --git a/extension/js/common/relay-manager.ts b/extension/js/common/relay-manager.ts index 561e26cc49b..2cec50b4d6d 100644 --- a/extension/js/common/relay-manager.ts +++ b/extension/js/common/relay-manager.ts @@ -12,6 +12,7 @@ type FrameEntry = { frameWindow?: Window; readyToReceive?: true; queue: RenderMe export class RelayManager implements RelayManagerInterface, BindInterface { private readonly frames = new Map(); + private readonly targetOrigin = chrome.runtime.getURL(''); public static getPercentage = (percent: number | undefined, loaded: number, total: number, expectedTransferSize: number) => { if (typeof percent === 'undefined') { @@ -83,7 +84,7 @@ export class RelayManager implements RelayManagerInterface, BindInterface { while (true) { const message = queue.shift(); if (message) { - frameWindow.postMessage(message, '*'); // todo: targetOrigin + frameWindow.postMessage(message, this.targetOrigin); // todo: test in Firefox // todo: if ready status, release resources -- callback function? } else break; } diff --git a/extension/js/content_scripts/webmail/setup-webmail-content-script.ts b/extension/js/content_scripts/webmail/setup-webmail-content-script.ts index 23dea2aa56f..826d3100939 100644 --- a/extension/js/content_scripts/webmail/setup-webmail-content-script.ts +++ b/extension/js/content_scripts/webmail/setup-webmail-content-script.ts @@ -431,7 +431,7 @@ export const contentScriptSetupIfVacant = async (webmailSpecific: WebmailSpecifi Catch.try(() => notifyExpiringKeys(acctEmail, clientConfiguration, notifications)) ); window.addEventListener('message', e => { - if (Env.getExtensionOriginRegExp().test(e.origin) && typeof e.data?.readyToReceive === 'string') { + if (e.origin === Env.getExtensionOrigin() && typeof e.data?.readyToReceive === 'string') { relayManager.readyToReceive(e.data.readyToReceive); } }); From c24c6b3db1f4017f8b8eec526175e060775d0040 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 26 May 2023 19:01:46 +0100 Subject: [PATCH 093/147] patches for Firefox --- extension/js/common/platform/require.ts | 10 ++++------ scripts/build.sh | 18 +++++++++++++----- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/extension/js/common/platform/require.ts b/extension/js/common/platform/require.ts index 0dade1becc6..933eff80282 100644 --- a/extension/js/common/platform/require.ts +++ b/extension/js/common/platform/require.ts @@ -46,16 +46,14 @@ export const requireOpenpgp = (): typeof OpenPGP => { }; export const requireMimeParser = (): typeof MimeParser => { - return (window as any)['emailjs-mime-parser']; // eslint-disable-line + return (globalThis as any)['emailjs-mime-parser']; // eslint-disable-line }; -// eslint-disable-next-line @typescript-eslint/no-explicit-any -export const requireMimeBuilder = (): any => { - // eslint-disable-next-line @typescript-eslint/no-explicit-any - return (window as any)['emailjs-mime-builder']; +export const requireMimeBuilder = () => { + return (globalThis as any)['emailjs-mime-builder']; // eslint-disable-line }; export const requireIso88592 = (): Codec => { // eslint-disable-next-line @typescript-eslint/no-explicit-any - return (window as any).iso88592 as Codec; + return (globalThis as any).iso88592 as Codec; }; diff --git a/scripts/build.sh b/scripts/build.sh index da015ddc76e..4ef9f583a51 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -72,17 +72,25 @@ cp node_modules/@openpgp/web-stream-tools/lib/*.js $OUTDIR/lib/streams # until https://github.com/openpgpjs/web-stream-tools/pull/20 is resolved STREAMS_REGEX="s/'\.\/(streams|util|writer|reader|node-conversions)'/'\.\/\1\.js'/g" STREAMS_FILES=$OUTDIR/lib/streams/* + # patch isUint8Array until https://github.com/openpgpjs/web-stream-tools/pull/23 is resolved -ISUINT8ARRAY_REGEX="s/(\s*)return\x20Uint8Array\.prototype\.isPrototypeOf\(input\);/\1return\x20Uint8Array\.prototype\.isPrototypeOf\(input\)\x20\|\|\x20globalThis\.Uint8Array\.prototype\.isPrototypeOf\(input\);/g" +ISUINT8ARRAY_REGEX1="s/(\s*)return\x20Uint8Array\.prototype\.isPrototypeOf\(input\);/\1return\x20Uint8Array\.prototype\.isPrototypeOf\(input\)\x20\|\|\x20globalThis\.Uint8Array\.prototype\.isPrototypeOf\(input\);/g" + +# this patch handles patterns like (n instanceof Uint8Array) or (arguments[i] instanceof Uint8Array) +# todo: there is also one place left unhandled: return a instanceof Uint8Array; +ISUINT8ARRAY_REGEX2="s/\(([^\(\)\x20]+)\x20instanceof\x20Uint8Array\)/\(\1\x20instanceof\x20Uint8Array\x20\|\|\x20\1\x20instanceof\x20globalThis\.Uint8Array\)/g" + OPENPGP_FILE=$OUTDIR/lib/openpgp.js if [[ "$OSTYPE" =~ ^darwin ]]; then # macOS needs additional parameter for backup files sed -i '' -E $STREAMS_REGEX $STREAMS_FILES - sed -i '' -E $ISUINT8ARRAY_REGEX $STREAMS_FILES - sed -i '' -E $ISUINT8ARRAY_REGEX $OPENPGP_FILE + sed -i '' -E $ISUINT8ARRAY_REGEX1 $STREAMS_FILES + sed -i '' -E $ISUINT8ARRAY_REGEX1 $OPENPGP_FILE + sed -i '' -E $ISUINT8ARRAY_REGEX2 $OPENPGP_FILE else sed -i -E $STREAMS_REGEX $STREAMS_FILES - sed -i -E $ISUINT8ARRAY_REGEX $STREAMS_FILES - sed -i -E $ISUINT8ARRAY_REGEX $OPENPGP_FILE + sed -i -E $ISUINT8ARRAY_REGEX1 $STREAMS_FILES + sed -i -E $ISUINT8ARRAY_REGEX1 $OPENPGP_FILE + sed -i -E $ISUINT8ARRAY_REGEX2 $OPENPGP_FILE fi # bundle web-stream-tools as Stream var for the content script From f110c22734aea89c789070fbe3273d17256ba92e Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sat, 27 May 2023 10:24:55 +0100 Subject: [PATCH 094/147] simplified sendAs-related code, fixed vulnerability --- extension/chrome/settings/inbox/inbox.ts | 5 ----- extension/js/common/message-renderer.ts | 6 ++++-- extension/js/common/xss-safe-factory.ts | 2 -- .../js/content_scripts/webmail/gmail-element-replacer.ts | 8 ++++---- extension/js/content_scripts/webmail/webmail.ts | 4 ---- 5 files changed, 8 insertions(+), 17 deletions(-) diff --git a/extension/chrome/settings/inbox/inbox.ts b/extension/chrome/settings/inbox/inbox.ts index c75541bdd9f..f2b8bf90d4d 100644 --- a/extension/chrome/settings/inbox/inbox.ts +++ b/extension/chrome/settings/inbox/inbox.ts @@ -75,11 +75,6 @@ export class InboxView extends View { this.injector = new Injector('settings', undefined, this.factory); this.webmailCommon = new WebmailCommon(this.acctEmail, this.injector); this.storage = await AcctStore.get(this.acctEmail, ['email_provider', 'picture', 'sendAs']); - // todo: remove code duplication - if (!this.storage.sendAs) { - this.storage.sendAs = {}; - this.storage.sendAs[this.acctEmail] = { name: this.storage.full_name, isPrimary: true }; - } this.messageRenderer = new MessageRenderer(this.acctEmail, this.gmail, this.relayManager, this.factory, this.storage.sendAs, this.debug); this.inboxNotificationModule.render(); const emailProvider = this.storage.email_provider || 'gmail'; diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index 19df9eb65e2..4a08b001b41 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -37,15 +37,17 @@ export type ProccesedMsg = MimeProccesedMsg; export class MessageRenderer { public readonly downloader: Downloader; + private readonly sendAsAliases: Set; public constructor( private readonly acctEmail: string, private readonly gmail: Gmail, private readonly relayManager: RelayManager, private readonly factory: XssSafeFactory, - private sendAs: Dict, + sendAs: Dict | undefined, private debug: boolean = false ) { this.downloader = new Downloader(gmail); + this.sendAsAliases = new Set(sendAs ? Object.keys(sendAs) : [acctEmail]); } public static isPwdMsg = (text: string) => { @@ -235,7 +237,7 @@ export class MessageRenderer { }; public isOutgoing = (senderEmail: string | undefined) => { - return Boolean(senderEmail && !!this.sendAs[senderEmail]); + return Boolean(senderEmail && this.sendAsAliases.has(senderEmail)); }; public processAttachment = async ( diff --git a/extension/js/common/xss-safe-factory.ts b/extension/js/common/xss-safe-factory.ts index f63d828fa81..98a062baa06 100644 --- a/extension/js/common/xss-safe-factory.ts +++ b/extension/js/common/xss-safe-factory.ts @@ -15,7 +15,6 @@ import { PgpArmor } from './core/crypto/pgp/pgp-armor.js'; import { Ui } from './browser/ui.js'; import { WebMailName, WebMailVersion } from './browser/env.js'; import { Xss } from './platform/xss.js'; -import { SendAsAlias } from './platform/store/acct-store.js'; import { Buf } from './core/buf.js'; type Placement = 'settings' | 'settings_compose' | 'default' | 'dialog' | 'gmail' | 'embedded' | 'compose'; @@ -24,7 +23,6 @@ export type PassphraseDialogType = 'embedded' | 'message' | 'attachment' | 'draf export type FactoryReplyParams = { replyMsgId?: string; draftId?: string; - sendAs?: Dict; subject?: string; removeAfterClose?: boolean; }; diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index 9d3ef78ee6c..0d9728fa1f2 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -71,7 +71,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { private readonly factory: XssSafeFactory, private clientConfiguration: ClientConfiguration, private acctEmail: string, - private readonly sendAs: Dict, + sendAs: Dict | undefined, private injector: Injector, private notifications: Notifications, private relayManager: RelayManager @@ -99,7 +99,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { }; public reinsertReplyBox = (replyMsgId: string) => { - const params: FactoryReplyParams = { sendAs: this.sendAs, replyMsgId }; + const params: FactoryReplyParams = { replyMsgId }; $('.reply_message_iframe_container:visible').last().append(this.factory.embeddedReply(params, false, true)); // xss-safe-value }; @@ -527,7 +527,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { }; private getLastMsgReplyParams = (convoRootEl: JQueryEl): FactoryReplyParams => { - return { sendAs: this.sendAs, replyMsgId: this.determineMsgId($(convoRootEl).find(this.sel.msgInner).last()) }; + return { replyMsgId: this.determineMsgId($(convoRootEl).find(this.sel.msgInner).last()) }; }; private getGonvoRootEl = (anyInnerElement: HTMLElement) => { @@ -537,7 +537,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { private insertEncryptedReplyBox = (messageContainer: JQuery) => { const msgIdElement = messageContainer.find('[data-legacy-message-id], [data-message-id]'); const msgId = msgIdElement.attr('data-legacy-message-id') || msgIdElement.attr('data-message-id'); - const replyParams: FactoryReplyParams = { sendAs: this.sendAs, replyMsgId: msgId, removeAfterClose: true }; + const replyParams: FactoryReplyParams = { replyMsgId: msgId, removeAfterClose: true }; const secureReplyBoxXssSafe = `
${this.factory.embeddedReply( replyParams, true, diff --git a/extension/js/content_scripts/webmail/webmail.ts b/extension/js/content_scripts/webmail/webmail.ts index 33ed4114d7f..09ef99985c8 100644 --- a/extension/js/content_scripts/webmail/webmail.ts +++ b/extension/js/content_scripts/webmail/webmail.ts @@ -102,10 +102,6 @@ Catch.try(async () => { ) => { hijackGmailHotkeys(); const storage = await AcctStore.get(acctEmail, ['sendAs', 'full_name']); - if (!storage.sendAs) { - storage.sendAs = {}; - storage.sendAs[acctEmail] = { name: storage.full_name, isPrimary: true }; - } injector.btns(); replacer = new GmailElementReplacer(factory, clientConfiguration, acctEmail, storage.sendAs, injector, notifications, relayManager); await notifications.showInitial(acctEmail); From 50ef01c30ec5f2c8c005ec6be868c3383cd914d2 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sat, 27 May 2023 16:25:10 +0100 Subject: [PATCH 095/147] simplify initialization, less loads --- .../inbox/inbox-modules/inbox-menu-module.ts | 4 ++-- extension/chrome/settings/inbox/inbox.ts | 12 +++++------ extension/js/common/downloader.ts | 2 +- extension/js/common/message-renderer.ts | 17 +++++++++------- .../webmail/gmail-element-replacer.ts | 20 +++++++------------ .../js/content_scripts/webmail/webmail.ts | 7 ++++--- 6 files changed, 30 insertions(+), 32 deletions(-) diff --git a/extension/chrome/settings/inbox/inbox-modules/inbox-menu-module.ts b/extension/chrome/settings/inbox/inbox-modules/inbox-menu-module.ts index ba3021fef67..be231a89d4f 100644 --- a/extension/chrome/settings/inbox/inbox-modules/inbox-menu-module.ts +++ b/extension/chrome/settings/inbox/inbox-modules/inbox-menu-module.ts @@ -119,9 +119,9 @@ export class InboxMenuModule extends ViewModule { private renderNavbartTop = async () => { $('.action_open_webmail').attr('href', Google.webmailUrl(this.view.acctEmail)); $('.action_choose_account').get(0).title = this.view.acctEmail; - if (this.view.storage.picture) { + if (this.view.picture) { $('img.main-profile-img') - .attr('src', this.view.storage.picture) + .attr('src', this.view.picture) .on( 'error', this.view.setHandler(self => { diff --git a/extension/chrome/settings/inbox/inbox.ts b/extension/chrome/settings/inbox/inbox.ts index f2b8bf90d4d..d111d1083c3 100644 --- a/extension/chrome/settings/inbox/inbox.ts +++ b/extension/chrome/settings/inbox/inbox.ts @@ -21,7 +21,7 @@ import { View } from '../../../js/common/view.js'; import { WebmailCommon } from '../../../js/common/webmail.js'; import { Xss } from '../../../js/common/platform/xss.js'; import { XssSafeFactory } from '../../../js/common/xss-safe-factory.js'; -import { AcctStore, AcctStoreDict } from '../../../js/common/platform/store/acct-store.js'; +import { AcctStore } from '../../../js/common/platform/store/acct-store.js'; import { RelayManager } from '../../../js/common/relay-manager.js'; import { MessageRenderer } from '../../../js/common/message-renderer.js'; import { Env } from '../../../js/common/browser/env.js'; @@ -44,7 +44,7 @@ export class InboxView extends View { public webmailCommon!: WebmailCommon; public messageRenderer!: MessageRenderer; public factory!: XssSafeFactory; - public storage!: AcctStoreDict; + public picture?: string; public tabId!: string; public relayManager = new RelayManager(); @@ -74,13 +74,13 @@ export class InboxView extends View { this.factory = new XssSafeFactory(this.acctEmail, this.tabId); this.injector = new Injector('settings', undefined, this.factory); this.webmailCommon = new WebmailCommon(this.acctEmail, this.injector); - this.storage = await AcctStore.get(this.acctEmail, ['email_provider', 'picture', 'sendAs']); - this.messageRenderer = new MessageRenderer(this.acctEmail, this.gmail, this.relayManager, this.factory, this.storage.sendAs, this.debug); + let emailProvider: 'gmail' | undefined; + ({ email_provider: emailProvider, picture: this.picture } = await AcctStore.get(this.acctEmail, ['email_provider', 'picture'])); + this.messageRenderer = await MessageRenderer.newInstance(this.acctEmail, this.gmail, this.relayManager, this.factory, this.debug); this.inboxNotificationModule.render(); - const emailProvider = this.storage.email_provider || 'gmail'; try { await Settings.populateAccountsMenu('inbox.htm'); - if (emailProvider !== 'gmail') { + if (emailProvider && emailProvider !== 'gmail') { $('body').text('Not supported for ' + emailProvider); } else { await this.inboxMenuModule.render(); diff --git a/extension/js/common/downloader.ts b/extension/js/common/downloader.ts index 7357041002c..3bcdd541459 100644 --- a/extension/js/common/downloader.ts +++ b/extension/js/common/downloader.ts @@ -2,7 +2,7 @@ 'use strict'; -import { GmailRes } from './api/email-provider/gmail/gmail-parser'; +import { GmailRes } from './api/email-provider/gmail/gmail-parser.js'; import { Gmail } from './api/email-provider/gmail/gmail.js'; import { Attachment } from './core/attachment.js'; import { Buf } from './core/buf.js'; diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index 4a08b001b41..526c18ff884 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -16,7 +16,7 @@ import { MsgBlockParser } from './core/msg-block-parser.js'; import { MsgBlock, MsgBlockType } from './core/msg-block.js'; import { Lang } from './lang.js'; import { Catch } from './platform/catch.js'; -import { AcctStore, SendAsAlias } from './platform/store/acct-store.js'; +import { AcctStore } from './platform/store/acct-store.js'; import { ContactStore } from './platform/store/contact-store.js'; import { KeyStore } from './platform/store/key-store.js'; import { PassphraseStore } from './platform/store/passphrase-store.js'; @@ -37,19 +37,23 @@ export type ProccesedMsg = MimeProccesedMsg; export class MessageRenderer { public readonly downloader: Downloader; - private readonly sendAsAliases: Set; - public constructor( + private constructor( private readonly acctEmail: string, private readonly gmail: Gmail, private readonly relayManager: RelayManager, private readonly factory: XssSafeFactory, - sendAs: Dict | undefined, + private readonly sendAsAliases: Set, + private readonly fullName?: string, private debug: boolean = false ) { this.downloader = new Downloader(gmail); - this.sendAsAliases = new Set(sendAs ? Object.keys(sendAs) : [acctEmail]); } + public static newInstance = async (acctEmail: string, gmail: Gmail, relayManager: RelayManager, factory: XssSafeFactory, debug = false) => { + const { sendAs, full_name: fullName } = await AcctStore.get(acctEmail, ['sendAs', 'full_name']); + return new MessageRenderer(acctEmail, gmail, relayManager, factory, new Set(sendAs ? Object.keys(sendAs) : [acctEmail]), fullName, debug); + }; + public static isPwdMsg = (text: string) => { return /https:\/\/flowcrypt\.com\/[a-zA-Z0-9]{10}$/.test(text); }; @@ -369,7 +373,6 @@ export class MessageRenderer { }; private getMessageInfo = async (fullMsg: GmailRes.GmailMsg): Promise => { - const fullName = await AcctStore.get(this.acctEmail, ['full_name']); // todo: cache const sentDate = GmailParser.findHeader(fullMsg, 'date'); const sentDateStr = sentDate ? Str.fromDate(new Date(sentDate)).replace(' ', ' at ') : ''; const fromString = GmailParser.findHeader(fullMsg, 'from'); @@ -384,7 +387,7 @@ export class MessageRenderer { /* eslint-enable @typescript-eslint/no-non-null-assertion */ return { printMailInfo: { - userNameAndEmail: `${fullName.full_name} <${this.acctEmail}>`, + userNameAndEmail: `${this.fullName ?? ''} <${this.acctEmail}>`, html: `

${Xss.htmlSanitize(GmailParser.findHeader(fullMsg, 'subject') ?? '')}

diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index 0d9728fa1f2..b327afffa77 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -10,7 +10,6 @@ import { Attachment } from '../../common/core/attachment.js'; import { BrowserMsg } from '../../common/browser/browser-msg.js'; import { Catch } from '../../common/platform/catch.js'; import { GlobalStore, LocalDraft } from '../../common/platform/store/global-store.js'; -import { Gmail } from '../../common/api/email-provider/gmail/gmail.js'; import { Injector } from '../../common/inject.js'; import { PubLookup } from '../../common/api/pub-lookup.js'; import { Notifications } from '../../common/notifications.js'; @@ -19,7 +18,6 @@ import { Ui } from '../../common/browser/ui.js'; import { WebmailCommon } from '../../common/webmail.js'; import { Xss } from '../../common/platform/xss.js'; import { ClientConfiguration } from '../../common/client-configuration.js'; -import { SendAsAlias } from '../../common/platform/store/acct-store.js'; // todo: can we somehow define a purely relay class for ContactStore to clearly show that crypto-libraries are not loaded and can't be used? import { ContactStore } from '../../common/platform/store/contact-store.js'; import { MessageRenderer } from '../../common/message-renderer.js'; @@ -33,7 +31,6 @@ import { MsgBlock } from '../../common/core/msg-block.js'; export class GmailElementReplacer implements WebmailElementReplacer { private debug = false; - private gmail: Gmail; private recipientHasPgpCache: Dict = {}; // private attachmentDownloads: { attachment: Attachment; result: Promise }[] = []; private pubLookup: PubLookup; @@ -43,7 +40,6 @@ export class GmailElementReplacer implements WebmailElementReplacer { private switchToEncryptedReply = false; private removeNextReplyBoxBorders = false; private shouldShowEditableSecureReply = false; - private readonly messageRenderer: MessageRenderer; private sel = { // gmail_variant=standard|new @@ -69,17 +65,15 @@ export class GmailElementReplacer implements WebmailElementReplacer { public constructor( private readonly factory: XssSafeFactory, - private clientConfiguration: ClientConfiguration, - private acctEmail: string, - sendAs: Dict | undefined, - private injector: Injector, - private notifications: Notifications, - private relayManager: RelayManager + clientConfiguration: ClientConfiguration, + private readonly acctEmail: string, + private readonly messageRenderer: MessageRenderer, + private readonly injector: Injector, + private readonly notifications: Notifications, + private readonly relayManager: RelayManager ) { this.webmailCommon = new WebmailCommon(acctEmail, injector); - this.gmail = new Gmail(acctEmail); - this.messageRenderer = new MessageRenderer(acctEmail, this.gmail, this.relayManager, factory, sendAs); - this.pubLookup = new PubLookup(this.clientConfiguration); + this.pubLookup = new PubLookup(clientConfiguration); } public getIntervalFunctions = (): Array => { diff --git a/extension/js/content_scripts/webmail/webmail.ts b/extension/js/content_scripts/webmail/webmail.ts index 09ef99985c8..3fb52842a76 100644 --- a/extension/js/content_scripts/webmail/webmail.ts +++ b/extension/js/content_scripts/webmail/webmail.ts @@ -14,8 +14,9 @@ import { Notifications } from '../../common/notifications.js'; import { Str } from '../../common/core/common.js'; import { XssSafeFactory } from '../../common/xss-safe-factory.js'; import { ClientConfiguration } from '../../common/client-configuration.js'; -import { AcctStore } from '../../common/platform/store/acct-store.js'; import { RelayManager } from '../../common/relay-manager.js'; +import { MessageRenderer } from '../../common/message-renderer.js'; +import { Gmail } from '../../common/api/email-provider/gmail/gmail.js'; Catch.try(async () => { const gmailWebmailStartup = async () => { @@ -101,9 +102,9 @@ Catch.try(async () => { relayManager: RelayManager ) => { hijackGmailHotkeys(); - const storage = await AcctStore.get(acctEmail, ['sendAs', 'full_name']); injector.btns(); - replacer = new GmailElementReplacer(factory, clientConfiguration, acctEmail, storage.sendAs, injector, notifications, relayManager); + const messageRenderer = await MessageRenderer.newInstance(acctEmail, new Gmail(acctEmail), relayManager, factory); + replacer = new GmailElementReplacer(factory, clientConfiguration, acctEmail, messageRenderer, injector, notifications, relayManager); await notifications.showInitial(acctEmail); const intervaliFunctions = replacer.getIntervalFunctions(); for (const intervalFunction of intervaliFunctions) { From f0c4fe859d58eefdb95f1ad61e692a6f2e073cb7 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sat, 27 May 2023 17:50:38 +0100 Subject: [PATCH 096/147] clearer code with regard to signedMsg, and a unit test for unusual signedMsg attachment --- extension/js/common/core/attachment.ts | 4 +- extension/js/common/message-renderer.ts | 29 +++-- extension/js/common/xss-safe-factory.ts | 2 +- .../message-export-1885ded59a2b5a8d.json | 118 ++++++++++++++++++ test/source/tests/decrypt.ts | 18 +++ 5 files changed, 153 insertions(+), 18 deletions(-) create mode 100644 test/source/mock/google/exported-messages/message-export-1885ded59a2b5a8d.json diff --git a/extension/js/common/core/attachment.ts b/extension/js/common/core/attachment.ts index 531bfd1b82b..f5fc064f565 100644 --- a/extension/js/common/core/attachment.ts +++ b/extension/js/common/core/attachment.ts @@ -8,7 +8,7 @@ import { Str } from './common.js'; export type Attachment$treatAs = | 'publicKey' | 'privateKey' - | 'encryptedMsg' + | 'encryptedMsg' // may be signed-only (known as 'signedMsg'), "encrypted" here means that the message is constructed as a whole (decryptable by MsgUtil.decryptMessage) | 'hidden' | 'signature' | 'encryptedFile' @@ -190,7 +190,7 @@ export class Attachment { } else if (Attachment.encryptedMsgNames.includes(this.name)) { return 'encryptedMsg'; } else if (this.name === 'message' && isBodyEmpty) { - // treat message as encryptedMsg when empty body for the 'message' attachment + // treat message as cryptoMsg when empty body for the 'message' attachment return 'encryptedMsg'; } else if (this.name.match(/(\.pgp$)|(\.gpg$)|(\.[a-zA-Z0-9]{3,4}\.asc$)/g)) { // ends with one of .gpg, .pgp, .???.asc, .????.asc diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index 526c18ff884..59ed8df59ec 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -13,7 +13,7 @@ import { DecryptErrTypes, DecryptResult, FormatError, MsgUtil, VerifyRes } from import { PgpArmor } from './core/crypto/pgp/pgp-armor.js'; import { Mime, MimeContent, MimeProccesedMsg } from './core/mime.js'; import { MsgBlockParser } from './core/msg-block-parser.js'; -import { MsgBlock, MsgBlockType } from './core/msg-block.js'; +import { MsgBlock } from './core/msg-block.js'; import { Lang } from './lang.js'; import { Catch } from './platform/catch.js'; import { AcctStore } from './platform/store/acct-store.js'; @@ -268,7 +268,7 @@ export class MessageRenderer { // if it looks like OpenPGP public key treatAs = 'publicKey'; } else if (openpgpType && ['encryptedMsg', 'signedMsg'].includes(openpgpType.type)) { - treatAs = 'encryptedMsg'; // todo: signedMsg ? + treatAs = 'encryptedMsg'; } else { if (this.debug) { console.debug("processAttachment() try -> awaiting done and processed -- doesn't look like OpenPGP"); @@ -292,7 +292,7 @@ export class MessageRenderer { return 'replaced'; // native should be hidden, custom should appear instead } else if (treatAs === 'encryptedMsg') { await this.setMsgBodyAndStartProcessing(loaderContext, treatAs, messageInfo.printMailInfo, messageInfo.from?.email, (renderModule, frameId) => - this.processEncryptedMessage(a, renderModule, frameId, messageInfo.from?.email, messageInfo.isPwdMsgBasedOnMsgSnippet) + this.processCryptoMessage(a, renderModule, frameId, messageInfo.from?.email, messageInfo.isPwdMsgBasedOnMsgSnippet) ); return 'hidden'; // native attachment should be hidden, the "attachment" goes to the message container } else if (treatAs === 'publicKey') { @@ -301,8 +301,8 @@ export class MessageRenderer { } else if (treatAs === 'privateKey') { return await this.renderBackupFromFile(a, loaderContext, this.isOutgoing(messageInfo.from?.email)); } else if (treatAs === 'signature') { - await this.setMsgBodyAndStartProcessing(loaderContext, 'signedMsg', messageInfo.printMailInfo, messageInfo.from?.email, renderModule => - this.processSignedMessage(msgId, renderModule, messageInfo.from?.email) + await this.setMsgBodyAndStartProcessing(loaderContext, 'signedDetached', messageInfo.printMailInfo, messageInfo.from?.email, renderModule => + this.processMessageWithDetachedSignature(msgId, renderModule, messageInfo.from?.email) ); return 'hidden'; // native attachment should be hidden, the "attachment" goes to the message container } else { @@ -551,8 +551,7 @@ export class MessageRenderer { signerEmail: string | undefined, isPwdMsgBasedOnMsgSnippet: boolean | undefined ) => { - // todo: 'signedMsg' also handled here? - return await this.renderEncryptedMessage(block.content, renderModule, true, signerEmail, isPwdMsgBasedOnMsgSnippet); + return await this.renderCryptoMessage(block.content, renderModule, true, signerEmail, isPwdMsgBasedOnMsgSnippet); }; // todo: this should be moved to some other class? @@ -569,7 +568,7 @@ export class MessageRenderer { }; }; - private renderSignedMessage = async (raw: string, renderModule: RenderInterface, signerEmail: string | undefined) => { + private processMessageWithDetachedSignatureFromRaw = async (raw: string, renderModule: RenderInterface, signerEmail: string | undefined) => { // ... from PgpBlockViewDecryptModule.initialize const mimeMsg = Buf.fromBase64UrlStr(raw); const parsed = await Mime.decode(mimeMsg); @@ -606,7 +605,7 @@ export class MessageRenderer { return {}; }; - private renderEncryptedMessage = async ( + private renderCryptoMessage = async ( encryptedData: string | Uint8Array, renderModule: RenderInterface, fallbackToPlainText: boolean, @@ -670,7 +669,7 @@ export class MessageRenderer { private setMsgBodyAndStartProcessing = async ( loaderContext: LoaderContextInterface, - type: MsgBlockType, // for diagnostics + type: string, // for diagnostics printMailInfo: PrintMailInfo | undefined, senderEmail: string | undefined, cb: (renderModule: RenderInterface, frameId: string) => Promise<{ publicKeys?: string[] }> @@ -680,19 +679,19 @@ export class MessageRenderer { await this.relayAndStartProcessing(this.relayManager, loaderContext, loaderContext.factory, frameId, printMailInfo, senderEmail, cb); }; - private processSignedMessage = async (msgId: string, renderModule: RenderInterface, senderEmail: string | undefined) => { + private processMessageWithDetachedSignature = async (msgId: string, renderModule: RenderInterface, senderEmail: string | undefined) => { try { renderModule.renderText('Loading signed message...'); - const raw = await this.msgGetRaw(msgId); + const raw = await this.msgGetRaw(msgId); // todo: not necessary as long as we can extract text and signature attachment from 'full' // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - return await this.renderSignedMessage(raw!, renderModule, senderEmail); + return await this.processMessageWithDetachedSignatureFromRaw(raw!, renderModule, senderEmail); } catch { // todo: render error via renderModule } return {}; }; - private processEncryptedMessage = async ( + private processCryptoMessage = async ( attachment: Attachment, renderModule: RenderInterface, frameId: string, @@ -719,7 +718,7 @@ export class MessageRenderer { throw new FormatError('Problem extracting armored message', attachment.getData().toUtfStr()); } renderModule.renderText('Decrypting...'); - return await this.renderEncryptedMessage(armoredMsg, renderModule, false, senderEmail, isPwdMsgBasedOnMsgSnippet); + return await this.renderCryptoMessage(armoredMsg, renderModule, false, senderEmail, isPwdMsgBasedOnMsgSnippet); } catch { // todo: render error via renderModule } diff --git a/extension/js/common/xss-safe-factory.ts b/extension/js/common/xss-safe-factory.ts index 98a062baa06..7e666a44007 100644 --- a/extension/js/common/xss-safe-factory.ts +++ b/extension/js/common/xss-safe-factory.ts @@ -238,7 +238,7 @@ export class XssSafeFactory { }; public embeddedRenderMsg = ( - type: MsgBlockType // for diagnostic purposes + type: string // for diagnostic purposes ) => { const { frameId, frameSrc } = this.srcPgpRenderBlockIframe(); return { frameId, frameXssSafe: this.iframe(frameSrc, ['pgp_block', type]) + this.hideGmailNewMsgInThreadNotification }; diff --git a/test/source/mock/google/exported-messages/message-export-1885ded59a2b5a8d.json b/test/source/mock/google/exported-messages/message-export-1885ded59a2b5a8d.json new file mode 100644 index 00000000000..91713516e58 --- /dev/null +++ b/test/source/mock/google/exported-messages/message-export-1885ded59a2b5a8d.json @@ -0,0 +1,118 @@ +{ + "acctEmail": "ci.tests.gmail@flowcrypt.test", + "full": { + "id": "1885ded59a2b5a8d", + "threadId": "1885ded59a2b5a8d", + "labelIds": ["STARRED", "SENT", "INBOX"], + "snippet": "See attachment", + "payload": { + "partId": "", + "mimeType": "multipart/mixed", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "multipart/mixed; boundary=\"----sinikael-?=_1-16852030157220.20294758385357903\"" + }, + { + "name": "Openpgp", + "value": "id=9BA39CE075F0839B30340FC807481C8ACF9D49FE" + }, + { + "name": "From", + "value": "ci.tests.gmail@flowcrypt.test" + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "Subject", + "value": "I'm attaching cleartext signed message as an attachment" + }, + { + "name": "Date", + "value": "Sat, 27 May 2023 10:56:55 -0500" + }, + { + "name": "MIME-Version", + "value": "1.0" + } + ], + "body": { + "size": 0 + }, + "parts": [ + { + "partId": "0", + "mimeType": "text/plain", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "text/plain" + }, + { + "name": "Content-Transfer-Encoding", + "value": "quoted-printable" + } + ], + "body": { + "size": 14, + "data": "U2VlIGF0dGFjaG1lbnQ=" + } + }, + { + "partId": "1", + "mimeType": "application/octet-stream", + "filename": "sample_cleartext.asc", + "headers": [ + { + "name": "Content-Type", + "value": "application/octet-stream; name=sample_cleartext.asc" + }, + { + "name": "Content-Disposition", + "value": "attachment; filename=sample_cleartext.asc" + }, + { + "name": "X-Attachment-Id", + "value": "f_JAEwIiHAlGaJaOIMRPoptmvXSiAmYD@flowcrypt" + }, + { + "name": "Content-Id", + "value": "" + }, + { + "name": "Content-Transfer-Encoding", + "value": "base64" + } + ], + "body": { + "attachmentId": "ANGjdJ_0g7PGqJSjI8-Wjd5o8HcVnAHxIk-H210TAxxwfhKWlCUqnXbZtBdwjPQqN9omCqn-0-r4JBy6amb0ogGz9jZL9q11Z_iUJzxr_X0MlJj0cw-3EYCFKPDrpfVVQZ-28Ajhd35CkI3Z93s3FU4BUKHROZR1qdEPOoQM63k1IOPTfL9c7ES-W8EaOKxB-k0n0frlXqpTJgv-AHAi9NEAaq-ghluobPc4JiSjgkK7_0MkykEm4oZfBSHSuzG94c3HWeYNJw4bcWFHiKRln7bB8nq5JTJe546Zg2MoVkMuc7K6a0cUwGd9mdAUAPqPyq1ENIQ9bGFK7ozlDezHHZYP8rOTEL3QBx6rEE-aaGT2MEQyWPtsp8Zgt42prnUjysPDe-uVs-pl31UpIDhf", + "size": 1071 + } + } + ] + }, + "sizeEstimate": 2587, + "historyId": "2673627", + "internalDate": "1685203015000" + }, + "attachments": { + "ANGjdJ_0g7PGqJSjI8-Wjd5o8HcVnAHxIk-H210TAxxwfhKWlCUqnXbZtBdwjPQqN9omCqn-0-r4JBy6amb0ogGz9jZL9q11Z_iUJzxr_X0MlJj0cw-3EYCFKPDrpfVVQZ-28Ajhd35CkI3Z93s3FU4BUKHROZR1qdEPOoQM63k1IOPTfL9c7ES-W8EaOKxB-k0n0frlXqpTJgv-AHAi9NEAaq-ghluobPc4JiSjgkK7_0MkykEm4oZfBSHSuzG94c3HWeYNJw4bcWFHiKRln7bB8nq5JTJe546Zg2MoVkMuc7K6a0cUwGd9mdAUAPqPyq1ENIQ9bGFK7ozlDezHHZYP8rOTEL3QBx6rEE-aaGT2MEQyWPtsp8Zgt42prnUjysPDe-uVs-pl31UpIDhf": { + "data": "LS0tLS1CRUdJTiBQR1AgU0lHTkVEIE1FU1NBR0UtLS0tLQ0KSGFzaDogU0hBMjU2DQoNClN0YW5kYXJkIG1lc3NhZ2UNCg0Kc2lnbmVkIGlubGluZQ0KDQpzaG91bGQgZWFzaWx5IHZlcmlmeQ0KVGhpcyBpcyBlbWFpbCBmb290ZXINCi0tLS0tQkVHSU4gUEdQIFNJR05BVFVSRS0tLS0tDQpWZXJzaW9uOiBGbG93Q3J5cHQgNS4wLjQgR21haWwgRW5jcnlwdGlvbiBmbG93Y3J5cHQuY29tDQpDb21tZW50OiBTZWFtbGVzc2x5IHNlbmQsIHJlY2VpdmUgYW5kIHNlYXJjaCBlbmNyeXB0ZWQgZW1haWwNCg0Kd3NGY0JBRUJDQUFRQlFKWis3NFlDUkFHeWxVK3drVmRjQUFBZkFrUUFLWXdUQ1FVWDRLMjZqd3pLUEcwDQp1ZTYralN5Z3BrTmxzSHFmbzdaVTBTWWJ2YW8weEVvMVFRUHk5elZXN3pQMzlVQUpaa041RXBJQVJCekYNCjY3MUFBM3MwS3Rrbkx0MEFZZmlUSmRrcVRpaFJqSlpIQkhRY3hra2Fqd3MrM0JyOG9CaWVCNHppMTlHSg0Kb09xanlpMnV4bDdCeTVDU1AyMzhCNkNYQlRnYVlraC83VHBZSkRnRnp1aHRYdHgwYVdCUDloN1RnRVlODQpBWU5tdEdJdFQ2VzJRL0pvQjI5Y1ZzeHl1Z1ZzUWhkZk04REE1TXBFWlkyWmsvK1VIWE4wTDQ1ckVKRmoNCjhISmtSODN2b2l3QWU2RGRrTFFIYllmVnl0U0RaTitLODB4Ti9WQ1FmZGQ3K0hLcEtiZnRJaWcwY1htcg0KK09zb0RNR3ZQV2tHRXFKUmg1N2JleldmejZqbmtTU0pTWDltWEZHNktTSjJ4dWozMG5QWHNsMVduMVh2DQp3UjVUM0wya0R1c2x1RkVSaXEwTm5LRHdBdmVIWkl6aDd4dGptWVJsR1ZOdWp0YTBxVFFYVHlhanhEcHUNCmdaSXFaS2pEVlpwN0NqS1lZUHp2Z1VzaWhQemxneXFBb2RrTXBsL0loWWlkUE1CMTM1bFY0QkJLSHJGMg0KVXJiYjJ0WE1IYTZyRVpvajZqYlMwdXcvTzFmU0JKQVNZZmxySjFNOFlMc0ZDd0JIcE1XV0wzOG9qYm1LDQppMUVIWUlVOEEveTBxRUxQcEtvcmduTE5LaDh0MDVhMDFuclVXZC9lWERLUzFiYkdsTGVSNlIvWXZPTTUNCkFEanZneXdwaUdtcndkZWhpb0t0UzBTckhSdkV4WXg4b3J5MGlMbzBjTEdFUkFyWjNqeWNGOEYrUzJYcA0KNUJuSQ0KPUYyb20NCi0tLS0tRU5EIFBHUCBTSUdOQVRVUkUtLS0tLQ0K", + "size": 1071 + } + }, + "raw": { + "id": "1885ded59a2b5a8d", + "threadId": "1885ded59a2b5a8d", + "labelIds": ["STARRED", "SENT", "INBOX"], + "snippet": "See attachment", + "sizeEstimate": 2587, + "raw": "UmVjZWl2ZWQ6IGZyb20gNzE3Mjg0NzMwMjQ0DQoJbmFtZWQgdW5rbm93bg0KCWJ5IGdtYWlsYXBpLmdvb2dsZS5jb20NCgl3aXRoIEhUVFBSRVNUOw0KCVNhdCwgMjcgTWF5IDIwMjMgMTA6NTY6NTUgLTA1MDANCkNvbnRlbnQtVHlwZTogbXVsdGlwYXJ0L21peGVkOw0KIGJvdW5kYXJ5PSItLS0tc2luaWthZWwtPz1fMS0xNjg1MjAzMDE1NzIyMC4yMDI5NDc1ODM4NTM1NzkwMyINCk9wZW5wZ3A6IGlkPTlCQTM5Q0UwNzVGMDgzOUIzMDM0MEZDODA3NDgxQzhBQ0Y5RDQ5RkUNCkZyb206IEdtYWlsIENJIFRlc3QgPGNpLnRlc3RzLmdtYWlsQGZsb3djcnlwdC5kZXY-DQpUbzogR21haWwgQ0kgVGVzdCA8Y2kudGVzdHMuZ21haWxAZmxvd2NyeXB0LmRldj4NClN1YmplY3Q6IEknbSBhdHRhY2hpbmcgY2xlYXJ0ZXh0IHNpZ25lZCBtZXNzYWdlIGFzIGFuIGF0dGFjaG1lbnQNCkRhdGU6IFNhdCwgMjcgTWF5IDIwMjMgMTA6NTY6NTUgLTA1MDANCk1lc3NhZ2UtSWQ6IDxDQU85Rlk5dXU3aUZSPVlaSlkyZSt0d1VqTjZ5OURLR0w1R2JPc1JTTTBEdTFPNWY4NHdAbWFpbC5nbWFpbC5jb20-DQpNSU1FLVZlcnNpb246IDEuMA0KDQotLS0tLS1zaW5pa2FlbC0_PV8xLTE2ODUyMDMwMTU3MjIwLjIwMjk0NzU4Mzg1MzU3OTAzDQpDb250ZW50LVR5cGU6IHRleHQvcGxhaW4NCkNvbnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6IHF1b3RlZC1wcmludGFibGUNCg0KU2VlIGF0dGFjaG1lbnQNCi0tLS0tLXNpbmlrYWVsLT89XzEtMTY4NTIwMzAxNTcyMjAuMjAyOTQ3NTgzODUzNTc5MDMNCkNvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vb2N0ZXQtc3RyZWFtOyBuYW1lPXNhbXBsZV9jbGVhcnRleHQuYXNjDQpDb250ZW50LURpc3Bvc2l0aW9uOiBhdHRhY2htZW50OyBmaWxlbmFtZT1zYW1wbGVfY2xlYXJ0ZXh0LmFzYw0KWC1BdHRhY2htZW50LUlkOiBmX0pBRXdJaUhBbEdhSmFPSU1SUG9wdG12WFNpQW1ZREBmbG93Y3J5cHQNCkNvbnRlbnQtSWQ6IDxmX0pBRXdJaUhBbEdhSmFPSU1SUG9wdG12WFNpQW1ZREBmbG93Y3J5cHQ-DQpDb250ZW50LVRyYW5zZmVyLUVuY29kaW5nOiBiYXNlNjQNCg0KTFMwdExTMUNSVWRKVGlCUVIxQWdVMGxIVGtWRUlFMUZVMU5CUjBVdExTMHRMUTBLU0dGemFEb2dVMGhCTWpVMkRRb05DbE4wWVc1aw0KWVhKa0lHMWxjM05oWjJVTkNnMEtjMmxuYm1Wa0lHbHViR2x1WlEwS0RRcHphRzkxYkdRZ1pXRnphV3g1SUhabGNtbG1lUTBLVkdocA0KY3lCcGN5QmxiV0ZwYkNCbWIyOTBaWElOQ2kwdExTMHRRa1ZIU1U0Z1VFZFFJRk5KUjA1QlZGVlNSUzB0TFMwdERRcFdaWEp6YVc5dQ0KT2lCR2JHOTNRM0o1Y0hRZ05TNHdMalFnUjIxaGFXd2dSVzVqY25sd2RHbHZiaUJtYkc5M1kzSjVjSFF1WTI5dERRcERiMjF0Wlc1MA0KT2lCVFpXRnRiR1Z6YzJ4NUlITmxibVFzSUhKbFkyVnBkbVVnWVc1a0lITmxZWEpqYUNCbGJtTnllWEIwWldRZ1pXMWhhV3dOQ2cwSw0KZDNOR1kwSkJSVUpEUVVGUlFsRktXaXMzTkZsRFVrRkhlV3hWSzNkclZtUmpRVUZCWmtGclVVRkxXWGRVUTFGVldEUkxNalpxZDNwTA0KVUVjd0RRcDFaVFlyYWxONVozQnJUbXh6U0hGbWJ6ZGFWVEJUV1dKMllXOHdlRVZ2TVZGUlVIazVlbFpYTjNwUU16bFZRVXBhYTA0MQ0KUlhCSlFWSkNla1lOQ2pZM01VRkJNM013UzNScmJreDBNRUZaWm1sVVNtUnJjVlJwYUZKcVNscElRa2hSWTNocmEyRnFkM01yTTBKeQ0KT0c5Q2FXVkNOSHBwTVRsSFNnMEtiMDl4YW5scE1uVjRiRGRDZVRWRFUxQXlNemhDTmtOWVFsUm5ZVmxyYUM4M1ZIQlpTa1JuUm5wMQ0KYUhSWWRIZ3dZVmRDVURsb04xUm5SVmxPRFFwQldVNXRkRWRKZEZRMlZ6SlJMMHB2UWpJNVkxWnplSGwxWjFaelVXaGtaazA0UkVFMQ0KVFhCRldsa3lXbXN2SzFWSVdFNHdURFExY2tWS1Jtb05DamhJU210U09ETjJiMmwzUVdVMlJHUnJURkZJWWxsbVZubDBVMFJhVGl0TA0KT0RCNFRpOVdRMUZtWkdRM0swaExjRXRpWm5SSmFXY3dZMWh0Y2cwS0swOXpiMFJOUjNaUVYydEhSWEZLVW1nMU4ySmxlbGRtZWpacQ0KYm10VFUwcFRXRGx0V0VaSE5rdFRTako0ZFdvek1HNVFXSE5zTVZkdU1WaDJEUXAzVWpWVU0wd3lhMFIxYzJ4MVJrVlNhWEV3VG01TA0KUkhkQmRtVklXa2w2YURkNGRHcHRXVkpzUjFaT2RXcDBZVEJ4VkZGWVZIbGhhbmhFY0hVTkNtZGFTWEZhUzJwRVZscHdOME5xUzFsWg0KVUhwMloxVnphV2hRZW14bmVYRkJiMlJyVFhCc0wwbG9XV2xrVUUxQ01UTTFiRlkwUWtKTFNISkdNZzBLVlhKaVlqSjBXRTFJWVRaeQ0KUlZwdmFqWnFZbE13ZFhjdlR6Rm1VMEpLUVZOWlpteHlTakZOT0ZsTWMwWkRkMEpJY0UxWFYwd3pPRzlxWW0xTERRcHBNVVZJV1VsVg0KT0VFdmVUQnhSVXhRY0V0dmNtZHVURTVMYURoME1EVmhNREZ1Y2xWWFpDOWxXRVJMVXpGaVlrZHNUR1ZTTmxJdldYWlBUVFVOQ2tGRQ0KYW5abmVYZHdhVWR0Y25ka1pXaHBiMHQwVXpCVGNraFNka1Y0V1hnNGIzSjVNR2xNYnpCalRFZEZVa0Z5V2pOcWVXTkdPRVlyVXpKWQ0KY0EwS05VSnVTUTBLUFVZeWIyME5DaTB0TFMwdFJVNUVJRkJIVUNCVFNVZE9RVlJWVWtVdExTMHRMUTBLDQotLS0tLS1zaW5pa2FlbC0_PV8xLTE2ODUyMDMwMTU3MjIwLjIwMjk0NzU4Mzg1MzU3OTAzLS0NCg==", + "historyId": "2673627", + "internalDate": "1685203015000" + } +} diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index 71724ca1ed3..85593825469 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -341,6 +341,24 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te }) ); + test( + `decrypt - cleartext signed message detected in an attachment`, + testWithBrowser(async (t, browser) => { + const { authHdr } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'ci.tests.gmail'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + '1885ded59a2b5a8d', + { + content: ['Standard message', 'signed inline', 'should easily verify', 'This is email footer'], + encryption: 'not encrypted', + signature: 'could not verify signature: missing pubkey 06CA553EC2455D70', + }, + authHdr + ); + }) + ); + test( `decrypt - [gpgmail] signed message will get parsed and rendered (though verification fails, enigmail does the same)`, testWithBrowser(async (t, browser) => { From 96b7097faf20edfe1347537466f344db8fede8eb Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sat, 27 May 2023 19:51:26 +0100 Subject: [PATCH 097/147] test fix --- extension/js/common/core/attachment.ts | 5 +++-- test/source/tests/gmail.ts | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/extension/js/common/core/attachment.ts b/extension/js/common/core/attachment.ts index f5fc064f565..db73adb6bea 100644 --- a/extension/js/common/core/attachment.ts +++ b/extension/js/common/core/attachment.ts @@ -8,7 +8,8 @@ import { Str } from './common.js'; export type Attachment$treatAs = | 'publicKey' | 'privateKey' - | 'encryptedMsg' // may be signed-only (known as 'signedMsg'), "encrypted" here means that the message is constructed as a whole (decryptable by MsgUtil.decryptMessage) + | 'encryptedMsg' /* may be signed-only (known as 'signedMsg' in MsgBlockType) as well, + should probably be renamed to 'cryptoMsg' to not be confused with 'encryptedMsg' in MsgBlockType */ | 'hidden' | 'signature' | 'encryptedFile' @@ -190,7 +191,7 @@ export class Attachment { } else if (Attachment.encryptedMsgNames.includes(this.name)) { return 'encryptedMsg'; } else if (this.name === 'message' && isBodyEmpty) { - // treat message as cryptoMsg when empty body for the 'message' attachment + // treat message as encryptedMsg when empty body for the 'message' attachment return 'encryptedMsg'; } else if (this.name.match(/(\.pgp$)|(\.gpg$)|(\.[a-zA-Z0-9]{3,4}\.asc$)/g)) { // ends with one of .gpg, .pgp, .???.asc, .????.asc diff --git a/test/source/tests/gmail.ts b/test/source/tests/gmail.ts index 92e903f59d4..a1f72d649ea 100644 --- a/test/source/tests/gmail.ts +++ b/test/source/tests/gmail.ts @@ -203,7 +203,7 @@ export const defineGmailTests = (testVariant: TestVariant, testWithBrowser: Test signature: 'signed', }); await pageHasSecureReplyContainer(t, browser, gmailPage); - await testMinimumElementHeight(gmailPage, '.pgp_block.signedMsg', 80); + await testMinimumElementHeight(gmailPage, '.pgp_block.signedDetached', 80); await testMinimumElementHeight(gmailPage, '.pgp_block.publicKey', 120); const pubkeyPage = await gmailPage.getFrame(['/chrome/elements/pgp_pubkey.htm']); await pubkeyPage.waitForContent('@container-pgp-pubkey', 'Fingerprint: 50B7 A032 B5E1 FBAB 24BA B205 B362 45FD AC2F BF3D'); @@ -222,7 +222,7 @@ export const defineGmailTests = (testVariant: TestVariant, testWithBrowser: Test appearIn: 25, }); expect(pgpBlockUrls.length).to.equal(1); - await testMinimumElementHeight(gmailPage, '.pgp_block.signedMsg', 80); + await testMinimumElementHeight(gmailPage, '.pgp_block.signedDetached', 80); await testMinimumElementHeight(gmailPage, '.pgp_block.publicKey', 120); const pgpBlockFrame = await gmailPage.getFrame([pgpBlockUrls[0]]); await BrowserRecipe.pgpBlockCheck(t, pgpBlockFrame, { From 88560a60f586a4d2412a1a31cbbb651aac68b481 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sun, 28 May 2023 12:46:32 +0100 Subject: [PATCH 098/147] nicer mock attachment UI --- test/source/mock/google/google-data.ts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/test/source/mock/google/google-data.ts b/test/source/mock/google/google-data.ts index 80cfa3b9a6d..c96ed9494e5 100644 --- a/test/source/mock/google/google-data.ts +++ b/test/source/mock/google/google-data.ts @@ -253,11 +253,18 @@ export class GoogleData {
` + otherParts .map( - part => ` -
+ part => ` + +
+
+
${Xss.escape(part.filename!)}
- ` + ` ) .join('') + '
'; From 19985de182037b9cc40419ee82f67fd4d281ff70 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sun, 28 May 2023 16:19:45 +0100 Subject: [PATCH 099/147] fixed comment --- extension/js/common/message-renderer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index 59ed8df59ec..6c4b28ce2fa 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -682,7 +682,7 @@ export class MessageRenderer { private processMessageWithDetachedSignature = async (msgId: string, renderModule: RenderInterface, senderEmail: string | undefined) => { try { renderModule.renderText('Loading signed message...'); - const raw = await this.msgGetRaw(msgId); // todo: not necessary as long as we can extract text and signature attachment from 'full' + const raw = await this.msgGetRaw(msgId); // todo: can we try to restore the content attachment from 'full'? // eslint-disable-next-line @typescript-eslint/no-non-null-assertion return await this.processMessageWithDetachedSignatureFromRaw(raw!, renderModule, senderEmail); } catch { From 4247406d8d5c742e5f7246bd6377c4f9cd12e42b Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 29 May 2023 14:27:09 +0100 Subject: [PATCH 100/147] failure to fetch raw signed message will result in attachment status error --- extension/js/common/message-renderer.ts | 26 +++++++-------------- test/source/mock/google/google-endpoints.ts | 4 ++-- test/source/tests/decrypt.ts | 26 +++++++++++++++++---- 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index 6c4b28ce2fa..af2b2b09d34 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -281,6 +281,15 @@ export class MessageRenderer { console.debug('processAttachment() try -> awaiting done and processed'); } } + if (treatAs === 'signature') { + // we could change 'Getting file info..' to 'Loading signed message..' in attachment_loader element + const raw = await this.msgGetRaw(msgId); // todo: can we try to restore the content attachment from 'full'? + loaderContext.hideAttachment(attachmentSel); + await this.setMsgBodyAndStartProcessing(loaderContext, 'signedDetached', messageInfo.printMailInfo, messageInfo.from?.email, renderModule => + this.processMessageWithDetachedSignatureFromRaw(raw, renderModule, messageInfo.from?.email) + ); + return 'hidden'; // native attachment should be hidden, the "attachment" goes to the message container + } if (treatAs !== 'plainFile') { loaderContext.hideAttachment(attachmentSel); } @@ -300,11 +309,6 @@ export class MessageRenderer { return await this.renderPublicKeyFromFile(a, loaderContext, this.isOutgoing(messageInfo.from?.email), attachmentSel); } else if (treatAs === 'privateKey') { return await this.renderBackupFromFile(a, loaderContext, this.isOutgoing(messageInfo.from?.email)); - } else if (treatAs === 'signature') { - await this.setMsgBodyAndStartProcessing(loaderContext, 'signedDetached', messageInfo.printMailInfo, messageInfo.from?.email, renderModule => - this.processMessageWithDetachedSignature(msgId, renderModule, messageInfo.from?.email) - ); - return 'hidden'; // native attachment should be hidden, the "attachment" goes to the message container } else { // standard file loaderContext.renderPlainAttachment(a, attachmentSel); @@ -679,18 +683,6 @@ export class MessageRenderer { await this.relayAndStartProcessing(this.relayManager, loaderContext, loaderContext.factory, frameId, printMailInfo, senderEmail, cb); }; - private processMessageWithDetachedSignature = async (msgId: string, renderModule: RenderInterface, senderEmail: string | undefined) => { - try { - renderModule.renderText('Loading signed message...'); - const raw = await this.msgGetRaw(msgId); // todo: can we try to restore the content attachment from 'full'? - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - return await this.processMessageWithDetachedSignatureFromRaw(raw!, renderModule, senderEmail); - } catch { - // todo: render error via renderModule - } - return {}; - }; - private processCryptoMessage = async ( attachment: Attachment, renderModule: RenderInterface, diff --git a/test/source/mock/google/google-endpoints.ts b/test/source/mock/google/google-endpoints.ts index 7f09b86da0d..e301d716160 100644 --- a/test/source/mock/google/google-endpoints.ts +++ b/test/source/mock/google/google-endpoints.ts @@ -59,7 +59,7 @@ export interface GoogleConfig { contacts?: string[]; othercontacts?: string[]; aliases?: Dict; - getMsg?: Dict<{ error: Error } | { msg: GmailMsg }>; + getMsg?: Dict>; htmlRenderer?: (msgId: string, prerendered?: string) => string | undefined; } @@ -226,7 +226,7 @@ export const getMockGoogleEndpoints = (oauth: OauthMock, config: GoogleConfig | } throw new HttpClientErr(`MOCK attachment not found for ${acct}: ${id}`, Status.NOT_FOUND); } - const found = config?.getMsg?.[id]; + const found = config?.getMsg?.[id]?.[format]; if (found && 'error' in found) throw found.error; const msg = found?.msg ? found.msg : data.getMessage(id); if (msg) { diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index 85593825469..03761d74863 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -5,7 +5,6 @@ import test 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 { TestWithBrowser } from './../test'; @@ -214,7 +213,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te const { authHdr } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'ci.tests.gmail'); t.mockApi!.configProvider!.config.google = { getMsg: { - '17b91b7e122902d2': { error: new HttpClientErr('RequestTimeout', Status.BAD_REQUEST) }, + '17b91b7e122902d2': { full: { error: new HttpClientErr('RequestTimeout', Status.BAD_REQUEST) } }, }, }; await BrowserRecipe.pgpBlockVerifyDecryptedContent( @@ -231,6 +230,25 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te }) ); + test( + 'mail.google.com - failure fetching raw message for detached signature - sets attachment status', + testWithBrowser(async (t, browser) => { + const { authHdr } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'compatibility'); + const msgId = '17daefa0eb077da6'; + t.mockApi!.configProvider!.config.google = { + getMsg: { + [msgId]: { raw: { error: new HttpClientErr('RequestTimeout', Status.BAD_REQUEST) } }, + }, + }; + const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${msgId}`, undefined, authHdr); + await gmailPage.waitAll('iframe'); + // no pgp_block + expect((await gmailPage.getFramesUrls(['pgp_block.htm'])).length).to.equal(0); + await gmailPage.waitForContent('.attachment_loader', 'Categorize: net err'); + await gmailPage.waitForContent('.aV3', 'OpenPGP_signature'); + }) + ); + test( `decrypt - without a subject`, testWithBrowser(async (t, browser) => { @@ -1588,14 +1606,12 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== testWithBrowser(async (t, browser) => { const acctEmail = 'flowcrypt.compatibility@gmail.com'; const msgId = '175ccd8755eab85f'; - const data = await GoogleData.withInitializedData(acctEmail); // eslint-disable @typescript-eslint/no-non-null-assertion - const { id, threadId, historyId, payload } = data.getMessage(msgId)!; t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), google: { getMsg: { - [msgId]: { msg: { id, threadId, historyId, payload, raw: 'RSo' } }, // corrupted raw part + [msgId]: { raw: { msg: { id: msgId, threadId: msgId, historyId: msgId, raw: 'RSo' } } }, // corrupted raw part }, }, }); From 0249c4fefdf35f725f65a29eca20f58c5274a736 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 29 May 2023 14:29:20 +0100 Subject: [PATCH 101/147] made method getFileParts private --- test/source/mock/google/google-data.ts | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/test/source/mock/google/google-data.ts b/test/source/mock/google/google-data.ts index c96ed9494e5..0fcdb4f4258 100644 --- a/test/source/mock/google/google-data.ts +++ b/test/source/mock/google/google-data.ts @@ -216,19 +216,6 @@ export class GoogleData { return msgCopy; }; - public static getFileParts = (parts: GmailMsg$payload$part[] | undefined, skipParts: GmailMsg$payload$part[]): { filename: string }[] => { - if (!parts) return []; - return parts - .filter(part => part.mimeType !== 'multipart/alternative' && !skipParts.includes(part)) - .map(part => { - if (part.mimeType === 'multipart/mixed') { - return GoogleData.getFileParts(part.parts, skipParts); - } - return [{ filename: part.filename || 'noname' }]; - }) - .reduce((a, b) => a.concat(b), []); - }; - public static getMockGmailPage = async (acct: string, msgId?: string, htmlRenderer?: (msgId: string, prerendered?: string) => string | undefined) => { let msgBlock = ''; let attachmentsBlock = ''; @@ -295,6 +282,19 @@ export class GoogleData { `; }; + private static getFileParts = (parts: GmailMsg$payload$part[] | undefined, skipParts: GmailMsg$payload$part[]): { filename: string }[] => { + if (!parts) return []; + return parts + .filter(part => part.mimeType !== 'multipart/alternative' && !skipParts.includes(part)) + .map(part => { + if (part.mimeType === 'multipart/mixed') { + return GoogleData.getFileParts(part.parts, skipParts); + } + return [{ filename: part.filename || 'noname' }]; + }) + .reduce((a, b) => a.concat(b), []); + }; + private static msgSubject = (m: GmailMsg): string => { const subjectHeader = m.payload && m.payload.headers && m.payload.headers.find(h => h.name === 'Subject'); return (subjectHeader && subjectHeader.value) || ''; From f3011fa298034dc1e347c84237e9a77c9fe48fbf Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 29 May 2023 18:22:15 +0100 Subject: [PATCH 102/147] code cleanup --- extension/js/content_scripts/webmail/gmail-element-replacer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index b327afffa77..b508582f35c 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -446,7 +446,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { msgId, messageInfo ); - if (['hidden', 'tomessage'].includes(renderStatus)) { + if (renderStatus === 'hidden') { nRenderedAttachments--; } // if (renderStatus === 'shown') attachmentSel.show(); From 7e447af73ab9942bb9dc8d0a81f9cabfd302e400 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 30 May 2023 19:30:04 +0100 Subject: [PATCH 103/147] simplifications, resource release related to relay manager and passphrase awaiting loop --- extension/chrome/elements/pgp_block.ts | 4 +- .../inbox-active-thread-module.ts | 2 +- extension/chrome/settings/inbox/inbox.ts | 3 +- .../js/common/loader-context-interface.ts | 2 +- extension/js/common/message-renderer.ts | 34 ++++--- .../js/common/relay-manager-interface.ts | 2 +- extension/js/common/relay-manager.ts | 97 ++++++++++++++----- extension/js/common/render-interface.ts | 3 +- extension/js/common/render-message.ts | 2 +- extension/js/common/render-relay.ts | 3 - .../webmail/gmail-element-replacer.ts | 2 +- 11 files changed, 102 insertions(+), 52 deletions(-) diff --git a/extension/chrome/elements/pgp_block.ts b/extension/chrome/elements/pgp_block.ts index 7b2126eee28..b58913587f1 100644 --- a/extension/chrome/elements/pgp_block.ts +++ b/extension/chrome/elements/pgp_block.ts @@ -98,8 +98,8 @@ export class PgpBlockView extends View { if (data?.clearErrorStatus) { this.renderModule.clearErrorStatus(); } - if (data?.setTestState) { - Ui.setTestState(data.setTestState); + if (data?.done) { + Ui.setTestState('ready'); } if (data?.printMailInfo) { Xss.sanitizeRender('.print_user_email', data.printMailInfo.userNameAndEmail); diff --git a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts index 0cf10c07d29..de2ec33bc79 100644 --- a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts +++ b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts @@ -170,7 +170,7 @@ export class InboxActiveThreadModule extends ViewModule { : ''); $('.thread').append(this.wrapMsg(htmlId, r)); // xss-safe-factory loaderContext.completeBinding(this.view.relayManager); - this.view.messageRenderer.processInlineBlocks(this.view.relayManager, this.view.factory, messageInfo, blocksInFrames).catch(Catch.reportErr); + await this.view.messageRenderer.startProcessingInlineBlocks(this.view.relayManager, this.view.factory, messageInfo, blocksInFrames); if (exportBtn) { $('.action-export').on( 'click', diff --git a/extension/chrome/settings/inbox/inbox.ts b/extension/chrome/settings/inbox/inbox.ts index d111d1083c3..e1914fb800a 100644 --- a/extension/chrome/settings/inbox/inbox.ts +++ b/extension/chrome/settings/inbox/inbox.ts @@ -46,7 +46,7 @@ export class InboxView extends View { public factory!: XssSafeFactory; public picture?: string; public tabId!: string; - public relayManager = new RelayManager(); + public relayManager!: RelayManager; public constructor() { super(); @@ -56,6 +56,7 @@ export class InboxView extends View { this.threadId = Assert.urlParamRequire.optionalString(uncheckedUrlParams, 'threadId'); this.showOriginal = uncheckedUrlParams.showOriginal === true; this.debug = uncheckedUrlParams.debug === true; + this.relayManager = new RelayManager(this.debug); this.S = Ui.buildJquerySels({ threads: '.threads', thread: '.thread', body: 'body' }); this.gmail = new Gmail(this.acctEmail); this.inboxMenuModule = new InboxMenuModule(this); diff --git a/extension/js/common/loader-context-interface.ts b/extension/js/common/loader-context-interface.ts index 5f23f169a6f..7347ba3d923 100644 --- a/extension/js/common/loader-context-interface.ts +++ b/extension/js/common/loader-context-interface.ts @@ -29,7 +29,7 @@ export interface LoaderContextInterface extends LoaderContextBindInterface { export const bindNow = (frameId: string, binder: BindInterface) => { const embeddedReference = XssSafeFactory.getEmbeddedMsg(frameId); if (embeddedReference) { - binder.bind(frameId, embeddedReference.frameWindow); + binder.bind(frameId, embeddedReference); } else { Catch.report('Unexpected: unable to reference a newly created message frame'); } diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index af2b2b09d34..2296526d709 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -158,7 +158,6 @@ export class MessageRenderer { } else { MessageRenderer.renderMissingPubkeyOrBadSignature(renderModule, verifyRes); } - renderModule.setTestState('ready'); }; private static renderMissingPubkeyOrBadSignature = (renderModule: RenderInterfaceBase, verifyRes: VerifyRes): void => { @@ -326,7 +325,7 @@ export class MessageRenderer { } }; - public processInlineBlocks = async (relayManager: RelayManager, factory: XssSafeFactory, messageInfo: MessageInfo, blocks: Dict) => { + public startProcessingInlineBlocks = async (relayManager: RelayManager, factory: XssSafeFactory, messageInfo: MessageInfo, blocks: Dict) => { await Promise.all( Object.entries(blocks).map(([frameId, block]) => this.relayAndStartProcessing( @@ -509,7 +508,6 @@ export class MessageRenderer { renderModule.renderInnerAttachments(renderableAttachments, isEncrypted); } renderModule.resizePgpBlockFrame(); - renderModule.setTestState('ready'); return isEncrypted ? { publicKeys } : {}; }; @@ -521,32 +519,38 @@ export class MessageRenderer { printMailInfo: PrintMailInfo | undefined, senderEmail: string | undefined, cb: (renderModule: RenderInterface, frameId: string) => Promise<{ publicKeys?: string[]; needPassphrase?: string[] }> - ) => { - const renderModule = relayManager.createRelay(frameId); + ): Promise<{ processor: Promise }> => { + const { renderModule, cancellation } = relayManager.createRelay(frameId); loaderContext.bind(frameId, relayManager); if (printMailInfo) { renderModule.setPrintMailInfo(printMailInfo); } - cb(renderModule, frameId) + const processor = cb(renderModule, frameId) .then(async result => { const appendAfter = $(`iframe#${frameId}`); // todo: late binding? won't work // todo: how publicKeys and needPassphrase interact? for (const armoredPubkey of result.publicKeys ?? []) { appendAfter.after(factory.embeddedPubkey(armoredPubkey, this.isOutgoing(senderEmail))); } - while (result.needPassphrase) { - // todo: queue into a dictionary? - await PassphraseStore.waitUntilPassphraseChanged(this.acctEmail, result.needPassphrase); + while (result.needPassphrase && !cancellation.cancel) { + // if we need passphrase, we have to be able to re-try decryption indefinitely on button presses, + // so we can only release resources when the frame is detached + await PassphraseStore.waitUntilPassphraseChanged(this.acctEmail, result.needPassphrase, 1000, cancellation); + if (cancellation.cancel) { + if (this.debug) { + console.debug('Destination frame was detached -- stopping processing'); + } + break; + } renderModule.clearErrorStatus(); renderModule.renderText('Decrypting...'); result = await cb(renderModule, frameId); + // I guess, no additional publicKeys will appear here for display... } - // todo: wait for renderModule completion: the queue has been actually flushed, - // and then remove the frame from relayManager.frames - // Something like: - // await relayManager.waitForCompletion(renderModule) }) + .finally(() => relayManager.done(frameId)) .catch(Catch.reportErr); + return { processor }; }; private renderMsgBlock = async ( @@ -677,10 +681,10 @@ export class MessageRenderer { printMailInfo: PrintMailInfo | undefined, senderEmail: string | undefined, cb: (renderModule: RenderInterface, frameId: string) => Promise<{ publicKeys?: string[] }> - ) => { + ): Promise<{ processor: Promise }> => { const { frameId, frameXssSafe } = loaderContext.factory.embeddedRenderMsg(type); loaderContext.setMsgBody(frameXssSafe, 'set'); - await this.relayAndStartProcessing(this.relayManager, loaderContext, loaderContext.factory, frameId, printMailInfo, senderEmail, cb); + return await this.relayAndStartProcessing(this.relayManager, loaderContext, loaderContext.factory, frameId, printMailInfo, senderEmail, cb); }; private processCryptoMessage = async ( diff --git a/extension/js/common/relay-manager-interface.ts b/extension/js/common/relay-manager-interface.ts index 51917d03da5..497619d3c0d 100644 --- a/extension/js/common/relay-manager-interface.ts +++ b/extension/js/common/relay-manager-interface.ts @@ -9,5 +9,5 @@ export interface RelayManagerInterface { } export interface BindInterface { - bind(frameId: string, frameWindow: Window): void; + bind(frameId: string, reference: { frameWindow: Window; frameElement: HTMLIFrameElement }): void; } diff --git a/extension/js/common/relay-manager.ts b/extension/js/common/relay-manager.ts index 2cec50b4d6d..d75255b5a61 100644 --- a/extension/js/common/relay-manager.ts +++ b/extension/js/common/relay-manager.ts @@ -3,17 +3,39 @@ 'use strict'; import { Bm } from './browser/browser-msg.js'; +import { PromiseCancellation } from './core/common.js'; import { BindInterface, RelayManagerInterface } from './relay-manager-interface.js'; import { RenderInterface } from './render-interface.js'; import { RenderMessage } from './render-message.js'; import { RenderRelay } from './render-relay.js'; -type FrameEntry = { frameWindow?: Window; readyToReceive?: true; queue: RenderMessage[]; progressText?: string }; +type FrameEntry = { + frameWindow?: Window; + readyToReceive?: true; + queue: RenderMessage[]; + cancellation: PromiseCancellation; + progressText?: string; +}; export class RelayManager implements RelayManagerInterface, BindInterface { + private static readonly completionMessage: RenderMessage = { done: true }; private readonly frames = new Map(); + private readonly frameElementsMap = new Map(); private readonly targetOrigin = chrome.runtime.getURL(''); + public constructor(private debug: boolean = false) { + const framesObserver = new MutationObserver(async mutationsList => { + for (const mutation of mutationsList) { + if (mutation.type === 'childList') { + for (const removedNode of mutation.removedNodes) { + this.dropRemovedNodes(removedNode); + } + } + } + }); + framesObserver.observe(window.document, { subtree: true, childList: true }); + } + public static getPercentage = (percent: number | undefined, loaded: number, total: number, expectedTransferSize: number) => { if (typeof percent === 'undefined') { if (total || expectedTransferSize) { @@ -24,68 +46,95 @@ export class RelayManager implements RelayManagerInterface, BindInterface { }; public relay = (frameId: string, message: RenderMessage) => { - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - const { frameWindow, readyToReceive, queue } = this.frames.get(frameId)!; - queue.push(message); - if (readyToReceive && frameWindow) { - this.flush({ frameWindow, queue }); + const frameData = this.frames.get(frameId); + if (frameData) { + frameData.queue.push(message); + if (frameData.readyToReceive && frameData.frameWindow) { + this.flush({ frameId, frameWindow: frameData.frameWindow, queue: frameData.queue }); + } } }; - public createRelay = (frameId: string): RenderInterface => { - this.getOrCreate(frameId); - return new RenderRelay(this, frameId); + public createRelay = (frameId: string): { renderModule: RenderInterface; cancellation: PromiseCancellation } => { + const frameData = this.getOrCreate(frameId); + return { renderModule: new RenderRelay(this, frameId), cancellation: frameData.cancellation }; + }; + + public done = (frameId: string) => { + this.relay(frameId, RelayManager.completionMessage); }; public readyToReceive = (frameId: string) => { const frameData = this.getOrCreate(frameId); frameData.readyToReceive = true; if (frameData.frameWindow) { - this.flush({ frameWindow: frameData.frameWindow, queue: frameData.queue }); + this.flush({ frameId, frameWindow: frameData.frameWindow, queue: frameData.queue }); } }; public renderProgressText = (frameId: string, text: string) => { - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - const frameData = this.frames.get(frameId)!; - frameData.progressText = text; - this.relay(frameId, { renderText: text }); + const frameData = this.frames.get(frameId); + if (frameData) { + frameData.progressText = text; + this.relay(frameId, { renderText: text }); + } }; public renderProgress = ({ frameId, percent, loaded, total, expectedTransferSize }: Bm.AjaxProgress) => { const perc = RelayManager.getPercentage(percent, loaded, total, expectedTransferSize); if (typeof perc !== 'undefined') { - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - const { readyToReceive, progressText } = this.frames.get(frameId)!; - if (readyToReceive && typeof progressText !== 'undefined') { - this.relay(frameId, { renderText: `${progressText} ${perc}%` }); + const frameData = this.frames.get(frameId); + if (frameData?.readyToReceive && typeof frameData.progressText !== 'undefined') { + this.relay(frameId, { renderText: `${frameData.progressText} ${perc}%` }); } } }; - public bind = (frameId: string, frameWindow: Window) => { + public bind = (frameId: string, { frameElement, frameWindow }: { frameElement: HTMLIFrameElement; frameWindow: Window }) => { // eslint-disable-next-line @typescript-eslint/no-non-null-assertion const frameData = this.frames.get(frameId)!; frameData.frameWindow = frameWindow; + this.frameElementsMap.set(frameElement, frameId); if (frameData.readyToReceive) { - this.flush({ frameWindow, queue: frameData.queue }); + this.flush({ frameId, frameWindow, queue: frameData.queue }); + } + }; + + private dropRemovedNodes = (removedNode: Node) => { + const frameId = this.frameElementsMap.get(removedNode); + if (frameId) { + if (this.debug) { + console.debug('releasing resources connected to frameId=', frameId); + } + this.frameElementsMap.delete(removedNode); + const frameData = this.frames.get(frameId); + if (frameData) { + frameData.cancellation.cancel = true; + this.frames.delete(frameId); + } + } else { + for (const childNode of removedNode.childNodes) { + this.dropRemovedNodes(childNode); + } } }; private getOrCreate = (frameId: string): FrameEntry => { const frameEntry = this.frames.get(frameId); if (frameEntry) return frameEntry; - const newFrameEntry = { queue: [] }; + const newFrameEntry = { queue: [], cancellation: { cancel: false } }; this.frames.set(frameId, newFrameEntry); return newFrameEntry; }; - private flush = ({ frameWindow, queue }: { frameWindow: Window; queue: RenderMessage[] }) => { + private flush = ({ frameId, frameWindow, queue }: { frameId: string; frameWindow: Window; queue: RenderMessage[] }) => { while (true) { const message = queue.shift(); if (message) { - frameWindow.postMessage(message, this.targetOrigin); // todo: test in Firefox - // todo: if ready status, release resources -- callback function? + frameWindow.postMessage(message, this.targetOrigin); + if (message === RelayManager.completionMessage) { + this.frames.delete(frameId); // todo: also delete related this.frameElementsMap entry? + } } else break; } }; diff --git a/extension/js/common/render-interface.ts b/extension/js/common/render-interface.ts index 1669a5bd878..5e80e5f0368 100644 --- a/extension/js/common/render-interface.ts +++ b/extension/js/common/render-interface.ts @@ -10,7 +10,7 @@ export interface RenderInterfaceBase { renderText(text: string): void; setFrameColor(color: 'red' | 'green' | 'gray'): void; renderEncryptionStatus(status: string): void; - renderSignatureStatus(status: string): void; // todo: need to implement "offline error"->"click"->retry scenario + renderSignatureStatus(status: string): void; } export interface RenderInterface extends RenderInterfaceBase { @@ -20,7 +20,6 @@ export interface RenderInterface extends RenderInterfaceBase { renderPassphraseNeeded(longids: string[]): void; renderErr(errBoxContent: string, renderRawMsg: string | undefined, errMsg?: string): void; renderInnerAttachments(attachments: TransferableAttachment[], isEncrypted: boolean): void; - setTestState(state: 'ready' | 'working' | 'waiting'): void; separateQuotedContentAndRenderText(decryptedContent: string, isHtml: boolean): void; renderVerificationInProgress(): void; } diff --git a/extension/js/common/render-message.ts b/extension/js/common/render-message.ts index 7ea26aedd63..9646f873813 100644 --- a/extension/js/common/render-message.ts +++ b/extension/js/common/render-message.ts @@ -20,7 +20,7 @@ export type MessageInfo = { }; export type RenderMessage = { - setTestState?: 'ready' | 'working' | 'waiting'; + done?: true; resizePgpBlockFrame?: true; separateQuotedContentAndRenderText?: { decryptedContent: string; isHtml: boolean }; renderText?: string; diff --git a/extension/js/common/render-relay.ts b/extension/js/common/render-relay.ts index 4f40b2b26e2..a27b2532cf6 100644 --- a/extension/js/common/render-relay.ts +++ b/extension/js/common/render-relay.ts @@ -18,9 +18,6 @@ export class RenderRelay implements RenderInterface { this.relay({ renderInnerAttachments: { attachments, isEncrypted } }); }; - public setTestState = (state: 'ready' | 'working' | 'waiting') => { - this.relay({ setTestState: state }); - }; public resizePgpBlockFrame = () => { this.relay({ resizePgpBlockFrame: true }); }; diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index b508582f35c..69a6a8f1d59 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -188,7 +188,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { if (this.debug) { console.debug('replaceArmoredBlocks() for of emailsContainingPgpBlock -> emailContainer replaced'); } - this.messageRenderer.processInlineBlocks(this.relayManager, this.factory, setMessageInfo, blocksInFrames).catch(Catch.reportErr); + await this.messageRenderer.startProcessingInlineBlocks(this.relayManager, this.factory, setMessageInfo, blocksInFrames).catch(Catch.reportErr); } }; From 4afd8f8299ac2ad7eb5e0b7a6d42c12f806bfeb1 Mon Sep 17 00:00:00 2001 From: Ioan Moldovan Date: Wed, 31 May 2023 10:38:30 -0400 Subject: [PATCH 104/147] fix: file encoding --- .../message-export-1821bf879a6f71e0.json | 118 ---------------- .../message-export-182263bf9f105adf.json | 118 ---------------- .../message-export-188721aebb71c16c.json | 126 ++++++++++++++++++ .../message-export-188722a157fd54a8.json | 126 ++++++++++++++++++ test/source/tests/compose.ts | 2 +- test/source/tests/settings.ts | 4 +- 6 files changed, 255 insertions(+), 239 deletions(-) delete mode 100644 test/source/mock/google/exported-messages/message-export-1821bf879a6f71e0.json delete mode 100644 test/source/mock/google/exported-messages/message-export-182263bf9f105adf.json create mode 100644 test/source/mock/google/exported-messages/message-export-188721aebb71c16c.json create mode 100644 test/source/mock/google/exported-messages/message-export-188722a157fd54a8.json diff --git a/test/source/mock/google/exported-messages/message-export-1821bf879a6f71e0.json b/test/source/mock/google/exported-messages/message-export-1821bf879a6f71e0.json deleted file mode 100644 index fd4ad86fb7c..00000000000 --- a/test/source/mock/google/exported-messages/message-export-1821bf879a6f71e0.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "acctEmail": "flowcrypt.compatibility@gmail.com", - "full": { - "id": "1821bf879a6f71e0", - "threadId": "1821bf879a6f71e0", - "labelIds": ["SENT"], - "snippet": "-----BEGIN PGP MESSAGE----- Version: FlowCrypt Email Encryption 8.3.1 Comment: Seamlessly send and receive encrypted email wV4DBQQnHrSzW44SAQdASAfSFmFf1F2NjOnjpPuSVUmgy+mtq9qzLrRy203g", - "payload": { - "partId": "", - "mimeType": "multipart/mixed", - "filename": "", - "headers": [ - { - "name": "Content-Type", - "value": "multipart/mixed; boundary=\"----sinikael-?=_1-16583266435440.5429396972265759\"" - }, - { - "name": "Openpgp", - "value": "id=E8F0517BA6D7DAB6081C96E4ADAC279C95093207" - }, - { - "name": "From", - "value": "sender@domain.com" - }, - { - "name": "To", - "value": "flowcrypt.compatibility@gmail.com" - }, - { - "name": "Subject", - "value": "Test attachment #3505" - }, - { - "name": "Date", - "value": "Wed, 20 Jul 2022 07:17:24 -0700" - }, - { - "name": "MIME-Version", - "value": "1.0" - } - ], - "body": { - "size": 0 - }, - "parts": [ - { - "partId": "0", - "mimeType": "text/plain", - "filename": "", - "headers": [ - { - "name": "Content-Type", - "value": "text/plain" - }, - { - "name": "Content-Transfer-Encoding", - "value": "quoted-printable" - } - ], - "body": { - "size": 2680, - "data": "LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tDQpWZXJzaW9uOiBGbG93Q3J5cHQgRW1haWwgRW5jcnlwdGlvbiA4LjMuMQ0KQ29tbWVudDogU2VhbWxlc3NseSBzZW5kIGFuZCByZWNlaXZlIGVuY3J5cHRlZCBlbWFpbA0KDQp3VjREQlFRbkhyU3pXNDRTQVFkQVNBZlNGbUZmMUYyTmpPbmpwUHVTVlVtZ3krbXRxOXF6THJSeTIwM2cNCnBBWXd3NTFBWVBSSFZZSGE3TE9mT2lzRGJGc3JXS3kzOERKUWpiaHJmenlJVy9XSVV3ZzRZQlhtc1o3SQ0KUzlPQUltVzJ3Y0ZNQTB0YUwvem1MWlVCQVEvNkFpcmxPSEdVL1lucjR6cFNBMlpSeTBDaGhGbHFuRTRvDQpwUTlrTUhndE51NndjNG8wVDBwM0VySWoxVHNSUm9UdDdRTFM0ZzhFemp1SDBHTWN0QlA4cWxMSFFrRFMNClF4bGgvaXZ1M0pGRWpXSU80N2psWDZJTmFIbXpsU080V0VqakNlUVJSRGlrT21tNVU0WWlqTC9NcmtoMA0KSytVMFlEc3JORjlha0VxR3NTRFdpemVRbXc4aDRyTVplckhBUmtkZFFGNzVRaDlKQzFrN3lWQTJodnBKDQpGQ0E3RDNodFhUK2ZPY1VBYlc3bzIrMEdZazR3a0M2OFRhL0Y0SWlwWVYwN1R0U0ttQWJvNTFOYWlWdHcNCklEMFJHK282Vnord0w0VzdvT1NoSFpaTllzZzlaS0hnNitNa1JwQitrZ3YyYzQwSkpWNmpsZTlsUVptaA0KTG1WMkwxbUxHeDhlaGkwS0hjNzV0Y0FCTmI4V0tYTmlQMkw1Q2tuSGtPaHYxTlBYdzNLZ052VlliN0tsDQpwdnJROGRlWjBqNk96K3V1NVRXZmI4ZFJZYjlNYVNHMmJwb1Uwa0ZwN0NKR3FPZmdQcUZIQUliSHdsWTMNCngrb2RNdXdUdHJHa2ozMTJ4anhJd1JaVXZkcm1UYzk4OTh4aVRDWDNpZDh5anJXd3gzUTA3MklscXZYVw0Kb2ZlRTVBelJQN2xiYkp5T05vTHlmNlEzaVlROUhTTS9ENVJ6cFFqZnY3SjNFNEZzNXBsM2phYjFhWG9LDQppaklPWFVBczJvdFdzWitDTWxzaUI4Wjg0ZTAvTHBSTzdudGtqOWtXRWZqY3pJNE1GYm9STHkzK2lCSjgNCkFVdkJKSlhpZTc3M0E5eVpDOWwrV0VoTWxxR0NGTFplZkhpSlk3Z0YxUERwRVVDVnB5bkJ3VXdEdmIxMg0KWVBhWmpjUUJFQUNhdWoyTEtYUk9NRnFGRFNSY1RGK2J0N1ZOS1VSVVQ1OHd6NUNwb3NRWFJGaGRwTXhrDQovUnVyRGV3VlNkYXI1MjVwNjJNNW1KYUxGUUxCZmhZa1h5OFVTbXo2WDllcjhqb3Fsb3lwcnAvMTVCL1ENClZUaHB5dUdlQmdYVmJMZXdmYVZSK0tSNEt0MllhVlQ0cUx4OUxpNVA5Y3VUd3R4SnBLOHdwdTNjd1JJdw0KQXJDWU9nbi9sVG1DSG04MXZCdjdGSmZkaC9GV3dDQVVZL3QyWXI0RTdHTjE5WDdxNm5RSWNsblcvUmZVDQpnQWhiSldSVk1OQWt0NmdQcWJ5M1VuTFZ2L1JiMC9MS1BQNyt5RUVtcWZ5M2RmZkw0VHBvMU1aUEhkNEYNCm4vcllnY1NIODRkWi94VDk0RDNza011cDc5UzRvcUFqVDBYYko2QlQ4cXVzSW9IRHhaelMyMnRwWExVZA0KajB1MXFFWjlKVlVRWVhKTERLYmtUUlNXWXp1emMzdXlyZ2RYd2UrRVNrb2RBcE1zRVpoUTVqRllzcHNYDQpCYktsYmNuRmROSWJ5S016VE0yMWlLWG90RmVsSnFZMHp5QzU4eldKNGpaZ1A3OGpaeFBING1TWkJYSXANCnF2UFRBZWpxK25Ub29mTVo3YTk5SHhPSU93L1llOHF1cWQ4TlJKU2VUVVdKRFFvZkpmaWpldXlIdW9BWg0Kakh5NDlaZk5uYmVobjQvNU5raVh6ckpoL1dzaTBaSGRad1pBMk16TkUrTFdtSkZOVERNT0tpaVJ2QktpDQpVN3EvSXpRdURuTVlySWFiUjZMWEZiRGlVZlRacTcxc3NPOVNFSS9JRGdHRmhJR0pxb1cvZHdNL1VHWVQNClFab284UnNtYmU1bFdmUkQvMFlSa05KNEZoSWVIYnlmeWRMQjRBSEJVdmpYWmdTZU55OVl5MFI5TDQ2MQ0KVFFGdHVHMjh5djR2RzVaTnorS1ZKZUtFT1VVYmtMN3hDWkdDTVlUc0ZmcGpyZEE0bWtGSDhIQjRia2xRDQpDSWRDT2tNbmJlSEdmSnc5em45ZDZRdFRkVXMyR0tRWncvYlB3bExYbDdQQW9wS0FjTmZDYzJnWTNDRzcNClFRSEcreEhwL1BNWFkxQy9kbHRUaFJJUkV6S2puejVDdndoV2FVb2JHaHhiL09pZ0tzQXlKV1FZbEsrYg0KbDM2UFVxU1lWNWc1YTdTeVdKZ1QxcmdMTEYrQWt0Vy9YMHJQYWRETkdiSSthWVhuMGRWcTRQb3VSYmZmDQpZSThmVmZOZmxQWk80aXFGclRBZnhYcXhXTjIxVkFpQ1k1dm5SMEpRck9HbUNqY2doZGcvWkFBQytqUjENCk4xU0dkVit4b21CMVpVb01KYnBTWW9MdEZWWGhuMmc0SUR1UmRucG1nNExFNkxBUng0VEhybFZtQU5wSA0KcitIWE9NcWNaM2t1QkNHSVRnUUN4bnkrZGh5MWdkUjF0WTNnaG9wUlZoK3IvYVU0R1FycHh6am5ZZnF0DQpKcHk3UUVqVzNYMmVhYlg1RHhyak1NSkZ1Q3AxSCtkUTFhWUc3QnhvMWhtNTBaQldBVk1DdnREakpWUHANCmlEYUM3UlJ0M1VYUnJJaDljQlJJdWlSbWxlT1ArZ1Z3RW1Dcjh0dXZadk1kZU9wZW5keExiM0k2Y1g2Vg0KajZJQ3lxYTJoMTBUWE9uNWp6dDc0Tm5wUG9tL1FGMlpyWGNGUzU5VmRCSVhEUnNubDFpYStVL1UyaERZDQpGbGc4MXVpRmZWSWhRWUJVM3lGekRMb1lYRWRoUTZHQ0RlNldFdmZwTnVzZFFDenl4QXFFOUVqN2d1alUNCmtSZTh0SWV3elYwamkvcEh6SHhDMnNYcGM1OXFSK2NrQkVRYnRuWXA5V3hnOSs3VFM0OVNVVlFaMElDdQ0KU205S1NHZjdkUmdrc1dsa1l4ak1BY0FZNFZBbUQ4K3NQckt5YWNqR2orUlpTTlkwTDZMQmw1bUpDU2FFDQovd0xjakFmcU1EWGVrNmVZU282UUwvbzgwcmF6RDJKT3czY3BaSXhkNU9lWXFuRmk2a0hGMDROTkpKODANCk9ETzRRVFpCZFVBSnVUV1Q3MXNIS2Z1cS9WY01CeC9XYVE9PQ0KPVpZdzUNCi0tLS0tRU5EIFBHUCBNRVNTQUdFLS0tLS0NCg==" - } - }, - { - "partId": "1", - "mimeType": "application/octet-stream", - "filename": "\"what\"'s_up%3F.txt.pgp", - "headers": [ - { - "name": "Content-Type", - "value": "application/octet-stream; name=\"what's_up?.txt.pgp\"" - }, - { - "name": "Content-Disposition", - "value": "attachment; filename=\"what\"'s_up%3F.txt.pgp" - }, - { - "name": "X-Attachment-Id", - "value": "f_SykdJPdZrAIeptyFOrGAjHhFMFVxIU@flowcrypt" - }, - { - "name": "Content-Id", - "value": "" - }, - { - "name": "Content-Transfer-Encoding", - "value": "base64" - } - ], - "body": { - "attachmentId": "ANGjdJ_LF_J2Ue8NzggJDwDFt5wDMoHy9of6PzbfeUzMiG2SdHlRK7UPNqXukXD0eheb0aDkTe-QPUCwMUwCEO46gBTSRMdS7URPoiyf1aZVQk0lNc-8u6WIZBSXOmqC8vGo-y6gzUMlfn-5AQCJAwYbqZptil9S22QXbmg-aDmEz4BC6K2CJsCSe-AKUeXNeTa2ZKupUknWPxKwzrOql-Su7OEbIjRPXUGOpgQ8MHa6QW8yBdOKeR0QV7Ajrad4WfV0FSK7l23x3KVOakgwaPov1b5QdFtDi7TMHJp8Txk7BfhZ_5jBY6u5_qaSxNKVw_HuL7uoImgYzzEDt0Afdwg6Zqj1u2qK2YQeC5Jm43qPF1TSh6XIU5V8RI6wmZWchrB6EpUYeTSHYuH8B2uU", - "size": 1220 - } - } - ] - }, - "sizeEstimate": 5445, - "historyId": "1366528", - "internalDate": "1658326644000" - }, - "attachments": { - "ANGjdJ_LF_J2Ue8NzggJDwDFt5wDMoHy9of6PzbfeUzMiG2SdHlRK7UPNqXukXD0eheb0aDkTe-QPUCwMUwCEO46gBTSRMdS7URPoiyf1aZVQk0lNc-8u6WIZBSXOmqC8vGo-y6gzUMlfn-5AQCJAwYbqZptil9S22QXbmg-aDmEz4BC6K2CJsCSe-AKUeXNeTa2ZKupUknWPxKwzrOql-Su7OEbIjRPXUGOpgQ8MHa6QW8yBdOKeR0QV7Ajrad4WfV0FSK7l23x3KVOakgwaPov1b5QdFtDi7TMHJp8Txk7BfhZ_5jBY6u5_qaSxNKVw_HuL7uoImgYzzEDt0Afdwg6Zqj1u2qK2YQeC5Jm43qPF1TSh6XIU5V8RI6wmZWchrB6EpUYeTSHYuH8B2uU": { - "data": "wV4DBQQnHrSzW44SAQdAx_uh3kOxES2zmWgsEKYqh70CTBLgQ6zTNCvaUKCs4R0wCcF9e2p5v5ryBphRD18X4gL9EPdgGp_7fEwMts7l1rweMSL1rEzfdumH7e89r-aiwcFMA0taL_zmLZUBAQ_8Cah5jC_hVfsSVEW8K1jIHr4pLON0_Z46bjl3mEaYlsapzNBqPuGCh6LXEOFtjIXdtesdvH4QDcocp2rUGvZfmOUZK9iupw-a6Xa2zvgPHCSghcKlzFTfhWTjhA9h2vXOgXIRlqb5ImmM5MVr6Bmdykth3IBbrZ_uPb58VBbKDi_HQoaSfr9QFTZys0cN6nfDFRr5LKlt0eqov69Jvs2ccOcWTTR8GGM57pPg7A32uf3vMBtTZmFnvVdbmnm9enDTZj87TgPVg5Vy1nYhfWicyDRwYMY-k0gJRNOfKM2oa0nDf6GXfs37SebvC2_aOLOa11lswP7Dx_ltOC9jTcrEM-Uy65OsRGAEIkFf6RMjTFborfreEyLpUMUr2PFG-3vuC2i3lWCseNpO8yDN3NMHzWrL7YjQ72MjanZVKGI0xjtGM5wYaEP2voCY0Rx83pTqHyphHWWlWxYMnp7kmIgnf4BnBIb2aC2z6EnfrlvhqmG3i3uiDxiL9-XVoK03hwSKJQsBlBgwYXWm6o0ABVTcjESpHfcDIwqU5C6aZz8E2CQX2T45poMHSzMSqOYZZjZdL2UP0ePsOU8ub0AqAX2W8NODjw2uY0dn0G1TKbxlHYK7wFc7SKh5ylWosF7CL7p7bk_JuoUMdOdwIg6lO_w-cR3u6BOGtj0EvW_1YFcwKe_BwUwDvb12YPaZjcQBEACtr2jO7A_CJyYlr_BzOf2MQOWNLdaxr2kbVKcs0X5XupI9m2u2e49s7Lp9IftxhOkEgvoQjF_E6-k8BkOrLfVU0o6DqcjsOfpNdHzFWWYhPvk7mizhaMWSfoibpS90IJibbhASsCPSv3bgfdgu2IhCCeMRZ1df66LrcP1qN7FE40iY7Yr9eS5SxLl_GXefEcTTD1ZkHXxhEXmoEzWl_kQOy_uYEcwoaN3t3LKiT010k0RJ898SNYVmS0UjEQAuIZSdzMn0Z133dEBBFOo05RkzxZenQ4YUiZhgUiFTRTpBl0BLm-y9XFq_SeAk7IHJP7ZyQncShck06USiVCGNsGjqLGeUgC4P-Zdp0SO1gKZEuuSNokJrFeR63pvhj4RdVLYUaCP1ly8r3WDURB7pWz8LYHpUS28hFpmVOXx-zIoYakcCJXqdmS6nyfAeCR-KXc2aOUn5Z8CZFrVbpTAeLAoSob4ZeCPnrnu0FKIvKeKDrnv6fHXD7-K5MXI5hHINqDgyvVQ0xXRuz0hoC5CKABSoHmpc_YIefZmTl8oUhF4LfIb63rsaQg1spaPdbEkBCdoK_QOI-x6YGPL2RI04Nz0ZFzDAwROSTBxPPDPXCIa8sixr4-CHBanDvE8u_3g2grya_LqzjuoAbvHK3FHOMTIL_PB3Uuu7Tgm3XtOAXGbHJdJEAYIt1UcNIYFCL-Fu8wTXF3NOj57ChQEykLe0z4rYfg5Y8mP82O9dqba-TpaEa4KFz6OUFYilVLJIMe9l16dSfa_tvtE", - "size": 1220 - } - }, - "raw": { - "id": "1821bf879a6f71e0", - "threadId": "1821bf879a6f71e0", - "labelIds": ["SENT"], - "snippet": "-----BEGIN PGP MESSAGE----- Version: FlowCrypt Email Encryption 8.3.1 Comment: Seamlessly send and receive encrypted email wV4DBQQnHrSzW44SAQdASAfSFmFf1F2NjOnjpPuSVUmgy+mtq9qzLrRy203g", - "sizeEstimate": 5445, - "raw": "UmVjZWl2ZWQ6IGZyb20gNzE3Mjg0NzMwMjQ0DQoJbmFtZWQgdW5rbm93bg0KCWJ5IGdtYWlsYXBpLmdvb2dsZS5jb20NCgl3aXRoIEhUVFBSRVNUOw0KCVdlZCwgMjAgSnVsIDIwMjIgMDc6MTc6MjQgLTA3MDANCkNvbnRlbnQtVHlwZTogbXVsdGlwYXJ0L21peGVkOw0KIGJvdW5kYXJ5PSItLS0tc2luaWthZWwtPz1fMS0xNjU4MzI2NjQzNTQ0MC41NDI5Mzk2OTcyMjY1NzU5Ig0KT3BlbnBncDogaWQ9RThGMDUxN0JBNkQ3REFCNjA4MUM5NkU0QURBQzI3OUM5NTA5MzIwNw0KRnJvbTogRmxvd0NyeXB0IENvbXBhdGliaWxpdHkgPGZsb3djcnlwdC5jb21wYXRpYmlsaXR5QGdtYWlsLmNvbT4NClRvOiBSb2JvdCBGbG93Q3J5cHQgPHJvYm90QGZsb3djcnlwdC5jb20-DQpTdWJqZWN0OiBUZXN0IGF0dGFjaG1lbnQgIzM1MDUNCkRhdGU6IFdlZCwgMjAgSnVsIDIwMjIgMDc6MTc6MjQgLTA3MDANCk1lc3NhZ2UtSWQ6IDxDQUtidUxUcFpuQ09jS1plX0F1akxRT1lNWCt6b1c4dEF2aXRqOTBuOWJ3NHhqSkVkMVFAbWFpbC5nbWFpbC5jb20-DQpNSU1FLVZlcnNpb246IDEuMA0KDQotLS0tLS1zaW5pa2FlbC0_PV8xLTE2NTgzMjY2NDM1NDQwLjU0MjkzOTY5NzIyNjU3NTkNCkNvbnRlbnQtVHlwZTogdGV4dC9wbGFpbg0KQ29udGVudC1UcmFuc2Zlci1FbmNvZGluZzogcXVvdGVkLXByaW50YWJsZQ0KDQotLS0tLUJFR0lOIFBHUCBNRVNTQUdFLS0tLS0NClZlcnNpb246IEZsb3dDcnlwdCBFbWFpbCBFbmNyeXB0aW9uIDguMy4xDQpDb21tZW50OiBTZWFtbGVzc2x5IHNlbmQgYW5kIHJlY2VpdmUgZW5jcnlwdGVkIGVtYWlsDQoNCndWNERCUVFuSHJTelc0NFNBUWRBU0FmU0ZtRmYxRjJOak9uanBQdVNWVW1neSttdHE5cXpMclJ5MjAzZw0KcEFZd3c1MUFZUFJIVllIYTdMT2ZPaXNEYkZzcldLeTM4REpRamJocmZ6eUlXL1dJVXdnNFlCWG1zWjdJDQpTOU9BSW1XMndjRk1BMHRhTC96bUxaVUJBUS82QWlybE9IR1UvWW5yNHpwU0EyWlJ5MENoaEZscW5FNG8NCnBROWtNSGd0TnU2d2M0bzBUMHAzRXJJajFUc1JSb1R0N1FMUzRnOEV6anVIMEdNY3RCUDhxbExIUWtEUw0KUXhsaC9pdnUzSkZFaldJTzQ3amxYNklOYUhtemxTTzRXRWpqQ2VRUlJEaWtPbW01VTRZaWpML01ya2gwDQpLK1UwWURzck5GOWFrRXFHc1NEV2l6ZVFtdzhoNHJNWmVySEFSa2RkUUY3NVFoOUpDMWs3eVZBMmh2cEoNCkZDQTdEM2h0WFQrZk9jVUFiVzdvMiswR1lrNHdrQzY4VGEvRjRJaXBZVjA3VHRTS21BYm81MU5haVZ0dw0KSUQwUkcrbzZWeit3TDRXN29PU2hIWlpOWXNnOVpLSGc2K01rUnBCK2tndjJjNDBKSlY2amxlOWxRWm1oDQpMbVYyTDFtTEd4OGVoaTBLSGM3NXRjQUJOYjhXS1hOaVAyTDVDa25Ia09odjFOUFh3M0tnTnZWWWI3S2wNCnB2clE4ZGVaMGo2T3ordXU1VFdmYjhkUlliOU1hU0cyYnBvVTBrRnA3Q0pHcU9mZ1BxRkhBSWJId2xZMw0KeCtvZE11d1R0ckdrajMxMnhqeEl3UlpVdmRybVRjOTg5OHhpVENYM2lkOHlqcld3eDNRMDcySWxxdlhXDQpvZmVFNUF6UlA3bGJiSnlPTm9MeWY2UTNpWVE5SFNNL0Q1UnpwUWpmdjdKM0U0RnM1cGwzamFiMWFYb0sNCmlqSU9YVUFzMm90V3NaK0NNbHNpQjhaODRlMC9McFJPN250a2o5a1dFZmpjekk0TUZib1JMeTMraUJKOA0KQVV2QkpKWGllNzczQTl5WkM5bCtXRWhNbHFHQ0ZMWmVmSGlKWTdnRjFQRHBFVUNWcHluQndVd0R2YjEyDQpZUGFaamNRQkVBQ2F1ajJMS1hST01GcUZEU1JjVEYrYnQ3Vk5LVVJVVDU4d3o1Q3Bvc1FYUkZoZHBNeGsNCi9SdXJEZXdWU2RhcjUyNXA2Mk01bUphTEZRTEJmaFlrWHk4VVNtejZYOWVyOGpvcWxveXBycC8xNUIvUQ0KVlRocHl1R2VCZ1hWYkxld2ZhVlIrS1I0S3QyWWFWVDRxTHg5TGk1UDljdVR3dHhKcEs4d3B1M2N3Ukl3DQpBckNZT2duL2xUbUNIbTgxdkJ2N0ZKZmRoL0ZXd0NBVVkvdDJZcjRFN0dOMTlYN3E2blFJY2xuVy9SZlUNCmdBaGJKV1JWTU5Ba3Q2Z1BxYnkzVW5MVnYvUmIwL0xLUFA3K3lFRW1xZnkzZGZmTDRUcG8xTVpQSGQ0Rg0Kbi9yWWdjU0g4NGRaL3hUOTREM3NrTXVwNzlTNG9xQWpUMFhiSjZCVDhxdXNJb0hEeFp6UzIydHBYTFVkDQpqMHUxcUVaOUpWVVFZWEpMREtia1RSU1dZenV6YzN1eXJnZFh3ZStFU2tvZEFwTXNFWmhRNWpGWXNwc1gNCkJiS2xiY25GZE5JYnlLTXpUTTIxaUtYb3RGZWxKcVkwenlDNTh6V0o0alpnUDc4alp4UEg0bVNaQlhJcA0KcXZQVEFlanErblRvb2ZNWjdhOTlIeE9JT3cvWWU4cXVxZDhOUkpTZVRVV0pEUW9mSmZpamV1eUh1b0FaDQpqSHk0OVpmTm5iZWhuNC81TmtpWHpySmgvV3NpMFpIZFp3WkEyTXpORStMV21KRk5URE1PS2lpUnZCS2kNClU3cS9JelF1RG5NWXJJYWJSNkxYRmJEaVVmVFpxNzFzc085U0VJL0lEZ0dGaElHSnFvVy9kd00vVUdZVA0KUVpvbzhSc21iZTVsV2ZSRC8wWVJrTko0RmhJZUhieWZ5ZExCNEFIQlV2alhaZ1NlTnk5WXkwUjlMNDYxDQpUUUZ0dUcyOHl2NHZHNVpOeitLVkplS0VPVVVia0w3eENaR0NNWVRzRmZwanJkQTRta0ZIOEhCNGJrbFENCkNJZENPa01uYmVIR2ZKdzl6bjlkNlF0VGRVczJHS1Fady9iUHdsTFhsN1BBb3BLQWNOZkNjMmdZM0NHNw0KUVFIRyt4SHAvUE1YWTFDL2RsdFRoUklSRXpLam56NUN2d2hXYVVvYkdoeGIvT2lnS3NBeUpXUVlsSytiDQpsMzZQVXFTWVY1ZzVhN1N5V0pnVDFyZ0xMRitBa3RXL1gwclBhZEROR2JJK2FZWG4wZFZxNFBvdVJiZmYNCllJOGZWZk5mbFBaTzRpcUZyVEFmeFhxeFdOMjFWQWlDWTV2blIwSlFyT0dtQ2pjZ2hkZy9aQUFDK2pSMQ0KTjFTR2RWK3hvbUIxWlVvTUpicFNZb0x0RlZYaG4yZzRJRHVSZG5wbWc0TEU2TEFSeDRUSHJsVm1BTnBIDQpyK0hYT01xY1oza3VCQ0dJVGdRQ3hueStkaHkxZ2RSMXRZM2dob3BSVmgrci9hVTRHUXJweHpqbllmcXQNCkpweTdRRWpXM1gyZWFiWDVEeHJqTU1KRnVDcDFIK2RRMWFZRzdCeG8xaG01MFpCV0FWTUN2dERqSlZQcA0KaURhQzdSUnQzVVhSckloOWNCUkl1aVJtbGVPUCtnVndFbUNyOHR1dlp2TWRlT3BlbmR4TGIzSTZjWDZWDQpqNklDeXFhMmgxMFRYT241anp0NzRObnBQb20vUUYyWnJYY0ZTNTlWZEJJWERSc25sMWlhK1UvVTJoRFkNCkZsZzgxdWlGZlZJaFFZQlUzeUZ6RExvWVhFZGhRNkdDRGU2V0V2ZnBOdXNkUUN6eXhBcUU5RWo3Z3VqVQ0Ka1JlOHRJZXd6VjBqaS9wSHpIeEMyc1hwYzU5cVIrY2tCRVFidG5ZcDlXeGc5KzdUUzQ5U1VWUVowSUN1DQpTbTlLU0dmN2RSZ2tzV2xrWXhqTUFjQVk0VkFtRDgrc1ByS3lhY2pHaitSWlNOWTBMNkxCbDVtSkNTYUUNCi93TGNqQWZxTURYZWs2ZVlTbzZRTC9vODByYXpEMkpPdzNjcFpJeGQ1T2VZcW5GaTZrSEYwNE5OSko4MA0KT0RPNFFUWkJkVUFKdVRXVDcxc0hLZnVxL1ZjTUJ4L1dhUT0zRD0zRA0KPTNEWll3NQ0KLS0tLS1FTkQgUEdQIE1FU1NBR0UtLS0tLQ0KDQotLS0tLS1zaW5pa2FlbC0_PV8xLTE2NTgzMjY2NDM1NDQwLjU0MjkzOTY5NzIyNjU3NTkNCkNvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vb2N0ZXQtc3RyZWFtOyBuYW1lPSJ3aGF0J3NfdXA_LnR4dC5wZ3AiDQpDb250ZW50LURpc3Bvc2l0aW9uOiBhdHRhY2htZW50OyBmaWxlbmFtZSowKj11dGYtOCcnd2hhdCdzX3VwJTNGLnR4dC5wZ3ANClgtQXR0YWNobWVudC1JZDogZl9TeWtkSlBkWnJBSWVwdHlGT3JHQWpIaEZNRlZ4SVVAZmxvd2NyeXB0DQpDb250ZW50LUlkOiA8Zl9TeWtkSlBkWnJBSWVwdHlGT3JHQWpIaEZNRlZ4SVVAZmxvd2NyeXB0Pg0KQ29udGVudC1UcmFuc2Zlci1FbmNvZGluZzogYmFzZTY0DQoNCndWNERCUVFuSHJTelc0NFNBUWRBeC91aDNrT3hFUzJ6bVdnc0VLWXFoNzBDVEJMZ1E2elROQ3ZhVUtDczRSMHdDY0Y5ZTJwNXY1cnkNCkJwaFJEMThYNGdMOUVQZGdHcC83ZkV3TXRzN2wxcndlTVNMMXJFemZkdW1IN2U4OXIrYWl3Y0ZNQTB0YUwvem1MWlVCQVEvOENhaDUNCmpDL2hWZnNTVkVXOEsxaklIcjRwTE9OMC9aNDZiamwzbUVhWWxzYXB6TkJxUHVHQ2g2TFhFT0Z0aklYZHRlc2R2SDRRRGNvY3AyclUNCkd2WmZtT1VaSzlpdXB3K2E2WGEyenZnUEhDU2doY0tsekZUZmhXVGpoQTloMnZYT2dYSVJscWI1SW1tTTVNVnI2Qm1keWt0aDNJQmINCnJaL3VQYjU4VkJiS0RpL0hRb2FTZnI5UUZUWnlzMGNONm5mREZScjVMS2x0MGVxb3Y2OUp2czJjY09jV1RUUjhHR001N3BQZzdBMzINCnVmM3ZNQnRUWm1GbnZWZGJtbm05ZW5EVFpqODdUZ1BWZzVWeTFuWWhmV2ljeURSd1lNWStrMGdKUk5PZktNMm9hMG5EZjZHWGZzMzcNClNlYnZDMi9hT0xPYTExbHN3UDdEeC9sdE9DOWpUY3JFTStVeTY1T3NSR0FFSWtGZjZSTWpURmJvcmZyZUV5THBVTVVyMlBGRyszdnUNCkMyaTNsV0NzZU5wTzh5RE4zTk1IeldyTDdZalE3Mk1qYW5aVktHSTB4anRHTTV3WWFFUDJ2b0NZMFJ4ODNwVHFIeXBoSFdXbFd4WU0NCm5wN2ttSWduZjRCbkJJYjJhQzJ6NkVuZnJsdmhxbUczaTN1aUR4aUw5K1hWb0swM2h3U0tKUXNCbEJnd1lYV202bzBBQlZUY2pFU3ANCkhmY0RJd3FVNUM2YVp6OEUyQ1FYMlQ0NXBvTUhTek1TcU9ZWlpqWmRMMlVQMGVQc09VOHViMEFxQVgyVzhOT0RqdzJ1WTBkbjBHMVQNCktieGxIWUs3d0ZjN1NLaDV5bFdvc0Y3Q0w3cDdiay9KdW9VTWRPZHdJZzZsTy93K2NSM3U2Qk9HdGowRXZXLzFZRmN3S2UvQndVd0QNCnZiMTJZUGFaamNRQkVBQ3RyMmpPN0EvQ0p5WWxyL0J6T2YyTVFPV05MZGF4cjJrYlZLY3MwWDVYdXBJOW0ydTJlNDlzN0xwOUlmdHgNCmhPa0Vndm9RakYvRTYrazhCa09yTGZWVTBvNkRxY2pzT2ZwTmRIekZXV1loUHZrN21pemhhTVdTZm9pYnBTOTBJSmliYmhBU3NDUFMNCnYzYmdmZGd1MkloQ0NlTVJaMWRmNjZMcmNQMXFON0ZFNDBpWTdZcjllUzVTeExsL0dYZWZFY1RURDFaa0hYeGhFWG1vRXpXbC9rUU8NCnkvdVlFY3dvYU4zdDNMS2lUMDEwazBSSjg5OFNOWVZtUzBVakVRQXVJWlNkek1uMFoxMzNkRUJCRk9vMDVSa3p4WmVuUTRZVWlaaGcNClVpRlRSVHBCbDBCTG0reTlYRnEvU2VBazdJSEpQN1p5UW5jU2hjazA2VVNpVkNHTnNHanFMR2VVZ0M0UCtaZHAwU08xZ0taRXV1U04NCm9rSnJGZVI2M3B2aGo0UmRWTFlVYUNQMWx5OHIzV0RVUkI3cFd6OExZSHBVUzI4aEZwbVZPWHgreklvWWFrY0NKWHFkbVM2bnlmQWUNCkNSK0tYYzJhT1VuNVo4Q1pGclZicFRBZUxBb1NvYjRaZUNQbnJudTBGS0l2S2VLRHJudjZmSFhENytLNU1YSTVoSElOcURneXZWUTANCnhYUnV6MGhvQzVDS0FCU29IbXBjL1lJZWZabVRsOG9VaEY0TGZJYjYzcnNhUWcxc3BhUGRiRWtCQ2RvSy9RT0kreDZZR1BMMlJJMDQNCk56MFpGekRBd1JPU1RCeFBQRFBYQ0lhOHNpeHI0K0NIQmFuRHZFOHUvM2cyZ3J5YS9McXpqdW9BYnZISzNGSE9NVElML1BCM1V1dTcNClRnbTNYdE9BWEdiSEpkSkVBWUl0MVVjTklZRkNMK0Z1OHdUWEYzTk9qNTdDaFFFeWtMZTB6NHJZZmc1WThtUDgyTzlkcWJhK1RwYUUNCmE0S0Z6Nk9VRllpbFZMSklNZTlsMTZkU2ZhL3R2dEU9DQotLS0tLS1zaW5pa2FlbC0_PV8xLTE2NTgzMjY2NDM1NDQwLjU0MjkzOTY5NzIyNjU3NTktLQ0K", - "historyId": "1366528", - "internalDate": "1658326644000" - } -} diff --git a/test/source/mock/google/exported-messages/message-export-182263bf9f105adf.json b/test/source/mock/google/exported-messages/message-export-182263bf9f105adf.json deleted file mode 100644 index 20b977551a0..00000000000 --- a/test/source/mock/google/exported-messages/message-export-182263bf9f105adf.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "acctEmail": "flowcrypt.compatibility@gmail.com", - "full": { - "id": "182263bf9f105adf", - "threadId": "182263bf9f105adf", - "labelIds": ["SENT", "INBOX"], - "snippet": "-----BEGIN PGP MESSAGE----- Version: FlowCrypt Email Encryption 8.3.2 Comment: Seamlessly send and receive encrypted email wcBMAxKVyQ+A04zgAQf9E3HP4UlGo0W7zOWIIaDjWhtH/OGuKvw3j+UToZxs fbhdMw8z4j36k+", - "payload": { - "partId": "", - "mimeType": "multipart/mixed", - "filename": "", - "headers": [ - { - "name": "Content-Type", - "value": "multipart/mixed; boundary=\"----sinikael-?=_1-16584988408450.8002882430055658\"" - }, - { - "name": "Openpgp", - "value": "id=277D1ADA213881F4ABE0415395E783DC0289E2E2" - }, - { - "name": "From", - "value": "sender@domain.com" - }, - { - "name": "To", - "value": "flowcrypt.compatibility@gmail.com" - }, - { - "name": "Subject", - "value": "Test attachment #3505 (with %)" - }, - { - "name": "Date", - "value": "Fri, 22 Jul 2022 07:07:20 -0700" - }, - { - "name": "MIME-Version", - "value": "1.0" - } - ], - "body": { - "size": 0 - }, - "parts": [ - { - "partId": "0", - "mimeType": "text/plain", - "filename": "", - "headers": [ - { - "name": "Content-Type", - "value": "text/plain" - }, - { - "name": "Content-Transfer-Encoding", - "value": "quoted-printable" - } - ], - "body": { - "size": 1774, - "data": "LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tDQpWZXJzaW9uOiBGbG93Q3J5cHQgRW1haWwgRW5jcnlwdGlvbiA4LjMuMg0KQ29tbWVudDogU2VhbWxlc3NseSBzZW5kIGFuZCByZWNlaXZlIGVuY3J5cHRlZCBlbWFpbA0KDQp3Y0JNQXhLVnlRK0EwNHpnQVFmOUUzSFA0VWxHbzBXN3pPV0lJYURqV2h0SC9PR3VLdnczaitVVG9aeHMNCmZiaGRNdzh6NGozNmsramszOHU0SDQ5YUxvTFd5RGFSRjB0VmREYjYvYys3SGFvblBpMTJlajlEd0VKdg0KTDV3UWEvOHJhYUc1bWFPMFRPTjc1QytMSnQzdHBEcDJDWnpaVlp6bDJHVHBPb1hmZXp1RjNRVzRkM2NWDQpNS3JUMXZZbU1lMHlrL043Y0FPSTZVVjg0R2dJNU1JaTR6Z0h0aEdLMXMyNWxVOGg4RXFUZmhBTGN3KzYNClVqbTFzNm9ZYWNobDNXc09oQWF0SEN5cURYVE0rYkE2YTlFRUh4STkyRk9mVEFSRGpNaXJZVkdDL1h4VQ0Kb1R1VTdqNkwzSnFUVGNWQzBCY0duRGt2ZmVReGRlRGsxdGFIK0J0ZUtDa0ZSN1l3a3luU090Y3Z1Q0lTDQo3TUZlQTNsbjRBclZiWFo2RWdFSFFEdDlEOXdLLzN4YVdBbUJ0cnFLd0dtQWN3SytBdUo3cEFGT1FjOUUNClNERURNSWpwOTh2WkxwbmFCMC92WVl4MXlhUi9TVUMxSmdQc2g5RkRLd2MyanJsNVVuNWh6aEtDZkd6bA0KbnI4Qm0yN2tETUhBVEFNU2xja1BnTk9NNEFFSUFNTGFtY2FubVp6RG5RUnYwZis3UHE2MWtRVWxMeTJjDQpZZy9BSHhnZnFUeVhDK2pQOFAxYWxxc2VCQ29vZDR4azJzakRmbVJ2YVY5UGp6WURvT0t1SHQ5SktQei8NCk45MFdOV3ZMamVJWnpWWDIzcERDVGdzYW0vYkRBOSsvTkFjRUZtRi91M2gyNEN5TTYrbk1Jcm5vQ2plSg0KUDljS0orYXB6YXhHV1ZZRTlhQVovYno2ZmVjTC9JTlZGaStqK0NiOGV1WklQYWhNSkxLRXAydkFObmRCDQpqcVl1M1c5b0xLRm5INStuNjZNeEZ5NmNSMk9JUkdqVFUxc1h2RkEwcE1VN2FWSFBOUkNtV3JHcXJvWWENCmdJZDdDSW9UR3I5WUF4Q0FoK1ZLQWdvZHVZOXR2M2dLS09leHhYWEQwT1hBbXl3NnpmcmI4ZHo0bzVPYg0KVE1UV2pGeWVic3JCWGdONVorQUsxVzEyZWhJQkIwRDBEV1BLMDdiZXp1aS8wOTMwWmNJNGFhY1BjMU1xDQphaCtqcHdBamhsNE5LREI4T2UrL0ZRSHVOM1drUkZ0OHVtT1FQOGZmOHFMR2RMdVRsZ2V0ekFtcE9hOWcNCmpwV28vNTVEZUNPTU85UTViYkRTd084Qk10Z25PS3dYRUt3eGh2eUhxWTI4NngzV1d3NERPWEZBcUdWWA0KU2RjTGZIS0tOVjFaMkhmQ3hiMVZsemtiWGJobFAvbEw1UzlXSGMvWmo4aFFOUzU4dWFoNFE2QVRDTDZHDQo3YjhkUU5iSzZvdXVSNnl0cW1GaitVek1rU3oyL1QrN3hWMDFLZGFhMGxMNDZrZVFkdzJraXhsU1FQY20NCllkR1IydjRUZk5qTHV6dW5IVjdobjRjcUdwbm9HNzZtWkNXTmRPaFJlTFNVMHhZV0h6U1ZUT2h1WGY0eg0KalFlNFZsNDU5UFg4SGw1N01DLzRSQ2kzM05YVnMyK2dpQmpybmYybml2RHA1TE9RYWlvN0pES3dqRm1UDQpPbEh0d2J0S1kwckVOQ0JZMHRxNGM2dEdqR0V2MUNkMkJtTmFxeWZYbHhXRFZXUEdlQ2xpaDdVc0Z5RjUNCnFWeFlpejJWRjJwVDBrcEN6dzJmcHZZNHlsWmFEVjhFN2xLaTV0TklHRGZ6djg4Mlg5QmJxSFpkN05qRQ0Kcmk2dzZTTUJBY3RVOGxUQkdGYXBnZkxRajlRZWlmRlhkT004WmRKc1dNZnFURXVsUmpVTnVrV3BYYXkrDQo0a2RzZEl0djdWRStBNEpYNzk0eDFacVJ2R1ErUjh5L0xkd09ycjBOblFJSlcxaTAvZnFLWTluNnM2NGoNCkFZVWZRM05vQzc0Nk1rQ0lnblM1TnIwbmVVQVY5RGZlNDd5dStqYUMxR2VHWkdlWVhSKzR3Z0ZyQnc9PQ0KPUgwa1YNCi0tLS0tRU5EIFBHUCBNRVNTQUdFLS0tLS0NCg==" - } - }, - { - "partId": "1", - "mimeType": "application/octet-stream", - "filename": "\"what\"'s_up%25253F.txt.pgp", - "headers": [ - { - "name": "Content-Type", - "value": "application/octet-stream; name=\"what's_up%253F.txt.pgp\"" - }, - { - "name": "Content-Disposition", - "value": "attachment; filename=\"what\"'s_up%25253F.txt.pgp" - }, - { - "name": "X-Attachment-Id", - "value": "f_jgDgLdTNOIiQXMrKOffiaJhGpPoWmo@flowcrypt" - }, - { - "name": "Content-Id", - "value": "" - }, - { - "name": "Content-Transfer-Encoding", - "value": "base64" - } - ], - "body": { - "attachmentId": "ANGjdJ90Mhq2GnvXZGFL2K0XClki6eYxB94kw7Pdnq4Su3N_pg56ZZJ6np9JC6BqwU1Fw4bU3BHlwC4zqAs5pYhYa2clFLaikv-4ivwO-sxK4aEvIOWdnq3wDBXiD5hJKtiNEqoYl2vYVxrN-7c85_MY4bgVpYSuzLNP001_cckJWV3L3Aairne4eSSka3KfmjLf2NORrnX1usUW1nBka1Ie2vKf3t1T21EBXSFWIFQu4INg6s_hfAVv05ohoX9kGBxb03GsLyrFYpnfYSYYwDba90-2c105IzOMfuDxdOnZOfyX8jHCj1Qq9pwrX2qmkv8S_V2uH8awhPXc2-F5UXtb25XecGpzcXaXIp4qqjcUtnQCB1n5HMKxUTUvxdVtdy_P3SWIE_-pBuL_KXIy", - "size": 808 - } - } - ] - }, - "sizeEstimate": 3988, - "historyId": "2302597", - "internalDate": "1658498840000" - }, - "attachments": { - "ANGjdJ90Mhq2GnvXZGFL2K0XClki6eYxB94kw7Pdnq4Su3N_pg56ZZJ6np9JC6BqwU1Fw4bU3BHlwC4zqAs5pYhYa2clFLaikv-4ivwO-sxK4aEvIOWdnq3wDBXiD5hJKtiNEqoYl2vYVxrN-7c85_MY4bgVpYSuzLNP001_cckJWV3L3Aairne4eSSka3KfmjLf2NORrnX1usUW1nBka1Ie2vKf3t1T21EBXSFWIFQu4INg6s_hfAVv05ohoX9kGBxb03GsLyrFYpnfYSYYwDba90-2c105IzOMfuDxdOnZOfyX8jHCj1Qq9pwrX2qmkv8S_V2uH8awhPXc2-F5UXtb25XecGpzcXaXIp4qqjcUtnQCB1n5HMKxUTUvxdVtdy_P3SWIE_-pBuL_KXIy": { - "data": "wcBMAxKVyQ-A04zgAQf_eHoWWhNCd09l3jlb3I1PELK_HfEQHFCdTX3MDVN7MD_9kpmR4zvSBKPHb_r5HFxD4-h_6jA4nS25E2Dbk4lLJYtxAuMdCaVun74O4w55PG9FIpt3syokcaNa9kIoQijvy0q9sIqWdO4af7Brpi8-om92jN_52h_TFF1Xx-AxVzWCdIzY4lhaVugiZlCG35gFfM8sWuv9Nvl9DPWcQ4yKGv4u0jwsDlrmyekBuF6_HcOVJiggZKB7XLk9h15G8HiLADnNd7DZWCsUgsTJSqCgVQrYvWs8xHf9MFmTArIpJ_loAoh2p1wTaZiT6yQfVk6j2G6MXnPyQ8nIvKvz4d7kNsFeA3ln4ArVbXZ6EgEHQI0yF0YGdf8txeorJoo-jr7cex8lEZ9L7II6qCeKY7N2MBbaYmYCHw1kiehlM05QbuBkz6MvMEOwwY0sfs8-4hIgw1vGSCWVHl0D6J9_EdZO4sHATAMSlckPgNOM4AEIAIYXnXE2x3FqetiCjeRMuZaGQqWWRRpFCr9YHD8BCURrTw1DgGyOjE1D4UsLmKVjnydI5_pkQbEnPiGybVoLr2O7-XNqCSsn2VKwrw7YiKx0-9wNJALPvbjHpGP3T_fBfL57J5zZZVwEVOLkdJl3uiIg0luAATDfqb2bac8vBryDW3x4VfQw600Fk1SV0lasTMIkTvEsFtPLnC3IOHGwX_ZrD4x5Mf6H6PkI5_0sjuHRZA_EJDjUWb5B6la_-eGof5ZLdwpKHywQLNQ0O4XzeM9zkzW6ZK-DjYvzwdaZbgFV5eOTo2rLp399-Hg5Twgw21QRdezXqfj4fcITjViQXHDBXgN5Z-AK1W12ehIBB0AtnfILmB8nnpS5HiKYQzUZBu6gfEpgw7GL0MV_5Xg7djDD8enL2sQmnHuekqgifTaWyHaVPDQLpTj2U0DqwFPAxRpoWmiC4cdQidZQBxFO943SSAGhuv11Jw7r8dQUSG6_A4cVQNuyGhQvdV7orAuM-gIO9vhcGE_R9tFpHD8-UYMJrlFPuO4Ej6RxUCl7bKVbfGiQUXNJFq83xw", - "size": 808 - } - }, - "raw": { - "id": "182263bf9f105adf", - "threadId": "182263bf9f105adf", - "labelIds": ["SENT", "INBOX"], - "snippet": "-----BEGIN PGP MESSAGE----- Version: FlowCrypt Email Encryption 8.3.2 Comment: Seamlessly send and receive encrypted email wcBMAxKVyQ+A04zgAQf9E3HP4UlGo0W7zOWIIaDjWhtH/OGuKvw3j+UToZxs fbhdMw8z4j36k+", - "sizeEstimate": 3988, - "raw": "UmVjZWl2ZWQ6IGZyb20gNzE3Mjg0NzMwMjQ0DQoJbmFtZWQgdW5rbm93bg0KCWJ5IGdtYWlsYXBpLmdvb2dsZS5jb20NCgl3aXRoIEhUVFBSRVNUOw0KCUZyaSwgMjIgSnVsIDIwMjIgMDc6MDc6MjAgLTA3MDANCkNvbnRlbnQtVHlwZTogbXVsdGlwYXJ0L21peGVkOw0KIGJvdW5kYXJ5PSItLS0tc2luaWthZWwtPz1fMS0xNjU4NDk4ODQwODQ1MC44MDAyODgyNDMwMDU1NjU4Ig0KT3BlbnBncDogaWQ9Mjc3RDFBREEyMTM4ODFGNEFCRTA0MTUzOTVFNzgzREMwMjg5RTJFMg0KRnJvbTogR21haWwgQ0kgVGVzdCA8Y2kudGVzdHMuZ21haWxAZmxvd2NyeXB0LmRldj4NClRvOiBHbWFpbCBDSSBUZXN0IDxjaS50ZXN0cy5nbWFpbEBmbG93Y3J5cHQuZGV2Pg0KU3ViamVjdDogVGVzdCBhdHRhY2htZW50ICMzNTA1ICh3aXRoICUpDQpEYXRlOiBGcmksIDIyIEp1bCAyMDIyIDA3OjA3OjIwIC0wNzAwDQpNZXNzYWdlLUlkOiA8Q0FPOUZZOXZITE5pPTdRaD1GeU9lTGhHTjRGVjNxYnZ3TUJlMEFURm9PajR6aE1mYUN3QG1haWwuZ21haWwuY29tPg0KTUlNRS1WZXJzaW9uOiAxLjANCg0KLS0tLS0tc2luaWthZWwtPz1fMS0xNjU4NDk4ODQwODQ1MC44MDAyODgyNDMwMDU1NjU4DQpDb250ZW50LVR5cGU6IHRleHQvcGxhaW4NCkNvbnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6IHF1b3RlZC1wcmludGFibGUNCg0KLS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tDQpWZXJzaW9uOiBGbG93Q3J5cHQgRW1haWwgRW5jcnlwdGlvbiA4LjMuMg0KQ29tbWVudDogU2VhbWxlc3NseSBzZW5kIGFuZCByZWNlaXZlIGVuY3J5cHRlZCBlbWFpbA0KDQp3Y0JNQXhLVnlRK0EwNHpnQVFmOUUzSFA0VWxHbzBXN3pPV0lJYURqV2h0SC9PR3VLdnczaitVVG9aeHMNCmZiaGRNdzh6NGozNmsramszOHU0SDQ5YUxvTFd5RGFSRjB0VmREYjYvYys3SGFvblBpMTJlajlEd0VKdg0KTDV3UWEvOHJhYUc1bWFPMFRPTjc1QytMSnQzdHBEcDJDWnpaVlp6bDJHVHBPb1hmZXp1RjNRVzRkM2NWDQpNS3JUMXZZbU1lMHlrL043Y0FPSTZVVjg0R2dJNU1JaTR6Z0h0aEdLMXMyNWxVOGg4RXFUZmhBTGN3KzYNClVqbTFzNm9ZYWNobDNXc09oQWF0SEN5cURYVE0rYkE2YTlFRUh4STkyRk9mVEFSRGpNaXJZVkdDL1h4VQ0Kb1R1VTdqNkwzSnFUVGNWQzBCY0duRGt2ZmVReGRlRGsxdGFIK0J0ZUtDa0ZSN1l3a3luU090Y3Z1Q0lTDQo3TUZlQTNsbjRBclZiWFo2RWdFSFFEdDlEOXdLLzN4YVdBbUJ0cnFLd0dtQWN3SytBdUo3cEFGT1FjOUUNClNERURNSWpwOTh2WkxwbmFCMC92WVl4MXlhUi9TVUMxSmdQc2g5RkRLd2MyanJsNVVuNWh6aEtDZkd6bA0KbnI4Qm0yN2tETUhBVEFNU2xja1BnTk9NNEFFSUFNTGFtY2FubVp6RG5RUnYwZis3UHE2MWtRVWxMeTJjDQpZZy9BSHhnZnFUeVhDK2pQOFAxYWxxc2VCQ29vZDR4azJzakRmbVJ2YVY5UGp6WURvT0t1SHQ5SktQei8NCk45MFdOV3ZMamVJWnpWWDIzcERDVGdzYW0vYkRBOSsvTkFjRUZtRi91M2gyNEN5TTYrbk1Jcm5vQ2plSg0KUDljS0orYXB6YXhHV1ZZRTlhQVovYno2ZmVjTC9JTlZGaStqK0NiOGV1WklQYWhNSkxLRXAydkFObmRCDQpqcVl1M1c5b0xLRm5INStuNjZNeEZ5NmNSMk9JUkdqVFUxc1h2RkEwcE1VN2FWSFBOUkNtV3JHcXJvWWENCmdJZDdDSW9UR3I5WUF4Q0FoK1ZLQWdvZHVZOXR2M2dLS09leHhYWEQwT1hBbXl3NnpmcmI4ZHo0bzVPYg0KVE1UV2pGeWVic3JCWGdONVorQUsxVzEyZWhJQkIwRDBEV1BLMDdiZXp1aS8wOTMwWmNJNGFhY1BjMU1xDQphaCtqcHdBamhsNE5LREI4T2UrL0ZRSHVOM1drUkZ0OHVtT1FQOGZmOHFMR2RMdVRsZ2V0ekFtcE9hOWcNCmpwV28vNTVEZUNPTU85UTViYkRTd084Qk10Z25PS3dYRUt3eGh2eUhxWTI4NngzV1d3NERPWEZBcUdWWA0KU2RjTGZIS0tOVjFaMkhmQ3hiMVZsemtiWGJobFAvbEw1UzlXSGMvWmo4aFFOUzU4dWFoNFE2QVRDTDZHDQo3YjhkUU5iSzZvdXVSNnl0cW1GaitVek1rU3oyL1QrN3hWMDFLZGFhMGxMNDZrZVFkdzJraXhsU1FQY20NCllkR1IydjRUZk5qTHV6dW5IVjdobjRjcUdwbm9HNzZtWkNXTmRPaFJlTFNVMHhZV0h6U1ZUT2h1WGY0eg0KalFlNFZsNDU5UFg4SGw1N01DLzRSQ2kzM05YVnMyK2dpQmpybmYybml2RHA1TE9RYWlvN0pES3dqRm1UDQpPbEh0d2J0S1kwckVOQ0JZMHRxNGM2dEdqR0V2MUNkMkJtTmFxeWZYbHhXRFZXUEdlQ2xpaDdVc0Z5RjUNCnFWeFlpejJWRjJwVDBrcEN6dzJmcHZZNHlsWmFEVjhFN2xLaTV0TklHRGZ6djg4Mlg5QmJxSFpkN05qRQ0Kcmk2dzZTTUJBY3RVOGxUQkdGYXBnZkxRajlRZWlmRlhkT004WmRKc1dNZnFURXVsUmpVTnVrV3BYYXkrDQo0a2RzZEl0djdWRStBNEpYNzk0eDFacVJ2R1ErUjh5L0xkd09ycjBOblFJSlcxaTAvZnFLWTluNnM2NGoNCkFZVWZRM05vQzc0Nk1rQ0lnblM1TnIwbmVVQVY5RGZlNDd5dStqYUMxR2VHWkdlWVhSKzR3Z0ZyQnc9M0Q9M0QNCj0zREgwa1YNCi0tLS0tRU5EIFBHUCBNRVNTQUdFLS0tLS0NCg0KLS0tLS0tc2luaWthZWwtPz1fMS0xNjU4NDk4ODQwODQ1MC44MDAyODgyNDMwMDU1NjU4DQpDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL29jdGV0LXN0cmVhbTsgbmFtZT0id2hhdCdzX3VwJTI1M0YudHh0LnBncCINCkNvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnQ7DQogZmlsZW5hbWUqMCo9dXRmLTgnJ3doYXQnc191cCUyNTI1M0YudHh0LnBncA0KWC1BdHRhY2htZW50LUlkOiBmX2pnRGdMZFROT0lpUVhNcktPZmZpYUpoR3BQb1dtb0BmbG93Y3J5cHQNCkNvbnRlbnQtSWQ6IDxmX2pnRGdMZFROT0lpUVhNcktPZmZpYUpoR3BQb1dtb0BmbG93Y3J5cHQ-DQpDb250ZW50LVRyYW5zZmVyLUVuY29kaW5nOiBiYXNlNjQNCg0Kd2NCTUF4S1Z5UStBMDR6Z0FRZi9lSG9XV2hOQ2QwOWwzamxiM0kxUEVMSy9IZkVRSEZDZFRYM01EVk43TUQvOWtwbVI0enZTQktQSA0KYi9yNUhGeEQ0K2gvNmpBNG5TMjVFMkRiazRsTEpZdHhBdU1kQ2FWdW43NE80dzU1UEc5RklwdDNzeW9rY2FOYTlrSW9RaWp2eTBxOQ0Kc0lxV2RPNGFmN0JycGk4K29tOTJqTi81MmgvVEZGMVh4K0F4VnpXQ2RJelk0bGhhVnVnaVpsQ0czNWdGZk04c1d1djlOdmw5RFBXYw0KUTR5S0d2NHUwandzRGxybXlla0J1RjYvSGNPVkppZ2daS0I3WExrOWgxNUc4SGlMQURuTmQ3RFpXQ3NVZ3NUSlNxQ2dWUXJZdldzOA0KeEhmOU1GbVRBcklwSi9sb0FvaDJwMXdUYVppVDZ5UWZWazZqMkc2TVhuUHlROG5Jdkt2ejRkN2tOc0ZlQTNsbjRBclZiWFo2RWdFSA0KUUkweUYwWUdkZjh0eGVvckpvbytqcjdjZXg4bEVaOUw3SUk2cUNlS1k3TjJNQmJhWW1ZQ0h3MWtpZWhsTTA1UWJ1Qmt6Nk12TUVPdw0Kd1kwc2ZzOCs0aElndzF2R1NDV1ZIbDBENko5L0VkWk80c0hBVEFNU2xja1BnTk9NNEFFSUFJWVhuWEUyeDNGcWV0aUNqZVJNdVphRw0KUXFXV1JScEZDcjlZSEQ4QkNVUnJUdzFEZ0d5T2pFMUQ0VXNMbUtWam55ZEk1L3BrUWJFblBpR3liVm9McjJPNytYTnFDU3NuMlZLdw0Kcnc3WWlLeDArOXdOSkFMUHZiakhwR1AzVC9mQmZMNTdKNXpaWlZ3RVZPTGtkSmwzdWlJZzBsdUFBVERmcWIyYmFjOHZCcnlEVzN4NA0KVmZRdzYwMEZrMVNWMGxhc1RNSWtUdkVzRnRQTG5DM0lPSEd3WC9ackQ0eDVNZjZINlBrSTUvMHNqdUhSWkEvRUpEalVXYjVCNmxhLw0KK2VHb2Y1Wkxkd3BLSHl3UUxOUTBPNFh6ZU05emt6VzZaSytEall2endkYVpiZ0ZWNWVPVG8yckxwMzk5K0hnNVR3Z3cyMVFSZGV6WA0KcWZqNGZjSVRqVmlRWEhEQlhnTjVaK0FLMVcxMmVoSUJCMEF0bmZJTG1COG5ucFM1SGlLWVF6VVpCdTZnZkVwZ3c3R0wwTVYvNVhnNw0KZGpERDhlbkwyc1Ftbkh1ZWtxZ2lmVGFXeUhhVlBEUUxwVGoyVTBEcXdGUEF4UnBvV21pQzRjZFFpZFpRQnhGTzk0M1NTQUdodXYxMQ0KSnc3cjhkUVVTRzYvQTRjVlFOdXlHaFF2ZFY3b3JBdU0rZ0lPOXZoY0dFL1I5dEZwSEQ4K1VZTUpybEZQdU80RWo2UnhVQ2w3YktWYg0KZkdpUVVYTkpGcTgzeHc9PQ0KLS0tLS0tc2luaWthZWwtPz1fMS0xNjU4NDk4ODQwODQ1MC44MDAyODgyNDMwMDU1NjU4LS0NCg==", - "historyId": "2302597", - "internalDate": "1658498840000" - } -} diff --git a/test/source/mock/google/exported-messages/message-export-188721aebb71c16c.json b/test/source/mock/google/exported-messages/message-export-188721aebb71c16c.json new file mode 100644 index 00000000000..a70a59e3da7 --- /dev/null +++ b/test/source/mock/google/exported-messages/message-export-188721aebb71c16c.json @@ -0,0 +1,126 @@ +{ + "acctEmail": "flowcrypt.compatibility@gmail.com", + "full": { + "id": "188721aebb71c16c", + "threadId": "188721aebb71c16c", + "labelIds": [ + "Label_15", + "SENT", + "INBOX" + ], + "snippet": "-----BEGIN PGP MESSAGE----- Version: FlowCrypt Email Encryption 8.4.7 Comment: Seamlessly send and receive encrypted email wcFMA0taL/zmLZUBAQ/+KI9KKzEER58FcRk0S1yqhbMp5ucWw/trGOupYyia", + "payload": { + "partId": "", + "mimeType": "multipart/mixed", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "multipart/mixed; boundary=\"----sinikael-?=_1-16855415442170.8906747903599939\"" + }, + { + "name": "Openpgp", + "value": "id=E8F0517BA6D7DAB6081C96E4ADAC279C95093207" + }, + { + "name": "From", + "value": "sender@domain.com" + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "Subject", + "value": "Test attachment #3505" + }, + { + "name": "Date", + "value": "Wed, 31 May 2023 06:59:06 -0700" + }, + { + "name": "MIME-Version", + "value": "1.0" + } + ], + "body": { + "size": 0 + }, + "parts": [ + { + "partId": "0", + "mimeType": "text/plain", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "text/plain" + }, + { + "name": "Content-Transfer-Encoding", + "value": "quoted-printable" + } + ], + "body": { + "size": 4122, + "data": "LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tDQpWZXJzaW9uOiBGbG93Q3J5cHQgRW1haWwgRW5jcnlwdGlvbiA4LjQuNw0KQ29tbWVudDogU2VhbWxlc3NseSBzZW5kIGFuZCByZWNlaXZlIGVuY3J5cHRlZCBlbWFpbA0KDQp3Y0ZNQTB0YUwvem1MWlVCQVEvK0tJOUtLekVFUjU4RmNSazBTMXlxaGJNcDV1Y1d3L3RyR091cFl5aWENCmNrRHd0TW1kMVJhYW1qd0k4bklnZXp5R09Lell2N2lSQ0tKSmpIRmtZaFREejh6QnI5ckdzaXdaVlFncQ0KNzZ3U1hOMzNSbnZ0czYrQ1A5WWZ3NmJHekk0UlRYaHlmR0JpMzJiNlMwQjMxcityTDFtM3dSUVhzck9wDQo0QUk0N2FpUnFPS0tGMHlhRlpka3JZWExrQ1F0Y0FhTXI5SzdkT1Izb3drc3FXVVpndEMxMmR1MDY1YTINCllxZjdNRnNQcGs0S3RhaXRZTTFOTFF6NzltbjlPeWdtTXlwLzdrZ1ljYWlqYWFYZlVxd1dQcSt3Y05iZw0KeEJHNXcvRmpJU1BOWFRaelNQMnQvRW0xNnZWRzBsbWlNOWRyTmlHV1MrSDcxbFhreEFrNDFtV1Y0NWw3DQp5anlCRHNJdUdZcVNzb1E1c3Y2ZnU4US9hdXFJQnRaam5MRHJhUnFldE5YVkdrT1owVVZYTUF0b1NCSnYNCm5LV1hjMXU5dm0xakY4ZFptK09kN3NhOVY4Zi8zam5BaHJsTTlkSldPQXd0YkJpa1VYc1plWFMxSEhlZQ0Kb2FEUjNiYWc0VFJpN0J5ZVZGR1Y5TGwwY2JjSlZVb2MvT2hpYzhaejJRTFRDaDhUaDdxZGF4a1RjbHY2DQpZTWtJNjEvS0dtb0hDUXNNcmtPVCt4bkJHUkhpNy9jMnF0N3FBTEZZaTlzcVBoRldKb1ZFYnl4dFNPM28NCkZ6MmFxWDJJVDV1ZDBxbWVaQ1A5QXlLdkpaVmpVNkJtZzdYT29GNVQ1ZUtiblNSUFdRZjNlVmRjOG44Vw0KM1R0RldrbERVTzYrUDg2WXppendKK0h1a0lEVE9vdFBjQlpPcTZNL1hzekJ3VXdEdmIxMllQYVpqY1FCDQpELzRxMlBoVHR6aWExbVBzMlJ2ZFFOTUo5cElxdnk3TEJJNk9KZDdrSE1JTkM4SDdTRVBBcWlaekYxYzYNCjBWVmN0UW1aN1NuajVKOHRaNTFYZmQzbERzM2hFczBQNE5oZEkxUURkdFRzMUkvbGYyQ2QrVktEQlFDSw0KT1NwV0VQSDlCM1ZuYVlVNzFsWEYzRTV3ZXVNMFRKQ2RIUkgxZ04wdVlxSFo5TTBJS0pjeGdOSHBDaUZPDQpCVkcwdzdmTmplakxYOHdDMUx4YmRYTWExY0pVcDhpYjhXdEk1ZVMwS2FQajlZNnViMUpRcTlpUVdXVHUNCmVoQVlmVlBGZWZQVjN0VXZORjVZc1pHeUFxTWFwOEk3MmN1cjRpWTNSS1g3V0lzOHZTeTZIRGJtUzRMVw0KeWhQZ2pWSHMvV0I0YVMyUXlMcjFadUlDZUlkRHQvN1RKTHFOQUdmZ2xSVG52ZnEweEtwTUtIczVVNnA4DQpKS2h2TUIyR2gydVpZaGRiMjdoaElqMUtBNkh5cFpRUHhyZDJwaGpVRlNSa0NSM05QNW1ieHlXbWN1NHkNCm1vU08rNEhLazlhemZkNklySHE0YjFRckJ5Rkwvc28wVFBtNFBVQW4zaDIwMmhKTU54WWdRdnB4bmc5WQ0KcnZVcmljY2RMUFpudTQ3MTlSbG9ZcTB3RVk1Y2paRHlQc0R3dG1Oa1hmRWJGbHdUekE2ci9tWndjalBEDQpKK0FBZ04vaTRjdkhZVFRFWHhPSEJDUTdsdzNuVzdzSS9zRHlSQW5UU25KODdSaU9pRE1DaEFhRUVmMDENCnJPM3gyYmplODE2STJjaTdPRDQvL2ljano1aEl5aWRqcFVOSUVEUGpESitLdE40QWF1QzdKa1p4d05KeA0KeEJ0cTNNYkZMREIyYlZZWmIwRUhxNUM1ZDhGZUEybjBreTNrTC9wVkVnRUhRSUtCelJIV1FyTnA4T2FjDQpMakpiVGFVOW9YamZMeUdqYTRISElPN0RkT29RTUtVYitLTS9rL051TktiY1o0c3NDWVRiUjhyc2xrRTQNCnpNclRac3h1QldubVhDdnI5ZHdQVmdXTGNOYStZcS9yRXNIQlRBTkxXaS84NWkyVkFRRVAvUkFJOVlpSw0KVEM1SzMyRDFrVnI3d0NqNU1NcVR5Q2hnUHJDMGI2NEpBLzVMeFRXRlhhaEc2RWwzaHdtMGxQODAvR2h3DQpBdjhFdW1xRTZqVUNnbTBaUWNqVVFPMEo0bVdmNDBLQ09zdkRVK01GTUdlQ3ArNDYzT3lURnJ4WmNIaTMNCmxsNjdpS0xGa1lNNDlwWSt1WVZoN1lRdm9nZERET2RaQXFPWmNlQXRnUGhiNU81UnUvcjEzVU92ZXBIZA0KamkvU0pHOTZoNzA0dURLK2RPOGM0dmtKN1Q2ZC9kRHUvYTlrazRvcGNuVm4wV3ZqRm9uU1BmcCtiOFFtDQpoY0ZERjBqbFBQdDVZNWoydll2REI5OXNNYUIwby9UVm53eFBnVEFuMkdRODF4dTcyOXo5ampwUnZocXQNCmJlZlA3TE5oTWhrQnRicXhVK01yTnZJUFRISXBOUmZJTDFwbzd3V0R4WlJudnpINGRCbk1jaGdiSmRHOA0KUG8raUsvcDlITkd6bkI0b3hHMVJkV2duV2Z0czdxUFlNQlpwdzg5ekFtbjV4Z0s4ZXYzdEJtTGVxdHIxDQo1T2hZYlgwNXJZd0gwUjJsbUc1SWQ5L3JOU2ZzRkpWTDJDQlVGUnFWOWpJc1NsdDAwUnBsUDBKNmwxOEwNCkpXc3d3Y3AzaHlvRlllS09GaCt3TjBITEJrUHBuR0x6eXdQYVduL3lRcFpqY25QcFZOQkNibjZDY1dFSw0KaE1ZeEFNakpsaWVTN25uNzhGMkZnWXVLSm5uREttSnpMOTBUM2tCdjc1WmJERklTQXpjdGhJL0tkQjU3DQo0ZW45YS9ya0ZjNkx5NnlUeHFuQ2xkaE91L1ZiL0ZpTHVFS1ZVbm9KcTZNTzFLeWI3aGFvYy9hVE51R3ENCkIwOGkvZGRMbUZnZ1RHNnh3Y0ZNQTcyOWRtRDJtWTNFQVJBQTFZU0xic2J1c2VZRnpjbEJabHJLRStRaQ0KcCs3THVmUkt2N3hDa3BYanFFZEJqMWwwOCtUNlFwZnEzUUdlVkdySDU4Q3dBL1ZCMzhXZmVIYVN6S2xLDQp3SDlVMVRHMFhqZG5wUm53eEZDQVpVUjA0NzdIVU9FQmRMZ3RUZWd3eGVGRjQwUUEwYllaZllHcHdKM2UNCm9ZdGJ4ejJkeDhTSHFKMWgzUUowNVhOUTNKQjlDK01YSWV3YW00K1RvWFptUVRSanI1V3JUb0VpeUxWTA0KRHpYQlIrYXB5YnlXTmhzeFVoTlcreUE0S0RXZHZYbnBMSDBUSno0VW9aTUpTQWVhcnk2ZDgzRHo5dmlsDQphUTBpWmJCWEprSWVacGxlbmlyQXF4bWYvRVduOEJKT20wS1R2Y2pxTW96dThPQm9ScG9LZytUUElSZGYNCllteERianJiMmxPeUI0b3VkWCs0WHZzVTlzamZiRzBrSk1iUldENXdKK2lxRjdvc3czUVhTMFh0SE41dA0KakxlcDh2akdWMVZTUHFxWlNtVkg1TXZSa1NraGtJeFd1c2Zma2J0a04rNXlGYzVnSWlnRmt3V1ZWcWpQDQo4RmZYZHFRcitrNlF3Uk9EbkRVR1l2K0ZEaFFVNjdxQlhQM2FlaG9RYTZON2dkMS9wQ1FnSG9zVzBTcGQNCko3bVZWcGIzVFZ3enYwUkQxTzZiNDNqbmY0bTZsdmdOZjlwUm1EOWxNSXZiaUJrM2t6WUlrUGVSZ0dIVg0KNi9VeVRwQXJSdjZrdW1wRUNVeFlJSDBYK3paRnVDNmdUbjRqZVJqb2k1S2N6UHRDRklwNGFFeWMwYjNnDQpHQWl1SWJWYkg5Vk4xSUtxZmViOG9HSStBZ2prQW91ZUxIV0tXTzVHdmRUOG9mZWx4Q2VYck1LN3RUSFMNCndkc0JwVlk5UnV4dFdiaGF0VWJyd0R2VzlVbXJXRG1naHVVSGg5VWthVUNjV3FvOTA2ZlQ2R1N1OWtUMw0KNG1PYnJqbGU3eXlSa3oyY3crVDMyNzRoeGZ3bmNqayszdUFtOW1iQzRCY3kvNDFwOGlOWHdZQjJyYlJqDQo1VjZtaFdiZ2RnbFpqcllWQ25QVnFrOThyN2haL1BKcENUOVB2OEtXMFZTakh5c3NmSWNqN1lobDhiT00NClJvYjE2Z0RzWUE5SjFTd1c2Q0owSnQxWEc5UTc2RkN5b1g2QnRNMUxWY3FHMlFLYUZoY3JQbUQzN3lubQ0KZDZkZUg4Rjk0K2doZnhVRlFuQlZUMGtsVzBBTnpWUnJwTWxSM1RoRUJFTHRTYUpOZ3IxbFowVTQzMVdVDQpUa0x4d09meWxjaEhsZFRMSzBPa0lLMlBySlc3R0dVSEdFVmNCbGJRT0dnUXFQMzFROXhhWVRBdVNHZEsNClhQc3BuT0hvYUZaZjUvcjZyVHBEdnBVekhRYWR6OTZtRDRLRk1XYTFVMy9iVzMzRnFFMGxCR2c2YXh3Qg0KRHo4UW1UMkFXUlJpc0RaUGZkU01NWUNnalFYZDJqQVo5U0ZzY1ZSODVaUDlqTEIyR200OWhkei84WktmDQpOc2dPditZMVIrN0hIMjFpNU1VVDlLYTB0bE9LcGVFd05vdklyOGpYS0tFcjdraEx2SnJ4TnNCSFk5blMNCnBOb0V5eHZBS2xXMXdSdm82VnNJVFhDQUp1bmpoVVFyVm9TbUJtYktuQWZZemkyOTRiNG5GYjAvYkZxdg0KaFIzb0hKcUs0bm9MWXpLZFpBVEJIWGdzNlF4Vm1oR2VQajJrd1JBYllHNFR1SWZKNkNnMHBSaXU2NzZsDQptMGlMaS93WFF0VDc2bmZZWDhiWVVtaDV2bHYvTW5LcGZBdlpDM1JDNXVuZFhYeWhHTm9zY2I1eWp4V1ENCmZwaEI3YXNBdUowMlk2VktCeDBQMk1CVDVOdnlPU3o0RWcyVUljWTdZV0tha0NjRWRsQUNsbEVMRzE1Vg0KSCtUQ1JmNGNqUStCekFKck9LZFIxOGkyTEdOR2ZWVzFmMUN4K2JYQzl6YnBmMjdBNjVxNUpCZGpidG9BDQpjb0ZKV3NPcmYyNjl0YnZFQUFtYkE5c1ZQbkN4bnk0b2xXT1RDVmFudmJjSC8yQVVTMTdoDQo9cC94cA0KLS0tLS1FTkQgUEdQIE1FU1NBR0UtLS0tLQ0K" + } + }, + { + "partId": "1", + "mimeType": "application/octet-stream", + "filename": "what's_up?.txt.pgp", + "headers": [ + { + "name": "Content-Type", + "value": "application/octet-stream; name=\"what's_up?.txt.pgp\"" + }, + { + "name": "Content-Disposition", + "value": "attachment; filename*0*=\"utf-8''what's_up%3F.txt.pgp\"" + }, + { + "name": "X-Attachment-Id", + "value": "f_TwRqngHBJBTuWpmsYkjIsImtCizyqT@flowcrypt" + }, + { + "name": "Content-Id", + "value": "" + }, + { + "name": "Content-Transfer-Encoding", + "value": "base64" + } + ], + "body": { + "attachmentId": "ANGjdJ93TiZoScoZbqS4-47RXwU7J4ZyMzvoUHZYrpna6bun9VTypNPxCD0p1v6j_5aB9wo_0w8lxdxCK0morUP3M4pikZWkxHO-BdzHzBumdQI4uBXuKUbQGw47vJfKB69SkDc9ClfBENTw6cpSVQlAQXUvckJu1lTbjbSAXXbhoCB3saQtHsdJ7QB0LHG3QBqM18gBsTDLsHoNtfA7xX-EnbT0VJ6l4tIcM9pKnGdmyrA4S2Ap-3Bz2jxgIuGYhexBJpbNtzUMOZHPY_cYnast6ZHkNgWZMqVLqvO4UOqlgELoRbJnaUCX8YXebW_IPPVq5zELRcWn14QOwway5s5bmW3nG0MgUtqZMuo9nizmRpfprNMylsF28ajv9WrL-gzFV9gEUiVvH40n82F6", + "size": 2273 + } + } + ] + }, + "sizeEstimate": 8347, + "historyId": "1408057", + "internalDate": "1685541546000" + }, + "attachments": { + "ANGjdJ93TiZoScoZbqS4-47RXwU7J4ZyMzvoUHZYrpna6bun9VTypNPxCD0p1v6j_5aB9wo_0w8lxdxCK0morUP3M4pikZWkxHO-BdzHzBumdQI4uBXuKUbQGw47vJfKB69SkDc9ClfBENTw6cpSVQlAQXUvckJu1lTbjbSAXXbhoCB3saQtHsdJ7QB0LHG3QBqM18gBsTDLsHoNtfA7xX-EnbT0VJ6l4tIcM9pKnGdmyrA4S2Ap-3Bz2jxgIuGYhexBJpbNtzUMOZHPY_cYnast6ZHkNgWZMqVLqvO4UOqlgELoRbJnaUCX8YXebW_IPPVq5zELRcWn14QOwway5s5bmW3nG0MgUtqZMuo9nizmRpfprNMylsF28ajv9WrL-gzFV9gEUiVvH40n82F6": { + "data": "wcFMA0taL_zmLZUBAQ__U2iTaxTs-GJ2VMxg87fFIxjkz5RXhhO86T5A-bRrA3LuUrQaXIbYkwcqQlokpRRmqs8HlpM_pQr8yz0A1HBJkrjWeKcKSJ6mxUr0H-3huxhOjP35V87Pr-MzvM1AnHxBorFnef4rqsu1uaI_7ny6kwURGCzBpqnLzzV0SUzgXRcUcxooBUr6BszM1y2tg3-VTMEn3U2EKKST6EVpQL2kcuKGBrM5zLnrEvwIhXrLckrf6fHLFQA83ooyiojH0XCnsIcgn999LIveZb0LAULlSDDgeuQ8pGFXSMCgtf02x3euLq22USaMDTijkQUgw4TRRBifVgeX7ffJ0V0hQLppUOP91OWgu81LX-CbUJuR5So0W8jgv7Z_UJyoRZ8QPsnVCP6KBmweLXorkdA4yq0GU_DMgRKT4kTVZz7sBzIyAWKd_ZyPmowfh_o85UqQoGhp3ALuRvCw_WbTzRLclJsfwP2Kl1nC5TXVvakQVefSm2fiuShHNe1rSZIstVZp6z51Xvm6jO2GcY6kRuGRpnZ_NM1d7auokutZprdEplTqxCzt5Yde9ueKYnWtncBPxY2IVr1bHzrCANKnI1Dx0XdCumcq6HND6To7xLgzf1ZJlTrIm0_19wMTZuVZ6au5JfgsK9Fs--mh39mY0g3BE3lBZlVn0PU11ZiMvM0QmP-nQavBwUwDvb12YPaZjcQBD_97nsunGO3jNqU7muSv2mLkg4N_pwnAVbZgMKwpeI3Ktj0OstRQj4RiSkTBbcut8GWV99s9R_iFCrTQsMX0qOUXi3r7-beC6_gFA-RplLAZgXbwZlMx9Ip_ZsvoU2fRHNdu2SIqNs-BFQIBpiUPWrBz01pJdfOA_IjDGJ3ZZXRwejCwoB-InMGhEWJ6FVs9ekeuW4wF40VvsLuS1Kp30VI4-SCH5txf7cX5jdDOcoPN6n1_BZHWQ77qhhOcb5To8aw0fKpYmEUAZ3Qc7OUtBlxZ_4dH8vfGsUZoiLORFWPjPZ_lxzf4kjBN8VC-f-F3eclGRyng8yezsp_Lrx-HNTlD6i7U131zTBKCgYJWN9iWJRbKSeG5JOPBfJaPfRDuUUq3dk5okbYsVX07RcWjeltB33T5UAj6nj7ydtxsaXjWPMjQUVPZKOI61-PrbcDJAhNefEkny3_7yF1BJjtV55-XVNaOIqcOzTrI5dpLJD5_Qp1BoZxOa8AJEiQkC7xKbZrq-zGjSeXoy1j_d1aYAOyFqeGcZ3y9me5XL0H5KGHRl_0A6hyCwhrnjYKH2IWYo5z-2Z-nQIaxpBJ4Yk90fHPUDnlnKEaZ5Z6xpDRtpRmgGZddHPKeJPbZE8Om4t-mTsH7KF2NbrzZyYvMWKSPwMvQmNc9ygX6O27fA0GS7s_A7cFeA2n0ky3kL_pVEgEHQIU1b4e8CnRlglTzixgVj11p0vvcxVME8nwJd9DgRYhoMLIlNSpQjxTM0MZvrH1mUBn0h4pLcqTzaXGd04XkeQslcYqvzeIFTsJtVzCaS_Xz3MHBTANLWi_85i2VAQEP_iybEjWyeGtR6w9h7S6mSzOT9InJ9TsOLdx2AtC-VOPMz6VUl4BwyNy38mDg8hPz-quYhXPOmo-0d7r3ujxb_MeD65M_ESUsxyjtp8bf_iRWxDkjr9-aiPgi9MAj2qGMMxWv2hF8de9oL78oD2i4b10GuA9ubb_Xj52Qxp-ysKr5DdnO6F0lQXNfoviUndp1PgDodtZDawOOKSGuwUusU62J_82__iXLzowjb1J-kMS5_FzWnjQod9BpOzE2eA5yYtg_MKt5jSWxRVE6omuwf6jQUAAS-nX9MpF2cotB_XD0uUweQTVhaDiYfMopT_sXjV0gQEbT7tTCYH0p4LvXEYwaZbsCmtS4k2ijUE6EqkHmL8CKQ_U0zL7EMXg2hADnCLJU9Xozo-XlnulZxmzOC5j0qtzhB5_xuSUFEkkIWz_GoE_FJlebaLSlMVi3z_7WrVZhntZnJnLD87HBC_ia68VBO17MUyc4kIOpsHL1bEJDqaFmlKFcGFvGoJcxmTqakT3m1gkhFw_f7lDpDA9mY708lQ6n1NxmfwB_wuHUOtfOcqxaeLG1nw_lhoYLJwJqVBsCG3SD8sywUjDQWGYj1-_4HD1Lm8My3Vw-H0mjd9jo2lo9Q7sig9KmTfeG1cPHjiHmop2UrRbAEkYfY21EcKbLiFvYlagMX0WEWgUbOKjZwcFMA729dmD2mY3EAQ_-L_LKYUt8BM66jVrK3GKXEs9mz52oNRDsXFyKxkC8jdIyxYR_h6vcTiDrOu-lkVIdrQmqMHkB45hvQMCKxFOKCl9R0_ECPqscjghNph_mBoKUlh_VypUWLXpr54ttcrzT7jOb1FEZUxTxnQZMQvK1Z4OG_YqNonTPC9E7HSULLZ2g_1FhrHnfEewtQF_EgY5DhbTX8eJbDtRz80mLtw1_LToSsTuEgLVwqO1eF1uckmuiokJc5-z0VRtYOALIxX4_tWigEsD1qczy9J3ne3-DjLFuZcOMocW7LawxnrEdSxkJf2CRrCl5C87yNpPnwxo9lm-Qk77E5WnupNlIrJfpxuoxvrGZ8eWFFQkm4tCOOyIuhYaB3mjXCgnINA53iLs1tCsdEL9ZS_--gC4rTvDFNjWojBDGq_kOZDlOVJCHK9OMfsC3elSc_VIcx6-aqf3OBRF8ryzt8-kFCOEHLNKi1SiyX9tAugXMTNsRXLXobiEjO6sGpdLEzmJZxyxu1IQ_YTD5BY9y8BfqsvQcDZ5KWJi6FJaXpNrMGBRAMOQogHmWnXqgdkz8S-vlggcX0q87OZmRxsP3unS_nxAclycGge7kROOFEvbKCnFcLfgptLYeAeKvhno892ualX9X175RoZ-WOVm9-MF_StWmS41vdKIpGWxXxE5rhQlA608My53SQwGF7q6vYrVPIL6DT1RlArbpdI54OSpTKvCbVC7E2Ku6vFlV1SkEyIGymC51IFDWRskEoF9Lqu9uma0BwKkPJcKZwrA", + "size": 2273 + } + }, + "raw": { + "id": "188721aebb71c16c", + "threadId": "188721aebb71c16c", + "labelIds": [ + "Label_15", + "SENT", + "INBOX" + ], + "snippet": "-----BEGIN PGP MESSAGE----- Version: FlowCrypt Email Encryption 8.4.7 Comment: Seamlessly send and receive encrypted email wcFMA0taL/zmLZUBAQ/+KI9KKzEER58FcRk0S1yqhbMp5ucWw/trGOupYyia", + "sizeEstimate": 8347, + "raw": "Received: from 717284730244
	named unknown
	by gmailapi.google.com
	with HTTPREST;
	Wed, 31 May 2023 06:59:06 -0700
Content-Type: multipart/mixed;
 boundary="----sinikael-?=_1-16855415442170.8906747903599939"
Openpgp: id=E8F0517BA6D7DAB6081C96E4ADAC279C95093207
From: FlowCrypt Compatibility <flowcrypt.compatibility@gmail.com>
To: FlowCrypt Compatibility <flowcrypt.compatibility@gmail.com>
Subject: Test attachment #3505
Date: Wed, 31 May 2023 06:59:06 -0700
Message-Id: <CAKbuLTppiu77d3gOtgNtsPb09yVL8FoBEUQvhQOhO-FAXCc9zA@mail.gmail.com>
MIME-Version: 1.0

------sinikael-?=_1-16855415442170.8906747903599939
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

-----BEGIN PGP MESSAGE-----
Version: FlowCrypt Email Encryption 8.4.7
Comment: Seamlessly send and receive encrypted email

wcFMA0taL/zmLZUBAQ/+KI9KKzEER58FcRk0S1yqhbMp5ucWw/trGOupYyia
ckDwtMmd1RaamjwI8nIgezyGOKzYv7iRCKJJjHFkYhTDz8zBr9rGsiwZVQgq
76wSXN33Rnvts6+CP9Yfw6bGzI4RTXhyfGBi32b6S0B31r+rL1m3wRQXsrOp
4AI47aiRqOKKF0yaFZdkrYXLkCQtcAaMr9K7dOR3owksqWUZgtC12du065a2
Yqf7MFsPpk4KtaitYM1NLQz79mn9OygmMyp/7kgYcaijaaXfUqwWPq+wcNbg
xBG5w/FjISPNXTZzSP2t/Em16vVG0lmiM9drNiGWS+H71lXkxAk41mWV45l7
yjyBDsIuGYqSsoQ5sv6fu8Q/auqIBtZjnLDraRqetNXVGkOZ0UVXMAtoSBJv
nKWXc1u9vm1jF8dZm+Od7sa9V8f/3jnAhrlM9dJWOAwtbBikUXsZeXS1HHee
oaDR3bag4TRi7ByeVFGV9Ll0cbcJVUoc/Ohic8Zz2QLTCh8Th7qdaxkTclv6
YMkI61/KGmoHCQsMrkOT+xnBGRHi7/c2qt7qALFYi9sqPhFWJoVEbyxtSO3o
Fz2aqX2IT5ud0qmeZCP9AyKvJZVjU6Bmg7XOoF5T5eKbnSRPWQf3eVdc8n8W
3TtFWklDUO6+P86YzizwJ+HukIDTOotPcBZOq6M/XszBwUwDvb12YPaZjcQB
D/4q2PhTtzia1mPs2RvdQNMJ9pIqvy7LBI6OJd7kHMINC8H7SEPAqiZzF1c6
0VVctQmZ7Snj5J8tZ51Xfd3lDs3hEs0P4NhdI1QDdtTs1I/lf2Cd+VKDBQCK
OSpWEPH9B3VnaYU71lXF3E5weuM0TJCdHRH1gN0uYqHZ9M0IKJcxgNHpCiFO
BVG0w7fNjejLX8wC1LxbdXMa1cJUp8ib8WtI5eS0KaPj9Y6ub1JQq9iQWWTu
ehAYfVPFefPV3tUvNF5YsZGyAqMap8I72cur4iY3RKX7WIs8vSy6HDbmS4LW
yhPgjVHs/WB4aS2QyLr1ZuICeIdDt/7TJLqNAGfglRTnvfq0xKpMKHs5U6p8
JKhvMB2Gh2uZYhdb27hhIj1KA6HypZQPxrd2phjUFSRkCR3NP5mbxyWmcu4y
moSO+4HKk9azfd6IrHq4b1QrByFL/so0TPm4PUAn3h202hJMNxYgQvpxng9Y
rvUriccdLPZnu4719RloYq0wEY5cjZDyPsDwtmNkXfEbFlwTzA6r/mZwcjPD
J+AAgN/i4cvHYTTEXxOHBCQ7lw3nW7sI/sDyRAnTSnJ87RiOiDMChAaEEf01
rO3x2bje816I2ci7OD4//icjz5hIyidjpUNIEDPjDJ+KtN4AauC7JkZxwNJx
xBtq3MbFLDB2bVYZb0EHq5C5d8FeA2n0ky3kL/pVEgEHQIKBzRHWQrNp8Oac
LjJbTaU9oXjfLyGja4HHIO7DdOoQMKUb+KM/k/NuNKbcZ4ssCYTbR8rslkE4
zMrTZsxuBWnmXCvr9dwPVgWLcNa+Yq/rEsHBTANLWi/85i2VAQEP/RAI9YiK
TC5K32D1kVr7wCj5MMqTyChgPrC0b64JA/5LxTWFXahG6El3hwm0lP80/Ghw
Av8EumqE6jUCgm0ZQcjUQO0J4mWf40KCOsvDU+MFMGeCp+463OyTFrxZcHi3
ll67iKLFkYM49pY+uYVh7YQvogdDDOdZAqOZceAtgPhb5O5Ru/r13UOvepHd
ji/SJG96h704uDK+dO8c4vkJ7T6d/dDu/a9kk4opcnVn0WvjFonSPfp+b8Qm
hcFDF0jlPPt5Y5j2vYvDB99sMaB0o/TVnwxPgTAn2GQ81xu729z9jjpRvhqt
befP7LNhMhkBtbqxU+MrNvIPTHIpNRfIL1po7wWDxZRnvzH4dBnMchgbJdG8
Po+iK/p9HNGznB4oxG1RdWgnWfts7qPYMBZpw89zAmn5xgK8ev3tBmLeqtr1
5OhYbX05rYwH0R2lmG5Id9/rNSfsFJVL2CBUFRqV9jIsSlt00RplP0J6l18L
JWswwcp3hyoFYeKOFh+wN0HLBkPpnGLzywPaWn/yQpZjcnPpVNBCbn6CcWEK
hMYxAMjJlieS7nn78F2FgYuKJnnDKmJzL90T3kBv75ZbDFISAzcthI/KdB57
4en9a/rkFc6Ly6yTxqnCldhOu/Vb/FiLuEKVUnoJq6MO1Kyb7haoc/aTNuGq
B08i/ddLmFggTG6xwcFMA729dmD2mY3EARAA1YSLbsbuseYFzclBZlrKE+Qi
p+7LufRKv7xCkpXjqEdBj1l08+T6Qpfq3QGeVGrH58CwA/VB38WfeHaSzKlK
wH9U1TG0XjdnpRnwxFCAZUR0477HUOEBdLgtTegwxeFF40QA0bYZfYGpwJ3e
oYtbxz2dx8SHqJ1h3QJ05XNQ3JB9C+MXIewam4+ToXZmQTRjr5WrToEiyLVL
DzXBR+apybyWNhsxUhNW+yA4KDWdvXnpLH0TJz4UoZMJSAeary6d83Dz9vil
aQ0iZbBXJkIeZplenirAqxmf/EWn8BJOm0KTvcjqMozu8OBoRpoKg+TPIRdf
YmxDbjrb2lOyB4oudX+4XvsU9sjfbG0kJMbRWD5wJ+iqF7osw3QXS0XtHN5t
jLep8vjGV1VSPqqZSmVH5MvRkSkhkIxWusffkbtkN+5yFc5gIigFkwWVVqjP
8FfXdqQr+k6QwRODnDUGYv+FDhQU67qBXP3aehoQa6N7gd1/pCQgHosW0Spd
J7mVVpb3TVwzv0RD1O6b43jnf4m6lvgNf9pRmD9lMIvbiBk3kzYIkPeRgGHV
6/UyTpArRv6kumpECUxYIH0X+zZFuC6gTn4jeRjoi5KczPtCFIp4aEyc0b3g
GAiuIbVbH9VN1IKqfeb8oGI+AgjkAoueLHWKWO5GvdT8ofelxCeXrMK7tTHS
wdsBpVY9RuxtWbhatUbrwDvW9UmrWDmghuUHh9UkaUCcWqo906fT6GSu9kT3
4mObrjle7yyRkz2cw+T3274hxfwncjk+3uAm9mbC4Bcy/41p8iNXwYB2rbRj
5V6mhWbgdglZjrYVCnPVqk98r7hZ/PJpCT9Pv8KW0VSjHyssfIcj7Yhl8bOM
Rob16gDsYA9J1SwW6CJ0Jt1XG9Q76FCyoX6BtM1LVcqG2QKaFhcrPmD37ynm
d6deH8F94+ghfxUFQnBVT0klW0ANzVRrpMlR3ThEBELtSaJNgr1lZ0U431WU
TkLxwOfylchHldTLK0OkIK2PrJW7GGUHGEVcBlbQOGgQqP31Q9xaYTAuSGdK
XPspnOHoaFZf5/r6rTpDvpUzHQadz96mD4KFMWa1U3/bW33FqE0lBGg6axwB
Dz8QmT2AWRRisDZPfdSMMYCgjQXd2jAZ9SFscVR85ZP9jLB2Gm49hdz/8ZKf
NsgOv+Y1R+7HH21i5MUT9Ka0tlOKpeEwNovIr8jXKKEr7khLvJrxNsBHY9nS
pNoEyxvAKlW1wRvo6VsITXCAJunjhUQrVoSmBmbKnAfYzi294b4nFb0/bFqv
hR3oHJqK4noLYzKdZATBHXgs6QxVmhGePj2kwRAbYG4TuIfJ6Cg0pRiu676l
m0iLi/wXQtT76nfYX8bYUmh5vlv/MnKpfAvZC3RC5undXXyhGNoscb5yjxWQ
fphB7asAuJ02Y6VKBx0P2MBT5NvyOSz4Eg2UIcY7YWKakCcEdlACllELG15V
H+TCRf4cjQ+BzAJrOKdR18i2LGNGfVW1f1Cx+bXC9zbpf27A65q5JBdjbtoA
coFJWsOrf269tbvEAAmbA9sVPnCxny4olWOTCVanvbcH/2AUS17h
=3Dp/xp
-----END PGP MESSAGE-----

------sinikael-?=_1-16855415442170.8906747903599939
Content-Type: application/octet-stream; name="what's_up?.txt.pgp"
Content-Disposition: attachment; filename*0*="utf-8''what's_up%3F.txt.pgp"
X-Attachment-Id: f_TwRqngHBJBTuWpmsYkjIsImtCizyqT@flowcrypt
Content-Id: <f_TwRqngHBJBTuWpmsYkjIsImtCizyqT@flowcrypt>
Content-Transfer-Encoding: base64

wcFMA0taL/zmLZUBAQ//U2iTaxTs+GJ2VMxg87fFIxjkz5RXhhO86T5A+bRrA3LuUrQaXIbYkwcq
QlokpRRmqs8HlpM/pQr8yz0A1HBJkrjWeKcKSJ6mxUr0H+3huxhOjP35V87Pr+MzvM1AnHxBorFn
ef4rqsu1uaI/7ny6kwURGCzBpqnLzzV0SUzgXRcUcxooBUr6BszM1y2tg3+VTMEn3U2EKKST6EVp
QL2kcuKGBrM5zLnrEvwIhXrLckrf6fHLFQA83ooyiojH0XCnsIcgn999LIveZb0LAULlSDDgeuQ8
pGFXSMCgtf02x3euLq22USaMDTijkQUgw4TRRBifVgeX7ffJ0V0hQLppUOP91OWgu81LX+CbUJuR
5So0W8jgv7Z/UJyoRZ8QPsnVCP6KBmweLXorkdA4yq0GU/DMgRKT4kTVZz7sBzIyAWKd/ZyPmowf
h/o85UqQoGhp3ALuRvCw/WbTzRLclJsfwP2Kl1nC5TXVvakQVefSm2fiuShHNe1rSZIstVZp6z51
Xvm6jO2GcY6kRuGRpnZ/NM1d7auokutZprdEplTqxCzt5Yde9ueKYnWtncBPxY2IVr1bHzrCANKn
I1Dx0XdCumcq6HND6To7xLgzf1ZJlTrIm0/19wMTZuVZ6au5JfgsK9Fs++mh39mY0g3BE3lBZlVn
0PU11ZiMvM0QmP+nQavBwUwDvb12YPaZjcQBD/97nsunGO3jNqU7muSv2mLkg4N/pwnAVbZgMKwp
eI3Ktj0OstRQj4RiSkTBbcut8GWV99s9R/iFCrTQsMX0qOUXi3r7+beC6/gFA+RplLAZgXbwZlMx
9Ip/ZsvoU2fRHNdu2SIqNs+BFQIBpiUPWrBz01pJdfOA/IjDGJ3ZZXRwejCwoB+InMGhEWJ6FVs9
ekeuW4wF40VvsLuS1Kp30VI4+SCH5txf7cX5jdDOcoPN6n1/BZHWQ77qhhOcb5To8aw0fKpYmEUA
Z3Qc7OUtBlxZ/4dH8vfGsUZoiLORFWPjPZ/lxzf4kjBN8VC+f+F3eclGRyng8yezsp/Lrx+HNTlD
6i7U131zTBKCgYJWN9iWJRbKSeG5JOPBfJaPfRDuUUq3dk5okbYsVX07RcWjeltB33T5UAj6nj7y
dtxsaXjWPMjQUVPZKOI61+PrbcDJAhNefEkny3/7yF1BJjtV55+XVNaOIqcOzTrI5dpLJD5/Qp1B
oZxOa8AJEiQkC7xKbZrq+zGjSeXoy1j/d1aYAOyFqeGcZ3y9me5XL0H5KGHRl/0A6hyCwhrnjYKH
2IWYo5z+2Z+nQIaxpBJ4Yk90fHPUDnlnKEaZ5Z6xpDRtpRmgGZddHPKeJPbZE8Om4t+mTsH7KF2N
brzZyYvMWKSPwMvQmNc9ygX6O27fA0GS7s/A7cFeA2n0ky3kL/pVEgEHQIU1b4e8CnRlglTzixgV
j11p0vvcxVME8nwJd9DgRYhoMLIlNSpQjxTM0MZvrH1mUBn0h4pLcqTzaXGd04XkeQslcYqvzeIF
TsJtVzCaS/Xz3MHBTANLWi/85i2VAQEP/iybEjWyeGtR6w9h7S6mSzOT9InJ9TsOLdx2AtC+VOPM
z6VUl4BwyNy38mDg8hPz+quYhXPOmo+0d7r3ujxb/MeD65M/ESUsxyjtp8bf/iRWxDkjr9+aiPgi
9MAj2qGMMxWv2hF8de9oL78oD2i4b10GuA9ubb/Xj52Qxp+ysKr5DdnO6F0lQXNfoviUndp1PgDo
dtZDawOOKSGuwUusU62J/82//iXLzowjb1J+kMS5/FzWnjQod9BpOzE2eA5yYtg/MKt5jSWxRVE6
omuwf6jQUAAS+nX9MpF2cotB/XD0uUweQTVhaDiYfMopT/sXjV0gQEbT7tTCYH0p4LvXEYwaZbsC
mtS4k2ijUE6EqkHmL8CKQ/U0zL7EMXg2hADnCLJU9Xozo+XlnulZxmzOC5j0qtzhB5/xuSUFEkkI
Wz/GoE/FJlebaLSlMVi3z/7WrVZhntZnJnLD87HBC/ia68VBO17MUyc4kIOpsHL1bEJDqaFmlKFc
GFvGoJcxmTqakT3m1gkhFw/f7lDpDA9mY708lQ6n1NxmfwB/wuHUOtfOcqxaeLG1nw/lhoYLJwJq
VBsCG3SD8sywUjDQWGYj1+/4HD1Lm8My3Vw+H0mjd9jo2lo9Q7sig9KmTfeG1cPHjiHmop2UrRbA
EkYfY21EcKbLiFvYlagMX0WEWgUbOKjZwcFMA729dmD2mY3EAQ/+L/LKYUt8BM66jVrK3GKXEs9m
z52oNRDsXFyKxkC8jdIyxYR/h6vcTiDrOu+lkVIdrQmqMHkB45hvQMCKxFOKCl9R0/ECPqscjghN
ph/mBoKUlh/VypUWLXpr54ttcrzT7jOb1FEZUxTxnQZMQvK1Z4OG/YqNonTPC9E7HSULLZ2g/1Fh
rHnfEewtQF/EgY5DhbTX8eJbDtRz80mLtw1/LToSsTuEgLVwqO1eF1uckmuiokJc5+z0VRtYOALI
xX4/tWigEsD1qczy9J3ne3+DjLFuZcOMocW7LawxnrEdSxkJf2CRrCl5C87yNpPnwxo9lm+Qk77E
5WnupNlIrJfpxuoxvrGZ8eWFFQkm4tCOOyIuhYaB3mjXCgnINA53iLs1tCsdEL9ZS/++gC4rTvDF
NjWojBDGq/kOZDlOVJCHK9OMfsC3elSc/VIcx6+aqf3OBRF8ryzt8+kFCOEHLNKi1SiyX9tAugXM
TNsRXLXobiEjO6sGpdLEzmJZxyxu1IQ/YTD5BY9y8BfqsvQcDZ5KWJi6FJaXpNrMGBRAMOQogHmW
nXqgdkz8S+vlggcX0q87OZmRxsP3unS/nxAclycGge7kROOFEvbKCnFcLfgptLYeAeKvhno892ua
lX9X175RoZ+WOVm9+MF/StWmS41vdKIpGWxXxE5rhQlA608My53SQwGF7q6vYrVPIL6DT1RlArbp
dI54OSpTKvCbVC7E2Ku6vFlV1SkEyIGymC51IFDWRskEoF9Lqu9uma0BwKkPJcKZwrA=
------sinikael-?=_1-16855415442170.8906747903599939--
", + "historyId": "1408057", + "internalDate": "1685541546000" + } +} \ No newline at end of file diff --git a/test/source/mock/google/exported-messages/message-export-188722a157fd54a8.json b/test/source/mock/google/exported-messages/message-export-188722a157fd54a8.json new file mode 100644 index 00000000000..a58d2230ebe --- /dev/null +++ b/test/source/mock/google/exported-messages/message-export-188722a157fd54a8.json @@ -0,0 +1,126 @@ +{ + "acctEmail": "flowcrypt.compatibility@gmail.com", + "full": { + "id": "188722a157fd54a8", + "threadId": "188722a157fd54a8", + "labelIds": [ + "Label_15", + "SENT", + "INBOX" + ], + "snippet": "-----BEGIN PGP MESSAGE----- Version: FlowCrypt Email Encryption 8.4.7 Comment: Seamlessly send and receive encrypted email wcFMA0taL/zmLZUBAQ/+IaLhBG0HJzwSPXGoEtHipEpUS9sn3tB6yrfr28KC", + "payload": { + "partId": "", + "mimeType": "multipart/mixed", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "multipart/mixed; boundary=\"----sinikael-?=_1-16855425387000.9701207325067771\"" + }, + { + "name": "Openpgp", + "value": "id=E8F0517BA6D7DAB6081C96E4ADAC279C95093207" + }, + { + "name": "From", + "value": "sender@domain.com" + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "Subject", + "value": "Test attachment #3505 2" + }, + { + "name": "Date", + "value": "Wed, 31 May 2023 07:15:40 -0700" + }, + { + "name": "MIME-Version", + "value": "1.0" + } + ], + "body": { + "size": 0 + }, + "parts": [ + { + "partId": "0", + "mimeType": "text/plain", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "text/plain" + }, + { + "name": "Content-Transfer-Encoding", + "value": "quoted-printable" + } + ], + "body": { + "size": 4126, + "data": "LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tDQpWZXJzaW9uOiBGbG93Q3J5cHQgRW1haWwgRW5jcnlwdGlvbiA4LjQuNw0KQ29tbWVudDogU2VhbWxlc3NseSBzZW5kIGFuZCByZWNlaXZlIGVuY3J5cHRlZCBlbWFpbA0KDQp3Y0ZNQTB0YUwvem1MWlVCQVEvK0lhTGhCRzBISnp3U1BYR29FdEhpcEVwVVM5c24zdEI2eXJmcjI4S0MNCm5mM05yajRQUkd3ZHUzUlRiNUkyczljQ2xocmJtWXhpdlBMalRGSk11dUo1a0FlSjZ0VjNxMVpodWd5OA0KdUNWRUMwbEF1d0RITWZiNUk4QjhwM3BEeDRkMktrWElKd1lyaXVuNEo0ZTNFV2RzS1FkNmZLSUNycm56DQpxYWlsZ0U2bjRCbkZNODg0Ujh0TnB4L3g1SnMwRlVXSUxVWVdRZ3cvT0kvdkZFd001NjRqQ1A4SnBYMnoNCjZtWm45OXFvRkd2Q0VNaVVhN3F2WTZKTnhtTVFFZVNXNFhldUo1QkNYZHlmeWdjY0JiSlVGbHVEVENTQg0KbTltREY2Mk1zdDMxM3A5c2IrUkFPLzJxM2xraTlIeG43cEg5U29XNmg3YVdSbmozOHBBZzNXYjJXdmdQDQpIV0RsbDRCalNKdHNhdHBSOGFLbnhQN3BVN0JXUndNUjg0dmw4TnhLVUNROU9GdTdzS09HQXVQOTBZOVANCmoyekdwS0pLeCtOdnpDTHVlK2NHTDdqSTZGUitHQ0NqYmVTcWRPSUxPSE8zU1Y1cVFyaWdtM0V0d0RVYw0KQWI5UkxlSlpLVFdweXlLOWNFVm5LdFkwMlozd1hoNjRiS0J3Wmd0ZVNoMkNkTFBoMjFza0R5NXlyRkwyDQptbVh6dWJISWhDVThUa2NHdkIxZ1h4ekV3dTRydllPaWR0M01HbzF2Rk5hY0hZbkVSTHgvaE9pRDJWMzYNCkhKa29yVk5UclhLeWRXYzhRS09CRnNmSkRnb1NJN2RINTByUU9zVDFmWWRVdjRQdG1lTVNMOWI4OG1Vdw0KZWxzUkVxUXVacG9EVGRvVXg0S2tBdzNxc1RJUDRka2dtMzJtM2NaUTlQUEJ3VXdEdmIxMllQYVpqY1FCDQpELzk1WjVRaHBpTWlGSWRoa3lZdDc5S2xnbnMzVS9zQzhSemZFdStHRlBPWmVVK2c3eGpqZHlMYlZZOXcNCjNCa3c3S1R3VjB0eksxNWkySStVdnVhZXRmY3VhUkp1SFZ5MlZlSk9oanhIRGNqcVl4OGVDUFNzdmFlbQ0KSVhYSTFQWkF2RTNRVVFuOVFNWHJPelZ4K3ZTY21YZmR2ZjZjaFpwUDJlWndsdURHanlHZU05aTNjZkR0DQpielBkcXVnLzBPU25Rb2lQaDk4czBhTWsya1FZT2Z2dXJPbmZGM0tBOWlGQVl3aTVLZnNWODhBSXNJUXkNCnVFbDI1KzdMckQyd29reisydVdDOGZkSjNLenhsbHVsSGIyUWJCUi9wRGZzOEJQRTh6dTdKWVdLc2RoVg0KbGJxdFNwdTI5Z1ZRWHRka0xLblUzalhpSmJiT0FhUUVNc3gwZHYyejJBNzlSQkh3WGZZclN5cFJDQVlFDQpsUnlHM3dPZ2tybTVtSGQxenpXQXJkcnVMQnFLQjNITUpDc2p2Y2ZIVU9ZczRqQUNMNzM2UFFUR2NiNEINCmRJaDk4M2x3cE5JVlY0VWN6ckdsdC9qT1daUTlRald3MytBaEFKajh1dmVEbUhGS0U3UTkrRWJNdXRSKw0KekxhUWxCNGc4RlVTZmVBVUZiVDRoK1FyNXc4Zy9PSVR0NEptODNtdDM3cThLLzlaRFBrczlCMmJ5WE13DQptOW9wcWNTTHVUUldQeDkxbm1SU0JVRy9rN0J0R2w4VUpPVXptdm4xMXQ3ODBHMnZ0QVc0UnZyWjFXVjQNCnlzSFFtTXRKdHptei9rTGpBNUlSbGhZbEJWSW1pVFhsMndaRnBuQXlXMzN2WSt2MVRSWlhLVFZteHdIcg0KY25WVWxEY1U3SFNyakRaVzVGcXpMSVpFWXNGZUEybjBreTNrTC9wVkVnRUhRTkx0WDlwV1hLUnVxVElFDQpCdGZ4Yk1GdnBBOTExbVJ2Q2pMRldTaFBTTWwwTUxGb0JYa0tFWDFpT2ZQQlJSZmZGd1plRmV1UGMxSE4NCitXUUFBZjRuTGRJeTljbVUvaHVGNUx5cEJxbWpCSVkvK01IQlRBTkxXaS84NWkyVkFRRVAvMFdQMzYzaA0KSjhFSHpZK255ei8vN3ZUbTl2QTU5SzVOMzdhQllUd3VEWE5RRGhxN29tLzhmbFc4RzJLMnhBNEthbVQyDQpnZjIwY29Nb0tEWktFMmhwOWp5RUVsekc1OGJMRjZ0QkgybzEvbXBPL2M3SUtxOWxxR3N0V2ZrL2FYR00NCm5NU2s5SW1WZ3JEY21wTy9DTlpJVGl5Szh4TWlPcHlXL0VNWWp3M1VralBoUGtvZkJnTWV6ZUEwNHFQZA0KNm5sUHVhcDJacDZ4SjNXL1lvZEZyNTJieHFFLzJyNW1xcU9POWFhem5kN3ZFbmRGb2RvQ0Z5L3d2SGZaDQpMYkxTMGVPTUFrdUlOUjFmbUFFaGlJV3hPMDRPN003RHZZeFZWVUJ3QTdZemJuOHRXWDNNNjRSSEtaWFgNCnJYcVhxQnFwVmhNUUZPbjdPZXR1cG1mTFFIYTFJS0dMQmZ4MU15OWRTalVDZ2NoNW1VNlJvblBwUjlqcg0KT0YvSTd1SXlEelYydXNHSkhFMmRHSDZHUE51d1YxMTZsUVZacVlRK3ZDUDM0V3BoVmJBdXh1Q1FGWFNFDQpxTjBDZ2lvbjRtenB5RFBvTEFyL0FHVU96Zk5tRU5HRzhsQ1ducXlXb0xoY0FZWkoycFhhL25lVk14MmgNCmpOWmsyd0RVS0N4TmEzNTVRK2JucDcvWkRaQ3RKZWtISUt2OHN2Z2xpYVhWalNwUUgvSWlobitmZUxDQQ0KWW0waFZLU2lqMW1hTnI2YnVsMXJQRUdrTzhjN3dlVkJ3bVcrS08rR2xNNGdPWjhKMmdIcU1IZlZxcDRIDQp6ZHhUcnY3WnBtRllCYlNIQ0pSRktQbWlIQnJ3MUxqUzhzNjNPR3FKOEI2ZHppSDJaOWp6RmlnRS9ZWm4NCm8ydkxsNkV3ZmwwNWZBMEV3Y0ZNQTcyOWRtRDJtWTNFQVEvL2VYd1E0YlpTZ285Znp6REFtTzh6bGJaeQ0KRURTM2xGekg2RERiSzJVK1JqTFZHSDZCQ3VFd2hmRFgrS250cjZzcDNsSW5qZzZwelZIVHA5RTJBaGdtDQo3cG5uMzlNRlRiRUxRbTZmR0RCMkhpVmIxdVk3bllUMmt6Vnl0cWFsOEszUDdSenAxRXorQVdJVExJOWENClpXUzVUbFBxN2ZaVXJabnJsVnRMbDIvdTVXT1BxRzdyL0dWRXdQOUp2ak1yc2c4WE9BczZ0OVVRQ1FqZw0KYm9ocnhvZEN6ZG81TVBCZDVxZk5nQ2dHbWpKeG5Fd3FBVGQ4QXhHSU95UStNWGFDMlkyYnA1YWlpNVdvDQpIN21obW5seFdRQWprSXBCRTQwclRIdXdoTkFLeHNFSXhiR3o5TGlJaEduZ3QvMGVxNjlTaXhEMmx4S2INCm0zb1k2Z1dyeklrblBrd0U4aFNnek9uSzR0WmExdzU1K09WQ0NLa2lpWkZNZXNiZEJGem5WMUdBcDRRRg0KanBOcXI4amhCOXhpdTBlYVlkdXlEWTBMQXljOHpIbnBvQUJST2RrQWVsYlc2SFJCc1doU1lZUWZzZVJBDQpOQWszZXpMTHRrRUUzQzE0SmVVK3h6Q1hEaVAveTh4OE9SQnRYWklydXg2dUNNZ2dQdTFQLys4b1BPN1YNCmprRUc2Mk1uVnZVa1pqWVBnREROTUtvUjQ1WWt6SWlUZ0E0OWRFSkVScDVCdklXbGE2Z2tsVWtyVVk4SQ0KZG5odEtLV0Vmcno1TjcvVjFaSmZYU25qMHNoQ0hoRjZNbEFqMFRBenF5K1BuVVZPVWwvUm1McTdsU0NJDQpXanRCaXhpWGxlVnBxcWVoRFMwQVZ6dWNDTVM2TEhqV29TSGdNcVhVQ01BNVAxVUF0dkY4UWFBNGdoM1MNCndkMEI0ZjNacEtuSjRYVjVMOUQ0aHhZSzRuTGVCOGszS1VVRG1sVzVjVmQzR2xSY3BFWVBhK3dUa0NrTQ0KbGsxR0YvdkhyTVFJbVRsUTY5RWY4QTc2Vmt1NjdBNjhzc3NMa2RtRThIS1JpVWNxK0tnMisyZGJyK2l2DQpiSzkvZUIraktJSXpUQUVnMUExUGwyYXlvK2JwaDFodVEwQkVJNHhGRDhMYllrS1RaakdRSERydC85RG0NCk1qL2tiTUZkMFdhOGk1c01CZWtFZklicDVWSTNaMGQ5cHNCbnc2MXhZa0tENUdXZDNMaEdmb0dESGNKMA0KM0psaTgvRThyS0VybXJKRkNXQjdrdnFMaHFucVNsbWhLK2pGNmkvWmNVNmJ4YTd4MllkbUZyOG5qdkVsDQprbTJhYk1wUWNFV1YrMTRKQlFaRXNEY2NDQWZjdVVLRnorZmxKWG1Qc2Q0UEpLS2szOGx4dE9tNmdrcDINCkVRcTlyU1VDRS9qb3plTXViMVprUEhTVXI0ZTRWcjhmVUhodllmVzdKNHUvV1c0c25JVnRSeUhjSDV6dg0KcWZZWXhhSWpjcFk0RVhRVUUyMlRGNUdOejlmZVErWTlXT2c4akYybFRhQURQNmdCdE1SaS96YWdGY0hEDQovOXl1eEpUanhVTmpYcWhzdm1YakJINVhncGRFSlB0RVF2QlhHUDJ5djVCa2xlWUlTYlQxbldPdURqR0wNCk9vTjZydGZ2MXZHWGNuVEx6L2taYUhRVzlaV3dFcFVHd0lUclh4UGNnZCt3Kzl5U1VxS1hwd2tuakx3Rw0KOXdUMWJxM1I1QXIzck9NQ2hReVByRHRnVmJ1L1dRcVAxQ1A4S1RKTHY0SFBSY21JKys4bWlpU2I4cmNWDQpWU3FHZlZ2enR5QnA2RXJMbEhSc0UrTlpuQjB0UWlxZFQ4cG5ZRXcwbVVqajQvSUoydnNESEtSTkpUK0MNCnVJWnZFREhOWU4zb0V2dUJSWFdzUENKWEdITmd4bmhtQ2JSOWxKTUNYU2REaTk5azQzaUluZTNkSEFkUQ0Ka05wNVlzWXVDU1dNM0pVaG51SDF1dUpZQVpxVHgxL2hkWi9CWDJsT3ljU0dRcTFPc0trWUwwdHo3bU5YDQpqRFY0SUdpTjQ1cjU3S2Rna0xVRFRxUC9BWVRzTGJnY21zKzU0Vkh5NUNaSnBPTERGNDZVQS8wPQ0KPXh2VFkNCi0tLS0tRU5EIFBHUCBNRVNTQUdFLS0tLS0NCg==" + } + }, + { + "partId": "1", + "mimeType": "application/octet-stream", + "filename": "what's_up%253F.txt.pgp", + "headers": [ + { + "name": "Content-Type", + "value": "application/octet-stream; name=\"what's_up%253F.txt.pgp\"" + }, + { + "name": "Content-Disposition", + "value": "attachment; filename*0*=\"utf-8''what's_up%25253F.txt.pgp\"" + }, + { + "name": "X-Attachment-Id", + "value": "f_OivxFuNXGYTRUuVjHAXIazllRnAZpr@flowcrypt" + }, + { + "name": "Content-Id", + "value": "" + }, + { + "name": "Content-Transfer-Encoding", + "value": "base64" + } + ], + "body": { + "attachmentId": "ANGjdJ_0BXQyC0svBPYWA46s1t8WzhLrGdATdxlXUISZzptkykjxbJfUUJk0iKSXVXyipZWCPKjmLlXk2EUWix93Hw5hFf0vSYZgT_5Sg7RYr7c0Yc6FS-RfJs67b_LtIl5x6jKzK2Ek4sXdExpLriZl93sF_4oiCBYgom-_W7Tt1jCwdpJv_n2XyS5o_fYCRhod9CTq1T4QLBm97dolY7Mnqg3I3C8NJebK7kEo02qaCfJ_NLdzVqMwSxniuZsb4fYKhk3bx4OMnPSQbQlPGums6ZuAdLxZqoD-t_G6DmacJbCV2ENtZQy6kA-9uHfnhvAfKLcV0HWDdilTSEYLFj4PzLuOSIrsbycy0jMwz28zWGelASipGsDifxeyu2z88bn-qnVnlXOJ0xMBsjvC", + "size": 2277 + } + } + ] + }, + "sizeEstimate": 8369, + "historyId": "1408179", + "internalDate": "1685542540000" + }, + "attachments": { + "ANGjdJ_0BXQyC0svBPYWA46s1t8WzhLrGdATdxlXUISZzptkykjxbJfUUJk0iKSXVXyipZWCPKjmLlXk2EUWix93Hw5hFf0vSYZgT_5Sg7RYr7c0Yc6FS-RfJs67b_LtIl5x6jKzK2Ek4sXdExpLriZl93sF_4oiCBYgom-_W7Tt1jCwdpJv_n2XyS5o_fYCRhod9CTq1T4QLBm97dolY7Mnqg3I3C8NJebK7kEo02qaCfJ_NLdzVqMwSxniuZsb4fYKhk3bx4OMnPSQbQlPGums6ZuAdLxZqoD-t_G6DmacJbCV2ENtZQy6kA-9uHfnhvAfKLcV0HWDdilTSEYLFj4PzLuOSIrsbycy0jMwz28zWGelASipGsDifxeyu2z88bn-qnVnlXOJ0xMBsjvC": { + "data": "wcFMA0taL_zmLZUBARAAjucslyWooO0OKxy4uVhc56QF92itic3kqc-DOxLFl4szMfAhsuYRIkSKkXN4UPKISI-i00xWqQpIZVZl_RldNrlzmvQzJLMIWjSK7Z_aocsaveNO2jj2GEMSNHQ0iYJ9FuUr2LmsAIASJZOzG9cwBNZZO0IxnhPURHUWTJtms8DqDPTIaOpFw4EOk9WwmmKBNqQvgAyGsZA2iS0PrEmlLdT098urhGZcLq9-1K8RSALAN7RHBuqQXmWrxoEmylwNJTlM5vMs5pllV7y2vBVgucTGvRlGbqzhLk5zc8Sf-Bg7Tf4u5Ztd9yEIzGmrVccDc2VQzSpym_fLEbcpgW_-zjlv0yKSlk-TwWIQBF3wPiULGwb0LtUnDveHQd1gGIlPcUSgtiRG3_5gT0qqIQdwvg3dpKNHrCyFi0Ppv8leTYBdeyPjo3snuFHqBTdcGUFoCRGS7NsGBUAH4Zg14F9feRsnTpOsqF36bG-psp8ST6HBgTyfbsgmud5eWEAy_FdUguWEW4-gRHU2WMq9GczOyVlxpZ1Lq_lgvsjLso0QHpbl2Uo90Njnjk4yX3GlXQyNoAZw9WdbEFftSA_TUeuS5yPayShQLvrF3OWV-PdBJRt0BBqKXLC6JRdSeuFJQpr1yEqBgkuNk2J9ZTk72MfCcrN9WmP9t7VCxVwSJSzmqlzBwUwDvb12YPaZjcQBEACaXLHIcl7hEWgGil19LABocL2ofKXbGXxeO2-RAWR4SfqHbk2wNJzWdqBgZVYUuMBai7jTt8ct1eeNs9Et0_eouHYJ-uU-CS6lX0M9dQLieQHGijnb-flD8M_Az_8YI4Ip4ii0OnEGavdjGPE_opxOjC4vl4ZEjgEyXKgwSSEuvuWNQqRDMWlzM3kpZ0B1FhzDIgeJYwpJsVcyE19DIv0y3g9L3TqqezO6oVcboU54u_ZDqbAALUivcPSFvCMiVz_UujnREz8mZHnQd2K4da7MS-UHfiADBOBX6NlPJP6vY-cZVPDAxy6yAKWfcpYxJZK8bvP3a6DpdIPMzNBpaEsmHlBmA7AbG4hkitm1Eh5ic-mYNBq5yphXFUvLZASM2ORdZUflwFML8p1Sr9rc6lGfXiLUjF1lAOvIvUnAE_fnQc83WOYckJLWqjqfF8wFixaztMzXJsBuWHYLSHYNyNMJQIkgmDi10srX10m5gLBMg9mXKY8TISgsKb4WT0ELOvP4qJ3pbcJtflVVc8p1AfgTfcx_CXxdqZuH2WvKdY3meOA1nSlJew9Ca77Qa6UONtM6FcB4bBwPFaLkISKwfcLaJ7sR3ONZJ95rlOVMlSJlT3bAf7ppvrjsvGz-vv-6nda-xusSUvQSmPjbQ8RDj0VyEsKWKRR64f2DU4krrnTb_MFeA2n0ky3kL_pVEgEHQAr2SfCUmlIvOzVLBEI2hYC5jR7gyYUH0p_rVwf2wGEVMDcwqAr2hAOHfjKh6wZjHefIMvqJEXNfCDX7R6JTQSGsyDBRrSvdP4-JO8j_co2Z48HBTANLWi_85i2VAQEQAKCWTOOCwDmo1M_cTNtBmCKDJscFj2nWeRZq5bjtU2hsKGmlQwUPLsYln7FPZIljrOhZUNalj06w9eWcmQP_45dOIebNkeeySPyNGcgE_h7AH4e2dCr0KRM3KtH8MiQMV1tiFlXzSk96jggw5DOf9AFO8z61jfOLhrmqAXuE9GFjN_7aKjk21XDho-ZBFhTAu226B2ghhfVeqC4Qb-rf8EVz0SBeDDB17qy3IXiSxOlMXDD6HuBXFxwF9q75dr7-Ms_pdJTQenh6JHgeNyxpRzvG9Hfb4zkgVbShXhLsa4IkqjQXsqJBhHHEFbTGJvUITyget7Xec6GZ_FRW8lmGOkrkRigx1Hg4wjOSffuJRd1nZ_0njDZNtXkwOi5RMJ5EH-J-NMLNeHwOWo7AlH3atVBpvS67wISXgdI_CQ5SzxQ6_qUQDpOHGKIT_ySdyLsUHl-jnscIAN_bNVYOqwkrXGtC030I8RmSgY44oiMVIwobFNlCwG4r0b4o4sSC3h1l94OIIuxS8TrhZc7Drx2NIvDv0HUVGm0GGPRoII7yUfE3rmtksjZ7IFBjtoAe-zlF2aS2bw__WeoZxO9wH-Dd2UXqsdGW7hLFjXX1W1sZPKT5kv2QObyYdQExcqs7rg86mdnL6E29-mnk6hQ38_pGb60whIP-RLeqR4yRVxdTvPk9wcFMA729dmD2mY3EAQ__dDXObgsBS7ey6Vj0abCScZCw_yfhbpdRbCKDnLs1nLg5CAma_nvWGOBT5R_LlNZcEXmGtdYfJTVSZG0bnnClypn_iWqhexv-tSS3Nxd95cYmdo31SHjqr0tAlB_vnNI94Rezb5ySQUJWwG5e0pxG_xexfciWEo7EpuglqIDfFIA8BPxdLv3mKu3VQmvS8zGsX3bjyrDEoeExtaocqIt8JM-D5IT7RNTvJzTbXurRBrLTNMcOPWS_8R0N4DOPpvWKqxyxi-gjgBBmph_v5SGT4oPh_4a37O0MJmrDwaAdkNB_t2Fz2CHFsghbYffkmyO9YoUyxUhxDPtAeojwi3_BzLMsbN46rpuAe8WhOjoQoaU6jALkDoZZxN3dsY1jFVn62Q-ThWFsHWISMRT3EhFEehnt2U0nI3RhDhIIJGZx-IrGmuDlpo3BiQDECieW78sIPp6_Pz-fv6ZGkakQmXf1E98QO7qVPYplsMicbE5aXskiH9rPo0PzqYkK1HfLwhxHfhFqGNvOfs_qPpdvXw2XARjN1Rld0RYWUDnmyv7Tn5VFGCg48qSPAD2XELPMlk66B4LP5qj1GozxDdbZvoJ--gKGsLoAZkduIdS0aWwpuJZm1KaViK9juDjm809IAPxPSSd60kStSJxywaHI84bPZBsDTco9TJFmIDm_URllIzTSRwHY_qR1p8E47SZowbO0zG8komX36reOn2HHHhhZejSewkdhVVQOUskTx9T2yApIuR9InDxGLFdqNNYtTk9ITNTCe-duCvJK", + "size": 2277 + } + }, + "raw": { + "id": "188722a157fd54a8", + "threadId": "188722a157fd54a8", + "labelIds": [ + "Label_15", + "SENT", + "INBOX" + ], + "snippet": "-----BEGIN PGP MESSAGE----- Version: FlowCrypt Email Encryption 8.4.7 Comment: Seamlessly send and receive encrypted email wcFMA0taL/zmLZUBAQ/+IaLhBG0HJzwSPXGoEtHipEpUS9sn3tB6yrfr28KC", + "sizeEstimate": 8369, + "raw": "Received: from 717284730244
	named unknown
	by gmailapi.google.com
	with HTTPREST;
	Wed, 31 May 2023 07:15:40 -0700
Content-Type: multipart/mixed;
 boundary="----sinikael-?=_1-16855425387000.9701207325067771"
Openpgp: id=E8F0517BA6D7DAB6081C96E4ADAC279C95093207
From: FlowCrypt Compatibility <flowcrypt.compatibility@gmail.com>
To: FlowCrypt Compatibility <flowcrypt.compatibility@gmail.com>
Subject: Test attachment #3505 2
Date: Wed, 31 May 2023 07:15:40 -0700
Message-Id: <CAKbuLTpH9-EivTPJj0JBJ9tyW57_rtri87gUF4Yge-QiOSG5ag@mail.gmail.com>
MIME-Version: 1.0

------sinikael-?=_1-16855425387000.9701207325067771
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

-----BEGIN PGP MESSAGE-----
Version: FlowCrypt Email Encryption 8.4.7
Comment: Seamlessly send and receive encrypted email

wcFMA0taL/zmLZUBAQ/+IaLhBG0HJzwSPXGoEtHipEpUS9sn3tB6yrfr28KC
nf3Nrj4PRGwdu3RTb5I2s9cClhrbmYxivPLjTFJMuuJ5kAeJ6tV3q1Zhugy8
uCVEC0lAuwDHMfb5I8B8p3pDx4d2KkXIJwYriun4J4e3EWdsKQd6fKICrrnz
qailgE6n4BnFM884R8tNpx/x5Js0FUWILUYWQgw/OI/vFEwM564jCP8JpX2z
6mZn99qoFGvCEMiUa7qvY6JNxmMQEeSW4XeuJ5BCXdyfygccBbJUFluDTCSB
m9mDF62Mst313p9sb+RAO/2q3lki9Hxn7pH9SoW6h7aWRnj38pAg3Wb2WvgP
HWDll4BjSJtsatpR8aKnxP7pU7BWRwMR84vl8NxKUCQ9OFu7sKOGAuP90Y9P
j2zGpKJKx+NvzCLue+cGL7jI6FR+GCCjbeSqdOILOHO3SV5qQrigm3EtwDUc
Ab9RLeJZKTWpyyK9cEVnKtY02Z3wXh64bKBwZgteSh2CdLPh21skDy5yrFL2
mmXzubHIhCU8TkcGvB1gXxzEwu4rvYOidt3MGo1vFNacHYnERLx/hOiD2V36
HJkorVNTrXKydWc8QKOBFsfJDgoSI7dH50rQOsT1fYdUv4PtmeMSL9b88mUw
elsREqQuZpoDTdoUx4KkAw3qsTIP4dkgm32m3cZQ9PPBwUwDvb12YPaZjcQB
D/95Z5QhpiMiFIdhkyYt79Klgns3U/sC8RzfEu+GFPOZeU+g7xjjdyLbVY9w
3Bkw7KTwV0tzK15i2I+UvuaetfcuaRJuHVy2VeJOhjxHDcjqYx8eCPSsvaem
IXXI1PZAvE3QUQn9QMXrOzVx+vScmXfdvf6chZpP2eZwluDGjyGeM9i3cfDt
bzPdqug/0OSnQoiPh98s0aMk2kQYOfvurOnfF3KA9iFAYwi5KfsV88AIsIQy
uEl25+7LrD2wokz+2uWC8fdJ3KzxllulHb2QbBR/pDfs8BPE8zu7JYWKsdhV
lbqtSpu29gVQXtdkLKnU3jXiJbbOAaQEMsx0dv2z2A79RBHwXfYrSypRCAYE
lRyG3wOgkrm5mHd1zzWArdruLBqKB3HMJCsjvcfHUOYs4jACL736PQTGcb4B
dIh983lwpNIVV4UczrGlt/jOWZQ9QjWw3+AhAJj8uveDmHFKE7Q9+EbMutR+
zLaQlB4g8FUSfeAUFbT4h+Qr5w8g/OITt4Jm83mt37q8K/9ZDPks9B2byXMw
m9opqcSLuTRWPx91nmRSBUG/k7BtGl8UJOUzmvn11t780G2vtAW4RvrZ1WV4
ysHQmMtJtzmz/kLjA5IRlhYlBVImiTXl2wZFpnAyW33vY+v1TRZXKTVmxwHr
cnVUlDcU7HSrjDZW5FqzLIZEYsFeA2n0ky3kL/pVEgEHQNLtX9pWXKRuqTIE
BtfxbMFvpA911mRvCjLFWShPSMl0MLFoBXkKEX1iOfPBRRffFwZeFeuPc1HN
+WQAAf4nLdIy9cmU/huF5LypBqmjBIY/+MHBTANLWi/85i2VAQEP/0WP363h
J8EHzY+nyz//7vTm9vA59K5N37aBYTwuDXNQDhq7om/8flW8G2K2xA4KamT2
gf20coMoKDZKE2hp9jyEElzG58bLF6tBH2o1/mpO/c7IKq9lqGstWfk/aXGM
nMSk9ImVgrDcmpO/CNZITiyK8xMiOpyW/EMYjw3UkjPhPkofBgMezeA04qPd
6nlPuap2Zp6xJ3W/YodFr52bxqE/2r5mqqOO9aaznd7vEndFodoCFy/wvHfZ
LbLS0eOMAkuINR1fmAEhiIWxO04O7M7DvYxVVUBwA7Yzbn8tWX3M64RHKZXX
rXqXqBqpVhMQFOn7OetupmfLQHa1IKGLBfx1My9dSjUCgch5mU6RonPpR9jr
OF/I7uIyDzV2usGJHE2dGH6GPNuwV116lQVZqYQ+vCP34WphVbAuxuCQFXSE
qN0Cgion4mzpyDPoLAr/AGUOzfNmENGG8lCWnqyWoLhcAYZJ2pXa/neVMx2h
jNZk2wDUKCxNa355Q+bnp7/ZDZCtJekHIKv8svgliaXVjSpQH/Iihn+feLCA
Ym0hVKSij1maNr6bul1rPEGkO8c7weVBwmW+KO+GlM4gOZ8J2gHqMHfVqp4H
zdxTrv7ZpmFYBbSHCJRFKPmiHBrw1LjS8s63OGqJ8B6dziH2Z9jzFigE/YZn
o2vLl6Ewfl05fA0EwcFMA729dmD2mY3EAQ//eXwQ4bZSgo9fzzDAmO8zlbZy
EDS3lFzH6DDbK2U+RjLVGH6BCuEwhfDX+Kntr6sp3lInjg6pzVHTp9E2Ahgm
7pnn39MFTbELQm6fGDB2HiVb1uY7nYT2kzVytqal8K3P7Rzp1Ez+AWITLI9a
ZWS5TlPq7fZUrZnrlVtLl2/u5WOPqG7r/GVEwP9JvjMrsg8XOAs6t9UQCQjg
bohrxodCzdo5MPBd5qfNgCgGmjJxnEwqATd8AxGIOyQ+MXaC2Y2bp5aii5Wo
H7mhmnlxWQAjkIpBE40rTHuwhNAKxsEIxbGz9LiIhGngt/0eq69SixD2lxKb
m3oY6gWrzIknPkwE8hSgzOnK4tZa1w55+OVCCKkiiZFMesbdBFznV1GAp4QF
jpNqr8jhB9xiu0eaYduyDY0LAyc8zHnpoABROdkAelbW6HRBsWhSYYQfseRA
NAk3ezLLtkEE3C14JeU+xzCXDiP/y8x8ORBtXZIrux6uCMggPu1P/+8oPO7V
jkEG62MnVvUkZjYPgDDNMKoR45YkzIiTgA49dEJERp5BvIWla6gklUkrUY8I
dnhtKKWEfrz5N7/V1ZJfXSnj0shCHhF6MlAj0TAzqy+PnUVOUl/RmLq7lSCI
WjtBixiXleVpqqehDS0AVzucCMS6LHjWoSHgMqXUCMA5P1UAtvF8QaA4gh3S
wd0B4f3ZpKnJ4XV5L9D4hxYK4nLeB8k3KUUDmlW5cVd3GlRcpEYPa+wTkCkM
lk1GF/vHrMQImTlQ69Ef8A76Vku67A68sssLkdmE8HKRiUcq+Kg2+2dbr+iv
bK9/eB+jKIIzTAEg1A1Pl2ayo+bph1huQ0BEI4xFD8LbYkKTZjGQHDrt/9Dm
Mj/kbMFd0Wa8i5sMBekEfIbp5VI3Z0d9psBnw61xYkKD5GWd3LhGfoGDHcJ0
3Jli8/E8rKErmrJFCWB7kvqLhqnqSlmhK+jF6i/ZcU6bxa7x2YdmFr8njvEl
km2abMpQcEWV+14JBQZEsDccCAfcuUKFz+flJXmPsd4PJKKk38lxtOm6gkp2
EQq9rSUCE/jozeMub1ZkPHSUr4e4Vr8fUHhvYfW7J4u/WW4snIVtRyHcH5zv
qfYYxaIjcpY4EXQUE22TF5GNz9feQ+Y9WOg8jF2lTaADP6gBtMRi/zagFcHD
/9yuxJTjxUNjXqhsvmXjBH5XgpdEJPtEQvBXGP2yv5BkleYISbT1nWOuDjGL
OoN6rtfv1vGXcnTLz/kZaHQW9ZWwEpUGwITrXxPcgd+w+9ySUqKXpwknjLwG
9wT1bq3R5Ar3rOMChQyPrDtgVbu/WQqP1CP8KTJLv4HPRcmI++8miiSb8rcV
VSqGfVvztyBp6ErLlHRsE+NZnB0tQiqdT8pnYEw0mUjj4/IJ2vsDHKRNJT+C
uIZvEDHNYN3oEvuBRXWsPCJXGHNgxnhmCbR9lJMCXSdDi99k43iIne3dHAdQ
kNp5YsYuCSWM3JUhnuH1uuJYAZqTx1/hdZ/BX2lOycSGQq1OsKkYL0tz7mNX
jDV4IGiN45r57KdgkLUDTqP/AYTsLbgcms+54VHy5CZJpOLDF46UA/0=3D
=3DxvTY
-----END PGP MESSAGE-----

------sinikael-?=_1-16855425387000.9701207325067771
Content-Type: application/octet-stream; name="what's_up%253F.txt.pgp"
Content-Disposition: attachment;
 filename*0*="utf-8''what's_up%25253F.txt.pgp"
X-Attachment-Id: f_OivxFuNXGYTRUuVjHAXIazllRnAZpr@flowcrypt
Content-Id: <f_OivxFuNXGYTRUuVjHAXIazllRnAZpr@flowcrypt>
Content-Transfer-Encoding: base64

wcFMA0taL/zmLZUBARAAjucslyWooO0OKxy4uVhc56QF92itic3kqc+DOxLFl4szMfAhsuYRIkSK
kXN4UPKISI+i00xWqQpIZVZl/RldNrlzmvQzJLMIWjSK7Z/aocsaveNO2jj2GEMSNHQ0iYJ9FuUr
2LmsAIASJZOzG9cwBNZZO0IxnhPURHUWTJtms8DqDPTIaOpFw4EOk9WwmmKBNqQvgAyGsZA2iS0P
rEmlLdT098urhGZcLq9+1K8RSALAN7RHBuqQXmWrxoEmylwNJTlM5vMs5pllV7y2vBVgucTGvRlG
bqzhLk5zc8Sf+Bg7Tf4u5Ztd9yEIzGmrVccDc2VQzSpym/fLEbcpgW/+zjlv0yKSlk+TwWIQBF3w
PiULGwb0LtUnDveHQd1gGIlPcUSgtiRG3/5gT0qqIQdwvg3dpKNHrCyFi0Ppv8leTYBdeyPjo3sn
uFHqBTdcGUFoCRGS7NsGBUAH4Zg14F9feRsnTpOsqF36bG+psp8ST6HBgTyfbsgmud5eWEAy/FdU
guWEW4+gRHU2WMq9GczOyVlxpZ1Lq/lgvsjLso0QHpbl2Uo90Njnjk4yX3GlXQyNoAZw9WdbEFft
SA/TUeuS5yPayShQLvrF3OWV+PdBJRt0BBqKXLC6JRdSeuFJQpr1yEqBgkuNk2J9ZTk72MfCcrN9
WmP9t7VCxVwSJSzmqlzBwUwDvb12YPaZjcQBEACaXLHIcl7hEWgGil19LABocL2ofKXbGXxeO2+R
AWR4SfqHbk2wNJzWdqBgZVYUuMBai7jTt8ct1eeNs9Et0/eouHYJ+uU+CS6lX0M9dQLieQHGijnb
+flD8M/Az/8YI4Ip4ii0OnEGavdjGPE/opxOjC4vl4ZEjgEyXKgwSSEuvuWNQqRDMWlzM3kpZ0B1
FhzDIgeJYwpJsVcyE19DIv0y3g9L3TqqezO6oVcboU54u/ZDqbAALUivcPSFvCMiVz/UujnREz8m
ZHnQd2K4da7MS+UHfiADBOBX6NlPJP6vY+cZVPDAxy6yAKWfcpYxJZK8bvP3a6DpdIPMzNBpaEsm
HlBmA7AbG4hkitm1Eh5ic+mYNBq5yphXFUvLZASM2ORdZUflwFML8p1Sr9rc6lGfXiLUjF1lAOvI
vUnAE/fnQc83WOYckJLWqjqfF8wFixaztMzXJsBuWHYLSHYNyNMJQIkgmDi10srX10m5gLBMg9mX
KY8TISgsKb4WT0ELOvP4qJ3pbcJtflVVc8p1AfgTfcx/CXxdqZuH2WvKdY3meOA1nSlJew9Ca77Q
a6UONtM6FcB4bBwPFaLkISKwfcLaJ7sR3ONZJ95rlOVMlSJlT3bAf7ppvrjsvGz+vv+6nda+xusS
UvQSmPjbQ8RDj0VyEsKWKRR64f2DU4krrnTb/MFeA2n0ky3kL/pVEgEHQAr2SfCUmlIvOzVLBEI2
hYC5jR7gyYUH0p/rVwf2wGEVMDcwqAr2hAOHfjKh6wZjHefIMvqJEXNfCDX7R6JTQSGsyDBRrSvd
P4+JO8j/co2Z48HBTANLWi/85i2VAQEQAKCWTOOCwDmo1M/cTNtBmCKDJscFj2nWeRZq5bjtU2hs
KGmlQwUPLsYln7FPZIljrOhZUNalj06w9eWcmQP/45dOIebNkeeySPyNGcgE/h7AH4e2dCr0KRM3
KtH8MiQMV1tiFlXzSk96jggw5DOf9AFO8z61jfOLhrmqAXuE9GFjN/7aKjk21XDho+ZBFhTAu226
B2ghhfVeqC4Qb+rf8EVz0SBeDDB17qy3IXiSxOlMXDD6HuBXFxwF9q75dr7+Ms/pdJTQenh6JHge
NyxpRzvG9Hfb4zkgVbShXhLsa4IkqjQXsqJBhHHEFbTGJvUITyget7Xec6GZ/FRW8lmGOkrkRigx
1Hg4wjOSffuJRd1nZ/0njDZNtXkwOi5RMJ5EH+J+NMLNeHwOWo7AlH3atVBpvS67wISXgdI/CQ5S
zxQ6/qUQDpOHGKIT/ySdyLsUHl+jnscIAN/bNVYOqwkrXGtC030I8RmSgY44oiMVIwobFNlCwG4r
0b4o4sSC3h1l94OIIuxS8TrhZc7Drx2NIvDv0HUVGm0GGPRoII7yUfE3rmtksjZ7IFBjtoAe+zlF
2aS2bw//WeoZxO9wH+Dd2UXqsdGW7hLFjXX1W1sZPKT5kv2QObyYdQExcqs7rg86mdnL6E29+mnk
6hQ38/pGb60whIP+RLeqR4yRVxdTvPk9wcFMA729dmD2mY3EAQ//dDXObgsBS7ey6Vj0abCScZCw
/yfhbpdRbCKDnLs1nLg5CAma/nvWGOBT5R/LlNZcEXmGtdYfJTVSZG0bnnClypn/iWqhexv+tSS3
Nxd95cYmdo31SHjqr0tAlB/vnNI94Rezb5ySQUJWwG5e0pxG/xexfciWEo7EpuglqIDfFIA8BPxd
Lv3mKu3VQmvS8zGsX3bjyrDEoeExtaocqIt8JM+D5IT7RNTvJzTbXurRBrLTNMcOPWS/8R0N4DOP
pvWKqxyxi+gjgBBmph/v5SGT4oPh/4a37O0MJmrDwaAdkNB/t2Fz2CHFsghbYffkmyO9YoUyxUhx
DPtAeojwi3/BzLMsbN46rpuAe8WhOjoQoaU6jALkDoZZxN3dsY1jFVn62Q+ThWFsHWISMRT3EhFE
ehnt2U0nI3RhDhIIJGZx+IrGmuDlpo3BiQDECieW78sIPp6/Pz+fv6ZGkakQmXf1E98QO7qVPYpl
sMicbE5aXskiH9rPo0PzqYkK1HfLwhxHfhFqGNvOfs/qPpdvXw2XARjN1Rld0RYWUDnmyv7Tn5VF
GCg48qSPAD2XELPMlk66B4LP5qj1GozxDdbZvoJ++gKGsLoAZkduIdS0aWwpuJZm1KaViK9juDjm
809IAPxPSSd60kStSJxywaHI84bPZBsDTco9TJFmIDm/URllIzTSRwHY/qR1p8E47SZowbO0zG8k
omX36reOn2HHHhhZejSewkdhVVQOUskTx9T2yApIuR9InDxGLFdqNNYtTk9ITNTCe+duCvJK
------sinikael-?=_1-16855425387000.9701207325067771--
", + "historyId": "1408179", + "internalDate": "1685542540000" + } +} \ No newline at end of file diff --git a/test/source/tests/compose.ts b/test/source/tests/compose.ts index 4d1b2a85aa7..3b7cdef3fee 100644 --- a/test/source/tests/compose.ts +++ b/test/source/tests/compose.ts @@ -1404,7 +1404,7 @@ export const defineComposeTests = (testVariant: TestVariant, testWithBrowser: Te 'compose - hide reply all option button for signle recipient', testWithBrowser(async (t, browser) => { await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'compatibility'); - const appendUrl = 'threadId=182263bf9f105adf&skipClickPrompt=___cu_false___&replyMsgId=182263bf9f105adf'; + const appendUrl = 'threadId=188722a157fd54a8&skipClickPrompt=___cu_false___&replyMsgId=188722a157fd54a8'; const composePage = await ComposePageRecipe.openStandalone(t, browser, 'compatibility', { appendUrl, hasReplyPrompt: true, diff --git a/test/source/tests/settings.ts b/test/source/tests/settings.ts index 8edd2df38ec..90abb497c75 100644 --- a/test/source/tests/settings.ts +++ b/test/source/tests/settings.ts @@ -808,8 +808,8 @@ export const defineSettingsTests = (testVariant: TestVariant, testWithBrowser: T await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'compatibility'); // `what's up?.txt` becomes `what's_up_.txt` and this is native way and we can't change this logic // https://github.com/FlowCrypt/flowcrypt-browser/issues/3505#issuecomment-812269422 - await checkIfFileDownloadsCorrectly(t, browser, '1821bf879a6f71e0', "what's_up_.txt"); - await checkIfFileDownloadsCorrectly(t, browser, '182263bf9f105adf', "_what_'s_up%25253F.txt.pgp"); // todo: #5150, should be "what's_up%253F.txt.pgp" + await checkIfFileDownloadsCorrectly(t, browser, '188721aebb71c16c', "what's_up_.txt"); + await checkIfFileDownloadsCorrectly(t, browser, '188722a157fd54a8', `what's_up%253F.txt`); // should not strip .gpg or .pgp extension when downloading original file after unsuccesssful decryption // // Check if bad pgp attachment file got downloaded with original file name await checkIfFileDownloadsCorrectly(t, browser, '18610f7f4ae8da0a', 'test.bat.pgp'); From 400ea613ae95730585d0f56de86841709bcb4742 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 31 May 2023 16:45:51 +0100 Subject: [PATCH 105/147] removed test interference --- test/source/mock/google/google-endpoints.ts | 2 +- test/source/tests/flaky.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/source/mock/google/google-endpoints.ts b/test/source/mock/google/google-endpoints.ts index e301d716160..5b11e4fb24f 100644 --- a/test/source/mock/google/google-endpoints.ts +++ b/test/source/mock/google/google-endpoints.ts @@ -41,7 +41,7 @@ const allowedRecipients: Array = [ 'sender@domain.com', 'invalid@example.com', 'timeout@example.com', - 'flowcrypt.test.key.new.manual@gmail.com', + 'flowcrypt.test.key.new.manual.1@gmail.com', ]; export type MockUserAlias = { diff --git a/test/source/tests/flaky.ts b/test/source/tests/flaky.ts index ac71d7af88f..78c01ec25d7 100644 --- a/test/source/tests/flaky.ts +++ b/test/source/tests/flaky.ts @@ -30,7 +30,7 @@ export const defineFlakyTests = (testVariant: TestVariant, testWithBrowser: Test test( 'compose - own key expired - update and retry', testWithBrowser(async (t, browser) => { - const acctEmail = 'flowcrypt.test.key.new.manual@gmail.com'; + const acctEmail = 'flowcrypt.test.key.new.manual.0@gmail.com'; t.mockApi!.configProvider = new ConfigurationProvider({ attester: { pubkeyLookup: { @@ -94,7 +94,7 @@ export const defineFlakyTests = (testVariant: TestVariant, testWithBrowser: Test test( 'setup - create key - with backup to inbox', testWithBrowser(async (t, browser) => { - const acctEmail = 'flowcrypt.test.key.new.manual@gmail.com'; + const acctEmail = 'flowcrypt.test.key.new.manual.1@gmail.com'; t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); @@ -112,7 +112,7 @@ export const defineFlakyTests = (testVariant: TestVariant, testWithBrowser: Test test( 'setup - create key - choose no backup', testWithBrowser(async (t, browser) => { - const acctEmail = 'flowcrypt.test.key.new.manual@gmail.com'; + const acctEmail = 'flowcrypt.test.key.new.manual.2@gmail.com'; t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); @@ -130,7 +130,7 @@ export const defineFlakyTests = (testVariant: TestVariant, testWithBrowser: Test test( 'setup - create key - backup as file - submit pubkey', testWithBrowser(async (t, browser) => { - const acctEmail = 'flowcrypt.test.key.new.manual@gmail.com'; + const acctEmail = 'flowcrypt.test.key.new.manual.3@gmail.com'; t.mockApi!.configProvider = new ConfigurationProvider({ attester: singlePubKeyAttesterConfig(acctEmail, somePubkey), }); From d385f3f8688696b2d6d038b1fc9c2f43154dc21d Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 31 May 2023 19:20:32 +0100 Subject: [PATCH 106/147] simplification / fetching only missing attachments --- .../inbox-active-thread-module.ts | 2 +- .../common/api/email-provider/gmail/gmail.ts | 15 +++++----- extension/js/common/downloader.ts | 7 ----- extension/js/common/message-renderer.ts | 30 +++++++------------ 4 files changed, 19 insertions(+), 35 deletions(-) diff --git a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts index de2ec33bc79..14ea6128aca 100644 --- a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts +++ b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts @@ -198,7 +198,7 @@ export class InboxActiveThreadModule extends ViewModule { const full = await this.view.gmail.msgGet(msgId, 'full'); const raw = await this.view.gmail.msgGet(msgId, 'raw'); const existingAttachments = GmailParser.findAttachments(full, full.id); - await this.view.gmail.fetchAttachments(existingAttachments); + await this.view.gmail.fetchAttachmentsMissingData(existingAttachments); this.redactExportMsgHeaders(full); this.redactExportMsgHeaders(raw); const attachments: { [id: string]: { data: string; size: number } } = {}; diff --git a/extension/js/common/api/email-provider/gmail/gmail.ts b/extension/js/common/api/email-provider/gmail/gmail.ts index e7a1cb1d541..e12016d2280 100644 --- a/extension/js/common/api/email-provider/gmail/gmail.ts +++ b/extension/js/common/api/email-provider/gmail/gmail.ts @@ -222,16 +222,17 @@ export class Gmail extends EmailProviderApi implements EmailProviderInterface { }); }; - public fetchAttachments = async (attachments: Attachment[], progressCb?: ProgressCb) => { - if (!attachments.length) { + public fetchAttachmentsMissingData = async (attachments: Attachment[], progressCb?: ProgressCb) => { + const attachmentsMissingData = attachments.filter(a => !a.hasData()); + if (!attachmentsMissingData.length) { return; } let lastProgressPercent = -1; const loadedAr: Array = []; // 1.33 is approximate ratio of downloaded data to what we expected, likely due to encoding - const total = attachments.map(x => x.length).reduce((a, b) => a + b) * 1.33; + const total = attachmentsMissingData.map(x => x.length).reduce((a, b) => a + b) * 1.33; const responses = await Promise.all( - attachments.map((a, index) => + attachmentsMissingData.map((a, index) => // eslint-disable-next-line @typescript-eslint/no-non-null-assertion this.attachmentGet(a.msgId!, a.id!, { download: (_, loaded) => { @@ -249,11 +250,11 @@ export class Gmail extends EmailProviderApi implements EmailProviderInterface { ) ); for (const i of responses.keys()) { - attachments[i].setData(responses[i].data); + attachmentsMissingData[i].setData(responses[i].data); } }; - public fetchAttachment = async (a: Attachment, progressFunction: (expectedTransderSize: number) => { download: ProgressCb } | ProgressDestFrame) => { + public fetchAttachment = async (a: Attachment, progressFunction: (expectedTransferSize: number) => { download: ProgressCb } | ProgressDestFrame) => { const expectedTransferSize = a.length * 1.33; // todo: remove code duplication // eslint-disable-next-line @typescript-eslint/no-non-null-assertion const response = await this.attachmentGet(a.msgId!, a.id!, progressFunction(expectedTransferSize)); @@ -327,7 +328,7 @@ export class Gmail extends EmailProviderApi implements EmailProviderInterface { for (const msg of msgs) { attachments.push(...GmailParser.findAttachments(msg, msg.id)); } - await this.fetchAttachments(attachments); + await this.fetchAttachmentsMissingData(attachments); const { keys: foundBackupKeys } = await KeyUtil.readMany(Buf.fromUtfStr(attachments.map(a => a.getData().toUtfStr()).join('\n'))); const backups = await Promise.all(foundBackupKeys.map(k => KeyUtil.keyInfoObj(k))); const imported = await KeyStore.get(this.acctEmail); diff --git a/extension/js/common/downloader.ts b/extension/js/common/downloader.ts index 3bcdd541459..2f2553a6cbb 100644 --- a/extension/js/common/downloader.ts +++ b/extension/js/common/downloader.ts @@ -28,13 +28,6 @@ export class Downloader { public constructor(private readonly gmail: Gmail) {} - /* - private queueAttachmentDownload = (a: Attachment) => { - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - this.attachmentDownloads.push({ attachment: a, result: this.gmail.attachmentGet(a.msgId!, a.id!) }); - }; - */ - public queueAttachmentChunkDownload = (a: Attachment) => { if (a.hasData()) { return { attachment: a, result: Promise.resolve(a.getData()) }; diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index 2296526d709..6faed9f4d86 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -722,26 +722,23 @@ export class MessageRenderer { }; private renderPublicKeyFromFile = async ( - attachmentMeta: Attachment, + attachment: Attachment, loaderContext: LoaderContextInterface, isOutgoing: boolean, attachmentSel: JQueryEl | undefined ): Promise<'shown' | 'hidden'> => { - // let downloadedAttachment: GmailRes.GmailAttachment; try { - // todo: how is different -- downloader.attachmentGet(attachmentMeta.msgId!, attachmentMeta.id!); // .id! is present when fetched from api - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - await this.gmail.fetchAttachments([attachmentMeta]); + await this.gmail.fetchAttachmentsMissingData([attachment]); } catch (e) { - loaderContext.renderPlainAttachment(attachmentMeta, undefined, 'Please reload page'); + loaderContext.renderPlainAttachment(attachment, attachmentSel, 'Please reload page'); return 'shown'; } - const openpgpType = MsgUtil.type({ data: attachmentMeta.getData().subarray(0, 1000) }); + const openpgpType = MsgUtil.type({ data: attachment.getData().subarray(0, 1000) }); if (openpgpType?.type === 'publicKey') { - loaderContext.setMsgBody(this.factory.embeddedPubkey(attachmentMeta.getData().toUtfStr(), isOutgoing), 'after'); + loaderContext.setMsgBody(this.factory.embeddedPubkey(attachment.getData().toUtfStr(), isOutgoing), 'after'); return 'hidden'; } else if (openpgpType?.type !== 'encryptedAttachment') { - loaderContext.renderPlainAttachment(attachmentMeta, attachmentSel, 'Unknown Public Key Format'); + loaderContext.renderPlainAttachment(attachment, attachmentSel, 'Unknown Public Key Format'); return 'shown'; } else { // todo: renderEncryptedAttachment @@ -749,21 +746,14 @@ export class MessageRenderer { } }; - private renderBackupFromFile = async ( - attachmentMeta: Attachment, - loaderContext: LoaderContextInterface, - isOutgoing: boolean - ): Promise<'shown' | 'hidden'> => { + private renderBackupFromFile = async (attachment: Attachment, loaderContext: LoaderContextInterface, isOutgoing: boolean): Promise<'shown' | 'hidden'> => { // let downloadedAttachment: GmailRes.GmailAttachment; try { - // todo: fetch from queue - // todo: how is different -- downloader.attachmentGet(attachmentMeta.msgId!, attachmentMeta.id!); // .id! is present when fetched from api - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - await this.gmail.fetchAttachments([attachmentMeta]); - loaderContext.setMsgBody(this.factory.embeddedPubkey(attachmentMeta.getData().toUtfStr(), isOutgoing), 'append'); + await this.gmail.fetchAttachmentsMissingData([attachment]); + loaderContext.setMsgBody(this.factory.embeddedPubkey(attachment.getData().toUtfStr(), isOutgoing), 'append'); return 'hidden'; } catch (e) { - loaderContext.renderPlainAttachment(attachmentMeta, undefined, 'Please reload page'); + loaderContext.renderPlainAttachment(attachment, undefined, 'Please reload page'); // todo: unit-test, provide attachmentSel? return 'shown'; } }; From ee34da1bbbb24d3d0a0cc324a525ef462737be58 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 1 Jun 2023 17:35:21 +0100 Subject: [PATCH 107/147] better gmail mock rendering --- test/source/mock/google/google-data.ts | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/test/source/mock/google/google-data.ts b/test/source/mock/google/google-data.ts index 0fcdb4f4258..9b3cc1bd03a 100644 --- a/test/source/mock/google/google-data.ts +++ b/test/source/mock/google/google-data.ts @@ -230,7 +230,7 @@ export class GoogleData { const textData = Buf.fromBase64Str(payload.body!.data!).toUtfStr(); htmlData = GoogleData.htmlFromText(textData); } else { - ({ htmlData, processedParts } = GoogleData.getHtmlDataToDisplay(payload.parts!) ?? { htmlData: undefined, processedParts: [] }); + ({ htmlData, processedParts } = GoogleData.getHtmlDataToDisplay(payload) ?? { htmlData: undefined, processedParts: [] }); } const updatedHtmlData = htmlRenderer ? htmlRenderer(msgId, htmlData) : htmlData; const otherParts = GoogleData.getFileParts(payload.parts, processedParts); @@ -312,25 +312,31 @@ export class GoogleData { ); }; - private static getHtmlDataToDisplay = (parts: GmailMsg$payload$part[]): { htmlData: string; processedParts: GmailMsg$payload$part[] } | undefined => { - const htmlPart = parts.find(part => part.mimeType === 'text/html'); - const textPart = parts.find(part => part.mimeType === 'text/plain'); - const processedParts = [htmlPart, textPart].filter(Boolean) as GmailMsg$payload$part[]; + private static getHtmlDataToDisplay = ( + partsContainer: GmailMsg$payload | GmailMsg$payload$part + ): { htmlData: string; processedParts: GmailMsg$payload$part[] } | undefined => { + const htmlPart = partsContainer.parts?.find(part => part.mimeType === 'text/html'); + const textPart = partsContainer.parts?.find(part => part.mimeType === 'text/plain'); if (htmlPart) { + const processedParts = [htmlPart]; + if (partsContainer.mimeType === 'multipart/alternative' && textPart) { + // consume both html and text + processedParts.push(textPart); + } return { htmlData: Buf.fromBase64Str(htmlPart.body!.data!).toUtfStr(), processedParts }; } else if (typeof textPart?.body?.data !== 'undefined') { const textData = Buf.fromBase64Str(textPart.body.data).toUtfStr(); - return { htmlData: GoogleData.htmlFromText(textData), processedParts }; + return { htmlData: GoogleData.htmlFromText(textData), processedParts: [textPart] }; } // search inside multipart/alternative - const alternativePart = parts.find(part => part.mimeType === 'multipart/alternative'); + const alternativePart = partsContainer.parts?.find(part => part.mimeType === 'multipart/alternative'); if (alternativePart) { - return GoogleData.getHtmlDataToDisplay(alternativePart.parts!); + return GoogleData.getHtmlDataToDisplay(alternativePart); } // search inside multipart/mixed - const mixedPart = parts.find(part => part.mimeType === 'multipart/mixed'); + const mixedPart = partsContainer.parts?.find(part => part.mimeType === 'multipart/mixed'); if (mixedPart) { - return GoogleData.getHtmlDataToDisplay(mixedPart.parts!); + return GoogleData.getHtmlDataToDisplay(mixedPart); } return undefined; }; From c3d61278ab013b53a95287c0ac10156df96463c1 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 1 Jun 2023 17:48:10 +0100 Subject: [PATCH 108/147] fix --- extension/chrome/dev/export.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extension/chrome/dev/export.ts b/extension/chrome/dev/export.ts index a232bd3b1b3..a8f2272c68c 100644 --- a/extension/chrome/dev/export.ts +++ b/extension/chrome/dev/export.ts @@ -102,7 +102,7 @@ Catch.try(async () => { } } } - await gmail.fetchAttachments(fetchableAttachments, percent => print(`Percent attachments done: ${percent}`)); + await gmail.fetchAttachmentsMissingData(fetchableAttachments, percent => print(`Percent attachments done: ${percent}`)); const attachments: { [id: string]: { data: string; size: number } } = {}; for (const attachment of fetchableAttachments.concat(skippedAttachments)) { // eslint-disable-next-line @typescript-eslint/no-non-null-assertion From 113a3bf1d63f679e43aaa445453e39f2ad50aa5d Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 1 Jun 2023 18:17:32 +0100 Subject: [PATCH 109/147] fixed and tested backup message rendering --- extension/chrome/elements/backup.htm | 2 +- extension/js/common/message-renderer.ts | 13 ++++++++----- test/source/tests/decrypt.ts | 16 ++++++++++++++++ 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/extension/chrome/elements/backup.htm b/extension/chrome/elements/backup.htm index 75335266130..3e3f1820c59 100644 --- a/extension/chrome/elements/backup.htm +++ b/extension/chrome/elements/backup.htm @@ -21,7 +21,7 @@
Key Fingerprint:
- +
diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index 6faed9f4d86..ba2635a50ed 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -307,7 +307,7 @@ export class MessageRenderer { // todo - pubkey should be fetched in pgp_pubkey.js return await this.renderPublicKeyFromFile(a, loaderContext, this.isOutgoing(messageInfo.from?.email), attachmentSel); } else if (treatAs === 'privateKey') { - return await this.renderBackupFromFile(a, loaderContext, this.isOutgoing(messageInfo.from?.email)); + return await this.renderBackupFromFile(a, loaderContext, attachmentSel); } else { // standard file loaderContext.renderPlainAttachment(a, attachmentSel); @@ -746,14 +746,17 @@ export class MessageRenderer { } }; - private renderBackupFromFile = async (attachment: Attachment, loaderContext: LoaderContextInterface, isOutgoing: boolean): Promise<'shown' | 'hidden'> => { - // let downloadedAttachment: GmailRes.GmailAttachment; + private renderBackupFromFile = async ( + attachment: Attachment, + loaderContext: LoaderContextInterface, + attachmentSel: JQueryEl | undefined + ): Promise<'shown' | 'hidden'> => { try { await this.gmail.fetchAttachmentsMissingData([attachment]); - loaderContext.setMsgBody(this.factory.embeddedPubkey(attachment.getData().toUtfStr(), isOutgoing), 'append'); + loaderContext.setMsgBody(this.factory.embeddedBackup(attachment.getData().toUtfStr()), 'append'); return 'hidden'; } catch (e) { - loaderContext.renderPlainAttachment(attachment, undefined, 'Please reload page'); // todo: unit-test, provide attachmentSel? + loaderContext.renderPlainAttachment(attachment, attachmentSel, 'Please reload page'); // todo: unit-test return 'shown'; } }; diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index 03761d74863..2dc8a2e257b 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -64,6 +64,22 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te }) ); + test( + `decrypt - backup message rendering`, + testWithBrowser(async (t, browser) => { + const threadId = '15f84afa553d8a83'; + const { acctEmail, authHdr } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'compatibility'); + const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); + await inboxPage.waitForSelTestState('ready'); + await (await inboxPage.getFrame(['backup.htm'])).waitForContent('@private-key-status', 'This Private Key is already imported.'); + await inboxPage.close(); + const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${threadId}`, undefined, authHdr); + await gmailPage.waitAll('iframe'); + await (await gmailPage.getFrame(['backup.htm'])).waitForContent('@private-key-status', 'This Private Key is already imported.'); + await gmailPage.close(); + }) + ); + test( `decrypt - show remote images`, testWithBrowser(async (t, browser) => { From db61dbdcc71a3a0b26526df25c8eb2888e6b6304 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 2 Jun 2023 12:39:30 +0100 Subject: [PATCH 110/147] send messages from content script to pgp_block using chrome.runtime --- extension/chrome/elements/pgp_block.ts | 22 +++++---- .../inbox-active-thread-module.ts | 18 +------ extension/js/common/browser/browser-msg.ts | 2 + extension/js/common/core/const.ts | 1 - .../js/common/loader-context-interface.ts | 23 +-------- extension/js/common/message-renderer.ts | 18 ++----- .../js/common/relay-manager-interface.ts | 4 -- extension/js/common/relay-manager.ts | 48 ++++++++----------- extension/js/common/render-message.ts | 4 ++ extension/js/common/xss-safe-factory.ts | 14 ------ .../content_scripts/webmail/loader-context.ts | 8 +--- tooling/build-types-and-manifests.ts | 1 - 12 files changed, 50 insertions(+), 113 deletions(-) diff --git a/extension/chrome/elements/pgp_block.ts b/extension/chrome/elements/pgp_block.ts index b58913587f1..6df44507c78 100644 --- a/extension/chrome/elements/pgp_block.ts +++ b/extension/chrome/elements/pgp_block.ts @@ -2,13 +2,11 @@ 'use strict'; -import { Str, Url } from '../../js/common/core/common.js'; +import { Url } from '../../js/common/core/common.js'; import { Assert } from '../../js/common/assert.js'; -import { RenderMessage } from '../../js/common/render-message.js'; +import { RenderMessage, RenderMessageWithFrameId } from '../../js/common/render-message.js'; import { Attachment } from '../../js/common/core/attachment.js'; import { Xss } from '../../js/common/platform/xss.js'; -import { GMAIL_PAGE_HOST } from '../../js/common/core/const.js'; -import { Env } from '../../js/common/browser/env.js'; import { PgpBlockViewAttachmentsModule } from './pgp_block_modules/pgp-block-attachmens-module.js'; import { PgpBlockViewErrorModule } from './pgp_block_modules/pgp-block-error-module.js'; import { PgpBlockViewPrintModule } from './pgp_block_modules/pgp-block-print-module.js'; @@ -16,6 +14,7 @@ import { PgpBlockViewQuoteModule } from './pgp_block_modules/pgp-block-quote-mod import { PgpBlockViewRenderModule } from './pgp_block_modules/pgp-block-render-module.js'; import { Ui } from '../../js/common/browser/ui.js'; import { View } from '../../js/common/view.js'; +import { Bm } from '../../js/common/browser/browser-msg.js'; export class PgpBlockView extends View { public readonly acctEmail: string; // needed for attachment decryption, probably should be refactored out @@ -42,7 +41,16 @@ export class PgpBlockView extends View { this.quoteModule = new PgpBlockViewQuoteModule(this); this.errorModule = new PgpBlockViewErrorModule(this); this.renderModule = new PgpBlockViewRenderModule(this); - window.addEventListener('message', this.handleMessage, true); // todo: capture? + chrome.runtime.onMessage.addListener((message: Bm.Raw) => { + if (message.name === 'pgp_block_render') { + const msg = message.data.bm as RenderMessageWithFrameId; + if (msg.frameId === this.frameId) { + this.processMessage(msg); + return true; + } + } + return false; + }); window.addEventListener('load', () => window.parent.postMessage({ readyToReceive: this.frameId }, '*')); } @@ -57,9 +65,7 @@ export class PgpBlockView extends View { ); }; - private handleMessage = (event: MessageEvent) => { - if (!(event.origin === Env.getExtensionOrigin() || new RegExp(`^http(s)?://${Str.regexEscape(GMAIL_PAGE_HOST)}$`).test(event.origin))) return; - const data = event.data as RenderMessage; + private processMessage = (data: RenderMessage) => { // todo: order better if (data?.renderEncryptionStatus) { this.renderModule.renderEncryptionStatus(data.renderEncryptionStatus); diff --git a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts index 14ea6128aca..698544d35b7 100644 --- a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts +++ b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts @@ -18,18 +18,11 @@ import { ViewModule } from '../../../../js/common/view-module.js'; import { Xss } from '../../../../js/common/platform/xss.js'; import { Browser } from '../../../../js/common/browser/browser.js'; import { Attachment } from '../../../../js/common/core/attachment.js'; -import { LoaderContextInterface, bindNow } from '../../../../js/common/loader-context-interface.js'; -import { BindInterface } from '../../../../js/common/relay-manager-interface.js'; +import { LoaderContextInterface } from '../../../../js/common/loader-context-interface.js'; class LoaderContext implements LoaderContextInterface { - private frameIdsToBind: string[] = []; - public constructor(public readonly factory: XssSafeFactory, public renderedMessageXssSafe: string | undefined, public renderedAttachments: string[]) {} - public bind = (frameId: string) => { - this.frameIdsToBind.push(frameId); - }; - public renderPlainAttachment = (a: Attachment) => { // todo: render error argument this.renderedAttachments.push(this.factory.embeddedAttachment(a, false)); @@ -51,14 +44,6 @@ class LoaderContext implements LoaderContextInterface { public hideAttachment = () => { // not applicable }; - - public completeBinding = (binder: BindInterface) => { - while (true) { - const frameId = this.frameIdsToBind.shift(); - if (!frameId) break; - bindNow(frameId, binder); - } - }; } export class InboxActiveThreadModule extends ViewModule { @@ -169,7 +154,6 @@ export class InboxActiveThreadModule extends ViewModule { ? `
${loaderContext.renderedAttachments.join('')}
` : ''); $('.thread').append(this.wrapMsg(htmlId, r)); // xss-safe-factory - loaderContext.completeBinding(this.view.relayManager); await this.view.messageRenderer.startProcessingInlineBlocks(this.view.relayManager, this.view.factory, messageInfo, blocksInFrames); if (exportBtn) { $('.action-export').on( diff --git a/extension/js/common/browser/browser-msg.ts b/extension/js/common/browser/browser-msg.ts index 1a40faa0208..cf9b99bc78f 100644 --- a/extension/js/common/browser/browser-msg.ts +++ b/extension/js/common/browser/browser-msg.ts @@ -18,6 +18,7 @@ import { BrowserMsgCommonHandlers } from './browser-msg-common-handlers.js'; import { Browser } from './browser.js'; import { Env } from './env.js'; import { Time } from './time.js'; +import { RenderMessageWithFrameId } from '../render-message.js'; export type GoogleAuthWindowResult$result = 'Success' | 'Denied' | 'Error' | 'Closed'; @@ -251,6 +252,7 @@ export class BrowserMsg { reRenderRecipient: (dest: Bm.Dest, bm: Bm.ReRenderRecipient) => BrowserMsg.sendCatch(dest, 'reRenderRecipient', bm), showAttachmentPreview: (dest: Bm.Dest, bm: Bm.ShowAttachmentPreview) => BrowserMsg.sendCatch(dest, 'show_attachment_preview', bm), ajaxProgress: (dest: Bm.Dest, bm: Bm.AjaxProgress) => BrowserMsg.sendCatch(dest, 'ajax_progress', bm), + pgpBlockRender: (dest: Bm.Dest, bm: RenderMessageWithFrameId) => BrowserMsg.sendCatch(dest, 'pgp_block_render', bm), }; /* eslint-disable @typescript-eslint/naming-convention */ private static HANDLERS_REGISTERED_BACKGROUND: Handlers = {}; diff --git a/extension/js/common/core/const.ts b/extension/js/common/core/const.ts index 99919ad1311..e0475aff902 100644 --- a/extension/js/common/core/const.ts +++ b/extension/js/common/core/const.ts @@ -5,7 +5,6 @@ export const VERSION = '[BUILD_REPLACEABLE_VERSION]'; export const FLAVOR: 'consumer' | 'enterprise' = '[BUILD_REPLACEABLE_FLAVOR]' as unknown as 'consumer' | 'enterprise'; export const OAUTH_GOOGLE_API_HOST = '[BUILD_REPLACEABLE_OAUTH_GOOGLE_API_HOST]'; -export const GMAIL_PAGE_HOST = 'mail.google.com'; export const GMAIL_GOOGLE_API_HOST = '[BUILD_REPLACEABLE_GMAIL_GOOGLE_API_HOST]'; export const PEOPLE_GOOGLE_API_HOST = '[BUILD_REPLACEABLE_PEOPLE_GOOGLE_API_HOST]'; export const GOOGLE_OAUTH_SCREEN_HOST = '[BUILD_REPLACEABLE_GOOGLE_OAUTH_SCREEN_HOST]'; diff --git a/extension/js/common/loader-context-interface.ts b/extension/js/common/loader-context-interface.ts index 7347ba3d923..1b4a8f294a0 100644 --- a/extension/js/common/loader-context-interface.ts +++ b/extension/js/common/loader-context-interface.ts @@ -3,17 +3,11 @@ 'use strict'; import { Attachment } from './core/attachment.js'; -import { Catch } from './platform/catch.js'; -import { BindInterface } from './relay-manager-interface.js'; import { XssSafeFactory } from './xss-safe-factory.js'; export type JQueryEl = JQuery; -export interface LoaderContextBindInterface { - bind(frameId: string, binder: BindInterface): void; -} - -export interface LoaderContextInterface extends LoaderContextBindInterface { +export interface LoaderContextInterface { readonly factory: XssSafeFactory; renderPlainAttachment(a: Attachment, attachmentEl?: JQueryEl, error?: string): void; @@ -25,18 +19,3 @@ export interface LoaderContextInterface extends LoaderContextBindInterface { setMsgBody(frameXssSafe: string, method: 'set' | 'append' | 'after'): void; } - -export const bindNow = (frameId: string, binder: BindInterface) => { - const embeddedReference = XssSafeFactory.getEmbeddedMsg(frameId); - if (embeddedReference) { - binder.bind(frameId, embeddedReference); - } else { - Catch.report('Unexpected: unable to reference a newly created message frame'); - } -}; - -export class LoaderContextBindNow implements LoaderContextBindInterface { - public bind = (frameId: string, binder: BindInterface) => { - bindNow(frameId, binder); - }; -} diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index ba2635a50ed..6e644b47872 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -28,7 +28,7 @@ import { saveFetchedPubkeysIfNewerThanInStorage } from './shared.js'; import { XssSafeFactory } from './xss-safe-factory.js'; import * as DOMPurify from 'dompurify'; import { Downloader, ProcessedMessage } from './downloader.js'; -import { JQueryEl, LoaderContextBindInterface, LoaderContextBindNow, LoaderContextInterface } from './loader-context-interface.js'; +import { JQueryEl, LoaderContextInterface } from './loader-context-interface.js'; import { Gmail } from './api/email-provider/gmail/gmail.js'; import { ApiErr, AjaxErr } from './api/shared/api-error.js'; import { isCustomerUrlFesUsed } from './helpers.js'; @@ -328,14 +328,8 @@ export class MessageRenderer { public startProcessingInlineBlocks = async (relayManager: RelayManager, factory: XssSafeFactory, messageInfo: MessageInfo, blocks: Dict) => { await Promise.all( Object.entries(blocks).map(([frameId, block]) => - this.relayAndStartProcessing( - relayManager, - new LoaderContextBindNow(), - factory, - frameId, - messageInfo.printMailInfo, - messageInfo.from?.email, - renderModule => this.renderMsgBlock(block, renderModule, messageInfo.from?.email, messageInfo.isPwdMsgBasedOnMsgSnippet) + this.relayAndStartProcessing(relayManager, factory, frameId, messageInfo.printMailInfo, messageInfo.from?.email, renderModule => + this.renderMsgBlock(block, renderModule, messageInfo.from?.email, messageInfo.isPwdMsgBasedOnMsgSnippet) ) ) ); @@ -513,7 +507,6 @@ export class MessageRenderer { private relayAndStartProcessing = async ( relayManager: RelayManager, - loaderContext: LoaderContextBindInterface, factory: XssSafeFactory, frameId: string, printMailInfo: PrintMailInfo | undefined, @@ -521,13 +514,12 @@ export class MessageRenderer { cb: (renderModule: RenderInterface, frameId: string) => Promise<{ publicKeys?: string[]; needPassphrase?: string[] }> ): Promise<{ processor: Promise }> => { const { renderModule, cancellation } = relayManager.createRelay(frameId); - loaderContext.bind(frameId, relayManager); if (printMailInfo) { renderModule.setPrintMailInfo(printMailInfo); } const processor = cb(renderModule, frameId) .then(async result => { - const appendAfter = $(`iframe#${frameId}`); // todo: late binding? won't work + const appendAfter = $(`iframe#${frameId}`); // todo: review inbox-active-thread -- may fail // todo: how publicKeys and needPassphrase interact? for (const armoredPubkey of result.publicKeys ?? []) { appendAfter.after(factory.embeddedPubkey(armoredPubkey, this.isOutgoing(senderEmail))); @@ -684,7 +676,7 @@ export class MessageRenderer { ): Promise<{ processor: Promise }> => { const { frameId, frameXssSafe } = loaderContext.factory.embeddedRenderMsg(type); loaderContext.setMsgBody(frameXssSafe, 'set'); - return await this.relayAndStartProcessing(this.relayManager, loaderContext, loaderContext.factory, frameId, printMailInfo, senderEmail, cb); + return await this.relayAndStartProcessing(this.relayManager, loaderContext.factory, frameId, printMailInfo, senderEmail, cb); }; private processCryptoMessage = async ( diff --git a/extension/js/common/relay-manager-interface.ts b/extension/js/common/relay-manager-interface.ts index 497619d3c0d..9e3d0bf3267 100644 --- a/extension/js/common/relay-manager-interface.ts +++ b/extension/js/common/relay-manager-interface.ts @@ -7,7 +7,3 @@ import { RenderMessage } from './render-message.js'; export interface RelayManagerInterface { relay(frameId: string, message: RenderMessage, dontEnqueue?: boolean): void; } - -export interface BindInterface { - bind(frameId: string, reference: { frameWindow: Window; frameElement: HTMLIFrameElement }): void; -} diff --git a/extension/js/common/relay-manager.ts b/extension/js/common/relay-manager.ts index d75255b5a61..e253e8058ca 100644 --- a/extension/js/common/relay-manager.ts +++ b/extension/js/common/relay-manager.ts @@ -2,26 +2,23 @@ 'use strict'; -import { Bm } from './browser/browser-msg.js'; +import { Bm, BrowserMsg } from './browser/browser-msg.js'; import { PromiseCancellation } from './core/common.js'; -import { BindInterface, RelayManagerInterface } from './relay-manager-interface.js'; +import { RelayManagerInterface } from './relay-manager-interface.js'; import { RenderInterface } from './render-interface.js'; -import { RenderMessage } from './render-message.js'; +import { RenderMessage, RenderMessageWithFrameId } from './render-message.js'; import { RenderRelay } from './render-relay.js'; type FrameEntry = { - frameWindow?: Window; readyToReceive?: true; queue: RenderMessage[]; cancellation: PromiseCancellation; progressText?: string; }; -export class RelayManager implements RelayManagerInterface, BindInterface { +export class RelayManager implements RelayManagerInterface { private static readonly completionMessage: RenderMessage = { done: true }; private readonly frames = new Map(); - private readonly frameElementsMap = new Map(); - private readonly targetOrigin = chrome.runtime.getURL(''); public constructor(private debug: boolean = false) { const framesObserver = new MutationObserver(async mutationsList => { @@ -49,8 +46,8 @@ export class RelayManager implements RelayManagerInterface, BindInterface { const frameData = this.frames.get(frameId); if (frameData) { frameData.queue.push(message); - if (frameData.readyToReceive && frameData.frameWindow) { - this.flush({ frameId, frameWindow: frameData.frameWindow, queue: frameData.queue }); + if (frameData.readyToReceive) { + this.flush({ frameId, queue: frameData.queue }); } } }; @@ -67,9 +64,7 @@ export class RelayManager implements RelayManagerInterface, BindInterface { public readyToReceive = (frameId: string) => { const frameData = this.getOrCreate(frameId); frameData.readyToReceive = true; - if (frameData.frameWindow) { - this.flush({ frameId, frameWindow: frameData.frameWindow, queue: frameData.queue }); - } + this.flush({ frameId, queue: frameData.queue }); }; public renderProgressText = (frameId: string, text: string) => { @@ -90,23 +85,18 @@ export class RelayManager implements RelayManagerInterface, BindInterface { } }; - public bind = (frameId: string, { frameElement, frameWindow }: { frameElement: HTMLIFrameElement; frameWindow: Window }) => { - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - const frameData = this.frames.get(frameId)!; - frameData.frameWindow = frameWindow; - this.frameElementsMap.set(frameElement, frameId); - if (frameData.readyToReceive) { - this.flush({ frameId, frameWindow, queue: frameData.queue }); - } - }; - private dropRemovedNodes = (removedNode: Node) => { - const frameId = this.frameElementsMap.get(removedNode); + let frameId: string | undefined; + if (removedNode.nodeType === Node.ELEMENT_NODE) { + const element = removedNode as HTMLElement; + if (element.tagName === 'IFRAME') { + frameId = element.id; + } + } if (frameId) { if (this.debug) { console.debug('releasing resources connected to frameId=', frameId); } - this.frameElementsMap.delete(removedNode); const frameData = this.frames.get(frameId); if (frameData) { frameData.cancellation.cancel = true; @@ -127,13 +117,17 @@ export class RelayManager implements RelayManagerInterface, BindInterface { return newFrameEntry; }; - private flush = ({ frameId, frameWindow, queue }: { frameId: string; frameWindow: Window; queue: RenderMessage[] }) => { + private flush = ({ frameId, queue }: { frameId: string; queue: RenderMessage[] }) => { while (true) { const message = queue.shift(); if (message) { - frameWindow.postMessage(message, this.targetOrigin); + const msg: RenderMessageWithFrameId = { ...message, frameId }; + BrowserMsg.send.pgpBlockRender( + 'broadcast', // todo: own tabId? + msg + ); if (message === RelayManager.completionMessage) { - this.frames.delete(frameId); // todo: also delete related this.frameElementsMap entry? + this.frames.delete(frameId); } } else break; } diff --git a/extension/js/common/render-message.ts b/extension/js/common/render-message.ts index 9646f873813..230a3ba2590 100644 --- a/extension/js/common/render-message.ts +++ b/extension/js/common/render-message.ts @@ -38,3 +38,7 @@ export type RenderMessage = { printMailInfo?: PrintMailInfo; renderAsRegularContent?: string; }; + +export type RenderMessageWithFrameId = { + frameId: string; +} & RenderMessage; diff --git a/extension/js/common/xss-safe-factory.ts b/extension/js/common/xss-safe-factory.ts index 7e666a44007..e791a11fee9 100644 --- a/extension/js/common/xss-safe-factory.ts +++ b/extension/js/common/xss-safe-factory.ts @@ -90,20 +90,6 @@ export class XssSafeFactory { * When edited, REQUEST A SECOND SET OF EYES TO REVIEW CHANGES */ - public static getEmbeddedMsg = (frameId: string): { frameElement: HTMLIFrameElement; frameWindow: Window } | undefined => { - // const iframe = document.getElementById(frameId) as HTMLIFrameElement; - const frameElement = $(`iframe#${frameId}`) - .filter(function () { - return this.offsetHeight > 0; // filter visible, there may be invisible leftovers - }) - .get(0) as HTMLIFrameElement; - if (frameElement?.contentWindow) { - return { frameElement, frameWindow: frameElement.contentWindow }; - } - Catch.report('Unable to find iframe by frameId=' + frameId); - return undefined; - }; - public srcImg = (relPath: string) => { return this.extUrl(`img/${relPath}`); }; diff --git a/extension/js/content_scripts/webmail/loader-context.ts b/extension/js/content_scripts/webmail/loader-context.ts index 89816054485..155d6fc00d2 100644 --- a/extension/js/content_scripts/webmail/loader-context.ts +++ b/extension/js/content_scripts/webmail/loader-context.ts @@ -3,8 +3,7 @@ 'use strict'; import { Attachment } from '../../common/core/attachment.js'; -import { JQueryEl, LoaderContextInterface, bindNow } from '../../common/loader-context-interface.js'; -import { BindInterface } from '../../common/relay-manager-interface.js'; +import { JQueryEl, LoaderContextInterface } from '../../common/loader-context-interface.js'; import { XssSafeFactory } from '../../common/xss-safe-factory.js'; export class LoaderContextWebmail implements LoaderContextInterface { @@ -67,13 +66,10 @@ export class LoaderContextWebmail implements LoaderContextInterface { return '
' + htmlContent + '
'; }; - public bind = (frameId: string, binder: BindInterface) => { - bindNow(frameId, binder); - }; - public renderPlainAttachment = (a: Attachment, attachmentSel?: JQueryEl, error?: string) => { // simply show existing attachment if (!attachmentSel) { + // todo: do we need this clause? this.attachmentsContainerInner .show() .addClass('attachment_processed') diff --git a/tooling/build-types-and-manifests.ts b/tooling/build-types-and-manifests.ts index 7559c84477a..49e9ae392ba 100644 --- a/tooling/build-types-and-manifests.ts +++ b/tooling/build-types-and-manifests.ts @@ -123,7 +123,6 @@ const makeMockBuild = (sourceBuildType: string) => { /const (OAUTH_GOOGLE_API_HOST|GMAIL_GOOGLE_API_HOST|PEOPLE_GOOGLE_API_HOST|GOOGLE_OAUTH_SCREEN_HOST) = [^;]+;/g, `const $1 = '${MOCK_HOST[sourceBuildType]}';` ) - .replace(/const (GMAIL_PAGE_HOST) = [^;]+;/g, `const $1 = '${mockGmailPageHost}';`) .replace(/const (BACKEND_API_HOST) = [^;]+;/g, `const $1 = 'https://localhost:8001/api/';`) .replace(/const (ATTESTER_API_HOST) = [^;]+;/g, `const $1 = 'https://localhost:8001/attester/';`) .replace(/const (KEYS_OPENPGP_ORG_API_HOST) = [^;]+;/g, `const $1 = 'https://localhost:8001/keys-openpgp-org/';`) From 95887f0e4be985aafaa28b556096656786fc882c Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 2 Jun 2023 13:45:58 +0100 Subject: [PATCH 111/147] race condition fix --- .../pgp_block_modules/pgp-block-attachmens-module.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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 6ea48a4cc26..20ddc65c542 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 @@ -67,12 +67,11 @@ export class PgpBlockViewAttachmentsModule { await this.decryptAndSaveAttachmentToDownloads(attachment); } else { Xss.sanitizePrepend($(target).find('.progress'), Ui.spinner('green')); - attachment.setData( - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - await Api.download(attachment.url!, (perc, load, total) => - this.renderProgress($(target).find('.progress .percent'), perc, load, total || attachment.length) - ) + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + const buf = await Api.download(attachment.url!, (perc, load, total) => + this.renderProgress($(target).find('.progress .percent'), perc, load, total || attachment.length) ); + if (!attachment.hasData()) attachment.setData(buf); // there may be some sort of a race await Ui.delay(100); // give browser time to render $(target).find('.progress').text(''); await this.decryptAndSaveAttachmentToDownloads(attachment); From a209771f957828f15d25f8bea2479aa520b7e18a Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 2 Jun 2023 13:46:40 +0100 Subject: [PATCH 112/147] cleanup --- extension/js/common/relay-manager.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/extension/js/common/relay-manager.ts b/extension/js/common/relay-manager.ts index e253e8058ca..8c0a3a5c501 100644 --- a/extension/js/common/relay-manager.ts +++ b/extension/js/common/relay-manager.ts @@ -6,7 +6,7 @@ import { Bm, BrowserMsg } from './browser/browser-msg.js'; import { PromiseCancellation } from './core/common.js'; import { RelayManagerInterface } from './relay-manager-interface.js'; import { RenderInterface } from './render-interface.js'; -import { RenderMessage, RenderMessageWithFrameId } from './render-message.js'; +import { RenderMessage } from './render-message.js'; import { RenderRelay } from './render-relay.js'; type FrameEntry = { @@ -121,10 +121,9 @@ export class RelayManager implements RelayManagerInterface { while (true) { const message = queue.shift(); if (message) { - const msg: RenderMessageWithFrameId = { ...message, frameId }; BrowserMsg.send.pgpBlockRender( 'broadcast', // todo: own tabId? - msg + { ...message, frameId } ); if (message === RelayManager.completionMessage) { this.frames.delete(frameId); From e65fa5554760beabe248f163777df5e430399209 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 2 Jun 2023 15:33:17 +0100 Subject: [PATCH 113/147] cache expiration for downloaded messages --- .../inbox-active-thread-module.ts | 1 + .../js/background_page/background_page.ts | 2 +- extension/js/common/core/expiration-cache.ts | 8 ++++---- extension/js/common/downloader.ts | 18 ++++++++++++------ extension/js/common/message-renderer.ts | 4 ++++ .../webmail/gmail-element-replacer.ts | 1 + 6 files changed, 23 insertions(+), 11 deletions(-) diff --git a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts index 698544d35b7..6107e857bed 100644 --- a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts +++ b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts @@ -101,6 +101,7 @@ export class InboxActiveThreadModule extends ViewModule { Xss.sanitizeRender('.thread', `
Failed to load thread due to the following error: 
${printable}
`); } } + this.view.messageRenderer.deleteExpired(); }; public setHandlers = () => { diff --git a/extension/js/background_page/background_page.ts b/extension/js/background_page/background_page.ts index 338b3cc1549..041dd068afd 100644 --- a/extension/js/background_page/background_page.ts +++ b/extension/js/background_page/background_page.ts @@ -21,7 +21,7 @@ console.info('background_process.js starting'); (async () => { let db: IDBDatabase; let storage: GlobalStoreDict; - const inMemoryStore = new ExpirationCache(4 * 60 * 60 * 1000); // 4 hours + const inMemoryStore = new ExpirationCache(4 * 60 * 60 * 1000); // 4 hours Catch.setHandledInterval(() => inMemoryStore.deleteExpired(), 60000); // each minute try { diff --git a/extension/js/common/core/expiration-cache.ts b/extension/js/common/core/expiration-cache.ts index 0bf762d859c..dbbd2826ce3 100644 --- a/extension/js/common/core/expiration-cache.ts +++ b/extension/js/common/core/expiration-cache.ts @@ -3,13 +3,13 @@ /** * Cache, keeping entries for limited duration */ -export class ExpirationCache { - private cache: { [key: string]: { value: string; expiration: number } } = {}; +export class ExpirationCache { + private cache: { [key: string]: { value: T; expiration: number } } = {}; // eslint-disable-next-line @typescript-eslint/naming-convention public constructor(public EXPIRATION_TICKS: number) {} - public set = (key: string, value?: string, expiration?: number) => { + public set = (key: string, value?: T, expiration?: number) => { if (value) { this.cache[key] = { value, expiration: expiration || Date.now() + this.EXPIRATION_TICKS }; } else { @@ -17,7 +17,7 @@ export class ExpirationCache { } }; - public get = (key: string): string | undefined => { + public get = (key: string): T | undefined => { const found = this.cache[key]; if (found) { if (found.expiration > Date.now()) { diff --git a/extension/js/common/downloader.ts b/extension/js/common/downloader.ts index 2f2553a6cbb..ba990b0cd3f 100644 --- a/extension/js/common/downloader.ts +++ b/extension/js/common/downloader.ts @@ -6,7 +6,7 @@ import { GmailRes } from './api/email-provider/gmail/gmail-parser.js'; import { Gmail } from './api/email-provider/gmail/gmail.js'; import { Attachment } from './core/attachment.js'; import { Buf } from './core/buf.js'; -import { Dict } from './core/common.js'; +import { ExpirationCache } from './core/expiration-cache.js'; import { MsgBlock } from './core/msg-block.js'; import { MessageInfo } from './render-message.js'; @@ -23,11 +23,16 @@ export interface MessageCacheEntry { } export class Downloader { - private chunkDownloads: { attachment: Attachment; result: Promise }[] = []; - private messages: Dict = {}; + private readonly chunkDownloads: { attachment: Attachment; result: Promise }[] = []; + private readonly messages = new ExpirationCache(24 * 60 * 60 * 1000); // 24 hours public constructor(private readonly gmail: Gmail) {} + public deleteExpired = (): void => { + this.messages.deleteExpired(); + // todo: this.chunkDownloads + }; + public queueAttachmentChunkDownload = (a: Attachment) => { if (a.hasData()) { return { attachment: a, result: Promise.resolve(a.getData()) }; @@ -43,10 +48,11 @@ export class Downloader { public msgGetCached = (msgId: string): MessageCacheEntry => { // todo: retries? exceptions? - let msgDownload = this.messages[msgId]; + let msgDownload = this.messages.get(msgId); if (!msgDownload) { - this.messages[msgId] = { download: { full: this.gmail.msgGet(msgId, 'full') } }; - msgDownload = this.messages[msgId]; + const newEntry = { download: { full: this.gmail.msgGet(msgId, 'full') } }; + this.messages.set(msgId, newEntry); + msgDownload = newEntry; } return msgDownload; }; diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index 6e644b47872..e4d3f8b4f12 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -369,6 +369,10 @@ export class MessageRenderer { return msgDownload.processedFull; }; + public deleteExpired = (): void => { + this.downloader.deleteExpired(); + }; + private getMessageInfo = async (fullMsg: GmailRes.GmailMsg): Promise => { const sentDate = GmailParser.findHeader(fullMsg, 'date'); const sentDateStr = sentDate ? Str.fromDate(new Date(sentDate)).replace(' ', ' at ') : ''; diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index 69a6a8f1d59..4098e28f1f2 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -148,6 +148,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { this.evaluateStandardComposeRecipients().catch(Catch.reportErr); this.addSettingsBtn(); this.renderLocalDrafts().catch(Catch.reportErr); + this.messageRenderer.deleteExpired(); }; private replaceArmoredBlocks = async () => { From 99b9fdab2ddd891e7b25c70df5a5f600e0b7f7f0 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 2 Jun 2023 17:27:33 +0100 Subject: [PATCH 114/147] use Map in ExpirationCache, delete expired chunks --- .../js/background_page/background_page.ts | 2 +- extension/js/common/core/expiration-cache.ts | 28 +++++++++++-------- extension/js/common/downloader.ts | 20 +++++++------ 3 files changed, 29 insertions(+), 21 deletions(-) diff --git a/extension/js/background_page/background_page.ts b/extension/js/background_page/background_page.ts index 041dd068afd..34570938951 100644 --- a/extension/js/background_page/background_page.ts +++ b/extension/js/background_page/background_page.ts @@ -21,7 +21,7 @@ console.info('background_process.js starting'); (async () => { let db: IDBDatabase; let storage: GlobalStoreDict; - const inMemoryStore = new ExpirationCache(4 * 60 * 60 * 1000); // 4 hours + const inMemoryStore = new ExpirationCache(4 * 60 * 60 * 1000); // 4 hours Catch.setHandledInterval(() => inMemoryStore.deleteExpired(), 60000); // each minute try { diff --git a/extension/js/common/core/expiration-cache.ts b/extension/js/common/core/expiration-cache.ts index dbbd2826ce3..e3420e216c2 100644 --- a/extension/js/common/core/expiration-cache.ts +++ b/extension/js/common/core/expiration-cache.ts @@ -3,36 +3,42 @@ /** * Cache, keeping entries for limited duration */ -export class ExpirationCache { - private cache: { [key: string]: { value: T; expiration: number } } = {}; +export class ExpirationCache { + private cache = new Map(); // eslint-disable-next-line @typescript-eslint/naming-convention public constructor(public EXPIRATION_TICKS: number) {} - public set = (key: string, value?: T, expiration?: number) => { + public set = (key: K, value?: V, expiration?: number) => { if (value) { - this.cache[key] = { value, expiration: expiration || Date.now() + this.EXPIRATION_TICKS }; + this.cache.set(key, { value, expiration: expiration || Date.now() + this.EXPIRATION_TICKS }); } else { - delete this.cache[key]; + this.cache.delete(key); } }; - public get = (key: string): T | undefined => { - const found = this.cache[key]; + public get = (key: K): V | undefined => { + const found = this.cache.get(key); if (found) { if (found.expiration > Date.now()) { return found.value; } else { // expired, so delete it and return as if not found - delete this.cache[key]; + this.cache.delete(key); } } return undefined; }; - public deleteExpired = (): void => { - for (const keyToDelete of Object.keys(this.cache).filter(key => this.cache[key].expiration <= Date.now())) { - delete this.cache[keyToDelete]; + public deleteExpired = (additionalPredicate: (key: K, value: V) => boolean = () => false): void => { + const keysToDelete: K[] = []; + for (const [key, value] of this.cache.entries()) { + if (value.expiration <= Date.now() || additionalPredicate(key, value.value)) { + keysToDelete.push(key); + } + } + for (const key of keysToDelete) { + this.cache.delete(key); } }; } diff --git a/extension/js/common/downloader.ts b/extension/js/common/downloader.ts index ba990b0cd3f..1ae4500168e 100644 --- a/extension/js/common/downloader.ts +++ b/extension/js/common/downloader.ts @@ -23,27 +23,29 @@ export interface MessageCacheEntry { } export class Downloader { - private readonly chunkDownloads: { attachment: Attachment; result: Promise }[] = []; - private readonly messages = new ExpirationCache(24 * 60 * 60 * 1000); // 24 hours + private readonly chunkDownloads = new ExpirationCache>(2 * 60 * 60 * 1000); // 2 hours + private readonly messages = new ExpirationCache(24 * 60 * 60 * 1000); // 24 hours public constructor(private readonly gmail: Gmail) {} public deleteExpired = (): void => { this.messages.deleteExpired(); - // todo: this.chunkDownloads + this.chunkDownloads.deleteExpired(attachment => { + return attachment.hasData(); + }); }; - public queueAttachmentChunkDownload = (a: Attachment) => { + public queueAttachmentChunkDownload = (a: Attachment): { result: Promise } => { if (a.hasData()) { - return { attachment: a, result: Promise.resolve(a.getData()) }; + return { result: Promise.resolve(a.getData()) }; } - let download = this.chunkDownloads.find(d => d.attachment === a); + let download = this.chunkDownloads.get(a); if (!download) { // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - download = { attachment: a, result: this.gmail.attachmentGetChunk(a.msgId!, a.id!) }; - this.chunkDownloads.push(download); + download = this.gmail.attachmentGetChunk(a.msgId!, a.id!); + this.chunkDownloads.set(a, download); } - return download; + return { result: download }; }; public msgGetCached = (msgId: string): MessageCacheEntry => { From 967fd3d187908a935d479d296f38410a5a57ff13 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 2 Jun 2023 18:13:32 +0100 Subject: [PATCH 115/147] more patches for Firefox Uint8Array issue --- scripts/build.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/build.sh b/scripts/build.sh index 4ef9f583a51..d095f941a27 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -76,9 +76,13 @@ STREAMS_FILES=$OUTDIR/lib/streams/* # patch isUint8Array until https://github.com/openpgpjs/web-stream-tools/pull/23 is resolved ISUINT8ARRAY_REGEX1="s/(\s*)return\x20Uint8Array\.prototype\.isPrototypeOf\(input\);/\1return\x20Uint8Array\.prototype\.isPrototypeOf\(input\)\x20\|\|\x20globalThis\.Uint8Array\.prototype\.isPrototypeOf\(input\);/g" +# the following patches are until https://github.com/openpgpjs/openpgpjs/issues/1648 is fixed + # this patch handles patterns like (n instanceof Uint8Array) or (arguments[i] instanceof Uint8Array) -# todo: there is also one place left unhandled: return a instanceof Uint8Array; +# to replace them with (\1 instanceof Uint8Array || \1 instanceof globalThis.Uint8Array) ISUINT8ARRAY_REGEX2="s/\(([^\(\)\x20]+)\x20instanceof\x20Uint8Array\)/\(\1\x20instanceof\x20Uint8Array\x20\|\|\x20\1\x20instanceof\x20globalThis\.Uint8Array\)/g" +# this patch handles pattern like \x20n instanceof Uint8Array; +ISUINT8ARRAY_REGEX3="s/\x20([^\(\)\x20]+)\x20instanceof\x20Uint8Array;/\x20\(\1\x20instanceof\x20Uint8Array\x20\|\|\x20\1\x20instanceof\x20globalThis\.Uint8Array\);/g" OPENPGP_FILE=$OUTDIR/lib/openpgp.js if [[ "$OSTYPE" =~ ^darwin ]]; then # macOS needs additional parameter for backup files @@ -86,11 +90,13 @@ if [[ "$OSTYPE" =~ ^darwin ]]; then # macOS needs additional parameter for backu sed -i '' -E $ISUINT8ARRAY_REGEX1 $STREAMS_FILES sed -i '' -E $ISUINT8ARRAY_REGEX1 $OPENPGP_FILE sed -i '' -E $ISUINT8ARRAY_REGEX2 $OPENPGP_FILE + sed -i '' -E $ISUINT8ARRAY_REGEX3 $OPENPGP_FILE else sed -i -E $STREAMS_REGEX $STREAMS_FILES sed -i -E $ISUINT8ARRAY_REGEX1 $STREAMS_FILES sed -i -E $ISUINT8ARRAY_REGEX1 $OPENPGP_FILE sed -i -E $ISUINT8ARRAY_REGEX2 $OPENPGP_FILE + sed -i -E $ISUINT8ARRAY_REGEX3 $OPENPGP_FILE fi # bundle web-stream-tools as Stream var for the content script From 1a612e72f18f63270ec3a3c97c28ab936ca11641 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sat, 3 Jun 2023 16:09:53 +0100 Subject: [PATCH 116/147] cleaner code --- extension/js/common/core/mime.ts | 36 +++++------------- extension/js/common/message-renderer.ts | 49 +++++++++++++------------ test/source/tests/decrypt.ts | 8 +++- 3 files changed, 43 insertions(+), 50 deletions(-) diff --git a/extension/js/common/core/mime.ts b/extension/js/common/core/mime.ts index 33256521b5e..940e73e12df 100644 --- a/extension/js/common/core/mime.ts +++ b/extension/js/common/core/mime.ts @@ -23,13 +23,13 @@ const Iso88592 = requireIso88592(); type AddressHeader = { address: string; name: string }; type MimeContentHeader = string | AddressHeader[]; -export type MimeContentBody = { +export type MessageBody = { html?: string; text?: string; }; -export type MimeContent = MimeContentBody & { - attachments: Attachment[]; +export type MimeContent = MessageBody & { + attachments: Attachment[]; // attachments in MimeContent are parsed from a raw MIME message and always have data rawSignedContent?: string; subject?: string; }; @@ -51,7 +51,7 @@ export type SendableMsgBody = { 'text/html'?: string; 'pkcs7/buf'?: Buf; // DER-encoded PKCS#7 message }; -/* eslint-enable @typescript-eslint/naming-convention */ + export type MimeProccesedMsg = { rawSignedContent: string | undefined; // undefined if format was 'full' blocks: MsgBlock[]; // may be many blocks per file @@ -64,7 +64,7 @@ export type MimeProccesedFromRawMsg = MimeProccesedMsg & { type SendingType = 'to' | 'cc' | 'bcc'; export class Mime { - public static processBody = (decoded: MimeContentBody): MsgBlock[] => { + public static processBody = (decoded: MessageBody): MsgBlock[] => { const blocks: MsgBlock[] = []; if (decoded.text) { const blocksFromTextPart = MsgBlockParser.detectBlocks(Str.normalize(decoded.text), true).blocks; @@ -84,7 +84,7 @@ export class Mime { return blocks; }; - public static isBodyEmpty = ({ text, html }: MimeContent) => { + public static isBodyEmpty = ({ text, html }: MessageBody) => { return Mime.isBodyTextEmpty(text) && Mime.isBodyTextEmpty(html); }; @@ -98,8 +98,9 @@ export class Mime { for (const file of decoded.attachments) { let treatAs = file.treatAs(decoded.attachments, Mime.isBodyEmpty(decoded)); if (['needChunk', 'maybePgp'].includes(treatAs)) { - // don't want to reference MsgUtil and OpenPGP.js here, so - // todo: think about refactoring this + // todo: attachments from MimeContent always have data set, so we can perform whatever analysis is needed, + // but we don't want to reference MsgUtil and OpenPGP.js from this class, + // so we need to move this method to MessageRenderer treatAs = 'encryptedMsg'; // publicKey? } if (treatAs === 'encryptedMsg') { @@ -120,13 +121,6 @@ export class Mime { type: file.type, length: file.getData().length, data: file.getData(), - /* - todo: do we need this? - length: file.hasData() ? file.getData().length : undefined, - data: file.hasData() ? file.getData() : undefined, - id: file.id, - msgId: file.id, - cid: file.cid, */ }) ); } else if (treatAs === 'plainFile') { @@ -137,8 +131,7 @@ export class Mime { length: file.getData().length, data: file.getData(), inline: file.inline, - id: file.id, // todo: - cid: file.cid, // todo: + cid: file.cid, }) ); } @@ -178,15 +171,6 @@ export class Mime { }; }; - public static isPlainImgAttachment = (b: MsgBlock) => { - return ( - b.type === 'plainAttachment' && - b.attachmentMeta && - b.attachmentMeta.type && - ['image/jpeg', 'image/jpg', 'image/bmp', 'image/png', 'image/svg+xml'].includes(b.attachmentMeta.type) - ); - }; - public static resemblesMsg = (msg: Uint8Array | string) => { const chunk = (typeof msg === 'string' ? msg.substring(0, 3000) : new Buf(msg.slice(0, 3000)).toUtfStr('ignore')).toLowerCase().replace(/\r\n/g, '\n'); const headers = chunk.split('\n\n')[0]; diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index e4d3f8b4f12..05df7c7c44b 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -11,7 +11,7 @@ import { CID_PATTERN, Dict, Str, Value } from './core/common.js'; import { KeyUtil } from './core/crypto/key.js'; import { DecryptErrTypes, DecryptResult, FormatError, MsgUtil, VerifyRes } from './core/crypto/pgp/msg-util.js'; import { PgpArmor } from './core/crypto/pgp/pgp-armor.js'; -import { Mime, MimeContent, MimeProccesedMsg } from './core/mime.js'; +import { Mime, MessageBody, MimeProccesedMsg } from './core/mime.js'; import { MsgBlockParser } from './core/msg-block-parser.js'; import { MsgBlock } from './core/msg-block.js'; import { Lang } from './lang.js'; @@ -66,9 +66,9 @@ export class MessageRenderer { * @param attachments - An array of email attachments. * @returns An object containing sanitized HTML and an array of inline CID attachments. */ - private static replaceInlineImageCIDs = (html: string, attachments: Attachment[]): { sanitizedHtml: string; inlineCIDAttachments: Attachment[] } => { - // Array to store inline CID attachments - const inlineCIDAttachments: Attachment[] = []; + private static replaceInlineImageCIDs = (html: string, attachments: Attachment[]): { sanitizedHtml: string; inlineCIDAttachments: Set } => { + // Set to store inline CID attachments + const inlineCIDAttachments = new Set(); // Define the hook function for DOMPurify to process image elements after sanitizing attributes const processImageElements = (node: Element | null) => { @@ -85,7 +85,7 @@ export class MessageRenderer { // Replace the src attribute with a base64 encoded string if (contentIdAttachment) { - inlineCIDAttachments.push(contentIdAttachment); + inlineCIDAttachments.add(contentIdAttachment); node.setAttribute('src', `data:${contentIdAttachment.type};base64,${contentIdAttachment.getData().toBase64Str()}`); } } @@ -121,16 +121,18 @@ export class MessageRenderer { } }; - private static reconstructMimeContent = (gmailMsg: GmailRes.GmailMsg): MimeContent => { + // attachments returned by this method are missing data, so they need to be fetched + private static getMessageBodyAndAttachments = (gmailMsg: GmailRes.GmailMsg): { body: MessageBody; attachments: Attachment[] } => { const bodies = GmailParser.findBodies(gmailMsg); const attachments = GmailParser.findAttachments(gmailMsg, gmailMsg.id); const text = bodies['text/plain'] ? Buf.fromBase64UrlStr(bodies['text/plain']).toUtfStr() : undefined; // todo: do we need to strip? const html = bodies['text/html'] ? Xss.htmlSanitizeAndStripAllTags(Buf.fromBase64UrlStr(bodies['text/html']).toUtfStr(), '\n') : undefined; - // reconstructed MIME content return { - text, - html, + body: { + text, + html, + }, attachments, }; }; @@ -342,29 +344,29 @@ export class MessageRenderer { return msgDownload.processedFull; } const fullMsg = await msgDownload.download.full; - const mimeContent = MessageRenderer.reconstructMimeContent(fullMsg); - const blocks = Mime.processBody(mimeContent); - const isBodyEmpty = Mime.isBodyEmpty(mimeContent); - // todo: only start `signature` download? - // start download of all attachments that are not plainFile, for 'needChunk' -- chunked download - for (const a of mimeContent.attachments.filter(a => !a.hasData())) { - const treatAs = a.treatAs(mimeContent.attachments, isBodyEmpty); + const { body, attachments } = MessageRenderer.getMessageBodyAndAttachments(fullMsg); + const blocks = Mime.processBody(body); + const isBodyEmpty = Mime.isBodyEmpty(body); + // todo: start download of all attachments that are not plainFile, when the cache is implemented? + // start chunk downloads for 'needChunk' attachments + for (const a of attachments.filter(a => !a.hasData())) { + const treatAs = a.treatAs(attachments, isBodyEmpty); if (treatAs === 'plainFile') continue; if (treatAs === 'needChunk') { this.downloader.queueAttachmentChunkDownload(a); } else if (treatAs === 'publicKey') { - // we also want a chunk before we replace the attachment in the UI - // todo: or simply download in full? + // we also want a chunk before we replace the publicKey-looking attachment in the UI + // todo: or simply queue full attachment download? this.downloader.queueAttachmentChunkDownload(a); } else { - // todo: this.downloader.queueAttachmentDownload(a); + // todo: queue full attachment download, when the cache is implemented? } } msgDownload.processedFull = { isBodyEmpty, blocks, messageInfo: await this.getMessageInfo(fullMsg), - attachments: mimeContent.attachments, + attachments, }; return msgDownload.processedFull; }; @@ -450,7 +452,7 @@ export class MessageRenderer { } else { renderModule.renderText('Formatting...'); const decoded = await Mime.decode(decryptedBytes); - let inlineCIDAttachments: Attachment[] = []; + let inlineCIDAttachments = new Set(); if (typeof decoded.html !== 'undefined') { ({ sanitizedHtml: decryptedContent, inlineCIDAttachments } = MessageRenderer.replaceInlineImageCIDs(decoded.html, decoded.attachments)); isHtml = true; @@ -472,14 +474,15 @@ export class MessageRenderer { publicKeys.push(attachment.getData().toUtfStr()); } else if (decoded.rawSignedContent && attachment.treatAs(decoded.attachments) === 'signature') { signedContentInDecryptedData = { rawSignedContent: decoded.rawSignedContent, signature: attachment }; - } else if (!inlineCIDAttachments.some(inlineAttachment => inlineAttachment.cid === attachment.cid)) { + } else if (inlineCIDAttachments.has(attachment)) { + // this attachment has been processed into an inline image + } else { renderableAttachments.push( Attachment.toTransferableAttachment({ name: attachment.name, type: attachment.type, length: attachment.getData().length, data: attachment.getData(), - cid: attachment.cid, // todo: do we need it? }) ); } diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index 2dc8a2e257b..edbddcc2c2f 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -996,7 +996,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== 'decrypt - display email with cid image correctly', testWithBrowser(async (t, browser) => { const threadId = '186eed032659ad4f'; - const { acctEmail } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'compatibility'); + const { acctEmail, authHdr } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'compatibility'); const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitAll('iframe'); const pgpBlock = await inboxPage.getFrame(['pgp_block.htm']); @@ -1005,6 +1005,12 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== const replyFrame = await inboxPage.getFrame(['compose.htm']); await replyFrame.waitAndClick('@action-forward'); await replyFrame.waitForContent('@input-body', 'googlelogo_color_272x92dp.png'); // check if forwarded content contains cid image name + await inboxPage.close(); + const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${threadId}`, undefined, authHdr); + await gmailPage.waitAll('iframe'); + const pgpBlockFromGmailPage = await gmailPage.getFrame(['pgp_block.htm']); + await pgpBlockFromGmailPage.waitForSelTestState('ready'); + await pgpBlockFromGmailPage.checkIfImageIsDisplayedCorrectly('#pgp_block img'); }) ); From 94d9e03f4dd54a3a126e2f6dd4a616cda2abf0a0 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sat, 3 Jun 2023 16:20:26 +0100 Subject: [PATCH 117/147] XssSafeFactory cleanup --- extension/js/common/message-renderer.ts | 4 ++-- extension/js/common/xss-safe-factory.ts | 23 ++++------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index 05df7c7c44b..b6761071b0b 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -231,7 +231,7 @@ export class MessageRenderer { if (showOriginal) { r += Xss.escape(Str.with(block.content)).replace(/\n/g, '
'); } else if (['signedMsg', 'encryptedMsg'].includes(block.type)) { - const { frameId, frameXssSafe } = this.factory.embeddedRenderMsg(block.type); + const { frameId, frameXssSafe } = this.factory.embeddedMsg(block.type); r += frameXssSafe; blocksInFrames[frameId] = block; } else { @@ -681,7 +681,7 @@ export class MessageRenderer { senderEmail: string | undefined, cb: (renderModule: RenderInterface, frameId: string) => Promise<{ publicKeys?: string[] }> ): Promise<{ processor: Promise }> => { - const { frameId, frameXssSafe } = loaderContext.factory.embeddedRenderMsg(type); + const { frameId, frameXssSafe } = loaderContext.factory.embeddedMsg(type); loaderContext.setMsgBody(frameXssSafe, 'set'); return await this.relayAndStartProcessing(this.relayManager, loaderContext.factory, frameId, printMailInfo, senderEmail, cb); }; diff --git a/extension/js/common/xss-safe-factory.ts b/extension/js/common/xss-safe-factory.ts index e791a11fee9..e8b2edb215d 100644 --- a/extension/js/common/xss-safe-factory.ts +++ b/extension/js/common/xss-safe-factory.ts @@ -10,7 +10,7 @@ import { Attachment } from './core/attachment.js'; import { Browser } from './browser/browser.js'; import { BrowserMsg } from './browser/browser-msg.js'; import { Catch } from './platform/catch.js'; -import { MsgBlock, MsgBlockType } from './core/msg-block.js'; +import { MsgBlock } from './core/msg-block.js'; import { PgpArmor } from './core/crypto/pgp/pgp-armor.js'; import { Ui } from './browser/ui.js'; import { WebMailName, WebMailVersion } from './browser/env.js'; @@ -136,18 +136,7 @@ export class XssSafeFactory { ); }; - public srcPgpBlockIframe = (message: string, msgId?: string, isOutgoing?: boolean, senderEmail?: string, signature?: string | boolean) => { - return this.frameSrc(this.extUrl('chrome/elements/pgp_block.htm'), { - frameId: this.newId(), - message, - msgId, - senderEmail, - isOutgoing, - signature, - }); - }; - - public srcPgpRenderBlockIframe = () => { + public srcPgpBlockIframe = () => { const frameId = this.newId(); return { frameId, @@ -219,14 +208,10 @@ export class XssSafeFactory { }); }; - public embeddedMsg = (type: MsgBlockType, armored: string, msgId?: string, isOutgoing?: boolean, sender?: string, signature?: string | boolean) => { - return this.iframe(this.srcPgpBlockIframe(armored, msgId, isOutgoing, sender, signature), ['pgp_block', type]) + this.hideGmailNewMsgInThreadNotification; - }; - - public embeddedRenderMsg = ( + public embeddedMsg = ( type: string // for diagnostic purposes ) => { - const { frameId, frameSrc } = this.srcPgpRenderBlockIframe(); + const { frameId, frameSrc } = this.srcPgpBlockIframe(); return { frameId, frameXssSafe: this.iframe(frameSrc, ['pgp_block', type]) + this.hideGmailNewMsgInThreadNotification }; }; From 5f126af11c49a808007a7a68fd88430129a8b840 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sat, 3 Jun 2023 17:47:38 +0100 Subject: [PATCH 118/147] added signature test for gmail mock --- test/source/tests/decrypt.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index edbddcc2c2f..03d5458a03d 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -1094,19 +1094,20 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== test( 'decrypt - thunderbird - signed text is recognized', testWithBrowser(async (t, browser) => { - const { acctEmail } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'compatibility'); + const { acctEmail, authHdr } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'compatibility'); t.mockApi!.configProvider!.config.attester!.pubkeyLookup!['some.sender@test.com'] = { pubkey: await get203FAE7076005381() }; - const threadId = '17dad75e63e47f97'; - const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); + const msgId = '17dad75e63e47f97'; + const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${msgId}`); 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); - await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame([urls[0]]), { + const expectedMessage = { content: ['1234'], encryption: 'not encrypted', signature: 'signed', - }); - // todo: check gmail mock + }; + await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame(['pgp_block.htm']), expectedMessage); + await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, msgId, expectedMessage, authHdr); }) ); From 0653a91237e54d95bc665fd44e0538c3a58e260a Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sun, 4 Jun 2023 19:41:02 +0100 Subject: [PATCH 119/147] retry verification when pubkeys fetch resulted in network error: offline->retry scenario --- extension/chrome/elements/pgp_block.ts | 7 ++- .../pgp-block-render-module.ts | 7 +++ extension/chrome/settings/inbox/inbox.ts | 4 +- extension/js/common/message-renderer.ts | 37 +++++++++++++--- extension/js/common/relay-manager.ts | 34 ++++++++++---- extension/js/common/render-interface.ts | 3 ++ extension/js/common/render-message.ts | 1 + extension/js/common/render-relay.ts | 16 +++++++ .../webmail/setup-webmail-content-script.ts | 4 +- test/source/tests/decrypt.ts | 44 +++++++++++++++++++ test/source/tests/tooling/browser-recipe.ts | 1 + 11 files changed, 137 insertions(+), 21 deletions(-) diff --git a/extension/chrome/elements/pgp_block.ts b/extension/chrome/elements/pgp_block.ts index 6df44507c78..50a9bee787d 100644 --- a/extension/chrome/elements/pgp_block.ts +++ b/extension/chrome/elements/pgp_block.ts @@ -71,10 +71,10 @@ export class PgpBlockView extends View { this.renderModule.renderEncryptionStatus(data.renderEncryptionStatus); } if (data?.renderVerificationInProgress) { - $('#pgp_signature').addClass('gray_label').text('verifying signature...'); + $('#pgp_signature').removeClass('green_label red_label').addClass('gray_label').text('verifying signature...'); } if (data?.renderSignatureStatus) { - this.renderModule.renderSignatureStatus(data.renderSignatureStatus); // todo: "offline"->click->reload? + this.renderModule.renderSignatureStatus(data.renderSignatureStatus); } if (data?.renderText) { this.renderModule.renderText(data.renderText); @@ -114,6 +114,9 @@ export class PgpBlockView extends View { if (data?.renderAsRegularContent) { this.renderModule.renderAsRegularContent(data.renderAsRegularContent); } + if (data?.renderSignatureOffline) { + this.renderModule.renderSignatureOffline(); + } }; } 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 de4c7934676..6552ab06b2d 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 @@ -126,4 +126,11 @@ export class PgpBlockViewRenderModule { .addClass(status === 'signed' ? 'green_label' : 'red_label') .text(status); }; + + public renderSignatureOffline = () => { + this.renderSignatureStatus('error verifying signature: offline, click to retry').on( + 'click', + this.view.setHandler(() => window.parent.postMessage({ retry: this.view.frameId }, '*')) + ); + }; } diff --git a/extension/chrome/settings/inbox/inbox.ts b/extension/chrome/settings/inbox/inbox.ts index e1914fb800a..32beb7fe5ac 100644 --- a/extension/chrome/settings/inbox/inbox.ts +++ b/extension/chrome/settings/inbox/inbox.ts @@ -64,8 +64,8 @@ export class InboxView extends View { this.inboxActiveThreadModule = new InboxActiveThreadModule(this); this.inboxListThreadsModule = new InboxListThreadsModule(this); window.addEventListener('message', e => { - if (e.origin === Env.getExtensionOrigin() && typeof e.data?.readyToReceive === 'string') { - this.relayManager.readyToReceive(e.data.readyToReceive); + if (e.origin === Env.getExtensionOrigin()) { + this.relayManager.handleMessageFromFrame(e.data); } }); } diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index b6761071b0b..633cfb4a244 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -152,7 +152,29 @@ export class MessageRenderer { renderModule.renderSignatureStatus('signed'); } else if (retryVerification) { renderModule.renderVerificationInProgress(); - await MessageRenderer.renderPgpSignatureCheckResult(renderModule, (await retryVerification()) ?? verifyRes, wasSignerEmailSupplied, undefined); + let retryVerificationAgain: (() => Promise) | undefined; + try { + verifyRes = (await retryVerification()) ?? verifyRes; // [fetch pubkeys] and verify again + } catch (e) { + if (ApiErr.isSignificant(e)) { + Catch.reportErr(e); + renderModule.renderSignatureStatus(`error verifying signature: ${e}`); + return; + } else { + const continuationPromise = new Promise(resolve => renderModule.renderSignatureOffline(resolve)); + // todo: we can make a helper method to await a Promise or a cancellation flag, + // but we'd better make `cancel` a Promise as well + const createTimeoutPromise = () => + new Promise<'timeout'>(resolve => { + Catch.setHandledTimeout(() => resolve('timeout'), 1000); + }); + while ((await Promise.race([continuationPromise, createTimeoutPromise()])) === 'timeout') { + if (renderModule.cancellation.cancel) return; + } + retryVerificationAgain = retryVerification; + } + } + await MessageRenderer.renderPgpSignatureCheckResult(renderModule, verifyRes, wasSignerEmailSupplied, retryVerificationAgain); return; } else if (!wasSignerEmailSupplied) { // todo: unit-test this case? @@ -520,7 +542,7 @@ export class MessageRenderer { senderEmail: string | undefined, cb: (renderModule: RenderInterface, frameId: string) => Promise<{ publicKeys?: string[]; needPassphrase?: string[] }> ): Promise<{ processor: Promise }> => { - const { renderModule, cancellation } = relayManager.createRelay(frameId); + const renderModule = relayManager.createRelay(frameId); if (printMailInfo) { renderModule.setPrintMailInfo(printMailInfo); } @@ -531,15 +553,15 @@ export class MessageRenderer { for (const armoredPubkey of result.publicKeys ?? []) { appendAfter.after(factory.embeddedPubkey(armoredPubkey, this.isOutgoing(senderEmail))); } - while (result.needPassphrase && !cancellation.cancel) { + while (result.needPassphrase && !renderModule.cancellation.cancel) { // if we need passphrase, we have to be able to re-try decryption indefinitely on button presses, // so we can only release resources when the frame is detached - await PassphraseStore.waitUntilPassphraseChanged(this.acctEmail, result.needPassphrase, 1000, cancellation); - if (cancellation.cancel) { + await PassphraseStore.waitUntilPassphraseChanged(this.acctEmail, result.needPassphrase, 1000, renderModule.cancellation); + if (renderModule.cancellation.cancel) { if (this.debug) { console.debug('Destination frame was detached -- stopping processing'); } - break; + return; } renderModule.clearErrorStatus(); renderModule.renderText('Decrypting...'); @@ -600,6 +622,9 @@ export class MessageRenderer { this.getRetryVerification(signerEmail, verify) ); } catch (e) { + // todo: network errors shouldn't pass to this point + // so an exception here would be an unexpected failure, + // need to handle it properly console.log(e); } } diff --git a/extension/js/common/relay-manager.ts b/extension/js/common/relay-manager.ts index 8c0a3a5c501..a92dfbcff9a 100644 --- a/extension/js/common/relay-manager.ts +++ b/extension/js/common/relay-manager.ts @@ -3,7 +3,6 @@ 'use strict'; import { Bm, BrowserMsg } from './browser/browser-msg.js'; -import { PromiseCancellation } from './core/common.js'; import { RelayManagerInterface } from './relay-manager-interface.js'; import { RenderInterface } from './render-interface.js'; import { RenderMessage } from './render-message.js'; @@ -12,8 +11,8 @@ import { RenderRelay } from './render-relay.js'; type FrameEntry = { readyToReceive?: true; queue: RenderMessage[]; - cancellation: PromiseCancellation; progressText?: string; + relay?: RenderRelay; }; export class RelayManager implements RelayManagerInterface { @@ -52,19 +51,25 @@ export class RelayManager implements RelayManagerInterface { } }; - public createRelay = (frameId: string): { renderModule: RenderInterface; cancellation: PromiseCancellation } => { + public createRelay = (frameId: string): RenderInterface => { const frameData = this.getOrCreate(frameId); - return { renderModule: new RenderRelay(this, frameId), cancellation: frameData.cancellation }; + const relay = new RenderRelay(this, frameId); + frameData.relay = relay; + return relay; }; public done = (frameId: string) => { this.relay(frameId, RelayManager.completionMessage); }; - public readyToReceive = (frameId: string) => { - const frameData = this.getOrCreate(frameId); - frameData.readyToReceive = true; - this.flush({ frameId, queue: frameData.queue }); + public handleMessageFromFrame = (data: unknown) => { + const typedData = data as { readyToReceive?: string; retry?: string } | undefined; + if (typeof typedData?.readyToReceive === 'string') { + this.readyToReceive(typedData.readyToReceive); + } + if (typeof typedData?.retry === 'string') { + this.retry(typedData.retry); + } }; public renderProgressText = (frameId: string, text: string) => { @@ -99,7 +104,7 @@ export class RelayManager implements RelayManagerInterface { } const frameData = this.frames.get(frameId); if (frameData) { - frameData.cancellation.cancel = true; + if (frameData.relay?.cancellation) frameData.relay.cancellation.cancel = true; this.frames.delete(frameId); } } else { @@ -131,4 +136,15 @@ export class RelayManager implements RelayManagerInterface { } else break; } }; + + private readyToReceive = (frameId: string) => { + const frameData = this.getOrCreate(frameId); + frameData.readyToReceive = true; + this.flush({ frameId, queue: frameData.queue }); + }; + + private retry = (frameId: string) => { + const frameData = this.frames.get(frameId); + frameData?.relay?.executeRetry(); + }; } diff --git a/extension/js/common/render-interface.ts b/extension/js/common/render-interface.ts index 5e80e5f0368..01d6373b628 100644 --- a/extension/js/common/render-interface.ts +++ b/extension/js/common/render-interface.ts @@ -3,6 +3,7 @@ 'use strict'; import { TransferableAttachment } from './core/attachment.js'; +import { PromiseCancellation } from './core/common.js'; import { PrintMailInfo } from './render-message.js'; export interface RenderInterfaceBase { @@ -14,6 +15,7 @@ export interface RenderInterfaceBase { } export interface RenderInterface extends RenderInterfaceBase { + cancellation: PromiseCancellation; renderAsRegularContent(content: string): void; setPrintMailInfo(info: PrintMailInfo): void; clearErrorStatus(): void; @@ -22,4 +24,5 @@ export interface RenderInterface extends RenderInterfaceBase { renderInnerAttachments(attachments: TransferableAttachment[], isEncrypted: boolean): void; separateQuotedContentAndRenderText(decryptedContent: string, isHtml: boolean): void; renderVerificationInProgress(): void; + renderSignatureOffline(retry: () => void): void; } diff --git a/extension/js/common/render-message.ts b/extension/js/common/render-message.ts index 230a3ba2590..a009b5faea6 100644 --- a/extension/js/common/render-message.ts +++ b/extension/js/common/render-message.ts @@ -35,6 +35,7 @@ export type RenderMessage = { renderPassphraseNeeded?: string[]; // longids renderErr?: { errBoxContent: string; renderRawMsg: string | undefined; errMsg?: string }; clearErrorStatus?: true; + renderSignatureOffline?: true; printMailInfo?: PrintMailInfo; renderAsRegularContent?: string; }; diff --git a/extension/js/common/render-relay.ts b/extension/js/common/render-relay.ts index a27b2532cf6..a03481ae02b 100644 --- a/extension/js/common/render-relay.ts +++ b/extension/js/common/render-relay.ts @@ -6,8 +6,11 @@ import { RelayManagerInterface } from './relay-manager-interface.js'; import { RenderInterface } from './render-interface.js'; import { PrintMailInfo, RenderMessage } from './render-message.js'; import { TransferableAttachment } from './core/attachment.js'; +import { PromiseCancellation } from './core/common.js'; export class RenderRelay implements RenderInterface { + public readonly cancellation: PromiseCancellation = { cancel: false }; + private retry?: () => void; public constructor(private relayManager: RelayManagerInterface, private frameId: string) {} public renderErr = (errBoxContent: string, renderRawMsg: string | undefined, errMsg?: string | undefined) => { @@ -62,6 +65,19 @@ export class RenderRelay implements RenderInterface { this.relay({ renderAsRegularContent: content }); }; + public renderSignatureOffline = (retry: () => void) => { + this.retry = retry; + this.relay({ renderSignatureOffline: true }); + }; + + public executeRetry = () => { + const retry = this.retry; + if (retry) { + this.retry = undefined; + retry(); + } + }; + private relay = (message: RenderMessage) => { this.relayManager.relay(this.frameId, message); }; diff --git a/extension/js/content_scripts/webmail/setup-webmail-content-script.ts b/extension/js/content_scripts/webmail/setup-webmail-content-script.ts index 826d3100939..611f359bcf3 100644 --- a/extension/js/content_scripts/webmail/setup-webmail-content-script.ts +++ b/extension/js/content_scripts/webmail/setup-webmail-content-script.ts @@ -431,8 +431,8 @@ export const contentScriptSetupIfVacant = async (webmailSpecific: WebmailSpecifi Catch.try(() => notifyExpiringKeys(acctEmail, clientConfiguration, notifications)) ); window.addEventListener('message', e => { - if (e.origin === Env.getExtensionOrigin() && typeof e.data?.readyToReceive === 'string') { - relayManager.readyToReceive(e.data.readyToReceive); + if (e.origin === Env.getExtensionOrigin()) { + relayManager.handleMessageFromFrame(e.data); } }); await webmailSpecific.start(acctEmail, clientConfiguration, inject, notifications, factory, notifyMurdered, relayManager); diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index 03d5458a03d..666bc44b7bf 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -1111,6 +1111,50 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== }) ); + test( + 'decrypt - timeout when looking up pubkey - inbox', + testWithBrowser(async (t, browser) => { + const { acctEmail } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'compatibility'); + t.mockApi!.configProvider!.config.attester!.pubkeyLookup!['some.sender@test.com'] = { + returnError: new HttpClientErr('RequestTimeout', Status.BAD_REQUEST), + }; + const msgId = '17dad75e63e47f97'; + const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${msgId}`); + const pgpFrame = await inboxPage.getFrame(['pgp_block.htm']); + await pgpFrame.waitForContent('@pgp-signature', 'error verifying signature: offline, click to retry'); + t.mockApi!.configProvider!.config.attester!.pubkeyLookup!['some.sender@test.com'] = { pubkey: await get203FAE7076005381() }; + await pgpFrame.waitAndClick('@pgp-signature'); + await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame(['pgp_block.htm']), { + content: ['1234'], + encryption: 'not encrypted', + signature: 'signed', + }); + await inboxPage.close(); + }) + ); + + test( + 'decrypt - timeout when looking up pubkey - gmail', + testWithBrowser(async (t, browser) => { + const { authHdr } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'compatibility'); + t.mockApi!.configProvider!.config.attester!.pubkeyLookup!['some.sender@test.com'] = { + returnError: new HttpClientErr('RequestTimeout', Status.BAD_REQUEST), + }; + const msgId = '17dad75e63e47f97'; + const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${msgId}`, undefined, authHdr); + const pgpFrame = await gmailPage.getFrame(['pgp_block.htm']); + await pgpFrame.waitForContent('@pgp-signature', 'error verifying signature: offline, click to retry'); + t.mockApi!.configProvider!.config.attester!.pubkeyLookup!['some.sender@test.com'] = { pubkey: await get203FAE7076005381() }; + await pgpFrame.waitAndClick('@pgp-signature'); + await BrowserRecipe.pgpBlockCheck(t, await gmailPage.getFrame(['pgp_block.htm']), { + content: ['1234'], + encryption: 'not encrypted', + signature: 'signed', + }); + await gmailPage.close(); + }) + ); + test( 'verification - message text is rendered prior to pubkey fetching', testWithBrowser(async (t, browser) => { diff --git a/test/source/tests/tooling/browser-recipe.ts b/test/source/tests/tooling/browser-recipe.ts index fca385fd218..f95655b6a4a 100644 --- a/test/source/tests/tooling/browser-recipe.ts +++ b/test/source/tests/tooling/browser-recipe.ts @@ -256,6 +256,7 @@ export class BrowserRecipe { const sigBadgeContent = await pgpBlockPage.read('@pgp-signature'); const encBadgeContent = await pgpBlockPage.read('@pgp-encryption'); if (m.signature) { + // todo: check color, 'signed' should have 'green_label' class without 'red_label', others should have 'red_label' class if (sigBadgeContent !== m.signature) { t.log(`found sig content:${sigBadgeContent}`); throw new Error(`pgp_block_verify_decrypted_content:missing expected signature content:${m.signature}\nactual sig content:${sigBadgeContent}`); From 9bc7ed10fbad82595343a5be475d451f9e89edd1 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 5 Jun 2023 16:46:03 +0100 Subject: [PATCH 120/147] OR short-circuit fix --- .../settings/inbox/inbox-modules/inbox-active-thread-module.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts index 6107e857bed..6ee745f3444 100644 --- a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts +++ b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts @@ -64,7 +64,8 @@ export class InboxActiveThreadModule extends ViewModule { this.view.displayBlock('thread', Xss.escape(subject)); let threadHasPgpBlock = false; for (const m of thread.messages) { - threadHasPgpBlock ||= await this.renderMsg(m); + const pgpFlag = await this.renderMsg(m); + threadHasPgpBlock ||= pgpFlag; } if (threadHasPgpBlock || this.view.showOriginal) { $('.action_see_original_message').css('display', 'inline-block'); From 1137d17a71ab459f885ad2019641a76c0ffe256e Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 5 Jun 2023 19:08:41 +0100 Subject: [PATCH 121/147] tidying up, comments --- .../inbox-modules/inbox-active-thread-module.ts | 2 +- extension/js/common/core/attachment.ts | 10 ++++++---- extension/js/common/downloader.ts | 2 +- extension/js/common/loader-context-interface.ts | 3 --- extension/js/common/message-renderer.ts | 12 ++++++------ .../webmail/gmail-element-replacer.ts | 1 - .../js/content_scripts/webmail/loader-context.ts | 2 +- 7 files changed, 15 insertions(+), 17 deletions(-) diff --git a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts index 6ee745f3444..de8a2a4e1e4 100644 --- a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts +++ b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts @@ -21,7 +21,7 @@ import { Attachment } from '../../../../js/common/core/attachment.js'; import { LoaderContextInterface } from '../../../../js/common/loader-context-interface.js'; class LoaderContext implements LoaderContextInterface { - public constructor(public readonly factory: XssSafeFactory, public renderedMessageXssSafe: string | undefined, public renderedAttachments: string[]) {} + public constructor(private readonly factory: XssSafeFactory, public renderedMessageXssSafe: string | undefined, public renderedAttachments: string[]) {} public renderPlainAttachment = (a: Attachment) => { // todo: render error argument diff --git a/extension/js/common/core/attachment.ts b/extension/js/common/core/attachment.ts index db73adb6bea..e5c663bcce0 100644 --- a/extension/js/common/core/attachment.ts +++ b/extension/js/common/core/attachment.ts @@ -18,13 +18,13 @@ export type Attachment$treatAs = | 'needChunk' | 'maybePgp'; type ContentTransferEncoding = '7bit' | 'quoted-printable' | 'base64'; -export type AttachmentId = { id: string; msgId: string } | { url: string }; +export type AttachmentId = { id: string; msgId: string } | { url: string }; // a way to extract data export type AttachmentProperties = { - length?: number; - name?: string; type?: string; - treatAs?: Attachment$treatAs; + name?: string; + length?: number; inline?: boolean; + treatAs?: Attachment$treatAs; cid?: string; contentDescription?: string; contentTransferEncoding?: ContentTransferEncoding; @@ -36,6 +36,8 @@ export type FcAttachmentLinkData = { name: string; type: string; size: number }; export type TransferableAttachment = (AttachmentId | { data: /* base64 see #2587 */ string }) & AttachmentProperties; export class Attachment { + // Regex to trigger message download and processing based on attachment file names + // todo: it'd be better to compile this regex based on the data we have in `treatAs` method public static readonly webmailNamePattern = /^(((cryptup|flowcrypt)-backup-[a-z0-9]+\.(key|asc))|(.+\.pgp)|(.+\.gpg)|(.+\.asc)|(OpenPGP_signature(.asc)?)|(noname)|(message)|(PGPMIME version identification)|(ATT[0-9]{5})|())$/m; public static readonly encryptedMsgNames = ['msg.asc', 'message.asc', 'encrypted.asc', 'encrypted.eml.pgp', 'Message.pgp', 'openpgp-encrypted-message.asc']; diff --git a/extension/js/common/downloader.ts b/extension/js/common/downloader.ts index 1ae4500168e..e1155b3f1b4 100644 --- a/extension/js/common/downloader.ts +++ b/extension/js/common/downloader.ts @@ -19,7 +19,7 @@ export type ProcessedMessage = { export interface MessageCacheEntry { download: { full: Promise; raw?: Promise }; - processedFull?: ProcessedMessage; + processed?: ProcessedMessage; } export class Downloader { diff --git a/extension/js/common/loader-context-interface.ts b/extension/js/common/loader-context-interface.ts index 1b4a8f294a0..309c962f921 100644 --- a/extension/js/common/loader-context-interface.ts +++ b/extension/js/common/loader-context-interface.ts @@ -3,13 +3,10 @@ 'use strict'; import { Attachment } from './core/attachment.js'; -import { XssSafeFactory } from './xss-safe-factory.js'; export type JQueryEl = JQuery; export interface LoaderContextInterface { - readonly factory: XssSafeFactory; - renderPlainAttachment(a: Attachment, attachmentEl?: JQueryEl, error?: string): void; // prependAttachments is used to render encrypted attachment prepending AttachmentContainerInner diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index 633cfb4a244..af9ff8c2931 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -362,8 +362,8 @@ export class MessageRenderer { public msgGetProcessed = async (msgId: string): Promise => { // todo: retries? exceptions? const msgDownload = this.downloader.msgGetCached(msgId); - if (msgDownload.processedFull) { - return msgDownload.processedFull; + if (msgDownload.processed) { + return msgDownload.processed; } const fullMsg = await msgDownload.download.full; const { body, attachments } = MessageRenderer.getMessageBodyAndAttachments(fullMsg); @@ -384,13 +384,13 @@ export class MessageRenderer { // todo: queue full attachment download, when the cache is implemented? } } - msgDownload.processedFull = { + msgDownload.processed = { isBodyEmpty, blocks, messageInfo: await this.getMessageInfo(fullMsg), attachments, }; - return msgDownload.processedFull; + return msgDownload.processed; }; public deleteExpired = (): void => { @@ -706,9 +706,9 @@ export class MessageRenderer { senderEmail: string | undefined, cb: (renderModule: RenderInterface, frameId: string) => Promise<{ publicKeys?: string[] }> ): Promise<{ processor: Promise }> => { - const { frameId, frameXssSafe } = loaderContext.factory.embeddedMsg(type); + const { frameId, frameXssSafe } = this.factory.embeddedMsg(type); loaderContext.setMsgBody(frameXssSafe, 'set'); - return await this.relayAndStartProcessing(this.relayManager, loaderContext.factory, frameId, printMailInfo, senderEmail, cb); + return await this.relayAndStartProcessing(this.relayManager, this.factory, frameId, printMailInfo, senderEmail, cb); }; private processCryptoMessage = async ( diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index 4098e28f1f2..860f48ce8e0 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -32,7 +32,6 @@ export class GmailElementReplacer implements WebmailElementReplacer { private debug = false; private recipientHasPgpCache: Dict = {}; - // private attachmentDownloads: { attachment: Attachment; result: Promise }[] = []; private pubLookup: PubLookup; private webmailCommon: WebmailCommon; private currentlyEvaluatingStandardComposeBoxRecipients = false; diff --git a/extension/js/content_scripts/webmail/loader-context.ts b/extension/js/content_scripts/webmail/loader-context.ts index 155d6fc00d2..b258c7a3cf9 100644 --- a/extension/js/content_scripts/webmail/loader-context.ts +++ b/extension/js/content_scripts/webmail/loader-context.ts @@ -7,7 +7,7 @@ import { JQueryEl, LoaderContextInterface } from '../../common/loader-context-in import { XssSafeFactory } from '../../common/xss-safe-factory.js'; export class LoaderContextWebmail implements LoaderContextInterface { - public constructor(public readonly factory: XssSafeFactory, public msgEl: JQueryEl, private readonly attachmentsContainerInner: JQueryEl) {} + public constructor(private readonly factory: XssSafeFactory, public msgEl: JQueryEl, private readonly attachmentsContainerInner: JQueryEl) {} /* eslint-disable @typescript-eslint/naming-convention */ /** From 8b0f4efec87ad31fa94f3c3a46ca7fd82f0a26aa Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 6 Jun 2023 11:51:12 +0100 Subject: [PATCH 122/147] more tests --- test/source/tests/decrypt.ts | 79 ++++++++++++++++++++---------------- 1 file changed, 44 insertions(+), 35 deletions(-) diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index e3aace8ed22..59402db32d9 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -19,6 +19,7 @@ import { singlePubKeyAttesterConfig, } from '../mock/attester/attester-key-constants'; import { ConfigurationProvider, HttpClientErr, Status } from '../mock/lib/api'; +import { ControllablePage } from '../browser'; export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: TestWithBrowser) => { if (testVariant !== 'CONSUMER-LIVE-GMAIL') { @@ -144,20 +145,23 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te test( `decrypt - parsed encrypted message signed with signature.asc inline attachment`, testWithBrowser(async (t, browser) => { - const threadId = '187ebe3cd1fae41e'; - const { acctEmail } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'compatibility'); - const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); + const msgId = '187ebe3cd1fae41e'; + const { acctEmail, authHdr } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'compatibility'); + const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${msgId}`); await inboxPage.waitForSelTestState('ready'); await inboxPage.waitAll('iframe'); const pgpBlock = await inboxPage.getFrame(['pgp_block.htm']); - await BrowserRecipe.pgpBlockCheck(t, pgpBlock, { + const expectedMessage = { encryption: 'encrypted', signature: 'signed', content: ['Check signature'], - }); + }; + await BrowserRecipe.pgpBlockCheck(t, pgpBlock, expectedMessage); expect(await inboxPage.isElementPresent('@container-attachments')).to.equal(false); await inboxPage.close(); - // todo: test mock gmail + const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${msgId}`, undefined, authHdr); + await BrowserRecipe.pgpBlockCheck(t, await gmailPage.getFrame(['pgp_block.htm']), expectedMessage); + await gmailPage.notPresent('.aV3'); }) ); @@ -1017,35 +1021,40 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== test( "decrypt - thunderbird - signedHtml verifyDetached doesn't duplicate PGP key section", testWithBrowser(async (t, browser) => { - const threadId = '17daefa0eb077da6'; - const { acctEmail } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'compatibility'); - const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); + const msgId = '17daefa0eb077da6'; + const { acctEmail, authHdr } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'compatibility'); + const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${msgId}`); await inboxPage.waitAll('iframe'); - const pgpBlock = await inboxPage.getFrame(['pgp_block.htm']); - await pgpBlock.waitForSelTestState('ready'); - const urls = await inboxPage.getFramesUrls(['pgp_pubkey.htm'], { sleep: 3 }); - expect(urls.length).to.be.lessThan(2); - // todo: mock gmail page + await (await inboxPage.getFrame(['pgp_block.htm'])).waitForSelTestState('ready'); + expect(await inboxPage.getFramesUrls(['pgp_pubkey.htm'], { sleep: 3 })).length.to.be.lessThan(2); + await inboxPage.close(); + const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${msgId}`, undefined, authHdr); + await (await gmailPage.getFrame(['pgp_block.htm'])).waitForSelTestState('ready'); + expect(await gmailPage.getFramesUrls(['pgp_pubkey.htm'], { sleep: 3 })).length.to.be.lessThan(2); }) ); test( 'decrypt - print feature in pgp block', testWithBrowser(async (t, browser) => { - const threadId = '182917712be838e1'; - const { acctEmail } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'compatibility'); - // todo: test mock gmail page - const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); - await inboxPage.waitAll('iframe'); - const pgpBlock = await inboxPage.getFrame(['pgp_block.htm']); - await pgpBlock.waitForSelTestState('ready'); - const printPage = await browser.newPageTriggeredBy(t, () => pgpBlock.click('@action-print')); - await printPage.waitForContent('@print-user-email', 'First Last '); - await printPage.waitForContent('@print-subject', 'Test print dialog'); - await printPage.waitForContent('@print-from', 'From: sender@domain.com'); - await printPage.waitForContent('@print-to', 'To: flowcrypt.compatibility@gmail.com'); - await printPage.waitForContent('@print-cc', 'ci.tests.gmail@flowcrypt.dev'); - await printPage.waitForContent('@print-content', 'Test print message'); + const msgId = '182917712be838e1'; + const testPrintBlockInPage = async (page: ControllablePage) => { + await page.waitAll('iframe'); + const pgpBlock = await page.getFrame(['pgp_block.htm']); + await pgpBlock.waitForSelTestState('ready'); + const printPage = await browser.newPageTriggeredBy(t, () => pgpBlock.click('@action-print')); + await printPage.waitForContent('@print-user-email', 'First Last '); + await printPage.waitForContent('@print-subject', 'Test print dialog'); + await printPage.waitForContent('@print-from', 'From: sender@domain.com'); + await printPage.waitForContent('@print-to', 'To: flowcrypt.compatibility@gmail.com'); + await printPage.waitForContent('@print-cc', 'ci.tests.gmail@flowcrypt.dev'); + await printPage.waitForContent('@print-content', 'Test print message'); + await printPage.close(); + await page.close(); + }; + const { acctEmail, authHdr } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'compatibility'); + await testPrintBlockInPage(await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${msgId}`)); + await testPrintBlockInPage(await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${msgId}`, undefined, authHdr)); }) ); @@ -1195,7 +1204,6 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== signature: 'signed', }); expect(await inboxPage.read('@message-line')).to.not.include('1234'); - // todo: check gmail mock }) ); test( @@ -1269,21 +1277,24 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== test( 'signature - sender is different from pubkey uid', testWithBrowser(async (t, browser) => { - const { acctEmail } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'ci.tests.gmail'); + const { acctEmail, authHdr } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'ci.tests.gmail'); t.mockApi!.configProvider!.config.attester!.pubkeyLookup!['sender@example.com'] = { pubkey: testConstants.pubkey2864E326A5BE488A, }; const threadId = '1766644f13510f58'; - // todo: test with gmail mock page const inboxPage = await browser.newExtensionPage(t, `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); - await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame(['pgp_block.htm']), { + const expectedMessage = { content: ['How is my message signed?'], encryption: 'not encrypted', signature: 'signed', - }); + }; + await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame(['pgp_block.htm']), expectedMessage); + await inboxPage.close(); + const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${threadId}`, undefined, authHdr); + await BrowserRecipe.pgpBlockCheck(t, await gmailPage.getFrame(['pgp_block.htm']), expectedMessage); }) ); @@ -1792,7 +1803,6 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== await inboxPage.close(); const inboxPage2 = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId2}`); const pgpBlockPage2 = await inboxPage2.getFrame(['pgp_block.htm']); - // todo: glitch? it shows "not encrypted" and "not signed" await pgpBlockPage2.waitAndClick('@download-attachment-0'); // check warning modal for inline signed attachment on FlowCrypt web extension page const downloadedFile3 = await inboxPage2.awaitDownloadTriggeredByClicking(() => @@ -1829,7 +1839,6 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== await gmailPage.close(); const gmailPage2 = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${threadId2}`, undefined, authHdr); const pgpBlockPage4 = await gmailPage2.getFrame(['pgp_block.htm']); - // todo: glitch? it shows "not encrypted" and "not signed" await pgpBlockPage4.waitAndClick('@download-attachment-0'); // check warning modal for inline signed attachment test on Gmail page const downloadedFile6 = await gmailPage2.awaitDownloadTriggeredByClicking(() => From 4cb74a4e52646444fd315f42c22bc454c80efe96 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 6 Jun 2023 11:52:18 +0100 Subject: [PATCH 123/147] comment --- extension/chrome/elements/pgp_block.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extension/chrome/elements/pgp_block.ts b/extension/chrome/elements/pgp_block.ts index 50a9bee787d..79ed3dc844a 100644 --- a/extension/chrome/elements/pgp_block.ts +++ b/extension/chrome/elements/pgp_block.ts @@ -66,7 +66,7 @@ export class PgpBlockView extends View { }; private processMessage = (data: RenderMessage) => { - // todo: order better + // messages aren't merged when queueing, so the order is arbitrary if (data?.renderEncryptionStatus) { this.renderModule.renderEncryptionStatus(data.renderEncryptionStatus); } From 98dcad67f8f938f3e61b6c590f0577e5dc607294 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 6 Jun 2023 13:41:41 +0100 Subject: [PATCH 124/147] comments and refactoring --- extension/js/common/core/attachment.ts | 1 - .../webmail/gmail-element-replacer.ts | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/extension/js/common/core/attachment.ts b/extension/js/common/core/attachment.ts index e5c663bcce0..bd62891acc7 100644 --- a/extension/js/common/core/attachment.ts +++ b/extension/js/common/core/attachment.ts @@ -207,7 +207,6 @@ export class Attachment { // && !Attachment.encryptedMsgNames.includes(this.name) -- already checked above const isAmbiguousAscFile = /\.asc$/.test(this.name); // ambiguous .asc name const isAmbiguousNonameFile = !this.name || this.name === 'noname'; // may not even be OpenPGP related - // todo: do we know length before fetching? if (!this.inline && this.length < 100000 && (isAmbiguousAscFile || isAmbiguousNonameFile)) { return this.hasData() ? 'maybePgp' : 'needChunk'; } diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index 860f48ce8e0..418d3c793cb 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -415,14 +415,14 @@ export class GmailElementReplacer implements WebmailElementReplacer { private processAttachments = async ( msgId: string, - attachmentMetas: Attachment[], // todo: these are not Metas! + attachments: Attachment[], attachmentsContainerInner: JQueryEl, messageInfo: MessageInfo, isBodyEmpty: boolean, skipGoogleDrive: boolean ) => { if (this.debug) { - console.debug('processAttachments()', attachmentMetas); + console.debug('processAttachments()', attachments); } const msgEl = this.getMsgBodyEl(msgId); if (!messageInfo.from?.email) { @@ -431,8 +431,8 @@ export class GmailElementReplacer implements WebmailElementReplacer { const loaderContext = new LoaderContextWebmail(this.factory, msgEl, attachmentsContainerInner); attachmentsContainerInner = $(attachmentsContainerInner); attachmentsContainerInner.parent().find(this.sel.numberOfAttachments).hide(); - let nRenderedAttachments = attachmentMetas.length; - for (const a of attachmentMetas) { + let nRenderedAttachments = attachments.length; + for (const a of attachments) { const attachmentSel = this.filterAttachments( attachmentsContainerInner.children().not('.attachment_processed'), new RegExp(`^${Str.regexEscape(a.name || 'noname')}$`) @@ -440,7 +440,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { // todo: shouldn't call `treatAs` in too many places ? const renderStatus = await this.messageRenderer.processAttachment( a, - a.treatAs(attachmentMetas, isBodyEmpty), + a.treatAs(attachments, isBodyEmpty), loaderContext, attachmentSel, msgId, @@ -451,7 +451,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { } // if (renderStatus === 'shown') attachmentSel.show(); } - if (nRenderedAttachments !== attachmentMetas.length) { + if (nRenderedAttachments !== attachments.length) { // according to #4200, no point in showing "download all" button if at least one attachment is encrypted etc. $(this.sel.attachmentsButtons).hide(); } From 7c59e2d201b24748e333724c3cbeff585cbc6d46 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 7 Jun 2023 21:21:07 +0100 Subject: [PATCH 125/147] removed failed chunk download from cache --- extension/js/common/downloader.ts | 9 +++++++ extension/js/common/message-renderer.ts | 17 +++++++----- test/source/mock/google/google-endpoints.ts | 3 +++ test/source/test.ts | 6 +++++ test/source/tests/decrypt.ts | 29 +++++++++++++++++++++ 5 files changed, 57 insertions(+), 7 deletions(-) diff --git a/extension/js/common/downloader.ts b/extension/js/common/downloader.ts index e1155b3f1b4..fb6e4e5c744 100644 --- a/extension/js/common/downloader.ts +++ b/extension/js/common/downloader.ts @@ -48,6 +48,15 @@ export class Downloader { return { result: download }; }; + public waitForAttachmentChunkDownload = async (a: Attachment) => { + if (a.hasData()) return a.getData(); + return this.queueAttachmentChunkDownload(a).result.catch(e => { + // remove from cache immediately + this.chunkDownloads.set(a, undefined); + return Promise.reject(e); + }); + }; + public msgGetCached = (msgId: string): MessageCacheEntry => { // todo: retries? exceptions? let msgDownload = this.messages.get(msgId); diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index af9ff8c2931..7d923a8938d 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -30,7 +30,7 @@ import * as DOMPurify from 'dompurify'; import { Downloader, ProcessedMessage } from './downloader.js'; import { JQueryEl, LoaderContextInterface } from './loader-context-interface.js'; import { Gmail } from './api/email-provider/gmail/gmail.js'; -import { ApiErr, AjaxErr } from './api/shared/api-error.js'; +import { ApiErr } from './api/shared/api-error.js'; import { isCustomerUrlFesUsed } from './helpers.js'; export type ProccesedMsg = MimeProccesedMsg; @@ -284,10 +284,10 @@ export class MessageRenderer { if (this.debug) { console.debug('processAttachment() try -> awaiting chunk + awaiting type'); } - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - const data = await this.downloader.queueAttachmentChunkDownload(a).result; + const data = await this.downloader.waitForAttachmentChunkDownload(a); const openpgpType = MsgUtil.type({ data }); if (openpgpType && openpgpType.type === 'publicKey' && openpgpType.armored) { + // todo: how can we have a single helper method? and convert unarmored pubkey to armored if needed // if it looks like OpenPGP public key treatAs = 'publicKey'; } else if (openpgpType && ['encryptedMsg', 'signedMsg'].includes(openpgpType.type)) { @@ -338,7 +338,7 @@ export class MessageRenderer { return 'shown'; } } catch (e) { - if (!ApiErr.isSignificant(e) || (e instanceof AjaxErr && e.status === 200)) { + if (ApiErr.isNetErr(e)) { loaderContext.renderPlainAttachment(a, attachmentSel, 'Categorize: net err'); return 'shown'; } else { @@ -757,11 +757,14 @@ export class MessageRenderer { loaderContext.renderPlainAttachment(attachment, attachmentSel, 'Please reload page'); return 'shown'; } - const openpgpType = MsgUtil.type({ data: attachment.getData().subarray(0, 1000) }); + const data = attachment.getData(); + const openpgpType = MsgUtil.type({ data }); if (openpgpType?.type === 'publicKey') { - loaderContext.setMsgBody(this.factory.embeddedPubkey(attachment.getData().toUtfStr(), isOutgoing), 'after'); + // todo: do we need to armor if not openpgpType.armored? + loaderContext.setMsgBody(this.factory.embeddedPubkey(data.toUtfStr(), isOutgoing), 'after'); return 'hidden'; - } else if (openpgpType?.type !== 'encryptedAttachment') { + } else if (openpgpType && ['signedMsg', 'encryptedMsg'].includes(openpgpType.type)) { + // todo: think about moving this fallback to the upper-level handler somehow loaderContext.renderPlainAttachment(attachment, attachmentSel, 'Unknown Public Key Format'); return 'shown'; } else { diff --git a/test/source/mock/google/google-endpoints.ts b/test/source/mock/google/google-endpoints.ts index 5b11e4fb24f..9fb40beabfe 100644 --- a/test/source/mock/google/google-endpoints.ts +++ b/test/source/mock/google/google-endpoints.ts @@ -60,6 +60,7 @@ export interface GoogleConfig { othercontacts?: string[]; aliases?: Dict; getMsg?: Dict>; + getAttachment?: Dict; htmlRenderer?: (msgId: string, prerendered?: string) => string | undefined; } @@ -220,6 +221,8 @@ export const getMockGoogleEndpoints = (oauth: OauthMock, config: GoogleConfig | } const data = await GoogleData.withInitializedData(acct); if (req.url?.includes('/attachments/')) { + const foundAttError = config?.getAttachment?.[id]; + if (foundAttError) throw foundAttError; const attachment = data.getAttachment(id); if (attachment) { return { data: attachment.data }; // Note: data (or quoted) field must be last in serialized JSON diff --git a/test/source/test.ts b/test/source/test.ts index 2d6ce922e0a..6b48e070cbe 100644 --- a/test/source/test.ts +++ b/test/source/test.ts @@ -152,6 +152,12 @@ test.after.always('evaluate Catch.reportErr errors', async t => { e.message !== 'Some keys could not be parsed' && !e.message.match(/BrowserMsg\(ajax\) Bad Request: 400 when GET-ing https:\/\/localhost:\d+\/flowcrypt-email-key-manager/) ) + // below for test "decrypt - failure retrieving chunk download - next request will try anew" + .filter( + e => + e.message === + 'BrowserMsg(ajaxGmailAttachmentGetChunk) (no status text): 400 when GET-ing https://localhost:32831/gmail/v1/users/me/messages/1885ded59a2b5a8d/attachments/ANGjdJ_0g7PGqJSjI8-Wjd5o8HcVnAHxIk-H210TAxxwf' + ) // below for test "user4@standardsubdomainfes.localhost:8001 - PWD encrypted message with FES web portal - a send fails with gateway update error" .filter(e => !e.message.includes('Test error')) // below for test "no.fes@example.com - skip FES on consumer, show friendly message on enterprise" diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index 59402db32d9..33c74052876 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -1164,6 +1164,35 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== }) ); + test( + 'decrypt - failure retrieving chunk download - next request will try anew', + testWithBrowser(async (t, browser) => { + const { authHdr } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'ci.tests.gmail'); + t.mockApi!.configProvider!.config.google = { + getAttachment: { + 'ANGjdJ_0g7PGqJSjI8-Wjd5o8HcVnAHxIk-H210TAxxwfhKWlCUqnXbZtBdwjPQqN9omCqn-0-r4JBy6amb0ogGz9jZL9q11Z_iUJzxr_X0MlJj0cw-3EYCFKPDrpfVVQZ-28Ajhd35CkI3Z93s3FU4BUKHROZR1qdEPOoQM63k1IOPTfL9c7ES-W8EaOKxB-k0n0frlXqpTJgv-AHAi9NEAaq-ghluobPc4JiSjgkK7_0MkykEm4oZfBSHSuzG94c3HWeYNJw4bcWFHiKRln7bB8nq5JTJe546Zg2MoVkMuc7K6a0cUwGd9mdAUAPqPyq1ENIQ9bGFK7ozlDezHHZYP8rOTEL3QBx6rEE-aaGT2MEQyWPtsp8Zgt42prnUjysPDe-uVs-pl31UpIDhf': + new HttpClientErr('RequestTimeout', Status.BAD_REQUEST), + }, + }; + const msgId = '1885ded59a2b5a8d'; + const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${msgId}`, undefined, authHdr); + expect((await gmailPage.getFramesUrls(['pgp_block.htm'])).length).to.equal(0); + await gmailPage.waitForContent('.attachment_loader', 'Categorize: unknown err'); // 'RequestTimeout' responseText gets lost in chunk downloader + t.mockApi!.configProvider!.config.google = {}; + await gmailPage.target.$$eval('.evaluated', elems => { + for (const el of elems) { + el.classList.remove('evaluated'); + } + }); // trigger processing + await BrowserRecipe.pgpBlockCheck(t, await gmailPage.getFrame(['pgp_block.htm']), { + content: ['Standard message'], + encryption: 'not encrypted', + signature: 'could not verify signature: missing pubkey 06CA553EC2455D70', + }); + await gmailPage.close(); + }) + ); + test( 'verification - message text is rendered prior to pubkey fetching', testWithBrowser(async (t, browser) => { From 9839b5ae5843a39b9afb8313b0dd97e28aa29265 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 9 Jun 2023 14:18:03 +0100 Subject: [PATCH 126/147] narrow type --- extension/js/common/core/crypto/pgp/msg-util.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extension/js/common/core/crypto/pgp/msg-util.ts b/extension/js/common/core/crypto/pgp/msg-util.ts index 9094bffe986..f7ea8976aab 100644 --- a/extension/js/common/core/crypto/pgp/msg-util.ts +++ b/extension/js/common/core/crypto/pgp/msg-util.ts @@ -2,7 +2,7 @@ 'use strict'; import { Key, KeyInfoWithIdentity, KeyInfoWithIdentityAndOptionalPp, KeyUtil } from '../key.js'; -import { MsgBlockType, ReplaceableMsgBlockType } from '../../msg-block.js'; +import { ReplaceableMsgBlockType } from '../../msg-block.js'; import { Buf } from '../../buf.js'; import { PgpArmor, PreparedForDecrypt } from './pgp-armor.js'; import { opgp } from './openpgpjs-custom.js'; @@ -95,7 +95,7 @@ export type VerifyRes = { isErrFatal?: boolean; content?: Buf; }; -export type PgpMsgTypeResult = { armored: boolean; type: MsgBlockType } | undefined; +export type PgpMsgTypeResult = { armored: boolean; type: ReplaceableMsgBlockType } | undefined; export type DecryptResult = DecryptSuccess | DecryptError; export type DiagnoseMsgPubkeysResult = { found_match: boolean; receivers: number }; // eslint-disable-line @typescript-eslint/naming-convention export enum DecryptErrTypes { From e83698ec000ff998cff222b64ad1b104805d3afd Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 9 Jun 2023 14:18:55 +0100 Subject: [PATCH 127/147] regex fix --- test/source/test.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/source/test.ts b/test/source/test.ts index 6b48e070cbe..71125e7899b 100644 --- a/test/source/test.ts +++ b/test/source/test.ts @@ -155,8 +155,9 @@ test.after.always('evaluate Catch.reportErr errors', async t => { // below for test "decrypt - failure retrieving chunk download - next request will try anew" .filter( e => - e.message === - 'BrowserMsg(ajaxGmailAttachmentGetChunk) (no status text): 400 when GET-ing https://localhost:32831/gmail/v1/users/me/messages/1885ded59a2b5a8d/attachments/ANGjdJ_0g7PGqJSjI8-Wjd5o8HcVnAHxIk-H210TAxxwf' + !/BrowserMsg\(ajaxGmailAttachmentGetChunk\) \(no status text\): 400 when GET-ing https:\/\/localhost:\d+\/gmail\/v1\/users\/me\/messages\/1885ded59a2b5a8d\/attachments\/ANGjdJ_0g7PGqJSjI8-Wjd5o8HcVnAHxIk-H210TAxxwf/.test( + e.message + ) ) // below for test "user4@standardsubdomainfes.localhost:8001 - PWD encrypted message with FES web portal - a send fails with gateway update error" .filter(e => !e.message.includes('Test error')) @@ -166,7 +167,7 @@ test.after.always('evaluate Catch.reportErr errors', async t => { .filter(e => !e.trace.includes('-1 when GET-ing https://openpgpkey.flowcrypt.com')) // below for "test allows to retry public key search when attester returns error" .filter( - e => !e.message.match(/Error: Internal Server Error: 500 when GET-ing https:\/\/localhost:\d+\/attester\/pub\/attester.return.error@flowcrypt.test/) + e => !e.message.match(/Error: Internal Server Error: 500 when GET-ing https:\/\/localhost:\d+\/attester\/pub\/attester\.return\.error@flowcrypt\.test/) ); const foundExpectedErr = usefulErrors.find(re => re.message === `intentional error for debugging`); const foundUnwantedErrs = usefulErrors.filter(re => re.message !== `intentional error for debugging` && !re.message.includes('traversal forbidden')); From fa7189cbfa5ba7a103673ca367d511ae2fc7874f Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 9 Jun 2023 16:12:47 +0100 Subject: [PATCH 128/147] refactor public key attachment identification --- extension/js/common/message-renderer.ts | 52 +++++++++++-------------- 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index 7d923a8938d..abc3f8814b5 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -9,7 +9,7 @@ import { Attachment, Attachment$treatAs, TransferableAttachment } from './core/a import { Buf } from './core/buf.js'; import { CID_PATTERN, Dict, Str, Value } from './core/common.js'; import { KeyUtil } from './core/crypto/key.js'; -import { DecryptErrTypes, DecryptResult, FormatError, MsgUtil, VerifyRes } from './core/crypto/pgp/msg-util.js'; +import { DecryptErrTypes, DecryptResult, FormatError, MsgUtil, PgpMsgTypeResult, VerifyRes } from './core/crypto/pgp/msg-util.js'; import { PgpArmor } from './core/crypto/pgp/pgp-armor.js'; import { Mime, MessageBody, MimeProccesedMsg } from './core/mime.js'; import { MsgBlockParser } from './core/msg-block-parser.js'; @@ -288,9 +288,10 @@ export class MessageRenderer { const openpgpType = MsgUtil.type({ data }); if (openpgpType && openpgpType.type === 'publicKey' && openpgpType.armored) { // todo: how can we have a single helper method? and convert unarmored pubkey to armored if needed - // if it looks like OpenPGP public key treatAs = 'publicKey'; - } else if (openpgpType && ['encryptedMsg', 'signedMsg'].includes(openpgpType.type)) { + } else if (treatAs === 'publicKey' && openpgpType?.type === 'encryptedMsg') { + treatAs = 'encryptedFile'; + } else if (treatAs !== 'publicKey' && openpgpType && ['encryptedMsg', 'signedMsg'].includes(openpgpType.type)) { treatAs = 'encryptedMsg'; } else { if (this.debug) { @@ -318,7 +319,20 @@ export class MessageRenderer { } if (treatAs === 'hidden') { return 'hidden'; - } else if (treatAs === 'encryptedFile') { + } + if (treatAs === 'publicKey') { + const { armoredPubkey, openpgpType } = await this.preparePubkey(a); + if (armoredPubkey) { + loaderContext.setMsgBody(this.factory.embeddedPubkey(armoredPubkey, this.isOutgoing(messageInfo.from?.email)), 'after'); + return 'hidden'; + } else if (openpgpType?.type === 'encryptedMsg') { + treatAs = 'encryptedFile'; // fall back to ordinary encrypted attachment + } else { + loaderContext.renderPlainAttachment(a, attachmentSel, 'Unknown Public Key Format'); + return 'shown'; + } + } + if (treatAs === 'encryptedFile') { // actual encrypted attachment - show it loaderContext.prependEncryptedAttachment(a); return 'replaced'; // native should be hidden, custom should appear instead @@ -327,9 +341,6 @@ export class MessageRenderer { this.processCryptoMessage(a, renderModule, frameId, messageInfo.from?.email, messageInfo.isPwdMsgBasedOnMsgSnippet) ); return 'hidden'; // native attachment should be hidden, the "attachment" goes to the message container - } else if (treatAs === 'publicKey') { - // todo - pubkey should be fetched in pgp_pubkey.js - return await this.renderPublicKeyFromFile(a, loaderContext, this.isOutgoing(messageInfo.from?.email), attachmentSel); } else if (treatAs === 'privateKey') { return await this.renderBackupFromFile(a, loaderContext, attachmentSel); } else { @@ -745,32 +756,15 @@ export class MessageRenderer { return {}; }; - private renderPublicKeyFromFile = async ( - attachment: Attachment, - loaderContext: LoaderContextInterface, - isOutgoing: boolean, - attachmentSel: JQueryEl | undefined - ): Promise<'shown' | 'hidden'> => { - try { - await this.gmail.fetchAttachmentsMissingData([attachment]); - } catch (e) { - loaderContext.renderPlainAttachment(attachment, attachmentSel, 'Please reload page'); - return 'shown'; - } + private preparePubkey = async (attachment: Attachment): Promise<{ armoredPubkey?: string; openpgpType: PgpMsgTypeResult }> => { + await this.gmail.fetchAttachmentsMissingData([attachment]); const data = attachment.getData(); const openpgpType = MsgUtil.type({ data }); - if (openpgpType?.type === 'publicKey') { + if (openpgpType?.type === 'publicKey' && openpgpType.armored) { // todo: do we need to armor if not openpgpType.armored? - loaderContext.setMsgBody(this.factory.embeddedPubkey(data.toUtfStr(), isOutgoing), 'after'); - return 'hidden'; - } else if (openpgpType && ['signedMsg', 'encryptedMsg'].includes(openpgpType.type)) { - // todo: think about moving this fallback to the upper-level handler somehow - loaderContext.renderPlainAttachment(attachment, attachmentSel, 'Unknown Public Key Format'); - return 'shown'; - } else { - // todo: renderEncryptedAttachment - return 'hidden'; // todo: return 'shown' + return { armoredPubkey: data.toUtfStr(), openpgpType }; } + return { openpgpType }; }; private renderBackupFromFile = async ( From 0074fbd2e6242cfcaac0347488704d2a8f1a63c1 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sat, 10 Jun 2023 14:53:14 +0100 Subject: [PATCH 129/147] added tests for incorrect 'publicKey'-looking attachments --- test/source/mock/google/google-endpoints.ts | 7 +- test/source/tests/decrypt.ts | 73 ++++++++++++++++++++- 2 files changed, 76 insertions(+), 4 deletions(-) diff --git a/test/source/mock/google/google-endpoints.ts b/test/source/mock/google/google-endpoints.ts index 9fb40beabfe..afa33dc3ca9 100644 --- a/test/source/mock/google/google-endpoints.ts +++ b/test/source/mock/google/google-endpoints.ts @@ -60,7 +60,7 @@ export interface GoogleConfig { othercontacts?: string[]; aliases?: Dict; getMsg?: Dict>; - getAttachment?: Dict; + getAttachment?: Dict<{ error: Error } | { data: string }>; htmlRenderer?: (msgId: string, prerendered?: string) => string | undefined; } @@ -221,8 +221,9 @@ export const getMockGoogleEndpoints = (oauth: OauthMock, config: GoogleConfig | } const data = await GoogleData.withInitializedData(acct); if (req.url?.includes('/attachments/')) { - const foundAttError = config?.getAttachment?.[id]; - if (foundAttError) throw foundAttError; + const foundAtt = config?.getAttachment?.[id]; + if (foundAtt && 'error' in foundAtt) throw foundAtt.error; + if (foundAtt?.data) return { data: foundAtt.data }; const attachment = data.getAttachment(id); if (attachment) { return { data: attachment.data }; // Note: data (or quoted) field must be last in serialized JSON diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index 33c74052876..d1b6ffa2fb9 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -1171,7 +1171,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== t.mockApi!.configProvider!.config.google = { getAttachment: { 'ANGjdJ_0g7PGqJSjI8-Wjd5o8HcVnAHxIk-H210TAxxwfhKWlCUqnXbZtBdwjPQqN9omCqn-0-r4JBy6amb0ogGz9jZL9q11Z_iUJzxr_X0MlJj0cw-3EYCFKPDrpfVVQZ-28Ajhd35CkI3Z93s3FU4BUKHROZR1qdEPOoQM63k1IOPTfL9c7ES-W8EaOKxB-k0n0frlXqpTJgv-AHAi9NEAaq-ghluobPc4JiSjgkK7_0MkykEm4oZfBSHSuzG94c3HWeYNJw4bcWFHiKRln7bB8nq5JTJe546Zg2MoVkMuc7K6a0cUwGd9mdAUAPqPyq1ENIQ9bGFK7ozlDezHHZYP8rOTEL3QBx6rEE-aaGT2MEQyWPtsp8Zgt42prnUjysPDe-uVs-pl31UpIDhf': - new HttpClientErr('RequestTimeout', Status.BAD_REQUEST), + { error: new HttpClientErr('RequestTimeout', Status.BAD_REQUEST) }, }, }; const msgId = '1885ded59a2b5a8d'; @@ -1448,6 +1448,77 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== }) ); + test( + 'decrypt - not an armored public key in a file that looked like a public key', + testWithBrowser(async (t, browser) => { + const { authHdr } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'ci.tests.gmail'); + const msgId = '1869220e0c8f16de'; + // 1. plain text + t.mockApi!.configProvider!.config.google = { + getAttachment: { + '1869220e0c8f16de-part1': { data: 'MTIz'.repeat(500) }, // string containing 123123... + }, + }; + const gmailPage1 = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${msgId}`, undefined, authHdr); + await gmailPage1.waitAll('iframe'); + await gmailPage1.waitForContent('.attachment_loader', 'Unknown OpenPGP format'); + expect((await gmailPage1.getFramesUrls(['pgp_block.htm'], { sleep: 0, appearIn: 0 })).length).to.equal(1); + expect((await gmailPage1.getFramesUrls(['attachment.htm'], { sleep: 0, appearIn: 0 })).length).to.equal(0); + expect((await gmailPage1.getFramesUrls(['pgp_pubkey.htm'], { sleep: 0, appearIn: 0 })).length).to.equal(0); + await gmailPage1.close(); + // 2. encryptedFile + t.mockApi!.configProvider!.config.google = { + getAttachment: { + '1869220e0c8f16de-part1': { + data: `LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tDQpWZXJzaW9uOiBGbG93Q3J5cHQgRW1haWwgRW5jcnlwdGlvbiA3LjkuOA0KQ29tbWVudDogU2VhbWxlc3NseSBzZW5kIGFuZCByZWNlaXZlIGVuY3J5cHRlZCBlbWFpbA0KDQp3VjREZVdmZ0N0VnRkbm9TQVFkQWRkRitWYmhVTjd0V2NGMnNKSW5aRzFKK08xYlBOLzNHd0NGbXlSd2wNCmFGTXcwMGhHVUd4UXBscUJNZnBVaktnWHdJSlpnbFNPbkd0b242VkpuVlpXSmwzN0tQcmZ6aFZ6bnhJbg0KckxCT3ZIUHp3Y0ZNQXpCZmdhbXUwU0ExQVJBQW9EeGhiRUIvQmNnVDB6Y29CYnJRMDhPZXpKZ2VWVDhXDQozY2p5RFI1YjY2U21MUCt5ZzdLTm5oUXNnR1I4blNRaUozNk1Id3JmU3MzTVcrNSt5YXdZOWcveXZWQzgNCkMxS3MzQTREbFlvcWFTY3dTUjhDeG9qcTAwNmErdGI0blp5cTdyY3ZsaDg5UjVObURZMjkxcC8vQ05JSA0KNC9rRWZXSVVIaW9sZEc0VlFnTnhVd0ZSbEVmMXYwL1RMTGg0bXN0ckJhU1BBM3BiV1VOZnZOYmc2WGl2DQpIcU1FVGdxUVVOb0MvU0dCYlNFOHgvNTlZa0tQQVlVcUNpT2E2UW5NWW14UUliUE1xNTFUV0VTS1ZVYmQNCmZ4S3BBeDNUaWQzRFBqWDNjT1Zvb2VsRWxDeXZLSDlkWlBweWEyTGpoankrUkVKWmZkNkpmNXpDUkdKVA0KSCs5cG9CdVpDR3BSMmVXamQ3SG5hbzFObjdKZkFSM3R2SDdVZUVMc1JjcFNJQ1JPZWxUQmJEVWlQK2JNDQpzOVduUWVsQ3FVNGNrNDE3dUpaNjluSXp1Y0NURnlnYmlIZzVXZnNzQzNxcVQzRTVjSE0yNXJEbmQ5MSsNCkVZN1RCbFJ5Z0tqM1RmRlYyRHZUNmdybk0yQWhvUnkyTWNGSGtMaEhCanJ4M3BCSHhGRWkvZVZLcncvaw0Ka044alJ4MFBMWWlZYWtGZjJWTCt4d0JxUkljWmd5SER4K2o5akViR1d2M25kU1ByT01qNFZxaVRMb0tUDQpBVkk4TUwyVHVCZGJGQS9TUWYyODZtTjhBeklRR2ZqL3J1enI0NFFCZS90RnlHdSsyR0NBQ3FxWGl2b3cNClo2d2QwVWRuc056Y3FKY0FWa28zOFN3QldtdjZzc3NwQURNZXNtYnU5WjA1V3k1L1BodlN3QUlCckovZA0KdjFJWnQ3VFpackNmSG4xak1xamRWRUhTRXB0VEJxYzBiSGxUT0c4Q0NST2VPNWFkSE13UW8zekJSRThYDQpqNG1JTkp5R1pyM3g5TCtxUTJuUnZrSlRBVTZNWm02UzdsWWdVdURqbi9DS3YzNUtYa1hqcnNPN1lsTTANClhydG1uMUZCTVZMQTNta3MwK1R4TSsyalBGNitKbmpaK29tVEpIbjRuWGNmWSsxM1VBaGZBNlNkeFFkQg0KVGQ3cjlkOWM0WUxTaEtEdXhwMlh4eDNXVVR2N3oxSm9sdFI1ZURXVFgxc3hMZURQQ0s0RnQ1VVNSYVhCDQpVc3hENnE0R2x3bHAzZz09DQo9MmVUTQ0KLS0tLS1FTkQgUEdQIE1FU1NBR0UtLS0tLQ0K`, + }, + }, + }; + const gmailPage2 = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${msgId}`, undefined, authHdr); + await gmailPage2.waitAll('iframe'); + expect((await gmailPage2.getFramesUrls(['pgp_block.htm'])).length).to.equal(1); + expect((await gmailPage2.getFramesUrls(['pgp_pubkey.htm'], { sleep: 0, appearIn: 0 })).length).to.equal(0); + const attachmentFrame = await gmailPage2.getFrame(['attachment.htm']); + const downloadedFiles = await attachmentFrame.awaitDownloadTriggeredByClicking('@download-attachment'); + const entries = Object.entries(downloadedFiles); + expect(entries.length).to.equal(1); + const decryptedContent = entries[0][1].toString(); + expect(decryptedContent).to.equal('1234'); + await gmailPage2.close(); + // 3. broken file + t.mockApi!.configProvider!.config.google = { + getAttachment: { + '1869220e0c8f16de-part1': { + data: 'LS0tLS1CRUdJTiBQR1AgUFVCTElDIEtFWSBCTE9DSy0tLS0tCgp4c0ZOQkdQOGIxSUJFQUN2WTk1bkVZRUZDOUpFZVA0NzVCWTRGSERaSzhITE5TTWJ4c2tRZGNSYXV3eXUKNEpyVm5Yb3UvOFFmdEtaejNheVVGbEswbVJ5NWFHZytEMW1jTjJFRHVmd0E3ZnVPb3dHWk1yOVdxeE9sCm1SK21YL0I3eWM4RmZNTHNIWjhrOVQzRncrcy9QbTR0dEdBaHVBSUpkMEx5bzZZTGdaVGFoL0hNK1MyOApQUUhFcGZPQWdtYk52YjdXYUxRd2gwb1RNR01Mb3NYSENoOE5PdlNXOVRTNHpCK2JNaEVuZkY1MytYTTUKUlVac0RRU3M4cDU5aXRjbjdrVTNMNDVDSzhWamc2UzQ5bWlHcFo2eFBESitmS04vWmhMelRrVDVhSFZ2Ck9qVUpMQ0NYcFluRzh1cVUvMXhYTGRBTk0xRk5LSFRrNEV1dUdpSEZBNlhZZWlQVnd4L2ROdytJdmVQUgpjYmd0a0dvTWZkZXQ0eXdmVWZyRnlkRlV1WEhmNTlYSm9hUzB0azNuVS9nUkMwZlJnZVN3ZFFhbVoxaXMKeEFzeXBydDlwUFNIbVZWQ3lGRU95Qk5ELzhsaWxCOFpMNS8xYmxPQmdyWkdqMXpNUm5VSkhEanM2VGtQCmhBcXc5ZEw2ais0cE4ybzNnalVGY2JQQng5TGZiZldicnFhWk1Xd2tEYi95c0E0cFNDZUxCbkdZSXc3OApoRExjaWpDZStSSkxsdTJzbkhmUnFjQ0kyd2FiK01NVUhDMTF4VHA1bHpBNHUwZW9xdWZwK0xPdWREWHoKemF3c2RqeitvalJ4ZjBZaUVkNGpZVmtJOS9xUDRXVmtPM1FtSlBOV3JEdzNYRGpTU3Z3cHo1ZWxyRTBsCjI0cE9IMXBHTE4vNkNEWnAwaDF3TnRMaEVBWDBhSWYva2N5cGp3QVJBUUFCelN0elkyaHNaVzFoZW14bApRSEJ5YjNSdmJpNXRaU0E4YzJOb2JHVnRZ', + }, + }, + }; + const gmailPage3 = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${msgId}`, undefined, authHdr); + await gmailPage3.waitAll('iframe'); + expect((await gmailPage3.getFramesUrls(['pgp_block.htm'])).length).to.equal(1); + expect((await gmailPage3.getFramesUrls(['attachment.htm'], { sleep: 0, appearIn: 0 })).length).to.equal(0); + const pubkeyFrame = await gmailPage3.getFrame(['pgp_pubkey.htm']); + await pubkeyFrame.waitForContent('@container-pgp-pubkey', 'This OpenPGP key is not usable.'); + await gmailPage3.close(); + // 4. binary pubkey + t.mockApi!.configProvider!.config.google = { + getAttachment: { + '1869220e0c8f16de-part1': { + data: 'xsFNBGP8b1IBEACvY95nEYEFC9JEeP475BY4FHDZK8HLNSMbxskQdcRauwyu4JrVnXou/8QftKZz3ayUFlK0mRy5aGg+D1mcN2EDufwA7fuOowGZMr9WqxOlmR+mX/B7yc8FfMLsHZ8k9T3Fw+s/Pm4ttGAhuAIJd0Lyo6YLgZTah/HM+S28PQHEpfOAgmbNvb7WaLQwh0oTMGMLosXHCh8NOvSW9TS4zB+bMhEnfF53+XM5RUZsDQSs8p59itcn7kU3L45CK8Vjg6S49miGpZ6xPDJ+fKN/ZhLzTkT5aHVvOjUJLCCXpYnG8uqU/1xXLdANM1FNKHTk4EuuGiHFA6XYeiPVwx/dNw+IvePRcbgtkGoMfdet4ywfUfrFydFUuXHf59XJoaS0tk3nU/gRC0fRgeSwdQamZ1isxAsyprt9pPSHmVVCyFEOyBND/8lilB8ZL5/1blOBgrZGj1zMRnUJHDjs6TkPhAqw9dL6j+4pN2o3gjUFcbPBx9LfbfWbrqaZMWwkDb/ysA4pSCeLBnGYIw78hDLcijCe+RJLlu2snHfRqcCI2wab+MMUHC11xTp5lzA4u0eoqufp+LOudDXzzawsdjz+ojRxf0YiEd4jYVkI9/qP4WVkO3QmJPNWrDw3XDjSSvwpz5elrE0l24pOH1pGLN/6CDZp0h1wNtLhEAX0aIf/kcypjwARAQABzStzY2hsZW1hemxlQHByb3Rvbi5tZSA8c2NobGVtYXpsZUBwcm90b24ubWU+wsGKBBABCAA+BQJj/G9SBAsJBwgJEGFtWWvCBl1IAxUICgQWAAIBAhkBAhsDAh4BFiEEpRQABVdStE+56giVYW1Za8IGXUgAAJsVEACCwO90h/jfWK0KJ203z9fRnDT+iX1ahTEnIvzsGUXwo5opTK8k8fz/wZDNl9itrd9c65fWOkeiVYM0jDINxeEvhTwJwTqYyic+yfnnH9EMIBlUCd36dh+xIK2GwdmtdqYBDwyKzOqWGRQb3zE9I6aHajI7yzaJyxEBLv2mrNId2Vtrz12JbJJv4RO4Dv3sZPJoJfbkuV5xg6uEUtIk9aAMiDdNUhkw3JvPq/cKnh6AAHPBSxxV8dRXOTgIgf5ncoXNodyGtbpPzis7Hxz+5KwoyfkDzQYtAKVpXRlyh+F06C5jUCUvmoFxZoH40OfSBpHKcu4EKqIBh28boI0ofxQCIWvMiYkcfYeKjnwg25MdpYvatxS4NQVegzq0DhiVEisO0cKtKawnVGPXTUsevGswICsJBS9DRv3FMkGJIDqR1S/E2GWZa3+U6A4TwPrcmzfXvzqQ+vxPdq03fMExIHeYlcnexypFUN9K/LtLgXEG34/LXXI9gNBjyfYUwjLZAuehYqsMqM05waJ3ZlgbZEsePK0LMfRO9g6lq7LsFtB0q28u5IwK6M7Fnox5bzQrhIDXAFpU4rw7GWWKF71Ujw9r6P8rY0RcRaW2RGlY8+tQvxnSHcK/Ki6ozlWQCv5blHur/EmTO9neO84dHspC8d5Ggwv8qDFR5deohm/TLlkh3c7BTQRj/G9SARAAv8AZdsZwWtxE7+NMX+CAurhFwvIxeDOjrXe5LeBhzIEUVXkTNIpf/udqBfH34LcemmoB6pPnpaxS0Grg/a8FLk7TRU2WkucrnbT8nuv9GihJCyucC9Co5ZoVmNwIFrxaSkC5oQvsQoytUyk5TJ95egTs7qcsICouCpcIJfM+seNtpc26XDWVrf+L3FWGK47LBExHhUrIbgEiUjLfHwCGZEQsctfTIs4W2PJhfF/egiPEDDLhfWgDQAplZrr6vZlCwPmGy5JYjYMq4u363+9eU/p3jBaK0kJg3O1KvDxnom/p4ouA64UbkB65gBW58XCECWGJi+AsKU4nmBTXu6DuFZUSedLl7LEmmFvcAHd5Pp9WFvn7UKae7qZRdLT8QDlRutn1IiVQLnlocI3dHS1Aw0uzbc8+kdE8SNbDBZYkLb7eb+aLsQtSegCu21+yIfMOBcBSoQa9uB3L9ZC1xvooGzWKWcCPjEykQc3akqACHGAsXXSOWvlfzx4dr9oDQASoqdQdZb3j3vDNqYYK00AJyQ9Rczic4tqDngUX8inTSAswkeQ/N/ZITI2Y3lwD0KF/vYTOSl7SK0wVLHZy54NXViZcuRJwYzqPoBpfj2ILGTa5o/WnTzWAQl+HHlD0xXhsLC0EeyiKMkBi0X/0MoHrdEvwvjSVIH7mGo+1hC2PipEAEQEAAcLBdgQYAQgAKgUCY/xvUgkQYW1Za8IGXUgCGwwWIQSlFAAFV1K0T7nqCJVhbVlrwgZdSAAAlfAP/1MszOKhkoqQK6JQHKyfBxXk+MKhp1TTAwtz+1X1OAOkrm/0Qi9S8kJU1LLQUXQWCNAsYM7H84lLfu9XTuHm39/QhupULjt1SAzc9Hfri00iSfWBB7diJX6UMjRMOAuNpiJ+/nKO8m7QJp61tvWdxYJUAXoJ0niZsnXk2KkJJHtceqVFGIuVjyFZVzZ3Z2I1QVOA8rxMZ9bSpnlzJFbHiyFmmAxLjn0Usr/wDKOPOubaVgt3+VVon6i4MWPnCgJ+KyuXI8Om99vRI3/d/fH0ZrBeK1Vyc8v2TTXtZHtOwpqczDn0JD4t+V/tv512cMeXGHjX1f0bNDkeRJ7czyX92FbyLhePuCg3oxEvB7yknSOzO0B/gmGarCBs3MltkE3fS9p8haasjBX1QLdkQAC4vT31BIrhyFFbQxnBeFGw/PK0Roga3gUH4WRkY24xdJ5ZOktj7F6y5mhxv69xbaJet4WB/6MGm36Zc9M0T0tcJlrGXTXFEw/PwRB1QJluM/KxliL2WcHSpr1rgRDGBmGCOGYYrPkjiHuBo3JqsVm0WNA5sNQKxg7PO+78WdK9nDCl8ZVimWLowZR776EhQ8nCqn8ckik9Y+AlJLQYmZj/np4NhifobIjw4MGcf8h2YOq6fWhhyZQKk1IOxVv0wZnqyjcHp3/HqlEqdUDdlDNGYaMN', + }, + }, + }; + const gmailPage4 = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${msgId}`, undefined, authHdr); + await gmailPage4.waitAll('iframe'); + // todo: we can add support for binary public keys + await gmailPage4.waitForContent('.attachment_loader', 'Unknown OpenPGP format'); + expect((await gmailPage4.getFramesUrls(['pgp_block.htm'], { sleep: 0, appearIn: 0 })).length).to.equal(1); + expect((await gmailPage4.getFramesUrls(['attachment.htm'], { sleep: 0, appearIn: 0 })).length).to.equal(0); + expect((await gmailPage4.getFramesUrls(['pgp_pubkey.htm'], { sleep: 0, appearIn: 0 })).length).to.equal(0); + await gmailPage4.close(); + }) + ); + test( 'signature - cleartext signed messages from HTML are re-fetched when needed', testWithBrowser(async (t, browser) => { From 71ccd083513698577cc5749bada6bd291cbd21e6 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sat, 10 Jun 2023 19:51:09 +0100 Subject: [PATCH 130/147] removed rejected promises from cache, simplification --- .../inbox-active-thread-module.ts | 2 +- extension/js/common/core/expiration-cache.ts | 11 ++++ extension/js/common/downloader.ts | 47 +++++++---------- extension/js/common/message-renderer.ts | 51 ++++++++++--------- 4 files changed, 59 insertions(+), 52 deletions(-) diff --git a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts index de8a2a4e1e4..3fdc1916f53 100644 --- a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts +++ b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts @@ -132,7 +132,7 @@ export class InboxActiveThreadModule extends ViewModule { private renderMsg = async (message: GmailRes.GmailMsg): Promise => { const htmlId = this.replyMsgId(message.id); try { - const msg = await this.view.messageRenderer.downloader.msgGetCached(message.id).download.full; + const msg = await this.view.messageRenderer.downloader.msgGetFull(message.id); const { blocks, isBodyEmpty, messageInfo, attachments } = await this.view.messageRenderer.msgGetProcessed(message.id); const exportBtn = this.debugEmails.includes(this.view.acctEmail) ? 'download api export' : ''; const senderEmail = messageInfo.from?.email; diff --git a/extension/js/common/core/expiration-cache.ts b/extension/js/common/core/expiration-cache.ts index e3420e216c2..e6859e2f4e6 100644 --- a/extension/js/common/core/expiration-cache.ts +++ b/extension/js/common/core/expiration-cache.ts @@ -41,4 +41,15 @@ export class ExpirationCache { this.cache.delete(key); } }; + + // await the value if it's a promise and remove from cache in case of exception + // the value is provided along with the key as parameter to eliminate possibility of a missing (expired) record + public await = async (key: K, value: V): Promise => { + try { + return await value; + } catch (e) { + if (this.cache.get(key) === value) this.set(key); // remove faulty record + return Promise.reject(e); + } + }; } diff --git a/extension/js/common/downloader.ts b/extension/js/common/downloader.ts index fb6e4e5c744..9cbfee6f74b 100644 --- a/extension/js/common/downloader.ts +++ b/extension/js/common/downloader.ts @@ -7,29 +7,17 @@ import { Gmail } from './api/email-provider/gmail/gmail.js'; import { Attachment } from './core/attachment.js'; import { Buf } from './core/buf.js'; import { ExpirationCache } from './core/expiration-cache.js'; -import { MsgBlock } from './core/msg-block.js'; -import { MessageInfo } from './render-message.js'; - -export type ProcessedMessage = { - isBodyEmpty: boolean; - blocks: MsgBlock[]; - attachments: Attachment[]; - messageInfo: MessageInfo; -}; - -export interface MessageCacheEntry { - download: { full: Promise; raw?: Promise }; - processed?: ProcessedMessage; -} export class Downloader { private readonly chunkDownloads = new ExpirationCache>(2 * 60 * 60 * 1000); // 2 hours - private readonly messages = new ExpirationCache(24 * 60 * 60 * 1000); // 24 hours + private readonly fullMessages = new ExpirationCache>(24 * 60 * 60 * 1000); // 24 hours + private readonly rawMessages = new ExpirationCache>(24 * 60 * 60 * 1000); // 24 hours public constructor(private readonly gmail: Gmail) {} public deleteExpired = (): void => { - this.messages.deleteExpired(); + this.fullMessages.deleteExpired(); + this.rawMessages.deleteExpired(); this.chunkDownloads.deleteExpired(attachment => { return attachment.hasData(); }); @@ -50,21 +38,24 @@ export class Downloader { public waitForAttachmentChunkDownload = async (a: Attachment) => { if (a.hasData()) return a.getData(); - return this.queueAttachmentChunkDownload(a).result.catch(e => { - // remove from cache immediately - this.chunkDownloads.set(a, undefined); - return Promise.reject(e); - }); + return this.chunkDownloads.await(a, this.queueAttachmentChunkDownload(a).result); + }; + + public msgGetRaw = async (msgId: string): Promise => { + let msgDownload = this.rawMessages.get(msgId); + if (!msgDownload) { + msgDownload = this.gmail.msgGet(msgId, 'raw'); + this.rawMessages.set(msgId, msgDownload); + } + return (await this.rawMessages.await(msgId, msgDownload)).raw || ''; }; - public msgGetCached = (msgId: string): MessageCacheEntry => { - // todo: retries? exceptions? - let msgDownload = this.messages.get(msgId); + public msgGetFull = async (msgId: string): Promise => { + let msgDownload = this.fullMessages.get(msgId); if (!msgDownload) { - const newEntry = { download: { full: this.gmail.msgGet(msgId, 'full') } }; - this.messages.set(msgId, newEntry); - msgDownload = newEntry; + msgDownload = this.gmail.msgGet(msgId, 'full'); + this.fullMessages.set(msgId, msgDownload); } - return msgDownload; + return await this.fullMessages.await(msgId, msgDownload); }; } diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index abc3f8814b5..5f06e1fac21 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -11,7 +11,7 @@ import { CID_PATTERN, Dict, Str, Value } from './core/common.js'; import { KeyUtil } from './core/crypto/key.js'; import { DecryptErrTypes, DecryptResult, FormatError, MsgUtil, PgpMsgTypeResult, VerifyRes } from './core/crypto/pgp/msg-util.js'; import { PgpArmor } from './core/crypto/pgp/pgp-armor.js'; -import { Mime, MessageBody, MimeProccesedMsg } from './core/mime.js'; +import { Mime, MessageBody } from './core/mime.js'; import { MsgBlockParser } from './core/msg-block-parser.js'; import { MsgBlock } from './core/msg-block.js'; import { Lang } from './lang.js'; @@ -27,16 +27,24 @@ import { MessageInfo, PrintMailInfo } from './render-message.js'; import { saveFetchedPubkeysIfNewerThanInStorage } from './shared.js'; import { XssSafeFactory } from './xss-safe-factory.js'; import * as DOMPurify from 'dompurify'; -import { Downloader, ProcessedMessage } from './downloader.js'; +import { Downloader } from './downloader.js'; import { JQueryEl, LoaderContextInterface } from './loader-context-interface.js'; import { Gmail } from './api/email-provider/gmail/gmail.js'; import { ApiErr } from './api/shared/api-error.js'; import { isCustomerUrlFesUsed } from './helpers.js'; +import { ExpirationCache } from './core/expiration-cache.js'; -export type ProccesedMsg = MimeProccesedMsg; +type ProcessedMessage = { + isBodyEmpty: boolean; + blocks: MsgBlock[]; + attachments: Attachment[]; + messageInfo: MessageInfo; +}; export class MessageRenderer { public readonly downloader: Downloader; + private readonly processedMessages = new ExpirationCache>(24 * 60 * 60 * 1000); // 24 hours + private constructor( private readonly acctEmail: string, private readonly gmail: Gmail, @@ -307,7 +315,7 @@ export class MessageRenderer { } if (treatAs === 'signature') { // we could change 'Getting file info..' to 'Loading signed message..' in attachment_loader element - const raw = await this.msgGetRaw(msgId); // todo: can we try to restore the content attachment from 'full'? + const raw = await this.downloader.msgGetRaw(msgId); // todo: can we try to restore the content attachment from 'full'? loaderContext.hideAttachment(attachmentSel); await this.setMsgBodyAndStartProcessing(loaderContext, 'signedDetached', messageInfo.printMailInfo, messageInfo.from?.email, renderModule => this.processMessageWithDetachedSignatureFromRaw(raw, renderModule, messageInfo.from?.email) @@ -370,13 +378,23 @@ export class MessageRenderer { ); }; + public deleteExpired = (): void => { + this.processedMessages.deleteExpired(); + this.downloader.deleteExpired(); + }; + public msgGetProcessed = async (msgId: string): Promise => { - // todo: retries? exceptions? - const msgDownload = this.downloader.msgGetCached(msgId); - if (msgDownload.processed) { - return msgDownload.processed; + let processed = this.processedMessages.get(msgId); + if (!processed) { + processed = (async () => { + return this.processFull(await this.downloader.msgGetFull(msgId)); + })(); + this.processedMessages.set(msgId, processed); } - const fullMsg = await msgDownload.download.full; + return this.processedMessages.await(msgId, processed); + }; + + private processFull = async (fullMsg: GmailRes.GmailMsg): Promise => { const { body, attachments } = MessageRenderer.getMessageBodyAndAttachments(fullMsg); const blocks = Mime.processBody(body); const isBodyEmpty = Mime.isBodyEmpty(body); @@ -395,17 +413,12 @@ export class MessageRenderer { // todo: queue full attachment download, when the cache is implemented? } } - msgDownload.processed = { + return { isBodyEmpty, blocks, messageInfo: await this.getMessageInfo(fullMsg), attachments, }; - return msgDownload.processed; - }; - - public deleteExpired = (): void => { - this.downloader.deleteExpired(); }; private getMessageInfo = async (fullMsg: GmailRes.GmailMsg): Promise => { @@ -781,12 +794,4 @@ export class MessageRenderer { return 'shown'; } }; - - private msgGetRaw = async (msgId: string): Promise => { - const msgDownload = this.downloader.msgGetCached(msgId).download; - if (!msgDownload.raw) { - msgDownload.raw = this.gmail.msgGet(msgId, 'raw'); - } - return (await msgDownload.raw).raw || ''; - }; } From 96c82e3787a3af93f2bdd514026212a14ea88d15 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sun, 11 Jun 2023 11:25:53 +0100 Subject: [PATCH 131/147] remove rejected promises from cache: fix, unit test --- extension/js/common/core/expiration-cache.ts | 2 +- test/source/tests/unit-node.ts | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/extension/js/common/core/expiration-cache.ts b/extension/js/common/core/expiration-cache.ts index e6859e2f4e6..7408adecac1 100644 --- a/extension/js/common/core/expiration-cache.ts +++ b/extension/js/common/core/expiration-cache.ts @@ -48,7 +48,7 @@ export class ExpirationCache { try { return await value; } catch (e) { - if (this.cache.get(key) === value) this.set(key); // remove faulty record + if (this.get(key) === value) this.set(key); // remove faulty record return Promise.reject(e); } }; diff --git a/test/source/tests/unit-node.ts b/test/source/tests/unit-node.ts index 576269cfa4d..31746a000ce 100644 --- a/test/source/tests/unit-node.ts +++ b/test/source/tests/unit-node.ts @@ -2743,6 +2743,23 @@ AAAAAAAAAAAAAAAAzzzzzzzzzzzzzzzzzzzzzzzzzzzz.....`) t.pass(); }); + test(`[unit][ExpirationCache.await] removes rejected promises from cache`, async t => { + const cache = new ExpirationCache>(24 * 60 * 60 * 1000); // 24 hours + const rejectionPromise = Promise.reject(Error('test-error')); + cache.set('test-key', rejectionPromise); + await t.throwsAsync(() => cache.await('test-key', rejectionPromise) as Promise>, { + instanceOf: Error, + message: 'test-error', + }); + expect(cache.get('test-key')).to.be.an('undefined'); // next call simply returns undefined + const fulfilledPromise = Promise.resolve('new-test-value'); + cache.set('test-key', fulfilledPromise); + // good value is returned indefinitely + expect(await cache.await('test-key', fulfilledPromise)).to.equal('new-test-value'); + expect(await cache.await('test-key', fulfilledPromise)).to.equal('new-test-value'); + expect(cache.get('test-key')).to.equal(fulfilledPromise); + }); + test(`[unit][Str] splitAlphanumericExtended returns all parts extendec till the end of the original string`, async t => { expect(Str.splitAlphanumericExtended('part1.part2@part3.part4')).to.eql(['part1.part2@part3.part4', 'part2@part3.part4', 'part3.part4', 'part4']); t.pass(); From 808e1e74b9d02dd93ed7c9d53dc6e9c6e40b28fa Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sun, 11 Jun 2023 11:26:40 +0100 Subject: [PATCH 132/147] comment --- extension/js/common/core/mime.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/extension/js/common/core/mime.ts b/extension/js/common/core/mime.ts index 940e73e12df..419b2a46a7e 100644 --- a/extension/js/common/core/mime.ts +++ b/extension/js/common/core/mime.ts @@ -98,9 +98,10 @@ export class Mime { for (const file of decoded.attachments) { let treatAs = file.treatAs(decoded.attachments, Mime.isBodyEmpty(decoded)); if (['needChunk', 'maybePgp'].includes(treatAs)) { - // todo: attachments from MimeContent always have data set, so we can perform whatever analysis is needed, + // todo: attachments from MimeContent always have data set (so 'needChunk' should never happen), + // and we can perform whatever analysis is needed based on the actual data, // but we don't want to reference MsgUtil and OpenPGP.js from this class, - // so we need to move this method to MessageRenderer + // so I suggest to move this method to MessageRenderer for further refactoring treatAs = 'encryptedMsg'; // publicKey? } if (treatAs === 'encryptedMsg') { From 24f6766f23f8f3dcf915031abd7eac5fb982d234 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sun, 11 Jun 2023 12:26:45 +0100 Subject: [PATCH 133/147] simplify and comment --- extension/js/common/core/mime.ts | 27 +++++++------------------ extension/js/common/message-renderer.ts | 3 +-- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/extension/js/common/core/mime.ts b/extension/js/common/core/mime.ts index 419b2a46a7e..df4b55a0e45 100644 --- a/extension/js/common/core/mime.ts +++ b/extension/js/common/core/mime.ts @@ -57,10 +57,6 @@ export type MimeProccesedMsg = { blocks: MsgBlock[]; // may be many blocks per file }; -export type MimeProccesedFromRawMsg = MimeProccesedMsg & { - headers: Dict; -}; - type SendingType = 'to' | 'cc' | 'bcc'; export class Mime { @@ -139,17 +135,11 @@ export class Mime { } if (signatureAttachments.length) { // todo: if multiple signatures, figure out which fits what - const signatureAttachment = signatureAttachments[0]; - // todo: data may not be present - if (signatureAttachment.hasData()) { - const signature = signatureAttachment.getData().toUtfStr(); - if (![...bodyBlocks, ...attachmentBlocks].some(block => ['plainText', 'plainHtml', 'signedMsg'].includes(block.type))) { - // signed an empty message - attachmentBlocks.push(new MsgBlock('signedMsg', '', true, signature)); - } - } else { - // todo: is this possible while we always load 'raw' for detached signature messages - throw new Error('No data.'); + // attachments from MimeContent always have data set + const signature = signatureAttachments[0].getData().toUtfStr(); + if (![...bodyBlocks, ...attachmentBlocks].some(block => ['plainText', 'plainHtml', 'signedMsg'].includes(block.type))) { + // signed an empty message + attachmentBlocks.push(new MsgBlock('signedMsg', '', true, signature)); } } return { @@ -164,12 +154,9 @@ export class Mime { return Mime.processAttachments(bodyBlocks, decoded); }; - public static process = async (mimeMsg: Uint8Array): Promise => { + public static process = async (mimeMsg: Uint8Array) => { const decoded = await Mime.decode(mimeMsg); - return { - headers: decoded.headers, - ...Mime.processDecoded(decoded), - }; + return Mime.processDecoded(decoded); }; public static resemblesMsg = (msg: Uint8Array | string) => { diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index 5f06e1fac21..458468a02bc 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -214,8 +214,7 @@ export class MessageRenderer { const email = Str.parseEmail(signerEmail).email; if (!email) return []; const parsedPubs = (await ContactStore.getOneWithAllPubkeys(undefined, email))?.sortedPubkeys ?? []; - // todo: we don't actually need parsed pubs here because we're going to pass them to the background page - // maybe we can have a method in ContactStore to extract armored keys + // todo: we're armoring pubkeys here to pass them to MsgUtil. Perhaps, we can optimize this return parsedPubs.map(key => KeyUtil.armor(key.pubkey)); }; From d0e78cd81fb2f79df83da12750dd25bcc9f83f86 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 13 Jun 2023 16:08:55 +0000 Subject: [PATCH 134/147] checked todo --- extension/js/common/core/mime.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/extension/js/common/core/mime.ts b/extension/js/common/core/mime.ts index df4b55a0e45..efc57749f58 100644 --- a/extension/js/common/core/mime.ts +++ b/extension/js/common/core/mime.ts @@ -143,8 +143,7 @@ export class Mime { } } return { - blocks: [...bodyBlocks, ...attachmentBlocks], // todo: check how compose-quote-module works, previous version made 'plainText' and 'plainHtml' invisible if a 'signature' block is present - // by changing their types to 'signedText' and 'signedHtml' respectively + blocks: [...bodyBlocks, ...attachmentBlocks], rawSignedContent: decoded.rawSignedContent, }; }; From 39d6dfbc0fd2bd291720fb40d3683a8271b6e2b0 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 14 Jun 2023 09:39:33 +0000 Subject: [PATCH 135/147] 'auth needed' notification is shown when processing armored blocks - unit test --- test/source/tests/decrypt.ts | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index d1b6ffa2fb9..a1fa8cc2d6d 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -250,6 +250,29 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te }) ); + test( + 'mail.google.com - "auth needed" notification is shown when processing armored blocks', + testWithBrowser(async (t, browser) => { + const { authHdr } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'ci.tests.gmail'); + const msgId = '17b91b7e122902d2'; + t.mockApi!.configProvider!.config.google = { + getMsg: { + [msgId]: { full: { error: new HttpClientErr('RequestTimeout', Status.UNAUTHORIZED) } }, + }, + }; + const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${msgId}`, undefined, authHdr); + // Check reconnect auth notification + await gmailPage.waitForContent('@webmail-notification-setup', 'Please reconnect FlowCrypt to your Gmail Account.'); + await gmailPage.waitAll('iframe'); + await BrowserRecipe.pgpBlockCheck(t, await gmailPage.getFrame(['pgp_block.htm']), { + content: ['this should decrypt even offline'], + encryption: 'encrypted', + signature: 'signed', + }); + await gmailPage.close(); + }) + ); + test( 'mail.google.com - failure fetching raw message for detached signature - sets attachment status', testWithBrowser(async (t, browser) => { From 7fa5b5fe4f1ec68f3d635200e61ea69ab12b5610 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 14 Jun 2023 11:04:03 +0000 Subject: [PATCH 136/147] 'auth needed' notification is shown when processing armored blocks - fix --- .../webmail/gmail-element-replacer.ts | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index 418d3c793cb..43323b425f2 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -166,6 +166,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { try { ({ messageInfo, blocks } = await this.messageRenderer.msgGetProcessed(msgId)); } catch (e) { + this.handleException(e); // fill with fallback values from the element blocks = Mime.processBody({ text: emailContainer.innerText }); // todo: print info for offline? @@ -395,17 +396,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { } await this.processAttachments(msgId, attachments, attachmentsContainer, messageInfo, isBodyEmpty, false); } catch (e) { - if (ApiErr.isAuthErr(e)) { - this.notifications.showAuthPopupNeeded(this.acctEmail); - $(newPgpAttachments).find('.attachment_loader').text('Auth needed'); - } else if (ApiErr.isNetErr(e)) { - $(newPgpAttachments).find('.attachment_loader').text('Network error'); - } else { - if (!ApiErr.isServerErr(e) && !ApiErr.isMailOrAcctDisabledOrPolicy(e) && !ApiErr.isNotFound(e)) { - Catch.reportErr(e); - } - $(newPgpAttachments).find('.attachment_loader').text('Failed to load'); - } + this.handleException(e, $(newPgpAttachments).find('.attachment_loader')); } } else { $(newPgpAttachments).prepend(this.factory.embeddedAttachmentStatus('Unknown message id')); // xss-safe-factory @@ -616,6 +607,23 @@ export class GmailElementReplacer implements WebmailElementReplacer { } }; + // loaderEl is a loader reference in case we're processing an attachment + // todo: we could also re-use a common method like this in Inbox + private handleException = (e: unknown, loaderEl?: JQueryEl) => { + if (ApiErr.isAuthErr(e)) { + this.notifications.showAuthPopupNeeded(this.acctEmail); + loaderEl?.text('Auth needed'); + } else if (ApiErr.isNetErr(e)) { + loaderEl?.text('Network error'); + } else { + if (!ApiErr.isServerErr(e) && !ApiErr.isMailOrAcctDisabledOrPolicy(e) && !ApiErr.isNotFound(e)) { + Catch.reportErr(e); + } + loaderEl?.text('Failed to load'); + // todo: show somenotification if this error happened when replacing armored blocks? + } + }; + private showSwitchToEncryptedReplyWarningIfNeeded = (reployBox: JQueryEl) => { const showSwitchToEncryptedReplyWarning = reployBox.closest('div.h7').find(this.sel.msgOuter).find('iframe.pgp_block').hasClass('encryptedMsg'); if (showSwitchToEncryptedReplyWarning) { From 5b389f5347e26ef32153c1031830322984dcd38a Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 16 Jun 2023 19:34:03 +0100 Subject: [PATCH 137/147] tidy up, exception handling, removed unused FormatError --- .../compose-modules/compose-quote-module.ts | 6 +- .../inbox-active-thread-module.ts | 4 +- .../js/common/core/crypto/pgp/msg-util.ts | 20 ++-- extension/js/common/message-renderer.ts | 91 ++++++++------- .../webmail/gmail-element-replacer.ts | 19 ++-- .../message-export-18024d53a24b19fe.json | 106 ++++++++++++++++++ test/source/tests/decrypt.ts | 19 ++++ 7 files changed, 204 insertions(+), 61 deletions(-) create mode 100644 test/source/mock/google/exported-messages/message-export-18024d53a24b19fe.json diff --git a/extension/chrome/elements/compose-modules/compose-quote-module.ts b/extension/chrome/elements/compose-modules/compose-quote-module.ts index 42efd492a55..75bb07d9259 100644 --- a/extension/chrome/elements/compose-modules/compose-quote-module.ts +++ b/extension/chrome/elements/compose-modules/compose-quote-module.ts @@ -3,7 +3,7 @@ 'use strict'; import { Bm, BrowserMsg } from '../../../js/common/browser/browser-msg.js'; -import { FormatError, MsgUtil, DecryptErrTypes } from '../../../js/common/core/crypto/pgp/msg-util.js'; +import { MsgUtil, DecryptErrTypes } from '../../../js/common/core/crypto/pgp/msg-util.js'; import { ApiErr } from '../../../js/common/api/shared/api-error.js'; import { Buf } from '../../../js/common/core/buf.js'; import { Catch } from '../../../js/common/platform/catch.js'; @@ -160,9 +160,7 @@ export class ComposeQuoteModule extends ViewModule { decryptedFiles, }; } catch (e) { - if (e instanceof FormatError) { - Xss.sanitizeAppend(this.view.S.cached('input_text'), `
\n
\n
\n${Xss.escape(e.data)}`); - } else if (ApiErr.isNetErr(e)) { + if (ApiErr.isNetErr(e)) { // todo: retry } else if (ApiErr.isAuthErr(e)) { BrowserMsg.send.notificationShowAuthPopupNeeded(this.view.parentTabId, { acctEmail: this.view.acctEmail }); diff --git a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts index 3fdc1916f53..1b7590fc7f2 100644 --- a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts +++ b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts @@ -133,7 +133,7 @@ export class InboxActiveThreadModule extends ViewModule { const htmlId = this.replyMsgId(message.id); try { const msg = await this.view.messageRenderer.downloader.msgGetFull(message.id); - const { blocks, isBodyEmpty, messageInfo, attachments } = await this.view.messageRenderer.msgGetProcessed(message.id); + const { blocks, body, messageInfo, attachments } = await this.view.messageRenderer.msgGetProcessed(message.id); const exportBtn = this.debugEmails.includes(this.view.acctEmail) ? 'download api export' : ''; const senderEmail = messageInfo.from?.email; const { renderedXssSafe, blocksInFrames } = this.view.messageRenderer.renderMsg({ blocks, senderEmail }, this.view.showOriginal); @@ -145,7 +145,7 @@ export class InboxActiveThreadModule extends ViewModule { .map(block => XssSafeFactory.renderableMsgBlock(this.view.factory, block, this.view.messageRenderer.isOutgoing(senderEmail))) ); for (const a of attachments) { - await this.view.messageRenderer.processAttachment(a, a.treatAs(attachments, isBodyEmpty), loaderContext, undefined, message.id, messageInfo); + await this.view.messageRenderer.processAttachment(a, body, attachments, loaderContext, undefined, message.id, messageInfo); } const r = `

From: ${Xss.escape(messageInfo.from?.full || 'unknown')} ${ diff --git a/extension/js/common/core/crypto/pgp/msg-util.ts b/extension/js/common/core/crypto/pgp/msg-util.ts index f7ea8976aab..d5c4503af1e 100644 --- a/extension/js/common/core/crypto/pgp/msg-util.ts +++ b/extension/js/common/core/crypto/pgp/msg-util.ts @@ -110,14 +110,6 @@ export enum DecryptErrTypes { other = 'other', } -export class FormatError extends Error { - public data: string; - public constructor(message: string, data: string) { - super(message); - this.data = data; - } -} - export class MsgUtil { public static type: PgpMsgMethod.Type = ({ data }) => { if (!data || !data.length) { @@ -172,7 +164,17 @@ export class MsgUtil { public static verifyDetached: PgpMsgMethod.VerifyDetached = async ({ plaintext, sigText, verificationPubs }) => { const message = await opgp.createMessage({ text: Str.with(plaintext) }); - await message.appendSignature(sigText); + try { + await message.appendSignature(sigText); + } catch (formatErr) { + return { + match: null, // eslint-disable-line no-null/no-null + signerLongids: [], + suppliedLongids: [], + error: String(formatErr).replace('Error: ', ''), + isErrFatal: true, + }; + } return await OpenPGPKey.verify(message, await ContactStore.getPubkeyInfos(undefined, verificationPubs)); }; diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index d3e4fb394aa..21579007159 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -5,11 +5,11 @@ import { GmailParser, GmailRes } from './api/email-provider/gmail/gmail-parser.js'; import { PubLookup } from './api/pub-lookup.js'; import { ClientConfiguration } from './client-configuration.js'; -import { Attachment, Attachment$treatAs, TransferableAttachment } from './core/attachment.js'; +import { Attachment, TransferableAttachment } from './core/attachment.js'; import { Buf } from './core/buf.js'; import { CID_PATTERN, Dict, Str, Value } from './core/common.js'; import { KeyUtil } from './core/crypto/key.js'; -import { DecryptErrTypes, DecryptResult, FormatError, MsgUtil, PgpMsgTypeResult, VerifyRes } from './core/crypto/pgp/msg-util.js'; +import { DecryptErrTypes, DecryptResult, MsgUtil, PgpMsgTypeResult, VerifyRes } from './core/crypto/pgp/msg-util.js'; import { PgpArmor } from './core/crypto/pgp/pgp-armor.js'; import { Mime, MessageBody } from './core/mime.js'; import { MsgBlockParser } from './core/msg-block-parser.js'; @@ -35,7 +35,7 @@ import { isCustomerUrlFesUsed } from './helpers.js'; import { ExpirationCache } from './core/expiration-cache.js'; type ProcessedMessage = { - isBodyEmpty: boolean; + body: MessageBody; blocks: MsgBlock[]; attachments: Attachment[]; messageInfo: MessageInfo; @@ -207,7 +207,7 @@ export class MessageRenderer { private static renderBadSignature = (renderModule: RenderInterfaceBase) => { renderModule.renderSignatureStatus('bad signature'); - renderModule.setFrameColor('red'); // todo: in what other cases should we set the frame red? + renderModule.setFrameColor('red'); }; private static getVerificationPubs = async (signerEmail: string) => { @@ -276,17 +276,18 @@ export class MessageRenderer { public processAttachment = async ( a: Attachment, - treatAs: Attachment$treatAs, + body: MessageBody, + attachments: Attachment[], loaderContext: LoaderContextInterface, attachmentSel: JQueryEl | undefined, - msgId: string, // deprecated - messageInfo: MessageInfo + msgId: string, // for PGP/MIME signed messages + messageInfo: MessageInfo, + skipSignatureAttachment?: boolean ): Promise<'shown' | 'hidden' | 'replaced'> => { // todo - [same name + not processed].first() ... What if attachment metas are out of order compared to how gmail shows it? And have the same name? try { + let treatAs = a.treatAs(attachments, !skipSignatureAttachment && Mime.isBodyEmpty(body)); if (['needChunk', 'maybePgp', 'publicKey'].includes(treatAs)) { - // todo: this isn't the best way to do this - // todo: move into a handler // Inspect a chunk if (this.debug) { console.debug('processAttachment() try -> awaiting chunk + awaiting type'); @@ -294,7 +295,7 @@ export class MessageRenderer { const data = await this.downloader.waitForAttachmentChunkDownload(a); const openpgpType = MsgUtil.type({ data }); if (openpgpType && openpgpType.type === 'publicKey' && openpgpType.armored) { - // todo: how can we have a single helper method? and convert unarmored pubkey to armored if needed + // todo: publicKey attachment can't be too big, so we could do preparePubkey() call (checking file length) right here treatAs = 'publicKey'; } else if (treatAs === 'publicKey' && openpgpType?.type === 'encryptedMsg') { treatAs = 'encryptedFile'; @@ -313,13 +314,17 @@ export class MessageRenderer { } } if (treatAs === 'signature') { - // we could change 'Getting file info..' to 'Loading signed message..' in attachment_loader element - const raw = await this.downloader.msgGetRaw(msgId); // todo: can we try to restore the content attachment from 'full'? - loaderContext.hideAttachment(attachmentSel); - await this.setMsgBodyAndStartProcessing(loaderContext, 'signedDetached', messageInfo.printMailInfo, messageInfo.from?.email, renderModule => - this.processMessageWithDetachedSignatureFromRaw(raw, renderModule, messageInfo.from?.email) - ); - return 'hidden'; // native attachment should be hidden, the "attachment" goes to the message container + if (skipSignatureAttachment) { + treatAs = 'plainFile'; + } else { + // we could change 'Getting file info..' to 'Loading signed message..' in attachment_loader element + const raw = await this.downloader.msgGetRaw(msgId); // todo: can we try to restore the content attachment from 'full'? + loaderContext.hideAttachment(attachmentSel); + await this.setMsgBodyAndStartProcessing(loaderContext, 'signedDetached', messageInfo.printMailInfo, messageInfo.from?.email, renderModule => + this.processMessageWithDetachedSignatureFromRaw(raw, renderModule, messageInfo.from?.email, body) + ); + return 'hidden'; // native attachment should be hidden, the "attachment" goes to the message container + } } if (treatAs !== 'plainFile') { loaderContext.hideAttachment(attachmentSel); @@ -413,7 +418,7 @@ export class MessageRenderer { } } return { - isBodyEmpty, + body, blocks, messageInfo: await this.getMessageInfo(fullMsg), attachments, @@ -620,43 +625,51 @@ export class MessageRenderer { }; }; - private processMessageWithDetachedSignatureFromRaw = async (raw: string, renderModule: RenderInterface, signerEmail: string | undefined) => { + private processMessageWithDetachedSignatureFromRaw = async ( + raw: string, + renderModule: RenderInterface, + signerEmail: string | undefined, + body: MessageBody + ) => { // ... from PgpBlockViewDecryptModule.initialize const mimeMsg = Buf.fromBase64UrlStr(raw); const parsed = await Mime.decode(mimeMsg); - if (parsed && typeof parsed.rawSignedContent === 'string') { + if (!parsed || typeof parsed.rawSignedContent !== 'string') { + renderModule.renderErr( + 'Error: could not properly parse signed message', + parsed.rawSignedContent || parsed.text || parsed.html || mimeMsg.toUtfStr(), + 'parse error' + ); + } else { const signatureAttachment = parsed.attachments.find(a => a.treatAs(parsed.attachments) === 'signature'); // todo: more than one signature candidate? if (signatureAttachment) { const parsedSignature = signatureAttachment.getData().toUtfStr(); // ... from PgpBlockViewDecryptModule.decryptAndRender const sigText = parsedSignature.replace('\n=3D', '\n='); - const encryptedData = parsed.rawSignedContent; + const plaintext = parsed.rawSignedContent; try { const verificationPubs = signerEmail ? await MessageRenderer.getVerificationPubs(signerEmail) : []; - const verify = async (verificationPubs: string[]) => await MsgUtil.verifyDetached({ plaintext: encryptedData, sigText, verificationPubs }); + const verify = async (verificationPubs: string[]) => await MsgUtil.verifyDetached({ plaintext, sigText, verificationPubs }); const signatureResult = await verify(verificationPubs); return await this.decideDecryptedContentFormattingAndRender( signerEmail, verificationPubs, - encryptedData, + plaintext, false, signatureResult, renderModule, this.getRetryVerification(signerEmail, verify) ); } catch (e) { - // todo: network errors shouldn't pass to this point - // so an exception here would be an unexpected failure, - // need to handle it properly - console.log(e); + // network errors shouldn't pass to this point + // so an exception here would be an unexpected failure + if (ApiErr.isSignificant(e)) { + Catch.reportErr(e); + } + renderModule.renderErr(Xss.escape(String(e)), body.html || body.text); // instead of raw MIME, show some readable text } } } - renderModule.renderErr( - 'Error: could not properly parse signed message', - parsed.rawSignedContent || parsed.text || parsed.html || mimeMsg.toUtfStr(), - 'parse error' - ); return {}; }; @@ -757,13 +770,15 @@ export class MessageRenderer { // const subject = gmailMsg.payload ? GmailParser.findHeader(gmailMsg.payload, 'subject') : undefined; const armoredMsg = PgpArmor.clip(attachment.getData().toUtfStr()); if (!armoredMsg) { - // todo: - throw new FormatError('Problem extracting armored message', attachment.getData().toUtfStr()); + renderModule.renderErr('Problem extracting armored message', attachment.getData().toUtfStr()); + } else { + renderModule.renderText('Decrypting...'); + return await this.renderCryptoMessage(armoredMsg, renderModule, false, senderEmail, isPwdMsgBasedOnMsgSnippet); } - renderModule.renderText('Decrypting...'); - return await this.renderCryptoMessage(armoredMsg, renderModule, false, senderEmail, isPwdMsgBasedOnMsgSnippet); - } catch { - // todo: render error via renderModule + } catch (e) { + // todo: re-fetch attachment on error? + if (ApiErr.isSignificant(e)) Catch.reportErr(e); + renderModule.renderErr(Xss.escape(String(e)), attachment.hasData() ? attachment.getData().toUtfStr() : undefined); } return {}; }; diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index 43323b425f2..67c4be10a54 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -25,7 +25,7 @@ import { RelayManager } from '../../common/relay-manager.js'; import { MessageInfo } from '../../common/render-message.js'; import { LoaderContextWebmail } from './loader-context.js'; import { JQueryEl } from '../../common/loader-context-interface.js'; -import { Mime } from '../../common/core/mime.js'; +import { MessageBody, Mime } from '../../common/core/mime.js'; import { MsgBlock } from '../../common/core/msg-block.js'; export class GmailElementReplacer implements WebmailElementReplacer { @@ -390,11 +390,11 @@ export class GmailElementReplacer implements WebmailElementReplacer { if (this.debug) { console.debug('processNewPgpAttachments() -> msgGet may take some time'); } - const { attachments, messageInfo, isBodyEmpty } = await this.messageRenderer.msgGetProcessed(msgId); + const { attachments, messageInfo, body } = await this.messageRenderer.msgGetProcessed(msgId); if (this.debug) { console.debug('processNewPgpAttachments() -> msgGet done -> processAttachments', attachments); } - await this.processAttachments(msgId, attachments, attachmentsContainer, messageInfo, isBodyEmpty, false); + await this.processAttachments(msgId, attachments, attachmentsContainer, messageInfo, body, false); } catch (e) { this.handleException(e, $(newPgpAttachments).find('.attachment_loader')); } @@ -409,7 +409,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { attachments: Attachment[], attachmentsContainerInner: JQueryEl, messageInfo: MessageInfo, - isBodyEmpty: boolean, + body: MessageBody, skipGoogleDrive: boolean ) => { if (this.debug) { @@ -428,14 +428,15 @@ export class GmailElementReplacer implements WebmailElementReplacer { attachmentsContainerInner.children().not('.attachment_processed'), new RegExp(`^${Str.regexEscape(a.name || 'noname')}$`) ).first(); - // todo: shouldn't call `treatAs` in too many places ? const renderStatus = await this.messageRenderer.processAttachment( a, - a.treatAs(attachments, isBodyEmpty), + body, + attachments, loaderContext, attachmentSel, msgId, - messageInfo + messageInfo, + skipGoogleDrive ); if (renderStatus === 'hidden') { nRenderedAttachments--; @@ -482,7 +483,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { console.info('Missing Google Drive attachments download_url'); } } - await this.processAttachments(msgId, googleDriveAttachments, attachmentsContainerInner, messageInfo, false, true); + await this.processAttachments(msgId, googleDriveAttachments, attachmentsContainerInner, messageInfo, {}, true); } }; @@ -615,6 +616,8 @@ export class GmailElementReplacer implements WebmailElementReplacer { loaderEl?.text('Auth needed'); } else if (ApiErr.isNetErr(e)) { loaderEl?.text('Network error'); + // todo: } else if (ApiErr.isInPrivateMode(e)) { + // this.notifications.show(`FlowCrypt does not work in a Firefox Private Window (or when Firefox Containers are used). Please try in a standard window.`); } else { if (!ApiErr.isServerErr(e) && !ApiErr.isMailOrAcctDisabledOrPolicy(e) && !ApiErr.isNotFound(e)) { Catch.reportErr(e); diff --git a/test/source/mock/google/exported-messages/message-export-18024d53a24b19fe.json b/test/source/mock/google/exported-messages/message-export-18024d53a24b19fe.json new file mode 100644 index 00000000000..352fdb9ba6c --- /dev/null +++ b/test/source/mock/google/exported-messages/message-export-18024d53a24b19fe.json @@ -0,0 +1,106 @@ +{ + "acctEmail": "flowcrypt.compatibility@gmail.com", + "full": { + "id": "18024d53a24b19fe", + "threadId": "18024d53a24b19fe", + "labelIds": ["INBOX", "Label_35"], + "snippet": "テストですテスト", + "payload": { + "partId": "", + "mimeType": "multipart/signed", + "filename": "", + "headers": [ + { + "name": "Date", + "value": "Fri, 26 Mar 2021 22:08:51 +0900 (JST)" + }, + { + "name": "To", + "value": "flowcrypt.compatibility@gmail.com" + }, + { + "name": "Subject", + "value": "テストです" + }, + { + "name": "From", + "value": "sender@domain.com" + }, + { + "name": "Mime-Version", + "value": "1.0" + }, + { + "name": "Content-Type", + "value": "Multipart/Signed; protocol=\"application/pgp-signature\"; micalg=pgp-sha256; boundary=\"--Security_Multipart(Fri_Mar_26_22_08_51_2021_147)--\"" + }, + { + "name": "Content-Transfer-Encoding", + "value": "7bit" + } + ], + "body": { + "size": 0 + }, + "parts": [ + { + "partId": "0", + "mimeType": "text/plain", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "Text/Plain; charset=iso-2022-jp" + }, + { + "name": "Content-Transfer-Encoding", + "value": "7bit" + } + ], + "body": { + "size": 30, + "data": "44OG44K544OI44Gn44GZCuODhuOCueODiAo=" + } + }, + { + "partId": "1", + "mimeType": "application/pgp-signature", + "filename": "", + "headers": [ + { + "name": "Content-Type", + "value": "application/pgp-signature" + }, + { + "name": "Content-Transfer-Encoding", + "value": "7bit" + } + ], + "body": { + "attachmentId": "18024d53a24b19fe-signature", + "size": 256 + } + } + ] + }, + "sizeEstimate": 1036, + "historyId": "1350094", + "internalDate": "1616764131000" + }, + "attachments": { + "18024d53a24b19fe-signature": { + "data": "LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KCnFjZVUvaW5rd1p5YkFRQzNuZmpNOUEvaXRYMXE3d3p6YWpMbW5VZ0NDeXBxZWRheGdNT2J5S3ZVQlE9PQo9MGtORAotLS0tLUVORCBQR1AgU0lHTkFUVVJFLS0tLS0K", + "size": 256 + } + }, + "raw": { + "id": "18024d53a24b19fe", + "threadId": "18024d53a24b19fe", + "labelIds": ["INBOX", "Label_35"], + "snippet": "テストですテスト", + "sizeEstimate": 1036, + "raw": "RGF0ZTogRnJpLCAyNiBNYXIgMjAyMSAyMjowODo1MSArMDkwMCAoSlNUKQpNZXNzYWdlLUlkOiA8MjAyMTAzMjYuMjIwODUxLjE0MjA4NDkyMTM2MTg0MjU5NkBjZW5zb3JlZD4KVG86IHJlY2lwaWVudEBlbWFpbC5jb20KU3ViamVjdDogPT9pc28tMjAyMi1qcD9CP0d5UkNKVVlsT1NWSUpFY2tPUnNvUWc9PT89CkZyb206IFRvbW95dWtpIE11cmFrYW1pIDx0b21veXVraUBwb2JveC5jb20+Ck1pbWUtVmVyc2lvbjogMS4wCkNvbnRlbnQtVHlwZTogTXVsdGlwYXJ0L1NpZ25lZDsgcHJvdG9jb2w9ImFwcGxpY2F0aW9uL3BncC1zaWduYXR1cmUiOwogbWljYWxnPXBncC1zaGEyNTY7CiBib3VuZGFyeT0iLS1TZWN1cml0eV9NdWx0aXBhcnQoRnJpX01hcl8yNl8yMl8wOF81MV8yMDIxXzE0NyktLSIKQ29udGVudC1UcmFuc2Zlci1FbmNvZGluZzogN2JpdAoKLS0tLVNlY3VyaXR5X011bHRpcGFydChGcmlfTWFyXzI2XzIyXzA4XzUxXzIwMjFfMTQ3KS0tCkNvbnRlbnQtVHlwZTogVGV4dC9QbGFpbjsgY2hhcnNldD1pc28tMjAyMi1qcApDb250ZW50LVRyYW5zZmVyLUVuY29kaW5nOiA3Yml0CgobJEIlRiU5JUgkRyQ5GyhCChskQiVGJTklSBsoQgoKLS0tLVNlY3VyaXR5X011bHRpcGFydChGcmlfTWFyXzI2XzIyXzA4XzUxXzIwMjFfMTQ3KS0tCkNvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vcGdwLXNpZ25hdHVyZQpDb250ZW50LVRyYW5zZmVyLUVuY29kaW5nOiA3Yml0CgotLS0tLUJFR0lOIFBHUCBTSUdOQVRVUkUtLS0tLQoKcWNlVS9pbmt3WnliQVFDM25mak05QS9pdFgxcTd3enphakxtblVnQ0N5cHFlZGF4Z01PYnlLdlVCUT09Cj0wa05ECi0tLS0tRU5EIFBHUCBTSUdOQVRVUkUtLS0tLQoKLS0tLVNlY3VyaXR5X011bHRpcGFydChGcmlfTWFyXzI2XzIyXzA4XzUxXzIwMjFfMTQ3KS0tLS0K", + "historyId": "1350094", + "internalDate": "1616764131000" + } +} diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index c99d235a226..9df2466467c 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -1096,6 +1096,25 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw== }) ); + test( + 'decrypt - verifyDetached displays error on corrupted signature attachment', + testWithBrowser(async (t, browser) => { + const msgId = '18024d53a24b19fe'; + const { authHdr } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'compatibility'); + await BrowserRecipe.pgpBlockVerifyDecryptedContent( + t, + browser, + msgId, + { + content: ['テストです\nテスト'], + signature: 'error verifying signature: Ascii armor integrity check failed', + encryption: 'not encrypted', + }, + authHdr + ); + }) + ); + test( "decrypt - thunderbird - signedMsg verifyDetached doesn't duplicate PGP key section", testWithBrowser(async (t, browser) => { From 267cabc9b1e1a59641041c7c7d3eba028dce673a Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sat, 17 Jun 2023 09:49:22 +0100 Subject: [PATCH 138/147] renaming and tidying up --- .../js/content_scripts/webmail/gmail-element-replacer.ts | 7 +++---- .../webmail/{loader-context.ts => gmail-loader-context.ts} | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) rename extension/js/content_scripts/webmail/{loader-context.ts => gmail-loader-context.ts} (95%) diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index 67c4be10a54..978e1505890 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -23,7 +23,7 @@ import { ContactStore } from '../../common/platform/store/contact-store.js'; import { MessageRenderer } from '../../common/message-renderer.js'; import { RelayManager } from '../../common/relay-manager.js'; import { MessageInfo } from '../../common/render-message.js'; -import { LoaderContextWebmail } from './loader-context.js'; +import { GmailLoaderContext } from './gmail-loader-context.js'; import { JQueryEl } from '../../common/loader-context-interface.js'; import { MessageBody, Mime } from '../../common/core/mime.js'; import { MsgBlock } from '../../common/core/msg-block.js'; @@ -185,7 +185,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { if (this.debug) { console.debug('replaceArmoredBlocks() for of emailsContainingPgpBlock -> emailContainer replacing'); } - LoaderContextWebmail.updateMsgBodyEl_DANGEROUSLY(emailContainer, 'set', renderedXssSafe); // xss-safe-factory: replace_blocks is XSS safe + GmailLoaderContext.updateMsgBodyEl_DANGEROUSLY(emailContainer, 'set', renderedXssSafe); // xss-safe-factory: replace_blocks is XSS safe if (this.debug) { console.debug('replaceArmoredBlocks() for of emailsContainingPgpBlock -> emailContainer replaced'); } @@ -419,7 +419,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { if (!messageInfo.from?.email) { messageInfo.from = this.getFrom(msgEl); } - const loaderContext = new LoaderContextWebmail(this.factory, msgEl, attachmentsContainerInner); + const loaderContext = new GmailLoaderContext(this.factory, msgEl, attachmentsContainerInner); attachmentsContainerInner = $(attachmentsContainerInner); attachmentsContainerInner.parent().find(this.sel.numberOfAttachments).hide(); let nRenderedAttachments = attachments.length; @@ -441,7 +441,6 @@ export class GmailElementReplacer implements WebmailElementReplacer { if (renderStatus === 'hidden') { nRenderedAttachments--; } - // if (renderStatus === 'shown') attachmentSel.show(); } if (nRenderedAttachments !== attachments.length) { // according to #4200, no point in showing "download all" button if at least one attachment is encrypted etc. diff --git a/extension/js/content_scripts/webmail/loader-context.ts b/extension/js/content_scripts/webmail/gmail-loader-context.ts similarity index 95% rename from extension/js/content_scripts/webmail/loader-context.ts rename to extension/js/content_scripts/webmail/gmail-loader-context.ts index b258c7a3cf9..3839761a4a0 100644 --- a/extension/js/content_scripts/webmail/loader-context.ts +++ b/extension/js/content_scripts/webmail/gmail-loader-context.ts @@ -6,7 +6,7 @@ import { Attachment } from '../../common/core/attachment.js'; import { JQueryEl, LoaderContextInterface } from '../../common/loader-context-interface.js'; import { XssSafeFactory } from '../../common/xss-safe-factory.js'; -export class LoaderContextWebmail implements LoaderContextInterface { +export class GmailLoaderContext implements LoaderContextInterface { public constructor(private readonly factory: XssSafeFactory, public msgEl: JQueryEl, private readonly attachmentsContainerInner: JQueryEl) {} /* eslint-disable @typescript-eslint/naming-convention */ @@ -90,7 +90,7 @@ export class LoaderContextWebmail implements LoaderContextInterface { }; public setMsgBody = (frameXssSafe: string, method: 'set' | 'append' | 'after') => { - this.msgEl = LoaderContextWebmail.updateMsgBodyEl_DANGEROUSLY(this.msgEl, method, frameXssSafe); // xss-safe-factory + this.msgEl = GmailLoaderContext.updateMsgBodyEl_DANGEROUSLY(this.msgEl, method, frameXssSafe); // xss-safe-factory }; public hideAttachment = (attachmentEl: JQueryEl) => { From 3af3fe37177dc4e924255b280534ce5fafbad70f Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sat, 17 Jun 2023 10:12:06 +0100 Subject: [PATCH 139/147] tidy up --- extension/js/common/message-renderer.ts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index 21579007159..a1f38547d98 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -415,6 +415,7 @@ export class MessageRenderer { this.downloader.queueAttachmentChunkDownload(a); } else { // todo: queue full attachment download, when the cache is implemented? + // note: this cache should return void or throw an exception because the data bytes are set to the Attachment object } } return { @@ -597,8 +598,12 @@ export class MessageRenderer { // I guess, no additional publicKeys will appear here for display... } }) - .finally(() => relayManager.done(frameId)) - .catch(Catch.reportErr); + .catch(e => { + // normally no exceptions come to this point so let's report it + Catch.reportErr(e); + renderModule.renderErr(Xss.escape(String(e)), undefined); + }) + .finally(() => relayManager.done(frameId)); return { processor }; }; @@ -756,7 +761,8 @@ export class MessageRenderer { ) => { try { if (!attachment.hasData()) { - // todo: common cache, load control? + // todo: implement cache similar to chunk downloads + // note: this cache should return void or throw an exception because the data bytes are set to the Attachment object this.relayManager.renderProgressText(frameId, 'Retrieving message...'); await this.gmail.fetchAttachment(attachment, expectedTransferSize => { return { @@ -776,7 +782,7 @@ export class MessageRenderer { return await this.renderCryptoMessage(armoredMsg, renderModule, false, senderEmail, isPwdMsgBasedOnMsgSnippet); } } catch (e) { - // todo: re-fetch attachment on error? + // todo: provide 'retry' button on isNetErr to re-fetch the attachment and continue processing? if (ApiErr.isSignificant(e)) Catch.reportErr(e); renderModule.renderErr(Xss.escape(String(e)), attachment.hasData() ? attachment.getData().toUtfStr() : undefined); } From 42f108bde71d3778af1d47c666d1ebb78ca92607 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sun, 18 Jun 2023 16:32:44 +0100 Subject: [PATCH 140/147] XSS safety review, comments --- .../inbox-active-thread-module.ts | 73 +++++++++++++------ .../js/common/loader-context-interface.ts | 8 +- extension/js/common/message-renderer.ts | 30 ++++---- extension/js/common/xss-safe-factory.ts | 2 +- .../webmail/gmail-element-replacer.ts | 6 +- .../webmail/gmail-loader-context.ts | 14 +++- 6 files changed, 89 insertions(+), 44 deletions(-) diff --git a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts index 1b7590fc7f2..f4404ab0bd3 100644 --- a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts +++ b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts @@ -21,26 +21,59 @@ import { Attachment } from '../../../../js/common/core/attachment.js'; import { LoaderContextInterface } from '../../../../js/common/loader-context-interface.js'; class LoaderContext implements LoaderContextInterface { - public constructor(private readonly factory: XssSafeFactory, public renderedMessageXssSafe: string | undefined, public renderedAttachments: string[]) {} + private renderedMessageXssSafe: string | undefined; // xss-none + private renderedAttachmentsXssSafe: string[] = []; // xss-none + + public constructor(private readonly factory: XssSafeFactory) {} public renderPlainAttachment = (a: Attachment) => { // todo: render error argument - this.renderedAttachments.push(this.factory.embeddedAttachment(a, false)); + this.renderedAttachmentsXssSafe.push(this.factory.embeddedAttachment(a, false)); // xss-safe-factory }; public prependEncryptedAttachment = (a: Attachment) => { - this.renderedAttachments.unshift(this.factory.embeddedAttachment(a, true)); + this.renderedAttachmentsXssSafe.unshift(this.factory.embeddedAttachment(a, true)); // xss-safe-factory }; - public setMsgBody = (xssSafe: string, method: 'set' | 'append' | 'after') => { + /* eslint-disable @typescript-eslint/naming-convention */ + /** + * XSS WARNING + * + * newHtmlContent must be XSS safe + */ + // prettier-ignore + public setMsgBody_DANGEROUSLY = (newHtmlContent_MUST_BE_XSS_SAFE: string, method: 'set' | 'append' | 'after') => { // xss-dangerous-function + /* eslint-enable @typescript-eslint/naming-convention */ if (method === 'set') { - this.renderedMessageXssSafe = xssSafe; + this.renderedMessageXssSafe = newHtmlContent_MUST_BE_XSS_SAFE; // xss-safe-value } else { // todo: how append should differ from after? - this.renderedAttachments.unshift(xssSafe); + this.renderedAttachmentsXssSafe.unshift(newHtmlContent_MUST_BE_XSS_SAFE); // xss-safe-value } }; + public getRenderedMessageXssSafe = (): string => { + return this.renderedMessageXssSafe || ''; + }; + + public getRenderedAttachmentsXssSafe = (): string => { + return this.renderedAttachmentsXssSafe.length + ? `

${this.renderedAttachmentsXssSafe.join('')}
` + : ''; + }; + + /* eslint-disable @typescript-eslint/naming-convention */ + /** + * XSS WARNING + * + * newHtmlContents must be XSS safe + */ + // prettier-ignore + public setRenderedAttachments_DANGEROUSLY = (newHtmlContents_MUST_BE_XSS_SAFE: string[]) => { // xss-dangerous-function + /* eslint-enable @typescript-eslint/naming-convention */ + this.renderedAttachmentsXssSafe = newHtmlContents_MUST_BE_XSS_SAFE; // xss-safe-value + }; + public hideAttachment = () => { // not applicable }; @@ -134,28 +167,26 @@ export class InboxActiveThreadModule extends ViewModule { try { const msg = await this.view.messageRenderer.downloader.msgGetFull(message.id); const { blocks, body, messageInfo, attachments } = await this.view.messageRenderer.msgGetProcessed(message.id); - const exportBtn = this.debugEmails.includes(this.view.acctEmail) ? 'download api export' : ''; const senderEmail = messageInfo.from?.email; - const { renderedXssSafe, blocksInFrames } = this.view.messageRenderer.renderMsg({ blocks, senderEmail }, this.view.showOriginal); - const loaderContext = new LoaderContext( - this.view.factory, - renderedXssSafe, - blocks - .filter(block => block.attachmentMeta && ['encryptedAttachment', 'plainAttachment'].includes(block.type)) - .map(block => XssSafeFactory.renderableMsgBlock(this.view.factory, block, this.view.messageRenderer.isOutgoing(senderEmail))) - ); + const { renderedXssSafe, blocksInFrames } = this.view.messageRenderer.renderMsg({ blocks, senderEmail }, this.view.showOriginal); // xss-safe-factory + const loaderContext = new LoaderContext(this.view.factory); + // not doing this in the constructor to track XSS safety + const renderedAttachmentsXssSafe = /* xss-safe-factory */ blocks + .filter(block => block.attachmentMeta && ['encryptedAttachment', 'plainAttachment'].includes(block.type)) + .map(block => XssSafeFactory.renderableMsgBlock(this.view.factory, block, this.view.messageRenderer.isOutgoing(senderEmail))); + loaderContext.setRenderedAttachments_DANGEROUSLY(renderedAttachmentsXssSafe); // xss-safe-factory + loaderContext.setMsgBody_DANGEROUSLY(renderedXssSafe, 'set'); // xss-safe-value for (const a of attachments) { await this.view.messageRenderer.processAttachment(a, body, attachments, loaderContext, undefined, message.id, messageInfo); } + const exportBtn = this.debugEmails.includes(this.view.acctEmail) ? 'download api export' : ''; const r = `

From: ${Xss.escape(messageInfo.from?.full || 'unknown')} ${ GmailParser.findHeader(msg, 'Date') ?? '' - } ${exportBtn}

` + - (loaderContext.renderedMessageXssSafe ?? '') + - (loaderContext.renderedAttachments.length - ? `
${loaderContext.renderedAttachments.join('')}
` - : ''); - $('.thread').append(this.wrapMsg(htmlId, r)); // xss-safe-factory + } ${exportBtn}

` + // xss-direct + loaderContext.getRenderedMessageXssSafe() + + loaderContext.getRenderedAttachmentsXssSafe(); + $('.thread').append(this.wrapMsg(htmlId, r)); // xss-safe-value await this.view.messageRenderer.startProcessingInlineBlocks(this.view.relayManager, this.view.factory, messageInfo, blocksInFrames); if (exportBtn) { $('.action-export').on( diff --git a/extension/js/common/loader-context-interface.ts b/extension/js/common/loader-context-interface.ts index 309c962f921..6486ced90d3 100644 --- a/extension/js/common/loader-context-interface.ts +++ b/extension/js/common/loader-context-interface.ts @@ -14,5 +14,11 @@ export interface LoaderContextInterface { hideAttachment(attachmentSel?: JQueryEl): void; - setMsgBody(frameXssSafe: string, method: 'set' | 'append' | 'after'): void; + /** + * XSS WARNING + * + * newHtmlContent must be XSS safe + */ + // eslint-disable-next-line @typescript-eslint/naming-convention + setMsgBody_DANGEROUSLY(newHtmlContent_MUST_BE_XSS_SAFE: string, method: 'set' | 'append' | 'after'): void; // xss-dangerous-function } diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index a1f38547d98..84a71bfb041 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -134,7 +134,9 @@ export class MessageRenderer { const bodies = GmailParser.findBodies(gmailMsg); const attachments = GmailParser.findAttachments(gmailMsg, gmailMsg.id); const text = bodies['text/plain'] ? Buf.fromBase64UrlStr(bodies['text/plain']).toUtfStr() : undefined; - // todo: do we need to strip? + // stripping HTML tags here for safety in the way extractArmoredBlock used to do, should we? + // note: MimeContent.html returned from Mime.decode (when processing a raw MIME-message) isn't stripped + // so there is another stripping that takes place later when rendering in XssSafeFactory.renderableMsgBlock const html = bodies['text/html'] ? Xss.htmlSanitizeAndStripAllTags(Buf.fromBase64UrlStr(bodies['text/html']).toUtfStr(), '\n') : undefined; return { body: { @@ -252,22 +254,20 @@ export class MessageRenderer { public renderMsg = ({ senderEmail, blocks }: { blocks: MsgBlock[]; senderEmail?: string }, showOriginal: boolean) => { const isOutgoing = this.isOutgoing(senderEmail); const blocksInFrames: Dict = {}; - let r = ''; + let renderedXssSafe = ''; // xss-direct for (const block of blocks) { - if (r) { - r += '

'; - } + if (renderedXssSafe) renderedXssSafe += '

'; // xss-direct if (showOriginal) { - r += Xss.escape(Str.with(block.content)).replace(/\n/g, '
'); + renderedXssSafe += Xss.escape(Str.with(block.content)).replace(/\n/g, '
'); // xss-escaped } else if (['signedMsg', 'encryptedMsg'].includes(block.type)) { - const { frameId, frameXssSafe } = this.factory.embeddedMsg(block.type); - r += frameXssSafe; + const { frameId, frameXssSafe } = this.factory.embeddedMsg(block.type); // xss-safe-factory + renderedXssSafe += frameXssSafe; // xss-safe-value blocksInFrames[frameId] = block; } else { - r += XssSafeFactory.renderableMsgBlock(this.factory, block, isOutgoing); + renderedXssSafe += XssSafeFactory.renderableMsgBlock(this.factory, block, isOutgoing); // xss-safe-factory } } - return { renderedXssSafe: r, isOutgoing, blocksInFrames }; + return { renderedXssSafe, isOutgoing, blocksInFrames }; // xss-safe-value }; public isOutgoing = (senderEmail: string | undefined) => { @@ -318,7 +318,7 @@ export class MessageRenderer { treatAs = 'plainFile'; } else { // we could change 'Getting file info..' to 'Loading signed message..' in attachment_loader element - const raw = await this.downloader.msgGetRaw(msgId); // todo: can we try to restore the content attachment from 'full'? + const raw = await this.downloader.msgGetRaw(msgId); loaderContext.hideAttachment(attachmentSel); await this.setMsgBodyAndStartProcessing(loaderContext, 'signedDetached', messageInfo.printMailInfo, messageInfo.from?.email, renderModule => this.processMessageWithDetachedSignatureFromRaw(raw, renderModule, messageInfo.from?.email, body) @@ -335,7 +335,7 @@ export class MessageRenderer { if (treatAs === 'publicKey') { const { armoredPubkey, openpgpType } = await this.preparePubkey(a); if (armoredPubkey) { - loaderContext.setMsgBody(this.factory.embeddedPubkey(armoredPubkey, this.isOutgoing(messageInfo.from?.email)), 'after'); + loaderContext.setMsgBody_DANGEROUSLY(this.factory.embeddedPubkey(armoredPubkey, this.isOutgoing(messageInfo.from?.email)), 'after'); // xss-safe-factory return 'hidden'; } else if (openpgpType?.type === 'encryptedMsg') { treatAs = 'encryptedFile'; // fall back to ordinary encrypted attachment @@ -747,8 +747,8 @@ export class MessageRenderer { senderEmail: string | undefined, cb: (renderModule: RenderInterface, frameId: string) => Promise<{ publicKeys?: string[] }> ): Promise<{ processor: Promise }> => { - const { frameId, frameXssSafe } = this.factory.embeddedMsg(type); - loaderContext.setMsgBody(frameXssSafe, 'set'); + const { frameId, frameXssSafe } = this.factory.embeddedMsg(type); // xss-safe-factory + loaderContext.setMsgBody_DANGEROUSLY(frameXssSafe, 'set'); // xss-safe-value return await this.relayAndStartProcessing(this.relayManager, this.factory, frameId, printMailInfo, senderEmail, cb); }; @@ -807,7 +807,7 @@ export class MessageRenderer { ): Promise<'shown' | 'hidden'> => { try { await this.gmail.fetchAttachmentsMissingData([attachment]); - loaderContext.setMsgBody(this.factory.embeddedBackup(attachment.getData().toUtfStr()), 'append'); + loaderContext.setMsgBody_DANGEROUSLY(this.factory.embeddedBackup(attachment.getData().toUtfStr()), 'append'); // xss-safe-factory return 'hidden'; } catch (e) { loaderContext.renderPlainAttachment(attachment, attachmentSel, 'Please reload page'); // todo: unit-test diff --git a/extension/js/common/xss-safe-factory.ts b/extension/js/common/xss-safe-factory.ts index e8b2edb215d..575873460ea 100644 --- a/extension/js/common/xss-safe-factory.ts +++ b/extension/js/common/xss-safe-factory.ts @@ -212,7 +212,7 @@ export class XssSafeFactory { type: string // for diagnostic purposes ) => { const { frameId, frameSrc } = this.srcPgpBlockIframe(); - return { frameId, frameXssSafe: this.iframe(frameSrc, ['pgp_block', type]) + this.hideGmailNewMsgInThreadNotification }; + return { frameId, frameXssSafe: this.iframe(frameSrc, ['pgp_block', type]) + this.hideGmailNewMsgInThreadNotification }; // xss-safe-factory }; public embeddedPubkey = (armoredPubkey: string, isOutgoing?: boolean) => { diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index 978e1505890..a64b119ba36 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -179,7 +179,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { if (!setMessageInfo.from) { setMessageInfo.from = this.getFrom(this.getMsgBodyEl(msgId)); } - const { renderedXssSafe, blocksInFrames } = this.messageRenderer.renderMsg({ blocks, senderEmail: setMessageInfo.from?.email }, false); + const { renderedXssSafe, blocksInFrames } = this.messageRenderer.renderMsg({ blocks, senderEmail: setMessageInfo.from?.email }, false); // xss-safe-value if (!renderedXssSafe) continue; $(this.sel.translatePrompt).hide(); if (this.debug) { @@ -523,7 +523,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { const msgIdElement = messageContainer.find('[data-legacy-message-id], [data-message-id]'); const msgId = msgIdElement.attr('data-legacy-message-id') || msgIdElement.attr('data-message-id'); const replyParams: FactoryReplyParams = { replyMsgId: msgId, removeAfterClose: true }; - const secureReplyBoxXssSafe = `
${this.factory.embeddedReply( + const secureReplyBoxXssSafe = /* xss-safe-factory */ `
${this.factory.embeddedReply( replyParams, true, true @@ -582,7 +582,7 @@ export class GmailElementReplacer implements WebmailElementReplacer { const isReplyButtonView = replyBoxEl.className.includes('nr'); const replyBoxes = document.querySelectorAll('iframe.reply_message'); const alreadyHasSecureReplyBox = replyBoxes.length > 0; - const secureReplyBoxXssSafe = ` + const secureReplyBoxXssSafe = /* xss-safe-factory */ `
${this.factory.embeddedReply(replyParams, this.shouldShowEditableSecureReply || alreadyHasSecureReplyBox)}
diff --git a/extension/js/content_scripts/webmail/gmail-loader-context.ts b/extension/js/content_scripts/webmail/gmail-loader-context.ts index 3839761a4a0..1d098c71ab2 100644 --- a/extension/js/content_scripts/webmail/gmail-loader-context.ts +++ b/extension/js/content_scripts/webmail/gmail-loader-context.ts @@ -13,7 +13,7 @@ export class GmailLoaderContext implements LoaderContextInterface { /** * XSS WARNING * - * new_html_content must be XSS safe + * newHtmlContent must be XSS safe */ // prettier-ignore public static updateMsgBodyEl_DANGEROUSLY( // xss-dangerous-function @@ -89,8 +89,16 @@ export class GmailLoaderContext implements LoaderContextInterface { this.attachmentsContainerInner.prepend(this.factory.embeddedAttachment(a, true)); // xss-safe-factory }; - public setMsgBody = (frameXssSafe: string, method: 'set' | 'append' | 'after') => { - this.msgEl = GmailLoaderContext.updateMsgBodyEl_DANGEROUSLY(this.msgEl, method, frameXssSafe); // xss-safe-factory + /* eslint-disable @typescript-eslint/naming-convention */ + /** + * XSS WARNING + * + * newHtmlContent must be XSS safe + */ + // prettier-ignore + public setMsgBody_DANGEROUSLY = (newHtmlContent_MUST_BE_XSS_SAFE: string, method: 'set' | 'append' | 'after') => { // xss-dangerous-function + /* eslint-enable @typescript-eslint/naming-convention */ + this.msgEl = GmailLoaderContext.updateMsgBodyEl_DANGEROUSLY(this.msgEl, method, newHtmlContent_MUST_BE_XSS_SAFE); // xss-safe-value }; public hideAttachment = (attachmentEl: JQueryEl) => { From f6463410e9c6b1e41180e4649877a04bc71b9df3 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sun, 18 Jun 2023 17:17:49 +0100 Subject: [PATCH 141/147] extra XSS escapes --- extension/js/common/message-renderer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index 84a71bfb041..fd9907d65c6 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -441,7 +441,7 @@ export class MessageRenderer { /* eslint-enable @typescript-eslint/no-non-null-assertion */ return { printMailInfo: { - userNameAndEmail: `${this.fullName ?? ''} <${this.acctEmail}>`, + userNameAndEmail: `${Xss.escape(this.fullName ?? '')} <${Xss.escape(this.acctEmail)}>`, html: `

${Xss.htmlSanitize(GmailParser.findHeader(fullMsg, 'subject') ?? '')}

From cd22928de5cc1634d87297613413c46c41920bc2 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sun, 18 Jun 2023 20:41:02 +0100 Subject: [PATCH 142/147] plainSubject logic restored (no unit tests), comments --- .../inbox-active-thread-module.ts | 2 +- extension/js/common/message-renderer.ts | 36 +++++++++++-------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts index f4404ab0bd3..5c912de10bb 100644 --- a/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts +++ b/extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts @@ -47,7 +47,7 @@ class LoaderContext implements LoaderContextInterface { if (method === 'set') { this.renderedMessageXssSafe = newHtmlContent_MUST_BE_XSS_SAFE; // xss-safe-value } else { - // todo: how append should differ from after? + // todo: we may implement the difference between 'append' and 'after' this.renderedAttachmentsXssSafe.unshift(newHtmlContent_MUST_BE_XSS_SAFE); // xss-safe-value } }; diff --git a/extension/js/common/message-renderer.ts b/extension/js/common/message-renderer.ts index fd9907d65c6..692d3efbd43 100644 --- a/extension/js/common/message-renderer.ts +++ b/extension/js/common/message-renderer.ts @@ -350,7 +350,7 @@ export class MessageRenderer { return 'replaced'; // native should be hidden, custom should appear instead } else if (treatAs === 'encryptedMsg') { await this.setMsgBodyAndStartProcessing(loaderContext, treatAs, messageInfo.printMailInfo, messageInfo.from?.email, (renderModule, frameId) => - this.processCryptoMessage(a, renderModule, frameId, messageInfo.from?.email, messageInfo.isPwdMsgBasedOnMsgSnippet) + this.processCryptoMessage(a, renderModule, frameId, messageInfo.from?.email, messageInfo.isPwdMsgBasedOnMsgSnippet, messageInfo.plainSubject) ); return 'hidden'; // native attachment should be hidden, the "attachment" goes to the message container } else if (treatAs === 'privateKey') { @@ -376,7 +376,7 @@ export class MessageRenderer { await Promise.all( Object.entries(blocks).map(([frameId, block]) => this.relayAndStartProcessing(relayManager, factory, frameId, messageInfo.printMailInfo, messageInfo.from?.email, renderModule => - this.renderMsgBlock(block, renderModule, messageInfo.from?.email, messageInfo.isPwdMsgBasedOnMsgSnippet) + this.renderMsgBlock(block, renderModule, messageInfo.from?.email, messageInfo.isPwdMsgBasedOnMsgSnippet, messageInfo.plainSubject) ) ) ); @@ -439,12 +439,14 @@ export class MessageRenderer { : ''; const bccString = GmailParser.findHeader(fullMsg, 'bcc') ? `Bcc: ${Xss.escape(GmailParser.findHeader(fullMsg, 'bcc')!)}
` : ''; /* eslint-enable @typescript-eslint/no-non-null-assertion */ + const plainSubject = GmailParser.findHeader(fullMsg, 'subject'); return { + plainSubject, printMailInfo: { userNameAndEmail: `${Xss.escape(this.fullName ?? '')} <${Xss.escape(this.acctEmail)}>`, html: `
-

${Xss.htmlSanitize(GmailParser.findHeader(fullMsg, 'subject') ?? '')}

+

${Xss.htmlSanitize(plainSubject ?? '')}


@@ -473,8 +475,8 @@ export class MessageRenderer { isEncrypted: boolean, sigResult: VerifyRes | undefined, renderModule: RenderInterface, - retryVerification?: () => Promise, - plainSubject?: string + retryVerification: (() => Promise) | undefined, + plainSubject: string | undefined ): Promise<{ publicKeys?: string[] }> => { if (isEncrypted) { renderModule.renderEncryptionStatus('encrypted'); @@ -551,7 +553,8 @@ export class MessageRenderer { isEncrypted, newSigResult, renderModule, - this.getRetryVerification(signerEmail, verify) + this.getRetryVerification(signerEmail, verify), + plainSubject ); } renderModule.separateQuotedContentAndRenderText(decryptedContent, isHtml); @@ -611,9 +614,10 @@ export class MessageRenderer { block: MsgBlock, renderModule: RenderInterface, signerEmail: string | undefined, - isPwdMsgBasedOnMsgSnippet: boolean | undefined + isPwdMsgBasedOnMsgSnippet: boolean | undefined, + plainSubject: string | undefined ) => { - return await this.renderCryptoMessage(block.content, renderModule, true, signerEmail, isPwdMsgBasedOnMsgSnippet); + return await this.renderCryptoMessage(block.content, renderModule, true, signerEmail, isPwdMsgBasedOnMsgSnippet, plainSubject); }; // todo: this should be moved to some other class? @@ -663,7 +667,8 @@ export class MessageRenderer { false, signatureResult, renderModule, - this.getRetryVerification(signerEmail, verify) + this.getRetryVerification(signerEmail, verify), + undefined ); } catch (e) { // network errors shouldn't pass to this point @@ -683,7 +688,8 @@ export class MessageRenderer { renderModule: RenderInterface, fallbackToPlainText: boolean, signerEmail: string | undefined, - isPwdMsgBasedOnMsgSnippet: boolean | undefined + isPwdMsgBasedOnMsgSnippet: boolean | undefined, + plainSubject: string | undefined ): Promise<{ publicKeys?: string[]; needPassphrase?: string[] }> => { const kisWithPp = await KeyStore.getAllWithOptionalPassPhrase(this.acctEmail); // todo: cache const verificationPubs = signerEmail ? await MessageRenderer.getVerificationPubs(signerEmail) : []; @@ -697,7 +703,8 @@ export class MessageRenderer { !!result.isEncrypted, result.signature, renderModule, - this.getRetryVerification(signerEmail, verificationPubs => MessageRenderer.decryptFunctionToVerifyRes(() => decrypt(verificationPubs))) + this.getRetryVerification(signerEmail, verificationPubs => MessageRenderer.decryptFunctionToVerifyRes(() => decrypt(verificationPubs))), + plainSubject ); } else if (result.error.type === DecryptErrTypes.format) { if (fallbackToPlainText) { @@ -757,7 +764,8 @@ export class MessageRenderer { renderModule: RenderInterface, frameId: string, senderEmail: string | undefined, - isPwdMsgBasedOnMsgSnippet?: boolean + isPwdMsgBasedOnMsgSnippet: boolean | undefined, + plainSubject: string | undefined ) => { try { if (!attachment.hasData()) { @@ -772,14 +780,12 @@ export class MessageRenderer { }; }); } - // todo: probaby subject isn't relevant in attachment-based decryption? - // const subject = gmailMsg.payload ? GmailParser.findHeader(gmailMsg.payload, 'subject') : undefined; const armoredMsg = PgpArmor.clip(attachment.getData().toUtfStr()); if (!armoredMsg) { renderModule.renderErr('Problem extracting armored message', attachment.getData().toUtfStr()); } else { renderModule.renderText('Decrypting...'); - return await this.renderCryptoMessage(armoredMsg, renderModule, false, senderEmail, isPwdMsgBasedOnMsgSnippet); + return await this.renderCryptoMessage(armoredMsg, renderModule, false, senderEmail, isPwdMsgBasedOnMsgSnippet, plainSubject); } } catch (e) { // todo: provide 'retry' button on isNetErr to re-fetch the attachment and continue processing? From 319e4eb3957bb272da3e0ecf70b5068fee976ebe Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sun, 18 Jun 2023 20:42:49 +0100 Subject: [PATCH 143/147] plainSubject logic restored additional updates (no unit tests) --- extension/js/common/render-message.ts | 1 + .../js/content_scripts/webmail/gmail-element-replacer.ts | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/extension/js/common/render-message.ts b/extension/js/common/render-message.ts index a009b5faea6..8fee3bd6673 100644 --- a/extension/js/common/render-message.ts +++ b/extension/js/common/render-message.ts @@ -17,6 +17,7 @@ export type MessageInfo = { name: string | undefined; full: string; }; + plainSubject: string | undefined; // todo: cover by unit tests }; export type RenderMessage = { diff --git a/extension/js/content_scripts/webmail/gmail-element-replacer.ts b/extension/js/content_scripts/webmail/gmail-element-replacer.ts index a64b119ba36..744cb7929eb 100644 --- a/extension/js/content_scripts/webmail/gmail-element-replacer.ts +++ b/extension/js/content_scripts/webmail/gmail-element-replacer.ts @@ -171,7 +171,10 @@ export class GmailElementReplacer implements WebmailElementReplacer { blocks = Mime.processBody({ text: emailContainer.innerText }); // todo: print info for offline? } - const setMessageInfo = messageInfo ?? { isPwdMsgBasedOnMsgSnippet: MessageRenderer.isPwdMsg(emailContainer.innerText) }; + const setMessageInfo = messageInfo ?? { + isPwdMsgBasedOnMsgSnippet: MessageRenderer.isPwdMsg(emailContainer.innerText), + plainSubject: undefined, // todo: take from this.sel.subject? + }; if (blocks.length === 0 || (blocks.length === 1 && blocks[0].type === 'plainText')) { // only has single block which is plain text continue; From a7a540719cc949de18c6ff51301deb2afe2507d2 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 19 Jun 2023 09:49:42 +0100 Subject: [PATCH 144/147] simplified test --- test/source/tests/decrypt.ts | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts index 9df2466467c..49068245a9d 100644 --- a/test/source/tests/decrypt.ts +++ b/test/source/tests/decrypt.ts @@ -123,22 +123,17 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te testWithBrowser(async (t, browser) => { const threadId = '187085b874fb727c'; const { acctEmail, authHdr } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'compatibility'); - const expectedContent = 'flowcrypt-browser issue #5029 test email'; + const expectedMessage = { + encryption: 'not encrypted', + signature: 'could not verify signature: missing pubkey ADAC279C95093207', + content: ['flowcrypt-browser issue #5029 test email'], + }; const inboxPage = await browser.newExtensionPage(t, `chrome/settings/inbox/inbox.htm?acctEmail=${acctEmail}&threadId=${threadId}`); await inboxPage.waitForSelTestState('ready'); await inboxPage.waitAll('iframe'); - await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame(['pgp_block.htm']), { - encryption: 'not encrypted', - content: [expectedContent], - }); + await BrowserRecipe.pgpBlockCheck(t, await inboxPage.getFrame(['pgp_block.htm']), expectedMessage); await inboxPage.close(); - const gmailPage = await browser.newPage(t, `${t.urls?.mockGmailUrl()}/${threadId}`, undefined, authHdr); - await gmailPage.waitAll('iframe'); - await BrowserRecipe.pgpBlockCheck(t, await gmailPage.getFrame(['pgp_block.htm']), { - encryption: 'not encrypted', - content: [expectedContent], - }); - await gmailPage.close(); + await BrowserRecipe.pgpBlockVerifyDecryptedContent(t, browser, threadId, expectedMessage, authHdr); }) ); From 1d98bc2493d99f1b4aaf3de5afb995354236e43d Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 19 Jun 2023 15:10:56 +0100 Subject: [PATCH 145/147] fix script --- scripts/build.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index f1ccdd53f95..c319bd13323 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -108,7 +108,8 @@ main() { # until https://github.com/openpgpjs/web-stream-tools/pull/20 is resolved STREAMS_REGEX="s/'\.\/(streams|util|writer|reader|node-conversions)'/'\.\/\1\.js'/g" STREAMS_FILES=$OUTPUT_DIRECTORY/lib/streams/* - + OPENPGP_FILE=$OUTPUT_DIRECTORY/lib/openpgp.js + # patch isUint8Array until https://github.com/openpgpjs/web-stream-tools/pull/23 is resolved ISUINT8ARRAY_REGEX1="s/(\s*)return\x20Uint8Array\.prototype\.isPrototypeOf\(input\);/\1return\x20Uint8Array\.prototype\.isPrototypeOf\(input\)\x20\|\|\x20globalThis\.Uint8Array\.prototype\.isPrototypeOf\(input\);/g" @@ -118,8 +119,8 @@ main() { # to replace them with (\1 instanceof Uint8Array || \1 instanceof globalThis.Uint8Array) ISUINT8ARRAY_REGEX2="s/\(([^\(\)\x20]+)\x20instanceof\x20Uint8Array\)/\(\1\x20instanceof\x20Uint8Array\x20\|\|\x20\1\x20instanceof\x20globalThis\.Uint8Array\)/g" # this patch handles pattern like \x20n instanceof Uint8Array; - ISUINT8ARRAY_REGEX3="s/\x20([^\(\)\x20]+)\x20instanceof\x20Uint8Array;/\x20\(\1\x20instanceof\x20Uint8Array\x20\|\|\x20\1\x20instanceof\x20globalThis\.Uint8Array\);/g" OPENPGP_FILE=$OUTPUT_DIRECTORY/lib/openpgp.js - + ISUINT8ARRAY_REGEX3="s/\x20([^\(\)\x20]+)\x20instanceof\x20Uint8Array;/\x20\(\1\x20instanceof\x20Uint8Array\x20\|\|\x20\1\x20instanceof\x20globalThis\.Uint8Array\);/g" + apply_regex_replace $STREAMS_REGEX $STREAMS_FILES apply_regex_replace $ISUINT8ARRAY_REGEX1 $STREAMS_FILES apply_regex_replace $ISUINT8ARRAY_REGEX1 $OPENPGP_FILE From 4a2fc81babec517250edb544ca9ede9a373bfb38 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 19 Jun 2023 15:23:18 +0100 Subject: [PATCH 146/147] lazy matching --- scripts/build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index c319bd13323..1ef058d0812 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -109,7 +109,7 @@ main() { STREAMS_REGEX="s/'\.\/(streams|util|writer|reader|node-conversions)'/'\.\/\1\.js'/g" STREAMS_FILES=$OUTPUT_DIRECTORY/lib/streams/* OPENPGP_FILE=$OUTPUT_DIRECTORY/lib/openpgp.js - + # patch isUint8Array until https://github.com/openpgpjs/web-stream-tools/pull/23 is resolved ISUINT8ARRAY_REGEX1="s/(\s*)return\x20Uint8Array\.prototype\.isPrototypeOf\(input\);/\1return\x20Uint8Array\.prototype\.isPrototypeOf\(input\)\x20\|\|\x20globalThis\.Uint8Array\.prototype\.isPrototypeOf\(input\);/g" @@ -117,10 +117,10 @@ main() { # this patch handles patterns like (n instanceof Uint8Array) or (arguments[i] instanceof Uint8Array) # to replace them with (\1 instanceof Uint8Array || \1 instanceof globalThis.Uint8Array) - ISUINT8ARRAY_REGEX2="s/\(([^\(\)\x20]+)\x20instanceof\x20Uint8Array\)/\(\1\x20instanceof\x20Uint8Array\x20\|\|\x20\1\x20instanceof\x20globalThis\.Uint8Array\)/g" + ISUINT8ARRAY_REGEX2="s/\(([^\(\)\x20]+?)\x20instanceof\x20Uint8Array\)/\(\1\x20instanceof\x20Uint8Array\x20\|\|\x20\1\x20instanceof\x20globalThis\.Uint8Array\)/g" # this patch handles pattern like \x20n instanceof Uint8Array; - ISUINT8ARRAY_REGEX3="s/\x20([^\(\)\x20]+)\x20instanceof\x20Uint8Array;/\x20\(\1\x20instanceof\x20Uint8Array\x20\|\|\x20\1\x20instanceof\x20globalThis\.Uint8Array\);/g" - + ISUINT8ARRAY_REGEX3="s/\x20([^\(\)\x20]+?)\x20instanceof\x20Uint8Array;/\x20\(\1\x20instanceof\x20Uint8Array\x20\|\|\x20\1\x20instanceof\x20globalThis\.Uint8Array\);/g" + apply_regex_replace $STREAMS_REGEX $STREAMS_FILES apply_regex_replace $ISUINT8ARRAY_REGEX1 $STREAMS_FILES apply_regex_replace $ISUINT8ARRAY_REGEX1 $OPENPGP_FILE From 78613f98e553681c746f4de23d760bb822d8c620 Mon Sep 17 00:00:00 2001 From: Roma Sosnovsky Date: Tue, 20 Jun 2023 22:01:29 +0300 Subject: [PATCH 147/147] fix build script on macOS --- scripts/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index 1ef058d0812..6cb799a5ea5 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -117,9 +117,9 @@ main() { # this patch handles patterns like (n instanceof Uint8Array) or (arguments[i] instanceof Uint8Array) # to replace them with (\1 instanceof Uint8Array || \1 instanceof globalThis.Uint8Array) - ISUINT8ARRAY_REGEX2="s/\(([^\(\)\x20]+?)\x20instanceof\x20Uint8Array\)/\(\1\x20instanceof\x20Uint8Array\x20\|\|\x20\1\x20instanceof\x20globalThis\.Uint8Array\)/g" + ISUINT8ARRAY_REGEX2="s/\(([^\(\)\x20]+)\x20instanceof\x20Uint8Array\)/\(\1\x20instanceof\x20Uint8Array\x20\|\|\x20\1\x20instanceof\x20globalThis\.Uint8Array\)/g" # this patch handles pattern like \x20n instanceof Uint8Array; - ISUINT8ARRAY_REGEX3="s/\x20([^\(\)\x20]+?)\x20instanceof\x20Uint8Array;/\x20\(\1\x20instanceof\x20Uint8Array\x20\|\|\x20\1\x20instanceof\x20globalThis\.Uint8Array\);/g" + ISUINT8ARRAY_REGEX3="s/return\x20([^\(\)\x20]+)\x20instanceof\x20Uint8Array;/return\x20\(\1\x20instanceof\x20Uint8Array\x20\|\|\x20\1\x20instanceof\x20globalThis\.Uint8Array\);/g" apply_regex_replace $STREAMS_REGEX $STREAMS_FILES apply_regex_replace $ISUINT8ARRAY_REGEX1 $STREAMS_FILES