Skip to content

use OpenPGP.js from web content script, simplify #5013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 32 commits into from
Mar 27, 2023
Merged

use OpenPGP.js from web content script, simplify #5013

Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
11d8a76
use OpenPGP.js from web content script - wip
Mar 14, 2023
3346597
firefox fix
Mar 14, 2023
7a7651e
use processAndStoreKeysFromEkmLocally() directly
Mar 14, 2023
48fb7f2
simplify
Mar 15, 2023
3dfd68b
Merge remote-tracking branch 'origin/master' into issue-4906-openpgp-…
Mar 15, 2023
6c8da84
added link to external PR
Mar 16, 2023
a2c989f
Merge remote-tracking branch 'origin/master' into issue-4906-openpgp-…
Mar 16, 2023
fe9bb59
web-stream-tools support in content script (development setup)
Mar 18, 2023
7ff645f
production mode in webpack bundling
Mar 20, 2023
6a1af63
testing OpenPGP/Stream operations from content script
Mar 20, 2023
1fa81d9
Merge remote-tracking branch 'origin/master' into issue-4906-openpgp-…
Mar 20, 2023
7dff2be
lint fix
Mar 20, 2023
4e33580
build for manual testing of content script in Firefox
Mar 20, 2023
6d2ec20
more debug configurations for VSCode
Mar 20, 2023
8d4a3ab
removed duplicate
Mar 21, 2023
4298b1d
Merge remote-tracking branch 'origin/master' into issue-4906-openpgp-…
Mar 21, 2023
9598bb0
fix
Mar 21, 2023
a72e748
fix
Mar 21, 2023
aa5c6ac
allow multiple test result divs
Mar 22, 2023
3fb4257
Merge remote-tracking branch 'origin/master' into issue-4906-openpgp-…
Mar 22, 2023
710f27d
clearer test output
Mar 22, 2023
70dc59c
niceties
Mar 22, 2023
d7df2bc
fix Uint8Array problem in Firefox
Mar 23, 2023
d971da2
Merge remote-tracking branch 'origin/master' into issue-4906-openpgp-…
Mar 24, 2023
4d88425
updated comment
Mar 24, 2023
3efd2e7
Merge remote-tracking branch 'origin/master' into issue-4906-openpgp-…
Mar 24, 2023
e53a17d
Merge remote-tracking branch 'origin/master' into issue-4906-openpgp-…
Mar 25, 2023
2dd0237
globally patch Uint8Array.subarray()
Mar 26, 2023
18dc1ab
fix
Mar 26, 2023
2a0c078
patch Uint8Array.slice
Mar 26, 2023
9deb31a
Added a test for KeyUtil.readBinary()
Mar 26, 2023
97396e1
increase ava cli timeout values
Mar 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .semaphore/semaphore.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ blocks:
- name: consumer mock - flaky test group
commands:
- npm run-script test_ci_chrome_consumer_flaky
- name: content script tests
commands:
- npm run-script test_ci_chrome_content_scripts
- name: enterprise mock - standard test group
commands:
- npm run-script test_ci_chrome_enterprise
Expand Down
62 changes: 62 additions & 0 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,16 @@
"outputCapture": "std",
"skipFiles": ["<node_internals>/**/*.js"]
},
{
"type": "node",
"request": "launch",
"name": "Debug buf",
"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/ava",
"preLaunchTask": "npm: pretest-incremental",
"runtimeArgs": ["build/test/test/source/buf.js", "--verbose", "--concurrency=1"],
"outputCapture": "std",
"skipFiles": ["<node_internals>/**/*.js"]
},
{
"type": "node",
"request": "launch",
Expand Down Expand Up @@ -81,6 +91,25 @@
"outputCapture": "std",
"skipFiles": ["<node_internals>/**/*.js"]
},
{
"type": "node",
"request": "launch",
"name": "Debug chrome_content_scripts",
"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/ava",
"preLaunchTask": "npm: pretest-incremental",
"runtimeArgs": [
"build/test/test/source/test.js",
"--verbose",
"--concurrency=1",
"--",
"CONTENT-SCRIPT-TESTS",
"--retry=false",
"--debug",
"--pool-size=1"
],
"outputCapture": "std",
"skipFiles": ["<node_internals>/**/*.js"]
},
{
"type": "node",
"request": "launch",
Expand Down Expand Up @@ -120,6 +149,39 @@
],
"outputCapture": "std",
"skipFiles": ["<node_internals>/**/*.js"]
},
{
"type": "node",
"request": "launch",
"name": "Debug tsc-compiler",
"program": "${workspaceFolder}/build/tooling/tsc-compiler.js",
"cwd": "${workspaceFolder}",
"args": ["--project", "conf/tsconfig.streams.json"],
"stopOnEntry": true,
"outputCapture": "std",
"skipFiles": ["<node_internals>/**/*.js"]
},
{
"type": "node",
"request": "launch",
"name": "Debug resolve-modules",
"program": "${workspaceFolder}/build/tooling/resolve-modules.js",
"cwd": "${workspaceFolder}",
"args": ["--project", "./tsconfig.json"],
"stopOnEntry": true,
"outputCapture": "std",
"skipFiles": ["<node_internals>/**/*.js"]
},
{
"type": "node",
"request": "launch",
"name": "Debug bundle-content-scripts",
"program": "${workspaceFolder}/build/tooling/bundle-content-scripts.js",
"cwd": "${workspaceFolder}",
"args": [],
"stopOnEntry": true,
"outputCapture": "std",
"skipFiles": ["<node_internals>/**/*.js"]
}
]
}
24 changes: 24 additions & 0 deletions conf/webpack.config.js
View file
Open in desktop
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was really a lot of work done only to be able to call web-stream-tools readToEnd function, with different approaches for unit test code, extension pages and content script. May it be possible to convince OpenPGP.js developers to simply re-export this helper function from their library, @tomholub ?

Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
//webpack.config.js
//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',
},
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'],
},
};
3 changes: 0 additions & 3 deletions extension/js/background_page/background_page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { Bm, BrowserMsg } from '../common/browser/browser-msg.js';
import { emailKeyIndex } from '../common/core/common.js';
import { VERSION } from '../common/core/const.js';
import { ExpirationCache } from '../common/core/expiration-cache.js';
import { processAndStoreKeysFromEkmLocally, getLocalKeyExpiration } from '../common/helpers.js';
import { Catch } from '../common/platform/catch.js';
import { AcctStore } from '../common/platform/store/acct-store.js';
import { ContactStore } from '../common/platform/store/contact-store.js';
Expand Down Expand Up @@ -60,8 +59,6 @@ console.info('background_process.js starting');
BrowserMsg.bgAddListener('storeGlobalSet', (r: Bm.StoreGlobalSet) => GlobalStore.set(r.values));
BrowserMsg.bgAddListener('storeAcctGet', (r: Bm.StoreAcctGet) => AcctStore.get(r.acctEmail, r.keys));
BrowserMsg.bgAddListener('storeAcctSet', (r: Bm.StoreAcctSet) => AcctStore.set(r.acctEmail, r.values));
BrowserMsg.bgAddListener('processAndStoreKeysFromEkmLocally', processAndStoreKeysFromEkmLocally);
BrowserMsg.bgAddListener('getLocalKeyExpiration', getLocalKeyExpiration);

// todo - when https://github.com/FlowCrypt/flowcrypt-browser/issues/2560
// is fixed, this can be moved to the gmail content script, and some may be removed
Comment on lines -63 to 64
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also BrowserMsg.addPgpListeners(); could be removed from below, and added to content script message listener instead.

Then pgp_block can be updated to call content script instead of background script.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should I do this in this PR?
I thought after #5022 we may no longer need some of these messages, e.g. pgpMsgDecrypt or pgpMsgVerifyDetached

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i see. then it doesn't have to be in this pr.

Expand Down
18 changes: 1 addition & 17 deletions extension/js/common/browser/browser-msg.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,6 @@ export namespace Bm {
export type ShowAttachmentPreview = { iframeUrl: string };
export type ReRenderRecipient = { email: string };
export type SaveFetchedPubkeys = { email: string; pubkeys: string[] };
export type ProcessAndStoreKeysFromEkmLocally = { acctEmail: string; decryptedPrivateKeys: string[] };
export type GetLocalKeyExpiration = { acctEmail: string };

export namespace Res {
export type GetActiveTabInfo = {
Expand All @@ -107,12 +105,6 @@ export namespace Bm {
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 GetLocalKeyExpiration = number | undefined;
export type ProcessAndStoreKeysFromEkmLocally = {
needPassphrase?: boolean;
updateCount?: number;
noKeysSetup?: boolean;
};
// 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
Expand All @@ -134,9 +126,7 @@ export namespace Bm {
| StoreGlobalSet
| AjaxGmailAttachmentGetChunk
| SaveFetchedPubkeys
| ProcessAndStoreKeysFromEkmLocally
| PgpKeyBinaryToArmored
| GetLocalKeyExpiration;
| PgpKeyBinaryToArmored;
}

export type AnyRequest =
Expand Down Expand Up @@ -176,8 +166,6 @@ export namespace Bm {
| ShowAttachmentPreview
| ReRenderRecipient
| SaveFetchedPubkeys
| ProcessAndStoreKeysFromEkmLocally
| GetLocalKeyExpiration
| PgpKeyBinaryToArmored
| AuthWindowResult;

Expand Down Expand Up @@ -244,10 +232,6 @@ export class BrowserMsg {
BrowserMsg.sendAwait(undefined, 'pgpKeyBinaryToArmored', bm, true) as Promise<Bm.Res.PgpKeyBinaryToArmored>,
saveFetchedPubkeys: (bm: Bm.SaveFetchedPubkeys) =>
BrowserMsg.sendAwait(undefined, 'saveFetchedPubkeys', bm, true) as Promise<Bm.Res.SaveFetchedPubkeys>,
processAndStoreKeysFromEkmLocally: (bm: Bm.ProcessAndStoreKeysFromEkmLocally) =>
BrowserMsg.sendAwait(undefined, 'processAndStoreKeysFromEkmLocally', bm, true) as Promise<Bm.Res.ProcessAndStoreKeysFromEkmLocally>,
getLocalKeyExpiration: (bm: Bm.GetLocalKeyExpiration) =>
BrowserMsg.sendAwait(undefined, 'getLocalKeyExpiration', bm, true) as Promise<Bm.Res.GetLocalKeyExpiration>,
},
},
passphraseEntry: (dest: Bm.Dest, bm: Bm.PassphraseEntry) => BrowserMsg.sendCatch(dest, 'passphrase_entry', bm),
Expand Down
24 changes: 24 additions & 0 deletions extension/js/common/core/crypto/pgp/openpgp-key.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@ export class OpenPGPKey {
throw new Error(`Key ${key.id} is not a private key`);
}
opgpKey = (await opgp.revokeKey({ key: opgpKey, format: 'object' })).privateKey;
OpenPGPKey.patch(opgpKey);
}
const certificate = await opgpKey.getRevocationCertificate();
if (!certificate) {
Expand Down Expand Up @@ -998,4 +999,27 @@ export class OpenPGPKey {
}
return nonDummyPrvPackets;
};

private static fixUint8Arrays = (obj: object, processed: object[] = []) => {
for (const k in obj) {
if (obj.hasOwnProperty(k)) {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const x = (obj as any)[k];
if (x instanceof globalThis.Uint8Array || x instanceof window.Uint8Array) {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
(obj as any)[k] = new Uint8Array(x);
} else if (typeof x === 'object' && x && !processed.includes(x)) {
processed.push(x);
OpenPGPKey.fixUint8Arrays(x, processed);
}
}
}
};

private static patch = (opgpKey: OpenPGP.Key) => {
if (Catch.browser()?.name === 'firefox') {
// need to re-create Uint8Array from globalThis.Uint8Array or window.Uint8Array for Firefox content script
OpenPGPKey.fixUint8Arrays(opgpKey);
Copy link
Contributor Author

@rrrooommmaaa rrrooommmaaa Mar 24, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The main problem with Firefox was that Uint8Array's created by OpenPGP.js were of globalThis.Uint8Array or window.Uint8Array types
and this fix openpgpjs/web-stream-tools#23 didn't help because
calling a method of such an object (e.g. stripped = bin.subarray(i); inside OpenPGP.js) caused an exception Error: Permission denied to access property "constructor"
However, this type of workaround works: new Uint8Array(bin).subarray(i)
So this patch iterates over the tree of OpenPGP.Key object to re-initialize all Uint8Array's with new Uint8Array

Opinions, @sosnovsky, @tomholub?

Copy link
Collaborator

@tomholub tomholub Mar 24, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I imagine this could be fixed purely in OpenPGP.js which would be cleaner? Either that, or monkey-patch the types on our end.

The main problem with Firefox was that Uint8Array's created by OpenPGP.js were of globalThis.Uint8Array or window.Uint8Array types

Does that mean they create sometimes one type and sometimes the other?

Option 1: Can the library be patched to always create the same "good" type?

Or are you saying that both globalThis.Uint8Array and window.Uint8Array are "bad" and we need just Uint8Array? Where does that one come from if not global or window?

Option 2: Could the library be patched to accept a config.Uint8ArrayClass = Uint8Array and then that would be used throughout the codebase? That would be a larger change, presumably.

Option 3: Alternatively, on the "broken" type, could we monkey patch it from outside the library like this? Right in requireOpenpgpjs

globalThis.Uint8Array.prototype.subarray = function (i) {
  return new Uint8Array(bin).subarray(i);
}

window.Uint8Array.prototype.subarray = function (i) {
  return new Uint8Array(bin).subarray(i);
}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The main problem with Firefox was that Uint8Array's created by OpenPGP.js were of globalThis.Uint8Array or window.Uint8Array types

Does that mean they create sometimes one type and sometimes the other?

  1. With regard to this particular test if (x instanceof window.Uint8Array) seems to be good enough, while if (x instanceof globalThis.Uint8Array) causes the test to fail.
  2. The window.openpgp (where we take the instance of OpenPGP.js) was undefined when loading the OpenPGP.js bundle in Firefox, so I changed it to globalThis.openpgp. This works in both Chrome and Firefox. So globalThis in Firefox is a sandbox, while in Chrome it's a window.
  3. And the issue (that I dealt with earlier) https://github.com/openpgpjs/web-stream-tools/pull/23/files is that OpenPGP.js doesn't recognize its "own" Uint8Array type when running in a Firefox sandbox.

I just had another look at OpenPGP.js code (and there is native Web Cryptography API involved) and have this hypothesis (not tested yet):
As the "Permission denied" error was encountered in serializeParams function, probably these "bad" window.Uint8Array objects are returned from this Web Cryptography API, while globalThis.Uint8Array (sandboxed) my be created by the OpenPGP.js code itself. And the "constructor" permission denied error actually means that subarray is trying to create window.Uint8Array (same as itself) but as it is called by a sandbox only globalThis.Uint8Array are allowed to be created, hence the cul-de-sac. We can try and file this as a bug to Firefox.

Option 1: Can the library be patched to always create the same "good" type?

The code itself only has simple new Uint8Array calls, so the fact that it creates globalThis.Uint8Array is a consequence that the code is running in a sandbox. So this question should be rephrased as -- can and should we make the code run not in a sandbox in Firefox? If not, we can probably try and update the library to re-initialize all Uint8Array's coming from Web Cryptography API (that is, convert window.Uint8Array to sandboxed globalThis.Uint8Array), but how to unit-test this? We need to handle each place where Uint8Array arrives from the API and make sure we handle each new such place.

Or are you saying that both globalThis.Uint8Array and window.Uint8Array are "bad" and we need just Uint8Array? Where does that one come from if not global or window?

Apparently this is due to the complex Firefox process model (that I don't fully understand yet) https://wiki.mozilla.org/Security/Sandbox/Process_model
Looks like globalThis.Uint8Array (sandbox) is bearable in a sense that it can be dealt with patches like https://github.com/openpgpjs/web-stream-tools/pull/23/files but there may be problems in the code consuming these objects should they try to test their types.

Option 2: Could the library be patched to accept a config.Uint8ArrayClass = Uint8Array and then that would be used throughout the codebase? That would be a larger change, presumably.

It's not an issue of mis-configuration.

Option 3: Alternatively, on the "broken" type, could we monkey patch it from outside the library like this? Right in requireOpenpgpjs

globalThis.Uint8Array.prototype.subarray = function (i) {
  return new Uint8Array(bin).subarray(i);
}

window.Uint8Array.prototype.subarray = function (i) {
  return new Uint8Array(bin).subarray(i);
}

I can try this.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This works in both Chrome and Firefox:

    if (window !== globalThis) {
        window.Uint8Array.prototype.subarray = function (i) {
            return new globalThis.Uint8Array(this).subarray(i);
        };
    }

and this too:

    if (window !== globalThis) {
        window.Uint8Array.prototype.subarray = function (i) {
            return new Uint8Array(this).subarray(i);
        };
    }

we can also add Catch.browser().name === 'firefox' into the condition.

The following results in an infinite recursion in Chrome:

        window.Uint8Array.prototype.subarray = function (i) {
            return new Uint8Array(this).subarray(i);
        };

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But may this patch possibly affect other scripts on the page? Is window of the content script isolated from the window of the page itself?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can also add Catch.browser().name === 'firefox' into the condition.

yes. This looks good. If that's the case, we don't have to test Firefox so thoroughly, since it's a global fix, and we also wouldn't have to set up Firefox automated tests at this time.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we don't have to test Firefox so thoroughly

There potentially might be issues with other objects than Uint8Array. Also we might need to patch other methods that return an array, e.g. slice and filter?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested slice and filter -- slice failed so I patched it too, filter is working without modification.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also tested the "bad" Uint8Array as input to a function like readBinary() or openpgp.readKey{ binaryKey: ... }
When unpatched, the permission denied exception happens.
When patched everything is ok.
My concern is whether our prototype patch applies to all potential sources of Uint8Arrays such as network, background page etc.?
Should we pre-emptively re-initialize all Uint8Array arguments of, say, KeyUtil and MsgUtil methods?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we pre-emptively re-initialize all Uint8Array arguments of, say, KeyUtil and MsgUtil methods?

I wouldn't. I'd just go with the patches that appear to work, do some manual testing on Firefox, release it, wait for any reports and then fix those (which should be coming from less common workflows).

We only probably have 5k users on Firefox, as opposed to hundreds of thousands on Chrome. Plus I treat Firefox as our beta channel. So I'm not too worried, and wouldn't want to over-focus on this.

}
};
}
9 changes: 5 additions & 4 deletions extension/js/common/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { ClientConfiguration } from './client-configuration.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 { Bm } from './browser/browser-msg.js';
import { PgpPwd } from './core/crypto/pgp/pgp-password.js';

export const isCustomerUrlFesUsed = async (acctEmail: string) => {
Expand Down Expand Up @@ -111,9 +110,11 @@ export const processAndStoreKeysFromEkmLocally = async ({
acctEmail,
decryptedPrivateKeys,
ppOptions: originalOptions,
}: Bm.ProcessAndStoreKeysFromEkmLocally & {
}: {
acctEmail: string;
decryptedPrivateKeys: string[];
ppOptions?: PassphraseOptions;
}): Promise<Bm.Res.ProcessAndStoreKeysFromEkmLocally> => {
}) => {
const { unencryptedPrvs } = await parseAndCheckPrivateKeys(decryptedPrivateKeys);
const existingKeys = await KeyStore.get(acctEmail);
let { keysToRetain, newUnencryptedKeysToSave } = await filterKeysToSave(unencryptedPrvs, existingKeys);
Expand Down Expand Up @@ -175,7 +176,7 @@ export const processAndStoreKeysFromEkmLocally = async ({
};
};

export const getLocalKeyExpiration = async ({ acctEmail }: Bm.GetLocalKeyExpiration): Promise<Bm.Res.GetLocalKeyExpiration> => {
export const getLocalKeyExpiration = async (acctEmail: string): Promise<number> => {
const kis = await KeyStore.get(acctEmail);
const expirations = await Promise.all(kis.map(async ki => (await KeyUtil.parse(ki.public))?.expiration ?? Number.MAX_SAFE_INTEGER));
return Math.max(...expirations);
Expand Down
2 changes: 1 addition & 1 deletion extension/js/common/platform/require.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ type Codec = {
};

export const requireOpenpgp = (): typeof OpenPGP => {
return (window as unknown as { openpgp: typeof OpenPGP }).openpgp;
return (globalThis as unknown as { openpgp: typeof OpenPGP }).openpgp;
};

export const requireMimeParser = (): typeof MimeParser => {
Expand Down
3 changes: 1 addition & 2 deletions extension/js/content_scripts/webmail/gmail-element-replacer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ 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';
// note: only types are supported for OpenPGP.js or web-stream-tools, their function calls will fail
import { PgpArmor } from '../../common/core/crypto/pgp/pgp-armor.js';
import { Ui } from '../../common/browser/ui.js';
import { WebmailCommon } from '../../common/webmail.js';
Expand Down Expand Up @@ -391,7 +390,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');
const msg = await this.gmail.msgGet(msgId, 'full'); // todo: cache or thoroughly refactor in #5022
if (this.debug) {
console.debug('processNewPgpAttachments() -> msgGet done -> processAttachments', msg);
}
Expand Down
5 changes: 3 additions & 2 deletions extension/js/content_scripts/webmail/setup-webmail-content-script.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { Ui } from '../../common/browser/ui.js';
import { ClientConfiguration, ClientConfigurationError } from '../../common/client-configuration.js';
import { Str, Url } from '../../common/core/common.js';
import { InMemoryStoreKeys, VERSION } from '../../common/core/const.js';
import { getLocalKeyExpiration, processAndStoreKeysFromEkmLocally } from '../../common/helpers.js';
import { Injector } from '../../common/inject.js';
import { Lang } from '../../common/lang.js';
import { Notifications } from '../../common/notifications.js';
Expand Down Expand Up @@ -291,7 +292,7 @@ export const contentScriptSetupIfVacant = async (webmailSpecific: WebmailSpecifi
ppEvent: { entered?: boolean }
) => {
try {
const { needPassphrase, updateCount, noKeysSetup } = await BrowserMsg.send.bg.await.processAndStoreKeysFromEkmLocally({
const { needPassphrase, updateCount, noKeysSetup } = await processAndStoreKeysFromEkmLocally({
acctEmail,
decryptedPrivateKeys,
});
Expand Down Expand Up @@ -382,7 +383,7 @@ export const contentScriptSetupIfVacant = async (webmailSpecific: WebmailSpecifi
};

const notifyExpiringKeys = async (acctEmail: string, clientConfiguration: ClientConfiguration, notifications: Notifications) => {
const expiration = await BrowserMsg.send.bg.await.getLocalKeyExpiration({ acctEmail });
const expiration = await getLocalKeyExpiration(acctEmail);
if (expiration === undefined) {
return;
}
Expand Down
26 changes: 6 additions & 20 deletions extension/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,27 +40,13 @@
],
"content_scripts": [
{
"matches": [
"https://mail.google.com/*"
],
"css": [
"/css/webmail.css",
"/css/sweetalert2.css"
],
"js": [
"/lib/purify.js",
"/lib/jquery.min.js",
"/lib/sweetalert2.js",
"/js/content_scripts/webmail_bundle.js"
]
"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"]
},
{
"matches": [
"https://www.google.com/robots.txt*"
],
"js": [
"/js/common/oauth2/oauth2_inject.js"
],
"matches": ["https://www.google.com/robots.txt*"],
"js": ["/js/common/oauth2/oauth2_inject.js"],
"run_at": "document_start"
}
],
Expand Down Expand Up @@ -93,4 +79,4 @@
],
"minimum_chrome_version": "96",
"content_security_policy": "upgrade-insecure-requests; script-src 'self'; frame-ancestors https://mail.google.com 'self'; img-src 'self' https://* data: blob:; frame-src 'self' blob:; worker-src 'self'; form-action 'none'; media-src 'none'; font-src 'none'; manifest-src 'none'; object-src 'none'; base-uri 'self'"
}
}
Loading