2287 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Timo Kösters	624654a88b	Merge branch 'fix-unrejectable-invites' into 'next' ... Fix unrejectable invites Closes #418 See merge request famedly/conduit!623	2024-04-24 18:01:48 +00:00
Timo Kösters	461236f3fb	Merge branch 'room-v11' into 'next' ... Add support for room v11 Closes #408 See merge request famedly/conduit!562	2024-04-24 10:48:12 +00:00
Matthias Ahouansou	1c4ae8d268	fix(redaction): use content.redacts when checking v11 events	2024-04-24 10:52:33 +01:00
Valentin Lorentz	89c1c2109c	Link to the specification from user_can_redact's documentation	2024-04-24 08:29:47 +02:00
Matthias Ahouansou	1bae8b35a9	Merge branch 'document-all-configuration' into 'next' ... Document all configuration Closes #435 See merge request famedly/conduit!635	2024-04-23 22:08:03 +00:00
Matthias Ahouansou	00d6aeddb6	refactor(redactions): move checks inside conduit ... ruma was already accidentally performing these checks for us, but this shouldn't be the case	2024-04-23 23:05:27 +01:00
Matthias Ahouansou	18f93ae8f3	Merge branch 'no-identity-assertion-optional-auth' into 'next' ... fix(appservices): don't perform identity assertion when auth is optional Closes #430 See merge request famedly/conduit!641	2024-04-23 21:05:01 +00:00
Matthias Ahouansou	6c9c1b5afe	fix(appservices): don't perform identity assertion when auth is optional	2024-04-22 10:33:12 +01:00
Charles Hall	27753b1d96	Merge branch 'updates' into 'next' ... Update crane and rocskdb See merge request famedly/conduit!640	2024-04-21 20:30:48 +00:00
Charles Hall	61cb186b5b	update rocksdb	2024-04-21 12:39:27 -07:00
Charles Hall	8c6ffb6bfc	unpin crane because the bug was fixed ... Flake lock file updates: • Updated input 'crane': 'github:ipetkov/crane/2c653e4478476a52c6aa3ac0495e4dea7449ea0e?narHash=sha256-XoXRS%2B5whotelr1rHiZle5t5hDg9kpguS5yk8c8qzOc%3D' (2024-02-11) → 'github:ipetkov/crane/55f4939ac59ff8f89c6a4029730a2d49ea09105f?narHash=sha256-Vz1KRVTzU3ClBfyhOj8gOehZk21q58T1YsXC30V23PU%3D' (2024-04-21)	2024-04-21 12:31:57 -07:00
Awiteb	2656f6f435	feat(docs): Document all configuration options ... Fixes: https://gitlab.com/famedly/conduit/-/issues/435 Suggested-by: Matthias Ahouansou <matthias@ahouansou.cz> Helped-by: Matthias Ahouansou <matthias@ahouansou.cz> Signed-off-by: Awiteb <a@4rs.nl>	2024-04-20 23:40:04 +03:00
Awiteb	b48e1300f2	chore(docs): Rename configuration section to Configuration	2024-04-20 23:37:00 +03:00
Timo Kösters	1474b94db6	Merge branch 'disable-federation-router' into 'next' ... refactor: disable federation at the router level See merge request famedly/conduit!629	2024-04-20 20:28:52 +00:00
Charles Hall	e19e6a4bff	Merge branch 'default-room-version-10' into 'next' ... chore(config): bump default room version to v10 See merge request famedly/conduit!628	2024-04-20 18:47:56 +00:00
Timo Kösters	95f5c61843	Merge branch 'remove-default-database-config' into 'next' ... chore: remove default database backend See merge request famedly/conduit!636	2024-04-18 20:55:03 +00:00
Matthias Ahouansou	4b288fd22f	chore: remove default database backend ... has been sqlite for far too long, and having a default for this is just asking for trouble	2024-04-18 20:49:50 +01:00
Valentin Lorentz	2d8c551cd5	Fix doc	2024-04-17 19:41:38 +02:00
Valentin Lorentz	eb6801290b	Document copy_redacts	2024-04-17 19:37:32 +02:00
Matthias Ahouansou	7a7c09785e	feat(pdu): copy top level redact to content and vice versa	2024-04-17 19:34:36 +02:00
Timo Kösters	d22bf5182b	Merge branch 'token-auth-fixes' into 'next' ... Token auth fixes Closes #430 See merge request famedly/conduit!633	2024-04-15 19:46:48 +00:00
Matthias Ahouansou	54e0e2a14c	fix(appservices): don't use identity assertion on account management endpoints	2024-04-15 19:16:18 +01:00
Matthias Ahouansou	475a68cbb9	refactor: disable federation at the router level	2024-04-13 10:39:32 +01:00
Matthias Ahouansou	92817213d5	Add missing import	2024-04-12 05:15:37 +00:00
Matthias Ahouansou	ab8592526f	Replace panic!() with unreachable!()	2024-04-12 05:14:39 +00:00
Matthias Ahouansou	561a103140	chore(config): bump default room version to v10	2024-04-11 22:55:18 +01:00
Val Lorentz	b5e21f761b	Merge branch 'next' into 'room-v11' ... # Conflicts: # src/service/rooms/timeline/mod.rs # src/utils/error.rs	2024-04-11 17:34:42 +00:00
Matthias Ahouansou	9e6ce8326f	Remove TODO	2024-04-11 17:21:00 +00:00
Matthias Ahouansou	e88d137bd7	Replace panic!() with unreachable!()	2024-04-11 17:19:42 +00:00
Charles Hall	7f63948db9	Merge branch 'version-extra' into 'next' ... allow including extra info in `--version` output See merge request famedly/conduit!601	2024-04-11 14:37:37 +00:00
Timo Kösters	f16bff2466	Merge branch 'user_can_membership' into 'next' ... refactor(state_accessor): add method to check if a user can invite another user See merge request famedly/conduit!621	2024-04-06 14:27:20 +00:00
Timo Kösters	e8796d6bf9	Merge branch 'admin-check-remote-users' into 'next' ... fix: do not allow administration of remote users Closes #377 See merge request famedly/conduit!614	2024-04-06 13:21:29 +00:00
Matthias Ahouansou	fe78cc8262	refactor(state_accessor): add method to check if a user can invite another user	2024-04-06 14:20:18 +01:00
Timo Kösters	03f9c888f0	Merge branch 'remove-join_authorized_via_users_servers' into 'next' ... fix(membership): remove join_authorized_via_users_server field on state update See merge request famedly/conduit!619	2024-04-06 13:20:01 +00:00
Matthias Ahouansou	2c73c3adbb	fix(sync): send phoney leave event where room state is unknown on invite rejection	2024-04-06 14:12:18 +01:00
Matthias Ahouansou	9497713a79	fix(membership): check if server is in room to decide whether to do remote leaves	2024-04-06 14:10:11 +01:00
Matthias Ahouansou	110b7e10e6	fix: do not allow administration of remote users	2024-04-05 10:56:28 +01:00
Timo Kösters	6c3ce71304	Merge branch 'dont-expect-reqwest-http-request' into 'next' ... fix: do not expect that all http requests are valid reqwest requests Closes #396 See merge request famedly/conduit!611	2024-04-05 09:53:14 +00:00
Matthias Ahouansou	fb4217486f	feat(membership): check if user already has the membership that is requested to be set	2024-04-05 10:21:44 +01:00
Charles Hall	dc23206e27	Merge branch 'nix-0.28' into 'next' ... chore: upgrade nix to 0.28 See merge request famedly/conduit!615	2024-04-04 04:34:46 +00:00
Matthias Ahouansou	0f6b771cdd	fix(membership): remove join_authorized_via_users_server field on state update	2024-04-03 22:46:47 +01:00
Timo Kösters	24e9c99d47	Merge branch 'no-auth-ignore-token' into 'next' ... fix: ignore access tokens where they are not needed See merge request famedly/conduit!617	2024-04-02 18:18:59 +00:00
Matthias Ahouansou	0d62c9de7c	fix: ignore access tokens where they are not needed	2024-04-02 17:19:59 +01:00
Timo Kösters	33fb32be9a	Merge branch 'srv-matrix-fed-record' into 'next' ... feat: use _matrix-fed._tcp SRV record, fallback to _matrix._tcp See merge request famedly/conduit!616	2024-04-01 21:30:58 +00:00
Matthias Ahouansou	e38af9b7fc	feat: use _matrix-fed._tcp SRV record, fallback to _matrix._tcp	2024-04-01 20:55:13 +01:00
Matthias Ahouansou	1c529529aa	chore: upgrade nix to 0.28 ... needed for musl targets on s390x	2024-04-01 13:36:38 +01:00
Timo Kösters	cf1e7bc1ed	Merge branch 'unregister-fail-id-not-found' into 'next' ... fix: return error when trying to unregister unknown appservice id See merge request famedly/conduit!610	2024-03-31 21:26:31 +00:00
Matthias Ahouansou	3ce3d13378	fix: do not expect that all http requests are valid reqwest requests	2024-03-31 22:20:36 +01:00
Matthias Ahouansou	11612e347d	fix: return error when trying to unregister unknown appservice id	2024-03-31 21:24:15 +01:00
Timo Kösters	7aa70e2030	Merge branch 'error-appservice-token-auth' into 'next' ... fix: reject requests with authentication when not used Closes #430 See merge request famedly/conduit!608	2024-03-31 09:43:17 +00:00