(merge progress on syn2mas tool into main branch)

Cargo.toml

@@ -54,6 +54,7 @@ mas-tasks = { path = "./crates/tasks/", version = "=0.13.0-rc.1" }
 mas-templates = { path = "./crates/templates/", version = "=0.13.0-rc.1" }
 mas-tower = { path = "./crates/tower/", version = "=0.13.0-rc.1" }
 oauth2-types = { path = "./crates/oauth2-types/", version = "=0.13.0-rc.1" }
+syn2mas = { path = "./crates/syn2mas", version = "=0.13.0-rc.1" }
 
 # OpenAPI schema generation and validation
 [workspace.dependencies.aide]
@@ -65,6 +66,9 @@ features = ["axum", "axum-headers", "macros"]
 version = "7.0.14"
 features = ["chrono", "url", "tracing"]
 
+[workspace.dependencies.async-stream]
+version = "0.3.6"
+
 # Utility to write and implement async traits
 [workspace.dependencies.async-trait]
 version = "0.1.85"
@@ -94,6 +98,10 @@ version = "1.9.0"
 [workspace.dependencies.camino]
 version = "1.1.9"
 
+# Memory optimisation for short strings
+[workspace.dependencies.compact_str]
+version = "0.8.0"
+
 # Time utilities
 [workspace.dependencies.chrono]
 version = "0.4.39"
@@ -312,11 +320,17 @@ features = [
 [workspace.dependencies.thiserror]
 version = "2.0.11"
 
+[workspace.dependencies.thiserror-ext]
+version = "0.2.0"
+
 # Async runtime
 [workspace.dependencies.tokio]
 version = "1.43.0"
 features = ["full"]
 
+[workspace.dependencies.tokio-stream]
+version = "0.1.16"
+
 # Useful async utilities
 [workspace.dependencies.tokio-util]
 version = "0.7.13"

clippy.toml

@@ -1,4 +1,4 @@
-doc-valid-idents = ["OpenID", "OAuth", "..", "PostgreSQL"]
+doc-valid-idents = ["OpenID", "OAuth", "..", "PostgreSQL", "SQLite"]
 
 disallowed-methods = [
     { path = "rand::thread_rng", reason = "do not create rngs on the fly, pass them as parameters" },

crates/cli/Cargo.toml

@@ -37,6 +37,7 @@ serde_yaml = "0.9.34"
 sqlx.workspace = true
 tokio.workspace = true
 tokio-util.workspace = true
+tokio-stream.workspace = true
 tower.workspace = true
 tower-http.workspace = true
 url.workspace = true
@@ -78,6 +79,9 @@ mas-tasks.workspace = true
 mas-templates.workspace = true
 mas-tower.workspace = true
 
+oauth2-types.workspace = true
+syn2mas.workspace = true
+
 [build-dependencies]
 anyhow.workspace = true
 vergen-gitcl = { version = "1.0.5", features = ["rustc"] }

crates/cli/src/commands/mod.rs

@@ -19,6 +19,7 @@ mod debug;
 mod doctor;
 mod manage;
 mod server;
+mod syn2mas;
 mod templates;
 mod worker;
 
@@ -48,6 +49,11 @@ enum Subcommand {
 
     /// Run diagnostics on the deployment
     Doctor(self::doctor::Options),
+
+    /// Migrate from Synapse's built-in auth system to MAS.
+    #[clap(name = "syn2mas")]
+    // Box<> is to work around a 'large size difference between variants' lint
+    Syn2Mas(Box<self::syn2mas::Options>),
 }
 
 #[derive(Parser, Debug)]
@@ -75,6 +81,7 @@ impl Options {
             Some(S::Templates(c)) => Box::pin(c.run(figment)).await,
             Some(S::Debug(c)) => Box::pin(c.run(figment)).await,
             Some(S::Doctor(c)) => Box::pin(c.run(figment)).await,
+            Some(S::Syn2Mas(c)) => Box::pin(c.run(figment)).await,
             None => Box::pin(self::server::Options::default().run(figment)).await,
         }
     }