From 725dba3eb130982f6ed65ef0e0fc11fe1f2b9263 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 13 Jul 2023 19:09:32 +0100 Subject: [PATCH 1/3] allow import a key from file --- extension/chrome/elements/add_pubkey.htm | 4 +- extension/chrome/settings/modules/add_key.htm | 2 +- extension/chrome/settings/modules/add_key.ts | 5 +- .../chrome/settings/modules/contacts.htm | 2 +- extension/chrome/settings/modules/decrypt.htm | 2 +- .../chrome/settings/modules/my_key_update.htm | 29 +++++- .../chrome/settings/modules/my_key_update.ts | 21 +++-- extension/chrome/settings/setup.htm | 2 +- extension/chrome/settings/setup.ts | 3 +- .../chrome/settings/setup/setup-create-key.ts | 1 + .../chrome/settings/setup/setup-import-key.ts | 1 + .../setup/setup-key-manager-autogen.ts | 1 + .../settings/setup/setup-recover-key.ts | 1 + extension/js/common/helpers.ts | 13 +-- extension/js/common/lang.ts | 1 + extension/js/common/ui/key-import-ui.ts | 9 +- ...legmailcom-0x98acfa1eadab5b92-original.asc | 50 +++++++++++ ...x98acfa1eadab5b92-updated-userid-issue.key | Bin 0 -> 2976 bytes ...plegmailcom-0x98acfa1eadab5b92-updated.key | Bin 0 -> 3005 bytes test/source/tests/settings.ts | 84 +++++++++++++++++- 20 files changed, 203 insertions(+), 28 deletions(-) create mode 100644 test/samples/openpgp/flowcrypttestkeymultiplegmailcom-0x98acfa1eadab5b92-original.asc create mode 100644 test/samples/openpgp/flowcrypttestkeymultiplegmailcom-0x98acfa1eadab5b92-updated-userid-issue.key create mode 100644 test/samples/openpgp/flowcrypttestkeymultiplegmailcom-0x98acfa1eadab5b92-updated.key diff --git a/extension/chrome/elements/add_pubkey.htm b/extension/chrome/elements/add_pubkey.htm index 78c0b986eff..2cc80a3f4bd 100644 --- a/extension/chrome/elements/add_pubkey.htm +++ b/extension/chrome/elements/add_pubkey.htm @@ -1,6 +1,6 @@ - + @@ -12,7 +12,7 @@ - + diff --git a/extension/chrome/settings/modules/add_key.htm b/extension/chrome/settings/modules/add_key.htm index b8ef788c1f1..9d07dfc8295 100644 --- a/extension/chrome/settings/modules/add_key.htm +++ b/extension/chrome/settings/modules/add_key.htm @@ -12,7 +12,7 @@ - + diff --git a/extension/chrome/settings/modules/add_key.ts b/extension/chrome/settings/modules/add_key.ts index c64ba25cef8..7198c26ed28 100644 --- a/extension/chrome/settings/modules/add_key.ts +++ b/extension/chrome/settings/modules/add_key.ts @@ -98,10 +98,13 @@ View.run( private saveKeyAndContinue = async (key: Key) => { await saveKeysAndPassPhrase(this.acctEmail, [key]); // resulting new_key checked above + /* eslint-disable @typescript-eslint/naming-convention */ await setPassphraseForPrvs(this.clientConfiguration, this.acctEmail, [key], { passphrase: String($('.input_passphrase').val()), - passphrase_save: !!$('.input_passphrase_save').prop('checked'), // eslint-disable-line , @typescript-eslint/naming-convention + passphrase_save: !!$('.input_passphrase_save').prop('checked'), + passphrase_ensure_single_copy: false, // we require KeyImportUi to rejectKnown keys }); + /* eslint-enable @typescript-eslint/naming-convention */ BrowserMsg.send.reload(this.parentTabId, { advanced: true }); }; diff --git a/extension/chrome/settings/modules/contacts.htm b/extension/chrome/settings/modules/contacts.htm index 5f2f0b3126f..8c799625e17 100644 --- a/extension/chrome/settings/modules/contacts.htm +++ b/extension/chrome/settings/modules/contacts.htm @@ -12,7 +12,7 @@ - +