matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-12-04 05:02:41 +03:00
Code Activity
4,546 Commits 238 Branches 515 Tags
efd3550f53b73bd82ca38fc08b9a30f694355f1b
Commit Graph

4546 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
David Baker
e09038232e Fix bootstrap cleanup 
As hopefully explained in the comment. The symptom of this was that
bootstrapping would work just fine the first time you called it
in any run of the app, but then if called a second time (eg. if you
cancelled by dismissing the password prompt) it would create keys and
upload the public parts but not store the private parts in SSSS,
leaving you with cross signing keys you don't have the private parts
of.

Also use object.assign in the save keys callback just in case we
ever reset a subset of the keys (and also because it makes it a
bit simpler to reason about what objects are where).
 2020-01-25 19:42:02 +00:00
Travis Ralston
2cfe310e89 Merge pull request #1155 from matrix-org/travis/qr-verif-rp 
QR code verification
 2020-01-24 08:55:42 -07:00
Bruno Windels
973c7467e8 Merge pull request #1171 from matrix-org/bwindels/fixverifyowndevice 
expose deviceId prop on device channel
 2020-01-24 11:24:23 +00:00
Bruno Windels
583df7ed7d don't log verification validation errors for normal messages 2020-01-24 12:23:18 +01:00
Bruno Windels
6d05376f04 expose deviceId prop on device channel 
used to check if a verification came through to_device in the toast
 2020-01-24 12:01:20 +01:00
Travis Ralston
b8092cd00b Make the tests pass 2020-01-23 20:41:52 -07:00
Travis Ralston
3c1dca6cef Generate a shared secret if we don't have one 2020-01-23 20:15:02 -07:00
Travis Ralston
c0f7dd6fe9 Fix secret size 2020-01-23 20:06:04 -07:00
Travis Ralston
6af6e99480 Expose the request event more readily for consumers 2020-01-23 20:05:56 -07:00
Travis Ralston
c5cbe48668 Remove docs too 2020-01-23 19:29:42 -07:00
Travis Ralston
15707956ef Remove private key accessors for cross-signing 2020-01-23 19:29:42 -07:00
Travis Ralston
4668fc87a1 Add cross-signing accessors and QR code stuff 2020-01-23 19:29:42 -07:00
Jack Works
468fb2cc41 chore: remove custom promise, use es6 standard 
Signed-off-by: Jack Works <jackworks@protonmail.com>
 2020-01-23 19:23:08 -07:00
Jack Works
7c79e7e836 fix: typos 
Signed-off-by: Jack Works <jackworks@protonmail.com>
 2020-01-23 19:21:19 -07:00
Travis Ralston
925c6ffc3e Merge pull request #1170 from matrix-org/travis/fix-build-release 
Move & upgrade babel runtime into dependencies (like it wants)
 2020-01-23 15:46:30 -07:00
Travis Ralston
0bf1f48623 Merge pull request #1169 from matrix-org/travis/fix-build 
Move & upgrade babel runtime into dependencies (like it wants)
 2020-01-23 15:45:53 -07:00
Travis Ralston
ffcb1c2513 Move & upgrade babel runtime into dependencies (like it wants) 
https://babeljs.io/docs/en/babel-runtime
 2020-01-23 15:44:59 -07:00
Travis Ralston
f286eb4d11 Move & upgrade babel runtime into dependencies (like it wants) 
https://babeljs.io/docs/en/babel-runtime
 2020-01-23 15:44:36 -07:00
Bruno Windels
a76267f5b0 Merge pull request #1166 from matrix-org/bwindels/verifyowndevicechecks 
Add unit tests for verifying your own device, remove .event property on verification request
 2020-01-23 17:01:43 +00:00
Bruno Windels
3faeec4add fix lint 2020-01-23 15:59:47 +01:00
Bruno Windels
7d56ee5084 with the change in the linked react-sdk PR, event isn't used anymore 2020-01-23 15:52:23 +01:00
Bruno Windels
b2afaabb8c add unit tests for verifying your own device over to_device messages 2020-01-23 15:52:07 +01:00
Bruno Windels
3efaf90bc8 Merge pull request #1163 from matrix-org/bwindels/verificationaccceptedbyotherdevice 
For dm-verification, also consider events sent by other devices of same user as "our" events
 2020-01-23 13:27:15 +00:00
Bruno Windels
0c52887688 copyright year 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-01-23 10:51:19 +00:00
David Baker
8aa1c1545e Merge pull request #1164 from matrix-org/dbkr/prepublish_rel 
Add a prepare script
 2020-01-22 20:59:40 +00:00
David Baker
7c84f421c5 Turns out prepublish is deprecated and should be prepare 2020-01-22 20:58:25 +00:00