Merge branch 'master' into issue-5858-add-secure-compose-action-menus-live-test

martgil · web-flow · commit a79c0e91de6a · 2024-11-26T13:20:39.000+08:00
diff --git a/conf/tsconfig.content_scripts.json b/conf/tsconfig.content_scripts.json
@@ -18,7 +18,7 @@
     "paths": {
       "dompurify": ["types/purify.d.ts"],
       "openpgp": ["../node_modules/openpgp/openpgp.d.ts"],
-      "@openpgp/web-stream-tools": ["../node_modules/@openpgp/web-stream-tools/types/index.v4.9.d.ts"],
+      "@openpgp/web-stream-tools": ["../node_modules/@openpgp/web-stream-tools/lib/index.d.ts"],
       "squire-rte": ["../node_modules/squire-rte/dist/types/Squire.d.ts"],
       "undici-types": ["../node_modules/undici-types/index.d.ts", "COMMENT"]
     },
diff --git a/conf/tsconfig.test.json b/conf/tsconfig.test.json
@@ -12,7 +12,7 @@
     "outDir": "../build/test",
     "skipLibCheck": true,
     "paths": {
-      "@openpgp/web-stream-tools": ["../node_modules/@openpgp/web-stream-tools/types/index.v4.9.d.ts", "../build/streams/streams.js"]
+      "@openpgp/web-stream-tools": ["../node_modules/@openpgp/web-stream-tools/lib/index.d.ts", "../build/generic-extension-wip/lib/streams_common.js"]
     }
   },
   "files": [
diff --git a/conf/webpack.config.js b/conf/webpack.config.js
@@ -2,23 +2,44 @@
 //bundle the web version of @openpgp/web-stream-tools for content script
 const path = require('path');
 
-module.exports = {
-  mode: 'production',
-  entry: {
-    main: '../build/generic-extension-wip/lib/streams/streams.js',
-  },
-  output: {
-    library: {
-      name: 'Stream',
-      type: 'var',
+module.exports = [
+  {
+    mode: 'production',
+    entry: {
+      main: '../build/generic-extension-wip/lib/streams/streams.js',
+    },
+    output: {
+      library: {
+        name: 'Stream',
+        type: 'var',
+      },
+      path: path.resolve('../build/generic-extension-wip/lib'),
+      filename: 'streams_web.js', // <--- Will be compiled to this single file
+    },
+    resolve: {
+      fallback: {
+        stream: false,
+      },
+      extensions: ['.js'],
     },
-    path: path.resolve('../build/generic-extension-wip/lib'),
-    filename: 'streams_web.js', // <--- Will be compiled to this single file
   },
-  resolve: {
-    fallback: {
-      stream: false,
+  {
+    mode: 'production',
+    entry: {
+      main: '../build/generic-extension-wip/lib/streams/streams.js',
+    },
+    output: {
+      library: {
+        type: 'commonjs',
+      },
+      path: path.resolve('../build/generic-extension-wip/lib'),
+      filename: 'streams_common.js', // <--- Will be compiled to this single file
+    },
+    resolve: {
+      fallback: {
+        stream: false,
+      },
+      extensions: ['.js'],
     },
-    extensions: ['.js'],
   },
-};
+];
diff --git a/extension/js/common/core/crypto/pgp/openpgp-key.ts b/extension/js/common/core/crypto/pgp/openpgp-key.ts
@@ -445,7 +445,7 @@ export class OpenPGPKey {
     const opt: OpenPGP.KeyOptions = { userIDs, passphrase };
     if (variant === 'curve25519') {
       opt.type = 'ecc';
-      opt.curve = 'curve25519';
+      opt.curve = 'curve25519Legacy';
     } else if (variant === 'rsa2048') {
       opt.type = 'rsa';
       opt.rsaBits = 2048;
@@ -744,6 +744,7 @@ export class OpenPGPKey {
         // todo: we can make it faster by manually collecting expirations from signatures?
         ...(await Promise.all(key.subkeys.map(async subkey => OpenPGPKey.getExpirationAsDateOrUndefined(await subkey.getExpirationTime()))))
           .filter(Boolean)
+
           // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           .map(expirationTime => expirationTime!.getTime())
           .filter(expiration => !primaryKeyExpiration || expiration < primaryKeyExpiration)
diff --git a/extension/js/common/core/crypto/pgp/pgp-armor.ts b/extension/js/common/core/crypto/pgp/pgp-armor.ts
@@ -165,6 +165,6 @@ export class PgpArmor {
   }
 
   public static armor(messagetype: OpenPGP.enums.armor, body: object): string {
-    return opgp.armor(messagetype, body, undefined, undefined, undefined, opgp.config);
+    return opgp.armor(messagetype, body, undefined, undefined, undefined, false, opgp.config);
   }
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
     "graceful-fs": "4.1.13"
   },
   "devDependencies": {
-    "@openpgp/web-stream-tools": "^0.0.13",
+    "@openpgp/web-stream-tools": "^0.1.3",
     "@types/chai": "4.3.19",
     "@types/chai-as-promised": "7.1.8",
     "@types/chrome": "0.0.284",
@@ -29,7 +29,7 @@
     "lint-staged": "^15.2.10",
     "mailparser": "3.7.1",
     "mkdirp": "3.0.1",
-    "openpgp": "5.11.2",
+    "openpgp": "6.0.0",
     "pdfjs-dist": "4.8.69",
     "prettier": "^3.3.3",
     "puppeteer": "23.9.0",
diff --git a/test/source/mock/attester/attester-key-constants.ts b/test/source/mock/attester/attester-key-constants.ts
@@ -33,21 +33,22 @@ export const somePubkey = `-----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: CryptUP 3.2.0 Easy Gmail Encryption https://cryptup.org
 Comment: Seamlessly send, receive and search encrypted email
 
-xsBNBFU0WMgBCACZSzijeN4YozhjmHU7BGWzW7ZbY6GGtJinByt8OnEnQ9TX
-9zrAxbyr0grPE4On7nd3uepwNxJbk5LlaCwHNkpX39xKgDgCskRO9CfeqOIO
-4l5Wjj4XldrgLSOGJe8Vmimo9UKmqsP5v8fR3mMyIqQbtE4G+Vq/J9A3uabr
-f0XYVsBdBvVoJkQ83gtQrZoTA/zihNmtLXH9pTwtX8FJcqgFK6RgvfAh2jCz
-DhT+reI50ZcuHRvVRxvrL172DFSQsLSdj8PcewS1J89knH4sjjBC/kwbLa0n
-tod/gBPWw/uetaOJna43wNueUKKOl2kAXE4sw6ESIrlFDynJ4g05T9yxABEB
-AAHNIlRvbSBKYW1lcyBIb2x1YiA8dG9tQGJpdG9hc2lzLm5ldD7CwFwEEAEI
-ABAFAlU0WM8JEA1WiOvzECvnAAAB4gf8DaIzZACUqkGEoI19HyBPtcrJT4mx
-hKZ/Wts0C6TGj/OQXevDI+h2jQTYf8+fOqCdQev2Kwh/8mQV6wQqmN9uiVXO
-5F4vAbWNfEve6mCVB5gi296mFf6kx04xC7VVYAJ3FUR72BplE/0+cwv9Nx2r
-Jh3QGFhoPaFMPtCAk0TgKcO0UkcBwXNzAV5Pgz0MT1COTWBXEej4yOrqdWoP
-A6fEpV8aLaFnAt+zh3cw4A7SNAO9omGAUZeBl4Pz1IlN2lC2grc2zpqoxo8o
-3W49JYTfExeCNVWhlSU74f6bpN6CMdSdrh5phOr+ffQQhEhkNblUgSZe6tKa
-VFI1MhkJ6Xhrug==
-=+de8
+
+mQENBGc9gogBCACzdC8asczNuVebgn4rQ87hBnpJcWRnYOjCFdL1mSsh6CT787kr
+AWdMr5xvNzCThv7n1uhWcdw4vdE87IRRiLTlx56HjkLkq/YyDC+rzf2kEVFSHpQn
+l0gAZrExcm7QSU3RkiyLeIhZl5TWnlk7swW4St85wurP+bEOn9hv0Csl5sNTVDYv
+jP02ewdm3VCe6y0s3euWo1FCOYtIx0K4IQyyghgHR94LYOtXa9nPbYLJr87Gqtto
+OK5yPB//ZN2t3tYwpAgpDWNQzFu/Jl0bREQFP1bVrZHhfy65UWwsxhP8REzdtl6Y
+t/EUM+74SC6pyEcVqCnJS8m3BmJUjGlrplT1ABEBAAG0IlRvbSBKYW1lcyBIb2x1
+YiA8dG9tQGJpdG9hc2lzLm5ldD6JAVEEEwEIADsWIQSMTB/Md581dynRlOzqIlql
+HKheCgUCZz2CiAIbLwULCQgHAgIiAgYVCgkICwIEFgIDAQIeBwIXgAAKCRDqIlql
+HKheCt8vB/4pLL2aMJwDgi8Qhmxfllz9mXTOn+h3LequV3ou8gDNSwByLbSrcZvd
+M4rlqjezQ9/Y+itALjQ3/jwhHMh4M5sDc7BXaO82eQzrpBywgLTY2km1RQ9BaoxT
+PQwkBDSt2Zp/XhBwYXiMtxw/d90Cu99fnitXFFZz3lkCq4zn3BeCAJmL3CHotCLe
+clmE7C16Y/w6t5+2AXej+lNpmBvQt2cXzDWeNxcZhJInW1MuIdUQFT8rEQ1H/r83
+t1RcQH6LuwetOysrY5a9DjH09mHizyt9KFu+jPP//pTXlWE0d2JX9buvkLTsm8IX
+jg/j+T6eFDW23ZST+PeNj4pFukc+feDa
+=kM8e
 -----END PGP PUBLIC KEY BLOCK-----`;
 
 export const testMatchPubKey = `-----BEGIN PGP PUBLIC KEY BLOCK-----
diff --git a/test/source/tests/browser-unit-tests/unit-AttUI.js b/test/source/tests/browser-unit-tests/unit-AttUI.js
@@ -33,8 +33,27 @@ BROWSER_UNIT_TEST_NAME(`collectEncryptAtts preserves utf attachment names`);
   await new Promise(resolve => setTimeout(resolve, 1000)); // the above method is actually async and needs some time
   attachmentUi.addFile(new File([content], utfName));
   await new Promise(resolve => setTimeout(resolve, 1000)); // again it seems to need some time to crunch the new file
-  const pubkey =
-    '-----BEGIN PGP PUBLIC KEY BLOCK-----\nVersion: CryptUP 3.2.0 Easy Gmail Encryption https://cryptup.org\nComment: Seamlessly send, receive and search encrypted email\n\nxsBNBFU0WMgBCACZSzijeN4YozhjmHU7BGWzW7ZbY6GGtJinByt8OnEnQ9TX\n9zrAxbyr0grPE4On7nd3uepwNxJbk5LlaCwHNkpX39xKgDgCskRO9CfeqOIO\n4l5Wjj4XldrgLSOGJe8Vmimo9UKmqsP5v8fR3mMyIqQbtE4G+Vq/J9A3uabr\nf0XYVsBdBvVoJkQ83gtQrZoTA/zihNmtLXH9pTwtX8FJcqgFK6RgvfAh2jCz\nDhT+reI50ZcuHRvVRxvrL172DFSQsLSdj8PcewS1J89knH4sjjBC/kwbLa0n\ntod/gBPWw/uetaOJna43wNueUKKOl2kAXE4sw6ESIrlFDynJ4g05T9yxABEB\nAAHNIlRvbSBKYW1lcyBIb2x1YiA8dG9tQGJpdG9hc2lzLm5ldD7CwFwEEAEI\nABAFAlU0WM8JEA1WiOvzECvnAAAB4gf8DaIzZACUqkGEoI19HyBPtcrJT4mx\nhKZ/Wts0C6TGj/OQXevDI+h2jQTYf8+fOqCdQev2Kwh/8mQV6wQqmN9uiVXO\n5F4vAbWNfEve6mCVB5gi296mFf6kx04xC7VVYAJ3FUR72BplE/0+cwv9Nx2r\nJh3QGFhoPaFMPtCAk0TgKcO0UkcBwXNzAV5Pgz0MT1COTWBXEej4yOrqdWoP\nA6fEpV8aLaFnAt+zh3cw4A7SNAO9omGAUZeBl4Pz1IlN2lC2grc2zpqoxo8o\n3W49JYTfExeCNVWhlSU74f6bpN6CMdSdrh5phOr+ffQQhEhkNblUgSZe6tKa\nVFI1MhkJ6Xhrug==\n=+de8\n-----END PGP PUBLIC KEY BLOCK-----';
+  const pubkey = `-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: CryptUP 3.2.0 Easy Gmail Encryption https://cryptup.org
+Comment: Seamlessly send, receive and search encrypted email
+
+
+mQENBGc9gogBCACzdC8asczNuVebgn4rQ87hBnpJcWRnYOjCFdL1mSsh6CT787kr
+AWdMr5xvNzCThv7n1uhWcdw4vdE87IRRiLTlx56HjkLkq/YyDC+rzf2kEVFSHpQn
+l0gAZrExcm7QSU3RkiyLeIhZl5TWnlk7swW4St85wurP+bEOn9hv0Csl5sNTVDYv
+jP02ewdm3VCe6y0s3euWo1FCOYtIx0K4IQyyghgHR94LYOtXa9nPbYLJr87Gqtto
+OK5yPB//ZN2t3tYwpAgpDWNQzFu/Jl0bREQFP1bVrZHhfy65UWwsxhP8REzdtl6Y
+t/EUM+74SC6pyEcVqCnJS8m3BmJUjGlrplT1ABEBAAG0IlRvbSBKYW1lcyBIb2x1
+YiA8dG9tQGJpdG9hc2lzLm5ldD6JAVEEEwEIADsWIQSMTB/Md581dynRlOzqIlql
+HKheCgUCZz2CiAIbLwULCQgHAgIiAgYVCgkICwIEFgIDAQIeBwIXgAAKCRDqIlql
+HKheCt8vB/4pLL2aMJwDgi8Qhmxfllz9mXTOn+h3LequV3ou8gDNSwByLbSrcZvd
+M4rlqjezQ9/Y+itALjQ3/jwhHMh4M5sDc7BXaO82eQzrpBywgLTY2km1RQ9BaoxT
+PQwkBDSt2Zp/XhBwYXiMtxw/d90Cu99fnitXFFZz3lkCq4zn3BeCAJmL3CHotCLe
+clmE7C16Y/w6t5+2AXej+lNpmBvQt2cXzDWeNxcZhJInW1MuIdUQFT8rEQ1H/r83
+t1RcQH6LuwetOysrY5a9DjH09mHizyt9KFu+jPP//pTXlWE0d2JX9buvkLTsm8IX
+jg/j+T6eFDW23ZST+PeNj4pFukc+feDa
+=kM8e
+-----END PGP PUBLIC KEY BLOCK-----`;
   const pubkeyResult = { pubkey: await KeyUtil.parse(pubkey), email: 'some@email.com', isMine: false };
   // test
   const [att] = await attachmentUi.collectEncryptAttachments([pubkeyResult]);
diff --git a/test/source/tests/compose.ts b/test/source/tests/compose.ts
@@ -2153,8 +2153,8 @@ export const defineComposeTests = (testVariant: TestVariant, testWithBrowser: Te
         await attachment.waitAndClick('@download-attachment');
         await attachment.waitAndClick('@decrypt-error-details');
         const decryptErrorDetails = await inboxPage.getFrame(['attachment_preview.htm']);
-        await decryptErrorDetails.waitForContent('@error-details', 'Error: Session key decryption failed'); // stack
-        await decryptErrorDetails.waitForContent('@error-details', '"type": "key_mismatch"'); // DecryptError
+        await decryptErrorDetails.waitForContent('@error-details', 'Error: No decryption key packets found'); // stack
+        await decryptErrorDetails.waitForContent('@error-details', '"type": "other"'); // DecryptError
       })
     );
 
@@ -2566,11 +2566,11 @@ export const defineComposeTests = (testVariant: TestVariant, testWithBrowser: Te
         // contains original key
         await SettingsPageRecipe.checkContactKey(contactsFrame, 'OPENPGP', 'ACTIVE', 'AB8C F86E 3715 7C3F 290D 7200 7ED4 3D79 E961 7655');
         // contains newly fetched key
-        await SettingsPageRecipe.checkContactKey(contactsFrame, 'OPENPGP', 'ACTIVE', '8B8A 05A2 216E E6E4 C5EE 3D54 0D56 88EB F310 2BE7');
-        await contactsFrame.waitAndClick(`@action-show-pubkey-8B8A05A2216EE6E4C5EE3D540D5688EBF3102BE7-openpgp`, {
+        await SettingsPageRecipe.checkContactKey(contactsFrame, 'OPENPGP', 'ACTIVE', '8C4C 1FCC 779F 3577 29D1 94EC EA22 5AA5 1CA8 5E0A');
+        await contactsFrame.waitAndClick(`@action-show-pubkey-8C4C1FCC779F357729D194ECEA225AA51CA85E0A-openpgp`, {
           confirmGone: true,
         });
-        await contactsFrame.waitForContent('@container-pubkey-details', 'Fingerprint: 8B8A 05A2 216E E6E4 C5EE 3D54 0D56 88EB F310 2BE7');
+        await contactsFrame.waitForContent('@container-pubkey-details', 'Fingerprint: 8C4C 1FCC 779F 3577 29D1 94EC EA22 5AA5 1CA8 5E0A');
         await contactsFrame.waitForContent('@container-pubkey-details', 'Users: tom@bitoasis.net');
       })
     );
@@ -2692,10 +2692,10 @@ export const defineComposeTests = (testVariant: TestVariant, testWithBrowser: Te
         await contactsFrame.waitAll('@page-contacts');
         await contactsFrame.waitAndClick(`@action-show-email-${recipientEmail.replace(/[^a-z0-9]+/g, '')}`);
         // Check protonMailCompatKey key
-        await contactsFrame.waitAndClick(`@action-show-pubkey-8B8A05A2216EE6E4C5EE3D540D5688EBF3102BE7-openpgp`, {
+        await contactsFrame.waitAndClick(`@action-show-pubkey-8C4C1FCC779F357729D194ECEA225AA51CA85E0A-openpgp`, {
           confirmGone: true,
         });
-        await contactsFrame.waitForContent('@container-pubkey-details', 'Fingerprint: 8B8A 05A2 216E E6E4 C5EE 3D54 0D56 88EB F310 2BE7');
+        await contactsFrame.waitForContent('@container-pubkey-details', 'Fingerprint: 8C4C 1FCC 779F 3577 29D1 94EC EA22 5AA5 1CA8 5E0A');
         await contactsFrame.waitForContent('@container-pubkey-details', 'Users: tom@bitoasis.net');
         // Check somePubkey
         await contactsFrame.waitAndClick('@action-back-to-contact-list', { confirmGone: true });
@@ -2806,10 +2806,10 @@ export const defineComposeTests = (testVariant: TestVariant, testWithBrowser: Te
         await contactsFrame.waitAll('@page-contacts');
         // Check test.ldap.timeout@gmail.com
         await contactsFrame.waitAndClick(`@action-show-email-${recipients.to.replace(/[^a-z0-9]+/g, '')}`);
-        await contactsFrame.waitAny(`@action-show-pubkey-8B8A05A2216EE6E4C5EE3D540D5688EBF3102BE7-openpgp`);
+        await contactsFrame.waitAny(`@action-show-pubkey-8C4C1FCC779F357729D194ECEA225AA51CA85E0A-openpgp`);
         // Check test.flowcrypt.pubkey.timeout@gmail.com
         await contactsFrame.waitAndClick(`@action-show-email-${recipients.cc.replace(/[^a-z0-9]+/g, '')}`);
-        await contactsFrame.waitAny(`@action-show-pubkey-8B8A05A2216EE6E4C5EE3D540D5688EBF3102BE7-openpgp`);
+        await contactsFrame.waitAny(`@action-show-pubkey-8C4C1FCC779F357729D194ECEA225AA51CA85E0A-openpgp`);
       })
     );
 
diff --git a/test/source/tests/decrypt.ts b/test/source/tests/decrypt.ts
@@ -722,7 +722,7 @@ export const defineDecryptTests = (testVariant: TestVariant, testWithBrowser: Te
           browser,
           '162275c819bcbf9b',
           {
-            content: ['Your current key cannot open this message.'],
+            content: ['No decryption key packets found'],
             error: 'decrypt error',
             expectPercentageProgress: true,
           },
@@ -1180,7 +1180,7 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw==
           msgId,
           {
             content: ['テストです\nテスト'],
-            signature: 'error verifying signature: Ascii armor integrity check failed',
+            signature: 'error verifying signature: Unexpected end of packet',
             encryption: 'not encrypted',
           },
           authHdr
@@ -1863,19 +1863,26 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw==
       })
     );
 
+    /**
+     * RFC 4880
+     * An implementation MUST NOT reject an OpenPGP object when the CRC24 footer is present, missing, malformed, or disagrees
+     * with the computed CRC24 sum. When forming ASCII Armor, the CRC24 footer SHOULD NOT be generated,
+     * unless interoperability with implementations that require the CRC24 footer to be present is a concern.
+     * https://github.com/openpgpjs/openpgpjs/issues/1810#issuecomment-2490780175
+     */
     test(
-      'decrypt - wrong message - checksum throws error',
+      'decrypt - check if decrypted correctly and not throw error for wrong checksum message',
       testWithBrowser(async (t, browser) => {
         const { authHdr } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'compatibility');
         const threadId = '15f7ffb9320bd79e';
-        const expectedContent = 'Ascii armor integrity check failed';
+        const expectedContent = 'The International DUBLIN Literary Award is an international literary award presented each year for a novel written';
         await BrowserRecipe.pgpBlockVerifyDecryptedContent(
           t,
           browser,
           threadId,
           {
             content: [expectedContent],
-            error: 'decrypt error',
+            encryption: 'encrypted',
           },
           authHdr
         );
diff --git a/test/source/tests/setup.ts b/test/source/tests/setup.ts
diff --git a/test/source/tests/unit-node.ts b/test/source/tests/unit-node.ts
diff --git a/tsconfig.json b/tsconfig.json

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`"outDir": "../build/test",`
`13`	`13`	`"skipLibCheck": true,`
`14`	`14`	`"paths": {`
`15`		`- "@openpgp/web-stream-tools": ["../node_modules/@openpgp/web-stream-tools/types/index.v4.9.d.ts", "../build/streams/streams.js"]`
	`15`	`+ "@openpgp/web-stream-tools": ["../node_modules/@openpgp/web-stream-tools/lib/index.d.ts", "../build/generic-extension-wip/lib/streams_common.js"]`
`16`	`16`	`}`
`17`	`17`	`},`
`18`	`18`	`"files": [`
Original file line number	Diff line number	Diff line change
`@@ -165,6 +165,6 @@ export class PgpArmor {`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`public static armor(messagetype: OpenPGP.enums.armor, body: object): string {`
`168`		`- return opgp.armor(messagetype, body, undefined, undefined, undefined, opgp.config);`
	`168`	`+ return opgp.armor(messagetype, body, undefined, undefined, undefined, false, opgp.config);`
`169`	`169`	`}`
`170`	`170`	`}`