4dbeee8cb3
Ignore downloading for tests
2020-01-27 15:28:36 +00:00
0dbf89b2b4
Ensure cross-signing keys are downloaded when checking trust
...
When checking cross-signing trust during login, we may not have downloaded keys
yet. This ensures we make an attempt first if needed.
Fixes https://github.com/vector-im/riot-web/issues/12068
2020-01-27 14:55:20 +00:00
aafc027812
Merge branch 'master' into develop
2020-01-27 11:31:09 +00:00
d84e0b166b
v4.0.0
2020-01-27 11:28:17 +00:00
d1d46009cd
Prepare changelog for v4.0.0
2020-01-27 11:28:17 +00:00
1c13f5026e
Merge pull request #1173 from matrix-org/dbkr/fix_bootstrap_cleanup
...
Fix bootstrap cleanup
2020-01-27 10:18:37 +00:00
49fd9e90a0
this can be const now
2020-01-25 19:48:36 +00:00
e09038232e
Fix bootstrap cleanup
...
As hopefully explained in the comment. The symptom of this was that
bootstrapping would work just fine the first time you called it
in any run of the app, but then if called a second time (eg. if you
cancelled by dismissing the password prompt) it would create keys and
upload the public parts but not store the private parts in SSSS,
leaving you with cross signing keys you don't have the private parts
of.
Also use object.assign in the save keys callback just in case we
ever reset a subset of the keys (and also because it makes it a
bit simpler to reason about what objects are where).
2020-01-25 19:42:02 +00:00
2cfe310e89
Merge pull request #1155 from matrix-org/travis/qr-verif-rp
...
QR code verification
2020-01-24 08:55:42 -07:00
973c7467e8
Merge pull request #1171 from matrix-org/bwindels/fixverifyowndevice
...
expose deviceId prop on device channel
2020-01-24 11:24:23 +00:00
6d05376f04
expose deviceId prop on device channel
...
used to check if a verification came through to_device in the toast
2020-01-24 12:01:20 +01:00
b8092cd00b
Make the tests pass
2020-01-23 20:41:52 -07:00
3c1dca6cef
Generate a shared secret if we don't have one
2020-01-23 20:15:02 -07:00
c0f7dd6fe9
Fix secret size
2020-01-23 20:06:04 -07:00
6af6e99480
Expose the request event more readily for consumers
2020-01-23 20:05:56 -07:00
c5cbe48668
Remove docs too
2020-01-23 19:29:42 -07:00
15707956ef
Remove private key accessors for cross-signing
2020-01-23 19:29:42 -07:00
4668fc87a1
Add cross-signing accessors and QR code stuff
2020-01-23 19:29:42 -07:00
468fb2cc41
chore: remove custom promise, use es6 standard
...
Signed-off-by: Jack Works <jackworks@protonmail.com >
2020-01-23 19:23:08 -07:00
7c79e7e836
fix: typos
...
Signed-off-by: Jack Works <jackworks@protonmail.com >
2020-01-23 19:21:19 -07:00
925c6ffc3e
Merge pull request #1170 from matrix-org/travis/fix-build-release
...
Move & upgrade babel runtime into dependencies (like it wants)
2020-01-23 15:46:30 -07:00
0bf1f48623
Merge pull request #1169 from matrix-org/travis/fix-build
...
Move & upgrade babel runtime into dependencies (like it wants)
2020-01-23 15:45:53 -07:00
ffcb1c2513
Move & upgrade babel runtime into dependencies (like it wants)
...
https://babeljs.io/docs/en/babel-runtime
2020-01-23 15:44:59 -07:00
f286eb4d11
Move & upgrade babel runtime into dependencies (like it wants)
...
https://babeljs.io/docs/en/babel-runtime
2020-01-23 15:44:36 -07:00
a76267f5b0
Merge pull request #1166 from matrix-org/bwindels/verifyowndevicechecks
...
Add unit tests for verifying your own device, remove .event property on verification request
2020-01-23 17:01:43 +00:00
3faeec4add
fix lint
2020-01-23 15:59:47 +01:00
7d56ee5084
with the change in the linked react-sdk PR, event isn't used anymore
2020-01-23 15:52:23 +01:00
b2afaabb8c
add unit tests for verifying your own device over to_device messages
2020-01-23 15:52:07 +01:00
3efaf90bc8
Merge pull request #1163 from matrix-org/bwindels/verificationaccceptedbyotherdevice
...
For dm-verification, also consider events sent by other devices of same user as "our" events
2020-01-23 13:27:15 +00:00
0c52887688
copyright year
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com >
2020-01-23 10:51:19 +00:00
8aa1c1545e
Merge pull request #1164 from matrix-org/dbkr/prepublish_rel
...
Add a prepare script
2020-01-22 20:59:40 +00:00
7c84f421c5
Turns out prepublish is deprecated and should be prepare
2020-01-22 20:58:25 +00:00
42a1dea7ad
Add a prepublish script
...
So we actually build the lib directory before publishing it
2020-01-22 20:58:18 +00:00
d5e9155a33
Merge pull request #1161 from matrix-org/dbkr/prepublish
...
Add a prepare script
2020-01-22 20:56:59 +00:00
5def5ab074
Merge pull request #1162 from matrix-org/t3chguy/crypto/keys/upload/deviceId
...
Remove :deviceId from /keys/upload/:deviceId as not spec-compliant
2020-01-22 17:13:21 +00:00
1b242e636b
remove obsolete comment
2020-01-22 17:39:21 +01:00
05f05c889a
don't verify in observeOnly mode
2020-01-22 17:39:21 +01:00
1367e285c8
have channel decide what is considered "sent by us"
...
for in room verification, if another client accepts the request,
we still want to observe so those events should still be
considered ours, so looking at from_device doesn't work there.
2020-01-22 17:39:21 +01:00
45ec3e0bb9
also emit if the phase didn't change but observeOnly did
2020-01-22 17:39:21 +01:00
dc38f78da2
add unit tests for verification request
2020-01-22 17:39:21 +01:00
1b6a74fd93
Remove :deviceId from /keys/upload/:deviceId as not spec-compliant
2020-01-22 15:20:13 +00:00
9d8a1494aa
Turns out prepublish is deprecated and should be prepare
2020-01-22 14:14:24 +00:00
08465cf236
Add a prepublish script
...
So we actually build the lib directory before publishing it
2020-01-22 14:09:01 +00:00
7016848401
Merge branch 'poljar/timeline-window-refactor' into develop
2020-01-21 17:01:16 +01:00
bdd2a9e7e8
timeline-window: Small docfix.
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com >
2020-01-21 16:55:12 +01:00
80256e6782
Merge pull request #1158 from matrix-org/dbkr/upload_device_keys_empty_auth
...
Allow a device key upload request without auth
2020-01-21 15:03:58 +00:00
7907ef44f8
timeline-window: Refactor out and expose the logic to extend the window.
2020-01-21 15:42:55 +01:00
3a97a24686
timeline-window: Refactor out the TimelineIndex getting logic.
2020-01-21 15:21:10 +01:00
7f208ed44e
Allow a device key upload request without auth
...
This is useful for querying the supported auth methods.
2020-01-21 11:35:49 +00:00
22e6cfaebb
Merge pull request #1140 from matrix-org/bwindels/verification-right-panel
...
Support for .ready verification event (MSC2366) & other things
2020-01-20 17:17:51 +00:00
J. Ryan Stinnett