Compare commits

...
Author SHA1 Message Date
Erwan Leboucher b38daf3310 fix: preserve predecessors sharing a state-before ID
Signed-off-by: Erwan Leboucher <erwanleboucher@gmail.com>
2026-11-10 22:04:45 +00:00
timedout 0a52421b65 fix: Re-introduce edge reference tracking 2026-11-10 21:18:13 +00:00
Jade Ellis 79b49134f4 fix: Correct conflict in patch 2026-11-10 21:01:48 +00:00
timedout 4a721dad07 fix: SEC15
Reviewed-By: Jade Ellis <jade@ellis.link>
Reviewed-By: Ginger <ginger@gingershaped.computer>
2026-11-10 20:42:04 +00:00
timedout 3abb32dd75 fix: SEC31
Reviewed-By: Jade Ellis <jade@ellis.link>
Reviewed-By: Ginger <ginger@gingershaped.computer>
2026-11-10 20:41:38 +00:00
timedout 7a6bea70b2 fix: SEC34
Reviewed-By: Jade Ellis <jade@ellis.link>
Reviewed-By: Ginger <ginger@gingershaped.computer>
Reviewed-By: Jacob Taylor <jacob@explodie.org>
2026-11-10 20:41:19 +00:00
timedoutandGinger b2b9c79927 fix: SEC39
Reviewed-By: timedout <git@nexy7574.co.uk>
Co-Authored-By: Ginger <ginger@gingershaped.computer>
2026-11-10 20:40:28 +00:00
timedout 23a3ada393 fix: SEC36
Reviewed-By: Jacob Taylor <jacob@explodie.org>
Reviewed-By: Jade Ellis <jade@ellis.link>
Reviewed-By: Ginger <ginger@gingershaped.computer>
2026-11-10 20:39:13 +00:00
Jade Ellis 88441a409a refactor(rooms/timeline): Simplify deduplication of read receipts 2026-11-10 20:02:21 +00:00
Jade Ellis e21d86161c chore: Add changelog 2026-11-10 20:02:21 +00:00
Jade Ellis f42955602e test: Add unit test for merging threaded and private receipts 2026-11-10 20:02:21 +00:00
Jade Ellis c7aebd2b52 fix: Deduplicate read receipts and preserve per-thread state 2026-11-10 20:02:20 +00:00
Jade Ellis 61a50a627b fix(client): Add membership checks to read markers 2026-11-10 20:02:20 +00:00
Jade Ellis 76ace2bc09 fix(client): Allow setting read receipts on backfilled events 2026-11-10 20:02:20 +00:00
Jade Ellis e0d3d12654 fix(sync/v3): Pack room receipts into single m.receipt event 2026-11-10 20:02:20 +00:00
Jade Ellis be2f540a9d fix(client): Accurately include receipt senders in lazy loading 2026-11-10 20:02:19 +00:00
Jade Ellis 0368097791 fix(service/sending): Prevent panics and fix receipt limit in federation sender 2026-11-10 20:02:18 +00:00
Ginger 4d7a7d6cdc chore(deps): Clean up features and remove unused dependencies 2026-11-10 13:24:05 -05:00
Ginger d677486100 chore: Fix docs build failing 2026-11-10 11:45:37 -05:00
Renovate Bot 684b83491b chore(deps): update github-actions-digest 2026-11-10 05:17:14 +00:00
Henry-Hiles db83bc4c63 fix(nix): Disable broken checks for tzdata and sqlite 2026-11-09 20:58:37 +00:00
Henry-Hiles bf028274f8 fix(nix): fix linking to RocksDB 2026-11-09 18:03:34 +00:00
Jade Ellis 779374bb54 fix(deps): Properly use intended crypto backends 2026-11-08 20:34:05 +00:00
Jade Ellis e217ebb5e0 chore(ci): Remove debug logs
This was an artifact that has long outlived its usefulness
2026-11-08 19:58:13 +00:00
Jade Ellis 87b2ca81a3 fix(ci): Kill the permissions blocks entirely, they don't do anything 2026-11-08 19:42:39 +00:00
theS1LV3R a9bb74df6d chore: Disable hickory-dns feature from reqwest
As we now pass in our own resolver (and hickory instance) for every client,
having the hickory-dns feature enabled isn't necessary.
2026-11-08 19:40:49 +00:00
theS1LV3R 144777dab0 fix: Add DNS resolver to oidc crate as well
Because openidconnect vendors reqwest (??), we have to re-implement
the entire Resolve trait.

No I don't like it, but I can't think of a better solution.
2026-11-08 19:40:49 +00:00
theS1LV3R 60a0784a36 chore: Changelog 2026-11-08 19:40:49 +00:00
theS1LV3R a484c28f99 fix: Don't try to use system resolv.conf when other servers are configured
Previously, only HTTP clients targeting matrix servers (and using the
resolution spec) would use the DNS servers configured in the c10y config.
This happened because reqwest requires any DNS resolvers passed in to
implement reqwest::dns::Resolve, which only the matrix resolver did,
and no other HTTP client had a proper DNS resolver (which used the
configured DNS servers) passed into it.

To fix this we make a custom resolution struct based on reqwest's
reqwest::dns::HickoryDnsResolver, which implements Request with no
other modifications to the DNS response. HickoryDnsResolver itself isn't
exported, which is why we re-created it instead of using it directly.

no im not an LLM i just wrote this to remember my own changes later on

Fixes: continuwuation/continuwuity#2441
2026-11-08 19:40:49 +00:00
Renovate Bot f4f0a69fe4 chore(deps): lock file maintenance 2026-11-08 19:35:37 +00:00
Renovate Bot fcde5634da chore(deps): update dependency cargo-bins/cargo-binstall to v1.26.2 2026-11-08 19:35:04 +00:00
Renovate Bot 2edd61062c chore(deps): pin dependencies 2026-11-08 19:34:54 +00:00
Renovate Bot bfabac095f chore(deps): update pre-commit hook crate-ci/committed to v1.1.12 2026-11-08 19:34:41 +00:00
Renovate Bot d6710a9f00 chore(deps): update dependency @rspress/plugin-sitemap to v2.1.1 2026-11-08 19:34:36 +00:00
Henry-Hiles be5ff91eb3 chore: break out of loop when level is empty 2026-11-08 19:34:25 +00:00
Henry-Hiles 5ff6d71e7c chore: Make walk use counts only 2026-11-08 19:34:25 +00:00
Henry-Hiles 6782e12231 chore: Add changelog to #2465 2026-11-08 19:34:25 +00:00
Henry-Hiles 2e43797d95 chore: Make Clippy happy 2026-11-08 19:34:25 +00:00
Henry-Hiles 15b4e8e2f9 fix: Correct relations pagination and recursion
Ended up rewriting a fair bit, but should work better.
2026-11-08 19:34:25 +00:00
Jade Ellis 7c451888ae fix(ci): Pull base images on build to prevent using outdated base images 2026-11-08 18:22:19 +00:00
Jade Ellis 1716913b1a fix(ci): Move permissions fields causing workflow warnings 2026-11-08 18:19:30 +00:00
Jade Ellis ce986d9c40 docs: Changelog 2026-11-08 17:49:03 +00:00
Jade Ellis 6075e6e3ad chore: Upgrade other dependencies 2026-11-08 17:41:23 +00:00
renovate 02f96d311b chore(Nix): Updated flake hashes 2026-11-08 17:04:25 +00:00
Jade Ellis 1af92add88 chore(deps): Upgrade rocksdb and jemalloc 2026-11-08 16:54:23 +00:00
Jade Ellis c3f0d2ffa5 chore(deps): Upgrade rustls
Closes #2472
2026-11-08 15:06:06 +00:00
Ginger 02aed4fb23 chore: News fragment 2026-11-05 16:49:48 +00:00
Ginger 4a3b0366ac feat: Ratelimit CSAPI endpoints 2026-11-05 16:49:48 +00:00
Bardi Harborow 15f7aabca6 fix(complement): Build with the openreg feature
Since challengeless registration was gated behind the `openreg` feature,
building with plain `cargo build -p conduwuit` produces a server that
refuses Complement's registrations, so almost every test fails.

This commit updates the testing docs and the runner's build hints to
enable the feature.
2026-11-05 16:16:11 +00:00
stratself a57e0945eb chore: Add changelog for continuwuity --> homeserver 2026-11-05 16:10:27 +00:00
stratself b095103e23 docs: Use continuwuity instead of homeserver for the docker service
This commit replaces all references of `homeserver` to `continuwuity`

The `docker-compose.yml` file also receives 2-space linting
2026-11-05 16:10:27 +00:00
99 changed files with 2700 additions and 1719 deletions

No files matched your search

@@ -44,7 +44,7 @@ runs:
- name: Login to builtin registry - name: Login to builtin registry
if: ${{ env.BUILTIN_REGISTRY_ENABLED == 'true' }} if: ${{ env.BUILTIN_REGISTRY_ENABLED == 'true' }}
uses: docker/login-action@81c6f93d4bc991e510b342a00b419b3bb4efc5c6 # v4 uses: docker/login-action@8aa5831fb8d48d8f76594c7ddde61ae58019f550 # v4
with: with:
registry: ${{ env.BUILTIN_REGISTRY }} registry: ${{ env.BUILTIN_REGISTRY }}
username: ${{ inputs.registry_user }} username: ${{ inputs.registry_user }}
@@ -79,7 +79,7 @@ runs:
- name: Login to builtin registry - name: Login to builtin registry
if: ${{ env.BUILTIN_REGISTRY_ENABLED == 'true' }} if: ${{ env.BUILTIN_REGISTRY_ENABLED == 'true' }}
uses: docker/login-action@81c6f93d4bc991e510b342a00b419b3bb4efc5c6 # v4 uses: docker/login-action@8aa5831fb8d48d8f76594c7ddde61ae58019f550 # v4
with: with:
registry: ${{ env.BUILTIN_REGISTRY }} registry: ${{ env.BUILTIN_REGISTRY }}
username: ${{ inputs.registry_user }} username: ${{ inputs.registry_user }}
+1 -1
View File
@@ -7,7 +7,7 @@ runs:
using: composite using: composite
steps: steps:
- name: Install sccache - name: Install sccache
uses: https://forgejo.ellis.link/continuwuation/sccache-action@v1 uses: https://forgejo.ellis.link/continuwuation/sccache-action@b5ae5b4541ed5fb0f616e3cb616bf213fefa1c40 # v1
- name: Configure sccache - name: Configure sccache
uses: https://github.com/actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9 uses: https://github.com/actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
with: with:
@@ -29,7 +29,7 @@ runs:
steps: steps:
- name: Detect runner OS - name: Detect runner OS
id: runner-os id: runner-os
uses: https://forgejo.ellis.link/continuwuation/detect-versions@v1 uses: https://forgejo.ellis.link/continuwuation/detect-versions@d39555789fed25b8eb8e086d9f199c514dfa311e # v1
- name: Configure cross-compilation architecture - name: Configure cross-compilation architecture
if: inputs.dpkg-arch != '' if: inputs.dpkg-arch != ''
+2 -2
View File
@@ -39,7 +39,7 @@ runs:
steps: steps:
- name: Detect runner OS - name: Detect runner OS
id: runner-os id: runner-os
uses: https://forgejo.ellis.link/continuwuation/detect-versions@v1 uses: https://forgejo.ellis.link/continuwuation/detect-versions@d39555789fed25b8eb8e086d9f199c514dfa311e # v1
- name: Configure Cargo environment - name: Configure Cargo environment
shell: bash shell: bash
@@ -147,7 +147,7 @@ runs:
run: echo "::group::📦 Restoring build cache" run: echo "::group::📦 Restoring build cache"
- name: Setup sccache - name: Setup sccache
uses: https://forgejo.ellis.link/continuwuation/sccache-action@v1 uses: https://forgejo.ellis.link/continuwuation/sccache-action@b5ae5b4541ed5fb0f616e3cb616bf213fefa1c40 # v1
- name: End build cache restore group - name: End build cache restore group
shell: bash shell: bash
+1 -1
View File
@@ -71,7 +71,7 @@ runs:
- name: Install timelord-cli and git-warp-time - name: Install timelord-cli and git-warp-time
if: steps.check-binaries.outputs.need-install == 'true' if: steps.check-binaries.outputs.need-install == 'true'
uses: https://github.com/taiki-e/install-action@682ce6c3c696a4cd5168a05f98e51aa02b877941 # v2 uses: https://github.com/taiki-e/install-action@cfdb7ed4ccc7c7dce37759eae89dc5674b469b39 # v2
with: with:
tool: git-warp-time,timelord-cli@3.0.1 tool: git-warp-time,timelord-cli@3.0.1
-5
View File
@@ -4,11 +4,6 @@ on:
pull_request_target: pull_request_target:
types: [opened, reopened] types: [opened, reopened]
permissions:
contents: read
pull-requests: write
issues: write
jobs: jobs:
auto-label: auto-label:
name: Apply labels based on changed files name: Apply labels based on changed files
+1 -1
View File
@@ -60,7 +60,7 @@ jobs:
cargo-debian-${{ steps.debian-version.outputs.distribution }}-${{ matrix.arch }}- cargo-debian-${{ steps.debian-version.outputs.distribution }}-${{ matrix.arch }}-
- name: Setup sccache - name: Setup sccache
uses: https://forgejo.ellis.link/continuwuation/sccache-action@v1 uses: https://forgejo.ellis.link/continuwuation/sccache-action@b5ae5b4541ed5fb0f616e3cb616bf213fefa1c40 # v1
- name: Configure sccache environment - name: Configure sccache environment
run: | run: |
+1 -3
View File
@@ -54,8 +54,6 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: needs:
- build - build
permissions:
contents: write
if: startsWith(github.ref, 'refs/tags/') if: startsWith(github.ref, 'refs/tags/')
steps: steps:
- name: Download binary artifacts - name: Download binary artifacts
@@ -65,7 +63,7 @@ jobs:
path: binaries path: binaries
merge-multiple: true merge-multiple: true
- name: Create Release and Upload - name: Create Release and Upload
uses: https://github.com/softprops/action-gh-release@efb35369e0ad2afab669f228072c1b0d510eae64 # v3 uses: https://github.com/softprops/action-gh-release@8a0cd651e5b2365bd640854a3fa5dfc70e4875f3 # v3
with: with:
draft: true draft: true
files: binaries/* files: binaries/*
-5
View File
@@ -4,11 +4,6 @@ on:
pull_request_target: pull_request_target:
types: [opened, synchronize, reopened, ready_for_review, labeled, unlabeled] types: [opened, synchronize, reopened, ready_for_review, labeled, unlabeled]
permissions:
contents: read
pull-requests: write
issues: write
jobs: jobs:
check-changelog: check-changelog:
name: Check changelog is added name: Check changelog is added
+1 -1
View File
@@ -28,7 +28,7 @@ jobs:
- name: Detect runner environment - name: Detect runner environment
id: runner-env id: runner-env
uses: https://forgejo.ellis.link/continuwuation/detect-versions@v1 uses: https://forgejo.ellis.link/continuwuation/detect-versions@d39555789fed25b8eb8e086d9f199c514dfa311e # v1
- name: Setup Node.js - name: Setup Node.js
if: steps.runner-env.outputs.node_major == '' || steps.runner-env.outputs.node_major < '20' if: steps.runner-env.outputs.node_major == '' || steps.runner-env.outputs.node_major < '20'
-4
View File
@@ -7,10 +7,6 @@ on:
- main - main
workflow_dispatch: workflow_dispatch:
permissions:
contents: read
pull-requests: read
jobs: jobs:
fast-checks: fast-checks:
name: Pre-commit & Formatting name: Pre-commit & Formatting
+3 -13
View File
@@ -31,11 +31,6 @@ jobs:
build-release: build-release:
name: "Build ${{ matrix.slug }} (release)" name: "Build ${{ matrix.slug }} (release)"
runs-on: dind runs-on: dind
permissions:
contents: read
packages: write
attestations: write
id-token: write
strategy: strategy:
matrix: matrix:
include: include:
@@ -84,6 +79,7 @@ jobs:
outputs: | outputs: |
${{ env.BUILTIN_REGISTRY_ENABLED == 'true' && format('type=image,"name={0}",push-by-digest=true,name-canonical=true,push=true', env.IMAGE_PATH) || format('type=image,"name={0}",push=false', env.IMAGE_PATH) }} ${{ env.BUILTIN_REGISTRY_ENABLED == 'true' && format('type=image,"name={0}",push-by-digest=true,name-canonical=true,push=true', env.IMAGE_PATH) || format('type=image,"name={0}",push=false', env.IMAGE_PATH) }}
type=local,dest=/tmp/binaries type=local,dest=/tmp/binaries
pull: true # Base images were becoming out of date
env: env:
SOURCE_DATE_EPOCH: ${{ env.TIMESTAMP }} SOURCE_DATE_EPOCH: ${{ env.TIMESTAMP }}
- name: Upload Docker artifacts - name: Upload Docker artifacts
@@ -117,11 +113,6 @@ jobs:
name: "Build ${{ matrix.slug }} (max-perf)" name: "Build ${{ matrix.slug }} (max-perf)"
runs-on: dind runs-on: dind
needs: build-release needs: build-release
permissions:
contents: read
packages: write
attestations: write
id-token: write
strategy: strategy:
matrix: matrix:
include: include:
@@ -172,6 +163,7 @@ jobs:
outputs: | outputs: |
${{ env.BUILTIN_REGISTRY_ENABLED == 'true' && format('type=image,"name={0}",push-by-digest=true,name-canonical=true,push=true', env.IMAGE_PATH) || format('type=image,"name={0}",push=false', env.IMAGE_PATH) }} ${{ env.BUILTIN_REGISTRY_ENABLED == 'true' && format('type=image,"name={0}",push-by-digest=true,name-canonical=true,push=true', env.IMAGE_PATH) || format('type=image,"name={0}",push=false', env.IMAGE_PATH) }}
type=local,dest=/tmp/binaries type=local,dest=/tmp/binaries
pull: true # Base images were becoming out of date
env: env:
SOURCE_DATE_EPOCH: ${{ env.TIMESTAMP }} SOURCE_DATE_EPOCH: ${{ env.TIMESTAMP }}
- name: Upload max-perf Docker artifacts - name: Upload max-perf Docker artifacts
@@ -207,8 +199,6 @@ jobs:
needs: needs:
- build-release - build-release
- build-maxperf - build-maxperf
permissions:
contents: write
if: startsWith(github.ref, 'refs/tags/') if: startsWith(github.ref, 'refs/tags/')
steps: steps:
- name: Download binary artifacts - name: Download binary artifacts
@@ -218,7 +208,7 @@ jobs:
path: binaries path: binaries
merge-multiple: true merge-multiple: true
- name: Create Release and Upload - name: Create Release and Upload
uses: https://github.com/softprops/action-gh-release@efb35369e0ad2afab669f228072c1b0d510eae64 # v3 uses: https://github.com/softprops/action-gh-release@8a0cd651e5b2365bd640854a3fa5dfc70e4875f3 # v3
with: with:
draft: true draft: true
files: binaries/* files: binaries/*
+1 -1
View File
@@ -32,7 +32,7 @@ repos:
stages: [ commit-msg ] stages: [ commit-msg ]
- repo: https://github.com/crate-ci/committed - repo: https://github.com/crate-ci/committed
rev: v1.1.11 rev: v1.1.12
hooks: hooks:
- id: committed - id: committed
Generated
+577 -564
View File
File diff suppressed because it is too large. Load diff
+78 -65
View File
@@ -18,11 +18,11 @@ version = "26.9.1"
name = "conduwuit" name = "conduwuit"
[workspace.dependencies.arrayvec] [workspace.dependencies.arrayvec]
version = "0.7.6" version = "0.7.8"
features = ["serde"] features = ["serde"]
[workspace.dependencies.smallvec] [workspace.dependencies.smallvec]
version = "1.14.0" version = "1.16.5"
features = [ features = [
"const_generics", "const_generics",
"const_new", "const_new",
@@ -39,10 +39,10 @@ features = ["ffi", "std", "union"]
version = "1.1.0" version = "1.1.0"
[workspace.dependencies.ctor] [workspace.dependencies.ctor]
version = "1.0.6" version = "1.0.13"
[workspace.dependencies.dtor] [workspace.dependencies.dtor]
version = "1.0.0" version = "1.0.6"
[workspace.dependencies.cargo_toml] [workspace.dependencies.cargo_toml]
version = "1.0" version = "1.0"
@@ -50,7 +50,7 @@ default-features = false
features = ["features"] features = ["features"]
[workspace.dependencies.toml] [workspace.dependencies.toml]
version = "1.1.2" version = "1.2.1"
default-features = false default-features = false
features = ["parse", "serde"] features = ["parse", "serde"]
@@ -58,7 +58,7 @@ features = ["parse", "serde"]
version = "0.6.0" version = "0.6.0"
[workspace.dependencies.base64] [workspace.dependencies.base64]
version = "0.23.0" version = "0.23.1"
default-features = false default-features = false
# used for TURN server authentication # used for TURN server authentication
@@ -71,36 +71,36 @@ version = "0.5.0"
default-features = false default-features = false
[workspace.dependencies.p256] [workspace.dependencies.p256]
version = "0.13.2" version = "0.14.0"
default-features = false default-features = false
features = ["ecdsa", "std"] features = ["ecdsa", "std"]
# used for checking if an IP is in specific subnets / CIDR ranges easier # used for checking if an IP is in specific subnets / CIDR ranges easier
[workspace.dependencies.ipaddress] [workspace.dependencies.ipaddress]
version = "0.2.0" version = "0.2.11"
[workspace.dependencies.rand] [workspace.dependencies.rand]
version = "0.10.1" version = "0.10.3"
# Used for the http request / response body type for Ruma endpoints used with reqwest # Used for the http request / response body type for Ruma endpoints used with reqwest
[workspace.dependencies.bytes] [workspace.dependencies.bytes]
version = "1.10.1" version = "1.12.1"
[workspace.dependencies.http-body-util] [workspace.dependencies.http-body-util]
version = "0.1.3" version = "0.1.5"
[workspace.dependencies.http] [workspace.dependencies.http]
version = "1.3.1" version = "1.5.0"
# parses the HTTP-date form of Retry-After # parses the HTTP-date form of Retry-After
[workspace.dependencies.httpdate] [workspace.dependencies.httpdate]
version = "1.0.3" version = "1.0.3"
[workspace.dependencies.regex] [workspace.dependencies.regex]
version = "1.11.1" version = "1.13.1"
[workspace.dependencies.axum] [workspace.dependencies.axum]
version = "0.8.8" version = "0.8.9"
default-features = false default-features = false
features = [ features = [
"form", "form",
@@ -114,7 +114,7 @@ features = [
] ]
[workspace.dependencies.axum-extra] [workspace.dependencies.axum-extra]
version = "0.12.0" version = "0.12.6"
default-features = false default-features = false
features = ["typed-header", "tracing", "cookie"] features = ["typed-header", "tracing", "cookie"]
@@ -133,12 +133,12 @@ default-features = false
version = "0.2" version = "0.2"
[workspace.dependencies.tower] [workspace.dependencies.tower]
version = "0.5.2" version = "0.5.3"
default-features = false default-features = false
features = ["util"] features = ["util"]
[workspace.dependencies.tower-http] [workspace.dependencies.tower-http]
version = "0.7.0" version = "0.7.1"
default-features = false default-features = false
features = [ features = [
"add-extension", "add-extension",
@@ -152,38 +152,46 @@ features = [
] ]
[workspace.dependencies.rustls] [workspace.dependencies.rustls]
version = "0.23.25" version = "0.23.46"
default-features = false default-features = false
[workspace.dependencies.reqwest] [workspace.dependencies.reqwest]
version = "0.13.2" version = "0.13.5"
default-features = false default-features = false
features = [ features = [
"rustls-no-provider", "rustls-no-provider",
"socks", "socks",
"hickory-dns",
"http2", "http2",
"stream", "stream",
"form", "form",
] ]
# Needed for as long as openidconnect is on an outdated reqwest
[workspace.dependencies.reqwest_0_12]
package = "reqwest"
version = "0.12"
default-features = false
features = [
"rustls-tls-native-roots-no-provider",
]
[workspace.dependencies.serde] [workspace.dependencies.serde]
version = "1.0.219" version = "1.0.229"
default-features = false default-features = false
features = ["rc"] features = ["rc"]
[workspace.dependencies.serde_json] [workspace.dependencies.serde_json]
version = "1.0.140" version = "1.0.154"
default-features = false default-features = false
features = ["raw_value"] features = ["raw_value"]
# Used for appservice registration files # Used for appservice registration files
[workspace.dependencies.serde-saphyr] [workspace.dependencies.serde-saphyr]
version = "1.0.0" version = "2.1.1"
# Used to load forbidden room/user regex from config # Used to load forbidden room/user regex from config
[workspace.dependencies.serde_regex] [workspace.dependencies.serde_regex]
version = "1.1.0" version = "1.2.0"
# Used for password hashing # Used for password hashing
[workspace.dependencies.argon2] [workspace.dependencies.argon2]
@@ -193,7 +201,7 @@ default-features = false
# Used to generate thumbnails for images # Used to generate thumbnails for images
[workspace.dependencies.image] [workspace.dependencies.image]
version = "0.25.5" version = "0.25.10"
default-features = false default-features = false
features = [ features = [
"jpeg", "jpeg",
@@ -204,29 +212,29 @@ features = [
# logging # logging
[workspace.dependencies.log] [workspace.dependencies.log]
version = "0.4.27" version = "0.4.35"
default-features = false default-features = false
[workspace.dependencies.tracing] [workspace.dependencies.tracing]
version = "0.1.41" version = "0.1.44"
default-features = false default-features = false
[workspace.dependencies.tracing-subscriber] [workspace.dependencies.tracing-subscriber]
version = "0.3.20" version = "0.3.23"
default-features = false default-features = false
features = ["env-filter", "std", "tracing", "tracing-log", "ansi", "fmt"] features = ["env-filter", "std", "tracing", "tracing-log", "ansi", "fmt"]
[workspace.dependencies.tracing-journald] [workspace.dependencies.tracing-journald]
version = "0.3.1" version = "0.3.2"
[workspace.dependencies.tracing-core] [workspace.dependencies.tracing-core]
version = "0.1.34" version = "0.1.36"
default-features = false default-features = false
# for URL previews # for URL previews
[workspace.dependencies.webpage] [workspace.dependencies.webpage]
version = "2.0.1" version = "2.1.0"
default-features = false default-features = false
# used for conduwuit's CLI and admin room command parsing # used for conduwuit's CLI and admin room command parsing
[workspace.dependencies.clap] [workspace.dependencies.clap]
version = "4.5.35" version = "4.6.7"
default-features = false default-features = false
features = [ features = [
"derive", "derive",
@@ -239,12 +247,12 @@ features = [
] ]
[workspace.dependencies.futures] [workspace.dependencies.futures]
version = "0.3.31" version = "0.3.34"
default-features = false default-features = false
features = ["std", "async-await"] features = ["std", "async-await"]
[workspace.dependencies.tokio] [workspace.dependencies.tokio]
version = "1.44.2" version = "1.54.1"
default-features = false default-features = false
features = [ features = [
"fs", "fs",
@@ -259,25 +267,25 @@ features = [
] ]
[workspace.dependencies.tokio-metrics] [workspace.dependencies.tokio-metrics]
version = "0.5.0" version = "0.5.2"
[workspace.dependencies.libloading] [workspace.dependencies.libloading]
version = "0.9.0" version = "0.9.0"
# Validating urls in config, was already a transitive dependency # Validating urls in config, was already a transitive dependency
[workspace.dependencies.url] [workspace.dependencies.url]
version = "2.5.4" version = "2.5.8"
default-features = false default-features = false
features = ["serde"] features = ["serde"]
# standard date and time tools # standard date and time tools
[workspace.dependencies.chrono] [workspace.dependencies.chrono]
version = "0.4.38" version = "0.4.45"
features = ["alloc", "std"] features = ["alloc", "std"]
default-features = false default-features = false
[workspace.dependencies.hyper] [workspace.dependencies.hyper]
version = "1.6.0" version = "1.12.0"
default-features = false default-features = false
features = [ features = [
"server", "server",
@@ -296,7 +304,7 @@ features = [
# to support multiple variations of setting a config option # to support multiple variations of setting a config option
[workspace.dependencies.either] [workspace.dependencies.either]
version = "1.15.0" version = "1.19.0"
default-features = false default-features = false
features = ["serde"] features = ["serde"]
@@ -307,7 +315,7 @@ default-features = false
features = ["env", "toml"] features = ["env", "toml"]
[workspace.dependencies.hickory-resolver] [workspace.dependencies.hickory-resolver]
version = "0.26.0" version = "0.26.3"
default-features = false default-features = false
features = [ features = [
"serde", "serde",
@@ -317,7 +325,7 @@ features = [
# Used for conduwuit::Error type # Used for conduwuit::Error type
[workspace.dependencies.thiserror] [workspace.dependencies.thiserror]
version = "2.0.12" version = "2.0.21"
default-features = false default-features = false
# Used to make working with iterators easier, was already a transitive depdendency # Used to make working with iterators easier, was already a transitive depdendency
@@ -338,7 +346,7 @@ version = "0.6.0"
version = "2.5.0" version = "2.5.0"
[workspace.dependencies.async-trait] [workspace.dependencies.async-trait]
version = "0.1.88" version = "0.1.92"
[workspace.dependencies.lru-cache] [workspace.dependencies.lru-cache]
version = "0.1.2" version = "0.1.2"
@@ -395,7 +403,7 @@ features = [
[workspace.dependencies.rust-rocksdb] [workspace.dependencies.rust-rocksdb]
git = "https://forgejo.ellis.link/continuwuation/rust-rocksdb-zaidoon1" git = "https://forgejo.ellis.link/continuwuation/rust-rocksdb-zaidoon1"
rev = "0a25ff92f7c09b55eec496b9c192c7d5136ab2b8" rev = "6021299f3e0e9455dc3f2e39c65e1dc217be8903"
default-features = false default-features = false
features = [ features = [
"multi-threaded-cf", "multi-threaded-cf",
@@ -406,7 +414,7 @@ features = [
] ]
[workspace.dependencies.sha2] [workspace.dependencies.sha2]
version = "0.11.0" version = "0.11.1"
default-features = false default-features = false
[workspace.dependencies.sha1] [workspace.dependencies.sha1]
@@ -414,11 +422,13 @@ version = "0.11.0"
default-features = false default-features = false
[workspace.dependencies.openidconnect] [workspace.dependencies.openidconnect]
version = "4.0.1" version = "4.1.0"
default-features = false
features = ["reqwest"]
# optional opentelemetry, performance measurements, flamegraphs, etc for performance measurements and monitoring # optional opentelemetry, performance measurements, flamegraphs, etc for performance measurements and monitoring
[workspace.dependencies.opentelemetry] [workspace.dependencies.opentelemetry]
version = "0.33.0" version = "0.33.1"
[workspace.dependencies.opentelemetry-instrumentation-tower] [workspace.dependencies.opentelemetry-instrumentation-tower]
version = "0.19.0" version = "0.19.0"
@@ -426,7 +436,7 @@ default-features = false
features = ["axum"] features = ["axum"]
[workspace.dependencies.opentelemetry-semantic-conventions] [workspace.dependencies.opentelemetry-semantic-conventions]
version = "0.33.0" version = "0.33.1"
features = ["semconv_experimental"] features = ["semconv_experimental"]
[workspace.dependencies.tracing-flame] [workspace.dependencies.tracing-flame]
@@ -436,25 +446,25 @@ version = "0.2.0"
version = "0.34.0" version = "0.34.0"
[workspace.dependencies.opentelemetry_sdk] [workspace.dependencies.opentelemetry_sdk]
version = "0.33.0" version = "0.33.1"
features = ["rt-tokio"] features = ["rt-tokio"]
[workspace.dependencies.opentelemetry-prometheus] [workspace.dependencies.opentelemetry-prometheus]
version = "0.33.0" version = "0.33.1"
[workspace.dependencies.prometheus] [workspace.dependencies.prometheus]
version = "0.14.0" version = "0.14.0"
default-features = false default-features = false
[workspace.dependencies.opentelemetry-otlp] [workspace.dependencies.opentelemetry-otlp]
version = "0.33.0" version = "0.33.1"
features = ["http", "grpc-tonic", "trace", "logs", "metrics"] features = ["http", "grpc-tonic", "trace", "logs", "metrics"]
# optional sentry metrics for crash/panic reporting # optional sentry metrics for crash/panic reporting
[workspace.dependencies.sentry] [workspace.dependencies.sentry]
version = "0.49.0" version = "0.49.5"
default-features = false default-features = false
features = [ features = [
"backtrace", "backtrace",
@@ -469,14 +479,14 @@ features = [
] ]
[workspace.dependencies.sentry-tracing] [workspace.dependencies.sentry-tracing]
version = "0.49.0" version = "0.49.5"
[workspace.dependencies.sentry-tower] [workspace.dependencies.sentry-tower]
version = "0.49.0" version = "0.49.5"
# jemalloc usage # jemalloc usage
[workspace.dependencies.tikv-jemalloc-sys] [workspace.dependencies.tikv-jemalloc-sys]
git = "https://forgejo.ellis.link/continuwuation/jemallocator" git = "https://forgejo.ellis.link/continuwuation/jemallocator"
rev = "df86ff89d4b1e223b9f7d2dd2fbb7f202da7f554" rev = "ac4d4861b335b199f812807996e8c9166961041a"
default-features = false default-features = false
features = [ features = [
"background_threads_runtime_support", "background_threads_runtime_support",
@@ -484,7 +494,7 @@ features = [
] ]
[workspace.dependencies.tikv-jemallocator] [workspace.dependencies.tikv-jemallocator]
git = "https://forgejo.ellis.link/continuwuation/jemallocator" git = "https://forgejo.ellis.link/continuwuation/jemallocator"
rev = "df86ff89d4b1e223b9f7d2dd2fbb7f202da7f554" rev = "ac4d4861b335b199f812807996e8c9166961041a"
default-features = false default-features = false
features = [ features = [
"background_threads_runtime_support", "background_threads_runtime_support",
@@ -492,7 +502,7 @@ features = [
] ]
[workspace.dependencies.tikv-jemalloc-ctl] [workspace.dependencies.tikv-jemalloc-ctl]
git = "https://forgejo.ellis.link/continuwuation/jemallocator" git = "https://forgejo.ellis.link/continuwuation/jemallocator"
rev = "df86ff89d4b1e223b9f7d2dd2fbb7f202da7f554" rev = "ac4d4861b335b199f812807996e8c9166961041a"
default-features = false default-features = false
features = ["use_std"] features = ["use_std"]
@@ -500,7 +510,7 @@ features = ["use_std"]
version = "0.5" version = "0.5"
[workspace.dependencies.nix] [workspace.dependencies.nix]
version = "0.31.0" version = "0.31.3"
default-features = false default-features = false
features = ["resource"] features = ["resource"]
@@ -522,7 +532,7 @@ version = "0.4.9"
default-features = false default-features = false
[workspace.dependencies.termimad] [workspace.dependencies.termimad]
version = "0.35.0" version = "0.35.5"
default-features = false default-features = false
[workspace.dependencies.checked_ops] [workspace.dependencies.checked_ops]
@@ -548,7 +558,7 @@ features = ["hardware-lock-elision", "deadlock_detection"] # TODO: Check if dead
version = "0.5.0" version = "0.5.0"
[workspace.dependencies.bytesize] [workspace.dependencies.bytesize]
version = "2.0" version = "2.7"
[workspace.dependencies.core_affinity] [workspace.dependencies.core_affinity]
version = "0.8.3" version = "0.8.3"
@@ -560,11 +570,11 @@ version = "0.2"
version = "0.2" version = "0.2"
[workspace.dependencies.minicbor] [workspace.dependencies.minicbor]
version = "2.1.1" version = "2.3.1"
features = ["std"] features = ["std"]
[workspace.dependencies.minicbor-serde] [workspace.dependencies.minicbor-serde]
version = "0.7.0" version = "0.7.2"
features = ["std"] features = ["std"]
[workspace.dependencies.maplit] [workspace.dependencies.maplit]
@@ -574,10 +584,10 @@ version = "1.0.2"
version = "1.0.1" version = "1.0.1"
[workspace.dependencies.askama] [workspace.dependencies.askama]
version = "0.16.0" version = "0.16.1"
[workspace.dependencies.lettre] [workspace.dependencies.lettre]
version = "0.11.19" version = "0.11.23"
default-features = false default-features = false
features = ["smtp-transport", "pool", "hostname", "builder", "rustls", "rustls-native-certs", "tokio1", "rustls-no-provider", "tokio1-rustls", "tracing", "serde"] features = ["smtp-transport", "pool", "hostname", "builder", "rustls", "rustls-native-certs", "tokio1", "rustls-no-provider", "tokio1-rustls", "tracing", "serde"]
@@ -590,7 +600,7 @@ features = ["std"]
version = "0.3.0" version = "0.3.0"
[workspace.dependencies.resolvematrix] [workspace.dependencies.resolvematrix]
version = "1.3.0" version = "1.4.0"
[workspace.dependencies.serde_urlencoded] [workspace.dependencies.serde_urlencoded]
version = "0.7.1" version = "0.7.1"
@@ -1010,4 +1020,7 @@ collapsible_if = "allow"
cognitive_complexity = "allow" cognitive_complexity = "allow"
[workspace.metadata.cargo-shear] [workspace.metadata.cargo-shear]
ignored = ["const-str", "ctor", "dtor"] # All of these crates provide macros that are used across the codebase
# and that every crate depends on. cargo-shear can't tell this because
# it doesn't expand macros.
ignored = ["const-str", "ctor", "dtor", "tracing"]
+2 -2
View File
@@ -53,7 +53,7 @@ fi
# The base docker image to use for complement tests # The base docker image to use for complement tests
# You can build the default with `docker build -t continuwuity:complement -f ./docker/complement.Dockerfile .` # You can build the default with `docker build -t continuwuity:complement -f ./docker/complement.Dockerfile .`
# after running `cargo build`. Only the debug binary is used. # after running `cargo build -p conduwuit --features openreg`. Only the debug binary is used.
COMPLEMENT_BASE_IMAGE="${COMPLEMENT_BASE_IMAGE:-continuwuity:complement}" COMPLEMENT_BASE_IMAGE="${COMPLEMENT_BASE_IMAGE:-continuwuity:complement}"
# Complement tests that are skipped due to flakiness/reliability issues or we don't implement such features and won't for a long time # Complement tests that are skipped due to flakiness/reliability issues or we don't implement such features and won't for a long time
@@ -99,7 +99,7 @@ fi
if ! docker image inspect "$COMPLEMENT_BASE_IMAGE" > /dev/null 2>&1; then if ! docker image inspect "$COMPLEMENT_BASE_IMAGE" > /dev/null 2>&1; then
echo "Complement base image not found: $COMPLEMENT_BASE_IMAGE" echo "Complement base image not found: $COMPLEMENT_BASE_IMAGE"
echo "Build it with: cargo build -p conduwuit && docker build -t $COMPLEMENT_BASE_IMAGE -f docker/complement.Dockerfile ." echo "Build it with: cargo build -p conduwuit --features openreg && docker build -t $COMPLEMENT_BASE_IMAGE -f docker/complement.Dockerfile ."
exit 1 exit 1
fi fi
+1
View File
@@ -0,0 +1 @@
Upgraded rocksdb from 11.1.1 to 11.12.0 and jemalloc to 5.4.0.
+1
View File
@@ -0,0 +1 @@
The documentation now refers to the Continuwuity Docker service as `continuwuity` instead of `homeserver`.
@@ -0,0 +1 @@
Fix incoming federation events losing state changes when predecessors share the same state-before snapshot. Contributed by @eleboucher.
+1
View File
@@ -0,0 +1 @@
Client-server API endpoints are now properly ratelimited for unauthenticated requests. Contributed by @ginger.
+1
View File
@@ -0,0 +1 @@
Ensure HTTP clients actually follow the `dns_servers` config option. Contributed by @silversys
+1
View File
@@ -0,0 +1 @@
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).
+1
View File
@@ -0,0 +1 @@
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
+7
View File
@@ -685,6 +685,13 @@
# env: CONTINUWUITY_SENDER_SHUTDOWN_TIMEOUT # env: CONTINUWUITY_SENDER_SHUTDOWN_TIMEOUT
#sender_shutdown_timeout = 5 #sender_shutdown_timeout = 5
# Maximum number of requests per minute that unauthenticated clients
# may make to ratelimited client-server API routes. This ratelimit is
# global across all endpoints for each IP.
#
# env: CONTINUWUITY_UNAUTHENTICATED_REQUEST_RATELIMIT
#unauthenticated_request_ratelimit = 30
# Enables registration. If set to false, no users can register on this # Enables registration. If set to false, no users can register on this
# server. # server.
# #
+2 -2
View File
@@ -50,7 +50,7 @@ EOF
# Developer tool versions # Developer tool versions
# renovate: datasource=github-releases depName=cargo-bins/cargo-binstall # renovate: datasource=github-releases depName=cargo-bins/cargo-binstall
ENV BINSTALL_VERSION=1.26.1 ENV BINSTALL_VERSION=1.26.2
# renovate: datasource=github-releases depName=psastras/sbom-rs # renovate: datasource=github-releases depName=psastras/sbom-rs
ENV CARGO_SBOM_VERSION=0.9.1 ENV CARGO_SBOM_VERSION=0.9.1
# renovate: datasource=crate depName=lddtree # renovate: datasource=crate depName=lddtree
@@ -192,7 +192,7 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \
jq -r ".target_directory")) jq -r ".target_directory"))
mkdir /out/sbin mkdir /out/sbin
PACKAGE=conduwuit PACKAGE=conduwuit
CARGO_LOG=debug xx-cargo build --locked --profile ${RUST_PROFILE} \ xx-cargo build --locked --profile ${RUST_PROFILE} \
--no-default-features --features ${CARGO_FEATURES} \ --no-default-features --features ${CARGO_FEATURES} \
-p $PACKAGE; -p $PACKAGE;
BINARIES=($(cargo metadata --no-deps --format-version 1 | \ BINARIES=($(cargo metadata --no-deps --format-version 1 | \
+1 -1
View File
@@ -18,7 +18,7 @@ RUN --mount=type=cache,target=/etc/apk/cache apk add \
# Developer tool versions # Developer tool versions
# renovate: datasource=github-releases depName=cargo-bins/cargo-binstall # renovate: datasource=github-releases depName=cargo-bins/cargo-binstall
ENV BINSTALL_VERSION=1.26.1 ENV BINSTALL_VERSION=1.26.2
# renovate: datasource=github-releases depName=psastras/sbom-rs # renovate: datasource=github-releases depName=psastras/sbom-rs
ENV CARGO_SBOM_VERSION=0.9.1 ENV CARGO_SBOM_VERSION=0.9.1
# renovate: datasource=crate depName=lddtree # renovate: datasource=crate depName=lddtree
+1 -1
View File
@@ -348,7 +348,7 @@ After configuration and spin-up, the destination `turns:turn.example.com:443?tra
<summary>Using static credentials</summary> <summary>Using static credentials</summary>
:::caution :::caution
Static credentials are less secure than shared secrets because they don't expire and must be configured in coturn separately. It is strongly advised you use [shared secret authentication](#2-configuration). Static credentials are less secure than shared secrets because they don't expire and must be configured in coturn separately. It is strongly advised you use [shared secret authentication](#2-configuring-coturn).
::: :::
If you prefer static username/password credentials instead of shared secrets: If you prefer static username/password credentials instead of shared secrets:
+3 -3
View File
@@ -69,7 +69,7 @@ Docker's default DNS resolver is known to [**cause timeout issues**](../troubles
```yaml title='docker-compose.yml' ```yaml title='docker-compose.yml'
services: services:
homeserver: continuwuity:
# ... # ...
volumes: volumes:
- ./continuwuity-resolv.conf:/etc/resolv.conf - ./continuwuity-resolv.conf:/etc/resolv.conf
@@ -95,7 +95,7 @@ Then, create a Caddyfile with the following content:
``` ```
https://example.com:443, https://example.com:8448 { https://example.com:443, https://example.com:8448 {
reverse_proxy http://homeserver:8008 reverse_proxy http://continuwuity:8008
} }
``` ```
@@ -297,7 +297,7 @@ For Docker Compose deployments this means adding `stdin_open: true` and `tty: tr
```yaml ```yaml
services: services:
homeserver: continuwuity:
stdin_open: true stdin_open: true
tty: true tty: true
# ... # ...
+4 -1
View File
@@ -12,11 +12,14 @@ Install Git, Rust, Docker, Go, and `jq`. From this repository's root, build the
server image and run the suite: server image and run the suite:
```bash ```bash
cargo build -p conduwuit cargo build -p conduwuit --features openreg
docker build -t continuwuity:complement -f docker/complement.Dockerfile . docker build -t continuwuity:complement -f docker/complement.Dockerfile .
./bin/complement ./bin/complement
``` ```
The `openreg` feature is required: without it the server refuses the open
registrations Complement uses to create test users, and almost every test fails.
The run can take up to an hour. The runner writes the full Go test stream to The run can take up to an hour. The runner writes the full Go test stream to
`tests/test_results/complement/test_logs.jsonl` and a sorted pass/fail/skip `tests/test_results/complement/test_logs.jsonl` and a sorted pass/fail/skip
summary to `tests/test_results/complement/test_results.jsonl`. It exits nonzero summary to `tests/test_results/complement/test_results.jsonl`. It exits nonzero
+2 -2
View File
@@ -226,10 +226,10 @@ The following Compose files are taken from [Docker deployment instructions](../d
```txt title="Caddyfile" ```txt title="Caddyfile"
https://matrix.example.com:443 { https://matrix.example.com:443 {
reverse_proxy http://homeserver:8008 reverse_proxy http://continuwuity:8008
} }
https://example.com:443 { https://example.com:443 {
reverse_proxy /.well-known/matrix* http://homeserver:8008 reverse_proxy /.well-known/matrix* http://continuwuity:8008
} }
``` ```
+1 -1
View File
@@ -37,7 +37,7 @@ networks:
- subnet: "10.10.10.0/24" - subnet: "10.10.10.0/24"
services: services:
homeserver: continuwuity:
# ... # ...
volume: volume:
- ./continuwuity-resolv.conf:/etc/resolv.conf:ro - ./continuwuity-resolv.conf:/etc/resolv.conf:ro
+1 -1
View File
@@ -17,7 +17,7 @@ Continuwuity has moderation admin commands for:
- fetching `/.well-known/matrix/support` from servers (`!admin federation`) - fetching `/.well-known/matrix/support` from servers (`!admin federation`)
- blocking incoming federation for certain rooms (not the same as room banning) - blocking incoming federation for certain rooms (not the same as room banning)
(`!admin federation`) (`!admin federation`)
- deleting media (see [the media section](#media)) - deleting media
Any commands with `-list` in them will require a codeblock in the message with Any commands with `-list` in them will require a codeblock in the message with
each object being newline delimited. An example of doing this is: each object being newline delimited. An example of doing this is:
@@ -1,7 +1,7 @@
# Continuwuity - Behind Traefik Reverse Proxy # Continuwuity - Behind Traefik Reverse Proxy
services: services:
homeserver: continuwuity:
image: "forgejo.ellis.link/continuwuation/continuwuity:latest" image: "forgejo.ellis.link/continuwuation/continuwuity:latest"
restart: unless-stopped restart: unless-stopped
command: /sbin/conduwuit command: /sbin/conduwuit
@@ -16,9 +16,9 @@ services:
restart: unless-stopped restart: unless-stopped
labels: labels:
caddy: example.com caddy: example.com
caddy.reverse_proxy: /.well-known/matrix/* homeserver:8008 caddy.reverse_proxy: /.well-known/matrix/* continuwuity:8008
homeserver: continuwuity:
image: "forgejo.ellis.link/continuwuation/continuwuity:latest" image: "forgejo.ellis.link/continuwuation/continuwuity:latest"
restart: unless-stopped restart: unless-stopped
command: /sbin/conduwuit command: /sbin/conduwuit
@@ -14,7 +14,7 @@ services:
- ./Caddyfile:/etc/caddy/Caddyfile - ./Caddyfile:/etc/caddy/Caddyfile
restart: unless-stopped restart: unless-stopped
homeserver: continuwuity:
image: "forgejo.ellis.link/continuwuation/continuwuity:latest" image: "forgejo.ellis.link/continuwuation/continuwuity:latest"
restart: unless-stopped restart: unless-stopped
command: /sbin/conduwuit command: /sbin/conduwuit
@@ -1,7 +1,7 @@
# Continuwuity - With Traefik Reverse Proxy # Continuwuity - With Traefik Reverse Proxy
services: services:
homeserver: continuwuity:
image: "forgejo.ellis.link/continuwuation/continuwuity:latest" image: "forgejo.ellis.link/continuwuation/continuwuity:latest"
restart: unless-stopped restart: unless-stopped
command: /sbin/conduwuit command: /sbin/conduwuit
@@ -37,7 +37,7 @@ services:
# If you already configured `[global.well_known]` with Continuwuity, # If you already configured `[global.well_known]` with Continuwuity,
# comment out the *_respond labels and uncomment the line below: # comment out the *_respond labels and uncomment the line below:
# caddy.reverse_proxy: /.well-known/matrix/* homeserver:8008 # caddy.reverse_proxy: /.well-known/matrix/* continuwuity:8008
# If you are having problems with continuwuity serving headers, # If you are having problems with continuwuity serving headers,
# uncomment the header section below. # uncomment the header section below.
@@ -48,7 +48,7 @@ services:
# caddy.0_header.Access-Control-Allow-Headers: "Authorization" # caddy.0_header.Access-Control-Allow-Headers: "Authorization"
# caddy.0_header.Content-Type: "application/json" # caddy.0_header.Content-Type: "application/json"
homeserver: continuwuity:
image: forgejo.ellis.link/continuwuation/continuwuity:latest image: forgejo.ellis.link/continuwuation/continuwuity:latest
restart: unless-stopped restart: unless-stopped
# add additional environment, volume, and network config here... # add additional environment, volume, and network config here...
@@ -1,7 +1,7 @@
# Continuwuity - Behind Traefik Reverse Proxy # Continuwuity - Behind Traefik Reverse Proxy
services: services:
homeserver: continuwuity:
image: "forgejo.ellis.link/continuwuation/continuwuity:latest" image: "forgejo.ellis.link/continuwuation/continuwuity:latest"
restart: unless-stopped restart: unless-stopped
command: /sbin/conduwuit command: /sbin/conduwuit
@@ -1,7 +1,7 @@
# Continuwuity - Traefik Reverse Proxy Labels (override file) # Continuwuity - Traefik Reverse Proxy Labels (override file)
services: services:
homeserver: continuwuity:
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.docker.network=proxy" # Change this to the name of your Traefik docker proxy network - "traefik.docker.network=proxy" # Change this to the name of your Traefik docker proxy network
@@ -15,7 +15,7 @@ services:
- ./caddy-data:/data - ./caddy-data:/data
restart: unless-stopped restart: unless-stopped
homeserver: continuwuity:
image: "forgejo.ellis.link/continuwuation/continuwuity:latest" image: "forgejo.ellis.link/continuwuation/continuwuity:latest"
restart: unless-stopped restart: unless-stopped
command: /sbin/conduwuit command: /sbin/conduwuit
@@ -15,7 +15,7 @@ services:
- ./Caddyfile:/etc/caddy/Caddyfile - ./Caddyfile:/etc/caddy/Caddyfile
restart: unless-stopped restart: unless-stopped
homeserver: continuwuity:
image: "forgejo.ellis.link/continuwuation/continuwuity:latest" image: "forgejo.ellis.link/continuwuation/continuwuity:latest"
restart: unless-stopped restart: unless-stopped
command: /sbin/conduwuit command: /sbin/conduwuit
@@ -1,7 +1,7 @@
# Continuwuity - With Traefik Reverse Proxy # Continuwuity - With Traefik Reverse Proxy
services: services:
homeserver: continuwuity:
image: "forgejo.ellis.link/continuwuation/continuwuity:latest" image: "forgejo.ellis.link/continuwuation/continuwuity:latest"
restart: unless-stopped restart: unless-stopped
command: /sbin/conduwuit command: /sbin/conduwuit
Generated
+24 -24
View File
@@ -3,11 +3,11 @@
"advisory-db": { "advisory-db": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1789329924, "lastModified": 1793979272,
"narHash": "sha256-mykGMFabQ7yP6G373M3VHkrac9PJPKJstrhQz2D/Rdc=", "narHash": "sha256-oUcBtPbtS7PlEMuSrgTAN4wv49cXYbwKbQqhH2pah5w=",
"owner": "rustsec", "owner": "rustsec",
"repo": "advisory-db", "repo": "advisory-db",
"rev": "455fd4bac659b5f1fca3810661c2d8b3c25dad05", "rev": "309392b18f6b17022f82c701f300433126901068",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -18,11 +18,11 @@
}, },
"crane": { "crane": {
"locked": { "locked": {
"lastModified": 1788465171, "lastModified": 1793836618,
"narHash": "sha256-Y1/TTVXjYXGF068IThQH9fPSZ0SIE74PABlUxnWTUH0=", "narHash": "sha256-TREenflwEjxOSq292FYwbc3kEm7TDRtXCZRNWEdjBmg=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "eb35abda9f232cc6610b1d1e3200d15c49b7ac54", "rev": "79fd63528501446749c09f08cad486a58c7d173e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -39,11 +39,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1789298866, "lastModified": 1794142885,
"narHash": "sha256-6eaV5+MdWy1tAlN4HAFr64pTnYc9jiKGXBsu18cyVjE=", "narHash": "sha256-xWFSr7q8IerDAVRk4W7/CgTmi05hMy2qjZ0z3VYpOVk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "1fc6f36a23fa16e3740987957266f6e4b915c3cd", "rev": "f7d416b5073152c7f2e4de1a28d1a4330dd30a26",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -74,11 +74,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1788450739, "lastModified": 1793576659,
"narHash": "sha256-glZLQlzIn1fXH6PazR2iUmTo7kzzyYSshrWhLS9TqCU=", "narHash": "sha256-V1h85lUaJBQoHFrB2vpXZOE0Ju1MYSnIpsehoVZYlDo=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "31729ca8cbdb4fa927b34e5f4353e6a83f39e993", "rev": "ea2630b7470978622c7689a1ff75d2b389175399",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -89,11 +89,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1789149629, "lastModified": 1794042290,
"narHash": "sha256-H6GwaZzZf+4npqv0tph94w9tZddSjFjmQrVsW0z78uk=", "narHash": "sha256-ziZn2PvCJE5JEEpqTdxXwJpPB+L3YqoCpTAMCzyaP3U=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "eaad089433ca2bb662274377d33df3d0e51ef28b", "rev": "f4a03c008967841f2a0b3cb7c436fc6fc31671f6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -105,11 +105,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1788057806, "lastModified": 1793504054,
"narHash": "sha256-DTQSMxzDWmT0zhguthvegnVkn7CFqGCv4IHCzk5ZUpM=", "narHash": "sha256-ThkfL3D/FhCiZFc9+3BtxwuMmpuK+/bGtXCSo1+yVew=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "596e2e3940e09b2abbeb03f75fa1828c57fcd72c", "rev": "7851ba61fd862b277cb6a9cef37394bc18bb94e4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -132,11 +132,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1789128286, "lastModified": 1794096810,
"narHash": "sha256-KRxxgHiKIBp7R2n41IJuE5K4IUiLOpg47EEi3AxuSp8=", "narHash": "sha256-dWC+YtMX+cwH3e9ndiFB77ijTsKtO5I2OxfcvUY4j3k=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "6aeeb8cf02741e5da07a1615a05faa506cecb21a", "rev": "03ae6be57aa063bb373f69eead3b8e15168a45d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -153,11 +153,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1786901030, "lastModified": 1791885023,
"narHash": "sha256-WSFCsDSE5ffgD2MqzkM2CYjeFiKhRF/dJUN8uedb6YE=", "narHash": "sha256-C3alQ2MEt0zVrUSho5NUDo3jmhbff72++bfwoqT9Omo=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "27b3b12a8e6375f28ebe122f07d230ca5459bbfa", "rev": "0d6d739a833ba9a9c93034862e4a7b061a062a1c",
"type": "github" "type": "github"
}, },
"original": { "original": {
+6 -13
View File
@@ -42,7 +42,12 @@ let
env = { env = {
CARGO_PROFILE = profile; CARGO_PROFILE = profile;
RUSTFLAGS = rustflags; # Rust links with its bundled rust-lld by default on linux-gnu targets.
# This bypasses nixpkgs' linker wrapper (and its rpaths), so we make it use the system one.
# `-C linker-features=-lld` is only stable on x86_64, but cc takes the last `-fuse-ld`.
RUSTFLAGS = lib.concatStringsSep " " (
lib.optional stdenv.hostPlatform.isLinux "-C link-arg=-fuse-ld=bfd" ++ [ rustflags ]
);
GIT_COMMIT_HASH = self.rev or self.dirtyRev or ""; GIT_COMMIT_HASH = self.rev or self.dirtyRev or "";
GIT_COMMIT_HASH_SHORT = self.shortRev or self.dirtyShortRev or ""; GIT_COMMIT_HASH_SHORT = self.shortRev or self.dirtyShortRev or "";
} }
@@ -60,18 +65,6 @@ craneLib.buildPackage (
inherit cargoExtraArgs; inherit cargoExtraArgs;
cargoArtifacts = craneLib.buildDepsOnly attrs; cargoArtifacts = craneLib.buildDepsOnly attrs;
# Needed to make continuwuity link to rocksdb
postFixup = lib.optionalString (stdenv.hostPlatform.isLinux && rocksdb != null) ''
old_rpath="$(patchelf --print-rpath $out/bin/conduwuit)"
extra_rpath="${
lib.makeLibraryPath [
rocksdb
]
}"
patchelf --set-rpath "$old_rpath:$extra_rpath" $out/bin/conduwuit
'';
meta = { meta = {
description = "A community-driven Matrix homeserver in Rust"; description = "A community-driven Matrix homeserver in Rust";
mainProgram = "conduwuit"; mainProgram = "conduwuit";
+19
View File
@@ -18,6 +18,23 @@
{ {
packages = packages =
let let
# These musl deps aren't in the binary cache, so they're built locally, and their
# test suites run (and break) when the builder can execute musl binaries.
#
# TODO: drop tzdata override once https://github.com/NixOS/nixpkgs/pull/582577 reaches nixos-unstable
# - tzdata: `now.ck` checks against the current date.
# TODO: drop sqlite override once https://github.com/NixOS/nixpkgs/issues/580629 is resolved
# - sqlite: its test runner fails to build `testfixture` when cross-compiling to musl.
muslOverlay =
_final: prev:
lib.genAttrs [ "tzdata" "sqlite" ] (
name:
if prev.stdenv.hostPlatform.isMusl then
prev.${name}.overrideAttrs { doCheck = false; }
else
prev.${name}
);
mkPackages = mkPackages =
pkgs: pkgs:
let let
@@ -78,6 +95,7 @@
import inputs.nixpkgs { import inputs.nixpkgs {
localSystem = system; localSystem = system;
crossSystem = "x86_64-unknown-linux-musl"; crossSystem = "x86_64-unknown-linux-musl";
overlays = [ muslOverlay ];
} }
) )
)) ))
@@ -86,6 +104,7 @@
import inputs.nixpkgs { import inputs.nixpkgs {
localSystem = system; localSystem = system;
crossSystem = "aarch64-unknown-linux-musl"; crossSystem = "aarch64-unknown-linux-musl";
overlays = [ muslOverlay ];
} }
) )
)); ));
+3 -3
View File
@@ -18,13 +18,13 @@
inherit enableJemalloc; inherit enableJemalloc;
}).overrideAttrs }).overrideAttrs
({ ({
version = "continuwuity-v0.5.0-unstable-2026-05-19"; version = "continuwuity-v0.5.0-unstable-2026-11-08";
src = fetchFromGitea { src = fetchFromGitea {
domain = "forgejo.ellis.link"; domain = "forgejo.ellis.link";
owner = "continuwuation"; owner = "continuwuation";
repo = "rocksdb"; repo = "rocksdb";
rev = "3756b2b905e13216d8b56bcc783d814e7b073aff"; rev = "722fa3219df4169610fda8962221a1ff74026fdb";
hash = "sha256-rSv4fr2bf9JJwdodgeuPCuceeh7k97KVxrAOC0wyPQY="; hash = "sha256-ZuXXp83Hgj0B5v499CNxa9oNQUS/ZKYOAZEhmarUifc=";
}; };
# We have this already at https://forgejo.ellis.link/continuwuation/rocksdb/commit/a935c0273e1ba44eacf88ce3685a9b9831486155 # We have this already at https://forgejo.ellis.link/continuwuation/rocksdb/commit/a935c0273e1ba44eacf88ce3685a9b9831486155
+372 -335
View File
File diff suppressed because it is too large. Load diff
-3
View File
@@ -62,8 +62,6 @@ release_max_log_level = [
"conduwuit-service/release_max_log_level", "conduwuit-service/release_max_log_level",
"tracing/max_level_trace", "tracing/max_level_trace",
"tracing/release_max_level_info", "tracing/release_max_level_info",
"log/max_level_trace",
"log/release_max_level_info",
] ]
zstd_compression = [ zstd_compression = [
"conduwuit-api/zstd_compression", "conduwuit-api/zstd_compression",
@@ -84,7 +82,6 @@ ctor.workspace = true
dtor.workspace = true dtor.workspace = true
futures.workspace = true futures.workspace = true
lettre.workspace = true lettre.workspace = true
log.workspace = true
ruma.workspace = true ruma.workspace = true
serde_json.workspace = true serde_json.workspace = true
serde-saphyr.workspace = true serde-saphyr.workspace = true
+2 -1
View File
@@ -983,7 +983,8 @@ impl crate::Context<'_> {
let resolver: &MatrixResolver = if no_cache { let resolver: &MatrixResolver = if no_cache {
&MatrixResolverBuilder::new() &MatrixResolverBuilder::new()
.dangerous_tls_accept_invalid_certs(self.services.server.config.allow_invalid_tls_certificates_yes_i_know_what_the_fuck_i_am_doing_with_this_and_i_know_this_is_insecure) .dangerous_tls_accept_invalid_certs(self.services.server.config.allow_invalid_tls_certificates_yes_i_know_what_the_fuck_i_am_doing_with_this_and_i_know_this_is_insecure)
.http_client(self.services.client.dns.clone()) .http_client(self.services.client.matrix_http_client.clone())
.dns_resolver(self.services.client.dns_resolver.clone())
.build()? .build()?
} else { } else {
&self.services.client.matrix_resolver &self.services.client.matrix_resolver
-3
View File
@@ -51,8 +51,6 @@ jemalloc_stats = [
release_max_log_level = [ release_max_log_level = [
"conduwuit-core/release_max_log_level", "conduwuit-core/release_max_log_level",
"conduwuit-service/release_max_log_level", "conduwuit-service/release_max_log_level",
"log/max_level_trace",
"log/release_max_level_info",
"tracing/max_level_trace", "tracing/max_level_trace",
"tracing/release_max_level_info", "tracing/release_max_level_info",
] ]
@@ -80,7 +78,6 @@ http-body-util.workspace = true
hyper.workspace = true hyper.workspace = true
itertools.workspace = true itertools.workspace = true
lettre.workspace = true lettre.workspace = true
log.workspace = true
rand.workspace = true rand.workspace = true
reqwest.workspace = true reqwest.workspace = true
ruma.workspace = true ruma.workspace = true
+18 -3
View File
@@ -523,7 +523,22 @@ where
for (server, response) in futures { for (server, response) in futures {
match response { match response {
| Ok(response) => { | Ok(response) => {
for (user, master_key) in response.master_keys { let is_wanted = |user_id: &UserId| {
user_id.server_name() == server && device_keys_input.contains_key(user_id)
};
let filtered_master_keys = response
.master_keys
.into_iter()
.filter(|(user_id, _)| is_wanted(user_id));
let filtered_self_signing_keys = response
.self_signing_keys
.into_iter()
.filter(|(user_id, _)| is_wanted(user_id));
let filtered_device_keys = response
.device_keys
.into_iter()
.filter(|(user_id, _)| is_wanted(user_id));
for (user, master_key) in filtered_master_keys {
let (master_key_id, mut master_key) = parse_master_key(&user, &master_key)?; let (master_key_id, mut master_key) = parse_master_key(&user, &master_key)?;
if let Ok(our_master_key) = services if let Ok(our_master_key) = services
@@ -549,8 +564,8 @@ where
} }
} }
self_signing_keys.extend(response.self_signing_keys); self_signing_keys.extend(filtered_self_signing_keys);
device_keys.extend(response.device_keys); device_keys.extend(filtered_device_keys);
}, },
| Err(e) => { | Err(e) => {
failures.insert(server.to_string(), json!({ "error": e.to_string() })); failures.insert(server.to_string(), json!({ "error": e.to_string() }));
+18 -21
View File
@@ -22,7 +22,7 @@ use conduwuit_service::{
}; };
use futures::{FutureExt, StreamExt, TryFutureExt, future::OptionFuture, pin_mut}; use futures::{FutureExt, StreamExt, TryFutureExt, future::OptionFuture, pin_mut};
use ruma::{ use ruma::{
RoomId, UserId, EventId, RoomId, UserId,
api::{ api::{
Direction, Direction,
client::{filter::RoomEventFilter, message::get_message_events}, client::{filter::RoomEventFilter, message::get_message_events},
@@ -30,8 +30,9 @@ use ruma::{
}, },
assign, assign,
events::{ events::{
AnyStateEvent, StateEventType, AnyStateEvent, StateEventType, SyncEphemeralRoomEvent,
TimelineEventType::{self, *}, TimelineEventType::{self, *},
receipt::ReceiptEventContent,
}, },
serde::Raw, serde::Raw,
}; };
@@ -209,36 +210,32 @@ pub(crate) async fn lazy_loading_witness<'a, I>(
where where
I: Iterator<Item = &'a PdusIterItem> + Clone + Send, I: Iterator<Item = &'a PdusIterItem> + Clone + Send,
{ {
let oldest = events let chunk_event_ids: std::collections::HashSet<&EventId> =
.clone() events.clone().map(|(_, event)| event.event_id()).collect();
.map(|(count, _)| count)
.copied()
.min()
.unwrap_or_else(PduCount::max);
let newest = events
.clone()
.map(|(count, _)| count)
.copied()
.max()
.unwrap_or_else(PduCount::max);
let receipts = services let receipts = services
.rooms .rooms
.read_receipt .read_receipt
.readreceipts_since(lazy_loading_context.room_id, Some(oldest.into_unsigned())); .readreceipts_since(lazy_loading_context.room_id, None);
pin_mut!(receipts); pin_mut!(receipts);
let receipt_users = receipts.ready_filter_map(|(user_id, _, raw)| {
let event =
serde_json::from_str::<SyncEphemeralRoomEvent<ReceiptEventContent>>(raw.json().get())
.ok()?;
event
.content
.keys()
.any(|id| chunk_event_ids.contains(&**id))
.then_some(user_id)
});
let witness: MemberSet = events let witness: MemberSet = events
.stream() .stream()
.map(ref_at!(1)) .map(ref_at!(1))
.map(Event::sender) .map(Event::sender)
.map(ToOwned::to_owned) .map(ToOwned::to_owned)
.chain( .chain(receipt_users)
receipts
.ready_take_while(|(_, c, _)| *c <= newest.into_unsigned())
.map(|(user_id, ..)| user_id),
)
.collect() .collect()
.await; .await;
+54 -38
View File
@@ -1,14 +1,14 @@
use std::collections::BTreeMap; use std::collections::BTreeMap;
use axum::extract::State; use axum::extract::State;
use conduwuit::{Err, PduCount, Result, err}; use conduwuit::{Err, Result, err};
use ruma::{ use ruma::{
MilliSecondsSinceUnixEpoch, MilliSecondsSinceUnixEpoch,
api::client::{read_marker::set_read_marker, receipt::create_receipt}, api::client::{read_marker::set_read_marker, receipt::create_receipt},
events::{ events::{
RoomAccountDataEventType, RoomAccountDataEventType,
fully_read::{FullyReadEvent, FullyReadEventContent}, fully_read::{FullyReadEvent, FullyReadEventContent},
receipt::{Receipt, ReceiptEvent, ReceiptEventContent, ReceiptType}, receipt::{Receipt, ReceiptEvent, ReceiptEventContent, ReceiptThread, ReceiptType},
}, },
}; };
@@ -27,6 +27,15 @@ pub(crate) async fn set_read_marker_route(
) -> Result<set_read_marker::v3::Response> { ) -> Result<set_read_marker::v3::Response> {
let sender_user = body.identity.expect_sender_user()?; let sender_user = body.identity.expect_sender_user()?;
if !services
.rooms
.state_cache
.is_joined(sender_user, &body.room_id)
.await
{
return Err!(Request(Forbidden("You are not in this room.")));
}
if let Some(event) = &body.fully_read { if let Some(event) = &body.fully_read {
let fully_read_event = FullyReadEvent::new(FullyReadEventContent::new(event.to_owned())); let fully_read_event = FullyReadEvent::new(FullyReadEventContent::new(event.to_owned()));
@@ -92,13 +101,8 @@ pub(crate) async fn set_read_marker_route(
.timeline .timeline
.get_pdu_count(event) .get_pdu_count(event)
.await .await
.map_err(|_| err!(Request(NotFound("Event not found."))))?; .map_err(|_| err!(Request(NotFound("Event not found."))))?
.into_unsigned();
let PduCount::Normal(count) = count else {
return Err!(Request(InvalidParam(
"Event is a backfilled PDU and cannot be marked as read."
)));
};
services services
.rooms .rooms
@@ -122,11 +126,26 @@ pub(crate) async fn create_receipt_route(
) -> Result<create_receipt::v3::Response> { ) -> Result<create_receipt::v3::Response> {
let sender_user = body.identity.expect_sender_user()?; let sender_user = body.identity.expect_sender_user()?;
if !services
.rooms
.state_cache
.is_joined(sender_user, &body.room_id)
.await
{
return Err!(Request(Forbidden("You are not in this room.")));
}
services services
.users .users
.update_device_last_seen(sender_user, body.identity.sender_device(), client_ip) .update_device_last_seen(sender_user, body.identity.sender_device(), client_ip)
.await; .await;
if body.receipt_type == create_receipt::v3::ReceiptType::FullyRead
&& body.thread != ReceiptThread::Unthreaded
{
return Err!(Request(InvalidParam("thread_id cannot be specified for m.fully_read")));
}
if matches!( if matches!(
&body.receipt_type, &body.receipt_type,
create_receipt::v3::ReceiptType::Read | create_receipt::v3::ReceiptType::ReadPrivate create_receipt::v3::ReceiptType::Read | create_receipt::v3::ReceiptType::ReadPrivate
@@ -159,44 +178,41 @@ pub(crate) async fn create_receipt_route(
) )
.await?; .await?;
}, },
| create_receipt::v3::ReceiptType::Read => { | create_receipt::v3::ReceiptType::Read =>
let receipt_content = [( if services.config.allow_local_read_receipts
body.event_id.clone(), && !services.users.is_suspended(sender_user).await?
BTreeMap::from_iter([( {
ReceiptType::Read, let mut receipt = Receipt::new(MilliSecondsSinceUnixEpoch::now());
receipt.thread = body.thread.clone();
let receipt_content = [(
body.event_id.clone(),
BTreeMap::from_iter([( BTreeMap::from_iter([(
sender_user.to_owned(), ReceiptType::Read,
Receipt::new(MilliSecondsSinceUnixEpoch::now()), BTreeMap::from_iter([(sender_user.to_owned(), receipt)]),
)]), )]),
)]), )];
)];
services services
.rooms .rooms
.read_receipt .read_receipt
.readreceipt_update( .readreceipt_update(
sender_user, sender_user,
&body.room_id, &body.room_id,
ReceiptEvent::new( ReceiptEvent::new(
body.room_id.clone(), body.room_id.clone(),
ReceiptEventContent::from_iter(receipt_content), ReceiptEventContent::from_iter(receipt_content),
), ),
) )
.await; .await;
}, },
| create_receipt::v3::ReceiptType::ReadPrivate => { | create_receipt::v3::ReceiptType::ReadPrivate => {
let count = services let count = services
.rooms .rooms
.timeline .timeline
.get_pdu_count(&body.event_id) .get_pdu_count(&body.event_id)
.await .await
.map_err(|_| err!(Request(NotFound("Event not found."))))?; .map_err(|_| err!(Request(NotFound("Event not found."))))?
.into_unsigned();
let PduCount::Normal(count) = count else {
return Err!(Request(InvalidParam(
"Event is a backfilled PDU and cannot be marked as read."
)));
};
services services
.rooms .rooms
+46 -38
View File
@@ -2,7 +2,7 @@ use axum::extract::State;
use conduwuit::{ use conduwuit::{
Err, Result, at, debug_warn, err, Err, Result, at, debug_warn, err,
matrix::{Event, event::RelationTypeEqual, pdu::PduCount}, matrix::{Event, event::RelationTypeEqual, pdu::PduCount},
utils::{IterStream, ReadyExt, result::FlatOk, stream::WidebandExt}, utils::{IterStream, result::FlatOk, stream::WidebandExt},
}; };
use conduwuit_service::Services; use conduwuit_service::Services;
use futures::StreamExt; use futures::StreamExt;
@@ -98,6 +98,10 @@ pub(crate) async fn get_relating_events_route(
.await .await
} }
// Spec (v1.10) recommends a depth of at least 3
const RECURSION_DEPTH: u8 = 3;
const LEVELS_BELOW: u8 = RECURSION_DEPTH - 1;
#[allow(clippy::too_many_arguments)] #[allow(clippy::too_many_arguments)]
async fn paginate_relations_with_filter( async fn paginate_relations_with_filter(
services: &Services, services: &Services,
@@ -147,28 +151,49 @@ async fn paginate_relations_with_filter(
.unwrap_or(30) .unwrap_or(30)
.min(100); .min(100);
// Spec (v1.10) recommends depth of at least 3 let max_depth = if recurse { LEVELS_BELOW } else { 0 };
let depth: u8 = if recurse { 3 } else { 1 };
let events: Vec<_> = services // One more than the limit, to know whether there's another page
let mut events = services
.rooms .rooms
.pdu_metadata .pdu_metadata
.get_relations(sender_user, room_id, target, start, limit, depth, dir) .get_relations(
.await sender_user,
room_id,
target,
start,
limit.saturating_add(1),
max_depth,
dir,
|pdu| {
filter_event_type
.as_ref()
.is_none_or(|kind| kind == pdu.kind())
&& filter_rel_type
.as_ref()
.is_none_or(|rel_type| rel_type.relation_type_equal(pdu))
},
)
.await;
let past_to = to.and_then(|to| {
events
.iter()
.position(|(count, _)| !to.is_after(*count, dir))
});
if let Some(past_to) = past_to {
events.truncate(past_to);
}
let has_more = past_to.is_none() && events.len() > limit;
events.truncate(limit);
let next_batch =
has_more.then(|| events.last().map_or(start, |(count, _)| *count).to_string());
let chunk: Vec<_> = events
.into_iter() .into_iter()
.filter(|(_, pdu)| {
filter_event_type
.as_ref()
.is_none_or(|kind| kind == pdu.kind())
})
.filter(|(_, pdu)| {
filter_rel_type
.as_ref()
.is_none_or(|rel_type| rel_type.relation_type_equal(pdu))
})
.stream() .stream()
.ready_take_while(|(count, _)| Some(*count) != to)
.take(limit)
.wide_filter_map(|item| visibility_filter(services, sender_user, item)) .wide_filter_map(|item| visibility_filter(services, sender_user, item))
.wide_filter_map(|item| ignored_filter(services, item, sender_user)) .wide_filter_map(|item| ignored_filter(services, item, sender_user))
.then(async |mut pdu| { .then(async |mut pdu| {
@@ -182,32 +207,15 @@ async fn paginate_relations_with_filter(
} }
pdu pdu
}) })
.collect()
.await;
// Determine if there are more events to fetch
let has_more = events.len() >= limit;
let next_batch = if has_more {
match dir {
| Direction::Forward => events.last(),
| Direction::Backward => events.first(),
}
.map(|(count, _)| count.to_string())
} else {
None
};
let chunk: Vec<_> = events
.into_iter()
.map(at!(1)) .map(at!(1))
.map(Event::into_format) .map(Event::into_format)
.collect(); .collect()
.await;
Ok(assign!(get_relating_events::v1::Response::new(chunk), { Ok(assign!(get_relating_events::v1::Response::new(chunk), {
next_batch, next_batch,
prev_batch: from.map(Into::into), prev_batch: from.map(Into::into),
recursion_depth: recurse.then_some(depth.into()), recursion_depth: recurse.then_some(RECURSION_DEPTH.into()),
})) }))
} }
+7 -2
View File
@@ -24,7 +24,7 @@ pub(crate) async fn get_room_event_route(
services.rooms.state_accessor.is_world_readable(room_id) services.rooms.state_accessor.is_world_readable(room_id)
); );
if !joined && !world_readable { if !joined && !world_readable {
return Err!(Request(NotFound("Event {} not found.", event_id))); return Err!(Request(NotFound("Event {event_id} not found.")));
} }
services services
@@ -32,10 +32,15 @@ pub(crate) async fn get_room_event_route(
.timeline .timeline
.get_remote_pdu(room_id, event_id) .get_remote_pdu(room_id, event_id)
.await .await
.map_err(|_| err!(Request(NotFound("Event {} not found.", event_id))))? .map_err(|_| err!(Request(NotFound("Event {event_id} not found."))))?
}, },
| Err(e) => return Err(e), | Err(e) => return Err(e),
}; };
if !event.room_id_or_hash().eq(room_id) {
// Return not found instead of invalid param to avoid revealing the
// existence of events the user might not be allowed to know about.
return Err!(Request(NotFound("Event {event_id} not found.")));
}
// NOTE: checked after fetching, as visibility of an unknown event cannot // NOTE: checked after fetching, as visibility of an unknown event cannot
// be determined (user_can_see_event returns true for those). // be determined (user_can_see_event returns true for those).
+8 -3
View File
@@ -15,7 +15,7 @@ use conduwuit::{
}, },
warn, warn,
}; };
use conduwuit_service::Services; use conduwuit_service::{Services, rooms::read_receipt::pack_receipts};
use futures::{ use futures::{
FutureExt, StreamExt, TryFutureExt, FutureExt, StreamExt, TryFutureExt,
future::{OptionFuture, join, join3, join4, try_join, try_join3}, future::{OptionFuture, join, join3, join4, try_join, try_join3},
@@ -243,9 +243,14 @@ async fn build_ephemeral(
let (receipt_events, typing_event, private_read_event) = let (receipt_events, typing_event, private_read_event) =
join3(receipt_events, typing_event, private_read_event).await; join3(receipt_events, typing_event, private_read_event).await;
let mut edus = receipt_events; let mut all_receipts = receipt_events;
all_receipts.extend(private_read_event);
let mut edus = Vec::new();
if !all_receipts.is_empty() {
edus.push(pack_receipts(all_receipts.into_iter()).cast());
}
edus.extend(typing_event); edus.extend(typing_event);
edus.extend(private_read_event);
Ok(assign!(Ephemeral::new(), { events: edus })) Ok(assign!(Ephemeral::new(), { events: edus }))
} }
+13 -4
View File
@@ -1,18 +1,21 @@
use std::ops::Deref; use std::{
net::{IpAddr, Ipv4Addr},
ops::Deref,
};
use axum::{ use axum::{
RequestExt, RequestPartsExt, RequestExt, RequestPartsExt,
body::Body, body::Body,
extract::{FromRequest, Path, Query}, extract::{FromRequest, Path, Query},
}; };
use conduwuit::{Error, Result, err}; use conduwuit::{Error, Result, err, error};
use ruma::{ use ruma::{
CanonicalJsonObject, CanonicalJsonObject,
api::{IncomingRequest, IncomingRequestExt, auth_scheme::AuthScheme}, api::{IncomingRequest, IncomingRequestExt, auth_scheme::AuthScheme},
}; };
use serde::Deserialize; use serde::Deserialize;
use crate::{State, router::auth::CheckAuth}; use crate::{State, client_ip::ClientIp, router::auth::CheckAuth};
/// Query parameters needed to authenticate requests /// Query parameters needed to authenticate requests
#[derive(Deserialize)] #[derive(Deserialize)]
@@ -87,6 +90,11 @@ where
let Path(path): Path<Vec<String>> = parts.extract().await?; let Path(path): Path<Vec<String>> = parts.extract().await?;
let borrowed_path: Vec<_> = path.iter().map(String::as_str).collect(); let borrowed_path: Vec<_> = path.iter().map(String::as_str).collect();
let Query(auth_query): Query<AuthQueryParams> = parts.extract().await?; let Query(auth_query): Query<AuthQueryParams> = parts.extract().await?;
let ClientIp(ip) = parts
.extract_with_state(services)
.await
.inspect_err(|err| error!("Failed to extract client IP: {err:?}"))
.unwrap_or(ClientIp(IpAddr::V4(Ipv4Addr::UNSPECIFIED)));
// Assemble a new request from the read body and parts // Assemble a new request from the read body and parts
let request = hyper::Request::from_parts(parts, body.as_ref()); let request = hyper::Request::from_parts(parts, body.as_ref());
@@ -102,7 +110,8 @@ where
})?; })?;
let identity = let identity =
R::Authentication::check::<R>(services, &request, authentication, auth_query).await?; R::Authentication::check::<R>(services, &request, ip, authentication, auth_query)
.await?;
// Deserialize the body // Deserialize the body
let body = R::try_from_http_request(request, &borrowed_path) let body = R::try_from_http_request(request, &borrowed_path)
+37 -1
View File
@@ -1,6 +1,7 @@
use std::{ use std::{
any::{Any, TypeId}, any::{Any, TypeId},
collections::BTreeSet, collections::BTreeSet,
net::IpAddr,
}; };
use conduwuit::{ use conduwuit::{
@@ -18,7 +19,10 @@ use ruma::{
AuthScheme, NoAccessToken, NoAuthentication, AuthScheme, NoAccessToken, NoAuthentication,
}, },
client, client,
error::{ErrorKind, InsufficientUserAuthenticationErrorData, UnknownTokenErrorData}, error::{
ErrorKind, InsufficientUserAuthenticationErrorData, LimitExceededErrorData,
UnknownTokenErrorData,
},
federation::authentication::ServerSignatures, federation::authentication::ServerSignatures,
}, },
assign, assign,
@@ -90,6 +94,7 @@ pub(crate) trait CheckAuth: AuthScheme {
fn check<R: IncomingRequest<Authentication = Self> + Any>( fn check<R: IncomingRequest<Authentication = Self> + Any>(
services: &Services, services: &Services,
incoming_request: &hyper::Request<&[u8]>, incoming_request: &hyper::Request<&[u8]>,
request_ip: IpAddr,
authentication: Self::Output, authentication: Self::Output,
query: AuthQueryParams, query: AuthQueryParams,
) -> impl Future<Output = Result<Self::Identity>> + Send; ) -> impl Future<Output = Result<Self::Identity>> + Send;
@@ -101,6 +106,7 @@ impl CheckAuth for ServerSignatures {
async fn check<R: IncomingRequest<Authentication = Self> + Any>( async fn check<R: IncomingRequest<Authentication = Self> + Any>(
services: &Services, services: &Services,
incoming_request: &hyper::Request<&[u8]>, incoming_request: &hyper::Request<&[u8]>,
_request_ip: IpAddr,
authentication: Self::Output, authentication: Self::Output,
_query: AuthQueryParams, _query: AuthQueryParams,
) -> Result<Self::Identity> { ) -> Result<Self::Identity> {
@@ -161,6 +167,7 @@ impl CheckAuth for AccessToken {
async fn check<R: IncomingRequest<Authentication = Self> + Any>( async fn check<R: IncomingRequest<Authentication = Self> + Any>(
services: &Services, services: &Services,
_incoming_request: &hyper::Request<&[u8]>, _incoming_request: &hyper::Request<&[u8]>,
_request_ip: IpAddr,
authentication: Self::Output, authentication: Self::Output,
query: AuthQueryParams, query: AuthQueryParams,
) -> Result<Self::Identity> { ) -> Result<Self::Identity> {
@@ -181,6 +188,7 @@ impl CheckAuth for AccessTokenOptional {
async fn check<R: IncomingRequest<Authentication = Self> + Any>( async fn check<R: IncomingRequest<Authentication = Self> + Any>(
services: &Services, services: &Services,
_incoming_request: &hyper::Request<&[u8]>, _incoming_request: &hyper::Request<&[u8]>,
request_ip: IpAddr,
authentication: Self::Output, authentication: Self::Output,
query: AuthQueryParams, query: AuthQueryParams,
) -> Result<Self::Identity> { ) -> Result<Self::Identity> {
@@ -195,6 +203,10 @@ impl CheckAuth for AccessTokenOptional {
.await .await
.map(Some) .map(Some)
} else { } else {
if R::RATE_LIMITED {
check_unauthenticated_request_ratelimiting(services, request_ip)?;
}
Ok(None) Ok(None)
} }
} }
@@ -206,6 +218,7 @@ impl CheckAuth for AppserviceToken {
async fn check<R: IncomingRequest + Any>( async fn check<R: IncomingRequest + Any>(
services: &Services, services: &Services,
_incoming_request: &hyper::Request<&[u8]>, _incoming_request: &hyper::Request<&[u8]>,
_request_ip: IpAddr,
authentication: Self::Output, authentication: Self::Output,
_query: AuthQueryParams, _query: AuthQueryParams,
) -> Result<Self::Identity> { ) -> Result<Self::Identity> {
@@ -219,6 +232,7 @@ impl CheckAuth for AppserviceTokenOptional {
async fn check<R: IncomingRequest<Authentication = Self> + Any>( async fn check<R: IncomingRequest<Authentication = Self> + Any>(
services: &Services, services: &Services,
_incoming_request: &hyper::Request<&[u8]>, _incoming_request: &hyper::Request<&[u8]>,
_request_ip: IpAddr,
authentication: Self::Output, authentication: Self::Output,
_query: AuthQueryParams, _query: AuthQueryParams,
) -> Result<Self::Identity> { ) -> Result<Self::Identity> {
@@ -238,6 +252,7 @@ impl CheckAuth for NoAuthentication {
fn check<R: IncomingRequest<Authentication = Self> + Any>( fn check<R: IncomingRequest<Authentication = Self> + Any>(
_services: &Services, _services: &Services,
_incoming_request: &hyper::Request<&[u8]>, _incoming_request: &hyper::Request<&[u8]>,
_request_ip: IpAddr,
_authentication: Self::Output, _authentication: Self::Output,
_query: AuthQueryParams, _query: AuthQueryParams,
) -> impl Future<Output = Result<Self::Identity>> + Send { ) -> impl Future<Output = Result<Self::Identity>> + Send {
@@ -251,6 +266,7 @@ impl CheckAuth for NoAccessToken {
async fn check<R: IncomingRequest<Authentication = Self> + Any>( async fn check<R: IncomingRequest<Authentication = Self> + Any>(
services: &Services, services: &Services,
incoming_request: &hyper::Request<&[u8]>, incoming_request: &hyper::Request<&[u8]>,
request_ip: IpAddr,
_authentication: Self::Output, _authentication: Self::Output,
query: AuthQueryParams, query: AuthQueryParams,
) -> Result<Self::Identity> { ) -> Result<Self::Identity> {
@@ -267,6 +283,10 @@ impl CheckAuth for NoAccessToken {
.await .await
.map(Some) .map(Some)
} else { } else {
if R::RATE_LIMITED {
check_unauthenticated_request_ratelimiting(services, request_ip)?;
}
Ok(None) Ok(None)
} }
} }
@@ -408,3 +428,19 @@ async fn check_appservice_token(services: &Services, token: &str) -> Result<Regi
Ok(appservice_info) Ok(appservice_info)
} }
fn check_unauthenticated_request_ratelimiting(services: &Services, ip: IpAddr) -> Result<()> {
if services
.config
.unauthenticated_request_ratelimit
.check_key(&ip)
.is_err()
{
return Err(Error::BadRequest(
ErrorKind::LimitExceeded(LimitExceededErrorData::new()),
"Rate limit exceeded.",
));
}
Ok(())
}
-1
View File
@@ -421,7 +421,6 @@ async fn validate_invite_create_event(
if !state_res::auth_check( if !state_res::auth_check(
room_version_rules, room_version_rules,
pdu, pdu,
None,
|_, _| async { |_, _| async {
unreachable!("No state should be fetched when processing a lone create event"); unreachable!("No state should be fetched when processing a lone create event");
}, },
+14 -22
View File
@@ -581,28 +581,20 @@ async fn handle_edu_receipt_room_user(
} }
let data = &user_updates.data; let data = &user_updates.data;
user_updates for event_id in user_updates.event_ids {
.event_ids let user_data = [(user_id.to_owned(), data.clone())];
.into_iter() let receipts = [(ReceiptType::Read, BTreeMap::from(user_data))];
.stream() let content = [(event_id, BTreeMap::from(receipts))];
.for_each_concurrent(automatic_width(), |event_id| async move { services
let user_data = [(user_id.to_owned(), data.clone())]; .rooms
let receipts = [(ReceiptType::Read, BTreeMap::from(user_data))]; .read_receipt
let content = [(event_id.clone(), BTreeMap::from(receipts))]; .readreceipt_update(
services user_id,
.rooms room_id,
.read_receipt ReceiptEvent::new(room_id.to_owned(), ReceiptEventContent::from_iter(content)),
.readreceipt_update( )
user_id, .await;
room_id, }
ReceiptEvent::new(
room_id.to_owned(),
ReceiptEventContent::from_iter(content),
),
)
.await;
})
.await;
} }
async fn handle_edu_typing(services: &Services, origin: &ServerName, typing: TypingContent) { async fn handle_edu_typing(services: &Services, origin: &ServerName, typing: TypingContent) {
+1 -3
View File
@@ -47,8 +47,6 @@ perf_measurements = []
release_max_log_level = [ release_max_log_level = [
"tracing/max_level_trace", "tracing/max_level_trace",
"tracing/release_max_level_info", "tracing/release_max_level_info",
"log/max_level_trace",
"log/release_max_level_info",
] ]
sentry_telemetry = [] sentry_telemetry = []
zstd_compression = [ zstd_compression = [
@@ -77,13 +75,13 @@ cyborgtime.workspace = true
either.workspace = true either.workspace = true
figment.workspace = true figment.workspace = true
futures.workspace = true futures.workspace = true
governor.workspace = true
http-body-util.workspace = true http-body-util.workspace = true
http.workspace = true http.workspace = true
ipaddress.workspace = true ipaddress.workspace = true
libc.workspace = true libc.workspace = true
libloading.workspace = true libloading.workspace = true
libloading.optional = true libloading.optional = true
log.workspace = true
lettre.workspace = true lettre.workspace = true
num-traits.workspace = true num-traits.workspace = true
rand.workspace = true rand.workspace = true
+43 -1
View File
@@ -5,7 +5,10 @@ pub mod proxy;
use std::{ use std::{
collections::{BTreeMap, BTreeSet, HashMap}, collections::{BTreeMap, BTreeSet, HashMap},
hash::Hash,
net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr}, net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr},
num::NonZero,
ops::Deref,
path::PathBuf, path::PathBuf,
time::Duration, time::Duration,
}; };
@@ -17,6 +20,7 @@ use either::{
}; };
use figment::providers::{Env, Format, Toml}; use figment::providers::{Env, Format, Toml};
pub use figment::{Figment, value::Value as FigmentValue}; pub use figment::{Figment, value::Value as FigmentValue};
use governor::{DefaultKeyedRateLimiter, Quota, RateLimiter};
use lettre::message::Mailbox; use lettre::message::Mailbox;
use openidconnect::{Audience, ClientId, ClientSecret, Scope}; use openidconnect::{Audience, ClientId, ClientSecret, Scope};
use regex::RegexSet; use regex::RegexSet;
@@ -40,7 +44,7 @@ use crate::{Result, err, error::Error, utils::sys};
/// All the config options for continuwuity. /// All the config options for continuwuity.
#[allow(clippy::struct_excessive_bools)] #[allow(clippy::struct_excessive_bools)]
#[allow(rustdoc::broken_intra_doc_links, rustdoc::bare_urls)] #[allow(rustdoc::broken_intra_doc_links, rustdoc::bare_urls)]
#[derive(Clone, Debug, Deserialize)] #[derive(Debug, Deserialize)]
#[config_example_generator( #[config_example_generator(
filename = "conduwuit-example.toml", filename = "conduwuit-example.toml",
section = "global", section = "global",
@@ -790,6 +794,14 @@ pub struct Config {
#[serde(default = "default_sender_shutdown_timeout")] #[serde(default = "default_sender_shutdown_timeout")]
pub sender_shutdown_timeout: u64, pub sender_shutdown_timeout: u64,
/// Maximum number of requests per minute that unauthenticated clients
/// may make to ratelimited client-server API routes. This ratelimit is
/// global across all endpoints for each IP.
///
/// default: 30
#[serde(default = "default_unauthenticated_request_ratelimit")]
pub unauthenticated_request_ratelimit: PerMinuteRatelimiter<IpAddr>,
/// Enables registration. If set to false, no users can register on this /// Enables registration. If set to false, no users can register on this
/// server. /// server.
/// ///
@@ -2960,6 +2972,32 @@ impl TrustedServerConfig {
} }
} }
#[derive(Debug)]
pub struct PerMinuteRatelimiter<K: Hash + Eq + Clone> {
ratelimiter: DefaultKeyedRateLimiter<K>,
}
impl<K: Hash + Eq + Clone> PerMinuteRatelimiter<K> {
fn new(quota: Quota) -> Self { Self { ratelimiter: RateLimiter::keyed(quota) } }
}
impl<K: Hash + Eq + Clone> Deref for PerMinuteRatelimiter<K> {
type Target = DefaultKeyedRateLimiter<K>;
fn deref(&self) -> &Self::Target { &self.ratelimiter }
}
impl<'de, K: Hash + Eq + Clone> Deserialize<'de> for PerMinuteRatelimiter<K> {
fn deserialize<D>(deserializer: D) -> std::prelude::v1::Result<Self, D::Error>
where
D: serde::Deserializer<'de>,
{
let max_burst = NonZero::<u32>::deserialize(deserializer)?;
Ok(Self::new(Quota::per_minute(max_burst)))
}
}
const DEPRECATED_KEYS: &[&str] = &[ const DEPRECATED_KEYS: &[&str] = &[
"cache_capacity", "cache_capacity",
"conduit_cache_capacity_modifier", "conduit_cache_capacity_modifier",
@@ -3403,3 +3441,7 @@ fn default_preferred_username_claim() -> String { "preferred_username".to_owned(
fn default_profile_key_map() -> HashMap<String, String> { fn default_profile_key_map() -> HashMap<String, String> {
HashMap::from_iter([(ProfileFieldName::DisplayName.to_string(), "name".to_owned())]) HashMap::from_iter([(ProfileFieldName::DisplayName.to_string(), "name".to_owned())])
} }
fn default_unauthenticated_request_ratelimit<K: Hash + Eq + Clone>() -> PerMinuteRatelimiter<K> {
PerMinuteRatelimiter::new(Quota::per_minute(30.try_into().unwrap()))
}
+6 -1
View File
@@ -16,7 +16,12 @@ use ruma::{
use serde::Deserialize; use serde::Deserialize;
use serde_json::{Value as JsonValue, value::RawValue as RawJsonValue}; use serde_json::{Value as JsonValue, value::RawValue as RawJsonValue};
pub use self::{filter::Matches, id::*, relation::RelationTypeEqual, type_ext::TypeExt}; pub use self::{
filter::Matches,
id::*,
relation::{RelationTypeEqual, relation_type},
type_ext::TypeExt,
};
use super::{pdu::Pdu, state_key::StateKey}; use super::{pdu::Pdu, state_key::StateKey};
use crate::{Result, utils}; use crate::{Result, utils};
+10 -5
View File
@@ -8,7 +8,7 @@ pub trait RelationTypeEqual<E: Event> {
} }
#[derive(Clone, Debug, Deserialize)] #[derive(Clone, Debug, Deserialize)]
struct ExtractRelatesToEventId { struct ExtractRelatesToRelType {
#[serde(rename = "m.relates_to")] #[serde(rename = "m.relates_to")]
relates_to: ExtractRelType, relates_to: ExtractRelType,
} }
@@ -18,11 +18,16 @@ struct ExtractRelType {
rel_type: RelationType, rel_type: RelationType,
} }
/// The type of an event's relation, if it has one
pub fn relation_type<E: Event>(event: &E) -> Option<RelationType> {
event
.get_content()
.map(|c: ExtractRelatesToRelType| c.relates_to.rel_type)
.ok()
}
impl<E: Event> RelationTypeEqual<E> for RelationType { impl<E: Event> RelationTypeEqual<E> for RelationType {
fn relation_type_equal(&self, event: &E) -> bool { fn relation_type_equal(&self, event: &E) -> bool {
event relation_type(event).is_some_and(|r| r == *self)
.get_content()
.map(|c: ExtractRelatesToEventId| c.relates_to.rel_type)
.is_ok_and(|r| r == *self)
} }
} }
+10
View File
@@ -105,6 +105,16 @@ impl Count {
} }
} }
/// Whether this comes after `other` when going in the direction of `dir`
#[inline]
#[must_use]
pub fn is_after(self, other: Self, dir: Direction) -> bool {
match dir {
| Direction::Forward => self > other,
| Direction::Backward => self < other,
}
}
#[inline] #[inline]
#[must_use] #[must_use]
pub fn saturating_add(self, add: u64) -> Self { pub fn saturating_add(self, add: u64) -> Self {
+247 -64
View File
@@ -5,17 +5,21 @@ use futures::{
future::{OptionFuture, join, join3}, future::{OptionFuture, join, join3},
}; };
use ruma::{ use ruma::{
Int, OwnedUserId, RoomVersionId, UserId, AnyKeyName, CanonicalJsonObject, Int, OwnedUserId, RoomVersionId, SigningKeyId, UserId,
events::room::{ events::room::{
join_rules::{JoinRule, RoomJoinRulesEventContent}, join_rules::{JoinRule, RoomJoinRulesEventContent},
member::{MembershipState, ThirdPartyInvite}, member::MembershipState,
power_levels::{RoomPowerLevelsEventContent, UserPowerLevel}, power_levels::{RoomPowerLevelsEventContent, UserPowerLevel},
third_party_invite::PublicKey,
}, },
int, int,
room_version_rules::{RoomIdFormatVersion, RoomVersionRules}, room_version_rules::{RoomIdFormatVersion, RoomVersionRules},
serde::Raw, serde::{Raw, base64, base64::Standard},
signatures,
signatures::to_canonical_json_string_for_signing,
third_party_invite::IdentityServerBase64PublicKey,
}; };
use serde::Deserialize; use serde::{Deserialize, Serialize};
use serde_json::{from_str as from_json_str, value::RawValue as RawJsonValue}; use serde_json::{from_str as from_json_str, value::RawValue as RawJsonValue};
use super::{ use super::{
@@ -25,7 +29,7 @@ use super::{
deserialize_power_levels_content_redact, deserialize_power_levels_content_redact,
}, },
}; };
use crate::{debug, error, trace, warn}; use crate::{debug, err, error, trace, warn};
// FIXME: field extracting could be bundled for `content` // FIXME: field extracting could be bundled for `content`
#[derive(Deserialize)] #[derive(Deserialize)]
@@ -48,6 +52,40 @@ struct RoomCreateContentFields {
federate: bool, federate: bool,
} }
// Workaround for https://github.com/matrix-org/matrix-spec/issues/2471
#[derive(Deserialize, Debug)]
struct RoomThirdPartyInviteContentFields {
public_key: Option<IdentityServerBase64PublicKey>,
public_keys: Option<Vec<PublicKey>>,
}
// same here sort of (maintainers see https://forgejo.ellis.link/continuwuation/continuwuity-sec/issues/41)
#[derive(Deserialize, Debug)]
struct MemberThirdPartyInviteSignedContent {
signed: ThirdPartyInviteSignedObject,
}
#[derive(Serialize, Deserialize, Debug)]
struct ThirdPartyInviteSignedObject(CanonicalJsonObject);
impl ThirdPartyInviteSignedObject {
#[inline]
fn mxid(&self) -> Option<OwnedUserId> {
self.0
.get("mxid")?
.as_str()
.and_then(|raw| UserId::parse(raw).ok())
}
#[inline]
fn token(&self) -> Option<&str> { self.0.get("token")?.as_str() }
#[inline]
fn signatures(&self) -> Option<CanonicalJsonObject> {
self.0.get("signatures")?.as_object().map(ToOwned::to_owned)
}
}
/// For the given event `kind` what are the relevant auth events that are needed /// For the given event `kind` what are the relevant auth events that are needed
/// to authenticate this `content`. /// to authenticate this `content`.
/// ///
@@ -61,7 +99,7 @@ pub fn auth_types_for_event(
state_key: Option<&str>, state_key: Option<&str>,
content: &RawJsonValue, content: &RawJsonValue,
room_version: &RoomVersionRules, room_version: &RoomVersionRules,
) -> serde_json::Result<Vec<(StateEventType, StateKey)>> { ) -> crate::Result<Vec<(StateEventType, StateKey)>> {
if kind == &TimelineEventType::RoomCreate { if kind == &TimelineEventType::RoomCreate {
return Ok(vec![]); return Ok(vec![]);
} }
@@ -84,7 +122,7 @@ pub fn auth_types_for_event(
#[allow(unused)] #[allow(unused)]
struct RoomMemberContentFields { struct RoomMemberContentFields {
membership: Option<Raw<MembershipState>>, membership: Option<Raw<MembershipState>>,
third_party_invite: Option<Raw<ThirdPartyInvite>>, third_party_invite: Option<Raw<MemberThirdPartyInviteSignedContent>>,
join_authorised_via_users_server: Option<Raw<OwnedUserId>>, join_authorised_via_users_server: Option<Raw<OwnedUserId>>,
} }
@@ -116,16 +154,24 @@ pub fn auth_types_for_event(
auth_types.push(key); auth_types.push(key);
} }
// TODO: restore this once 3pid support isn't broken if membership == MembershipState::Invite {
// if membership == MembershipState::Invite { if let Some(Ok(t_id)) = content.third_party_invite.map(|t| t.deserialize()) {
// if let Some(Ok(t_id)) = content.third_party_invite.map(|t| let key = (
// t.deserialize()) { let key = StateEventType::RoomThirdPartyInvite,
// (StateEventType::RoomThirdPartyInvite, t_id.signed
// t_id.signed.token.into()); if !auth_types.contains(& .token()
// key) { auth_types.push(key); .ok_or_else(|| {
// } err!(Request(BadJson(
// } "Third party invite content missing a token"
// } )))
})?
.into(),
);
if !auth_types.contains(&key) {
auth_types.push(key);
}
}
}
} }
} }
} }
@@ -179,12 +225,11 @@ fn get_user_power_level(
pub async fn auth_check<E, F, Fut>( pub async fn auth_check<E, F, Fut>(
room_version: &RoomVersionRules, room_version: &RoomVersionRules,
incoming_event: &E, incoming_event: &E,
current_third_party_invite: Option<&E>,
fetch_state: F, fetch_state: F,
create_event: &E, create_event: &E,
) -> Result<bool, Error> ) -> Result<bool, Error>
where where
F: Fn(&StateEventType, &str) -> Fut + Send, F: Fn(&StateEventType, &str) -> Fut + Send + Copy,
Fut: Future<Output = Option<E>> + Send, Fut: Future<Output = Option<E>> + Send,
E: Event + Send + Sync, E: Event + Send + Sync,
for<'a> &'a E: Event + Send, for<'a> &'a E: Event + Send,
@@ -444,13 +489,15 @@ where
sender, sender,
sender_member_event.as_ref(), sender_member_event.as_ref(),
incoming_event, incoming_event,
current_third_party_invite, fetch_state,
power_levels_event.as_ref(), power_levels_event.as_ref(),
join_rules_event.as_ref(), join_rules_event.as_ref(),
user_for_join_auth.as_deref(), user_for_join_auth.as_deref(),
&user_for_join_auth_membership, &user_for_join_auth_membership,
&room_create_event, &room_create_event,
)? { )
.await?
{
return Ok(false); return Ok(false);
} }
@@ -639,14 +686,14 @@ where
/// event and the current State. /// event and the current State.
#[allow(clippy::too_many_arguments)] #[allow(clippy::too_many_arguments)]
#[allow(clippy::cognitive_complexity)] #[allow(clippy::cognitive_complexity)]
fn valid_membership_change<E>( async fn valid_membership_change<E, F, Fut>(
room_version: &RoomVersionRules, room_version: &RoomVersionRules,
target_user: &UserId, target_user: &UserId,
target_user_membership_event: Option<&E>, target_user_membership_event: Option<&E>,
sender: &UserId, sender: &UserId,
sender_membership_event: Option<&E>, sender_membership_event: Option<&E>,
current_event: &E, current_event: &E,
current_third_party_invite: Option<&E>, fetch_state: F,
power_levels_event: Option<&E>, power_levels_event: Option<&E>,
join_rules_event: Option<&E>, join_rules_event: Option<&E>,
user_for_join_auth: Option<&UserId>, user_for_join_auth: Option<&UserId>,
@@ -655,11 +702,13 @@ fn valid_membership_change<E>(
) -> Result<bool> ) -> Result<bool>
where where
E: Event + Send + Sync, E: Event + Send + Sync,
F: Fn(&StateEventType, &str) -> Fut + Send + Copy,
Fut: Future<Output = Option<E>> + Send,
for<'a> &'a E: Event + Send, for<'a> &'a E: Event + Send,
{ {
#[derive(Deserialize)] #[derive(Deserialize)]
struct GetThirdPartyInvite { struct GetThirdPartyInvite {
third_party_invite: Option<Raw<ThirdPartyInvite>>, third_party_invite: Option<Raw<MemberThirdPartyInviteSignedContent>>,
} }
let create_content = from_json_str::<RoomCreateContentFields>(create_room.content().get())?; let create_content = from_json_str::<RoomCreateContentFields>(create_room.content().get())?;
let creator = if room_version.authorization.use_room_create_sender { let creator = if room_version.authorization.use_room_create_sender {
@@ -901,22 +950,18 @@ where
| MembershipState::Invite => { | MembershipState::Invite => {
// If content has third_party_invite key // If content has third_party_invite key
trace!("starting target_membership=invite check"); trace!("starting target_membership=invite check");
match third_party_invite.and_then(|i| i.deserialize().ok()) { match third_party_invite {
| Some(tp_id) => | Some(raw_tp_id) =>
if target_user_current_membership == MembershipState::Ban { if target_user_current_membership == MembershipState::Ban {
warn!(?target_user_membership_event_id, "Can't invite banned user"); warn!(?target_user_membership_event_id, "Can't invite banned user");
false false
} else { } else {
let allow = verify_third_party_invite( let Ok(tp_id) = raw_tp_id.deserialize() else {
Some(target_user), warn!("Invite third party content is invalid");
sender, return Ok(false);
&tp_id, };
current_third_party_invite, verify_third_party_invite(Some(target_user), sender, &tp_id, fetch_state)
); .await
if !allow {
warn!("Third party invite invalid");
}
allow
}, },
| _ => | _ =>
if !sender_is_joined { if !sender_is_joined {
@@ -1435,14 +1480,133 @@ fn get_send_level(
.unwrap_or_else(|| if state_key.is_some() { int!(50) } else { int!(0) }) .unwrap_or_else(|| if state_key.is_some() { int!(50) } else { int!(0) })
} }
fn verify_third_party_invite( async fn verify_third_party_invite<F, Fut, E>(
_target_user: Option<&UserId>, target_user: Option<&UserId>,
_sender: &UserId, sender: &UserId,
_tp_id: &ThirdPartyInvite, tp_id: &MemberThirdPartyInviteSignedContent,
_current_third_party_invite: Option<&impl Event>, fetch_state: F,
) -> bool { ) -> bool
// TODO: implement proper verification here where
true F: Fn(&StateEventType, &str) -> Fut + Send,
Fut: Future<Output = Option<E>> + Send,
E: Event + Send + Sync,
{
// If content.third_party_invite does not have a signed property, reject.
// ^ This would be a deserialization error before this function call, which
// equates to a rejection
let signed = &tp_id.signed;
// If signed does not have mxid and token properties, reject.
let Some(mxid) = signed.mxid() else {
warn!("Invite third party signed content is missing or has invalid `mxid` property");
return false;
};
let Some(token) = signed.token() else {
warn!("Invite third party signed content is missing or has invalid `token` property");
return false;
};
if let Err(e) = mxid.validate_historical() {
warn!(error=?e, ?mxid, "Invite third party signed content has invalid `mxid` property");
return false;
}
// If mxid does not match state_key, reject.
// N.B. target_user is the state_key
if target_user.is_none_or(|u| u != mxid) {
warn!(?target_user, %mxid, "Invite third party mxid does not match membership state key");
return false;
}
// If there is no m.room.third_party_invite event in the current room state
// with state_key matching token, reject.
let Some(current_third_party_invite) =
fetch_state(&StateEventType::RoomThirdPartyInvite, token).await
else {
warn!("No third party invite associated with the invite's third party invite found");
return false;
};
let Ok(tpi_content) = current_third_party_invite
.get_content::<RoomThirdPartyInviteContentFields>()
.inspect_err(
|e| warn!(error=?e, "Third party invite event content is invalid (cannot deserialize)"),
)
else {
return false;
};
if current_third_party_invite.state_key() != Some(token) {
warn!(
state_key=?current_third_party_invite.state_key(),
%token,
"Third party invite state key mismatch with signed invite token"
);
return false;
}
// If sender does not match sender of the m.room.third_party_invite, reject.
if sender != current_third_party_invite.sender() {
warn!(
?sender,
third_party_invite_sender=%current_third_party_invite.sender(),
"Third party invite sender does not match invite membership sender"
);
return false;
}
// If any signature in signed matches any public key in the
// m.room.third_party_invite event, allow. The public keys are in content of
// m.room.third_party_invite as:
//
// A single public key in the public_key property.
// A list of public keys in the public_keys property.
// NOTE: Technically the two below operations shouldn't be fallible at this
// point in execution, but if we can't de/serialize them now, we won't be
// able to in the future, so rejecting the event is the right way to go.
// We log an error though since this is unexpected.
let Ok(signed_json) = to_canonical_json_string_for_signing(&signed.0).inspect_err(
|e| error!(error=?e, "Canonical signed object cannot be cast to a signing string"),
) else {
return false;
};
let signatures = signed
.signatures()
.unwrap_or_default() // Empty sigs object will never pass so this is fine
.values()
.filter_map(|signatures| signatures.as_object())
.flat_map(|signatures| {
signatures.iter().map(|(key, sig)| {
let key_id = SigningKeyId::<AnyKeyName>::parse(key).ok()?;
base64::Base64::<Standard>::parse(sig.as_str()?)
.map(|parsed| (key_id.algorithm(), parsed))
.ok()
})
})
.flatten()
.collect::<Vec<_>>();
for public_key_bytes in tpi_content
.public_key
.into_iter()
.chain(
tpi_content
.public_keys
.unwrap_or_default()
.iter()
.map(|pk| pk.public_key.clone()),
)
.filter_map(|pk| pk.decode().ok())
{
for (algorithm, signature) in &signatures {
if signatures::verify_canonical_json_bytes(
algorithm,
&public_key_bytes,
signature.as_bytes(),
signed_json.as_bytes(),
)
.is_ok()
{
return true;
}
}
}
warn!("Invite via third party was not signed by any associated public keys");
false
} }
#[cfg(test)] #[cfg(test)]
@@ -1461,7 +1625,7 @@ mod tests {
use serde_json::value::to_raw_value as to_raw_json_value; use serde_json::value::to_raw_value as to_raw_json_value;
use crate::{ use crate::{
matrix::{Event, EventTypeExt, Pdu as PduEvent}, matrix::{Event, EventTypeExt},
state_res::{ state_res::{
StateMap, StateMap,
event_auth::valid_membership_change, event_auth::valid_membership_change,
@@ -1472,8 +1636,8 @@ mod tests {
}, },
}; };
#[test] #[tokio::test]
fn test_ban_pass() { async fn test_ban_pass() {
let _ = tracing::subscriber::set_default( let _ = tracing::subscriber::set_default(
tracing_subscriber::fmt().with_test_writer().finish(), tracing_subscriber::fmt().with_test_writer().finish(),
); );
@@ -1495,6 +1659,8 @@ mod tests {
); );
let fetch_state = |ty, key| auth_events.get(&(ty, key)).cloned(); let fetch_state = |ty, key| auth_events.get(&(ty, key)).cloned();
let async_fetch_state =
|t: &StateEventType, k: &str| std::future::ready(fetch_state(t.to_owned(), k.into()));
let target_user = charlie(); let target_user = charlie();
let sender = alice(); let sender = alice();
@@ -1506,19 +1672,20 @@ mod tests {
sender, sender,
fetch_state(StateEventType::RoomMember, sender.as_str().into()).as_ref(), fetch_state(StateEventType::RoomMember, sender.as_str().into()).as_ref(),
&requester, &requester,
None::<&PduEvent>, &async_fetch_state,
fetch_state(StateEventType::RoomPowerLevels, "".into()).as_ref(), fetch_state(StateEventType::RoomPowerLevels, "".into()).as_ref(),
fetch_state(StateEventType::RoomJoinRules, "".into()).as_ref(), fetch_state(StateEventType::RoomJoinRules, "".into()).as_ref(),
None, None,
&MembershipState::Leave, &MembershipState::Leave,
&fetch_state(StateEventType::RoomCreate, "".into()).unwrap(), &fetch_state(StateEventType::RoomCreate, "".into()).unwrap(),
) )
.await
.unwrap() .unwrap()
); );
} }
#[test] #[tokio::test]
fn test_join_non_creator() { async fn test_join_non_creator() {
let _ = tracing::subscriber::set_default( let _ = tracing::subscriber::set_default(
tracing_subscriber::fmt().with_test_writer().finish(), tracing_subscriber::fmt().with_test_writer().finish(),
); );
@@ -1540,6 +1707,8 @@ mod tests {
); );
let fetch_state = |ty, key| auth_events.get(&(ty, key)).cloned(); let fetch_state = |ty, key| auth_events.get(&(ty, key)).cloned();
let async_fetch_state =
|t: &StateEventType, k: &str| std::future::ready(fetch_state(t.to_owned(), k.into()));
let target_user = charlie(); let target_user = charlie();
let sender = charlie(); let sender = charlie();
@@ -1551,19 +1720,20 @@ mod tests {
sender, sender,
fetch_state(StateEventType::RoomMember, sender.as_str().into()).as_ref(), fetch_state(StateEventType::RoomMember, sender.as_str().into()).as_ref(),
&requester, &requester,
None::<&PduEvent>, &async_fetch_state,
fetch_state(StateEventType::RoomPowerLevels, "".into()).as_ref(), fetch_state(StateEventType::RoomPowerLevels, "".into()).as_ref(),
fetch_state(StateEventType::RoomJoinRules, "".into()).as_ref(), fetch_state(StateEventType::RoomJoinRules, "".into()).as_ref(),
None, None,
&MembershipState::Leave, &MembershipState::Leave,
&fetch_state(StateEventType::RoomCreate, "".into()).unwrap(), &fetch_state(StateEventType::RoomCreate, "".into()).unwrap(),
) )
.await
.unwrap() .unwrap()
); );
} }
#[test] #[tokio::test]
fn test_join_creator() { async fn test_join_creator() {
let _ = tracing::subscriber::set_default( let _ = tracing::subscriber::set_default(
tracing_subscriber::fmt().with_test_writer().finish(), tracing_subscriber::fmt().with_test_writer().finish(),
); );
@@ -1585,6 +1755,8 @@ mod tests {
); );
let fetch_state = |ty, key| auth_events.get(&(ty, key)).cloned(); let fetch_state = |ty, key| auth_events.get(&(ty, key)).cloned();
let async_fetch_state =
|t: &StateEventType, k: &str| std::future::ready(fetch_state(t.to_owned(), k.into()));
let target_user = alice(); let target_user = alice();
let sender = alice(); let sender = alice();
@@ -1596,19 +1768,20 @@ mod tests {
sender, sender,
fetch_state(StateEventType::RoomMember, sender.as_str().into()).as_ref(), fetch_state(StateEventType::RoomMember, sender.as_str().into()).as_ref(),
&requester, &requester,
None::<&PduEvent>, &async_fetch_state,
fetch_state(StateEventType::RoomPowerLevels, "".into()).as_ref(), fetch_state(StateEventType::RoomPowerLevels, "".into()).as_ref(),
fetch_state(StateEventType::RoomJoinRules, "".into()).as_ref(), fetch_state(StateEventType::RoomJoinRules, "".into()).as_ref(),
None, None,
&MembershipState::Leave, &MembershipState::Leave,
&fetch_state(StateEventType::RoomCreate, "".into()).unwrap(), &fetch_state(StateEventType::RoomCreate, "".into()).unwrap(),
) )
.await
.unwrap() .unwrap()
); );
} }
#[test] #[tokio::test]
fn test_ban_fail() { async fn test_ban_fail() {
let _ = tracing::subscriber::set_default( let _ = tracing::subscriber::set_default(
tracing_subscriber::fmt().with_test_writer().finish(), tracing_subscriber::fmt().with_test_writer().finish(),
); );
@@ -1630,6 +1803,8 @@ mod tests {
); );
let fetch_state = |ty, key| auth_events.get(&(ty, key)).cloned(); let fetch_state = |ty, key| auth_events.get(&(ty, key)).cloned();
let async_fetch_state =
|t: &StateEventType, k: &str| std::future::ready(fetch_state(t.to_owned(), k.into()));
let target_user = alice(); let target_user = alice();
let sender = charlie(); let sender = charlie();
@@ -1641,19 +1816,20 @@ mod tests {
sender, sender,
fetch_state(StateEventType::RoomMember, sender.as_str().into()).as_ref(), fetch_state(StateEventType::RoomMember, sender.as_str().into()).as_ref(),
&requester, &requester,
None::<&PduEvent>, &async_fetch_state,
fetch_state(StateEventType::RoomPowerLevels, "".into()).as_ref(), fetch_state(StateEventType::RoomPowerLevels, "".into()).as_ref(),
fetch_state(StateEventType::RoomJoinRules, "".into()).as_ref(), fetch_state(StateEventType::RoomJoinRules, "".into()).as_ref(),
None, None,
&MembershipState::Leave, &MembershipState::Leave,
&fetch_state(StateEventType::RoomCreate, "".into()).unwrap(), &fetch_state(StateEventType::RoomCreate, "".into()).unwrap(),
) )
.await
.unwrap() .unwrap()
); );
} }
#[test] #[tokio::test]
fn test_restricted_join_rule() { async fn test_restricted_join_rule() {
let _ = tracing::subscriber::set_default( let _ = tracing::subscriber::set_default(
tracing_subscriber::fmt().with_test_writer().finish(), tracing_subscriber::fmt().with_test_writer().finish(),
); );
@@ -1692,6 +1868,8 @@ mod tests {
); );
let fetch_state = |ty, key| auth_events.get(&(ty, key)).cloned(); let fetch_state = |ty, key| auth_events.get(&(ty, key)).cloned();
let async_fetch_state =
|t: &StateEventType, k: &str| std::future::ready(fetch_state(t.to_owned(), k.into()));
let target_user = ella(); let target_user = ella();
let sender = ella(); let sender = ella();
@@ -1703,13 +1881,14 @@ mod tests {
sender, sender,
fetch_state(StateEventType::RoomMember, sender.as_str().into()).as_ref(), fetch_state(StateEventType::RoomMember, sender.as_str().into()).as_ref(),
&requester, &requester,
None::<&PduEvent>, &async_fetch_state,
fetch_state(StateEventType::RoomPowerLevels, "".into()).as_ref(), fetch_state(StateEventType::RoomPowerLevels, "".into()).as_ref(),
fetch_state(StateEventType::RoomJoinRules, "".into()).as_ref(), fetch_state(StateEventType::RoomJoinRules, "".into()).as_ref(),
Some(alice()), Some(alice()),
&MembershipState::Join, &MembershipState::Join,
&fetch_state(StateEventType::RoomCreate, "".into()).unwrap(), &fetch_state(StateEventType::RoomCreate, "".into()).unwrap(),
) )
.await
.unwrap() .unwrap()
); );
@@ -1721,19 +1900,20 @@ mod tests {
sender, sender,
fetch_state(StateEventType::RoomMember, sender.as_str().into()).as_ref(), fetch_state(StateEventType::RoomMember, sender.as_str().into()).as_ref(),
&requester, &requester,
None::<&PduEvent>, &async_fetch_state,
fetch_state(StateEventType::RoomPowerLevels, "".into()).as_ref(), fetch_state(StateEventType::RoomPowerLevels, "".into()).as_ref(),
fetch_state(StateEventType::RoomJoinRules, "".into()).as_ref(), fetch_state(StateEventType::RoomJoinRules, "".into()).as_ref(),
Some(ella()), Some(ella()),
&MembershipState::Leave, &MembershipState::Leave,
&fetch_state(StateEventType::RoomCreate, "".into()).unwrap(), &fetch_state(StateEventType::RoomCreate, "".into()).unwrap(),
) )
.await
.unwrap() .unwrap()
); );
} }
#[test] #[tokio::test]
fn test_knock() { async fn test_knock() {
let _ = tracing::subscriber::set_default( let _ = tracing::subscriber::set_default(
tracing_subscriber::fmt().with_test_writer().finish(), tracing_subscriber::fmt().with_test_writer().finish(),
); );
@@ -1764,6 +1944,8 @@ mod tests {
); );
let fetch_state = |ty, key| auth_events.get(&(ty, key)).cloned(); let fetch_state = |ty, key| auth_events.get(&(ty, key)).cloned();
let async_fetch_state =
|t: &StateEventType, k: &str| std::future::ready(fetch_state(t.to_owned(), k.into()));
let target_user = ella(); let target_user = ella();
let sender = ella(); let sender = ella();
@@ -1775,13 +1957,14 @@ mod tests {
sender, sender,
fetch_state(StateEventType::RoomMember, sender.as_str().into()).as_ref(), fetch_state(StateEventType::RoomMember, sender.as_str().into()).as_ref(),
&requester, &requester,
None::<&PduEvent>, &async_fetch_state,
fetch_state(StateEventType::RoomPowerLevels, "".into()).as_ref(), fetch_state(StateEventType::RoomPowerLevels, "".into()).as_ref(),
fetch_state(StateEventType::RoomJoinRules, "".into()).as_ref(), fetch_state(StateEventType::RoomJoinRules, "".into()).as_ref(),
None, None,
&MembershipState::Leave, &MembershipState::Leave,
&fetch_state(StateEventType::RoomCreate, "".into()).unwrap(), &fetch_state(StateEventType::RoomCreate, "".into()).unwrap(),
) )
.await
.unwrap() .unwrap()
); );
} }
+2 -8
View File
@@ -757,7 +757,8 @@ where
Some(state_key), Some(state_key),
event.content(), event.content(),
room_version, room_version,
)?; )
.map_err(|e| Error::InvalidPdu(e.to_string()))?;
trace!(list = ?auth_types, event_id = event.event_id().as_str(), "auth types for event"); trace!(list = ?auth_types, event_id = event.event_id().as_str(), "auth types for event");
let mut auth_state = StateMap::new(); let mut auth_state = StateMap::new();
@@ -830,12 +831,6 @@ where
debug!(event_id = event.event_id().as_str(), "Running auth checks"); debug!(event_id = event.event_id().as_str(), "Running auth checks");
// The key for this is (eventType + a state_key of the signed token not
// sender) so search for it
let current_third_party = auth_state.iter().find_map(|(_, pdu)| {
(*pdu.event_type() == TimelineEventType::RoomThirdPartyInvite).then_some(pdu)
});
let fetch_state = |ty: &StateEventType, key: &str| { let fetch_state = |ty: &StateEventType, key: &str| {
future::ready( future::ready(
auth_state auth_state
@@ -847,7 +842,6 @@ where
let auth_result = auth_check( let auth_result = auth_check(
room_version, room_version,
&event, &event,
current_third_party,
fetch_state, fetch_state,
&fetch_state(&StateEventType::RoomCreate, "") &fetch_state(&StateEventType::RoomCreate, "")
.await .await
-62
View File
@@ -1,62 +0,0 @@
use std::fmt;
use tracing::Level;
use super::Result;
use crate::error;
pub trait ErrLog<T, E>
where
E: fmt::Display,
{
fn log_err(self, level: Level) -> Self;
#[inline]
fn err_log(self) -> Self
where
Self: Sized,
{
self.log_err(Level::ERROR)
}
}
pub trait ErrDebugLog<T, E>
where
E: fmt::Debug,
{
fn log_err_debug(self, level: Level) -> Self;
#[inline]
fn err_debug_log(self) -> Self
where
Self: Sized,
{
self.log_err_debug(Level::ERROR)
}
}
impl<T, E> ErrLog<T, E> for Result<T, E>
where
E: fmt::Display,
{
#[inline]
fn log_err(self, level: Level) -> Self
where
Self: Sized,
{
self.inspect_err(|error| error::inspect_log_level(&error, level))
}
}
impl<T, E> ErrDebugLog<T, E> for Result<T, E>
where
E: fmt::Debug,
{
#[inline]
fn log_err_debug(self, level: Level) -> Self
where
Self: Sized,
{
self.inspect_err(|error| error::inspect_debug_log_level(&error, level))
}
}
-3
View File
@@ -34,8 +34,6 @@ jemalloc_stats = [
] ]
release_max_log_level = [ release_max_log_level = [
"conduwuit-core/release_max_log_level", "conduwuit-core/release_max_log_level",
"log/max_level_trace",
"log/release_max_level_info",
"tracing/max_level_trace", "tracing/max_level_trace",
"tracing/release_max_level_info", "tracing/release_max_level_info",
] ]
@@ -60,7 +58,6 @@ const-str.workspace = true
ctor.workspace = true ctor.workspace = true
dtor.workspace = true dtor.workspace = true
futures.workspace = true futures.workspace = true
log.workspace = true
minicbor.workspace = true minicbor.workspace = true
minicbor-serde.workspace = true minicbor-serde.workspace = true
rust-rocksdb.workspace = true rust-rocksdb.workspace = true
+1 -1
View File
@@ -171,7 +171,7 @@ pub(super) static MAPS: &[Descriptor] = &[
}, },
Descriptor { Descriptor {
name: "referencedevents", name: "referencedevents",
..descriptor::DROPPED ..descriptor::RANDOM
}, },
Descriptor { Descriptor {
name: "refreshtoken_refreshtokeninfo", name: "refreshtoken_refreshtokeninfo",
+8 -33
View File
@@ -77,7 +77,6 @@ full = [
] ]
brotli_compression = [ brotli_compression = [
"conduwuit-api/brotli_compression",
"conduwuit-core/brotli_compression", "conduwuit-core/brotli_compression",
"conduwuit-router/brotli_compression", "conduwuit-router/brotli_compression",
"conduwuit-service/brotli_compression", "conduwuit-service/brotli_compression",
@@ -89,11 +88,10 @@ direct_tls = [
"conduwuit-router/direct_tls" "conduwuit-router/direct_tls"
] ]
element_hacks = [ element_hacks = [
"conduwuit-api/element_hacks",
"conduwuit-service/element_hacks", "conduwuit-service/element_hacks",
"conduwuit-router/element_hacks",
] ]
gzip_compression = [ gzip_compression = [
"conduwuit-api/gzip_compression",
"conduwuit-core/gzip_compression", "conduwuit-core/gzip_compression",
"conduwuit-router/gzip_compression", "conduwuit-router/gzip_compression",
"conduwuit-service/gzip_compression", "conduwuit-service/gzip_compression",
@@ -102,21 +100,21 @@ hardened_malloc = [
"conduwuit-core/hardened_malloc", "conduwuit-core/hardened_malloc",
] ]
http3 = [ http3 = [
"reqwest/http3" "conduwuit-service/http3"
] ]
ring = [ ring = [
"rustls/ring" "rustls/ring",
] ]
aws_lc_rs = [ aws_lc_rs = [
"rustls/aws_lc_rs", "rustls/aws_lc_rs",
"dep:aws-lc-rs"
] ]
io_uring = [ io_uring = [
"conduwuit-database/io_uring", "conduwuit-service/io_uring",
] ]
jemalloc = [ jemalloc = [
"conduwuit-core/jemalloc", "conduwuit-core/jemalloc",
"conduwuit-database/jemalloc", "conduwuit-service/jemalloc",
] ]
jemalloc_prof = [ jemalloc_prof = [
"conduwuit-core/jemalloc_prof", "conduwuit-core/jemalloc_prof",
@@ -145,19 +143,13 @@ perf_measurements = [
release_max_log_level = [ release_max_log_level = [
"tracing/max_level_trace", "tracing/max_level_trace",
"tracing/release_max_level_info", "tracing/release_max_level_info",
"log/max_level_trace",
"log/release_max_level_info",
"conduwuit-admin/release_max_log_level",
"conduwuit-api/release_max_log_level",
"conduwuit-core/release_max_log_level", "conduwuit-core/release_max_log_level",
"conduwuit-database/release_max_log_level",
"conduwuit-router/release_max_log_level", "conduwuit-router/release_max_log_level",
"conduwuit-service/release_max_log_level", "conduwuit-service/release_max_log_level",
] ]
sentry_telemetry = [ sentry_telemetry = [
"dep:sentry", "dep:sentry",
"dep:sentry-tracing", "dep:sentry-tracing",
"dep:sentry-tower",
"conduwuit-core/sentry_telemetry", "conduwuit-core/sentry_telemetry",
"conduwuit-router/sentry_telemetry", "conduwuit-router/sentry_telemetry",
] ]
@@ -180,9 +172,7 @@ url_preview = [
"conduwuit-service/url_preview", "conduwuit-service/url_preview",
] ]
zstd_compression = [ zstd_compression = [
"conduwuit-api/zstd_compression",
"conduwuit-core/zstd_compression", "conduwuit-core/zstd_compression",
"conduwuit-database/zstd_compression",
"conduwuit-router/zstd_compression", "conduwuit-router/zstd_compression",
"conduwuit-service/zstd_compression", "conduwuit-service/zstd_compression",
] ]
@@ -192,10 +182,10 @@ conduwuit_mods = [
bindgen-static = [ bindgen-static = [
# "bindgen/static" # "bindgen/static"
# "clang-sys/static" # "clang-sys/static"
"conduwuit-database/bindgen-static" "conduwuit-service/bindgen-static"
] ]
bindgen-runtime = [ bindgen-runtime = [
"conduwuit-database/bindgen-runtime" "conduwuit-service/bindgen-runtime"
] ]
[build-dependencies] [build-dependencies]
@@ -203,10 +193,7 @@ bindgen-runtime = [
# clang-sys = {version = "1", default-features = false} # clang-sys = {version = "1", default-features = false}
[dependencies] [dependencies]
conduwuit-admin.workspace = true
conduwuit-api.workspace = true
conduwuit-core.workspace = true conduwuit-core.workspace = true
conduwuit-database.workspace = true
conduwuit-router.workspace = true conduwuit-router.workspace = true
conduwuit-service.workspace = true conduwuit-service.workspace = true
conduwuit-build-metadata.workspace = true conduwuit-build-metadata.workspace = true
@@ -218,7 +205,6 @@ dtor.workspace = true
console-subscriber.optional = true console-subscriber.optional = true
console-subscriber.workspace = true console-subscriber.workspace = true
const-str.workspace = true const-str.workspace = true
log.workspace = true
opentelemetry.workspace = true opentelemetry.workspace = true
opentelemetry-otlp.optional = true opentelemetry-otlp.optional = true
opentelemetry-otlp.workspace = true opentelemetry-otlp.workspace = true
@@ -226,14 +212,10 @@ opentelemetry-prometheus.workspace = true
opentelemetry-semantic-conventions.workspace = true opentelemetry-semantic-conventions.workspace = true
opentelemetry_sdk.workspace = true opentelemetry_sdk.workspace = true
prometheus.workspace = true prometheus.workspace = true
sentry-tower.optional = true
sentry-tower.workspace = true
sentry-tracing.optional = true sentry-tracing.optional = true
sentry-tracing.workspace = true sentry-tracing.workspace = true
sentry.optional = true sentry.optional = true
sentry.workspace = true sentry.workspace = true
tokio-metrics.optional = true
tokio-metrics.workspace = true
tokio.workspace = true tokio.workspace = true
tracing-flame.optional = true tracing-flame.optional = true
tracing-flame.workspace = true tracing-flame.workspace = true
@@ -243,14 +225,7 @@ tracing-subscriber.workspace = true
tracing.workspace = true tracing.workspace = true
tracing-journald = { workspace = true, optional = true } tracing-journald = { workspace = true, optional = true }
parking_lot.workspace = true parking_lot.workspace = true
reqwest = { workspace = true, default-features = false }
rustls = { workspace = true, default-features = false } rustls = { workspace = true, default-features = false }
aws-lc-rs = { version = "1.16.3", default-features = false, optional = true }
[target.'cfg(all(not(target_env = "msvc"), target_os = "linux"))'.dependencies]
hardened_malloc-rs.workspace = true
hardened_malloc-rs.optional = true
[lints] [lints]
workspace = true workspace = true
+9 -1
View File
@@ -60,10 +60,18 @@ pub(crate) fn init(
#[cfg(feature = "sentry_telemetry")] #[cfg(feature = "sentry_telemetry")]
let subscriber = { let subscriber = {
use tracing::Level;
use tracing_subscriber::filter::{LevelFilter, filter_fn};
let sentry_filter = EnvFilter::try_new(&config.sentry_filter) let sentry_filter = EnvFilter::try_new(&config.sentry_filter)
.map_err(|e| err!(Config("sentry_filter", "{e}.")))?; .map_err(|e| err!(Config("sentry_filter", "{e}.")))?;
let sentry_layer = sentry_tracing::layer(); let sentry_layer = sentry_tracing::SpanLayer::new()
.with_filter(LevelFilter::INFO)
.and_then(sentry_tracing::BreadcrumbLayer::new().with_filter(filter_fn(|metadata| {
matches!(*metadata.level(), Level::WARN | Level::INFO)
})))
.and_then(sentry_tracing::ErrorLayer::new().with_filter(LevelFilter::ERROR));
let (sentry_reload_filter, sentry_reload_handle) = reload::Layer::new(sentry_filter); let (sentry_reload_filter, sentry_reload_handle) = reload::Layer::new(sentry_filter);
reload_handles.add("sentry", Box::new(sentry_reload_handle)); reload_handles.add("sentry", Box::new(sentry_reload_handle));
+4 -14
View File
@@ -25,9 +25,11 @@ brotli_compression = [
] ]
direct_tls = [ direct_tls = [
"axum-server/tls-rustls-no-provider", "axum-server/tls-rustls-no-provider",
"dep:rustls",
"dep:axum-server-dual-protocol", "dep:axum-server-dual-protocol",
] ]
element_hacks = [
"conduwuit-api/element_hacks",
]
gzip_compression = [ gzip_compression = [
"conduwuit-admin/gzip_compression", "conduwuit-admin/gzip_compression",
"conduwuit-api/gzip_compression", "conduwuit-api/gzip_compression",
@@ -71,13 +73,9 @@ release_max_log_level = [
"conduwuit-service/release_max_log_level", "conduwuit-service/release_max_log_level",
"tracing/max_level_trace", "tracing/max_level_trace",
"tracing/release_max_level_info", "tracing/release_max_level_info",
"log/max_level_trace",
"log/release_max_level_info",
] ]
sentry_telemetry = [ sentry_telemetry = [
"conduwuit-core/sentry_telemetry", "conduwuit-core/sentry_telemetry",
"dep:sentry",
"dep:sentry-tracing",
"dep:sentry-tower", "dep:sentry-tower",
] ]
systemd = [ systemd = [
@@ -110,17 +108,9 @@ http.workspace = true
http-body-util.workspace = true http-body-util.workspace = true
hyper.workspace = true hyper.workspace = true
hyper-util.workspace = true hyper-util.workspace = true
log.workspace = true
opentelemetry-instrumentation-tower.workspace = true opentelemetry-instrumentation-tower.workspace = true
ruma.workspace = true ruma.workspace = true
rustls.workspace = true sentry-tower = { workspace = true, optional = true }
rustls.optional = true
sentry.optional = true
sentry.workspace = true
sentry-tower.optional = true
sentry-tower.workspace = true
sentry-tracing.optional = true
sentry-tracing.workspace = true
serde_json.workspace = true serde_json.workspace = true
tokio.workspace = true tokio.workspace = true
tower.workspace = true tower.workspace = true
+1 -1
View File
@@ -25,7 +25,7 @@ http.workspace = true
ruma.workspace = true ruma.workspace = true
serde = { workspace = true } serde = { workspace = true }
serde_json = { workspace = true } serde_json = { workspace = true }
wildmatch = "2.6.1" wildmatch = "2.7.0"
[dev-dependencies] [dev-dependencies]
+19
View File
@@ -16,6 +16,12 @@ crate-type = [
] ]
[features] [features]
bindgen-runtime = [
"conduwuit-database/bindgen-runtime"
]
bindgen-static = [
"conduwuit-database/bindgen-static"
]
brotli_compression = [ brotli_compression = [
"conduwuit-core/brotli_compression", "conduwuit-core/brotli_compression",
"reqwest/brotli", "reqwest/brotli",
@@ -29,6 +35,9 @@ gzip_compression = [
"conduwuit-core/gzip_compression", "conduwuit-core/gzip_compression",
"reqwest/gzip", "reqwest/gzip",
] ]
http3 = [
"reqwest/http3"
]
io_uring = [ io_uring = [
"conduwuit-database/io_uring", "conduwuit-database/io_uring",
] ]
@@ -122,6 +131,9 @@ lettre.workspace = true
resolvematrix.workspace = true resolvematrix.workspace = true
serde_urlencoded.workspace = true serde_urlencoded.workspace = true
openidconnect.workspace = true openidconnect.workspace = true
# We use this to set TLS backend features on the outdated reqwest bundled by openidconnect,
# which is necessary to call `danger_accept_invalid_certs`.
reqwest_0_12.workspace = true
rand.workspace = true rand.workspace = true
[target.'cfg(all(unix, target_os = "linux"))'.dependencies] [target.'cfg(all(unix, target_os = "linux"))'.dependencies]
@@ -130,3 +142,10 @@ sd-notify.optional = true
[lints] [lints]
workspace = true workspace = true
[package.metadata.cargo-shear]
ignored = ["reqwest_0_12"]
[dev-dependencies]
opentelemetry.workspace = true
rustls = { workspace = true, features = ["ring"] }
+61
View File
@@ -0,0 +1,61 @@
use std::{
net::{IpAddr, SocketAddr},
sync::Arc,
};
use hickory_resolver::{Resolver, net::runtime::TokioRuntimeProvider};
use reqwest::dns::{Addrs, Resolving};
/// A simple struct to implement reqwest::dns::Resolve, as that is what's
/// required by the reqwest client builder. Most code is based on
/// reqwest::dns::HickoryDnsResolver, which we here have to almost re-create
/// because it's pub(crate) instead of pub:
pub struct DnsResolver {
resolver: Arc<TokioResolver>,
}
type TokioResolver = Resolver<TokioRuntimeProvider>;
impl DnsResolver {
pub(crate) fn new(resolver: Arc<TokioResolver>) -> Self { Self { resolver } }
}
struct SocketAddrs {
iter: std::vec::IntoIter<IpAddr>,
}
impl Iterator for SocketAddrs {
type Item = SocketAddr;
fn next(&mut self) -> Option<Self::Item> {
self.iter.next().map(|ip_addr| SocketAddr::new(ip_addr, 0))
}
}
impl reqwest::dns::Resolve for DnsResolver {
fn resolve(&self, name: reqwest::dns::Name) -> Resolving {
let resolver = self.resolver.clone();
Box::pin(async move {
let lookup = resolver.lookup_ip(name.as_str()).await?;
let addrs: Addrs = Box::new(SocketAddrs {
iter: lookup.iter().collect::<Vec<_>>().into_iter(),
});
Ok(addrs)
})
}
}
// openidconnect is weird and vendors reqwest (?), therefore we have to
// completely re-implement Resolve with different types
impl openidconnect::reqwest::dns::Resolve for DnsResolver {
fn resolve(&self, name: openidconnect::reqwest::dns::Name) -> Resolving {
let resolver = self.resolver.clone();
Box::pin(async move {
let lookup = resolver.lookup_ip(name.as_str()).await?;
let addrs: Addrs = Box::new(SocketAddrs {
iter: lookup.iter().collect::<Vec<_>>().into_iter(),
});
Ok(addrs)
})
}
}
+76 -42
View File
@@ -1,26 +1,39 @@
mod dns_resolver;
use std::{sync::Arc, time::Duration}; use std::{sync::Arc, time::Duration};
use async_trait::async_trait; use async_trait::async_trait;
use conduwuit::{Config, Result, Server, err, trace, utils::response::LimitReadExt, warn}; use conduwuit::{
Config, Result, Server, debug, err, info, trace, utils::response::LimitReadExt, warn,
};
pub(crate) use dns_resolver::DnsResolver;
use either::Either; use either::Either;
use hickory_resolver::{ use hickory_resolver::{
TokioResolver, TokioResolver,
config::{ConnectionConfig, NameServerConfig}, config::{ConnectionConfig, NameServerConfig, ResolverConfig},
net::runtime::TokioRuntimeProvider, net::runtime::TokioRuntimeProvider,
proto::rr::IntoName, proto::rr::IntoName,
}; };
use ipaddress::IPAddress; use ipaddress::IPAddress;
use reqwest::redirect; use reqwest::{dns::Resolve, redirect};
use resolvematrix::server::{MatrixResolver, MatrixResolverBuilder}; use resolvematrix::server::{MatrixResolver, MatrixResolverBuilder};
use serde::Deserialize; use serde::Deserialize;
use crate::service; use crate::service;
pub struct Service { pub struct Service {
pub matrix_resolver: Arc<MatrixResolver>, /// Regular DNS resolver
pub dns_resolver: Arc<TokioResolver>, pub dns_resolver: Arc<TokioResolver>,
pub dns: reqwest::Client, /// Tokio system resolver wrapped
pub reqwest_resolver: Arc<DnsResolver>,
/// Matrix server resolver according to server resolution spec
pub matrix_resolver: Arc<MatrixResolver>,
/// HTTP client used for fetching files during server resolution
pub matrix_http_client: reqwest::Client,
pub url_preview: reqwest::Client, pub url_preview: reqwest::Client,
pub external_resource: reqwest::Client, pub external_resource: reqwest::Client,
pub federation: reqwest::Client, pub federation: reqwest::Client,
@@ -38,9 +51,18 @@ impl crate::Service for Service {
fn build(args: crate::Args<'_>) -> Result<Arc<Self>> { fn build(args: crate::Args<'_>) -> Result<Arc<Self>> {
let config = &args.server.config; let config = &args.server.config;
let dns_resolver = get_dns_resolver(args.server)?; // Regular DNS resolver
let tokio_dns_resolver = get_dns_resolver(args.server)?;
let dns_client = base(&args.server.config)? // More different DNS resolver that also implements
// reqwest::dns::Resolve (which is required for reqwest to use it).
// Don't ask me, I just work here. - @silversys
let reqwest_dns_resolver = Arc::new(DnsResolver::new(tokio_dns_resolver.clone()));
// Regular HTTP client that does regular HTTP requests with regular DNS
// resolution, but with timeouts for /.well-known/matrix/* files
// according to c10y config.
let matrix_http_client = base(&args.server.config, reqwest_dns_resolver.clone())?
.connect_timeout(Duration::from_secs(args.server.config.well_known_conn_timeout)) .connect_timeout(Duration::from_secs(args.server.config.well_known_conn_timeout))
.read_timeout(Duration::from_secs(args.server.config.well_known_timeout)) .read_timeout(Duration::from_secs(args.server.config.well_known_timeout))
.timeout(Duration::from_secs(args.server.config.well_known_timeout)) .timeout(Duration::from_secs(args.server.config.well_known_timeout))
@@ -48,12 +70,17 @@ impl crate::Service for Service {
.redirect(redirect::Policy::limited(4)) .redirect(redirect::Policy::limited(4))
.build()?; .build()?;
// Resolves hostnames into ip+port or hostname+port server combinations
// according to the server resolution spec
let matrix_resolver = Arc::new(MatrixResolverBuilder::new() let matrix_resolver = Arc::new(MatrixResolverBuilder::new()
.dangerous_tls_accept_invalid_certs(args.server.config.allow_invalid_tls_certificates_yes_i_know_what_the_fuck_i_am_doing_with_this_and_i_know_this_is_insecure) .dangerous_tls_accept_invalid_certs(args.server.config.allow_invalid_tls_certificates_yes_i_know_what_the_fuck_i_am_doing_with_this_and_i_know_this_is_insecure)
.http_client(dns_client.clone()) .http_client(matrix_http_client.clone())
.dns_resolver(dns_resolver.clone()) .dns_resolver(tokio_dns_resolver.clone())
.build()?); .build()?);
let matrix_dns_resolver = matrix_resolver.create_dns_resolver(); // Does the same as the above, but acts as a DNS resolver for reqwest
// (implementing caching and following the matrix server resolution
// spec)
let matrix_dns_resolver = Arc::new(matrix_resolver.create_dns_resolver());
let url_preview_bind_addr = config let url_preview_bind_addr = config
.url_preview_bound_interface .url_preview_bound_interface
@@ -72,11 +99,12 @@ impl crate::Service for Service {
Ok(Arc::new(Self { Ok(Arc::new(Self {
matrix_resolver, matrix_resolver,
dns_resolver, matrix_http_client,
reqwest_resolver: reqwest_dns_resolver.clone(),
dns: dns_client, dns_resolver: tokio_dns_resolver,
url_preview: base(config) url_preview: base(config, reqwest_dns_resolver.clone())
.and_then(|builder| { .and_then(|builder| {
builder_interface(builder, url_preview_bind_iface.as_deref()) builder_interface(builder, url_preview_bind_iface.as_deref())
})? })?
@@ -86,12 +114,11 @@ impl crate::Service for Service {
.user_agent(url_preview_user_agent) .user_agent(url_preview_user_agent)
.build()?, .build()?,
external_resource: base(config)? external_resource: base(config, reqwest_dns_resolver.clone())?
.redirect(redirect::Policy::limited(3)) .redirect(redirect::Policy::limited(3))
.build()?, .build()?,
federation: base(config)? federation: base(config, matrix_dns_resolver.clone())?
.dns_resolver(matrix_dns_resolver.clone())
.connect_timeout(Duration::from_secs(config.federation_conn_timeout)) .connect_timeout(Duration::from_secs(config.federation_conn_timeout))
.read_timeout(Duration::from_secs(config.federation_timeout)) .read_timeout(Duration::from_secs(config.federation_timeout))
.timeout(Duration::from_secs( .timeout(Duration::from_secs(
@@ -104,8 +131,7 @@ impl crate::Service for Service {
.redirect(redirect::Policy::limited(3)) .redirect(redirect::Policy::limited(3))
.build()?, .build()?,
federation_slow: base(config)? federation_slow: base(config, matrix_dns_resolver.clone())?
.dns_resolver(matrix_dns_resolver.clone())
.connect_timeout(Duration::from_secs(config.federation_conn_timeout)) .connect_timeout(Duration::from_secs(config.federation_conn_timeout))
.read_timeout(Duration::from_secs(config.federation_timeout.saturating_mul(6))) .read_timeout(Duration::from_secs(config.federation_timeout.saturating_mul(6)))
.timeout(Duration::from_secs( .timeout(Duration::from_secs(
@@ -118,8 +144,7 @@ impl crate::Service for Service {
.redirect(redirect::Policy::limited(3)) .redirect(redirect::Policy::limited(3))
.build()?, .build()?,
sender: base(config)? sender: base(config, matrix_dns_resolver)?
.dns_resolver(matrix_dns_resolver.clone())
.connect_timeout(Duration::from_secs(config.federation_conn_timeout)) .connect_timeout(Duration::from_secs(config.federation_conn_timeout))
.read_timeout(Duration::from_secs(config.sender_timeout)) .read_timeout(Duration::from_secs(config.sender_timeout))
.timeout(Duration::from_secs(config.sender_timeout)) .timeout(Duration::from_secs(config.sender_timeout))
@@ -128,8 +153,7 @@ impl crate::Service for Service {
.redirect(redirect::Policy::limited(2)) .redirect(redirect::Policy::limited(2))
.build()?, .build()?,
appservice: base(config)? appservice: base(config, reqwest_dns_resolver.clone())?
.dns_resolver(matrix_dns_resolver)
.connect_timeout(Duration::from_secs(5)) .connect_timeout(Duration::from_secs(5))
.read_timeout(Duration::from_secs(config.appservice_timeout)) .read_timeout(Duration::from_secs(config.appservice_timeout))
.timeout(Duration::from_secs(config.appservice_timeout)) .timeout(Duration::from_secs(config.appservice_timeout))
@@ -138,7 +162,7 @@ impl crate::Service for Service {
.redirect(redirect::Policy::limited(2)) .redirect(redirect::Policy::limited(2))
.build()?, .build()?,
pusher: base(config)? pusher: base(config, reqwest_dns_resolver.clone())?
.connect_timeout(Duration::from_secs(config.pusher_conn_timeout)) .connect_timeout(Duration::from_secs(config.pusher_conn_timeout))
.timeout(Duration::from_secs(config.pusher_timeout)) .timeout(Duration::from_secs(config.pusher_timeout))
.pool_max_idle_per_host(1) .pool_max_idle_per_host(1)
@@ -148,7 +172,7 @@ impl crate::Service for Service {
// MSC4174 recommends against following redirects, since the // MSC4174 recommends against following redirects, since the
// destination is only checked before the request is sent. // destination is only checked before the request is sent.
webpush: base(config)? webpush: base(config, reqwest_dns_resolver)?
.connect_timeout(Duration::from_secs(config.pusher_conn_timeout)) .connect_timeout(Duration::from_secs(config.pusher_conn_timeout))
.timeout(Duration::from_secs(config.pusher_timeout)) .timeout(Duration::from_secs(config.pusher_timeout))
.pool_max_idle_per_host(1) .pool_max_idle_per_host(1)
@@ -221,18 +245,21 @@ impl Service {
} }
} }
pub fn base(config: &Config) -> Result<reqwest::ClientBuilder> { pub(crate) fn base(
config: &Config,
resolver: Arc<dyn Resolve>,
) -> Result<reqwest::ClientBuilder> {
let mut builder = reqwest::Client::builder() let mut builder = reqwest::Client::builder()
.hickory_dns(true) .dns_resolver(resolver)
.connect_timeout(Duration::from_secs(config.request_conn_timeout)) .connect_timeout(Duration::from_secs(config.request_conn_timeout))
.read_timeout(Duration::from_secs(config.request_timeout)) .read_timeout(Duration::from_secs(config.request_timeout))
.timeout(Duration::from_secs(config.request_total_timeout)) .timeout(Duration::from_secs(config.request_total_timeout))
.pool_idle_timeout(Duration::from_secs(config.request_idle_timeout)) .pool_idle_timeout(Duration::from_secs(config.request_idle_timeout))
.pool_max_idle_per_host(config.request_idle_per_host.into()) .pool_max_idle_per_host(config.request_idle_per_host.into())
.user_agent(conduwuit::user_agent()) .user_agent(conduwuit::user_agent())
.redirect(redirect::Policy::limited(6)) .redirect(redirect::Policy::limited(6))
.danger_accept_invalid_certs(config.allow_invalid_tls_certificates_yes_i_know_what_the_fuck_i_am_doing_with_this_and_i_know_this_is_insecure) .danger_accept_invalid_certs(config.allow_invalid_tls_certificates_yes_i_know_what_the_fuck_i_am_doing_with_this_and_i_know_this_is_insecure)
.connection_verbose(cfg!(debug_assertions)); .connection_verbose(cfg!(debug_assertions));
#[cfg(feature = "gzip_compression")] #[cfg(feature = "gzip_compression")]
{ {
@@ -310,19 +337,21 @@ fn builder_interface(
fn get_dns_resolver(server: &Arc<Server>) -> Result<Arc<TokioResolver>> { fn get_dns_resolver(server: &Arc<Server>) -> Result<Arc<TokioResolver>> {
let config = &server.config; let config = &server.config;
let (sys_conf, mut opts) = hickory_resolver::system_conf::read_system_conf()
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}")))?; .map_err(|e| err!(error!("Failed to configure DNS resolver from system: {e}")))?;
let mut conf = hickory_resolver::config::ResolverConfig::default(); let mut conf = ResolverConfig::from_name_servers(vec![]);
if let Some(domain) = sys_conf.domain() { // Set domain and search domains from system config (/etc/resolv.conf)
if let Some(domain) = system_resolver_config.domain() {
conf.set_domain(domain.clone()); conf.set_domain(domain.clone());
} }
for sys_conf in system_resolver_config.search() {
for sys_conf in sys_conf.search() {
conf.add_search(sys_conf.clone()); conf.add_search(sys_conf.clone());
} }
// Read nameservers from c10y config file
let config_nameservers: Vec<NameServerConfig> = server let config_nameservers: Vec<NameServerConfig> = server
.config .config
.dns_servers .dns_servers
@@ -330,11 +359,16 @@ fn get_dns_resolver(server: &Arc<Server>) -> Result<Arc<TokioResolver>> {
.filter_map(IntoName::to_ip) .filter_map(IntoName::to_ip)
.map(NameServerConfig::udp_and_tcp) .map(NameServerConfig::udp_and_tcp)
.collect(); .collect();
let system_nameservers = system_resolver_config.name_servers().to_vec();
let nameservers = if !config_nameservers.is_empty() { let nameservers = if !config_nameservers.is_empty() {
debug!("Using DNS nameservers from config file");
config_nameservers config_nameservers
} else { } else {
sys_conf.name_servers().to_vec() debug!("Using DNS nameservers from /etc/resolv.conf");
system_nameservers
}; };
info!(?nameservers, "Resolved nameservers for DNS client");
for sys_conf in nameservers { for sys_conf in nameservers {
let mut ns = sys_conf.clone(); let mut ns = sys_conf.clone();
+2 -1
View File
@@ -32,7 +32,7 @@ use tokio::{runtime, sync::SetOnce};
use url::Url; use url::Url;
use crate::{ use crate::{
Dep, config, globals, media, Dep, client, config, globals, media,
oauth::grant::AuthorizationCodeResponse, oauth::grant::AuthorizationCodeResponse,
threepid, threepid,
users::{self, AccountStatus, ProfileFieldChange}, users::{self, AccountStatus, ProfileFieldChange},
@@ -163,6 +163,7 @@ impl crate::Service for Service {
machine: SetOnce::new(), machine: SetOnce::new(),
// This isn't in the client service because it has to use the `reqwest` shipped by `openidconnect` // This isn't in the client service because it has to use the `reqwest` shipped by `openidconnect`
client: reqwest::ClientBuilder::new() client: reqwest::ClientBuilder::new()
.dns_resolver(args.depend::<client::Service>("client").reqwest_resolver.clone())
.connect_timeout(Duration::from_secs(args.server.config.request_conn_timeout)) .connect_timeout(Duration::from_secs(args.server.config.request_conn_timeout))
.read_timeout(Duration::from_secs(args.server.config.request_timeout)) .read_timeout(Duration::from_secs(args.server.config.request_timeout))
.timeout(Duration::from_secs(args.server.config.request_total_timeout)) .timeout(Duration::from_secs(args.server.config.request_total_timeout))
+2 -2
View File
@@ -8,7 +8,7 @@ use conduwuit_database::Database;
use p256::{ use p256::{
SecretKey, SecretKey,
ecdsa::{Signature, SigningKey, signature::Signer}, ecdsa::{Signature, SigningKey, signature::Signer},
elliptic_curve::sec1::ToEncodedPoint, elliptic_curve::sec1::ToSec1Point,
}; };
use serde_json::json; use serde_json::json;
@@ -48,7 +48,7 @@ impl Vapid {
}; };
let public_key = let public_key =
URL_SAFE_NO_PAD.encode(secret.public_key().to_encoded_point(false).as_bytes()); URL_SAFE_NO_PAD.encode(secret.public_key().to_sec1_point(false).as_bytes());
Ok(Self { Ok(Self {
secret, secret,
+3 -11
View File
@@ -159,15 +159,9 @@ impl super::Service {
ready(auth_events_by_key.get(&key).map(ToOwned::to_owned)) ready(auth_events_by_key.get(&key).map(ToOwned::to_owned))
}; };
state_res::event_auth::auth_check( state_res::event_auth::auth_check(room_version_rules, pdu, state_fetch, create_event)
room_version_rules, .await
pdu, .map_err(|e| err!("Event self-authentication failed: {e:?}"))
None, // TODO: third party invite
state_fetch,
create_event,
)
.await
.map_err(|e| err!("Event self-authentication failed: {e:?}"))
} }
/// Checks that the event passes PDU check 5, which ensures that the event /// Checks that the event passes PDU check 5, which ensures that the event
@@ -241,7 +235,6 @@ impl super::Service {
let auth_check = state_res::event_auth::auth_check( let auth_check = state_res::event_auth::auth_check(
room_version_rules, room_version_rules,
incoming_pdu, incoming_pdu,
None, // TODO: third party invite
|ty, sk| state_fetch(ty.clone(), sk.into()), |ty, sk| state_fetch(ty.clone(), sk.into()),
create_event.as_pdu(), create_event.as_pdu(),
) )
@@ -291,7 +284,6 @@ impl super::Service {
state_res::event_auth::auth_check( state_res::event_auth::auth_check(
room_version_rules, room_version_rules,
incoming_pdu, incoming_pdu,
None, // third-party invite
state_fetch, state_fetch,
create_event.as_pdu(), create_event.as_pdu(),
) )
@@ -15,6 +15,9 @@ use ruma::{OwnedEventId, RoomId, room_version_rules::RoomVersionRules};
use crate::rooms::short::ShortStateHash; use crate::rooms::short::ShortStateHash;
#[cfg(test)]
mod tests;
impl super::Service { impl super::Service {
/// Resolves the state before the incoming event. /// Resolves the state before the incoming event.
/// ///
@@ -124,7 +127,7 @@ impl super::Service {
.pdu_shortstatehash(prev_eventid) .pdu_shortstatehash(prev_eventid)
.map_ok(move |sstatehash| (sstatehash, prev_event)) .map_ok(move |sstatehash| (sstatehash, prev_event))
}) })
.try_collect::<HashMap<_, _>>() .try_collect::<Vec<_>>()
.inspect_err(|e| debug_error!("failed to calculate N-degree short state hashes: {e}")) .inspect_err(|e| debug_error!("failed to calculate N-degree short state hashes: {e}"))
.await .await
else { else {
@@ -0,0 +1,271 @@
use std::sync::Arc;
use conduwuit::{Config, PduEvent, Server, log::Log, metrics::Metrics};
use futures::StreamExt;
use ruma::{RoomId, RoomVersionId, events::StateEventType};
use serde_json::json;
#[tokio::test]
async fn admitted_joins_do_not_disappear_after_a_merge() {
use conduwuit::matrix::PartialPdu;
use ruma::{
UserId,
events::room::{
join_rules::{JoinRule, RoomJoinRulesEventContent},
member::{MembershipState, RoomMemberEventContent},
},
};
let (services, path) = test_services().await;
let alice = UserId::parse("@alice:test.example").unwrap();
let bob = UserId::parse("@bob:bob.example").unwrap();
let charlie = UserId::parse("@charlie:charlie.example").unwrap();
let dave = UserId::parse("@dave:dave.example").unwrap();
let mut remote_keys = Vec::new();
for user in [&bob, &charlie, &dave] {
let key = ruma::signatures::Ed25519KeyPair::from_der(
&ruma::signatures::Ed25519KeyPair::generate(),
"test".into(),
)
.unwrap();
cache_key(&services, user.server_name(), &key);
remote_keys.push(key);
}
let bootstrap = services
.rooms
.state
.mutex
.lock("!bootstrap:test.example")
.await;
let create_id = services
.rooms
.timeline
.build_and_append_pdu(
PartialPdu {
event_type: "m.room.create".into(),
content: serde_json::value::to_raw_value(&json!({ "room_version": "12" }))
.unwrap(),
state_key: Some("".into()),
..Default::default()
},
&alice,
None,
&bootstrap,
)
.await
.unwrap();
drop(bootstrap);
let room = RoomId::parse(create_id.as_str().replacen('$', "!", 1)).unwrap();
let lock = services.rooms.state.mutex.lock(&room).await;
services
.rooms
.timeline
.build_and_append_pdu(
PartialPdu::state(
alice.to_string(),
&RoomMemberEventContent::new(MembershipState::Join),
),
&alice,
Some(&room),
&lock,
)
.await
.unwrap();
let rules_id = services
.rooms
.timeline
.build_and_append_pdu(
PartialPdu::state("", &RoomJoinRulesEventContent::new(JoinRule::Public)),
&alice,
Some(&room),
&lock,
)
.await
.unwrap();
drop(lock);
let rules = services.rooms.timeline.get_pdu(&rules_id).await.unwrap();
let (dave_join, json) = signed_remote_event(
json!({
"room_id": room, "sender": dave, "type": "m.room.member", "state_key": dave,
"content": { "membership": "join" }, "auth_events": [rules_id], "prev_events": [rules_id],
"depth": rules.depth + ruma::uint!(1), "origin_server_ts": conduwuit::utils::millis_since_unix_epoch(),
}),
dave.server_name(),
&remote_keys[2],
);
assert!(
services
.rooms
.event_handler
.handle_incoming_pdu(dave.server_name(), &room, &dave_join.event_id, json, false)
.await
.unwrap()
.is_some()
);
let mut joins = Vec::new();
for (user, key) in [&bob, &charlie].into_iter().zip(&remote_keys) {
let signed = signed_remote_event(
json!({
"room_id": room, "sender": user, "type": "m.room.member", "state_key": user,
"content": { "membership": "join" }, "auth_events": [rules_id], "prev_events": [dave_join.event_id],
"depth": dave_join.depth + ruma::uint!(1), "origin_server_ts": conduwuit::utils::millis_since_unix_epoch(),
}),
user.server_name(),
key,
);
joins.push(signed);
}
for ((pdu, json), user) in joins.iter().zip([&bob, &charlie]) {
let accepted = services
.rooms
.event_handler
.handle_incoming_pdu(user.server_name(), &room, &pdu.event_id, json.clone(), false)
.await
.unwrap();
assert!(accepted.is_some());
}
let bob_hash = services
.rooms
.state_accessor
.pdu_shortstatehash(&joins[0].0.event_id)
.await
.unwrap();
let charlie_hash = services
.rooms
.state_accessor
.pdu_shortstatehash(&joins[1].0.event_id)
.await
.unwrap();
assert_eq!(bob_hash, charlie_hash);
let (merge, json) = signed_remote_event(
json!({
"room_id": room, "sender": dave, "type": "m.room.message",
"content": { "msgtype": "m.text", "body": "merge" },
"auth_events": [dave_join.event_id],
"prev_events": [joins[0].0.event_id, joins[1].0.event_id],
"depth": joins[0].0.depth + ruma::uint!(1),
"origin_server_ts": conduwuit::utils::millis_since_unix_epoch(),
}),
dave.server_name(),
&remote_keys[2],
);
assert!(
services
.rooms
.event_handler
.handle_incoming_pdu(dave.server_name(), &room, &merge.event_id, json, false)
.await
.unwrap()
.is_some()
);
let mut results = Vec::new();
for ((user, key), (join, _)) in [&bob, &charlie].into_iter().zip(&remote_keys).zip(&joins) {
let membership = services
.rooms
.state_accessor
.room_state_get_content::<RoomMemberEventContent>(
&room,
&StateEventType::RoomMember,
user.as_str(),
)
.await
.unwrap();
assert_eq!(membership.membership, MembershipState::Join);
let prev_events = services
.rooms
.state
.get_forward_extremities(&room)
.collect::<Vec<_>>()
.await;
let depth = services
.rooms
.timeline
.get_pdu(&prev_events[0])
.await
.unwrap()
.depth
+ ruma::uint!(1);
let (message, json) = signed_remote_event(
json!({
"room_id": room, "sender": user, "type": "m.room.message",
"content": { "msgtype": "m.text", "body": format!("message from {user}") },
"auth_events": [join.event_id], "prev_events": prev_events,
"depth": depth, "origin_server_ts": conduwuit::utils::millis_since_unix_epoch(),
}),
user.server_name(),
key,
);
let result = services
.rooms
.event_handler
.handle_incoming_pdu(user.server_name(), &room, &message.event_id, json, false)
.await;
results.push(result.is_ok_and(|pdu| pdu.is_some()));
}
services.stop().await;
drop(services);
std::fs::remove_dir_all(path).unwrap();
assert_eq!(results, [true, true], "both joined users must be able to send messages");
}
async fn test_services() -> (Arc<crate::Services>, std::path::PathBuf) {
let _ = rustls::crypto::ring::default_provider().install_default();
let path = std::env::temp_dir()
.join(format!("continuwuity-shared-state-{:016x}", rand::random::<u64>()));
std::fs::create_dir(&path).unwrap();
let config: Config = serde_json::from_value(json!({
"server_name": "test.example",
"database_path": path,
"db_cache_capacity_mb": 16.0,
"rocksdb_write_buffer_capacity_mb": 4.0,
"allow_local_presence": false
}))
.unwrap();
let runtime = tokio::runtime::Handle::current();
let server = Arc::new(Server::new(
config,
Some(runtime.clone()),
Log {
reload: Default::default(),
capture: Default::default(),
},
Metrics::new(Some(runtime), opentelemetry::global::meter("test"), None),
));
let services = crate::Services::build(server).await.unwrap();
(services, path)
}
fn cache_key(
services: &crate::Services,
server: &ruma::ServerName,
key: &ruma::signatures::Ed25519KeyPair,
) {
let mut response = ruma::api::federation::discovery::ServerSigningKeys::new(
server.to_owned(),
crate::server_keys::in_one_week(),
);
let id: ruma::OwnedServerSigningKeyId =
format!("ed25519:{}", key.version()).try_into().unwrap();
response.verify_keys.insert(
id.clone(),
ruma::api::federation::discovery::VerifyKey::new(ruma::serde::Base64::new(
key.public_key().to_vec(),
)),
);
services.db["servernamekeyid_response"]
.put((server.as_str(), id.as_str()), database::Json(&response));
}
fn signed_remote_event(
value: serde_json::Value,
server: &ruma::ServerName,
key: &ruma::signatures::Ed25519KeyPair,
) -> (PduEvent, ruma::CanonicalJsonObject) {
let rules = RoomVersionId::V12.rules().unwrap();
let mut value = serde_json::from_value(value).unwrap();
ruma::signatures::hash_and_sign_event(server.as_str(), key, &mut value, &rules.redaction)
.unwrap();
let id = conduwuit::matrix::event::gen_event_id(&value, &rules).unwrap();
let pdu = PduEvent::from_id_val(&id, value.clone()).unwrap();
(pdu, value)
}
-1
View File
@@ -617,7 +617,6 @@ impl Service {
let auth_check = state_res::event_auth::auth_check( let auth_check = state_res::event_auth::auth_check(
&room_version.rules().unwrap(), &room_version.rules().unwrap(),
&parsed_join_pdu, &parsed_join_pdu,
None, // TODO: third party invite
|k, s| state_fetch(k.clone(), s.into()), |k, s| state_fetch(k.clone(), s.into()),
&create_event, &create_event,
) )
@@ -1,14 +1,16 @@
use conduwuit::{Event, PduEvent, Result, err}; use conduwuit::{
Event, PduEvent, Result, err,
matrix::{PduCount, event::relation_type},
utils::ReadyExt,
};
use ruma::{ use ruma::{
UserId, UserId,
api::Direction, api::Direction,
events::relation::{BundledMessageLikeRelations, BundledReference, ReferenceChunk}, events::relation::{
BundledMessageLikeRelations, BundledReference, ReferenceChunk, RelationType,
},
}; };
use crate::rooms::timeline::PdusIterItem;
const MAX_BUNDLED_RELATIONS: usize = 50;
impl super::Service { impl super::Service {
/// Gets bundled aggregations for an event according to the Matrix /// Gets bundled aggregations for an event according to the Matrix
/// specification. /// specification.
@@ -26,52 +28,24 @@ impl super::Service {
return Ok(None); return Ok(None);
} }
let relations = self let Some((room_id, target)) = self
.get_relations( .relation_target(&pdu.room_id_or_hash(), pdu.event_id())
user_id, .await
&pdu.room_id_or_hash(), else {
pdu.event_id(), return Ok(None);
conduwuit::PduCount::max(), };
MAX_BUNDLED_RELATIONS,
0, let mut replace_events = Vec::new();
Direction::Backward, let mut reference_events = Vec::new();
) self.db
.get_relations(room_id, target, PduCount::max(), Direction::Backward)
.ready_for_each(|(_, relation)| match relation_type(&relation) {
| Some(RelationType::Replacement) => replace_events.push(relation),
| Some(RelationType::Reference) => reference_events.push(relation),
| _ => {},
})
.await; .await;
// The relations database code still handles the basic unsigned data
// We don't want to recursively fetch relations
if relations.is_empty() {
return Ok(None);
}
// Partition relations by type
let (replace_events, reference_events): (Vec<_>, Vec<_>) = relations
.iter()
.filter_map(|relation| {
let pdu = &relation.1;
let content = pdu.get_content_as_value();
content
.get("m.relates_to")
.and_then(|relates_to| relates_to.get("rel_type"))
.and_then(|rel_type| rel_type.as_str())
.and_then(|rel_type_str| match rel_type_str {
| "m.replace" => Some(RelationType::Replace(relation)),
| "m.reference" => Some(RelationType::Reference(relation)),
| _ => None, /* Ignore other relation types (threads are in DB but not
* handled here) */
})
})
.fold((Vec::new(), Vec::new()), |(mut replaces, mut references), rel_type| {
match rel_type {
| RelationType::Replace(r) => replaces.push(r),
| RelationType::Reference(r) => references.push(r),
}
(replaces, references)
});
// If no relations to bundle, return None
if replace_events.is_empty() && reference_events.is_empty() { if replace_events.is_empty() && reference_events.is_empty() {
return Ok(None); return Ok(None);
} }
@@ -85,7 +59,9 @@ impl super::Service {
.find_most_recent_valid_replacement(user_id, pdu, &replace_events) .find_most_recent_valid_replacement(user_id, pdu, &replace_events)
.await? .await?
{ {
bundled.replace = Some(Self::serialize_replacement(replacement)?); bundled.replace = Some(Self::serialize_replacement(
&self.with_unsigned(user_id, replacement.clone()).await,
)?);
} }
} }
@@ -93,7 +69,7 @@ impl super::Service {
if !reference_events.is_empty() { if !reference_events.is_empty() {
let reference_chunk: Vec<_> = reference_events let reference_chunk: Vec<_> = reference_events
.into_iter() .into_iter()
.map(|relation| BundledReference::new(relation.1.event_id().to_owned())) .map(|relation| BundledReference::new(relation.event_id().to_owned()))
.collect(); .collect();
if !reference_chunk.is_empty() { if !reference_chunk.is_empty() {
@@ -123,14 +99,12 @@ impl super::Service {
&self, &self,
user_id: &UserId, user_id: &UserId,
original_event: &PduEvent, original_event: &PduEvent,
replacement_events: &[&'a PdusIterItem], replacement_events: &'a [PduEvent],
) -> Result<Option<&'a PduEvent>> { ) -> Result<Option<&'a PduEvent>> {
// Filter valid replacements and find the maximum in a single pass // Filter valid replacements and find the maximum in a single pass
let mut result: Option<&PduEvent> = None; let mut result: Option<&PduEvent> = None;
for relation in replacement_events { for pdu in replacement_events {
let pdu = &relation.1;
// Validate replacement // Validate replacement
if !Self::is_valid_replacement_event(original_event, pdu).await? { if !Self::is_valid_replacement_event(original_event, pdu).await? {
continue; continue;
@@ -245,12 +219,7 @@ impl super::Service {
/// Check if an event is itself a replacement /// Check if an event is itself a replacement
#[inline] #[inline]
fn is_replacement_event(event: &PduEvent) -> bool { fn is_replacement_event(event: &PduEvent) -> bool {
event relation_type(event) == Some(RelationType::Replacement)
.get_content_as_value()
.get("m.relates_to")
.and_then(|relates_to| relates_to.get("rel_type"))
.and_then(|rel_type| rel_type.as_str())
.is_some_and(|rel_type| rel_type == "m.replace")
} }
/// Check if event has m.new_content or is encrypted (where m.new_content /// Check if event has m.new_content or is encrypted (where m.new_content
@@ -262,12 +231,6 @@ impl super::Service {
} }
} }
/// Helper enum for partitioning relations
enum RelationType<'a> {
Replace(&'a PdusIterItem),
Reference(&'a PdusIterItem),
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use conduwuit_core::pdu::{EventHash, PduEvent}; use conduwuit_core::pdu::{EventHash, PduEvent};
+56 -43
View File
@@ -2,8 +2,7 @@ use std::{mem::size_of, sync::Arc};
use conduwuit::{ use conduwuit::{
arrayvec::ArrayVec, arrayvec::ArrayVec,
matrix::PduCount, matrix::{PduCount, PduEvent},
result::LogErr,
utils::{ utils::{
ReadyExt, ReadyExt,
stream::{TryIgnore, WidebandExt}, stream::{TryIgnore, WidebandExt},
@@ -12,14 +11,14 @@ use conduwuit::{
}; };
use database::Map; use database::Map;
use futures::{Stream, StreamExt}; use futures::{Stream, StreamExt};
use ruma::{EventId, UserId, api::Direction}; use ruma::{EventId, RoomId, api::Direction};
use crate::{ use crate::{
Dep, Dep,
rooms::{ rooms::{
self, self,
short::{ShortEventId, ShortRoomId}, short::ShortRoomId,
timeline::{PduId, PdusIterItem, RawPduId}, timeline::{PduId, RawPduId},
}, },
}; };
@@ -27,6 +26,7 @@ pub(super) struct Data {
tofrom_relation: Arc<Map>, tofrom_relation: Arc<Map>,
softfailedeventids: Arc<Map>, softfailedeventids: Arc<Map>,
rejectedeventids: Arc<Map>, rejectedeventids: Arc<Map>,
referencedevents: Arc<Map>,
services: Services, services: Services,
} }
@@ -41,6 +41,7 @@ impl Data {
tofrom_relation: db["tofrom_relation"].clone(), tofrom_relation: db["tofrom_relation"].clone(),
softfailedeventids: db["softfailedeventids"].clone(), softfailedeventids: db["softfailedeventids"].clone(),
rejectedeventids: db["rejectedeventids"].clone(), rejectedeventids: db["rejectedeventids"].clone(),
referencedevents: db["referencedevents"].clone(),
services: Services { services: Services {
timeline: args.depend::<rooms::timeline::Service>("rooms::timeline"), timeline: args.depend::<rooms::timeline::Service>("rooms::timeline"),
}, },
@@ -54,54 +55,54 @@ impl Data {
self.tofrom_relation.aput_raw::<BUFSIZE, _, _>(key, []); self.tofrom_relation.aput_raw::<BUFSIZE, _, _>(key, []);
} }
pub(super) fn get_relations<'a>( pub(super) fn get_relations(
&'a self, &self,
user_id: &'a UserId,
shortroomid: ShortRoomId, shortroomid: ShortRoomId,
target: ShortEventId, target: u64,
from: PduCount, from: PduCount,
dir: Direction, dir: Direction,
) -> impl Stream<Item = PdusIterItem> + Send + 'a { ) -> impl Stream<Item = (u64, PduEvent)> + Send + '_ {
// Query from exact position then filter excludes it (saturating_inc self.relation_counts(target, from, dir)
// could skip events at min/max boundaries) .wide_filter_map(move |count| self.get_relation_pdu(shortroomid, count))
let from_unsigned = from.into_unsigned(); }
let mut current = ArrayVec::<u8, 16>::new();
current.extend(target.to_be_bytes()); /// The counts of the direct relations of `target`, in the order of `dir`,
current.extend(from_unsigned.to_be_bytes()); /// starting after `from`.
let current = current.as_slice(); pub(super) fn relation_counts(
&self,
target: u64,
from: PduCount,
dir: Direction,
) -> impl Stream<Item = u64> + Send + '_ {
let start_count = match from {
| PduCount::Normal(count) => count,
| PduCount::Backfilled(_) => 0,
};
let mut start = ArrayVec::<u8, 16>::new();
start.extend(target.to_be_bytes());
start.extend(start_count.to_be_bytes());
let start = start.as_slice();
match dir { match dir {
| Direction::Forward => self.tofrom_relation.raw_keys_from(current).boxed(), | Direction::Forward => self.tofrom_relation.raw_keys_from(start).boxed(),
| Direction::Backward => self.tofrom_relation.rev_raw_keys_from(current).boxed(), | Direction::Backward => self.tofrom_relation.rev_raw_keys_from(start).boxed(),
} }
.ignore_err() .ignore_err()
.ready_take_while(move |key| key.starts_with(&target.to_be_bytes())) .ready_take_while(move |key| key.starts_with(&target.to_be_bytes()))
.map(|to_from| u64_from_u8(&to_from[8..16])) .map(|to_from| u64_from_u8(&to_from[8..16]))
.map(PduCount::from_unsigned) // The scan includes `from` itself, which should be skipped
.ready_filter(move |count| { .ready_filter(move |&count| PduCount::Normal(count).is_after(from, dir))
if from == PduCount::min() || from == PduCount::max() { }
true
} else {
let count_unsigned = count.into_unsigned();
match dir {
| Direction::Forward => count_unsigned > from_unsigned,
| Direction::Backward => count_unsigned < from_unsigned,
}
}
})
.wide_filter_map(move |shorteventid| async move {
let pdu_id: RawPduId = PduId { shortroomid, shorteventid }.into();
let mut pdu = self.services.timeline.get_pdu_from_id(&pdu_id).await.ok()?; pub(super) async fn get_relation_pdu(
&self,
shortroomid: ShortRoomId,
count: u64,
) -> Option<(u64, PduEvent)> {
let shorteventid = PduCount::Normal(count);
let pdu_id: RawPduId = PduId { shortroomid, shorteventid }.into();
let pdu = self.services.timeline.get_pdu_from_id(&pdu_id).await.ok()?;
let ctx = self Some((count, pdu))
.services
.timeline
.get_unsigned_context(&pdu, Some(user_id))
.await;
pdu.set_unsigned(Some(ctx)).log_err().ok();
Some((shorteventid, pdu))
})
} }
pub(super) fn mark_event_soft_failed(&self, event_id: &EventId) { pub(super) fn mark_event_soft_failed(&self, event_id: &EventId) {
@@ -133,4 +134,16 @@ impl Data {
self.unmark_event_rejected(event_id); self.unmark_event_rejected(event_id);
self.unmark_event_soft_failed(event_id); self.unmark_event_soft_failed(event_id);
} }
#[inline]
pub(super) fn mark_as_referenced(&self, room_id: &RoomId, event_id: &EventId) {
let key = (room_id, event_id);
self.referencedevents.put_raw(key, []);
}
#[inline]
pub(super) async fn is_event_referenced(&self, room_id: &RoomId, event_id: &EventId) -> bool {
let key = (room_id, event_id);
self.referencedevents.qry(&key).await.is_ok()
}
} }
+128 -44
View File
@@ -1,15 +1,20 @@
mod bundled_aggregations; mod bundled_aggregations;
mod data; mod data;
use std::sync::Arc; use std::{collections::HashSet, sync::Arc};
use conduwuit::{Result, matrix::PduCount}; use conduwuit::{
use futures::{StreamExt, future::try_join}; Result,
matrix::{PduCount, PduEvent},
result::LogErr,
utils::{IterStream, ReadyExt, stream::WidebandExt},
};
use futures::{Stream, StreamExt, future::try_join};
use ruma::{EventId, RoomId, UserId, api::Direction}; use ruma::{EventId, RoomId, UserId, api::Direction};
use self::data::Data; use self::data::Data;
use crate::{ use crate::{
Dep, Dep,
rooms::{self, timeline::PdusIterItem}, rooms::{self, short::ShortRoomId, timeline::PdusIterItem},
}; };
pub struct Service { pub struct Service {
@@ -51,7 +56,7 @@ impl Service {
} }
#[allow(clippy::too_many_arguments)] #[allow(clippy::too_many_arguments)]
pub async fn get_relations<'a>( pub async fn get_relations<'a, F>(
&'a self, &'a self,
user_id: &'a UserId, user_id: &'a UserId,
room_id: &'a RoomId, room_id: &'a RoomId,
@@ -60,59 +65,130 @@ impl Service {
limit: usize, limit: usize,
max_depth: u8, max_depth: u8,
dir: Direction, dir: Direction,
) -> Vec<PdusIterItem> { matches: F,
let room_id = self.services.short.get_shortroomid(room_id); ) -> Vec<PdusIterItem>
where
let target = self.services.timeline.get_pdu_count(target); F: Fn(&PduEvent) -> bool + Send + Sync,
{
let Ok((room_id, target)) = try_join(room_id, target).await else { let Some((room_id, target)) = self.relation_target(room_id, target).await else {
return Vec::new(); return Vec::new();
}; };
let target = match target { // Direct relations are already in order
| PduCount::Normal(c) => c, if max_depth == 0 {
// TODO: Support backfilled relations let counts = self.db.relation_counts(target, from, dir);
| _ => 0, // This will result in an empty iterator return self
.load_relations(user_id, room_id, counts, limit, &matches)
.await;
}
let scan_from = match dir {
| Direction::Forward => PduCount::min(),
| Direction::Backward => from,
}; };
let mut pdus: Vec<_> = self // An event can relate to two others in the tree, like a thread reply
// that also replies to another reply in the thread, so it's only kept
// and looked through the first time it's found
let mut seen = HashSet::new();
let mut counts = Vec::new();
let mut level: Vec<_> = self
.db .db
.get_relations(user_id, room_id, target, from, dir) .relation_counts(target, scan_from, dir)
.collect() .collect()
.await; .await;
seen.extend(level.iter().copied());
for _ in 0..max_depth {
if level.is_empty() {
break;
}
let mut stack: Vec<_> = pdus let next: Vec<Vec<_>> = level
.iter() .iter()
.filter(|_| max_depth > 0) .copied()
.map(|pdu| (pdu.clone(), 1)) .stream()
.collect(); .wide_then(|target| {
self.db
'limit: while let Some(stack_pdu) = stack.pop() { .relation_counts(target, scan_from, dir)
let target = match stack_pdu.0.0 { .collect::<Vec<_>>()
| PduCount::Normal(c) => c, })
// TODO: Support backfilled relations
| PduCount::Backfilled(_) => 0, // This will result in an empty iterator
};
let relations: Vec<_> = self
.db
.get_relations(user_id, room_id, target, from, dir)
.collect() .collect()
.await; .await;
for relation in relations { counts.append(&mut level);
if stack_pdu.1 < max_depth { level = next
stack.push((relation.clone(), stack_pdu.1.saturating_add(1))); .into_iter()
} .flatten()
.filter(|&count| seen.insert(count))
pdus.push(relation); .collect();
if pdus.len() >= limit {
break 'limit;
}
}
} }
counts.append(&mut level);
pdus counts.retain(|&count| PduCount::Normal(count).is_after(from, dir));
counts.sort_unstable_by(|a, b| match dir {
| Direction::Forward => a.cmp(b),
| Direction::Backward => b.cmp(a),
});
self.load_relations(user_id, room_id, counts.into_iter().stream(), limit, &matches)
.await
}
/// Loads the pdus of relations in the order of `counts`
async fn load_relations<S, F>(
&self,
user_id: &UserId,
room_id: ShortRoomId,
counts: S,
limit: usize,
matches: &F,
) -> Vec<PdusIterItem>
where
S: Stream<Item = u64> + Send,
F: Fn(&PduEvent) -> bool + Send + Sync,
{
counts
.wide_filter_map(|count| self.db.get_relation_pdu(room_id, count))
.ready_filter(|(_, pdu)| matches(pdu))
.take(limit)
.wide_then(|relation| self.finish_relation(user_id, relation))
.collect()
.await
}
/// The short room ID and count of `target`
async fn relation_target(
&self,
room_id: &RoomId,
target: &EventId,
) -> Option<(ShortRoomId, u64)> {
let room_id = self.services.short.get_shortroomid(room_id);
let target = self.services.timeline.get_pdu_count(target);
match try_join(room_id, target).await {
| Ok((room_id, PduCount::Normal(target))) => Some((room_id, target)),
// TODO: Support backfilled relations
| _ => None,
}
}
async fn finish_relation(
&self,
user_id: &UserId,
(count, pdu): (u64, PduEvent),
) -> PdusIterItem {
(PduCount::Normal(count), self.with_unsigned(user_id, pdu).await)
}
async fn with_unsigned(&self, user_id: &UserId, mut pdu: PduEvent) -> PduEvent {
let ctx = self
.services
.timeline
.get_unsigned_context(&pdu, Some(user_id))
.await;
pdu.set_unsigned(Some(ctx)).log_err().ok();
pdu
} }
#[inline] #[inline]
@@ -131,6 +207,14 @@ impl Service {
self.db.is_event_rejected(event_id).await self.db.is_event_rejected(event_id).await
} }
pub async fn is_event_referenced(&self, room_id: &RoomId, event_id: &EventId) -> bool {
self.db.is_event_referenced(room_id, event_id).await
}
pub fn mark_as_referenced(&self, room_id: &RoomId, event_id: &EventId) {
self.db.mark_as_referenced(room_id, event_id);
}
pub fn mark_event_rejected(&self, event_id: &EventId) { pub fn mark_event_rejected(&self, event_id: &EventId) {
self.db.mark_event_rejected(event_id); self.db.mark_event_rejected(event_id);
} }
+65 -9
View File
@@ -8,7 +8,10 @@ use database::{Deserialized, Json, Map};
use futures::{Stream, StreamExt}; use futures::{Stream, StreamExt};
use ruma::{ use ruma::{
CanonicalJsonObject, OwnedRoomId, OwnedUserId, RoomId, UserId, CanonicalJsonObject, OwnedRoomId, OwnedUserId, RoomId, UserId,
events::{AnySyncEphemeralRoomEvent, receipt::ReceiptEvent}, events::{
AnySyncEphemeralRoomEvent,
receipt::{ReceiptEvent, ReceiptType},
},
serde::Raw, serde::Raw,
}; };
@@ -45,20 +48,57 @@ impl Data {
user_id: &UserId, user_id: &UserId,
room_id: &RoomId, room_id: &RoomId,
event: &ReceiptEvent, event: &ReceiptEvent,
) { ) -> bool {
// Remove old entry let Some((new_event, new_receipt)) =
event.content.user_receipt(user_id, ReceiptType::Read)
else {
return false;
};
// Find old entries for this user in this room
let last_possible_key = (room_id, u64::MAX); let last_possible_key = (room_id, u64::MAX);
let mut old_entries = Vec::new();
self.readreceiptid_readreceipt self.readreceiptid_readreceipt
.rev_keys_from_raw(&last_possible_key) .rev_stream_from_raw(&last_possible_key)
.ignore_err() .ignore_err()
.ready_take_while(|key| key.starts_with(room_id.as_bytes())) .ready_take_while(|(key, _)| key.starts_with(room_id.as_bytes()))
.ready_filter_map(|key| key.ends_with(user_id.as_bytes()).then_some(key)) .ready_filter_map(|(key, val)| {
.ready_for_each(|key| self.readreceiptid_readreceipt.del(key)) key.ends_with(user_id.as_bytes())
.then(|| (key.to_vec(), serde_json::from_slice::<ReceiptEvent>(val).ok()))
})
.ready_for_each(|entry| old_entries.push(entry))
.await; .await;
let mut to_del = Vec::new();
for (key, existing) in old_entries {
let Some(existing) = existing else {
to_del.push(key);
continue;
};
let Some((old_event, old_receipt)) =
existing.content.user_receipt(user_id, ReceiptType::Read)
else {
to_del.push(key);
continue;
};
if old_receipt.thread == new_receipt.thread {
if old_event == new_event {
return false;
}
to_del.push(key);
}
}
for key in to_del {
self.readreceiptid_readreceipt.del(&key);
}
let count = self.services.globals.next_count().unwrap(); let count = self.services.globals.next_count().unwrap();
let latest_id = (room_id, count, user_id); let latest_id = (room_id, count, user_id);
self.readreceiptid_readreceipt.put(latest_id, Json(event)); self.readreceiptid_readreceipt.put(latest_id, Json(event));
true
} }
pub(super) fn readreceipts_since<'a>( pub(super) fn readreceipts_since<'a>(
@@ -86,12 +126,28 @@ impl Data {
.ignore_err() .ignore_err()
} }
pub(super) fn private_read_set(&self, room_id: &RoomId, user_id: &UserId, pdu_count: u64) { pub(super) async fn private_read_set(
&self,
room_id: &RoomId,
user_id: &UserId,
pdu_count: u64,
) -> bool {
let key = (room_id, user_id); let key = (room_id, user_id);
let next_count = self.services.globals.next_count().unwrap(); if let Ok(current) = self
.roomuserid_privateread
.qry(&key)
.await
.deserialized::<u64>()
{
if current == pdu_count {
return false;
}
}
let next_count = self.services.globals.next_count().unwrap();
self.roomuserid_privateread.put(key, pdu_count); self.roomuserid_privateread.put(key, pdu_count);
self.roomuserid_lastprivatereadupdate.put(key, next_count); self.roomuserid_lastprivatereadupdate.put(key, next_count);
true
} }
pub(super) async fn private_read_get_count( pub(super) async fn private_read_get_count(
+59 -5
View File
@@ -65,7 +65,10 @@ impl Service {
room_id: &RoomId, room_id: &RoomId,
event: ReceiptEvent, event: ReceiptEvent,
) { ) {
self.db.readreceipt_update(user_id, room_id, &event).await; if !self.db.readreceipt_update(user_id, room_id, &event).await {
return;
}
self.services.sync.wake_all_joined(room_id).await; self.services.sync.wake_all_joined(room_id).await;
// update appservices // update appservices
let edu = EphemeralData::Receipt(event); let edu = EphemeralData::Receipt(event);
@@ -93,7 +96,7 @@ impl Service {
}); });
let (pdu_count, shortroomid) = try_join!(pdu_count, shortroomid)?; let (pdu_count, shortroomid) = try_join!(pdu_count, shortroomid)?;
let shorteventid = PduCount::Normal(pdu_count); let shorteventid = PduCount::from_unsigned(pdu_count);
let pdu_id: RawPduId = PduId { shortroomid, shorteventid }.into(); let pdu_id: RawPduId = PduId { shortroomid, shorteventid }.into();
let pdu = self.services.timeline.get_pdu_from_id(&pdu_id).await?; let pdu = self.services.timeline.get_pdu_from_id(&pdu_id).await?;
@@ -101,8 +104,7 @@ impl Service {
let user_id: OwnedUserId = user_id.to_owned(); let user_id: OwnedUserId = user_id.to_owned();
let mut receipt = ruma::events::receipt::Receipt::default(); let mut receipt = ruma::events::receipt::Receipt::default();
// TODO: start storing the timestamp so we can return one receipt.ts = Some(pdu.origin_server_ts());
receipt.ts = None;
receipt.thread = ruma::events::receipt::ReceiptThread::Unthreaded; receipt.thread = ruma::events::receipt::ReceiptThread::Unthreaded;
let content: BTreeMap<OwnedEventId, Receipts> = BTreeMap::from_iter([( let content: BTreeMap<OwnedEventId, Receipts> = BTreeMap::from_iter([(
@@ -143,7 +145,9 @@ impl Service {
event_id: &EventId, event_id: &EventId,
count: u64, count: u64,
) { ) {
self.db.private_read_set(room_id, user_id, count); if !self.db.private_read_set(room_id, user_id, count).await {
return;
}
// update appservices matching the user's namespace (MSC2409) // update appservices matching the user's namespace (MSC2409)
let receipt_content = [( let receipt_content = [(
@@ -267,4 +271,54 @@ mod tests {
assert!(users.contains_key(user_id!("@alice:example.org"))); assert!(users.contains_key(user_id!("@alice:example.org")));
assert!(users.contains_key(user_id!("@bob:example.org"))); assert!(users.contains_key(user_id!("@bob:example.org")));
} }
#[test]
fn pack_receipts_merges_threaded_and_private_receipts() {
let event_a: OwnedEventId = "$event_a:example.org".try_into().expect("valid event ID");
let event_b: OwnedEventId = "$event_b:example.org".try_into().expect("valid event ID");
let mut public_threaded_receipt = Receipt::default();
public_threaded_receipt.thread = ruma::events::receipt::ReceiptThread::Main;
let r1_content = ReceiptEventContent::from_iter([(
event_a.clone(),
BTreeMap::from([(
ReceiptType::Read,
BTreeMap::from([(
user_id!("@alice:example.org").to_owned(),
public_threaded_receipt,
)]),
)]),
)]);
let r1: Raw<AnySyncEphemeralRoomEvent> = Raw::from_json(
serde_json::value::to_raw_value(&SyncEphemeralRoomEvent::new(r1_content)).unwrap(),
);
let mut private_receipt = Receipt::default();
private_receipt.thread = ruma::events::receipt::ReceiptThread::Unthreaded;
let r2_content = ReceiptEventContent::from_iter([(
event_b.clone(),
BTreeMap::from([(
ReceiptType::ReadPrivate,
BTreeMap::from([(user_id!("@alice:example.org").to_owned(), private_receipt)]),
)]),
)]);
let r2: Raw<AnySyncEphemeralRoomEvent> = Raw::from_json(
serde_json::value::to_raw_value(&SyncEphemeralRoomEvent::new(r2_content)).unwrap(),
);
let packed = pack_receipts([r1, r2].into_iter());
let packed: SyncEphemeralRoomEvent<ReceiptEventContent> =
serde_json::from_str(packed.json().get()).expect("packed receipt is valid");
assert_eq!(
packed.content[&event_a][&ReceiptType::Read][user_id!("@alice:example.org")].thread,
ruma::events::receipt::ReceiptThread::Main
);
assert_eq!(
packed.content[&event_b][&ReceiptType::ReadPrivate][user_id!("@alice:example.org")]
.thread,
ruma::events::receipt::ReceiptThread::Unthreaded
);
}
} }
+12 -4
View File
@@ -77,12 +77,20 @@ impl super::Service {
room_id: &RoomId, room_id: &RoomId,
event_id: &EventId, event_id: &EventId,
) -> bool { ) -> bool {
let Ok(shortstatehash) = self.pdu_shortstatehash(event_id).await else {
return true;
};
let currently_member = self.services.state_cache.is_joined(user_id, room_id).await; let currently_member = self.services.state_cache.is_joined(user_id, room_id).await;
let Ok(shortstatehash) = self.pdu_shortstatehash(event_id).await else {
// We haven't calculated the state at this event, so we can't
// properly history visibility check it. This happens for outliers
// and backfilled events. Since continuwuity is primarily targeting
// single-user/trusted deployments, an acceptable compromise for now
// is to ensure that the user is currently joined to the room.
// Federation fails closed here, but if that was replicated for the
// check used for client-server, nobody would be allowed to see
// events before their server started participating in the room.
return currently_member;
};
let history_visibility = self let history_visibility = self
.state_get_content(shortstatehash, &StateEventType::RoomHistoryVisibility, "") .state_get_content(shortstatehash, &StateEventType::RoomHistoryVisibility, "")
.await .await
+115 -34
View File
@@ -3,7 +3,10 @@ use std::{collections::BTreeMap, sync::Arc};
use conduwuit::result::LogErr; use conduwuit::result::LogErr;
use conduwuit_core::{ use conduwuit_core::{
Event, Result, err, Event, Result, err,
matrix::pdu::{PduCount, PduEvent, PduId, RawPduId}, matrix::{
event::RelationTypeEqual,
pdu::{PduCount, PduEvent, PduId, RawPduId},
},
utils::{ utils::{
ReadyExt, ReadyExt,
stream::{TryIgnore, WidebandExt}, stream::{TryIgnore, WidebandExt},
@@ -12,9 +15,14 @@ use conduwuit_core::{
use conduwuit_database::{Deserialized, Map}; use conduwuit_database::{Deserialized, Map};
use futures::{Stream, StreamExt}; use futures::{Stream, StreamExt};
use ruma::{ use ruma::{
CanonicalJsonValue, EventId, OwnedUserId, RoomId, UserId, CanonicalJsonObject, CanonicalJsonValue, EventId, OwnedUserId, RoomId, UInt, UserId,
api::client::threads::get_threads::v1::IncludeThreads, events::relation::BundledThread, api::{Direction, client::threads::get_threads::v1::IncludeThreads},
serde::Raw, uint, events::{
AnySyncMessageLikeEvent, AnySyncTimelineEvent,
relation::{BundledThread, RelationType},
},
serde::Raw,
uint,
}; };
use serde_json::json; use serde_json::json;
@@ -27,6 +35,7 @@ pub struct Service {
struct Services { struct Services {
short: Dep<rooms::short::Service>, short: Dep<rooms::short::Service>,
pdu_metadata: Dep<rooms::pdu_metadata::Service>,
timeline: Dep<rooms::timeline::Service>, timeline: Dep<rooms::timeline::Service>,
} }
@@ -42,6 +51,7 @@ impl crate::Service for Service {
}, },
services: Services { services: Services {
short: args.depend::<rooms::short::Service>("rooms::short"), short: args.depend::<rooms::short::Service>("rooms::short"),
pdu_metadata: args.depend::<rooms::pdu_metadata::Service>("rooms::pdu_metadata"),
timeline: args.depend::<rooms::timeline::Service>("rooms::timeline"), timeline: args.depend::<rooms::timeline::Service>("rooms::timeline"),
}, },
})) }))
@@ -51,6 +61,86 @@ impl crate::Service for Service {
} }
impl Service { impl Service {
/// Serializes an event for the `latest_event` of a thread's aggregation,
/// stripping `unsigned` as we don't want to send e.g. txnid to clients.
fn latest_event<E>(event: &E) -> Raw<AnySyncMessageLikeEvent>
where
E: Event,
{
let mut latest_pdu = event.clone().into_pdu();
latest_pdu.unsigned = None;
latest_pdu
.into_format::<Raw<AnySyncTimelineEvent>>()
.cast_unchecked()
}
fn set_thread(unsigned: &mut CanonicalJsonObject, thread: BundledThread) {
let content = serde_json::to_value(thread).expect("to_value always works");
unsigned.insert(
"m.relations".to_owned(),
json!({ "m.thread": content })
.try_into()
.expect("thread is valid json"),
);
}
/// Remove `event` from the aggregation of the thread matching
/// `root_event_id`
pub async fn remove_from_thread<E>(&self, root_event_id: &EventId, event: &E) -> Result
where
E: Event + Send + Sync,
{
let Ok(root_id) = self.services.timeline.get_pdu_id(root_event_id).await else {
return Ok(());
};
let mut root_pdu_json = self
.services
.timeline
.get_pdu_json_from_id(&root_id)
.await
.map_err(|e| err!(Database("Thread root pdu not found: {e:?}")))?;
let Some(CanonicalJsonValue::Object(unsigned)) = root_pdu_json.get_mut("unsigned") else {
return Ok(());
};
let thread = self
.services
.pdu_metadata
.get_relations(
event.sender(),
&event.room_id_or_hash(),
root_event_id,
PduCount::max(),
usize::MAX,
0,
Direction::Backward,
|pdu| RelationType::Thread.relation_type_equal(pdu),
)
.await;
match thread.first() {
| Some((_, latest)) => Self::set_thread(
unsigned,
BundledThread::new(
Self::latest_event(latest),
thread.len().try_into().unwrap_or(UInt::MAX),
true,
),
),
| None => {
// No events are left in the thread, or the root is backfilled
unsigned.remove("m.relations");
},
}
self.services
.timeline
.replace_pdu(&root_id, &root_pdu_json)
.await
}
pub async fn add_to_thread<E>(&self, root_event_id: &EventId, event: &E) -> Result pub async fn add_to_thread<E>(&self, root_event_id: &EventId, event: &E) -> Result
where where
E: Event + Send + Sync, E: Event + Send + Sync,
@@ -78,11 +168,20 @@ impl Service {
.await .await
.map_err(|e| err!(Request(InvalidParam("Thread root pdu not found: {e:?}"))))?; .map_err(|e| err!(Request(InvalidParam("Thread root pdu not found: {e:?}"))))?;
if let CanonicalJsonValue::Object(unsigned) = root_pdu_json // get_relations doesn't support backfilled targets, so redactions
.entry("unsigned".to_owned()) // couldn't update the aggregation of a backfilled root
.or_insert_with(|| CanonicalJsonValue::Object(BTreeMap::default())) //
// TODO: Support backfilled threads. This needs
// `src/service/rooms/pdu_metadata/mod.rs`'s
// (TODO: Relations with backfilled pdus) to be implemented,
// and then this check can be removed.
if matches!(root_id.pdu_count(), PduCount::Normal(_))
&& let CanonicalJsonValue::Object(unsigned) = root_pdu_json
.entry("unsigned".to_owned())
.or_insert_with(|| CanonicalJsonValue::Object(BTreeMap::default()))
{ {
if let Some(mut relations) = unsigned let latest_event = Self::latest_event(event);
let thread = match unsigned
.get("m.relations") .get("m.relations")
.and_then(|r| r.as_object()) .and_then(|r| r.as_object())
.and_then(|r| r.get("m.thread")) .and_then(|r| r.get("m.thread"))
@@ -90,34 +189,16 @@ impl Service {
serde_json::from_value::<BundledThread>(relations.clone().into()).ok() serde_json::from_value::<BundledThread>(relations.clone().into()).ok()
}) { }) {
// Thread already existed // Thread already existed
relations.count = relations.count.saturating_add(uint!(1)); | Some(mut thread) => {
relations.latest_event = Raw::from_json(event.content().to_owned()); thread.count = thread.count.saturating_add(uint!(1));
thread.latest_event = latest_event;
let content = serde_json::to_value(relations).expect("to_value always works"); thread
},
unsigned.insert(
"m.relations".to_owned(),
json!({ "m.thread": content })
.try_into()
.expect("thread is valid json"),
);
} else {
// New thread // New thread
let relations = BundledThread::new( | None => BundledThread::new(latest_event, uint!(1), true),
Raw::from_json(event.content().to_owned()), };
uint!(1),
true,
);
let content = serde_json::to_value(relations).expect("to_value always works"); Self::set_thread(unsigned, thread);
unsigned.insert(
"m.relations".to_owned(),
json!({ "m.thread": content })
.try_into()
.expect("thread is valid json"),
);
}
self.services self.services
.timeline .timeline
+32 -6
View File
@@ -145,9 +145,17 @@ impl super::Service {
// Note that we add it *again* as a no-op in append_pdu. This is done // Note that we add it *again* as a no-op in append_pdu. This is done
// now so that there's never a point in time where we have zero forward // now so that there's never a point in time where we have zero forward
// extremities. // extremities.
self.services let effective_room_id = incoming_pdu.room_id_or_hash();
.state if !self
.add_forward_extremity(&incoming_pdu.room_id_or_hash(), incoming_pdu.event_id()); .services
.pdu_metadata
.is_event_referenced(&effective_room_id, incoming_pdu.event_id())
.await
{
self.services
.state
.add_forward_extremity(&incoming_pdu.room_id_or_hash(), incoming_pdu.event_id());
}
let Some(room_id) = incoming_pdu.room_id() else { let Some(room_id) = incoming_pdu.room_id() else {
// If there's no room ID, this is a v12+ create event, which never // If there's no room ID, this is a v12+ create event, which never
// has any predecessors, and consequently will be the // has any predecessors, and consequently will be the
@@ -177,19 +185,37 @@ impl super::Service {
// Now we collect all the prev events of this predecessor and filter // Now we collect all the prev events of this predecessor and filter
// for ones that we 1. know, 2. are not backfilled, and 3. have // for ones that we 1. know, 2. are not backfilled, and 3. have
// rejected/soft-failed. // rejected/soft-failed.
// Additionally, drop any events that were referenced late.
let outlier_prevs = prev_event let outlier_prevs = prev_event
.prev_events() .prev_events()
.map(ToOwned::to_owned) .map(ToOwned::to_owned)
.stream() .stream()
.broad_filter_map(|prev_id| async { .broad_filter_map(|prev_id| async {
let (exists, count, is_accepted) = tokio::join!( let (exists, count, is_accepted, is_referenced) = tokio::join!(
self.pdu_exists(&prev_id), self.pdu_exists(&prev_id),
self.get_pdu_count(&prev_id) self.get_pdu_count(&prev_id)
.unwrap_or(PduCount::Backfilled(i64::MIN)), .unwrap_or(PduCount::Backfilled(i64::MIN)),
self.services.pdu_metadata.is_event_accepted(&prev_id), self.services.pdu_metadata.is_event_accepted(&prev_id),
self.services
.pdu_metadata
.is_event_referenced(room_id, &prev_id)
); );
(exists && !matches!(count, PduCount::Backfilled(_)) && !is_accepted) let is_backfilled = matches!(count, PduCount::Backfilled(_));
.then_some(prev_id) if is_referenced {
self.services
.state
.remove_forward_extremity(room_id, &prev_id);
} else {
// If we got here, that means there's now at least an
// indirect reference to the event.
self.services
.pdu_metadata
.mark_as_referenced(room_id, &prev_id);
}
if is_referenced || !exists || !is_accepted || is_backfilled {
return None;
}
Some(prev_id)
}) })
.collect::<Vec<_>>() .collect::<Vec<_>>()
.await; .await;
+4 -9
View File
@@ -256,15 +256,10 @@ impl super::Service {
| _ => create_pdu.as_ref().unwrap().as_pdu(), | _ => create_pdu.as_ref().unwrap().as_pdu(),
}; };
let auth_check = state_res::auth_check( let auth_check =
&room_version_rules, state_res::auth_check(&room_version_rules, &pdu, auth_fetch, create_event)
&pdu, .await
None, // TODO: third_party_invite .map_err(|e| err!(Request(Forbidden(warn!("Auth check failed: {e:?}")))))?;
auth_fetch,
create_event,
)
.await
.map_err(|e| err!(Request(Forbidden(warn!("Auth check failed: {e:?}")))))?;
if !auth_check { if !auth_check {
return Err!(Request(Forbidden("Event is not authorized."))); return Err!(Request(Forbidden("Event is not authorized.")));
+25 -3
View File
@@ -2,10 +2,11 @@ use conduwuit_core::{
Result, err, Result, err,
matrix::event::Event, matrix::event::Event,
utils::{self}, utils::{self},
warn,
}; };
use ruma::EventId; use ruma::{EventId, events::room::encrypted::Relation};
use super::ExtractBody; use super::{ExtractBody, ExtractRelatesTo};
use crate::rooms::short::ShortRoomId; use crate::rooms::short::ShortRoomId;
impl super::Service { impl super::Service {
@@ -31,6 +32,12 @@ impl super::Service {
err!(Database(error!(?pdu_id, %event_id, ?e, "PDU ID points to invalid PDU."))) err!(Database(error!(?pdu_id, %event_id, ?e, "PDU ID points to invalid PDU.")))
})?; })?;
let thread_root = match pdu.get_content::<ExtractRelatesTo>() {
| Ok(ExtractRelatesTo { relates_to: Relation::Thread(thread) }) =>
Some(thread.event_id),
| _ => None,
};
if let Ok(content) = pdu.get_content::<ExtractBody>() { if let Ok(content) = pdu.get_content::<ExtractBody>() {
if let Some(body) = content.body { if let Some(body) = content.body {
self.services self.services
@@ -51,6 +58,21 @@ impl super::Service {
err!(Database(error!(%event_id, ?e, "Failed to convert PDU to canonical JSON"))) err!(Database(error!(%event_id, ?e, "Failed to convert PDU to canonical JSON")))
})?; })?;
self.replace_pdu(&pdu_id, &obj).await self.replace_pdu(&pdu_id, &obj).await?;
// So the thread's root doesn't keep the original content in its
// `latest_event` aggregation
if let Some(thread_root) = thread_root {
self.services
.threads
.remove_from_thread(&thread_root, &pdu)
.await
.inspect_err(|e| {
warn!("Failed to remove redacted event from thread {thread_root}: {e:?}");
})
.ok();
}
Ok(())
} }
} }
+25 -22
View File
@@ -579,21 +579,21 @@ impl Service {
since: (u64, u64), since: (u64, u64),
max_edu_count: &AtomicU64, max_edu_count: &AtomicU64,
) -> Option<EduBuf> { ) -> Option<EduBuf> {
let mut num = 0; let num = AtomicUsize::new(0);
let receipts: BTreeMap<OwnedRoomId, ReceiptMap> = self let receipts: BTreeMap<OwnedRoomId, ReceiptMap> = self
.services .services
.state_cache .state_cache
.server_rooms(server_name) .server_rooms(server_name)
.broad_filter_map(|room_id| async move { .broad_filter_map(|room_id| async {
if num.load(Ordering::Relaxed) >= SELECT_RECEIPT_LIMIT {
return None;
}
let receipt_map = self let receipt_map = self
.select_edus_receipts_room(&room_id, since, max_edu_count, &mut num) .select_edus_receipts_room(&room_id, since, max_edu_count, &num)
.await; .await;
receipt_map (!receipt_map.read.is_empty()).then_some((room_id, receipt_map))
.read
.is_empty()
.eq(&false)
.then_some((room_id, receipt_map))
}) })
.collect() .collect()
.await; .await;
@@ -612,13 +612,17 @@ impl Service {
} }
/// Look for read receipts in this room /// Look for read receipts in this room
#[tracing::instrument(name = "receipts", level = "trace", skip(self, since, max_edu_count))] #[tracing::instrument(
name = "receipts",
level = "trace",
skip(self, since, max_edu_count, num)
)]
async fn select_edus_receipts_room( async fn select_edus_receipts_room(
&self, &self,
room_id: &RoomId, room_id: &RoomId,
since: (u64, u64), since: (u64, u64),
max_edu_count: &AtomicU64, max_edu_count: &AtomicU64,
num: &mut usize, num: &AtomicUsize,
) -> ReceiptMap { ) -> ReceiptMap {
let receipts = self let receipts = self
.services .services
@@ -647,24 +651,23 @@ impl Service {
continue; continue;
}; };
let (event_id, mut receipt) = r let Some((event_id, mut receipt)) = r.content.0.into_iter().next() else {
.content error!(%user_id, %count, "Empty content in read_receipts");
.0 continue;
.into_iter() };
.next()
.expect("we only use one event per read receipt");
let receipt = receipt let Some(receipt) = receipt
.remove(&ReceiptType::Read) .remove(&ReceiptType::Read)
.expect("our read receipts always set this") .and_then(|mut u| u.remove(&user_id))
.remove(&user_id) else {
.expect("our read receipts always have the user here"); error!(%user_id, %count, "Missing user receipt for ReceiptType::Read in read_receipts");
continue;
};
let receipt_data = ReceiptData::new(receipt, vec![event_id]); let receipt_data = ReceiptData::new(receipt, vec![event_id]);
if read.insert(user_id, receipt_data).is_none() { if read.insert(user_id, receipt_data).is_none() {
*num = num.saturating_add(1); if num.fetch_add(1, Ordering::Relaxed).saturating_add(1) >= SELECT_RECEIPT_LIMIT {
if *num >= SELECT_RECEIPT_LIMIT {
break; break;
} }
} }
+5 -5
View File
@@ -30,7 +30,7 @@ conduwuit-service.workspace = true
form_urlencoded = "1.2.2" form_urlencoded = "1.2.2"
futures.workspace = true futures.workspace = true
lettre.workspace = true lettre.workspace = true
memory-serve = "2.1.0" memory-serve = "2.4.0"
openidconnect.workspace = true openidconnect.workspace = true
ruma.workspace = true ruma.workspace = true
serde.workspace = true serde.workspace = true
@@ -48,17 +48,17 @@ url.workspace = true
validator = { version = "0.21.0", features = ["derive"] } validator = { version = "0.21.0", features = ["derive"] }
[build-dependencies] [build-dependencies]
memory-serve = "2.1.0" memory-serve = "2.4.0"
[lints] [lints]
workspace = true workspace = true
[package.metadata.cargo-shear] [package.metadata.cargo-shear]
# All of these dependencies are only used in Askama templates,
# which are transformed into Rust by a proc macro.
# cargo-shear can't see them because it doesn't expand macros.
ignored = [ ignored = [
"conduwuit_build_metadata", "conduwuit_build_metadata",
"form_urlencoded", "form_urlencoded",
"reqwest_recaptcha",
"serde_json", "serde_json",
"tower-sessions-core",
"tracing",
] ]
+2 -1
View File
@@ -11,7 +11,8 @@ use axum::{
use conduwuit_service::{Services, state}; use conduwuit_service::{Services, state};
use tower_http::catch_panic::CatchPanicLayer; use tower_http::catch_panic::CatchPanicLayer;
use tower_sec_fetch::SecFetchLayer; use tower_sec_fetch::SecFetchLayer;
use tower_sessions::{ExpiredDeletion, SessionManagerLayer, cookie::SameSite}; use tower_sessions::{SessionManagerLayer, cookie::SameSite};
use tower_sessions_core::ExpiredDeletion;
use crate::{ use crate::{
pages::TemplateContext, pages::TemplateContext,
+2
View File
@@ -313,6 +313,7 @@ async fn get_register_email_validate(
Some(email), Some(email),
&client &client
) )
.boxed()
.await? .await?
) )
} }
@@ -504,6 +505,7 @@ async fn begin_registration(
// If email isn't required we can immediately complete registration // If email isn't required we can immediately complete registration
Ok(response!( Ok(response!(
complete_registration(services, session_store, completed_registration, None, client) complete_registration(services, session_store, completed_registration, None, client)
.boxed()
.await? .await?
)) ))
} }
+6 -1
View File
@@ -13,8 +13,13 @@ version.workspace = true
conduwuit-admin.workspace = true conduwuit-admin.workspace = true
clap.workspace = true clap.workspace = true
askama = "0.16.0" askama = "0.16.1"
cargo_metadata = "0.23.1" cargo_metadata = "0.23.1"
[lints] [lints]
workspace = true workspace = true
[package.metadata.cargo-shear]
# Task modules are linked by a macro that cargo-shear doesn't expand,
# so we tell it to ignore them specifically.
ignored-paths = ["src/tasks/*/mod.rs"]