Merge branch 'main' into rei/templatecheck_todisk

Author: reivilibre

.github/CODEOWNERS

@@ -0,0 +1 @@
+*   @element-hq/mas-maintainers

Cargo.lock

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

Cargo.toml

@@ -160,8 +160,14 @@ impl Options {
         )?;
 
         // Load and compile the templates
-        let templates =
-            templates_from_config(&config.templates, &site_config, &url_builder).await?;
+        let templates = templates_from_config(
+            &config.templates,
+            &site_config,
+            &url_builder,
+            // Don't use strict mode in production yet
+            false,
+        )
+        .await?;
         shutdown.register_reloadable(&templates);
 
         let http_client = mas_http::reqwest_client();

crates/cli/src/commands/server.rs

@@ -72,8 +72,13 @@ impl Options {
                     &account_config,
                     &captcha_config,
                 )?;
-                let templates =
-                    templates_from_config(&template_config, &site_config, &url_builder).await?;
+                let templates = templates_from_config(
+                    &template_config,
+                    &site_config,
+                    &url_builder, // Use strict mode in template checks
+                    true,
+                )
+                .await?;
                 let all_renders = templates.check_render(clock.now(), &mut rng)?;
 
                 if let Some(out_dir) = out_dir {

crates/cli/src/commands/templates.rs

@@ -52,8 +52,14 @@ impl Options {
         )?;
 
         // Load and compile the templates
-        let templates =
-            templates_from_config(&config.templates, &site_config, &url_builder).await?;
+        let templates = templates_from_config(
+            &config.templates,
+            &site_config,
+            &url_builder,
+            // Don't use strict mode on task workers for now
+            false,
+        )
+        .await?;
 
         let mailer = mailer_from_config(&config.email, &templates)?;
         test_mailer_in_background(&mailer, Duration::from_secs(30));

crates/cli/src/commands/worker.rs

@@ -232,6 +232,7 @@ pub async fn templates_from_config(
     config: &TemplatesConfig,
     site_config: &SiteConfig,
     url_builder: &UrlBuilder,
+    strict: bool,
 ) -> Result<Templates, anyhow::Error> {
     Templates::load(
         config.path.clone(),
@@ -240,6 +241,7 @@ pub async fn templates_from_config(
         config.translations_path.clone(),
         site_config.templates_branding(),
         site_config.templates_features(),
+        strict,
     )
     .await
     .with_context(|| format!("Failed to load the templates at {}", config.path))