MirrorHub/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-11-17 07:50:50 +01:00
Code Issues Releases Activity
1943 commits 50 branches 6 tags 12 MiB
Commit graph

1210 commits

Author SHA1 Message Date
Timo Kösters
9e29dc808f Merge branch '198-support-user-password-resets' into 'next' 
feat: support user password resets

Closes #198

See merge request famedly/conduit!339
 2022-04-07 12:11:55 +00:00
Jakub Kubík
ada07de204 feat: support user password resets 2022-04-07 12:11:55 +00:00
Timo Kösters
df4c38cb61
fix: remove warnings 2022-04-07 13:22:32 +02:00
Timo Kösters
2808dd2000
Ruma upgrade 2022-04-07 12:58:48 +02:00
Timo Kösters
17ad5f0595
fix: checks for incoming cross signing changes 2022-04-07 12:56:18 +02:00
Timo Kösters
b8411ae2fd
refactor: rename endpoints to match ruma 2022-04-07 12:56:17 +02:00
Timo Kösters
566833111c
refactor: small improvements 2022-04-07 12:56:16 +02:00
chenyuqide
ee96a03d60
Update ruma 2022-04-07 12:56:16 +02:00
chenyuqide
21bc099ccf
Update ruma 2022-04-07 12:56:12 +02:00
Timo Kösters
1ce03059a0 Merge branch 'next' into 'next' 
Fix wrong associated type in OutgoingKind::Appservice

See merge request famedly/conduit!324
 2022-04-03 19:48:25 +00:00
Timo Kösters
9ed352d4c0 Merge branch '199-fix-kick-ban-over-federation' into 'next' 
fix: fix kick and ban events over federation

Closes #199

See merge request famedly/conduit!338
 2022-04-03 17:59:15 +00:00
Jakub Kubík
a08c667230
docs: add comments for clarification of recent changes 2022-04-03 19:27:48 +02:00
Jakub Kubík
414c7c40c4
fix: remove our server from the list of servers to send the event PDU to 2022-04-03 19:19:57 +02:00
Jakub Kubík
1712e63e06
fix: fix kick and ban events over federation 
Fix the scenario where a MembershipState change event was not sent to the server of a user kicked/banned from a room on a Conduit instance if there were not any other users from that server in the room.
 2022-04-03 18:58:45 +02:00
Andrej Kacian
9046223e7f Send PDU to appservice if state_key is their user ID 
Fixes #110.
 2022-04-01 19:38:38 +02:00
Timo Kösters
0066f20bdd Merge branch 'trailingslash' into 'next' 
fix: allow trailing slashes for /state/<type>/ again

See merge request famedly/conduit!336
 2022-04-01 14:17:21 +00:00
Timo Kösters
a5465dfd3e
fix: allow trailing slashes for /state/<type>/ again 2022-04-01 16:00:04 +02:00
Timo Kösters
8086bee146 Merge branch 'show-config' into 'next' 
Add show-config admin command

See merge request famedly/conduit!295
 2022-04-01 09:01:00 +00:00
Timo Kösters
b11a3b80bc Merge branch 'shutdown-msg' into 'next' 
Log caught Ctrl+C or SIGTERM for operator feedback

See merge request famedly/conduit!319
 2022-04-01 08:49:28 +00:00
Timo Kösters
554146f46e Merge branch 'notify-admin-room-on-user-register' into 'next' 
Notify admin room for user registrations, deactivations and password changes

See merge request famedly/conduit!318
 2022-04-01 08:41:51 +00:00
Timo Kösters
7bc84dc971 Merge branch 'jplatte/up-axum' into 'next' 
Upgrade axum to 0.5

See merge request famedly/conduit!335
 2022-04-01 08:33:22 +00:00
Timo Kösters
d89141100c Merge branch 'insensitive-login' into 'next' 
Case insensitive username login

Closes #248

See merge request famedly/conduit!323
 2022-04-01 08:20:45 +00:00
Jonas Platte
db0659cb3d
Upgrade axum to 0.5 2022-03-31 22:50:17 +02:00
LordMZTE
4a12a7cbc8
Fix crash when a bad user ID is in the database 
To my understanding, a bad user ID can sometimes make it into the
database, which lead to a panic prior to this change.
 2022-03-31 20:59:59 +02:00
Andrej Kacian
b5b8181851 Notify admin room for user registrations, deactivations and password changes 2022-03-13 09:13:45 +01:00
chenyuqide
5695121f38 Fix wrong associated type in OutgoingKind::Appservice 2022-03-02 23:48:01 +08:00
reti4
8bafdc4623 fixed location of lowercase fn 2022-03-02 02:25:15 +00:00
reti4
9385ea0e7c fmt fix 2022-03-01 21:23:34 +00:00
reti4
9f059ad4c3 make username login case insensitive 2022-03-01 21:03:55 +00:00
Andrej Kacian
65fa4b2ca4 Fix proxy config examples in config/proxy.rs 2022-02-22 22:32:38 +01:00
Andrej Kacian
3b2b35aab7 Log caught Ctrl+C or SIGTERM for operator feedback 2022-02-22 00:28:46 +01:00
Andrej Kacian
196c83939c Add show-config admin room command 2022-02-21 22:27:19 +01:00
Jonathan de Jong
557d119bee change search_events_v3 to search_events::v3 2022-02-18 19:54:26 +01:00
Jonathan de Jong
e9f87e1952 update ruma 2022-02-18 15:33:14 +01:00
Timo Kösters
b8eaa3be85 Merge branch 'redactfix' into 'next' 
Redaction fix

Closes #235

See merge request famedly/conduit!298
 2022-02-18 12:00:40 +00:00
Jonas Platte
27692a2f14
Remove useless serde roundtrips 2022-02-18 11:52:00 +01:00
Timo Kösters
6602f6114c
fix: redacts can't error anymore 2022-02-13 15:47:58 +01:00
Jonas Platte
3aece38e9d
Add a not-found route 2022-02-13 13:59:27 +01:00
Jonas Platte
aee6bf7e7a Change this to handler 2022-02-13 11:30:04 +00:00
Jonathan de Jong
b8d92d3cec take advantage of multiple paths 2022-02-13 12:07:00 +01:00
Timo Kösters
0c4b42ac13 Merge branch 'parse-pdu-command-panic' into 'next' 
fix: do not panic on a JSON not containing the PDU

Closes #236

See merge request famedly/conduit!304
 2022-02-12 21:22:37 +00:00
M0dEx
d4217007fe
fix: do not panic on a JSON not containing the PDU 
Do not panic on a JSON not containing the PDU when executing the parse-pdu admin command.
 2022-02-12 21:40:07 +01:00
Jonathan de Jong
35b82d51cf fix compilations 2022-02-12 21:04:38 +01:00
Timo Kösters
2b644ef7b7 Merge branch 'tracing-cleanup' into 'next' 
Remove unnecessary tracing::instrument attributes

See merge request famedly/conduit!302
 2022-02-12 15:50:24 +00:00
Jonas Platte
0ad6eac4f8
Remove all tracing::instrument attributes from database::abstraction::* 2022-02-12 16:38:47 +01:00
Jonas Platte
accdb77315
Clean up tracing::instrument attributes 
Remove it from request handler since there's already the context of the
request path, added through TraceLayer.
 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
Jonas Platte
adeb8ee425
Remove no-op conversions 2022-02-12 15:03:07 +01:00
Jonas Platte
d74074ad53
Remove tracing::instrument attribute from util functions 
They don't ever log anything, so the extra context is never used.
 2022-02-12 15:01:28 +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
50b24b37c2
Upgrade Ruma 2022-02-12 12:56:18 +01:00
Jonas Platte
9db0473ed5
Improve error messages in Ruma wrapper FromRequest impl 2022-02-12 12:56:08 +01:00
Jonas Platte
5d8c80b170
Strip quotes from X-Matrix fields 2022-02-12 12:56:08 +01:00
Jonas Platte
21ae63d46b
Rewrite query parameter parsing 2022-02-12 12:56:08 +01:00
Jonas Platte
c8951a1d9c
Use axum-server for direct TLS support 2022-02-12 12:56:08 +01:00
Jonas Platte
5fa9190117
Simplify return type of most route handlers 2022-02-12 12:56:08 +01:00
Jonas Platte
77a87881c9
Add message to unsupported HTTP method panic 2022-02-12 12:56:08 +01:00
Jonas Platte
7bf538f549
Fix axum route conflicts 2022-02-12 12:56:07 +01:00
Jonas Platte
a5757ab195
Generalize RumaHandler 2022-02-12 12:56:07 +01:00
Jonas Platte
d1d2217019
Clean up error handling for server_server::get_server_keys_route 2022-02-12 12:56:07 +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
Jonas Platte
583ec51f9f
Remove unnecessary use of 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
d55992dc83 Merge branch 'jemallocfeature' into 'next' 
feat: allow disabling jemalloc via feature

See merge request famedly/conduit!285
 2022-02-04 17:08:03 +00:00
Timo Kösters
eb0b2c429f
fix: crash on empty search 2022-02-04 17:15:52 +01:00
Timo Kösters
8d8edddb2e
feat: allow disabling jemalloc via feature 2022-02-04 17:00:46 +01:00
Timo Kösters
72cd52e57c
fix: lazy loading for /context 2022-02-04 13:33:04 +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
Jonas Platte
d23d6fbb37
Upgrade Ruma 2022-02-03 20:24:02 +01:00
Jonas Platte
92571d961f
Remove mutation from default_config and set default log_level to off 2022-02-03 19:55:54 +01: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
ce60fc6859
Stop using set_env to configure tracing-subscriber 2022-02-03 13:24:28 +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
Timo Kösters
b4755ba15b Merge branch 'tests' into 'next' 
Bug fixes

See merge request famedly/conduit!278
 2022-02-03 10:12:04 +00:00
Timo Kösters
9ef3abacd4
fix: initial state deserialize->serialize error 2022-02-03 10:57:54 +01:00
Andrei Vasiliu
87225e70c3 Parse admin command body templates from doc comments 2022-02-02 21:35:57 +02:00
Timo Kösters
a5f004d7e9
fix: signature mismatch on odd send_join servers 2022-02-02 13:25:31 +01:00
Timo Kösters
caf9834e50
feat: cache capacity modifier 2022-02-01 14:42:13 +01:00
Timo Kösters
23aecb78c7
fix: use to_lowercase on /register/available username 2022-01-31 15:40:31 +01:00
Timo Kösters
e17bbdd42d
tests 2022-01-31 14:49:00 +01: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
Andrej Kacian
0f6d232cb1 Style fixes from 'cargo fmt' 2022-01-27 17:13:33 +01:00
Andrej Kacian
ccfc243c2c Make get_remote_content() return Result instead of ConduitResult 2022-01-27 17:13:07 +01:00
Timo Kösters
f7148def90 Merge branch 'up-ruma' into 'next' 
Upgrade Ruma

See merge request famedly/conduit!268
 2022-01-27 15:46:00 +00:00
Timo Kösters
63309e52f8 Merge branch 'media-download-with-filename' into 'next' 
Media download with filename

See merge request famedly/conduit!266
 2022-01-27 15:44:56 +00:00
Andrej Kacian
c4317a7a96 Reduce code duplication in media download route handlers 2022-01-27 16:32:19 +01:00
Jonas Platte
9c2000cb89
Upgrade Ruma 2022-01-27 16:25:42 +01:00
Andrej Kacian
52873c88b7 Fix incorrect HTTP method in doc comments of two media routes 2022-01-27 00:31:44 +01:00
Andrej Kacian
8472eff277 Implement media download with custom filename 2022-01-27 00:31:44 +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
Timo Kösters
f88523988e
improvement: use jemalloc for lower memory usage 2022-01-21 17:54:05 +01: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
Jonas Platte
13a48c4577
Clean up mod and use statements in lib.rs and main.rs 2022-01-18 21:04:44 +01:00
Timo Kösters
53de350908
fix: less load when lazy loading 2022-01-17 23:24:27 +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
03b174335c
improvement: lower default pdu cache capacity 2022-01-17 14:46:53 +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
80e51986c4
improvement: better default cache capacity 2022-01-14 11:08:31 +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
447639054e
improvement: higher default pdu capacity 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
4f39d36e98
docs: lazy loading 2022-01-13 22:38:52 +01:00
Timo Kösters
c6d88359d7
fix: incremental lazy loading 2022-01-13 22:38:52 +01:00
Timo Kösters
f285c89006
fix: make incremental sync efficient again 2022-01-13 22:38:52 +01:00
Timo Kösters
93d225fd1e
improvement: faster way to load required state 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
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