e1e9f690c9
ignore m.key.verification.done messages when we don't expect any more messages
2019-12-05 12:53:59 -05:00
c1543545d2
Merge pull request #1102 from matrix-org/travis/aliases
...
Update alias handling
2019-12-03 13:54:27 -07:00
5da936d96a
Fix tests
2019-12-03 13:38:40 -07:00
0dead73837
Update alias handling
...
Fixes https://github.com/vector-im/riot-web/issues/11551
2019-12-03 12:29:50 -07:00
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
59b25d6837
increase timeout on flush to fix failing unit test
...
also remove unused requests
2019-11-28 16:53:21 -05:00
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
7392b4de17
xit instead of comment
2019-11-27 19:23:59 -07:00
79b0a5fada
Add issue to comment
2019-11-27 19:21:57 -07:00
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
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
6ea8003df2
Merge branch 'master' into develop
2019-11-27 10:28:14 +00:00
c8ab82010a
v2.4.5
2019-11-27 10:17:54 +00:00
bf1bec9c6c
Prepare changelog for v2.4.5
2019-11-27 10:17:54 +00:00
e0c90ec9e3
Fix test flakes in SAS verification with old MAC
...
This has similar fixes to 7ad5021147https://github.com/vector-im/riot-web/issues/11520
2019-11-26 23:29:06 -07:00
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
fd73c3fb3a
fix bogus logline
2019-11-27 01:19:17 +00:00
e3dbf7cc41
Merge pull request #1093 from matrix-org/travis/fix-tests-3
...
Fix Olm unwedging test
2019-11-26 15:32:50 -07:00
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
396db30fbf
Update tests
2019-11-26 12:04:14 -07:00
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
01a46ad880
log outbound to_device msgs for tracking keyshares
2019-11-26 12:03:34 -07:00
46f8251e94
s/console/logger/ as per review
2019-11-26 12:03:28 -07:00
77f882f45a
log keyshare ID
2019-11-26 12:03:24 -07:00
8c72fd104e
lint
2019-11-26 12:03:20 -07:00
549656884b
expand e2ee logging to better debug UISIs
2019-11-26 12:03:11 -07:00
5b8b0a8aa3
log outbound to_device msgs for tracking keyshares
2019-11-26 18:35:25 +00:00
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
1b877118ef
Only do one type check
2019-11-26 10:31:04 -07:00
682a5daf1c
Merge branch 'develop' into travis/upgrade-notifications
2019-11-26 10:29:40 -07:00
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
3787b6f1c7
s/console/logger/ as per review
2019-11-26 09:07:23 +00:00
6e08835496
log keyshare ID
2019-11-26 01:58:04 +00:00
191695da5a
lint
2019-11-26 01:41:59 +00:00
2215087f96
expand e2ee logging to better debug UISIs
2019-11-26 01:17:12 +00:00
32234ee7fc
Merge pull request #1087 from matrix-org/t3chguy/remove_bluebird_11
...
Remove Bluebird: phase 2
2019-11-26 00:03:22 +00:00
aa37f697bf
Fix empty string handling in push notifications
...
Fixes https://github.com/vector-im/riot-web/issues/11460
Empty strings are falsey, and the state key match for a tombstone event is an empty string. Ergo, nothing happens because all the conditions fail.
2019-11-25 16:35:27 -07:00
057303d57c
s/beforeEach/beforeAll/ for Olm.init() and cleanup sas.spec.js
2019-11-25 13:26:10 +00:00
ccc85d98e2
Merge branch 'master' into develop
2019-11-25 13:24:08 +00:00
c30a8b5a29
v2.4.4
2019-11-25 13:10:04 +00:00
295010893d
Prepare changelog for v2.4.4
2019-11-25 13:10:04 +00:00
7fb807919c
Stop using bluebird .returns and .spread
2019-11-25 12:31:46 +00:00
bd8f8ef28d
Replace yet more deferreds
2019-11-25 11:28:09 +00:00
3901a381cc
replace another couple of deferreds
2019-11-25 11:18:32 +00:00
12f6e51ef6
Merge pull request #1062 from matrix-org/jryans/identity-disco-opt
...
Relax identity server discovery checks to FAIL_PROMPT
2019-11-25 10:48:53 +00:00
aa8454e30a
Merge pull request #1061 from beaclnd92/develop
...
Fix incorrect return value of MatrixClient.prototype.uploadKeys
2019-11-24 22:19:09 -07:00
6b70230e0d
Merge branch 'develop' into develop2-test
2019-11-24 22:13:53 -07:00
5e0ba9971c
nothing works anymore :((
2019-11-23 12:18:39 +00:00
fa577c9475
Merge pull request #1086 from matrix-org/dbkr/fix_calls_in_e2e_rooms
...
Fix calls in e2e rooms
2019-11-22 17:48:33 +00:00
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
Hubert Chathi