7ea09ebe4a
Add fix and test
...
Signed-off-by: Nicolas Chamo <nicolas@chamo.com.ar >
2020-04-17 19:37:33 -03:00
1dcb16365b
Merge pull request #1326 from matrix-org/dbkr/serialise_prekey_decryptions
...
Serialise Olm prekey decryptions
2020-04-17 18:07:24 +01:00
83b33d9d7a
Add a catch so the error doesn't propagate to later decryptions
2020-04-17 18:03:15 +01:00
83879fa945
Serialise Olm prekey decryptions
...
If they overlap, they can both try to create new sessions, but this
removes the OTK so it will only work once.
Fixes https://github.com/vector-im/riot-web/issues/13229
2020-04-17 17:47:46 +01:00
57233416d9
Merge pull request #1324 from matrix-org/bwindels/fixkeybackupcrash
...
Fix: crash when backup key needs fixing from corruption issue
2020-04-17 12:11:07 +00:00
f56ce29210
method is on crypto
2020-04-17 13:51:12 +02:00
4b639d5f9a
Merge pull request #1322 from matrix-org/dbkr/fix_ssss_reset
...
Fix cross-signing/SSSS reset
2020-04-16 20:38:47 +01:00
da8ed77aae
lint
2020-04-16 20:18:27 +01:00
12f46909f7
Fix cross-signing/SSSS reset
...
We re-used the old SSSS key even when resetting, meaning we prompted
the user to create a new passphrase but then ignored it and kept using
the old one.
Fixes https://github.com/vector-im/riot-web/issues/13212
2020-04-16 20:13:18 +01:00
919189db1a
Merge pull request #1320 from matrix-org/bwindels/untrustedqrcodereciprocate
...
Implement QR code reciprocate for self-verification with untrusted MSK
2020-04-16 12:34:46 +00:00
f814a96eac
update comments
2020-04-16 14:30:51 +02:00
218aa423c3
implement qr code reciprocate for self-verif with untrusted MSK
2020-04-16 13:01:46 +02:00
63bc17a6b4
Merge pull request #1319 from matrix-org/jryans/release-script
...
Adapt release script for riot-desktop
2020-04-15 18:26:04 +01:00
629490c4ae
Adapt release script for riot-desktop
...
This allows the bulk of the release script to be used for riot-desktop, while
skipping the NPM and develop branch parts that do not apply.
Part of https://github.com/vector-im/riot-web/issues/13176
2020-04-15 18:10:46 +01:00
d59d62f96a
Merge pull request #1318 from matrix-org/bwindels/fixindexernotifs
...
Fix: prevent spurious notifications from indexer
2020-04-15 16:50:18 +00:00
8a460c2368
fix jsdoc
2020-04-15 18:33:55 +02:00
6f60183316
allow creating event mappers that map events whose events are not reemitted
2020-04-15 17:08:25 +02:00
a21c62519b
Merge pull request #1317 from matrix-org/jryans/gen-user-obj
...
Always create our own user object
2020-04-14 16:19:45 +01:00
1b8f6d1739
Always create our own user object
...
This ensures our own user object is always available for tasks like
verification, even if you aren't in any rooms.
Fixes https://github.com/vector-im/riot-web/issues/13165
2020-04-14 16:02:00 +01:00
e087bce61a
Merge pull request #1311 from matrix-org/uhoreg/fix_backup_key_format
...
Fix incorrect backup key format in SSSS
2020-04-13 17:38:45 -04:00
d2f24c3e87
cut long line to appease lint
2020-04-13 17:03:17 -04:00
5d606bba66
add test for passthrough on backups
2020-04-13 16:54:02 -04:00
864fe459b7
improve readability of tests
2020-04-13 16:27:46 -04:00
8992438aa6
Merge pull request #1315 from matrix-org/bwindels/fixe2eecrash
...
Fix e2ee crash after refreshing after having received a cross-singing key reset
2020-04-10 10:20:20 +00:00
197d5ebb44
fix e2ee crash after refreshing after cross-singing key reset
2020-04-10 10:37:12 +02:00
4039498eee
use cached backup key if available
2020-04-09 17:05:01 -04:00
a686231a5b
Merge pull request #1314 from matrix-org/bwindels/catchverifysenderrors
...
Fix: catch send errors in SAS verifier
2020-04-09 16:32:09 +00:00
97cf4bff1f
fix tests
2020-04-09 18:21:20 +02:00
11727833a2
mark request as cancelled immediately after verifier is cancelled
...
in case send errors prevent us from receiving remote echo
2020-04-09 17:54:45 +02:00
df38fde336
apply changes from code review
2020-04-09 11:48:58 -04:00
00233d610b
pass on send errors so request gets cancelled
2020-04-09 17:23:44 +02:00
d1c9030fac
Merge pull request #1312 from matrix-org/bwindels/fixresetkeys
...
Clear cross-signing keys when detecting the keys have changed
2020-04-09 13:34:26 +00:00
70071eef41
also emit user trust has changed
2020-04-09 14:09:51 +02:00
65dd56f53a
remove obsolete comment
2020-04-09 13:27:13 +02:00
c8fb4af369
fix comment style
2020-04-09 13:13:17 +02:00
9e1ba992e3
Clear cross-signing keys when detecting the keys have changed
2020-04-09 12:24:29 +02:00
bad09fed44
Merge pull request #1310 from matrix-org/jryans/upgrade-2020-04-08
...
Upgrade deps
2020-04-09 10:19:09 +01:00
5bd146bb85
lint
2020-04-09 00:21:31 -04:00
75703f273f
fix unit tests
2020-04-09 00:18:21 -04:00
ca7b49d209
fix incorrect backup key format in SSSS
2020-04-09 00:08:17 -04:00
30bce8a682
yarn upgrade
2020-04-08 14:41:36 +01:00
84637c6ebd
Merge pull request #1308 from matrix-org/jryans/backup-key-cache-format
...
Store key backup key in cache as Uint8Array
2020-04-08 11:32:18 +01:00
2ed6e9ba2f
Convert recovery key to Uint8Array explicitly
2020-04-08 00:43:52 +01:00
2e3cb54d38
Restore redundant conversion for tests
2020-04-07 19:21:25 +01:00
0efac7eae0
Store key backup key in cache as Uint8Array
...
Bootstrap was incorrectly storing the key backup key as base64 encoded, when
instead it should be a uint8Array.
Fixes https://github.com/vector-im/riot-web/issues/13057
2020-04-07 18:28:48 +01:00
dc56f05d03
Throw error when trying to cache keys in the wrong format
2020-04-07 18:06:57 +01:00
4d2625278c
Merge pull request #1307 from MTRNord/fix-keys_query_endpoint
...
Use the correct request body for the /keys/query endpoint.
2020-04-07 12:01:06 -04:00
bff8a947a1
Fix expectBobQueryKeys test
2020-04-07 16:53:28 +02:00
9cb7406ebd
Fix downloadKeys test
2020-04-07 16:44:30 +02:00
38681ca6ca
Fix expectAliQueryKeys test
2020-04-07 16:31:15 +02:00
nchamo