Make OAuth 2.0 client_id and client_secret mandatory#294
Merged
roidelapluie merged 4 commits intoprometheus:mainfrom Apr 27, 2021
Merged
Make OAuth 2.0 client_id and client_secret mandatory#294roidelapluie merged 4 commits intoprometheus:mainfrom
roidelapluie merged 4 commits intoprometheus:mainfrom
Conversation
Signed-off-by: Levi Harrison <git@leviharrison.dev>
dd23553 to
e5fed51
Compare
config/http_config.go
Outdated
| if c.BasicAuth != nil { | ||
| return fmt.Errorf("at most one of basic_auth, oauth2 & authorization must be configured") | ||
| } | ||
| if len(c.OAuth2.ClientID) < 1 || (len(c.OAuth2.ClientSecret) < 1 || len(c.OAuth2.ClientSecretFile) < 1) { |
Member
There was a problem hiding this comment.
We generally use == 0 to check this.
Can we have 2 distincts errors? This would be more readable and more direct for the user.
Member
There was a problem hiding this comment.
We also need the token url mandatory.
Member
roidelapluie
left a comment
There was a problem hiding this comment.
Thanks,
token URL is also mandatory.
Signed-off-by: Levi Harrison <git@leviharrison.dev>
Contributor
Author
|
Whoops, that too. Thanks! |
config/http_config.go
Outdated
| return fmt.Errorf("at most one of basic_auth, oauth2 & authorization must be configured") | ||
| } | ||
| if len(c.OAuth2.ClientID) < 1 || (len(c.OAuth2.ClientSecret) < 1 && len(c.OAuth2.ClientSecretFile) < 1) { | ||
| return fmt.Errorf("the oauth2 client_id and either the client_secret or client_secret_file must be configured") |
Member
There was a problem hiding this comment.
I think that I would still prefer to use == 0 like elsewhere and have 2 different errors for better readability.
config/http_config.go
Outdated
| if len(c.OAuth2.ClientID) < 1 || (len(c.OAuth2.ClientSecret) < 1 && len(c.OAuth2.ClientSecretFile) < 1) { | ||
| return fmt.Errorf("the oauth2 client_id and either the client_secret or client_secret_file must be configured") | ||
| } | ||
| if len(c.OAuth2.TokenURL) < 1 { |
Member
There was a problem hiding this comment.
Suggested change
| if len(c.OAuth2.TokenURL) < 1 { | |
| if len(c.OAuth2.TokenURL) == 0 { |
Signed-off-by: Levi Harrison <git@leviharrison.dev>
Member
roidelapluie
left a comment
There was a problem hiding this comment.
Final nits to be consistent with the other error messages. After this is changed I will merge and release 0.23.0
config/http_config.go
Outdated
| return fmt.Errorf("the oauth2 client_id must be configured") | ||
| } | ||
| if len(c.OAuth2.ClientSecret) == 0 && len(c.OAuth2.ClientSecretFile) == 0 { | ||
| return fmt.Errorf("either the oauth2 client_secret or client_secret_file must be configured") |
Member
There was a problem hiding this comment.
Suggested change
| return fmt.Errorf("either the oauth2 client_secret or client_secret_file must be configured") | |
| return fmt.Errorf("either oauth2 client_secret or client_secret_file must be configured") |
config/http_config.go
Outdated
| return fmt.Errorf("either the oauth2 client_secret or client_secret_file must be configured") | ||
| } | ||
| if len(c.OAuth2.TokenURL) == 0 { | ||
| return fmt.Errorf("the oauth2 token_url must be configured") |
Member
There was a problem hiding this comment.
Suggested change
| return fmt.Errorf("the oauth2 token_url must be configured") | |
| return fmt.Errorf("oauth2 token_url must be configured") |
config/http_config.go
Outdated
| return fmt.Errorf("at most one of basic_auth, oauth2 & authorization must be configured") | ||
| } | ||
| if len(c.OAuth2.ClientID) == 0 { | ||
| return fmt.Errorf("the oauth2 client_id must be configured") |
Member
There was a problem hiding this comment.
Suggested change
| return fmt.Errorf("the oauth2 client_id must be configured") | |
| return fmt.Errorf("oauth2 client_id must be configured") |
Signed-off-by: Levi Harrison <git@leviharrison.dev>
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
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.
These should be mandatory as per the spec.
cc @roidelapluie