issue 4369 choose valid key for sending by tomholub · Pull Request #4372 · FlowCrypt/flowcrypt-browser

tomholub · 2022-04-05T16:52:45Z

This PR ensures that the extension always works with a valid key when available, even if first received key is revoked.

close #4369 - choose valid key
issue #4376 - KeyIdentity.type renamed to KeyIdentity.family

Tests added or updated

To be filled by reviewers

I have reviewed that this PR... (tick whichever items you personally focused on during this review):

addresses the issue it closes (if any)
code is readable and understandable
is accompanied with tests, or tests are not needed
is free of vulnerabilities
is documented clearly and usefully, or doesn't need documentation

tomholub · 2022-04-06T15:47:18Z

also todo - need to ensure there is no more primary especially primaryKi. Always treat as array.

tomholub · 2022-04-07T08:49:48Z

@rrrooommmaaa do you think you could review this today?

If yes, I'll wait with the release for the review. If not, I'd do a release and tell the customer to only test on evaluation environment for now.

rrrooommmaaa · 2022-04-07T09:56:41Z

@rrrooommmaaa do you think you could review this today?

Sure, I'll take a look

tomholub · 2022-04-07T11:00:30Z

(for me - need to look at revoked@key-manager-autoimport-no-prv-create-no-attester-submit.flowcrypt.test - cannot draft or send msg test and some of the other ones)

extension/chrome/elements/compose-modules/formatters/general-mail-formatter.ts

test/source/tests/compose.ts

tomholub · 2022-04-07T20:39:16Z

@rrrooommmaaa we're green. Tomorrow please have another look. Thanks!

tomholub

.

extension/chrome/elements/compose-modules/formatters/encrypted-mail-msg-formatter.ts

rrrooommmaaa

I outlined my concerns and ideas

extension/chrome/elements/compose-modules/compose-storage-module.ts

extension/chrome/elements/compose-modules/formatters/general-mail-formatter.ts

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

extension/js/common/assert.ts

extension/chrome/elements/compose-modules/formatters/general-mail-formatter.ts

extension/chrome/settings/setup.ts

extension/chrome/settings/modules/security.ts

extension/chrome/settings/modules/keyserver.ts

…owcrypt-browser into issue-4369-choose-right-key

tomholub

re-review. looks good, will file one more issue and merge this

tomholub · 2022-04-11T09:59:32Z

extension/chrome/settings/modules/backup-manual-module.ts

-    return new Attachment({ name: `flowcrypt-backup-${this.view.acctEmail.replace(/[^A-Za-z0-9]+/g, '')}.asc`, type: 'application/pgp-keys', data: Buf.fromUtfStr(armoredKey) });
+  private asBackupFile = (prv: KeyInfoWithIdentity) => {
+    return new Attachment({
+      name: `flowcrypt-backup-${this.view.acctEmail.replace(/[^A-Za-z0-9]+/g, '')}-${prv.id}.asc`,


I updated backups to use one file per key, and include fingerprint in each filename.

test/source/tests/compose.ts

Tom J added 4 commits April 5, 2022 16:51

issue 4369 choose valid key for sending - tests wip

7cc229f

ekm mock fix

06cf1a7

improve test

99f43bb

test

074ff88

wip

1ef1cf6

This comment was marked as resolved.

Sign in to view

wip

2f85f00

This comment was marked as resolved.

Sign in to view

wip

887d8b7

This comment was marked as resolved.

Sign in to view

Tom J added 9 commits April 6, 2022 18:21

can build

18e61d0

fix

c6e4d0a

fix code style

70a573f

refactor

3bb2ab5

fix

3bb0556

fix

f0b833f

wip

029cfec

fix

1659cf8

fix

520bc14

tomholub marked this pull request as ready for review April 7, 2022 08:48

tomholub requested a review from rrrooommmaaa as a code owner April 7, 2022 08:48

This comment was marked as off-topic.

Sign in to view

rrrooommmaaa reviewed Apr 7, 2022

View reviewed changes

extension/chrome/elements/compose-modules/formatters/general-mail-formatter.ts Show resolved Hide resolved

rrrooommmaaa reviewed Apr 7, 2022

View reviewed changes

test/source/tests/compose.ts Outdated Show resolved Hide resolved

fix test

929acf3

Tom J added 2 commits April 7, 2022 20:05

increase test timeouts

d492104

fixed test

ee95555

tomholub enabled auto-merge (squash) April 7, 2022 20:38

tomholub commented Apr 7, 2022

View reviewed changes

extension/chrome/elements/compose-modules/formatters/encrypted-mail-msg-formatter.ts Show resolved Hide resolved

rrrooommmaaa reviewed Apr 8, 2022

View reviewed changes

tomholub mentioned this pull request Apr 8, 2022

pass keys into submitPublicKeys in setup #4381

Open

simpler PR comments

4d5a68f

This was referenced Apr 8, 2022

openpgp header as parameter instead of loading keys again #4382

Open

update ranking of prvs, only load once #4383

Open

Tom J added 3 commits April 9, 2022 11:38

fix import style

7b9a27a

clean up backup mechanism

20c23c7

update backups test

50f3f03

tomholub mentioned this pull request Apr 9, 2022

OpenPGP key is no longer preferred over X509? #4385

Open

tomholub and others added 11 commits April 10, 2022 22:16

tests to expect more than one file

fc52725

Merge branch 'issue-4369-choose-right-key' of github.com:FlowCrypt/fl…

010c8c1

…owcrypt-browser into issue-4369-choose-right-key

fix possible undefined

c39a1cb

each backup with unique name

bb3ebd6

rm log

d3d8440

fix

58783aa

fixed download testing

8967ea1

reduce test flakiness

6ab61fe

reduce flakiness

5d528b0

fix floating promises

8c7eeb6

fix btn test

8da3e4a

tomholub commented Apr 11, 2022

View reviewed changes

tomholub mentioned this pull request Apr 11, 2022

expect exact file names when usingawaitDownloadTriggeredByClicking in tests #4387

Closed

tomholub disabled auto-merge April 11, 2022 10:06

tomholub merged commit cd824fc into master Apr 11, 2022

tomholub deleted the issue-4369-choose-right-key branch April 11, 2022 10:06

Conversation

tomholub commented Apr 5, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

To be filled by reviewers

Uh oh!

tomholub commented Apr 6, 2022

Uh oh!

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

tomholub commented Apr 7, 2022

Uh oh!

rrrooommmaaa commented Apr 7, 2022

Uh oh!

tomholub commented Apr 7, 2022

Uh oh!

This comment was marked as off-topic.

This comment was marked as off-topic.

Uh oh!

Uh oh!

tomholub commented Apr 7, 2022

Uh oh!

tomholub left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

rrrooommmaaa left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

tomholub left a comment

Choose a reason for hiding this comment

Uh oh!

tomholub Apr 11, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

tomholub commented Apr 5, 2022 •

edited

Loading