#5667 Added message decryption on Thunderbird

extension/chrome/dev/export.ts

@@ -13,7 +13,7 @@ import { Catch } from '../../js/common/platform/catch.js';
 import { Gmail } from '../../js/common/api/email-provider/gmail/gmail.js';
 import { Time } from '../../js/common/browser/time.js';
 import { Url } from '../../js/common/core/common.js';
-import { opgp } from '../../js/common/core/crypto/pgp/openpgpjs-custom.js';
+import { opgp as openpgp } from '../../js/common/core/crypto/pgp/openpgpjs-custom.js';
 
 Catch.try(async () => {
   const uncheckedUrlParams = Url.parse(['acctEmail']);
@@ -123,7 +123,7 @@ Catch.try(async () => {
     const pwd = prompt('Please enter encryption password');
     if (pwd) {
       print('encrypting..');
-      const encrypted = await opgp.encrypt({ format: 'binary', message: await opgp.createMessage({ binary: data }), passwords: [pwd] });
+      const encrypted = await openpgp.encrypt({ format: 'binary', message: await openpgp.createMessage({ binary: data }), passwords: [pwd] });
       save(encrypted); // todo: test
     } else {
       save(data);

extension/chrome/elements/compose.ts

@@ -10,7 +10,7 @@ import { Ui } from '../../js/common/browser/ui.js';
 import { PromiseCancellation, Url } from '../../js/common/core/common.js';
 import { View } from '../../js/common/view.js';
 import { XssSafeFactory } from '../../js/common/xss-safe-factory.js';
-import { opgp } from '../../js/common/core/crypto/pgp/openpgpjs-custom.js';
+import { opgp as openpgp } from '../../js/common/core/crypto/pgp/openpgpjs-custom.js';
 import { ComposeAttachmentsModule } from './compose-modules/compose-attachments-module.js';
 import { ComposeDraftModule } from './compose-modules/compose-draft-module.js';
 import { ComposeErrModule } from './compose-modules/compose-err-module.js';
@@ -174,8 +174,8 @@ export class ComposeView extends View {
     const storage = await AcctStore.get(this.acctEmail, ['sendAs', 'hide_message_password', 'fesUrl']);
     this.clientConfiguration = await ClientConfiguration.newInstance(this.acctEmail);
     if (this.clientConfiguration.shouldHideArmorMeta()) {
-      opgp.config.showComment = false;
-      opgp.config.showVersion = false;
+      openpgp.config.showComment = false;
+      openpgp.config.showVersion = false;
     }
     this.pubLookup = new PubLookup(this.clientConfiguration);
     this.factory = new XssSafeFactory(this.acctEmail, this.tabId);

extension/chrome/elements/passphrase.ts

@@ -200,6 +200,20 @@ View.run(
       BrowserMsg.send.passphraseEntry({ entered, initiatorFrameId });
     };
 
+    private closeDialogPageOpenedExternally = async () => {
+      if (window.top === window.self) {
+        if (Catch.isThunderbirdMail()) {
+          const currentTab = await messenger.tabs.query({ active: true, currentWindow: true });
+          if (currentTab.length > 0) {
+            const tabId = currentTab[0].id;
+            if (tabId) {
+              await messenger.tabs.remove(tabId);
+            }
+          }
+        }
+      }
+    };
+
     private submitHandler = async () => {
       if (await this.bruteForceProtection.shouldDisablePassphraseCheck()) {
         return;
@@ -237,10 +251,12 @@ View.run(
       }
       if (unlockCount && allPrivateKeys.length > 1) {
         Ui.toast(`${unlockCount} of ${allPrivateKeys.length} keys ${unlockCount > 1 ? 'were' : 'was'} unlocked by this pass phrase`);
+        await this.closeDialogPageOpenedExternally();
       }
       if (atLeastOneMatched) {
         await this.bruteForceProtection.passphraseCheckSucceed();
         this.closeDialog(true, this.initiatorFrameId);
+        await this.closeDialogPageOpenedExternally();
       } else {
         await this.bruteForceProtection.passphraseCheckFailed();
         this.renderFailedEntryPpPrompt();

extension/chrome/settings/setup.ts

@@ -12,7 +12,7 @@ import { Gmail } from '../../js/common/api/email-provider/gmail/gmail.js';
 import { Google } from '../../js/common/api/email-provider/gmail/google.js';
 import { KeyImportUi } from '../../js/common/ui/key-import-ui.js';
 import { Lang } from '../../js/common/lang.js';
-import { opgp } from '../../js/common/core/crypto/pgp/openpgpjs-custom.js';
+import { opgp as openpgp } from '../../js/common/core/crypto/pgp/openpgpjs-custom.js';
 import { ClientConfiguration } from '../../js/common/client-configuration.js';
 import { Settings } from '../../js/common/settings.js';
 import { SetupCreateKeyModule } from './setup/setup-create-key.js';
@@ -124,9 +124,9 @@ export class SetupView extends View {
     this.storage = await AcctStore.get(this.acctEmail, ['setup_done', 'email_provider', 'fesUrl']);
     this.storage.email_provider = this.storage.email_provider || 'gmail';
     this.clientConfiguration = await ClientConfiguration.newInstance(this.acctEmail);
-    if (this.clientConfiguration.shouldHideArmorMeta() && typeof opgp !== 'undefined') {
-      opgp.config.showComment = false;
-      opgp.config.showVersion = false;
+    if (this.clientConfiguration.shouldHideArmorMeta() && typeof openpgp !== 'undefined') {
+      openpgp.config.showComment = false;
+      openpgp.config.showVersion = false;
     }
     this.pubLookup = new PubLookup(this.clientConfiguration);
     if (this.clientConfiguration.usesKeyManager() && this.idToken) {

extension/css/cryptup.css

@@ -1428,7 +1428,7 @@ td {
 .backup_neutral {
   border: none;
   border-left: 4px solid #989898;
-  padding-left: 10px;
+  padding: 6px 10px;
 }
 
 .pgp_neutral .error_container {

extension/js/common/api/key-server/wkd.ts

@@ -7,7 +7,7 @@ import { ApiErr } from '../shared/api-error.js';
 import { Buf } from '../../core/buf.js';
 import { PubkeysSearchResult } from './../pub-lookup.js';
 import { WKD_API_HOST } from '../../core/const.js';
-import { opgp } from '../../core/crypto/pgp/openpgpjs-custom.js';
+import { opgp as openpgp } from '../../core/crypto/pgp/openpgpjs-custom.js';
 import { ArmoredKeyIdentityWithEmails, KeyUtil } from '../../core/crypto/key.js';
 
 export class Wkd extends Api {
@@ -52,7 +52,7 @@ export class Wkd extends Api {
     if (!response.buf) {
       return [];
     }
-    if (typeof opgp !== 'undefined') {
+    if (typeof openpgp !== 'undefined') {
       return await KeyUtil.parseAndArmorKeys(response.buf);
     }
     // in pgp-block.html there is no openpgp loaded for performance, use background

extension/js/common/browser/browser-msg.ts

@@ -96,6 +96,7 @@ export namespace Bm {
   export type ReRenderRecipient = { email: string };
   export type PgpBlockRetry = { frameId: string; messageSender: Dest };
   export type PgpBlockReady = { frameId: string; messageSender: Dest };
+  export type ThunderbirdOpenPassphraseDialog = { acctEmail: string; longids: string };
 
   export namespace Res {
     export type GetActiveTabInfo = {
@@ -112,6 +113,9 @@ export namespace Bm {
     export type ExpirationCacheGet<V> = Promise<V | undefined>;
     export type ExpirationCacheSet = Promise<void>;
     export type ExpirationCacheDeleteExpired = Promise<void>;
+    export type ThunderbirdGetCurrentUser = string | undefined;
+    export type ThunderbirdMsgGet = messenger.messages.MessagePart | undefined;
+    export type ThunderbirdOpenPassphraseDialog = Promise<void>;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     export type Db = any; // not included in Any below
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -128,7 +132,8 @@ export namespace Bm {
       | ExpirationCacheSet
       | ExpirationCacheDeleteExpired
       | AjaxGmailAttachmentGetChunk
-      | ConfirmationResult;
+      | ConfirmationResult
+      | ThunderbirdMsgGet;
   }
 
   export type AnyRequest =
@@ -169,6 +174,7 @@ export namespace Bm {
     | PgpBlockReady
     | PgpBlockRetry
     | ConfirmationResult
+    | ThunderbirdOpenPassphraseDialog
     | Ajax;
 
   export type AsyncRespondingHandler = (req: AnyRequest) => Promise<Res.Any>;
@@ -232,6 +238,11 @@ export class BrowserMsg {
           BrowserMsg.sendAwait(undefined, 'expirationCacheSet', bm, true) as Promise<Bm.Res.ExpirationCacheSet>,
         expirationCacheDeleteExpired: (bm: Bm.ExpirationCacheDeleteExpired) =>
           BrowserMsg.sendAwait(undefined, 'expirationCacheDeleteExpired', bm, true) as Promise<Bm.Res.ExpirationCacheDeleteExpired>,
+        thunderbirdGetCurrentUser: () =>
+          BrowserMsg.sendAwait(undefined, 'thunderbirdGetCurrentUser', undefined, true) as Promise<Bm.Res.ThunderbirdGetCurrentUser>,
+        thunderbirdMsgGet: () => BrowserMsg.sendAwait(undefined, 'thunderbirdMsgGet', undefined, true) as Promise<Bm.Res.ThunderbirdMsgGet>,
+        thunderbirdOpenPassphraseDiaglog: (bm: Bm.ThunderbirdOpenPassphraseDialog) =>
+          BrowserMsg.sendAwait(undefined, 'thunderbirdOpenPassphraseDialog', bm, true) as Promise<Bm.Res.ThunderbirdOpenPassphraseDialog>,
       },
     },
     passphraseEntry: (bm: Bm.PassphraseEntry) => {

extension/js/common/browser/env.ts

@@ -61,7 +61,7 @@ export class Env {
   }
 
   public static async webmails(): Promise<WebMailName[]> {
-    return ['gmail']; // async because storage may be involved in the future
+    return ['gmail', 'thunderbird']; // async because storage may be involved in the future
   }
 
   public static getBaseUrl() {

extension/js/common/core/crypto/key.ts

@@ -6,7 +6,7 @@ import { Buf } from '../buf.js';
 import { Catch } from '../../platform/catch.js';
 import { MsgBlockParser } from '../msg-block-parser.js';
 import { PgpArmor } from './pgp/pgp-armor.js';
-import { opgp } from './pgp/openpgpjs-custom.js';
+import { opgp as openpgp } from './pgp/openpgpjs-custom.js';
 import { OpenPGPKey } from './pgp/openpgp-key.js';
 import type * as OpenPGP from 'openpgp';
 import { SmimeKey } from './smime/smime-key.js';
@@ -210,7 +210,7 @@ export class KeyUtil {
       allErr: Error[] = [];
     let uncheckedOpgpKeyCount = 0;
     try {
-      const keys = await opgp.readKeys({ binaryKeys: key }); // todo: opgp.readKey ?
+      const keys = await openpgp.readKeys({ binaryKeys: key }); // todo: openpgp.readKey ?
       uncheckedOpgpKeyCount = keys.length;
       for (const key of keys) {
         try {
@@ -348,12 +348,12 @@ export class KeyUtil {
       let keys: OpenPGP.Key[] = [];
       armored = PgpArmor.normalize(armored, 'key');
       if (RegExp(PgpArmor.headers('publicKey', 're').begin).test(armored)) {
-        keys = await opgp.readKeys({ armoredKeys: armored });
+        keys = await openpgp.readKeys({ armoredKeys: armored });
       } else if (RegExp(PgpArmor.headers('privateKey', 're').begin).test(armored)) {
-        keys = await opgp.readKeys({ armoredKeys: armored });
+        keys = await openpgp.readKeys({ armoredKeys: armored });
       } else if (RegExp(PgpArmor.headers('encryptedMsg', 're').begin).test(armored)) {
-        const packets = (await opgp.readMessage({ armoredMessage: armored })).packets;
-        keys = [type === 'publicKey' ? new opgp.PublicKey(packets) : new opgp.PrivateKey(packets)];
+        const packets = (await openpgp.readMessage({ armoredMessage: armored })).packets;
+        keys = [type === 'publicKey' ? new openpgp.PublicKey(packets) : new openpgp.PrivateKey(packets)];
       }
       for (const k of keys) {
         for (const u of k.users) {

extension/js/common/core/crypto/pgp/msg-util.ts

@@ -5,7 +5,7 @@ import { Key, KeyInfoWithIdentity, KeyInfoWithIdentityAndOptionalPp, KeyUtil } f
 import { ReplaceableMsgBlockType } from '../../msg-block.js';
 import { Buf } from '../../buf.js';
 import { PgpArmor, PreparedForDecrypt } from './pgp-armor.js';
-import { opgp } from './openpgpjs-custom.js';
+import { opgp as openpgp } from './openpgpjs-custom.js';
 import type * as OpenPGP from 'openpgp';
 import { KeyCache } from '../../../platform/key-cache.js';
 import { SmimeKey, SmimeMsg } from '../smime/smime-key.js';
@@ -127,11 +127,11 @@ export class MsgUtil {
         // 10XX XXXX - potential old pgp packet tag
         tagNumber = (firstByte & 0b00111100) / 4; // 10TTTTLL where T is tag number bit. Division by 4 in place of two bit shifts. I hate bit shifts.
       }
-      if (Object.values(opgp.enums.packet).includes(tagNumber)) {
+      if (Object.values(openpgp.enums.packet).includes(tagNumber)) {
         // Indeed a valid OpenPGP packet tag number
         // This does not 100% mean it's OpenPGP message
         // But it's a good indication that it may be
-        const t = opgp.enums.packet;
+        const t = openpgp.enums.packet;
         const msgTypes = [
           t.publicKeyEncryptedSessionKey,
           t.symEncryptedIntegrityProtectedData,
@@ -163,7 +163,7 @@ export class MsgUtil {
   }
 
   public static async verifyDetached({ plaintext, sigText, verificationPubs }: PgpMsgMethod.Arg.VerifyDetached) {
-    const message = await opgp.createMessage({ text: Str.with(plaintext) });
+    const message = await openpgp.createMessage({ text: Str.with(plaintext) });
     try {
       await message.appendSignature(sigText);
     } catch (formatErr) {
@@ -220,8 +220,8 @@ export class MsgUtil {
       // cleartext and PKCS#7 are gone by this line
       const msg = prepared.message;
       const packets = msg.packets;
-      const isSymEncrypted = packets.filter(p => p instanceof opgp.SymEncryptedSessionKeyPacket).length > 0;
-      const isPubEncrypted = packets.filter(p => p instanceof opgp.PublicKeyEncryptedSessionKeyPacket).length > 0;
+      const isSymEncrypted = packets.filter(p => p instanceof openpgp.SymEncryptedSessionKeyPacket).length > 0;
+      const isPubEncrypted = packets.filter(p => p instanceof openpgp.PublicKeyEncryptedSessionKeyPacket).length > 0;
       if (isSymEncrypted && !isPubEncrypted && !msgPwd) {
         return {
           success: false,
@@ -256,7 +256,7 @@ export class MsgUtil {
           isEncrypted,
         };
       }
-      if (msg.packets.filterByTag(opgp.enums.packet.symmetricallyEncryptedData).length) {
+      if (msg.packets.filterByTag(openpgp.enums.packet.symmetricallyEncryptedData).length) {
         const noMdc =
           'Security threat!\n\nMessage is missing integrity checks (MDC). ' +
           ' The sender should update their outdated software.\n\nDisplay the message at your own risk.';
@@ -287,7 +287,7 @@ export class MsgUtil {
   }
 
   public static async diagnosePubkeys({ armoredPubs, message }: PgpMsgMethod.Arg.DiagnosePubkeys) {
-    const m = await opgp.readMessage({ armoredMessage: Str.with(message) });
+    const m = await openpgp.readMessage({ armoredMessage: Str.with(message) });
     const msgKeyIds = m.getEncryptionKeyIDs();
     const localKeyIds: string[] = [];
     for (const k of await Promise.all(armoredPubs.map(pub => KeyUtil.parse(pub)))) {