matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-12-01 04:43:29 +03:00
Code Activity
5,882 Commits 238 Branches 514 Tags
ad521bf4c2532b51f6c04caff0ab98f470f8a116
Commit Graph

227 Commits

Author SHA1 Message Date
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
Bruno Windels
df6ebf83b4 fix tests 2019-12-09 17:45:01 +01: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
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
2173ab3437 Add test for bootstrapping from scratch 2019-12-04 10:59:28 +00:00
Michael Telatynski
1632ee3537 fix order 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-12-02 23:18:26 +00:00
Michael Telatynski
a16cdb948c Fix cross-signing.spec by waiting for right emit 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-12-02 23:12:45 +00:00
Michael Telatynski
c4ae27dae6 Merge branches 'develop' and 't3chguy/remove_bluebird_13' of github.com:matrix-org/matrix-js-sdk into t3chguy/remove_bluebird_13 2019-12-02 22:56:13 +00:00
Michael Telatynski
0170cb066d add another clean-up to sas.spec.js 2019-12-02 22:34:46 +00:00
Michael Telatynski
1286007b2e Rip out bluebird of a bunch of places, lots to go :( 2019-12-02 22:34:46 +00:00
Michael Telatynski
733008cfc4 delint and replace more defers 2019-12-02 22:34:46 +00:00
Michael Telatynski
bab4582139 Replace more Bluebirdy stuffs 2019-12-02 22:34:46 +00:00
Hubert Chathi
59b25d6837 increase timeout on flush to fix failing unit test 
also remove unused requests
 2019-11-28 16:53:21 -05:00
Travis Ralston
7392b4de17 xit instead of comment 2019-11-27 19:23:59 -07:00
Travis Ralston
79b0a5fada Add issue to comment 2019-11-27 19:21:57 -07:00
Travis Ralston
aee9442e52 Disable broken cross-signing test 
I don't know why it's broken, but the two errors I can get out of it are "unknown device for verification" and "user_signing key does not match". Someone who knows a bit more about cross-signing will probably need to take a look at this one.

Fixes https://github.com/vector-im/riot-web/issues/11520 (technically)
Opened https://github.com/vector-im/riot-web/issues/11545 to fix this correctly.
 2019-11-27 19:20:09 -07:00
Travis Ralston
e0c90ec9e3 Fix test flakes in SAS verification with old MAC 
This has similar fixes to 7ad5021147

Part of https://github.com/vector-im/riot-web/issues/11520
 2019-11-26 23:29:06 -07:00
Travis Ralston
7ad5021147 Fix SAS verification test 
There's 3 things going on in this commit:
1. `this` is maintained in the tests. Some binds are added instead of the `.call(this, ...)` syntax.
2. We use the right `origSendToDevice`
3. We ensure `downloadKeys` is actually on the client

The combination of these 3 fixes makes the test pass.

Part of https://github.com/vector-im/riot-web/issues/11520
 2019-11-26 23:24:37 -07:00
Michael Telatynski
057303d57c s/beforeEach/beforeAll/ for Olm.init() and cleanup sas.spec.js 2019-11-25 13:26:10 +00:00
Michael Telatynski
5fc0629201 fix expect calls 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-20 20:19:54 +00:00
Michael Telatynski
fd58957b06 migrate to jest from mocha+expect+istanbul 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-20 19:52:50 +00:00
J. Ryan Stinnett
d2ebc58c3c Use secret storage alg const in tests 2019-11-19 11:46:08 +00:00
J. Ryan Stinnett
5f02c4b5ad Namespace default secret storage key methods 2019-11-18 15:19:18 +00:00
David Baker
d37ed9ff6f lint 2019-11-15 12:39:14 +00:00
David Baker
e541b96a71 Change check{User|Device}Trust interfaces 
...to return objects with functions rather than a bitmask
 2019-11-15 12:15:13 +00:00
David Baker
d9d65309b3 More s/cross-signing/crossSigning/ 2019-11-14 11:29:08 +00:00
David Baker
7218e31a9c Sign & verify SSSS keys 2019-11-13 17:52:24 +00:00
David Baker
1798f3921f Make setDeafultKeyId wait for event 2019-11-13 14:42:08 +00:00
David Baker
26aa3d3ce7 Support default keys 2019-11-13 14:09:40 +00:00
David Baker
c97a87d1f6 Throw if an unknown key is specified 
It's probably important that the app knows if a secret isn't going
to be stored under one or more of the keys it thought it was going
to be stored under.

Also add a test to assert it.
 2019-11-12 14:07:05 +00:00
David Baker
4c651c15ea Convert secrets events to callbacks too 2019-11-11 20:01:11 +00:00
David Baker
a98e6964ef Missed bits of callback renaming 2019-11-11 16:51:49 +00:00
David Baker
03fe4afe32 lint 2019-11-07 15:20:07 +00:00
David Baker
12627022d1 Convert sas verification test to callbacks 2019-11-07 15:18:16 +00:00
David Baker
fabfe16d45 lint 2019-11-07 12:35:39 +00:00
David Baker
a34758f938 Convert event interface to callbacks 
Use options.cryptoCallbacks for things that require information
from the app rather than events, since events can have zero, one
or many listeners and the emitter doesn't know how many, so if
nobody's listening then we would have just waited forever for a
response.

Also a collection of other changes like renaming 'fu' to 'firstUse'
 2019-11-07 12:31:44 +00:00
David Baker
49588da73d Fix more tests 2019-10-29 19:39:31 +00:00
David Baker
3e2d845342 Merge remote-tracking branch 'origin/develop' into dbkr/cross_signing 2019-10-28 16:47:16 +00:00
David Baker
de1b545df1 lint 2019-10-28 15:42:42 +00:00
David Baker
3bec28b2ff make other tests pass 2019-10-28 15:23:58 +00:00
David Baker
8cad116dd7 Make tests pass 
* Pass the http backend out of makeTestClients so we can tell it
   to expect queries and flush requests out
 * Change colons to dots in the key events
 2019-10-28 14:56:35 +00:00
Hubert Chathi
d8e8dddd25 initial implementation of verification in DMs 2019-10-08 15:44:51 -04:00
Travis Ralston
f80af68686 End the verification timer when verification is done 
Fixes https://github.com/matrix-org/matrix-js-sdk/issues/980

This also improves cleanliness in the tests to cancel/terminate timers when needed.
 2019-07-10 14:51:12 -06:00
Hubert Chathi
7f8b9de560 offer to upgrade device verifications to cross-signing 2019-07-08 12:26:00 -04:00
Hubert Chathi
761f22b63d minor cleanups 2019-07-08 12:25:28 -04:00
Hubert Chathi
8d1d657c44 add unit test for backups signed by cross-signing key 2019-07-03 19:16:26 -04:00
Hubert Chathi
1cae5e8b97 fix unit tests to match event name changes 2019-06-27 23:33:07 -04:00