fix/refactor: Move auth.token_key and other parameters to AuthConfig structure
#925
Conversation
This file contains 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
JAORMX
force-pushed
the
token-key
branch
2 times, most recently
from
fecf453
to
dbc5e13
Compare
jhrozek
previously approved these changes
Sep 11, 2023
JAORMX
force-pushed
the
token-key
branch
2 times, most recently
from
48af093
to
1fb4c4b
Compare
evankanderson
requested changes
Sep 11, 2023
internal/crypto/crypto.go
Outdated
Comment on lines
62
to
91
| // EngineFromAuthConfig creates a new crypto engine from an auth config | ||
| func EngineFromAuthConfig(authConfig *config.AuthConfig) (*Engine, error) { | ||
| if authConfig == nil { | ||
| return nil, errors.New("auth config is nil") | ||
| } | ||
|
|
||
| if authConfig.TokenKey == "" { | ||
| return nil, errors.New("token key is empty") | ||
| } | ||
|
|
||
| return &Engine{ | ||
| encryptionKey: authConfig.TokenKey, | ||
| }, nil | ||
| } |
There was a problem hiding this comment.
What do you think of reversing this dependency, and having config.go have an .Engine() method?
It looks like the other usage is configuration params in GeneratePasswordHash, and I'd sort of prefer a non-magic struct as an argument there.
There was a problem hiding this comment.
uhm... can't really add an Engine method without introducing an import cycle
…ig` structure The intent is to have a central place to fetch the configuration and validate it. This way, starting the server will fail if the needed crypto configuration is not set up appropriately. This also moves the `crypto` package to `internal` which is more appropriate. Finally, the concept of `auth.token_key` changed from being a string to being a file. The idea is that we'll have all secrets as files which will be referenced as kubernetes secrets. Closes: #923
jhrozek
approved these changes
Sep 12, 2023
evankanderson
approved these changes
Sep 12, 2023
JAORMX
added a commit
that referenced
this pull request
Sep 12, 2023
Add token_key_passphrase to file location overrides following #925
This was referenced Nov 2, 2023
Merged
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.
The intent is to have a central place to fetch the configuration and validate it.
This way, starting the server will fail if the needed crypto configuration is not
set up appropriately.
This also moves the
cryptopackage tointernalwhich is more appropriate.Closes: #923