Remove cert and pem enforcement #150
Open
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
…hat required kubernetes_ca_cert to exist if token_reviewer_jwt is false
tomhjp
reviewed
Apr 22, 2022
tvoran
reviewed
Apr 22, 2022
tvoran
reviewed
Apr 25, 2022
tvoran
reviewed
Apr 27, 2022
Comment on lines
+544
to
+561
| "no CA default to system": { | ||
| config: map[string]interface{}{ | ||
| "kubernetes_host": "host", | ||
| "disable_local_ca_jwt": false, | ||
| "kubernetes_ca_cert": "", | ||
| }, | ||
| setupInClusterFiles: true, | ||
|
|
||
| expected: &kubeConfig{ | ||
| PublicKeys: []interface{}{}, | ||
| PEMKeys: []string{}, | ||
| Host: "host", | ||
| CACert: testLocalCACert, | ||
| TokenReviewerJWT: testLocalJWT, | ||
| DisableISSValidation: true, | ||
| DisableLocalCAJwt: false, | ||
| }, | ||
| }, |
There was a problem hiding this comment.
Is this test different than "no CA or JWT, default to local" in TestConfig_LocalCaJWT()? IIRC disable_local_ca_jwt defaults to false, and kubernetes_ca_cert defaults to "".
vault-plugin-auth-kubernetes/path_config_test.go
Lines 361 to 375 in a0dfafe
calvn
reviewed
Apr 27, 2022
tomhjp
reviewed
Apr 28, 2022
| @@ -161,11 +159,11 @@ func (b *kubeAuthBackend) pathConfigWrite(ctx context.Context, req *logical.Requ | |||
|
|
|||
| // Determine if we load the local CA cert or the CA cert provided | |||
| // by the kubernetes_ca_cert path into the backend's HTTP client | |||
| certPool := x509.NewCertPool() | |||
| tlsConfig := &tls.Config{ | |||
| MinVersion: tls.VersionTLS12, | |||
| } | |||
| if disableLocalJWT || len(caCert) > 0 { | |||
There was a problem hiding this comment.
How come we don't use system certs if disableLocalJWT is true?
| @@ -161,11 +159,11 @@ func (b *kubeAuthBackend) pathConfigWrite(ctx context.Context, req *logical.Requ | |||
|
|
|||
| // Determine if we load the local CA cert or the CA cert provided | |||
| // by the kubernetes_ca_cert path into the backend's HTTP client | |||
| certPool := x509.NewCertPool() | |||
| tlsConfig := &tls.Config{ | |||
| MinVersion: tls.VersionTLS12, | |||
| } | |||
| if disableLocalJWT || len(caCert) > 0 { | |||
There was a problem hiding this comment.
This is a more idiomatic check for empty strings:
Suggested change
| if disableLocalJWT || len(caCert) > 0 { | |
| if disableLocalJWT || caCert != "" { |
|
@imthaghost and @tomhjp can we merge this? |
3 tasks
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.
Overview
Some users didn't find it necessary for Vault to enforce the CA cert or PEM keys. Examples can be found in the related issues.
Design of Change
We add false booleans to the
kubernetes_ca_certandpem_keysfields. While therequiredfield on theFieldSchemastruct are deprecated we added this just for future reference and documentation. We also remove checks that enforcedkubernetes_ca_certto be present instead we just default to the local CA cert ifkubernetes_ca_certis not set which will return an error ofx509: certificate signed by unknown authorityif the user did supply an appropriate CA cert.Related Issues
Issue #62
Issue #88
Docs
I don't believe docs need to be added since this is implied in the example below.