matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-26 17:03:12 +03:00
Code Activity
4,310 Commits 237 Branches 514 Tags
657e48de7ef75321fd2bd2e239bac398d8c84c46
Commit Graph

309 Commits

Author SHA1 Message Date
J. Ryan Stinnett
657e48de7e Fix grammar 2019-12-11 10:51:12 +00:00
J. Ryan Stinnett
780394b051 Merge remote-tracking branch 'origin/develop' into jryans/4s-new-key-backup 2019-12-10 17:54:02 +00:00
J. Ryan Stinnett
6942e3467b Rework to hold cross-signing keys in JS SDK as needed 2019-12-10 17:36:35 +00:00
Michael Telatynski
70eb8a7300 Merge pull request #1100 from matrix-org/t3chguy/remove_bluebird_13 
Remove Bluebird: phase 2.5
 2019-12-10 16:58:22 +00:00
J. Ryan Stinnett
4a3ce640d7 Document verification methods accepts cross-signing key ID as well 2019-12-09 17:20:54 +00:00
Bruno Windels
e5dcc5a407 use verification request with channel from crypto 2019-12-09 17:45:01 +01:00
J. Ryan Stinnett
2a2a40af7a Add separate check for secret storage keys 
Decryption vs. signing keys are calculated differently and so require separate
check functions.
 2019-12-06 17:51:22 +00:00
J. Ryan Stinnett
1df12d1677 Fix type docs for checkPrivateKey 2019-12-06 14:41:29 +00:00
J. Ryan Stinnett
14a2d7e860 Add docs for more exported cross-signing APIs 2019-12-06 13:20:57 +00:00
J. Ryan Stinnett
33f5894547 Adjust secret key adding to consume instead of create 
This changes `addKey` for secret storage to consume info about a pre-generated
key, rather than creating the key in middle of the method. This eases UI work
that want to have the public and private keys earlier on in the flow.
 2019-12-05 16:30:10 +00:00
J. Ryan Stinnett
65f8556ee9 Include KDF params in recovery key info 
This adjusts the metadata from `createRecoveryKeyFromPassphrase` to include KDF
info formatted in the way secret storage expects. Since
`prepareKeyBackupVersion` did something similar, we adjust it to use the new
function and reshape the objects.
 2019-12-05 10:25:24 +00:00
Michael Telatynski
4a47867e49 Down to two test failures 2019-12-04 19:17:58 +00:00
J. Ryan Stinnett
9fb559307b Add recovery key generation path 2019-12-04 15:32:22 +00:00
J. Ryan Stinnett
96c8c2b9c3 Test for cross-signing private key as well as public 2019-12-04 15:16:38 +00:00
J. Ryan Stinnett
c0dbf2df7f Publicise method testing for secret storage key existence 2019-12-04 14:23:47 +00:00
J. Ryan Stinnett
eeffe208ec Clarify client-level method for adding secret storage keys 2019-12-04 13:45:56 +00:00
J. Ryan Stinnett
9dc61faa6f Add bootstrap option to specify storage key 2019-12-04 11:36:25 +00:00
J. Ryan Stinnett
58ad1ecbfe Sign secret storage keys when cross-signing keys change 2019-12-02 13:50:43 +00:00
J. Ryan Stinnett
463538178d Clarify purpose of the after local key change helper 2019-12-02 13:02:21 +00:00
J. Ryan Stinnett
14907065d7 Rename device signing auth param 2019-11-29 17:50:59 +00:00
J. Ryan Stinnett
ce2059a4b9 Add follow-up steps when restoring from secret storage 
If we restore cross-signing keys from secret storage, we also need to run many
of the same follow-up steps from resetting the keys, such as saving to the
crypto store, upgrading device verifications, etc.
 2019-11-29 15:20:59 +00:00
J. Ryan Stinnett
2bfc157e64 Clarify cross-signing reset variable 2019-11-29 15:15:18 +00:00
J. Ryan Stinnett
e69de8c26f Merge remote-tracking branch 'origin/develop' into jryans/4s-new-key-backup 2019-11-29 11:23:48 +00:00
J. Ryan Stinnett
f404c80714 Get cross-signing private keys from secret storage 
If you've already set up cross-signing elsewhere and start using a new device,
this loads the private keys from secret storage and regenerates the public keys
to match.

We may also want to download the public keys from the homeserver's key sharing
and verify that they match the private keys, but for now that's left as future
work.
 2019-11-29 11:11:45 +00:00
J. Ryan Stinnett
bdaf2e3b4f Reflow comment 2019-11-28 12:13:48 +00:00
J. Ryan Stinnett
e000e2b9fd Move cross-signing storage to 4S into class 2019-11-28 11:54:20 +00:00
J. Ryan Stinnett
d5000820fd Fix comment typo 2019-11-27 17:19:41 +00:00
J. Ryan Stinnett
9d91d197e4 Revert to previous cross-signing keys on error 2019-11-27 16:11:06 +00:00
J. Ryan Stinnett
5b767ae948 More comment tweaks to cross-signing keys 2019-11-27 15:51:00 +00:00
RiotRobot
6ea8003df2 Merge branch 'master' into develop 2019-11-27 10:28:14 +00:00
Matthew Hodgson
fd73c3fb3a fix bogus logline 2019-11-27 01:19:17 +00:00
Matthew Hodgson
46f8251e94 s/console/logger/ as per review 2019-11-26 12:03:28 -07:00
Matthew Hodgson
8c72fd104e lint 2019-11-26 12:03:20 -07:00
Matthew Hodgson
549656884b expand e2ee logging to better debug UISIs 2019-11-26 12:03:11 -07:00
Matthew Hodgson
fcbfaac1fd Merge pull request #1090 from matrix-org/matthew/more_e2ee_logging 
expand e2ee logging to better debug UISIs
 2019-11-26 10:18:28 +00:00
Matthew Hodgson
3787b6f1c7 s/console/logger/ as per review 2019-11-26 09:07:23 +00:00
Matthew Hodgson
191695da5a lint 2019-11-26 01:41:59 +00:00
Matthew Hodgson
2215087f96 expand e2ee logging to better debug UISIs 2019-11-26 01:17:12 +00:00
Michael Telatynski
32234ee7fc Merge pull request #1087 from matrix-org/t3chguy/remove_bluebird_11 
Remove Bluebird: phase 2
 2019-11-26 00:03:22 +00:00
David Baker
49448fafaa Correct comment (it's not just a cache) 2019-11-25 15:05:10 +00:00
Bruno Windels
11a958b8ca Merge pull request #1085 from matrix-org/bwindels/verif-toasts 
Monitor verification request over DM as well
 2019-11-22 16:39:07 +00:00
Bruno Windels
6952db6762 no need to filter here anymore when listening for timeline, also remove obsolete docs 2019-11-22 17:32:37 +01:00
Bruno Windels
51898cffe8 add comments for timeout constants 2019-11-22 17:31:48 +01:00
Bruno Windels
ca89b6e7a8 use adapter for to_device requests to have same api as for verif over DM 
Riot doesn't fully implement to_device verifications, e.g.
it doesn't send a `request` but immediately sends a `start` event.

Because of this, `crypto.verification.request` doesn't get fired,
as that code path doesn't get triggered. This is why MatrixChat
in the react-sdk was listening for `crypto.verification.start`.

Verification over DM *does* send a `request` event first, so
to have the same API for both methods, we fake the request and
wrap the verifier in it.
 2019-11-22 16:12:19 +01:00
Bruno Windels
ac1173c628 also emit crypto.verification.request for verification over DM 2019-11-22 16:11:49 +01:00
Michael Telatynski
0a0ae111f6 replace Bluebird::map 2019-11-22 15:03:03 +00:00
Michael Telatynski
549b0f9313 Stop using Bluebird.delay and Bluebird promise::delay 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-21 10:05:59 +00:00
J. Ryan Stinnett
4116d89d5f Store cross-signing keys in secret storage 2019-11-20 17:48:36 +00:00
J. Ryan Stinnett
cc192efe45 Create the SSSS default key when needed 2019-11-20 17:27:57 +00:00
J. Ryan Stinnett
feef1a35b9 Add first pass at bootstrapping Secure Secret Storage 
This adds a first chunk of bootstrapping Secure Secret Storage by creating
cross-signing keys and supporting interactive auth to upload them.

Part of https://github.com/vector-im/riot-web/issues/11212
 2019-11-20 17:23:21 +00:00