MirrorHub
/
conduit
mirror of https://gitlab.com/famedly/conduit.git
1
0
Fork 0
Code Issues Releases Activity
2,250 Commits 51 Branches 6 Tags 14 MiB
Commit Graph

2250 Commits

Author SHA1 Message Date
Timo Kösters a854ce5cf6 Merge branch 'next' into 'master' 
Merge branch 'next' into 'master'

See merge request famedly/conduit!646
 2024-04-24 23:23:33 +00:00
Timo Kösters 414056442a Merge branch 'bump' into 'next' 
Bump version to v0.7.0

See merge request famedly/conduit!645
 2024-04-24 22:22:56 +00:00
Timo Kösters 7c83372336 Merge branch 'exclusive-namespace-error' into 'next' 
feat(appservice): ensure users/aliases outside of namespaces are not accessed

See merge request famedly/conduit!634
 2024-04-24 21:39:20 +00:00
Timo Kösters a854a46c24
Bump version to v0.7.0 2024-04-24 23:24:20 +02:00
Timo Kösters 429f80548f Merge branch 'sync-up-debian-generated-config' into 'next' 
Sync up the generated Conduit config for Debian

See merge request famedly/conduit!644
 2024-04-24 21:01:58 +00:00
Timo Kösters a140bf8a6f Merge branch 'authorized-user-search' into 'next' 
fix(membership): perform stricter checks when choosing an authorized user

See merge request famedly/conduit!620
 2024-04-24 21:00:52 +00:00
Matthias Ahouansou 74db555336
fix(membership): perform stricter checks when choosing an authorized user 2024-04-24 20:54:07 +01:00
Timo Kösters 08636ef236 Merge branch 'can-invite-state-lock' into 'next' 
fix(state-accessor): hold the state_lock when checking if a user can invite

See merge request famedly/conduit!643
 2024-04-24 19:29:01 +00:00
Matthias Ahouansou 3086271139
feat(appservice): ensure users/aliases outside of namespaces are not accessed 2024-04-24 19:51:28 +01:00
Matthias Ahouansou e40aed3a7d
fix(state-accessor): hold the state_lock when checking if a user can invite 2024-04-24 19:17:00 +01:00
Paul van Tilburg 0c0c9549b9
Sync up the generated Conduit config for Debian 
This applies changes made in the exampl config by commits dc89fbe and
844508b.
 2024-04-24 20:12:38 +02:00
Timo Kösters 53d3f9ae89 Merge branch 'registration-token-in-config' into 'next' 
add registration_token in default cfg and DEPLOY

See merge request famedly/conduit!557
 2024-04-24 18:09:47 +00:00
Timo Kösters 7ace9b0dff Merge branch 'check-if-membership-is-case-endpoints' into 'next' 
feat(membership): check if user already has the membership that is requested to be set

See merge request famedly/conduit!622
 2024-04-24 18:02:08 +00:00
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