Commit Graph

1921 Commits (a9ba067e7758207d1411b24c537cf755608632e8)
 

Author SHA1 Message Date
AndSDev 10d2da3009 fix(main): fix request size limit to max_request_size (axum defaults 2MB) 2 years ago
Paul Beziau d47c1a8ba6 Fix database version check & code formating 2 years ago
Paul Beziau 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
2 years ago
Jonathan de Jong 215d909e59 More debug info when try_from_http_request fails 2 years ago
Jonathan de Jong ada15ceacc Complement improvements 2 years ago
Charles Hall 716f82db6d
add nix/nixos deployment documentation 2 years ago
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.
2 years ago
Timo Kösters cb2b5beea8 Merge branch 'fix_persy' into 'next'
fix: update persy implementation after refactor

See merge request famedly/conduit!396
2 years ago
Timo Kösters 2231a69b4c
fix: make previous MR compile 2 years ago
Timo Kösters 13052388a7
Merge branch 'conduit-next' into next 2 years ago
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
2 years ago
Timo Kösters 2627ca5e3d Merge branch 'update-rust' into 'next'
update rust to avoid a cargo problem

See merge request famedly/conduit!395
2 years ago
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
2 years ago
Nyaaori 2d0fdddd34
Do not return true for is_guest on whoami for appservice users 2 years ago
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
2 years ago
Nyaaori 1e1a144dfa
Move room version 10 out of experimental/unstable 2 years ago
Nyaaori cc3e1f58cc
Bump default room version to V9; per matrix spec recommendation 2 years ago
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
2 years ago
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
2 years ago
Nyaaori e9697f13d6
Handle initiating restricted joins over federation
Allows Conduit users to join restricted rooms if we are not currently participating
2 years ago
Nyaaori 3b0aa23fdf
Rejoin room over federation if we are not participating in it; do not include invited users in participating servers calculation 2 years ago
Timo Kösters aca6218c0a Merge branch 'unrecognizedmethods' into 'next'
fix: send unrecognized error on wrong http methods

See merge request famedly/conduit!397
2 years ago
Timo Kösters 3a45628e1d
fix: send unrecognized error on wrong http methods 2 years ago
AndSDev e923f63c49 fix(service/rooms/timeline): fix validating for non-joined members 2 years ago
Tglman 842feabced fix: update persy implementation after refactor 2 years ago
Charles Hall 286936db32
msrv is 1.63 in Cargo.toml; use that 2 years ago
Charles Hall 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
2 years ago
AndSDev d755a96c2c refactor(service/rooms/timeline): add cache for server_name 2 years ago
Timo Kösters c948324cf2 Merge branch 'fix-admin-help' into 'next'
fix `@conduit help` not working in the admin room

See merge request famedly/conduit!392
2 years ago
AndSDev 76f81ac201 feat(db/rooms): disable banning for last user and conduit user in admins room 2 years ago
Timo Kösters ce188daccb
Merge branch 'conduit-lower-default-log-level' into HEAD 2 years ago
exin 98702da4e6
Lower default log level for docker 2 years ago
exin 92f7f0c849
Lower log level commented config options 2 years ago
exin 7451abe3ea
Lower default log level for docker and debian 2 years ago
exin 3e6c66b899
Fix formatting 2 years ago
exin 3a40bf8ae0
Add error for invalid log config
Log config falls back to "warn"
2 years ago
exin 9c922db14b
Lower default log level
Update config-example.toml to accordingly

Closes #281
2 years ago
Timo Kösters 175fba5739 Merge branch 'fix-login-token' into 'next'
fix(client/login): username in lowercase for login by token

See merge request famedly/conduit!380
2 years ago
AndSDev 912491cb28 style(db/rooms): refactor admin room pdu validating 2 years ago
AndSDev da2dbd2877 feat(db/rooms): disable leaving from admin room for last user 2 years ago
AndSDev c67f95ebff feat(db/rooms): disable leaving from admin room for conduit user 2 years ago
AndSDev 3a8321f9ad feat(db/rooms): encryption is not allowed in the admins room 2 years ago
Timo Kösters f46d64e52f Merge branch 'unstability' into 'next'
Mark unstable versions as unstable in /capabilities

See merge request famedly/conduit!394
2 years ago
Timo Kösters 8c6e75a0cd
Mark unstable versions as unstable in /capabilities 2 years ago
Timo Kösters c23b4946c5 Merge branch 'fixallthebugs' into 'next'
fix: all the e2ee problems

See merge request famedly/conduit!393
2 years ago
Timo Kösters ac52b234fa
fix: all the e2ee problems 2 years ago
AndSDev 9a47069f45 fix(client/login): username in lowercase for login by token 2 years ago
Charles Hall 7ef9fe3454
add regression tests
This way we don't regress on accident again in the future.
2 years ago
Charles Hall fc852f8be6
resolve `cargo check --features clap/deprecated`
This has no functional effects.
2 years ago
Charles Hall 4710f739c0
clap v4 turned more things into optional features
So we need to re-enable some things. See their changelog[0] for details.

[0]: https://github.com/clap-rs/clap/blob/master/CHANGELOG.md#migrating
2 years ago