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
4,783 Commits 238 Branches 514 Tags
758e12d6ddbdfebaf75d431dc4add47e10c7732c
Commit Graph

4783 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baker
62bd41d2e6 Don't add ephemeral events to timeline when peeking 
As hopefully explained by comment.

Fixes https://github.com/vector-im/riot-web/issues/11120
 2020-01-29 15:04:09 +00:00
Bruno Windels
9d864ffd60 Merge pull request #1187 from matrix-org/bwindels/fixstartrace-rebased 
Verification: resolve race between .start events from both parties
 2020-01-29 15:04:00 +00:00
Travis Ralston
c45b38cece Actually do the verification 2020-01-29 14:56:28 +00:00
Travis Ralston
0d7aee2c36 Misc cleanup 2020-01-29 14:52:04 +00:00
Travis Ralston
be345a523f Fix verification flow 2020-01-29 14:43:37 +00:00
Bruno Windels
470bdf8741 fix tests 2020-01-29 15:19:18 +01:00
Bruno Windels
59319fb55b use logger instead of console 2020-01-29 15:19:07 +01:00
Bruno Windels
fb7695fdbc fix unrelated issue: errorFactory returns function, so call it 2020-01-29 15:18:48 +01:00
Bruno Windels
25b7552683 startEvent can always be passed to verifier 
as we'll check the sender there to see on which side we are
 2020-01-29 15:18:18 +01:00
Bruno Windels
21d520378f apply same algo to pick .start event initially when changing phase 
smallest sender userid wins
 2020-01-29 15:17:36 +01:00
Bruno Windels
9cd6607520 attempt to switch start event if we already have a verifier 2020-01-29 15:16:54 +01:00
Bruno Windels
efd3550f53 support switching startEvent while waiting for .accept on initiator side 
if we get a .start event from the other party and we've also sent one,
the .start event with the sender that is first in sorting order should
be taken, and the other one ignored.

At the point where we will receive it, the verifier has already
been returned from beginKeyVerification, so we'll need to switch
start event internally, and retry the verification, now on the
receiver (sending .accept) side instead of initiator side
(sending .start).
 2020-01-29 15:13:59 +01:00
Travis Ralston
76402ec8d7 Lie to the verification handling 2020-01-29 13:45:02 +00:00
Travis Ralston
f689142806 Define NAME as a property higher up 2020-01-29 10:52:26 +00:00
Travis Ralston
fd563bda6a Remove irrelevant verification flows for QR codes 
You can't actually get at these through our verification framework - they scan/show steps are pre-verification framework.
 2020-01-29 09:26:29 +00:00
Travis Ralston
09a8f7122c Merge branch 'develop' into travis/update-qr-code 2020-01-29 00:18:15 +00:00
David Baker
608fb00844 Merge pull request #1184 from matrix-org/dbkr/new_keybackup_in_bootstrap 
Add option to bootstrap to start new key backup
 2020-01-28 22:02:10 +00:00
David Baker
5c45e9c306 Add option to bootstrap to start new key backup 
The key backup needs to be signed by the cross-signing key so
doing it here allows us to do it before we blow the private part
out of memory.
 2020-01-28 19:36:00 +00:00
Travis Ralston
950221dc13 Merge branch 'develop' into travis/update-qr-code 2020-01-28 17:27:38 +00:00
Travis Ralston
f816679596 Merge pull request #1182 from matrix-org/travis/null-guards 
Add a bunch of null guards to feature checks
 2020-01-28 14:24:53 +00:00
Travis Ralston
80ccf18b16 Merge pull request #1183 from salzig/docs/fix_matrix_client_reference 
docs: fix MatrixClient reference
 2020-01-28 14:13:59 +00:00
Ben Rexin
c7abd9062a docs: fix MatrixClient reference 2020-01-28 15:05:13 +01:00
Travis Ralston
4287f2229b Add a bunch of null guards to feature checks 2020-01-28 13:21:01 +00:00
Michael Telatynski
8408055137 Merge pull request #1180 from matrix-org/t3chguy/cs_verification_decoration 
Add helper to obtain the cancellation code for a verification request
 2020-01-28 11:23:24 +00:00
Michael Telatynski
cc0965d703 s/^t/T/ 2020-01-28 11:19:05 +00:00
Michael Telatynski
94b3d9d3e1 Add helper to obtain the cancellation code for a verification request 2020-01-28 11:15:07 +00:00
J. Ryan Stinnett
772bf7d6ff Merge pull request #1178 from matrix-org/jryans/tag-prerelease-next 
Publish pre-releases as a separate tag on npm
 2020-01-27 22:32:56 +00:00
J. Ryan Stinnett
15c2e4bb07 Publish pre-releases as a separate tag on npm 
npm will install the newest version a package has published to the `latest` tag,
including pre-releases, which is not ideal since those may not be ready for
production use yet.

This uses an alternate tag (`next` is a common convention, but it can be
anything) for pre-releases so the default installs only get stable versions.

Fixes https://github.com/vector-im/riot-web/issues/12029
 2020-01-27 20:40:35 +00:00
Travis Ralston
419693023f Add untested reciprocate function 2020-01-27 11:41:52 -07:00
Travis Ralston
2d081f2c19 Merge branch 'develop' into travis/update-qr-code 2020-01-27 11:41:05 -07:00
David Baker
c76ce1fd85 Merge pull request #1177 from matrix-org/dbkr/fix_passthrough_keys 
Fix support for passthrough keys
 2020-01-27 16:55:27 +00:00
David Baker
f38b4d37e6 Check for the whole thing being null 2020-01-27 16:25:08 +00:00
David Baker
73c92dfc57 Merge pull request #1174 from matrix-org/dbkr/trust_cross_signing_on_verify 
Trust our own cross-signing keys if we verify them with another device
 2020-01-27 16:11:08 +00:00
David Baker
61c5430deb Fix support for passthrough keys 
and add code to fix up ones mis-stored by the old code
 2020-01-27 15:50:01 +00:00
J. Ryan Stinnett
21e4c597d9 Merge pull request #1176 from matrix-org/jryans/await-device-list 
Ensure cross-signing keys are downloaded when checking trust
 2020-01-27 15:34:19 +00:00
J. Ryan Stinnett
4dbeee8cb3 Ignore downloading for tests 2020-01-27 15:28:36 +00:00
J. Ryan Stinnett
adc76c636e Merge pull request #1172 from matrix-org/bwindels/reduceveriflogging 
Don't log verification validation errors for normal messages
 2020-01-27 15:04:00 +00:00
J. Ryan Stinnett
0dbf89b2b4 Ensure cross-signing keys are downloaded when checking trust 
When checking cross-signing trust during login, we may not have downloaded keys
yet. This ensures we make an attempt first if needed.

Fixes https://github.com/vector-im/riot-web/issues/12068
 2020-01-27 14:55:20 +00:00
Travis Ralston
83241ac17d Update QR code handling for new URL 
This doesn't have any meaningful change on the process, just makes it more in line with what we do.
 2020-01-27 06:59:04 -07:00
Cédric Van Rompay
6aa5d39357 move new example to own directory 2020-01-27 14:28:50 +01:00
Cédric Van Rompay
1304ecbe03 factor out _initializeFromExportedDevice 2020-01-27 14:12:43 +01:00
RiotRobot
aafc027812 Merge branch 'master' into develop 2020-01-27 11:31:09 +00:00
RiotRobot
d84e0b166b v4.0.0 v4.0.0 2020-01-27 11:28:17 +00:00
RiotRobot
d1d46009cd Prepare changelog for v4.0.0 2020-01-27 11:28:17 +00:00
Cédric Van Rompay
3a4b6f0ea0 rename "kwargs" to "opts" 2020-01-27 11:48:28 +01:00
Cédric Van Rompay
b3d10ace21 mention export method in import 2020-01-27 11:45:17 +01:00
Cédric Van Rompay
c17df7a6f7 fix typo in comments 2020-01-27 11:42:15 +01:00
David Baker
1c13f5026e Merge pull request #1173 from matrix-org/dbkr/fix_bootstrap_cleanup 
Fix bootstrap cleanup
 2020-01-27 10:18:37 +00:00
David Baker
b9cfede888 Trust our own cross-signing keys if we verify them with another device 2020-01-25 20:38:11 +00:00
David Baker
49fd9e90a0 this can be const now 2020-01-25 19:48:36 +00:00