Merge branch 'main' into patch-1

Author: Stogas

.github/workflows/build.yaml

@@ -61,7 +61,9 @@ jobs:
           version: 0.13.0
 
       - name: Install cargo-zigbuild
-        run: curl -L https://github.com/rust-cross/cargo-zigbuild/releases/download/v0.19.1/cargo-zigbuild-v0.19.1.x86_64-unknown-linux-musl.tar.gz | tar -z -x -C /usr/local/bin
+        uses: taiki-e/install-action@v2
+        with:
+          tool: cargo-zigbuild
 
       - name: Install frontend Node
         uses: actions/[email protected]

.github/workflows/ci.yaml

@@ -263,7 +263,9 @@ jobs:
           rustup default stable
 
       - name: Install nextest
-        uses: taiki-e/install-action@nextest
+        uses: taiki-e/install-action@v2
+        with:
+          tool: cargo-nextest
 
       - name: Setup sccache
         uses: mozilla-actions/[email protected]
@@ -313,7 +315,9 @@ jobs:
 
       - run: mkdir -p ~/.cargo/bin
       - name: Install nextest
-        uses: taiki-e/install-action@nextest
+        uses: taiki-e/install-action@v2
+        with:
+          tool: cargo-nextest
 
       - name: Install Node
         uses: actions/[email protected]

.github/workflows/coverage.yaml

@@ -141,11 +141,10 @@ jobs:
       - name: Setup sccache
         uses: mozilla-actions/[email protected]
 
-      - name: Download grcov
-        run: |
-          mkdir -p "${HOME}/.local/bin"
-          curl -sL https://github.com/mozilla/grcov/releases/download/v0.8.19/grcov-x86_64-unknown-linux-gnu.tar.bz2 | tar jxf - -C "${HOME}/.local/bin"
-          echo "$HOME/.local/bin" >> $GITHUB_PATH
+      - name: Install grcov
+        uses: taiki-e/install-action@v2
+        with:
+          tool: grcov
 
       - name: Run test suite with profiling enabled
         run: |

.github/workflows/docs.yaml

@@ -30,10 +30,10 @@ jobs:
       - name: Setup sccache
         uses: mozilla-actions/[email protected]
 
-      - name: Setup mdBook
-        uses: peaceiris/actions-mdbook@v2.0.0
+      - name: Install mdbook
+        uses: taiki-e/install-action@v2
         with:
-          mdbook-version: '0.4.37'
+          tool: mdbook
 
       - name: Install Node
         uses: actions/[email protected]

Cargo.lock

@@ -82,6 +82,10 @@ version = "0.7.9"
 version = "0.9.6"
 features = ["cookie-private", "cookie-key-expansion", "typed-header"]
 
+# Constant-time base64
+[workspace.dependencies.base64ct]
+version = "1.6.0"
+
 # Bytes
 [workspace.dependencies.bytes]
 version = "1.9.0"

Cargo.toml

@@ -15,27 +15,20 @@ workspace = true
 async-trait.workspace = true
 axum.workspace = true
 axum-extra.workspace = true
-bytes.workspace = true
 chrono.workspace = true
 data-encoding = "2.6.0"
-futures-util.workspace = true
 headers.workspace = true
 http.workspace = true
-http-body.workspace = true
-http-body-util.workspace = true
-hyper-util.workspace = true
 icu_locid = "1.4.0"
 mime = "0.3.17"
 rand.workspace = true
 reqwest.workspace = true
 sentry.workspace = true
 serde.workspace = true
 serde_with = "3.12.0"
-serde_urlencoded = "0.7.1"
 serde_json.workspace = true
 thiserror.workspace = true
 tokio.workspace = true
-tower.workspace = true
 tracing.workspace = true
 url.workspace = true
 ulid.workspace = true

crates/axum-utils/Cargo.toml

@@ -23,9 +23,6 @@ console = "0.15.10"
 dialoguer = { version = "0.11.0", features = ["fuzzy-select"] }
 dotenvy = "0.15.7"
 figment.workspace = true
-httpdate = "1.0.3"
-http.workspace = true
-http-body.workspace = true
 http-body-util.workspace = true
 hyper.workspace = true
 ipnetwork = "0.20.0"
@@ -69,20 +66,17 @@ mas-email.workspace = true
 mas-handlers.workspace = true
 mas-http.workspace = true
 mas-i18n.workspace = true
-mas-iana.workspace = true
 mas-keystore.workspace = true
 mas-listener.workspace = true
 mas-matrix.workspace = true
 mas-matrix-synapse.workspace = true
 mas-policy.workspace = true
 mas-router.workspace = true
-mas-spa.workspace = true
 mas-storage.workspace = true
 mas-storage-pg.workspace = true
 mas-tasks.workspace = true
 mas-templates.workspace = true
 mas-tower.workspace = true
-oauth2-types.workspace = true
 
 [build-dependencies]
 anyhow.workspace = true

crates/cli/Cargo.toml

@@ -209,6 +209,7 @@ impl Options {
             site_config.clone(),
             password_manager.clone(),
             url_builder.clone(),
+            limiter.clone(),
         );
 
         let state = {

crates/cli/src/commands/server.rs

@@ -1,4 +1,4 @@
-// Copyright 2024 New Vector Ltd.
+// Copyright 2024, 2025 New Vector Ltd.
 // Copyright 2022-2024 The Matrix.org Foundation C.I.C.
 //
 // SPDX-License-Identifier: AGPL-3.0-only