dolysis/conduwuit
3
0
Fork 0
mirror of https://github.com/girlbossceo/conduwuit.git synced 2024-12-03 14:54:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
2017 commits 28 branches 14 tags 16 MiB
Commit graph

1250 commits

Author SHA1 Message Date
Timo Kösters 1bd9fd74b3
feat: partially support sync filters 2022-01-13 22:38:52 +01:00
Timo Kösters 68e910bb77
feat: lazy loading 2022-01-13 22:38:50 +01:00
Timo Kösters 5bcc1324ed
fix: auth event fetch order 2022-01-13 22:29:19 +01:00
Timo Kösters 54f4d39e3e
improvement: don't fetch event multiple times 2022-01-13 22:29:17 +01:00
Timo Kösters b1d9ec3efc
fix: atomic increment 2022-01-13 22:28:18 +01:00
Timo Kösters ee3d2db8e0
improvement, maybe not safe 2022-01-13 22:10:51 +01:00
Timo Kösters 83a9095cdc
fix? 2022-01-13 22:10:51 +01:00
Timo Kösters 74951cb239
dbg 2022-01-13 22:10:51 +01:00
Timo Kösters 4b4afea2ab
fix auth event fetching 2022-01-13 22:10:51 +01:00
Timo Kösters c9c9974641
fix: stack overflows when fetching auth events 2022-01-13 22:10:50 +01:00
Timo Kösters a30b588ede
rocksdb as default 2022-01-13 22:10:50 +01:00
Timo Kösters 1d647a1a9a
improvement: allow rocksdb again 2022-01-13 22:10:43 +01:00
Timo Kösters b25354c747 Merge branch 'add_remove_appservice' into 'next' 
Add ability to remove an appservice

See merge request famedly/conduit!236
 2022-01-13 11:38:17 +00:00
Torsten Flammiger eecd664c43 Reformat code 2022-01-13 12:26:23 +01:00
Jonas Platte bcf4ede0bc
Restore compatibility with Rust 1.53 2022-01-13 12:06:20 +01:00
Jonas Platte 84862352ba
Replace to_string calls on string literals with to_owned 2022-01-13 11:48:40 +01:00
Jonas Platte cf54185a1c
Use struct literals for consistency 2022-01-13 11:48:18 +01:00
Jonas Platte 349865d3cc
Upgrade Ruma 2022-01-13 11:44:23 +01:00
Timo Kösters 8e12b47df4 Merge branch 'no-passwords-in-db' into 'next' 
Do not store uiaa requests in database

See merge request famedly/conduit!219
 2022-01-13 10:33:49 +00:00
Timo Kösters 0ec26b7e96 Merge branch 'next' into 'next' 
refactor:moved key watch wake logic to specific module

See merge request famedly/conduit!238
 2022-01-13 10:27:56 +00:00
Torsten Flammiger 8d51359668 Fix typo and remove unneeded newline 2021-12-26 20:49:19 +01:00
Torsten Flammiger a69eb277d4 Update count users: It's now list_local_users and contains the number and the usernames 2021-12-26 20:00:31 +01:00
Torsten Flammiger 39787b41cb Rename admin command CountUsers -> CountLocalUsers; Update comments 2021-12-26 12:04:38 +01:00
Torsten Flammiger 2281bcefc6 Finalize count_local_users function 2021-12-26 11:06:28 +01:00
Torsten Flammiger d21030566c Rename/Add count methods to count_local_users 2021-12-25 21:29:03 +01:00
Torsten Flammiger 567cf6dbe9 Add command count_local_users to database/rooms.rs 2021-12-25 20:51:22 +01:00
Torsten Flammiger 7c1b2625cf Prepare to add an option to list local user accounts from your homeserver 2021-12-24 23:06:54 +01:00
Tglman a889e884e6 refactor:moved key watch wake logic to specific module 2021-12-23 23:17:43 +00:00
Jonas Platte aba95b20f3
Upgrade Ruma 2021-12-23 17:40:42 +01:00
Moritz Bitsch c4a438460e Use Box to store UserID and DeviceID 
Userid and DeviceID are of unknown size, use Box to be able to store
them into the userdevicesessionid_uiaarequest BTreeMap
 2021-12-22 19:26:23 +01:00
Torsten Flammiger 7f2445be6c On unregister_appservice(service_name), remove the appservice service_name from cache too 2021-12-22 16:48:27 +01:00
Torsten Flammiger b6c9582cf4 Fix doc style comment according to Rust; VSCode added line breaks 2021-12-22 13:09:56 +01:00
Torsten Flammiger 7857da8a0b Add ability to remove an appservice 2021-12-20 15:46:36 +01:00
Moritz Bitsch 720a54b3bb Use String to store UserId for uiaa request 
Fixes compilation error after ruma upgrade
 2021-12-18 19:05:18 +01:00
Moritz Bitsch 0725b69abb Clean up userdevicesessionid_uiaarequest BTreeMap 
There is no need to encode or decode anything as we are not
saving to disk
 2021-12-18 18:57:36 +01:00
Moritz Bitsch fe8cfe0556 Add database migration to remove stored passwords 
uiaarequests can contain plaintext passwords, which were stored on disk
 2021-12-18 18:57:36 +01:00
Moritz Bitsch 3d25d46dc5 Use simple BTreeMap to store uiaa requests 
some uiaa requests contain plaintext passwords which should never be
persisted to disk.

Currently there is no cleanup implemented (you have to restart conduit)
 2021-12-18 18:57:36 +01:00
Jonas Platte 34d3f74f36
Use Arc for EventIds in PDUs 
Upgrades Ruma again to make this work.
 2021-12-16 13:55:24 +01:00
Jonas Platte 0183d003d0
Revert rename of Ruma<_> parameters 2021-12-15 13:58:25 +01:00
Jonas Platte f712455047
Reduce EventId copying 2021-12-15 13:00:37 +01:00
Jonas Platte 58ea081762
Use int! macro instead of Int::from 2021-12-15 13:00:37 +01:00
Jonas Platte bffddbd487
Simplify identifier parsing code 2021-12-15 13:00:37 +01:00
Jonas Platte 41fef1da64
Remove unnecessary .to_string() calls 2021-12-15 13:00:37 +01:00
Jonas Platte 892a0525f2
Upgrade Ruma 2021-12-15 13:00:37 +01:00
Jonas Platte 1fc616320a
Use struct init shorthand 2021-12-15 13:00:37 +01:00
Moritz Bitsch 9fccbb014a Implement TURN server authentication with hmac 
This is a prefered method to allow limited access to the TURN server
 2021-11-12 12:43:15 +00:00
Moritz Bitsch 109892b4b7 Implement turn server settings 
this fills out the infos in /_matrix/client/r0/voip/turnServer with
values specified in the server config
 2021-11-12 12:43:15 +00:00
Jonas Platte 24a835647c Merge branch 'nyaaori/fix-room-creation' into 'next' 
Make createRoom follow spec for m.room.create, allowing creation of spaces

See merge request famedly/conduit!220
 2021-11-09 16:34:51 +00:00
Nyaaori c4bce1d0c7
Cleanup room.rs; replace unwraps with map_err 2021-11-09 16:12:44 +00:00
Nyaaori 86177faae7
Fix join panic bug 2021-11-07 07:57:15 +00:00
Nyaaori d5d25fb064
Preserve all m.room.create entries when performing room upgrades 2021-10-24 22:13:08 +00:00
Nyaaori 8087a26a35
Make createRoom follow spec for m.room.create, allowing creation of spaces 2021-10-24 20:26:51 +00:00
Nyaaori bbe16f8467
Update Ruma 2021-10-24 00:45:02 +00:00
Nyaaori 50f931a2fd
Cleanup and fix validation in report.rs, lower max report length, better html 2021-10-20 11:12:06 +00:00
Nyaaori 1541b93f45
Make reports look nicer and reduce spam potential, increase max report length to 1000 characters 2021-10-18 05:38:41 +00:00
Nyaaori ccf501a420
Initial implementation of /report, fixing #13 2021-10-18 04:51:11 +00:00
Nyaaori 484a044b50
Remove device_one_time_keys_count from is_empty() sync checks, fixing sync issue as reported by Nekron 2021-10-15 23:17:08 +00:00
Timo Kösters e88929e154 Merge branch 'nyaaori/fix-otk-reporting' into 'next' 
Always send device_one_time_keys_count, fixing #178

Closes #169 and #178

See merge request famedly/conduit!213
 2021-10-15 13:01:52 +00:00
Nyaaori d996d1b0e6
Always send device_one_time_keys_count, fixing #178 2021-10-15 12:38:20 +00:00
Timo Kösters dc8bc4a880 Merge branch 'up-ruma' into 'next' 
Upgrade Ruma

See merge request famedly/conduit!210
 2021-10-15 11:38:12 +00:00
Timo Kösters 335027e739 Merge branch 'nyaaori/admin-check' into 'next' 
Implement admin check and add config option for allowing room creation

See merge request famedly/conduit!211
 2021-10-15 10:47:55 +00:00
Nyaaori 9082a531c9
Make allow_encryption work again, fixing #115 2021-10-15 09:57:49 +00:00
Jonas Platte 91afa1e0e0
Make Result alias usable with any error type 2021-10-13 12:25:58 +02:00
Jonas Platte f2ef5677e0
Reduce turbofish usage 
Should make the code a little bit easier to read.
 2021-10-13 12:25:58 +02:00
Jonas Platte 1c4d9af586
Enable more lints and apply their suggestions 2021-10-13 10:24:39 +02:00
Jonas Platte 09895a20c8
Upgrade Ruma 
Co-authored-by: Timo Kösters <timo@koesters.xyz>
 2021-10-13 10:16:45 +02:00
Nyaaori 6bc8fb2ae7
Implement admin check and add config option for allowing room creation 2021-09-24 07:16:34 +00:00
Timo Kösters 5c02dc7830
improvement: batch inserts for inserting pdus 2021-09-14 14:33:46 +02:00
Timo Kösters b64538c6f1 Merge branch 'efficient-sqlite' into 'next' 
improvement: more efficient sqlite

See merge request famedly/conduit!199
 2021-09-14 07:23:02 +00:00
Timo Kösters 178451e9b5 Merge branch 'deduplicate-watchers' into 'next' 
improvement: deduplicate watchers

See merge request famedly/conduit!201
 2021-09-14 07:10:59 +00:00
Timo Kösters cbee7fe111
improvement: deduplicate watchers 2021-09-13 23:20:30 +02:00
Jonas Platte d68c93b5fa
Clean up (mostly automated with cargo clippy --fix) 2021-09-13 20:58:58 +02:00
Jonas Platte 979ec6b4fa
Upgrade ruma 2021-09-13 20:55:13 +02:00
Jonas Platte 910ad7fed1
Get rid of more unnecessary intermediate collections 2021-09-13 20:55:12 +02:00
Timo Kösters 2c8412fe58
improvement: more efficient sqlite 2021-09-13 20:12:42 +02:00
Jonathan de Jong 23c5ec8099 fix sync not firing on new events in room 2021-09-08 14:50:44 +02:00
Rasmus Thomsen 51245d34f1
fix(database): handle errors in config parsin or database creation 
Showing the user a backtrace can be pretty confusing, so just printing
a nice error message makes errors easier to understand for end users.

fixes #121
 2021-09-08 09:08:45 +01:00
Timo Kösters 71341ea05a
fix: make sure old events don't sneek into the timeline 2021-09-03 11:26:15 +02:00
Timo Kösters 2770ce2cf6
fix: avoid panic 2021-09-01 23:00:24 +02:00
Timo Kösters 43d693ca19
revert Arc<EventId> commit 2021-09-01 22:30:11 +02:00
Timo Kösters 875b345a5f
docs: update readme and version 2021-09-01 22:18:19 +02:00
Jonas Platte 487601a249
Remove unneeded intermediary container collection 2021-09-01 21:46:05 +02:00
Timo Kösters 4b39d7cb64
fix: batch key fetching 2021-09-01 20:02:34 +02:00
Kurt Roeckx c53d79e287
fixup! Get required keys in batch when joining a room 2021-09-01 19:30:32 +02:00
Kurt Roeckx 984ad5ecd6
fixup! Get required keys in batch when joining a room 2021-09-01 19:30:31 +02:00
Kurt Roeckx b546a5bf15
Let our server signing be valid for 1 week 
It was valid for 2 minutes, which can result in the server being
asked too much for something that never changes.
 2021-09-01 19:30:31 +02:00
Kurt Roeckx a87519fb71
Get required keys in batch when joining a room 
We now ask the trusted server for all keys in 1 request, instead of
asking each server individual for it's own keys.
 2021-09-01 19:30:30 +02:00
Timo Kösters 8518d59a0b Merge branch 'clippy' into 'master' 
Fix a bunch of clippy lints

See merge request famedly/conduit!178
 2021-09-01 10:47:23 +00:00
Timo Kösters 73d876643c
improvement: make pdu cache capacity configurable 2021-09-01 11:03:45 +02:00
Timo Kösters 33738dbbc2
improvement: stop prev event fetching if too many events fail 2021-08-31 22:04:47 +02:00
Jonas Platte a6bb9bbe68
Fix a bunch of clippy lints 2021-08-31 21:20:03 +02:00
Timo Kösters b9eb39a9c6
docs: documentation for every endpoint 2021-08-31 19:20:34 +02:00
Jonathan de Jong 9ec8b7f2b3 registration default true 2021-08-31 18:25:35 +02:00
Jonathan de Jong 69df9a0145 add tls 2021-08-30 20:18:48 +02:00
Timo Kösters bd4ea14a29
improvement: call /state_ids less often by using state res 2021-08-30 16:07:59 +02:00
Timo Kösters 1b25e78e3a
fix: inviting dendrite users 2021-08-30 10:56:41 +02:00
Timo Kösters d57c19802d
improvement: don't do state updates if the event was soft failed 2021-08-30 10:46:36 +02:00
Timo Kösters 632a1343eb
fix: make appservices more efficient 2021-08-29 20:00:43 +02:00
Timo Kösters 1601027605
add warning if calculated event id != requested event id 2021-08-28 19:35:42 +02:00
Timo Kösters afca61fe7c
fix: don't retry soft failed events 2021-08-28 11:39:33 +02:00
Devin Ragotzy 9bff276fa9
Use Arc<EventId> in place of most EventIds 2021-08-27 20:20:14 +02:00
Timo Kösters 19b89ab91f
fix: server resolution 2021-08-27 20:20:13 +02:00
Timo Kösters 0330d3e270
fix: server resolution with well-known files 2021-08-27 20:20:13 +02:00
Timo Kösters a1e8a99db5
improvement: less IO for auth chains 2021-08-27 20:20:12 +02:00
Timo Kösters 33172a70e6
fix: improve key fetching 2021-08-27 20:20:12 +02:00
Timo Kösters 41d07be97b
improvement: persist cached auth chains in db 2021-08-26 14:19:08 +02:00
Timo Kösters bef4fe50ce
fix: better migration, force e2ee device key updates 2021-08-26 14:19:08 +02:00
Timo Kösters 9152b877a7
fix: wrong soft fail check, too many events in /sync state response 2021-08-26 14:19:07 +02:00
Timo Kösters 9f8c45c763
fix: e2ee over federation 
to device events were not being sent
 2021-08-26 14:19:07 +02:00
Timo Kösters dd87066546
improvement: more efficient auth chain cache 2021-08-24 21:55:18 +02:00
Timo Kösters 81e056417c
improvement: better e2ee over fed, faster incoming event handling 2021-08-24 19:52:05 +02:00
Timo Kösters 72dd95f500 Merge branch 'createwarnings' into 'master' 
fix: correct create event warnings

See merge request famedly/conduit!161
 2021-08-24 17:51:53 +00:00
Timo Kösters 4f8cf3bed4 Merge branch 'send_join_v1' into 'master' 
Implement federation/v1/send_join

See merge request famedly/conduit!141
 2021-08-22 12:06:26 +00:00
Timo Kösters b3ea6adc9c Merge branch 'get-pdu-json' into 'master' 
Consistent and escaped response in get_pdu

See merge request famedly/conduit!160
 2021-08-22 11:08:11 +00:00
Timo Kösters 6d83954c40
fix: room upgrades 2021-08-22 13:06:50 +02:00
Timo Kösters 667ffb4239
fix: correct create event warnings 2021-08-22 13:01:13 +02:00
Kurt Roeckx 48494c9464 Implement federation/v1/send_join 2021-08-22 10:07:38 +02:00
Tom Smeding 2ef23b213a
Consistent and escaped response in get_pdu 
1. The fallback text of the get_pdu admin room command response message
   now contains the same text as the formatted_body content (namely, the
   json instead of Debug-formatting of a serde type).
2. The formatted_body content of the get_pdu response is now
   html-escaped.
 2021-08-21 15:31:26 +02:00
Timo Kösters 3b78e43a18
fmt 2021-08-21 14:24:10 +02:00
Timo Kösters 4956fb9fba
improvement: limit prev event fetching 2021-08-21 14:22:21 +02:00
Timo Kösters b09499c2df
fix: don't save empty tokens 2021-08-19 14:05:23 +02:00
Timo Kösters 46d8a46e1f
improvement: faster incoming transaction handling 2021-08-19 11:01:43 +02:00
Timo Kösters bf7e019a68
improvement: better prev event fetching, perf improvements 2021-08-17 16:06:09 +02:00
Timo Kösters 75ba8bb565
fix: faster room joins 2021-08-17 00:22:52 +02:00
Timo Kösters 0823506d05
fix: don't load endless prev events and fix room join bug 2021-08-16 23:24:52 +02:00
Timo Kösters 2c3bee34a0
improvement: better sqlite 2021-08-15 13:27:03 +02:00
Timo Kösters a4310f840e
improvement: state info cache 2021-08-15 06:48:25 +02:00
Timo Kösters 5bd5b41c70
fix: fetch event multiple times 2021-08-15 06:48:25 +02:00
Timo Kösters f9a2edc0dd
fix: also fetch prev events that are outliers already 2021-08-15 06:48:25 +02:00
Timo Kösters ecd1e45a44
fix: fetch more than one prev event 2021-08-15 06:48:24 +02:00
Timo Kösters 1d46569929
fix: don't use recursion for prev events 2021-08-15 06:48:24 +02:00
Timo Kösters 1e3a8ca35d
fmt 2021-08-15 06:48:24 +02:00
Timo Kösters 0cb22996be
remove prev event fetch limit 2021-08-15 06:48:14 +02:00
Timo Kösters 38effda799
fix: delta calculation 2021-08-14 19:11:10 +02:00
Timo Kösters 3cf0145bc5
fix: room exists panic 2021-08-14 08:26:45 +02:00
Timo Kösters 3eabaa2a95
finish implementing better state store 2021-08-13 19:49:16 +02:00
Timo Kösters 31f60ad6fd
improvement: migrations, batch inserts 2021-08-12 17:56:35 +02:00
Timo Kösters 41dd620d74
WIP improvement: much better state storage 2021-08-12 17:56:35 +02:00
Timo Kösters 9410d3ef9c
fix: long prev event fetch times for huge rooms 2021-08-12 17:56:14 +02:00
Timo Kösters 665aee11c0
less warnings 2021-08-12 17:56:14 +02:00
Timo Kösters 5173d0deb5
improvement: cache for short event ids 2021-08-12 17:56:14 +02:00
Timo Kösters c2c6a8673e
improvement: use u64s in auth chain cache 2021-08-12 17:56:14 +02:00
Timo Kösters 096e0971f1
improvement: smaller cache, better prev event fetching 2021-08-12 17:56:13 +02:00
Jonas Zohren 4cf3c432af Try to set canonical room alias on room creation. 
The spec does not require servers to apply a room canonical alias event upon room creation (yet).
Still, synapse does that, since users can set their desired alias in Elements room creation dialog.
With this commit, conduit also sets that alias if it is a valid one.

This closes https://gitlab.com/famedly/conduit/-/issues/123
 2021-08-12 14:02:46 +02:00
Timo Kösters e83c226b1b Merge branch 'zap-displayname' into 'master' 
Set nicer displayname

See merge request famedly/conduit!149
 2021-08-10 05:43:44 +00:00
Jonathan de Jong 8335f44bfe Set nicer displayname 2021-08-10 05:43:44 +00:00
Timo Kösters 3745a7cbe6 Merge branch '3pid' into 'master' 
Add support for a minimal `r0/account/3pid`.

See merge request famedly/conduit!151
 2021-08-10 05:42:50 +00:00
Timo Kösters 610b4f9ad1 Merge branch 'fetchprev' into 'master' 
improvement: try to load missing prev events

See merge request famedly/conduit!152
 2021-08-10 05:30:12 +00:00
Ahmed Charles 879aeafa9e Add support for a minimal r0/account/3pid. 2021-08-09 12:34:25 -07:00
Timo Kösters 260db9fcc7
improvement: try to load missing prev events 2021-08-09 21:05:41 +02:00
Timo Kösters 1cbc61c558 Merge branch 'badeventfix' into 'master' 
fix: handle bad events in db better

See merge request famedly/conduit!148
 2021-08-08 19:48:08 +00:00
Timo Kösters d2f406e0e8
fix: handle bad events in db better 2021-08-08 21:33:28 +02:00
Kurt Roeckx 989a20e99c Support creating rooms with a version 2021-08-07 16:25:21 +02:00
Timo Kösters 55a2ff025f
improvement: longer timeout, more descriptive errors 2021-08-04 22:55:03 +02:00
Timo Kösters df727688ef
remove rocksdb 2021-08-04 21:17:40 +02:00
Timo Kösters 902404d48d
improvement: save member count + sled fixes 2021-08-04 21:15:01 +02:00
Timo Kösters b813c34642
improvement: more auth chain caching 2021-08-04 18:30:56 +02:00
Timo Kösters ab7835dedb
fix: early return from state res 2021-08-04 15:19:50 +02:00
Timo Kösters 9bb4c3cd01
improvement: batched inserts for tokenids 2021-08-04 12:54:26 +02:00
Timo Kösters fce22362d4
improvement: better auth chain calculation 2021-08-03 19:18:41 +02:00
Timo Kösters 41ec7cf5d0
improvement: batch inserts for stateids 2021-08-03 16:14:07 +02:00
Timo Kösters 49ade0cfbd
improvement: allow batch inserts 2021-08-03 11:24:21 +02:00
Timo Kösters 0eeba86b32
fix: improve locks 2021-08-03 11:17:39 +02:00
Timo Kösters 6b06fc9707
fix: don't run push rules for users that don't exist 2021-08-03 10:24:20 +02:00
Timo Kösters bd63797213
improvement: make better use of sqlite connections 2021-08-03 10:24:14 +02:00
Timo Kösters 2c4f966d60
improvement: use sqlite properly 2021-08-01 16:59:52 +02:00
Timo Kösters dc85a8fafd
fix: migration and push edu bugs 2021-07-30 18:05:26 +02:00
Timo Kösters 5df6b8cd5f
improvement: better account data implementation 2021-07-30 16:08:24 +02:00
Timo Kösters 5c776e9ba7
feat: heed db backend (LMDB) 2021-07-29 23:11:53 +02:00
Timo Kösters c209775abd
fix: pdu without state bug 2021-07-29 12:33:44 +02:00
Timo Kösters 5e924227b6
feat: add threadpool for iterator threads, bug fixes, tracing_flame support 2021-07-29 08:49:28 +02:00
Timo Kösters e0072eff63 Merge branch 'v5' into 'master' 
feat: support room version 5

See merge request famedly/conduit!138
 2021-07-21 11:05:59 +00:00
Timo Kösters cae2b200cc Merge branch 'initial_state_keys' into 'master' 
Implement From<AnyInitialStateEvent> on PduBuilder

Closes #116

See merge request famedly/conduit!136
 2021-07-21 10:03:08 +00:00
Timo Kösters 918df9ca6d
feat: support room version 5 2021-07-21 11:59:56 +02:00
Kurt Roeckx 0d33cc4acd Implement getting room aliases 
Signed-off-by: Kurt Roeckx <kurt@roeckx.be>
 2021-07-21 10:56:22 +02:00
phesch 666e1d30a3 Implement From<AnyInitialStateEvent> on PduBuilder 
The conversion between the two is now direct and thus shouldn't lose the state_keys.
 2021-07-21 10:55:23 +02:00
Timo Kösters 1587f2cd52
fix: check events in timeline (not only state) for member changes 2021-07-21 09:39:54 +02:00
Timo Kösters f121978897
fix: state bug 2021-07-20 23:36:03 +02:00
Timo Kösters 80533bfab2
fix: improve code when skipping /state_ids 2021-07-20 22:06:42 +02:00
Timo Kösters 08a3326431
docs: Initial end-to-end encryption over federation support 2021-07-20 21:37:08 +02:00
Timo Kösters fe3b5d32a7
feat: send to-device events over federation 2021-07-20 21:17:15 +02:00
Timo Kösters e20f55970e
feat: call /query/profile over federation when local user asks 2021-07-20 19:49:47 +02:00
Timo Kösters 728e176a06
feat: /keys/query and /keys/claim over federation 2021-07-20 19:40:25 +02:00
Timo Kösters 68cc743f2a
fix: use get_auth_chain method more often 2021-07-20 18:45:21 +02:00
Timo Kösters 56e5d5e3d2
fix: add warning for strange bug 2021-07-20 18:38:17 +02:00
Timo Kösters f0ac7ed933
chore: update ruma again 2021-07-20 15:25:17 +02:00
Timo Kösters 0f8ecdc625
fix: state res fixes 2021-07-20 15:25:17 +02:00
Timo Kösters cfaa900e83
improvement: auth chain cache 2021-07-20 15:25:16 +02:00
Timo Kösters f5273f7eb1
improvement: upgrade ruma and implement blurhashes 2021-07-20 15:25:16 +02:00
Timo Kösters 0fcefa4125
fix: ruma 2021-07-20 15:25:16 +02:00
Timo Kösters d07762f596 Merge branch 'connection-cushion' into 'master' 
Spillover connection cushion

See merge request famedly/conduit!133
 2021-07-20 10:39:04 +00:00
Jonathan de Jong d253f9236a change fraction type 2021-07-20 11:01:35 +02:00
Jonathan de Jong ec44f3d568 change to f64 2021-07-20 10:47:36 +02:00
Jonathan de Jong e7a51c07d0 log change feedback 2021-07-19 17:17:10 +02:00
Jonathan de Jong 79bf7fc597 some logging shuffling 2021-07-19 16:46:59 +02:00
Jonathan de Jong 7e579f8d34 change to fraction-based approach 2021-07-19 16:25:41 +02:00
Jonathan de Jong 0f2dc9a239 add stuff and bits 2021-07-19 15:56:20 +02:00
Jonathan de Jong faa283d35b review feedback 2021-07-19 13:44:53 +02:00
Jonathan de Jong 3ce75d1f02 apply fix 2021-07-19 11:55:39 +02:00
Timo Kösters f924ebf8a6 Merge branch 'fix-windows-signal' into 'master' 
fix signal compiling on windows

See merge request famedly/conduit!126
 2021-07-15 16:29:47 +00:00
Jonathan de Jong b1993421c2 fix signal compiling on windows 2021-07-15 18:09:10 +02:00
Jonathan de Jong d76e95e8fc use existing db cache size 2021-07-15 13:47:21 +02:00
Jonathan de Jong 661101c9ae add sled cache_capacity back 2021-07-15 13:29:08 +02:00
Timo Kösters f7ecf83ac3 Merge branch 'stuff' into 'master' 
fix: stuck/duplicate messages, e2ee and sync timeouts

See merge request famedly/conduit!123
 2021-07-15 08:18:56 +00:00
Jonathan de Jong 952fb75795 add shutdown handler to kick sync 2021-07-14 14:50:07 +02:00
Timo Kösters e12b1ff863
improvement: locks 2021-07-14 13:21:25 +02:00
Timo Kösters e15e6d4405
improvement: efficient /sync, mutex for federation transactions 2021-07-14 13:20:39 +02:00
Timo Kösters 1c25492a7e
fix: stuck messages 
Conduit did not send the event in /sync because of a race condition.
There is a brief moment in time where Conduit accepted the event, but
did not store it yet. So when the client /syncs it updates the since
token without sending the event. I hope I fixed it by significantly
shortening the race-condition period.
 2021-07-14 13:19:24 +02:00
Timo Kösters 8c44312485
fix: e2ee verification 2021-07-14 13:10:56 +02:00
Timo Kösters ac0027756e
improvement: more efficient state res 2021-07-14 13:10:49 +02:00
Jonathan de Jong e1b89c1248 apply lint suggestions and version bump 2021-07-14 12:31:38 +02:00
Jonathan de Jong 15471d9ac4 update rocket and lock 2021-07-14 11:28:24 +02:00
Jonathan de Jong 9d4fa9a220 Sqlite 2021-07-14 07:07:08 +00:00
Kurt Roeckx dcb5e5900f Getting capabilities requires authentication 2021-07-11 22:07:10 +02:00
Timo Kösters 4732aa6782 Merge branch 'invalid_utf8' into 'master' 
Return proper error in case of invalid UTF-8

See merge request famedly/conduit!110
 2021-07-11 13:44:27 +00:00
Kurt Roeckx 699f77671f Return proper error in case of invalid UTF-8 in json_body 
json_body is used in places that need authentication. In
case an unknown field is set, Ruma doesn't parse the field
and so doesn't give an error on invalid UTF-8. But Conduit
has parsed and on error makes json_body None. Return an
error to the client instead of generating an internal error.
 2021-07-11 14:47:13 +02:00
Timo Kösters 13c0beafa6 Merge branch 'lib-fix' into 'master' 
Export conduits Config struct and fix clippy warnings

See merge request famedly/conduit!99
 2021-07-11 11:42:07 +00:00
Timo Kösters 5711467ad9 Merge branch 'state-res-closure' into 'master' 
Remove auth_cache using a closure to fetch events in state-res

See merge request famedly/conduit!108
 2021-07-02 10:56:21 +00:00
Aiden McClelland c53cc03ff8
address pr comments 2021-07-01 13:38:25 -06:00
Aiden McClelland f25f61d4a9
fix errors introduced by rebase 2021-07-01 12:48:12 -06:00
Aiden McClelland b2d5516058 add support for arbitrary proxies 2021-07-01 12:41:12 -06:00
Devin Ragotzy 1bb84a8e2d Fix docs for fetch_and_handle_events 2021-06-30 07:48:16 -04:00
Devin Ragotzy 98f1480e2b
Remove auth_cache using a closure to fetch events in state-res 2021-06-30 12:54:19 +02:00
Timo Kösters 05821d6fd5
improvement: pdu cache, /sync cache 2021-06-30 10:31:34 +02:00
Devin Ragotzy 09a8737f24 Export conduits Config struct and fix clipp warningsy 2021-06-29 16:02:12 -04:00
Timo Kösters dcac1361ec
improvement: /search works for multiple rooms 2021-06-21 15:21:00 +02:00
Timo Kösters fee7d3d2e3 Merge branch 'allow_appservice_registration' into 'master' 
Always allow appservices to register new users

See merge request famedly/conduit!105
 2021-06-21 10:15:48 +00:00
phesch 637d9d3b6f Always allow appservices to register new users 2021-06-19 16:12:05 +02:00
Jonas Platte 808741bcb6
Remove unnecessary Option-wrapping and successive unwrapping 2021-06-17 20:44:29 +02:00
Jonas Platte b291e76572
Use try operator for Option more 2021-06-17 20:37:07 +02:00
Jonas Platte f3e630c064
Fix lots of clippy lints 2021-06-17 20:34:14 +02:00
Jonas Platte af2ce5803e
Remove pointless double deserialization 2021-06-17 20:29:02 +02:00
Jonas Platte 7fa54e4411
Use Ruma-provided default power levels for shorter code 2021-06-17 20:14:37 +02:00
Jonas Platte f6046871f4
Upgrade Ruma 2021-06-17 20:12:36 +02:00
Timo Kösters 67f9592b17
feat: /event_auth 2021-06-14 11:36:40 +02:00
Timo Kösters 77a23f8969
improvement: filter our room directory 
Fixes #35
 2021-06-14 11:26:41 +02:00
Timo Kösters 3c9ea55938
feat: /state 2021-06-14 11:01:12 +02:00
Timo Kösters e8f6708927
improvement: show more users in our user directory 2021-06-12 18:40:33 +02:00
Timo Kösters cd4bc520d8
improvement: feature flags for sled, rocksdb 2021-06-12 15:13:04 +02:00
hamidreza kalbasi 2078af59d8
fix fmt problems 2021-06-09 22:22:05 +02:00
hamidreza kalbasi 2385bd1cfd
add migrations 2021-06-09 22:22:05 +02:00
hamidreza kalbasi affa124864
create media folder in init 2021-06-09 22:22:05 +02:00
hamidreza kalbasi ff841b73c5
use .keys() and remove unneccery .to_vec() 2021-06-09 22:22:04 +02:00
hamidreza kalbasi 804105479c
fix fmt and clippy warnings 2021-06-09 22:22:04 +02:00
hamidreza kalbasi 972caacdc2
put media in filesystem 2021-06-09 22:22:04 +02:00
Timo Kösters d0ee823254
feat: swappable database backend 2021-06-09 22:21:52 +02:00
Timo Kösters e1e529d818
fix: don't apply push rules for users of other homeservers 2021-05-30 22:01:12 +02:00
Timo Kösters 88cf043f94
fix: deactivate accounts that should be deactivated 2021-05-30 21:56:36 +02:00
Timo Kösters 59dd3676d5
fix: putting global account data works now 2021-05-29 10:53:03 +02:00
Timo Kösters deacdf6f58
fix: is_direct for locally invited users 2021-05-28 22:53:00 +02:00
Timo Kösters 5b5cc0574e
feat: implement /claim, handle to-device events 2021-05-28 13:46:15 +02:00
Gabriel Souza Franco 7db59c550f fix: also return successful PDUs in /send/:txnId 2021-05-27 18:10:48 -03:00
Timo Kösters daa1fc90a7
fix: state resolution bugs 2021-05-27 10:48:17 +02:00
phesch ddcf1a715b Fix redacted_because field being sent as a string 2021-05-26 17:38:30 +02:00
Timo Kösters aacf6289db
improvement: increase default max concurrent requests 2021-05-24 18:00:39 +02:00
Timo Kösters 57ecd81534
fix: logs for ruma crate 2021-05-24 13:22:30 +02:00
Timo Kösters e5c7119516
feat: forward federation errors to the client 2021-05-23 16:46:46 +02:00
Timo Kösters 1939e62814
fmt 2021-05-23 11:11:20 +02:00
Timo Kösters c1b2b468b8
fix: bad except in ruma wrapper 2021-05-22 21:33:31 +02:00
Timo Kösters 90cd11d850
fix: Forbidden instead of InvalidParam when joining 2021-05-22 18:50:40 +02:00
Timo Kösters 9b77eb7bb7
fix: too many syncs 2021-05-22 11:31:15 +02:00
Timo Kösters 1b42770ab5
improvement: warning for small max_request_size values 2021-05-22 10:34:19 +02:00
Timo Kösters 3e2f742f30
fix: room version warnings and other bugs when joining rooms 2021-05-21 22:22:05 +02:00
Timo Kösters 989d843c40
fix: unauthorized pdus will be responded to with FORBIDDEN 2021-05-21 18:12:02 +02:00
Timo Kösters 09157b2096
improvement: federation get_keys and optimize signingkey storage 
- get encryption keys over federation
- optimize signing key storage
- rate limit parsing of bad events
- rate limit signature fetching
- dependency bumps
 2021-05-21 13:25:24 +02:00
Timo Kösters ae41bc5067
fix: run state res with old current state again 
I'm a bit torn on the "auth check based on the current state of the
room". It can mean multiple things:

1. The state of the room before the homeserver looked at the event at
all. But that means if a message event from a user arrives, but we
didn't see their join event before, we soft fail the message (even
though we would find the join event when going through the auth events
of the event and doing state res)

2. The state of the room after doing state-res with the event and our
previous room state. We need to do this state resolution to find the new
room state anyway, so we could just use the new room state for the auth
check. The problem is that if the incoming event is a membership leave
event, the new room state does not allow another leave event. This is
obviously the wrong option.

3. The state of the room after doing state-res with the state **before**
the event and our previous room state. This will mean a lot more
calculations because we have to run state-res again

We used 2. before and now use 1. again
 2021-05-17 10:58:44 +02:00
Timo Kösters 8f27e6123b
feat: send read receipts over federation 
currently they will only be sent if a PDU has to be sent as well
 2021-05-17 10:25:27 +02:00
Timo Kösters 24793891e0
feat: implement GET /presence 2021-05-14 11:05:41 +02:00
Timo Kösters 37b4a1cd0d Merge branch 'dbg_clippy' into 'master' 
Add dbg_macro check

See merge request famedly/conduit!75
 2021-05-12 18:44:01 +00:00
Timo Kösters f62258ba35
improvement: bug fixes and refactors 
- power level content override adds to the default event instead of
replacing it
- sending code refactored to make edus possible
- remove presence events when restarting conduit
- remove room_id field from read receipts over /sync
- handle incoming read receipts
- fix array bounds bug in server_server.rs
 2021-05-12 20:15:24 +02:00
Jonas Platte af6fea3d4e
Refactor some canonical JSON code 2021-05-08 02:13:01 +02:00
Jonas Platte a0457000ff
Upgrade Ruma 2021-05-08 01:54:28 +02:00
Jonathan de Jong 268ad3441c add dbg_macro check 2021-05-05 16:14:49 +00:00
Timo Kösters cf94b8e712
improvement: uiaa works like in synapse 2021-05-04 19:05:30 +02:00
Jonas Platte e1c4e5c73e
Return only event content in account_data endpoints, not the entire event 2021-04-29 21:28:01 +02:00
Jonas Platte 8bfaf09f37
Clean up reqwest::Response to http::Response conversion 2021-04-29 21:28:00 +02:00
Jonas Platte c28eba1e5b
Bump ruma 2021-04-29 21:05:29 +02:00
Jonas Platte 08ca573df0
Remove explicit setting of content-type header 
`try_into_http_request` takes care of this already.
 2021-04-29 20:50:59 +02:00
Jonas Platte 61c522dcc0
Fix formatting 2021-04-29 20:50:59 +02:00
Jonas Platte b76af682a6
Fix clippy warnings 2021-04-29 20:50:59 +02:00
Timo Kösters 3c3062a316
improvement: optimize room directory 2021-04-28 17:56:15 +02:00
Jonas Platte 2e1d7d12ca
Refactor usage of CanonicalJsonValue 2021-04-26 19:03:51 +02:00
Jonas Platte c2b72773d5
Fix clippy warning 2021-04-26 19:02:32 +02:00
Timo Kösters 58463bba93
feat: send invites over federation 2021-04-25 14:10:21 +02:00
Timo Kösters 3dfc245633
fix: send transaction retry code 2021-04-24 18:26:41 +02:00
Timo Kösters 2fc1ec2ad5
fix: logging 2021-04-24 13:34:35 +02:00
Timo Kösters 226045ea4b
improvement: warning on misconfigured reverse proxy 2021-04-24 12:29:02 +02:00
Jonas Platte 026af6b1a6
Improve formatting of ruma_wrapper.rs 2021-04-24 12:22:42 +02:00
Jonas Platte d8b484beed
Upgrade ruma 2021-04-24 12:22:36 +02:00
Jonas Platte e72fd44bb5
Refactor send_request for appservices 2021-04-24 12:18:21 +02:00
Jonas Platte 7067d7acae
Refactor Responder implementation for RumaResponse 2021-04-24 12:18:21 +02:00
Timo Kösters 23f81bfaf7
chore: update dependencies 2021-04-24 12:18:19 +02:00
Timo Kösters bb234ca002
fix: only show one typing event per user 2021-04-24 12:17:45 +02:00
Timo Kösters 6e84d317b2
improvement: update ruma 2021-04-24 12:17:44 +02:00
Timo Kösters 1f84013b2a
feat: verify signatures for incoming requests 2021-04-24 12:17:44 +02:00
Timo Kösters 8c72909bb8 Merge branch 'tls-name' into 'master' 
Validate TLS certificates according to Matrix spec

See merge request famedly/conduit!60
 2021-04-23 05:22:07 +00:00
Timo Kösters 2f440e644d
fix: clippy 2021-04-21 10:59:07 +02:00
Timo Kösters 71ed1b295a
feat: /devices route 2021-04-21 10:51:56 +02:00
Timo Kösters e815486030
fix: don't allow inviting other users (not implemented yet) 2021-04-21 10:00:23 +02:00
Gabriel Souza Franco ed253e236c chore: document FedDest, fix tests 2021-04-21 00:35:44 -03:00
Timo Kösters d4e0ba245b
fix: bug when fetching events over federation 2021-04-19 11:55:27 +02:00
Timo Kösters eedac4fd96
feat: make_join, send_join and /directory 2021-04-16 18:18:29 +02:00
Gabriel Souza Franco 7faa021ff5 chore: code formatting and cleanup 2021-04-16 12:18:22 -03:00
Gabriel Souza Franco e73de2317e fix: verify tls cert for non-conformant servers 2021-04-16 00:36:35 -03:00
Gabriel Souza Franco b4c001de2f chore: cleanup string-based code in find_actual_destination 2021-04-16 00:27:26 -03:00
Gabriel Souza Franco 0b56589dce feat: add handling of tls cert for delegated hosts 2021-04-15 22:07:27 -03:00
Timo Kösters bc98425dfe
improvement: use invite state as hints to what servers to ask for joining 2021-04-14 14:46:40 +02:00
Timo Kösters 001d8dc257
fix: don't do expensive operation on local /send 2021-04-14 12:55:14 +02:00
Timo Kösters c1953efa6b
chore: code cleanup 2021-04-14 10:43:31 +02:00
Timo Kösters abddfc2d2a
Merge remote-tracking branch 'famedly/master' into develop 2021-04-14 10:26:28 +02:00
Timo Kösters 5951294638
feat: join cursed rooms 
this removes several restrictions and tries to continue verifying a pdu
event if some auth events fail (it drops/ignores bad pdus)
 2021-04-14 09:39:06 +02:00
Timo Kösters 8b40e0a85f
improvement: fetch signing keys in parallel when joining a room 2021-04-13 22:54:01 +02:00
Timo Kösters 5049d0e01b
improvement: check signatures on join 2021-04-13 18:17:51 +02:00
Timo Kösters b4f79b77ba
feat: reject invites over federation 2021-04-13 17:41:14 +02:00
Timo Kösters 662a0cf1df
improvement: better and more efficient message count calculation 2021-04-12 12:40:16 +02:00
Timo Kösters 1dc85895a7
fix: show warning for invalid user ids 2021-04-12 10:12:52 +02:00
Timo Kösters a961732f5f
fix: overflow 2021-04-11 21:35:17 +02:00
Timo Kösters a8231eef25
fix: alias parsing 2021-04-11 21:29:37 +02:00
Timo Kösters 8773e5013d
feat: incoming invites over federation 2021-04-11 21:04:31 +02:00
Timo Kösters b0ea692706
fix: malformed pushrule error when event does not trigger any actions 2021-04-11 10:50:30 +02:00
Timo Kösters 588de12d79
fix: lost forward extremity 2021-04-11 10:12:29 +02:00
Timo Kösters 044e65afcc
fix: move back to sled stable 2021-04-11 10:12:05 +02:00
Timo Kösters 84f4ce73e5
fix: membership deserializing 2021-04-09 21:45:22 +02:00
Timo Kösters f3f95a73d0
improvement: /event route 2021-04-07 15:57:23 +02:00
Jonas Platte dc031fff95
Remove redundant calls to .iter() and .into_iter() 2021-04-06 17:38:54 +02:00
Jonas Platte dbe8c2ce19
Remove lots of redundant string allocations 2021-04-06 17:38:54 +02:00
Jonas Platte fe744c856f
Upgrade ruma 
… and refactor push rule code along the way.
 2021-04-06 17:38:53 +02:00
Timo Kösters db7044a950
sytest test 2021-03-26 13:41:05 +01:00
Timo Kösters cd4dc13731
fix: use correct room versions 2021-03-26 13:30:17 +01:00
Timo Kösters c213769d9f
improvement: refactor state res and fix a few bugs in the process 2021-03-25 23:55:40 +01:00
Timo Kösters 16eed1d8c2
chore: get rid of warnings 2021-03-24 12:44:10 +01:00
Timo Kösters e50f2864de
improvement: save state for send_join pdu 2021-03-24 11:46:15 +01:00
Timo Kösters e305889b72
feat: room_account_data endpoints 2021-03-24 08:48:28 +01:00
Timo Kösters 1d00a8c41f
improvement: better logging 
Use CONDUIT_LOG or the log setting in the config
 2021-03-23 22:06:09 +01:00
Timo Kösters 46d8f36a2c
fix: media thumbnail calculation and appservice detection 2021-03-23 21:18:16 +01:00
Timo Kösters 3ea7d162db
fix: various improvements and fixes 2021-03-23 12:59:27 +01:00
Timo Kösters 363c629faf
fix: signature key fetching, optimize push sending 2021-03-22 14:04:41 +01:00
Timo Kösters d4c76f4654
chore: update ruma 2021-03-18 19:38:08 +01:00
Timo Kösters f775c76d8a
chore: get rid of warnings 2021-03-18 18:33:43 +01:00
Gabriel Souza Franco 7b3fe88345
Send proper Host header in federation requests 2021-03-18 17:59:16 +01:00
Timo Kösters 5cb15551f3
improvement: use db compression 2021-03-18 13:13:08 +01:00
Timo Kösters a0fa0ee7a0
fix: join appservice room with alias 2021-03-18 12:03:44 +01:00
Timo Kösters a77fcd106e
feat: implement /state_ids and fix federation stuff 2021-03-18 00:11:13 +01:00
Timo Kösters 100307c936
improvement: optimize state storage 2021-03-17 22:31:28 +01:00
Timo Kösters 44425a903a
fix: multiple federation/pusher fixes 2021-03-16 18:00:46 +01:00
Timo Kösters 21f785d530
Merge branch 'correct-sendtxn' into pushers 2021-03-15 09:56:04 +01:00
Timo Kösters 6da40225bb
improvement: make state res actually work 2021-03-13 16:30:12 +01:00
Timo Kösters 643109309b Merge branch 'incoming-pdu' into 'master' 
fix: don't accept incoming pdus if we know about them already

Closes #70

See merge request famedly/conduit!33
 2021-03-04 14:38:07 +00:00
Rudi Floren 4027cbd01d Fix various clippy errors 2021-03-04 15:27:25 +01:00
Rudi Floren 6309506a48 Allow suspicious_else_formatting 
This is probably unfixable because it is caused by macros
 2021-03-04 15:26:34 +01:00
Devin Ragotzy 0d55964d24 Run nightly cargo fmt 2021-03-04 08:45:23 -05:00
Devin Ragotzy d0df8b495c Merge remote-tracking branch 'upstream/master' into correct-sendtxn 2021-03-04 08:39:16 -05:00
Devin Ragotzy e239014fa3 Query for the correct server 2021-03-04 08:02:41 -05:00
Timo Kösters 1ce00f90fe
fix: don't accept incoming pdus if we know about them already 2021-03-04 13:37:16 +01:00
Timo Kösters bd6507eafb Merge branch 'valkum-master-patch-25423' into 'master' 
Make clippy happy (needless-return, etc.)

See merge request famedly/conduit!23
 2021-03-04 12:35:12 +00:00
Rudi Floren 231c6032f4 Make clippy happy (needless-return, etc.) 2021-03-04 12:35:12 +00:00
Timo Kösters 3e274d7d2c Merge branch 'valkum/conduit-update_rocket' into 'master' 
update dependencies

See merge request famedly/conduit!32
 2021-03-04 12:32:22 +00:00
Timo Kösters 105f893cf3
chore: bump other dependencies to make it work 2021-03-04 12:29:08 +01:00
Timo Kösters 437cb5783a
fix: apply the same appservice sending rules to events coming from federation 
currently this code is duplicated from database/rooms.rs, when we
refactor server_server.rs we should deduplicate it
 2021-03-04 11:34:38 +01:00
Rudi Floren f4039902d8 Bump Rocket to current HEAD 2021-03-03 22:42:10 +01:00
Timo Kösters f2ec2be821
fix: don't always query aliases of appservices 
only do so if the alias matches the regex in the registration file
 2021-03-03 21:53:32 +01:00
Timo Kösters 1a198e7336 Merge branch 'jaeger' into 'master' 
feat: opentelemetry/jaeger support

See merge request famedly/conduit!28
 2021-03-02 14:14:26 +00:00
Timo Kösters 4155a47db1
feat: opentelemetry/jaeger support 2021-03-02 15:08:54 +01:00
Timo Kösters f7713fdf2e
fix: sending code got stuck sometimes 2021-03-02 14:58:46 +01:00
Timo Kösters 278751eb23
improvement: use transaction ids for federation requests 2021-03-02 14:36:48 +01:00
Timo Kösters dd68031b69
improvement: implement /receipt 2021-03-02 14:33:35 +01:00
Devin Ragotzy 79c9de98cd Add trusted_servers, filter servers to query keys by trusted_servers 2021-03-01 09:17:53 -05:00
Devin Ragotzy c9f4ff5cf8 Ask multiple servers for keys when not known or sending server failed 2021-03-01 08:23:28 -05:00
Devin Ragotzy f3253f2033 Move comments about Rooms trees to doc comments 2021-02-28 18:53:17 -05:00
Devin Ragotzy 0dd8a15c49 Fix leaves not being replaced by correct eventId in membership 
Update ruma
 2021-02-27 16:09:22 -05:00
Devin Ragotzy 0cc6448dbe Temp disable rust_2018_idioms for CI 2021-02-23 17:21:01 -05:00
Devin Ragotzy 8f283510aa Fix unused import clippy warning 2021-02-23 17:21:01 -05:00
Devin Ragotzy 48601142f8 Use auth_cache to avoid db, save state for every event when joining 2021-02-23 17:21:01 -05:00
Devin Ragotzy 74d530ae0e Address review issues, fix forward extremity calc 
Keep track of all prev_events since if we know that an event is a
prev_event it is referenced and does not qualify as a forward extremity.
 2021-02-23 17:21:01 -05:00
Devin Ragotzy 591769d5f3 Fiter PDU's before main incoming PDU loop 2021-02-23 17:21:01 -05:00
Devin Ragotzy 64374b4679 Use eventId when saving outliers 2021-02-23 17:21:01 -05:00
Devin Ragotzy e09be2f7ee Add incoming event to the current room state then resolve 
All state snapshots that are used in the resolve call are state after
snapshots, they have the event inserted.
 2021-02-23 17:21:01 -05:00
Devin Ragotzy 6661de50ab Fix and integrate outlier tree, build forks after adding event to DB 2021-02-23 17:21:01 -05:00
Devin Ragotzy 6fd3e1d1dd Append state event that pass resolution to DB, update to tokio 1.1 2021-02-23 17:21:01 -05:00
Devin Ragotzy e0453e2348 Cleanup dbg prints and error messages 2021-02-23 17:21:01 -05:00
Devin Ragotzy 68f60933e6 Resolved state is set as the current room state on incoming events 2021-02-23 17:21:01 -05:00
Devin Ragotzy 05a4c0b325 Finish forward extremity gathering, use resolved state as new snapshot 2021-02-23 17:21:01 -05:00
Timo Kösters 602edfd849 feature: push rule settings 2021-02-23 17:21:01 -05:00
Devin Ragotzy 88c60605b4 Add ability to update room leaves with multiple eventIds 
Tokio seems a bit broken with Rocket...
 2021-02-23 17:21:01 -05:00
Devin Ragotzy 66af1ff695 Update ruma and rocket to latest git rev and tokio to 1.0 
Ruma updated the event signing validation code and there was a dep
resolving failure with serde rocket and tokio so I updated rocket latest and
tokio 1.0 to fix.
 2021-02-23 17:20:52 -05:00
Timo Kösters 835cf80acd
fix: pushers 2021-02-11 13:17:21 +01:00
Devin Ragotzy 7309b2fba9 WIP gather and update forward extremities 2021-02-09 15:25:30 -05:00
Devin Ragotzy 94da569119 Fixing the incoming events algorithm (review with time) 2021-02-09 15:25:22 -05:00
Devin Ragotzy db0aee3318 Use the auth_events for step 6, WIP forward_extremity_ids fn 2021-02-09 15:25:10 -05:00
Devin Ragotzy 4b2eb5ab82 Fix ALL clippy warnings 2021-02-09 15:25:00 -05:00
Devin Ragotzy 4cf530c55b Abstract event validation/fetching, add outlier and signing key DB trees 
Fixed the miss named commented out keys in conduit-example.toml.
 2021-02-09 15:24:09 -05:00
Devin Ragotzy 52392628e9 Convert uses of Box<ServerName> to a ref 2021-02-09 15:22:22 -05:00
Devin Ragotzy d108a735a4 State resolution outline for /send 2021-02-09 15:22:12 -05:00
Devin Ragotzy d0b8d0f5fd Fix signature/hash checks, fetch recursive auth events 2021-02-09 15:22:02 -05:00
Devin Ragotzy 168ae8dca0 Fill event_map with all events that will be needed for resolution 2021-02-09 15:21:51 -05:00
Devin Ragotzy 8de0d9f9ce Remove StateStore trait from state-res collect events needed 2021-02-09 15:21:41 -05:00
Devin Ragotzy cdeb1236a2 Fix clippy warnings remove unused imports 2021-02-09 15:21:14 -05:00
Devin Ragotzy 63af3d3da0 Step 5 in /send just fetches state from incoming server 2021-02-09 15:20:07 -05:00
Devin Ragotzy 4b9976aa74 Update state-res, use the new Event trait 
This also bumps ruma to latest and removes js_int infavor of the ruma
re-export
 2021-02-09 15:19:47 -05:00
Devin Ragotzy 4a92a29b56 State resolution outline for /send 2021-02-09 15:18:47 -05:00
Timo Kösters d49911c5e0
Add 'm.login.token' authentication 2021-02-07 17:38:45 +01:00
Timo Kösters 3588dcd6d0 Merge branch 'deviceid-login' into 'master' 
Handle optional device_id field during login

See merge request famedly/conduit!16
 2021-02-07 12:28:05 +00:00
Timo Kösters ea1e4625d1
fix: default config options 2021-02-07 13:20:00 +01:00
Timo Kösters 6924dfc8ea
improvement: better appservice compatibility and optimizations 2021-02-06 15:28:30 +01:00
Timo Kösters fd3fb3a7ed
Merge remote-tracking branch 'famedly/master' into appservices 2021-02-03 12:54:37 +01:00
Devin Ragotzy e4dc7ea8ac Prevent admin room from recursively spamming itself and user -> user 2021-01-30 11:52:48 -05:00
Devin Ragotzy 73124629b7 Add general rules matching for pusher, calc unread msgs 2021-01-29 21:48:35 -05:00
Devin Ragotzy 2d69e81699 WIP: send out push notification, impl pusher routes 
It seems in order to test this I may also have to impl the email 3pid
route? I need to call the set_pusher route somehow.
 2021-01-29 21:48:09 -05:00
Devin Ragotzy a0ecd76e21 Run cargo fmt using nightly 2021-01-29 21:48:09 -05:00
Devin Ragotzy 56b816a2be Fix and integrate outlier tree, build forks after adding event to DB 2021-01-29 21:45:33 -05:00
Devin Ragotzy cd0c5c0566 Append state event that pass resolution to DB, update to tokio 1.1 2021-01-29 11:20:33 -05:00
Devin Ragotzy b8b40ce38b Cleanup dbg prints and error messages 2021-01-28 15:50:45 -05:00
Devin Ragotzy 894b6ef037 Resolved state is set as the current room state on incoming events 2021-01-28 15:33:41 -05:00
Timo Kösters 265fab843a
feature: push rule settings 2021-01-28 20:47:19 +01:00
Devin Ragotzy 35c1904b37 Finish forward extremity gathering, use resolved state as new snapshot 2021-01-24 20:18:40 -05:00
Timo Kösters a119d858f3
feature: push rule settings 2021-01-24 16:07:49 +01:00
Devin Ragotzy a897608025 Roll back tokio and rocket update since ruma's request is at 0.2 tokio 2021-01-18 19:59:08 -05:00
Devin Ragotzy 3a6f264450 Add ability to update room leaves with multiple eventIds 
Tokio seems a bit broken with Rocket...
 2021-01-18 19:41:38 -05:00
Devin Ragotzy 00436a32b0 Update ruma and rocket to latest git rev and tokio to 1.0 
Ruma updated the event signing validation code and there was a dep
resolving failure with serde rocket and tokio so I updated rocket latest and
tokio 1.0 to fix.
 2021-01-18 19:36:44 -05:00
Devin Ragotzy c65bde41e0 WIP gather and update forward extremities 2021-01-18 19:08:59 -05:00
Devon Hudson 762255fa8d
Simplify device creation logic during login 2021-01-17 08:39:47 -07:00
Devon Hudson 890187e004
improvement: Handle optional device_id field during login 
remove debug logging
 2021-01-16 22:19:48 -07:00
Devon Hudson ebb38cd330
improvement: respect logout_devices param on password change 
Move logout devices comment next to relevant loop

remove unnecessary log
 2021-01-16 15:14:50 -07:00
Devin Ragotzy b1ae2bbeb2 Fixing the incoming events algorithm (review with time) 2021-01-16 16:37:20 -05:00
Devin Ragotzy 96dc6be14b Use the auth_events for step 6, WIP forward_extremity_ids fn 2021-01-15 15:46:47 -05:00
Devin Ragotzy 5a8041969d Fix ALL clippy warnings 2021-01-15 11:05:57 -05:00
Devin Ragotzy 851eb555b6 Abstract event validation/fetching, add outlier and signing key DB trees 
Fixed the miss named commented out keys in conduit-example.toml.
 2021-01-14 21:32:22 -05:00
Devin Ragotzy 2ac3ffbb24 Convert uses of Box<ServerName> to a ref 2021-01-14 15:11:55 -05:00
Devin Ragotzy 7c4e116caa State resolution outline for /send 2021-01-14 15:07:40 -05:00
Devin Ragotzy 27c4e9d9d5
Fix signature/hash checks, fetch recursive auth events 2021-01-14 14:36:24 +01:00
Devin Ragotzy 88f3ee489b
Fill event_map with all events that will be needed for resolution 2021-01-14 14:31:47 +01:00
Devin Ragotzy 8a035880f0
Remove StateStore trait from state-res collect events needed 2021-01-14 14:30:24 +01:00
Devin Ragotzy 7c4d74bf9b
Fix clippy warnings remove unused imports 2021-01-14 14:30:24 +01:00
Devin Ragotzy 0ee239c9d7
Step 5 in /send just fetches state from incoming server 2021-01-14 14:30:23 +01:00
Devin Ragotzy 9e83d2b2d5
Update state-res, use the new Event trait 
This also bumps ruma to latest and removes js_int infavor of the ruma
re-export
 2021-01-14 14:30:19 +01:00
Devin Ragotzy 690c066064
State resolution outline for /send 2021-01-14 14:28:32 +01:00
Timo Kösters ad7b3f184b
improvement: send 200 response for turn server info 
We didn't implement it, but this will stop clients from retrying the
endpoint every minute
 2021-01-11 17:26:47 +01:00
Timo Kösters d45d033bf1
fix: send presence updates when going offline 
remaining bug: conduit sends presence updates every 5 minutes even if
the user is already offline
 2021-01-10 17:12:34 +01:00
Timo Kösters b4818716b8
improvement: better deploy guide 2021-01-01 22:21:05 +01:00
Timo Kösters 85364a9c27
improvement: change federation_enabled to federation_disabled 
This enables federation by default
 2021-01-01 10:52:43 +01:00
Timo Kösters edfd3c1f34
improvement: better config, better logs 2020-12-31 21:07:55 +01:00
Timo Kösters df16b2ba98
fix: rare state races 2020-12-31 14:52:08 +01:00
Timo Kösters 2cf6fd57b7
improvement: don't send pdus to appservices if it isn't interested 
TODO: we need to send pdus if a user of the appservice is in the room
but not the appservice user itself
 2020-12-23 19:41:54 +01:00
Timo Kösters fb9bd34696
improvement: better warnings when server is unreachable 2020-12-23 15:53:41 +01:00
Leonhard Kuboschek 8dcc1dfe56
improvement: always use port from SRV lookups 
Also query SRV records when well-known is not found, fixes #29
 2020-12-22 20:34:07 +01:00
Timo Kösters f12fbca3c5
fix: send state in /sync, element displays wrong membership changes 2020-12-22 20:22:17 +01:00
Timo Kösters 6606e41dde
feat: improved state store 2020-12-20 13:34:11 +01:00
Timo Kösters 6e5b35ea92
feat: implement appservices 
this also reverts some stateres changes
 2020-12-08 12:59:20 +01:00
Timo Kösters d62f17a91a
improvement: cache actual destination 2020-12-06 11:05:51 +01:00
Timo Kösters 45086b54b3
improvement: upgrade dependencies, fix timeline reload bug 2020-12-05 21:04:34 +01:00
Devin Ragotzy 164b1633d8
Update ruma to latest, renamed server keys and removed PduStub 2020-12-05 17:44:54 +01:00
Devin Ragotzy b869aab5d0
Cleanup removing debug printing and logging, append non state events 2020-12-05 17:37:13 +01:00
Devin Ragotzy c173ce43a5
convert_to_outgoing_federation_event takes CanonicalJsonObj 2020-12-05 17:37:12 +01:00
Devin Ragotzy 27e686f9ff
Convert uses of serde_json::Value to CanonicalJsonObject 2020-12-05 17:37:12 +01:00
Devin Ragotzy b6d721374f
Have Media db return optional content_type, conversion fixes 2020-12-05 17:37:11 +01:00
Devin Ragotzy bb24f6ad90
Address some review issues fmt, errors, comments 2020-12-05 17:37:11 +01:00
Devin Ragotzy 86bb93f8cf
Remove outdated TODOs, use StateEvent::from_id_value consistently 2020-12-05 17:37:10 +01:00
Devin Ragotzy 234b226468
Fix review issues, Remove EventHash's in prev/auth_events in StateEvent 
The latest state-res crate uses ruma's PduRoomV3 PDU's which don't have
tuples of (EventId, EventHashs) like previous versions did (this was
left from rebasing onto master). The Media DB
now takes an optional content_type like the updated ruma structs.
 2020-12-05 17:37:10 +01:00
Devin Ragotzy acd144e934
Fix get_closest_parent and cleanup federation/send/:txn 2020-12-05 17:37:10 +01:00
Devin Ragotzy b13049a6fa
Fix federated join miss hashing the join event created 2020-12-05 17:37:09 +01:00
Devin Ragotzy eca0bbb35a
Fix federated join miss hashing the join event created 2020-12-05 17:37:09 +01:00
Devin Ragotzy dcd1163806
All outgoing pdus in Sending must be PduStubs 2020-12-05 17:37:08 +01:00
Devin Ragotzy c9a6ce54cb
Add basic handling of EDUs for /send/txn 2020-12-05 17:37:08 +01:00
Devin Ragotzy 0d69ebdc6c
Reformat imports and fix clippy warnings 2020-12-05 17:37:07 +01:00
Devin Ragotzy db8a0c5d69
Add closest_parent method to Rooms Db insert in order /send pdus 2020-12-05 17:37:07 +01:00
Devin Ragotzy 96dd3b2880
Update ruma to latest, fix unstable origin feature in ruma 2020-12-05 17:37:07 +01:00
Timo Kösters 6e36081573
improvement: more logging 2020-12-05 17:35:00 +01:00
Timo Kösters 9439f2c183
feat: send logs into admin room 
Log entries will automatically be deduplicated, so a message won't be
sent if the same line has already been sent in the last 30 mins
 2020-12-05 17:34:58 +01:00
Timo Kösters e691e880e0
fix: logging thread crash when admin room does not exist 2020-12-02 16:08:59 +01:00
Timo Kösters 9f8cffcd22
Admin room improvements 2020-11-09 12:21:57 +01:00
Timo Kösters 16b22bb432
fix: don't allow more than 50 PDUs in a transaction 2020-11-03 21:53:57 +01:00
Timo Kösters 0762196963
fix: don't send new events from left rooms 2020-10-27 20:26:28 +01:00
Timo Kösters 2f5df4aac9
improvement: more reliable federation sending 2020-10-27 20:26:27 +01:00
Timo Kösters df82314440
improvement: welcome message 2020-10-23 14:38:12 +02:00
Timo Kösters 6b3934e31d
feat: configurable cache capacity 2020-10-23 14:38:12 +02:00
Timo Kösters 6dbe195695
improvement: flush after every request that manipulates the db 2020-10-23 14:38:07 +02:00
Timo Kösters 6bb8284fc0
improvement: correct thumbnailing algorithm 2020-10-19 17:21:28 +02:00
Timo Kösters f0a21b6165
fix: use device_id when registering 
TIL body.device_id != (*body).device_id, which is pretty bad, so I
renamed body.device_id to body.sender_device
 2020-10-18 21:51:28 +02:00
Timo Kösters 243126d393
Allow reading state if history_visibility is world readable 
See https://matrix.org/docs/spec/client_server/r0.6.1#id87
 2020-10-18 16:44:18 +02:00
Timo Kösters 12b0efac8b
fix: random timeline reloads 2020-10-18 09:03:40 +02:00
Timo Kösters 9109cb492f
fix: double join over federation 2020-10-17 11:24:57 +02:00
Timo Kösters dfcfab5b7e Merge branch 'master' into deps 2020-10-16 14:06:14 +02:00
Timo Kösters 9d1387954f
Update dependencies, remove dbgs 2020-10-16 14:04:29 +02:00
Timo Kösters b6ed018d16 Merge branch 'master' into reduce-mxc-length 2020-10-14 11:48:25 +02:00
Timo Kösters 304c53c4f5
style: make clippy happier 2020-10-07 12:29:19 +02:00
Timo Kösters 6afc4c9b3e
feat: federation disabled by default 
It can be enable in the Rocket.toml config or using ROCKET_FEDERATION_ENABLED=true
 2020-10-07 11:51:56 +02:00
Timo Kösters c15ae3c126
fix: invalid typing bytes because of 0xff in numbers 2020-10-07 11:51:56 +02:00
Timo Kösters bcd1fe1856
feat: admin room 2020-10-07 11:51:49 +02:00
Timo Kösters 0d6159c2da
improvement: get_missing_events route and cleanup 2020-10-01 20:49:15 +02:00
Timo Kösters ab332363ce
fix: don't send new requests to servers if we are already waiting 2020-10-01 20:49:14 +02:00
miruka 26e200e290 Reduce media ID length from 256 to 32 
Most common filesystems limit paths to 255 bytes.
This change brings down the media ID length to be similar to
Synapse servers (25), and makes it possible for clients to
download media with the ID included in the filename.
 2020-09-25 14:18:36 -04:00
Timo Kösters e08dfd982b
improvement: look at SRV record when sending requests 2020-09-23 12:04:02 +02:00
Timo Kösters 267c721616
fix: encryption and sync spam 2020-09-18 10:29:44 +02:00
Timo Kösters 8bcfff2766
fix: no notification counts for fast /syncs 2020-09-18 10:29:43 +02:00
Timo Kösters ea3aaa6b5c
improvement: more efficient /sync with gaps 2020-09-18 10:29:43 +02:00
Timo Kösters 506c2a3146
fix: can't find count from event in db 2020-09-17 10:24:18 +02:00
Timo Kösters 4db6d7e430
fix: remove avatar url checks 
They are not in the spec and maubot relies on that
 2020-09-16 18:10:55 +02:00
Timo Kösters a567cd81d5
improvement: better logs on deserialization errors 2020-09-16 15:08:51 +02:00
Timo Kösters f4078a29eb
fix: synapse complains about missing origin 2020-09-16 11:42:33 +02:00
Timo Kösters dd749b8aee
fix: server keys and destination resolution when server name contains port 2020-09-16 11:01:04 +02:00
Timo Kösters 005e00e9b1
fix: remove well-known 2020-09-15 17:16:55 +02:00
Timo Kösters 1bf614b0f5
fix: remove transaction_id from pdus over federation 2020-09-15 17:02:20 +02:00
Timo Kösters b7ab57897b
fix: sending slowness 2020-09-15 16:14:59 +02:00
Timo Kösters 0b263208e3
fix: don't panic on bad server names 2020-09-15 08:55:02 +02:00
Timo Kösters 71500b14b9
fix: send to all servers and fix media store 2020-09-15 08:17:15 +02:00
Timo Kösters f7816b11de
feat: send messages over federation 2020-09-15 08:17:06 +02:00
Timo Kösters 9f05ef926a
fix: filter public room dir 2020-09-14 16:23:15 +02:00
Timo d1099e9224
Update dependencies 2020-09-14 14:36:49 +02:00
Timo Kösters aa5e9e607e
feat: download media and thumbnails over federation 2020-09-14 14:20:38 +02:00
Timo Kösters 4e44fedbcd
fix: room list over federation 2020-09-14 11:43:42 +02:00
Timo Kösters c5313b3e8f
improvement: try out multiple servers when joining remote rooms 2020-09-14 11:00:31 +02:00
Timo Kösters 1f292c09f2
improvement: better federation joins 2020-09-14 09:29:46 +02:00
Timo Kösters af53485d70
fix: avoid pdus without event ids 2020-09-12 23:38:52 +02:00
Timo Kösters 1f28434988
feat: hacky transactions 2020-09-12 22:42:05 +02:00
Timo Kösters e6b1f54857
Merge remote-tracking branch 'origin/master' into federation 2020-09-12 22:23:54 +02:00
Timo Kösters 12a8c9badd
fix: join rooms over federation 2020-09-12 21:30:07 +02:00
Timo Kösters 1e8fbd8d50
Update ruma version 2020-09-08 17:32:03 +02:00
Timo Kösters 698e44a732
Fix /upgrade account data problems 2020-09-01 13:08:49 +02:00
Timo Kösters 515465f900
fix: make element not show "unknown user" warning 
The 404 error for /profile in the spec says "There is no profile
information for this user or this user does not exist.", but Element
assumes every 404 is a user that does not exist.
 2020-08-31 13:23:39 +02:00
Faelar df55e8ed0b
Add room upgrade. 2020-08-31 12:01:41 +02:00
Devin Ragotzy 2a63d0955a Sort and authenticate the events from /send_join response 2020-08-30 16:08:47 -04:00
Devin Ragotzy 3b40f3d60e Update state-res crate 2020-08-27 20:11:53 -04:00
Devin Ragotzy f46c2d1eec Fix review issues, move state-res to spec-comp branch 2020-08-27 20:11:53 -04:00
Timo Kösters 3f4cb753ee
improvement: add remaining key backup endpoints 2020-08-27 14:52:20 +02:00
Timo 4954df3cc3
feat: handle txn ids 2020-08-25 21:33:44 +02:00
Devin Ragotzy d9a29e3e5c Fix state for empty key route 
Replace None with Some("") for state_key
 2020-08-25 15:30:25 -04:00
Timo 33215d6099
fix: send notification count updates when private read receipts change 2020-08-24 10:46:20 +02:00
Devin Ragotzy 27ffe77823 Use helper instead of route for get_public_rooms_filtered 2020-08-23 16:45:01 -04:00
Devin Ragotzy 1848f08292 Use full sorting algorithm on incoming PDU's in membership 2020-08-23 16:43:48 -04:00
Timo 3c26166fb5 improvement: device list works better 
The only situation that isn't working yet is sending `left` events for
users when the sender leaves the room
 2020-08-23 16:43:48 -04:00
Timo 972babbc79 fix: set limited to true when skipping messages in /sync 2020-08-23 16:43:21 -04:00
Devin Ragotzy 672bf4f473 Cargo lock update and a few doc additions 2020-08-23 16:43:21 -04:00
Devin Ragotzy fe795d38ea Replace route calling routes with helpers 
This fixes the panic from ruma "index out of bounds"
 2020-08-23 16:43:21 -04:00
Devin Ragotzy 5ccdd3694b Add helper function for get_alias route 2020-08-23 16:43:21 -04:00
Devin Ragotzy ea20032404 Helper for join_room_by_id route so routes aren't calling routes 2020-08-23 16:43:21 -04:00
Devin Ragotzy 64fb0374b6 Use Vec<u8> instead of string for digest bytes and add roomid_statehash 2020-08-23 16:43:21 -04:00
Devin Ragotzy d73c6aa8ad Add roomid_statehash tree, clean up review issues 2020-08-23 16:43:21 -04:00
Devin Ragotzy 846a0098c1 Split append_pdu -> append_pdu and build_and_append 
Move all state event appending to append_state_pdu.
 2020-08-23 16:43:21 -04:00
Devin Ragotzy cb68bf9e0c Use ring crate to generate StatHashes when saving stateid/statehash 2020-08-23 16:43:21 -04:00
Devin Ragotzy c4f5a0a631 Keep track of State at event for state resolution 
feat: first steps towards joining rooms over federation
Add state-res as a dependency of conduit
Add reverse_topological_power_sort before append_pdu
Implement statehashstatid_pduid tree for keeping track of state
Clean up implementation of state_hash as key for tracking state
 2020-08-23 16:43:21 -04:00
Timo 38663228f5
fix: put reason of redaction in the redacted event 2020-08-23 16:47:27 +02:00
Timo 7ba9263cc6
improvement: show most recent PDUs first when searching 2020-08-23 16:14:11 +02:00
Timo 366554630a
fix: account registration 2020-08-23 16:14:11 +02:00
Timo 804d097a18
fix: wake up /sync for typing events 2020-08-23 16:14:10 +02:00
Timo c092f06068
docs: /sync 2020-08-23 16:14:10 +02:00
Timo df936e8e7e
improvement: guests are more spec-conform 2020-08-23 16:14:10 +02:00
Timo 64789537f5
fix: device list when leaving rooms 2020-08-23 16:14:09 +02:00
Timo 4323cf5fec
improvement: device list works better 
The only situation that isn't working yet is sending `left` events for
users when the sender leaves the room
 2020-08-23 16:14:09 +02:00
Timo f23fb32e95
fix: set limited to true when skipping messages in /sync 2020-08-23 16:14:09 +02:00
timokoesters e457e19088
feat: search pdus 2020-08-23 16:14:08 +02:00