Commit graph

1885 commits

Author SHA1 Message Date
Damir Jelić
4a83e36195 Merge branch 'appservice/feature/warp' 2021-06-09 17:31:07 +02:00
Johannes Becker
da673f1308 appservice: Temporarily remove windows from CI
because it's broken
2021-06-08 11:29:14 +02:00
Johannes Becker
c634efbe09 appservice: Fixes after rebase 2021-06-08 11:18:56 +02:00
Damir Jelić
5fa2b05622 matrix-sdk: Fix some more typos 2021-06-08 11:13:23 +02:00
Johannes Becker
66551d28e4 appservice: Switch autojoin example to warp 2021-06-08 11:09:05 +02:00
Johannes Becker
7116fc1103 appservice: Switch warp to git dep so it works OOTB 2021-06-08 11:09:05 +02:00
Johannes Becker
d8b23f789d appservice: Expand set_event_handler docs 2021-06-08 11:09:05 +02:00
Johannes Becker
4dacef2e2c appservice: Improve warp_filter 2021-06-08 11:09:05 +02:00
Johannes Becker
d6ca3a27bb appservice: Properly scope webserver configuration 2021-06-08 11:09:05 +02:00
Johannes Becker
8d061447d6 appservice: Improve test coverage 2021-06-08 11:09:03 +02:00
Johannes Becker
38512d6a54 appservice: Add warp support 2021-06-08 11:01:20 +02:00
Johannes Becker
f3bbcf553c appservice: Restructure tests 2021-06-08 10:58:07 +02:00
Jonas Platte
e1d905fbc6
Temporarily remove Windows from CI
It's currently broken.
2021-06-07 19:50:14 +02:00
Jonas Platte
1168c39c20
Move ruma re-export from matrix-sdk-common to matrix-sdk 2021-06-07 19:50:14 +02:00
Jonas Platte
54063513a3
appservice: Depend on ruma directly 2021-06-07 19:50:14 +02:00
Jonas Platte
26788f83f0
sdk: Depend on ruma directly 2021-06-07 19:50:13 +02:00
Jonas Platte
c705af1048
test: Depend on ruma directly 2021-06-07 18:55:56 +02:00
Jonas Platte
c964589049
base: Depend on ruma directly 2021-06-07 18:55:56 +02:00
Jonas Platte
74d0ac7c77
crypto: Depend on ruma directly
… instead of using matrix_sdk_common's re-exports
2021-06-07 18:55:56 +02:00
Jonas Platte
3bac536daf
Fix clippy lints
Automated via `cargo clippy --workspace --all-targets -Zunstable-options --fix`.
2021-06-07 15:51:18 +02:00
Jonas Platte
e18f248dbb
crypto: Add missing required-features to crypto_bench 2021-06-07 15:16:53 +02:00
Damir Jelić
b6c7b317bf Merge branch 'qr-crate' 2021-06-07 14:03:29 +02:00
Damir Jelić
6f11244017 Merge branch 'typos' 2021-06-06 21:01:30 +02:00
Jonas Platte
6b685b671d
Replace Arc<Box<dyn (Crypto|State)Store>> by Arc<dyn (Crypto|State)Store> 2021-06-06 18:16:25 +02:00
Jonas Platte
eed2b37885
Replace Arc<Box<DeviceId>> by Arc<DeviceId> 2021-06-06 18:15:18 +02:00
Jonathan de Jong
f76cb1d123 the the 2021-06-05 14:55:01 +02:00
Jonathan de Jong
f36fb55727 some more typos 2021-06-05 14:50:08 +02:00
Jonathan de Jong
74a6d39b9f various typos 2021-06-05 14:35:20 +02:00
Damir Jelić
0df782e93e crypto: Fix some clippy warnings 2021-06-04 19:26:32 +02:00
Damir Jelić
7cca358399 Merge branch 'master' into verification-improvements 2021-06-04 18:37:42 +02:00
Damir Jelić
96d4566111 crypto: Move the verification cache into a separate module 2021-06-04 18:13:52 +02:00
Damir Jelić
31e00eb434 crypto: Don't panic if we get a unknown cancel code 2021-06-04 18:13:52 +02:00
Damir Jelić
612fa46359 crypto: Replace a bunch of From implementations with macros 2021-06-04 18:13:52 +02:00
Damir Jelić
0a7fb2cbc3 crytpo: Mark verification requests as cancelled and as done 2021-06-04 18:13:52 +02:00
Damir Jelić
f9fb530480 crypto: Forward cancel events to the sas object 2021-06-04 18:13:52 +02:00
Damir Jelić
2ec8893273 crypto: Silence a clippy warning until we add QR code verifications 2021-06-04 15:39:56 +02:00
Damir Jelić
bd5dda370d crypto: Remove the sas event enums module 2021-06-04 15:16:38 +02:00
Damir Jelić
ac04b0c36e crypto: Create a enum for the verification types 2021-06-04 15:16:38 +02:00
Damir Jelić
a04afac963 crypto: Fix a clippy warning 2021-06-04 15:16:38 +02:00
Damir Jelić
cf98681f19 crypto: Remove some duplicate code 2021-06-04 15:16:38 +02:00
Damir Jelić
cbcf673d21 crypto: Make sure we send verification done events 2021-06-04 15:16:38 +02:00
Damir Jelić
9b20b00908 crypto: Log if we get a missmatch of the flow id 2021-06-04 15:16:38 +02:00
Damir Jelić
f50d0cd3a6 crypto: Test starting a to-device verification request 2021-06-04 15:16:38 +02:00
Damir Jelić
1e48b15040 crypto: Add enums so we can handle in-room and to-device verifications the same 2021-06-04 15:16:38 +02:00
Damir Jelić
b52f3fb11f crypto: Remove an allocation when calculating the SAS MAC 2021-06-04 15:16:38 +02:00
Damir Jelić
d877c1cf8c crypto: Move the Done state into the common verification module 2021-06-04 15:16:38 +02:00
Damir Jelić
327445c6a0 crypto: Move the logic for marking identities as verified out of the Sas struct 2021-06-04 15:16:38 +02:00
Damir Jelić
8a5a0e511e crypto: Don't await while holding a sync lock 2021-06-04 15:16:38 +02:00
Damir Jelić
12619ab8b3 crypto: Log a warning if we get a start event without being ready 2021-06-04 15:16:38 +02:00
Damir Jelić
069ef3a661 crypto: Move the SAS starting logic into the verification request struct 2021-06-04 15:16:38 +02:00