Commit graph

578 commits

Author SHA1 Message Date
Jonas Platte
0ad6eac4f8
Remove all tracing::instrument attributes from database::abstraction::* 2022-02-12 16:38:47 +01:00
Timo Kösters
914152fcbd Merge branch 'syncfast' into 'next'
improvement: faster /syncs

Closes #231

See merge request famedly/conduit!297
2022-02-12 15:11:03 +00:00
Timo Kösters
2a00c547a1
improvement: faster /syncs 2022-02-12 15:57:54 +01:00
Timo Kösters
0565b5a6c8 Merge branch 'show-dns-setup-error' into 'next'
Display actual error message from TokioAsyncResolver, if any

See merge request famedly/conduit!296
2022-02-12 13:01:41 +00:00
Timo Kösters
f3502beb94 Merge branch 'welcome-message-command-hint' into 'next'
feat: add welcome message command hint

See merge request famedly/conduit!299
2022-02-12 12:28:53 +00:00
Timo Kösters
d6b9874b35 Merge branch 'fix-admin-self-commands' into 'next'
Fix admin room processing commands from its own messages

See merge request famedly/conduit!293
2022-02-12 12:27:57 +00:00
Jonas Platte
5fa9190117
Simplify return type of most route handlers 2022-02-12 12:56:08 +01:00
Jonas Platte
1f7b3fa4ac
Port from Rocket to axum 2022-02-12 12:56:07 +01:00
Jonas Platte
5db4c001d1
Remove another unnecessary use of an event enum 2022-02-12 01:58:47 +01:00
M0dEx
f602d32aaa
feat: add the actual server name to the welcome message 2022-02-11 18:51:28 +01:00
M0dEx
a6976e6d2d
feat: add 'available' to the help command line in the welcome message 2022-02-11 18:40:51 +01:00
M0dEx
f2b8aa28f3
feat: add a line with the help command to the welcome message 2022-02-11 18:26:56 +01:00
Andrej Kacian
bfbefb0cd2 Display actual error message from TokioAsyncResolver, if any 2022-02-07 12:56:44 +01:00
Andrei Vasiliu
31918bb990 Fix admin room processing commands from its own messages 2022-02-05 08:57:15 +02:00
Timo Kösters
eb0b2c429f
fix: crash on empty search 2022-02-04 17:15:52 +01:00
Timo Kösters
8db7d2c025 Merge branch 'asonix/encourage-reqwest-reuse' into 'next'
Re-use a basic reqwest client in all possible cases

See merge request famedly/conduit!265
2022-02-04 11:27:41 +00:00
Andrei Vasiliu
e1c0dcb6bb Create admin room and hide migration messages on first run 2022-02-03 22:50:11 +02:00
Andrei Vasiliu
b56efcdc2a Merge remote-tracking branch 'origin/next' into command-refactor
Fixed a small conflict in admin.rs
2022-02-03 20:31:06 +02:00
Andrei Vasiliu
6399a7fe4e Remove dash from admin command help 2022-02-03 20:21:04 +02:00
Jonas Platte
974c10e739
Move Config out of database module 2022-02-03 13:30:04 +01:00
Jonas Platte
abb4b4cf0b
Remove TryFrom, TryInto imports
They are no longer needed in the 2021 edition.
2022-02-03 13:24:04 +01:00
Andrei Vasiliu
4bbff69a24 Merge remote-tracking branch 'origin/next' into command-refactor
Fixed conflict with commit 78502aa6b1
2022-02-03 13:12:55 +02:00
Andrei Vasiliu
87225e70c3 Parse admin command body templates from doc comments 2022-02-02 21:35:57 +02:00
Torsten Flammiger
28d3b348d2 Return the ID of the appservice that was created by register_appservice 2022-01-31 11:52:33 +01:00
Torsten Flammiger
78502aa6b1 add error handling for register_appservice too 2022-01-31 10:07:49 +01:00
Torsten Flammiger
cc13112592 Cleanup appservice events after removing the appservice 2022-01-31 09:27:31 +01:00
Andrei Vasiliu
677f044d13 Refactor admin code to always defer command processing 2022-01-31 00:00:05 +02:00
Aode (lion)
b39ddf7be9 Rename reqwest clients, mention cheap client clones in comment 2022-01-28 12:42:47 -06:00
Andrej Kacian
529e88c7f9 Do not copy mxc string unnecessarily in db.get_thumbnail() 2022-01-27 17:47:09 +01:00
Aode (lion)
1059f35fdc use pre-constructed client for well-known requests also 2022-01-27 10:37:04 -06:00
Aode (Lion)
f8d1c1a8af Re-use a basic request in all possible cases 2022-01-27 10:37:04 -06:00
Jonas Platte
9c2000cb89
Upgrade Ruma 2022-01-27 16:25:42 +01:00
Andrei Vasiliu
7505548b94 Merge remote-tracking branch 'refs/remotes/origin/next' into command-refactor
Resolved conflict for the new list_local_users command
2022-01-22 14:29:50 +02:00
Timo Kösters
f50bdb6010 Merge branch 'list_local_users' into 'next'
Implement list_local_users command

See merge request famedly/conduit!260
2022-01-22 09:33:32 +00:00
Andrei Vasiliu
57979da28c Change structopt to clap, remove markdown dependency 2022-01-21 17:35:26 +02:00
Timo Kösters
5d3ba5c628 Merge branch 'WIP_persy_batch_next' into 'next'
feat: Integration with persy using background ops

See merge request famedly/conduit!231
2022-01-21 15:31:46 +00:00
Torsten Flammiger
960ba8bd99 Merged current next 2022-01-21 14:32:59 +01:00
Torsten Flammiger
ba6d72f3f9 Reformatted 2022-01-21 14:28:07 +01:00
Andrei Vasiliu
cc3ef1a8be Improve help text for admin commands 2022-01-21 11:13:24 +02:00
Andrei Vasiliu
f244c0e2ce Merge remote-tracking branch 'refs/remotes/origin/next' into command-refactor 2022-01-21 10:19:17 +02:00
Andrei Vasiliu
e378bc4a2c Refactor admin commands to use structopt 2022-01-21 10:17:50 +02:00
Jonas Platte
6bb1081b71
Use BTreeMap::into_values
Stable under new MSRV.
2022-01-20 13:19:51 +01:00
Jonas Platte
756a41f22d
Fix rustc / clippy warnings 2022-01-20 00:10:39 +01:00
Jonas Platte
a0fc5eba72
Remove unnecessary Result 2022-01-19 23:57:22 +01:00
Jonas Platte
c6277c72a1
Fix warnings in database::abstraction 2022-01-18 21:05:40 +01:00
Torsten Flammiger
fd6427a83f Update/Revert code comment 2022-01-17 22:34:34 +01:00
Torsten Flammiger
fc39b3447c Little bit of refactoring 2022-01-17 19:43:45 +01:00
Torsten Flammiger
4aefc29650 Merge branch 'list_local_users_test' into list_local_users 2022-01-17 19:20:11 +01:00
Timo Kösters
8c90e7adfb
refactor: fix warnings 2022-01-17 14:46:03 +01:00
Timo Kösters
ee8e72f7a8
feat: implement server ACLs 2022-01-17 14:35:38 +01:00
Torsten Flammiger
50430cf4ab Name function after command: list_local_users 2022-01-16 21:22:57 +01:00
Torsten Flammiger
52284ef9e2 Add some debug/info if user was found 2022-01-16 20:25:16 +01:00
Torsten Flammiger
3e79d15495 Updated function documentation 2022-01-16 20:15:53 +01:00
Andrei Vasiliu
13ae036ca0 Move and refactor admin commands into admin module 2022-01-16 13:52:23 +02:00
Torsten Flammiger
9205c07048 Update get_local_users description 2022-01-15 22:37:39 +01:00
Torsten Flammiger
c03bf6ef11 name the function after its purpose: iter_locals -> get_local_users 2022-01-15 22:20:51 +01:00
Torsten Flammiger
91eb6c4d08 Return a Result instead of a vector 2022-01-15 17:10:23 +01:00
Torsten Flammiger
fb19114bd9 rename iter_locals to get_local_users; make get_local_users skip on parse errors; remove deprecated function count_local_users 2022-01-15 15:52:47 +01:00
Tglman
f9977ca64f fix: changes to update to the last database engine trait definition 2022-01-15 14:17:15 +00:00
Tglman
1cc41937bd refactor:use generic watcher in persy implementation 2022-01-15 14:17:15 +00:00
Tglman
ab15ec6c32 feat: Integration with persy using background ops 2022-01-15 14:17:15 +00:00
Timo Kösters
d434dfb3a5
feat: config option for rocksdb max open files 2022-01-14 11:44:20 +01:00
Timo Kösters
16f826773b
refactor: fix warnings 2022-01-13 22:55:35 +01:00
Timo Kösters
6fa01aa982
fix: remove dbg 2022-01-13 22:44:27 +01:00
Timo Kösters
a336027b0e
fix: better memory usage message 2022-01-13 22:44:27 +01:00
Timo Kösters
9e77f7617c
fix: disable direct IO again 2022-01-13 22:44:27 +01:00
Timo Kösters
7f27af032b
improvement: optimize rocksdb for spinning disks 2022-01-13 22:44:26 +01:00
Timo Kösters
b96822b617
fix: use db options for column families too 2022-01-13 22:44:26 +01:00
Timo Kösters
0bb7d76dec
improvement: rocksdb configuration 2022-01-13 22:44:26 +01:00
Timo Kösters
077e9ad438
improvement: memory usage for caches 2022-01-13 22:44:25 +01:00
Andrej Kacian
68ee1a5408
Add rocksdb implementation of memory_usage() 2022-01-13 22:42:25 +01:00
Andrej Kacian
ff243870f8
Add "database_memory_usage" AdminCommand 2022-01-13 22:42:24 +01:00
Andrej Kacian
71431f330a
Add memory_usage() to DatabaseEngine trait 2022-01-13 22:42:24 +01:00
Timo Kösters
fa6d7f7ccd
feat: database backend selection at runtime 2022-01-13 22:42:22 +01:00
Timo Kösters
f285c89006
fix: make incremental sync efficient again 2022-01-13 22:38:52 +01:00
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
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
c9c9974641
fix: stack overflows when fetching auth events 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
84862352ba
Replace to_string calls on string literals with to_owned 2022-01-13 11:48:40 +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
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
f712455047
Reduce EventId copying 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
892a0525f2
Upgrade Ruma 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
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
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
Timo Kösters
2c8412fe58
improvement: more efficient sqlite 2021-09-13 20:12:42 +02:00
Timo Kösters
4b39d7cb64
fix: batch key fetching 2021-09-01 20:02:34 +02:00
Kurt Roeckx
984ad5ecd6
fixup! Get required keys in batch when joining a room 2021-09-01 19:30:31 +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
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
69df9a0145 add tls 2021-08-30 20:18:48 +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
41d07be97b
improvement: persist cached auth chains in db 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
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
667ffb4239
fix: correct create event warnings 2021-08-22 13:01:13 +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
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