Add secrets.keys_dir config option.
#4877
Open
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
Contributor
Author
|
Rebase to incorporate #4876. |
Contributor
Author
|
@sandhose Could you please take a look at this PR? 👉👈 |
sandhose
requested changes
Nov 6, 2025
Member
sandhose
left a comment
sandhose
left a comment
There was a problem hiding this comment.
Very sorry for the delay on getting back to this. Ironically I had a review started about a month ago 😅
This is a very nice addition, the only thing I would ask is to make the keys and keys_dir additive options and not exclusive
| #[schemars(with = "KeysRaw")] | ||
| #[serde_as(as = "serde_with::TryFromInto<KeysRaw>")] | ||
| #[serde(flatten)] | ||
| keys: Keys, |
Member
There was a problem hiding this comment.
I think they should be additive, not exclusive in this case, since it's a list
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Implements the
secrets.keys_dirconfig option as an alternative tosecrets.keys. Contains unit tests and documentation.Currently managing MAS key material is intertwined with managing MAS configuration: it is not possible to provide signing keys to MAS without some prior knowledge of their content, filename or count. This PR resolves that limitation by introducing the
secrets.keys_dirconfig option.The
secrets.keys_dirconfig option allows specifying a single directory that is expected to contain one file per MAS signingkey. The key files are read from the directory when aKeyStoreis created viaSecretsConfig::key_store().Requires #4876 to derive a key’s kid.