fix: Properly handle appservice device creation

.forgejo/actions/create-docker-manifest/action.yml

@@ -44,7 +44,7 @@ runs:
 
     - name: Login to builtin registry
       if: ${{ env.BUILTIN_REGISTRY_ENABLED == 'true' }}
-      uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4
+      uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4
       with:
         registry: ${{ env.BUILTIN_REGISTRY }}
         username: ${{ inputs.registry_user }}

.forgejo/actions/prepare-docker-build/action.yml

@@ -79,7 +79,7 @@ runs:
 
     - name: Login to builtin registry
       if: ${{ env.BUILTIN_REGISTRY_ENABLED == 'true' }}
-      uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4
+      uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4
       with:
         registry: ${{ env.BUILTIN_REGISTRY }}
         username: ${{ inputs.registry_user }}

.forgejo/actions/timelord/action.yml

@@ -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@41049aa56687c35e0afa74eed4f09cec4f9afabf # v2
+      uses: https://github.com/taiki-e/install-action@50414676f9f5d50a65992c6dd2ed02641263226c # v2
       with:
         tool: git-warp-time,timelord-cli@3.0.1
 

.forgejo/workflows/build-debian.yml

@@ -18,7 +18,6 @@ jobs:
     strategy:
       matrix:
         container: [ "ubuntu-latest", "ubuntu-previous", "debian-latest", "debian-oldstable" ]
-        arch: [ "amd64", "arm64" ]
     container:
       image: "ghcr.io/tcpipuk/act-runner:${{ matrix.container }}"
 
@@ -44,7 +43,7 @@ jobs:
       #    fi
 
       - name: Checkout repository with full history
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           fetch-depth: 0
           ref: ${{ github.ref_name }}
@@ -55,9 +54,9 @@ jobs:
           path: |
             ~/.cargo/registry
             ~/.cargo/git
-          key: cargo-debian-${{ steps.debian-version.outputs.distribution }}-${{ matrix.arch }}-${{ hashFiles('**/Cargo.lock') }}
+          key: cargo-debian-${{ steps.debian-version.outputs.distribution }}-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
-            cargo-debian-${{ steps.debian-version.outputs.distribution }}-${{ matrix.arch }}-
+            cargo-debian-${{ steps.debian-version.outputs.distribution }}-
 
       - name: Setup sccache
         uses: https://git.tomfos.tr/tom/sccache-action@v1
@@ -71,55 +70,11 @@ jobs:
           # Aggressive GC since cache restores don't increment counter
           echo "CARGO_INCREMENTAL_GC_TRIGGER=5" >> $GITHUB_ENV
 
-      - name: Install cross-compilation tools for arm64
-        if: matrix.arch == 'arm64'
-        run: |
-          dpkg --add-architecture arm64
-          if ! apt-get update; then
-            # Older Ubuntu releases (e.g. noble) advertise arm64 in their
-            # Release files but only serve amd64/i386 from archive.ubuntu.com,
-            # so apt update 404s. Restrict the main sources to amd64 and
-            # fetch arm64 from ports.ubuntu.com instead.
-            CODENAME=$(lsb_release -sc)
-            # deb822 sources (noble and newer)
-            if [ -f /etc/apt/sources.list.d/ubuntu.sources ]; then
-              sed -i '/^Components:/a Architectures: amd64' /etc/apt/sources.list.d/ubuntu.sources
-            fi
-            # one-line sources (jammy and older)
-            if [ -f /etc/apt/sources.list ]; then
-              sed -i 's/^deb /deb [arch=amd64] /' /etc/apt/sources.list
-            fi
-            printf 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports %s main restricted universe multiverse\n' \
-              "$CODENAME" "$CODENAME-updates" "$CODENAME-security" \
-              > /etc/apt/sources.list.d/arm64-ports.list
-            apt-get update
-          fi
-          apt-get install -y \
-            gcc-aarch64-linux-gnu \
-            g++-aarch64-linux-gnu \
-            libc6-dev-arm64-cross
-
       - name: Setup Rust
         uses: ./.forgejo/actions/setup-rust
         with:
           github-token: ${{ secrets.GH_PUBLIC_RO }}
 
-      - name: Add Rust target
-        run: |
-          TARGET=${{ matrix.arch == 'arm64' && 'aarch64-unknown-linux-gnu' || 'x86_64-unknown-linux-gnu' }}
-          rustup target add $TARGET
-
-      - name: Configure cross-compilation for arm64
-        if: matrix.arch == 'arm64'
-        run: |
-          echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
-          echo "CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
-          echo "CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++" >> $GITHUB_ENV
-          # rust-rocksdb's build script probes liburing via pkg-config, which
-          # refuses to run when host != target unless explicitly allowed
-          echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV
-          echo "PKG_CONFIG_PATH_aarch64_unknown_linux_gnu=/usr/lib/aarch64-linux-gnu/pkgconfig" >> $GITHUB_ENV
-
       - name: Get package version and component
         id: package-meta
         run: |
@@ -165,26 +120,21 @@ jobs:
           apt-get update -y
           # Build dependencies for rocksdb
           apt-get install -y liburing-dev clang
-          # For arm64 builds, install cross-compiled dependencies.
-          # libstdc++6:arm64 is needed by dpkg-shlibdeps to resolve the
-          # dynamically-linked libstdc++ when cargo-deb computes $auto depends.
-          if [ "${{ matrix.arch }}" = "arm64" ]; then
-            apt-get install -y liburing-dev:arm64 libstdc++6:arm64
-          fi
 
       - name: Run cargo-deb
         id: cargo-deb
         run: |
-          TARGET=${{ matrix.arch == 'arm64' && 'aarch64-unknown-linux-gnu' || 'x86_64-unknown-linux-gnu' }}
-          DEB_PATH=$(cargo deb --target $TARGET --deb-version ${{ steps.package-meta.outputs.version }})
+          DEB_PATH=$(cargo deb --deb-version ${{ steps.package-meta.outputs.version }})
           echo "path=$DEB_PATH" >> $GITHUB_OUTPUT
 
       - name: Test deb installation
-        if: matrix.arch == 'amd64'
         run: |
           echo "Installing: ${{ steps.cargo-deb.outputs.path }}"
+
           apt-get install -y ${{ steps.cargo-deb.outputs.path }}
+
           dpkg -s continuwuity
+
           [ -f /usr/bin/conduwuit ] && echo "✅ Binary installed successfully"
           [ -f /usr/lib/systemd/system/conduwuit.service ] && echo "✅ Systemd service installed"
           [ -f /etc/conduwuit/conduwuit.toml ] && echo "✅ Config file installed"
@@ -192,7 +142,7 @@ jobs:
       - name: Upload deb artifact
         uses: forgejo/upload-artifact@v4
         with:
-          name: continuwuity-${{ steps.debian-version.outputs.distribution }}-${{ matrix.arch }}
+          name: continuwuity-${{ steps.debian-version.outputs.distribution }}
           path: ${{ steps.cargo-deb.outputs.path }}
 
       - name: Publish to Forgejo package registry

.forgejo/workflows/build-nix.yml

@@ -65,7 +65,7 @@ jobs:
           path: binaries
           merge-multiple: true
       - name: Create Release and Upload
-        uses: https://github.com/softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v3
+        uses: https://github.com/softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3
         with:
           draft: true
           files: binaries/*

.forgejo/workflows/documentation.yml

@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Sync repository
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           persist-credentials: false
           fetch-depth: 0
@@ -32,7 +32,7 @@ jobs:
 
       - name: Setup Node.js
         if: steps.runner-env.outputs.node_major == '' || steps.runner-env.outputs.node_major < '20'
-        uses: https://github.com/actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7
+        uses: https://github.com/actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
         with:
           node-version: 22
 

.forgejo/workflows/element.yml

@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: 📦 Setup Node.js
-        uses: https://github.com/actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7
+        uses: https://github.com/actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
         with:
           node-version: "22"
 

.forgejo/workflows/mirror-images.yml

@@ -41,7 +41,7 @@ jobs:
       DOCKER_MIRROR_TOKEN: ${{ secrets.DOCKER_MIRROR_TOKEN }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           persist-credentials: false
 
@@ -55,7 +55,7 @@ jobs:
       #     repositories: continuwuity
 
       - name: Install regsync
-        uses: https://github.com/regclient/actions/regsync-installer@c48159175b58fb90cccd0f98410927a81e04a166 # main
+        uses: https://github.com/regclient/actions/regsync-installer@39bf30ced4be9d147faaabbde2682e9725fb8bd1 # main
 
       - name: Check what images need mirroring
         run: |

.forgejo/workflows/prek-checks.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           persist-credentials: false
 
@@ -48,7 +48,7 @@ jobs:
       rust: ${{ steps.filter.outputs.rust }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           persist-credentials: false
 
@@ -70,7 +70,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           persist-credentials: false
 

.forgejo/workflows/release-image.yml

@@ -46,7 +46,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           persist-credentials: false
       - name: Prepare Docker build environment
@@ -101,7 +101,7 @@ jobs:
     needs: build-release
     steps:
       - name: Checkout repository
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           persist-credentials: false
       - name: Create multi-platform manifest
@@ -134,7 +134,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           persist-credentials: false
       - name: Prepare max-perf Docker build environment
@@ -189,7 +189,7 @@ jobs:
     needs: build-maxperf
     steps:
       - name: Checkout repository
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           persist-credentials: false
       - name: Create max-perf manifest
@@ -218,7 +218,7 @@ jobs:
           path: binaries
           merge-multiple: true
       - name: Create Release and Upload
-        uses: https://github.com/softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v3
+        uses: https://github.com/softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3
         with:
           draft: true
           files: binaries/*

.forgejo/workflows/renovate.yml

@@ -43,11 +43,11 @@ jobs:
     name: Renovate
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/renovatebot/renovate:43.281.1@sha256:34c2dd58f58e8976be2024a24fec23bbee805f0bf887837d9aaee7daeb09ccfc
+      image: ghcr.io/renovatebot/renovate:43.252.1@sha256:121eb04ef758537019fb58f587aa53c99e5fda4e703993ce2ca01bd4b3926bd4
       options: --tmpfs /tmp:exec
     steps:
       - name: Checkout
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           show-progress: false
 

.forgejo/workflows/update-flake-hashes.yml

@@ -14,7 +14,7 @@ jobs:
   update-flake-hashes:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           persist-credentials: true
           token: ${{ secrets.FORGEJO_TOKEN }}

CHANGELOG.md

@@ -1,67 +1,3 @@
-# Continuwuity 26.7.0 (2026-07-27)
-
-## Features
-
-- Build and publish arm64 .deb packages alongside amd64 for all supported Debian and Ubuntu releases. (#1235)
-- Dehydrated devices are now visible in the account panel. Contributed by @ginger. (#1970)
-- Introduce `accepted_ip_sources` as a multiple options variant of `request_ip_source`, allowing for more advanced deployments and making fallbacks an explicit choice. Contributed by @Omar007 (#1985)
-- Added an admin command to issue an access token for a bot account, to allow legacy bots to function while legacy authentication is disabled. Contributed by @ginger (#2044)
-- Added support for the OAuth2 device authorization flow. Contributed by @ginger
-- Added support for the stable mutual rooms query endpoint. Contributed by @ginger
-- Fetch the joined member count once per event instead of once per notified user.
-
-## Bugfixes
-
-- Fix joining restricted rooms over federation failing with signature verification error. (fix-federation-signature)
-- Fixed the client space hierarchy endpoint returning a 500 "Space hierarchy is unreasonably large" error for cyclic space graphs (e.g. a space containing itself). Rooms are now deduplicated during traversal as required by the spec, and the traversal depth is bounded even when the client does not specify `max_depth`. (space-hierarchy-cycle)
-- Fixed simplified sliding sync holding account data for up to 30 seconds, which made encryption setup and cross-signing resets appear to hang. (sss-account-data-longpoll)
-- Fixed local invites and invite acceptances not being reflected in sync promptly. Contributed by @eleboucher (wake-local-member-sync)
-- Fixed the deeplink redirect for deleting devices. Contributed by @koen (#1965)
-- Fix status code for oauth registration. Contributed by @n00byking (#1984)
-- Exempt m.room.create from auth_events check. Contributed by @eleboucher (#1987)
-- Fixed `create` being returned as a supported prompt value regardless of if registration is enabled or not. Contributed by @ginger (#1994)
-- Fixed high CPU usage when multiple clients from the same account were connected at once. Each sync woke the account's other sync loops, causing them to wake each other in a loop. (#2006)
-- Fixed MSC4190 appservice device creation registering a random device ID instead of the requested one (and dropping the requested display name), which prevented encrypted mautrix bridges from starting on OIDC-enabled servers and leaked an orphan device on the bridge bot per startup attempt. (#2015)
-- Deactivated users and appservice puppets are no longer counted by `/_continuwuity/local_user_count`. Contributed by @ginger. (#2040)
-- Re-introduced admin room registration alerts that were accidentally removed in the OAuth2 update. (#2057)
-- Appservices are now properly able to create devices for E2EE.
-- Appservices may now specify both the unstable and stable `device_id` query parameters in a request. The stable parameter will take priority. Contributed by @ginger.
-- Fixed `roomuserid_lastnotificationread` being aliased to the highlight count table, which clobbered highlight counts when setting a read marker. Contributed by @eleboucher
-- Fixed freshly left room failing to sync.
-- Fixed newly created rooms failing to sync properly in clients using legacy sync.
-- Fixed newly joined rooms failing to sync their full state (including the room name) to clients using legacy sync.
-- Fixed requests returning `500 Internal Server Error` when the header selected by `request_ip_source` is absent, duplicated, or malformed (for example Envoy omitting `X-Envoy-External-Address` on internal requests). The client IP now falls back to the connection peer address instead of failing the request. Contributed by @eleboucher
-- Resolve alias service by correct name for auto-join. Contributed by @eleboucher
-
-## Improved Documentation
-
-- Updated an out-of-date statement about Oracle Linux release cadences. (#1999)
-
-
-# Continuwuity 26.6.2 (2026-07-12)
-
-## Bugfixes
-
-- Fixed the server returning 500 errors if `admin_console_automatic` is enabled and no TTY is available. Contributed by @s1lv3r. (#1975)
-- Fixed `global.oauth.compatibility_mode` being required, despite being ignored, when the `[global.oauth.oidc]` config section is provided.
-- Fixed an issue with a migration that could cause user accounts imported from an identity provider to be marked as deactivated when the server started. If you have accounts affected by this issue, use `!admin users reset-password --convert-to-local-account` to reactivate them.
-
-
-# Continuwuity 26.6.1 (2026-07-12)
-
-## Features
-
-- Added enforcement for new federated invite checks and corrected a bunch of related spec compliance issues along the way. Contributed by @nex. (#1952)
-
-## Bugfixes
-
-- Fixed existing accounts failing to link when logging in with OIDC if `prompt_for_localpart` was `false`. (#1942)
-- Authentication is no longer required on the `/_matrix/client/v3/account/3pid/email/requestToken` endpoint. (#1953)
-- Fixed newly created rooms failing to sync properly in clients using legacy sync.
-- Stopped appservice users from being erroneously marked as deactivated during a 26.6 database migration.
-- Whitespace will now automatically be trimmed from the start and end of the `global.oauth.oidc.client_secret_file`.
-
-
 # Continuwuity 26.6.0 (2026-07-10)
 
 ## Features

CONTRIBUTING.md

@@ -26,7 +26,7 @@ ### Pre-commit Checks
 
 
 ```bash
-# Install prek using cargo-binstall https://github.com/cargo-bins/cargo-binstall
+# Install prek using cargo-binstall
 cargo binstall prek
 
 # Install git hooks to run checks automatically
@@ -155,7 +155,7 @@ ### Creating pull requests
 
 Before submitting a pull request, please ensure:
 1. Your code passes all CI checks (formatting, linting, typo detection, etc.)
-2. Your code follows the [code style guide](docs/development/code_style.mdx)
+2. Your code follows the [code style guide](/development/code_style.md)
 3. Your commit messages follow the conventional commits format
 4. Tests are added for new functionality
 5. Documentation is updated if needed

Cargo.toml

@@ -12,7 +12,7 @@ license = "Apache-2.0"
 # See also `rust-toolchain.toml`
 readme = "README.md"
 repository = "https://forgejo.ellis.link/continuwuation/continuwuity"
-version = "26.7.2"
+version = "26.6.0"
 
 [workspace.metadata.crane]
 name = "conduwuit"
@@ -115,8 +115,8 @@ git = "https://github.com/vinchona/axum-server-dual-protocol.git"
 rev = "ca6db055254255b74238673ce4135698e347d71c" # feat!: bump axum_server to 0.8.0
 default-features = false
 
-[workspace.dependencies.client-ip]
-version = "0.2"
+[workspace.dependencies.axum-client-ip]
+version = "1.3"
 
 [workspace.dependencies.tower]
 version = "0.5.2"
@@ -141,6 +141,12 @@ features = [
 version = "0.23.25"
 default-features = false
 
+[workspace.dependencies.aws-lc-sys]
+version = "0.41.0"
+
+[workspace.dependencies.aws-lc-rs]
+version = "1.17.0"
+
 [workspace.dependencies.reqwest]
 version = "0.13.2"
 default-features = false
@@ -342,8 +348,9 @@ version = "1.1.1"
 
 # Used for matrix spec type definitions and helpers
 [workspace.dependencies.ruma]
+# version = "0.14.1"
 git = "https://github.com/ruma/ruma.git"
-rev = "e7284c31da289f0a3b885191f5b2b6b307fa059f"
+rev = "9b6a2e7323649af926e4b5363d87239ee4247f4a"
 features = [
     "appservice-api-c",
     "client-api",
@@ -356,6 +363,7 @@ features = [
     "compat-upload-signatures",
     "compat-optional-txn-pdus",
     "compat-get-3pids",
+    "unstable-msc2666",
     "unstable-msc2867",
     "unstable-msc2870",
     "unstable-msc3061",
@@ -501,7 +509,7 @@ default-features = false
 version = "0.1"
 
 [workspace.dependencies.syn]
-version = "3.0"
+version = "2.0"
 default-features = false
 features = ["full", "extra-traits"]
 
@@ -562,7 +570,7 @@ features = ["std"]
 version = "0.3.0"
 
 [workspace.dependencies.resolvematrix]
-version = "1.2.0"
+version = "1.1.0"
 
 [workspace.dependencies.serde_urlencoded]
 version = "0.7.1"

SECURITY.md

@@ -1,90 +1,47 @@
 # Security Policy for Continuwuity
 
-This document outlines the security policy for Continuwuity. Our goal is to maintain a secure platform for all users,
-and we take security matters seriously.
+This document outlines the security policy for Continuwuity. Our goal is to maintain a secure platform for all users, and we take security matters seriously.
 
 ## Supported Versions
 
 We provide security updates for the following versions of Continuwuity:
 
-| Version        | Supported |
-|----------------|:---------:|
-| Latest release |     ✅     |
-| Main branch    |     ✅     |
-| Older releases |     ❌     |
+| Version        | Supported        |
+| -------------- |:----------------:|
+| Latest release |        ✅        |
+| Main branch    |        ✅        |
+| Older releases |        ❌        |
 
-We may backport fixes to the previous release at our discretion, but we don't guarantee this; our versioning is designed
-to encourage users to stay up-to-date with the latest release, and we have no concept of "long term support".
+We may backport fixes to the previous release at our discretion, but we don't guarantee this.
 
 ## Reporting a Vulnerability
 
 ### Responsible Disclosure
 
-We appreciate the efforts of security researchers and the community in identifying and reporting vulnerabilities. To
-ensure that potential vulnerabilities are addressed properly, please follow these guidelines:
+We appreciate the efforts of security researchers and the community in identifying and reporting vulnerabilities. To ensure that potential vulnerabilities are addressed properly, please follow these guidelines:
 
 1. **Contact members of the team directly** over E2EE private message.
-    - [@jade:ellis.link](https://matrix.to/#/@jade:ellis.link)
-    - [@nex:nexy7574.co.uk](https://matrix.to/#/@nex:nexy7574.co.uk)
-    - [@ginger:gingershaped.computer](https://matrix.to/#/@ginger:gingershaped.computer)
-2. **Email the security team** at [security@continuwuity.org](mailto:security@continuwuity.org). This is not E2EE, so
-   don't include sensitive details.
-3. **Do not disclose the vulnerability publicly** until a fix has been pushed to the main branch.
+   - [@jade:ellis.link](https://matrix.to/#/@jade:ellis.link)
+   - [@nex:nexy7574.co.uk](https://matrix.to/#/@nex:nexy7574.co.uk)
+   - [@ginger:gingershaped.computer](https://matrix.to/#/@ginger:gingershaped.computer)
+2. **Email the security team** at [security@continuwuity.org](mailto:security@continuwuity.org). This is not E2EE, so don't include sensitive details.
+3. **Do not disclose the vulnerability publicly** until it has been addressed
 4. **Provide detailed information** about the vulnerability, including:
-    - A clear description of the issue
-    - Steps to reproduce
-    - Potential impact
-    - Any possible mitigations
-    - Version(s) affected, including specific commits if possible
-    - How you want to be attributed if your report is accepted (website, social media handle, Matrix user ID, etc).
-      **Please state explicitly if you wish to remain anonymous.**
+   - A clear description of the issue
+   - Steps to reproduce
+   - Potential impact
+   - Any possible mitigations
+   - Version(s) affected, including specific commits if possible
 
-If you have any doubts about a potential security vulnerability, contact us via private channels first! We'd prefer that
-you bother us, instead of having a vulnerability disclosed without a fix.
+If you have any doubts about a potential security vulnerability, contact us via private channels first! We'd prefer that you bother us, instead of having a vulnerability disclosed without a fix.
 
-### Terms for credit
-
-Before reporting a vulnerability, please remember that we are a small team maintaining a large codebase depended upon by
-a vast unknown number of users in our free time. While we always investigate *all* security reports, we may not
-acknowledge or credit your report under certain circumstances.
-
-#### Following the security policy
-
-If you do not report the vulnerability following this security policy, your report may be ignored and/or may not be
-credited if fixed. This includes filing for GitHub security advisories without contacting us directly first (we do not
-get notified about these!).
-
-#### Automation-assisted reports
-
-Reports assisted by automatic tooling such as LLMs MUST disclose such in the report.
-Assisted reports must also produce a working proof-of-concept (PoC) demonstrating the vulnerability against the latest
-release and/or main commit with no modifications to the codebase. This is to demonstrate that not only does
-the author understand the vulnerability that they are reporting, but also that the vulnerability is reproducible
-and not a false positive.
-
-#### Reports for known issues
-
-Reports for issues we are already aware of will only be credited if subsequent reporters provide new information.
-
-#### Audits and CVE farming
-
-Sweeping audits (vulnerability hunting) **must** be coordinated with the team first - receiving a rapsheet of new
-vulnerabilities is explicitly not helpful to us and only harms the project. If you are interested in performing a
-security audit, please contact us first to discuss the scope and methodology.
-
-Likewise, CVE farming (reporting vulnerabilities with the primary intent to get a CVE number) is actively harmful to the
-project, and will not be credited. Severe violations of this policy will result in a permanent ban from collaborating
-with the project in any capacity. We are attempting to build high quality free software, not flesh out your CV/resume.
-
-### What to expect
+### What to Expect
 
 When you report a security vulnerability:
 
-1. **Acknowledgment**: We will acknowledge receipt of your report. We may ask for further information.
-2. **Triage**: The report will be triaged into our internal tracker, and you will be provided with a reference number (
-   in case you end up with multiple reports). An ETA for a fix will be provided if feasible.
-3. **Updates**: We will provide updates on our progress in addressing the vulnerability, including a heads-up for when
-   we plan to release a fix.
+1. **Acknowledgment**: We will acknowledge receipt of your report.
+2. **Assessment**: We will assess the vulnerability and determine its impact on our users
+3. **Updates**: We will provide updates on our progress in addressing the vulnerability, and may request you help test mitigations
 4. **Resolution**: Once resolved, we will notify you and discuss coordinated disclosure
 5. **Credit**: We will recognize your contribution (unless you prefer to remain anonymous)
 
@@ -94,8 +51,7 @@ ## Security Update Process
 
 1. We will develop and test fixes in a private fork
 2. Security updates will be released as soon as possible
-3. Release notes will include information about the vulnerabilities, avoiding details that could facilitate exploitation
-   where possible
+3. Release notes will include information about the vulnerabilities, avoiding details that could facilitate exploitation where possible
 4. Critical security updates may be backported to the previous stable release
 
 ## Additional Resources

changelog.d/+39fcec3a.bugfix.md

@@ -0,0 +1 @@
+Appservices are now properly able to create devices for E2EE.

changelog.d/+88fbb987.bugfix.md

@@ -0,0 +1 @@
+Fixed newly created rooms failing to sync properly in clients using legacy sync.

changelog.d/+91e96207.bugfix.md

@@ -0,0 +1 @@
+Stopped appservice users from being erroneously marked as deactivated during a 26.6 database migration.

changelog.d/1942.bugfix.md

@@ -0,0 +1 @@
+Fixed existing accounts failing to link when logging in with OIDC if `prompt_for_localpart` was `false`.

changelog.d/1953.bugfix.md

@@ -0,0 +1 @@
+Authentication is no longer required on the `/_matrix/client/v3/account/3pid/email/requestToken` endpoint.

changelog.d/sec10.bugfix.md

@@ -1 +0,0 @@
-**TODO - embargoed until next release** (maintainers see security issue 10 when writing rls notes). Contributed by @eleboucher.

conduwuit-example.toml

@@ -290,7 +290,7 @@
 #
 #ip_lookup_strategy = 5
 
-# The preferred source to use for getting the real client IP.
+# The source to use for discovering the real connecting client IP.
 #
 # Takes any of the following options:
 #
@@ -301,47 +301,16 @@
 # "true_client_ip" - `True-Client-Ip` header
 # "x_envoy_external_address" - `X-Envoy-External-Address` header
 # "x_real_ip" - `X-Real-Ip` header
-# "direct" - the directly connected IP address (fallback for other
-# options)
 #
 # Only set this if you are certain only your reverse proxy
 # will send the expected header. There is no "is the connecting IP allowed
 # to set this header" check; if the header selected is present, it is
 # used.
 #
-# Ignored if `accepted_ip_sources` is set.
-#
-# If not set set, `direct` is used. Additionally, `direct` is used
-# as a fallback if the chosen header is not found.
+# Defaults to the IP address actually making the connection.
 #
 #request_ip_source = false
 
-# The accepted source(s) for the real client IP.
-#
-# Takes any combination of the following options:
-#
-# "cf_connecting_ip" - `Cf-Connecting-Ip` header
-# "cloudfront_viewer_address" - `CloudFront-Viewer-Address` header
-# "fly_client_ip" - `Fly-Client-IP` header
-# "x_forwarded_for" - rightmost value of the `X-Forwarded-For` header
-# "true_client_ip" - `True-Client-Ip` header
-# "x_envoy_external_address" - `X-Envoy-External-Address` header
-# "x_real_ip" - `X-Real-Ip` header
-# "direct" - the directly connected IP address
-#
-# Only set this if you are certain only your reverse proxy
-# will send the expected header. There is no "is the connecting IP allowed
-# to set this header" check; if the header selected is present, it is
-# used.
-#
-# One of the configured sources must be available or the request is
-# rejected. If you want a fallback (including `direct`!), you have to
-# configure it. Priority is based on configuration order.
-#
-# If not set, `request_ip_source` configuration is used.
-#
-#accepted_ip_sources = []
-
 # Max request size for file uploads in bytes. Defaults to 20MB.
 # Also limits incoming federated media.
 #

docker/Dockerfile

@@ -50,7 +50,7 @@ EOF
 
 # Developer tool versions
 # renovate: datasource=github-releases depName=cargo-bins/cargo-binstall
-ENV BINSTALL_VERSION=1.21.1
+ENV BINSTALL_VERSION=1.20.1
 # renovate: datasource=github-releases depName=psastras/sbom-rs
 ENV CARGO_SBOM_VERSION=0.9.1
 # renovate: datasource=crate depName=lddtree

docker/musl.Dockerfile

@@ -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.21.1
+ENV BINSTALL_VERSION=1.20.1
 # renovate: datasource=github-releases depName=psastras/sbom-rs
 ENV CARGO_SBOM_VERSION=0.9.1
 # renovate: datasource=crate depName=lddtree

docs/deploying/rpm.mdx

@@ -15,8 +15,8 @@ ## Overview
 
 :::warning Oracle Linux support
 Due to upstream limitations, Terra is only usable on Oracle Linux if you use [upstream EPEL](https://docs.fedoraproject.org/en-US/epel/getting-started/)
-rather than Oracle's rebuilds of EPEL. Oracle tends to lag behind on new EL versions, both major and minor—for example, Oracle's release of 10.2 lagged
-approximately 1.5 months behind other ELs—so you may encounter further compatibility issues with EPEL.
+rather than Oracle's rebuilds of EPEL. Oracle tends to lag behind on new EL versions, both major and minor—for example, as of the time of writing, 10.2 has been
+available for over a month through other ELs, but Oracle has not yet released corresponding updates—so you may encounter further compatibility issues with EPEL.
 **For this reason, it is recommended that you use another EL distribution if at all possible.**
 :::
 

docs/public/.well-known/continuwuity/announcements

@@ -6,10 +6,10 @@
             "message": "Welcome to Continuwuity! Important announcements about the project will appear here."
         },
         {
-            "id": 16,
+            "id": 15,
             "mention_room": true,
-            "date": "2026-07-13",
-            "message": "[Continuwuity 26.6.2](https://forgejo.ellis.link/continuwuation/continuwuity/releases/tag/v26.6.1) has just been released! This release fixes a severe bug with OIDC that could cause users' accounts to be flagged as deactivated. If you use OIDC, please update as soon as possible."
+            "date": "2026-07-10",
+            "message": "[Continuwuity 26.6.0](https://forgejo.ellis.link/continuwuation/continuwuity/releases/tag/v26.6.0) is finally out! This is by far our largest release yet, and it wouldn't have been possible without our community. Thank you so much for all of your patience, support, and/or development time over the last three months <3"
         }
     ]
 }

docs/reference/admin/users.md

@@ -8,10 +8,6 @@ ## `!admin users create-user`
 
 Create a new user
 
-## `!admin users issue-token`
-
-Issue an access token for a user. This command will not work on shadow users, such as appservice puppets or accounts imported from an identity provider
-
 ## `!admin users reset-password`
 
 Reset user password

flake.lock

@@ -3,11 +3,11 @@
     "advisory-db": {
       "flake": false,
       "locked": {
-        "lastModified": 1783840254,
-        "narHash": "sha256-XjyvZk0f3YiinVHmkGOotmLBAzvK+LwEJYj2QqJ5pn8=",
+        "lastModified": 1781566179,
+        "narHash": "sha256-Tqv8I586fYzWpEW/Smq/JqESFa3DVVzVWsnAMtvhy/I=",
         "owner": "rustsec",
         "repo": "advisory-db",
-        "rev": "6e3286f4efa8c142fb33e5ea4342c8db6693cf34",
+        "rev": "74e084413d979d52d2f93b1d93b1ab7b9ee648f5",
         "type": "github"
       },
       "original": {
@@ -18,11 +18,11 @@
     },
     "crane": {
       "locked": {
-        "lastModified": 1783203018,
-        "narHash": "sha256-G6R9IT/xwFuu+CYBWDUAok6AdC4ERC4ZfPPFtEpxnZE=",
+        "lastModified": 1780532242,
+        "narHash": "sha256-D+BsdpxmtUwtqGoY0IXPhHgTlmqgcZKCEo1oMyn7ep0=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "80db5bdc391be8a1794f6d8a2d56e3a84ebcede2",
+        "rev": "59a82a1222dd3b2080b5cc52a1a2e8d5f1b77f37",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1783844668,
-        "narHash": "sha256-3MOpw4y3reoErRLvFBDz0t9aG6FWXUj7leKvUns5eQA=",
+        "lastModified": 1781527054,
+        "narHash": "sha256-1fX9ev2Fh5QoKQ41G9dYutjo5j/jywu6tZse5Eb1Ck4=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "4e49ef62eedaa5c149d62b63b3f53844e1cc45d7",
+        "rev": "8c2e51dffefc040a21975da7abf6f252c8c9b783",
         "type": "github"
       },
       "original": {
@@ -74,11 +74,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1782949081,
-        "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=",
+        "lastModified": 1778716662,
+        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e",
+        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
         "type": "github"
       },
       "original": {
@@ -89,11 +89,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1783776592,
-        "narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=",
+        "lastModified": 1781074563,
+        "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3",
+        "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
         "type": "github"
       },
       "original": {
@@ -105,11 +105,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1782614948,
-        "narHash": "sha256-ePjCwr1sNm9NYUqywL7QfK3JnlS015msC+eBu2zKlp8=",
+        "lastModified": 1777168982,
+        "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "db3f255737b94216eb71cce308e2912cf6bc2d7c",
+        "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14",
         "type": "github"
       },
       "original": {
@@ -132,11 +132,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1783779020,
-        "narHash": "sha256-vpm418WZa9l1KUl6HRs+Ga+SIfE+D2/sV4olwTlilYc=",
+        "lastModified": 1781453968,
+        "narHash": "sha256-+V3nK4pCngbmgyVGXY6Kkrlevp4ocPkJJLf2aqwkDNA=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "5be5e89cf0145d73a85c805726821b4adfc3af48",
+        "rev": "cc272809a173c2c11d0e479d639c811c1eacf049",
         "type": "github"
       },
       "original": {

nix/devshell.nix

@@ -9,7 +9,7 @@
     {
       # basic nix shell containing all things necessary to build continuwuity in all flavors manually (on x86_64-linux)
       devShells.default =
-        ((inputs.crane.mkLib pkgs).overrideToolchain (pkgs: self'.packages.dev-toolchain)).devShell
+        ((inputs.crane.mkLib pkgs).overrideToolchain (pkgs: self'.packages.stable-toolchain)).devShell
           {
             packages = [
               self'.packages.rocksdb

nix/packages/continuwuity.nix

@@ -43,8 +43,8 @@ let
     env = {
       CARGO_PROFILE = profile;
       RUSTFLAGS = rustflags;
-      GIT_COMMIT_HASH = self.rev or self.dirtyRev or "";
-      GIT_COMMIT_HASH_SHORT = self.shortRev or self.dirtyShortRev or "";
+      GIT_COMMIT_HASH = self.rev or self.dirtyRev;
+      GIT_COMMIT_HASH_SHORT = self.shortRev or self.dirtyShortRev;
     }
     // (lib.optionalAttrs (rocksdb != null) {
       ROCKSDB_INCLUDE_DIR = "${rocksdb}/include";

nix/rust.nix

@@ -12,7 +12,7 @@
         target:
         target.fromToolchainName {
           name = (lib.importTOML "${inputs.self}/rust-toolchain.toml").toolchain.channel;
-          sha256 = "sha256-A1abGIbOtcBSdrUMhDGrER3pRM1hQP4fp9gh3Y4PKc8=";
+          sha256 = "sha256-OATSZm98Es5kIFuqaba+UvkQtFsVgJEBMmS+t6od5/U=";
         };
     in
     {
@@ -27,9 +27,9 @@
           inherit stable-toolchain;
 
           dev-toolchain = fnx.combine [
+            stable-toolchain
             # use the nightly rustfmt because we use nightly features
             fnx.complete.rustfmt
-            stable-toolchain
           ];
         };
     };

package-lock.json

@@ -419,9 +419,9 @@
       }
     },
     "node_modules/@rspress/core": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/@rspress/core/-/core-2.0.18.tgz",
-      "integrity": "sha512-DBpsr/6XAItQkZPL5FSjthLGuzdG9ks/7EOxkqaaXp93uAT54LO0PD5Dkoy6ydup1PnvkpHyiHpUyDcnHHTVhg==",
+      "version": "2.0.17",
+      "resolved": "https://registry.npmjs.org/@rspress/core/-/core-2.0.17.tgz",
+      "integrity": "sha512-oynYHE2aBj7BFzD/UgqKnrj/PyYxfWGrmRPlTmjLL22UPcocdUdFYLb/6nijyseAST59VMr5Gj4wOfFUeJT5vw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -429,7 +429,7 @@
         "@mdx-js/react": "^3.1.1",
         "@rsbuild/core": "^2.1.5",
         "@rsbuild/plugin-react": "~2.1.0",
-        "@rspress/shared": "2.0.18",
+        "@rspress/shared": "2.0.17",
         "@shikijs/rehype": "^4.2.0",
         "@types/unist": "^3.0.3",
         "@unhead/react": "^2.1.15",
@@ -472,9 +472,9 @@
       }
     },
     "node_modules/@rspress/plugin-client-redirects": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/@rspress/plugin-client-redirects/-/plugin-client-redirects-2.0.18.tgz",
-      "integrity": "sha512-q70ufN0S125kl0QlucO7JuiZ0WJaxFOtPPoGu7eWwam9fb+i4YsWnOWtAKSKGH4JP5+897mgpDPP+dmfl9DPCw==",
+      "version": "2.0.17",
+      "resolved": "https://registry.npmjs.org/@rspress/plugin-client-redirects/-/plugin-client-redirects-2.0.17.tgz",
+      "integrity": "sha512-HJMlW5xsQe2cAFYNHw3LhMy8WcuqRb4l0ey3E3OIu121ymbSLqIQJVPS/IF/NuoyPoxCAmV58LYIaCxGEriUww==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -485,9 +485,9 @@
       }
     },
     "node_modules/@rspress/plugin-sitemap": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/@rspress/plugin-sitemap/-/plugin-sitemap-2.0.18.tgz",
-      "integrity": "sha512-XfaXzZx+ASN9OMTc0fOvW8QmbmyCyDWkO8xJj4XF4E0YJtsu7j/65+v8/KXXdwpywOfUIQ6M94/meRTy2urNmQ==",
+      "version": "2.0.17",
+      "resolved": "https://registry.npmjs.org/@rspress/plugin-sitemap/-/plugin-sitemap-2.0.17.tgz",
+      "integrity": "sha512-MpNxF+hFK7zsk8t+Ta7KYI/Py6Csjyw0AMGrWf3XG/kr0+fisVxbT/jUanXRLSoj2m9VX9CVsi180rPnezUpbQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -498,9 +498,9 @@
       }
     },
     "node_modules/@rspress/shared": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/@rspress/shared/-/shared-2.0.18.tgz",
-      "integrity": "sha512-GJswqJQCPSxvBt5r+gJzz8Em8EEK/sOmCQjTpemTvldvxr1Lva85BGVnSQZOgofnM0nrjt18kn4mmnuuSstbpA==",
+      "version": "2.0.17",
+      "resolved": "https://registry.npmjs.org/@rspress/shared/-/shared-2.0.17.tgz",
+      "integrity": "sha512-ZzpZ4hm5svgwU0w5CpTLZy4vFD3uPo8+gXtWMOREYMzwfzJeHqwOyXwxHf6byGpx85mVK5DQqMDi61meAS7ZUw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -510,14 +510,14 @@
       }
     },
     "node_modules/@shikijs/core": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-4.3.1.tgz",
-      "integrity": "sha512-ANMDxuaPsNMdDC1m4vfvhlDmJweMwkE5XitTwrq2rWHx5jM+dlm4MmHt2PP6t0uejfR77SuhrhJ0zEijIF/uhA==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-4.2.0.tgz",
+      "integrity": "sha512-Hc87Ab1Ld/vEbZRCbwx344I5v+4RU8CVToUTRkqXL1+TjbuOp9U5Xa0M23V4GEWHxVn+yO5otb+HkQVm3ptWQQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@shikijs/primitive": "4.3.1",
-        "@shikijs/types": "4.3.1",
+        "@shikijs/primitive": "4.2.0",
+        "@shikijs/types": "4.2.0",
         "@shikijs/vscode-textmate": "^10.0.2",
         "@types/hast": "^3.0.4",
         "hast-util-to-html": "^9.0.5"
@@ -527,13 +527,13 @@
       }
     },
     "node_modules/@shikijs/engine-javascript": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-4.3.1.tgz",
-      "integrity": "sha512-JBItcnPuYq7jVJdZo/vMj94r+szT7XEjHFX+mvFDGSEIbVAXAGyHAHzhbWzpGOwYidCZrErJLLgn2PVeiokHnQ==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-4.2.0.tgz",
+      "integrity": "sha512-fjETeq1k5ffyXqRgS6+3hpvqseLalp1kjNfRbXpUgWR8FpZ1CmQfiNHovc5lncYjt/Vg5JK/WJEmLahjwMa0og==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@shikijs/types": "4.3.1",
+        "@shikijs/types": "4.2.0",
         "@shikijs/vscode-textmate": "^10.0.2",
         "oniguruma-to-es": "^4.3.6"
       },
@@ -542,13 +542,13 @@
       }
     },
     "node_modules/@shikijs/engine-oniguruma": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-4.3.1.tgz",
-      "integrity": "sha512-OXyNMzg0pews+msMj4cHeqT4xiYKKvbnn6VbdAXxfoFl3SSx4fJTc8FadECuc5/H9p3BzhNAoAUXKwAu9rWYhg==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-4.2.0.tgz",
+      "integrity": "sha512-hTorK1dffPkpbMUk6Z+828PgRo7d07HbnizoP0hNPFjhxMHctj0Px/qoHeGMYafc6ju+u9iMldN4JbVzNQM++g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@shikijs/types": "4.3.1",
+        "@shikijs/types": "4.2.0",
         "@shikijs/vscode-textmate": "^10.0.2"
       },
       "engines": {
@@ -556,26 +556,26 @@
       }
     },
     "node_modules/@shikijs/langs": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-4.3.1.tgz",
-      "integrity": "sha512-m0l9nsDqgBHvbZbk7A0/kXz/impK3uB/c6rAn6Gpg/uPtdZRQ+alsN/17MU5thb68XTj/4DxkZAotrM0GGSpDQ==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-4.2.0.tgz",
+      "integrity": "sha512-bwrVRlJ0wUhZxAbVdvBbv2TTC9yLsh4C/IO5Ofz0T8MQntgDvyVnkbjw9vi50r1kx7RCIJdnJnjZAwmAsXFLZQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@shikijs/types": "4.3.1"
+        "@shikijs/types": "4.2.0"
       },
       "engines": {
         "node": ">=20"
       }
     },
     "node_modules/@shikijs/primitive": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@shikijs/primitive/-/primitive-4.3.1.tgz",
-      "integrity": "sha512-CXQRQOYy1leqQ8ceTeJdmXv/bsUY++6QyLpXJ94LZAAYj5X2SKRdc5ipguv4NPyGVKItB2PPwUpRNe0Sjh5S1A==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/primitive/-/primitive-4.2.0.tgz",
+      "integrity": "sha512-NOq+DtUkVBJtZMVXL5A0vI0Xk8nvDYaXetFHSJFlOqjDZIVhIPRYFdGkSoElDqNuegikcc3A76SNUa8dTqtAYA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@shikijs/types": "4.3.1",
+        "@shikijs/types": "4.2.0",
         "@shikijs/vscode-textmate": "^10.0.2",
         "@types/hast": "^3.0.4"
       },
@@ -584,16 +584,16 @@
       }
     },
     "node_modules/@shikijs/rehype": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@shikijs/rehype/-/rehype-4.3.1.tgz",
-      "integrity": "sha512-oshrlfUF3VPUJfnp5K1lLwsS/SRBKrIxONpdWebSKZXdBE3UsZnxgqpvRUA8UsofS7vmjFOCAHIT71ECbmOxTw==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/rehype/-/rehype-4.2.0.tgz",
+      "integrity": "sha512-ST3EWye/dwF1gWskczJNBnwFtDzEQ9ceytXZtyc/GfwR5V0qJrkoSGZO55O3SAKDDsXkTDcsfwd9pVe7ROlAHg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@shikijs/types": "4.3.1",
+        "@shikijs/types": "4.2.0",
         "@types/hast": "^3.0.4",
         "hast-util-to-string": "^3.0.1",
-        "shiki": "4.3.1",
+        "shiki": "4.2.0",
         "unified": "^11.0.5",
         "unist-util-visit": "^5.1.0"
       },
@@ -602,22 +602,22 @@
       }
     },
     "node_modules/@shikijs/themes": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-4.3.1.tgz",
-      "integrity": "sha512-dgpoJ4WqNi2yTmizQHBJ5zcX6j2lE6icN/0yt4l1kkf16jrY/pwPLoTb1ETsWMz0OBLf9ZNvwmxft+cH+N9qSA==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-4.2.0.tgz",
+      "integrity": "sha512-RX8IHYeLv8Cu2W6ruc3RxUqWn0IYCqSrMBzi/uRGAmfyDNOnNO5BF/Px7o97n4XTpmFTo5GbRaazuOWj+2ak2w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@shikijs/types": "4.3.1"
+        "@shikijs/types": "4.2.0"
       },
       "engines": {
         "node": ">=20"
       }
     },
     "node_modules/@shikijs/types": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-4.3.1.tgz",
-      "integrity": "sha512-CHFxE0jztBIZRHH6gxXE7DXUCFXjReEGxZ/j0rfSLGKZuwp2xBYycEP14875DSa9KLL/6700oxIq6oO6ef9K2g==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-4.2.0.tgz",
+      "integrity": "sha512-VT/MKtlpOhEPZloSH3Pb9WCZEBDoQVMa9jedp5UAwmJOar1DVc9DRODAxmYPW9M93IK4ryuqRejFfmlvlVDemw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -684,9 +684,9 @@
       }
     },
     "node_modules/@types/hast": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.5.tgz",
-      "integrity": "sha512-rp/ezSWaD1m44dPKICGhiskI13nVr7qTloFwDa/IYkhhf5nzwP+zIQcIJh3WIFSBOy/H1PzB40jPjMDksN4F+g==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
+      "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1076,9 +1076,9 @@
       }
     },
     "node_modules/@ungap/structured-clone": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.3.tgz",
-      "integrity": "sha512-60YRaenCQcVjYEKOcG824+DRGGIQ3VKErcBoAEDJZz5bKIs2ZG+X/H9Nk+Q6EVkwJk5QNApxbrc5QtBSwtrXAg==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.1.tgz",
+      "integrity": "sha512-mUFwbeTqrVgDQxFveS+df2yfap6iuP20NAKAsBt5jDEoOTDew+zwLAOilHCeQJOVSvmgCX4ogqIrA0mnyr08yQ==",
       "dev": true,
       "license": "ISC"
     },
@@ -3589,18 +3589,18 @@
       "license": "MIT"
     },
     "node_modules/shiki": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/shiki/-/shiki-4.3.1.tgz",
-      "integrity": "sha512-oR+qDVi2OjX1tmDpyv+3KviX01KzO6Af+0NNnKnsp9491UEGz2YpxTuJboS/6VhYpTdqzmuJBuiTlrAWWJAssw==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/shiki/-/shiki-4.2.0.tgz",
+      "integrity": "sha512-hjNax6o/ylDy9lefQEaSDtzaT3iVNtZ3WmpQnbuQNoG4xvnSKf2kSKbihZVO4JRG1TTMejs7CmNRYlWgAL66pQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@shikijs/core": "4.3.1",
-        "@shikijs/engine-javascript": "4.3.1",
-        "@shikijs/engine-oniguruma": "4.3.1",
-        "@shikijs/langs": "4.3.1",
-        "@shikijs/themes": "4.3.1",
-        "@shikijs/types": "4.3.1",
+        "@shikijs/core": "4.2.0",
+        "@shikijs/engine-javascript": "4.2.0",
+        "@shikijs/engine-oniguruma": "4.2.0",
+        "@shikijs/langs": "4.2.0",
+        "@shikijs/themes": "4.2.0",
+        "@shikijs/types": "4.2.0",
         "@shikijs/vscode-textmate": "^10.0.2",
         "@types/hast": "^3.0.4"
       },

renovate.json

@@ -60,13 +60,6 @@
             "matchPackageNames": ["rust", "rustc", "cargo"],
             "groupName": "rust-toolchain"
         },
-        {
-            "description": "Delay major rust toolchain updates",
-            "matchManagers": ["custom.regex"],
-            "matchPackageNames": ["rust", "rustc", "cargo"],
-            "matchUpdateTypes": ["major"],
-            "minimumReleaseAge": "30 days"
-        },
         {
             "description": "Batch minor and patch GitHub Actions updates",
             "matchManagers": ["github-actions"],

rust-toolchain.toml

@@ -10,7 +10,7 @@
 
 [toolchain]
 profile = "minimal"
-channel = "1.97.1"
+channel = "1.97.0"
 components = [
     # For rust-analyzer
     "rust-src",

src/admin/debug/commands.rs

@@ -486,7 +486,7 @@ pub(super) async fn get_remote_pdu(
 						.services
 						.rooms
 						.event_handler
-						.parse_incoming_pdu(&response.pdu, None)
+						.parse_incoming_pdu(&response.pdu)
 						.boxed()
 						.await;
 
@@ -832,7 +832,7 @@ pub(super) async fn force_set_room_state_from_server(
 				.services
 				.rooms
 				.event_handler
-				.parse_incoming_pdu(&pdu, Some(&room_version_rules))
+				.parse_incoming_pdu(&pdu)
 				.await
 			{
 				| Ok(t) => t,
@@ -1014,7 +1014,7 @@ pub(super) async fn resolve_true_destination(
 		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.dns.clone())
+				.http_client(self.services.client.default.clone())
 				.build()?
 		} else {
 			&self.services.client.matrix_resolver

src/admin/federation/commands.rs

@@ -54,7 +54,7 @@ pub(super) async fn fetch_support_well_known(&self, server_name: OwnedServerName
 		let response = self
 			.services
 			.client
-			.external_resource
+			.default
 			.get(format!("https://{server_name}/.well-known/matrix/support"))
 			.send()
 			.await?;

src/admin/token/commands.rs

@@ -3,7 +3,7 @@
 use service::registration_tokens::TokenExpires;
 
 impl crate::Context<'_> {
-	pub(super) async fn issue_registration_token(&self, expires: super::TokenExpires) -> Result {
+	pub(super) async fn issue_token(&self, expires: super::TokenExpires) -> Result {
 		let expires = {
 			if expires.immortal {
 				None

src/admin/token/mod.rs

@@ -10,7 +10,7 @@
 pub enum TokenCommand {
 	/// Issue a new registration token
 	#[clap(name = "issue")]
-	IssueRegistrationToken {
+	IssueToken {
 		/// When this token will expire.
 		#[command(flatten)]
 		expires: TokenExpires,

src/admin/user/commands.rs

@@ -20,7 +20,7 @@
 		tag::{TagEvent, TagEventContent, TagInfo},
 	},
 };
-use service::users::{AccountStatus, DeviceToken, HashedPassword};
+use service::users::{AccountStatus, HashedPassword};
 
 use crate::{
 	get_room_info,
@@ -59,42 +59,13 @@ pub(super) async fn create_user(&self, username: String, password: Option<String
 
 		self.services
 			.users
-			.create_local_account(
-				&user_id,
-				Some(HashedPassword::new(password)?),
-				None,
-				None,
-				None,
-			)
+			.create_local_account(&user_id, Some(HashedPassword::new(password)?), None)
 			.await?;
 
 		self.write_str(&format!("Created user {user_id} with password `{password}`"))
 			.await
 	}
 
-	pub(super) async fn issue_access_token(&self, username: String, password: String) -> Result {
-		let user_id = parse_active_local_user_id(self.services, &username).await?;
-
-		let user_id = self
-			.services
-			.users
-			.check_password(&user_id, &password)
-			.await?;
-		let token = DeviceToken::new_random();
-
-		let device_id = self
-			.services
-			.users
-			.create_device(&user_id, None, Some(token.clone()), None, None)
-			.await?;
-
-		self.write_str(&format!(
-			"Created device `{device_id}` with access token `{}` for {user_id}",
-			token.into_token()
-		))
-		.await
-	}
-
 	pub(super) async fn deactivate(&self, no_leave_rooms: bool, user_id: String) -> Result {
 		// Validate user id
 		let user_id = parse_local_user_id(self.services, &user_id)?;
@@ -131,6 +102,7 @@ pub(super) async fn deactivate(&self, no_leave_rooms: bool, user_id: String) ->
 	}
 
 	pub(super) async fn suspend(&self, user_id: String) -> Result {
+		self.bail_restricted()?;
 		let user_id = parse_active_local_user_id(self.services, &user_id).await?;
 
 		if user_id == self.services.globals.server_user {
@@ -151,6 +123,7 @@ pub(super) async fn suspend(&self, user_id: String) -> Result {
 	}
 
 	pub(super) async fn unsuspend(&self, user_id: String) -> Result {
+		self.bail_restricted()?;
 		let user_id = parse_active_local_user_id(self.services, &user_id).await?;
 
 		if user_id == self.services.globals.server_user {
@@ -962,6 +935,7 @@ pub(super) async fn force_leave_remote_room(
 	}
 
 	pub(super) async fn lock(&self, user_id: String) -> Result {
+		self.bail_restricted()?;
 		let user_id = parse_active_local_user_id(self.services, &user_id).await?;
 
 		if user_id == self.services.globals.server_user {
@@ -982,6 +956,7 @@ pub(super) async fn lock(&self, user_id: String) -> Result {
 	}
 
 	pub(super) async fn unlock(&self, user_id: String) -> Result {
+		self.bail_restricted()?;
 		let user_id = parse_active_local_user_id(self.services, &user_id).await?;
 
 		self.services.users.unlock_account(&user_id).await;
@@ -991,6 +966,7 @@ pub(super) async fn unlock(&self, user_id: String) -> Result {
 	}
 
 	pub(super) async fn logout(&self, user_id: String) -> Result {
+		self.bail_restricted()?;
 		let user_id = parse_active_local_user_id(self.services, &user_id).await?;
 
 		if user_id == self.services.globals.server_user {
@@ -1016,6 +992,7 @@ pub(super) async fn logout(&self, user_id: String) -> Result {
 	}
 
 	pub(super) async fn disable_login(&self, user_id: String) -> Result {
+		self.bail_restricted()?;
 		let user_id = parse_active_local_user_id(self.services, &user_id).await?;
 
 		if user_id == self.services.globals.server_user {
@@ -1034,6 +1011,7 @@ pub(super) async fn disable_login(&self, user_id: String) -> Result {
 	}
 
 	pub(super) async fn enable_login(&self, user_id: String) -> Result {
+		self.bail_restricted()?;
 		let user_id = parse_active_local_user_id(self.services, &user_id).await?;
 
 		self.services.users.enable_login(&user_id);
@@ -1042,6 +1020,7 @@ pub(super) async fn enable_login(&self, user_id: String) -> Result {
 	}
 
 	pub(super) async fn get_email(&self, user_id: String) -> Result {
+		self.bail_restricted()?;
 		let user_id = parse_local_user_id(self.services, &user_id)?;
 
 		match self
@@ -1060,6 +1039,8 @@ pub(super) async fn get_email(&self, user_id: String) -> Result {
 	}
 
 	pub(super) async fn get_user_by_email(&self, email: String) -> Result {
+		self.bail_restricted()?;
+
 		let Ok(email) = Address::try_from(email) else {
 			return Err!("Invalid email address.");
 		};
@@ -1082,6 +1063,8 @@ pub(super) async fn get_user_by_email(&self, email: String) -> Result {
 	}
 
 	pub(super) async fn change_email(&self, user_id: String, email: Option<String>) -> Result {
+		self.bail_restricted()?;
+
 		let user_id = parse_local_user_id(self.services, &user_id)?;
 		let Ok(new_email) = email.map(Address::try_from).transpose() else {
 			return Err!("Invalid email address.");

src/admin/user/mod.rs

@@ -18,15 +18,6 @@ pub enum UserCommand {
 		password: Option<String>,
 	},
 
-	/// Issue an access token for a user. This command will not work on
-	/// shadow users, such as appservice puppets or accounts imported from
-	/// an identity provider.
-	#[clap(name = "issue-token")]
-	IssueAccessToken {
-		username: String,
-		password: String,
-	},
-
 	/// Reset user password
 	ResetPassword {
 		/// Log out existing sessions

src/api/Cargo.toml

@@ -64,11 +64,11 @@ zstd_compression = [
 
 [dependencies]
 async-trait.workspace = true
+axum-client-ip.workspace = true
 axum-extra.workspace = true
 axum.workspace = true
 base64.workspace = true
 bytes.workspace = true
-client-ip.workspace = true
 conduwuit-core.workspace = true
 conduwuit-macros.workspace = true
 conduwuit-service.workspace = true

src/api/client/account/mod.rs

@@ -1,4 +1,5 @@
 use axum::extract::State;
+use axum_client_ip::ClientIp;
 use conduwuit::{
 	Err, Result, err, info,
 	pdu::PartialPdu,
@@ -25,6 +26,7 @@
 };
 use service::{mailer::messages, uiaa::UiaaInitiator, users::HashedPassword};
 
+use super::DEVICE_ID_LENGTH;
 use crate::{Ruma, router::ClientIdentity};
 
 pub(crate) mod register;
@@ -41,9 +43,10 @@
 ///
 /// Note: This will not reserve the username, so the username might become
 /// invalid when trying to register
-#[tracing::instrument(skip_all, name = "register_available", level = "info")]
+#[tracing::instrument(skip_all, fields(%client), name = "register_available", level = "info")]
 pub(crate) async fn get_register_available_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<get_username_availability::v3::Request>,
 ) -> Result<get_username_availability::v3::Response> {
 	let _ = services
@@ -77,9 +80,10 @@ pub(crate) async fn get_register_available_route(
 ///   last seen ts)
 /// - Forgets to-device events
 /// - Triggers device list updates
-#[tracing::instrument(skip_all, name = "change_password", level = "info")]
+#[tracing::instrument(skip_all, fields(%client), name = "change_password", level = "info")]
 pub(crate) async fn change_password_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<change_password::v3::Request>,
 ) -> Result<change_password::v3::Response> {
 	let identity = if let Some(identity) = body.identity.as_ref() {
@@ -244,9 +248,10 @@ pub(crate) async fn whoami_route(
 /// - Forgets all to-device events
 /// - Triggers device list updates
 /// - Removes ability to log in again
-#[tracing::instrument(skip_all, name = "deactivate", level = "info")]
+#[tracing::instrument(skip_all, fields(%client), name = "deactivate", level = "info")]
 pub(crate) async fn deactivate_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<deactivate::v3::Request>,
 ) -> Result<deactivate::v3::Response> {
 	// Authentication for this endpoint is technically optional,

src/api/client/account/register.rs

@@ -1,7 +1,11 @@
 use std::collections::HashMap;
 
 use axum::extract::State;
-use conduwuit::{Err, Result, debug_info, info};
+use axum_client_ip::ClientIp;
+use conduwuit::{
+	Err, Result, debug_info, info,
+	utils::{self},
+};
 use conduwuit_service::Services;
 use futures::StreamExt;
 use lettre::{Address, message::Mailbox};
@@ -21,7 +25,8 @@
 	users::{DeviceToken, HashedPassword},
 };
 
-use crate::{Ruma, client_ip::ClientIp};
+use super::DEVICE_ID_LENGTH;
+use crate::Ruma;
 
 /// # `POST /_matrix/client/v3/register`
 ///
@@ -31,10 +36,10 @@
 /// /_matrix/client/v3/register/available`](fn.get_register_available_route.
 /// html) to check if the user id is valid and available.
 #[allow(clippy::doc_markdown)]
-#[tracing::instrument(skip_all, name = "register", level = "info")]
+#[tracing::instrument(skip_all, fields(%client), name = "register", level = "info")]
 pub(crate) async fn register_route(
 	State(services): State<crate::State>,
-	ClientIp(client): ClientIp, // NOTE: Required for metadata.
+	ClientIp(client): ClientIp,
 	body: Ruma<register::v3::Request>,
 ) -> Result<register::v3::Response> {
 	if body.kind != RegistrationKind::User {
@@ -95,13 +100,7 @@ pub(crate) async fn register_route(
 
 		services
 			.users
-			.create_local_account(
-				&user_id,
-				Some(password),
-				identity.email,
-				Some(&client),
-				body.initial_device_display_name.as_deref(),
-			)
+			.create_local_account(&user_id, Some(password), identity.email)
 			.await?;
 
 		user_id
@@ -116,21 +115,26 @@ pub(crate) async fn register_route(
 			)));
 		}
 
+		// Generate new device id if the user didn't specify one
+		let device_id = body
+			.device_id
+			.clone()
+			.unwrap_or_else(|| utils::random_string(DEVICE_ID_LENGTH).into());
+
 		// Generate new token for the device
 		let new_token = DeviceToken::new_random();
 
 		// Create device for this account
-		let device_id = services
+		services
 			.users
 			.create_device(
 				&user_id,
-				body.device_id.clone(),
+				&device_id,
 				Some(new_token.clone()),
 				body.initial_device_display_name.clone(),
 				Some(client.to_string()),
 			)
 			.await?;
-
 		(Some(new_token), Some(device_id))
 	} else {
 		// Don't create a device for inhibited logins

src/api/client/dehydrated_device.rs

@@ -1,4 +1,5 @@
 use axum::extract::State;
+use axum_client_ip::ClientIp;
 use conduwuit::{Err, Result, at};
 use futures::StreamExt;
 use ruma::{
@@ -18,9 +19,10 @@
 /// # `PUT /_matrix/client/../dehydrated_device`
 ///
 /// Creates or overwrites the user's dehydrated device.
-#[tracing::instrument(skip_all)]
+#[tracing::instrument(skip_all, fields(%client))]
 pub(crate) async fn put_dehydrated_device_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<put_dehydrated_device::Request>,
 ) -> Result<put_dehydrated_device::Response> {
 	let device_id = body.device_id.clone();
@@ -36,9 +38,10 @@ pub(crate) async fn put_dehydrated_device_route(
 /// # `DELETE /_matrix/client/../dehydrated_device`
 ///
 /// Deletes the user's dehydrated device without replacement.
-#[tracing::instrument(skip_all)]
+#[tracing::instrument(skip_all, fields(%client))]
 pub(crate) async fn delete_dehydrated_device_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<delete_dehydrated_device::Request>,
 ) -> Result<delete_dehydrated_device::Response> {
 	let sender_user = body.identity.expect_sender_user()?;
@@ -53,9 +56,10 @@ pub(crate) async fn delete_dehydrated_device_route(
 /// # `GET /_matrix/client/../dehydrated_device`
 ///
 /// Gets the user's dehydrated device
-#[tracing::instrument(skip_all)]
+#[tracing::instrument(skip_all, fields(%client))]
 pub(crate) async fn get_dehydrated_device_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<get_dehydrated_device::Request>,
 ) -> Result<get_dehydrated_device::Response> {
 	let sender_user = body.identity.expect_sender_user()?;
@@ -68,9 +72,10 @@ pub(crate) async fn get_dehydrated_device_route(
 /// # `GET /_matrix/client/../dehydrated_device/{device_id}/events`
 ///
 /// Paginates the events of the dehydrated device.
-#[tracing::instrument(skip_all)]
+#[tracing::instrument(skip_all, fields(%client))]
 pub(crate) async fn get_dehydrated_events_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<get_events::Request>,
 ) -> Result<get_events::Response> {
 	let sender_user = body.identity.expect_sender_user()?;

src/api/client/device.rs

@@ -1,14 +1,15 @@
 use axum::extract::State;
-use conduwuit::{Err, Result, debug, err};
+use axum_client_ip::ClientIp;
+use conduwuit::{Err, Result, debug, err, utils};
 use futures::StreamExt;
 use ruma::{
-	MilliSecondsSinceUnixEpoch,
+	MilliSecondsSinceUnixEpoch, OwnedDeviceId,
 	api::client::device::{
 		self, delete_device, delete_devices, get_device, get_devices, update_device,
 	},
 };
 
-use crate::{Ruma, client_ip::ClientIp};
+use crate::{Ruma, client::DEVICE_ID_LENGTH};
 
 /// # `GET /_matrix/client/r0/devices`
 ///
@@ -45,10 +46,10 @@ pub(crate) async fn get_device_route(
 /// # `PUT /_matrix/client/r0/devices/{deviceId}`
 ///
 /// Updates the metadata on a given device of the sender user.
-#[tracing::instrument(skip_all, name = "update_device", level = "debug")]
+#[tracing::instrument(skip_all, fields(%client), name = "update_device", level = "debug")]
 pub(crate) async fn update_device_route(
 	State(services): State<crate::State>,
-	ClientIp(client): ClientIp, // NOTE: Required for updating device metadata
+	ClientIp(client): ClientIp,
 	body: Ruma<update_device::v3::Request>,
 ) -> Result<update_device::v3::Response> {
 	let sender_user = body.identity.expect_sender_user()?;
@@ -84,15 +85,11 @@ pub(crate) async fn update_device_route(
 				appservice.registration.id
 			);
 
+			let device_id = OwnedDeviceId::from(utils::random_string(DEVICE_ID_LENGTH));
+
 			services
 				.users
-				.create_device(
-					sender_user,
-					Some(body.device_id.clone()),
-					None,
-					body.display_name.clone(),
-					Some(client.to_string()),
-				)
+				.create_device(sender_user, &device_id, None, None, Some(client.to_string()))
 				.await?;
 
 			return Ok(update_device::v3::Response::new());

src/api/client/directory.rs

@@ -1,4 +1,5 @@
 use axum::extract::State;
+use axum_client_ip::ClientIp;
 use conduwuit::{
 	Err, Result, err, info,
 	utils::{
@@ -34,9 +35,10 @@
 /// Lists the public rooms on this server.
 ///
 /// - Rooms are ordered by the number of joined members
-#[tracing::instrument(skip_all, name = "publicrooms", level = "info")]
+#[tracing::instrument(skip_all, fields(%client), name = "publicrooms", level = "info")]
 pub(crate) async fn get_public_rooms_filtered_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<get_public_rooms_filtered::v3::Request>,
 ) -> Result<get_public_rooms_filtered::v3::Response> {
 	if let Some(server) = &body.server {
@@ -69,9 +71,10 @@ pub(crate) async fn get_public_rooms_filtered_route(
 /// Lists the public rooms on this server.
 ///
 /// - Rooms are ordered by the number of joined members
-#[tracing::instrument(skip_all, name = "publicrooms", level = "info")]
+#[tracing::instrument(skip_all, fields(%client), name = "publicrooms", level = "info")]
 pub(crate) async fn get_public_rooms_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<get_public_rooms::v3::Request>,
 ) -> Result<get_public_rooms::v3::Response> {
 	if let Some(server) = &body.server {
@@ -103,9 +106,10 @@ pub(crate) async fn get_public_rooms_route(
 /// # `PUT /_matrix/client/r0/directory/list/room/{roomId}`
 ///
 /// Sets the visibility of a given room in the room directory.
-#[tracing::instrument(skip_all, name = "room_directory", level = "info")]
+#[tracing::instrument(skip_all, fields(%client), name = "room_directory", level = "info")]
 pub(crate) async fn set_room_visibility_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<set_room_visibility::v3::Request>,
 ) -> Result<set_room_visibility::v3::Response> {
 	let sender_user = body.identity.expect_sender_user()?;

src/api/client/media.rs

@@ -1,6 +1,7 @@
 use std::time::Duration;
 
 use axum::extract::State;
+use axum_client_ip::ClientIp;
 use conduwuit::{
 	Err, Result, err,
 	utils::{self, content_disposition::make_content_disposition, math::ruma_from_usize},
@@ -41,8 +42,15 @@ pub(crate) async fn get_media_config_route(
 ///
 /// - Some metadata will be saved in the database
 /// - Media will be saved in the media/ directory
+#[tracing::instrument(
+	name = "media_upload",
+	level = "debug",
+	skip_all,
+	fields(%client),
+)]
 pub(crate) async fn create_content_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<create_content::v3::Request>,
 ) -> Result<create_content::v3::Response> {
 	let user = body.identity.expect_sender_user()?;
@@ -73,8 +81,15 @@ pub(crate) async fn create_content_route(
 /// # `GET /_matrix/client/v1/media/thumbnail/{serverName}/{mediaId}`
 ///
 /// Load media thumbnail from our server or over federation.
+#[tracing::instrument(
+	name = "media_thumbnail_get",
+	level = "debug",
+	skip_all,
+	fields(%client),
+)]
 pub(crate) async fn get_content_thumbnail_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<get_content_thumbnail::v1::Request>,
 ) -> Result<get_content_thumbnail::v1::Response> {
 	let user = body.identity.expect_sender_user()?;
@@ -116,8 +131,15 @@ pub(crate) async fn get_content_thumbnail_route(
 /// # `GET /_matrix/client/v1/media/download/{serverName}/{mediaId}`
 ///
 /// Load media from our server or over federation.
+#[tracing::instrument(
+	name = "media_get",
+	level = "debug",
+	skip_all,
+	fields(%client),
+)]
 pub(crate) async fn get_content_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<get_content::v1::Request>,
 ) -> Result<get_content::v1::Response> {
 	let user = body.identity.expect_sender_user()?;
@@ -156,8 +178,15 @@ pub(crate) async fn get_content_route(
 /// # `GET /_matrix/client/v1/media/download/{serverName}/{mediaId}/{fileName}`
 ///
 /// Load media from our server or over federation as fileName.
+#[tracing::instrument(
+	name = "media_get_af",
+	level = "debug",
+	skip_all,
+	fields(%client),
+)]
 pub(crate) async fn get_content_as_filename_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<get_content_as_filename::v1::Request>,
 ) -> Result<get_content_as_filename::v1::Response> {
 	let user = body.identity.expect_sender_user()?;
@@ -200,8 +229,15 @@ pub(crate) async fn get_content_as_filename_route(
 /// # `GET /_matrix/client/v1/media/preview_url`
 ///
 /// Returns URL preview.
+#[tracing::instrument(
+	name = "url_preview",
+	level = "debug",
+	skip_all,
+	fields(%client),
+)]
 pub(crate) async fn get_media_preview_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<get_media_preview::v1::Request>,
 ) -> Result<get_media_preview::v1::Response> {
 	let sender_user = body.identity.expect_sender_user()?;

src/api/client/media_legacy.rs

@@ -1,6 +1,7 @@
 #![allow(deprecated)]
 
 use axum::extract::State;
+use axum_client_ip::ClientIp;
 use conduwuit::{
 	Err, Result, err,
 	utils::{content_disposition::make_content_disposition, math::ruma_from_usize},
@@ -49,8 +50,10 @@ pub(crate) async fn get_media_config_legacy_legacy_route(
 /// # `GET /_matrix/media/v3/preview_url`
 ///
 /// Returns URL preview.
+#[tracing::instrument(skip_all, fields(%client), name = "url_preview_legacy", level = "debug")]
 pub(crate) async fn get_media_preview_legacy_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<get_media_preview::v3::Request>,
 ) -> Result<get_media_preview::v3::Response> {
 	let sender_user = body.identity.expect_sender_user()?;
@@ -92,9 +95,10 @@ pub(crate) async fn get_media_preview_legacy_route(
 /// Returns URL preview.
 pub(crate) async fn get_media_preview_legacy_legacy_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<get_media_preview::v3::Request>,
 ) -> Result<RumaResponse<get_media_preview::v3::Response>> {
-	get_media_preview_legacy_route(State(services), body)
+	get_media_preview_legacy_route(State(services), ClientIp(client), body)
 		.await
 		.map(RumaResponse)
 }
@@ -111,9 +115,10 @@ pub(crate) async fn get_media_preview_legacy_legacy_route(
 /// - Media will be saved in the media/ directory
 pub(crate) async fn create_content_legacy_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<create_content::v3::Request>,
 ) -> Result<RumaResponse<create_content::v3::Response>> {
-	create_content_route(State(services), body)
+	create_content_route(State(services), ClientIp(client), body)
 		.await
 		.map(RumaResponse)
 }
@@ -126,8 +131,10 @@ pub(crate) async fn create_content_legacy_route(
 /// - Only redirects if `allow_redirect` is true
 /// - Uses client-provided `timeout_ms` if available, else defaults to 20
 ///   seconds
+#[tracing::instrument(skip_all, fields(%client), name = "media_get_legacy", level = "debug")]
 pub(crate) async fn get_content_legacy_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<get_content::v3::Request>,
 ) -> Result<get_content::v3::Response> {
 	let mxc = Mxc {
@@ -202,11 +209,13 @@ pub(crate) async fn get_content_legacy_route(
 /// - Only redirects if `allow_redirect` is true
 /// - Uses client-provided `timeout_ms` if available, else defaults to 20
 ///   seconds
+#[tracing::instrument(skip_all, fields(%client), name = "media_get_legacy", level = "debug")]
 pub(crate) async fn get_content_legacy_legacy_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<get_content::v3::Request>,
 ) -> Result<RumaResponse<get_content::v3::Response>> {
-	get_content_legacy_route(State(services), body)
+	get_content_legacy_route(State(services), ClientIp(client), body)
 		.await
 		.map(RumaResponse)
 }
@@ -219,8 +228,10 @@ pub(crate) async fn get_content_legacy_legacy_route(
 /// - Only redirects if `allow_redirect` is true
 /// - Uses client-provided `timeout_ms` if available, else defaults to 20
 ///   seconds
+#[tracing::instrument(skip_all, fields(%client), name = "media_get_legacy", level = "debug")]
 pub(crate) async fn get_content_as_filename_legacy_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<get_content_as_filename::v3::Request>,
 ) -> Result<get_content_as_filename::v3::Response> {
 	let mxc = Mxc {
@@ -296,9 +307,10 @@ pub(crate) async fn get_content_as_filename_legacy_route(
 ///   seconds
 pub(crate) async fn get_content_as_filename_legacy_legacy_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<get_content_as_filename::v3::Request>,
 ) -> Result<RumaResponse<get_content_as_filename::v3::Response>> {
-	get_content_as_filename_legacy_route(State(services), body)
+	get_content_as_filename_legacy_route(State(services), ClientIp(client), body)
 		.await
 		.map(RumaResponse)
 }
@@ -311,8 +323,10 @@ pub(crate) async fn get_content_as_filename_legacy_legacy_route(
 /// - Only redirects if `allow_redirect` is true
 /// - Uses client-provided `timeout_ms` if available, else defaults to 20
 ///   seconds
+#[tracing::instrument(skip_all, fields(%client), name = "media_thumbnail_get_legacy", level = "debug")]
 pub(crate) async fn get_content_thumbnail_legacy_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<get_content_thumbnail::v3::Request>,
 ) -> Result<get_content_thumbnail::v3::Response> {
 	let mxc = Mxc {
@@ -390,9 +404,10 @@ pub(crate) async fn get_content_thumbnail_legacy_route(
 ///   seconds
 pub(crate) async fn get_content_thumbnail_legacy_legacy_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<get_content_thumbnail::v3::Request>,
 ) -> Result<RumaResponse<get_content_thumbnail::v3::Response>> {
-	get_content_thumbnail_legacy_route(State(services), body)
+	get_content_thumbnail_legacy_route(State(services), ClientIp(client), body)
 		.await
 		.map(RumaResponse)
 }

src/api/client/membership/invite.rs

@@ -1,8 +1,9 @@
 use axum::extract::State;
+use axum_client_ip::ClientIp;
 use conduwuit::{
 	Err, Result, debug_error, err, info,
 	matrix::{event::gen_event_id_canonical_json, pdu::PartialPdu},
-	trace, warn,
+	warn,
 };
 use futures::FutureExt;
 use ruma::{
@@ -22,9 +23,10 @@
 /// # `POST /_matrix/client/r0/rooms/{roomId}/invite`
 ///
 /// Tries to send an invite event into the room.
-#[tracing::instrument(skip_all, name = "invite", level = "info")]
+#[tracing::instrument(skip_all, fields(%client), name = "invite", level = "info")]
 pub(crate) async fn invite_user_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<invite_user::v3::Request>,
 ) -> Result<invite_user::v3::Response> {
 	let sender_user = body.identity.expect_sender_user()?;
@@ -40,8 +42,14 @@ pub(crate) async fn invite_user_route(
 		return Err!(Request(Forbidden("Invites are not allowed on this server.")));
 	}
 
-	banned_room_check(&services, sender_user, Some(&body.room_id), body.room_id.server_name())
-		.await?;
+	banned_room_check(
+		&services,
+		sender_user,
+		Some(&body.room_id),
+		body.room_id.server_name(),
+		client,
+	)
+	.await?;
 
 	match &body.recipient {
 		| invite_user::v3::InvitationRecipient::UserId(InviteUserId {
@@ -158,7 +166,7 @@ pub(crate) async fn invite_helper(
 			let invite_room_state = services
 				.rooms
 				.state
-				.summary_stripped(&pdu, room_id, recipient_user, true)
+				.summary_stripped(&pdu, room_id, recipient_user)
 				.await;
 
 			drop(state_lock);
@@ -185,7 +193,6 @@ pub(crate) async fn invite_helper(
 			.await
 			.ok();
 
-		trace!(?request, "Sending invite");
 		let response = services
 			.sending
 			.send_federation_request(recipient_user.server_name(), request)

src/api/client/membership/join.rs

@@ -1,4 +1,5 @@
 use axum::extract::State;
+use axum_client_ip::ClientIp;
 use conduwuit::{
 	Err, Result, debug,
 	result::FlatOk,
@@ -21,9 +22,10 @@
 ///   rules locally
 /// - If the server does not know about the room: asks other servers over
 ///   federation
-#[tracing::instrument(skip_all, name = "join", level = "info")]
+#[tracing::instrument(skip_all, fields(%client), name = "join", level = "info")]
 pub(crate) async fn join_room_by_id_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<join_room_by_id::v3::Request>,
 ) -> Result<join_room_by_id::v3::Response> {
 	let sender_user = body.identity.expect_sender_user()?;
@@ -31,8 +33,14 @@ pub(crate) async fn join_room_by_id_route(
 		return Err!(Request(UserSuspended("You cannot perform this action while suspended.")));
 	}
 
-	banned_room_check(&services, sender_user, Some(&body.room_id), body.room_id.server_name())
-		.await?;
+	banned_room_check(
+		&services,
+		sender_user,
+		Some(&body.room_id),
+		body.room_id.server_name(),
+		client,
+	)
+	.await?;
 
 	// There is no body.server_name for /roomId/join
 	let mut servers: Vec<_> = services
@@ -83,9 +91,10 @@ pub(crate) async fn join_room_by_id_route(
 /// - If the server does not know about the room: use the server name query
 ///   param if specified. if not specified, asks other servers over federation
 ///   via room alias server name and room ID server name
-#[tracing::instrument(skip_all, name = "join", level = "info")]
+#[tracing::instrument(skip_all, fields(%client), name = "join", level = "info")]
 pub(crate) async fn join_room_by_id_or_alias_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<join_room_by_id_or_alias::v3::Request>,
 ) -> Result<join_room_by_id_or_alias::v3::Response> {
 	let sender_user = body.identity.expect_sender_user()?;
@@ -96,9 +105,15 @@ pub(crate) async fn join_room_by_id_or_alias_route(
 
 	let (servers, room_id) = match OwnedRoomId::try_from(body.room_id_or_alias.clone()) {
 		| Ok(room_id) => {
-			banned_room_check(&services, sender_user, Some(&room_id), room_id.server_name())
-				.boxed()
-				.await?;
+			banned_room_check(
+				&services,
+				sender_user,
+				Some(&room_id),
+				room_id.server_name(),
+				client,
+			)
+			.boxed()
+			.await?;
 
 			let mut servers = body.via.clone();
 			if servers.is_empty() {
@@ -144,6 +159,7 @@ pub(crate) async fn join_room_by_id_or_alias_route(
 				sender_user,
 				Some(&room_id),
 				Some(room_alias.server_name()),
+				client,
 			)
 			.await?;
 

src/api/client/membership/knock.rs

@@ -1,6 +1,7 @@
 use std::{borrow::Borrow, collections::HashMap, iter::once, sync::Arc};
 
 use axum::extract::State;
+use axum_client_ip::ClientIp;
 use conduwuit::{
 	Err, Result, debug, debug_info, debug_warn, err, info,
 	matrix::{
@@ -44,9 +45,10 @@
 /// # `POST /_matrix/client/*/knock/{roomIdOrAlias}`
 ///
 /// Tries to knock the room to ask permission to join for the sender user.
-#[tracing::instrument(skip_all, name = "knock", level = "info")]
+#[tracing::instrument(skip_all, fields(%client), name = "knock", level = "info")]
 pub(crate) async fn knock_room_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<knock_room::v3::Request>,
 ) -> Result<knock_room::v3::Response> {
 	let sender_user = body.identity.expect_sender_user()?;
@@ -57,8 +59,14 @@ pub(crate) async fn knock_room_route(
 
 	let (servers, room_id) = match OwnedRoomId::try_from(body.room_id_or_alias.clone()) {
 		| Ok(room_id) => {
-			banned_room_check(&services, sender_user, Some(&room_id), room_id.server_name())
-				.await?;
+			banned_room_check(
+				&services,
+				sender_user,
+				Some(&room_id),
+				room_id.server_name(),
+				client,
+			)
+			.await?;
 
 			let mut servers = body.via.clone();
 			servers.extend(
@@ -101,6 +109,7 @@ pub(crate) async fn knock_room_route(
 				sender_user,
 				Some(&room_id),
 				Some(room_alias.server_name()),
+				client,
 			)
 			.await?;
 

src/api/client/membership/mod.rs

@@ -8,6 +8,8 @@
 mod members;
 mod unban;
 
+use std::net::IpAddr;
+
 use axum::extract::State;
 use conduwuit::{Err, Result, warn};
 use futures::{FutureExt, StreamExt};
@@ -56,6 +58,7 @@ pub(crate) async fn banned_room_check(
 	user_id: &UserId,
 	room_id: Option<&RoomId>,
 	server_name: Option<&ServerName>,
+	client_ip: IpAddr,
 ) -> Result {
 	if services.users.is_admin(user_id).await {
 		return Ok(());
@@ -82,7 +85,7 @@ pub(crate) async fn banned_room_check(
 						.admin
 						.send_text(&format!(
 							"Automatically deactivating user {user_id} due to attempted banned \
-							 room join"
+							 room join from IP {client_ip}"
 						))
 						.await;
 				}
@@ -118,7 +121,7 @@ pub(crate) async fn banned_room_check(
 						.admin
 						.send_text(&format!(
 							"Automatically deactivating user {user_id} due to attempted banned \
-							 room join"
+							 room join from IP {client_ip}"
 						))
 						.await;
 				}

src/api/client/message.rs

@@ -1,4 +1,5 @@
 use axum::extract::State;
+use axum_client_ip::ClientIp;
 use conduwuit::{
 	Err, Error, Result, at, debug_warn,
 	matrix::{
@@ -37,7 +38,7 @@
 };
 use ruminuwuity::invite_permission_config::FilterLevel;
 
-use crate::{Ruma, client_ip::ClientIp};
+use crate::Ruma;
 
 /// list of safe and common non-state events to ignore if the user is ignored
 const IGNORED_MESSAGE_TYPES: &[TimelineEventType] = &[
@@ -71,7 +72,7 @@
 ///   where the user was joined, depending on `history_visibility`)
 pub(crate) async fn get_message_events_route(
 	State(services): State<crate::State>,
-	ClientIp(client_ip): ClientIp, // NOTE: Required for updating device metadata
+	ClientIp(client_ip): ClientIp,
 	body: Ruma<get_message_events::v3::Request>,
 ) -> Result<get_message_events::v3::Response> {
 	let sender_user = body.identity.expect_sender_user()?;

src/api/client/mod.rs

@@ -90,5 +90,8 @@
 pub(super) use voip::*;
 pub(super) use well_known::*;
 
+/// generated device ID length
+const DEVICE_ID_LENGTH: usize = 10;
+
 /// generated user access token length
 const TOKEN_LENGTH: usize = 32;

src/api/client/mutual_rooms.rs

@@ -1,7 +1,7 @@
 use axum::extract::State;
 use conduwuit::{Err, Result};
 use futures::StreamExt;
-use ruma::{OwnedRoomId, api::client::membership::mutual_rooms};
+use ruma::api::client::membership::mutual_rooms;
 
 use crate::Ruma;
 
@@ -11,14 +11,14 @@
 ///
 /// An implementation of [MSC2666](https://github.com/matrix-org/matrix-spec-proposals/pull/2666)
 #[tracing::instrument(skip_all, name = "mutual_rooms", level = "info")]
-pub(crate) async fn get_mutual_rooms_unstable_route(
+pub(crate) async fn get_mutual_rooms_route(
 	State(services): State<crate::State>,
 	body: Ruma<mutual_rooms::unstable::Request>,
 ) -> Result<mutual_rooms::unstable::Response> {
 	let sender_user = body.identity.expect_sender_user()?;
 
 	if sender_user == body.user_id {
-		return Err!(Request(InvalidParam("You cannot request rooms in common with yourself.")));
+		return Err!(Request(Unknown("You cannot request rooms in common with yourself.")));
 	}
 
 	let mutual_rooms = services
@@ -30,33 +30,3 @@ pub(crate) async fn get_mutual_rooms_unstable_route(
 
 	Ok(mutual_rooms::unstable::Response::new(mutual_rooms))
 }
-
-/// # `GET /_matrix/client/v1/mutual_rooms`
-///
-/// Gets all the rooms the sender shares with the specified user.
-#[tracing::instrument(skip_all, name = "mutual_rooms", level = "info")]
-pub(crate) async fn get_mutual_rooms_route(
-	State(services): State<crate::State>,
-	body: Ruma<mutual_rooms::v1::Request>,
-) -> Result<mutual_rooms::v1::Response> {
-	let sender_user = body.identity.expect_sender_user()?;
-
-	if sender_user == body.user_id {
-		return Err!(Request(InvalidParam("You cannot request rooms in common with yourself.")));
-	}
-
-	let mutual_rooms: Vec<OwnedRoomId> = services
-		.rooms
-		.state_cache
-		.get_shared_rooms(sender_user, &body.user_id)
-		.collect()
-		.await;
-
-	Ok(mutual_rooms::v1::Response::new(
-		mutual_rooms
-			.len()
-			.try_into()
-			.expect("user should be in fewer than 9.1 quadrillion rooms"),
-		mutual_rooms,
-	))
-}

src/api/client/oauth/device.rs

@@ -1,13 +0,0 @@
-use axum::{Form, Json, extract::State, response::IntoResponse};
-use http::StatusCode;
-use service::oauth::grant::DeviceCodeRequest;
-
-pub(crate) async fn device_authorization_route(
-	State(services): State<crate::State>,
-	Form(request): Form<DeviceCodeRequest>,
-) -> impl IntoResponse {
-	match services.oauth.request_device_code(request).await {
-		| Ok(response) => Ok(Json(response)),
-		| Err(err) => Err((StatusCode::BAD_REQUEST, Json(err))),
-	}
-}

src/api/client/oauth/mod.rs

@@ -10,7 +10,6 @@
 use serde_json::json;
 pub(crate) use server_metadata::*;
 
-mod device;
 mod register_client;
 mod server_metadata;
 mod token;
@@ -21,7 +20,6 @@
 const CLIENT_REGISTER_PATH: &str = "client/register";
 const TOKEN_REVOKE_PATH: &str = "client/revoke";
 const TOKEN_PATH: &str = "grant/token";
-const DEVICE_AUTHORIZATION_PATH: &str = "device";
 const ACCOUNT_MANAGEMENT_PATH: &str = concat!(conduwuit_core::ROUTE_PREFIX, "/account/deeplink");
 
 pub(crate) fn router(state: crate::State) -> Router<crate::State> {
@@ -55,5 +53,4 @@ fn oauth_router() -> Router<crate::State> {
 		.route(concat!("/", JWKS_URI_PATH), get(async || Json(json!({"keys": []}))))
 		.route(concat!("/", TOKEN_PATH), post(token::token_route))
 		.route(concat!("/", TOKEN_REVOKE_PATH), post(token::revoke_token_route))
-		.route(concat!("/", DEVICE_AUTHORIZATION_PATH), post(device::device_authorization_route))
 }

src/api/client/oauth/register_client.rs

@@ -24,5 +24,5 @@ pub(crate) async fn register_client_route(
 		.await
 		.map_err(|err| (StatusCode::BAD_REQUEST, Json(err)).into_response())?;
 
-	Ok((StatusCode::CREATED, Json(RegisteredClient { client_id, metadata })).into_response())
+	Ok(Json(RegisteredClient { client_id, metadata }).into_response())
 }

src/api/client/oauth/server_metadata.rs

@@ -12,8 +12,8 @@
 use crate::{
 	Ruma,
 	client::oauth::{
-		ACCOUNT_MANAGEMENT_PATH, AUTH_CODE_PATH, CLIENT_REGISTER_PATH, DEVICE_AUTHORIZATION_PATH,
-		JWKS_URI_PATH, TOKEN_PATH, TOKEN_REVOKE_PATH,
+		ACCOUNT_MANAGEMENT_PATH, AUTH_CODE_PATH, CLIENT_REGISTER_PATH, JWKS_URI_PATH, TOKEN_PATH,
+		TOKEN_REVOKE_PATH,
 	},
 };
 
@@ -37,17 +37,6 @@ pub(crate) async fn authorization_server_metadata(services: &Services) -> Value
 		.join(super::BASE_PATH)
 		.unwrap();
 
-	let prompt_values_supported = if services
-		.uiaa
-		.registration_flow_status()
-		.await
-		.any_available()
-	{
-		json!(["create"])
-	} else {
-		json!([])
-	};
-
 	json!({
 		"account_management_uri": endpoint_base.join(ACCOUNT_MANAGEMENT_PATH).unwrap(),
 		"account_management_actions_supported": [
@@ -60,11 +49,10 @@ 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"],
 		"issuer": services.config.get_client_domain(),
 		"jwks_uri": endpoint_base.join(JWKS_URI_PATH).unwrap(),
-		"prompt_values_supported": prompt_values_supported,
+		"prompt_values_supported": ["create"],
 		"registration_endpoint": endpoint_base.join(CLIENT_REGISTER_PATH).unwrap(),
 		"response_modes_supported": ["query", "fragment"],
 		"response_types_supported": ["code"],

src/api/client/read_marker.rs

@@ -1,6 +1,7 @@
 use std::collections::BTreeMap;
 
 use axum::extract::State;
+use axum_client_ip::ClientIp;
 use conduwuit::{Err, PduCount, Result, err};
 use ruma::{
 	MilliSecondsSinceUnixEpoch,
@@ -12,7 +13,7 @@
 	},
 };
 
-use crate::{Ruma, client_ip::ClientIp};
+use crate::Ruma;
 
 /// # `POST /_matrix/client/r0/rooms/{roomId}/read_markers`
 ///
@@ -116,7 +117,7 @@ pub(crate) async fn set_read_marker_route(
 /// Sets private read marker and public read receipt EDU.
 pub(crate) async fn create_receipt_route(
 	State(services): State<crate::State>,
-	ClientIp(client_ip): ClientIp, // NOTE: Required for updating device metadata
+	ClientIp(client_ip): ClientIp,
 	body: Ruma<create_receipt::v3::Request>,
 ) -> Result<create_receipt::v3::Response> {
 	let sender_user = body.identity.expect_sender_user()?;

src/api/client/redact.rs

@@ -1,10 +1,11 @@
 use axum::extract::State;
+use axum_client_ip::ClientIp;
 use conduwuit::{Err, Result, matrix::pdu::PartialPdu};
 use ruma::{
 	api::client::redact::redact_event, assign, events::room::redaction::RoomRedactionEventContent,
 };
 
-use crate::{Ruma, client_ip::ClientIp};
+use crate::Ruma;
 
 /// # `PUT /_matrix/client/r0/rooms/{roomId}/redact/{eventId}/{txnId}`
 ///
@@ -13,7 +14,7 @@
 /// - TODO: Handle txn id
 pub(crate) async fn redact_event_route(
 	State(services): State<crate::State>,
-	ClientIp(client_ip): ClientIp, // NOTE: required for updating device metadata
+	ClientIp(client_ip): ClientIp,
 	body: Ruma<redact_event::v3::Request>,
 ) -> Result<redact_event::v3::Response> {
 	let sender_user = body.identity.expect_sender_user()?;

src/api/client/report.rs

@@ -1,6 +1,7 @@
 use std::{fmt::Write as _, time::Duration};
 
 use axum::extract::State;
+use axum_client_ip::ClientIp;
 use conduwuit::{Err, Event, Result, debug_info, info, matrix::pdu::PduEvent, utils::ReadyExt};
 use conduwuit_service::Services;
 use ruma::{
@@ -29,9 +30,10 @@ struct Report {
 /// # `POST /_matrix/client/v3/rooms/{roomId}/report`
 ///
 /// Reports an abusive room to homeserver admins
-#[tracing::instrument(skip_all, name = "report_room", level = "info")]
+#[tracing::instrument(skip_all, fields(%client), name = "report_room", level = "info")]
 pub(crate) async fn report_room_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<report_room::v3::Request>,
 ) -> Result<report_room::v3::Response> {
 	let sender_user = body.identity.expect_sender_user()?;
@@ -83,9 +85,10 @@ pub(crate) async fn report_room_route(
 /// # `POST /_matrix/client/v3/rooms/{roomId}/report/{eventId}`
 ///
 /// Reports an inappropriate event to homeserver admins
-#[tracing::instrument(skip_all, name = "report_event", level = "info")]
+#[tracing::instrument(skip_all, fields(%client), name = "report_event", level = "info")]
 pub(crate) async fn report_event_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<report_content::v3::Request>,
 ) -> Result<report_content::v3::Response> {
 	// user authentication
@@ -126,9 +129,10 @@ pub(crate) async fn report_event_route(
 	Ok(report_content::v3::Response::new())
 }
 
-#[tracing::instrument(skip_all, name = "report_user", level = "info")]
+#[tracing::instrument(skip_all, fields(%client), name = "report_user", level = "info")]
 pub(crate) async fn report_user_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<report_user::v3::Request>,
 ) -> Result<report_user::v3::Response> {
 	let sender_user = body.identity.expect_sender_user()?;

src/api/client/room/create.rs

@@ -2,7 +2,7 @@
 
 use axum::extract::State;
 use conduwuit::{
-	Err, Error, Result, debug, debug_info, err, info,
+	Err, Result, debug, debug_info, err, info,
 	matrix::{StateKey, pdu::PartialPdu},
 	trace, warn,
 };
@@ -11,13 +11,10 @@
 use ruma::{
 	CanonicalJsonObject, CanonicalJsonValue, Int, MilliSecondsSinceUnixEpoch, OwnedRoomAliasId,
 	OwnedUserId, RoomAliasId, RoomId, RoomVersionId, UserId,
-	api::{
-		client::room::{self, create_room},
-		error::ErrorKind::Forbidden,
-	},
+	api::client::room::{self, create_room},
 	assign,
 	events::{
-		AnyStateEventContent, StateEventType, TimelineEventType,
+		TimelineEventType,
 		room::{
 			canonical_alias::RoomCanonicalAliasEventContent,
 			create::RoomCreateEventContent,
@@ -515,42 +512,30 @@ pub(crate) async fn create_room_route(
 
 	// 7. Events listed in initial_state
 	for event in &body.initial_state {
-		let event_type: StateEventType = event.get_field("type")?.ok_or_else(|| {
-			err!(Request(InvalidParam(warn!(
-				r#"Invalid initial state event: missing "type" field "#
-			))))
-		})?;
-
-		let content: Raw<AnyStateEventContent> =
-			event.get_field("content")?.ok_or_else(|| {
-				err!(Request(InvalidParam(warn!(
-					r#"Invalid initial state event: missing "content" field "#
-				))))
+		let mut partial_pdu = event
+			.deserialize_as_unchecked::<PartialPdu>()
+			.map_err(|e| {
+				err!(Request(InvalidParam(warn!("Invalid initial state event: {e:?}"))))
 			})?;
 
-		let state_key: String = event.get_field("state_key")?.unwrap_or_default();
+		debug_info!("Room creation initial state event: {event:?}");
 
-		match services
+		// Implicit state key defaults to ""
+		partial_pdu.state_key.get_or_insert_with(StateKey::new);
+
+		// Silently skip encryption events if they are not allowed
+		if partial_pdu.event_type == TimelineEventType::RoomEncryption
+			&& !services.config.allow_encryption
+		{
+			continue;
+		}
+
+		services
 			.rooms
 			.timeline
-			.send_state_event_for_key(
-				sender_user,
-				&room_id,
-				&state_lock,
-				&event_type,
-				&content,
-				&state_key,
-				None,
-			)
+			.build_and_append_pdu(partial_pdu, sender_user, Some(&room_id), &state_lock)
 			.boxed()
-			.await
-		{
-			| Err(Error::Request(Forbidden, ..)) => {
-				// Silently skip forbidden events
-				continue;
-			},
-			| r => r,
-		}?;
+			.await?;
 	}
 
 	// 8. Events implied by name and topic

src/api/client/room/summary.rs

@@ -1,4 +1,5 @@
 use axum::extract::State;
+use axum_client_ip::ClientIp;
 use conduwuit::{Err, Result};
 use ruma::api::client::room::get_summary;
 use service::rooms::summary::Accessibility;
@@ -8,9 +9,10 @@
 /// # `GET /_matrix/client/v1/room_summary/{roomIdOrAlias}`
 ///
 /// Returns a short description of the state of a room.
-#[tracing::instrument(skip_all, name = "room_summary", level = "info")]
+#[tracing::instrument(skip_all, fields(%client), name = "room_summary", level = "info")]
 pub(crate) async fn get_room_summary(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<get_summary::v1::Request>,
 ) -> Result<get_summary::v1::Response> {
 	let (room_id, servers) = services

src/api/client/send.rs

@@ -1,11 +1,12 @@
 use std::collections::BTreeMap;
 
 use axum::extract::State;
+use axum_client_ip::ClientIp;
 use conduwuit::{Err, Result, err, matrix::pdu::PartialPdu, utils};
 use ruma::{api::client::message::send_message_event, events::MessageLikeEventType};
 use serde_json::from_str;
 
-use crate::{Ruma, client_ip::ClientIp};
+use crate::Ruma;
 
 /// # `PUT /_matrix/client/v3/rooms/{roomId}/send/{eventType}/{txnId}`
 ///
@@ -18,7 +19,7 @@
 ///   allowed
 pub(crate) async fn send_message_event_route(
 	State(services): State<crate::State>,
-	ClientIp(client_ip): ClientIp, // NOTE: required for updating device metadata
+	ClientIp(client_ip): ClientIp,
 	body: Ruma<send_message_event::v3::Request>,
 ) -> Result<send_message_event::v3::Response> {
 	let sender_user = body.identity.expect_sender_user()?;

src/api/client/session.rs

@@ -1,9 +1,10 @@
 use std::time::Duration;
 
 use axum::extract::State;
+use axum_client_ip::ClientIp;
 use conduwuit::{
 	Err, Result, debug, err, info,
-	utils::{ReadyExt, stream::BroadbandExt},
+	utils::{self, ReadyExt, stream::BroadbandExt},
 	warn,
 };
 use conduwuit_service::Services;
@@ -30,15 +31,17 @@
 };
 use service::users::DeviceToken;
 
-use crate::{Ruma, client_ip::ClientIp};
+use super::DEVICE_ID_LENGTH;
+use crate::Ruma;
 
 /// # `GET /_matrix/client/v3/login`
 ///
 /// Get the supported login types of this server. One of these should be used as
 /// the `type` field when logging in.
-#[tracing::instrument(skip_all, name = "login", level = "info")]
+#[tracing::instrument(skip_all, fields(%client), name = "login", level = "info")]
 pub(crate) async fn get_login_types_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	_body: Ruma<get_login_types::v3::Request>,
 ) -> Result<get_login_types::v3::Response> {
 	if !services.config.oauth.compatibility_mode().uiaa_available() {
@@ -112,10 +115,10 @@ pub async fn handle_login(
 /// Note: You can use [`GET
 /// /_matrix/client/r0/login`](fn.get_supported_versions_route.html) to see
 /// supported login types.
-#[tracing::instrument(skip_all, name = "login", level = "info")]
+#[tracing::instrument(skip_all, fields(%client), name = "login", level = "info")]
 pub(crate) async fn login_route(
 	State(services): State<crate::State>,
-	ClientIp(client): ClientIp, // NOTE: Required for device metadata
+	ClientIp(client): ClientIp,
 	body: Ruma<login::v3::Request>,
 ) -> Result<login::v3::Response> {
 	if !services.config.oauth.compatibility_mode().uiaa_available() {
@@ -188,39 +191,43 @@ pub(crate) async fn login_route(
 		},
 	};
 
+	// Generate new device id if the user didn't specify one
+	let device_id = body
+		.device_id
+		.clone()
+		.unwrap_or_else(|| utils::random_string(DEVICE_ID_LENGTH).into());
+
 	// Generate a new token for the device
 	let token = DeviceToken::new_random();
 
 	// Determine if device_id was provided and exists in the db for this user
-	let existing_device_id = if let Some(device_id) = &body.device_id {
+	let device_exists = if body.device_id.is_some() {
 		services
 			.users
 			.all_device_ids(&user_id)
-			.ready_find(|v| v == device_id)
+			.ready_any(|v| v == device_id)
 			.await
 	} else {
-		None
+		false
 	};
 
-	let device_id = if let Some(existing_device_id) = existing_device_id {
+	if device_exists {
 		services
 			.users
-			.set_token(&user_id, &existing_device_id, token.clone())
+			.set_token(&user_id, &device_id, token.clone())
 			.await?;
-
-		existing_device_id
 	} else {
 		services
 			.users
 			.create_device(
 				&user_id,
-				body.device_id.clone(),
+				&device_id,
 				Some(token.clone()),
 				body.initial_device_display_name.clone(),
 				Some(client.to_string()),
 			)
-			.await?
-	};
+			.await?;
+	}
 
 	// send client well-known if specified so the client knows to reconfigure itself
 	let client_discovery_info: Option<DiscoveryInfo> = services
@@ -248,9 +255,10 @@ pub(crate) async fn login_route(
 /// to log in with the m.login.token flow.
 ///
 /// <https://spec.matrix.org/v1.13/client-server-api/#post_matrixclientv1loginget_token>
-#[tracing::instrument(skip_all, name = "login_token", level = "info")]
+#[tracing::instrument(skip_all, fields(%client), name = "login_token", level = "info")]
 pub(crate) async fn login_token_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<get_login_token::v1::Request>,
 ) -> Result<get_login_token::v1::Response> {
 	if !services.config.login_via_existing_session {
@@ -283,9 +291,10 @@ pub(crate) async fn login_token_route(
 ///   last seen ts)
 /// - Forgets to-device events
 /// - Triggers device list updates
-#[tracing::instrument(skip_all, name = "logout", level = "info")]
+#[tracing::instrument(skip_all, fields(%client), name = "logout", level = "info")]
 pub(crate) async fn logout_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<logout::v3::Request>,
 ) -> Result<logout::v3::Response> {
 	let sender_user = body.identity.expect_sender_user()?;
@@ -330,9 +339,10 @@ pub(crate) async fn logout_route(
 /// Note: This is equivalent to calling [`GET
 /// /_matrix/client/r0/logout`](fn.logout_route.html) from each device of this
 /// user.
-#[tracing::instrument(skip_all, name = "logout", level = "info")]
+#[tracing::instrument(skip_all, fields(%client), name = "logout", level = "info")]
 pub(crate) async fn logout_all_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<logout_all::v3::Request>,
 ) -> Result<logout_all::v3::Response> {
 	let sender_user = body.identity.expect_sender_user()?;

src/api/client/space.rs

@@ -19,10 +19,9 @@ pub(crate) async fn get_hierarchy_route(
 	// there's no reasonable way to handle a space hierarchy changing during
 	// pagination.
 
-	// Default to MAX_MAX_DEPTH when the client doesn't specify one, so an
-	// unbounded traversal can never happen.
-	let max_max_depth = UInt::from(MAX_MAX_DEPTH);
-	let max_depth = Some(body.max_depth.unwrap_or(max_max_depth).min(max_max_depth));
+	let max_depth = body
+		.max_depth
+		.map(|max_depth| max_depth.min(UInt::from(MAX_MAX_DEPTH)));
 
 	let hierarchy = services
 		.rooms

src/api/client/state.rs

@@ -1,25 +1,41 @@
 #[cfg(test)]
 mod tests;
 use axum::extract::State;
-use conduwuit::{Err, Result, err, matrix::Event};
+use axum_client_ip::ClientIp;
+use conduwuit::{
+	Err, Result, err,
+	matrix::{Event, pdu::PartialPdu},
+};
+use conduwuit_service::Services;
 use futures::{FutureExt, TryStreamExt};
 use ruma::{
-	RoomId,
+	MilliSecondsSinceUnixEpoch, OwnedEventId, RoomId, UserId,
 	api::client::state::{
 		get_state_event_for_key::{self, v3::StateEventFormat},
 		get_state_events, send_state_event,
 	},
+	events::{
+		AnyStateEventContent, StateEventType,
+		room::{
+			canonical_alias::RoomCanonicalAliasEventContent,
+			history_visibility::{HistoryVisibility, RoomHistoryVisibilityEventContent},
+			join_rules::{JoinRule, RoomJoinRulesEventContent},
+			member::{MembershipState, RoomMemberEventContent},
+			server_acl::RoomServerAclEventContent,
+		},
+	},
+	serde::Raw,
 };
 use serde_json::{json, value::to_raw_value};
 
-use crate::{Ruma, RumaResponse, client_ip::ClientIp};
+use crate::{Ruma, RumaResponse};
 
 /// # `PUT /_matrix/client/*/rooms/{roomId}/state/{eventType}/{stateKey}`
 ///
 /// Sends a state event into the room.
 pub(crate) async fn send_state_event_for_key_route(
 	State(services): State<crate::State>,
-	ClientIp(ip): ClientIp, // NOTE: Required for updating device metadata
+	ClientIp(ip): ClientIp,
 	body: Ruma<send_state_event::v3::Request>,
 ) -> Result<send_state_event::v3::Response> {
 	let sender_user = body.identity.expect_sender_user()?;
@@ -32,31 +48,21 @@ pub(crate) async fn send_state_event_for_key_route(
 		return Err!(Request(UserSuspended("You cannot perform this action while suspended.")));
 	}
 
-	let state_lock = services
-		.rooms
-		.state
-		.mutex
-		.lock::<RoomId>(&body.room_id)
-		.await;
-
-	let event_id = services
-		.rooms
-		.timeline
-		.send_state_event_for_key(
-			sender_user,
-			&body.room_id,
-			&state_lock,
-			&body.event_type,
-			&body.body.body,
-			&body.state_key,
-			if body.identity.is_appservice() {
-				body.timestamp
-			} else {
-				None
-			},
-		)
-		.boxed()
-		.await?;
+	let event_id = send_state_event_for_key_helper(
+		&services,
+		sender_user,
+		&body.room_id,
+		&body.event_type,
+		&body.body.body,
+		&body.state_key,
+		if body.identity.is_appservice() {
+			body.timestamp
+		} else {
+			None
+		},
+	)
+	.boxed()
+	.await?;
 
 	Ok(send_state_event::v3::Response::new(event_id))
 }
@@ -66,7 +72,7 @@ pub(crate) async fn send_state_event_for_key_route(
 /// Sends a state event into the room.
 pub(crate) async fn send_state_event_for_empty_key_route(
 	State(services): State<crate::State>,
-	ClientIp(ip): ClientIp, // NOTE: Required for updating device metadata
+	ClientIp(ip): ClientIp,
 	body: Ruma<send_state_event::v3::Request>,
 ) -> Result<RumaResponse<send_state_event::v3::Response>> {
 	send_state_event_for_key_route(State(services), ClientIp(ip), body)
@@ -180,3 +186,257 @@ pub(crate) async fn get_state_events_for_empty_key_route(
 		.await
 		.map(RumaResponse)
 }
+
+async fn send_state_event_for_key_helper(
+	services: &Services,
+	sender: &UserId,
+	room_id: &RoomId,
+	event_type: &StateEventType,
+	json: &Raw<AnyStateEventContent>,
+	state_key: &str,
+	timestamp: Option<MilliSecondsSinceUnixEpoch>,
+) -> Result<OwnedEventId> {
+	let json: &mut Raw<AnyStateEventContent> = &mut json.clone();
+	allowed_to_send_state_event(services, room_id, event_type, state_key, json).await?;
+	let state_lock = services.rooms.state.mutex.lock(room_id).await;
+	let event_id = services
+		.rooms
+		.timeline
+		.build_and_append_pdu(
+			PartialPdu {
+				event_type: event_type.to_string().into(),
+				content: serde_json::from_str(json.json().get())?,
+				state_key: Some(state_key.into()),
+				timestamp,
+				..Default::default()
+			},
+			sender,
+			Some(room_id),
+			&state_lock,
+		)
+		.await?;
+
+	Ok(event_id)
+}
+
+async fn allowed_to_send_state_event(
+	services: &Services,
+	room_id: &RoomId,
+	event_type: &StateEventType,
+	state_key: &str,
+	json: &mut Raw<AnyStateEventContent>,
+) -> Result {
+	match event_type {
+		| StateEventType::RoomCreate => {
+			return Err!(Request(BadJson(debug_warn!(
+				%room_id,
+				"You cannot update m.room.create after a room has been created."
+			))));
+		},
+		| StateEventType::RoomServerAcl => {
+			// prevents common ACL paw-guns as ACL management is difficult and prone to
+			// irreversible mistakes
+			match json.deserialize_as_unchecked::<RoomServerAclEventContent>() {
+				| Ok(acl_content) => {
+					let allow_has_wildcard = acl_content.allow.iter().any(|entry| entry == "*");
+					let deny_has_wildcard = acl_content.deny.iter().any(|entry| entry == "*");
+					let allow_has_server = acl_content
+						.allow
+						.iter()
+						.any(|entry| entry == services.globals.server_name().as_str());
+
+					if acl_content.allow.is_empty() {
+						return Err!(Request(BadJson(debug_warn!(
+							%room_id,
+							"Sending an ACL event with an empty allow key will permanently \
+							 brick the room for non-conduwuit's as this equates to no servers \
+							 being allowed to participate in this room."
+						))));
+					}
+
+					if allow_has_wildcard && deny_has_wildcard {
+						return Err!(Request(BadJson(debug_warn!(
+							%room_id,
+							"Sending an ACL event with a deny and allow key value of \"*\" will \
+							 permanently brick the room for non-conduwuit's as this equates to \
+							 no servers being allowed to participate in this room."
+						))));
+					}
+
+					if deny_has_wildcard
+						&& !acl_content.is_allowed(services.globals.server_name())
+						&& !allow_has_server
+					{
+						return Err!(Request(BadJson(debug_warn!(
+							%room_id,
+							"Sending an ACL event with a deny key value of \"*\" and without \
+							 your own server name in the allow key will result in you being \
+							 unable to participate in this room."
+						))));
+					}
+
+					if !allow_has_wildcard
+						&& !acl_content.is_allowed(services.globals.server_name())
+						&& !allow_has_server
+					{
+						return Err!(Request(BadJson(debug_warn!(
+							%room_id,
+							"Sending an ACL event for an allow key without \"*\" and without \
+							 your own server name in the allow key will result in you being \
+							 unable to participate in this room."
+						))));
+					}
+				},
+				| Err(e) => {
+					return Err!(Request(BadJson(debug_warn!(
+						"Room server ACL event is invalid: {e}"
+					))));
+				},
+			}
+		},
+		| StateEventType::RoomEncryption =>
+		// Forbid m.room.encryption if encryption is disabled
+			if !services.config.allow_encryption {
+				return Err!(Request(Forbidden("Encryption is disabled on this homeserver.")));
+			},
+		| StateEventType::RoomJoinRules => {
+			// admin room is a sensitive room, it should not ever be made public
+			if let Ok(admin_room_id) = services.admin.get_admin_room().await {
+				if admin_room_id == room_id {
+					match json.deserialize_as_unchecked::<RoomJoinRulesEventContent>() {
+						| Ok(join_rule) =>
+							if join_rule.join_rule == JoinRule::Public {
+								return Err!(Request(Forbidden(
+									"Admin room is a sensitive room, it cannot be made public"
+								)));
+							},
+						| Err(e) => {
+							return Err!(Request(BadJson(debug_warn!(
+								"Room join rules event is invalid: {e}"
+							))));
+						},
+					}
+				}
+			}
+		},
+		| StateEventType::RoomHistoryVisibility => {
+			// admin room is a sensitive room, it should not ever be made world readable
+			if let Ok(admin_room_id) = services.admin.get_admin_room().await {
+				match json.deserialize_as_unchecked::<RoomHistoryVisibilityEventContent>() {
+					| Ok(visibility_content) => {
+						if admin_room_id == room_id
+							&& visibility_content.history_visibility
+								== HistoryVisibility::WorldReadable
+						{
+							return Err!(Request(Forbidden(
+								"Admin room is a sensitive room, it cannot be made world \
+								 readable (public room history)."
+							)));
+						}
+					},
+					| Err(e) => {
+						return Err!(Request(BadJson(debug_warn!(
+							"Room history visibility event is invalid: {e}"
+						))));
+					},
+				}
+			}
+		},
+		| StateEventType::RoomCanonicalAlias => {
+			match json.deserialize_as_unchecked::<RoomCanonicalAliasEventContent>() {
+				| Ok(canonical_alias_content) => {
+					let mut aliases = canonical_alias_content.alt_aliases.clone();
+
+					if let Some(alias) = canonical_alias_content.alias {
+						aliases.push(alias);
+					}
+
+					for alias in aliases {
+						let (alias_room_id, _) = services
+							.rooms
+							.alias
+							.resolve_alias(&alias)
+							.await
+							.map_err(|e| {
+								err!(Request(Unknown("Failed resolving alias \"{alias}\": {e}")))
+							})?;
+
+						if alias_room_id != room_id {
+							return Err!(Request(BadAlias(
+								"Room alias {alias} does not belong to room {room_id}"
+							)));
+						}
+					}
+				},
+				| Err(e) => {
+					return Err!(Request(InvalidParam(debug_warn!(
+						"Room canonical alias event is invalid: {e}"
+					))));
+				},
+			}
+		},
+		| StateEventType::RoomMember =>
+			match json.deserialize_as_unchecked::<RoomMemberEventContent>() {
+				| Ok(mut membership_content) => {
+					let Ok(state_key) = UserId::parse(state_key) else {
+						return Err!(Request(BadJson(
+							"Membership event has invalid or non-existent state key"
+						)));
+					};
+
+					if let Some(authorising_user) =
+						membership_content.join_authorized_via_users_server
+					{
+						// join_authorized_via_users_server must be thrown away, if user is
+						// already a member of the room.
+						if services
+							.rooms
+							.state_cache
+							.is_joined(&state_key, room_id)
+							.await
+						{
+							membership_content.join_authorized_via_users_server = None;
+							*json = Raw::<AnyStateEventContent>::from_json_string(
+								serde_json::to_string(&membership_content)?,
+							)?;
+							return Ok(());
+						}
+
+						if membership_content.membership != MembershipState::Join {
+							return Err!(Request(BadJson(
+								"join_authorised_via_users_server is only for member joins"
+							)));
+						}
+
+						if !services.globals.user_is_local(&authorising_user) {
+							return Err!(Request(InvalidParam(
+								"Authorising user {authorising_user} does not belong to this \
+								 homeserver"
+							)));
+						}
+
+						if !services
+							.rooms
+							.state_cache
+							.is_joined(&authorising_user, room_id)
+							.await
+						{
+							return Err!(Request(InvalidParam(
+								"Authorising user {authorising_user} is not in the room, they \
+								 cannot authorise the join."
+							)));
+						}
+					}
+				},
+				| Err(e) => {
+					return Err!(Request(BadJson(
+						"Membership content must have a valid JSON body with at least a valid \
+						 membership state: {e}"
+					)));
+				},
+			},
+		| _ => (),
+	}
+
+	Ok(())
+}

src/api/client/state/tests.rs

@@ -1,8 +1,3 @@
-use ruma::{
-	events::{AnyStateEventContent, room::member::RoomMemberEventContent},
-	serde::Raw,
-};
-
 use super::*;
 
 #[test]

src/api/client/sync/v3/joined.rs

@@ -269,22 +269,13 @@ async fn build_state_and_timeline(
 	)
 	.await?;
 
-	let (notification_counts, joined_since_last_sync) = try_join(
+	let (state_events, notification_counts, joined_since_last_sync) = try_join3(
+		build_state_events(services, sync_context, room_id, shortstatehashes, &timeline),
 		build_notification_counts(services, sync_context, room_id, &timeline),
 		check_joined_since_last_sync(services, shortstatehashes, sync_context),
 	)
 	.await?;
 
-	let state_events = build_state_events(
-		services,
-		sync_context,
-		room_id,
-		shortstatehashes,
-		&timeline,
-		joined_since_last_sync,
-	)
-	.await?;
-
 	// the timeline should always include at least one PDU if the syncing user
 	// joined since the last sync, that being the syncing user's join event. if
 	// it's empty something is wrong.
@@ -468,7 +459,6 @@ async fn build_state_events(
 	room_id: &RoomId,
 	shortstatehashes: ShortStateHashes,
 	timeline: &TimelinePdus,
-	joined_since_last_sync: bool,
 ) -> Result<Vec<PduEvent>> {
 	let SyncContext {
 		syncing_user,
@@ -498,10 +488,9 @@ async fn build_state_events(
 		/*
 		if `last_sync_end_count` is Some (meaning this is an incremental sync), and `last_sync_end_shortstatehash`
 		is Some (meaning the syncing user didn't just join this room for the first time ever), and `full_state` is false,
-		and the user didn't just join the room since the last sync, then use `build_state_incremental`.
+		then use `build_state_incremental`.
 		*/
-		| (Some(_), Some(last_sync_end_shortstatehash))
-			if !full_state && !joined_since_last_sync =>
+		| (Some(_), Some(last_sync_end_shortstatehash)) if !full_state =>
 			build_state_incremental(
 				services,
 				syncing_user,

src/api/client/sync/v3/left.rs

@@ -230,7 +230,7 @@ async fn build_left_state_and_timeline(
 		.and_then(|limit| limit.try_into().ok())
 		.unwrap_or(DEFAULT_TIMELINE_LIMIT);
 
-	let mut timeline = load_timeline(
+	let timeline = load_timeline(
 		services,
 		syncing_user,
 		room_id,
@@ -240,20 +240,6 @@ async fn build_left_state_and_timeline(
 	)
 	.await?;
 
-	// the timeline index can lag behind the leave PDU, so `load_timeline` may omit
-	// it. we already hold the leave event, so ensure it's always synced to the
-	// client.
-	let leave_synced = timeline
-		.pdus
-		.iter()
-		.any(|(_, pdu)| pdu.event_id() == leave_membership_event.event_id());
-
-	if !leave_synced {
-		timeline
-			.pdus
-			.push_back((timeline_end_count, leave_membership_event));
-	}
-
 	let lazily_loaded_members =
 		prepare_lazily_loaded_members(services, sync_context, room_id, timeline.senders()).await;
 

src/api/client/sync/v3/mod.rs

@@ -9,6 +9,7 @@
 };
 
 use axum::extract::State;
+use axum_client_ip::ClientIp;
 use conduwuit::{
 	Err, Result, at, error, extract_variant,
 	utils::{
@@ -47,7 +48,6 @@
 		is_ignored_invite,
 		sync::v3::{joined::load_joined_room, left::load_left_room},
 	},
-	client_ip::ClientIp,
 };
 
 /// The default maximum number of events to return in the `timeline` key of
@@ -181,7 +181,7 @@ fn lazy_loading_enabled(&self) -> bool {
 )]
 pub(crate) async fn sync_events_route(
 	State(services): State<crate::State>,
-	ClientIp(client_ip): ClientIp, // NOTE: Required for updating device metadata
+	ClientIp(client_ip): ClientIp,
 	body: Ruma<sync_events::v3::Request>,
 ) -> Result<sync_events::v3::Response> {
 	let sender_user = body.identity.expect_sender_user()?;

src/api/client/sync/v5.rs

@@ -1,11 +1,12 @@
 use std::{
 	cmp::{self, Ordering},
-	collections::{BTreeMap, BTreeSet, HashMap, HashSet},
+	collections::{BTreeMap, BTreeSet, HashMap, HashSet, VecDeque},
 	ops::Deref,
 	time::Duration,
 };
 
 use axum::extract::State;
+use axum_client_ip::ClientIp;
 use conduwuit::{
 	Err, Error, Result, at, error, extract_variant, is_equal_to,
 	matrix::{Event, TypeStateKey, pdu::PduCount},
@@ -48,7 +49,6 @@
 	client::{
 		DEFAULT_BUMP_TYPES, TimelinePdus, ignored_filter, is_ignored_invite, sync::load_timeline,
 	},
-	client_ip::ClientIp,
 };
 
 type SyncInfo<'a> = (&'a UserId, &'a DeviceId, u64, &'a sync_events::v5::Request);
@@ -67,7 +67,7 @@
 /// [MSC4186]: https://github.com/matrix-org/matrix-spec-proposals/pull/4186
 pub(crate) async fn sync_events_v5_route(
 	State(ref services): State<crate::State>,
-	ClientIp(client_ip): ClientIp, // NOTE: Required for updating device metadata
+	ClientIp(client_ip): ClientIp,
 	body: Ruma<sync_events::v5::Request>,
 ) -> Result<sync_events::v5::Response> {
 	let sender_user = body.identity.expect_sender_user()?;
@@ -138,13 +138,6 @@ pub(crate) async fn sync_events_v5_route(
 	let (all_joined_rooms, all_invited_rooms, all_knocked_rooms) =
 		join3(all_joined_rooms, all_invited_rooms, all_knocked_rooms).await;
 
-	let allowed_rooms: BTreeSet<OwnedRoomId> = all_joined_rooms
-		.iter()
-		.chain(all_invited_rooms.iter())
-		.chain(all_knocked_rooms.iter())
-		.cloned()
-		.collect();
-
 	let all_joined_rooms = all_joined_rooms.iter().map(AsRef::as_ref);
 	let all_invited_rooms = all_invited_rooms.iter().map(AsRef::as_ref);
 	let all_knocked_rooms = all_knocked_rooms.iter().map(AsRef::as_ref);
@@ -197,42 +190,29 @@ pub(crate) async fn sync_events_v5_route(
 	)
 	.await;
 
-	fetch_subscriptions(services, sync_info, &known_rooms, &allowed_rooms, &mut todo_rooms).await;
+	fetch_subscriptions(services, sync_info, &known_rooms, &mut todo_rooms).await;
 
 	response.rooms = process_rooms(
 		services,
 		sender_user,
 		next_batch,
 		all_invited_rooms.clone(),
-		all_knocked_rooms.clone(),
 		&todo_rooms,
 		&mut response,
 		&body,
 	)
 	.await?;
 
-	let no_account_data = response.extensions.account_data.global.is_empty()
-		&& response
-			.extensions
-			.account_data
-			.rooms
-			.values()
-			.all(Vec::is_empty);
-
-	let no_room_data = response.rooms.iter().all(|(id, r)| {
+	if response.rooms.iter().all(|(id, r)| {
 		r.timeline.is_empty()
 			&& r.required_state.is_empty()
-			&& r.invite_state.is_none()
 			&& !response.extensions.receipts.rooms.contains_key(id)
-	});
-
-	let no_to_device_messages = response
+	}) && response
 		.extensions
 		.to_device
 		.clone()
-		.is_none_or(|to| to.events.is_empty());
-
-	if no_account_data && no_room_data && no_to_device_messages {
+		.is_none_or(|to| to.events.is_empty())
+	{
 		// Hang a few seconds so requests are not spammed
 		// Stop hanging if new info arrives
 		let default = Duration::from_secs(30);
@@ -256,17 +236,10 @@ async fn fetch_subscriptions(
 	services: &Services,
 	(sender_user, sender_device, globalsince, body): SyncInfo<'_>,
 	known_rooms: &KnownRooms,
-	allowed_rooms: &BTreeSet<OwnedRoomId>,
 	todo_rooms: &mut TodoRooms,
 ) {
 	let mut known_subscription_rooms = BTreeSet::new();
 	for (room_id, room) in &body.room_subscriptions {
-		// Silently ignore subscriptions to rooms the user is not a member of
-		// (joined or invited).
-		if !allowed_rooms.contains(room_id) {
-			continue;
-		}
-
 		let not_exists = services.rooms.metadata.exists(room_id).eq(&false);
 
 		let is_disabled = services.rooms.metadata.is_disabled(room_id);
@@ -425,13 +398,11 @@ async fn handle_lists<'a, Rooms, AllRooms>(
 	BTreeMap::default()
 }
 
-#[allow(clippy::too_many_arguments)]
 async fn process_rooms<'a, Rooms>(
 	services: &Services,
 	sender_user: &UserId,
 	next_batch: u64,
 	all_invited_rooms: Rooms,
-	all_knocked_rooms: Rooms,
 	todo_rooms: &TodoRooms,
 	response: &mut sync_events::v5::Response,
 	body: &sync_events::v5::Request,
@@ -444,101 +415,38 @@ async fn process_rooms<'a, Rooms>(
 		let roomsincecount = PduCount::Normal(*roomsince);
 
 		let mut timestamp: Option<_> = None;
+		let mut invite_state = None;
 		let (timeline_pdus, limited);
 		let new_room_id: &RoomId = (*room_id).as_ref();
 		if all_invited_rooms.clone().any(is_equal_to!(new_room_id)) {
-			let Ok(invite_count) = services
-				.rooms
-				.state_cache
-				.get_invite_count(room_id, sender_user)
-				.await
-			else {
-				continue;
-			};
-
-			if *roomsince >= invite_count {
-				continue;
-			}
-
 			// TODO: figure out a timestamp we can use for remote invites
-			let invite_state = services
+			invite_state = services
 				.rooms
 				.state_cache
 				.invite_state(sender_user, room_id)
 				.await
 				.ok();
 
-			rooms.insert(
-				room_id.clone(),
-				assign!(sync_events::v5::response::Room::new(), {
-					initial: Some(roomsince == &0),
-					invite_state,
-					limited: true,
-				}),
-			);
-			continue;
-		}
-
-		if all_knocked_rooms.clone().any(is_equal_to!(new_room_id)) {
-			let Ok(knock_count) = services
-				.rooms
-				.state_cache
-				.get_knock_count(room_id, sender_user)
-				.await
-			else {
-				continue;
-			};
-
-			if *roomsince >= knock_count {
-				continue;
-			}
-
-			let Ok(knock_state) = services
-				.rooms
-				.state_cache
-				.knock_state(sender_user, room_id)
-				.await
-			else {
-				continue;
-			};
-
-			rooms.insert(
-				room_id.clone(),
-				assign!(sync_events::v5::response::Room::new(), {
-					initial: Some(roomsince == &0),
-					invite_state: Some(knock_state),
-					limited: true,
-				}),
-			);
-			continue;
-		}
-
-		if !services
-			.rooms
-			.state_cache
-			.is_joined(sender_user, room_id)
+			(timeline_pdus, limited) = (VecDeque::new(), true);
+		} else {
+			TimelinePdus { pdus: timeline_pdus, limited } = match load_timeline(
+				services,
+				sender_user,
+				room_id,
+				Some(roomsincecount),
+				Some(PduCount::from(next_batch)),
+				*timeline_limit,
+			)
 			.await
-		{
-			continue;
+			{
+				| Ok(value) => value,
+				| Err(err) => {
+					warn!("Encountered missing timeline in {}, error {}", room_id, err);
+					continue;
+				},
+			};
 		}
 
-		TimelinePdus { pdus: timeline_pdus, limited } = match load_timeline(
-			services,
-			sender_user,
-			room_id,
-			Some(roomsincecount),
-			Some(PduCount::from(next_batch)),
-			*timeline_limit,
-		)
-		.await
-		{
-			| Ok(value) => value,
-			| Err(err) => {
-				warn!("Encountered missing timeline in {}, error {}", room_id, err);
-				continue;
-			},
-		};
-
 		if body.extensions.account_data.enabled == Some(true) {
 			response.extensions.account_data.rooms.insert(
 				room_id.to_owned(),
@@ -722,6 +630,7 @@ async fn process_rooms<'a, Rooms>(
 				},
 				initial: Some(roomsince == &0),
 				is_dm: None,
+				invite_state,
 				unread_notifications: assign!(UnreadNotificationsCount::new(), {
 					highlight_count: Some(
 						services
@@ -849,15 +758,6 @@ async fn collect_typing_events(
 
 	let mut typing_response = sync_events::v5::response::Typing::default();
 	for (room_id, (_, _, roomsince)) in todo_rooms {
-		if !services
-			.rooms
-			.state_cache
-			.is_joined(sender_user, room_id)
-			.await
-		{
-			continue;
-		}
-
 		if services.rooms.typing.last_typing_update(room_id).await? <= *roomsince {
 			continue;
 		}

src/api/client/typing.rs

@@ -1,15 +1,16 @@
 use axum::extract::State;
+use axum_client_ip::ClientIp;
 use conduwuit::{Err, Result, utils, utils::math::Tried};
 use ruma::api::client::typing::create_typing_event::{self, v3::TypingInfo};
 
-use crate::{Ruma, client_ip::ClientIp};
+use crate::Ruma;
 
 /// # `PUT /_matrix/client/r0/rooms/{roomId}/typing/{userId}`
 ///
 /// Sets the typing state of the sender user.
 pub(crate) async fn create_typing_event_route(
 	State(services): State<crate::State>,
-	ClientIp(ip): ClientIp, // NOTE: Required for updating device metadata
+	ClientIp(ip): ClientIp,
 	body: Ruma<create_typing_event::v3::Request>,
 ) -> Result<create_typing_event::v3::Response> {
 	use create_typing_event::v3::Typing;

src/api/client/unversioned.rs

@@ -44,25 +44,11 @@ pub(crate) async fn continuwuity_server_version() -> Result<impl IntoResponse> {
 ///
 /// conduwuit-specific API to return the amount of users registered on this
 /// homeserver. Endpoint is disabled if federation is disabled for privacy. This
-///
 /// only includes active users (not deactivated, etc)
 pub(crate) async fn continuwuity_local_user_count(
 	State(services): State<crate::State>,
 ) -> Result<impl IntoResponse> {
-	let user_count = services
-		.users
-		.stream_local_users()
-		.filter_map(async |user_id| {
-			if !services.users.status(&user_id).await.is_active()
-				|| services.appservice.is_exclusive_user_id(&user_id).await
-			{
-				None
-			} else {
-				Some(user_id)
-			}
-		})
-		.count()
-		.await;
+	let user_count = services.users.stream_local_users().count().await;
 
 	Ok(Json(serde_json::json!({
 		"count": user_count

src/api/client_ip.rs

@@ -1,212 +0,0 @@
-use core::net::{IpAddr, SocketAddr};
-use std::ops::Deref;
-
-use axum::{
-	extract::{ConnectInfo, FromRequestParts},
-	response::{IntoResponse, Response},
-};
-use conduwuit::{debug_info, debug_warn};
-use http::{HeaderMap, StatusCode, request::Parts};
-use service::Services;
-
-#[derive(Debug, PartialEq)]
-pub enum ClientIpError {
-	Header(client_ip::Error),
-	Direct,
-}
-
-impl IntoResponse for ClientIpError {
-	fn into_response(self) -> Response {
-		let text = match self {
-			| Self::Header(e) => format!("{e}"),
-			| Self::Direct => "Failed to extract IP from ConnectionInfo".to_owned(),
-		};
-		(StatusCode::INTERNAL_SERVER_ERROR, text).into_response()
-	}
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
-pub struct ClientIp(pub IpAddr);
-
-type PartsToIpFn = Box<dyn Fn(&Parts) -> Result<ClientIp, ClientIpError>>;
-
-impl ClientIp {
-	fn from_header<T>(func: T) -> PartsToIpFn
-	where
-		T: Fn(&HeaderMap) -> Result<IpAddr, client_ip::Error> + 'static,
-	{
-		Box::new(move |parts: &Parts| {
-			func(&parts.headers)
-				.map(Self)
-				.map_err(ClientIpError::Header)
-		})
-	}
-
-	fn from_connection_info(parts: &Parts) -> Result<Self, ClientIpError> {
-		parts
-			.extensions
-			.get::<ConnectInfo<SocketAddr>>()
-			.ok_or_else(|| ClientIpError::Direct)
-			.map(|ConnectInfo(addr)| Self(addr.ip()))
-	}
-
-	fn for_source(source: &str) -> Option<PartsToIpFn> {
-		match source {
-			| "cf_connecting_ip" => Some(Self::from_header(client_ip::cf_connecting_ip)),
-			| "cloudfront_viewer_address" =>
-				Some(Self::from_header(client_ip::cloudfront_viewer_address)),
-			| "fly_client_ip" => Some(Self::from_header(client_ip::fly_client_ip)),
-			| "x_forwarded_for" => Some(Self::from_header(client_ip::rightmost_x_forwarded_for)),
-			| "true_client_ip" => Some(Self::from_header(client_ip::true_client_ip)),
-			| "x_envoy_external_address" =>
-				Some(Self::from_header(client_ip::x_envoy_external_address)),
-			| "x_real_ip" => Some(Self::from_header(client_ip::x_real_ip)),
-			| "direct" => Some(Box::new(Self::from_connection_info)),
-			| s => {
-				debug_warn!("Invalid client IP source option supplied, skipping: {s}");
-				None
-			},
-		}
-	}
-
-	fn for_config(
-		parts: &Parts,
-		accepted_ip_sources: &[String],
-		request_ip_source: Option<&String>,
-	) -> Result<Self, ClientIpError> {
-		accepted_ip_sources
-			.iter()
-			.filter_map(|s| Self::for_source(s))
-			.map(|f| f(parts))
-			.reduce(Result::or)
-			.or_else(|| {
-				debug_info!(
-					"No (valid) options set in `accepted_ip_sources`; falling back to \
-					 `request_ip_source`"
-				);
-				request_ip_source
-					.and_then(|s| Self::for_source(s))
-					.map(|f| f(parts).or_else(|_| Self::from_connection_info(parts)))
-			})
-			.unwrap_or_else(|| {
-				debug_info!(
-					"No (valid) options set in `accepted_ip_sources` or `request_ip_source`; \
-					 using peer address"
-				);
-				Self::from_connection_info(parts)
-			})
-	}
-}
-
-impl<S> FromRequestParts<S> for ClientIp
-where
-	S: Deref<Target = Services> + Sync,
-{
-	type Rejection = ClientIpError;
-
-	async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self, Self::Rejection> {
-		Self::for_config(
-			parts,
-			&state.config.accepted_ip_sources,
-			state.config.request_ip_source.as_ref(),
-		)
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use std::net::{Ipv4Addr, Ipv6Addr};
-
-	use super::*;
-
-	const SOCKET_V4: IpAddr = IpAddr::V4(Ipv4Addr::new(198, 51, 100, 1));
-	const HEADER_V4: IpAddr = IpAddr::V4(Ipv4Addr::new(203, 0, 113, 1));
-
-	const SOCKET_V6: IpAddr = IpAddr::V6(Ipv6Addr::new(0x2001, 0xDB8, 0, 0, 0, 0, 0, 1));
-	const HEADER_V6: IpAddr = IpAddr::V6(Ipv6Addr::new(0x2001, 0xDB8, 0, 0, 0, 0, 0, 2));
-
-	fn parts(peer: Option<IpAddr>, headers: &[(&str, &str)]) -> Parts {
-		let mut builder = http::Request::builder();
-		for (name, value) in headers {
-			builder = builder.header(*name, *value);
-		}
-
-		let (mut parts, ()) = builder.body(()).unwrap().into_parts();
-		if let Some(peer) = peer {
-			parts
-				.extensions
-				.insert(ConnectInfo(SocketAddr::new(peer, 8448)));
-		}
-
-		parts
-	}
-
-	fn extract(
-		parts: &Parts,
-		accepted_ip_sources: &[String],
-		request_ip_source: Option<&String>,
-	) -> Result<IpAddr, ClientIpError> {
-		ClientIp::for_config(parts, accepted_ip_sources, request_ip_source).map(|ClientIp(ip)| ip)
-	}
-
-	#[tokio::test]
-	async fn resolves_from_configured_source_ipv4() {
-		let parts = parts(Some(SOCKET_V4), &[("x-real-ip", &HEADER_V4.to_string())]);
-
-		assert_eq!(extract(&parts, &["x_real_ip".to_owned()], None), Ok(HEADER_V4));
-		assert_eq!(extract(&parts, &[], Some(&"x_real_ip".to_owned())), Ok(HEADER_V4));
-	}
-
-	#[tokio::test]
-	async fn resolves_from_configured_source_ipv6() {
-		let parts = parts(Some(SOCKET_V6), &[("x-real-ip", &HEADER_V6.to_string())]);
-
-		assert_eq!(extract(&parts, &["x_real_ip".to_owned()], None), Ok(HEADER_V6));
-		assert_eq!(extract(&parts, &[], Some(&"x_real_ip".to_owned())), Ok(HEADER_V6));
-	}
-
-	#[tokio::test]
-	async fn accepted_ip_sources_no_fall_back_to_peer_when_header_missing() {
-		let parts = parts(Some(SOCKET_V4), &[]);
-
-		extract(&parts, &["x_real_ip".to_owned()], None).unwrap_err();
-	}
-
-	#[tokio::test]
-	async fn request_ip_source_falls_back_to_peer_when_header_missing() {
-		let parts = parts(Some(SOCKET_V4), &[]);
-
-		assert_eq!(extract(&parts, &[], Some(&"x_real_ip".to_owned())), Ok(SOCKET_V4));
-	}
-
-	#[tokio::test]
-	async fn accepted_ip_sources_no_fall_back_to_peer_when_header_unparsable() {
-		let parts = parts(Some(SOCKET_V4), &[("x-real-ip", "not-an-ip")]);
-
-		extract(&parts, &["x_real_ip".to_owned()], None).unwrap_err();
-	}
-
-	#[tokio::test]
-	async fn request_ip_source_falls_back_to_peer_when_header_unparsable() {
-		let parts = parts(Some(SOCKET_V4), &[("x-real-ip", "not-an-ip")]);
-
-		assert_eq!(extract(&parts, &[], Some(&"x_real_ip".to_owned())), Ok(SOCKET_V4));
-	}
-
-	#[tokio::test]
-	async fn accepted_ip_sources_falls_back_when_configured() {
-		let parts = parts(Some(SOCKET_V4), &[]);
-
-		assert_eq!(
-			extract(&parts, &["x_real_ip".to_owned(), "direct".to_owned()], None),
-			Ok(SOCKET_V4)
-		);
-	}
-
-	#[tokio::test]
-	async fn falls_back_to_peer_no_configuration() {
-		let parts = parts(Some(SOCKET_V4), &[("x-real-ip", &HEADER_V4.to_string())]);
-
-		assert_eq!(extract(&parts, &[], None), Ok(SOCKET_V4));
-	}
-}

src/api/mod.rs

@@ -11,8 +11,6 @@
 pub mod router;
 pub mod server;
 
-pub mod client_ip;
-
 pub mod admin;
 
 pub(crate) use self::router::{Ruma, RumaResponse, State};

src/api/router.rs

@@ -177,7 +177,6 @@ pub fn build(router: Router<State>, state: State) -> Router<State> {
 		.ruma_route(&client::get_relating_events_with_rel_type_route)
 		.ruma_route(&client::get_relating_events_route)
 		.ruma_route(&client::get_hierarchy_route)
-		.ruma_route(&client::get_mutual_rooms_unstable_route)
 		.ruma_route(&client::get_mutual_rooms_route)
 		.ruma_route(&client::get_room_summary)
 		.ruma_route(&client::get_suspended_status)

src/api/router/args.rs

@@ -15,9 +15,10 @@
 #[derive(Deserialize)]
 pub(crate) struct AuthQueryParams {
 	pub(super) user_id: Option<String>,
+	/// Device ID for appservice device masquerading (MSC3202/MSC4190).
+	/// Can be provided as `device_id` or `org.matrix.msc3202.device_id`.
+	#[serde(alias = "org.matrix.msc3202.device_id")]
 	pub(super) device_id: Option<String>,
-	#[serde(rename = "org.matrix.msc3202.device_id")]
-	pub(super) legacy_device_id: Option<String>,
 }
 
 /// Extractor for Ruma request structs

src/api/router/auth.rs

@@ -219,29 +219,25 @@ async fn verify<B: AsRef<[u8]> + Sync>(
 			// MSC3202/MSC4190: Handle device_id masquerading for appservices.
 			// The device_id can be provided via `device_id` or
 			// `org.matrix.msc3202.device_id` query parameter.
-			let sender_device = if let Some(device_id) = query
-				.device_id
-				.or(query.legacy_device_id)
-				.as_deref()
-				.map(Into::into)
-			{
-				// Verify the device exists for this user
-				if services
-					.users
-					.get_device_metadata(&sender_user, device_id)
-					.await
-					.is_err()
-				{
-					return Err!(Request(Forbidden(
-						"Device does not exist for user or appservice cannot masquerade as this \
-						 device."
-					)));
-				}
+			let sender_device =
+				if let Some(device_id) = query.device_id.as_deref().map(Into::into) {
+					// Verify the device exists for this user
+					if services
+						.users
+						.get_device_metadata(&sender_user, device_id)
+						.await
+						.is_err()
+					{
+						return Err!(Request(Forbidden(
+							"Device does not exist for user or appservice cannot masquerade as \
+							 this device."
+						)));
+					}
 
-				Some(device_id.to_owned())
-			} else {
-				None
-			};
+					Some(device_id.to_owned())
+				} else {
+					None
+				};
 
 			Ok(ClientIdentity::Appservice {
 				sender_user,

src/api/server/invite.rs

@@ -1,47 +1,57 @@
-use std::collections::{HashMap, hash_map::Entry};
-
 use axum::extract::State;
+use axum_client_ip::ClientIp;
 use base64::{Engine as _, engine::general_purpose};
 use conduwuit::{
-	Err, Error, EventTypeExt, PduEvent, Result, debug, err, error,
-	matrix::{Event, StateKey},
-	result::FlatOk,
-	state_res, trace,
-	utils::hash::sha256,
+	Err, Error, PduEvent, Result, err, error,
+	matrix::{Event, event::gen_event_id},
+	utils::{self, hash::sha256},
 	warn,
 };
 use ruma::{
-	CanonicalJsonObject, CanonicalJsonValue, OwnedEventId, OwnedRoomId, OwnedUserId, ServerName,
-	UserId,
+	CanonicalJsonValue, UserId,
 	api::{
 		error::{ErrorKind, IncompatibleRoomVersionErrorData},
 		federation::membership::{RawStrippedState, create_invite},
 	},
-	events::{StateEventType, room::member::MembershipState},
-	room_version_rules::RoomVersionRules,
+	events::room::member::{MembershipState, RoomMemberEventContent},
+	serde::JsonObject,
 };
-use serde::Deserialize;
 
-use crate::{Ruma, server::utils::validate_any_membership_event};
+use crate::Ruma;
 
 /// # `PUT /_matrix/federation/v2/invite/{roomId}/{eventId}`
 ///
 /// Invites a remote user to a room.
-#[tracing::instrument(skip_all, name = "invite", level = "info")]
+#[tracing::instrument(skip_all, fields(%client), name = "invite", level = "info")]
 pub(crate) async fn create_invite_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<create_invite::v2::Request>,
 ) -> Result<create_invite::v2::Response> {
+	// ACL check origin
+	services
+		.rooms
+		.event_handler
+		.acl_check(&body.identity, &body.room_id)
+		.await?;
+
 	if !services.server.supported_room_version(&body.room_version) {
 		return Err(Error::BadRequest(
 			ErrorKind::IncompatibleRoomVersion(IncompatibleRoomVersionErrorData::new(
 				body.room_version.clone(),
 			)),
-			"This server does not support that room version",
+			"Server does not support this room version.",
 		));
 	}
+
 	let room_version_rules = body.room_version.rules().unwrap();
 
+	if let Some(server) = body.room_id.server_name() {
+		if services.moderation.is_remote_server_forbidden(server) {
+			return Err!(Request(Forbidden("Server is banned on this homeserver.")));
+		}
+	}
+
 	if services
 		.moderation
 		.is_remote_server_forbidden(&body.identity)
@@ -51,61 +61,90 @@ pub(crate) async fn create_invite_route(
 			body.identity, body.room_id
 		);
 
-		return Err!(Request(Forbidden("Federation denied with {}", body.identity)));
-	}
-
-	// First, validate the invite room state, so we can compare with the create
-	// event.
-	debug!(
-		event_id=%body.event_id,
-		room_id=%body.room_id,
-		room_version=?body.room_version,
-		via=?body.via,
-		"Validating invite room state for invite request"
-	);
-	let (create_event_id, state) = validate_invite_state(
-		&services,
-		&body.invite_room_state,
-		&room_version_rules,
-		body.room_id.clone(),
-	)
-	.await?;
-	let create_event_json = state
-		.get(&StateEventType::RoomCreate.with_state_key(""))
-		.expect("must have create event in invite state by this point");
-
-	// We can now perform the banned remote server check with the create event.
-	// N.B. this checks the sender field, which is technically incorrect for rooms
-	// v10 and below. This usually isn't the case though so sue me
-	let creator = create_event_json
-		.get("sender")
-		.and_then(|v| v.as_str())
-		.map(UserId::parse)
-		.flat_ok()
-		.expect("must have valid sender in create event");
-	if services
-		.moderation
-		.is_remote_server_forbidden(creator.server_name())
-	{
 		return Err!(Request(Forbidden("Server is banned on this homeserver.")));
 	}
 
-	// And then we can validate the member event itself
-	let (mut signed_event, sender_user, recipient_user) = validate_invite_membership_event(
-		&services,
-		&body.event,
-		&room_version_rules,
-		&body.identity,
-		create_event_id.clone(),
-		body.room_id.clone(),
-		body.event_id.clone(),
+	let mut signed_event = utils::to_canonical_object(&body.event)
+		.map_err(|_| err!(Request(InvalidParam("Invite event is invalid."))))?;
+
+	// Ensure this is a membership event
+	if signed_event
+		.get("type")
+		.expect("event must have a type")
+		.as_str()
+		.expect("type must be a string")
+		!= "m.room.member"
+	{
+		return Err!(Request(BadJson(
+			"Not allowed to send non-membership event to invite endpoint."
+		)));
+	}
+
+	let content: RoomMemberEventContent = serde_json::from_value(
+		signed_event
+			.get("content")
+			.ok_or_else(|| err!(Request(BadJson("Event missing content property"))))?
+			.clone()
+			.into(),
 	)
-	.await?;
+	.map_err(|e| err!(Request(BadJson(warn!("Event content is empty or invalid: {e}")))))?;
+
+	// Ensure this is an invite membership event
+	if content.membership != MembershipState::Invite {
+		return Err!(Request(BadJson(
+			"Not allowed to send a non-invite membership event to invite endpoint."
+		)));
+	}
+
+	// Ensure the sending user isn't a lying bozo
+	let sender_user = signed_event
+		.get("sender")
+		.and_then(|v| v.as_str())
+		.map(UserId::parse)
+		.and_then(Result::ok)
+		.ok_or_else(|| err!(Request(InvalidParam("Invalid sender property"))))?;
+
+	if sender_user.server_name() != body.identity {
+		return Err!(Request(Forbidden("Sender's server does not match the origin server.",)));
+	}
+
+	// Ensure the target user belongs to this server
+	let recipient_user = signed_event
+		.get("state_key")
+		.and_then(|v| v.as_str())
+		.map(UserId::parse)
+		.and_then(Result::ok)
+		.ok_or_else(|| err!(Request(InvalidParam("Invalid state_key property"))))?;
+
+	if !services
+		.globals
+		.server_is_ours(recipient_user.server_name())
+	{
+		return Err!(Request(InvalidParam("User does not belong to this homeserver.")));
+	}
+
+	// Make sure we're not ACL'ed from their room.
+	services
+		.rooms
+		.event_handler
+		.acl_check(recipient_user.server_name(), &body.room_id)
+		.await?;
+
+	services
+		.server_keys
+		.hash_and_sign_event(&mut signed_event, &room_version_rules)
+		.map_err(|e| err!(Request(InvalidParam("Failed to sign event: {e}"))))?;
+
+	// Generate event id
+	let event_id = gen_event_id(&signed_event, &room_version_rules)?;
+
+	// Add event_id back
+	signed_event.insert("event_id".to_owned(), CanonicalJsonValue::String(event_id.to_string()));
 
 	if services.rooms.metadata.is_banned(&body.room_id).await
 		&& !services.users.is_admin(&recipient_user).await
 	{
-		return Err!(Request(Forbidden("That room is banned on this homeserver.")));
+		return Err!(Request(Forbidden("This room is banned on this homeserver.")));
 	}
 
 	if services.config.block_non_admin_invites && !services.users.is_admin(&recipient_user).await
@@ -122,57 +161,30 @@ pub(crate) async fn create_invite_route(
 		return Err!(Request(Forbidden("Invite rejected by antispam service.")));
 	}
 
-	// If we're already in the room, ensure that neither the origin nor ourselves
-	// are ACL'd.
-	let resident = services
-		.rooms
-		.state_cache
-		.server_in_room(services.globals.server_name(), &body.room_id)
-		.await;
-	if resident {
-		services
-			.rooms
-			.event_handler
-			.acl_check(&body.identity, &body.room_id)
-			.await?;
-		services
-			.rooms
-			.event_handler
-			.acl_check(recipient_user.server_name(), &body.room_id)
-			.await
-			.map_err(|_| err!(Request(Forbidden("This server is ACL'd from that room"))))?;
-	}
-
-	services
-		.server_keys
-		.hash_and_sign_event(&mut signed_event, &room_version_rules)
-		.map_err(|e| err!(Request(InvalidParam("Failed to sign event: {e}"))))?;
-
-	// Add event_id back
-	signed_event
-		.insert("event_id".to_owned(), CanonicalJsonValue::String(body.event_id.to_string()));
-
 	let mut invite_state = body.invite_room_state.clone();
-	let pdu = PduEvent::from_id_val(&body.event_id, signed_event.clone())
-		.expect("must be able to create PDU object");
-	invite_state.push(RawStrippedState::Pdu(serde_json::value::to_raw_value(&signed_event)?));
+
+	let mut event: JsonObject = serde_json::from_str(body.event.get())
+		.map_err(|e| err!(Request(BadJson("Invalid invite event PDU: {e}"))))?;
+
+	event.insert("event_id".to_owned(), "$placeholder".into());
+
+	let pdu: PduEvent = serde_json::from_value(event.into())
+		.map_err(|e| err!(Request(BadJson("Invalid invite event PDU: {e}"))))?;
+
+	invite_state.push(RawStrippedState::Pdu(
+		serde_json::value::to_raw_value(&pdu).expect("PDU was just created, it must be valid"),
+	));
 
 	// If we are active in the room, the remote server will notify us about the
 	// join/invite through /send. If we are not in the room, we need to manually
 	// record the invited state for client /sync through update_membership(), and
 	// send the invite PDU to the relevant appservices.
-	if !resident {
-		// We will start by recording the room's create event as an outlier.
-		// This will allow us to recognise it later in case the sender revokes the
-		// invite over federation later. We could store more state from the invite
-		// request, but we will get that during send_join anyway.
-		// This is safe to just add directly as an outlier as we already auth checked it
-		// during validation.
-		services
-			.rooms
-			.outlier
-			.add_pdu_outlier(&create_event_id, create_event_json);
-
+	if !services
+		.rooms
+		.state_cache
+		.server_in_room(services.globals.server_name(), &body.room_id)
+		.await
+	{
 		services
 			.rooms
 			.state_cache
@@ -228,197 +240,3 @@ pub(crate) async fn create_invite_route(
 			.await,
 	))
 }
-
-/// Validates the *membership event* in the invite request, per the steps listed
-/// under the invite endpoint's [spec].
-///
-/// Returns the validated JSON body, sender user ID, and recipient user ID.
-///
-/// Since this function performs a PDU format check, the create event must be
-/// known ahead of time. This implies validating the invite state before the
-/// invite event itself.
-///
-/// [spec]: https://spec.matrix.org/v1.19/server-server-api/#put_matrixfederationv2inviteroomideventid
-async fn validate_invite_membership_event(
-	services: &crate::State,
-	body: &serde_json::value::RawValue,
-	room_version_rules: &RoomVersionRules,
-	origin: &ServerName,
-	create_event_id: OwnedEventId,
-	room_id: OwnedRoomId,
-	event_id: OwnedEventId,
-) -> Result<(CanonicalJsonObject, OwnedUserId, OwnedUserId)> {
-	trace!(?body, "Invite membership event");
-	let (pdu, target_membership, sender_user, recipient_user) = validate_any_membership_event(
-		services,
-		body,
-		room_version_rules,
-		create_event_id,
-		room_id,
-		event_id,
-	)
-	.await?;
-
-	// Ensure the sender belongs to the remote that is sending the invite
-	if sender_user.server_name() != origin {
-		return Err!(Request(Forbidden("Sender belongs to a different server")));
-	}
-
-	// Ensure the target user belongs to this server
-	if !services
-		.globals
-		.server_is_ours(recipient_user.server_name())
-	{
-		return Err!(Request(InvalidParam("Recipient does not belong to this homeserver")));
-	}
-
-	if target_membership != MembershipState::Invite {
-		return Err!(Request(BadJson("Invalid membership (expected `invite`)")));
-	}
-
-	Ok((pdu, sender_user, recipient_user))
-}
-
-/// Validates the *invite state* of an invite request, per the steps listed
-/// under the endpoint's [spec].
-///
-/// Returns the create event's event ID, and the partial state map.
-///
-/// [spec]: https://spec.matrix.org/v1.19/server-server-api/#put_matrixfederationv2inviteroomideventid
-async fn validate_invite_state(
-	services: &crate::State,
-	invite_state: &[RawStrippedState],
-	room_version_rules: &RoomVersionRules,
-	room_id: OwnedRoomId,
-) -> Result<(OwnedEventId, HashMap<(StateEventType, StateKey), CanonicalJsonObject>)> {
-	trace!(?invite_state, "Raw invite state");
-	let mut invite_state_map: HashMap<(StateEventType, StateKey), _> =
-		HashMap::with_capacity(invite_state.len());
-	let mut create_event_id: Option<OwnedEventId> = None;
-
-	for (idx, invite_state_event) in invite_state.iter().cloned().enumerate() {
-		trace!(%idx, ?invite_state_event, "Invite state event");
-		// Stripped state hasn't been sent over federation since v1.16.
-		let RawStrippedState::Pdu(raw_pdu) = invite_state_event else {
-			debug!(%idx, "Invite state event is not a PDU");
-			return Err!(Request(InvalidParam(
-				"PDU in invite state (index {idx}) violates the room event format"
-			)));
-		};
-		let (state_event_room_id, state_event_id, state_event_json) = services
-			.rooms
-			.event_handler
-			.parse_incoming_pdu(&raw_pdu, Some(room_version_rules))
-			.await
-			.map_err(|e| {
-				err!(Request(InvalidParam(debug_warn!("Invalid PDU in invite state: {e}"))))
-			})?;
-
-		if state_event_room_id != room_id {
-			return Err!(Request(InvalidParam(debug_warn!(
-				%state_event_room_id,
-				%room_id,
-				"PDU in invite state ({state_event_id}) belongs to the wrong room"
-			))));
-		}
-
-		services
-			.server_keys
-			.verify_event(&state_event_json, room_version_rules)
-			.await
-			.map_err(|e| {
-				err!(Request(InvalidParam("Signature verification failed on invite event: {e}")))
-			})?;
-
-		let Some(state_key) = state_event_json.get("state_key").and_then(|k| k.as_str()) else {
-			return Err!(Request(InvalidParam(debug_info!(
-				"PDU in invite state ({state_event_id}) is not a state event"
-			))));
-		};
-		let Some(event_type) = state_event_json.get("type").and_then(|k| k.as_str()) else {
-			return Err!(Request(InvalidParam(debug_warn!(
-				"PDU in invite state ({state_event_id}) is not an event?"
-			))));
-		};
-
-		let key = StateEventType::from(event_type).with_state_key(state_key);
-		match invite_state_map.entry(key) {
-			| Entry::Occupied(entry) =>
-				return Err!(Request(InvalidParam(
-					"Duplicate state events in invite state for state key: {:?}",
-					entry.key(),
-				))),
-			| Entry::Vacant(entry) => {
-				if entry.key().0 == StateEventType::RoomCreate {
-					// Ensure this is a legal create event.
-					let pdu_event =
-						PduEvent::from_id_val(&state_event_id, state_event_json.clone())
-							.expect("must be able to create pdu event from event json");
-					debug!("Validating discovered create event in invite room state");
-					validate_invite_create_event(&pdu_event, room_version_rules).await?;
-					create_event_id = Some(state_event_id);
-				}
-				entry.insert(state_event_json);
-			},
-		}
-	}
-	let Some(create_event_id) = create_event_id else {
-		return Err!(Request(InvalidParam(debug_warn!(
-			parsed_state=?invite_state_map,
-			"Invite state does not contain the m.room.create event"
-		))));
-	};
-	invite_state_map.iter().try_for_each(|(key, event_json)| {
-		service::rooms::event_handler::Service::pdu_format_check_1(
-			event_json,
-			room_version_rules,
-			&create_event_id,
-		)
-		.map_err(|e| {
-			err!(Request(InvalidParam(
-				"PDU in invite state for {key:?} violates the room event format: {e}"
-			)))
-		})
-	})?;
-
-	Ok((create_event_id, invite_state_map))
-}
-
-#[derive(Deserialize)]
-struct MFederate {
-	#[serde(rename = "m.federate")]
-	mfederate: Option<bool>,
-}
-
-/// Validates that a create event is suitable for the invite, namely:
-///
-/// 1. It passes auth checks (aka is valid)
-/// 2. The room is federated (there's no point persisting unfederated rooms)
-async fn validate_invite_create_event(
-	pdu: &PduEvent,
-	room_version_rules: &RoomVersionRules,
-) -> Result {
-	if !state_res::auth_check(
-		room_version_rules,
-		pdu,
-		None,
-		|_, _| async {
-			unreachable!("No state should be fetched when processing a lone create event");
-		},
-		pdu,
-	)
-	.await
-	.unwrap_or_default()
-	{
-		return Err!(Request(InvalidParam("m.room.create event fails auth check")));
-	}
-
-	let can_federate = pdu.get_content::<MFederate>()?.mfederate;
-	if !can_federate.unwrap_or(true) {
-		return Err!(Request(InvalidParam(
-			"Cannot receive invites to a room with m.federate=false"
-		)));
-	}
-
-	Ok(())
-}

src/api/server/make_join.rs

@@ -75,6 +75,14 @@ pub(crate) async fn create_join_event_template_route(
 		return Err!(Request(Forbidden("Server is banned on this homeserver.")));
 	}
 
+	if let Some(server) = body.room_id.server_name() {
+		if services.moderation.is_remote_server_forbidden(server) {
+			return Err!(Request(Forbidden(warn!(
+				"Room ID server name {server} is banned on this homeserver."
+			))));
+		}
+	}
+
 	let room_version = services.rooms.state.get_room_version(&body.room_id).await?;
 	let room_version_rules = room_version.rules().unwrap();
 	if !body.ver.contains(&room_version) {

src/api/server/make_knock.rs

@@ -58,6 +58,12 @@ pub(crate) async fn create_knock_event_template_route(
 		return Err!(Request(Forbidden("Server is banned on this homeserver.")));
 	}
 
+	if let Some(server) = body.room_id.server_name() {
+		if services.moderation.is_remote_server_forbidden(server) {
+			return Err!(Request(Forbidden("Server is banned on this homeserver.")));
+		}
+	}
+
 	let room_version = services.rooms.state.get_room_version(&body.room_id).await?;
 	let room_version_rules = room_version.rules().unwrap();
 

src/api/server/make_leave.rs

@@ -27,7 +27,6 @@ pub(crate) async fn create_leave_event_template_route(
 	{
 		info!(
 			origin = body.identity.as_str(),
-			room_id = %body.room_id,
 			"Refusing to serve make_leave for room we aren't participating in"
 		);
 		return Err!(Request(NotFound("This server is not participating in that room.")));

src/api/server/media.rs

@@ -1,4 +1,5 @@
 use axum::extract::State;
+use axum_client_ip::ClientIp;
 use conduwuit::{Err, Result, utils::content_disposition::make_content_disposition};
 use conduwuit_service::media::{Dim, FileMeta};
 use ruma::api::federation::authenticated_media::{
@@ -11,9 +12,15 @@
 /// # `GET /_matrix/federation/v1/media/download/{mediaId}`
 ///
 /// Load media from our server.
-#[tracing::instrument(name = "media_get", level = "debug", skip_all)]
+#[tracing::instrument(
+	name = "media_get",
+	level = "debug",
+	skip_all,
+	fields(%client)
+)]
 pub(crate) async fn get_content_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<get_content::v1::Request>,
 ) -> Result<get_content::v1::Response> {
 	let mxc = Mxc {
@@ -47,9 +54,15 @@ pub(crate) async fn get_content_route(
 /// # `GET /_matrix/federation/v1/media/thumbnail/{mediaId}`
 ///
 /// Load media thumbnail from our server.
-#[tracing::instrument(name = "media_thumbnail_get", level = "debug", skip_all)]
+#[tracing::instrument(
+	name = "media_thumbnail_get",
+	level = "debug",
+	skip_all,
+	fields(%client)
+)]
 pub(crate) async fn get_content_thumbnail_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<get_content_thumbnail::v1::Request>,
 ) -> Result<get_content_thumbnail::v1::Response> {
 	let dim = Dim::from_ruma(body.width, body.height, body.method.clone())?;

src/api/server/publicrooms.rs

@@ -1,4 +1,5 @@
 use axum::extract::State;
+use axum_client_ip::ClientIp;
 use conduwuit::{Err, Result, err};
 use ruma::{
 	api::federation::directory::{get_public_rooms, get_public_rooms_filtered},
@@ -11,9 +12,10 @@
 /// # `POST /_matrix/federation/v1/publicRooms`
 ///
 /// Lists the public rooms on this server.
-#[tracing::instrument(name = "publicrooms", level = "debug", skip_all)]
+#[tracing::instrument(name = "publicrooms", level = "debug", skip_all, fields(%client))]
 pub(crate) async fn get_public_rooms_filtered_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<get_public_rooms_filtered::v1::Request>,
 ) -> Result<get_public_rooms_filtered::v1::Response> {
 	if !services
@@ -46,9 +48,10 @@ pub(crate) async fn get_public_rooms_filtered_route(
 /// # `GET /_matrix/federation/v1/publicRooms`
 ///
 /// Lists the public rooms on this server.
-#[tracing::instrument(name = "publicrooms", level = "debug", skip_all)]
+#[tracing::instrument(name = "publicrooms", level = "debug", skip_all, fields(%client))]
 pub(crate) async fn get_public_rooms_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<get_public_rooms::v1::Request>,
 ) -> Result<get_public_rooms::v1::Response> {
 	if !services

src/api/server/send.rs

@@ -1,9 +1,11 @@
 use std::{
 	collections::{BTreeMap, HashMap},
+	net::IpAddr,
 	time::{Duration, Instant},
 };
 
 use axum::extract::State;
+use axum_client_ip::ClientIp;
 use conduwuit::{
 	Err, Error, Result, debug, debug_error, debug_warn, err, error,
 	result::LogErr,
@@ -55,6 +57,7 @@
 /// Push EDUs and PDUs to this server.
 pub(crate) async fn send_transaction_message_route(
 	State(services): State<crate::State>,
+	ClientIp(client): ClientIp,
 	body: Ruma<send_transaction_message::v1::Request>,
 ) -> Result<send_transaction_message::v1::Response> {
 	if body.identity != body.body.origin {
@@ -95,7 +98,7 @@ pub(crate) async fn send_transaction_message_route(
 			services
 				.server
 				.runtime()
-				.spawn(process_inbound_transaction(services, body, txn_key, sender));
+				.spawn(process_inbound_transaction(services, body, client, txn_key, sender));
 			// and wait for it
 			wait_for_result(receiver).await
 		},
@@ -138,6 +141,7 @@ async fn wait_for_result(
 async fn process_inbound_transaction(
 	services: crate::State,
 	body: Ruma<send_transaction_message::v1::Request>,
+	client: IpAddr,
 	txn_key: TxnKey,
 	sender: Sender<WrappedTransactionResponse>,
 ) {
@@ -146,7 +150,7 @@ async fn process_inbound_transaction(
 		.pdus
 		.iter()
 		.stream()
-		.broad_then(|pdu| services.rooms.event_handler.parse_incoming_pdu(pdu, None))
+		.broad_then(|pdu| services.rooms.event_handler.parse_incoming_pdu(pdu))
 		.inspect_err(|e| warn!("Could not parse incoming PDU: {e}"))
 		.ready_filter_map(Result::ok);
 
@@ -159,7 +163,7 @@ async fn process_inbound_transaction(
 		.stream();
 
 	debug!(pdus = body.pdus.len(), edus = body.edus.len(), "Processing transaction",);
-	let results = match handle(&services, &body.identity, pdus, edus).await {
+	let results = match handle(&services, &client, &body.identity, pdus, edus).await {
 		| Ok(results) => results,
 		| Err(err) => {
 			fail_federation_txn(services, &txn_key, &sender, err);
@@ -232,6 +236,7 @@ fn transaction_error_to_response(err: &TransactionError) -> Error {
 }
 async fn handle(
 	services: &Services,
+	client: &IpAddr,
 	origin: &ServerName,
 	pdus: impl Stream<Item = Pdu> + Send,
 	edus: impl Stream<Item = Edu> + Send,
@@ -252,7 +257,7 @@ async fn handle(
 		.into_iter()
 		.try_stream()
 		.broad_and_then(|(room_id, pdus): (_, Vec<_>)| {
-			handle_room(services, origin, room_id, pdus.into_iter())
+			handle_room(services, client, origin, room_id, pdus.into_iter())
 				.map_ok(Vec::into_iter)
 				.map_ok(IterStream::try_stream)
 		})
@@ -262,7 +267,7 @@ async fn handle(
 		.await?;
 
 	// Evaluate EDUs after PDUs in case some of the PDUs then forbid some EDUs.
-	edus.for_each_concurrent(automatic_width(), |edu| handle_edu(services, origin, edu))
+	edus.for_each_concurrent(automatic_width(), |edu| handle_edu(services, client, origin, edu))
 		.boxed()
 		.await;
 
@@ -271,6 +276,7 @@ async fn handle(
 
 async fn handle_room(
 	services: &Services,
+	_client: &IpAddr,
 	origin: &ServerName,
 	room_id: OwnedRoomId,
 	pdus: impl Iterator<Item = Pdu> + Send,
@@ -317,25 +323,25 @@ async fn handle_room(
 	Ok(results)
 }
 
-async fn handle_edu(services: &Services, origin: &ServerName, edu: Edu) {
+async fn handle_edu(services: &Services, client: &IpAddr, origin: &ServerName, edu: Edu) {
 	match edu {
 		| Edu::Presence(presence) if services.server.config.allow_incoming_presence =>
-			handle_edu_presence(services, origin, presence).await,
+			handle_edu_presence(services, client, origin, presence).await,
 
 		| Edu::Receipt(receipt) if services.server.config.allow_incoming_read_receipts =>
-			handle_edu_receipt(services, origin, receipt).await,
+			handle_edu_receipt(services, client, origin, receipt).await,
 
 		| Edu::Typing(typing) if services.server.config.allow_incoming_typing =>
-			handle_edu_typing(services, origin, typing).await,
+			handle_edu_typing(services, client, origin, typing).await,
 
 		| Edu::DeviceListUpdate(content) =>
-			handle_edu_device_list_update(services, origin, content).await,
+			handle_edu_device_list_update(services, client, origin, content).await,
 
 		| Edu::DirectToDevice(content) =>
-			handle_edu_direct_to_device(services, origin, content).await,
+			handle_edu_direct_to_device(services, client, origin, content).await,
 
 		| Edu::SigningKeyUpdate(content) =>
-			handle_edu_signing_key_update(services, origin, content).await,
+			handle_edu_signing_key_update(services, client, origin, content).await,
 
 		| Edu::_Custom(ref _custom) => debug_warn!(?edu, "received custom/unknown EDU"),
 
@@ -345,6 +351,7 @@ async fn handle_edu(services: &Services, origin: &ServerName, edu: Edu) {
 
 async fn handle_edu_presence(
 	services: &Services,
+	_client: &IpAddr,
 	origin: &ServerName,
 	presence: PresenceContent,
 ) {
@@ -385,7 +392,12 @@ async fn handle_edu_presence_update(
 		.ok();
 }
 
-async fn handle_edu_receipt(services: &Services, origin: &ServerName, receipt: ReceiptContent) {
+async fn handle_edu_receipt(
+	services: &Services,
+	_client: &IpAddr,
+	origin: &ServerName,
+	receipt: ReceiptContent,
+) {
 	receipt
 		.receipts
 		.into_iter()
@@ -480,7 +492,12 @@ async fn handle_edu_receipt_room_user(
 		.await;
 }
 
-async fn handle_edu_typing(services: &Services, origin: &ServerName, typing: TypingContent) {
+async fn handle_edu_typing(
+	services: &Services,
+	_client: &IpAddr,
+	origin: &ServerName,
+	typing: TypingContent,
+) {
 	if typing.user_id.server_name() != origin {
 		debug_warn!(
 			%typing.user_id, %origin,
@@ -540,6 +557,7 @@ async fn handle_edu_typing(services: &Services, origin: &ServerName, typing: Typ
 
 async fn handle_edu_device_list_update(
 	services: &Services,
+	_client: &IpAddr,
 	origin: &ServerName,
 	content: DeviceListUpdateContent,
 ) {
@@ -558,6 +576,7 @@ async fn handle_edu_device_list_update(
 
 async fn handle_edu_direct_to_device(
 	services: &Services,
+	_client: &IpAddr,
 	origin: &ServerName,
 	content: DirectDeviceContent,
 ) {
@@ -677,6 +696,7 @@ async fn handle_edu_direct_to_device_event(
 
 async fn handle_edu_signing_key_update(
 	services: &Services,
+	_client: &IpAddr,
 	origin: &ServerName,
 	content: SigningKeyUpdateContent,
 ) {

src/api/server/send_join.rs

@@ -2,36 +2,34 @@
 
 use axum::extract::State;
 use conduwuit::{
-	Err, Event, Result, at, debug, err, info, trace,
+	Err, Event, Result, at, debug, err, info,
+	matrix::event::gen_event_id_canonical_json,
+	trace,
 	utils::stream::{BroadbandExt, IterStream, TryBroadbandExt},
 	warn,
 };
 use conduwuit_service::Services;
 use futures::{FutureExt, StreamExt, TryStreamExt};
 use ruma::{
-	CanonicalJsonObject, CanonicalJsonValue, EventId, OwnedEventId, RoomId, ServerName, UserId,
+	CanonicalJsonValue, OwnedEventId, OwnedRoomId, OwnedUserId, RoomId, ServerName,
 	api::federation::membership::create_join_event,
 	assign,
 	events::{
-		TimelineEventType,
+		StateEventType, TimelineEventType,
 		room::member::{MembershipState, RoomMemberEventContent},
 	},
-	room_version_rules::RoomVersionRules,
 };
-use serde_json::value::to_raw_value;
+use serde_json::value::{RawValue as RawJsonValue, to_raw_value};
 
-use crate::{Ruma, server::utils::validate_any_membership_event};
+use crate::Ruma;
 
-/// Creates a join membership event for the target, returning a computed
-/// response with room state, auth chains, etc.
+/// helper method for /send_join v1 and v2
 #[tracing::instrument(skip(services, pdu, omit_members), fields(room_id = room_id.as_str(), origin = origin.as_str()), level = "info")]
 async fn create_join_event(
 	services: &Services,
 	origin: &ServerName,
 	room_id: &RoomId,
-	event_id: &EventId,
-	room_version_rules: &RoomVersionRules,
-	mut pdu: CanonicalJsonObject,
+	pdu: &RawJsonValue,
 	omit_members: bool,
 ) -> Result<create_join_event::v2::RoomState> {
 	if !services.rooms.metadata.exists(room_id).await {
@@ -45,7 +43,6 @@ async fn create_join_event(
 	{
 		info!(
 			origin = origin.as_str(),
-			room_id = %room_id,
 			"Refusing to serve send_join for room we aren't participating in"
 		);
 		return Err!(Request(NotFound("This server is not participating in that room.")));
@@ -67,25 +64,94 @@ async fn create_join_event(
 		.await
 		.map_err(|e| err!(Request(NotFound(error!("Room has no state: {e}")))))?;
 
-	let sender = pdu
-		.get("sender")
-		.and_then(|v| v.as_str())
-		.map(UserId::parse)
-		.and_then(Result::ok)
-		.expect("sender was already validated");
+	// We do not add the event_id field to the pdu here because of signature and
+	// hashes checks
+	trace!("Getting room version");
+	let room_version = services.rooms.state.get_room_version(room_id).await?;
+	let room_version_rules = room_version.rules().unwrap();
+
+	trace!("Generating event ID and converting to canonical json");
+	let Ok((event_id, mut value)) = gen_event_id_canonical_json(pdu, &room_version_rules) else {
+		// Event could not be converted to canonical json
+		return Err!(Request(BadJson("Could not convert event to canonical json.")));
+	};
+
+	let event_room_id: OwnedRoomId = serde_json::from_value(
+		value
+			.get("room_id")
+			.ok_or_else(|| err!(Request(BadJson("Event missing room_id property."))))?
+			.clone()
+			.into(),
+	)
+	.map_err(|e| err!(Request(BadJson(warn!("room_id field is not a valid room ID: {e}")))))?;
+
+	if event_room_id != room_id {
+		return Err!(Request(BadJson("Event room_id does not match request path room ID.")));
+	}
+
+	let event_type: StateEventType = serde_json::from_value(
+		value
+			.get("type")
+			.ok_or_else(|| err!(Request(BadJson("Event missing type property."))))?
+			.clone()
+			.into(),
+	)
+	.map_err(|e| err!(Request(BadJson(warn!("Event has invalid state event type: {e}")))))?;
+
+	if event_type != StateEventType::RoomMember {
+		return Err!(Request(BadJson(
+			"Not allowed to send non-membership state event to join endpoint."
+		)));
+	}
 
 	let content: RoomMemberEventContent = serde_json::from_value(
-		pdu.get("content")
+		value
+			.get("content")
 			.ok_or_else(|| err!(Request(BadJson("Event missing content property"))))?
 			.clone()
 			.into(),
 	)
 	.map_err(|e| err!(Request(BadJson(warn!("Event content is empty or invalid: {e}")))))?;
 
+	if content.membership != MembershipState::Join {
+		return Err!(Request(BadJson(
+			"Not allowed to send a non-join membership event to join endpoint."
+		)));
+	}
+
+	let sender: OwnedUserId = serde_json::from_value(
+		value
+			.get("sender")
+			.ok_or_else(|| err!(Request(BadJson("Event missing sender property."))))?
+			.clone()
+			.into(),
+	)
+	.map_err(|e| err!(Request(BadJson(warn!("sender property is not a valid user ID: {e}")))))?;
+
+	// check if origin server is trying to send for another server
+	if sender.server_name() != origin {
+		return Err!(Request(Forbidden("Not allowed to join on behalf of another server.")));
+	}
+
+	let state_key: OwnedUserId = serde_json::from_value(
+		value
+			.get("state_key")
+			.ok_or_else(|| err!(Request(BadJson("Event missing state_key property."))))?
+			.clone()
+			.into(),
+	)
+	.map_err(|e| err!(Request(BadJson(warn!("State key is not a valid user ID: {e}")))))?;
+
+	if state_key != sender {
+		return Err!(Request(BadJson("State key does not match sender user.")));
+	}
+
 	if let Some(authorising_user) = content.join_authorized_via_users_server {
-		if !room_version_rules.authorization.restricted_join_rule {
+		use ruma::RoomVersionId::*;
+
+		if matches!(room_version, V1 | V2 | V3 | V4 | V5 | V6 | V7) {
 			return Err!(Request(InvalidParam(
-				"Room version does not support restricted rooms but \
+				"Room version {room_version} does not support restricted rooms but \
 				 join_authorised_via_users_server ({authorising_user}) was found in the event."
 			)));
 		}
@@ -108,7 +174,8 @@ async fn create_join_event(
 				 they cannot authorise your join."
 			)));
 		}
-		if !super::user_can_perform_restricted_join(services, &sender, room_id).await? {
+
+		if !super::user_can_perform_restricted_join(services, &state_key, room_id).await? {
 			return Err!(Request(UnableToAuthorizeJoin(
 				"Joining user did not pass restricted room's rules."
 			)));
@@ -116,7 +183,7 @@ async fn create_join_event(
 
 		services
 			.server_keys
-			.hash_and_sign_event(&mut pdu, room_version_rules)
+			.hash_and_sign_event(&mut value, &room_version_rules)
 			.map_err(|e| {
 				err!(Request(InvalidParam(warn!("Failed to sign send_join event: {e}"))))
 			})?;
@@ -133,7 +200,7 @@ async fn create_join_event(
 	let pdu_id = services
 		.rooms
 		.event_handler
-		.handle_incoming_pdu(sender.server_name(), room_id, event_id, pdu.clone(), false)
+		.handle_incoming_pdu(sender.server_name(), room_id, &event_id, value.clone(), false)
 		.boxed()
 		.await?
 		.ok_or_else(|| err!(Request(InvalidParam("Could not accept as timeline event."))))?;
@@ -153,12 +220,14 @@ async fn create_join_event(
 		.iter()
 		.try_stream()
 		.broad_filter_map(|event_id| async move {
-			if omit_members && let Ok(e) = event_id.as_ref() {
-				let pdu = services.rooms.timeline.get_pdu(e).await;
-				if pdu.is_ok_and(|p| *p.kind() == TimelineEventType::RoomMember) {
-					trace!("omitting member event {e:?} from returned state");
-					// skip members
-					return None;
+			if omit_members {
+				if let Ok(e) = event_id.as_ref() {
+					let pdu = services.rooms.timeline.get_pdu(e).await;
+					if pdu.is_ok_and(|p| *p.kind() == TimelineEventType::RoomMember) {
+						trace!("omitting member event {e:?} from returned state");
+						// skip members
+						return None;
+					}
 				}
 			}
 			Some(event_id)
@@ -220,7 +289,7 @@ async fn create_join_event(
 	Ok(assign!(create_join_event::v2::RoomState::new(), {
 		auth_chain,
 		state,
-		event: to_raw_value(&CanonicalJsonValue::Object(pdu)).ok(),
+		event: to_raw_value(&CanonicalJsonValue::Object(value)).ok(),
 		members_omitted: omit_members,
 		servers_in_room,
 	}))
@@ -240,45 +309,24 @@ pub(crate) async fn create_join_event_v2_route(
 		return Err!(Request(Forbidden("Server is banned on this homeserver.")));
 	}
 
-	let room_version = services.rooms.state.get_room_version(&body.room_id).await?;
-	let create_event = services
-		.rooms
-		.state_accessor
-		.get_room_create_event(&body.room_id)
-		.await;
-	let room_version_rules = room_version.rules().unwrap();
-
-	let (value, membership, sender, target) = validate_any_membership_event(
-		&services,
-		&body.pdu,
-		&room_version_rules,
-		create_event.event_id.clone(),
-		body.room_id.clone(),
-		body.event_id.clone(),
-	)
-	.await?;
-	if membership != MembershipState::Join {
-		return Err!(Request(InvalidParam("Invalid membership (expected `join`)")));
-	}
-	if sender.server_name() != body.identity {
-		return Err!(Request(InvalidParam("Sender belongs to a different server")));
-	}
-	if sender != target {
-		return Err!(Request(InvalidParam("Sender does not match state key")));
+	if let Some(server) = body.room_id.server_name() {
+		if services.moderation.is_remote_server_forbidden(server) {
+			warn!(
+				"Server {} tried joining room ID {} through us which has a server name that is \
+				 globally forbidden. Rejecting.",
+				body.identity, &body.room_id,
+			);
+			return Err!(Request(Forbidden(warn!(
+				"Room ID server name {server} is banned on this homeserver."
+			))));
+		}
 	}
 
 	let now = Instant::now();
-	let room_state = create_join_event(
-		&services,
-		&body.identity,
-		&body.room_id,
-		&body.event_id,
-		&room_version_rules,
-		value,
-		body.omit_members,
-	)
-	.boxed()
-	.await?;
+	let room_state =
+		create_join_event(&services, &body.identity, &body.room_id, &body.pdu, body.omit_members)
+			.boxed()
+			.await?;
 	info!(
 		"Finished sending a join for {} in {} in {:?}",
 		body.identity,

src/api/server/send_knock.rs

@@ -1,11 +1,21 @@
 use axum::extract::State;
-use conduwuit::{Err, Event, Result, debug_info, err, matrix::pdu::PduEvent, warn};
+use conduwuit::{
+	Err, Result, err, info,
+	matrix::{event::gen_event_id_canonical_json, pdu::PduEvent},
+	warn,
+};
 use futures::FutureExt;
 use ruma::{
-	api::federation::membership::create_knock_event, events::room::member::MembershipState,
+	OwnedUserId,
+	api::federation::membership::create_knock_event,
+	events::{
+		StateEventType,
+		room::member::{MembershipState, RoomMemberEventContent},
+	},
+	serde::JsonObject,
 };
 
-use crate::{Ruma, server::utils::validate_any_membership_event};
+use crate::Ruma;
 
 /// # `PUT /_matrix/federation/v1/send_knock/{roomId}/{eventId}`
 ///
@@ -23,7 +33,18 @@ pub(crate) async fn create_knock_event_v1_route(
 			 forbidden. Rejecting.",
 			body.identity, &body.room_id,
 		);
-		return Err!(Request(Forbidden("Federation denied with {}", body.identity)));
+		return Err!(Request(Forbidden("Server is banned on this homeserver.")));
+	}
+
+	if let Some(server) = body.room_id.server_name() {
+		if services.moderation.is_remote_server_forbidden(server) {
+			warn!(
+				"Server {} tried knocking room ID {} which has a server name that is globally \
+				 forbidden. Rejecting.",
+				body.identity, &body.room_id,
+			);
+			return Err!(Request(Forbidden("Server is banned on this homeserver.")));
+		}
 	}
 
 	if !services.rooms.metadata.exists(&body.room_id).await {
@@ -36,9 +57,8 @@ pub(crate) async fn create_knock_event_v1_route(
 		.server_in_room(services.globals.server_name(), &body.room_id)
 		.await
 	{
-		debug_info!(
+		info!(
 			origin = body.identity.as_str(),
-			room_id = %body.room_id,
 			"Refusing to serve send_knock for room we aren't participating in"
 		);
 		return Err!(Request(NotFound("This server is not participating in that room.")));
@@ -52,40 +72,88 @@ pub(crate) async fn create_knock_event_v1_route(
 		.await?;
 
 	let room_version = services.rooms.state.get_room_version(&body.room_id).await?;
-	let create_event = services
-		.rooms
-		.state_accessor
-		.get_room_create_event(&body.room_id)
-		.await;
 	let room_version_rules = room_version.rules().unwrap();
 
 	if !room_version_rules.authorization.knocking {
 		return Err!(Request(Forbidden("Room version does not support knocking.")));
 	}
 
-	let (mut event, target_membership, sender, target) = validate_any_membership_event(
-		&services,
-		&body.pdu,
-		&room_version_rules,
-		create_event.event_id().to_owned(),
-		body.room_id.clone(),
-		body.event_id.clone(),
+	let Ok((event_id, value)) = gen_event_id_canonical_json(&body.pdu, &room_version_rules)
+	else {
+		// Event could not be converted to canonical json
+		return Err!(Request(InvalidParam("Could not convert event to canonical json.")));
+	};
+
+	let event_type: StateEventType = serde_json::from_value(
+		value
+			.get("type")
+			.ok_or_else(|| err!(Request(InvalidParam("Event has no event type."))))?
+			.clone()
+			.into(),
 	)
-	.await?;
+	.map_err(|e| err!(Request(InvalidParam("Event has invalid event type: {e}"))))?;
 
-	if target_membership != MembershipState::Knock {
-		return Err!(Request(InvalidParam("Invalid membership (expected `knock`)")));
+	if event_type != StateEventType::RoomMember {
+		return Err!(Request(InvalidParam(
+			"Not allowed to send non-membership state event to knock endpoint.",
+		)));
 	}
+
+	let content: RoomMemberEventContent = serde_json::from_value(
+		value
+			.get("content")
+			.ok_or_else(|| err!(Request(InvalidParam("Membership event has no content"))))?
+			.clone()
+			.into(),
+	)
+	.map_err(|e| err!(Request(InvalidParam("Event has invalid membership content: {e}"))))?;
+
+	if content.membership != MembershipState::Knock {
+		return Err!(Request(InvalidParam(
+			"Not allowed to send a non-knock membership event to knock endpoint."
+		)));
+	}
+
+	// ACL check sender server name
+	let sender: OwnedUserId = serde_json::from_value(
+		value
+			.get("sender")
+			.ok_or_else(|| err!(Request(InvalidParam("Event has no sender user ID."))))?
+			.clone()
+			.into(),
+	)
+	.map_err(|e| err!(Request(BadJson("Event sender is not a valid user ID: {e}"))))?;
+
+	services
+		.rooms
+		.event_handler
+		.acl_check(sender.server_name(), &body.room_id)
+		.await?;
+
+	// check if origin server is trying to send for another server
 	if sender.server_name() != body.identity {
-		return Err!(Request(InvalidParam("Sender belongs to a different server")));
-	}
-	if sender != target {
-		return Err!(Request(InvalidParam("Sender does not match state key")));
+		return Err!(Request(BadJson("Not allowed to knock on behalf of another server/user.")));
 	}
 
-	event.insert("event_id".to_owned(), body.event_id.as_str().into());
+	let state_key: OwnedUserId = serde_json::from_value(
+		value
+			.get("state_key")
+			.ok_or_else(|| err!(Request(InvalidParam("Event does not have a state_key"))))?
+			.clone()
+			.into(),
+	)
+	.map_err(|e| err!(Request(BadJson("Event does not have a valid state_key: {e}"))))?;
 
-	let pdu = PduEvent::from_id_val(&body.event_id, event.clone())
+	if state_key != sender {
+		return Err!(Request(InvalidParam("state_key does not match sender user of event.")));
+	}
+
+	let mut event: JsonObject = serde_json::from_str(body.pdu.get())
+		.map_err(|e| err!(Request(InvalidParam("Invalid knock event PDU: {e}"))))?;
+
+	event.insert("event_id".to_owned(), "$placeholder".into());
+
+	let pdu: PduEvent = serde_json::from_value(event.into())
 		.map_err(|e| err!(Request(InvalidParam("Invalid knock event PDU: {e}"))))?;
 
 	let mutex_lock = services
@@ -98,7 +166,7 @@ pub(crate) async fn create_knock_event_v1_route(
 	let pdu_id = services
 		.rooms
 		.event_handler
-		.handle_incoming_pdu(sender.server_name(), &body.room_id, &body.event_id, event, false)
+		.handle_incoming_pdu(sender.server_name(), &body.room_id, &event_id, value.clone(), false)
 		.boxed()
 		.await?
 		.ok_or_else(|| err!(Request(InvalidParam("Could not accept as timeline event."))))?;
@@ -113,7 +181,7 @@ pub(crate) async fn create_knock_event_v1_route(
 	let knock_room_state = services
 		.rooms
 		.state
-		.summary_stripped(&pdu, &body.room_id, &sender, true)
+		.summary_stripped(&pdu, &body.room_id, &sender)
 		.await;
 
 	Ok(create_knock_event::v1::Response::new(knock_room_state))

src/api/server/send_leave.rs

@@ -1,11 +1,18 @@
 use axum::extract::State;
-use conduwuit::{Err, Result, debug_info, err};
+use conduwuit::{Err, Result, err, info, matrix::event::gen_event_id_canonical_json};
+use conduwuit_service::Services;
 use futures::FutureExt;
 use ruma::{
-	api::federation::membership::create_leave_event, events::room::member::MembershipState,
+	OwnedRoomId, OwnedUserId, RoomId, ServerName,
+	api::federation::membership::create_leave_event,
+	events::{
+		StateEventType,
+		room::member::{MembershipState, RoomMemberEventContent},
+	},
 };
+use serde_json::value::RawValue as RawJsonValue;
 
-use crate::{Ruma, server::utils::validate_any_membership_event};
+use crate::Ruma;
 
 /// # `PUT /_matrix/federation/v2/send_leave/{roomId}/{eventId}`
 ///
@@ -14,8 +21,17 @@ pub(crate) async fn create_leave_event_v2_route(
 	State(services): State<crate::State>,
 	body: Ruma<create_leave_event::v2::Request>,
 ) -> Result<create_leave_event::v2::Response> {
-	let room_id = body.room_id.as_ref();
-	let origin = &body.identity;
+	create_leave_event(&services, &body.identity, &body.room_id, &body.pdu).await?;
+
+	Ok(create_leave_event::v2::Response::new())
+}
+
+async fn create_leave_event(
+	services: &Services,
+	origin: &ServerName,
+	room_id: &RoomId,
+	pdu: &RawJsonValue,
+) -> Result {
 	if !services.rooms.metadata.exists(room_id).await {
 		return Err!(Request(NotFound("Room is unknown to this server.")));
 	}
@@ -26,10 +42,9 @@ pub(crate) async fn create_leave_event_v2_route(
 		.server_in_room(services.globals.server_name(), room_id)
 		.await
 	{
-		debug_info!(
+		info!(
 			origin = origin.as_str(),
-			room_id = %room_id,
-			"Refusing to send_leave for room we aren't participating in"
+			"Refusing to serve backfill for room we aren't participating in"
 		);
 		return Err!(Request(NotFound("This server is not participating in that room.")));
 	}
@@ -41,31 +56,91 @@ pub(crate) async fn create_leave_event_v2_route(
 		.acl_check(origin, room_id)
 		.await?;
 
+	// We do not add the event_id field to the pdu here because of signature and
+	// hashes checks
 	let room_version = services.rooms.state.get_room_version(room_id).await?;
-	let create_event = services
-		.rooms
-		.state_accessor
-		.get_room_create_event(room_id)
-		.await;
 	let room_version_rules = room_version.rules().unwrap();
 
-	let (value, membership, sender, target) = validate_any_membership_event(
-		&services,
-		&body.pdu,
-		&room_version_rules,
-		create_event.event_id.clone(),
-		body.room_id.clone(),
-		body.event_id.clone(),
+	let Ok((event_id, value)) = gen_event_id_canonical_json(pdu, &room_version_rules) else {
+		// Event could not be converted to canonical json
+		return Err!(Request(BadJson("Could not convert event to canonical json.")));
+	};
+
+	let event_room_id: OwnedRoomId = serde_json::from_value(
+		serde_json::to_value(
+			value
+				.get("room_id")
+				.ok_or_else(|| err!(Request(BadJson("Event missing room_id property."))))?,
+		)
+		.expect("CanonicalJson is valid json value"),
 	)
-	.await?;
-	if membership != MembershipState::Leave {
-		return Err!(Request(InvalidParam("Invalid membership (expected `leave`)")));
+	.map_err(|e| err!(Request(BadJson(warn!("room_id field is not a valid room ID: {e}")))))?;
+
+	if event_room_id != room_id {
+		return Err!(Request(BadJson("Event room_id does not match request path room ID.")));
 	}
-	if sender.server_name() != body.identity {
-		return Err!(Request(InvalidParam("Sender belongs to a different server")));
+
+	let content: RoomMemberEventContent = serde_json::from_value(
+		value
+			.get("content")
+			.ok_or_else(|| err!(Request(BadJson("Event missing content property."))))?
+			.clone()
+			.into(),
+	)
+	.map_err(|e| err!(Request(BadJson(warn!("Event content is empty or invalid: {e}")))))?;
+
+	if content.membership != MembershipState::Leave {
+		return Err!(Request(BadJson(
+			"Not allowed to send a non-leave membership event to leave endpoint."
+		)));
 	}
-	if sender != target {
-		return Err!(Request(InvalidParam("Sender does not match state key")));
+
+	let event_type: StateEventType = serde_json::from_value(
+		value
+			.get("type")
+			.ok_or_else(|| err!(Request(BadJson("Event missing type property."))))?
+			.clone()
+			.into(),
+	)
+	.map_err(|e| err!(Request(BadJson(warn!("Event has invalid state event type: {e}")))))?;
+
+	if event_type != StateEventType::RoomMember {
+		return Err!(Request(BadJson(
+			"Not allowed to send non-membership state event to leave endpoint."
+		)));
+	}
+
+	// ACL check sender server name
+	let sender: OwnedUserId = serde_json::from_value(
+		value
+			.get("sender")
+			.ok_or_else(|| err!(Request(BadJson("Event missing sender property."))))?
+			.clone()
+			.into(),
+	)
+	.map_err(|e| err!(Request(BadJson(warn!("sender property is not a valid user ID: {e}")))))?;
+
+	services
+		.rooms
+		.event_handler
+		.acl_check(sender.server_name(), room_id)
+		.await?;
+
+	if sender.server_name() != origin {
+		return Err!(Request(BadJson("Not allowed to leave on behalf of another server/user.")));
+	}
+
+	let state_key: OwnedUserId = serde_json::from_value(
+		value
+			.get("state_key")
+			.ok_or_else(|| err!(Request(BadJson("Event missing state_key property."))))?
+			.clone()
+			.into(),
+	)
+	.map_err(|e| err!(Request(BadJson(warn!("State key is not a valid user ID: {e}")))))?;
+
+	if state_key != sender {
+		return Err!(Request(BadJson("State key does not match sender user.")));
 	}
 
 	let mutex_lock = services
@@ -78,7 +153,7 @@ pub(crate) async fn create_leave_event_v2_route(
 	let pdu_id = services
 		.rooms
 		.event_handler
-		.handle_incoming_pdu(origin, room_id, &body.event_id, value, false)
+		.handle_incoming_pdu(origin, room_id, &event_id, value, false)
 		.boxed()
 		.await?
 		.ok_or_else(|| err!(Request(InvalidParam("Could not accept as timeline event."))))?;
@@ -89,7 +164,5 @@ pub(crate) async fn create_leave_event_v2_route(
 		.sending
 		.send_pdu_room(room_id, &pdu_id)
 		.boxed()
-		.await?;
-
-	Ok(create_leave_event::v2::Response::new())
+		.await
 }

src/api/server/utils.rs

@@ -1,10 +1,7 @@
-use conduwuit::{Err, Result, err, is_false};
+use conduwuit::{Err, Result, is_false};
 use conduwuit_service::Services;
 use futures::{FutureExt, future::OptionFuture, join};
-use ruma::{
-	CanonicalJsonObject, EventId, OwnedEventId, OwnedRoomId, OwnedUserId, RoomId, ServerName,
-	UserId, events::room::member::MembershipState, room_version_rules::RoomVersionRules,
-};
+use ruma::{EventId, RoomId, ServerName};
 
 pub(super) struct AccessCheck<'a> {
 	pub(super) services: &'a Services,
@@ -66,134 +63,3 @@ pub(super) async fn assert(&self) -> Result {
 		Ok(())
 	}
 }
-
-/// Performs validation on a membership event that should be run on any event a
-/// remote is trying to send via us.
-///
-/// ## Checks performed
-///
-/// 1. PDU room ID matches request path room ID
-/// 2. PDU event ID matches request path event ID
-/// 3. Signature check
-/// 4. Event type check
-/// 5. `sender` field presence (and parsing)
-/// 6. `state_key` field presence (and parsing)
-/// 7. PDU room format check (PDU check 1)
-///
-/// ## Returns
-///
-/// A resulting tuple of (PDU JSON, target membership state, sender, recipient).
-pub(crate) async fn validate_any_membership_event(
-	services: &crate::State,
-	body: &serde_json::value::RawValue,
-	room_version_rules: &RoomVersionRules,
-	create_event_id: OwnedEventId,
-	expected_room_id: OwnedRoomId,
-	expected_event_id: OwnedEventId,
-) -> Result<(CanonicalJsonObject, MembershipState, OwnedUserId, OwnedUserId)> {
-	let (template_room_id, template_event_id, mut pdu) = services
-		.rooms
-		.event_handler
-		.parse_incoming_pdu(body, Some(room_version_rules))
-		.await
-		.map_err(|e| err!(Request(BadJson("Invalid membership PDU: {e}"))))?;
-
-	if template_room_id != expected_room_id {
-		return Err!(Request(InvalidParam("Membership event does not belong to requested room")));
-	}
-	if template_event_id != expected_event_id {
-		return Err!(Request(InvalidParam(debug_warn!(
-			%template_event_id,
-			%expected_event_id,
-			"Membership event ID does not match provided event ID"
-		))));
-	}
-
-	// Only `join` events carry `join_authorised_via_users_server`; co-sign
-	// restricted joins so verification passes. Authorisation is enforced in
-	// create_join_event.
-	let membership_is_join = pdu
-		.get("content")
-		.and_then(|v| v.as_object())
-		.and_then(|c| c.get("membership"))
-		.and_then(|v| v.as_str())
-		.is_some_and(|m| m == "join");
-
-	let authorising_user = pdu
-		.get("content")
-		.and_then(|v| v.as_object())
-		.and_then(|c| c.get("join_authorised_via_users_server"))
-		.and_then(|v| v.as_str())
-		.map(UserId::parse)
-		.and_then(Result::ok);
-
-	if room_version_rules.authorization.restricted_join_rule
-		&& membership_is_join
-		&& let Some(authorising_user) = authorising_user
-		&& services.globals.user_is_local(&authorising_user)
-	{
-		services
-			.server_keys
-			.hash_and_sign_event(&mut pdu, room_version_rules)
-			.map_err(|e| {
-				err!(Request(InvalidParam("Failed to sign restricted join event: {e}")))
-			})?;
-	}
-
-	services
-		.server_keys
-		.verify_event(&pdu, room_version_rules)
-		.await
-		.map_err(|e| {
-			err!(Request(InvalidParam("Signature verification failed on membership event: {e}")))
-		})?;
-
-	// Ensure this is a membership event
-	if pdu
-		.get("type")
-		.expect("event must have a type")
-		.as_str()
-		.expect("type must be a string")
-		!= "m.room.member"
-	{
-		return Err!(Request(BadJson(
-			"Not allowed to send non-membership event to this endpoint"
-		)));
-	}
-	let membership = pdu
-		.get("content")
-		.ok_or_else(|| err!(Request(BadJson("Event missing content property"))))?
-		.as_object()
-		.ok_or_else(|| err!(Request(BadJson("Event content is not an object"))))?
-		.get("membership")
-		.ok_or_else(|| err!(Request(BadJson("Event missing membership property"))))?
-		.as_str()
-		.ok_or_else(|| err!(Request(BadJson("Event is not a string"))))?
-		.to_owned();
-
-	let sender_user = pdu
-		.get("sender")
-		.and_then(|v| v.as_str())
-		.map(UserId::parse)
-		.and_then(Result::ok)
-		.ok_or_else(|| err!(Request(InvalidParam("Invalid sender property"))))?;
-	let recipient_user = pdu
-		.get("state_key")
-		.and_then(|v| v.as_str())
-		.map(UserId::parse)
-		.and_then(Result::ok)
-		.ok_or_else(|| err!(Request(InvalidParam("Invalid state_key property"))))?;
-
-	// Do a quick format check. The spec doesn't suggest this, but it's probably
-	// a good idea nonetheless.
-	service::rooms::event_handler::Service::pdu_format_check_1(
-		&pdu,
-		room_version_rules,
-		&create_event_id,
-	)
-	.map_err(|e| {
-		err!(Request(InvalidParam("Membership event violates the room event format: {e}")))
-	})?;
-
-	Ok((pdu, membership.into(), sender_user, recipient_user))
-}

src/core/config/mod.rs

@@ -370,7 +370,7 @@ pub struct Config {
 	#[serde(default = "default_ip_lookup_strategy")]
 	pub ip_lookup_strategy: u8,
 
-	/// The preferred source to use for getting the real client IP.
+	/// The source to use for discovering the real connecting client IP.
 	///
 	/// Takes any of the following options:
 	///
@@ -381,49 +381,16 @@ pub struct Config {
 	/// "true_client_ip" - `True-Client-Ip` header
 	/// "x_envoy_external_address" - `X-Envoy-External-Address` header
 	/// "x_real_ip" - `X-Real-Ip` header
-	/// "direct" - the directly connected IP address (fallback for other
-	/// options)
 	///
 	/// Only set this if you are certain only your reverse proxy
 	/// will send the expected header. There is no "is the connecting IP allowed
 	/// to set this header" check; if the header selected is present, it is
 	/// used.
 	///
-	/// Ignored if `accepted_ip_sources` is set.
-	///
-	/// If not set set, `direct` is used. Additionally, `direct` is used
-	/// as a fallback if the chosen header is not found.
+	/// Defaults to the IP address actually making the connection.
 	#[serde(default)]
 	pub request_ip_source: Option<String>,
 
-	/// The accepted source(s) for the real client IP.
-	///
-	/// Takes any combination of the following options:
-	///
-	/// "cf_connecting_ip" - `Cf-Connecting-Ip` header
-	/// "cloudfront_viewer_address" - `CloudFront-Viewer-Address` header
-	/// "fly_client_ip" - `Fly-Client-IP` header
-	/// "x_forwarded_for" - rightmost value of the `X-Forwarded-For` header
-	/// "true_client_ip" - `True-Client-Ip` header
-	/// "x_envoy_external_address" - `X-Envoy-External-Address` header
-	/// "x_real_ip" - `X-Real-Ip` header
-	/// "direct" - the directly connected IP address
-	///
-	/// Only set this if you are certain only your reverse proxy
-	/// will send the expected header. There is no "is the connecting IP allowed
-	/// to set this header" check; if the header selected is present, it is
-	/// used.
-	///
-	/// One of the configured sources must be available or the request is
-	/// rejected. If you want a fallback (including `direct`!), you have to
-	/// configure it. Priority is based on configuration order.
-	///
-	/// If not set, `request_ip_source` configuration is used.
-	///
-	/// default: []
-	#[serde(default)]
-	pub accepted_ip_sources: Vec<String>,
-
 	/// Max request size for file uploads in bytes. Defaults to 20MB.
 	/// Also limits incoming federated media.
 	///
@@ -2475,7 +2442,6 @@ pub struct OauthConfig {
 	///   legacy authentication will be unable to log in.
 	///
 	/// default: "hybrid"
-	#[serde(default)]
 	compatibility_mode: OAuthMode,
 
 	/// display: hidden

src/core/matrix/versions.rs

@@ -34,7 +34,6 @@ pub fn unstable_features() -> BTreeMap<String, bool> {
 		// query mutual rooms (https://github.com/matrix-org/matrix-spec-proposals/pull/2666)
 		// Expected for spec v1.19
 		("uk.half-shot.msc2666.query_mutual_rooms".to_owned(), true),
-		("uk.half-shot.msc2666.query_mutual_rooms.stable".to_owned(), true),
 		// Simplified Sliding sync (https://github.com/matrix-org/matrix-spec-proposals/pull/4186)
 		// Expected for spec v1.19
 		("org.matrix.simplified_msc3575".to_owned(), true),

src/database/maps.rs

@@ -478,10 +478,6 @@ pub(super) fn open_list(db: &Arc<Engine>, maps: &[Descriptor]) -> Result<Maps> {
 		name: "logintoken_expiresatuserid",
 		..descriptor::RANDOM_SMALL
 	},
-	Descriptor {
-		name: "roomuserid_lastnotificationread",
-		..descriptor::RANDOM
-	},
 	Descriptor {
 		name: "userroomid_highlightcount",
 		..descriptor::RANDOM

src/main/Cargo.toml

@@ -35,10 +35,7 @@ systemd-units = { unit-name = "conduwuit", start = false, unit-scripts = "../../
 assets = [
 	["../../pkg/debian/README.md", "usr/share/doc/conduwuit/README.Debian", "644"],
 	["../../README.md", "usr/share/doc/conduwuit/", "644"],
-	# cargo-deb only treats the exact prefix "target/release/" as the magic
-	# path that resolves to the real build dir (e.g. target/<triple>/release
-	# when cross-compiling); a ../../ prefix would be read as a literal path
-	["target/release/conduwuit", "usr/bin/conduwuit", "755"],
+	["../../target/release/conduwuit", "usr/bin/conduwuit", "755"],
 	["../../conduwuit-example.toml", "etc/conduwuit/conduwuit.toml", "640"],
 ]
 

src/router/Cargo.toml

@@ -91,6 +91,7 @@ zstd_compression = [
 ]
 
 [dependencies]
+axum-client-ip.workspace = true
 axum-server-dual-protocol.workspace = true
 axum-server-dual-protocol.optional = true
 axum-server.workspace = true

src/router/layers.rs

@@ -2,10 +2,10 @@
 
 use axum::{
 	Router,
-	extract::{self, DefaultBodyLimit, FromRequestParts, MatchedPath, State},
+	extract::{DefaultBodyLimit, MatchedPath},
 };
+use axum_client_ip::ClientIpSource;
 use conduwuit::{Result, Server, debug, error};
-use conduwuit_api::client_ip::ClientIp;
 use conduwuit_service::{Services, state::Guard};
 use http::{
 	HeaderValue, Method, StatusCode,
@@ -20,6 +20,7 @@
 	timeout::{RequestBodyTimeoutLayer, ResponseBodyTimeoutLayer, TimeoutLayer},
 	trace::{DefaultOnFailure, DefaultOnRequest, DefaultOnResponse, TraceLayer},
 };
+use tracing::Level;
 
 use crate::{request, router};
 
@@ -47,18 +48,34 @@ pub(crate) fn build(services: &Arc<Services>) -> Result<(Router, Guard)> {
 	))]
 	let layers = layers.layer(compression_layer(server));
 
+	let client_ip_layer = match services
+		.config
+		.request_ip_source
+		.as_ref()
+		.map(AsRef::as_ref)
+	{
+		| Some("cf_connecting_ip") => ClientIpSource::CfConnectingIp,
+		| Some("cloudfront_viewer_address") => ClientIpSource::CloudFrontViewerAddress,
+		| Some("fly_client_ip") => ClientIpSource::FlyClientIp,
+		| Some("x_forwarded_for") => ClientIpSource::RightmostXForwardedFor,
+		| Some("true_client_ip") => ClientIpSource::TrueClientIp,
+		| Some("x_envoy_external_address") => ClientIpSource::XEnvoyExternalAddress,
+		| Some("x_real_ip") => ClientIpSource::XRealIp,
+		| None | Some(_) => ClientIpSource::ConnectInfo,
+	};
+
 	let services_ = services.clone();
 	let layers = layers
 		.layer(SetSensitiveHeadersLayer::new([header::AUTHORIZATION]))
 		.layer(
 			TraceLayer::new_for_http()
 				.make_span_with(tracing_span::<_>)
-				.on_failure(DefaultOnFailure::new().level(tracing::Level::ERROR))
-				.on_request(DefaultOnRequest::new().level(tracing::Level::TRACE))
-				.on_response(DefaultOnResponse::new().level(tracing::Level::DEBUG)),
+				.on_failure(DefaultOnFailure::new().level(Level::ERROR))
+				.on_request(DefaultOnRequest::new().level(Level::TRACE))
+				.on_response(DefaultOnResponse::new().level(Level::DEBUG)),
 		)
-		.layer(axum::middleware::from_fn_with_state(Arc::clone(services), request_ip))
 		.layer(axum::middleware::from_fn_with_state(Arc::clone(services), request::handle))
+		.layer(client_ip_layer.into_extension())
 		.layer(ResponseBodyTimeoutLayer::new(Duration::from_secs(
 			server.config.client_response_timeout,
 		)))
@@ -213,26 +230,11 @@ fn tracing_span<T>(request: &http::Request<T>) -> tracing::Span {
 		parent: None,
 		debug::INFO_SPAN_LEVEL,
 		"router",
-		ip=tracing::field::Empty,
 		method = %request.method(),
 		%path,
 	}
 }
 
-/// Annotates the tracing span with the client IP
-async fn request_ip(
-	State(services): State<Arc<Services>>,
-	request: extract::Request,
-	next: axum::middleware::Next,
-) -> axum::response::Response {
-	let (mut parts, body) = request.into_parts();
-	if let Ok(ip) = ClientIp::from_request_parts(&mut parts, &services).await {
-		let span = tracing::Span::current();
-		span.record("ip", ip.0.to_string());
-	}
-	next.run(extract::Request::from_parts(parts, body)).await
-}
-
 fn request_path_str<T>(request: &http::Request<T>) -> &str {
 	request
 		.uri()

src/service/admin/execute.rs

@@ -1,6 +1,4 @@
-use std::io::IsTerminal;
-
-use conduwuit::{Err, Result, debug, debug_info, error, info, warn};
+use conduwuit::{Err, Result, debug, debug_info, error, info};
 use ruma::events::room::message::RoomMessageEventContent;
 use tokio::time::{Duration, sleep};
 
@@ -9,16 +7,10 @@
 pub(super) const SIGNAL: &str = "SIGUSR2";
 
 impl super::Service {
-	/// Possibly spawn the terminal console at startup if configured and a TTY
-	/// is available.
+	/// Possibly spawn the terminal console at startup if configured.
 	pub(super) async fn console_auto_start(&self) {
 		#[cfg(feature = "console")]
 		if self.services.server.config.admin_console_automatic {
-			if !std::io::stdin().is_terminal() {
-				warn!("Console enabled without a tty available; Not enabling console");
-				return;
-			}
-
 			// Allow more of the startup sequence to execute before spawning
 			tokio::task::yield_now().await;
 			self.console.start().await;