Trim the secret read by the matrix.secret_file configuration option
#4961
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sandhose
requested changes
Sep 2, 2025
crates/config/src/sections/matrix.rs
Outdated
| pub async fn secret(&self) -> anyhow::Result<String> { | ||
| Ok(match &self.secret { | ||
| let raw = match &self.secret { | ||
| Secret::File(path) => tokio::fs::read_to_string(path).await?, |
There was a problem hiding this comment.
I think we should trim only if the secret is being read from a file to match synapse behaviour. It would also be nice to stick in a comment to explicit this behaviour
mweinelt
force-pushed
the
trim-matrix-secret
branch
2 times, most recently
from
2fbaebf to
6a0ab03
Compare
Treat the secret the same as synapse when read from file a file, so that the same secret file can be reused between mas and synapse. https://github.com/element-hq/synapse/blob/v1.137.0/synapse/config/experimental.py#L50
mweinelt
force-pushed
the
trim-matrix-secret
branch
from
6a0ab03 to
823c60f
Compare
sandhose
approved these changes
Sep 12, 2025
sandhose
changed the title
matrix.secret_file in the configuration when read from file
sandhose
changed the title
matrix.secret_file in the configuration when read from filematrix.secret_file the configuration option
sandhose
changed the title
matrix.secret_file the configuration optionmatrix.secret_file configuration option
sandhose
added
A-Configuration
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Treat the secret the same as synapse, so the same secret file can be reused between mas and synapse.
https://github.com/element-hq/synapse/blob/v1.137.0/synapse/config/experimental.py#L50