Travis Ralston
0dead73837
Update alias handling
...
Fixes https://github.com/vector-im/riot-web/issues/11551
2019-12-03 12:29:50 -07:00
RiotRobot
6ea8003df2
Merge branch 'master' into develop
2019-11-27 10:28:14 +00:00
Matthew Hodgson
fd73c3fb3a
fix bogus logline
2019-11-27 01:19:17 +00: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
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
Matthew Hodgson
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
Matthew Hodgson
3787b6f1c7
s/console/logger/ as per review
2019-11-26 09:07:23 +00:00
Matthew Hodgson
6e08835496
log keyshare ID
2019-11-26 01:58:04 +00:00
Matthew Hodgson
191695da5a
lint
2019-11-26 01:41:59 +00:00
Matthew Hodgson
2215087f96
expand e2ee logging to better debug UISIs
2019-11-26 01:17:12 +00:00
Michael Telatynski
32234ee7fc
Merge pull request #1087 from matrix-org/t3chguy/remove_bluebird_11
...
Remove Bluebird: phase 2
2019-11-26 00:03:22 +00:00
Travis Ralston
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
Michael Telatynski
7fb807919c
Stop using bluebird .returns and .spread
2019-11-25 12:31:46 +00:00
Michael Telatynski
bd8f8ef28d
Replace yet more deferreds
2019-11-25 11:28:09 +00:00
Michael Telatynski
3901a381cc
replace another couple of deferreds
2019-11-25 11:18:32 +00:00
J. Ryan Stinnett
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
Michael Telatynski
5e0ba9971c
nothing works anymore :((
2019-11-23 12:18:39 +00:00
David Baker
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
Bruno Windels
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
Bruno Windels
6952db6762
no need to filter here anymore when listening for timeline, also remove obsolete docs
2019-11-22 17:32:37 +01:00
Bruno Windels
51898cffe8
add comments for timeout constants
2019-11-22 17:31:48 +01:00
David Baker
d8337d703d
Use the right variable name
2019-11-22 15:59:36 +00:00
David Baker
adac0c353c
Fix calls in e2e rooms
...
Events will be decrypted after the sync event, so we were having
to wait until the next sync event before they got processed.
2019-11-22 15:56:06 +00:00
Michael Telatynski
04fca16420
Stop using Bluebird promise::value
2019-11-22 15:36:42 +00:00
Bruno Windels
ca89b6e7a8
use adapter for to_device requests to have same api as for verif over DM
...
Riot doesn't fully implement to_device verifications, e.g.
it doesn't send a `request` but immediately sends a `start` event.
Because of this, `crypto.verification.request` doesn't get fired,
as that code path doesn't get triggered. This is why MatrixChat
in the react-sdk was listening for `crypto.verification.start`.
Verification over DM *does* send a `request` event first, so
to have the same API for both methods, we fake the request and
wrap the verifier in it.
2019-11-22 16:12:19 +01:00
Bruno Windels
ac1173c628
also emit crypto.verification.request for verification over DM
2019-11-22 16:11:49 +01:00
Michael Telatynski
0a0ae111f6
replace Bluebird::map
2019-11-22 15:03:03 +00:00
David Baker
5262d716e4
Lint
2019-11-21 19:10:27 +00:00
David Baker
7addacba38
Always process call events in batches
...
We had a bunch of logic in place to suppress calls if the answer
or hangup had already arrived, but we only used it on startup.
This extends this logic to happen all the time, which means we'll
also do the same suppression if a call happenned while we were
offline.
2019-11-21 18:56:37 +00:00
David Baker
3a9832a8c6
Fix ringing chirp on loading
...
We have a heap of logic to do the right thing when a call event
arrives, eg. wait until the client is ready so we can see if there's
already been a hangup event before saying there's an incoming call.
Unfortunately it only waited until the client was prepared, not
until it was syncing, so any events that arrived from the server
in the catchup sync bypassed this logic altogether.
This was probably broken back when we introduced the sync accumulator,
since before then, "PREPARED" meant, "done initialsync" rather than
"loaded fake initialsync from storage".
Fixes https://github.com/vector-im/riot-web/issues/3572
2019-11-21 17:56:04 +00:00
Bruno Windels
4a40c10d4c
add helper method on event for current age according to local clock
2019-11-21 17:13:43 +01:00
Michael Telatynski
ac742aad70
use Bluebird in promise utils sleep so it has .done and .nodeify
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2019-11-21 10:14:06 +00:00
Michael Telatynski
549b0f9313
Stop using Bluebird.delay and Bluebird promise::delay
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2019-11-21 10:05:59 +00:00
Michael Telatynski
2ce106382a
Stop using Bluebird promise::isFulfilled()
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2019-11-21 10:01:16 +00:00
Michael Telatynski
b44f43e5db
fix import in relations.js
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2019-11-21 09:45:00 +00:00
Michael Telatynski
522640edd9
rip out lolex also
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2019-11-20 21:05:21 +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
Bruno Windels
c785b10603
Merge pull request #1077 from matrix-org/bwindels/dm-verif-in-e2ee-rooms
...
Fix SAS verification in encrypted DMs
2019-11-19 14:32:01 +00:00
Bruno Windels
90512bdd5f
also listen for non-encrypted events when verifying over DM
2019-11-19 15:23:05 +01:00
J. Ryan Stinnett
10751e9a6d
Merge pull request #1078 from matrix-org/jryans/4s-new-key-backup
...
Cross-signing / secret storage tweaks
2019-11-19 12:54:38 +00:00
J. Ryan Stinnett
d51c5a2d68
Rename secret storage file to match the default class
2019-11-19 11:21:20 +00:00
J. Ryan Stinnett
1f24845431
Standardise naming of key ID variables in secret storage
...
Keys in secret storage have both an ID and an optional name, but most `keyName`
variables were actually storing the ID value. This renames and standardises to
avoid confusion.
2019-11-19 10:48:47 +00:00
Bruno Windels
3b02b62ba5
add m.relates_to back to the content on the requesting side for e2e room
...
as it needs to be added to the commitment hash
as before, getContent() in an e2ee room doesn't return the relation
2019-11-18 18:34:05 +01:00