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,224 Commits 237 Branches 514 Tags
49f0e368d081b4a96ecbed2277c93e5b9af90d8c
Commit Graph

4224 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hubert Chathi
49f0e368d0 Merge pull request #1104 from matrix-org/uhoreg/ignore_verification_done 
ignore m.key.verification.done messages when we don't expect any more messages
 2019-12-10 09:27:22 -05:00
Bruno Windels
590608a215 Merge pull request #1111 from matrix-org/bwindels/fix-verif-remote-echo-cancel 
dont cancel on remote echo of own .request event
 2019-12-10 14:09:47 +00:00
Bruno Windels
202fec2a35 dont cancel on remote echo of own .request event 2019-12-10 14:35:17 +01:00
Bruno Windels
817bfa35e5 Merge pull request #1109 from matrix-org/bwindels/accept-verif-request-rebased 
Refactor verification request code
 2019-12-10 11:10:01 +00:00
Bruno Windels
df6ebf83b4 fix tests 2019-12-09 17:45:01 +01:00
Bruno Windels
e5dcc5a407 use verification request with channel from crypto 2019-12-09 17:45:01 +01:00
Bruno Windels
1ee8abb0e6 wrap channel passed to verifier to nofity request 
so request is notified when verifier sends an event
 2019-12-09 17:45:01 +01:00
Bruno Windels
dd40435425 make verifier use channel instead of client straight away 
so it is agnostic of the channel used
 2019-12-09 17:45:01 +01:00
Bruno Windels
74cb57c761 extract DM verification specific things into InRoomChannel 2019-12-09 17:45:01 +01:00
Bruno Windels
86123f28f7 extract to_device verification specific things into ToDeviceChannel 2019-12-09 17:45:01 +01:00
Bruno Windels
f97ab32e7c extract common logic between normal & DM verif into single request class 2019-12-09 17:45:01 +01:00
RiotRobot
b0e2544e4b Merge branch 'master' into develop 2019-12-09 11:25:47 +00:00
RiotRobot
0d59963b53 v2.4.6 v2.4.6 2019-12-09 11:23:37 +00:00
RiotRobot
c669aafedb Prepare changelog for v2.4.6 2019-12-09 11:23:37 +00:00
J. Ryan Stinnett
772d668389 Merge pull request #1105 from matrix-org/jryans/xs-dl-storage 
Fix device list's cross-signing storage path
 2019-12-06 12:06:49 +00:00
J. Ryan Stinnett
03360a663e Fix device list's cross-signing storage path 
Some variables were changed during the course of the initial cross-signing PR
(https://github.com/matrix-org/matrix-js-sdk/pull/832) without updating the
storage path to match, so we weren't storing / loading cross-signing info for
devices in the end.

This updates storage and loading to match where the data now lives in memory.
 2019-12-06 11:59:17 +00:00
Hubert Chathi
e1e9f690c9 ignore m.key.verification.done messages when we don't expect any more messages 2019-12-05 12:53:59 -05:00
David Baker
fa46d2bef8 Merge pull request #1103 from matrix-org/dbkr/yarn_upgrade_dec19 
yarn upgrade
 2019-12-05 13:58:50 +00:00
David Baker
cfaadef669 yarn upgrade 2019-12-04 14:19:38 +00:00
RiotRobot
358f13500b v2.4.6-rc.1 v2.4.6-rc.1 2019-12-04 11:57:08 +00:00
RiotRobot
016f16954a Prepare changelog for v2.4.6-rc.1 2019-12-04 11:57:07 +00:00
Travis Ralston
c1543545d2 Merge pull request #1102 from matrix-org/travis/aliases 
Update alias handling
 2019-12-03 13:54:27 -07:00
Travis Ralston
5da936d96a Fix tests 2019-12-03 13:38:40 -07:00
Travis Ralston
0dead73837 Update alias handling 
Fixes https://github.com/vector-im/riot-web/issues/11551
 2019-12-03 12:29:50 -07:00
Hubert Chathi
92ca2386ea Merge pull request #1096 from uhoreg/fix_sas_unit_test 
increase timeout on flush to fix failing unit test
 2019-11-28 17:19:41 -05: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
a6f7936311 Merge pull request #1095 from matrix-org/travis/fix-tests-18 
Disable broken cross-signing test
 2019-11-28 09:11:05 -07: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
569d5d1fce Merge pull request #1094 from matrix-org/travis/fix-tests-13 
Fix a couple SAS tests
 2019-11-27 09:24:27 -07:00
RiotRobot
6ea8003df2 Merge branch 'master' into develop 2019-11-27 10:28:14 +00:00
RiotRobot
c8ab82010a v2.4.5 v2.4.5 2019-11-27 10:17:54 +00:00
RiotRobot
bf1bec9c6c Prepare changelog for v2.4.5 2019-11-27 10:17:54 +00: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
Matthew Hodgson
fd73c3fb3a fix bogus logline 2019-11-27 01:19:17 +00:00
Travis Ralston
e3dbf7cc41 Merge pull request #1093 from matrix-org/travis/fix-tests-3 
Fix Olm unwedging test
 2019-11-26 15:32:50 -07:00
Travis Ralston
18749c580e Fix Olm unwedging test 
Deep within the crypto layers we call `getId()`, and when we don't have that function the async call on the emitter fails but doesn't fail the test. This manifests as a timeout because the code path that would call the thing blew up.
 2019-11-26 15:06:56 -07:00
J. Ryan Stinnett
396db30fbf Update tests 2019-11-26 12:04:14 -07:00
J. Ryan Stinnett
6b38868de6 Relax identity server discovery checks to FAIL_PROMPT 
As discussed in MSC2284, this relaxes the identity server discovery to a
`FAIL_PROMPT` state so that clients can choose to warn and continue.

Part of https://github.com/vector-im/riot-web/issues/11102
Implements https://github.com/matrix-org/matrix-doc/pull/2284
 2019-11-26 12:04:07 -07:00
Matthew Hodgson
01a46ad880 log outbound to_device msgs for tracking keyshares 2019-11-26 12:03:34 -07:00
Matthew Hodgson
46f8251e94 s/console/logger/ as per review 2019-11-26 12:03:28 -07:00
Matthew Hodgson
77f882f45a log keyshare ID 2019-11-26 12:03:24 -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
5b8b0a8aa3 log outbound to_device msgs for tracking keyshares 2019-11-26 18:35:25 +00:00
Travis Ralston
b1924d4db6 Merge pull request #1089 from matrix-org/travis/upgrade-notifications 
Fix empty string handling in push notifications
 2019-11-26 11:00:24 -07:00
Travis Ralston
1b877118ef Only do one type check 2019-11-26 10:31:04 -07:00
Travis Ralston
682a5daf1c Merge branch 'develop' into travis/upgrade-notifications 2019-11-26 10:29:40 -07:00