Automatic merge back to main (#4703)

Author: matrixbot

Cargo.lock

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

Cargo.toml

@@ -149,21 +149,21 @@ impl KeyConfig {
     /// Returns the password in case any is provided.
     ///
     /// If `password_file` was given, the password is read from that file.
-    async fn password(&self) -> anyhow::Result<Option<Cow<String>>> {
+    async fn password(&self) -> anyhow::Result<Option<Cow<[u8]>>> {
         Ok(match &self.password {
-            Some(Password::File(path)) => Some(Cow::Owned(tokio::fs::read_to_string(path).await?)),
-            Some(Password::Value(password)) => Some(Cow::Borrowed(password)),
+            Some(Password::File(path)) => Some(Cow::Owned(tokio::fs::read(path).await?)),
+            Some(Password::Value(password)) => Some(Cow::Borrowed(password.as_bytes())),
             None => None,
         })
     }
 
     /// Returns the key.
     ///
     /// If `key_file` was given, the key is read from that file.
-    async fn key(&self) -> anyhow::Result<Cow<String>> {
+    async fn key(&self) -> anyhow::Result<Cow<[u8]>> {
         Ok(match &self.key {
-            Key::File(path) => Cow::Owned(tokio::fs::read_to_string(path).await?),
-            Key::Value(key) => Cow::Borrowed(key),
+            Key::File(path) => Cow::Owned(tokio::fs::read(path).await?),
+            Key::Value(key) => Cow::Borrowed(key.as_bytes()),
         })
     }
 
@@ -174,8 +174,8 @@ impl KeyConfig {
         let (key, password) = try_join(self.key(), self.password()).await?;
 
         let private_key = match password {
-            Some(password) => PrivateKey::load_encrypted(key.as_bytes(), password.as_bytes())?,
-            None => PrivateKey::load(key.as_bytes())?,
+            Some(password) => PrivateKey::load_encrypted(&key, password)?,
+            None => PrivateKey::load(&key)?,
         };
 
         Ok(JsonWebKey::new(private_key)