Zoe
7a1bbdf2dd
oops
2020-02-07 15:51:27 +00:00
Zoe
a69c621305
New option to fully reset Secret Storage keys in boostrapSecretStorage
2020-02-07 14:45:10 +00:00
Hubert Chathi
3f369e528b
Merge pull request #1167 from cedricvanrompay/1-olm-device-export-import
...
add export/import of Olm devices
2020-02-05 20:09:01 -05:00
Zoe
77f42c479b
Update src/utils.ts
...
Co-Authored-By: Travis Ralston <travpc@gmail.com >
2020-02-05 11:50:39 +00:00
Zoe
d60bd22674
actually let's not get into the business of writing types for our deps
2020-02-05 11:43:11 +00:00
Zoe
6d8e8e6bd7
fix tests
2020-02-05 11:07:55 +00:00
Zoe
9c01945a05
copyright notice *sigh*
2020-02-05 10:23:24 +00:00
Zoe
7ce5ddd380
lint
2020-02-05 10:14:26 +00:00
Zoe
2b5de914f5
review feedback
2020-02-05 09:57:46 +00:00
Zoe
18a2426707
Convert utils.js -> utils.ts
2020-02-04 19:09:48 +00:00
David Baker
157cc9e5eb
Merge remote-tracking branch 'origin/develop' into dbkr/stop_signing_yourself
2020-02-04 14:26:58 +00:00
David Baker
81daf12598
Merge pull request #1196 from matrix-org/dbkr/verfication_logging
...
Add a bunch of logging to verification
2020-02-04 14:21:08 +00:00
Bruno Windels
9249b0652f
Merge pull request #1198 from matrix-org/bwindels/fixverifroomeventtype
...
Fix: always return a valid string from InRoomChannel.getEventType
2020-02-04 14:16:14 +00:00
Bruno Windels
ee4c6b6265
Merge pull request #1195 from matrix-org/bwindels/logoncancel
...
add logging when a request is being cancelled
2020-02-04 13:08:13 +00:00
David Baker
68deab4a68
We still need to mark our master key locally verified
2020-02-04 12:27:53 +00:00
Bruno Windels
c9c765b5b8
fix getEventType
2020-02-04 13:12:38 +01:00
David Baker
616f73d8c6
forgive me, o great linter
2020-02-04 12:12:02 +00:00
David Baker
3a59cfa9c0
Don't sign ourselves as a user
2020-02-04 12:09:42 +00:00
David Baker
cf94527bd5
Add a bunch of logging to verification
...
So we have a better idea of what's going on
2020-02-04 12:04:50 +00:00
Bruno Windels
8bc0ef8c27
add logging when a request is being cancelled
...
so we can more easily see (especially for to_device requests)
why something was cancelled
2020-02-04 12:48:02 +01:00
Travis Ralston
bd403b6d87
Don't explode verification validation if we don't have an event type
...
I don't know why this is undefined at this point, or why membership events are ending up here, but this fixes develop for people.
See https://github.com/vector-im/riot-web/issues/12231
2020-02-04 11:46:31 +00:00
Bruno Windels
57a7328065
Merge pull request #1193 from matrix-org/bwindels/dontshowverifrequestnotforme
...
Fix: verification request appearing for users that are not the receiver or sender if they are in room
2020-02-04 09:39:45 +00:00
Bruno Windels
dfafa791f2
fix getOtherPartyUserId
2020-02-03 19:17:40 +01:00
Bruno Windels
5f2cb6b3a4
only an m.room.message with msgtype can be a .request
2020-02-03 19:17:18 +01:00
Cédric Van Rompay
b217f6aa81
minor doc update (with sign-off)
...
Signed-off-by: Cédric Van Rompay <cedric.vanrompay@gmail.com >
2020-02-03 10:32:32 +01:00
Cédric Van Rompay
ec597bea93
fix new way of calling OlmDevice.init
2020-02-03 10:27:10 +01:00
Cédric Van Rompay
7a5c54fef7
set pickle key through OlmDevice.init
2020-02-03 09:58:18 +01:00
David Baker
6d13457172
Fix getting secrets encoded with passthrough keys
2020-02-01 17:29:08 +00:00
Cédric Van Rompay
352509fd3a
Update src/crypto/OlmDevice.js
...
Co-Authored-By: Hubert Chathi <hubert@uhoreg.ca >
2020-01-31 11:53:20 +01:00
Cédric Van Rompay
d0f08f8839
Update src/crypto/OlmDevice.js
...
Co-Authored-By: Hubert Chathi <hubert@uhoreg.ca >
2020-01-31 11:53:09 +01:00
Cédric Van Rompay
efd38a3471
Update src/crypto/OlmDevice.js
...
Co-Authored-By: Hubert Chathi <hubert@uhoreg.ca >
2020-01-31 11:52:54 +01:00
Travis Ralston
3645764f9a
Appease the linter
2020-01-30 11:15:25 +00:00
Travis Ralston
769bfeb10f
Verify all the things
2020-01-30 11:10:25 +00:00
Travis Ralston
5fbaa9cfa7
Fix verification of the master key
2020-01-29 18:06:25 +00:00
Travis Ralston
007508ba12
Merge branch 'develop' into travis/update-qr-code
2020-01-29 16:57:57 +00:00
David Baker
0f1f18b232
Merge pull request #1188 from matrix-org/dbkr/dont_add_epemeral_events_to_timeline_when_peeking
...
Don't add ephemeral events to timeline when peeking
2020-01-29 15:17:27 +00:00
David Baker
d6b754b133
Merge pull request #1189 from matrix-org/dbkr/be_prepaed
...
Fix typo
2020-01-29 15:16:56 +00:00
Travis Ralston
1b80c83676
Merge branch 'develop' into travis/update-qr-code
2020-01-29 15:11:06 +00:00
David Baker
65646ff9e2
Fix typo
...
This would probably just cause apps to wait until the first live
sync had finished rather than the one from the store, so slowing
them down / breaking offline support.
2020-01-29 15:06:19 +00:00
Travis Ralston
92f6ec918b
Appease the linter
2020-01-29 15:06:13 +00:00
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
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
