238ebcfcac
Update nginx configuration to allow for larger uploads.
2022-10-27 04:20:56 +00:00
876fdf480d
Merge branch '3pid_403_next' into 'next'
...
Return 403 to 3pid token routes to signal not implemented
See merge request famedly/conduit!375
2022-10-25 20:47:41 +00:00
3bc0a1924b
Return 403 to 3pid token routes to signal not implemented
2022-10-25 20:47:41 +00:00
4af998963b
Merge branch 'fix-axum-request-size' into 'next'
...
fix(main): fix request size limit to max_request_size (axum defaults 2MB)
See merge request famedly/conduit!406
2022-10-25 20:34:33 +00:00
10d2da3009
fix(main): fix request size limit to max_request_size (axum defaults 2MB)
2022-10-25 12:53:58 +03:00
d47c1a8ba6
Fix database version check & code formating
2022-10-21 12:27:11 +00:00
9c0c74f547
Migrate database to use correct rule id in pushrules.
...
it convert :
- ".m.rules.call" to ".m.rule.call"
- ".m.rules.room_one_to_one" to ".m.rule.room_one_to_one"
- ".m.rules.encrypted_room_one_to_one" to ".m.rule.encrypted_room_one_to_one"
- ".m.rules.message" to ".m.rule.message"
- ".m.rules.encrypted" to ".m.rule.encrypted"
related to issue #264
2022-10-18 09:15:07 +00:00
215d909e59
More debug info when try_from_http_request fails
2022-10-17 18:41:59 +02:00
ada15ceacc
Complement improvements
2022-10-17 18:41:45 +02:00
716f82db6d
add nix/nixos deployment documentation
2022-10-16 10:50:52 -07:00
fe7d8c4f12
add nix flake
...
Also add `.envrc` for direnv + Nix users. This makes developing locally
easier for us NixOS folks.
The flake itself will allow NixOS users to pull code directly from
Conduit's repository, making it completely trivial to stay up-to-date
with every commit.
I'd also like to add a NixOS module directly to this repository at some
point so that new configuration options will be available in the NixOS
module faster. But for now, NixOS users can simply override
`serivces.matrix-conduit.package` and get pretty much all the
functionality.
I've added myself to the `CODEOWNERS` file for the Nix files, since I am
willing to maintain this stuff. I use Conduit on NixOS so I'm personally
invested in having this work.
Lastly, `.gitignore` was updated to exclude symlinks created by `direnv`
and `nix build` and other such Nix commands.
This doesn't come without maintenance burden, however:
* The `sha256` in `flake.nix` will need to be updated whenever Conduit's
MSRV is updated, but that should be pretty infrequent.
* `nix flake update` should be run every so often to pull in updates to
`nixpkgs` and other flake inputs. I think downstream users can also
override this themselves with `inputs.<name>.inputs.<name>.follows`.
* `nix flake check` should be run in CI to ensure Nix builds keep
working.
* `nixpkgs-fmt --check $(fd '\.nix')` (or similar) should be run in CI
to ensure style uniformity.
2022-10-15 19:26:53 -07:00
cb2b5beea8
Merge branch 'fix_persy' into 'next'
...
fix: update persy implementation after refactor
See merge request famedly/conduit!396
2022-10-15 12:13:36 +00:00
2231a69b4c
fix: make previous MR compile
2022-10-15 14:07:27 +02:00
13052388a7
Merge branch 'conduit-next' into next
2022-10-15 13:55:39 +02:00
6fd39ae174
Raise 404 when room doesn't exist
...
Raise 404 "Room not found" when changing or accessing room visibility
settings (`GET` and `PUT
/_matrix/client/r0/directory/list/room/{roomId}`).
See issue #290
2022-10-15 13:52:58 +02:00
2627ca5e3d
Merge branch 'update-rust' into 'next'
...
update rust to avoid a cargo problem
See merge request famedly/conduit!395
2022-10-15 11:50:55 +00:00
ed5b8d6a46
Merge branch 'Nyaaori/fix-whoami-appservices' into 'next'
...
Fix is_guest value on whoami for appservice users
Closes #310
See merge request famedly/conduit!401
2022-10-15 11:32:49 +00:00
2d0fdddd34
Do not return true for is_guest on whoami for appservice users
2022-10-15 13:17:58 +02:00
3054af41ba
Merge branch 'Nyaaori/bump-default-room-version' into 'next'
...
Bump default room version to V9
See merge request famedly/conduit!400
2022-10-15 11:02:44 +00:00
1e1a144dfa
Move room version 10 out of experimental/unstable
2022-10-15 12:17:06 +02:00
cc3e1f58cc
Bump default room version to V9; per matrix spec recommendation
2022-10-15 12:16:02 +02:00
b1991c8f4f
Merge branch 'Nyaaori/rejoin-fix' into 'next'
...
Rejoin over federation if we are not participating
See merge request famedly/conduit!399
2022-10-15 09:56:55 +00:00
6f7f2820ce
Merge branch 'Nyaaori/restricted-join-fix' into 'next'
...
Fix doing restricted joins into rooms we are not participating in
See merge request famedly/conduit!398
2022-10-15 09:50:25 +00:00
e9697f13d6
Handle initiating restricted joins over federation
...
Allows Conduit users to join restricted rooms if we are not currently participating
2022-10-15 10:46:50 +02:00
3b0aa23fdf
Rejoin room over federation if we are not participating in it; do not include invited users in participating servers calculation
2022-10-15 10:38:30 +02:00
aca6218c0a
Merge branch 'unrecognizedmethods' into 'next'
...
fix: send unrecognized error on wrong http methods
See merge request famedly/conduit!397
2022-10-15 08:35:39 +00:00
3a45628e1d
fix: send unrecognized error on wrong http methods
2022-10-15 00:28:43 +02:00
e923f63c49
fix(service/rooms/timeline): fix validating for non-joined members
2022-10-14 14:45:05 +03:00
842feabced
fix: update persy implementation after refactor
2022-10-13 20:02:36 +01:00
286936db32
msrv is 1.63 in Cargo.toml; use that
2022-10-13 08:26:46 -07:00
bf7c4b4001
update rust to avoid a cargo problem
...
We were hitting [this bug][0] when trying to select a version for clap
^4.
[0]: https://github.com/rust-lang/cargo/issues/10623
2022-10-13 08:06:49 -07:00
d755a96c2c
refactor(service/rooms/timeline): add cache for server_name
2022-10-13 11:19:51 +00:00
c948324cf2
Merge branch 'fix-admin-help' into 'next'
...
fix `@conduit help` not working in the admin room
See merge request famedly/conduit!392
2022-10-13 11:15:49 +00:00
76f81ac201
feat(db/rooms): disable banning for last user and conduit user in admins room
2022-10-13 14:15:23 +03:00
ce188daccb
Merge branch 'conduit-lower-default-log-level' into HEAD
2022-10-13 13:13:03 +02:00
98702da4e6
Lower default log level for docker
2022-10-13 13:11:15 +02:00
92f7f0c849
Lower log level commented config options
2022-10-13 13:11:15 +02:00
7451abe3ea
Lower default log level for docker and debian
2022-10-13 13:11:14 +02:00
3e6c66b899
Fix formatting
2022-10-13 13:11:14 +02:00
3a40bf8ae0
Add error for invalid log config
...
Log config falls back to "warn"
2022-10-13 13:11:14 +02:00
9c922db14b
Lower default log level
...
Update config-example.toml to accordingly
Closes #281
2022-10-13 13:11:13 +02:00
175fba5739
Merge branch 'fix-login-token' into 'next'
...
fix(client/login): username in lowercase for login by token
See merge request famedly/conduit!380
2022-10-13 11:08:04 +00:00
912491cb28
style(db/rooms): refactor admin room pdu validating
2022-10-13 14:04:26 +03:00
da2dbd2877
feat(db/rooms): disable leaving from admin room for last user
2022-10-13 13:09:26 +03:00
c67f95ebff
feat(db/rooms): disable leaving from admin room for conduit user
2022-10-13 13:01:18 +03:00
3a8321f9ad
feat(db/rooms): encryption is not allowed in the admins room
2022-10-13 12:50:23 +03:00
f46d64e52f
Merge branch 'unstability' into 'next'
...
Mark unstable versions as unstable in /capabilities
See merge request famedly/conduit!394
2022-10-13 09:39:45 +00:00
8c6e75a0cd
Mark unstable versions as unstable in /capabilities
2022-10-13 10:27:42 +02:00
c23b4946c5
Merge branch 'fixallthebugs' into 'next'
...
fix: all the e2ee problems
See merge request famedly/conduit!393
2022-10-13 08:21:12 +00:00
ac52b234fa
fix: all the e2ee problems
2022-10-13 10:15:35 +02:00
Nabulator