Jonas Zohren
249960b111
Merge branch 'fix-lock' into 'next'
...
Update Cargo.lock
See merge request famedly/conduit!427
2022-11-25 21:44:31 +00:00
Andriy Kushnir (Orhideous)
583aea187b
Update Cargo.lock
2022-11-25 23:13:58 +02:00
Timo Kösters
396dac6d82
Merge branch 'fixroomleave' into 'next'
...
fix: unable to leave room
See merge request famedly/conduit!419
2022-11-21 20:04:27 +00:00
Timo Kösters
9149be31af
Merge branch 'logs-cleanup' into 'next'
...
Clean some noisy logs
See merge request famedly/conduit!423
2022-11-21 20:03:17 +00:00
Timo Kösters
32a4ded4a1
Merge branch 'Nyaaori/reduce-generated-token-length' into 'next'
...
Reduce length of generated access tokens and session ids
See merge request famedly/conduit!386
2022-11-21 20:02:20 +00:00
Timo Kösters
e3dabdf525
Merge branch 'Nyaaori/cleanup' into 'next'
...
misc. cleanup
See merge request famedly/conduit!420
2022-11-21 19:59:45 +00:00
Nyaaori
b59304a4df
Reduce length of generated access tokens and session ids
...
Reduces generated tokens and session ids down to 32 characters (~190 bits of entropy) in length
2022-11-21 20:51:59 +01:00
Nyaaori
66bc41125c
refactor: cleanup
2022-11-21 20:50:39 +01:00
Nyaaori
6786c44f4d
chore: Fix MSRV
...
Ruma requires Rust 1.64
2022-11-21 20:50:30 +01:00
Andriy Kushnir (Orhideous)
a3a1db124d
Clean some noisy logs
2022-11-21 21:48:06 +02:00
Timo Kösters
3b3c451c83
fix: unable to leave room
2022-11-21 19:50:48 +01:00
Timo Kösters
cf99316082
Merge branch 'dendritefix' into 'next'
...
Dendrite invite fix
See merge request famedly/conduit!416
2022-11-09 20:27:22 +00:00
Timo Kösters
c063700255
fix: invite dendrite users
2022-11-09 21:14:17 +01:00
Timo Kösters
7540227388
chore: bump dependencies
2022-11-09 18:46:10 +01:00
Timo Kösters
ccdaaceb33
Merge branch 'ci-revamp-2022-10' into 'next'
...
Fix CI
See merge request famedly/conduit!414
2022-11-02 16:47:48 +00:00
Jonas Zohren
b37876f3b2
fix(ci): Only build in (remote host) docker and switch to glibc
2022-11-02 12:12:48 +01:00
Timo Kösters
e8e0a4dcc5
Merge branch 'Nyaaori/fix-trusted-server-panic' into 'next'
...
Cleanly handle invalid response from trusted server instead of panicking
See merge request famedly/conduit!411
2022-10-31 11:35:55 +00:00
Nyaaori
23cf39c525
Cleanly handle invalid response from trusted server instead of panicking
2022-10-31 12:28:30 +01:00
Nyaaori
00996dd834
Cargo Clippy
2022-10-31 09:31:17 +01:00
Timo Kösters
2a52f666dc
Merge branch 'fixtyping' into 'next'
...
Fix typing indicators and unencrypted messages in encrypted rooms
See merge request famedly/conduit!409
2022-10-30 20:25:45 +00:00
Timo Kösters
0cf6545116
fix: not sending enough state on join
2022-10-30 21:23:43 +01:00
Timo Kösters
5d691f405e
fix: stuck typing indicators
2022-10-30 21:22:32 +01:00
Timo Kösters
c61914c8e1
Merge branch 'fixhead' into 'next'
...
fix: HEAD requests should continue to produce METHOD_NOT_ALLOWED
See merge request famedly/conduit!402
2022-10-30 19:45:58 +00:00
Timo Kösters
9548c84d32
Merge branch 'fixnotifcount' into 'next'
...
fix: element android did not reset notification counts
See merge request famedly/conduit!408
2022-10-30 19:43:39 +00:00
Timo Kösters
02dd3d32f2
fix: element android did not reset notification counts
2022-10-30 20:41:32 +01:00
Timo Kösters
7c98ba64aa
fix: HEAD requests should produce METHOD_NOT_ALLOWED
2022-10-30 19:53:05 +01:00
Timo Kösters
e86fb11512
Merge branch 'nabulator-next-patch-84388' into 'next'
...
Update nginx configuration to allow for larger uploads.
See merge request famedly/conduit!407
2022-10-28 13:32:02 +00:00
Timo Kösters
20e3c42456
Merge branch 'add-nix-flake' into 'next'
...
add nix flake
See merge request famedly/conduit!403
2022-10-28 13:31:21 +00:00
Nabulator
1aff2a54ef
comment typo
2022-10-27 04:23:07 +00:00
Nabulator
238ebcfcac
Update nginx configuration to allow for larger uploads.
2022-10-27 04:20:56 +00:00
Timo Kösters
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
James Blachly
3bc0a1924b
Return 403 to 3pid token routes to signal not implemented
2022-10-25 20:47:41 +00:00
Timo Kösters
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
AndSDev
10d2da3009
fix(main): fix request size limit to max_request_size (axum defaults 2MB)
2022-10-25 12:53:58 +03:00
Charles Hall
716f82db6d
add nix/nixos deployment documentation
2022-10-16 10:50:52 -07:00
Charles Hall
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
Timo Kösters
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
Timo Kösters
2231a69b4c
fix: make previous MR compile
2022-10-15 14:07:27 +02:00
Timo Kösters
13052388a7
Merge branch 'conduit-next' into next
2022-10-15 13:55:39 +02:00
Max Cohen
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
Timo Kösters
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
Timo Kösters
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
Nyaaori
2d0fdddd34
Do not return true for is_guest on whoami for appservice users
2022-10-15 13:17:58 +02:00
Timo Kösters
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
Nyaaori
1e1a144dfa
Move room version 10 out of experimental/unstable
2022-10-15 12:17:06 +02:00
Nyaaori
cc3e1f58cc
Bump default room version to V9; per matrix spec recommendation
2022-10-15 12:16:02 +02:00
Timo Kösters
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
Timo Kösters
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
Nyaaori
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
Nyaaori
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
