diff --git a/extension/chrome/elements/add_pubkey.htm b/extension/chrome/elements/add_pubkey.htm index c67794ac3fb..a4cbbc3faca 100644 --- a/extension/chrome/elements/add_pubkey.htm +++ b/extension/chrome/elements/add_pubkey.htm @@ -20,7 +20,7 @@
-

Add a pubkey to email address

+

Add a public key to email address

@@ -37,7 +37,7 @@

Add a pubkey to email address

-
+
Manually importing Public Keys can be dangerous
@@ -57,4 +57,4 @@

Add a pubkey to email address

- \ No newline at end of file + diff --git a/extension/chrome/elements/add_pubkey.ts b/extension/chrome/elements/add_pubkey.ts index 341ef939678..d5d4dba2b56 100644 --- a/extension/chrome/elements/add_pubkey.ts +++ b/extension/chrome/elements/add_pubkey.ts @@ -35,10 +35,16 @@ View.run(class AddPubkeyView extends View { public render = async () => { Ui.event.protect(); for (const missingPubkeyEmail of this.missingPubkeyEmails) { - Xss.sanitizeAppend('select.email', ``); + const escapedMissingPubkeyEmail = Xss.escape(missingPubkeyEmail); + Xss.sanitizeAppend('select.email', ``); } + const uniqueEmails = new Set(); for (const contact of await ContactStore.search(undefined, { hasPgp: true })) { - Xss.sanitizeAppend('select.copy_from_email', ``); + uniqueEmails.add(contact.email); + } + for (const email of Array.from(uniqueEmails).sort()) { + const escapedEmail = Xss.escape(email); + Xss.sanitizeAppend('select.copy_from_email', ``); } this.fetchKeyUi.handleOnPaste($('.pubkey')); $('.action_settings').click(this.setHandler(async () => await Browser.openSettingsPage('index.htm', this.acctEmail, '/chrome/settings/modules/contacts.htm'))); @@ -53,6 +59,7 @@ View.run(class AddPubkeyView extends View { if (errs.length) { await Ui.modal.warning(`some keys could not be processed due to errors:\n${errs.map(e => `-> ${e.message}\n`).join('')}`); } + $('.copy_from_email').val(''); $('.pubkey').val(String(KeyUtil.armor(keys[0]))); $('.action_ok').trigger('click'); } else if (errs.length) { @@ -73,21 +80,34 @@ View.run(class AddPubkeyView extends View { if ($(fromSelect).val()) { const [contact] = await ContactStore.get(undefined, [String($(fromSelect).val())]); if (contact?.pubkey) { - $('.pubkey').val(KeyUtil.armor(contact.pubkey)).prop('disabled', true); + $('.pubkey').val('').prop('disabled', true).prop('style', 'display: none;'); + $('#manual-import-warning').prop('style', 'display: none;'); } else { Catch.report('Contact unexpectedly not found when copying pubkey by email in add_pubkey.htm'); await Ui.modal.error('Contact not found.'); } } else { - $('.pubkey').val('').prop('disabled', false); + $('.pubkey').val('').prop('disabled', false).prop('style', 'display: inline;'); + $('#manual-import-warning').prop('style', 'display: inline;'); } }; private submitHandler = async () => { try { - const keyImportUi = new KeyImportUi({ checkEncryption: true }); - const normalized = await keyImportUi.checkPub(String($('.pubkey').val())); - await ContactStore.update(undefined, String($('select.email').val()), { pubkey: normalized }); + const email = String($('select.email').val()); + if ($('.copy_from_email').val()) { + const fromEmail = String($('.copy_from_email').val()); + const keys = await ContactStore.getEncryptionKeys(undefined, [fromEmail]); + for (const keyArray of keys) { + for (const key of keyArray.keys) { + await ContactStore.update(undefined, email, { pubkey: key }); + } + } + } else { + const keyImportUi = new KeyImportUi({ checkEncryption: true }); + const normalized = await keyImportUi.checkPub(String($('.pubkey').val())); + await ContactStore.update(undefined, email, { pubkey: normalized }); + } this.closeDialog(); } catch (e) { if (e instanceof UserAlert) { diff --git a/extension/js/common/ui/key-import-ui.ts b/extension/js/common/ui/key-import-ui.ts index 647ba8eeca1..c5f916eac48 100644 --- a/extension/js/common/ui/key-import-ui.ts +++ b/extension/js/common/ui/key-import-ui.ts @@ -246,10 +246,11 @@ export class KeyImportUi { if (KeyUtil.getKeyType(armored) !== 'openpgp') { return { normalized: armored }; } - const headers = PgpArmor.headers(type); const normalized = await KeyUtil.normalize(armored); if (!normalized) { - throw new UserAlert('There was an error processing this key, possibly due to bad formatting.\nPlease insert complete key, including "' + headers.begin + '" and "' + headers.end + '"'); + const headers = PgpArmor.headers(type); + throw new UserAlert('There was an error processing this key, possibly due to bad formatting.\n' + + `Please insert complete key, including "${headers.begin}" and "${headers.end}".`); } return normalized; }; diff --git a/test/source/mock/google/google-endpoints.ts b/test/source/mock/google/google-endpoints.ts index 8da8e5b0399..29fb9bab8bf 100644 --- a/test/source/mock/google/google-endpoints.ts +++ b/test/source/mock/google/google-endpoints.ts @@ -12,7 +12,7 @@ import { oauth } from '../lib/oauth'; type DraftSaveModel = { message: { raw: string, threadId: string } }; -const allowedRecipients: Array = ['flowcrypt.compatibility@gmail.com', 'human+manualcopypgp@flowcrypt.com', +const allowedRecipients: Array = ['flowcrypt.compatibility@gmail.com', 'manualcopypgp@flowcrypt.com', 'censored@email.com', 'test@email.com', 'human@flowcrypt.com', 'human+nopgp@flowcrypt.com', 'expired.on.attester@domain.com', 'ci.tests.gmail@flowcrypt.test', 'smime1@recipient.com', 'smime2@recipient.com', 'smime@recipient.com', 'smime.attachment@recipient.com', 'auto.refresh.expired.key@recipient.com', 'to@example.com', 'cc@example.com', 'bcc@example.com', diff --git a/test/source/tests/compose.ts b/test/source/tests/compose.ts index 797d070b45a..cdbfa290697 100644 --- a/test/source/tests/compose.ts +++ b/test/source/tests/compose.ts @@ -23,6 +23,7 @@ import { SetupPageRecipe } from './page-recipe/setup-page-recipe'; import { testConstants } from './tooling/consts'; import { MsgUtil } from '../core/crypto/pgp/msg-util'; import { Buf } from '../core/buf'; +import { PubkeyInfoWithLastCheck } from '../core/crypto/key'; // tslint:disable:no-blank-lines-func // tslint:disable:no-unused-expression @@ -269,25 +270,41 @@ export const defineComposeTests = (testVariant: TestVariant, testWithBrowser: Te })); ava.default('compose - settings - manually copied pubkey', testWithBrowser('ci.tests.gmail', async (t, browser) => { + const dbPage = await browser.newPage(t, TestUrls.extension('chrome/dev/ci_unit_test.htm')); + // add a contact containing 2 pubkeys to the storage + await dbPage.page.evaluate(async (pubkeys: string[]) => { + for (const pubkey of pubkeys) { + const key = await (window as any).KeyUtil.parse(pubkey); + await (window as any).ContactStore.update(undefined, 'tocopyfrom@example.test', { pubkey: key }); + } + }, [testConstants.abcddfTestComPubkey, testConstants.abcdefTestComPubkey]); const inboxPage = await browser.newPage(t, TestUrls.extensionInbox('ci.tests.gmail@flowcrypt.test')); - let composeFrame = await InboxPageRecipe.openAndGetComposeFrame(inboxPage); - await ComposePageRecipe.fillMsg(composeFrame, { to: 'human@flowcrypt.com' }, 'just to load - will close this page'); - await Util.sleep(2); // todo: should wait until actually loaded - await composeFrame.waitAndClick('@action-close-new-message'); - await inboxPage.waitTillGone('@container-new-message'); - composeFrame = await InboxPageRecipe.openAndGetComposeFrame(inboxPage); - await ComposePageRecipe.fillMsg(composeFrame, { to: 'human+manualcopypgp@flowcrypt.com' }, 'manual copied key'); + const composeFrame = await InboxPageRecipe.openAndGetComposeFrame(inboxPage); + await ComposePageRecipe.fillMsg(composeFrame, { to: 'manualcopypgp@flowcrypt.com' }, 'manual copied key'); await composeFrame.waitAndClick('@action-open-add-pubkey-dialog', { delay: 1 }); await inboxPage.waitAll('@dialog-add-pubkey'); const addPubkeyDialog = await inboxPage.getFrame(['add_pubkey.htm']); await addPubkeyDialog.waitAll('@input-select-copy-from'); await Util.sleep(1); - await addPubkeyDialog.selectOption('@input-select-copy-from', 'human@flowcrypt.com'); - await Util.sleep(1); + await addPubkeyDialog.selectOption('@input-select-copy-from', 'tocopyfrom@example.test'); + await addPubkeyDialog.waitTillGone(['@input-pubkey', '@manual-import-warning']); + await addPubkeyDialog.selectOption('@input-select-copy-from', 'Copy from Contact'); + await addPubkeyDialog.waitAll(['@input-pubkey', '@manual-import-warning']); + await addPubkeyDialog.selectOption('@input-select-copy-from', 'tocopyfrom@example.test'); + await addPubkeyDialog.waitTillGone(['@input-pubkey', '@manual-import-warning']); await addPubkeyDialog.waitAndClick('@action-add-pubkey'); await inboxPage.waitTillGone('@dialog-add-pubkey'); await composeFrame.waitAndClick('@action-send', { delay: 2 }); await inboxPage.waitTillGone('@container-new-message'); + await inboxPage.close(); + // test the pubkeys we copied + const contact = await dbPage.page.evaluate(async () => { + return await (window as any).ContactStore.getOneWithAllPubkeys(undefined, 'manualcopypgp@flowcrypt.com'); + }); + expect(contact.sortedPubkeys.length).to.equal(2); + expect((contact.sortedPubkeys as PubkeyInfoWithLastCheck[]).map(pub => pub.pubkey.id)).to.include.members( + ['6CF53D2329C2A80828F499D375AA44AB8930F7E9', '3155F118B6E732B3638A1CE1608BCD797A23FB91']); + await dbPage.close(); })); ava.default('compose - keyboard - Ctrl+Enter sends message', testWithBrowser('ci.tests.gmail', async (t, browser) => {