Merge branch 'main' of github.com:/matrix-org/matrix-authentication-service into t3chguy/uia-x-signing-reset

# Conflicts:
#	frontend/src/routes/_account.index.lazy.tsx

Author: t3chguy

.github/workflows/build.yaml

@@ -113,7 +113,7 @@ jobs:
           done
 
       - name: Upload the artifacts
-        uses: actions/[email protected].5
+        uses: actions/[email protected].6
         with:
           name: binaries
           path: |

Cargo.lock

@@ -4,7 +4,7 @@ members = ["crates/*"]
 resolver = "2"
 
 # Updated in the CI with a `sed` command
-package.version = "0.9.0"
+package.version = "0.10.0-rc.0"
 
 package.license = "Apache-2.0"
 package.authors = ["Quentin Gliech <[email protected]>"]
@@ -28,33 +28,33 @@ broken_intra_doc_links = "deny"
 [workspace.dependencies]
 
 # Workspace crates
-mas-axum-utils = { path = "./crates/axum-utils/", version = "=0.9.0" }
-mas-cli = { path = "./crates/cli/", version = "=0.9.0" }
-mas-config = { path = "./crates/config/", version = "=0.9.0" }
-mas-data-model = { path = "./crates/data-model/", version = "=0.9.0" }
-mas-email = { path = "./crates/email/", version = "=0.9.0" }
-mas-graphql = { path = "./crates/graphql/", version = "=0.9.0" }
-mas-handlers = { path = "./crates/handlers/", version = "=0.9.0" }
-mas-http = { path = "./crates/http/", version = "=0.9.0" }
-mas-i18n = { path = "./crates/i18n/", version = "=0.9.0" }
-mas-i18n-scan = { path = "./crates/i18n-scan/", version = "=0.9.0" }
-mas-iana = { path = "./crates/iana/", version = "=0.9.0" }
-mas-iana-codegen = { path = "./crates/iana-codegen/", version = "=0.9.0" }
-mas-jose = { path = "./crates/jose/", version = "=0.9.0" }
-mas-keystore = { path = "./crates/keystore/", version = "=0.9.0" }
-mas-listener = { path = "./crates/listener/", version = "=0.9.0" }
-mas-matrix = { path = "./crates/matrix/", version = "=0.9.0" }
-mas-matrix-synapse = { path = "./crates/matrix-synapse/", version = "=0.9.0" }
-mas-oidc-client = { path = "./crates/oidc-client/", version = "=0.9.0" }
-mas-policy = { path = "./crates/policy/", version = "=0.9.0" }
-mas-router = { path = "./crates/router/", version = "=0.9.0" }
-mas-spa = { path = "./crates/spa/", version = "=0.9.0" }
-mas-storage = { path = "./crates/storage/", version = "=0.9.0" }
-mas-storage-pg = { path = "./crates/storage-pg/", version = "=0.9.0" }
-mas-tasks = { path = "./crates/tasks/", version = "=0.9.0" }
-mas-templates = { path = "./crates/templates/", version = "=0.9.0" }
-mas-tower = { path = "./crates/tower/", version = "=0.9.0" }
-oauth2-types = { path = "./crates/oauth2-types/", version = "=0.9.0" }
+mas-axum-utils = { path = "./crates/axum-utils/", version = "=0.10.0-rc.0" }
+mas-cli = { path = "./crates/cli/", version = "=0.10.0-rc.0" }
+mas-config = { path = "./crates/config/", version = "=0.10.0-rc.0" }
+mas-data-model = { path = "./crates/data-model/", version = "=0.10.0-rc.0" }
+mas-email = { path = "./crates/email/", version = "=0.10.0-rc.0" }
+mas-graphql = { path = "./crates/graphql/", version = "=0.10.0-rc.0" }
+mas-handlers = { path = "./crates/handlers/", version = "=0.10.0-rc.0" }
+mas-http = { path = "./crates/http/", version = "=0.10.0-rc.0" }
+mas-i18n = { path = "./crates/i18n/", version = "=0.10.0-rc.0" }
+mas-i18n-scan = { path = "./crates/i18n-scan/", version = "=0.10.0-rc.0" }
+mas-iana = { path = "./crates/iana/", version = "=0.10.0-rc.0" }
+mas-iana-codegen = { path = "./crates/iana-codegen/", version = "=0.10.0-rc.0" }
+mas-jose = { path = "./crates/jose/", version = "=0.10.0-rc.0" }
+mas-keystore = { path = "./crates/keystore/", version = "=0.10.0-rc.0" }
+mas-listener = { path = "./crates/listener/", version = "=0.10.0-rc.0" }
+mas-matrix = { path = "./crates/matrix/", version = "=0.10.0-rc.0" }
+mas-matrix-synapse = { path = "./crates/matrix-synapse/", version = "=0.10.0-rc.0" }
+mas-oidc-client = { path = "./crates/oidc-client/", version = "=0.10.0-rc.0" }
+mas-policy = { path = "./crates/policy/", version = "=0.10.0-rc.0" }
+mas-router = { path = "./crates/router/", version = "=0.10.0-rc.0" }
+mas-spa = { path = "./crates/spa/", version = "=0.10.0-rc.0" }
+mas-storage = { path = "./crates/storage/", version = "=0.10.0-rc.0" }
+mas-storage-pg = { path = "./crates/storage-pg/", version = "=0.10.0-rc.0" }
+mas-tasks = { path = "./crates/tasks/", version = "=0.10.0-rc.0" }
+mas-templates = { path = "./crates/templates/", version = "=0.10.0-rc.0" }
+mas-tower = { path = "./crates/tower/", version = "=0.10.0-rc.0" }
+oauth2-types = { path = "./crates/oauth2-types/", version = "=0.10.0-rc.0" }
 
 # OpenAPI schema generation and validation
 [workspace.dependencies.aide]
@@ -134,7 +134,7 @@ features = ["client", "http1", "http2"]
 
 # Additional Hyper utilties
 [workspace.dependencies.hyper-util]
-version = "0.1.6"
+version = "0.1.7"
 features = [
     "client",
     "server",
@@ -151,6 +151,11 @@ version = "0.27.2"
 features = ["http1", "http2"]
 default-features = false
 
+# Snapshot testing
+[workspace.dependencies.insta]
+version = "1.39.0"
+features = ["yaml", "json"]
+
 # Email sending
 [workspace.dependencies.lettre]
 version = "0.11.7"

Cargo.toml

@@ -197,14 +197,18 @@ impl Options {
         let activity_tracker = ActivityTracker::new(pool.clone(), Duration::from_secs(60));
         let trusted_proxies = config.http.trusted_proxies.clone();
 
+        // Build a rate limiter.
+        // This should not raise an error here as the config should already have been
+        // validated.
+        let limiter = Limiter::new(&config.rate_limiting)
+            .context("rate-limiting configuration is not valid")?;
+
         // Explicitly the config to properly zeroize secret keys
         drop(config);
 
         // Listen for SIGHUP
         register_sighup(&templates, &activity_tracker)?;
 
-        let limiter = Limiter::default();
-
         limiter.start();
 
         let graphql_schema = mas_handlers::graphql_schema(