mirror of
https://forgejo.ellis.link/continuwuation/continuwuity.git
synced 2026-11-16 21:47:34 +00:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b38daf3310 |
No files matched your search
@@ -43,7 +43,7 @@ jobs:
|
||||
name: Renovate
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: ghcr.io/renovatebot/renovate:44.227.4@sha256:e09d40686f73d43b2c1e4667cb47d3c1d24a6ac730b74ce7aced9c84f68594f1
|
||||
image: ghcr.io/renovatebot/renovate:44.210.1@sha256:45cc73346c44a9afe037f2d19766f2b545b59b2ed31b937b5b09017d2958e45f
|
||||
options: --tmpfs /tmp:exec
|
||||
steps:
|
||||
- name: Checkout
|
||||
|
||||
@@ -24,7 +24,7 @@ repos:
|
||||
- id: check-added-large-files
|
||||
|
||||
- repo: https://github.com/crate-ci/typos
|
||||
rev: v1.52.2
|
||||
rev: v1.51.1
|
||||
hooks:
|
||||
- id: typos
|
||||
- id: typos
|
||||
|
||||
-151
@@ -1,154 +1,3 @@
|
||||
# Continuwuity v26.11.0-alpha.2 (2026-11-14)
|
||||
|
||||
## Features
|
||||
|
||||
- Added opt-in OpenTelemetry metrics, exported over OTLP or scraped by Prometheus from `/_continuwuity/metrics`, and a Grafana dashboard. Contributed by @eleboucher. (prometheus-metrics)
|
||||
- Add support for using custom DNS servers instead of using /etc/resolv.conf. Contributed by @s1lv3r. ([#2056](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2056))
|
||||
- Continuwuity now supports configuring additional trusted audience values for deployments using OIDC with an IDP that sends them. Contributed by @ginger ([#2226](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2226))
|
||||
- "!admin users list" now hides deactivated users by default, but can display them with the optional "--show-deactivated" flag. "--hide-suspended" and "--hide-locked" have been added as well, which stop suspended and locked users from being displayed respectively. Contributed by @Clubs. ([#2292](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2292))
|
||||
- Added support for [MSC4494: Membership-based invite blocking](https://github.com/matrix-org/matrix-spec-proposals/pull/4494) ([#2297](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2297))
|
||||
- Appservices now receive typing indicators and read receipts. Contributed by @Jade ([#2327](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2327))
|
||||
- Added support for servers returning 410 gone to indicate they are no longer serving a Matrix server ([MSC4188](https://github.com/matrix-org/matrix-spec-proposals/pull/4188)). Contributed by @nex and @silversys ([#2355](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2355))
|
||||
- Changed the policy on unstable features, disabling most by default and making them configurable in a tidy little `experiments` configuration. See also: #1884. ([#2517](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2517))
|
||||
- Added support for [MSC4363](https://github.com/matrix-org/matrix-spec-proposals/pull/4363) (OAuth step-up authentication). Contributed by @ginger.
|
||||
- Added support for [MSC2815](https://github.com/matrix-org/matrix-spec-proposals/pull/2815), allowing room moderators to fetch the original content of redacted events, behind the `allow_moderators_to_view_redacted_content` config option. Contributed by @eleboucher.
|
||||
- Added support for [MSC4484](https://github.com/matrix-org/matrix-spec-proposals/pull/4484). Clients which use the built-in Matrix server administration APIs will need to ask for the appropriate scope when signing in with OAuth. Contributed by @ginger.
|
||||
- Check content-type header on federation responses, ignoring any that don't match (spec compliance)
|
||||
- Implemented unstable support for [MSC4560] (Stripped state requests over federation). Contributed by @ginger.
|
||||
|
||||
[MSC4560]: https://github.com/matrix-org/matrix-spec-proposals/pull/4560
|
||||
- Profile banners are now treated as images when imported from OIDC claims, like avatars already were.
|
||||
- Remove support for legacy, unauthenticated media, including the `allow_legacy_media` and `freeze_legacy_media` options.
|
||||
- The first-run version of the web UI now includes a link to the registration page. Contributed by @ginger
|
||||
|
||||
## Bugfixes
|
||||
|
||||
- Fixed `/get_missing_events` rejecting requests with more `earliest_events` than the `limit`. Contributed by @eleboucher. (get-missing-events-earliest-limit)
|
||||
- Invitees are now added as room creators when creating a v12+ trusted private chat. Contributed by @ginger. ([#2162](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2162))
|
||||
- Fixed push gateway URLs containing the configured notification path outside of their suffix. Contributed by @eleboucher. ([#2261](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2261))
|
||||
- "!admin users change-email" now verifies a user exists before attempting to change their email. Contributed by @Clubs. ([#2298](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2298))
|
||||
- Fixed URL preview image MIME types and rejected failed downloads. Contributed by @eleboucher. ([#2308](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2308))
|
||||
- Correctly set RocksDB column options, including enabling block caches. Contributed by @Jade ([#2345](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2345))
|
||||
- Fix some possible deadlocks/freezes and reduce lock contention (improving performance). Contributed by @Jade ([#2351](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2351))
|
||||
- Once again fixed how room extremities are handled, fixing a problem that made continuwuity gradually make rooms needlessly complex, which also caused more frequent state resets. ([#2356](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2356))
|
||||
- The OAuth identity reset page is no longer linked from the account management UI to reduce confusion. Contributed by @ginger. ([#2383](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2383))
|
||||
- Fixed a worker panic when knocking on a room over federation. Contributed by @eleboucher. ([#2387](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2387))
|
||||
- Perform more validation on events received during atomic gapfill from remote servers, fixing a panic if bad data was persisted by another server and later lazily fetched by us. ([#2400](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2400))
|
||||
- Redirect URIs in OAuth clients' metadata are now properly validated to be on a subdomain of the OAuth issuer URL domain. Contributed by @ginger. ([#2421](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2421))
|
||||
- Fix v12 rooms created by the same user in the same millisecond ending up as the same room. Contributed by @eleboucher. ([#2424](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2424))
|
||||
- Client-server API endpoints are now properly ratelimited for unauthenticated requests. Contributed by @ginger. ([#2444](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2444))
|
||||
- Setting a profile key longer than 255 bytes now returns 400 `M_KEY_TOO_LARGE` as required by the spec, instead of 413 `M_TOO_LARGE`. ([#2451](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2451))
|
||||
- Setting `m.fully_read` via the account data endpoints now returns 405 `M_BAD_JSON` as required by the spec, instead of 400. ([#2451](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2451))
|
||||
- Appservices masquerading as a device that does not exist now receive 400 `M_UNKNOWN_DEVICE` as required by the spec, instead of 403 `M_FORBIDDEN`. ([#2451](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2451))
|
||||
- Setting profile data that would make the profile exceed 64 KiB now returns 400 `M_PROFILE_TOO_LARGE` as required by the spec, instead of a 500 error. ([#2451](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2451))
|
||||
- The `m.forget_forced_upon_leave` capability now reflects the `forget_forced_upon_leave` config option instead of always being advertised as enabled. ([#2452](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2452))
|
||||
- Fixed push notifications for membership events setting `user_is_target` based on the sender rather than the user being notified. ([#2454](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2454))
|
||||
- Ensure HTTP clients actually follow the `dns_servers` config option. Contributed by @silversys ([#2460](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2460))
|
||||
- Reworked event relations to follow the spec more closely. Pagination of `/relations` now returns the correct pages and `next_batch` tokens, recursive relations are returned in the right order without duplicates, and bundled `m.reference` aggregations now include every reference. Contributed by @Henry-Hiles (QuadRadical). ([#2465](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2465))
|
||||
- Read receipts are now more spec compliant, will work better in threads and are less likely to end up causing loops with other software. Contributed by @Jade ([#2481](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2481))
|
||||
- Fix the DNS resolver failing to start without `/etc/resolv.conf` when `dns_servers` is configured. Contributed by @eleboucher. ([#2495](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2495))
|
||||
- Fixed OIDC logins failing after the identity provider rotates its signing keys. Contributed by @eleboucher. ([#2497](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2497))
|
||||
- Creating a room with valid but non-canonical JSON now returns `400 M_BAD_JSON` instead of panicking the worker and returning `500 M_UNKNOWN`.
|
||||
- Fix account data updates sent at the same time leaving old copies behind, which every initial sync then returned. Existing copies are removed on startup. Contributed by @eleboucher.
|
||||
- Fix gap filling skipping outlier events that are missing their previous events. Contributed by @eleboucher.
|
||||
- Fix incoming federation events losing state changes when predecessors share the same state-before snapshot. Contributed by @eleboucher.
|
||||
- Fix new devices sometimes never reaching other users' device lists. Contributed by @eleboucher.
|
||||
- Fix state resolution applying events out of order, which could undo room joins. Contributed by @eleboucher.
|
||||
- Fix to-device messages, including room keys, sometimes being lost before delivery. Contributed by @eleboucher.
|
||||
- For deployments using OIDC with `profile_key_import_mode` set to `on_login`, users' avatars will no longer be clobbered if they didn't change their avatar since their last login.
|
||||
- Joining a local room the user is not allowed to join now returns `403 M_FORBIDDEN` instead of `500 M_UNKNOWN` when there are no other servers to try.
|
||||
- Room summary visibility checks are no longer incorrectly applied for remote rooms. Contributed by @ginger.
|
||||
- The userinfo endpoint is now accessible even if federation is disabled, allowing LiveKit to be used on servers with federation disabled without using the server name whitelist.
|
||||
- `!admin token issue` can no longer issue registration tokens when `allow_registration` is false. Contributed by @Clubs.
|
||||
|
||||
## Improved Documentation
|
||||
|
||||
- Add the Authentication section to document available auth methods for Continuwuity. The "delegated authentication" guide has also been migrated to here. Contributed by @stratself. ([#2234](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2234))
|
||||
- Add a guide for push notifications, detailing how it works, push gateway specifics, troubleshooting common issues, and pointing to external guides for UnifiedPush backends. Contributed by @stratself ([#2244](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2244))
|
||||
- The deploying page now includes vital general information about installing Continuwuity: release tracks, update steps, and post-installation recommendations. Contributed by @stratself ([#2252](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2252))
|
||||
- Add some missing instructions on configuring Continuwuity on the RPM page. Users are encouraged to use the [generic deploying docs](https://continuwuity.org/deploying/generic) for the bulk of guidance anyhow. Contributed by @stratself ([#2275](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2275))
|
||||
- Better, more succinct [introduction page](https://continuwuity.org/introduction.html). Contributed by @stratself ([#2279](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2279))
|
||||
- Add a section on [troubleshooting Docker issues](https://continuwuity.org/troubleshooting#docker-issues). Contributed by @stratself. ([#2324](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2324))
|
||||
- Instructions for Authelia added to the [OIDC guide](https://continuwuity.org/authentication/oidc.html). Contributed by @fhoekstra ([#2341](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2341))
|
||||
- Docker compose examples now use bind mounts by default, instead of Docker volumes, as they are easier to work with esp. for backup/restore. Contributed by @stratself. ([#2353](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2353))
|
||||
- The documentation now refers to the Continuwuity Docker service as `continuwuity` instead of `homeserver`.
|
||||
|
||||
## Misc
|
||||
|
||||
- Updated internal Sentry integration setup to the new pattern required by the SDK. #2423
|
||||
- Upgraded rocksdb from 11.1.1 to 11.12.0 and jemalloc to 5.4.0.
|
||||
|
||||
|
||||
# Continuwuity v26.11.0-alpha.1 (2026-11-10)
|
||||
|
||||
## Features
|
||||
|
||||
- Added opt-in OpenTelemetry metrics, exported over OTLP or scraped by Prometheus from `/_continuwuity/metrics`, and a Grafana dashboard. Contributed by @eleboucher. (prometheus-metrics)
|
||||
- Add support for using custom DNS servers instead of using /etc/resolv.conf. Contributed by @s1lv3r. ([#2056](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2056))
|
||||
- Continuwuity now supports configuring additional trusted audience values for deployments using OIDC with an IDP that sends them. Contributed by @ginger ([#2226](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2226))
|
||||
- "!admin users list" now hides deactivated users by default, but can display them with the optional "--show-deactivated" flag. "--hide-suspended" and "--hide-locked" have been added as well, which stop suspended and locked users from being displayed respectively. Contributed by @Clubs. ([#2292](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2292))
|
||||
- Added support for [MSC4494: Membership-based invite blocking](https://github.com/matrix-org/matrix-spec-proposals/pull/4494) ([#2297](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2297))
|
||||
- Appservices now receive typing indicators and read receipts. Contributed by @Jade ([#2327](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2327))
|
||||
- Added support for [MSC4363](https://github.com/matrix-org/matrix-spec-proposals/pull/4363) (OAuth step-up authentication). Contributed by @ginger.
|
||||
- Added support for [MSC4484](https://github.com/matrix-org/matrix-spec-proposals/pull/4484). Clients which use the built-in Matrix server administration APIs will need to ask for the appropriate scope when signing in with OAuth. Contributed by @ginger.
|
||||
- Implemented unstable support for [MSC4560] (Stripped state requests over federation). Contributed by @ginger.
|
||||
|
||||
[MSC4560]: https://github.com/matrix-org/matrix-spec-proposals/pull/4560
|
||||
- Profile banners are now treated as images when imported from OIDC claims, like avatars already were.
|
||||
- The first-run version of the web UI now includes a link to the registration page. Contributed by @ginger
|
||||
|
||||
## Bugfixes
|
||||
|
||||
- Invitees are now added as room creators when creating a v12+ trusted private chat. Contributed by @ginger. ([#2162](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2162))
|
||||
- Fixed push gateway URLs containing the configured notification path outside of their suffix. Contributed by @eleboucher. ([#2261](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2261))
|
||||
- "!admin users change-email" now verifies a user exists before attempting to change their email. Contributed by @Clubs. ([#2298](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2298))
|
||||
- Fixed URL preview image MIME types and rejected failed downloads. Contributed by @eleboucher. ([#2308](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2308))
|
||||
- Correctly set RocksDB column options, including enabling block caches. Contributed by @Jade ([#2345](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2345))
|
||||
- Fix some possible deadlocks/freezes and reduce lock contention (improving performance). Contributed by @Jade ([#2351](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2351))
|
||||
- Once again fixed how room extremities are handled, fixing a problem that made continuwuity gradually make rooms needlessly complex, which also caused more frequent state resets. ([#2356](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2356))
|
||||
- The OAuth identity reset page is no longer linked from the account management UI to reduce confusion. Contributed by @ginger. ([#2383](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2383))
|
||||
- Fixed a worker panic when knocking on a room over federation. Contributed by @eleboucher. ([#2387](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2387))
|
||||
- Perform more validation on events received during atomic gapfill from remote servers, fixing a panic if bad data was persisted by another server and later lazily fetched by us. ([#2400](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2400))
|
||||
- Redirect URIs in OAuth clients' metadata are now properly validated to be on a subdomain of the OAuth issuer URL domain. Contributed by @ginger. ([#2421](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2421))
|
||||
- Fix v12 rooms created by the same user in the same millisecond ending up as the same room. Contributed by @eleboucher. ([#2424](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2424))
|
||||
- Client-server API endpoints are now properly ratelimited for unauthenticated requests. Contributed by @ginger. ([#2444](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2444))
|
||||
- Setting a profile key longer than 255 bytes now returns 400 `M_KEY_TOO_LARGE` as required by the spec, instead of 413 `M_TOO_LARGE`. ([#2451](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2451))
|
||||
- Setting `m.fully_read` via the account data endpoints now returns 405 `M_BAD_JSON` as required by the spec, instead of 400. ([#2451](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2451))
|
||||
- Appservices masquerading as a device that does not exist now receive 400 `M_UNKNOWN_DEVICE` as required by the spec, instead of 403 `M_FORBIDDEN`. ([#2451](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2451))
|
||||
- Setting profile data that would make the profile exceed 64 KiB now returns 400 `M_PROFILE_TOO_LARGE` as required by the spec, instead of a 500 error. ([#2451](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2451))
|
||||
- The `m.forget_forced_upon_leave` capability now reflects the `forget_forced_upon_leave` config option instead of always being advertised as enabled. ([#2452](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2452))
|
||||
- Fixed push notifications for membership events setting `user_is_target` based on the sender rather than the user being notified. ([#2454](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2454))
|
||||
- Ensure HTTP clients actually follow the `dns_servers` config option. Contributed by @silversys ([#2460](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2460))
|
||||
- Reworked event relations to follow the spec more closely. Pagination of `/relations` now returns the correct pages and `next_batch` tokens, recursive relations are returned in the right order without duplicates, and bundled `m.reference` aggregations now include every reference. Contributed by @Henry-Hiles (QuadRadical). ([#2465](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2465))
|
||||
- Read receipts are now more spec compliant, will work better in threads and are less likely to end up causing loops with other software. Contributed by @Jade ([#2481](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2481))
|
||||
- Fix gap filling skipping outlier events that are missing their previous events. Contributed by @eleboucher.
|
||||
- Fix incoming federation events losing state changes when predecessors share the same state-before snapshot. Contributed by @eleboucher.
|
||||
- Fix new devices sometimes never reaching other users' device lists. Contributed by @eleboucher.
|
||||
- Fix state resolution applying events out of order, which could undo room joins. Contributed by @eleboucher.
|
||||
- Fix to-device messages, including room keys, sometimes being lost before delivery. Contributed by @eleboucher.
|
||||
- For deployments using OIDC with `profile_key_import_mode` set to `on_login`, users' avatars will no longer be clobbered if they didn't change their avatar since their last login.
|
||||
- Room summary visibility checks are no longer incorrectly applied for remote rooms. Contributed by @ginger.
|
||||
- The userinfo endpoint is now accessible even if federation is disabled, allowing LiveKit to be used on servers with federation disabled without using the server name whitelist.
|
||||
- `!admin token issue` can no longer issue registration tokens when `allow_registration` is false. Contributed by @Clubs.
|
||||
|
||||
## Improved Documentation
|
||||
|
||||
- Add the Authentication section to document available auth methods for Continuwuity. The "delegated authentication" guide has also been migrated to here. Contributed by @stratself. ([#2234](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2234))
|
||||
- Add a guide for push notifications, detailing how it works, push gateway specifics, troubleshooting common issues, and pointing to external guides for UnifiedPush backends. Contributed by @stratself ([#2244](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2244))
|
||||
- The deploying page now includes vital general information about installing Continuwuity: release tracks, update steps, and post-installation recommendations. Contributed by @stratself ([#2252](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2252))
|
||||
- Add some missing instructions on configuring Continuwuity on the RPM page. Users are encouraged to use the [generic deploying docs](https://continuwuity.org/deploying/generic) for the bulk of guidance anyhow. Contributed by @stratself ([#2275](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2275))
|
||||
- Better, more succinct [introduction page](https://continuwuity.org/introduction.html). Contributed by @stratself ([#2279](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2279))
|
||||
- Add a section on [troubleshooting Docker issues](https://continuwuity.org/troubleshooting#docker-issues). Contributed by @stratself. ([#2324](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2324))
|
||||
- Instructions for Authelia added to the [OIDC guide](https://continuwuity.org/authentication/oidc.html). Contributed by @fhoekstra ([#2341](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2341))
|
||||
- Docker compose examples now use bind mounts by default, instead of Docker volumes, as they are easier to work with esp. for backup/restore. Contributed by @stratself. ([#2353](https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2353))
|
||||
- The documentation now refers to the Continuwuity Docker service as `continuwuity` instead of `homeserver`.
|
||||
|
||||
## Misc
|
||||
|
||||
- Updated internal Sentry integration setup to the new pattern required by the SDK. #2423
|
||||
- Upgraded rocksdb from 11.1.1 to 11.12.0 and jemalloc to 5.4.0.
|
||||
|
||||
|
||||
# Continuwuity v26.9.1 (2026-09-28)
|
||||
|
||||
## Features
|
||||
|
||||
Generated
+69
-70
@@ -193,7 +193,7 @@ dependencies = [
|
||||
"rustc-hash",
|
||||
"serde",
|
||||
"serde_derive",
|
||||
"syn 3.0.10",
|
||||
"syn 3.0.9",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -255,7 +255,7 @@ checksum = "82f6aeea286b8eb4dd3431a1be1b59d290ace00f5bfd8e2a159bc2a05e2c1667"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 3.0.10",
|
||||
"syn 3.0.9",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -497,7 +497,7 @@ dependencies = [
|
||||
"regex",
|
||||
"rustc-hash",
|
||||
"shlex",
|
||||
"syn 2.0.119",
|
||||
"syn 3.0.9",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -785,7 +785,7 @@ dependencies = [
|
||||
"heck",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 3.0.10",
|
||||
"syn 3.0.9",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -865,7 +865,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "conduwuit"
|
||||
version = "26.11.0-alpha.2"
|
||||
version = "26.9.1"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"conduwuit_build_metadata",
|
||||
@@ -897,7 +897,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "conduwuit_admin"
|
||||
version = "26.11.0-alpha.2"
|
||||
version = "26.9.1"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"conduwuit_api",
|
||||
@@ -921,7 +921,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "conduwuit_api"
|
||||
version = "26.11.0-alpha.2"
|
||||
version = "26.9.1"
|
||||
dependencies = [
|
||||
"axum",
|
||||
"base64 0.23.1",
|
||||
@@ -940,7 +940,7 @@ dependencies = [
|
||||
"hyper",
|
||||
"itertools 0.15.0",
|
||||
"lettre",
|
||||
"rand 0.10.4",
|
||||
"rand 0.10.3",
|
||||
"reqwest 0.13.5",
|
||||
"ruma",
|
||||
"ruminuwuity",
|
||||
@@ -949,12 +949,11 @@ dependencies = [
|
||||
"sha1 0.11.0",
|
||||
"tokio",
|
||||
"tracing",
|
||||
"wildmatch",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "conduwuit_build_metadata"
|
||||
version = "26.11.0-alpha.2"
|
||||
version = "26.9.1"
|
||||
dependencies = [
|
||||
"built",
|
||||
"cargo_metadata",
|
||||
@@ -962,7 +961,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "conduwuit_core"
|
||||
version = "26.11.0-alpha.2"
|
||||
version = "26.9.1"
|
||||
dependencies = [
|
||||
"argon2",
|
||||
"arrayvec",
|
||||
@@ -992,7 +991,7 @@ dependencies = [
|
||||
"ipaddress",
|
||||
"lettre",
|
||||
"libc",
|
||||
"libloading 0.9.1",
|
||||
"libloading 0.9.0",
|
||||
"lock_api 0.5.0",
|
||||
"maplit",
|
||||
"nix",
|
||||
@@ -1004,7 +1003,7 @@ dependencies = [
|
||||
"opentelemetry_sdk",
|
||||
"parking_lot",
|
||||
"prometheus",
|
||||
"rand 0.10.4",
|
||||
"rand 0.10.3",
|
||||
"regex",
|
||||
"reqwest 0.13.5",
|
||||
"resolvematrix",
|
||||
@@ -1032,7 +1031,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "conduwuit_database"
|
||||
version = "26.11.0-alpha.2"
|
||||
version = "26.9.1"
|
||||
dependencies = [
|
||||
"async-channel",
|
||||
"conduwuit_core",
|
||||
@@ -1052,17 +1051,17 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "conduwuit_macros"
|
||||
version = "26.11.0-alpha.2"
|
||||
version = "26.9.1"
|
||||
dependencies = [
|
||||
"itertools 0.15.0",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 3.0.10",
|
||||
"syn 3.0.9",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "conduwuit_router"
|
||||
version = "26.11.0-alpha.2"
|
||||
version = "26.9.1"
|
||||
dependencies = [
|
||||
"axum",
|
||||
"axum-server",
|
||||
@@ -1095,7 +1094,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "conduwuit_service"
|
||||
version = "26.11.0-alpha.2"
|
||||
version = "26.9.1"
|
||||
dependencies = [
|
||||
"askama",
|
||||
"assign",
|
||||
@@ -1125,7 +1124,7 @@ dependencies = [
|
||||
"openidconnect",
|
||||
"opentelemetry",
|
||||
"p256 0.14.0",
|
||||
"rand 0.10.4",
|
||||
"rand 0.10.3",
|
||||
"regex",
|
||||
"reqwest 0.12.28",
|
||||
"reqwest 0.13.5",
|
||||
@@ -1151,7 +1150,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "conduwuit_web"
|
||||
version = "26.11.0-alpha.2"
|
||||
version = "26.9.1"
|
||||
dependencies = [
|
||||
"askama",
|
||||
"async-trait",
|
||||
@@ -1380,7 +1379,7 @@ dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"strict",
|
||||
"syn 3.0.10",
|
||||
"syn 3.0.9",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1622,7 +1621,7 @@ dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"strsim",
|
||||
"syn 3.0.10",
|
||||
"syn 3.0.9",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1644,7 +1643,7 @@ checksum = "2ac7135c3ef02b2f7833bbeb1be5ba7f966dcde8a87c6b87f65a778d71a02785"
|
||||
dependencies = [
|
||||
"darling_core 0.24.1",
|
||||
"quote",
|
||||
"syn 3.0.10",
|
||||
"syn 3.0.9",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1764,7 +1763,7 @@ checksum = "c6232dd377dcc64799954cbd3a9bb882e9cdc1308ccd87b1c098f1fb2eaf82a8"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 3.0.10",
|
||||
"syn 3.0.9",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -2170,7 +2169,7 @@ checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 3.0.10",
|
||||
"syn 3.0.9",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -2488,7 +2487,7 @@ dependencies = [
|
||||
"idna",
|
||||
"ipnet",
|
||||
"jni",
|
||||
"rand 0.10.4",
|
||||
"rand 0.10.3",
|
||||
"thiserror 2.0.21",
|
||||
"tinyvec",
|
||||
"tokio",
|
||||
@@ -2508,7 +2507,7 @@ dependencies = [
|
||||
"jni",
|
||||
"once_cell",
|
||||
"prefix-trie",
|
||||
"rand 0.10.4",
|
||||
"rand 0.10.3",
|
||||
"ring",
|
||||
"serde",
|
||||
"thiserror 2.0.21",
|
||||
@@ -2534,7 +2533,7 @@ dependencies = [
|
||||
"ndk-context",
|
||||
"once_cell",
|
||||
"parking_lot",
|
||||
"rand 0.10.4",
|
||||
"rand 0.10.3",
|
||||
"resolv-conf",
|
||||
"serde",
|
||||
"smallvec",
|
||||
@@ -2947,9 +2946,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ipaddress"
|
||||
version = "0.2.12"
|
||||
version = "0.2.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ece51ba5fffb4aa775b99f2ec4008622c7735dbdac7bf6490a646160c28badff"
|
||||
checksum = "67a97d7409c3ade4304acbff6b33b915af4564c42bf6e383651ced09bd6a2bce"
|
||||
dependencies = [
|
||||
"lazy_static",
|
||||
"libc",
|
||||
@@ -3175,7 +3174,7 @@ dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"regex",
|
||||
"syn 3.0.10",
|
||||
"syn 3.0.9",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -3235,9 +3234,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "libloading"
|
||||
version = "0.9.1"
|
||||
version = "0.9.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a1832accd5a4ca2795ace4d05d15c4039be15b62d3b950eff99746a990e3cc10"
|
||||
checksum = "754ca22de805bb5744484a5b151a9e1a8e837d5dc232c2d7d8c2e3492edc8b60"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"windows-link",
|
||||
@@ -4479,7 +4478,7 @@ dependencies = [
|
||||
"proc-macro-error-attr3",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 3.0.10",
|
||||
"syn 3.0.9",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -4611,7 +4610,7 @@ dependencies = [
|
||||
"bytes",
|
||||
"getrandom 0.4.3",
|
||||
"lru-slab",
|
||||
"rand 0.10.4",
|
||||
"rand 0.10.3",
|
||||
"rand_pcg",
|
||||
"ring",
|
||||
"rustc-hash",
|
||||
@@ -4688,9 +4687,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rand"
|
||||
version = "0.10.4"
|
||||
version = "0.10.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8f6fa277c67e6ea590466f04c3fe82cb509f0864fe470643e5570de9514a9b11"
|
||||
checksum = "65c9fb96cbc91e3478eaae79a69fcd3f1ae4ad052e471fe6732fff548984b4af"
|
||||
dependencies = [
|
||||
"chacha20",
|
||||
"getrandom 0.4.3",
|
||||
@@ -4776,7 +4775,7 @@ checksum = "92ecd8964f8453721699a1ed72037b0db49ce2f5a5138486ee89bed6f67cdf3a"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 3.0.10",
|
||||
"syn 3.0.9",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -4898,9 +4897,9 @@ checksum = "1e061d1b48cb8d38042de4ae0a7a6401009d6143dc80d2e2d6f31f0bdd6470c7"
|
||||
|
||||
[[package]]
|
||||
name = "resolvematrix"
|
||||
version = "1.4.2"
|
||||
version = "1.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d6e659fe17ed82acfac43641d00d1bbfd0a9d53ec4d2f901b01f792f0e2c9e3c"
|
||||
checksum = "9e7767f4eb1d58880d6b33135a6c098cc8fbccecb259a833b44448c0de144dac"
|
||||
dependencies = [
|
||||
"hickory-resolver",
|
||||
"num-traits",
|
||||
@@ -4970,7 +4969,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "ruma"
|
||||
version = "0.17.2"
|
||||
source = "git+https://github.com/ruma/ruma.git?rev=472a23ef86bc0bb40a22d856fc0af539eb9d71b7#472a23ef86bc0bb40a22d856fc0af539eb9d71b7"
|
||||
source = "git+https://github.com/ruma/ruma.git?rev=0ed7fba34213f18a628a56f527c6cc795cd7eef5#0ed7fba34213f18a628a56f527c6cc795cd7eef5"
|
||||
dependencies = [
|
||||
"assign",
|
||||
"js_int",
|
||||
@@ -4989,7 +4988,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "ruma-appservice-api"
|
||||
version = "0.17.1"
|
||||
source = "git+https://github.com/ruma/ruma.git?rev=472a23ef86bc0bb40a22d856fc0af539eb9d71b7#472a23ef86bc0bb40a22d856fc0af539eb9d71b7"
|
||||
source = "git+https://github.com/ruma/ruma.git?rev=0ed7fba34213f18a628a56f527c6cc795cd7eef5#0ed7fba34213f18a628a56f527c6cc795cd7eef5"
|
||||
dependencies = [
|
||||
"http",
|
||||
"js_int",
|
||||
@@ -5002,7 +5001,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "ruma-client-api"
|
||||
version = "0.25.2"
|
||||
source = "git+https://github.com/ruma/ruma.git?rev=472a23ef86bc0bb40a22d856fc0af539eb9d71b7#472a23ef86bc0bb40a22d856fc0af539eb9d71b7"
|
||||
source = "git+https://github.com/ruma/ruma.git?rev=0ed7fba34213f18a628a56f527c6cc795cd7eef5#0ed7fba34213f18a628a56f527c6cc795cd7eef5"
|
||||
dependencies = [
|
||||
"as_variant",
|
||||
"assign",
|
||||
@@ -5024,7 +5023,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "ruma-common"
|
||||
version = "0.20.2"
|
||||
source = "git+https://github.com/ruma/ruma.git?rev=472a23ef86bc0bb40a22d856fc0af539eb9d71b7#472a23ef86bc0bb40a22d856fc0af539eb9d71b7"
|
||||
source = "git+https://github.com/ruma/ruma.git?rev=0ed7fba34213f18a628a56f527c6cc795cd7eef5#0ed7fba34213f18a628a56f527c6cc795cd7eef5"
|
||||
dependencies = [
|
||||
"as_variant",
|
||||
"base64 0.23.1",
|
||||
@@ -5037,7 +5036,7 @@ dependencies = [
|
||||
"js_int",
|
||||
"konst",
|
||||
"percent-encoding",
|
||||
"rand 0.10.4",
|
||||
"rand 0.10.3",
|
||||
"regex",
|
||||
"ruma-identifiers-validation",
|
||||
"ruma-macros",
|
||||
@@ -5057,7 +5056,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "ruma-events"
|
||||
version = "0.35.2"
|
||||
source = "git+https://github.com/ruma/ruma.git?rev=472a23ef86bc0bb40a22d856fc0af539eb9d71b7#472a23ef86bc0bb40a22d856fc0af539eb9d71b7"
|
||||
source = "git+https://github.com/ruma/ruma.git?rev=0ed7fba34213f18a628a56f527c6cc795cd7eef5#0ed7fba34213f18a628a56f527c6cc795cd7eef5"
|
||||
dependencies = [
|
||||
"as_variant",
|
||||
"indexmap 2.14.2",
|
||||
@@ -5078,7 +5077,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "ruma-federation-api"
|
||||
version = "0.16.1"
|
||||
source = "git+https://github.com/ruma/ruma.git?rev=472a23ef86bc0bb40a22d856fc0af539eb9d71b7#472a23ef86bc0bb40a22d856fc0af539eb9d71b7"
|
||||
source = "git+https://github.com/ruma/ruma.git?rev=0ed7fba34213f18a628a56f527c6cc795cd7eef5#0ed7fba34213f18a628a56f527c6cc795cd7eef5"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"http",
|
||||
@@ -5087,7 +5086,7 @@ dependencies = [
|
||||
"js_int",
|
||||
"memchr",
|
||||
"mime",
|
||||
"rand 0.10.4",
|
||||
"rand 0.10.3",
|
||||
"ruma-common",
|
||||
"ruma-events",
|
||||
"ruma-signatures",
|
||||
@@ -5100,7 +5099,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "ruma-identifiers-validation"
|
||||
version = "0.14.0"
|
||||
source = "git+https://github.com/ruma/ruma.git?rev=472a23ef86bc0bb40a22d856fc0af539eb9d71b7#472a23ef86bc0bb40a22d856fc0af539eb9d71b7"
|
||||
source = "git+https://github.com/ruma/ruma.git?rev=0ed7fba34213f18a628a56f527c6cc795cd7eef5#0ed7fba34213f18a628a56f527c6cc795cd7eef5"
|
||||
dependencies = [
|
||||
"js_int",
|
||||
"thiserror 2.0.21",
|
||||
@@ -5109,7 +5108,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "ruma-macros"
|
||||
version = "0.20.2"
|
||||
source = "git+https://github.com/ruma/ruma.git?rev=472a23ef86bc0bb40a22d856fc0af539eb9d71b7#472a23ef86bc0bb40a22d856fc0af539eb9d71b7"
|
||||
source = "git+https://github.com/ruma/ruma.git?rev=0ed7fba34213f18a628a56f527c6cc795cd7eef5#0ed7fba34213f18a628a56f527c6cc795cd7eef5"
|
||||
dependencies = [
|
||||
"as_variant",
|
||||
"cfg-if",
|
||||
@@ -5118,14 +5117,14 @@ dependencies = [
|
||||
"quote",
|
||||
"ruma-identifiers-validation",
|
||||
"serde",
|
||||
"syn 3.0.10",
|
||||
"syn 3.0.9",
|
||||
"toml 1.2.1+spec-1.1.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ruma-push-gateway-api"
|
||||
version = "0.16.0"
|
||||
source = "git+https://github.com/ruma/ruma.git?rev=472a23ef86bc0bb40a22d856fc0af539eb9d71b7#472a23ef86bc0bb40a22d856fc0af539eb9d71b7"
|
||||
source = "git+https://github.com/ruma/ruma.git?rev=0ed7fba34213f18a628a56f527c6cc795cd7eef5#0ed7fba34213f18a628a56f527c6cc795cd7eef5"
|
||||
dependencies = [
|
||||
"js_int",
|
||||
"ruma-common",
|
||||
@@ -5137,13 +5136,13 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "ruma-signatures"
|
||||
version = "0.22.1"
|
||||
source = "git+https://github.com/ruma/ruma.git?rev=472a23ef86bc0bb40a22d856fc0af539eb9d71b7#472a23ef86bc0bb40a22d856fc0af539eb9d71b7"
|
||||
source = "git+https://github.com/ruma/ruma.git?rev=0ed7fba34213f18a628a56f527c6cc795cd7eef5#0ed7fba34213f18a628a56f527c6cc795cd7eef5"
|
||||
dependencies = [
|
||||
"base64 0.23.1",
|
||||
"ed25519-dalek",
|
||||
"memchr",
|
||||
"pkcs8 0.11.0",
|
||||
"rand 0.10.4",
|
||||
"rand 0.10.3",
|
||||
"ruma-common",
|
||||
"ruma-events",
|
||||
"serde_json",
|
||||
@@ -5154,7 +5153,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "ruma-state-res"
|
||||
version = "0.18.0"
|
||||
source = "git+https://github.com/ruma/ruma.git?rev=472a23ef86bc0bb40a22d856fc0af539eb9d71b7#472a23ef86bc0bb40a22d856fc0af539eb9d71b7"
|
||||
source = "git+https://github.com/ruma/ruma.git?rev=0ed7fba34213f18a628a56f527c6cc795cd7eef5#0ed7fba34213f18a628a56f527c6cc795cd7eef5"
|
||||
dependencies = [
|
||||
"js_int",
|
||||
"ruma-common",
|
||||
@@ -5168,7 +5167,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ruminuwuity"
|
||||
version = "26.11.0-alpha.2"
|
||||
version = "26.9.1"
|
||||
dependencies = [
|
||||
"assign",
|
||||
"http",
|
||||
@@ -5527,7 +5526,7 @@ version = "0.49.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "edcb294ca821e5c5624edaf33535eb18b06ef4f8675201d3e4d81ce325741692"
|
||||
dependencies = [
|
||||
"rand 0.10.4",
|
||||
"rand 0.10.3",
|
||||
"sentry-types",
|
||||
"serde",
|
||||
"serde_json",
|
||||
@@ -5600,7 +5599,7 @@ checksum = "83d84a36b6bdeeb7813976fb899fca45d94540d2e2b80eac91ba66b4c654d8f0"
|
||||
dependencies = [
|
||||
"debugid",
|
||||
"hex",
|
||||
"rand 0.10.4",
|
||||
"rand 0.10.3",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"thiserror 2.0.21",
|
||||
@@ -5663,7 +5662,7 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 3.0.10",
|
||||
"syn 3.0.9",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -5782,7 +5781,7 @@ dependencies = [
|
||||
"darling 0.24.1",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 3.0.10",
|
||||
"syn 3.0.9",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -6078,9 +6077,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "3.0.10"
|
||||
version = "3.0.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4ae9ccbea3a7b0b09443036490c8f34a8b1b760fd345e5c0dae0aac718faea79"
|
||||
checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@@ -6104,7 +6103,7 @@ checksum = "901704edd0dfe137f1987838ee4f259e4e063c31371bdb423f7ae38ec6f77f02"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 3.0.10",
|
||||
"syn 3.0.9",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -6206,7 +6205,7 @@ checksum = "fe5197923287db20a58125f0bc85c062f7f2c892de97b18c356f9efb14b28524"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 3.0.10",
|
||||
"syn 3.0.9",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -6316,7 +6315,7 @@ checksum = "78773a2a397f451582ce068015985c33193cf6dea8b74d2a639fe457b2f07b0e"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 3.0.10",
|
||||
"syn 3.0.9",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -7004,7 +7003,7 @@ dependencies = [
|
||||
"bumpalo",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 3.0.10",
|
||||
"syn 3.0.9",
|
||||
"wasm-bindgen-shared",
|
||||
]
|
||||
|
||||
@@ -7352,7 +7351,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "xtask"
|
||||
version = "26.11.0-alpha.2"
|
||||
version = "26.9.1"
|
||||
dependencies = [
|
||||
"askama",
|
||||
"cargo_metadata",
|
||||
@@ -7385,7 +7384,7 @@ checksum = "ec8ebde2db3681e8c9980cc27822030e68752690ddfa9473e739aeb4dbde6d71"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 3.0.10",
|
||||
"syn 3.0.9",
|
||||
"synstructure",
|
||||
]
|
||||
|
||||
@@ -7426,7 +7425,7 @@ checksum = "f75b4683f6c7f45248d4d64056a24298c6281e0993356d7d1b4a1a962ef10d4a"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 3.0.10",
|
||||
"syn 3.0.9",
|
||||
"synstructure",
|
||||
]
|
||||
|
||||
@@ -7466,7 +7465,7 @@ checksum = "c3743ddbf47738d929cd1ae2e199d40d0162979dfe31aef8ae646d2bf00bf97a"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 3.0.10",
|
||||
"syn 3.0.9",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
||||
+3
-7
@@ -12,7 +12,7 @@ license = "Apache-2.0"
|
||||
# See also `rust-toolchain.toml`
|
||||
readme = "README.md"
|
||||
repository = "https://forgejo.ellis.link/continuwuation/continuwuity"
|
||||
version = "26.11.0-alpha.2"
|
||||
version = "26.9.1"
|
||||
|
||||
[workspace.metadata.crane]
|
||||
name = "conduwuit"
|
||||
@@ -272,9 +272,6 @@ version = "0.5.2"
|
||||
[workspace.dependencies.libloading]
|
||||
version = "0.9.0"
|
||||
|
||||
[workspace.dependencies.wildmatch]
|
||||
version = "2.7.0"
|
||||
|
||||
# Validating urls in config, was already a transitive dependency
|
||||
[workspace.dependencies.url]
|
||||
version = "2.5.8"
|
||||
@@ -360,7 +357,7 @@ version = "1.1.1"
|
||||
# Used for matrix spec type definitions and helpers
|
||||
[workspace.dependencies.ruma]
|
||||
git = "https://github.com/ruma/ruma.git"
|
||||
rev = "472a23ef86bc0bb40a22d856fc0af539eb9d71b7"
|
||||
rev = "0ed7fba34213f18a628a56f527c6cc795cd7eef5"
|
||||
features = [
|
||||
"appservice-api-c",
|
||||
"client-api",
|
||||
@@ -603,8 +600,7 @@ features = ["std"]
|
||||
version = "0.3.0"
|
||||
|
||||
[workspace.dependencies.resolvematrix]
|
||||
version = "1.4.2"
|
||||
features = ["unstable-msc4188"]
|
||||
version = "1.4.0"
|
||||
|
||||
[workspace.dependencies.serde_urlencoded]
|
||||
version = "0.7.1"
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
Check content-type header on federation responses, ignoring any that don't match (spec compliance)
|
||||
@@ -1 +0,0 @@
|
||||
Fix account data updates sent at the same time leaving old copies behind, which every initial sync then returned. Existing copies are removed on startup. Contributed by @eleboucher.
|
||||
@@ -1 +0,0 @@
|
||||
Creating a room with valid but non-canonical JSON now returns `400 M_BAD_JSON` instead of panicking the worker and returning `500 M_UNKNOWN`.
|
||||
@@ -1 +0,0 @@
|
||||
Joining a local room the user is not allowed to join now returns `403 M_FORBIDDEN` instead of `500 M_UNKNOWN` when there are no other servers to try.
|
||||
@@ -1 +0,0 @@
|
||||
Added support for [MSC2815](https://github.com/matrix-org/matrix-spec-proposals/pull/2815), allowing room moderators to fetch the original content of redacted events, behind the `allow_moderators_to_view_redacted_content` config option. Contributed by @eleboucher.
|
||||
@@ -1 +0,0 @@
|
||||
Remove support for legacy, unauthenticated media, including the `allow_legacy_media` and `freeze_legacy_media` options.
|
||||
@@ -1 +0,0 @@
|
||||
Legacy `/sync` now honours the `room.rooms`, `room.not_rooms`, `account_data.types` and `account_data.not_types` filter fields instead of returning every room and all account data. Contributed by @eleboucher.
|
||||
@@ -1 +0,0 @@
|
||||
Added support for servers returning 410 gone to indicate they are no longer serving a Matrix server (MSC4188). Contributed by @nex and @silversys
|
||||
@@ -1 +0,0 @@
|
||||
Fix the DNS resolver failing to start without `/etc/resolv.conf` when `dns_servers` is configured. Contributed by @eleboucher.
|
||||
@@ -1 +0,0 @@
|
||||
Fixed OIDC logins failing after the identity provider rotates its signing keys. Contributed by @eleboucher.
|
||||
@@ -1 +0,0 @@
|
||||
Changed the policy on unstable features, disabling most by default and making them configurable in a tidy little `experiments` configuration. See also: #1884.
|
||||
@@ -1 +0,0 @@
|
||||
Fixed `/get_missing_events` rejecting requests with more `earliest_events` than the `limit`. Contributed by @eleboucher.
|
||||
@@ -31,6 +31,7 @@ rocksdb_log_level = "info"
|
||||
rocksdb_max_log_files = 1
|
||||
rocksdb_recovery_mode = 0
|
||||
rocksdb_paranoid_file_checks = true
|
||||
allow_legacy_media = true
|
||||
startup_netburst = true
|
||||
startup_netburst_keep = -1
|
||||
allow_invalid_tls_certificates_yes_i_know_what_the_fuck_i_am_doing_with_this_and_i_know_this_is_insecure = true
|
||||
|
||||
+30
-103
@@ -1657,6 +1657,13 @@
|
||||
# env: CONTINUWUITY_ALLOW_INCOMING_TYPING
|
||||
#allow_incoming_typing = true
|
||||
|
||||
# Allow the use of unstable persistent "sticky events" ([MSC4354])
|
||||
#
|
||||
# MSC4354: https://c10y.cc/MSC4354
|
||||
#
|
||||
# env: CONTINUWUITY_ALLOW_STICKY_EVENTS
|
||||
#allow_sticky_events = false
|
||||
|
||||
# Maximum time federation user can indicate typing.
|
||||
#
|
||||
# env: CONTINUWUITY_TYPING_FEDERATION_TIMEOUT_S
|
||||
@@ -1707,6 +1714,29 @@
|
||||
# env: CONTINUWUITY_BROTLI_COMPRESSION
|
||||
#brotli_compression = false
|
||||
|
||||
# Enable the legacy unauthenticated Matrix media repository endpoints.
|
||||
# These endpoints consist of:
|
||||
# - /_matrix/media/*/config
|
||||
# - /_matrix/media/*/upload
|
||||
# - /_matrix/media/*/preview_url
|
||||
# - /_matrix/media/*/download/*
|
||||
# - /_matrix/media/*/thumbnail/*
|
||||
#
|
||||
# The authenticated equivalent endpoints are always enabled.
|
||||
#
|
||||
# Defaults to false, as unauthenticated media has been sunsetted.
|
||||
#
|
||||
# env: CONTINUWUITY_ALLOW_LEGACY_MEDIA
|
||||
#allow_legacy_media = false
|
||||
|
||||
# If set to true, prevents fetching new legacy remote media.
|
||||
#
|
||||
# Legacy media may still be accessible if it was already fetched
|
||||
# previously and allow_legacy_media is true.
|
||||
#
|
||||
# env: CONTINUWUITY_FREEZE_LEGACY_MEDIA
|
||||
#freeze_legacy_media = true
|
||||
|
||||
# Check consistency of the media directory at startup:
|
||||
# 1. When `media_compat_file_link` is enabled, this check will upgrade
|
||||
# media when switching back and forth between Conduit and conduwuit.
|
||||
@@ -2657,106 +2687,3 @@
|
||||
#
|
||||
# env: CONTINUWUITY_OAUTH__OIDC__PROFILE_KEY_IMPORT_MODE
|
||||
#profile_key_import_mode = "on_registration"
|
||||
|
||||
[global.experiments]
|
||||
# Continuwuity's experimental features are frequently updated.
|
||||
# If you got this configuration via a package manager, chances are it's outdated.
|
||||
# Check out the configuration reference online to see a fresh version:
|
||||
# https://continuwuity.org/reference/config.html#:~:text=global.experiments
|
||||
#
|
||||
# Please keep in mind that experiments are used to enable unstable features.
|
||||
# You probably don't need to enable any of these unless you know what they are,
|
||||
# and consequently know why you should enable them.
|
||||
|
||||
|
||||
# MSC4155: Invite filtering
|
||||
#
|
||||
# Provides advanced invite filtering rules for users, allowing complex
|
||||
# configurations that can allow, ignore, and reject invites from users and
|
||||
# servers broadly.
|
||||
#
|
||||
# Requires a supporting client to set up on an account.
|
||||
#
|
||||
# https://github.com/matrix-org/matrix-spec-proposals/pull/4155
|
||||
#
|
||||
# env: CONTINUWUITY_EXPERIMENTS__MSC4155
|
||||
#msc4155 = false
|
||||
|
||||
# MSC4174: Web push
|
||||
#
|
||||
# Adds server-side support for web push, allowing web clients to receive
|
||||
# push notifications directly without the need for an intermediary push
|
||||
# gateway like Sygnal.
|
||||
#
|
||||
# https://github.com/matrix-org/matrix-spec-proposals/pull/4174
|
||||
#
|
||||
# env: CONTINUWUITY_EXPERIMENTS__MSC4174
|
||||
#msc4174 = false
|
||||
|
||||
# MSC4484: Server Administration OAuth Scope
|
||||
#
|
||||
# Adds a new OAuth2 scope that explicitly grants a token temporary
|
||||
# homeserver administrator privileges, granting temporary token access
|
||||
# to administrator endpoints like locking & suspension.
|
||||
#
|
||||
# https://github.com/matrix-org/matrix-spec-proposals/pull/4484
|
||||
#
|
||||
# env: CONTINUWUITY_EXPERIMENTS__MSC4484
|
||||
#msc4484 = false
|
||||
|
||||
# MSC4494: Membership-based invite blocking
|
||||
#
|
||||
# Adds a new invite blocking action that will reject all invites coming
|
||||
# from users who do not share a room with the invitee that is not `public`
|
||||
# (the join rule).
|
||||
#
|
||||
# This is not related to MSC4155, this proposal instead builds on the
|
||||
# "invite blocking" proposal that landed in the specification in v1.17,
|
||||
# which simply allows enabling or disabling invites altogether.
|
||||
#
|
||||
# MSC4494 is a good middle-ground between the allowlisting possible with
|
||||
# MSC4155, and the general desire to block invites from users you may not
|
||||
# know.
|
||||
#
|
||||
# Requires a supporting client to enable on an account.
|
||||
#
|
||||
# https://github.com/matrix-org/matrix-spec-proposals/pull/4494
|
||||
#
|
||||
# env: CONTINUWUITY_EXPERIMENTS__MSC4494
|
||||
#msc4494 = false
|
||||
|
||||
# MSC4560: Stripped state requests over federation
|
||||
#
|
||||
# Implements a more efficient way for servers to acquire and serve
|
||||
# "stripped state" to clients, which is typically only used for displaying
|
||||
# rooms. The display of space hierarchies and room summaries is
|
||||
# significantly faster when this proposal is enabled and used.
|
||||
#
|
||||
# https://github.com/matrix-org/matrix-spec-proposals/pull/4560
|
||||
#
|
||||
# env: CONTINUWUITY_EXPERIMENTS__MSC4560
|
||||
#msc4560 = false
|
||||
|
||||
#[global.experiments.msc2815]
|
||||
# MSC2815: Proposal to allow room moderators to view redacted event content
|
||||
#
|
||||
# Allows the server to retain unredacted copies of events that have been
|
||||
# redacted for a limited period of time, which allows room moderators and
|
||||
# server administrators to reveal redacted contents. Useful for moderation
|
||||
# and investigating reports.
|
||||
#
|
||||
# Requires a supporting client to use.
|
||||
#
|
||||
# https://github.com/matrix-org/matrix-spec-proposals/pull/2815
|
||||
|
||||
|
||||
# Whether to enable MSC2815.
|
||||
#
|
||||
# env: CONTINUWUITY_EXPERIMENTS__MSC2815__ENABLED
|
||||
#enabled = false
|
||||
|
||||
# How long, in seconds, to retain the original content of redacted
|
||||
# events before it is permanently erased. Defaults to 90 days.
|
||||
#
|
||||
# env: CONTINUWUITY_EXPERIMENTS__MSC2815__UNREDACTED_CONTENT_MAX_AGE_SECS
|
||||
#unredacted_content_max_age_secs = 7776000
|
||||
+1
-1
@@ -50,7 +50,7 @@ EOF
|
||||
|
||||
# Developer tool versions
|
||||
# renovate: datasource=github-releases depName=cargo-bins/cargo-binstall
|
||||
ENV BINSTALL_VERSION=1.27.0
|
||||
ENV BINSTALL_VERSION=1.26.2
|
||||
# renovate: datasource=github-releases depName=psastras/sbom-rs
|
||||
ENV CARGO_SBOM_VERSION=0.9.1
|
||||
# renovate: datasource=crate depName=lddtree
|
||||
|
||||
@@ -18,7 +18,7 @@ RUN --mount=type=cache,target=/etc/apk/cache apk add \
|
||||
|
||||
# Developer tool versions
|
||||
# renovate: datasource=github-releases depName=cargo-bins/cargo-binstall
|
||||
ENV BINSTALL_VERSION=1.27.0
|
||||
ENV BINSTALL_VERSION=1.26.2
|
||||
# renovate: datasource=github-releases depName=psastras/sbom-rs
|
||||
ENV CARGO_SBOM_VERSION=0.9.1
|
||||
# renovate: datasource=crate depName=lddtree
|
||||
|
||||
@@ -4,7 +4,7 @@ Continuwuity comes with an internal database for user authentication, which it u
|
||||
|
||||
## Registration
|
||||
|
||||
The following registration methods are available for Continuwuity:
|
||||
Registration is disabled by default. To enable it, set `allow_registration = true` in your config file and use at least one of the registration methods below.
|
||||
|
||||
| Method | Description | Additional configuration needed |
|
||||
| ------ | --------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- |
|
||||
@@ -19,8 +19,6 @@ Admin-issued tokens are the recommended registration method. These tokens are we
|
||||
|
||||
Other registration methods are meant for **untrusted, public registration**. Care must be taken when allowing these modes of operation.
|
||||
|
||||
If you wish to disable registration entirely, set `allow_registration = false` in your config file.
|
||||
|
||||
## Email configuration
|
||||
|
||||
Continuwuity can be configured to send emails via an SMTP relay of your choice. These are used for verifying user email addresses and sending password reset links to them.
|
||||
|
||||
+5
-9
@@ -2,16 +2,12 @@
|
||||
|
||||
Matrix supports two types of calls:
|
||||
|
||||
- [MatrixRTC][MSC4143] calls, powered by [LiveKit][livekit-server-github] and frontends such as [Element Call][element-call].
|
||||
- Legacy 1-to-1 calls, supported by a STUN/TURN server.
|
||||
- Element Call powered by [MatrixRTC](https://half-shot.github.io/msc-crafter/#msc/4143) and [LiveKit](https://github.com/livekit/livekit)
|
||||
- Legacy calls, supported by a STUN/TURN server.
|
||||
|
||||
[MSC4143]: https://github.com/matrix-org/matrix-spec-proposals/pull/4143
|
||||
[element-call-github]: https://github.com/element-hq/element-call/
|
||||
[livekit-server-github]: https://github.com/livekit/livekit
|
||||
|
||||
Both types of calls are supported by different sets of clients, but most clients are moving towards MatrixRTC.
|
||||
Both types of calls are supported by different sets of clients, but most clients are moving towards MatrixRTC / Element Call.
|
||||
|
||||
For either one to work correctly, you have to do some additional setup:
|
||||
|
||||
- For legacy calls to work, you need to set up a TURN/STUN server. [Read the TURN guide for instructions on how to set up coturn](./calls/turn.mdx)
|
||||
- For MatrixRTC calls to work, you have to set up the LiveKit backend, and optionally configure a TURN server for increased reliability. [Read the LiveKit guide](./calls/livekit.mdx)
|
||||
- For legacy calls to work, you need to set up a TURN/STUN server. [Read the TURN guide for tips on how to set up coturn](./calls/turn.mdx)
|
||||
- For MatrixRTC / Element Call to work, you have to set up the LiveKit backend. LiveKit also uses TURN/STUN to increase reliability - you can set up its built-in TURN server, or integrate with an existing one. [Read the LiveKit guide](./calls/livekit.mdx)
|
||||
+23
-86
@@ -1,15 +1,13 @@
|
||||
import { Tab, Tabs } from '@rspress/core/theme';
|
||||
import { Tab, Tabs} from '@rspress/core/theme';
|
||||
|
||||
# MatrixRTC/LiveKit Setup
|
||||
# MatrixRTC/Element Call Setup
|
||||
|
||||
This guide assumes that you are using `docker compose` for deployment.
|
||||
This guide assumes that you are using docker compose for deployment.
|
||||
|
||||
:::tip
|
||||
You can find help setting up MatrixRTC in our support room - [`#continuwuity:continuwuity.org`][support-room]
|
||||
You can find help setting up MatrixRTC in our dedicated room - [#matrixrtc:continuwuity.org](https://matrix.to/#/%23matrixrtc%3Acontinuwuity.org)
|
||||
:::
|
||||
|
||||
[support-room]: https://matrix.to/#/%23continuwuity:continuwuity.org
|
||||
|
||||
## Instructions
|
||||
|
||||
### 1. Set up your domain
|
||||
@@ -60,9 +58,7 @@ services:
|
||||
- ./livekit.yaml:/etc/livekit.yaml:ro
|
||||
network_mode: "host" # /!\ LiveKit binds to all addresses by default.
|
||||
# Make sure port 7880 is blocked by your firewall to prevent access bypassing your reverse proxy
|
||||
|
||||
# Alternatively, uncomment the lines below and comment out `network_mode: "host"`
|
||||
# above to use bridge networking and manually specify port mappings.
|
||||
# Alternatively, uncomment the lines below and comment `network_mode: "host"` above to specify port mappings.
|
||||
# ports:
|
||||
# - "127.0.0.1:7880:7880/tcp"
|
||||
# - "7881:7881/tcp"
|
||||
@@ -222,9 +218,7 @@ Start up the services using your usual method - for example `docker compose up -
|
||||
|
||||
## Testing
|
||||
|
||||
To test that LiveKit is successfully integrated with Continuwuity, you will need to replicate its [Token Exchange Flow][token-exchange-flow]. Follow the steps below while checking Docker logs (`docker compose logs --follow`), in order to help [troubleshooting](#troubleshooting) any issues.
|
||||
|
||||
[token-exchange-flow]: https://github.com/element-hq/lk-jwt-service/tree/v0.6.0#%EF%B8%8F-how-it-works--token-exchange-flow
|
||||
To test that LiveKit is successfully integrated with Continuwuity, you will need to replicate its [Token Exchange Flow](https://github.com/element-hq/lk-jwt-service#%EF%B8%8F-how-it-works--token-exchange-flow). Follow the steps below while checking Docker logs (`docker compose logs --follow`), in order to help [troubleshooting](#troubleshooting) any issues.
|
||||
|
||||
First, you will need an access token for your current login session. These can be found in your client's settings or obtained via [this website][starstruck-mxtoken2].
|
||||
|
||||
@@ -285,7 +279,7 @@ You can then send this payload to the lk-jwt-service:
|
||||
curl -X POST -d @payload.json https://livekit.example.com/get_token
|
||||
```
|
||||
|
||||
The lk-jwt-service will, after checking against Continuwuity, answer with a `jwt` token to [create a LiveKit media room](#livekit-cli):
|
||||
The lk-jwt-service will, after checking against Continuwuity, answer with a `jwt` token to create a LiveKit media room:
|
||||
|
||||
```json
|
||||
{"url":"wss://livekit.example.com","jwt":"a_really_really_long_string"}
|
||||
@@ -299,20 +293,13 @@ Use this token to test at the [LiveKit Connection Tester][livekit-connection-tes
|
||||
|
||||
To debug any issues, you can place a call or redo the Testing instructions, and check the container logs for any specific errors. Use `docker compose logs --follow` to follow these logs in real-time.
|
||||
|
||||
Before debugging, ensure the following prerequisites:
|
||||
|
||||
- The user has permissions to send call events into the room. See the Appendix section on [call modes](#call-modes) for more details.
|
||||
- WebRTC is enabled, if using a browser client.
|
||||
|
||||
### Common errors in Element Call UI
|
||||
|
||||
- `MISSING_MATRIX_RTC_FOCUS`/`MISSING_MATRIX_RTC_TRANSPORT`: the client cannot find a suitable SFU. This is likely due to LiveKit being missing from Continuwuity's config file, and therefore not being exposed properly.
|
||||
- `MISSING_MATRIX_RTC_FOCUS`/`MISSING_MATRIX_RTC_TRANSPORT`: LiveKit is missing from Continuwuity's config file
|
||||
- "Waiting for media" popup always showing for yourself: a LiveKit URL has been configured in Continuwuity, but your client cannot connect to it for some reason
|
||||
- `OPEN_ID_ERROR`: Your client can reach out to `lk-jwt-service`, but has problems authenticating with it. In this case, check `lk-jwt-service` logs for more details
|
||||
|
||||
- `OPEN_ID_ERROR`: Your client can reach out to `lk-jwt-service`, but `lk-jwt-service` has problems authenticating you against Continuwuity. In this case, check `lk-jwt-service` logs for more details. The section below on [Docker loopback networking issues](#docker-loopback-networking-issues) may be of help.
|
||||
|
||||
- Calls fail to start with `ServerUnreachable` error: a LiveKit URL has been properly configured and exposed in Continuwuity, but the client cannot connect to it for some reason.
|
||||
|
||||
For browser-based clients, you can inspect connections using DevTools' Networking tab, to see which requests are erroring out. You may also want to toggle on Element Call's Developer tab via _Settings > Preferences > Developer mode_ \- various call details and advanced settings can be further tweaked there.
|
||||
For browser-based clients, you can also inspect connections using DevTools' Networking tab, to see which requests are erroring out.
|
||||
|
||||
### Docker loopback networking issues
|
||||
|
||||
@@ -325,9 +312,9 @@ docker run --rm --net container:lk-jwt-service docker.io/curlimages/curl https:/
|
||||
|
||||
To resolve this, follow the steps in [Docker loopback networking issues](../troubleshooting.mdx#docker-loopback-networking-issues) of the Troubleshooting page.
|
||||
|
||||
### Incorrect IP addresses for LiveKit
|
||||
### Incorrect IP address for LiveKit
|
||||
|
||||
By default, LiveKit automatically finds its public IP address(es), which are reflected in the "Establishing WebRTC connection" section of the connection test page. If these IPs are incorrect, you may want to hardcode your own IP by doing the following:
|
||||
By default, LiveKit automatically finds its public IP address(es), which can be seen in the "Establishing WebRTC connection" section of the connection test page. If these IPs are incorrect, you may want to hardcode your own IP by doing the following:
|
||||
|
||||
```diff
|
||||
### in your livekit.yaml ###
|
||||
@@ -338,21 +325,20 @@ rtc:
|
||||
+ node_ip: "1.2.3.4"
|
||||
```
|
||||
|
||||
Run the LiveKit tests again, and the new updated `node_ip` should be included as one of the candidates.
|
||||
### Workaround for non-federating servers
|
||||
|
||||
You may further restrict the advertised address to only the `node_ip` with the following configurations:
|
||||
When deploying on servers with federation disabled (`allow_federation = false`), LiveKit will fail as it can't fetch the required [OpenID endpoint](https://spec.matrix.org/v1.17/server-server-api/#get_matrixfederationv1openiduserinfo) via federation paths.
|
||||
|
||||
```diff
|
||||
### in your livekit.yaml ###
|
||||
rtc:
|
||||
# ... other configs here ...
|
||||
+ enable_loopback_candidate: false
|
||||
+ interfaces:
|
||||
+ includes: []
|
||||
+ ips:
|
||||
+ includes: [ "1.2.3.4/32" ]
|
||||
As a workaround, you can enable federation, but forbid all remote servers via the following config parameters:
|
||||
|
||||
```toml
|
||||
### in your continuwuity.toml file ###
|
||||
allow_federation = true
|
||||
forbidden_remote_server_names = [".*"]
|
||||
```
|
||||
|
||||
Subscribe to issue [!1440](https://forgejo.ellis.link/continuwuation/continuwuity/issues/1440) for future updates on this matter.
|
||||
|
||||
## Related Documentation
|
||||
|
||||
Guides:
|
||||
@@ -373,15 +359,9 @@ Specifications:
|
||||
|
||||
- [MSC4143: MatrixRTC \- Real-time communication over Matrix][MSC4143]
|
||||
- [MSC4195: MatrixRTC Transport using LiveKit Backend][MSC4195]
|
||||
- [MSC3401: Native Group VoIP Signalling][MSC3401] - state events for legacy calls
|
||||
- [MSC4075: MatrixRTC invites and notifications][MSC4075] - for ringing users
|
||||
- [MSC4354: Sticky Events][MSC4354] - for MatrixRTC 2.0 calls
|
||||
|
||||
[MSC4143]: https://github.com/matrix-org/matrix-spec-proposals/pull/4143
|
||||
[MSC4195]: https://github.com/matrix-org/matrix-spec-proposals/pull/4195
|
||||
[MSC3401]: https://github.com/matrix-org/matrix-spec-proposals/pull/3401
|
||||
[MSC4075]: https://github.com/matrix-org/matrix-spec-proposals/pull/4075
|
||||
[MSC4354]: https://github.com/matrix-org/matrix-spec-proposals/pull/4354
|
||||
|
||||
Source code:
|
||||
|
||||
@@ -401,47 +381,6 @@ Other:
|
||||
|
||||
## Appendix
|
||||
|
||||
### MatrixRTC calling modes and enabling sticky events {#call-modes}
|
||||
|
||||
MatrixRTC currently supports 3 calling modes:
|
||||
|
||||
- **Legacy mode** (deprecated): calls are established by sending state events to a room. The call initiator's SFU hosts the entire call for all remote and local participants.
|
||||
- **Compatibility mode*: same as Legacy mode, but utilizes multiple SFUs between federating servers. Clients publish media streams to their own SFUs, and fetch remote streams from remote SFUs. This is the most commonly used mode nowadays.
|
||||
- **MatrixRTC 2.0 mode**: also utilizes multiple SFUs, but establishes calls with [sticky events] instead of state events.
|
||||
|
||||
To support Legacy and Compatibility mode, ensure that the user is allowed to send the relevant state events. Usually, this means promoting them to a power level of 50 or above. Alternatively, set the power level required to send `org.matrix.msc3401.call.member` events to 0.
|
||||
|
||||
To support MatrixRTC 2.0 mode, sticky events has to be enabled on the Matrix server. In Continuwuity, this is as easy as setting `enable_sticky_events = true` in the config file.
|
||||
|
||||
### Creating LiveKit tokens via `livekit-cli` {#livekit-cli}
|
||||
|
||||
To create room tokens directly without going through `lk-jwt-service`, use the [Livekit CLI tool][livekit-cli].
|
||||
|
||||
<Tabs groupId="livekit">
|
||||
<Tab label="Bare Binary">
|
||||
|
||||
First, download the [release tarball][livekit-cli-releases] and extract it. Then:
|
||||
|
||||
```sh
|
||||
./lk --url https://livekit.example.com \
|
||||
--api-key APIUxUnMnSkuFWV \
|
||||
--api-secret t93ZVjPeoEdyx7Wbet3kG4L3NGZIZVEFvqe0UuiVc22A \
|
||||
token create --create --join
|
||||
```
|
||||
</Tab>
|
||||
<Tab label="Docker">
|
||||
```sh
|
||||
docker run --rm docker.io/livekit/livekit-cli --url https://livekit.example.com \
|
||||
--api-key APIUxUnMnSkuFWV \
|
||||
--api-secret t93ZVjPeoEdyx7Wbet3kG4L3NGZIZVEFvqe0UuiVc22A \
|
||||
token create --create --join
|
||||
```
|
||||
</Tab>
|
||||
</Tabs>
|
||||
|
||||
[livekit-cli]: https://github.com/livekit/livekit-cli
|
||||
[livekit-cli-releases]: https://github.com/livekit/livekit-cli
|
||||
|
||||
### Additional TURN-over-TLS on 443 configuration
|
||||
|
||||
Most of the time, LiveKit [**does not need TURN**][sspaeth-matrix-voip-turn] to function. However, there are situations where clients may be unable to use nonstandard ports or UDP connections, such as in highly restrictive networks. In such cases, a TURN-over-TLS server on port 443 could relay traffic for the clients.
|
||||
@@ -548,8 +487,6 @@ Then configure LiveKit, making sure to replace `COTURN_SECRET` with the one you
|
||||
### in your livekit.yaml ###
|
||||
rtc:
|
||||
# ... other configs here ...
|
||||
stun_servers:
|
||||
- coturn.example.com
|
||||
turn_servers:
|
||||
- host: coturn.example.com
|
||||
port: 443
|
||||
|
||||
+3
-4
@@ -1,17 +1,16 @@
|
||||
# Setting up TURN/STUN
|
||||
|
||||
[TURN][turn] and [STUN][stun] are used as components in many calling systems. Matrix uses them directly for legacy 1-to-1 calls and indirectly to assist MatrixRTC calls via Livekit.
|
||||
[TURN][turn] and [STUN][stun] are used as components in many calling systems. Matrix uses them directly for legacy calls and indirectly for MatrixRTC via Livekit.
|
||||
|
||||
Continuwuity recommends using [coturn][coturn] as your TURN/STUN server, which is available as a Docker image or a distro package. This guide assumes that you are using `docker compose` for deployment.
|
||||
Continuwuity recommends using [coturn][coturn] as your TURN/STUN server, which is available as a Docker image or a distro package. This guide assumes that you are using docker compose for deployment.
|
||||
|
||||
:::tip
|
||||
You can find help setting up TURN/STUN in our support room - [`#continuwuity:continuwuity.org`][support-room]
|
||||
You can find help setting up TURN/STUN in our MatrixRTC room - [#matrixrtc:continuwuity.org](https://matrix.to/#/%23matrixrtc%3Acontinuwuity.org)
|
||||
:::
|
||||
|
||||
[turn]: https://en.wikipedia.org/wiki/Traversal_Using_Relays_around_NAT
|
||||
[stun]: https://en.wikipedia.org/wiki/STUN
|
||||
[coturn]: https://github.com/coturn/coturn
|
||||
[support-room]: https://matrix.to/#/%23continuwuity:continuwuity.org
|
||||
|
||||
## Installing coturn
|
||||
|
||||
|
||||
+1
-1
@@ -101,7 +101,7 @@ After Continuwuity is up and running, consider the following:
|
||||
|
||||
- See the [**Authentication chapter**](./authentication.mdx) for various ways to access to your homeserver, such as logging in with an external OIDC provider.
|
||||
|
||||
- Consult the [**Maintenance**](./maintenance.mdx) page for guidance on backups, moderation, and other topics for homeserver management.
|
||||
- Consult the [**Maintenance**](./maintenance.mdx) page for guidance on maintaining your homeserver.
|
||||
|
||||
- If you want to set up an appservice, take a look at the [**Appservice Guide**](./appservices.mdx).
|
||||
|
||||
|
||||
@@ -2,16 +2,10 @@
|
||||
|
||||
Continuwuity is available in the [`archlinuxcn`][archlinuxcn] repository and AUR with the same package name, [`continuwuity`][aur-continuwuity].
|
||||
|
||||
For instructions on adding the archlinuxcn repo to your machine, see the [archlinuxcn README][archlinuxcn-readme] page. For AUR instructions, consult its [entry][aur-archwiki] on the Arch Wiki.
|
||||
|
||||
The development version, which tracks latest commits to the main branch, is also available on the AUR as [`continuwuity-git`][aur-continuwuity-git].
|
||||
The development version is available on the AUR as [`continuwuity-git`][aur-continuwuity-git].
|
||||
|
||||
[archlinuxcn]: https://www.archlinuxcn.org/
|
||||
[archlinuxcn-readme]: https://github.com/archlinuxcn/repo#usage
|
||||
[aur-archwiki]: https://wiki.archlinux.org/title/Arch_User_Repository
|
||||
[aur-continuwuity]: https://aur.archlinux.org/packages/continuwuity
|
||||
[aur-continuwuity-git]: https://aur.archlinux.org/packages/continuwuity-git
|
||||
|
||||
Once you're done configuring your repos, simply install the `continuwuity` package with `pacman -S continuwuity`. Consult the [generic deployment instructions](./generic.mdx) for detailed steps, which involves editing `/etc/conduwuit/conduwuit.toml` and setting up a reverse proxy. Finally, enable and start the `continuwuity.service`.
|
||||
|
||||
After successfully setting up Continuwuity, navigate to [Post-installation](../deploying.mdx#post-installation) for next steps.
|
||||
Simply install the `continuwuity` package. Configure the service in `/etc/conduwuit/conduwuit.toml`, then enable and start the `continuwuity.service`.
|
||||
@@ -246,8 +246,8 @@ to the `#admin:example.com` room and be able to [issue admin commands](../refere
|
||||
To check if your server can communicate with other homeservers,
|
||||
use an external testing tool:
|
||||
|
||||
- [Matrix Connectivity Tester](https://federationtester.mtrnord.blog/) by MTRNord (recommended, with more tests).
|
||||
- [Matrix Federation Tester](https://federationtester.matrix.org/) by f0x.
|
||||
- [Matrix Connectivity Tester](https://federationtester.mtrnord.blog/)
|
||||
- [Matrix Federation Tester](https://federationtester.matrix.org/)
|
||||
|
||||
If you can register your account but cannot join federated rooms, check your configuration
|
||||
and verify that your federation endpoints are opened and forwarded correctly.
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
# Continuwuity for Kubernetes
|
||||
|
||||
Continuwuity doesn't support horizontal scalability or distributed loading
|
||||
natively. However, a deployment in Kubernetes is very similar to the [docker setup](./docker.mdx).
|
||||
This is because Continuwuity can be fully configured using environment
|
||||
variables. A sample `StatefulSet` is shared below. The only thing missing is
|
||||
natively. However, a deployment in Kubernetes is very similar to the docker
|
||||
setup. This is because Continuwuity can be fully configured using environment
|
||||
variables. A sample StatefulSet is shared below. The only thing missing is
|
||||
a PVC definition (named `continuwuity-data`) for the volume mounted to
|
||||
the `StatefulSet`, an Ingress resources to point your webserver to the
|
||||
the StatefulSet, an Ingress resources to point your webserver to the
|
||||
Continuwuity Pods, and a Service resource (targeting `app.kubernetes.io/name: continuwuity`)
|
||||
to glue the Ingress and Pod together.
|
||||
|
||||
@@ -103,18 +103,10 @@ spec:
|
||||
|
||||
---
|
||||
|
||||
## Community maintained Helm Chart
|
||||
Apart from manually configuring the containers,
|
||||
[a community-maintained Helm Chart is available here to run
|
||||
conduwuit on Kubernetes](https://gitlab.cronce.io/charts/conduwuit)
|
||||
|
||||
Apart from manually configuring the containers, you can consult
|
||||
a community-maintained Helm Chart for the former `conduwuit` project,
|
||||
which is available [here][community-helm-chart].
|
||||
This should be compatible with Continuwuity, but you will need to change the image reference.
|
||||
|
||||
[community-helm-chart]: https://gitlab.cronce.io/charts/conduwuit
|
||||
|
||||
This should be compatible with Continuwuity, but you will need to switch the image reference.
|
||||
|
||||
If changes are needed to be made, please reach out to the maintainer of that repository, as it is not maintained nor controlled by the Continuwuity maintainers.
|
||||
|
||||
## Post-installation
|
||||
|
||||
After successfully setting up your Continuwuity, navigate to [Post-installation](../deploying.mdx#post-installation) for next steps.
|
||||
If changes need to be made, please reach out to the maintainer, as this is not maintained or controlled by the Continuwuity maintainers.
|
||||
@@ -31,14 +31,7 @@ services.matrix-continuwuity = {
|
||||
# address and port are handled automatically
|
||||
|
||||
# You can add any further configuration here, e.g.
|
||||
# trusted_servers = [ "matrix.org" ];
|
||||
|
||||
## (if using well-known delegation)
|
||||
# well_known = {
|
||||
# client = "https://matrix.example.com";
|
||||
# server = "matrix.example.com:443";
|
||||
# }
|
||||
|
||||
# trusted_servers = [ "matrix.org" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
@@ -86,9 +79,3 @@ client = "https://matrix.example.com"
|
||||
|
||||
You'll need to set up a reverse proxy (like NGINX or Caddy) to expose Continuwuity to the internet. You can configure your reverse proxy using NixOS options (e.g. `services.caddy`).
|
||||
See the [reverse proxy setup guide](./generic.mdx#setting-up-the-reverse-proxy) for information on correct reverse proxy configuration.
|
||||
|
||||
Then, test that your setup works by following these [instructions](./generic.mdx#how-do-i-know-it-works).
|
||||
|
||||
## What's next?
|
||||
|
||||
Navigate to [Post-installation](../deploying.mdx#post-installation) for next steps.
|
||||
@@ -1,105 +0,0 @@
|
||||
# Unstable features policy
|
||||
|
||||
Like several other homeservers in the Matrix ecosystem, Continuwuity adopts a "disable by default"
|
||||
approach to experimental features. This ensures every deployment gets the same baseline stability,
|
||||
allowing users to opt in to potentially unstable features.
|
||||
|
||||
Historically, Continuwuity used maintainer discretion to decide whether an unstable feature should
|
||||
be enabled by default. However, as the project has grown, and the pace of spec development has
|
||||
increased, keeping up with unstable proposals becomes less and less feasible by the day, and this
|
||||
causes the implementation of unstable proposals to gradually drift. This can lead to implementations
|
||||
becoming so stale they're incompatible, with no bandwidth to get them fixed up.
|
||||
|
||||
Continuwuity is already selective about which unstable features it implements: the maintainer team
|
||||
typically only accept implementations of proposals that seem like they are a net positive for a
|
||||
large portion of the Matrix ecosystem, rather than aiming to "implement everything". As such, the
|
||||
unstable feature list should typically be small and manageable.
|
||||
|
||||
**All** unstable proposals require an experiment before their implementation can be accepted.
|
||||
Likewise, all experiments should default to being disabled, requiring explicit configuration to
|
||||
enable.
|
||||
|
||||
**Draft proposals** will not be merged until their proposal is undrafted. Likewise, the pull request
|
||||
that implements the draft proposal should itself be marked "WIP", to avoid being merged or
|
||||
prioritised for review. Review is still possible for WIP PRs, so feel free to request a round of
|
||||
feedback.
|
||||
|
||||
## Adding an unstable feature
|
||||
|
||||
First, navigate to `src/core/config/experiments.rs`. There, you have two options for adding an
|
||||
experiment to the `Experiments` struct:
|
||||
|
||||
1. Use `SimpleExperiment` if the experiment only requires enabling with no further configuration.
|
||||
2. Define a new struct that implements the `ToggledExperiment` trait.
|
||||
|
||||
All experiments must be optional and default to off (i.e. `is_enabled()` returns `false`).
|
||||
`SimpleExperiment` is actually a wrapper around `Option<bool>`, and the omission of the
|
||||
configuration OR setting it to `false` disables the experiment. `ToggledExperiment` impls should
|
||||
copy similar behaviour.
|
||||
|
||||
Then, add a public field to the `Experiments` struct that is named the MSC's ID in lowercase.
|
||||
Add a docstring to it, starting with the proposal title (including ID), then a brief paragraph or
|
||||
so explaining what the proposal does in simple terms, and then finally end the docstring with a link
|
||||
to the proposal.
|
||||
|
||||
### Advertising support for unstable features
|
||||
|
||||
If the proposal requires advertising an unstable feature flag, that flag must be added to
|
||||
`unstable_features` in `src/core/matrix/versions.rs`. For example:
|
||||
|
||||
```diff
|
||||
pub fn unstable_features(experiments: &Experiments) -> BTreeMap<String, bool> {
|
||||
BTreeMap::from_iter([
|
||||
// Always enabled feature (https://github.com/matrix-org/matrix-spec-proposals/pull/0000)
|
||||
// Expected for spec v1.20
|
||||
("org.matrix.msc0000".to_owned(), true),
|
||||
+ // MSC9999: My Cool Feature (https://github.com/matrix-org/matrix-spec-proposals/pull/9999)
|
||||
+ ("example.matrix.msc9999".to_owned(), experiments.msc9999.is_enabled())
|
||||
])
|
||||
}
|
||||
```
|
||||
|
||||
This will allow the `/_matrix/client/versions` endpoint to dynamically advertise whether the unstable
|
||||
feature is enabled on the current server.
|
||||
|
||||
## Removing unstable features
|
||||
|
||||
If a proposal is abandoned, becomes obsolete, or is accepted into the specification, the unstable
|
||||
configuration should be removed (and possibly migrated) as soon as possible.
|
||||
|
||||
After removing a field from `experiments`, the key should be added to the `DEPRECATED_KEYS` slice in
|
||||
`src/core/config/mod.rs` (really far down). This will ensure that a warning is printed on startup
|
||||
when a configuration is using a now-removed config key. For example:
|
||||
|
||||
```diff
|
||||
pub struct Experiments {
|
||||
- pub msc9999: SimpleExperiment,
|
||||
}
|
||||
```
|
||||
```diff
|
||||
const DEPRECATED_KEYS: &[&str] = [
|
||||
"foo",
|
||||
+ "experiments.msc9999",
|
||||
];
|
||||
```
|
||||
|
||||
## Always-on experiments
|
||||
|
||||
Some experiments can be forcefully enabled (i.e. always-on), or enabled by default. This should only
|
||||
be the case in exceptional circumstances, and must be adequately well documented. Some examples of
|
||||
situations that may warrant an experiment being always-enabled:
|
||||
|
||||
* A proposal was implemented AFTER it was merged, but BEFORE it had a merged spec PR.
|
||||
These proposals are typically as stable as they'll get, as major changes post-factum of an MSC
|
||||
merge requires another MSC, so only minor changes can be made in the spec PR phase.
|
||||
* The daily experience of users would be at a great detriment without the experiment being enabled.
|
||||
* A proposal is so simple that making it opt-in would be pointless. This is *incredibly* rare.
|
||||
|
||||
The latter two require explicit maintainer approval, so discuss those with the maintainer team
|
||||
first. You can exercise your own judgement for the first.
|
||||
|
||||
Always-on or enabled-by-default experiments must explain in detail why they're exempt from the
|
||||
standard experiments policy via comments in surrounding areas, like
|
||||
`src/core/config/experiments.rs` and `src/core/matrix/versions.rs`. Ideally, these features are not
|
||||
unstable for too long, so explaining a timescale for how long before the feature is stabilised is
|
||||
also helpful.
|
||||
+19
-15
@@ -82,21 +82,6 @@ Consult these documents for more information on compression tuning and levels:
|
||||
|
||||
## Other tweaks
|
||||
|
||||
### Tuning your trusted servers
|
||||
|
||||
:::important Important: Vet your trusted servers!
|
||||
Trusted servers are your first point of contact when obtaining public keys from the wider federated network. They could theoretically impersonate other servers and cause significant harm to your deployment. Please thoroughly verify your trusted servers' credibility before adding them to your configuration.
|
||||
|
||||
If you need suggestions for trusted servers, ask in the Continuwuity support room.
|
||||
:::
|
||||
|
||||
For performance and reliability, it is recommended to set up 3 to 5 trusted servers for your deployment. Currently, these must all be Synapse servers.
|
||||
|
||||
```toml
|
||||
# Example config, using maintainers' recommended homeservers
|
||||
trusted_servers = ["codestorm.net","starstruck.systems","unredacted.org","matrix.org"]
|
||||
```
|
||||
|
||||
### Using UNIX sockets
|
||||
|
||||
If your homeserver and reverse proxy live on the same machine, you may wish to expose Continuwuity on a UNIX socket instead of a port. This removes TCP overhead between the two programs.
|
||||
@@ -126,6 +111,25 @@ https://matrix.example.com {
|
||||
|
||||
</details>
|
||||
|
||||
### Tuning your trusted servers
|
||||
|
||||
:::important Important: Vet your trusted servers!
|
||||
Trusted servers are your first point of contact when obtaining public keys from other servers, and they could theoretically impersonate other servers and cause significant harm to your deployment. Please thoroughly verify your trusted servers' credibility before adding them to your configuration.
|
||||
|
||||
If you need suggestions for trusted servers, ask in the Continuwuity main room.
|
||||
:::
|
||||
|
||||
Trusted servers are queried sequentially in the order they are listed. If you have multiple trusted servers configured, put the faster ones first:
|
||||
|
||||
```toml
|
||||
# Example config, using maintainers' recommended homeservers
|
||||
trusted_servers = ["codestorm.net","starstruck.systems","unredacted.org","matrix.org"]
|
||||
```
|
||||
|
||||
Avoid prioritising `matrix.org` as your primary trusted server, as it tends to be quite slow.
|
||||
|
||||
Some users have also reported that increasing `trusted_server_batch_size` helps with faster joins for huge rooms. Start with doubling the default to `2048` until you find a suitable value.
|
||||
|
||||
### Enable HTTP/3 on your reverse proxy
|
||||
|
||||
Consider enabling the newer **HTTP/3** protocol for inbound connections to Continuwuity. In Caddy HTTP/3 is allowed by default, but you must expose port :443/**udp** on your firewall.
|
||||
|
||||
@@ -78,9 +78,9 @@ To debug and test your UnifiedPush installation, use the [UP-Example] app for An
|
||||
|
||||
### UnifiedPush and push gateways
|
||||
|
||||
Normally, the push gateway URL is pre-configured by the client app. However, some clients (such as Element X) implement UnifiedPush's [Gateway Discovery] mechanism, and attempt to detect a push gateway _on the same domain as the push provider_ to use before falling back to a hardcoded one. Users of these clients can therefore self-host their own push gateway.
|
||||
The push gateway URL is usually pre-configured by the client app. However, some clients (such as Element X) implement UnifiedPush's [Gateway Discovery] mechanism, and attempt to detect a push gateway _on the same domain as the push provider_, before falling back to a hardcoded one.
|
||||
|
||||
Per the [spec][spec-push-gateway-api], these push gateways must be available on the `/_matrix/push/v1/notify` path of said domain. To test that a push gateway is usable, make a request to it from both the homeserver and the client. The returned response should look like the following:
|
||||
Per the [spec][spec-push-gateway-api], these push gateways must be available on the `/_matrix/push/v1/notify` path of said domain. To test that a push gateway is accessible to the homeserver, make a request for it from the homeserver's IP:
|
||||
|
||||
```txt
|
||||
curl https://push.example.com/_matrix/push/v1/notify
|
||||
@@ -122,7 +122,7 @@ Community tutorials for selfhosting some of these stacks are listed below. Unles
|
||||
- Push gateway: [common-proxies]
|
||||
- Push server: [ejabberd's mod_unified_push]
|
||||
- Push app: [Conversations] (and forks)
|
||||
- [Element X push notifications via Conversations][alfredolin-xmpp], by Alfredolin.
|
||||
- [Element X push notifications via Conversations][alfredolin-xmpp], by Alfredo Lin.
|
||||
- Push gateway: [common-proxies]
|
||||
- Push server: [Prosody's mod_unified_push]
|
||||
- Push app: [Conversations]
|
||||
@@ -156,8 +156,6 @@ WARN conduwuit_service::pusher: Pusher URL is a forbidden remote address url=htt
|
||||
|
||||
To fix this, remove your push gateway or push server's address from `ip_range_denylist`, and restart Continuwuity to apply the changes.
|
||||
|
||||
Docker deployments with the push server/gateway on the same host as Continuwuity may run into some further network issues. In this case, consult the [Docker loopback networking issues] section and its workarounds.
|
||||
|
||||
### Push notifications not audible/not displaying
|
||||
|
||||
This is likely an issue with your account's _push rules_, which determines which events are shown to to the user as notifications. Check these push rules in the client's notifications settings and tweak accordingly. Continuwuity also provides an [`!admin users reset-push-rules`](../reference/admin/users#admin-users-reset-push-rules) command, which restores the rules to the default of notifying for every message.
|
||||
@@ -177,7 +175,7 @@ If you find spurious log entries like this in your Continuwuity deployment:
|
||||
WARN push{user_id="@user:example.com" pushkey="very-long-string-of-letters" events=1}:send_push_notice:send_notice:send_request: conduwuit_service::pusher: Could not send request to pusher https//push.example.com: error sending request for url (https://push.example.com/_matrix/push/v1/notify)
|
||||
```
|
||||
|
||||
Then, your server is sending push requests to too many invalid targets. This could be due to one of the following reasons:
|
||||
Then, your server is most likely sending push requests to too many invalid targets. This could be due to one of the following reasons:
|
||||
|
||||
#### Connection issues between the server and the push gateway
|
||||
|
||||
|
||||
Generated
+16
-16
@@ -431,9 +431,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@rspress/core": {
|
||||
"version": "2.1.2",
|
||||
"resolved": "https://registry.npmjs.org/@rspress/core/-/core-2.1.2.tgz",
|
||||
"integrity": "sha512-3ghPRkZFwbuO3tr2Rb5cxi6QfSFWOcxoZ5p4pv21lbN5DxAzMduITFlfgBMTArIQbehXrfXw3OUXe1l422b0RA==",
|
||||
"version": "2.1.1",
|
||||
"resolved": "https://registry.npmjs.org/@rspress/core/-/core-2.1.1.tgz",
|
||||
"integrity": "sha512-GArybZxyifQ/wC8N2SzVyFi5JCJpUXgajITV4if8ylOImjZr8j9Cgy+6o55tXEtq85r6XYYE5fbcEz2nxxCpnA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
@@ -441,7 +441,7 @@
|
||||
"@mdx-js/react": "^3.1.1",
|
||||
"@rsbuild/core": "^2.2.14",
|
||||
"@rsbuild/plugin-react": "~2.1.1",
|
||||
"@rspress/shared": "2.1.2",
|
||||
"@rspress/shared": "2.1.1",
|
||||
"@shikijs/rehype": "^4.2.0",
|
||||
"@shikijs/transformers": "^4.2.0",
|
||||
"@types/mdast": "^4.0.4",
|
||||
@@ -464,8 +464,8 @@
|
||||
"react-router-dom": "^7.18.5",
|
||||
"rehype-external-links": "^3.0.0",
|
||||
"rehype-raw": "^7.0.0",
|
||||
"remark-cjk-friendly": "^2.3.4",
|
||||
"remark-cjk-friendly-gfm-strikethrough": "^2.3.3",
|
||||
"remark-cjk-friendly": "^2.3.3",
|
||||
"remark-cjk-friendly-gfm-strikethrough": "^2.3.2",
|
||||
"remark-gfm": "^4.0.1",
|
||||
"remark-mdx": "^3.1.1",
|
||||
"remark-parse": "^11.0.0",
|
||||
@@ -485,9 +485,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@rspress/plugin-client-redirects": {
|
||||
"version": "2.1.2",
|
||||
"resolved": "https://registry.npmjs.org/@rspress/plugin-client-redirects/-/plugin-client-redirects-2.1.2.tgz",
|
||||
"integrity": "sha512-kNCC7fffXA277TzTDfKpP+QuCI1X218lJ5JH/2iqYR8PHnLw0Y6ZIwoFmJlE0eKaBdniYyBRGn9zgvT93mCWdg==",
|
||||
"version": "2.1.1",
|
||||
"resolved": "https://registry.npmjs.org/@rspress/plugin-client-redirects/-/plugin-client-redirects-2.1.1.tgz",
|
||||
"integrity": "sha512-jrnh0UTczcTAk+xeJH6b2/LFLF2W7UzPYP992GxnW0mWJxPnvKQIk9v051bezD3gDuiGGRv8puFU7PMmwLOaHg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
@@ -498,9 +498,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@rspress/plugin-sitemap": {
|
||||
"version": "2.1.2",
|
||||
"resolved": "https://registry.npmjs.org/@rspress/plugin-sitemap/-/plugin-sitemap-2.1.2.tgz",
|
||||
"integrity": "sha512-qF9NDLLJORa7MM8QY/etgMlrXM8hlArNaK5ntiFimqtKRoF1YTJQSKPsAfMq2PvYrpQJyEqsSg6wJ+r+lyjNlw==",
|
||||
"version": "2.1.1",
|
||||
"resolved": "https://registry.npmjs.org/@rspress/plugin-sitemap/-/plugin-sitemap-2.1.1.tgz",
|
||||
"integrity": "sha512-3Zk+dmitcx5QxiSPi1Wh4exexRnKa09Yyj3710x6UM4sW2cl72SctMZapO7X9ETNrgVt9fW52eQsFzW1y38gSg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
@@ -511,16 +511,16 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@rspress/shared": {
|
||||
"version": "2.1.2",
|
||||
"resolved": "https://registry.npmjs.org/@rspress/shared/-/shared-2.1.2.tgz",
|
||||
"integrity": "sha512-W34tT1fdP3PrdbXpZNKqOGZMOw+RYL70Z9vnkbT1HTTbtX4uMIDE+SU7ByihG0S0LYBsT3kPxA2cXj696253Uw==",
|
||||
"version": "2.1.1",
|
||||
"resolved": "https://registry.npmjs.org/@rspress/shared/-/shared-2.1.1.tgz",
|
||||
"integrity": "sha512-U+OEPt/Ze+ryJdLHvpJJv9hxiRp03rknn5pvhh6v0enjib9SuUrsku/cPzneal3EsNyDZB5kncghpH1iwVKxnA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@rsbuild/core": "^2.2.14",
|
||||
"@shikijs/rehype": "^4.2.0",
|
||||
"@types/react": "^19.3.0",
|
||||
"mdast-util-mdx-jsx": "^3.2.1",
|
||||
"mdast-util-mdx-jsx": "^3.2.0",
|
||||
"unified": "^11.0.5"
|
||||
}
|
||||
},
|
||||
|
||||
@@ -11,7 +11,6 @@ export default defineConfig({
|
||||
light: '/assets/logo.svg',
|
||||
dark: '/assets/logo.svg',
|
||||
},
|
||||
llms: false,
|
||||
// Use `.no-zoom` class to disable image zooms
|
||||
mediumZoom: {
|
||||
selector: '.rspress-doc :not(.no-zoom *) > img',
|
||||
@@ -41,9 +40,7 @@ export default defineConfig({
|
||||
},
|
||||
},
|
||||
},
|
||||
webMcp: false,
|
||||
themeConfig: {
|
||||
llmsUI: false,
|
||||
socialLinks: [
|
||||
{
|
||||
icon: {
|
||||
|
||||
@@ -87,7 +87,6 @@ serde.workspace = true
|
||||
sha1.workspace = true
|
||||
tokio.workspace = true
|
||||
tracing.workspace = true
|
||||
wildmatch.workspace = true
|
||||
|
||||
[lints]
|
||||
workspace = true
|
||||
@@ -3,10 +3,10 @@ use conduwuit::{Err, Result, at};
|
||||
use futures::StreamExt;
|
||||
use ruma::{
|
||||
api::client::dehydrated_device::{
|
||||
delete_dehydrated_device::msc3814 as delete_dehydrated_device,
|
||||
get_dehydrated_device::msc3814 as get_dehydrated_device,
|
||||
get_events::msc3814 as get_events,
|
||||
put_dehydrated_device::msc3814 as put_dehydrated_device,
|
||||
delete_dehydrated_device::unstable as delete_dehydrated_device,
|
||||
get_dehydrated_device::unstable as get_dehydrated_device,
|
||||
get_events::unstable as get_events,
|
||||
put_dehydrated_device::unstable as put_dehydrated_device,
|
||||
},
|
||||
assign,
|
||||
};
|
||||
|
||||
@@ -30,9 +30,9 @@ pub(crate) async fn get_media_config_route(
|
||||
State(services): State<crate::State>,
|
||||
_body: Ruma<get_media_config::v1::Request>,
|
||||
) -> Result<get_media_config::v1::Response> {
|
||||
Ok(get_media_config::v1::Response::new(Some(ruma_from_usize(
|
||||
Ok(get_media_config::v1::Response::new(ruma_from_usize(
|
||||
services.server.config.max_request_size,
|
||||
))))
|
||||
)))
|
||||
}
|
||||
|
||||
/// # `POST /_matrix/media/v3/upload`
|
||||
|
||||
@@ -0,0 +1,398 @@
|
||||
#![allow(deprecated)]
|
||||
|
||||
use axum::extract::State;
|
||||
use conduwuit::{
|
||||
Err, Result, err,
|
||||
utils::{content_disposition::make_content_disposition, math::ruma_from_usize},
|
||||
};
|
||||
use conduwuit_service::media::{CORP_CROSS_ORIGIN, Dim, FileMeta};
|
||||
use reqwest::Url;
|
||||
use ruma::{
|
||||
api::client::media::{
|
||||
create_content, get_content, get_content_as_filename, get_content_thumbnail,
|
||||
get_media_config, get_media_preview,
|
||||
},
|
||||
assign,
|
||||
};
|
||||
use service::media::mxc::Mxc;
|
||||
|
||||
use crate::{Ruma, RumaResponse, client::create_content_route};
|
||||
|
||||
/// # `GET /_matrix/media/v3/config`
|
||||
///
|
||||
/// Returns max upload size.
|
||||
pub(crate) async fn get_media_config_legacy_route(
|
||||
State(services): State<crate::State>,
|
||||
_body: Ruma<get_media_config::v3::Request>,
|
||||
) -> Result<get_media_config::v3::Response> {
|
||||
Ok(get_media_config::v3::Response::new(ruma_from_usize(
|
||||
services.server.config.max_request_size,
|
||||
)))
|
||||
}
|
||||
|
||||
/// # `GET /_matrix/media/v1/config`
|
||||
///
|
||||
/// This is a legacy endpoint ("/v1/") that some very old homeservers and/or
|
||||
/// clients may call. conduwuit adds these for compatibility purposes.
|
||||
/// See <https://spec.matrix.org/legacy/legacy/#id27>
|
||||
///
|
||||
/// Returns max upload size.
|
||||
pub(crate) async fn get_media_config_legacy_legacy_route(
|
||||
State(services): State<crate::State>,
|
||||
body: Ruma<get_media_config::v3::Request>,
|
||||
) -> Result<RumaResponse<get_media_config::v3::Response>> {
|
||||
get_media_config_legacy_route(State(services), body)
|
||||
.await
|
||||
.map(RumaResponse)
|
||||
}
|
||||
|
||||
/// # `GET /_matrix/media/v3/preview_url`
|
||||
///
|
||||
/// Returns URL preview.
|
||||
pub(crate) async fn get_media_preview_legacy_route(
|
||||
State(services): State<crate::State>,
|
||||
body: Ruma<get_media_preview::v3::Request>,
|
||||
) -> Result<get_media_preview::v3::Response> {
|
||||
let sender_user = body.identity.expect_sender_user()?;
|
||||
|
||||
let url = &body.url;
|
||||
let url = Url::parse(&body.url).map_err(|e| {
|
||||
err!(Request(InvalidParam(
|
||||
debug_warn!(%sender_user, %url, "Requested URL is not valid: {e}")
|
||||
)))
|
||||
})?;
|
||||
|
||||
if !services.media.url_preview_allowed(&url) {
|
||||
return Err!(Request(Forbidden(
|
||||
debug_warn!(%sender_user, %url, "URL is not allowed to be previewed")
|
||||
)));
|
||||
}
|
||||
|
||||
let preview = services.media.get_url_preview(&url).await.map_err(|e| {
|
||||
err!(Request(Unknown(
|
||||
debug_error!(%sender_user, %url, "Failed to fetch a URL preview: {e}")
|
||||
)))
|
||||
})?;
|
||||
|
||||
serde_json::value::to_raw_value(&preview)
|
||||
.map(get_media_preview::v3::Response::from_raw_value)
|
||||
.map_err(|error| {
|
||||
err!(Request(Unknown(
|
||||
debug_error!(%sender_user, %url, "Failed to parse URL preview: {error}")
|
||||
)))
|
||||
})
|
||||
}
|
||||
|
||||
/// # `GET /_matrix/media/v1/preview_url`
|
||||
///
|
||||
/// This is a legacy endpoint ("/v1/") that some very old homeservers and/or
|
||||
/// clients may call. conduwuit adds these for compatibility purposes.
|
||||
/// See <https://spec.matrix.org/legacy/legacy/#id27>
|
||||
///
|
||||
/// Returns URL preview.
|
||||
pub(crate) async fn get_media_preview_legacy_legacy_route(
|
||||
State(services): State<crate::State>,
|
||||
body: Ruma<get_media_preview::v3::Request>,
|
||||
) -> Result<RumaResponse<get_media_preview::v3::Response>> {
|
||||
get_media_preview_legacy_route(State(services), body)
|
||||
.await
|
||||
.map(RumaResponse)
|
||||
}
|
||||
|
||||
/// # `POST /_matrix/media/v1/upload`
|
||||
///
|
||||
/// Permanently save media in the server.
|
||||
///
|
||||
/// This is a legacy endpoint ("/v1/") that some very old homeservers and/or
|
||||
/// clients may call. conduwuit adds these for compatibility purposes.
|
||||
/// See <https://spec.matrix.org/legacy/legacy/#id27>
|
||||
///
|
||||
/// - Some metadata will be saved in the database
|
||||
/// - Media will be saved in the media/ directory
|
||||
pub(crate) async fn create_content_legacy_route(
|
||||
State(services): State<crate::State>,
|
||||
body: Ruma<create_content::v3::Request>,
|
||||
) -> Result<RumaResponse<create_content::v3::Response>> {
|
||||
create_content_route(State(services), body)
|
||||
.await
|
||||
.map(RumaResponse)
|
||||
}
|
||||
|
||||
/// # `GET /_matrix/media/v3/download/{serverName}/{mediaId}`
|
||||
///
|
||||
/// Load media from our server or over federation.
|
||||
///
|
||||
/// - Only allows federation if `allow_remote` is true
|
||||
/// - Only redirects if `allow_redirect` is true
|
||||
/// - Uses client-provided `timeout_ms` if available, else defaults to 20
|
||||
/// seconds
|
||||
pub(crate) async fn get_content_legacy_route(
|
||||
State(services): State<crate::State>,
|
||||
body: Ruma<get_content::v3::Request>,
|
||||
) -> Result<get_content::v3::Response> {
|
||||
let mxc = Mxc {
|
||||
server_name: &body.server_name,
|
||||
media_id: &body.media_id,
|
||||
};
|
||||
|
||||
match services.media.get(&mxc).await? {
|
||||
| Some(FileMeta {
|
||||
content,
|
||||
content_type,
|
||||
content_disposition,
|
||||
}) => {
|
||||
let content_disposition = make_content_disposition(
|
||||
content_disposition.as_ref(),
|
||||
content_type.as_deref(),
|
||||
None,
|
||||
);
|
||||
|
||||
Ok(assign!(
|
||||
get_content::v3::Response::new(
|
||||
content.expect("entire file contents"),
|
||||
content_type.unwrap_or_default(),
|
||||
content_disposition,
|
||||
),
|
||||
{
|
||||
cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.into()),
|
||||
}
|
||||
))
|
||||
},
|
||||
| _ =>
|
||||
if !services.globals.server_is_ours(&body.server_name) && body.allow_remote {
|
||||
let response = services
|
||||
.media
|
||||
.fetch_remote_content_legacy(&mxc, body.allow_redirect, body.timeout_ms)
|
||||
.await
|
||||
.map_err(|e| {
|
||||
err!(Request(NotFound(debug_warn!(%mxc, "Fetching media failed: {e:?}"))))
|
||||
})?;
|
||||
|
||||
let content_disposition = make_content_disposition(
|
||||
response.content_disposition.as_ref(),
|
||||
response.content_type.as_deref(),
|
||||
None,
|
||||
);
|
||||
|
||||
Ok(assign!(
|
||||
get_content::v3::Response::new(
|
||||
response.file,
|
||||
response.content_type.unwrap_or_default(),
|
||||
content_disposition,
|
||||
),
|
||||
{
|
||||
cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.into()),
|
||||
}
|
||||
))
|
||||
} else {
|
||||
Err!(Request(NotFound("Media not found.")))
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
/// # `GET /_matrix/media/v1/download/{serverName}/{mediaId}`
|
||||
///
|
||||
/// Load media from our server or over federation.
|
||||
///
|
||||
/// This is a legacy endpoint ("/v1/") that some very old homeservers and/or
|
||||
/// clients may call. conduwuit adds these for compatibility purposes.
|
||||
/// See <https://spec.matrix.org/legacy/legacy/#id27>
|
||||
///
|
||||
/// - Only allows federation if `allow_remote` is true
|
||||
/// - Only redirects if `allow_redirect` is true
|
||||
/// - Uses client-provided `timeout_ms` if available, else defaults to 20
|
||||
/// seconds
|
||||
pub(crate) async fn get_content_legacy_legacy_route(
|
||||
State(services): State<crate::State>,
|
||||
body: Ruma<get_content::v3::Request>,
|
||||
) -> Result<RumaResponse<get_content::v3::Response>> {
|
||||
get_content_legacy_route(State(services), body)
|
||||
.await
|
||||
.map(RumaResponse)
|
||||
}
|
||||
|
||||
/// # `GET /_matrix/media/v3/download/{serverName}/{mediaId}/{fileName}`
|
||||
///
|
||||
/// Load media from our server or over federation, permitting desired filename.
|
||||
///
|
||||
/// - Only allows federation if `allow_remote` is true
|
||||
/// - Only redirects if `allow_redirect` is true
|
||||
/// - Uses client-provided `timeout_ms` if available, else defaults to 20
|
||||
/// seconds
|
||||
pub(crate) async fn get_content_as_filename_legacy_route(
|
||||
State(services): State<crate::State>,
|
||||
body: Ruma<get_content_as_filename::v3::Request>,
|
||||
) -> Result<get_content_as_filename::v3::Response> {
|
||||
let mxc = Mxc {
|
||||
server_name: &body.server_name,
|
||||
media_id: &body.media_id,
|
||||
};
|
||||
|
||||
match services.media.get(&mxc).await? {
|
||||
| Some(FileMeta {
|
||||
content,
|
||||
content_type,
|
||||
content_disposition,
|
||||
}) => {
|
||||
let content_disposition = make_content_disposition(
|
||||
content_disposition.as_ref(),
|
||||
content_type.as_deref(),
|
||||
Some(&body.filename),
|
||||
);
|
||||
|
||||
Ok(assign!(get_content_as_filename::v3::Response::new(
|
||||
content.expect("entire file contents"),
|
||||
content_type.unwrap_or_default(),
|
||||
content_disposition,
|
||||
),
|
||||
{
|
||||
cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.into()),
|
||||
}
|
||||
))
|
||||
},
|
||||
| _ =>
|
||||
if !services.globals.server_is_ours(&body.server_name) && body.allow_remote {
|
||||
let response = services
|
||||
.media
|
||||
.fetch_remote_content_legacy(&mxc, body.allow_redirect, body.timeout_ms)
|
||||
.await
|
||||
.map_err(|e| {
|
||||
err!(Request(NotFound(debug_warn!(%mxc, "Fetching media failed: {e:?}"))))
|
||||
})?;
|
||||
|
||||
let content_disposition = make_content_disposition(
|
||||
response.content_disposition.as_ref(),
|
||||
response.content_type.as_deref(),
|
||||
None,
|
||||
);
|
||||
|
||||
Ok(assign!(
|
||||
get_content_as_filename::v3::Response::new(
|
||||
response.file,
|
||||
response.content_type.unwrap_or_default(),
|
||||
content_disposition,
|
||||
),
|
||||
{
|
||||
cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.into()),
|
||||
}
|
||||
))
|
||||
} else {
|
||||
Err!(Request(NotFound("Media not found.")))
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
/// # `GET /_matrix/media/v1/download/{serverName}/{mediaId}/{fileName}`
|
||||
///
|
||||
/// Load media from our server or over federation, permitting desired filename.
|
||||
///
|
||||
/// This is a legacy endpoint ("/v1/") that some very old homeservers and/or
|
||||
/// clients may call. conduwuit adds these for compatibility purposes.
|
||||
/// See <https://spec.matrix.org/legacy/legacy/#id27>
|
||||
///
|
||||
/// - Only allows federation if `allow_remote` is true
|
||||
/// - Only redirects if `allow_redirect` is true
|
||||
/// - Uses client-provided `timeout_ms` if available, else defaults to 20
|
||||
/// seconds
|
||||
pub(crate) async fn get_content_as_filename_legacy_legacy_route(
|
||||
State(services): State<crate::State>,
|
||||
body: Ruma<get_content_as_filename::v3::Request>,
|
||||
) -> Result<RumaResponse<get_content_as_filename::v3::Response>> {
|
||||
get_content_as_filename_legacy_route(State(services), body)
|
||||
.await
|
||||
.map(RumaResponse)
|
||||
}
|
||||
|
||||
/// # `GET /_matrix/media/v3/thumbnail/{serverName}/{mediaId}`
|
||||
///
|
||||
/// Load media thumbnail from our server or over federation.
|
||||
///
|
||||
/// - Only allows federation if `allow_remote` is true
|
||||
/// - Only redirects if `allow_redirect` is true
|
||||
/// - Uses client-provided `timeout_ms` if available, else defaults to 20
|
||||
/// seconds
|
||||
pub(crate) async fn get_content_thumbnail_legacy_route(
|
||||
State(services): State<crate::State>,
|
||||
body: Ruma<get_content_thumbnail::v3::Request>,
|
||||
) -> Result<get_content_thumbnail::v3::Response> {
|
||||
let mxc = Mxc {
|
||||
server_name: &body.server_name,
|
||||
media_id: &body.media_id,
|
||||
};
|
||||
|
||||
let dim = Dim::from_ruma(body.width, body.height, body.method.clone())?;
|
||||
match services.media.get_thumbnail(&mxc, &dim).await? {
|
||||
| Some(FileMeta {
|
||||
content,
|
||||
content_type,
|
||||
content_disposition,
|
||||
}) => {
|
||||
let content_disposition = make_content_disposition(
|
||||
content_disposition.as_ref(),
|
||||
content_type.as_deref(),
|
||||
None,
|
||||
);
|
||||
|
||||
Ok(assign!(
|
||||
get_content_thumbnail::v3::Response::new(
|
||||
content.expect("entire file contents"),
|
||||
content_type.unwrap_or_default(),
|
||||
content_disposition,
|
||||
),
|
||||
{
|
||||
cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.to_owned()),
|
||||
}
|
||||
))
|
||||
},
|
||||
| _ =>
|
||||
if !services.globals.server_is_ours(&body.server_name) && body.allow_remote {
|
||||
let response = services
|
||||
.media
|
||||
.fetch_remote_thumbnail_legacy(&body)
|
||||
.await
|
||||
.map_err(|e| {
|
||||
err!(Request(NotFound(debug_warn!(%mxc, "Fetching media failed: {e:?}"))))
|
||||
})?;
|
||||
|
||||
let content_disposition = make_content_disposition(
|
||||
response.content_disposition.as_ref(),
|
||||
response.content_type.as_deref(),
|
||||
None,
|
||||
);
|
||||
|
||||
Ok(assign!(
|
||||
get_content_thumbnail::v3::Response::new(
|
||||
response.file,
|
||||
response.content_type.unwrap_or_default(),
|
||||
content_disposition,
|
||||
),
|
||||
{
|
||||
cross_origin_resource_policy: Some(CORP_CROSS_ORIGIN.to_owned()),
|
||||
}
|
||||
))
|
||||
} else {
|
||||
Err!(Request(NotFound("Media not found.")))
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
/// # `GET /_matrix/media/v1/thumbnail/{serverName}/{mediaId}`
|
||||
///
|
||||
/// Load media thumbnail from our server or over federation.
|
||||
///
|
||||
/// This is a legacy endpoint ("/v1/") that some very old homeservers and/or
|
||||
/// clients may call. conduwuit adds these for compatibility purposes.
|
||||
/// See <https://spec.matrix.org/legacy/legacy/#id27>
|
||||
///
|
||||
/// - Only allows federation if `allow_remote` is true
|
||||
/// - Only redirects if `allow_redirect` is true
|
||||
/// - Uses client-provided `timeout_ms` if available, else defaults to 20
|
||||
/// seconds
|
||||
pub(crate) async fn get_content_thumbnail_legacy_legacy_route(
|
||||
State(services): State<crate::State>,
|
||||
body: Ruma<get_content_thumbnail::v3::Request>,
|
||||
) -> Result<RumaResponse<get_content_thumbnail::v3::Response>> {
|
||||
get_content_thumbnail_legacy_route(State(services), body)
|
||||
.await
|
||||
.map(RumaResponse)
|
||||
}
|
||||
@@ -12,6 +12,7 @@ pub(super) mod directory;
|
||||
pub(super) mod filter;
|
||||
pub(super) mod keys;
|
||||
pub(super) mod media;
|
||||
pub(super) mod media_legacy;
|
||||
pub(super) mod membership;
|
||||
pub(super) mod message;
|
||||
pub(super) mod mutual_rooms;
|
||||
@@ -56,6 +57,7 @@ pub(super) use directory::*;
|
||||
pub(super) use filter::*;
|
||||
pub(super) use keys::*;
|
||||
pub(super) use media::*;
|
||||
pub(super) use media_legacy::*;
|
||||
pub(super) use membership::*;
|
||||
pub use membership::{leave_all_rooms, leave_room, remote_leave_room};
|
||||
pub(super) use message::*;
|
||||
|
||||
@@ -13,8 +13,8 @@ use crate::Ruma;
|
||||
#[tracing::instrument(skip_all, name = "mutual_rooms", level = "info")]
|
||||
pub(crate) async fn get_mutual_rooms_unstable_route(
|
||||
State(services): State<crate::State>,
|
||||
body: Ruma<get_mutual_rooms::msc2666::Request>,
|
||||
) -> Result<get_mutual_rooms::msc2666::Response> {
|
||||
body: Ruma<get_mutual_rooms::unstable::Request>,
|
||||
) -> Result<get_mutual_rooms::unstable::Response> {
|
||||
let sender_user = body.identity.expect_sender_user()?;
|
||||
|
||||
if sender_user == body.user_id {
|
||||
@@ -28,7 +28,7 @@ pub(crate) async fn get_mutual_rooms_unstable_route(
|
||||
.collect()
|
||||
.await;
|
||||
|
||||
Ok(get_mutual_rooms::msc2666::Response::new(mutual_rooms))
|
||||
Ok(get_mutual_rooms::unstable::Response::new(mutual_rooms))
|
||||
}
|
||||
|
||||
/// # `GET /_matrix/client/v1/mutual_rooms`
|
||||
|
||||
@@ -121,10 +121,7 @@ pub(crate) async fn create_room_route(
|
||||
// ID exactly matches this, and abort if it doesn't. Otherwise, we use it
|
||||
// as the room ID itself.
|
||||
let expect_room_id = {
|
||||
let body_ref = body
|
||||
.json_body
|
||||
.as_ref()
|
||||
.ok_or_else(|| err!(Request(BadJson("Invalid JSON body"))))?;
|
||||
let body_ref = body.json_body.as_ref().unwrap();
|
||||
if let Some(CanonicalJsonValue::String(room_id)) = body_ref
|
||||
.get("fi.mau.room_id")
|
||||
.or_else(|| body_ref.get("room_id"))
|
||||
@@ -305,10 +302,7 @@ pub(crate) async fn create_room_route(
|
||||
// Allow requesters to override the `origin_server_ts` to customize room ids
|
||||
// from v12 onwards
|
||||
let custom_origin_server_ts = {
|
||||
let body_ref = body
|
||||
.json_body
|
||||
.as_ref()
|
||||
.ok_or_else(|| err!(Request(BadJson("Invalid JSON body"))))?;
|
||||
let body_ref = body.json_body.as_ref().unwrap();
|
||||
body_ref
|
||||
.get("origin_server_ts")
|
||||
.or_else(|| body_ref.get("fi.mau.origin_server_ts"))
|
||||
|
||||
@@ -1,30 +1,14 @@
|
||||
use axum::extract::{Query, State};
|
||||
use conduwuit::{
|
||||
Err, Error, Event, PduEvent, Result, config::experiments::ToggledExperiment, debug_warn, err,
|
||||
};
|
||||
use futures::TryFutureExt;
|
||||
use http::StatusCode;
|
||||
use ruma::{
|
||||
UserId,
|
||||
api::{client::room::get_room_event, error::ErrorKind},
|
||||
};
|
||||
use serde::Deserialize;
|
||||
use serde_json::json;
|
||||
use axum::extract::State;
|
||||
use conduwuit::{Err, Event, Result, debug_warn, err};
|
||||
use ruma::api::client::room::get_room_event;
|
||||
|
||||
use crate::{Ruma, client::is_ignored_pdu};
|
||||
|
||||
#[derive(Deserialize)]
|
||||
pub(crate) struct Msc2815Params {
|
||||
#[serde(rename = "fi.mau.msc2815.include_unredacted_content", default)]
|
||||
include_unredacted_content: Option<bool>,
|
||||
}
|
||||
|
||||
/// # `GET /_matrix/client/r0/rooms/{roomId}/event/{eventId}`
|
||||
///
|
||||
/// Gets a single event.
|
||||
pub(crate) async fn get_room_event_route(
|
||||
State(ref services): State<crate::State>,
|
||||
Query(params): Query<Msc2815Params>,
|
||||
ref body: Ruma<get_room_event::v3::Request>,
|
||||
) -> Result<get_room_event::v3::Response> {
|
||||
let sender_user = body.identity.expect_sender_user()?;
|
||||
@@ -70,13 +54,6 @@ pub(crate) async fn get_room_event_route(
|
||||
return Err!(Request(Forbidden("You don't have permission to view this event.")));
|
||||
}
|
||||
|
||||
if services.config.experiments.msc2815.is_enabled()
|
||||
&& params.include_unredacted_content.unwrap_or(false)
|
||||
&& event.is_redacted()
|
||||
{
|
||||
unredact(services, sender_user, &mut event).await?;
|
||||
}
|
||||
|
||||
if let Err(e) = services
|
||||
.rooms
|
||||
.pdu_metadata
|
||||
@@ -95,59 +72,3 @@ pub(crate) async fn get_room_event_route(
|
||||
|
||||
Ok(get_room_event::v3::Response::new(event.into_format()))
|
||||
}
|
||||
|
||||
async fn unredact(services: &crate::State, sender_user: &UserId, event: &mut PduEvent) -> Result {
|
||||
if !services.users.is_admin(sender_user).await {
|
||||
let power_levels = services
|
||||
.rooms
|
||||
.state_accessor
|
||||
.get_room_power_levels(&event.room_id_or_hash())
|
||||
.await;
|
||||
|
||||
if power_levels.for_user(sender_user) < power_levels.redact {
|
||||
return Err!(Request(Forbidden(
|
||||
"You don't have permission to view redacted content in this room."
|
||||
)));
|
||||
}
|
||||
}
|
||||
|
||||
let content = services
|
||||
.rooms
|
||||
.timeline
|
||||
.get_pdu_id(event.event_id())
|
||||
.and_then(async |pdu_id| {
|
||||
services
|
||||
.rooms
|
||||
.timeline
|
||||
.get_unredacted_content(&pdu_id)
|
||||
.await
|
||||
})
|
||||
.await;
|
||||
|
||||
let Ok(content) = content else {
|
||||
// CustomErrorKind has private fields; only serde can build one.
|
||||
let keep_ms = services
|
||||
.config
|
||||
.experiments
|
||||
.msc2815
|
||||
.expect("msc2815 config is disabled but unredact() attempted to access it anyway")
|
||||
.unredacted_content_max_age_secs
|
||||
.saturating_mul(1000);
|
||||
|
||||
let kind = serde_json::from_value::<ErrorKind>(json!({
|
||||
"errcode": "FI.MAU.MSC2815_UNREDACTED_CONTENT_DELETED",
|
||||
"fi.mau.msc2815.content_keep_ms": keep_ms,
|
||||
}))
|
||||
.expect("errcode is a valid custom error kind");
|
||||
|
||||
return Err(Error::Request(
|
||||
kind,
|
||||
"The unredacted content of this event is not available.".into(),
|
||||
StatusCode::NOT_FOUND,
|
||||
));
|
||||
};
|
||||
|
||||
event.content = content;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@@ -15,11 +15,11 @@ use crate::{Ruma, router::ClientIdentity};
|
||||
#[tracing::instrument(skip_all, name = "stripped_state", level = "info")]
|
||||
pub(crate) async fn get_stripped_state_route(
|
||||
State(services): State<crate::State>,
|
||||
body: Ruma<get_stripped_state::msc4560::Request>,
|
||||
) -> Result<get_stripped_state::msc4560::Response> {
|
||||
body: Ruma<get_stripped_state::unstable::Request>,
|
||||
) -> Result<get_stripped_state::unstable::Response> {
|
||||
let user_id = body.identity.as_ref().and_then(ClientIdentity::sender_user);
|
||||
|
||||
if body.via.len() > get_stripped_state::msc4560::MAX_VIAS {
|
||||
if body.via.len() > get_stripped_state::unstable::MAX_VIAS {
|
||||
return Err!(Request(TooLarge("Too many vias, please be less indecisive.")));
|
||||
}
|
||||
|
||||
@@ -59,7 +59,7 @@ pub(crate) async fn get_stripped_state_route(
|
||||
via,
|
||||
RoomStrippedState { state, num_joined_members, .. },
|
||||
)) => Ok(
|
||||
assign!(get_stripped_state::msc4560::Response::new(via), { state, num_joined_members }),
|
||||
assign!(get_stripped_state::unstable::Response::new(via), { state, num_joined_members }),
|
||||
),
|
||||
| Accessibility::Inaccessible => {
|
||||
Err!(Request(Forbidden("You may not request this room's stripped state.")))
|
||||
|
||||
@@ -39,7 +39,7 @@ pub(crate) async fn get_room_summary(
|
||||
Err!(Request(Forbidden("You may not preview this room."), FORBIDDEN))
|
||||
},
|
||||
| Accessibility::NotFound => {
|
||||
Err!(Request(NotFound("This room does not exist.")))
|
||||
Err!(Request(Forbidden("This room does not exist."), FORBIDDEN))
|
||||
},
|
||||
}
|
||||
}
|
||||
@@ -95,7 +95,12 @@ pub(crate) async fn send_message_event_route(
|
||||
PartialPdu {
|
||||
event_type: body.event_type.clone().into(),
|
||||
content,
|
||||
sticky: body.sticky_duration_ms.map(sticky::object),
|
||||
sticky: services
|
||||
.config
|
||||
.allow_sticky_events
|
||||
.then_some(body.sticky_duration_ms)
|
||||
.flatten()
|
||||
.map(sticky::object),
|
||||
unsigned: Some(unsigned),
|
||||
timestamp: if body.identity.is_appservice()
|
||||
|| services.admin.user_is_admin(sender_user).await
|
||||
|
||||
@@ -64,7 +64,7 @@ pub(super) async fn load_joined_room(
|
||||
services: &Services,
|
||||
sync_context: SyncContext<'_>,
|
||||
ref room_id: OwnedRoomId,
|
||||
) -> Result<JoinedRoom> {
|
||||
) -> Result<(JoinedRoom, DeviceListUpdates)> {
|
||||
/*
|
||||
Building a sync response involves many steps which all depend on each other.
|
||||
To parallelize the process as much as possible, each step is divided into its own function,
|
||||
@@ -80,6 +80,7 @@ pub(super) async fn load_joined_room(
|
||||
sticky,
|
||||
summary,
|
||||
notification_counts,
|
||||
device_list_updates,
|
||||
},
|
||||
) = try_join3(
|
||||
build_account_data(services, sync_context, room_id),
|
||||
@@ -116,7 +117,7 @@ pub(super) async fn load_joined_room(
|
||||
unread_thread_notifications: BTreeMap::new(),
|
||||
});
|
||||
|
||||
Ok(joined_room)
|
||||
Ok((joined_room, device_list_updates))
|
||||
}
|
||||
|
||||
/// Collect changes to the syncing user's account data events.
|
||||
@@ -262,6 +263,7 @@ struct StateAndTimeline {
|
||||
sticky: Sticky,
|
||||
summary: Option<RoomSummary>,
|
||||
notification_counts: Option<UnreadNotificationsCount>,
|
||||
device_list_updates: DeviceListUpdates,
|
||||
}
|
||||
|
||||
async fn build_sticky_events(
|
||||
@@ -271,6 +273,10 @@ async fn build_sticky_events(
|
||||
timeline: &TimelinePdus,
|
||||
joined_since_last_sync: bool,
|
||||
) -> Sticky {
|
||||
if !services.config.allow_sticky_events {
|
||||
return Sticky::new();
|
||||
}
|
||||
|
||||
let SyncContext {
|
||||
syncing_user,
|
||||
last_sync_end_count,
|
||||
@@ -375,14 +381,24 @@ async fn build_state_and_timeline(
|
||||
debug_warn!("timeline for newly joined room is empty");
|
||||
}
|
||||
|
||||
let summary = build_room_summary(
|
||||
services,
|
||||
sync_context,
|
||||
room_id,
|
||||
shortstatehashes,
|
||||
&timeline,
|
||||
&state_events,
|
||||
joined_since_last_sync,
|
||||
let (summary, device_list_updates) = try_join(
|
||||
build_room_summary(
|
||||
services,
|
||||
sync_context,
|
||||
room_id,
|
||||
shortstatehashes,
|
||||
&timeline,
|
||||
&state_events,
|
||||
joined_since_last_sync,
|
||||
),
|
||||
build_device_list_updates(
|
||||
services,
|
||||
sync_context,
|
||||
room_id,
|
||||
shortstatehashes,
|
||||
&state_events,
|
||||
joined_since_last_sync,
|
||||
),
|
||||
)
|
||||
.await?;
|
||||
|
||||
@@ -418,6 +434,7 @@ async fn build_state_and_timeline(
|
||||
sticky,
|
||||
summary,
|
||||
notification_counts,
|
||||
device_list_updates,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -841,34 +858,35 @@ async fn build_heroes(
|
||||
.await
|
||||
}
|
||||
|
||||
/// Collect updates to users' device lists for E2EE in a joined room.
|
||||
#[tracing::instrument(level = "debug", skip_all, fields(%room_id))]
|
||||
pub(super) async fn load_device_list_updates(
|
||||
/// Collect updates to users' device lists for E2EE.
|
||||
#[tracing::instrument(level = "debug", skip_all)]
|
||||
async fn build_device_list_updates(
|
||||
services: &Services,
|
||||
sync_context: SyncContext<'_>,
|
||||
room_id: &RoomId,
|
||||
) -> Result<DeviceListUpdates> {
|
||||
let SyncContext {
|
||||
SyncContext {
|
||||
syncing_user,
|
||||
last_sync_end_count,
|
||||
current_count,
|
||||
..
|
||||
} = sync_context;
|
||||
|
||||
let mut device_list_updates = DeviceListUpdates::new();
|
||||
}: SyncContext<'_>,
|
||||
room_id: &RoomId,
|
||||
ShortStateHashes { current_shortstatehash, .. }: ShortStateHashes,
|
||||
state_events: &Vec<PduEvent>,
|
||||
joined_since_last_sync: bool,
|
||||
) -> Result<DeviceListUpdates> {
|
||||
let is_encrypted_room = services
|
||||
.rooms
|
||||
.state_accessor
|
||||
.state_get(current_shortstatehash, &StateEventType::RoomEncryption, "")
|
||||
.is_ok();
|
||||
|
||||
// initial syncs don't include device updates, and rooms which aren't
|
||||
// encrypted don't affect them, so return early in either of those cases
|
||||
if last_sync_end_count.is_none()
|
||||
|| !services
|
||||
.rooms
|
||||
.state_accessor
|
||||
.is_encrypted_room(room_id)
|
||||
.await
|
||||
{
|
||||
return Ok(device_list_updates);
|
||||
if last_sync_end_count.is_none() || !(is_encrypted_room.await) {
|
||||
return Ok(DeviceListUpdates::new());
|
||||
}
|
||||
|
||||
let mut device_list_updates = DeviceListUpdates::new();
|
||||
|
||||
// add users with changed keys to the `changed` list
|
||||
services
|
||||
.users
|
||||
@@ -879,56 +897,19 @@ pub(super) async fn load_device_list_updates(
|
||||
})
|
||||
.await;
|
||||
|
||||
let shortstatehashes = fetch_shortstatehashes(services, sync_context, room_id).await?;
|
||||
let ShortStateHashes {
|
||||
current_shortstatehash,
|
||||
last_sync_end_shortstatehash,
|
||||
} = shortstatehashes;
|
||||
|
||||
if check_joined_since_last_sync(services, shortstatehashes, sync_context).await? {
|
||||
// the syncing user now shares an encrypted room with every member
|
||||
services
|
||||
.rooms
|
||||
.state_cache
|
||||
.room_members(room_id)
|
||||
.ready_for_each(|user_id| {
|
||||
device_list_updates.changed.insert(user_id);
|
||||
})
|
||||
.await;
|
||||
} else if let Some(last_sync_end_shortstatehash) = last_sync_end_shortstatehash
|
||||
&& last_sync_end_shortstatehash != current_shortstatehash
|
||||
{
|
||||
// add users who now share encrypted rooms to `changed` and
|
||||
// users who no longer share encrypted rooms to `left`
|
||||
let state_added = services
|
||||
.rooms
|
||||
.state_accessor
|
||||
.state_added((last_sync_end_shortstatehash, current_shortstatehash))
|
||||
.await?;
|
||||
|
||||
for (shortstatekey, _) in state_added {
|
||||
let Ok((StateEventType::RoomMember, state_key)) = services
|
||||
.rooms
|
||||
.short
|
||||
.get_statekey_from_short(shortstatekey)
|
||||
.await
|
||||
// add users who now share encrypted rooms to `changed` and
|
||||
// users who no longer share encrypted rooms to `left`
|
||||
for state_event in state_events {
|
||||
if state_event.kind == RoomMember {
|
||||
let Some(content): Option<RoomMemberEventContent> = state_event.get_content().ok()
|
||||
else {
|
||||
continue;
|
||||
};
|
||||
|
||||
let Ok(user_id) = OwnedUserId::try_from(state_key.as_str()) else {
|
||||
continue;
|
||||
};
|
||||
|
||||
let Ok(content): Result<RoomMemberEventContent> = services
|
||||
.rooms
|
||||
.state_accessor
|
||||
.state_get_content(
|
||||
current_shortstatehash,
|
||||
&StateEventType::RoomMember,
|
||||
user_id.as_str(),
|
||||
)
|
||||
.await
|
||||
let Some(user_id): Option<OwnedUserId> = state_event
|
||||
.state_key
|
||||
.as_ref()
|
||||
.and_then(|key| key.parse().ok())
|
||||
else {
|
||||
continue;
|
||||
};
|
||||
@@ -944,7 +925,7 @@ pub(super) async fn load_device_list_updates(
|
||||
| Leave if !shares_encrypted_room => {
|
||||
device_list_updates.left.insert(user_id);
|
||||
},
|
||||
| Join if shares_encrypted_room => {
|
||||
| Join if joined_since_last_sync || shares_encrypted_room => {
|
||||
device_list_updates.changed.insert(user_id);
|
||||
},
|
||||
| _ => (),
|
||||
|
||||
+14
-102
@@ -21,7 +21,7 @@ use futures::{FutureExt, StreamExt, TryFutureExt, future::OptionFuture};
|
||||
use ruma::{
|
||||
DeviceId, OwnedUserId, RoomId, UserId,
|
||||
api::client::{
|
||||
filter::{self, FilterDefinition, RoomFilter},
|
||||
filter::FilterDefinition,
|
||||
sync::sync_events::{
|
||||
self, DeviceLists,
|
||||
v3::{
|
||||
@@ -39,17 +39,13 @@ use service::{
|
||||
account_data::AnyRawAccountDataEvent,
|
||||
rooms::lazy_loading::{self, MemberSet, Options as _},
|
||||
};
|
||||
use wildmatch::WildMatch;
|
||||
|
||||
use super::{load_timeline, share_encrypted_room};
|
||||
use crate::{
|
||||
Ruma,
|
||||
client::{
|
||||
is_ignored_invite,
|
||||
sync::v3::{
|
||||
joined::{load_device_list_updates, load_joined_room},
|
||||
left::load_left_room,
|
||||
},
|
||||
sync::v3::{joined::load_joined_room, left::load_left_room},
|
||||
},
|
||||
client_ip::ClientIp,
|
||||
};
|
||||
@@ -275,47 +271,34 @@ pub(crate) async fn build_sync_events(
|
||||
.rooms
|
||||
.state_cache
|
||||
.rooms_joined(syncing_user)
|
||||
.ready_filter(|room_id| room_selected(&filter.room, room_id))
|
||||
.broad_filter_map(|room_id| async {
|
||||
let joined_room = load_joined_room(services, context, room_id.clone()).await;
|
||||
|
||||
match joined_room {
|
||||
| Ok(room) => Some((room_id, room)),
|
||||
| Ok((room, updates)) => Some((room_id, room, updates)),
|
||||
| Err(err) => {
|
||||
error!(?err, %room_id, "error loading joined room");
|
||||
None
|
||||
},
|
||||
}
|
||||
})
|
||||
.ready_fold(BTreeMap::new(), |mut joined_rooms, (room_id, joined_room)| {
|
||||
if !joined_room.is_empty() {
|
||||
joined_rooms.insert(room_id, joined_room);
|
||||
}
|
||||
.ready_fold(
|
||||
(BTreeMap::new(), DeviceListUpdates::new()),
|
||||
|(mut joined_rooms, mut all_updates), (room_id, joined_room, updates)| {
|
||||
all_updates.merge(updates);
|
||||
|
||||
joined_rooms
|
||||
});
|
||||
if !joined_room.is_empty() {
|
||||
joined_rooms.insert(room_id, joined_room);
|
||||
}
|
||||
|
||||
// a filtered out room still contributes its device list updates
|
||||
let device_list_updates = services
|
||||
.rooms
|
||||
.state_cache
|
||||
.rooms_joined(syncing_user)
|
||||
.broad_filter_map(|room_id| async move {
|
||||
load_device_list_updates(services, context, &room_id)
|
||||
.await
|
||||
.inspect_err(|err| error!(?err, %room_id, "error loading device list updates"))
|
||||
.ok()
|
||||
})
|
||||
.ready_fold(DeviceListUpdates::new(), |mut all_updates, updates| {
|
||||
all_updates.merge(updates);
|
||||
all_updates
|
||||
});
|
||||
(joined_rooms, all_updates)
|
||||
},
|
||||
);
|
||||
|
||||
let left_rooms = services
|
||||
.rooms
|
||||
.state_cache
|
||||
.rooms_left(syncing_user)
|
||||
.ready_filter(|(room_id, _)| room_selected(&filter.room, room_id))
|
||||
.broad_filter_map(|(room_id, leave_pdu)| async {
|
||||
let left_room = load_left_room(services, context, room_id.clone(), leave_pdu).await;
|
||||
|
||||
@@ -334,7 +317,6 @@ pub(crate) async fn build_sync_events(
|
||||
.rooms
|
||||
.state_cache
|
||||
.rooms_invited(syncing_user)
|
||||
.ready_filter(|(room_id, _)| room_selected(&filter.room, room_id))
|
||||
.wide_filter_map(async |(room_id, invite_state)| {
|
||||
if is_ignored_invite(services, syncing_user, &room_id).await {
|
||||
None
|
||||
@@ -365,7 +347,6 @@ pub(crate) async fn build_sync_events(
|
||||
.rooms
|
||||
.state_cache
|
||||
.rooms_knocked(syncing_user)
|
||||
.ready_filter(|(room_id, _)| room_selected(&filter.room, room_id))
|
||||
.fold_default(|mut knocked_rooms: BTreeMap<_, _>, (room_id, knock_state)| async move {
|
||||
let knock_count = services
|
||||
.rooms
|
||||
@@ -395,13 +376,6 @@ pub(crate) async fn build_sync_events(
|
||||
.account_data
|
||||
.changes_since(None, syncing_user, last_sync_end_count, Some(current_count))
|
||||
.ready_filter_map(|e| extract_variant!(e, AnyRawAccountDataEvent::Global))
|
||||
.ready_filter(|event| {
|
||||
event
|
||||
.get_field::<String>("type")
|
||||
.ok()
|
||||
.flatten()
|
||||
.is_some_and(|event_type| type_selected(&filter.account_data, &event_type))
|
||||
})
|
||||
.collect();
|
||||
|
||||
let to_device_events = services
|
||||
@@ -430,8 +404,7 @@ pub(crate) async fn build_sync_events(
|
||||
.list_unused_fallback_key_types(syncing_user, syncing_device);
|
||||
|
||||
let (
|
||||
joined_rooms,
|
||||
mut device_list_updates,
|
||||
(joined_rooms, mut device_list_updates),
|
||||
left_rooms,
|
||||
invited_rooms,
|
||||
knocked_rooms,
|
||||
@@ -444,7 +417,6 @@ pub(crate) async fn build_sync_events(
|
||||
) = async {
|
||||
futures::join!(
|
||||
joined_rooms,
|
||||
device_list_updates,
|
||||
left_rooms,
|
||||
invited_rooms,
|
||||
knocked_rooms,
|
||||
@@ -493,24 +465,6 @@ pub(crate) async fn build_sync_events(
|
||||
Ok(response)
|
||||
}
|
||||
|
||||
fn room_selected(filter: &RoomFilter, room_id: &RoomId) -> bool {
|
||||
!filter.not_rooms.iter().any(|not_room| not_room == room_id)
|
||||
&& filter
|
||||
.rooms
|
||||
.as_ref()
|
||||
.is_none_or(|rooms| rooms.iter().any(|room| room == room_id))
|
||||
}
|
||||
|
||||
fn type_selected(filter: &filter::Filter, event_type: &str) -> bool {
|
||||
let matches = |pattern: &String| WildMatch::new(pattern).matches(event_type);
|
||||
|
||||
!filter.not_types.iter().any(matches)
|
||||
&& filter
|
||||
.types
|
||||
.as_ref()
|
||||
.is_none_or(|types| types.iter().any(matches))
|
||||
}
|
||||
|
||||
#[tracing::instrument(name = "presence", level = "debug", skip_all)]
|
||||
async fn process_presence_updates(
|
||||
services: &Services,
|
||||
@@ -574,45 +528,3 @@ async fn prepare_lazily_loaded_members(
|
||||
|
||||
lazily_loaded_members
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use ruma::{owned_room_id, room_id};
|
||||
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn rooms_filter_selects_rooms() {
|
||||
let room_id = room_id!("!a:example.com");
|
||||
let mut filter = RoomFilter::default();
|
||||
assert!(room_selected(&filter, room_id));
|
||||
|
||||
filter.rooms = Some(Vec::new());
|
||||
assert!(!room_selected(&filter, room_id));
|
||||
|
||||
filter.rooms = Some(vec![room_id.to_owned()]);
|
||||
assert!(room_selected(&filter, room_id));
|
||||
|
||||
filter.not_rooms = vec![owned_room_id!("!a:example.com")];
|
||||
assert!(!room_selected(&filter, room_id));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn types_filter_selects_account_data() {
|
||||
let mut filter = filter::Filter::default();
|
||||
assert!(type_selected(&filter, "m.direct"));
|
||||
|
||||
filter.types = Some(Vec::new());
|
||||
assert!(!type_selected(&filter, "m.direct"));
|
||||
|
||||
filter.types = Some(vec!["m.direct".to_owned()]);
|
||||
assert!(type_selected(&filter, "m.direct"));
|
||||
|
||||
filter.types = Some(vec!["m.*".to_owned()]);
|
||||
assert!(type_selected(&filter, "m.direct"));
|
||||
assert!(!type_selected(&filter, "im.ponies.user_emotes"));
|
||||
|
||||
filter.not_types = vec!["m.direct".to_owned()];
|
||||
assert!(!type_selected(&filter, "m.direct"));
|
||||
}
|
||||
}
|
||||
+128
-126
@@ -24,7 +24,7 @@ use conduwuit::{
|
||||
use conduwuit_service::{
|
||||
Services,
|
||||
rooms::read_receipt::pack_receipts,
|
||||
sync::{SnakeConnectionsKey, StickyDelivered, into_snake_key},
|
||||
sync::{SnakeConnectionsKey, into_snake_key},
|
||||
};
|
||||
use futures::{
|
||||
FutureExt, StreamExt, TryFutureExt,
|
||||
@@ -34,7 +34,7 @@ use futures::{
|
||||
use ruma::{
|
||||
DeviceId, MilliSecondsSinceUnixEpoch, OwnedEventId, OwnedRoomId, RoomId, UInt, UserId,
|
||||
api::client::sync::sync_events::{
|
||||
self, DeviceLists, UnreadNotificationsCount, msc4186::request::ExtensionRoomConfig,
|
||||
self, DeviceLists, UnreadNotificationsCount, v5::request::ExtensionRoomConfig,
|
||||
},
|
||||
assign,
|
||||
directory::RoomTypeFilter,
|
||||
@@ -63,7 +63,7 @@ use crate::{
|
||||
client_ip::ClientIp,
|
||||
};
|
||||
|
||||
type SyncInfo<'a> = (&'a UserId, &'a DeviceId, u64, &'a sync_events::msc4186::Request);
|
||||
type SyncInfo<'a> = (&'a UserId, &'a DeviceId, u64, &'a sync_events::v5::Request);
|
||||
type TodoRooms = BTreeMap<OwnedRoomId, (BTreeSet<TypeStateKey>, usize, u64)>;
|
||||
type KnownRooms = BTreeMap<String, BTreeMap<OwnedRoomId, u64>>;
|
||||
type KnownRoomUpdates = BTreeMap<String, BTreeSet<OwnedRoomId>>;
|
||||
@@ -86,9 +86,8 @@ fn num_live_events<'a>(
|
||||
}
|
||||
|
||||
struct SyncCollection {
|
||||
response: sync_events::msc4186::Response,
|
||||
response: sync_events::v5::Response,
|
||||
known_room_updates: KnownRoomUpdates,
|
||||
sticky_delivered: StickyDelivered,
|
||||
}
|
||||
|
||||
/// `POST /_matrix/client/unstable/org.matrix.simplified_msc3575/sync`
|
||||
@@ -104,8 +103,8 @@ struct SyncCollection {
|
||||
pub(crate) async fn sync_events_v5_route(
|
||||
State(ref services): State<crate::State>,
|
||||
ClientIp(client_ip): ClientIp, // NOTE: Required for updating device metadata
|
||||
body: Ruma<sync_events::msc4186::Request>,
|
||||
) -> Result<sync_events::msc4186::Response> {
|
||||
body: Ruma<sync_events::v5::Request>,
|
||||
) -> Result<sync_events::v5::Response> {
|
||||
let sender_user = body.identity.expect_sender_user()?;
|
||||
let sender_device = body.identity.expect_sender_device()?;
|
||||
|
||||
@@ -143,7 +142,7 @@ pub(crate) async fn sync_events_v5_route(
|
||||
}
|
||||
|
||||
// Get sticky parameters from cache
|
||||
let (known_rooms, sticky_delivered) =
|
||||
let known_rooms =
|
||||
services
|
||||
.sync
|
||||
.update_snake_sync_request_with_cache(&snake_key, globalsince, &mut body);
|
||||
@@ -156,7 +155,6 @@ pub(crate) async fn sync_events_v5_route(
|
||||
&body,
|
||||
globalsince,
|
||||
&known_rooms,
|
||||
&sticky_delivered,
|
||||
)
|
||||
.await?;
|
||||
|
||||
@@ -175,7 +173,6 @@ pub(crate) async fn sync_events_v5_route(
|
||||
&body,
|
||||
globalsince,
|
||||
&known_rooms,
|
||||
&sticky_delivered,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
@@ -205,13 +202,13 @@ async fn collect_sync_response(
|
||||
services: &Services,
|
||||
sender_user: &UserId,
|
||||
sender_device: &DeviceId,
|
||||
body: &sync_events::msc4186::Request,
|
||||
body: &sync_events::v5::Request,
|
||||
globalsince: u64,
|
||||
known_rooms: &KnownRooms,
|
||||
sticky_delivered: &StickyDelivered,
|
||||
) -> Result<SyncCollection> {
|
||||
// Bounds every read below and becomes the `pos` returned to the client.
|
||||
let next_batch = services.globals.next_count()?;
|
||||
// Zero would be echoed back as a request for an initial sync.
|
||||
let next_batch = services.globals.current_count()?.max(1);
|
||||
|
||||
let all_joined_rooms = services
|
||||
.rooms
|
||||
@@ -265,6 +262,7 @@ async fn collect_sync_response(
|
||||
let pos = next_batch.to_string();
|
||||
|
||||
let mut todo_rooms: TodoRooms = BTreeMap::new();
|
||||
let mut sticky_rooms = BTreeSet::new();
|
||||
|
||||
let sync_info: SyncInfo<'_> = (sender_user, sender_device, globalsince, body);
|
||||
|
||||
@@ -279,16 +277,16 @@ async fn collect_sync_response(
|
||||
let (account_data, e2ee, to_device, receipts) =
|
||||
try_join4(account_data, e2ee, to_device, receipts).await?;
|
||||
|
||||
let extensions = assign!(sync_events::msc4186::response::Extensions::default(), {
|
||||
let extensions = assign!(sync_events::v5::response::Extensions::default(), {
|
||||
account_data,
|
||||
e2ee,
|
||||
to_device,
|
||||
receipts,
|
||||
typing: sync_events::msc4186::response::Typing::default(),
|
||||
sticky_events: sync_events::msc4186::response::StickyEvents::default(),
|
||||
typing: sync_events::v5::response::Typing::default(),
|
||||
sticky_events: sync_events::v5::response::StickyEvents::default(),
|
||||
});
|
||||
|
||||
let mut response = assign!(sync_events::msc4186::Response::new(pos), {
|
||||
let mut response = assign!(sync_events::v5::Response::new(pos), {
|
||||
txn_id: body.txn_id.clone(),
|
||||
lists: BTreeMap::new(),
|
||||
rooms: BTreeMap::new(),
|
||||
@@ -321,6 +319,7 @@ async fn collect_sync_response(
|
||||
all_rooms,
|
||||
&direct_rooms,
|
||||
&mut todo_rooms,
|
||||
&mut sticky_rooms,
|
||||
known_rooms,
|
||||
&mut response,
|
||||
)
|
||||
@@ -330,6 +329,7 @@ async fn collect_sync_response(
|
||||
"subscriptions".to_owned(),
|
||||
fetch_subscriptions(services, body, known_rooms, &allowed_rooms, &mut todo_rooms).await,
|
||||
);
|
||||
sticky_rooms.extend(body.room_subscriptions.keys().cloned());
|
||||
|
||||
let mut timeline_event_ids = BTreeSet::new();
|
||||
response.rooms = process_rooms(
|
||||
@@ -346,31 +346,25 @@ async fn collect_sync_response(
|
||||
)
|
||||
.await?;
|
||||
|
||||
let (sticky_events, sticky_delivered) = collect_sticky_events(
|
||||
response.extensions.sticky_events = collect_sticky_events(
|
||||
services,
|
||||
sender_user,
|
||||
body,
|
||||
next_batch,
|
||||
sticky_delivered,
|
||||
&known_room_updates,
|
||||
&sticky_rooms,
|
||||
&joined_room_ids,
|
||||
&todo_rooms,
|
||||
&timeline_event_ids,
|
||||
)
|
||||
.await;
|
||||
response.extensions.sticky_events = sticky_events;
|
||||
.await?;
|
||||
|
||||
response.extensions.typing =
|
||||
collect_typing_events(services, sender_user, body, &todo_rooms, &known_room_updates)
|
||||
.await?;
|
||||
|
||||
Ok(SyncCollection {
|
||||
response,
|
||||
known_room_updates,
|
||||
sticky_delivered,
|
||||
})
|
||||
Ok(SyncCollection { response, known_room_updates })
|
||||
}
|
||||
|
||||
fn response_is_empty(response: &sync_events::msc4186::Response) -> bool {
|
||||
fn response_is_empty(response: &sync_events::v5::Response) -> bool {
|
||||
let no_account_data = response.extensions.account_data.global.is_empty()
|
||||
&& response
|
||||
.extensions
|
||||
@@ -401,7 +395,7 @@ async fn commit_sync_collection(
|
||||
services: &Services,
|
||||
sender_user: &UserId,
|
||||
sender_device: &DeviceId,
|
||||
body: &sync_events::msc4186::Request,
|
||||
body: &sync_events::v5::Request,
|
||||
globalsince: u64,
|
||||
snake_key: &SnakeConnectionsKey,
|
||||
collection: &SyncCollection,
|
||||
@@ -414,10 +408,9 @@ async fn commit_sync_collection(
|
||||
.parse()
|
||||
.expect("generated sync position"),
|
||||
collection.known_room_updates.clone(),
|
||||
collection.sticky_delivered.clone(),
|
||||
);
|
||||
|
||||
if body.extensions.to_device.enabled {
|
||||
if body.extensions.to_device.enabled.unwrap_or(false) {
|
||||
services
|
||||
.users
|
||||
.remove_to_device_events(sender_user, sender_device, globalsince)
|
||||
@@ -427,7 +420,7 @@ async fn commit_sync_collection(
|
||||
|
||||
async fn fetch_subscriptions(
|
||||
services: &Services,
|
||||
body: &sync_events::msc4186::Request,
|
||||
body: &sync_events::v5::Request,
|
||||
known_rooms: &KnownRooms,
|
||||
allowed_rooms: &BTreeSet<OwnedRoomId>,
|
||||
todo_rooms: &mut TodoRooms,
|
||||
@@ -487,14 +480,15 @@ async fn fetch_subscriptions(
|
||||
async fn handle_lists<'a, Rooms, AllRooms>(
|
||||
services: &Services,
|
||||
sender_user: &UserId,
|
||||
body: &sync_events::msc4186::Request,
|
||||
body: &sync_events::v5::Request,
|
||||
all_invited_rooms: Rooms,
|
||||
all_joined_rooms: Rooms,
|
||||
all_rooms: AllRooms,
|
||||
direct_rooms: &HashSet<OwnedRoomId>,
|
||||
todo_rooms: &'a mut TodoRooms,
|
||||
sticky_rooms: &mut BTreeSet<OwnedRoomId>,
|
||||
known_rooms: &'a KnownRooms,
|
||||
response: &'_ mut sync_events::msc4186::Response,
|
||||
response: &'_ mut sync_events::v5::Response,
|
||||
) -> KnownRoomUpdates
|
||||
where
|
||||
Rooms: Iterator<Item = &'a RoomId> + Clone + Send + 'a,
|
||||
@@ -585,6 +579,7 @@ where
|
||||
.await;
|
||||
sort_rooms_by_activity(&mut active_rooms);
|
||||
let active_rooms: Vec<_> = active_rooms.into_iter().map(at!(0)).collect();
|
||||
sticky_rooms.extend(active_rooms.iter().map(|room_id| (*room_id).to_owned()));
|
||||
|
||||
let mut new_known_rooms: BTreeSet<OwnedRoomId> = BTreeSet::new();
|
||||
|
||||
@@ -636,7 +631,7 @@ where
|
||||
}
|
||||
response.lists.insert(
|
||||
list_id.clone(),
|
||||
assign!(sync_events::msc4186::response::List::default(), {
|
||||
assign!(sync_events::v5::response::List::default(), {
|
||||
count: ruma_from_usize(active_rooms.len()),
|
||||
}),
|
||||
);
|
||||
@@ -754,10 +749,10 @@ async fn process_rooms<'a, Rooms>(
|
||||
all_invited_rooms: Rooms,
|
||||
all_knocked_rooms: Rooms,
|
||||
todo_rooms: &TodoRooms,
|
||||
response: &mut sync_events::msc4186::Response,
|
||||
body: &sync_events::msc4186::Request,
|
||||
response: &mut sync_events::v5::Response,
|
||||
body: &sync_events::v5::Request,
|
||||
timeline_event_ids: &mut BTreeSet<OwnedEventId>,
|
||||
) -> Result<BTreeMap<OwnedRoomId, sync_events::msc4186::response::Room>>
|
||||
) -> Result<BTreeMap<OwnedRoomId, sync_events::v5::response::Room>>
|
||||
where
|
||||
Rooms: Iterator<Item = &'a RoomId> + Clone + Send + 'a,
|
||||
{
|
||||
@@ -792,7 +787,7 @@ where
|
||||
|
||||
rooms.insert(
|
||||
room_id.clone(),
|
||||
assign!(sync_events::msc4186::response::Room::new(), {
|
||||
assign!(sync_events::v5::response::Room::new(), {
|
||||
initial: Some(roomsince == &0),
|
||||
invite_state,
|
||||
limited: true,
|
||||
@@ -826,7 +821,7 @@ where
|
||||
|
||||
rooms.insert(
|
||||
room_id.clone(),
|
||||
assign!(sync_events::msc4186::response::Room::new(), {
|
||||
assign!(sync_events::v5::response::Room::new(), {
|
||||
initial: Some(roomsince == &0),
|
||||
invite_state: Some(knock_state),
|
||||
limited: true,
|
||||
@@ -993,7 +988,7 @@ where
|
||||
.state_accessor
|
||||
.get_member(room_id, &user_id)
|
||||
.map_ok(|member_event| {
|
||||
assign!(sync_events::msc4186::response::Hero::new(user_id.clone()), {
|
||||
assign!(sync_events::v5::response::Hero::new(user_id.clone()), {
|
||||
name: member_event.displayname,
|
||||
avatar: member_event.avatar_url,
|
||||
})
|
||||
@@ -1037,7 +1032,7 @@ where
|
||||
|
||||
rooms.insert(
|
||||
room_id.clone(),
|
||||
assign!(sync_events::msc4186::response::Room::new(), {
|
||||
assign!(sync_events::v5::response::Room::new(), {
|
||||
name: services
|
||||
.rooms
|
||||
.state_accessor
|
||||
@@ -1108,61 +1103,64 @@ where
|
||||
Ok(rooms)
|
||||
}
|
||||
|
||||
#[expect(clippy::too_many_arguments)]
|
||||
async fn collect_sticky_events(
|
||||
services: &Services,
|
||||
sender_user: &UserId,
|
||||
body: &sync_events::msc4186::Request,
|
||||
next_batch: u64,
|
||||
sticky_delivered: &StickyDelivered,
|
||||
known_room_updates: &KnownRoomUpdates,
|
||||
body: &sync_events::v5::Request,
|
||||
sticky_rooms: &BTreeSet<OwnedRoomId>,
|
||||
joined_room_ids: &BTreeSet<OwnedRoomId>,
|
||||
todo_rooms: &TodoRooms,
|
||||
timeline_event_ids: &BTreeSet<OwnedEventId>,
|
||||
) -> (sync_events::msc4186::response::StickyEvents, StickyDelivered) {
|
||||
let mut response = sync_events::msc4186::response::StickyEvents::default();
|
||||
let mut delivered = StickyDelivered::new();
|
||||
|
||||
let sticky_events = &body.extensions.sticky_events;
|
||||
if !sticky_events.enabled.unwrap_or(false) {
|
||||
return (response, delivered);
|
||||
) -> Result<sync_events::v5::response::StickyEvents> {
|
||||
if !services.config.allow_sticky_events
|
||||
|| !body.extensions.sticky_events.enabled.unwrap_or(false)
|
||||
{
|
||||
return Ok(sync_events::v5::response::StickyEvents::default());
|
||||
}
|
||||
|
||||
let scope = extension_scope(
|
||||
sticky_events.lists.as_deref(),
|
||||
sticky_events.rooms.as_deref(),
|
||||
body.lists.keys().map(String::as_str),
|
||||
known_room_updates,
|
||||
);
|
||||
let limit = sticky_events
|
||||
let since = body
|
||||
.extensions
|
||||
.sticky_events
|
||||
.since
|
||||
.as_deref()
|
||||
.and_then(|token| token.parse::<u64>().ok())
|
||||
.unwrap_or(0);
|
||||
let limit = body
|
||||
.extensions
|
||||
.sticky_events
|
||||
.limit
|
||||
.map_or(DEFAULT_STICKY_LIMIT, usize_from_ruma)
|
||||
.clamp(1, DEFAULT_STICKY_LIMIT);
|
||||
let now = u64::from(MilliSecondsSinceUnixEpoch::now().get());
|
||||
let oldest_sticky_ts = now.saturating_sub(sticky::MAX_DURATION_MS);
|
||||
|
||||
for room_id in scope.intersection(joined_room_ids) {
|
||||
let since = sticky_delivered.get(room_id).copied();
|
||||
let mut backlog = Vec::new();
|
||||
let mut stream = Vec::new();
|
||||
for room_id in sticky_rooms
|
||||
.iter()
|
||||
.filter(|room_id| joined_room_ids.contains(*room_id))
|
||||
{
|
||||
// a room the client has not seen before needs its whole backlog, which
|
||||
// a single stream position cannot express
|
||||
let initial = todo_rooms
|
||||
.get(room_id)
|
||||
.is_some_and(|&(_, _, roomsince)| roomsince == 0);
|
||||
|
||||
let mut pending = Vec::new();
|
||||
let pdus = services.rooms.timeline.pdus_rev(room_id, None).ignore_err();
|
||||
pin_mut!(pdus);
|
||||
while let Some((count, pdu)) = pdus.next().await {
|
||||
let PduCount::Normal(count) = count else {
|
||||
continue;
|
||||
};
|
||||
|
||||
if count > next_batch {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Nothing older than this can still be sticky, and everything up to
|
||||
// `since` has already been delivered
|
||||
// nothing older than this can still be sticky, and on the stream we
|
||||
// have already delivered everything up to `since`
|
||||
if u64::from(pdu.origin_server_ts) < oldest_sticky_ts
|
||||
|| since.is_some_and(|since| count <= since)
|
||||
|| (!initial && count <= PduCount::Normal(since))
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
let PduCount::Normal(count) = count else {
|
||||
continue;
|
||||
};
|
||||
|
||||
let is_sticky = pdu
|
||||
.sticky
|
||||
.as_deref()
|
||||
@@ -1179,26 +1177,38 @@ async fn collect_sticky_events(
|
||||
continue;
|
||||
}
|
||||
|
||||
pending.push((count, pdu));
|
||||
if count > since {
|
||||
stream.push((count, room_id.clone(), pdu));
|
||||
} else {
|
||||
backlog.push((room_id.clone(), pdu));
|
||||
}
|
||||
}
|
||||
}
|
||||
stream.sort_by_key(|(count, ..)| *count);
|
||||
|
||||
pending.reverse();
|
||||
let truncated = pending.len() > limit;
|
||||
let mut last_count = next_batch;
|
||||
for (count, pdu) in pending.into_iter().take(limit) {
|
||||
push_sticky_event(services, &mut response, sender_user, room_id.clone(), pdu).await;
|
||||
last_count = count;
|
||||
}
|
||||
let mut response = sync_events::v5::response::StickyEvents::default();
|
||||
|
||||
delivered.insert(room_id.clone(), if truncated { last_count } else { next_batch });
|
||||
// MSC4480 lets us ignore the limit for a newly visible room's backlog
|
||||
for (room_id, pdu) in backlog {
|
||||
push_sticky_event(services, &mut response, sender_user, room_id, pdu).await;
|
||||
}
|
||||
|
||||
(response, delivered)
|
||||
let mut next_batch = None;
|
||||
for (count, room_id, pdu) in stream.into_iter().take(limit) {
|
||||
push_sticky_event(services, &mut response, sender_user, room_id, pdu).await;
|
||||
next_batch = Some(count);
|
||||
}
|
||||
|
||||
if !response.rooms.is_empty() {
|
||||
response.next_batch = Some(next_batch.unwrap_or(since).to_string());
|
||||
}
|
||||
|
||||
Ok(response)
|
||||
}
|
||||
|
||||
async fn push_sticky_event(
|
||||
services: &Services,
|
||||
response: &mut sync_events::msc4186::response::StickyEvents,
|
||||
response: &mut sync_events::v5::response::StickyEvents,
|
||||
sender_user: &UserId,
|
||||
room_id: OwnedRoomId,
|
||||
mut pdu: PduEvent,
|
||||
@@ -1265,12 +1275,12 @@ async fn collect_required_state(
|
||||
async fn collect_typing_events(
|
||||
services: &Services,
|
||||
sender_user: &UserId,
|
||||
body: &sync_events::msc4186::Request,
|
||||
body: &sync_events::v5::Request,
|
||||
todo_rooms: &TodoRooms,
|
||||
known_room_updates: &KnownRoomUpdates,
|
||||
) -> Result<sync_events::msc4186::response::Typing> {
|
||||
) -> Result<sync_events::v5::response::Typing> {
|
||||
if !body.extensions.typing.enabled.unwrap_or(false) {
|
||||
return Ok(sync_events::msc4186::response::Typing::default());
|
||||
return Ok(sync_events::v5::response::Typing::default());
|
||||
}
|
||||
let typing = &body.extensions.typing;
|
||||
let scope = extension_scope(
|
||||
@@ -1280,10 +1290,10 @@ async fn collect_typing_events(
|
||||
known_room_updates,
|
||||
);
|
||||
if scope.is_empty() {
|
||||
return Ok(sync_events::msc4186::response::Typing::default());
|
||||
return Ok(sync_events::v5::response::Typing::default());
|
||||
}
|
||||
|
||||
let mut typing_response = sync_events::msc4186::response::Typing::default();
|
||||
let mut typing_response = sync_events::v5::response::Typing::default();
|
||||
for (room_id, (_, _, roomsince)) in todo_rooms {
|
||||
if !scope.contains(room_id) {
|
||||
continue;
|
||||
@@ -1363,17 +1373,12 @@ fn extension_scope<'a>(
|
||||
|
||||
async fn collect_account_data(
|
||||
services: &Services,
|
||||
(sender_user, _, globalsince, body): (
|
||||
&UserId,
|
||||
&DeviceId,
|
||||
u64,
|
||||
&sync_events::msc4186::Request,
|
||||
),
|
||||
) -> sync_events::msc4186::response::AccountData {
|
||||
let mut account_data = sync_events::msc4186::response::AccountData::default();
|
||||
(sender_user, _, globalsince, body): (&UserId, &DeviceId, u64, &sync_events::v5::Request),
|
||||
) -> sync_events::v5::response::AccountData {
|
||||
let mut account_data = sync_events::v5::response::AccountData::default();
|
||||
|
||||
if !body.extensions.account_data.enabled.unwrap_or(false) {
|
||||
return sync_events::msc4186::response::AccountData::default();
|
||||
return sync_events::v5::response::AccountData::default();
|
||||
}
|
||||
|
||||
account_data.global = services
|
||||
@@ -1408,15 +1413,15 @@ async fn collect_e2ee<'a, Rooms>(
|
||||
&UserId,
|
||||
&DeviceId,
|
||||
u64,
|
||||
&sync_events::msc4186::Request,
|
||||
&sync_events::v5::Request,
|
||||
),
|
||||
all_joined_rooms: Rooms,
|
||||
) -> Result<sync_events::msc4186::response::E2EE>
|
||||
) -> Result<sync_events::v5::response::E2EE>
|
||||
where
|
||||
Rooms: Iterator<Item = &'a RoomId> + Send + 'a,
|
||||
{
|
||||
if !body.extensions.e2ee.enabled {
|
||||
return Ok(sync_events::msc4186::response::E2EE::default());
|
||||
if !body.extensions.e2ee.enabled.unwrap_or(false) {
|
||||
return Ok(sync_events::v5::response::E2EE::default());
|
||||
}
|
||||
let mut left_encrypted_users = HashSet::new(); // Users that have left any encrypted rooms the sender was in
|
||||
let mut device_list_changes = HashSet::new();
|
||||
@@ -1603,7 +1608,7 @@ where
|
||||
}
|
||||
}
|
||||
|
||||
Ok(assign!(sync_events::msc4186::response::E2EE::default(), {
|
||||
Ok(assign!(sync_events::v5::response::E2EE::default(), {
|
||||
device_unused_fallback_key_types: None,
|
||||
|
||||
device_one_time_keys_count: services
|
||||
@@ -1622,12 +1627,12 @@ async fn collect_to_device(
|
||||
services: &Services,
|
||||
(sender_user, sender_device, globalsince, body): SyncInfo<'_>,
|
||||
next_batch: u64,
|
||||
) -> Option<sync_events::msc4186::response::ToDevice> {
|
||||
if !body.extensions.to_device.enabled {
|
||||
) -> Option<sync_events::v5::response::ToDevice> {
|
||||
if !body.extensions.to_device.enabled.unwrap_or(false) {
|
||||
return None;
|
||||
}
|
||||
|
||||
Some(assign!(sync_events::msc4186::response::ToDevice::default(), {
|
||||
Some(assign!(sync_events::v5::response::ToDevice::default(), {
|
||||
next_batch: next_batch.to_string(),
|
||||
events: services
|
||||
.users
|
||||
@@ -1638,9 +1643,9 @@ async fn collect_to_device(
|
||||
}))
|
||||
}
|
||||
|
||||
async fn collect_receipts(_services: &Services) -> sync_events::msc4186::response::Receipts {
|
||||
async fn collect_receipts(_services: &Services) -> sync_events::v5::response::Receipts {
|
||||
// TODO: get explicitly requested read receipts
|
||||
sync_events::msc4186::response::Receipts::default()
|
||||
sync_events::v5::response::Receipts::default()
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
@@ -1653,25 +1658,23 @@ mod tests {
|
||||
|
||||
fn custom_room_type() -> RoomTypeFilter { RoomTypeFilter::from(Some("com.example")) }
|
||||
|
||||
fn response() -> sync_events::msc4186::Response {
|
||||
sync_events::msc4186::Response::new("1".to_owned())
|
||||
}
|
||||
fn response() -> sync_events::v5::Response { sync_events::v5::Response::new("1".to_owned()) }
|
||||
|
||||
fn typing_scope_request() -> sync_events::msc4186::Request {
|
||||
let mut request = sync_events::msc4186::Request::new();
|
||||
fn typing_scope_request() -> sync_events::v5::Request {
|
||||
let mut request = sync_events::v5::Request::new();
|
||||
request
|
||||
.lists
|
||||
.insert("first".to_owned(), sync_events::msc4186::request::List::default());
|
||||
.insert("first".to_owned(), sync_events::v5::request::List::default());
|
||||
request
|
||||
.lists
|
||||
.insert("second".to_owned(), sync_events::msc4186::request::List::default());
|
||||
.insert("second".to_owned(), sync_events::v5::request::List::default());
|
||||
request.room_subscriptions.insert(
|
||||
owned_room_id!("!subscription-a:example.com"),
|
||||
sync_events::msc4186::request::RoomSubscription::default(),
|
||||
sync_events::v5::request::RoomSubscription::default(),
|
||||
);
|
||||
request.room_subscriptions.insert(
|
||||
owned_room_id!("!subscription-b:example.com"),
|
||||
sync_events::msc4186::request::RoomSubscription::default(),
|
||||
sync_events::v5::request::RoomSubscription::default(),
|
||||
);
|
||||
request
|
||||
}
|
||||
@@ -1765,10 +1768,9 @@ mod tests {
|
||||
#[test]
|
||||
fn a_room_with_no_events_is_still_empty() {
|
||||
let mut response = response();
|
||||
response.rooms.insert(
|
||||
owned_room_id!("!a:example.com"),
|
||||
sync_events::msc4186::response::Room::default(),
|
||||
);
|
||||
response
|
||||
.rooms
|
||||
.insert(owned_room_id!("!a:example.com"), sync_events::v5::response::Room::default());
|
||||
|
||||
assert!(response_is_empty(&response));
|
||||
}
|
||||
@@ -1779,7 +1781,7 @@ mod tests {
|
||||
let mut response = response();
|
||||
response
|
||||
.rooms
|
||||
.insert(room_id.to_owned(), sync_events::msc4186::response::Room::default());
|
||||
.insert(room_id.to_owned(), sync_events::v5::response::Room::default());
|
||||
response
|
||||
.extensions
|
||||
.receipts
|
||||
@@ -1844,7 +1846,7 @@ mod tests {
|
||||
#[test]
|
||||
fn to_device_without_events_is_empty() {
|
||||
let mut response = response();
|
||||
response.extensions.to_device = Some(sync_events::msc4186::response::ToDevice::default());
|
||||
response.extensions.to_device = Some(sync_events::v5::response::ToDevice::default());
|
||||
|
||||
assert!(response_is_empty(&response));
|
||||
}
|
||||
|
||||
@@ -27,7 +27,12 @@ pub(crate) async fn get_supported_versions_route(
|
||||
State(services): State<crate::State>,
|
||||
_body: Ruma<get_supported_versions::Request>,
|
||||
) -> Result<get_supported_versions::Response> {
|
||||
let unstable_features = unstable_features(&services.config.experiments);
|
||||
let mut unstable_features = unstable_features();
|
||||
|
||||
if services.config.allow_sticky_events {
|
||||
// sticky events (https://github.com/matrix-org/matrix-spec-proposals/pull/4354)
|
||||
unstable_features.insert("org.matrix.msc4354".to_owned(), true);
|
||||
}
|
||||
|
||||
Ok(assign!(get_supported_versions::Response::new(versions()), {
|
||||
unstable_features
|
||||
|
||||
@@ -43,9 +43,9 @@ pub(crate) async fn well_known_client(
|
||||
/// homeserver, implementing MSC4143.
|
||||
pub(crate) async fn get_rtc_transports(
|
||||
State(services): State<crate::State>,
|
||||
_body: Ruma<ruma::api::client::rtc::transports::msc4143::Request>,
|
||||
) -> Result<ruma::api::client::rtc::transports::msc4143::Response> {
|
||||
Ok(ruma::api::client::rtc::transports::msc4143::Response::new(
|
||||
_body: Ruma<ruma::api::client::rtc::transports::v1::Request>,
|
||||
) -> Result<ruma::api::client::rtc::transports::v1::Response> {
|
||||
Ok(ruma::api::client::rtc::transports::v1::Response::new(
|
||||
services.config.matrix_rtc.foci.clone(),
|
||||
))
|
||||
}
|
||||
|
||||
+40
-11
@@ -8,7 +8,7 @@ use std::str::FromStr;
|
||||
use axum::{
|
||||
Router,
|
||||
response::{IntoResponse, Redirect},
|
||||
routing::{any, get},
|
||||
routing::{any, get, post},
|
||||
};
|
||||
use conduwuit::err;
|
||||
pub(super) use conduwuit_service::state::State;
|
||||
@@ -247,16 +247,45 @@ pub fn build(router: Router<State>, state: State) -> Router<State> {
|
||||
// and other functionality will continue to work
|
||||
router = router.ruma_route(&server::get_openid_userinfo_route);
|
||||
|
||||
if config.allow_legacy_media {
|
||||
router = router
|
||||
.ruma_route(&client::get_media_config_legacy_route)
|
||||
.ruma_route(&client::get_media_preview_legacy_route)
|
||||
.ruma_route(&client::get_content_legacy_route)
|
||||
.ruma_route(&client::get_content_as_filename_legacy_route)
|
||||
.ruma_route(&client::get_content_thumbnail_legacy_route)
|
||||
.route("/_matrix/media/v1/config", get(client::get_media_config_legacy_legacy_route))
|
||||
.route("/_matrix/media/v1/upload", post(client::create_content_legacy_route))
|
||||
.route(
|
||||
"/_matrix/media/v1/preview_url",
|
||||
get(client::get_media_preview_legacy_legacy_route),
|
||||
)
|
||||
.route(
|
||||
"/_matrix/media/v1/download/{server_name}/{media_id}",
|
||||
get(client::get_content_legacy_legacy_route),
|
||||
)
|
||||
.route(
|
||||
"/_matrix/media/v1/download/{server_name}/{media_id}/{file_name}",
|
||||
get(client::get_content_as_filename_legacy_legacy_route),
|
||||
)
|
||||
.route(
|
||||
"/_matrix/media/v1/thumbnail/{server_name}/{media_id}",
|
||||
get(client::get_content_thumbnail_legacy_legacy_route),
|
||||
);
|
||||
} else {
|
||||
router = router
|
||||
.route("/_matrix/media/v1/{*path}", any(legacy_media_disabled))
|
||||
.route("/_matrix/media/v3/config", any(legacy_media_disabled))
|
||||
.route("/_matrix/media/v3/download/{*path}", any(legacy_media_disabled))
|
||||
.route("/_matrix/media/v3/thumbnail/{*path}", any(legacy_media_disabled))
|
||||
.route("/_matrix/media/v3/preview_url", any(redirect_legacy_preview))
|
||||
.route("/_matrix/media/r0/config", any(legacy_media_disabled))
|
||||
.route("/_matrix/media/r0/download/{*path}", any(legacy_media_disabled))
|
||||
.route("/_matrix/media/r0/thumbnail/{*path}", any(legacy_media_disabled))
|
||||
.route("/_matrix/media/r0/preview_url", any(redirect_legacy_preview));
|
||||
}
|
||||
|
||||
router
|
||||
.route("/_matrix/media/v1/{*path}", any(legacy_media_disabled))
|
||||
.route("/_matrix/media/v3/config", any(legacy_media_disabled))
|
||||
.route("/_matrix/media/v3/download/{*path}", any(legacy_media_disabled))
|
||||
.route("/_matrix/media/v3/thumbnail/{*path}", any(legacy_media_disabled))
|
||||
.route("/_matrix/media/v3/preview_url", any(redirect_legacy_preview))
|
||||
.route("/_matrix/media/r0/config", any(legacy_media_disabled))
|
||||
.route("/_matrix/media/r0/download/{*path}", any(legacy_media_disabled))
|
||||
.route("/_matrix/media/r0/thumbnail/{*path}", any(legacy_media_disabled))
|
||||
.route("/_matrix/media/r0/preview_url", any(redirect_legacy_preview))
|
||||
}
|
||||
|
||||
async fn redirect_legacy_preview(uri: Uri) -> impl IntoResponse {
|
||||
@@ -277,7 +306,7 @@ async fn redirect_legacy_preview(uri: Uri) -> impl IntoResponse {
|
||||
}
|
||||
|
||||
async fn legacy_media_disabled() -> impl IntoResponse {
|
||||
err!(Request(NotFound("Unauthenticated media is disabled.")))
|
||||
err!(Request(Forbidden("Unauthenticated media is disabled.")))
|
||||
}
|
||||
|
||||
async fn federation_disabled() -> impl IntoResponse {
|
||||
|
||||
@@ -47,6 +47,9 @@ pub(crate) async fn get_missing_events_route(
|
||||
if body.latest_events.len() > limit {
|
||||
return Err!(Request(InvalidParam("Too many latest_events")));
|
||||
}
|
||||
if body.earliest_events.len() > limit {
|
||||
return Err!(Request(InvalidParam("Too many earliest_events")));
|
||||
}
|
||||
|
||||
let room_version = services.rooms.state.get_room_version(&body.room_id).await?;
|
||||
|
||||
|
||||
@@ -14,8 +14,8 @@ use crate::Ruma;
|
||||
/// [MSC4560]: https://github.com/matrix-org/matrix-spec-proposals/pull/4560
|
||||
pub(crate) async fn get_stripped_state_route(
|
||||
State(services): State<crate::State>,
|
||||
body: Ruma<get_stripped_state::msc4560::Request>,
|
||||
) -> Result<get_stripped_state::msc4560::Response> {
|
||||
body: Ruma<get_stripped_state::unstable::Request>,
|
||||
) -> Result<get_stripped_state::unstable::Response> {
|
||||
if let Some(forbidden_type) = body
|
||||
.state
|
||||
.iter()
|
||||
@@ -42,7 +42,7 @@ pub(crate) async fn get_stripped_state_route(
|
||||
.await
|
||||
{
|
||||
| Accessibility::Accessible(RoomStrippedState { state, num_joined_members, .. }) => Ok(
|
||||
assign!(get_stripped_state::msc4560::Response::default(), { state, num_joined_members }),
|
||||
assign!(get_stripped_state::unstable::Response::default(), { state, num_joined_members }),
|
||||
),
|
||||
| Accessibility::Inaccessible => {
|
||||
Err!(Request(Forbidden("You may not access this room's stripped state.")))
|
||||
|
||||
@@ -1,156 +0,0 @@
|
||||
use conduwuit_macros::config_example_generator;
|
||||
use serde::Deserialize;
|
||||
|
||||
/// Configuration for experimental features.
|
||||
#[derive(Debug, Deserialize, Default, Clone)]
|
||||
#[config_example_generator(
|
||||
filename = "conduwuit-example.toml",
|
||||
section = "global.experiments",
|
||||
subheader = r##"# Continuwuity's experimental features are frequently updated.
|
||||
# If you got this configuration via a package manager, chances are it's outdated.
|
||||
# Check out the configuration reference online to see a fresh version:
|
||||
# https://continuwuity.org/reference/config.html#:~:text=global.experiments
|
||||
#
|
||||
# Please keep in mind that experiments are used to enable unstable features.
|
||||
# You probably don't need to enable any of these unless you know what they are,
|
||||
# and consequently know why you should enable them."##
|
||||
)]
|
||||
pub struct Experiments {
|
||||
/// MSC2815: Proposal to allow room moderators to view redacted event
|
||||
/// content
|
||||
///
|
||||
/// See [`MSC2815`] for details.
|
||||
///
|
||||
/// display: nested
|
||||
#[serde(default)]
|
||||
pub msc2815: Option<MSC2815>,
|
||||
/// MSC4155: Invite filtering
|
||||
///
|
||||
/// Provides advanced invite filtering rules for users, allowing complex
|
||||
/// configurations that can allow, ignore, and reject invites from users and
|
||||
/// servers broadly.
|
||||
///
|
||||
/// Requires a supporting client to set up on an account.
|
||||
///
|
||||
/// https://github.com/matrix-org/matrix-spec-proposals/pull/4155
|
||||
///
|
||||
/// default: false
|
||||
#[serde(default)]
|
||||
pub msc4155: SimpleExperiment,
|
||||
/// MSC4174: Web push
|
||||
///
|
||||
/// Adds server-side support for web push, allowing web clients to receive
|
||||
/// push notifications directly without the need for an intermediary push
|
||||
/// gateway like Sygnal.
|
||||
///
|
||||
/// https://github.com/matrix-org/matrix-spec-proposals/pull/4174
|
||||
///
|
||||
/// default: false
|
||||
#[serde(default)]
|
||||
pub msc4174: SimpleExperiment,
|
||||
/// MSC4484: Server Administration OAuth Scope
|
||||
///
|
||||
/// Adds a new OAuth2 scope that explicitly grants a token temporary
|
||||
/// homeserver administrator privileges, granting temporary token access
|
||||
/// to administrator endpoints like locking & suspension.
|
||||
///
|
||||
/// https://github.com/matrix-org/matrix-spec-proposals/pull/4484
|
||||
///
|
||||
/// default: false
|
||||
#[serde(default)]
|
||||
pub msc4484: SimpleExperiment,
|
||||
/// MSC4494: Membership-based invite blocking
|
||||
///
|
||||
/// Adds a new invite blocking action that will reject all invites coming
|
||||
/// from users who do not share a room with the invitee that is not `public`
|
||||
/// (the join rule).
|
||||
///
|
||||
/// This is not related to MSC4155, this proposal instead builds on the
|
||||
/// "invite blocking" proposal that landed in the specification in v1.17,
|
||||
/// which simply allows enabling or disabling invites altogether.
|
||||
///
|
||||
/// MSC4494 is a good middle-ground between the allowlisting possible with
|
||||
/// MSC4155, and the general desire to block invites from users you may not
|
||||
/// know.
|
||||
///
|
||||
/// Requires a supporting client to enable on an account.
|
||||
///
|
||||
/// https://github.com/matrix-org/matrix-spec-proposals/pull/4494
|
||||
///
|
||||
/// default: false
|
||||
#[serde(default)]
|
||||
pub msc4494: SimpleExperiment,
|
||||
/// MSC4560: Stripped state requests over federation
|
||||
///
|
||||
/// Implements a more efficient way for servers to acquire and serve
|
||||
/// "stripped state" to clients, which is typically only used for displaying
|
||||
/// rooms. The display of space hierarchies and room summaries is
|
||||
/// significantly faster when this proposal is enabled and used.
|
||||
///
|
||||
/// https://github.com/matrix-org/matrix-spec-proposals/pull/4560
|
||||
///
|
||||
/// default: false
|
||||
#[serde(default)]
|
||||
pub msc4560: SimpleExperiment,
|
||||
}
|
||||
|
||||
/// Represents a "simple" experiment, which is either disabled or enabled.
|
||||
///
|
||||
/// More complex experiments that require configuration should define their own
|
||||
/// type and implement `ToggledExperiment` instead.
|
||||
#[derive(Debug, Deserialize, Default, Clone, Copy)]
|
||||
pub struct SimpleExperiment(Option<bool>);
|
||||
|
||||
pub trait ToggledExperiment {
|
||||
/// Returns true if this experiment is explicitly enabled.
|
||||
#[must_use]
|
||||
fn is_enabled(&self) -> bool;
|
||||
}
|
||||
|
||||
impl ToggledExperiment for SimpleExperiment {
|
||||
#[inline]
|
||||
fn is_enabled(&self) -> bool { self.0.is_some_and(crate::is_true!()) }
|
||||
}
|
||||
|
||||
/// Configuration for [MSC2815]: Proposal to allow room moderators to view
|
||||
/// redacted event content
|
||||
///
|
||||
/// MSC2815: https://github.com/matrix-org/matrix-spec-proposals/pull/2815
|
||||
#[derive(Debug, Deserialize, Default, Clone, Copy)]
|
||||
#[config_example_generator(
|
||||
filename = "conduwuit-example.toml",
|
||||
section = "global.experiments.msc2815",
|
||||
optional = "true",
|
||||
subheader = r#"# MSC2815: Proposal to allow room moderators to view redacted event content
|
||||
#
|
||||
# Allows the server to retain unredacted copies of events that have been
|
||||
# redacted for a limited period of time, which allows room moderators and
|
||||
# server administrators to reveal redacted contents. Useful for moderation
|
||||
# and investigating reports.
|
||||
#
|
||||
# Requires a supporting client to use.
|
||||
#
|
||||
# https://github.com/matrix-org/matrix-spec-proposals/pull/2815"#
|
||||
)]
|
||||
pub struct MSC2815 {
|
||||
/// Whether to enable MSC2815.
|
||||
///
|
||||
/// default: false
|
||||
#[serde(default)]
|
||||
pub enabled: bool,
|
||||
|
||||
/// How long, in seconds, to retain the original content of redacted
|
||||
/// events before it is permanently erased. Defaults to 90 days.
|
||||
///
|
||||
/// default: 7776000
|
||||
#[serde(default = "default_unredacted_content_max_age_secs")]
|
||||
pub unredacted_content_max_age_secs: u64,
|
||||
}
|
||||
|
||||
#[inline]
|
||||
fn default_unredacted_content_max_age_secs() -> u64 { 7_776_000 }
|
||||
|
||||
impl ToggledExperiment for Option<MSC2815> {
|
||||
#[inline]
|
||||
fn is_enabled(&self) -> bool { self.is_some_and(|config| config.enabled) }
|
||||
}
|
||||
+33
-16
@@ -18,7 +18,6 @@ use either::{
|
||||
Either,
|
||||
Either::{Left, Right},
|
||||
};
|
||||
pub use experiments::Experiments;
|
||||
use figment::providers::{Env, Format, Toml};
|
||||
pub use figment::{Figment, value::Value as FigmentValue};
|
||||
use governor::{DefaultKeyedRateLimiter, Quota, RateLimiter};
|
||||
@@ -1769,6 +1768,14 @@ pub struct Config {
|
||||
#[serde(default = "true_fn")]
|
||||
pub allow_incoming_typing: bool,
|
||||
|
||||
/// Allow the use of unstable persistent "sticky events" ([MSC4354])
|
||||
///
|
||||
/// MSC4354: https://c10y.cc/MSC4354
|
||||
///
|
||||
/// default: false
|
||||
#[serde(default)]
|
||||
pub allow_sticky_events: bool,
|
||||
|
||||
/// Maximum time federation user can indicate typing.
|
||||
///
|
||||
/// default: 30
|
||||
@@ -1819,6 +1826,31 @@ pub struct Config {
|
||||
#[serde(default)]
|
||||
pub brotli_compression: bool,
|
||||
|
||||
/// Enable the legacy unauthenticated Matrix media repository endpoints.
|
||||
/// These endpoints consist of:
|
||||
/// - /_matrix/media/*/config
|
||||
/// - /_matrix/media/*/upload
|
||||
/// - /_matrix/media/*/preview_url
|
||||
/// - /_matrix/media/*/download/*
|
||||
/// - /_matrix/media/*/thumbnail/*
|
||||
///
|
||||
/// The authenticated equivalent endpoints are always enabled.
|
||||
///
|
||||
/// Defaults to false, as unauthenticated media has been sunsetted.
|
||||
///
|
||||
/// default: false
|
||||
#[serde(default)]
|
||||
pub allow_legacy_media: bool,
|
||||
|
||||
/// If set to true, prevents fetching new legacy remote media.
|
||||
///
|
||||
/// Legacy media may still be accessible if it was already fetched
|
||||
/// previously and allow_legacy_media is true.
|
||||
///
|
||||
/// default: true
|
||||
#[serde(default = "true_fn")]
|
||||
pub freeze_legacy_media: bool,
|
||||
|
||||
/// Check consistency of the media directory at startup:
|
||||
/// 1. When `media_compat_file_link` is enabled, this check will upgrade
|
||||
/// media when switching back and forth between Conduit and conduwuit.
|
||||
@@ -2446,12 +2478,6 @@ pub struct Config {
|
||||
#[serde(default)]
|
||||
pub matrix_rtc: MatrixRtcConfig,
|
||||
|
||||
/// Configuration for unstable features.
|
||||
///
|
||||
/// display: nested
|
||||
#[serde(default)]
|
||||
pub experiments: Experiments,
|
||||
|
||||
#[serde(flatten)]
|
||||
#[allow(clippy::zero_sized_map_values)]
|
||||
// this is a catchall, the map shouldn't be zero at runtime
|
||||
@@ -2985,9 +3011,6 @@ const DEPRECATED_KEYS: &[&str] = &[
|
||||
"well_known_support_email",
|
||||
"well_known_support_mxid",
|
||||
"well_known.rtc_focus_server_urls",
|
||||
"allow_sticky_events",
|
||||
"allow_moderators_to_view_redacted_content",
|
||||
"unredacted_content_max_age_secs",
|
||||
];
|
||||
|
||||
impl Config {
|
||||
@@ -3422,9 +3445,3 @@ fn default_profile_key_map() -> HashMap<String, String> {
|
||||
fn default_unauthenticated_request_ratelimit<K: Hash + Eq + Clone>() -> PerMinuteRatelimiter<K> {
|
||||
PerMinuteRatelimiter::new(Quota::per_minute(30.try_into().unwrap()))
|
||||
}
|
||||
|
||||
// NOTE: This must be declared *after* every config struct in this file. The
|
||||
// example config generator writes sections in macro expansion order, and the
|
||||
// `global` section truncates the file, so declaring this module any earlier
|
||||
// causes its sections to be wiped from the generated example config.
|
||||
pub mod experiments;
|
||||
+16
-12
@@ -1,7 +1,5 @@
|
||||
use std::collections::BTreeMap;
|
||||
|
||||
use crate::config::{Experiments, experiments::ToggledExperiment};
|
||||
|
||||
#[must_use]
|
||||
pub fn versions() -> Vec<String> {
|
||||
vec![
|
||||
@@ -27,26 +25,32 @@ pub fn versions() -> Vec<String> {
|
||||
"v1.16".to_owned(),
|
||||
"v1.17".to_owned(),
|
||||
"v1.18".to_owned(),
|
||||
"v1.19".to_owned(),
|
||||
]
|
||||
}
|
||||
|
||||
#[must_use]
|
||||
pub fn unstable_features(experiments: &Experiments) -> BTreeMap<String, bool> {
|
||||
pub fn unstable_features() -> BTreeMap<String, bool> {
|
||||
BTreeMap::from_iter([
|
||||
// MatrixRTC (https://github.com/matrix-org/matrix-spec-proposals/pull/4143)
|
||||
// Expected for spec v1.20
|
||||
("org.matrix.msc4143".to_owned(), true),
|
||||
// query mutual rooms (https://github.com/matrix-org/matrix-spec-proposals/pull/2666)
|
||||
// Expected for spec v1.19
|
||||
("uk.half-shot.msc2666.query_mutual_rooms".to_owned(), true),
|
||||
("uk.half-shot.msc2666.query_mutual_rooms.stable".to_owned(), true),
|
||||
// Simplified Sliding sync (https://github.com/matrix-org/matrix-spec-proposals/pull/4186)
|
||||
// Expected for spec v1.20
|
||||
// Expected for spec v1.19
|
||||
("org.matrix.simplified_msc3575".to_owned(), true),
|
||||
("org.matrix.msc4155".to_owned(), experiments.msc4155.is_enabled()),
|
||||
// invite filtering (https://github.com/matrix-org/matrix-spec-proposals/pull/4155)
|
||||
("org.matrix.msc4155".to_owned(), true),
|
||||
// profile change propagation (https://github.com/matrix-org/matrix-spec-proposals/pull/4466)
|
||||
("computer.gingershaped.msc4466".to_owned(), true),
|
||||
("org.matrix.msc4174".to_owned(), experiments.msc4174.is_enabled()),
|
||||
("uk.timedout.msc4494".to_owned(), experiments.msc4494.is_enabled()),
|
||||
("org.continuwuity.msc4484.unstable".to_owned(), experiments.msc4484.is_enabled()),
|
||||
("org.continuwuity.msc4560".to_owned(), experiments.msc4560.is_enabled()),
|
||||
("fi.mau.msc2815".to_owned(), experiments.msc2815.is_enabled()),
|
||||
// web push (https://github.com/matrix-org/matrix-spec-proposals/pull/4174)
|
||||
("org.matrix.msc4174".to_owned(), true),
|
||||
// Membership-based invite blocking (https://github.com/matrix-org/matrix-spec-proposals/pull/4494)
|
||||
("uk.timedout.msc4494".to_owned(), true),
|
||||
// server administration OAuth scope (https://github.com/matrix-org/matrix-spec-proposals/pull/4484)
|
||||
("org.continuwuity.msc4484.unstable".to_owned(), true),
|
||||
// stripped state over federation (https://github.com/matrix-org/matrix-spec-proposals/pull/4560)
|
||||
("org.continuwuity.msc4560".to_owned(), true),
|
||||
])
|
||||
}
|
||||
@@ -153,11 +153,6 @@ pub(super) static MAPS: &[Descriptor] = &[
|
||||
index_size: 512,
|
||||
..descriptor::SEQUENTIAL
|
||||
},
|
||||
Descriptor {
|
||||
name: "pduid_unredactedcontent",
|
||||
key_size_hint: Some(16),
|
||||
..descriptor::SEQUENTIAL
|
||||
},
|
||||
Descriptor {
|
||||
name: "publicroomids",
|
||||
..descriptor::RANDOM_SMALL
|
||||
|
||||
@@ -25,7 +25,7 @@ http.workspace = true
|
||||
ruma.workspace = true
|
||||
serde = { workspace = true }
|
||||
serde_json = { workspace = true }
|
||||
wildmatch.workspace = true
|
||||
wildmatch = "2.7.0"
|
||||
|
||||
[dev-dependencies]
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ use std::sync::Arc;
|
||||
|
||||
use conduwuit::{
|
||||
Err, Result, err,
|
||||
utils::{MutexMap, ReadyExt, result::LogErr, stream::TryIgnore},
|
||||
utils::{ReadyExt, result::LogErr, stream::TryIgnore},
|
||||
};
|
||||
use database::{Deserialized, Handle, Ignore, Json, Map};
|
||||
use futures::{Stream, StreamExt, TryFutureExt};
|
||||
@@ -27,7 +27,6 @@ pub enum AnyRawAccountDataEvent {
|
||||
pub struct Service {
|
||||
services: Services,
|
||||
db: Data,
|
||||
update_mutex: MutexMap<OwnedUserId, ()>,
|
||||
}
|
||||
|
||||
struct Data {
|
||||
@@ -51,7 +50,6 @@ impl crate::Service for Service {
|
||||
roomuserdataid_accountdata: args.db["roomuserdataid_accountdata"].clone(),
|
||||
roomusertype_roomuserdataid: args.db["roomusertype_roomuserdataid"].clone(),
|
||||
},
|
||||
update_mutex: MutexMap::new(),
|
||||
}))
|
||||
}
|
||||
|
||||
@@ -73,10 +71,6 @@ impl Service {
|
||||
return Err!(Request(InvalidParam("Account data doesn't have all required fields.")));
|
||||
}
|
||||
|
||||
// Two updates reading the same previous entry would both remove it,
|
||||
// and the entry of the one that lost the index would stay forever.
|
||||
let _lock = self.update_mutex.lock(user_id).await;
|
||||
|
||||
let count = self.services.globals.next_count().unwrap();
|
||||
let roomuserdataid = (room_id, user_id, count, &event_type);
|
||||
self.db
|
||||
|
||||
@@ -338,16 +338,8 @@ fn builder_interface(
|
||||
fn get_dns_resolver(server: &Arc<Server>) -> Result<Arc<TokioResolver>> {
|
||||
let config = &server.config;
|
||||
|
||||
let (system_resolver_config, mut opts) =
|
||||
match hickory_resolver::system_conf::read_system_conf() {
|
||||
| Ok(system_conf) => system_conf,
|
||||
| Err(e) if config.dns_servers.is_empty() =>
|
||||
return Err(err!(error!("Failed to configure DNS resolver from system: {e}"))),
|
||||
| Err(e) => {
|
||||
warn!("Failed to read system DNS configuration, using dns_servers: {e}");
|
||||
Default::default()
|
||||
},
|
||||
};
|
||||
let (system_resolver_config, mut opts) = hickory_resolver::system_conf::read_system_conf()
|
||||
.map_err(|e| err!(error!("Failed to configure DNS resolver from system: {e}")))?;
|
||||
|
||||
let mut conf = ResolverConfig::from_name_servers(vec![]);
|
||||
|
||||
|
||||
@@ -1,9 +1,4 @@
|
||||
use std::{
|
||||
borrow::Cow,
|
||||
fmt::Debug,
|
||||
mem,
|
||||
time::{Duration, Instant},
|
||||
};
|
||||
use std::{borrow::Cow, fmt::Debug, mem, time::Instant};
|
||||
|
||||
use conduwuit::{
|
||||
Err, Error, Result, debug, debug_error, debug_info, debug_warn, err, metrics::KeyValue,
|
||||
@@ -138,19 +133,12 @@ impl super::Service {
|
||||
|
||||
self.ensure_remote_is_healthy(dest)?;
|
||||
|
||||
/// How long to wait with re-resolution if a server fails to resolve
|
||||
const UNRESOLVABLE_RETRY_AFTER: Duration = Duration::from_hours(24 * 90);
|
||||
|
||||
let actual = self
|
||||
.services
|
||||
.client
|
||||
.matrix_resolver
|
||||
.resolve_server(dest.as_str())
|
||||
.await
|
||||
.inspect_err(|_| {
|
||||
self.hit_unhealthy(dest.to_owned(), Some(UNRESOLVABLE_RETRY_AFTER));
|
||||
self.mark_destination_stale(dest);
|
||||
})?;
|
||||
.await?;
|
||||
|
||||
let request = Request::try_from(request.try_into_http_request::<Vec<u8>>(
|
||||
actual.base_url().as_str(),
|
||||
@@ -222,7 +210,7 @@ impl super::Service {
|
||||
if self.should_mark_stale(&wrapped) {
|
||||
debug_info!("{dest} is unhealthy & stale due to a connect error");
|
||||
self.mark_destination_stale(dest);
|
||||
self.hit_unhealthy(dest.to_owned(), None);
|
||||
self.hit_unhealthy(dest.to_owned());
|
||||
}
|
||||
let Error::Reqwest(unwrapped) = wrapped else {
|
||||
unreachable!("wrapped reqwest error must unwrap to a reqwest error");
|
||||
@@ -312,26 +300,6 @@ async fn into_http_response(
|
||||
actual.base_url(),
|
||||
);
|
||||
|
||||
if url.path() != "/.well-known/matrix/server" {
|
||||
// For some reason, the spec starts off saying federation responses MUST
|
||||
// include a `Content-Type` header of `application/json` on all
|
||||
// responses. Then, the definition for the well-known server endpoint
|
||||
// says that it's a SHOULD and that servers SHOULD just assume that the
|
||||
// response is JSON regardless... And then there's media wayyyy down in
|
||||
// the spec doc that just throws a `multipart/mixed` in there.
|
||||
//
|
||||
// Media has a special case regarding status codes. Only 200 OK
|
||||
// responses should have the multipart assertion, as errors are JSON.
|
||||
let ct = if url.path().starts_with("/_matrix/federation/v1/media/")
|
||||
&& response.status().is_success()
|
||||
{
|
||||
"multipart/mixed"
|
||||
} else {
|
||||
"application/json"
|
||||
};
|
||||
enforce_content_type(&response, ct)?;
|
||||
}
|
||||
|
||||
let mut http_response_builder = http::Response::builder()
|
||||
.status(status)
|
||||
.version(response.version());
|
||||
@@ -385,42 +353,6 @@ fn handle_error(
|
||||
Err(e.into())
|
||||
}
|
||||
|
||||
/// Enforces that the `Content-Type` response header is present, and that the
|
||||
/// first part matches the expected header. This does not enforce that multipart
|
||||
/// responses have a boundary as only the text left of a semicolon, if present,
|
||||
/// is compared.
|
||||
///
|
||||
/// Returns `M_UNKNOWN` with HTTP 415 (Unsupported Media Type) if the response
|
||||
/// header is missing or mismatched.
|
||||
fn enforce_content_type(response: &Response, expected: &str) -> Result<()> {
|
||||
// N.B. Content type's value is case-insensitive per RFC 9110. The Matrix
|
||||
// spec explicitly prescribes `application/json` and `multipart/mixed` etc,
|
||||
// but it's assumed they're intended to be case-insensitive.
|
||||
debug_assert_eq!(
|
||||
expected,
|
||||
expected.to_lowercase(),
|
||||
"Content type checks should use the lowercase content type"
|
||||
); // ^ Saves us double-folding
|
||||
match response
|
||||
.headers()
|
||||
.get(&http::header::CONTENT_TYPE)
|
||||
.and_then(|h| h.to_str().ok())
|
||||
.map(|h| h.split_once(';').unwrap_or((h, "")).0.to_lowercase())
|
||||
{
|
||||
| Some(ct) if ct == expected => Ok(()),
|
||||
| Some(ct) => Err!(Request(
|
||||
Unknown(
|
||||
"Remote server returned the wrong Content-Type: expected {expected}, got {ct:?}"
|
||||
),
|
||||
UNSUPPORTED_MEDIA_TYPE
|
||||
)),
|
||||
| None => Err!(Request(
|
||||
Unknown("Remote server did not return a Content-Type header"),
|
||||
UNSUPPORTED_MEDIA_TYPE
|
||||
)),
|
||||
}
|
||||
}
|
||||
|
||||
/// A trait for the input types of acceptable path builders for outgoing
|
||||
/// federation requests.
|
||||
///
|
||||
|
||||
@@ -92,7 +92,7 @@ impl Service {
|
||||
/// retry count is incremented and next retry window is updated.
|
||||
///
|
||||
/// Does not update the marker if the backoff period is already in effect.
|
||||
pub fn hit_unhealthy(&self, server_name: OwnedServerName, next_attempt: Option<Duration>) {
|
||||
pub fn hit_unhealthy(&self, server_name: OwnedServerName) {
|
||||
if server_name == self.services.server.name {
|
||||
return;
|
||||
}
|
||||
@@ -109,8 +109,7 @@ impl Service {
|
||||
}
|
||||
|
||||
*retries = retries.saturating_add(1);
|
||||
let next_interval = next_attempt
|
||||
.unwrap_or_else(|| self.services.server.config.sender_retry_backoff(*retries));
|
||||
let next_interval = self.services.server.config.sender_retry_backoff(*retries);
|
||||
*next_retry = millis_from_now(next_interval);
|
||||
debug!(
|
||||
"{} is (now) unhealthy ({} retries, blocked until: {})",
|
||||
@@ -201,14 +200,14 @@ impl Service {
|
||||
}
|
||||
|
||||
match error.status_code() {
|
||||
// Some special servers account for this specifically
|
||||
| StatusCode::MISDIRECTED_REQUEST
|
||||
// Common error codes observed for misdirected requests
|
||||
// | StatusCode::NOT_FOUND This one can be encountered naturally
|
||||
| StatusCode::METHOD_NOT_ALLOWED
|
||||
| StatusCode::IM_A_TEAPOT => true,
|
||||
_ => false,
|
||||
}
|
||||
// Some special servers account for this specifically
|
||||
| StatusCode::MISDIRECTED_REQUEST
|
||||
// Common error codes observed for misdirected requests
|
||||
// | StatusCode::NOT_FOUND This one can be encountered naturally
|
||||
| StatusCode::METHOD_NOT_ALLOWED
|
||||
| StatusCode::IM_A_TEAPOT => true,
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
|
||||
/// Returns a clone of the internal remote health tracking map.
|
||||
|
||||
+197
-5
@@ -1,7 +1,7 @@
|
||||
use std::{fmt::Debug, time::Duration};
|
||||
|
||||
use conduwuit::{
|
||||
Err, Result, debug_warn, err,
|
||||
Err, Error, Result, debug_warn, err,
|
||||
utils::{content_disposition::make_content_disposition, response::LimitReadExt},
|
||||
};
|
||||
use http::header::{CONTENT_DISPOSITION, CONTENT_TYPE, HeaderValue};
|
||||
@@ -9,6 +9,9 @@ use ruma::{
|
||||
ServerName, UserId,
|
||||
api::{
|
||||
OutgoingRequest,
|
||||
auth_scheme::NoAccessToken,
|
||||
client::media,
|
||||
error::ErrorKind::{NotFound, Unrecognized},
|
||||
federation::{
|
||||
self,
|
||||
authenticated_media::{Content, FileOrLocation},
|
||||
@@ -32,8 +35,17 @@ impl super::Service {
|
||||
) -> Result<FileMeta> {
|
||||
self.check_fetch_authorized(mxc)?;
|
||||
|
||||
self.fetch_thumbnail_authenticated(mxc, user, server, timeout_ms, dim)
|
||||
.await
|
||||
let result = self
|
||||
.fetch_thumbnail_authenticated(mxc, user, server, timeout_ms, dim)
|
||||
.await;
|
||||
|
||||
if let Err(Error::Request(NotFound, ..)) = &result {
|
||||
return self
|
||||
.fetch_thumbnail_unauthenticated(mxc, user, server, timeout_ms, dim)
|
||||
.await;
|
||||
}
|
||||
|
||||
result
|
||||
}
|
||||
|
||||
pub async fn fetch_remote_content(
|
||||
@@ -45,7 +57,8 @@ impl super::Service {
|
||||
) -> Result<FileMeta> {
|
||||
self.check_fetch_authorized(mxc)?;
|
||||
|
||||
self.fetch_content_authenticated(mxc, user, server, timeout_ms)
|
||||
let result = self
|
||||
.fetch_content_authenticated(mxc, user, server, timeout_ms)
|
||||
.await
|
||||
.inspect_err(|error| {
|
||||
debug_warn!(
|
||||
@@ -55,7 +68,15 @@ impl super::Service {
|
||||
?error,
|
||||
"Authenticated fetch of remote content failed"
|
||||
);
|
||||
})
|
||||
});
|
||||
|
||||
if let Err(Error::Request(Unrecognized, ..)) = &result {
|
||||
return self
|
||||
.fetch_content_unauthenticated(mxc, user, server, timeout_ms)
|
||||
.await;
|
||||
}
|
||||
|
||||
result
|
||||
}
|
||||
|
||||
async fn fetch_thumbnail_authenticated(
|
||||
@@ -106,6 +127,66 @@ impl super::Service {
|
||||
}
|
||||
}
|
||||
|
||||
#[allow(deprecated)]
|
||||
async fn fetch_thumbnail_unauthenticated(
|
||||
&self,
|
||||
mxc: &Mxc<'_>,
|
||||
user: Option<&UserId>,
|
||||
server: Option<&ServerName>,
|
||||
timeout_ms: Duration,
|
||||
dim: &Dim,
|
||||
) -> Result<FileMeta> {
|
||||
use media::get_content_thumbnail::v3::{Request, Response};
|
||||
|
||||
let mut request = Request::new(
|
||||
mxc.media_id.into(),
|
||||
mxc.server_name.into(),
|
||||
dim.width.into(),
|
||||
dim.height.into(),
|
||||
);
|
||||
request.allow_redirect = true;
|
||||
request.allow_remote = true;
|
||||
request.animated = Some(true);
|
||||
request.method = Some(dim.method.clone());
|
||||
request.timeout_ms = timeout_ms;
|
||||
|
||||
let Response {
|
||||
file, content_type, content_disposition, ..
|
||||
} = self
|
||||
.federation_request_legacy_media(mxc, server, request)
|
||||
.await?;
|
||||
|
||||
let content = Content::new(file, content_type.unwrap(), content_disposition.unwrap());
|
||||
|
||||
self.handle_thumbnail_file(mxc, user, dim, content).await
|
||||
}
|
||||
|
||||
#[allow(deprecated)]
|
||||
async fn fetch_content_unauthenticated(
|
||||
&self,
|
||||
mxc: &Mxc<'_>,
|
||||
user: Option<&UserId>,
|
||||
server: Option<&ServerName>,
|
||||
timeout_ms: Duration,
|
||||
) -> Result<FileMeta> {
|
||||
use media::get_content::v3::{Request, Response};
|
||||
|
||||
let mut request = Request::new(mxc.media_id.into(), mxc.server_name.into());
|
||||
request.allow_remote = true;
|
||||
request.allow_redirect = true;
|
||||
request.timeout_ms = timeout_ms;
|
||||
|
||||
let Response {
|
||||
file, content_type, content_disposition, ..
|
||||
} = self
|
||||
.federation_request_legacy_media(mxc, server, request)
|
||||
.await?;
|
||||
|
||||
let content = Content::new(file, content_type.unwrap(), content_disposition.unwrap());
|
||||
|
||||
self.handle_content_file(mxc, user, content).await
|
||||
}
|
||||
|
||||
async fn handle_thumbnail_file(
|
||||
&self,
|
||||
mxc: &Mxc<'_>,
|
||||
@@ -238,6 +319,108 @@ impl super::Service {
|
||||
.await
|
||||
}
|
||||
|
||||
async fn federation_request_legacy_media<'i, Request>(
|
||||
&self,
|
||||
mxc: &Mxc<'_>,
|
||||
server: Option<&ServerName>,
|
||||
request: Request,
|
||||
) -> Result<Request::IncomingResponse>
|
||||
where
|
||||
Request: OutgoingRequest<
|
||||
Authentication = NoAccessToken,
|
||||
PathBuilder: PathBuilder<Input<'i>: FederationPathBuilderInput>,
|
||||
> + Debug
|
||||
+ Send,
|
||||
{
|
||||
self.services
|
||||
.sending
|
||||
.send_legacy_media_request(server.unwrap_or(mxc.server_name), request)
|
||||
.await
|
||||
}
|
||||
|
||||
#[allow(deprecated)]
|
||||
pub async fn fetch_remote_thumbnail_legacy(
|
||||
&self,
|
||||
body: &media::get_content_thumbnail::v3::Request,
|
||||
) -> Result<media::get_content_thumbnail::v3::Response> {
|
||||
let mxc = Mxc {
|
||||
server_name: &body.server_name,
|
||||
media_id: &body.media_id,
|
||||
};
|
||||
|
||||
let mut request = media::get_content_thumbnail::v3::Request::new(
|
||||
body.media_id.clone(),
|
||||
body.server_name.clone(),
|
||||
body.width,
|
||||
body.height,
|
||||
);
|
||||
request.method.clone_from(&body.method);
|
||||
request.allow_remote = body.allow_remote;
|
||||
request.allow_redirect = body.allow_redirect;
|
||||
request.animated = body.animated;
|
||||
request.timeout_ms = body.timeout_ms;
|
||||
|
||||
self.check_legacy_freeze()?;
|
||||
self.check_fetch_authorized(&mxc)?;
|
||||
let response = self
|
||||
.services
|
||||
.sending
|
||||
.send_legacy_media_request(mxc.server_name, request)
|
||||
.await?;
|
||||
|
||||
let dim = Dim::from_ruma(body.width, body.height, body.method.clone())?;
|
||||
self.upload_thumbnail(
|
||||
&mxc,
|
||||
None,
|
||||
None,
|
||||
response.content_type.as_deref(),
|
||||
&dim,
|
||||
&response.file,
|
||||
)
|
||||
.await?;
|
||||
|
||||
Ok(response)
|
||||
}
|
||||
|
||||
#[allow(deprecated)]
|
||||
pub async fn fetch_remote_content_legacy(
|
||||
&self,
|
||||
mxc: &Mxc<'_>,
|
||||
allow_redirect: bool,
|
||||
timeout_ms: Duration,
|
||||
) -> Result<media::get_content::v3::Response, Error> {
|
||||
let mut request =
|
||||
media::get_content::v3::Request::new(mxc.media_id.into(), mxc.server_name.into());
|
||||
request.allow_remote = true;
|
||||
request.allow_redirect = allow_redirect;
|
||||
request.timeout_ms = timeout_ms;
|
||||
|
||||
self.check_legacy_freeze()?;
|
||||
self.check_fetch_authorized(mxc)?;
|
||||
let response = self
|
||||
.services
|
||||
.sending
|
||||
.send_legacy_media_request(mxc.server_name, request)
|
||||
.await?;
|
||||
|
||||
let content_disposition = make_content_disposition(
|
||||
response.content_disposition.as_ref(),
|
||||
response.content_type.as_deref(),
|
||||
None,
|
||||
);
|
||||
|
||||
self.create(
|
||||
mxc,
|
||||
None,
|
||||
Some(&content_disposition),
|
||||
response.content_type.as_deref(),
|
||||
&response.file,
|
||||
)
|
||||
.await?;
|
||||
|
||||
Ok(response)
|
||||
}
|
||||
|
||||
fn check_fetch_authorized(&self, mxc: &Mxc<'_>) -> Result<()> {
|
||||
if self
|
||||
.services
|
||||
@@ -253,4 +436,13 @@ impl super::Service {
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn check_legacy_freeze(&self) -> Result<()> {
|
||||
self.services
|
||||
.server
|
||||
.config
|
||||
.freeze_legacy_media
|
||||
.then_some(())
|
||||
.ok_or(err!(Request(NotFound("Remote media is frozen."))))
|
||||
}
|
||||
}
|
||||
@@ -18,7 +18,7 @@ use conduwuit::{
|
||||
},
|
||||
warn,
|
||||
};
|
||||
use database::{Deserialized, Ignore, Json};
|
||||
use database::Json;
|
||||
use futures::{FutureExt, StreamExt, TryStreamExt};
|
||||
use itertools::Itertools;
|
||||
use ruma::{
|
||||
@@ -173,9 +173,6 @@ migration!(stringify!($name) => $name)
|
||||
// Re-calculates extremities for any rooms that actually lack any
|
||||
// extremities at all.
|
||||
migration!(consistency_check_extremity_tracker),
|
||||
// This is backwards compatible because old versions never read the
|
||||
// account data entries it removes.
|
||||
migration!(remove_replaced_account_data),
|
||||
]
|
||||
};
|
||||
|
||||
@@ -1021,35 +1018,6 @@ async fn remove_unknown_extremities(services: &Services) -> Result {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn remove_replaced_account_data(services: &Services) -> Result {
|
||||
type Key = (Option<OwnedRoomId>, OwnedUserId, u64, String);
|
||||
type Latest = (Ignore, Ignore, u64, Ignore);
|
||||
|
||||
let entries = services.db["roomuserdataid_accountdata"].clone();
|
||||
let latest_of_type = services.db["roomusertype_roomuserdataid"].clone();
|
||||
|
||||
let keys: Vec<Key> = entries.keys().ignore_err().collect().await;
|
||||
let mut removed: usize = 0;
|
||||
for (room_id, user_id, count, event_type) in &keys {
|
||||
let latest = latest_of_type
|
||||
.qry(&(room_id, user_id, event_type))
|
||||
.await
|
||||
.deserialized::<Latest>();
|
||||
|
||||
if latest.is_ok_and(|(_, _, latest, _)| latest != *count) {
|
||||
entries.del((room_id, user_id, count, event_type));
|
||||
removed = removed.saturating_add(1);
|
||||
}
|
||||
}
|
||||
|
||||
info!(
|
||||
total = keys.len(),
|
||||
?removed,
|
||||
"Removed replaced entries in 'roomuserdataid_accountdata'."
|
||||
);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[tracing::instrument(skip_all)]
|
||||
async fn consistency_check_extremity_tracker(services: &Services) -> Result {
|
||||
let mut rooms = services.rooms.metadata.iter_ids();
|
||||
|
||||
+2
-4
@@ -42,8 +42,6 @@ pub mod transactions;
|
||||
pub mod uiaa;
|
||||
pub mod users;
|
||||
|
||||
use std::collections::BTreeMap;
|
||||
|
||||
pub(crate) use service::{Args, Dep, Service};
|
||||
|
||||
pub use crate::services::Services;
|
||||
@@ -53,8 +51,8 @@ conduwuit::mod_dtor! {}
|
||||
|
||||
use std::sync::LazyLock;
|
||||
|
||||
use conduwuit::matrix::versions::versions;
|
||||
use conduwuit::matrix::versions::{unstable_features, versions};
|
||||
use ruma::api::SupportedVersions;
|
||||
|
||||
pub static SUPPORTED_VERSIONS: LazyLock<SupportedVersions> =
|
||||
LazyLock::new(|| SupportedVersions::from_parts(&versions(), &BTreeMap::new()));
|
||||
LazyLock::new(|| SupportedVersions::from_parts(&versions(), &unstable_features()));
|
||||
+45
-73
@@ -2,17 +2,17 @@ use std::{collections::HashMap, str::FromStr, sync::Arc, time::Duration};
|
||||
|
||||
use async_trait::async_trait;
|
||||
use conduwuit::{
|
||||
Result, SyncRwLock,
|
||||
Result,
|
||||
config::{OidcConfig, OidcProfileKeyImportMode},
|
||||
debug, err, error, info, warn,
|
||||
};
|
||||
use database::{Deserialized, Map};
|
||||
use lettre::Address;
|
||||
use openidconnect::{
|
||||
AdditionalClaims, AuthorizationCode, ClaimsVerificationError, ClientSecret, CsrfToken,
|
||||
EmptyExtraTokenFields, EndpointMaybeSet, EndpointNotSet, EndpointSet, IdTokenClaims,
|
||||
IdTokenFields, IssuerUrl, Nonce, PkceCodeChallenge, PkceCodeVerifier, RedirectUrl,
|
||||
SignatureVerificationError, StandardErrorResponse, StandardTokenResponse, TokenResponse,
|
||||
AdditionalClaims, AuthorizationCode, ClientSecret, CsrfToken, EmptyExtraTokenFields,
|
||||
EndpointMaybeSet, EndpointNotSet, EndpointSet, IdTokenClaims, IdTokenFields, IssuerUrl,
|
||||
Nonce, PkceCodeChallenge, PkceCodeVerifier, RedirectUrl, StandardErrorResponse,
|
||||
StandardTokenResponse, TokenResponse,
|
||||
core::{
|
||||
CoreAuthDisplay, CoreAuthPrompt, CoreAuthenticationFlow, CoreErrorResponseType,
|
||||
CoreGenderClaim, CoreJsonWebKey, CoreJweContentEncryptionAlgorithm,
|
||||
@@ -60,7 +60,7 @@ struct Services {
|
||||
struct OidcClient {
|
||||
config: OidcConfig,
|
||||
client_secret: ClientSecret,
|
||||
machine: SetOnce<SyncRwLock<Arc<OidcClientMachine>>>,
|
||||
machine: SetOnce<OidcClientMachine>,
|
||||
client: reqwest::Client,
|
||||
}
|
||||
|
||||
@@ -180,10 +180,31 @@ impl crate::Service for Service {
|
||||
}
|
||||
|
||||
async fn worker(self: Arc<Self>) -> Result {
|
||||
if let Some(OidcClient { machine, .. }) = &self.client {
|
||||
let discovered = self.discover().await?;
|
||||
if let Some(OidcClient { config, client_secret, machine, client }) = &self.client {
|
||||
let redirect_url = self
|
||||
.services
|
||||
.config
|
||||
.get_client_domain()
|
||||
.join(&format!("{}/oidc/complete", conduwuit::ROUTE_PREFIX))
|
||||
.expect("redirect url should be valid");
|
||||
|
||||
let provider_metadata = CoreProviderMetadata::discover_async(
|
||||
IssuerUrl::new(config.discovery_url.clone())
|
||||
.map_err(|err| err!("Failed to parse OIDC discovery URL: {err}"))?,
|
||||
client,
|
||||
)
|
||||
.await
|
||||
.map_err(|err| err!("Failed to discover OIDC provider metadata: {err}"))?;
|
||||
|
||||
machine
|
||||
.set(SyncRwLock::new(Arc::new(discovered)))
|
||||
.set(
|
||||
OidcClientMachine::from_provider_metadata(
|
||||
provider_metadata,
|
||||
config.client_id.clone(),
|
||||
Some(client_secret.clone()),
|
||||
)
|
||||
.set_redirect_uri(RedirectUrl::from_url(redirect_url)),
|
||||
)
|
||||
.expect("machine should be empty");
|
||||
}
|
||||
|
||||
@@ -203,33 +224,6 @@ impl Service {
|
||||
|
||||
pub fn enabled(&self) -> bool { self.client.is_some() }
|
||||
|
||||
async fn discover(&self) -> Result<OidcClientMachine> {
|
||||
let OidcClient { config, client_secret, client, .. } =
|
||||
self.client.as_ref().expect("oidc should be configured");
|
||||
|
||||
let redirect_url = self
|
||||
.services
|
||||
.config
|
||||
.get_client_domain()
|
||||
.join(&format!("{}/oidc/complete", conduwuit::ROUTE_PREFIX))
|
||||
.expect("redirect url should be valid");
|
||||
|
||||
let provider_metadata = CoreProviderMetadata::discover_async(
|
||||
IssuerUrl::new(config.discovery_url.clone())
|
||||
.map_err(|err| err!("Failed to parse OIDC discovery URL: {err}"))?,
|
||||
client,
|
||||
)
|
||||
.await
|
||||
.map_err(|err| err!("Failed to discover OIDC provider metadata: {err}"))?;
|
||||
|
||||
Ok(OidcClientMachine::from_provider_metadata(
|
||||
provider_metadata,
|
||||
config.client_id.clone(),
|
||||
Some(client_secret.clone()),
|
||||
)
|
||||
.set_redirect_uri(RedirectUrl::from_url(redirect_url)))
|
||||
}
|
||||
|
||||
pub fn provider_name(&self) -> Option<String> {
|
||||
let OidcClient { config, .. } = self.client.as_ref().expect("oidc should be configured");
|
||||
|
||||
@@ -259,7 +253,7 @@ impl Service {
|
||||
pub async fn begin_session(&self, prompt: Option<CoreAuthPrompt>) -> (PendingSession, Url) {
|
||||
let OidcClient { machine, config, .. } =
|
||||
self.client.as_ref().expect("oidc should be configured");
|
||||
let machine = machine.wait().await.read().clone();
|
||||
let machine = machine.wait().await;
|
||||
|
||||
let (pkce_challenge, pkce_verifier) = PkceCodeChallenge::new_random_sha256();
|
||||
|
||||
@@ -290,13 +284,13 @@ impl Service {
|
||||
return Err("Delegated authentication is not enabled on this server.");
|
||||
};
|
||||
|
||||
let current = machine.wait().await.read().clone();
|
||||
let machine = machine.wait().await;
|
||||
|
||||
if session.csrf_token.into_secret() != response.state {
|
||||
return Err("State mismatch.");
|
||||
}
|
||||
|
||||
let token_response = current
|
||||
let token_response = machine
|
||||
.exchange_code(AuthorizationCode::new(response.code))
|
||||
.expect("machine should be configured correctly")
|
||||
.set_pkce_verifier(session.pkce_verifier)
|
||||
@@ -313,41 +307,19 @@ impl Service {
|
||||
return Err(Self::SERVER_MISCONFIGURED);
|
||||
};
|
||||
|
||||
let verify = |machine: &OidcClientMachine| {
|
||||
let verifier =
|
||||
machine
|
||||
.id_token_verifier()
|
||||
.set_other_audience_verifier_fn(|audience| {
|
||||
config.additional_trusted_audiences.contains(audience)
|
||||
});
|
||||
let verifier = machine
|
||||
.id_token_verifier()
|
||||
.set_other_audience_verifier_fn(|audience| {
|
||||
config.additional_trusted_audiences.contains(audience)
|
||||
});
|
||||
|
||||
id_token
|
||||
.claims(&verifier, &session.nonce)
|
||||
.map(ToOwned::to_owned)
|
||||
};
|
||||
|
||||
let mut result = verify(¤t);
|
||||
|
||||
if matches!(
|
||||
result,
|
||||
Err(ClaimsVerificationError::SignatureVerification(
|
||||
SignatureVerificationError::NoMatchingKey
|
||||
))
|
||||
) {
|
||||
match self.discover().await {
|
||||
| Ok(discovered) => {
|
||||
info!("Refreshed OIDC provider metadata after an unknown signing key");
|
||||
result = verify(&discovered);
|
||||
*machine.wait().await.write() = Arc::new(discovered);
|
||||
},
|
||||
| Err(err) => warn!("Failed to refresh OIDC provider metadata: {err}"),
|
||||
}
|
||||
}
|
||||
|
||||
let claims = result.map_err(|err| {
|
||||
error!("Failed to verify id token claims: {err}");
|
||||
Self::SERVER_MISCONFIGURED
|
||||
})?;
|
||||
let claims = id_token
|
||||
.claims(&verifier, &session.nonce)
|
||||
.map_err(|err| {
|
||||
error!("Failed to verify id token claims: {err}");
|
||||
Self::SERVER_MISCONFIGURED
|
||||
})?
|
||||
.to_owned();
|
||||
|
||||
info!(subject = claims.subject().as_str(), "Authenticated subject");
|
||||
|
||||
|
||||
@@ -1,10 +1,6 @@
|
||||
use std::sync::Arc;
|
||||
|
||||
use conduwuit::{
|
||||
Config, PduEvent, Server,
|
||||
log::{Log, LogLevelReloadHandles},
|
||||
metrics::Metrics,
|
||||
};
|
||||
use conduwuit::{Config, PduEvent, Server, log::Log, metrics::Metrics};
|
||||
use futures::StreamExt;
|
||||
use ruma::{RoomId, RoomVersionId, events::StateEventType};
|
||||
use serde_json::json;
|
||||
@@ -222,9 +218,7 @@ async fn test_services() -> (Arc<crate::Services>, std::path::PathBuf) {
|
||||
"database_path": path,
|
||||
"db_cache_capacity_mb": 16.0,
|
||||
"rocksdb_write_buffer_capacity_mb": 4.0,
|
||||
"allow_local_presence": false,
|
||||
"dns_servers": ["127.0.0.1"],
|
||||
"allow_invalid_tls_certificates_yes_i_know_what_the_fuck_i_am_doing_with_this_and_i_know_this_is_insecure": true
|
||||
"allow_local_presence": false
|
||||
}))
|
||||
.unwrap();
|
||||
let runtime = tokio::runtime::Handle::current();
|
||||
@@ -232,8 +226,8 @@ async fn test_services() -> (Arc<crate::Services>, std::path::PathBuf) {
|
||||
config,
|
||||
Some(runtime.clone()),
|
||||
Log {
|
||||
reload: LogLevelReloadHandles::default(),
|
||||
capture: Arc::default(),
|
||||
reload: Default::default(),
|
||||
capture: Default::default(),
|
||||
},
|
||||
Metrics::new(Some(runtime), opentelemetry::global::meter("test"), None),
|
||||
));
|
||||
|
||||
@@ -221,9 +221,6 @@ impl Service {
|
||||
// We couldn't authorize a local join, probably because it's
|
||||
// restricted and we couldn't satisfy
|
||||
// the join rules ourselves.
|
||||
if servers.is_empty() {
|
||||
return Err(err);
|
||||
}
|
||||
info!(?err, "Failed to join room locally, trying over federation instead");
|
||||
},
|
||||
}
|
||||
|
||||
@@ -33,16 +33,6 @@ impl super::Service {
|
||||
return Err!(Request(Forbidden("Redacting m.room.create is not safe, forbidding.")));
|
||||
}
|
||||
|
||||
// Defense in depth, shouldn't be reachable
|
||||
if redacting_event
|
||||
.as_ref()
|
||||
.is_ok_and(|pdu| pdu.room_id() != Some(room_id))
|
||||
{
|
||||
return Err!(Request(Forbidden(
|
||||
"Cannot redact an event that belongs to a different room."
|
||||
)));
|
||||
}
|
||||
|
||||
if redacting_event
|
||||
.as_ref()
|
||||
.is_ok_and(|pdu| *pdu.kind() == TimelineEventType::RoomServerAcl)
|
||||
|
||||
@@ -666,7 +666,7 @@ impl Service {
|
||||
return Accessibility::NotFound;
|
||||
}
|
||||
|
||||
let request = assign!(get_stripped_state::msc4560::Request::new(room_id.to_owned()), {
|
||||
let request = assign!(get_stripped_state::unstable::Request::new(room_id.to_owned()), {
|
||||
state: state.to_owned(),
|
||||
num_joined_members
|
||||
});
|
||||
|
||||
@@ -591,7 +591,9 @@ impl super::Service {
|
||||
room_id: &RoomId,
|
||||
) -> Option<OwnedServerName> {
|
||||
let server = target_user_id.server_name();
|
||||
if self.services.globals.server_is_ours(server) {
|
||||
if !self.services.config.allow_sticky_events
|
||||
|| self.services.globals.server_is_ours(server)
|
||||
{
|
||||
return None;
|
||||
}
|
||||
|
||||
|
||||
@@ -3,18 +3,11 @@ use std::sync::Arc;
|
||||
use conduwuit::{
|
||||
Err, PduCount, PduEvent, Result, at, err,
|
||||
result::NotFound,
|
||||
utils::{
|
||||
self,
|
||||
stream::{ReadyExt, TryReadyExt},
|
||||
},
|
||||
utils::{self, stream::TryReadyExt},
|
||||
};
|
||||
use database::{Database, Deserialized, Json, KeyVal, Map};
|
||||
use futures::{
|
||||
FutureExt, Stream, StreamExt, TryFutureExt, TryStreamExt, future::select_ok, pin_mut,
|
||||
};
|
||||
use futures::{FutureExt, Stream, TryFutureExt, TryStreamExt, future::select_ok, pin_mut};
|
||||
use ruma::{CanonicalJsonObject, EventId, OwnedUserId, RoomId, api::Direction};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use serde_json::value::RawValue as RawJsonValue;
|
||||
|
||||
use super::{PduId, RawPduId};
|
||||
use crate::{Dep, rooms, rooms::short::ShortRoomId};
|
||||
@@ -23,7 +16,6 @@ pub(super) struct Data {
|
||||
eventid_outlierpdu: Arc<Map>,
|
||||
eventid_pduid: Arc<Map>,
|
||||
pduid_pdu: Arc<Map>,
|
||||
pduid_unredactedcontent: Arc<Map>,
|
||||
roomid_lasttimelinecount: Arc<Map>,
|
||||
userroomid_highlightcount: Arc<Map>,
|
||||
userroomid_notificationcount: Arc<Map>,
|
||||
@@ -37,12 +29,6 @@ struct Services {
|
||||
|
||||
pub type PdusIterItem = (PduCount, PduEvent);
|
||||
|
||||
#[derive(Deserialize, Serialize)]
|
||||
pub(super) struct UnredactedContent {
|
||||
pub(super) created: u64,
|
||||
pub(super) content: Box<RawJsonValue>,
|
||||
}
|
||||
|
||||
impl Data {
|
||||
pub(super) fn new(args: &crate::Args<'_>) -> Self {
|
||||
let db = &args.db;
|
||||
@@ -50,7 +36,6 @@ impl Data {
|
||||
eventid_outlierpdu: db["eventid_outlierpdu"].clone(),
|
||||
eventid_pduid: db["eventid_pduid"].clone(),
|
||||
pduid_pdu: db["pduid_pdu"].clone(),
|
||||
pduid_unredactedcontent: db["pduid_unredactedcontent"].clone(),
|
||||
roomid_lasttimelinecount: db["roomid_lasttimelinecount"].clone(),
|
||||
userroomid_highlightcount: db["userroomid_highlightcount"].clone(),
|
||||
userroomid_notificationcount: db["userroomid_notificationcount"].clone(),
|
||||
@@ -249,44 +234,6 @@ impl Data {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub(super) fn save_unredacted_content(&self, pdu_id: &RawPduId, content: &RawJsonValue) {
|
||||
let entry = UnredactedContent {
|
||||
created: utils::millis_since_unix_epoch(),
|
||||
content: content.to_owned(),
|
||||
};
|
||||
|
||||
self.pduid_unredactedcontent.raw_put(pdu_id, Json(&entry));
|
||||
}
|
||||
|
||||
pub(super) async fn get_unredacted_content(
|
||||
&self,
|
||||
pdu_id: &RawPduId,
|
||||
) -> Result<UnredactedContent> {
|
||||
self.pduid_unredactedcontent
|
||||
.get(pdu_id)
|
||||
.await
|
||||
.deserialized()
|
||||
}
|
||||
|
||||
pub(super) async fn purge_unredacted_content(&self, cutoff: u64) -> usize {
|
||||
let expired: Vec<_> = self
|
||||
.pduid_unredactedcontent
|
||||
.raw_stream()
|
||||
.ready_filter_map(Result::ok)
|
||||
.ready_filter_map(|(key, val)| {
|
||||
let entry: UnredactedContent = serde_json::from_slice(val).ok()?;
|
||||
(entry.created < cutoff).then(|| key.to_vec())
|
||||
})
|
||||
.collect()
|
||||
.await;
|
||||
|
||||
for key in &expired {
|
||||
self.pduid_unredactedcontent.remove(key);
|
||||
}
|
||||
|
||||
expired.len()
|
||||
}
|
||||
|
||||
/// Returns an iterator over all events and their tokens in a room that
|
||||
/// happened before the event with id `until` in reverse-chronological
|
||||
/// order.
|
||||
|
||||
@@ -48,7 +48,13 @@ impl super::Service {
|
||||
PartialPdu {
|
||||
event_type: event_type.to_string().into(),
|
||||
content,
|
||||
sticky: sticky_duration_ms.map(sticky::object),
|
||||
sticky: self
|
||||
.services
|
||||
.config
|
||||
.allow_sticky_events
|
||||
.then_some(sticky_duration_ms)
|
||||
.flatten()
|
||||
.map(sticky::object),
|
||||
state_key: Some(state_key.into()),
|
||||
timestamp,
|
||||
..Default::default()
|
||||
|
||||
@@ -6,17 +6,17 @@ mod data;
|
||||
mod helpers;
|
||||
mod redact;
|
||||
|
||||
use std::{fmt::Write, sync::Arc, time::Duration};
|
||||
use std::{fmt::Write, sync::Arc};
|
||||
|
||||
use async_trait::async_trait;
|
||||
pub use conduwuit_core::matrix::pdu::{PduId, RawPduId};
|
||||
use conduwuit_core::{
|
||||
Err, Result, Server, at, debug, err,
|
||||
Result, Server, at, err,
|
||||
matrix::{
|
||||
event::Event,
|
||||
pdu::{PduCount, PduEvent},
|
||||
},
|
||||
utils::{self, MutexMap, MutexMapGuard, future::TryExtExt, stream::TryIgnore},
|
||||
utils::{MutexMap, MutexMapGuard, future::TryExtExt, stream::TryIgnore},
|
||||
warn,
|
||||
};
|
||||
use futures::{Future, Stream, TryStreamExt, pin_mut};
|
||||
@@ -25,11 +25,6 @@ use ruma::{
|
||||
events::room::encrypted::Relation,
|
||||
};
|
||||
use serde::Deserialize;
|
||||
use serde_json::value::RawValue as RawJsonValue;
|
||||
use tokio::{
|
||||
sync::Notify,
|
||||
time::{MissedTickBehavior, interval},
|
||||
};
|
||||
|
||||
use self::data::Data;
|
||||
pub use self::{create::pdu_fits, data::PdusIterItem};
|
||||
@@ -61,7 +56,6 @@ struct ExtractBody {
|
||||
}
|
||||
|
||||
pub struct Service {
|
||||
interrupt: Notify,
|
||||
services: Services,
|
||||
db: Data,
|
||||
pub mutex_insert: RoomMutexMap,
|
||||
@@ -93,8 +87,6 @@ struct Services {
|
||||
users: Dep<users::Service>,
|
||||
}
|
||||
|
||||
const PURGE_INTERVAL_SECS: u64 = 3600;
|
||||
|
||||
type RoomMutexMap = MutexMap<OwnedRoomId, ()>;
|
||||
pub type RoomMutexGuard = MutexMapGuard<OwnedRoomId, ()>;
|
||||
|
||||
@@ -132,35 +124,9 @@ impl crate::Service for Service {
|
||||
},
|
||||
db: Data::new(&args),
|
||||
mutex_insert: RoomMutexMap::new(),
|
||||
interrupt: Notify::new(),
|
||||
}))
|
||||
}
|
||||
|
||||
#[tracing::instrument(skip_all, name = "unredacted_content_purge", level = "debug")]
|
||||
async fn worker(self: Arc<Self>) -> Result<()> {
|
||||
// Runs while disabled too, so old retained content still ages out.
|
||||
let mut i = interval(Duration::from_secs(PURGE_INTERVAL_SECS));
|
||||
i.set_missed_tick_behavior(MissedTickBehavior::Delay);
|
||||
loop {
|
||||
tokio::select! {
|
||||
() = self.interrupt.notified() => break,
|
||||
_ = i.tick() => (),
|
||||
}
|
||||
|
||||
let purged = self
|
||||
.db
|
||||
.purge_unredacted_content(self.unredacted_content_cutoff())
|
||||
.await;
|
||||
if purged > 0 {
|
||||
debug!("Purged {purged} expired unredacted event contents");
|
||||
}
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn interrupt(&self) { self.interrupt.notify_waiters(); }
|
||||
|
||||
async fn memory_usage(&self, out: &mut (dyn Write + Send)) -> Result {
|
||||
let mutex_insert = self.mutex_insert.len();
|
||||
writeln!(out, "insert_mutex: {mutex_insert}")?;
|
||||
@@ -276,27 +242,6 @@ impl Service {
|
||||
self.db.replace_pdu(pdu_id, pdu_json).await
|
||||
}
|
||||
|
||||
pub async fn get_unredacted_content(&self, pdu_id: &RawPduId) -> Result<Box<RawJsonValue>> {
|
||||
let entry = self.db.get_unredacted_content(pdu_id).await?;
|
||||
|
||||
if entry.created < self.unredacted_content_cutoff() {
|
||||
return Err!(Request(NotFound("Unredacted content has expired.")));
|
||||
}
|
||||
|
||||
Ok(entry.content)
|
||||
}
|
||||
|
||||
fn unredacted_content_cutoff(&self) -> u64 {
|
||||
let max_age = self
|
||||
.services
|
||||
.config
|
||||
.experiments
|
||||
.msc2815
|
||||
.map_or_default(|c| c.unredacted_content_max_age_secs);
|
||||
|
||||
utils::millis_since_unix_epoch().saturating_sub(max_age.saturating_mul(1000))
|
||||
}
|
||||
|
||||
/// Returns an iterator over all PDUs in a room. Unknown rooms produce no
|
||||
/// items.
|
||||
#[inline]
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
use conduwuit::config::experiments::ToggledExperiment;
|
||||
use conduwuit_core::{
|
||||
Err, Result, err,
|
||||
Result, err,
|
||||
matrix::event::Event,
|
||||
utils::{self},
|
||||
warn,
|
||||
};
|
||||
use ruma::{EventId, events::room::encrypted::Relation, signatures::content_hash};
|
||||
use ruma::{EventId, events::room::encrypted::Relation};
|
||||
|
||||
use super::{ExtractBody, ExtractRelatesTo};
|
||||
use crate::rooms::short::ShortRoomId;
|
||||
@@ -33,12 +32,6 @@ impl super::Service {
|
||||
err!(Database(error!(?pdu_id, %event_id, ?e, "PDU ID points to invalid PDU.")))
|
||||
})?;
|
||||
|
||||
if pdu.room_id() != reason.room_id() {
|
||||
return Err!(Request(Forbidden(
|
||||
"Cannot redact an event that belongs to a different room."
|
||||
)));
|
||||
}
|
||||
|
||||
let thread_root = match pdu.get_content::<ExtractRelatesTo>() {
|
||||
| Ok(ExtractRelatesTo { relates_to: Relation::Thread(thread) }) =>
|
||||
Some(thread.event_id),
|
||||
@@ -59,16 +52,6 @@ impl super::Service {
|
||||
.get_room_version(&pdu.room_id_or_hash())
|
||||
.await?;
|
||||
|
||||
if self.services.config.experiments.msc2815.is_enabled() {
|
||||
let mut pdu_json = self.get_pdu_json_from_id(&pdu_id).await?;
|
||||
pdu_json.remove("event_id");
|
||||
if content_hash(&pdu_json)
|
||||
.is_ok_and(|hash| hash.encode() == pdu.hashes.sha256.trim_end_matches('='))
|
||||
{
|
||||
self.db.save_unredacted_content(&pdu_id, &pdu.content);
|
||||
}
|
||||
}
|
||||
|
||||
pdu.redact(&room_version_id, Some(reason.event_id()))?;
|
||||
|
||||
let obj = utils::to_canonical_object(&pdu).map_err(|e| {
|
||||
|
||||
@@ -23,8 +23,10 @@ use futures::{FutureExt, Stream, StreamExt};
|
||||
use ruma::{
|
||||
OwnedServerName, RoomId, ServerName, UserId,
|
||||
api::{
|
||||
OutgoingRequest, auth_scheme::NoAuthentication,
|
||||
federation::authentication::ServerSignatures, path_builder::PathBuilder,
|
||||
OutgoingRequest,
|
||||
auth_scheme::{NoAccessToken, NoAuthentication, SendAccessToken},
|
||||
federation::authentication::ServerSignatures,
|
||||
path_builder::PathBuilder,
|
||||
},
|
||||
};
|
||||
use tokio::{task, task::JoinSet};
|
||||
@@ -418,6 +420,26 @@ impl Service {
|
||||
.await
|
||||
}
|
||||
|
||||
/// Send an unauthenticated federation request with no X-Matrix header.
|
||||
#[inline]
|
||||
pub async fn send_legacy_media_request<'i, T>(
|
||||
&self,
|
||||
dest: &ServerName,
|
||||
request: T,
|
||||
) -> Result<T::IncomingResponse>
|
||||
where
|
||||
T: OutgoingRequest<
|
||||
Authentication = NoAccessToken,
|
||||
PathBuilder: PathBuilder<Input<'i>: FederationPathBuilderInput>,
|
||||
> + Debug
|
||||
+ Send,
|
||||
{
|
||||
self.services
|
||||
.federation
|
||||
.execute_on(&self.services.client.federation, dest, request, SendAccessToken::None)
|
||||
.await
|
||||
}
|
||||
|
||||
/// Clean up queued sending event data
|
||||
///
|
||||
/// Used after we remove an appservice registration or a user deletes a push
|
||||
|
||||
@@ -149,10 +149,10 @@ impl Service {
|
||||
{
|
||||
debug!("{dest} is now unhealthy & stale due to a connect error: {e:?}");
|
||||
self.services.federation.mark_destination_stale(dest);
|
||||
self.services.federation.hit_unhealthy(dest.clone(), None);
|
||||
self.services.federation.hit_unhealthy(dest.clone());
|
||||
} else if e.status_code() != StatusCode::OK {
|
||||
debug!("{dest} is now unhealthy due to error response: {e:?}");
|
||||
self.services.federation.hit_unhealthy(dest.clone(), None);
|
||||
self.services.federation.hit_unhealthy(dest.clone());
|
||||
}
|
||||
}
|
||||
Self::handle_response_err(dest, statuses, &e);
|
||||
@@ -327,7 +327,7 @@ impl Service {
|
||||
/// still-sticky events. Only netburst delivers this queue, so with it
|
||||
/// disabled there is nothing to keep the event for.
|
||||
async fn survives_netburst_trim(&self, event: &SendingEvent) -> bool {
|
||||
if !self.server.config.startup_netburst {
|
||||
if !self.server.config.allow_sticky_events || !self.server.config.startup_netburst {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
+36
-72
@@ -6,8 +6,7 @@ use std::{
|
||||
use conduwuit::{Result, SyncMutex, trace};
|
||||
use futures::StreamExt;
|
||||
use ruma::{
|
||||
OwnedDeviceId, OwnedRoomId, OwnedUserId, RoomId, UserId,
|
||||
api::client::sync::sync_events::msc4186,
|
||||
OwnedDeviceId, OwnedRoomId, OwnedUserId, RoomId, UserId, api::client::sync::sync_events::v5,
|
||||
};
|
||||
use tokio::sync::watch;
|
||||
|
||||
@@ -25,32 +24,21 @@ struct Services {
|
||||
|
||||
#[allow(unused, reason = "TODO refactor")]
|
||||
struct SlidingSyncCache {
|
||||
lists: BTreeMap<String, msc4186::request::List>,
|
||||
subscriptions: BTreeMap<OwnedRoomId, msc4186::request::RoomSubscription>,
|
||||
lists: BTreeMap<String, v5::request::List>,
|
||||
subscriptions: BTreeMap<OwnedRoomId, v5::request::RoomSubscription>,
|
||||
// For every room, the roomsince number
|
||||
known_rooms: BTreeMap<String, BTreeMap<OwnedRoomId, u64>>,
|
||||
extensions: msc4186::request::Extensions,
|
||||
extensions: v5::request::Extensions,
|
||||
}
|
||||
|
||||
/// For every in-scope room, the stream position up to which sticky events
|
||||
/// have been delivered on this connection.
|
||||
pub type StickyDelivered = BTreeMap<OwnedRoomId, u64>;
|
||||
|
||||
#[derive(Default)]
|
||||
struct SnakeSyncCache {
|
||||
lists: BTreeMap<String, msc4186::request::List>,
|
||||
subscriptions: BTreeMap<OwnedRoomId, msc4186::request::RoomSubscription>,
|
||||
lists: BTreeMap<String, v5::request::List>,
|
||||
subscriptions: BTreeMap<OwnedRoomId, v5::request::RoomSubscription>,
|
||||
known_rooms: BTreeMap<String, BTreeMap<OwnedRoomId, u64>>,
|
||||
sticky_delivered: StickyDelivered,
|
||||
acknowledged_pos: u64,
|
||||
pending: BTreeMap<u64, PendingState>,
|
||||
extensions: msc4186::request::Extensions,
|
||||
}
|
||||
|
||||
#[derive(Default)]
|
||||
struct PendingState {
|
||||
known_rooms: BTreeMap<String, BTreeMap<OwnedRoomId, u64>>,
|
||||
sticky_delivered: StickyDelivered,
|
||||
pending: BTreeMap<u64, BTreeMap<String, BTreeMap<OwnedRoomId, u64>>>,
|
||||
extensions: v5::request::Extensions,
|
||||
}
|
||||
|
||||
impl SnakeSyncCache {
|
||||
@@ -59,19 +47,13 @@ impl SnakeSyncCache {
|
||||
}
|
||||
|
||||
fn acknowledge(&mut self, pos: u64) {
|
||||
if let Some(pending) = self.pending.remove(&pos) {
|
||||
self.known_rooms = pending.known_rooms;
|
||||
self.sticky_delivered = pending.sticky_delivered;
|
||||
if let Some(known_rooms) = self.pending.remove(&pos) {
|
||||
self.known_rooms = known_rooms;
|
||||
self.acknowledged_pos = pos;
|
||||
}
|
||||
}
|
||||
|
||||
fn stage_pending(
|
||||
&mut self,
|
||||
pos: u64,
|
||||
known_rooms: BTreeMap<String, BTreeSet<OwnedRoomId>>,
|
||||
sticky_delivered: StickyDelivered,
|
||||
) {
|
||||
fn stage_pending(&mut self, pos: u64, known_rooms: BTreeMap<String, BTreeSet<OwnedRoomId>>) {
|
||||
let mut pending_rooms = self.known_rooms.clone();
|
||||
for (list_id, rooms) in known_rooms {
|
||||
let list = pending_rooms.entry(list_id).or_default();
|
||||
@@ -79,10 +61,7 @@ impl SnakeSyncCache {
|
||||
list.insert(room_id, pos);
|
||||
}
|
||||
}
|
||||
self.pending.insert(pos, PendingState {
|
||||
known_rooms: pending_rooms,
|
||||
sticky_delivered,
|
||||
});
|
||||
self.pending.insert(pos, pending_rooms);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -198,8 +177,8 @@ impl Service {
|
||||
&self,
|
||||
snake_key: &SnakeConnectionsKey,
|
||||
pos: u64,
|
||||
request: &mut msc4186::Request,
|
||||
) -> (BTreeMap<String, BTreeMap<OwnedRoomId, u64>>, StickyDelivered) {
|
||||
request: &mut v5::Request,
|
||||
) -> BTreeMap<String, BTreeMap<OwnedRoomId, u64>> {
|
||||
let mut cache = self.snake_connections.lock();
|
||||
let cached = Arc::clone(
|
||||
cache
|
||||
@@ -211,7 +190,7 @@ impl Service {
|
||||
|
||||
cached.acknowledge(pos);
|
||||
|
||||
//msc4186::Request::try_from_http_request(req, path_args);
|
||||
//v5::Request::try_from_http_request(req, path_args);
|
||||
for (list_id, list) in &mut request.lists {
|
||||
if let Some(cached_list) = cached.lists.get(list_id) {
|
||||
list_or_sticky(
|
||||
@@ -245,6 +224,18 @@ impl Service {
|
||||
.room_subscriptions
|
||||
.extend(cached.subscriptions.clone());
|
||||
|
||||
request.extensions.e2ee.enabled = request
|
||||
.extensions
|
||||
.e2ee
|
||||
.enabled
|
||||
.or(cached.extensions.e2ee.enabled);
|
||||
|
||||
request.extensions.to_device.enabled = request
|
||||
.extensions
|
||||
.to_device
|
||||
.enabled
|
||||
.or(cached.extensions.to_device.enabled);
|
||||
|
||||
request.extensions.account_data.enabled = request
|
||||
.extensions
|
||||
.account_data
|
||||
@@ -284,25 +275,9 @@ impl Service {
|
||||
&mut request.extensions.receipts.lists,
|
||||
cached.extensions.receipts.lists.clone(),
|
||||
);
|
||||
some_or_sticky(
|
||||
&mut request.extensions.sticky_events.enabled,
|
||||
cached.extensions.sticky_events.enabled,
|
||||
);
|
||||
some_or_sticky(
|
||||
&mut request.extensions.sticky_events.limit,
|
||||
cached.extensions.sticky_events.limit,
|
||||
);
|
||||
some_or_sticky(
|
||||
&mut request.extensions.sticky_events.rooms,
|
||||
cached.extensions.sticky_events.rooms.clone(),
|
||||
);
|
||||
some_or_sticky(
|
||||
&mut request.extensions.sticky_events.lists,
|
||||
cached.extensions.sticky_events.lists.clone(),
|
||||
);
|
||||
|
||||
cached.extensions = request.extensions.clone();
|
||||
(cached.known_rooms.clone(), cached.sticky_delivered.clone())
|
||||
cached.known_rooms.clone()
|
||||
}
|
||||
|
||||
pub fn store_snake_sync_pending(
|
||||
@@ -310,7 +285,6 @@ impl Service {
|
||||
key: &SnakeConnectionsKey,
|
||||
pos: u64,
|
||||
known_rooms: BTreeMap<String, BTreeSet<OwnedRoomId>>,
|
||||
sticky_delivered: StickyDelivered,
|
||||
) {
|
||||
let mut cache = self.snake_connections.lock();
|
||||
let cached = Arc::clone(
|
||||
@@ -321,13 +295,13 @@ impl Service {
|
||||
let cached = &mut cached.lock();
|
||||
drop(cache);
|
||||
|
||||
cached.stage_pending(pos, known_rooms, sticky_delivered);
|
||||
cached.stage_pending(pos, known_rooms);
|
||||
}
|
||||
|
||||
pub fn update_snake_sync_subscriptions(
|
||||
&self,
|
||||
key: &SnakeConnectionsKey,
|
||||
subscriptions: BTreeMap<OwnedRoomId, msc4186::request::RoomSubscription>,
|
||||
subscriptions: BTreeMap<OwnedRoomId, v5::request::RoomSubscription>,
|
||||
) {
|
||||
let mut cache = self.snake_connections.lock();
|
||||
let cached = Arc::clone(
|
||||
@@ -438,13 +412,10 @@ mod tests {
|
||||
fn pending_rooms_are_committed_only_when_the_response_pos_is_acknowledged() {
|
||||
let room_id = OwnedRoomId::try_from("!room:example.com").unwrap();
|
||||
let mut cache = SnakeSyncCache {
|
||||
pending: BTreeMap::from([(42, PendingState {
|
||||
known_rooms: BTreeMap::from([(
|
||||
"list".to_owned(),
|
||||
BTreeMap::from([(room_id, 42)]),
|
||||
)]),
|
||||
sticky_delivered: StickyDelivered::new(),
|
||||
})]),
|
||||
pending: BTreeMap::from([(
|
||||
42,
|
||||
BTreeMap::from([("list".to_owned(), BTreeMap::from([(room_id, 42)]))]),
|
||||
)]),
|
||||
..Default::default()
|
||||
};
|
||||
|
||||
@@ -467,11 +438,7 @@ mod tests {
|
||||
let dropped = OwnedRoomId::try_from("!dropped:example.com").unwrap();
|
||||
let mut cache = SnakeSyncCache::default();
|
||||
let stage = |cache: &mut SnakeSyncCache, pos, rooms: BTreeSet<OwnedRoomId>| {
|
||||
cache.stage_pending(
|
||||
pos,
|
||||
BTreeMap::from([("all_rooms".to_owned(), rooms)]),
|
||||
StickyDelivered::new(),
|
||||
);
|
||||
cache.stage_pending(pos, BTreeMap::from([("all_rooms".to_owned(), rooms)]));
|
||||
cache.acknowledge(pos);
|
||||
};
|
||||
|
||||
@@ -491,10 +458,7 @@ mod tests {
|
||||
fn overlapping_responses_accept_either_response_position() {
|
||||
let mut cache = SnakeSyncCache {
|
||||
acknowledged_pos: 100,
|
||||
pending: BTreeMap::from([
|
||||
(200, PendingState::default()),
|
||||
(201, PendingState::default()),
|
||||
]),
|
||||
pending: BTreeMap::from([(200, BTreeMap::new()), (201, BTreeMap::new())]),
|
||||
..Default::default()
|
||||
};
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ use conduwuit_database::{Deserialized, Json};
|
||||
use ruma::{
|
||||
DeviceId, OwnedDeviceId, UserId,
|
||||
api::client::dehydrated_device::{
|
||||
DehydratedDeviceData, put_dehydrated_device::msc3814::Request,
|
||||
DehydratedDeviceData, put_dehydrated_device::unstable::Request,
|
||||
},
|
||||
serde::Raw,
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user