Automatic merge back to main (#4070)

Author: matrixbot

Cargo.lock

@@ -4,7 +4,7 @@ members = ["crates/*"]
 resolver = "2"
 
 # Updated in the CI with a `sed` command
-package.version = "0.14.0"
+package.version = "0.14.1"
 package.license = "AGPL-3.0-only"
 package.authors = ["Element Backend Team"]
 package.edition = "2021"
@@ -27,34 +27,34 @@ broken_intra_doc_links = "deny"
 [workspace.dependencies]
 
 # Workspace crates
-mas-axum-utils = { path = "./crates/axum-utils/", version = "=0.14.0" }
-mas-cli = { path = "./crates/cli/", version = "=0.14.0" }
-mas-config = { path = "./crates/config/", version = "=0.14.0" }
-mas-data-model = { path = "./crates/data-model/", version = "=0.14.0" }
-mas-email = { path = "./crates/email/", version = "=0.14.0" }
-mas-graphql = { path = "./crates/graphql/", version = "=0.14.0" }
-mas-handlers = { path = "./crates/handlers/", version = "=0.14.0" }
-mas-http = { path = "./crates/http/", version = "=0.14.0" }
-mas-i18n = { path = "./crates/i18n/", version = "=0.14.0" }
-mas-i18n-scan = { path = "./crates/i18n-scan/", version = "=0.14.0" }
-mas-iana = { path = "./crates/iana/", version = "=0.14.0" }
-mas-iana-codegen = { path = "./crates/iana-codegen/", version = "=0.14.0" }
-mas-jose = { path = "./crates/jose/", version = "=0.14.0" }
-mas-keystore = { path = "./crates/keystore/", version = "=0.14.0" }
-mas-listener = { path = "./crates/listener/", version = "=0.14.0" }
-mas-matrix = { path = "./crates/matrix/", version = "=0.14.0" }
-mas-matrix-synapse = { path = "./crates/matrix-synapse/", version = "=0.14.0" }
-mas-oidc-client = { path = "./crates/oidc-client/", version = "=0.14.0" }
-mas-policy = { path = "./crates/policy/", version = "=0.14.0" }
-mas-router = { path = "./crates/router/", version = "=0.14.0" }
-mas-spa = { path = "./crates/spa/", version = "=0.14.0" }
-mas-storage = { path = "./crates/storage/", version = "=0.14.0" }
-mas-storage-pg = { path = "./crates/storage-pg/", version = "=0.14.0" }
-mas-tasks = { path = "./crates/tasks/", version = "=0.14.0" }
-mas-templates = { path = "./crates/templates/", version = "=0.14.0" }
-mas-tower = { path = "./crates/tower/", version = "=0.14.0" }
-oauth2-types = { path = "./crates/oauth2-types/", version = "=0.14.0" }
-syn2mas = { path = "./crates/syn2mas", version = "=0.14.0" }
+mas-axum-utils = { path = "./crates/axum-utils/", version = "=0.14.1" }
+mas-cli = { path = "./crates/cli/", version = "=0.14.1" }
+mas-config = { path = "./crates/config/", version = "=0.14.1" }
+mas-data-model = { path = "./crates/data-model/", version = "=0.14.1" }
+mas-email = { path = "./crates/email/", version = "=0.14.1" }
+mas-graphql = { path = "./crates/graphql/", version = "=0.14.1" }
+mas-handlers = { path = "./crates/handlers/", version = "=0.14.1" }
+mas-http = { path = "./crates/http/", version = "=0.14.1" }
+mas-i18n = { path = "./crates/i18n/", version = "=0.14.1" }
+mas-i18n-scan = { path = "./crates/i18n-scan/", version = "=0.14.1" }
+mas-iana = { path = "./crates/iana/", version = "=0.14.1" }
+mas-iana-codegen = { path = "./crates/iana-codegen/", version = "=0.14.1" }
+mas-jose = { path = "./crates/jose/", version = "=0.14.1" }
+mas-keystore = { path = "./crates/keystore/", version = "=0.14.1" }
+mas-listener = { path = "./crates/listener/", version = "=0.14.1" }
+mas-matrix = { path = "./crates/matrix/", version = "=0.14.1" }
+mas-matrix-synapse = { path = "./crates/matrix-synapse/", version = "=0.14.1" }
+mas-oidc-client = { path = "./crates/oidc-client/", version = "=0.14.1" }
+mas-policy = { path = "./crates/policy/", version = "=0.14.1" }
+mas-router = { path = "./crates/router/", version = "=0.14.1" }
+mas-spa = { path = "./crates/spa/", version = "=0.14.1" }
+mas-storage = { path = "./crates/storage/", version = "=0.14.1" }
+mas-storage-pg = { path = "./crates/storage-pg/", version = "=0.14.1" }
+mas-tasks = { path = "./crates/tasks/", version = "=0.14.1" }
+mas-templates = { path = "./crates/templates/", version = "=0.14.1" }
+mas-tower = { path = "./crates/tower/", version = "=0.14.1" }
+oauth2-types = { path = "./crates/oauth2-types/", version = "=0.14.1" }
+syn2mas = { path = "./crates/syn2mas", version = "=0.14.1" }
 
 # OpenAPI schema generation and validation
 [workspace.dependencies.aide]

Cargo.toml

@@ -238,9 +238,15 @@ pub fn build_router(
         }
     }
 
-    if let Some(prefix) = prefix {
-        let path = format!("{}/", prefix.trim_end_matches('/'));
-        router = Router::new().nest(&path, router);
+    // We normalize the prefix:
+    //  - if it's None, it becomes '/'
+    //  - if it's Some(..), any trailing '/' is first trimmed, then a '/' is added
+    let prefix = format!("{}/", prefix.unwrap_or_default().trim_end_matches('/'));
+    // Then we only nest the router if the prefix is not empty and not the root
+    // If we blindly nest the router if the prefix is Some("/"), axum will panic as
+    // we're not supposed to nest the router at the root
+    if !prefix.is_empty() && prefix != "/" {
+        router = Router::new().nest(&prefix, router);
     }
 
     router = router.fallback(mas_handlers::fallback);

crates/cli/src/server.rs

@@ -1,6 +1,6 @@
 {
   "name": "@vector-im/syn2mas",
-  "version": "0.14.0",
+  "version": "0.14.1",
   "description": "A tool to migrate Synapse users and sessions to the Matrix Authentication Service",
   "license": "AGPL-3.0-only",
   "author": "Matrix.org",