TudbuT/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1445 commits 50 branches 7 tags 14 MiB
Commit graph

1445 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Timo Kösters
272e27ae01 Merge branch 'appservice-pdu-send-fix' into 'next' 
Send PDU to appservice if state_key is their user ID

Closes #110

See merge request famedly/conduit!331
 2022-04-03 12:32:23 +00: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
Timo Kösters
f9bf465578 Merge branch 'readable' into 'next' 
Fix security issue.

See merge request famedly/conduit!316
 2022-04-01 07:30:05 +00:00
Jonas Platte
3933bd9a8e
Update axum feature set used 2022-03-31 22:52:16 +02:00
Jonas Platte
db0659cb3d
Upgrade axum to 0.5 2022-03-31 22:50:17 +02:00
Timo Kösters
1219535e56 Merge branch 'fix/bad-uid-crash' into 'next' 
Fix crash when a bad user ID is in the database

See merge request famedly/conduit!334
 2022-03-31 19:23:41 +00: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
Jonas Zohren
08072d2c8d Merge branch 'docker/ci-bump-alpine-version' into 'next' 
chore: Bump alpine version for CI generated docker

See merge request famedly/conduit!333
 2022-03-30 20:30:56 +00:00
Jonas Zohren
1ebf417c11 chore: Bump alpine version for CI generated docker 2022-03-30 20:23:04 +00:00
Jonas Zohren
a2a7c61872 Merge branch 'docker-bump-alpine-version' into 'next' 
chore(docker): Bump alpine (base image) version

Closes #255

See merge request famedly/conduit!330
 2022-03-18 17:52:50 +00:00
Jonas Zohren
61277452af
chore(docker): Bump alpine (base image) version 2022-03-18 18:44:05 +01:00
Timo Kösters
6be5e83e61 Merge branch 'reqwest-tls-native-roots' into 'next' 
Use native root CA certificates for reqwest

See merge request famedly/conduit!329
 2022-03-14 14:27:12 +00:00
Timo Kösters
c70c0129f8 Merge branch 'proxy-config-examples' into 'next' 
Fix proxy config examples in config/proxy.rs

See merge request famedly/conduit!321
 2022-03-14 14:26:28 +00:00
Andrej Kacian
b5b8181851 Notify admin room for user registrations, deactivations and password changes 2022-03-13 09:13:45 +01:00
Andrej Kacian
194a85d4c5 Use native root CA certificates for reqwest 2022-03-12 15:44:22 +01:00
kk
a6edf00810 Merge remote-tracking branch 'origin/next' into insensitive-login 
pulling next into dev branch
 2022-03-09 19:12:02 -08:00
Jonas Zohren
738f5e8f68 Merge branch 'ci-fix-cross-musl-builds' into 'next' 
CI: Fix musl builds

See merge request famedly/conduit!328
 2022-03-08 22:13:31 +00:00
Jonas Zohren
5a9462c9ab fix(ci): Fix musl builds 
This pins the image to use for cross to a working image's sha256
 2022-03-08 21:52:57 +00: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
Jonas Zohren
36a6d724fe Merge branch 'writable' into 'next' 
Fix permissions

See merge request famedly/conduit!317
 2022-03-01 23:55:10 +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
TomZ
5c6c6f272c Fix security issue. 
The docs state that you need to make the config file _readable_
and then proceeds to make the file writable.

This changes it to make the file to be owned by root and readable by
anyone. This is the default for unix / linux and suggested practice
for files in /etc.
 2022-02-23 10:15:33 +01:00
Andrej Kacian
65fa4b2ca4 Fix proxy config examples in config/proxy.rs 2022-02-22 22:32:38 +01:00
Jonas Zohren
6788225cac Merge branch 'fix-docker-db-dir-permissions' into 'next' 
Fix(docker): Make conduit own default db path

See merge request famedly/conduit!320
 2022-02-22 15:34:14 +00:00
Jonas Zohren
a5bb6786c8
fix(docker): Make conduit own default db path 
When a user mounts a volume into the default volume path,
it uses the permissions and ownership from the host volume.
In most cases, this is 1000:1000, which it also uses on the inside.

If you don't mount a volume though (e.g., for testing), conduit cries:
“The database couldn't be loaded or created.”

This fix chowns the default db dir to remedy this.
 2022-02-22 16:26:30 +01:00
Andrej Kacian
3b2b35aab7 Log caught Ctrl+C or SIGTERM for operator feedback 2022-02-22 00:28:46 +01:00
TomZ
949f2523f9 Fix permissions 
The text just sets the ownership and ignores that defaults on unix
are to have newly created dirs be readable by everyone.
This closes the database to unauthorized users on multi-user systems.
 2022-02-21 22:35:08 +01:00
Andrej Kacian
196c83939c Add show-config admin room command 2022-02-21 22:27:19 +01:00
Jonas Zohren
237645e975 Merge branch 'docs' into 'next' 
docs: make all configs match

Closes #205

See merge request famedly/conduit!301
 2022-02-20 10:59:56 +00:00
Jonas Zohren
86162c2c20
Merge branch 'next' into docs 2022-02-20 11:43:50 +01:00
Jonas Zohren
199c84195a Merge branch 'improve-docker-documentation' into 'next' 
Improve docker documentation some

See merge request famedly/conduit!314
 2022-02-20 10:43:05 +00:00
Jonas Zohren
57ac4160b7
Merge branch 'next' into docs 2022-02-20 11:42:19 +01:00
Jonas Zohren
91c648253a Merge branch 'docs-remove-obsolete-cross-readme' into 'next' 
Remove the now obsolete cross readme

See merge request famedly/conduit!315
 2022-02-20 10:22:47 +00:00
Jonas Zohren
5a80507006
chore(docs): Remove the now obsolete cross readme 2022-02-20 11:12:49 +01:00
Jonathan de Jong
cc14727888 revert reflow 2022-02-20 10:55:17 +01:00