Compare commits

..
Author SHA1 Message Date
Ginger fe8314bb4d chore: Fix typo 2026-11-05 10:35:18 -05:00
Ginger 4922e5da01 feat: Add support for OAuth client credentials grant 2026-11-05 10:35:17 -05:00
105 changed files with 1971 additions and 2706 deletions

No files matched your search

@@ -44,7 +44,7 @@ runs:
- name: Login to builtin registry
if: ${{ env.BUILTIN_REGISTRY_ENABLED == 'true' }}
uses: docker/login-action@8aa5831fb8d48d8f76594c7ddde61ae58019f550 # v4
uses: docker/login-action@81c6f93d4bc991e510b342a00b419b3bb4efc5c6 # v4
with:
registry: ${{ env.BUILTIN_REGISTRY }}
username: ${{ inputs.registry_user }}
@@ -79,7 +79,7 @@ runs:
- name: Login to builtin registry
if: ${{ env.BUILTIN_REGISTRY_ENABLED == 'true' }}
uses: docker/login-action@8aa5831fb8d48d8f76594c7ddde61ae58019f550 # v4
uses: docker/login-action@81c6f93d4bc991e510b342a00b419b3bb4efc5c6 # v4
with:
registry: ${{ env.BUILTIN_REGISTRY }}
username: ${{ inputs.registry_user }}
+1 -1
View File
@@ -7,7 +7,7 @@ runs:
using: composite
steps:
- name: Install sccache
uses: https://forgejo.ellis.link/continuwuation/sccache-action@b5ae5b4541ed5fb0f616e3cb616bf213fefa1c40 # v1
uses: https://forgejo.ellis.link/continuwuation/sccache-action@v1
- name: Configure sccache
uses: https://github.com/actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
with:
@@ -29,7 +29,7 @@ runs:
steps:
- name: Detect runner OS
id: runner-os
uses: https://forgejo.ellis.link/continuwuation/detect-versions@d39555789fed25b8eb8e086d9f199c514dfa311e # v1
uses: https://forgejo.ellis.link/continuwuation/detect-versions@v1
- name: Configure cross-compilation architecture
if: inputs.dpkg-arch != ''
+2 -2
View File
@@ -39,7 +39,7 @@ runs:
steps:
- name: Detect runner OS
id: runner-os
uses: https://forgejo.ellis.link/continuwuation/detect-versions@d39555789fed25b8eb8e086d9f199c514dfa311e # v1
uses: https://forgejo.ellis.link/continuwuation/detect-versions@v1
- name: Configure Cargo environment
shell: bash
@@ -147,7 +147,7 @@ runs:
run: echo "::group::📦 Restoring build cache"
- name: Setup sccache
uses: https://forgejo.ellis.link/continuwuation/sccache-action@b5ae5b4541ed5fb0f616e3cb616bf213fefa1c40 # v1
uses: https://forgejo.ellis.link/continuwuation/sccache-action@v1
- name: End build cache restore group
shell: bash
+1 -1
View File
@@ -71,7 +71,7 @@ runs:
- name: Install timelord-cli and git-warp-time
if: steps.check-binaries.outputs.need-install == 'true'
uses: https://github.com/taiki-e/install-action@cfdb7ed4ccc7c7dce37759eae89dc5674b469b39 # v2
uses: https://github.com/taiki-e/install-action@682ce6c3c696a4cd5168a05f98e51aa02b877941 # v2
with:
tool: git-warp-time,timelord-cli@3.0.1
+5
View File
@@ -4,6 +4,11 @@ on:
pull_request_target:
types: [opened, reopened]
permissions:
contents: read
pull-requests: write
issues: write
jobs:
auto-label:
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 }}-
- name: Setup sccache
uses: https://forgejo.ellis.link/continuwuation/sccache-action@b5ae5b4541ed5fb0f616e3cb616bf213fefa1c40 # v1
uses: https://forgejo.ellis.link/continuwuation/sccache-action@v1
- name: Configure sccache environment
run: |
+3 -1
View File
@@ -54,6 +54,8 @@ jobs:
runs-on: ubuntu-latest
needs:
- build
permissions:
contents: write
if: startsWith(github.ref, 'refs/tags/')
steps:
- name: Download binary artifacts
@@ -63,7 +65,7 @@ jobs:
path: binaries
merge-multiple: true
- name: Create Release and Upload
uses: https://github.com/softprops/action-gh-release@8a0cd651e5b2365bd640854a3fa5dfc70e4875f3 # v3
uses: https://github.com/softprops/action-gh-release@efb35369e0ad2afab669f228072c1b0d510eae64 # v3
with:
draft: true
files: binaries/*
+5
View File
@@ -4,6 +4,11 @@ on:
pull_request_target:
types: [opened, synchronize, reopened, ready_for_review, labeled, unlabeled]
permissions:
contents: read
pull-requests: write
issues: write
jobs:
check-changelog:
name: Check changelog is added
+1 -1
View File
@@ -28,7 +28,7 @@ jobs:
- name: Detect runner environment
id: runner-env
uses: https://forgejo.ellis.link/continuwuation/detect-versions@d39555789fed25b8eb8e086d9f199c514dfa311e # v1
uses: https://forgejo.ellis.link/continuwuation/detect-versions@v1
- name: Setup Node.js
if: steps.runner-env.outputs.node_major == '' || steps.runner-env.outputs.node_major < '20'
+4
View File
@@ -7,6 +7,10 @@ on:
- main
workflow_dispatch:
permissions:
contents: read
pull-requests: read
jobs:
fast-checks:
name: Pre-commit & Formatting
+13 -3
View File
@@ -31,6 +31,11 @@ jobs:
build-release:
name: "Build ${{ matrix.slug }} (release)"
runs-on: dind
permissions:
contents: read
packages: write
attestations: write
id-token: write
strategy:
matrix:
include:
@@ -79,7 +84,6 @@ jobs:
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) }}
type=local,dest=/tmp/binaries
pull: true # Base images were becoming out of date
env:
SOURCE_DATE_EPOCH: ${{ env.TIMESTAMP }}
- name: Upload Docker artifacts
@@ -113,6 +117,11 @@ jobs:
name: "Build ${{ matrix.slug }} (max-perf)"
runs-on: dind
needs: build-release
permissions:
contents: read
packages: write
attestations: write
id-token: write
strategy:
matrix:
include:
@@ -163,7 +172,6 @@ jobs:
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) }}
type=local,dest=/tmp/binaries
pull: true # Base images were becoming out of date
env:
SOURCE_DATE_EPOCH: ${{ env.TIMESTAMP }}
- name: Upload max-perf Docker artifacts
@@ -199,6 +207,8 @@ jobs:
needs:
- build-release
- build-maxperf
permissions:
contents: write
if: startsWith(github.ref, 'refs/tags/')
steps:
- name: Download binary artifacts
@@ -208,7 +218,7 @@ jobs:
path: binaries
merge-multiple: true
- name: Create Release and Upload
uses: https://github.com/softprops/action-gh-release@8a0cd651e5b2365bd640854a3fa5dfc70e4875f3 # v3
uses: https://github.com/softprops/action-gh-release@efb35369e0ad2afab669f228072c1b0d510eae64 # v3
with:
draft: true
files: binaries/*
+1 -1
View File
@@ -32,7 +32,7 @@ repos:
stages: [ commit-msg ]
- repo: https://github.com/crate-ci/committed
rev: v1.1.12
rev: v1.1.11
hooks:
- id: committed
Generated
+560 -573
View File
File diff suppressed because it is too large. Load diff
+65 -78
View File
@@ -18,11 +18,11 @@ version = "26.9.1"
name = "conduwuit"
[workspace.dependencies.arrayvec]
version = "0.7.8"
version = "0.7.6"
features = ["serde"]
[workspace.dependencies.smallvec]
version = "1.16.5"
version = "1.14.0"
features = [
"const_generics",
"const_new",
@@ -39,10 +39,10 @@ features = ["ffi", "std", "union"]
version = "1.1.0"
[workspace.dependencies.ctor]
version = "1.0.13"
version = "1.0.6"
[workspace.dependencies.dtor]
version = "1.0.6"
version = "1.0.0"
[workspace.dependencies.cargo_toml]
version = "1.0"
@@ -50,7 +50,7 @@ default-features = false
features = ["features"]
[workspace.dependencies.toml]
version = "1.2.1"
version = "1.1.2"
default-features = false
features = ["parse", "serde"]
@@ -58,7 +58,7 @@ features = ["parse", "serde"]
version = "0.6.0"
[workspace.dependencies.base64]
version = "0.23.1"
version = "0.23.0"
default-features = false
# used for TURN server authentication
@@ -71,36 +71,36 @@ version = "0.5.0"
default-features = false
[workspace.dependencies.p256]
version = "0.14.0"
version = "0.13.2"
default-features = false
features = ["ecdsa", "std"]
# used for checking if an IP is in specific subnets / CIDR ranges easier
[workspace.dependencies.ipaddress]
version = "0.2.11"
version = "0.2.0"
[workspace.dependencies.rand]
version = "0.10.3"
version = "0.10.1"
# Used for the http request / response body type for Ruma endpoints used with reqwest
[workspace.dependencies.bytes]
version = "1.12.1"
version = "1.10.1"
[workspace.dependencies.http-body-util]
version = "0.1.5"
version = "0.1.3"
[workspace.dependencies.http]
version = "1.5.0"
version = "1.3.1"
# parses the HTTP-date form of Retry-After
[workspace.dependencies.httpdate]
version = "1.0.3"
[workspace.dependencies.regex]
version = "1.13.1"
version = "1.11.1"
[workspace.dependencies.axum]
version = "0.8.9"
version = "0.8.8"
default-features = false
features = [
"form",
@@ -114,7 +114,7 @@ features = [
]
[workspace.dependencies.axum-extra]
version = "0.12.6"
version = "0.12.0"
default-features = false
features = ["typed-header", "tracing", "cookie"]
@@ -133,12 +133,12 @@ default-features = false
version = "0.2"
[workspace.dependencies.tower]
version = "0.5.3"
version = "0.5.2"
default-features = false
features = ["util"]
[workspace.dependencies.tower-http]
version = "0.7.1"
version = "0.7.0"
default-features = false
features = [
"add-extension",
@@ -152,46 +152,38 @@ features = [
]
[workspace.dependencies.rustls]
version = "0.23.46"
version = "0.23.25"
default-features = false
[workspace.dependencies.reqwest]
version = "0.13.5"
version = "0.13.2"
default-features = false
features = [
"rustls-no-provider",
"socks",
"hickory-dns",
"http2",
"stream",
"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]
version = "1.0.229"
version = "1.0.219"
default-features = false
features = ["rc"]
[workspace.dependencies.serde_json]
version = "1.0.154"
version = "1.0.140"
default-features = false
features = ["raw_value"]
# Used for appservice registration files
[workspace.dependencies.serde-saphyr]
version = "2.1.1"
version = "1.0.0"
# Used to load forbidden room/user regex from config
[workspace.dependencies.serde_regex]
version = "1.2.0"
version = "1.1.0"
# Used for password hashing
[workspace.dependencies.argon2]
@@ -201,7 +193,7 @@ default-features = false
# Used to generate thumbnails for images
[workspace.dependencies.image]
version = "0.25.10"
version = "0.25.5"
default-features = false
features = [
"jpeg",
@@ -212,29 +204,29 @@ features = [
# logging
[workspace.dependencies.log]
version = "0.4.35"
version = "0.4.27"
default-features = false
[workspace.dependencies.tracing]
version = "0.1.44"
version = "0.1.41"
default-features = false
[workspace.dependencies.tracing-subscriber]
version = "0.3.23"
version = "0.3.20"
default-features = false
features = ["env-filter", "std", "tracing", "tracing-log", "ansi", "fmt"]
[workspace.dependencies.tracing-journald]
version = "0.3.2"
version = "0.3.1"
[workspace.dependencies.tracing-core]
version = "0.1.36"
version = "0.1.34"
default-features = false
# for URL previews
[workspace.dependencies.webpage]
version = "2.1.0"
version = "2.0.1"
default-features = false
# used for conduwuit's CLI and admin room command parsing
[workspace.dependencies.clap]
version = "4.6.7"
version = "4.5.35"
default-features = false
features = [
"derive",
@@ -247,12 +239,12 @@ features = [
]
[workspace.dependencies.futures]
version = "0.3.34"
version = "0.3.31"
default-features = false
features = ["std", "async-await"]
[workspace.dependencies.tokio]
version = "1.54.1"
version = "1.44.2"
default-features = false
features = [
"fs",
@@ -267,25 +259,25 @@ features = [
]
[workspace.dependencies.tokio-metrics]
version = "0.5.2"
version = "0.5.0"
[workspace.dependencies.libloading]
version = "0.9.0"
# Validating urls in config, was already a transitive dependency
[workspace.dependencies.url]
version = "2.5.8"
version = "2.5.4"
default-features = false
features = ["serde"]
# standard date and time tools
[workspace.dependencies.chrono]
version = "0.4.45"
version = "0.4.38"
features = ["alloc", "std"]
default-features = false
[workspace.dependencies.hyper]
version = "1.12.0"
version = "1.6.0"
default-features = false
features = [
"server",
@@ -304,7 +296,7 @@ features = [
# to support multiple variations of setting a config option
[workspace.dependencies.either]
version = "1.19.0"
version = "1.15.0"
default-features = false
features = ["serde"]
@@ -315,7 +307,7 @@ default-features = false
features = ["env", "toml"]
[workspace.dependencies.hickory-resolver]
version = "0.26.3"
version = "0.26.0"
default-features = false
features = [
"serde",
@@ -325,7 +317,7 @@ features = [
# Used for conduwuit::Error type
[workspace.dependencies.thiserror]
version = "2.0.21"
version = "2.0.12"
default-features = false
# Used to make working with iterators easier, was already a transitive depdendency
@@ -346,7 +338,7 @@ version = "0.6.0"
version = "2.5.0"
[workspace.dependencies.async-trait]
version = "0.1.92"
version = "0.1.88"
[workspace.dependencies.lru-cache]
version = "0.1.2"
@@ -403,7 +395,7 @@ features = [
[workspace.dependencies.rust-rocksdb]
git = "https://forgejo.ellis.link/continuwuation/rust-rocksdb-zaidoon1"
rev = "6021299f3e0e9455dc3f2e39c65e1dc217be8903"
rev = "0a25ff92f7c09b55eec496b9c192c7d5136ab2b8"
default-features = false
features = [
"multi-threaded-cf",
@@ -414,7 +406,7 @@ features = [
]
[workspace.dependencies.sha2]
version = "0.11.1"
version = "0.11.0"
default-features = false
[workspace.dependencies.sha1]
@@ -422,13 +414,11 @@ version = "0.11.0"
default-features = false
[workspace.dependencies.openidconnect]
version = "4.1.0"
default-features = false
features = ["reqwest"]
version = "4.0.1"
# optional opentelemetry, performance measurements, flamegraphs, etc for performance measurements and monitoring
[workspace.dependencies.opentelemetry]
version = "0.33.1"
version = "0.33.0"
[workspace.dependencies.opentelemetry-instrumentation-tower]
version = "0.19.0"
@@ -436,7 +426,7 @@ default-features = false
features = ["axum"]
[workspace.dependencies.opentelemetry-semantic-conventions]
version = "0.33.1"
version = "0.33.0"
features = ["semconv_experimental"]
[workspace.dependencies.tracing-flame]
@@ -446,25 +436,25 @@ version = "0.2.0"
version = "0.34.0"
[workspace.dependencies.opentelemetry_sdk]
version = "0.33.1"
version = "0.33.0"
features = ["rt-tokio"]
[workspace.dependencies.opentelemetry-prometheus]
version = "0.33.1"
version = "0.33.0"
[workspace.dependencies.prometheus]
version = "0.14.0"
default-features = false
[workspace.dependencies.opentelemetry-otlp]
version = "0.33.1"
version = "0.33.0"
features = ["http", "grpc-tonic", "trace", "logs", "metrics"]
# optional sentry metrics for crash/panic reporting
[workspace.dependencies.sentry]
version = "0.49.5"
version = "0.49.0"
default-features = false
features = [
"backtrace",
@@ -479,14 +469,14 @@ features = [
]
[workspace.dependencies.sentry-tracing]
version = "0.49.5"
version = "0.49.0"
[workspace.dependencies.sentry-tower]
version = "0.49.5"
version = "0.49.0"
# jemalloc usage
[workspace.dependencies.tikv-jemalloc-sys]
git = "https://forgejo.ellis.link/continuwuation/jemallocator"
rev = "ac4d4861b335b199f812807996e8c9166961041a"
rev = "df86ff89d4b1e223b9f7d2dd2fbb7f202da7f554"
default-features = false
features = [
"background_threads_runtime_support",
@@ -494,7 +484,7 @@ features = [
]
[workspace.dependencies.tikv-jemallocator]
git = "https://forgejo.ellis.link/continuwuation/jemallocator"
rev = "ac4d4861b335b199f812807996e8c9166961041a"
rev = "df86ff89d4b1e223b9f7d2dd2fbb7f202da7f554"
default-features = false
features = [
"background_threads_runtime_support",
@@ -502,7 +492,7 @@ features = [
]
[workspace.dependencies.tikv-jemalloc-ctl]
git = "https://forgejo.ellis.link/continuwuation/jemallocator"
rev = "ac4d4861b335b199f812807996e8c9166961041a"
rev = "df86ff89d4b1e223b9f7d2dd2fbb7f202da7f554"
default-features = false
features = ["use_std"]
@@ -510,7 +500,7 @@ features = ["use_std"]
version = "0.5"
[workspace.dependencies.nix]
version = "0.31.3"
version = "0.31.0"
default-features = false
features = ["resource"]
@@ -532,7 +522,7 @@ version = "0.4.9"
default-features = false
[workspace.dependencies.termimad]
version = "0.35.5"
version = "0.35.0"
default-features = false
[workspace.dependencies.checked_ops]
@@ -558,7 +548,7 @@ features = ["hardware-lock-elision", "deadlock_detection"] # TODO: Check if dead
version = "0.5.0"
[workspace.dependencies.bytesize]
version = "2.7"
version = "2.0"
[workspace.dependencies.core_affinity]
version = "0.8.3"
@@ -570,11 +560,11 @@ version = "0.2"
version = "0.2"
[workspace.dependencies.minicbor]
version = "2.3.1"
version = "2.1.1"
features = ["std"]
[workspace.dependencies.minicbor-serde]
version = "0.7.2"
version = "0.7.0"
features = ["std"]
[workspace.dependencies.maplit]
@@ -584,10 +574,10 @@ version = "1.0.2"
version = "1.0.1"
[workspace.dependencies.askama]
version = "0.16.1"
version = "0.16.0"
[workspace.dependencies.lettre]
version = "0.11.23"
version = "0.11.19"
default-features = false
features = ["smtp-transport", "pool", "hostname", "builder", "rustls", "rustls-native-certs", "tokio1", "rustls-no-provider", "tokio1-rustls", "tracing", "serde"]
@@ -600,7 +590,7 @@ features = ["std"]
version = "0.3.0"
[workspace.dependencies.resolvematrix]
version = "1.4.0"
version = "1.3.0"
[workspace.dependencies.serde_urlencoded]
version = "0.7.1"
@@ -1020,7 +1010,4 @@ collapsible_if = "allow"
cognitive_complexity = "allow"
[workspace.metadata.cargo-shear]
# 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"]
ignored = ["const-str", "ctor", "dtor"]
+2 -2
View File
@@ -53,7 +53,7 @@ fi
# The base docker image to use for complement tests
# You can build the default with `docker build -t continuwuity:complement -f ./docker/complement.Dockerfile .`
# after running `cargo build -p conduwuit --features openreg`. Only the debug binary is used.
# after running `cargo build`. Only the debug binary is used.
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
@@ -99,7 +99,7 @@ fi
if ! docker image inspect "$COMPLEMENT_BASE_IMAGE" > /dev/null 2>&1; then
echo "Complement base image not found: $COMPLEMENT_BASE_IMAGE"
echo "Build it with: cargo build -p conduwuit --features openreg && docker build -t $COMPLEMENT_BASE_IMAGE -f docker/complement.Dockerfile ."
echo "Build it with: cargo build -p conduwuit && docker build -t $COMPLEMENT_BASE_IMAGE -f docker/complement.Dockerfile ."
exit 1
fi
-1
View File
@@ -1 +0,0 @@
Upgraded rocksdb from 11.1.1 to 11.12.0 and jemalloc to 5.4.0.
+1
View File
@@ -0,0 +1 @@
Continuwuity now supports the OAuth 2.0 client credentials grant type, allowing secure automated access to the Matrix homeserver admin API, as well as future administrative functionality. Contributed by @ginger.
-1
View File
@@ -1 +0,0 @@
The documentation now refers to the Continuwuity Docker service as `continuwuity` instead of `homeserver`.
@@ -1 +0,0 @@
Fix incoming federation events losing state changes when predecessors share the same state-before snapshot. Contributed by @eleboucher.
-1
View File
@@ -1 +0,0 @@
Client-server API endpoints are now properly ratelimited for unauthenticated requests. Contributed by @ginger.
-1
View File
@@ -1 +0,0 @@
Ensure HTTP clients actually follow the `dns_servers` config option. Contributed by @silversys
-1
View File
@@ -1 +0,0 @@
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
@@ -1 +0,0 @@
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
+42 -7
View File
@@ -685,13 +685,6 @@
# env: CONTINUWUITY_SENDER_SHUTDOWN_TIMEOUT
#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
# server.
#
@@ -2687,3 +2680,45 @@
#
# env: CONTINUWUITY_OAUTH__OIDC__PROFILE_KEY_IMPORT_MODE
#profile_key_import_mode = "on_registration"
#[global.oauth.clients."$id"]
# Use this section to add static OAuth clients for bots and automation.
# Clients added here may use the client credentials OAuth grant to authorize
# themselves with Continuwuity.
#
# Make sure to replace `$id` in the header with your client ID of choice! You can
# add more copies of this section with different IDs to add multiple clients.
#
# Because the client credentials grant authorizes the client as itself, without
# an attached user, clients that use it will not be able to access most of the Matrix
# client-server API. Administrative functionality that does not require a user
# will still be available.
# The client's client secret.
#
# This must be supplied as the `client_secret` parameter when requesting
# an access token with the OAuth 2.0 token endpoint. Continuwuity does
# not check the `Authorization` header for requests to this endpoint.
#
#client_secret =
# A list of scopes that the client may request. Continuwuity allows static
# clients to request the following scopes:
#
# - "urn:matrix:client:cc.c10y.msc4484.server_administration" (MSC4484):
# This scope grants access to the Matrix server administration APIs, as
# well as Continuwuity's internal admin API (currently a work in
# progress).
# - "urn:matrix:client:api:*": This scope grants access to the Matrix
# client-server API. Most endpoints require an authenticated Matrix user
# and thus will not be usable by static clients.
#
# The `urn:matrix:client:device:<id>` scope may not be requested by static
# clients.
#
# Scopes listed here are not granted by default. The client must
# explicitly include them in the `scope` parameter of its access token
# request.
#
#scopes = []
+2 -2
View File
@@ -50,7 +50,7 @@ EOF
# Developer tool versions
# renovate: datasource=github-releases depName=cargo-bins/cargo-binstall
ENV BINSTALL_VERSION=1.26.2
ENV BINSTALL_VERSION=1.26.1
# renovate: datasource=github-releases depName=psastras/sbom-rs
ENV CARGO_SBOM_VERSION=0.9.1
# renovate: datasource=crate depName=lddtree
@@ -192,7 +192,7 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \
jq -r ".target_directory"))
mkdir /out/sbin
PACKAGE=conduwuit
xx-cargo build --locked --profile ${RUST_PROFILE} \
CARGO_LOG=debug xx-cargo build --locked --profile ${RUST_PROFILE} \
--no-default-features --features ${CARGO_FEATURES} \
-p $PACKAGE;
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
# renovate: datasource=github-releases depName=cargo-bins/cargo-binstall
ENV BINSTALL_VERSION=1.26.2
ENV BINSTALL_VERSION=1.26.1
# renovate: datasource=github-releases depName=psastras/sbom-rs
ENV CARGO_SBOM_VERSION=0.9.1
# 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>
:::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-configuring-coturn).
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).
:::
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'
services:
continuwuity:
homeserver:
# ...
volumes:
- ./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 {
reverse_proxy http://continuwuity:8008
reverse_proxy http://homeserver:8008
}
```
@@ -297,7 +297,7 @@ For Docker Compose deployments this means adding `stdin_open: true` and `tty: tr
```yaml
services:
continuwuity:
homeserver:
stdin_open: true
tty: true
# ...
+1 -4
View File
@@ -12,14 +12,11 @@ Install Git, Rust, Docker, Go, and `jq`. From this repository's root, build the
server image and run the suite:
```bash
cargo build -p conduwuit --features openreg
cargo build -p conduwuit
docker build -t continuwuity:complement -f docker/complement.Dockerfile .
./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
`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
+2 -2
View File
@@ -226,10 +226,10 @@ The following Compose files are taken from [Docker deployment instructions](../d
```txt title="Caddyfile"
https://matrix.example.com:443 {
reverse_proxy http://continuwuity:8008
reverse_proxy http://homeserver:8008
}
https://example.com:443 {
reverse_proxy /.well-known/matrix* http://continuwuity:8008
reverse_proxy /.well-known/matrix* http://homeserver:8008
}
```
+1 -1
View File
@@ -37,7 +37,7 @@ networks:
- subnet: "10.10.10.0/24"
services:
continuwuity:
homeserver:
# ...
volume:
- ./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`)
- blocking incoming federation for certain rooms (not the same as room banning)
(`!admin federation`)
- deleting media
- deleting media (see [the media section](#media))
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:
@@ -1,7 +1,7 @@
# Continuwuity - Behind Traefik Reverse Proxy
services:
continuwuity:
homeserver:
image: "forgejo.ellis.link/continuwuation/continuwuity:latest"
restart: unless-stopped
command: /sbin/conduwuit
@@ -16,9 +16,9 @@ services:
restart: unless-stopped
labels:
caddy: example.com
caddy.reverse_proxy: /.well-known/matrix/* continuwuity:8008
caddy.reverse_proxy: /.well-known/matrix/* homeserver:8008
continuwuity:
homeserver:
image: "forgejo.ellis.link/continuwuation/continuwuity:latest"
restart: unless-stopped
command: /sbin/conduwuit
@@ -14,7 +14,7 @@ services:
- ./Caddyfile:/etc/caddy/Caddyfile
restart: unless-stopped
continuwuity:
homeserver:
image: "forgejo.ellis.link/continuwuation/continuwuity:latest"
restart: unless-stopped
command: /sbin/conduwuit
@@ -1,7 +1,7 @@
# Continuwuity - With Traefik Reverse Proxy
services:
continuwuity:
homeserver:
image: "forgejo.ellis.link/continuwuation/continuwuity:latest"
restart: unless-stopped
command: /sbin/conduwuit
@@ -37,7 +37,7 @@ services:
# If you already configured `[global.well_known]` with Continuwuity,
# comment out the *_respond labels and uncomment the line below:
# caddy.reverse_proxy: /.well-known/matrix/* continuwuity:8008
# caddy.reverse_proxy: /.well-known/matrix/* homeserver:8008
# If you are having problems with continuwuity serving headers,
# uncomment the header section below.
@@ -48,7 +48,7 @@ services:
# caddy.0_header.Access-Control-Allow-Headers: "Authorization"
# caddy.0_header.Content-Type: "application/json"
continuwuity:
homeserver:
image: forgejo.ellis.link/continuwuation/continuwuity:latest
restart: unless-stopped
# add additional environment, volume, and network config here...
@@ -1,7 +1,7 @@
# Continuwuity - Behind Traefik Reverse Proxy
services:
continuwuity:
homeserver:
image: "forgejo.ellis.link/continuwuation/continuwuity:latest"
restart: unless-stopped
command: /sbin/conduwuit
@@ -1,7 +1,7 @@
# Continuwuity - Traefik Reverse Proxy Labels (override file)
services:
continuwuity:
homeserver:
labels:
- "traefik.enable=true"
- "traefik.docker.network=proxy" # Change this to the name of your Traefik docker proxy network
@@ -15,7 +15,7 @@ services:
- ./caddy-data:/data
restart: unless-stopped
continuwuity:
homeserver:
image: "forgejo.ellis.link/continuwuation/continuwuity:latest"
restart: unless-stopped
command: /sbin/conduwuit
@@ -15,7 +15,7 @@ services:
- ./Caddyfile:/etc/caddy/Caddyfile
restart: unless-stopped
continuwuity:
homeserver:
image: "forgejo.ellis.link/continuwuation/continuwuity:latest"
restart: unless-stopped
command: /sbin/conduwuit
@@ -1,7 +1,7 @@
# Continuwuity - With Traefik Reverse Proxy
services:
continuwuity:
homeserver:
image: "forgejo.ellis.link/continuwuation/continuwuity:latest"
restart: unless-stopped
command: /sbin/conduwuit
Generated
+24 -24
View File
@@ -3,11 +3,11 @@
"advisory-db": {
"flake": false,
"locked": {
"lastModified": 1793979272,
"narHash": "sha256-oUcBtPbtS7PlEMuSrgTAN4wv49cXYbwKbQqhH2pah5w=",
"lastModified": 1789329924,
"narHash": "sha256-mykGMFabQ7yP6G373M3VHkrac9PJPKJstrhQz2D/Rdc=",
"owner": "rustsec",
"repo": "advisory-db",
"rev": "309392b18f6b17022f82c701f300433126901068",
"rev": "455fd4bac659b5f1fca3810661c2d8b3c25dad05",
"type": "github"
},
"original": {
@@ -18,11 +18,11 @@
},
"crane": {
"locked": {
"lastModified": 1793836618,
"narHash": "sha256-TREenflwEjxOSq292FYwbc3kEm7TDRtXCZRNWEdjBmg=",
"lastModified": 1788465171,
"narHash": "sha256-Y1/TTVXjYXGF068IThQH9fPSZ0SIE74PABlUxnWTUH0=",
"owner": "ipetkov",
"repo": "crane",
"rev": "79fd63528501446749c09f08cad486a58c7d173e",
"rev": "eb35abda9f232cc6610b1d1e3200d15c49b7ac54",
"type": "github"
},
"original": {
@@ -39,11 +39,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1794142885,
"narHash": "sha256-xWFSr7q8IerDAVRk4W7/CgTmi05hMy2qjZ0z3VYpOVk=",
"lastModified": 1789298866,
"narHash": "sha256-6eaV5+MdWy1tAlN4HAFr64pTnYc9jiKGXBsu18cyVjE=",
"owner": "nix-community",
"repo": "fenix",
"rev": "f7d416b5073152c7f2e4de1a28d1a4330dd30a26",
"rev": "1fc6f36a23fa16e3740987957266f6e4b915c3cd",
"type": "github"
},
"original": {
@@ -74,11 +74,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1793576659,
"narHash": "sha256-V1h85lUaJBQoHFrB2vpXZOE0Ju1MYSnIpsehoVZYlDo=",
"lastModified": 1788450739,
"narHash": "sha256-glZLQlzIn1fXH6PazR2iUmTo7kzzyYSshrWhLS9TqCU=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "ea2630b7470978622c7689a1ff75d2b389175399",
"rev": "31729ca8cbdb4fa927b34e5f4353e6a83f39e993",
"type": "github"
},
"original": {
@@ -89,11 +89,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1794042290,
"narHash": "sha256-ziZn2PvCJE5JEEpqTdxXwJpPB+L3YqoCpTAMCzyaP3U=",
"lastModified": 1789149629,
"narHash": "sha256-H6GwaZzZf+4npqv0tph94w9tZddSjFjmQrVsW0z78uk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f4a03c008967841f2a0b3cb7c436fc6fc31671f6",
"rev": "eaad089433ca2bb662274377d33df3d0e51ef28b",
"type": "github"
},
"original": {
@@ -105,11 +105,11 @@
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1793504054,
"narHash": "sha256-ThkfL3D/FhCiZFc9+3BtxwuMmpuK+/bGtXCSo1+yVew=",
"lastModified": 1788057806,
"narHash": "sha256-DTQSMxzDWmT0zhguthvegnVkn7CFqGCv4IHCzk5ZUpM=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "7851ba61fd862b277cb6a9cef37394bc18bb94e4",
"rev": "596e2e3940e09b2abbeb03f75fa1828c57fcd72c",
"type": "github"
},
"original": {
@@ -132,11 +132,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1794096810,
"narHash": "sha256-dWC+YtMX+cwH3e9ndiFB77ijTsKtO5I2OxfcvUY4j3k=",
"lastModified": 1789128286,
"narHash": "sha256-KRxxgHiKIBp7R2n41IJuE5K4IUiLOpg47EEi3AxuSp8=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "03ae6be57aa063bb373f69eead3b8e15168a45d2",
"rev": "6aeeb8cf02741e5da07a1615a05faa506cecb21a",
"type": "github"
},
"original": {
@@ -153,11 +153,11 @@
]
},
"locked": {
"lastModified": 1791885023,
"narHash": "sha256-C3alQ2MEt0zVrUSho5NUDo3jmhbff72++bfwoqT9Omo=",
"lastModified": 1786901030,
"narHash": "sha256-WSFCsDSE5ffgD2MqzkM2CYjeFiKhRF/dJUN8uedb6YE=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "0d6d739a833ba9a9c93034862e4a7b061a062a1c",
"rev": "27b3b12a8e6375f28ebe122f07d230ca5459bbfa",
"type": "github"
},
"original": {
+13 -6
View File
@@ -42,12 +42,7 @@ let
env = {
CARGO_PROFILE = profile;
# 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 ]
);
RUSTFLAGS = rustflags;
GIT_COMMIT_HASH = self.rev or self.dirtyRev or "";
GIT_COMMIT_HASH_SHORT = self.shortRev or self.dirtyShortRev or "";
}
@@ -65,6 +60,18 @@ craneLib.buildPackage (
inherit cargoExtraArgs;
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 = {
description = "A community-driven Matrix homeserver in Rust";
mainProgram = "conduwuit";
-19
View File
@@ -18,23 +18,6 @@
{
packages =
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 =
pkgs:
let
@@ -95,7 +78,6 @@
import inputs.nixpkgs {
localSystem = system;
crossSystem = "x86_64-unknown-linux-musl";
overlays = [ muslOverlay ];
}
)
))
@@ -104,7 +86,6 @@
import inputs.nixpkgs {
localSystem = system;
crossSystem = "aarch64-unknown-linux-musl";
overlays = [ muslOverlay ];
}
)
));
+3 -3
View File
@@ -18,13 +18,13 @@
inherit enableJemalloc;
}).overrideAttrs
({
version = "continuwuity-v0.5.0-unstable-2026-11-08";
version = "continuwuity-v0.5.0-unstable-2026-05-19";
src = fetchFromGitea {
domain = "forgejo.ellis.link";
owner = "continuwuation";
repo = "rocksdb";
rev = "722fa3219df4169610fda8962221a1ff74026fdb";
hash = "sha256-ZuXXp83Hgj0B5v499CNxa9oNQUS/ZKYOAZEhmarUifc=";
rev = "3756b2b905e13216d8b56bcc783d814e7b073aff";
hash = "sha256-rSv4fr2bf9JJwdodgeuPCuceeh7k97KVxrAOC0wyPQY=";
};
# We have this already at https://forgejo.ellis.link/continuwuation/rocksdb/commit/a935c0273e1ba44eacf88ce3685a9b9831486155
+335 -372
View File
File diff suppressed because it is too large. Load diff
+3
View File
@@ -62,6 +62,8 @@ release_max_log_level = [
"conduwuit-service/release_max_log_level",
"tracing/max_level_trace",
"tracing/release_max_level_info",
"log/max_level_trace",
"log/release_max_level_info",
]
zstd_compression = [
"conduwuit-api/zstd_compression",
@@ -82,6 +84,7 @@ ctor.workspace = true
dtor.workspace = true
futures.workspace = true
lettre.workspace = true
log.workspace = true
ruma.workspace = true
serde_json.workspace = true
serde-saphyr.workspace = true
+1 -2
View File
@@ -983,8 +983,7 @@ impl crate::Context<'_> {
let resolver: &MatrixResolver = if no_cache {
&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)
.http_client(self.services.client.matrix_http_client.clone())
.dns_resolver(self.services.client.dns_resolver.clone())
.http_client(self.services.client.dns.clone())
.build()?
} else {
&self.services.client.matrix_resolver
+3
View File
@@ -51,6 +51,8 @@ jemalloc_stats = [
release_max_log_level = [
"conduwuit-core/release_max_log_level",
"conduwuit-service/release_max_log_level",
"log/max_level_trace",
"log/release_max_level_info",
"tracing/max_level_trace",
"tracing/release_max_level_info",
]
@@ -78,6 +80,7 @@ http-body-util.workspace = true
hyper.workspace = true
itertools.workspace = true
lettre.workspace = true
log.workspace = true
rand.workspace = true
reqwest.workspace = true
ruma.workspace = true
+3 -18
View File
@@ -523,22 +523,7 @@ where
for (server, response) in futures {
match response {
| Ok(response) => {
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 {
for (user, master_key) in response.master_keys {
let (master_key_id, mut master_key) = parse_master_key(&user, &master_key)?;
if let Ok(our_master_key) = services
@@ -564,8 +549,8 @@ where
}
}
self_signing_keys.extend(filtered_self_signing_keys);
device_keys.extend(filtered_device_keys);
self_signing_keys.extend(response.self_signing_keys);
device_keys.extend(response.device_keys);
},
| Err(e) => {
failures.insert(server.to_string(), json!({ "error": e.to_string() }));
+21 -18
View File
@@ -22,7 +22,7 @@ use conduwuit_service::{
};
use futures::{FutureExt, StreamExt, TryFutureExt, future::OptionFuture, pin_mut};
use ruma::{
EventId, RoomId, UserId,
RoomId, UserId,
api::{
Direction,
client::{filter::RoomEventFilter, message::get_message_events},
@@ -30,9 +30,8 @@ use ruma::{
},
assign,
events::{
AnyStateEvent, StateEventType, SyncEphemeralRoomEvent,
AnyStateEvent, StateEventType,
TimelineEventType::{self, *},
receipt::ReceiptEventContent,
},
serde::Raw,
};
@@ -210,32 +209,36 @@ pub(crate) async fn lazy_loading_witness<'a, I>(
where
I: Iterator<Item = &'a PdusIterItem> + Clone + Send,
{
let chunk_event_ids: std::collections::HashSet<&EventId> =
events.clone().map(|(_, event)| event.event_id()).collect();
let oldest = events
.clone()
.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
.rooms
.read_receipt
.readreceipts_since(lazy_loading_context.room_id, None);
.readreceipts_since(lazy_loading_context.room_id, Some(oldest.into_unsigned()));
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
.stream()
.map(ref_at!(1))
.map(Event::sender)
.map(ToOwned::to_owned)
.chain(receipt_users)
.chain(
receipts
.ready_take_while(|(_, c, _)| *c <= newest.into_unsigned())
.map(|(user_id, ..)| user_id),
)
.collect()
.await;
+1 -1
View File
@@ -61,7 +61,7 @@ pub(crate) async fn authorization_server_metadata(services: &Services) -> Value
"authorization_endpoint": endpoint_base.join(AUTH_CODE_PATH).unwrap(),
"code_challenge_methods_supported": ["S256"],
"device_authorization_endpoint": endpoint_base.join(DEVICE_AUTHORIZATION_PATH).unwrap(),
"grant_types_supported": ["authorization_code", "refresh_token", "urn:ietf:params:oauth:grant-type:device_code"],
"grant_types_supported": ["authorization_code", "refresh_token", "urn:ietf:params:oauth:grant-type:device_code", "client_credentials"],
"issuer": services.config.get_client_domain(),
"jwks_uri": endpoint_base.join(JWKS_URI_PATH).unwrap(),
"prompt_values_supported": prompt_values_supported,
+38 -54
View File
@@ -1,14 +1,14 @@
use std::collections::BTreeMap;
use axum::extract::State;
use conduwuit::{Err, Result, err};
use conduwuit::{Err, PduCount, Result, err};
use ruma::{
MilliSecondsSinceUnixEpoch,
api::client::{read_marker::set_read_marker, receipt::create_receipt},
events::{
RoomAccountDataEventType,
fully_read::{FullyReadEvent, FullyReadEventContent},
receipt::{Receipt, ReceiptEvent, ReceiptEventContent, ReceiptThread, ReceiptType},
receipt::{Receipt, ReceiptEvent, ReceiptEventContent, ReceiptType},
},
};
@@ -27,15 +27,6 @@ pub(crate) async fn set_read_marker_route(
) -> Result<set_read_marker::v3::Response> {
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 {
let fully_read_event = FullyReadEvent::new(FullyReadEventContent::new(event.to_owned()));
@@ -101,8 +92,13 @@ pub(crate) async fn set_read_marker_route(
.timeline
.get_pdu_count(event)
.await
.map_err(|_| err!(Request(NotFound("Event not found."))))?
.into_unsigned();
.map_err(|_| err!(Request(NotFound("Event not found."))))?;
let PduCount::Normal(count) = count else {
return Err!(Request(InvalidParam(
"Event is a backfilled PDU and cannot be marked as read."
)));
};
services
.rooms
@@ -126,26 +122,11 @@ pub(crate) async fn create_receipt_route(
) -> Result<create_receipt::v3::Response> {
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
.users
.update_device_last_seen(sender_user, body.identity.sender_device(), client_ip)
.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!(
&body.receipt_type,
create_receipt::v3::ReceiptType::Read | create_receipt::v3::ReceiptType::ReadPrivate
@@ -178,41 +159,44 @@ pub(crate) async fn create_receipt_route(
)
.await?;
},
| create_receipt::v3::ReceiptType::Read =>
if services.config.allow_local_read_receipts
&& !services.users.is_suspended(sender_user).await?
{
let mut receipt = Receipt::new(MilliSecondsSinceUnixEpoch::now());
receipt.thread = body.thread.clone();
let receipt_content = [(
body.event_id.clone(),
| create_receipt::v3::ReceiptType::Read => {
let receipt_content = [(
body.event_id.clone(),
BTreeMap::from_iter([(
ReceiptType::Read,
BTreeMap::from_iter([(
ReceiptType::Read,
BTreeMap::from_iter([(sender_user.to_owned(), receipt)]),
sender_user.to_owned(),
Receipt::new(MilliSecondsSinceUnixEpoch::now()),
)]),
)];
)]),
)];
services
.rooms
.read_receipt
.readreceipt_update(
sender_user,
&body.room_id,
ReceiptEvent::new(
body.room_id.clone(),
ReceiptEventContent::from_iter(receipt_content),
),
)
.await;
},
services
.rooms
.read_receipt
.readreceipt_update(
sender_user,
&body.room_id,
ReceiptEvent::new(
body.room_id.clone(),
ReceiptEventContent::from_iter(receipt_content),
),
)
.await;
},
| create_receipt::v3::ReceiptType::ReadPrivate => {
let count = services
.rooms
.timeline
.get_pdu_count(&body.event_id)
.await
.map_err(|_| err!(Request(NotFound("Event not found."))))?
.into_unsigned();
.map_err(|_| err!(Request(NotFound("Event not found."))))?;
let PduCount::Normal(count) = count else {
return Err!(Request(InvalidParam(
"Event is a backfilled PDU and cannot be marked as read."
)));
};
services
.rooms
+38 -46
View File
@@ -2,7 +2,7 @@ use axum::extract::State;
use conduwuit::{
Err, Result, at, debug_warn, err,
matrix::{Event, event::RelationTypeEqual, pdu::PduCount},
utils::{IterStream, result::FlatOk, stream::WidebandExt},
utils::{IterStream, ReadyExt, result::FlatOk, stream::WidebandExt},
};
use conduwuit_service::Services;
use futures::StreamExt;
@@ -98,10 +98,6 @@ pub(crate) async fn get_relating_events_route(
.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)]
async fn paginate_relations_with_filter(
services: &Services,
@@ -151,49 +147,28 @@ async fn paginate_relations_with_filter(
.unwrap_or(30)
.min(100);
let max_depth = if recurse { LEVELS_BELOW } else { 0 };
// Spec (v1.10) recommends depth of at least 3
let depth: u8 = if recurse { 3 } else { 1 };
// One more than the limit, to know whether there's another page
let mut events = services
let events: Vec<_> = services
.rooms
.pdu_metadata
.get_relations(
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
.get_relations(sender_user, room_id, target, start, limit, depth, dir)
.await
.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()
.ready_take_while(|(count, _)| Some(*count) != to)
.take(limit)
.wide_filter_map(|item| visibility_filter(services, sender_user, item))
.wide_filter_map(|item| ignored_filter(services, item, sender_user))
.then(async |mut pdu| {
@@ -207,15 +182,32 @@ async fn paginate_relations_with_filter(
}
pdu
})
.map(at!(1))
.map(Event::into_format)
.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(Event::into_format)
.collect();
Ok(assign!(get_relating_events::v1::Response::new(chunk), {
next_batch,
prev_batch: from.map(Into::into),
recursion_depth: recurse.then_some(RECURSION_DEPTH.into()),
recursion_depth: recurse.then_some(depth.into()),
}))
}
+2 -7
View File
@@ -24,7 +24,7 @@ pub(crate) async fn get_room_event_route(
services.rooms.state_accessor.is_world_readable(room_id)
);
if !joined && !world_readable {
return Err!(Request(NotFound("Event {event_id} not found.")));
return Err!(Request(NotFound("Event {} not found.", event_id)));
}
services
@@ -32,15 +32,10 @@ pub(crate) async fn get_room_event_route(
.timeline
.get_remote_pdu(room_id, event_id)
.await
.map_err(|_| err!(Request(NotFound("Event {event_id} not found."))))?
.map_err(|_| err!(Request(NotFound("Event {} not found.", event_id))))?
},
| 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
// be determined (user_can_see_event returns true for those).
+3 -8
View File
@@ -15,7 +15,7 @@ use conduwuit::{
},
warn,
};
use conduwuit_service::{Services, rooms::read_receipt::pack_receipts};
use conduwuit_service::Services;
use futures::{
FutureExt, StreamExt, TryFutureExt,
future::{OptionFuture, join, join3, join4, try_join, try_join3},
@@ -243,14 +243,9 @@ async fn build_ephemeral(
let (receipt_events, typing_event, private_read_event) =
join3(receipt_events, typing_event, private_read_event).await;
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());
}
let mut edus = receipt_events;
edus.extend(typing_event);
edus.extend(private_read_event);
Ok(assign!(Ephemeral::new(), { events: edus }))
}
+4 -13
View File
@@ -1,21 +1,18 @@
use std::{
net::{IpAddr, Ipv4Addr},
ops::Deref,
};
use std::ops::Deref;
use axum::{
RequestExt, RequestPartsExt,
body::Body,
extract::{FromRequest, Path, Query},
};
use conduwuit::{Error, Result, err, error};
use conduwuit::{Error, Result, err};
use ruma::{
CanonicalJsonObject,
api::{IncomingRequest, IncomingRequestExt, auth_scheme::AuthScheme},
};
use serde::Deserialize;
use crate::{State, client_ip::ClientIp, router::auth::CheckAuth};
use crate::{State, router::auth::CheckAuth};
/// Query parameters needed to authenticate requests
#[derive(Deserialize)]
@@ -90,11 +87,6 @@ where
let Path(path): Path<Vec<String>> = parts.extract().await?;
let borrowed_path: Vec<_> = path.iter().map(String::as_str).collect();
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
let request = hyper::Request::from_parts(parts, body.as_ref());
@@ -110,8 +102,7 @@ where
})?;
let identity =
R::Authentication::check::<R>(services, &request, ip, authentication, auth_query)
.await?;
R::Authentication::check::<R>(services, &request, authentication, auth_query).await?;
// Deserialize the body
let body = R::try_from_http_request(request, &borrowed_path)
+26 -38
View File
@@ -1,7 +1,6 @@
use std::{
any::{Any, TypeId},
collections::BTreeSet,
net::IpAddr,
};
use conduwuit::{
@@ -19,10 +18,7 @@ use ruma::{
AuthScheme, NoAccessToken, NoAuthentication,
},
client,
error::{
ErrorKind, InsufficientUserAuthenticationErrorData, LimitExceededErrorData,
UnknownTokenErrorData,
},
error::{ErrorKind, InsufficientUserAuthenticationErrorData, UnknownTokenErrorData},
federation::authentication::ServerSignatures,
},
assign,
@@ -45,6 +41,7 @@ pub(crate) enum ClientIdentity {
sender_device: Option<OwnedDeviceId>,
appservice_info: Box<RegistrationInfo>,
},
StaticClient,
}
impl ClientIdentity {
@@ -52,6 +49,7 @@ impl ClientIdentity {
match self {
| Self::User { sender_user, .. } | Self::Appservice { sender_user, .. } =>
Some(sender_user),
| Self::StaticClient => None,
}
}
@@ -59,6 +57,8 @@ impl ClientIdentity {
match self {
| Self::User { sender_user, .. } | Self::Appservice { sender_user, .. } =>
Ok(sender_user),
| Self::StaticClient =>
Err!(Request(Forbidden("Static clients cannot use this endpoint."))),
}
}
@@ -66,6 +66,7 @@ impl ClientIdentity {
match self {
| Self::User { sender_device, .. } => Some(sender_device),
| Self::Appservice { sender_device, .. } => sender_device.as_deref(),
| Self::StaticClient => None,
}
}
@@ -75,12 +76,14 @@ impl ClientIdentity {
| Self::Appservice { sender_device: Some(sender_device), .. } => Ok(sender_device),
| Self::Appservice { sender_device: None, .. } =>
Err!(Request(Forbidden("Appservices must masquerade to use this endpoint."))),
| Self::StaticClient =>
Err!(Request(Forbidden("Static clients cannot use this endpoint."))),
}
}
pub(crate) fn appservice_info(&self) -> Option<&RegistrationInfo> {
match self {
| Self::User { .. } => None,
| Self::User { .. } | Self::StaticClient => None,
| Self::Appservice { appservice_info, .. } => Some(appservice_info),
}
}
@@ -94,7 +97,6 @@ pub(crate) trait CheckAuth: AuthScheme {
fn check<R: IncomingRequest<Authentication = Self> + Any>(
services: &Services,
incoming_request: &hyper::Request<&[u8]>,
request_ip: IpAddr,
authentication: Self::Output,
query: AuthQueryParams,
) -> impl Future<Output = Result<Self::Identity>> + Send;
@@ -106,7 +108,6 @@ impl CheckAuth for ServerSignatures {
async fn check<R: IncomingRequest<Authentication = Self> + Any>(
services: &Services,
incoming_request: &hyper::Request<&[u8]>,
_request_ip: IpAddr,
authentication: Self::Output,
_query: AuthQueryParams,
) -> Result<Self::Identity> {
@@ -167,7 +168,6 @@ impl CheckAuth for AccessToken {
async fn check<R: IncomingRequest<Authentication = Self> + Any>(
services: &Services,
_incoming_request: &hyper::Request<&[u8]>,
_request_ip: IpAddr,
authentication: Self::Output,
query: AuthQueryParams,
) -> Result<Self::Identity> {
@@ -188,7 +188,6 @@ impl CheckAuth for AccessTokenOptional {
async fn check<R: IncomingRequest<Authentication = Self> + Any>(
services: &Services,
_incoming_request: &hyper::Request<&[u8]>,
request_ip: IpAddr,
authentication: Self::Output,
query: AuthQueryParams,
) -> Result<Self::Identity> {
@@ -203,10 +202,6 @@ impl CheckAuth for AccessTokenOptional {
.await
.map(Some)
} else {
if R::RATE_LIMITED {
check_unauthenticated_request_ratelimiting(services, request_ip)?;
}
Ok(None)
}
}
@@ -218,7 +213,6 @@ impl CheckAuth for AppserviceToken {
async fn check<R: IncomingRequest + Any>(
services: &Services,
_incoming_request: &hyper::Request<&[u8]>,
_request_ip: IpAddr,
authentication: Self::Output,
_query: AuthQueryParams,
) -> Result<Self::Identity> {
@@ -232,7 +226,6 @@ impl CheckAuth for AppserviceTokenOptional {
async fn check<R: IncomingRequest<Authentication = Self> + Any>(
services: &Services,
_incoming_request: &hyper::Request<&[u8]>,
_request_ip: IpAddr,
authentication: Self::Output,
_query: AuthQueryParams,
) -> Result<Self::Identity> {
@@ -252,7 +245,6 @@ impl CheckAuth for NoAuthentication {
fn check<R: IncomingRequest<Authentication = Self> + Any>(
_services: &Services,
_incoming_request: &hyper::Request<&[u8]>,
_request_ip: IpAddr,
_authentication: Self::Output,
_query: AuthQueryParams,
) -> impl Future<Output = Result<Self::Identity>> + Send {
@@ -266,7 +258,6 @@ impl CheckAuth for NoAccessToken {
async fn check<R: IncomingRequest<Authentication = Self> + Any>(
services: &Services,
incoming_request: &hyper::Request<&[u8]>,
request_ip: IpAddr,
_authentication: Self::Output,
query: AuthQueryParams,
) -> Result<Self::Identity> {
@@ -283,10 +274,6 @@ impl CheckAuth for NoAccessToken {
.await
.map(Some)
} else {
if R::RATE_LIMITED {
check_unauthenticated_request_ratelimiting(services, request_ip)?;
}
Ok(None)
}
}
@@ -412,6 +399,23 @@ async fn check_access_token(
sender_device,
appservice_info: Box::new(appservice_info),
})
} else if let Some(session) = services.oauth.get_client_credentials_session(token).await {
if !required_scopes
.iter()
.any(|scope| session.scopes.contains(scope))
{
return Err(Error::Request(
ErrorKind::InsufficientUserAuthentication(Box::new(
assign!(InsufficientUserAuthenticationErrorData::new(), {
scope: required_scopes.iter().cloned().collect()
}),
)),
"You do not have permission to access this endpoint.".into(),
StatusCode::UNAUTHORIZED,
));
}
Ok(ClientIdentity::StaticClient)
} else {
Err(Error::Request(
ErrorKind::UnknownToken(UnknownTokenErrorData::new()),
@@ -428,19 +432,3 @@ async fn check_appservice_token(services: &Services, token: &str) -> Result<Regi
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,6 +421,7 @@ async fn validate_invite_create_event(
if !state_res::auth_check(
room_version_rules,
pdu,
None,
|_, _| async {
unreachable!("No state should be fetched when processing a lone create event");
},
+22 -14
View File
@@ -581,20 +581,28 @@ async fn handle_edu_receipt_room_user(
}
let data = &user_updates.data;
for event_id in user_updates.event_ids {
let user_data = [(user_id.to_owned(), data.clone())];
let receipts = [(ReceiptType::Read, BTreeMap::from(user_data))];
let content = [(event_id, BTreeMap::from(receipts))];
services
.rooms
.read_receipt
.readreceipt_update(
user_id,
room_id,
ReceiptEvent::new(room_id.to_owned(), ReceiptEventContent::from_iter(content)),
)
.await;
}
user_updates
.event_ids
.into_iter()
.stream()
.for_each_concurrent(automatic_width(), |event_id| async move {
let user_data = [(user_id.to_owned(), data.clone())];
let receipts = [(ReceiptType::Read, BTreeMap::from(user_data))];
let content = [(event_id.clone(), BTreeMap::from(receipts))];
services
.rooms
.read_receipt
.readreceipt_update(
user_id,
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) {
+3 -1
View File
@@ -47,6 +47,8 @@ perf_measurements = []
release_max_log_level = [
"tracing/max_level_trace",
"tracing/release_max_level_info",
"log/max_level_trace",
"log/release_max_level_info",
]
sentry_telemetry = []
zstd_compression = [
@@ -75,13 +77,13 @@ cyborgtime.workspace = true
either.workspace = true
figment.workspace = true
futures.workspace = true
governor.workspace = true
http-body-util.workspace = true
http.workspace = true
ipaddress.workspace = true
libc.workspace = true
libloading.workspace = true
libloading.optional = true
log.workspace = true
lettre.workspace = true
num-traits.workspace = true
rand.workspace = true
+9
View File
@@ -353,6 +353,15 @@ pub fn check(config: &Config) -> Result {
}
})?;
for (id, client) in &config.oauth.clients {
if client.scopes.is_empty() {
warn!(
"The static OAuth client `{id}` has no scopes configured. It will not be able \
to access any API endpoints."
);
}
}
Ok(())
}
+52 -40
View File
@@ -5,10 +5,7 @@ pub mod proxy;
use std::{
collections::{BTreeMap, BTreeSet, HashMap},
hash::Hash,
net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr},
num::NonZero,
ops::Deref,
path::PathBuf,
time::Duration,
};
@@ -20,7 +17,6 @@ use either::{
};
use figment::providers::{Env, Format, Toml};
pub use figment::{Figment, value::Value as FigmentValue};
use governor::{DefaultKeyedRateLimiter, Quota, RateLimiter};
use lettre::message::Mailbox;
use openidconnect::{Audience, ClientId, ClientSecret, Scope};
use regex::RegexSet;
@@ -28,6 +24,7 @@ use ruma::{
OwnedRoomId, OwnedRoomOrAliasId, OwnedServerName, OwnedServerSigningKeyId, OwnedUserId,
RoomVersionId, ServerName,
api::{
OAuthClientScope,
client::{discovery::discover_support::ContactRole, rtc::RtcTransport},
federation::discovery::OldVerifyKey,
},
@@ -44,7 +41,7 @@ use crate::{Result, err, error::Error, utils::sys};
/// All the config options for continuwuity.
#[allow(clippy::struct_excessive_bools)]
#[allow(rustdoc::broken_intra_doc_links, rustdoc::bare_urls)]
#[derive(Debug, Deserialize)]
#[derive(Clone, Debug, Deserialize)]
#[config_example_generator(
filename = "conduwuit-example.toml",
section = "global",
@@ -794,14 +791,6 @@ pub struct Config {
#[serde(default = "default_sender_shutdown_timeout")]
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
/// server.
///
@@ -2758,7 +2747,12 @@ pub struct OauthConfig {
compatibility_mode: OAuthMode,
/// display: hidden
#[serde(default)]
pub oidc: Option<OidcConfig>,
/// display: hidden
#[serde(default)]
pub clients: HashMap<String, OAuthClient>,
}
impl OauthConfig {
@@ -2972,30 +2966,52 @@ impl TrustedServerConfig {
}
}
#[derive(Debug)]
pub struct PerMinuteRatelimiter<K: Hash + Eq + Clone> {
ratelimiter: DefaultKeyedRateLimiter<K>,
}
#[derive(Clone, Debug, Deserialize)]
#[config_example_generator(
filename = "conduwuit-example.toml",
section = "global.oauth.clients.\"$id\"",
optional = "true",
subheader = "\
# Use this section to add static OAuth clients for bots and automation.
# Clients added here may use the client credentials OAuth grant to authorize
# themselves with Continuwuity.
#
# Make sure to replace `$id` in the header with your client ID of choice! You can
# add more copies of this section with different IDs to add multiple clients.
#
# Because the client credentials grant authorizes the client as itself, without
# an attached user, clients that use it will not be able to access most of the Matrix
# client-server API. Administrative functionality that does not require a user
# will still be available."
)]
pub struct OAuthClient {
/// The client's client secret.
///
/// This must be supplied as the `client_secret` parameter when requesting
/// an access token with the OAuth 2.0 token endpoint. Continuwuity does
/// not check the `Authorization` header for requests to this endpoint.
pub client_secret: String,
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)))
}
/// A list of scopes that the client may request. Continuwuity allows static
/// clients to request the following scopes:
///
/// - "urn:matrix:client:cc.c10y.msc4484.server_administration" (MSC4484):
/// This scope grants access to the Matrix server administration APIs, as
/// well as Continuwuity's internal admin API (currently a work in
/// progress).
/// - "urn:matrix:client:api:*": This scope grants access to the Matrix
/// client-server API. Most endpoints require an authenticated Matrix user
/// and thus will not be usable by static clients.
///
/// The `urn:matrix:client:device:<id>` scope may not be requested by static
/// clients.
///
/// Scopes listed here are not granted by default. The client must
/// explicitly include them in the `scope` parameter of its access token
/// request.
///
/// default: []
pub scopes: BTreeSet<OAuthClientScope>,
}
const DEPRECATED_KEYS: &[&str] = &[
@@ -3441,7 +3457,3 @@ fn default_preferred_username_claim() -> String { "preferred_username".to_owned(
fn default_profile_key_map() -> HashMap<String, String> {
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()))
}
+1 -6
View File
@@ -16,12 +16,7 @@ use ruma::{
use serde::Deserialize;
use serde_json::{Value as JsonValue, value::RawValue as RawJsonValue};
pub use self::{
filter::Matches,
id::*,
relation::{RelationTypeEqual, relation_type},
type_ext::TypeExt,
};
pub use self::{filter::Matches, id::*, relation::RelationTypeEqual, type_ext::TypeExt};
use super::{pdu::Pdu, state_key::StateKey};
use crate::{Result, utils};
+5 -10
View File
@@ -8,7 +8,7 @@ pub trait RelationTypeEqual<E: Event> {
}
#[derive(Clone, Debug, Deserialize)]
struct ExtractRelatesToRelType {
struct ExtractRelatesToEventId {
#[serde(rename = "m.relates_to")]
relates_to: ExtractRelType,
}
@@ -18,16 +18,11 @@ struct ExtractRelType {
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 {
fn relation_type_equal(&self, event: &E) -> bool {
relation_type(event).is_some_and(|r| r == *self)
event
.get_content()
.map(|c: ExtractRelatesToEventId| c.relates_to.rel_type)
.is_ok_and(|r| r == *self)
}
}
-10
View File
@@ -105,16 +105,6 @@ 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]
#[must_use]
pub fn saturating_add(self, add: u64) -> Self {
+64 -247
View File
@@ -5,21 +5,17 @@ use futures::{
future::{OptionFuture, join, join3},
};
use ruma::{
AnyKeyName, CanonicalJsonObject, Int, OwnedUserId, RoomVersionId, SigningKeyId, UserId,
Int, OwnedUserId, RoomVersionId, UserId,
events::room::{
join_rules::{JoinRule, RoomJoinRulesEventContent},
member::MembershipState,
member::{MembershipState, ThirdPartyInvite},
power_levels::{RoomPowerLevelsEventContent, UserPowerLevel},
third_party_invite::PublicKey,
},
int,
room_version_rules::{RoomIdFormatVersion, RoomVersionRules},
serde::{Raw, base64, base64::Standard},
signatures,
signatures::to_canonical_json_string_for_signing,
third_party_invite::IdentityServerBase64PublicKey,
serde::Raw,
};
use serde::{Deserialize, Serialize};
use serde::Deserialize;
use serde_json::{from_str as from_json_str, value::RawValue as RawJsonValue};
use super::{
@@ -29,7 +25,7 @@ use super::{
deserialize_power_levels_content_redact,
},
};
use crate::{debug, err, error, trace, warn};
use crate::{debug, error, trace, warn};
// FIXME: field extracting could be bundled for `content`
#[derive(Deserialize)]
@@ -52,40 +48,6 @@ struct RoomCreateContentFields {
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
/// to authenticate this `content`.
///
@@ -99,7 +61,7 @@ pub fn auth_types_for_event(
state_key: Option<&str>,
content: &RawJsonValue,
room_version: &RoomVersionRules,
) -> crate::Result<Vec<(StateEventType, StateKey)>> {
) -> serde_json::Result<Vec<(StateEventType, StateKey)>> {
if kind == &TimelineEventType::RoomCreate {
return Ok(vec![]);
}
@@ -122,7 +84,7 @@ pub fn auth_types_for_event(
#[allow(unused)]
struct RoomMemberContentFields {
membership: Option<Raw<MembershipState>>,
third_party_invite: Option<Raw<MemberThirdPartyInviteSignedContent>>,
third_party_invite: Option<Raw<ThirdPartyInvite>>,
join_authorised_via_users_server: Option<Raw<OwnedUserId>>,
}
@@ -154,24 +116,16 @@ pub fn auth_types_for_event(
auth_types.push(key);
}
if membership == MembershipState::Invite {
if let Some(Ok(t_id)) = content.third_party_invite.map(|t| t.deserialize()) {
let key = (
StateEventType::RoomThirdPartyInvite,
t_id.signed
.token()
.ok_or_else(|| {
err!(Request(BadJson(
"Third party invite content missing a token"
)))
})?
.into(),
);
if !auth_types.contains(&key) {
auth_types.push(key);
}
}
}
// TODO: restore this once 3pid support isn't broken
// if membership == MembershipState::Invite {
// if let Some(Ok(t_id)) = content.third_party_invite.map(|t|
// t.deserialize()) { let key =
// (StateEventType::RoomThirdPartyInvite,
// t_id.signed.token.into()); if !auth_types.contains(&
// key) { auth_types.push(key);
// }
// }
// }
}
}
}
@@ -225,11 +179,12 @@ fn get_user_power_level(
pub async fn auth_check<E, F, Fut>(
room_version: &RoomVersionRules,
incoming_event: &E,
current_third_party_invite: Option<&E>,
fetch_state: F,
create_event: &E,
) -> Result<bool, Error>
where
F: Fn(&StateEventType, &str) -> Fut + Send + Copy,
F: Fn(&StateEventType, &str) -> Fut + Send,
Fut: Future<Output = Option<E>> + Send,
E: Event + Send + Sync,
for<'a> &'a E: Event + Send,
@@ -489,15 +444,13 @@ where
sender,
sender_member_event.as_ref(),
incoming_event,
fetch_state,
current_third_party_invite,
power_levels_event.as_ref(),
join_rules_event.as_ref(),
user_for_join_auth.as_deref(),
&user_for_join_auth_membership,
&room_create_event,
)
.await?
{
)? {
return Ok(false);
}
@@ -686,14 +639,14 @@ where
/// event and the current State.
#[allow(clippy::too_many_arguments)]
#[allow(clippy::cognitive_complexity)]
async fn valid_membership_change<E, F, Fut>(
fn valid_membership_change<E>(
room_version: &RoomVersionRules,
target_user: &UserId,
target_user_membership_event: Option<&E>,
sender: &UserId,
sender_membership_event: Option<&E>,
current_event: &E,
fetch_state: F,
current_third_party_invite: Option<&E>,
power_levels_event: Option<&E>,
join_rules_event: Option<&E>,
user_for_join_auth: Option<&UserId>,
@@ -702,13 +655,11 @@ async fn valid_membership_change<E, F, Fut>(
) -> Result<bool>
where
E: Event + Send + Sync,
F: Fn(&StateEventType, &str) -> Fut + Send + Copy,
Fut: Future<Output = Option<E>> + Send,
for<'a> &'a E: Event + Send,
{
#[derive(Deserialize)]
struct GetThirdPartyInvite {
third_party_invite: Option<Raw<MemberThirdPartyInviteSignedContent>>,
third_party_invite: Option<Raw<ThirdPartyInvite>>,
}
let create_content = from_json_str::<RoomCreateContentFields>(create_room.content().get())?;
let creator = if room_version.authorization.use_room_create_sender {
@@ -950,18 +901,22 @@ where
| MembershipState::Invite => {
// If content has third_party_invite key
trace!("starting target_membership=invite check");
match third_party_invite {
| Some(raw_tp_id) =>
match third_party_invite.and_then(|i| i.deserialize().ok()) {
| Some(tp_id) =>
if target_user_current_membership == MembershipState::Ban {
warn!(?target_user_membership_event_id, "Can't invite banned user");
false
} else {
let Ok(tp_id) = raw_tp_id.deserialize() else {
warn!("Invite third party content is invalid");
return Ok(false);
};
verify_third_party_invite(Some(target_user), sender, &tp_id, fetch_state)
.await
let allow = verify_third_party_invite(
Some(target_user),
sender,
&tp_id,
current_third_party_invite,
);
if !allow {
warn!("Third party invite invalid");
}
allow
},
| _ =>
if !sender_is_joined {
@@ -1480,133 +1435,14 @@ fn get_send_level(
.unwrap_or_else(|| if state_key.is_some() { int!(50) } else { int!(0) })
}
async fn verify_third_party_invite<F, Fut, E>(
target_user: Option<&UserId>,
sender: &UserId,
tp_id: &MemberThirdPartyInviteSignedContent,
fetch_state: F,
) -> bool
where
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
fn verify_third_party_invite(
_target_user: Option<&UserId>,
_sender: &UserId,
_tp_id: &ThirdPartyInvite,
_current_third_party_invite: Option<&impl Event>,
) -> bool {
// TODO: implement proper verification here
true
}
#[cfg(test)]
@@ -1625,7 +1461,7 @@ mod tests {
use serde_json::value::to_raw_value as to_raw_json_value;
use crate::{
matrix::{Event, EventTypeExt},
matrix::{Event, EventTypeExt, Pdu as PduEvent},
state_res::{
StateMap,
event_auth::valid_membership_change,
@@ -1636,8 +1472,8 @@ mod tests {
},
};
#[tokio::test]
async fn test_ban_pass() {
#[test]
fn test_ban_pass() {
let _ = tracing::subscriber::set_default(
tracing_subscriber::fmt().with_test_writer().finish(),
);
@@ -1659,8 +1495,6 @@ mod tests {
);
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 sender = alice();
@@ -1672,20 +1506,19 @@ mod tests {
sender,
fetch_state(StateEventType::RoomMember, sender.as_str().into()).as_ref(),
&requester,
&async_fetch_state,
None::<&PduEvent>,
fetch_state(StateEventType::RoomPowerLevels, "".into()).as_ref(),
fetch_state(StateEventType::RoomJoinRules, "".into()).as_ref(),
None,
&MembershipState::Leave,
&fetch_state(StateEventType::RoomCreate, "".into()).unwrap(),
)
.await
.unwrap()
);
}
#[tokio::test]
async fn test_join_non_creator() {
#[test]
fn test_join_non_creator() {
let _ = tracing::subscriber::set_default(
tracing_subscriber::fmt().with_test_writer().finish(),
);
@@ -1707,8 +1540,6 @@ mod tests {
);
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 sender = charlie();
@@ -1720,20 +1551,19 @@ mod tests {
sender,
fetch_state(StateEventType::RoomMember, sender.as_str().into()).as_ref(),
&requester,
&async_fetch_state,
None::<&PduEvent>,
fetch_state(StateEventType::RoomPowerLevels, "".into()).as_ref(),
fetch_state(StateEventType::RoomJoinRules, "".into()).as_ref(),
None,
&MembershipState::Leave,
&fetch_state(StateEventType::RoomCreate, "".into()).unwrap(),
)
.await
.unwrap()
);
}
#[tokio::test]
async fn test_join_creator() {
#[test]
fn test_join_creator() {
let _ = tracing::subscriber::set_default(
tracing_subscriber::fmt().with_test_writer().finish(),
);
@@ -1755,8 +1585,6 @@ mod tests {
);
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 sender = alice();
@@ -1768,20 +1596,19 @@ mod tests {
sender,
fetch_state(StateEventType::RoomMember, sender.as_str().into()).as_ref(),
&requester,
&async_fetch_state,
None::<&PduEvent>,
fetch_state(StateEventType::RoomPowerLevels, "".into()).as_ref(),
fetch_state(StateEventType::RoomJoinRules, "".into()).as_ref(),
None,
&MembershipState::Leave,
&fetch_state(StateEventType::RoomCreate, "".into()).unwrap(),
)
.await
.unwrap()
);
}
#[tokio::test]
async fn test_ban_fail() {
#[test]
fn test_ban_fail() {
let _ = tracing::subscriber::set_default(
tracing_subscriber::fmt().with_test_writer().finish(),
);
@@ -1803,8 +1630,6 @@ mod tests {
);
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 sender = charlie();
@@ -1816,20 +1641,19 @@ mod tests {
sender,
fetch_state(StateEventType::RoomMember, sender.as_str().into()).as_ref(),
&requester,
&async_fetch_state,
None::<&PduEvent>,
fetch_state(StateEventType::RoomPowerLevels, "".into()).as_ref(),
fetch_state(StateEventType::RoomJoinRules, "".into()).as_ref(),
None,
&MembershipState::Leave,
&fetch_state(StateEventType::RoomCreate, "".into()).unwrap(),
)
.await
.unwrap()
);
}
#[tokio::test]
async fn test_restricted_join_rule() {
#[test]
fn test_restricted_join_rule() {
let _ = tracing::subscriber::set_default(
tracing_subscriber::fmt().with_test_writer().finish(),
);
@@ -1868,8 +1692,6 @@ mod tests {
);
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 sender = ella();
@@ -1881,14 +1703,13 @@ mod tests {
sender,
fetch_state(StateEventType::RoomMember, sender.as_str().into()).as_ref(),
&requester,
&async_fetch_state,
None::<&PduEvent>,
fetch_state(StateEventType::RoomPowerLevels, "".into()).as_ref(),
fetch_state(StateEventType::RoomJoinRules, "".into()).as_ref(),
Some(alice()),
&MembershipState::Join,
&fetch_state(StateEventType::RoomCreate, "".into()).unwrap(),
)
.await
.unwrap()
);
@@ -1900,20 +1721,19 @@ mod tests {
sender,
fetch_state(StateEventType::RoomMember, sender.as_str().into()).as_ref(),
&requester,
&async_fetch_state,
None::<&PduEvent>,
fetch_state(StateEventType::RoomPowerLevels, "".into()).as_ref(),
fetch_state(StateEventType::RoomJoinRules, "".into()).as_ref(),
Some(ella()),
&MembershipState::Leave,
&fetch_state(StateEventType::RoomCreate, "".into()).unwrap(),
)
.await
.unwrap()
);
}
#[tokio::test]
async fn test_knock() {
#[test]
fn test_knock() {
let _ = tracing::subscriber::set_default(
tracing_subscriber::fmt().with_test_writer().finish(),
);
@@ -1944,8 +1764,6 @@ mod tests {
);
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 sender = ella();
@@ -1957,14 +1775,13 @@ mod tests {
sender,
fetch_state(StateEventType::RoomMember, sender.as_str().into()).as_ref(),
&requester,
&async_fetch_state,
None::<&PduEvent>,
fetch_state(StateEventType::RoomPowerLevels, "".into()).as_ref(),
fetch_state(StateEventType::RoomJoinRules, "".into()).as_ref(),
None,
&MembershipState::Leave,
&fetch_state(StateEventType::RoomCreate, "".into()).unwrap(),
)
.await
.unwrap()
);
}
+8 -2
View File
@@ -757,8 +757,7 @@ where
Some(state_key),
event.content(),
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");
let mut auth_state = StateMap::new();
@@ -831,6 +830,12 @@ where
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| {
future::ready(
auth_state
@@ -842,6 +847,7 @@ where
let auth_result = auth_check(
room_version,
&event,
current_third_party,
fetch_state,
&fetch_state(&StateEventType::RoomCreate, "")
.await
+62
View File
@@ -0,0 +1,62 @@
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,6 +34,8 @@ jemalloc_stats = [
]
release_max_log_level = [
"conduwuit-core/release_max_log_level",
"log/max_level_trace",
"log/release_max_level_info",
"tracing/max_level_trace",
"tracing/release_max_level_info",
]
@@ -58,6 +60,7 @@ const-str.workspace = true
ctor.workspace = true
dtor.workspace = true
futures.workspace = true
log.workspace = true
minicbor.workspace = true
minicbor-serde.workspace = true
rust-rocksdb.workspace = true
+1 -1
View File
@@ -171,7 +171,7 @@ pub(super) static MAPS: &[Descriptor] = &[
},
Descriptor {
name: "referencedevents",
..descriptor::RANDOM
..descriptor::DROPPED
},
Descriptor {
name: "refreshtoken_refreshtokeninfo",
+33 -8
View File
@@ -77,6 +77,7 @@ full = [
]
brotli_compression = [
"conduwuit-api/brotli_compression",
"conduwuit-core/brotli_compression",
"conduwuit-router/brotli_compression",
"conduwuit-service/brotli_compression",
@@ -88,10 +89,11 @@ direct_tls = [
"conduwuit-router/direct_tls"
]
element_hacks = [
"conduwuit-api/element_hacks",
"conduwuit-service/element_hacks",
"conduwuit-router/element_hacks",
]
gzip_compression = [
"conduwuit-api/gzip_compression",
"conduwuit-core/gzip_compression",
"conduwuit-router/gzip_compression",
"conduwuit-service/gzip_compression",
@@ -100,21 +102,21 @@ hardened_malloc = [
"conduwuit-core/hardened_malloc",
]
http3 = [
"conduwuit-service/http3"
"reqwest/http3"
]
ring = [
"rustls/ring",
"rustls/ring"
]
aws_lc_rs = [
"rustls/aws_lc_rs",
"dep:aws-lc-rs"
]
io_uring = [
"conduwuit-service/io_uring",
"conduwuit-database/io_uring",
]
jemalloc = [
"conduwuit-core/jemalloc",
"conduwuit-service/jemalloc",
"conduwuit-database/jemalloc",
]
jemalloc_prof = [
"conduwuit-core/jemalloc_prof",
@@ -143,13 +145,19 @@ perf_measurements = [
release_max_log_level = [
"tracing/max_level_trace",
"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-database/release_max_log_level",
"conduwuit-router/release_max_log_level",
"conduwuit-service/release_max_log_level",
]
sentry_telemetry = [
"dep:sentry",
"dep:sentry-tracing",
"dep:sentry-tower",
"conduwuit-core/sentry_telemetry",
"conduwuit-router/sentry_telemetry",
]
@@ -172,7 +180,9 @@ url_preview = [
"conduwuit-service/url_preview",
]
zstd_compression = [
"conduwuit-api/zstd_compression",
"conduwuit-core/zstd_compression",
"conduwuit-database/zstd_compression",
"conduwuit-router/zstd_compression",
"conduwuit-service/zstd_compression",
]
@@ -182,10 +192,10 @@ conduwuit_mods = [
bindgen-static = [
# "bindgen/static"
# "clang-sys/static"
"conduwuit-service/bindgen-static"
"conduwuit-database/bindgen-static"
]
bindgen-runtime = [
"conduwuit-service/bindgen-runtime"
"conduwuit-database/bindgen-runtime"
]
[build-dependencies]
@@ -193,7 +203,10 @@ bindgen-runtime = [
# clang-sys = {version = "1", default-features = false}
[dependencies]
conduwuit-admin.workspace = true
conduwuit-api.workspace = true
conduwuit-core.workspace = true
conduwuit-database.workspace = true
conduwuit-router.workspace = true
conduwuit-service.workspace = true
conduwuit-build-metadata.workspace = true
@@ -205,6 +218,7 @@ dtor.workspace = true
console-subscriber.optional = true
console-subscriber.workspace = true
const-str.workspace = true
log.workspace = true
opentelemetry.workspace = true
opentelemetry-otlp.optional = true
opentelemetry-otlp.workspace = true
@@ -212,10 +226,14 @@ opentelemetry-prometheus.workspace = true
opentelemetry-semantic-conventions.workspace = true
opentelemetry_sdk.workspace = true
prometheus.workspace = true
sentry-tower.optional = true
sentry-tower.workspace = true
sentry-tracing.optional = true
sentry-tracing.workspace = true
sentry.optional = true
sentry.workspace = true
tokio-metrics.optional = true
tokio-metrics.workspace = true
tokio.workspace = true
tracing-flame.optional = true
tracing-flame.workspace = true
@@ -225,7 +243,14 @@ tracing-subscriber.workspace = true
tracing.workspace = true
tracing-journald = { workspace = true, optional = true }
parking_lot.workspace = true
reqwest = { 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]
workspace = true
+1 -9
View File
@@ -60,18 +60,10 @@ pub(crate) fn init(
#[cfg(feature = "sentry_telemetry")]
let subscriber = {
use tracing::Level;
use tracing_subscriber::filter::{LevelFilter, filter_fn};
let sentry_filter = EnvFilter::try_new(&config.sentry_filter)
.map_err(|e| err!(Config("sentry_filter", "{e}.")))?;
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_layer = sentry_tracing::layer();
let (sentry_reload_filter, sentry_reload_handle) = reload::Layer::new(sentry_filter);
reload_handles.add("sentry", Box::new(sentry_reload_handle));
+14 -4
View File
@@ -25,11 +25,9 @@ brotli_compression = [
]
direct_tls = [
"axum-server/tls-rustls-no-provider",
"dep:rustls",
"dep:axum-server-dual-protocol",
]
element_hacks = [
"conduwuit-api/element_hacks",
]
gzip_compression = [
"conduwuit-admin/gzip_compression",
"conduwuit-api/gzip_compression",
@@ -73,9 +71,13 @@ release_max_log_level = [
"conduwuit-service/release_max_log_level",
"tracing/max_level_trace",
"tracing/release_max_level_info",
"log/max_level_trace",
"log/release_max_level_info",
]
sentry_telemetry = [
"conduwuit-core/sentry_telemetry",
"dep:sentry",
"dep:sentry-tracing",
"dep:sentry-tower",
]
systemd = [
@@ -108,9 +110,17 @@ http.workspace = true
http-body-util.workspace = true
hyper.workspace = true
hyper-util.workspace = true
log.workspace = true
opentelemetry-instrumentation-tower.workspace = true
ruma.workspace = true
sentry-tower = { workspace = true, optional = true }
rustls.workspace = 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
tokio.workspace = true
tower.workspace = true
+1 -1
View File
@@ -25,7 +25,7 @@ http.workspace = true
ruma.workspace = true
serde = { workspace = true }
serde_json = { workspace = true }
wildmatch = "2.7.0"
wildmatch = "2.6.1"
[dev-dependencies]
-19
View File
@@ -16,12 +16,6 @@ crate-type = [
]
[features]
bindgen-runtime = [
"conduwuit-database/bindgen-runtime"
]
bindgen-static = [
"conduwuit-database/bindgen-static"
]
brotli_compression = [
"conduwuit-core/brotli_compression",
"reqwest/brotli",
@@ -35,9 +29,6 @@ gzip_compression = [
"conduwuit-core/gzip_compression",
"reqwest/gzip",
]
http3 = [
"reqwest/http3"
]
io_uring = [
"conduwuit-database/io_uring",
]
@@ -131,9 +122,6 @@ lettre.workspace = true
resolvematrix.workspace = true
serde_urlencoded.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
[target.'cfg(all(unix, target_os = "linux"))'.dependencies]
@@ -142,10 +130,3 @@ sd-notify.optional = true
[lints]
workspace = true
[package.metadata.cargo-shear]
ignored = ["reqwest_0_12"]
[dev-dependencies]
opentelemetry.workspace = true
rustls = { workspace = true, features = ["ring"] }
-61
View File
@@ -1,61 +0,0 @@
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)
})
}
}
+42 -76
View File
@@ -1,39 +1,26 @@
mod dns_resolver;
use std::{sync::Arc, time::Duration};
use async_trait::async_trait;
use conduwuit::{
Config, Result, Server, debug, err, info, trace, utils::response::LimitReadExt, warn,
};
pub(crate) use dns_resolver::DnsResolver;
use conduwuit::{Config, Result, Server, err, trace, utils::response::LimitReadExt, warn};
use either::Either;
use hickory_resolver::{
TokioResolver,
config::{ConnectionConfig, NameServerConfig, ResolverConfig},
config::{ConnectionConfig, NameServerConfig},
net::runtime::TokioRuntimeProvider,
proto::rr::IntoName,
};
use ipaddress::IPAddress;
use reqwest::{dns::Resolve, redirect};
use reqwest::redirect;
use resolvematrix::server::{MatrixResolver, MatrixResolverBuilder};
use serde::Deserialize;
use crate::service;
pub struct Service {
/// Regular DNS resolver
pub matrix_resolver: Arc<MatrixResolver>,
pub dns_resolver: Arc<TokioResolver>,
/// 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 dns: reqwest::Client,
pub url_preview: reqwest::Client,
pub external_resource: reqwest::Client,
pub federation: reqwest::Client,
@@ -51,18 +38,9 @@ impl crate::Service for Service {
fn build(args: crate::Args<'_>) -> Result<Arc<Self>> {
let config = &args.server.config;
// Regular DNS resolver
let tokio_dns_resolver = get_dns_resolver(args.server)?;
let dns_resolver = get_dns_resolver(args.server)?;
// 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())?
let dns_client = base(&args.server.config)?
.connect_timeout(Duration::from_secs(args.server.config.well_known_conn_timeout))
.read_timeout(Duration::from_secs(args.server.config.well_known_timeout))
.timeout(Duration::from_secs(args.server.config.well_known_timeout))
@@ -70,17 +48,12 @@ impl crate::Service for Service {
.redirect(redirect::Policy::limited(4))
.build()?;
// Resolves hostnames into ip+port or hostname+port server combinations
// according to the server resolution spec
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)
.http_client(matrix_http_client.clone())
.dns_resolver(tokio_dns_resolver.clone())
.build()?);
// 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());
.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())
.dns_resolver(dns_resolver.clone())
.build()?);
let matrix_dns_resolver = matrix_resolver.create_dns_resolver();
let url_preview_bind_addr = config
.url_preview_bound_interface
@@ -99,12 +72,11 @@ impl crate::Service for Service {
Ok(Arc::new(Self {
matrix_resolver,
matrix_http_client,
reqwest_resolver: reqwest_dns_resolver.clone(),
dns_resolver,
dns_resolver: tokio_dns_resolver,
dns: dns_client,
url_preview: base(config, reqwest_dns_resolver.clone())
url_preview: base(config)
.and_then(|builder| {
builder_interface(builder, url_preview_bind_iface.as_deref())
})?
@@ -114,11 +86,12 @@ impl crate::Service for Service {
.user_agent(url_preview_user_agent)
.build()?,
external_resource: base(config, reqwest_dns_resolver.clone())?
external_resource: base(config)?
.redirect(redirect::Policy::limited(3))
.build()?,
federation: base(config, matrix_dns_resolver.clone())?
federation: base(config)?
.dns_resolver(matrix_dns_resolver.clone())
.connect_timeout(Duration::from_secs(config.federation_conn_timeout))
.read_timeout(Duration::from_secs(config.federation_timeout))
.timeout(Duration::from_secs(
@@ -131,7 +104,8 @@ impl crate::Service for Service {
.redirect(redirect::Policy::limited(3))
.build()?,
federation_slow: base(config, matrix_dns_resolver.clone())?
federation_slow: base(config)?
.dns_resolver(matrix_dns_resolver.clone())
.connect_timeout(Duration::from_secs(config.federation_conn_timeout))
.read_timeout(Duration::from_secs(config.federation_timeout.saturating_mul(6)))
.timeout(Duration::from_secs(
@@ -144,7 +118,8 @@ impl crate::Service for Service {
.redirect(redirect::Policy::limited(3))
.build()?,
sender: base(config, matrix_dns_resolver)?
sender: base(config)?
.dns_resolver(matrix_dns_resolver.clone())
.connect_timeout(Duration::from_secs(config.federation_conn_timeout))
.read_timeout(Duration::from_secs(config.sender_timeout))
.timeout(Duration::from_secs(config.sender_timeout))
@@ -153,7 +128,8 @@ impl crate::Service for Service {
.redirect(redirect::Policy::limited(2))
.build()?,
appservice: base(config, reqwest_dns_resolver.clone())?
appservice: base(config)?
.dns_resolver(matrix_dns_resolver)
.connect_timeout(Duration::from_secs(5))
.read_timeout(Duration::from_secs(config.appservice_timeout))
.timeout(Duration::from_secs(config.appservice_timeout))
@@ -162,7 +138,7 @@ impl crate::Service for Service {
.redirect(redirect::Policy::limited(2))
.build()?,
pusher: base(config, reqwest_dns_resolver.clone())?
pusher: base(config)?
.connect_timeout(Duration::from_secs(config.pusher_conn_timeout))
.timeout(Duration::from_secs(config.pusher_timeout))
.pool_max_idle_per_host(1)
@@ -172,7 +148,7 @@ impl crate::Service for Service {
// MSC4174 recommends against following redirects, since the
// destination is only checked before the request is sent.
webpush: base(config, reqwest_dns_resolver)?
webpush: base(config)?
.connect_timeout(Duration::from_secs(config.pusher_conn_timeout))
.timeout(Duration::from_secs(config.pusher_timeout))
.pool_max_idle_per_host(1)
@@ -245,21 +221,18 @@ impl Service {
}
}
pub(crate) fn base(
config: &Config,
resolver: Arc<dyn Resolve>,
) -> Result<reqwest::ClientBuilder> {
pub fn base(config: &Config) -> Result<reqwest::ClientBuilder> {
let mut builder = reqwest::Client::builder()
.dns_resolver(resolver)
.connect_timeout(Duration::from_secs(config.request_conn_timeout))
.read_timeout(Duration::from_secs(config.request_timeout))
.timeout(Duration::from_secs(config.request_total_timeout))
.pool_idle_timeout(Duration::from_secs(config.request_idle_timeout))
.pool_max_idle_per_host(config.request_idle_per_host.into())
.user_agent(conduwuit::user_agent())
.redirect(redirect::Policy::limited(6))
.hickory_dns(true)
.connect_timeout(Duration::from_secs(config.request_conn_timeout))
.read_timeout(Duration::from_secs(config.request_timeout))
.timeout(Duration::from_secs(config.request_total_timeout))
.pool_idle_timeout(Duration::from_secs(config.request_idle_timeout))
.pool_max_idle_per_host(config.request_idle_per_host.into())
.user_agent(conduwuit::user_agent())
.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)
.connection_verbose(cfg!(debug_assertions));
.connection_verbose(cfg!(debug_assertions));
#[cfg(feature = "gzip_compression")]
{
@@ -337,21 +310,19 @@ fn builder_interface(
fn get_dns_resolver(server: &Arc<Server>) -> Result<Arc<TokioResolver>> {
let config = &server.config;
let (system_resolver_config, mut opts) = hickory_resolver::system_conf::read_system_conf()
let (sys_conf, mut opts) = hickory_resolver::system_conf::read_system_conf()
.map_err(|e| err!(error!("Failed to configure DNS resolver from system: {e}")))?;
let mut conf = ResolverConfig::from_name_servers(vec![]);
let mut conf = hickory_resolver::config::ResolverConfig::default();
// Set domain and search domains from system config (/etc/resolv.conf)
if let Some(domain) = system_resolver_config.domain() {
if let Some(domain) = sys_conf.domain() {
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());
}
// Read nameservers from c10y config file
let config_nameservers: Vec<NameServerConfig> = server
.config
.dns_servers
@@ -359,16 +330,11 @@ fn get_dns_resolver(server: &Arc<Server>) -> Result<Arc<TokioResolver>> {
.filter_map(IntoName::to_ip)
.map(NameServerConfig::udp_and_tcp)
.collect();
let system_nameservers = system_resolver_config.name_servers().to_vec();
let nameservers = if !config_nameservers.is_empty() {
debug!("Using DNS nameservers from config file");
config_nameservers
} else {
debug!("Using DNS nameservers from /etc/resolv.conf");
system_nameservers
sys_conf.name_servers().to_vec()
};
info!(?nameservers, "Resolved nameservers for DNS client");
for sys_conf in nameservers {
let mut ns = sys_conf.clone();
+7
View File
@@ -125,6 +125,12 @@ impl ClientMetadata {
}
}
if self.grant_types.contains(&GrantType::ClientCredentials) {
return Err(
"Dynamically registered clients may not use the client credentials grant."
);
}
Ok(())
}
}
@@ -144,6 +150,7 @@ pub enum GrantType {
#[serde(rename = "urn:ietf:params:oauth:grant-type:device_code")]
DeviceCode,
RefreshToken,
ClientCredentials,
}
#[derive(Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, Deserialize, Serialize)]
+6 -1
View File
@@ -225,6 +225,10 @@ pub enum TokenRequestType {
RefreshToken {
refresh_token: String,
},
ClientCredentials {
client_secret: String,
scope: RawScopes,
},
}
impl TokenRequestType {
@@ -234,6 +238,7 @@ impl TokenRequestType {
| Self::AuthorizationCode { .. } => GrantType::AuthorizationCode,
| Self::DeviceCode { .. } => GrantType::DeviceCode,
| Self::RefreshToken { .. } => GrantType::RefreshToken,
| Self::ClientCredentials { .. } => GrantType::ClientCredentials,
}
}
}
@@ -243,7 +248,7 @@ pub struct TokenResponse {
pub access_token: String,
pub token_type: TokenType,
pub expires_in: u64,
pub refresh_token: String,
pub refresh_token: Option<String>,
pub scope: String,
}
+114 -10
View File
@@ -23,8 +23,9 @@ use crate::{
client_metadata::{ApplicationType, ClientMetadata, GrantType, ResponseType},
grant::{
AuthorizationCodeQuery, AuthorizationCodeResponse, CodeChallengeMethod,
DeviceCodeRequest, DeviceCodeResponse, ErrorCode, OAuthError, RequestedScopes,
ResponseMode, TokenRequest, TokenRequestType, TokenResponse, TokenType,
DeviceCodeRequest, DeviceCodeResponse, ErrorCode, OAuthError, RawScopes,
RequestedScopes, ResponseMode, TokenRequest, TokenRequestType, TokenResponse,
TokenType,
},
},
users::{self, DeviceToken},
@@ -39,6 +40,7 @@ pub struct Service {
tickets: SyncMutex<HashMap<String, HashMap<OAuthTicket, SystemTime>>>,
pending_auth_code_grants: SyncMutex<LruCache<String, PendingAuthCodeGrant>>,
pending_device_code_grants: SyncMutex<LruCache<String, PendingDeviceCodeGrant>>,
client_credential_sessions: tokio::sync::Mutex<HashMap<String, ClientCredentialsSession>>,
}
struct Data {
@@ -78,6 +80,12 @@ struct RefreshTokenInfo {
device_id: OwnedDeviceId,
}
pub struct ClientCredentialsSession {
pub client_id: String,
pub scopes: BTreeSet<OAuthClientScope>,
created_at: SystemTime,
}
struct PendingAuthCodeGrant {
authorizing_user: OwnedUserId,
requested_scopes: RequestedScopes,
@@ -172,6 +180,7 @@ impl crate::Service for Service {
tickets: SyncMutex::default(),
pending_auth_code_grants: SyncMutex::new(LruCache::new(Self::MAX_PENDING_GRANTS)),
pending_device_code_grants: SyncMutex::new(LruCache::new(Self::MAX_PENDING_GRANTS)),
client_credential_sessions: tokio::sync::Mutex::default(),
}))
}
@@ -448,12 +457,25 @@ impl Service {
pub async fn issue_token(&self, request: TokenRequest) -> Result<TokenResponse, OAuthError> {
let TokenRequest { client_id, request } = request;
let Some(client_metadata) = self.get_client_metadata(&client_id).await else {
return Err(OAuthError::new_static(ErrorCode::InvalidClient, "Invalid client ID"));
};
if !matches!(request, TokenRequestType::ClientCredentials { .. }) {
// The client credentials grant can only be used by statically
// registered clients, and the other grant types can
// only be used by dynamically registered clients, so we
// don't look up the dynamic client metadata if the token request is
// for the client credentials grant.
if !client_metadata.grant_types.contains(&request.grant_type()) {
return Err(OAuthError::unauthorized_client("Client cannot request this grant type"));
let Some(client_metadata) = self.get_client_metadata(&client_id).await else {
return Err(OAuthError::new_static(
ErrorCode::InvalidClient,
"Invalid client ID",
));
};
if !client_metadata.grant_types.contains(&request.grant_type()) {
return Err(OAuthError::unauthorized_client(
"Client cannot request this grant type",
));
}
}
match request {
@@ -525,6 +547,9 @@ impl Service {
},
| TokenRequestType::RefreshToken { refresh_token } =>
self.refresh_session(client_id, refresh_token).await,
| TokenRequestType::ClientCredentials { client_secret, scope: scopes } =>
self.create_client_credentials_token(&client_id, &client_secret, scopes)
.await,
}
}
@@ -542,7 +567,7 @@ impl Service {
{
(user_id, device_id)
} else {
return Err(OAuthError::invalid_grant("Invalid access or refersh token"));
return Err(OAuthError::invalid_grant("Invalid access or refresh token"));
};
// This will also call [`Self::remove_session`]
@@ -668,7 +693,7 @@ impl Service {
token_type: TokenType::Bearer,
expires_in: Self::ACCESS_TOKEN_MAX_AGE.as_secs(),
scope: response_scope,
refresh_token,
refresh_token: Some(refresh_token),
})
}
@@ -738,10 +763,89 @@ impl Service {
token_type: TokenType::Bearer,
expires_in: Self::ACCESS_TOKEN_MAX_AGE.as_secs(),
scope,
refresh_token: new_refresh_token,
refresh_token: Some(new_refresh_token),
})
}
async fn create_client_credentials_token(
&self,
client_id: &str,
client_secret: &str,
scopes: RawScopes,
) -> Result<TokenResponse, OAuthError> {
let now = SystemTime::now();
let Some(client) = self.services.config.oauth.clients.get(client_id) else {
return Err(OAuthError::new_static(ErrorCode::InvalidClient, "Unknown client ID"));
};
let RequestedScopes { device_id, scopes } = scopes
.to_scopes()
.map_err(|err| OAuthError::new(ErrorCode::InvalidGrant, err))?;
if device_id.is_some() {
return Err(OAuthError::new_static(
ErrorCode::InvalidGrant,
"Static clients may not request a device ID",
));
}
if client_secret != client.client_secret {
return Err(OAuthError::new_static(
ErrorCode::InvalidClient,
"Client secret does not match",
));
}
if !scopes.is_subset(&client.scopes) {
return Err(OAuthError::new_static(
ErrorCode::InvalidScope,
"This client may not request those scopes",
));
}
let mut sessions = self.client_credential_sessions.lock().await;
// Clear expired sessions while we're at it
sessions.retain(|_, session| {
now.duration_since(session.created_at)
.is_ok_and(|age| age <= Self::ACCESS_TOKEN_MAX_AGE)
});
let access_token = Self::generate_token();
let scope = scopes.iter().join(" ");
sessions.insert(access_token.clone(), ClientCredentialsSession {
client_id: client_id.to_owned(),
scopes,
created_at: now,
});
Ok(TokenResponse {
access_token,
token_type: TokenType::Bearer,
expires_in: Self::ACCESS_TOKEN_MAX_AGE.as_secs(),
refresh_token: None,
scope,
})
}
pub async fn get_client_credentials_session(
&self,
token: &str,
) -> Option<tokio::sync::MappedMutexGuard<'_, ClientCredentialsSession>> {
let sessions = self.client_credential_sessions.lock().await;
tokio::sync::MutexGuard::try_map(sessions, |sessions| {
sessions.get_mut(token).filter(|session| {
SystemTime::now()
.duration_since(session.created_at)
.is_ok_and(|age| age <= Self::ACCESS_TOKEN_MAX_AGE)
})
})
.ok()
}
pub async fn remove_session(&self, user_id: &UserId, device_id: &DeviceId) {
let session_info = self.get_session_info_for_device(user_id, device_id).await;
+1 -2
View File
@@ -32,7 +32,7 @@ use tokio::{runtime, sync::SetOnce};
use url::Url;
use crate::{
Dep, client, config, globals, media,
Dep, config, globals, media,
oauth::grant::AuthorizationCodeResponse,
threepid,
users::{self, AccountStatus, ProfileFieldChange},
@@ -163,7 +163,6 @@ impl crate::Service for Service {
machine: SetOnce::new(),
// This isn't in the client service because it has to use the `reqwest` shipped by `openidconnect`
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))
.read_timeout(Duration::from_secs(args.server.config.request_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::{
SecretKey,
ecdsa::{Signature, SigningKey, signature::Signer},
elliptic_curve::sec1::ToSec1Point,
elliptic_curve::sec1::ToEncodedPoint,
};
use serde_json::json;
@@ -48,7 +48,7 @@ impl Vapid {
};
let public_key =
URL_SAFE_NO_PAD.encode(secret.public_key().to_sec1_point(false).as_bytes());
URL_SAFE_NO_PAD.encode(secret.public_key().to_encoded_point(false).as_bytes());
Ok(Self {
secret,
+11 -3
View File
@@ -159,9 +159,15 @@ impl super::Service {
ready(auth_events_by_key.get(&key).map(ToOwned::to_owned))
};
state_res::event_auth::auth_check(room_version_rules, pdu, state_fetch, create_event)
.await
.map_err(|e| err!("Event self-authentication failed: {e:?}"))
state_res::event_auth::auth_check(
room_version_rules,
pdu,
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
@@ -235,6 +241,7 @@ impl super::Service {
let auth_check = state_res::event_auth::auth_check(
room_version_rules,
incoming_pdu,
None, // TODO: third party invite
|ty, sk| state_fetch(ty.clone(), sk.into()),
create_event.as_pdu(),
)
@@ -284,6 +291,7 @@ impl super::Service {
state_res::event_auth::auth_check(
room_version_rules,
incoming_pdu,
None, // third-party invite
state_fetch,
create_event.as_pdu(),
)
@@ -15,9 +15,6 @@ use ruma::{OwnedEventId, RoomId, room_version_rules::RoomVersionRules};
use crate::rooms::short::ShortStateHash;
#[cfg(test)]
mod tests;
impl super::Service {
/// Resolves the state before the incoming event.
///
@@ -127,7 +124,7 @@ impl super::Service {
.pdu_shortstatehash(prev_eventid)
.map_ok(move |sstatehash| (sstatehash, prev_event))
})
.try_collect::<Vec<_>>()
.try_collect::<HashMap<_, _>>()
.inspect_err(|e| debug_error!("failed to calculate N-degree short state hashes: {e}"))
.await
else {
@@ -1,271 +0,0 @@
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,6 +617,7 @@ impl Service {
let auth_check = state_res::event_auth::auth_check(
&room_version.rules().unwrap(),
&parsed_join_pdu,
None, // TODO: third party invite
|k, s| state_fetch(k.clone(), s.into()),
&create_event,
)
@@ -1,16 +1,14 @@
use conduwuit::{
Event, PduEvent, Result, err,
matrix::{PduCount, event::relation_type},
utils::ReadyExt,
};
use conduwuit::{Event, PduEvent, Result, err};
use ruma::{
UserId,
api::Direction,
events::relation::{
BundledMessageLikeRelations, BundledReference, ReferenceChunk, RelationType,
},
events::relation::{BundledMessageLikeRelations, BundledReference, ReferenceChunk},
};
use crate::rooms::timeline::PdusIterItem;
const MAX_BUNDLED_RELATIONS: usize = 50;
impl super::Service {
/// Gets bundled aggregations for an event according to the Matrix
/// specification.
@@ -28,24 +26,52 @@ impl super::Service {
return Ok(None);
}
let Some((room_id, target)) = self
.relation_target(&pdu.room_id_or_hash(), pdu.event_id())
.await
else {
return Ok(None);
};
let mut replace_events = Vec::new();
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),
| _ => {},
})
let relations = self
.get_relations(
user_id,
&pdu.room_id_or_hash(),
pdu.event_id(),
conduwuit::PduCount::max(),
MAX_BUNDLED_RELATIONS,
0,
Direction::Backward,
)
.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() {
return Ok(None);
}
@@ -59,9 +85,7 @@ impl super::Service {
.find_most_recent_valid_replacement(user_id, pdu, &replace_events)
.await?
{
bundled.replace = Some(Self::serialize_replacement(
&self.with_unsigned(user_id, replacement.clone()).await,
)?);
bundled.replace = Some(Self::serialize_replacement(replacement)?);
}
}
@@ -69,7 +93,7 @@ impl super::Service {
if !reference_events.is_empty() {
let reference_chunk: Vec<_> = reference_events
.into_iter()
.map(|relation| BundledReference::new(relation.event_id().to_owned()))
.map(|relation| BundledReference::new(relation.1.event_id().to_owned()))
.collect();
if !reference_chunk.is_empty() {
@@ -99,12 +123,14 @@ impl super::Service {
&self,
user_id: &UserId,
original_event: &PduEvent,
replacement_events: &'a [PduEvent],
replacement_events: &[&'a PdusIterItem],
) -> Result<Option<&'a PduEvent>> {
// Filter valid replacements and find the maximum in a single pass
let mut result: Option<&PduEvent> = None;
for pdu in replacement_events {
for relation in replacement_events {
let pdu = &relation.1;
// Validate replacement
if !Self::is_valid_replacement_event(original_event, pdu).await? {
continue;
@@ -219,7 +245,12 @@ impl super::Service {
/// Check if an event is itself a replacement
#[inline]
fn is_replacement_event(event: &PduEvent) -> bool {
relation_type(event) == Some(RelationType::Replacement)
event
.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
@@ -231,6 +262,12 @@ impl super::Service {
}
}
/// Helper enum for partitioning relations
enum RelationType<'a> {
Replace(&'a PdusIterItem),
Reference(&'a PdusIterItem),
}
#[cfg(test)]
mod tests {
use conduwuit_core::pdu::{EventHash, PduEvent};
+43 -56
View File
@@ -2,7 +2,8 @@ use std::{mem::size_of, sync::Arc};
use conduwuit::{
arrayvec::ArrayVec,
matrix::{PduCount, PduEvent},
matrix::PduCount,
result::LogErr,
utils::{
ReadyExt,
stream::{TryIgnore, WidebandExt},
@@ -11,14 +12,14 @@ use conduwuit::{
};
use database::Map;
use futures::{Stream, StreamExt};
use ruma::{EventId, RoomId, api::Direction};
use ruma::{EventId, UserId, api::Direction};
use crate::{
Dep,
rooms::{
self,
short::ShortRoomId,
timeline::{PduId, RawPduId},
short::{ShortEventId, ShortRoomId},
timeline::{PduId, PdusIterItem, RawPduId},
},
};
@@ -26,7 +27,6 @@ pub(super) struct Data {
tofrom_relation: Arc<Map>,
softfailedeventids: Arc<Map>,
rejectedeventids: Arc<Map>,
referencedevents: Arc<Map>,
services: Services,
}
@@ -41,7 +41,6 @@ impl Data {
tofrom_relation: db["tofrom_relation"].clone(),
softfailedeventids: db["softfailedeventids"].clone(),
rejectedeventids: db["rejectedeventids"].clone(),
referencedevents: db["referencedevents"].clone(),
services: Services {
timeline: args.depend::<rooms::timeline::Service>("rooms::timeline"),
},
@@ -55,54 +54,54 @@ impl Data {
self.tofrom_relation.aput_raw::<BUFSIZE, _, _>(key, []);
}
pub(super) fn get_relations(
&self,
pub(super) fn get_relations<'a>(
&'a self,
user_id: &'a UserId,
shortroomid: ShortRoomId,
target: u64,
target: ShortEventId,
from: PduCount,
dir: Direction,
) -> impl Stream<Item = (u64, PduEvent)> + Send + '_ {
self.relation_counts(target, from, dir)
.wide_filter_map(move |count| self.get_relation_pdu(shortroomid, count))
}
/// The counts of the direct relations of `target`, in the order of `dir`,
/// starting after `from`.
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();
) -> impl Stream<Item = PdusIterItem> + Send + 'a {
// Query from exact position then filter excludes it (saturating_inc
// could skip events at min/max boundaries)
let from_unsigned = from.into_unsigned();
let mut current = ArrayVec::<u8, 16>::new();
current.extend(target.to_be_bytes());
current.extend(from_unsigned.to_be_bytes());
let current = current.as_slice();
match dir {
| Direction::Forward => self.tofrom_relation.raw_keys_from(start).boxed(),
| Direction::Backward => self.tofrom_relation.rev_raw_keys_from(start).boxed(),
| Direction::Forward => self.tofrom_relation.raw_keys_from(current).boxed(),
| Direction::Backward => self.tofrom_relation.rev_raw_keys_from(current).boxed(),
}
.ignore_err()
.ready_take_while(move |key| key.starts_with(&target.to_be_bytes()))
.map(|to_from| u64_from_u8(&to_from[8..16]))
// The scan includes `from` itself, which should be skipped
.ready_filter(move |&count| PduCount::Normal(count).is_after(from, dir))
}
.map(PduCount::from_unsigned)
.ready_filter(move |count| {
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();
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 mut pdu = self.services.timeline.get_pdu_from_id(&pdu_id).await.ok()?;
Some((count, pdu))
let ctx = self
.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) {
@@ -134,16 +133,4 @@ impl Data {
self.unmark_event_rejected(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()
}
}
+44 -128
View File
@@ -1,20 +1,15 @@
mod bundled_aggregations;
mod data;
use std::{collections::HashSet, sync::Arc};
use std::sync::Arc;
use conduwuit::{
Result,
matrix::{PduCount, PduEvent},
result::LogErr,
utils::{IterStream, ReadyExt, stream::WidebandExt},
};
use futures::{Stream, StreamExt, future::try_join};
use conduwuit::{Result, matrix::PduCount};
use futures::{StreamExt, future::try_join};
use ruma::{EventId, RoomId, UserId, api::Direction};
use self::data::Data;
use crate::{
Dep,
rooms::{self, short::ShortRoomId, timeline::PdusIterItem},
rooms::{self, timeline::PdusIterItem},
};
pub struct Service {
@@ -56,7 +51,7 @@ impl Service {
}
#[allow(clippy::too_many_arguments)]
pub async fn get_relations<'a, F>(
pub async fn get_relations<'a>(
&'a self,
user_id: &'a UserId,
room_id: &'a RoomId,
@@ -65,130 +60,59 @@ impl Service {
limit: usize,
max_depth: u8,
dir: Direction,
matches: F,
) -> Vec<PdusIterItem>
where
F: Fn(&PduEvent) -> bool + Send + Sync,
{
let Some((room_id, target)) = self.relation_target(room_id, target).await else {
) -> Vec<PdusIterItem> {
let room_id = self.services.short.get_shortroomid(room_id);
let target = self.services.timeline.get_pdu_count(target);
let Ok((room_id, target)) = try_join(room_id, target).await else {
return Vec::new();
};
// Direct relations are already in order
if max_depth == 0 {
let counts = self.db.relation_counts(target, from, dir);
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 target = match target {
| PduCount::Normal(c) => c,
// TODO: Support backfilled relations
| _ => 0, // This will result in an empty iterator
};
// 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
let mut pdus: Vec<_> = self
.db
.relation_counts(target, scan_from, dir)
.get_relations(user_id, room_id, target, from, dir)
.collect()
.await;
seen.extend(level.iter().copied());
for _ in 0..max_depth {
if level.is_empty() {
break;
}
let next: Vec<Vec<_>> = level
.iter()
.copied()
.stream()
.wide_then(|target| {
self.db
.relation_counts(target, scan_from, dir)
.collect::<Vec<_>>()
})
let mut stack: Vec<_> = pdus
.iter()
.filter(|_| max_depth > 0)
.map(|pdu| (pdu.clone(), 1))
.collect();
'limit: while let Some(stack_pdu) = stack.pop() {
let target = match stack_pdu.0.0 {
| 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()
.await;
counts.append(&mut level);
level = next
.into_iter()
.flatten()
.filter(|&count| seen.insert(count))
.collect();
for relation in relations {
if stack_pdu.1 < max_depth {
stack.push((relation.clone(), stack_pdu.1.saturating_add(1)));
}
pdus.push(relation);
if pdus.len() >= limit {
break 'limit;
}
}
}
counts.append(&mut level);
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
pdus
}
#[inline]
@@ -207,14 +131,6 @@ impl Service {
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) {
self.db.mark_event_rejected(event_id);
}
+9 -65
View File
@@ -8,10 +8,7 @@ use database::{Deserialized, Json, Map};
use futures::{Stream, StreamExt};
use ruma::{
CanonicalJsonObject, OwnedRoomId, OwnedUserId, RoomId, UserId,
events::{
AnySyncEphemeralRoomEvent,
receipt::{ReceiptEvent, ReceiptType},
},
events::{AnySyncEphemeralRoomEvent, receipt::ReceiptEvent},
serde::Raw,
};
@@ -48,57 +45,20 @@ impl Data {
user_id: &UserId,
room_id: &RoomId,
event: &ReceiptEvent,
) -> bool {
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
) {
// Remove old entry
let last_possible_key = (room_id, u64::MAX);
let mut old_entries = Vec::new();
self.readreceiptid_readreceipt
.rev_stream_from_raw(&last_possible_key)
.rev_keys_from_raw(&last_possible_key)
.ignore_err()
.ready_take_while(|(key, _)| key.starts_with(room_id.as_bytes()))
.ready_filter_map(|(key, val)| {
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))
.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_for_each(|key| self.readreceiptid_readreceipt.del(key))
.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 latest_id = (room_id, count, user_id);
self.readreceiptid_readreceipt.put(latest_id, Json(event));
true
}
pub(super) fn readreceipts_since<'a>(
@@ -126,28 +86,12 @@ impl Data {
.ignore_err()
}
pub(super) async fn private_read_set(
&self,
room_id: &RoomId,
user_id: &UserId,
pdu_count: u64,
) -> bool {
pub(super) fn private_read_set(&self, room_id: &RoomId, user_id: &UserId, pdu_count: u64) {
let key = (room_id, user_id);
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_lastprivatereadupdate.put(key, next_count);
true
}
pub(super) async fn private_read_get_count(
+5 -59
View File
@@ -65,10 +65,7 @@ impl Service {
room_id: &RoomId,
event: ReceiptEvent,
) {
if !self.db.readreceipt_update(user_id, room_id, &event).await {
return;
}
self.db.readreceipt_update(user_id, room_id, &event).await;
self.services.sync.wake_all_joined(room_id).await;
// update appservices
let edu = EphemeralData::Receipt(event);
@@ -96,7 +93,7 @@ impl Service {
});
let (pdu_count, shortroomid) = try_join!(pdu_count, shortroomid)?;
let shorteventid = PduCount::from_unsigned(pdu_count);
let shorteventid = PduCount::Normal(pdu_count);
let pdu_id: RawPduId = PduId { shortroomid, shorteventid }.into();
let pdu = self.services.timeline.get_pdu_from_id(&pdu_id).await?;
@@ -104,7 +101,8 @@ impl Service {
let user_id: OwnedUserId = user_id.to_owned();
let mut receipt = ruma::events::receipt::Receipt::default();
receipt.ts = Some(pdu.origin_server_ts());
// TODO: start storing the timestamp so we can return one
receipt.ts = None;
receipt.thread = ruma::events::receipt::ReceiptThread::Unthreaded;
let content: BTreeMap<OwnedEventId, Receipts> = BTreeMap::from_iter([(
@@ -145,9 +143,7 @@ impl Service {
event_id: &EventId,
count: u64,
) {
if !self.db.private_read_set(room_id, user_id, count).await {
return;
}
self.db.private_read_set(room_id, user_id, count);
// update appservices matching the user's namespace (MSC2409)
let receipt_content = [(
@@ -271,54 +267,4 @@ mod tests {
assert!(users.contains_key(user_id!("@alice: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
);
}
}
+3 -11
View File
@@ -77,20 +77,12 @@ impl super::Service {
room_id: &RoomId,
event_id: &EventId,
) -> bool {
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;
return true;
};
let currently_member = self.services.state_cache.is_joined(user_id, room_id).await;
let history_visibility = self
.state_get_content(shortstatehash, &StateEventType::RoomHistoryVisibility, "")
.await
+35 -116
View File
@@ -3,10 +3,7 @@ use std::{collections::BTreeMap, sync::Arc};
use conduwuit::result::LogErr;
use conduwuit_core::{
Event, Result, err,
matrix::{
event::RelationTypeEqual,
pdu::{PduCount, PduEvent, PduId, RawPduId},
},
matrix::pdu::{PduCount, PduEvent, PduId, RawPduId},
utils::{
ReadyExt,
stream::{TryIgnore, WidebandExt},
@@ -15,14 +12,9 @@ use conduwuit_core::{
use conduwuit_database::{Deserialized, Map};
use futures::{Stream, StreamExt};
use ruma::{
CanonicalJsonObject, CanonicalJsonValue, EventId, OwnedUserId, RoomId, UInt, UserId,
api::{Direction, client::threads::get_threads::v1::IncludeThreads},
events::{
AnySyncMessageLikeEvent, AnySyncTimelineEvent,
relation::{BundledThread, RelationType},
},
serde::Raw,
uint,
CanonicalJsonValue, EventId, OwnedUserId, RoomId, UserId,
api::client::threads::get_threads::v1::IncludeThreads, events::relation::BundledThread,
serde::Raw, uint,
};
use serde_json::json;
@@ -35,7 +27,6 @@ pub struct Service {
struct Services {
short: Dep<rooms::short::Service>,
pdu_metadata: Dep<rooms::pdu_metadata::Service>,
timeline: Dep<rooms::timeline::Service>,
}
@@ -51,7 +42,6 @@ impl crate::Service for Service {
},
services: Services {
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"),
},
}))
@@ -61,86 +51,6 @@ impl crate::Service for 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
where
E: Event + Send + Sync,
@@ -168,20 +78,11 @@ impl Service {
.await
.map_err(|e| err!(Request(InvalidParam("Thread root pdu not found: {e:?}"))))?;
// get_relations doesn't support backfilled targets, so redactions
// couldn't update the aggregation of a backfilled root
//
// 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 CanonicalJsonValue::Object(unsigned) = root_pdu_json
.entry("unsigned".to_owned())
.or_insert_with(|| CanonicalJsonValue::Object(BTreeMap::default()))
{
let latest_event = Self::latest_event(event);
let thread = match unsigned
if let Some(mut relations) = unsigned
.get("m.relations")
.and_then(|r| r.as_object())
.and_then(|r| r.get("m.thread"))
@@ -189,16 +90,34 @@ impl Service {
serde_json::from_value::<BundledThread>(relations.clone().into()).ok()
}) {
// Thread already existed
| Some(mut thread) => {
thread.count = thread.count.saturating_add(uint!(1));
thread.latest_event = latest_event;
thread
},
// New thread
| None => BundledThread::new(latest_event, uint!(1), true),
};
relations.count = relations.count.saturating_add(uint!(1));
relations.latest_event = Raw::from_json(event.content().to_owned());
Self::set_thread(unsigned, thread);
let content = serde_json::to_value(relations).expect("to_value always works");
unsigned.insert(
"m.relations".to_owned(),
json!({ "m.thread": content })
.try_into()
.expect("thread is valid json"),
);
} else {
// New thread
let relations = BundledThread::new(
Raw::from_json(event.content().to_owned()),
uint!(1),
true,
);
let content = serde_json::to_value(relations).expect("to_value always works");
unsigned.insert(
"m.relations".to_owned(),
json!({ "m.thread": content })
.try_into()
.expect("thread is valid json"),
);
}
self.services
.timeline
+6 -32
View File
@@ -145,17 +145,9 @@ impl super::Service {
// 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
// extremities.
let effective_room_id = incoming_pdu.room_id_or_hash();
if !self
.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());
}
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 {
// If there's no room ID, this is a v12+ create event, which never
// has any predecessors, and consequently will be the
@@ -185,37 +177,19 @@ impl super::Service {
// 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
// rejected/soft-failed.
// Additionally, drop any events that were referenced late.
let outlier_prevs = prev_event
.prev_events()
.map(ToOwned::to_owned)
.stream()
.broad_filter_map(|prev_id| async {
let (exists, count, is_accepted, is_referenced) = tokio::join!(
let (exists, count, is_accepted) = tokio::join!(
self.pdu_exists(&prev_id),
self.get_pdu_count(&prev_id)
.unwrap_or(PduCount::Backfilled(i64::MIN)),
self.services.pdu_metadata.is_event_accepted(&prev_id),
self.services
.pdu_metadata
.is_event_referenced(room_id, &prev_id)
);
let is_backfilled = matches!(count, PduCount::Backfilled(_));
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)
(exists && !matches!(count, PduCount::Backfilled(_)) && !is_accepted)
.then_some(prev_id)
})
.collect::<Vec<_>>()
.await;
+9 -4
View File
@@ -256,10 +256,15 @@ impl super::Service {
| _ => create_pdu.as_ref().unwrap().as_pdu(),
};
let auth_check =
state_res::auth_check(&room_version_rules, &pdu, auth_fetch, create_event)
.await
.map_err(|e| err!(Request(Forbidden(warn!("Auth check failed: {e:?}")))))?;
let auth_check = state_res::auth_check(
&room_version_rules,
&pdu,
None, // TODO: third_party_invite
auth_fetch,
create_event,
)
.await
.map_err(|e| err!(Request(Forbidden(warn!("Auth check failed: {e:?}")))))?;
if !auth_check {
return Err!(Request(Forbidden("Event is not authorized.")));
+3 -25
View File
@@ -2,11 +2,10 @@ use conduwuit_core::{
Result, err,
matrix::event::Event,
utils::{self},
warn,
};
use ruma::{EventId, events::room::encrypted::Relation};
use ruma::EventId;
use super::{ExtractBody, ExtractRelatesTo};
use super::ExtractBody;
use crate::rooms::short::ShortRoomId;
impl super::Service {
@@ -32,12 +31,6 @@ impl super::Service {
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 Some(body) = content.body {
self.services
@@ -58,21 +51,6 @@ impl super::Service {
err!(Database(error!(%event_id, ?e, "Failed to convert PDU to canonical JSON")))
})?;
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(())
self.replace_pdu(&pdu_id, &obj).await
}
}
Loaded 100 of 105 files, more files were not shown because too many files have changed in this diff. Show more