vault: protect against empty Vault secret response #4937
Merged
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
notnoop
commented
Nov 29, 2018
| if err != nil { | ||
| // Try looking up our token directly | ||
| self, err = auth.Lookup(v.client.Token()) |
There was a problem hiding this comment.
The assignment to self here is ineffective - as if this try succeeds, self is stomped by assignment in L646, as @tantra35 identified. Thanks!
Also, fix a case where a successful second attempt of loading token can cause a panic.
notnoop
force-pushed
the
b-vault-panic
branch
from
6b93829 to
f3853f1
Compare
|
I'm going to lock this pull request because it has been closed for 120 days ⏳. This helps our maintainers find and focus on the active contributions. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes #4921
Sadly, we don't have proper mechanism to mock Vault client, so not sure how to best test this.
I inspected the Vault client interactions, specially for cases where returned value is nil even if the error is also nil. I believe we covered all correctly now:
v.client.Sys().InitStatus()- the value is non-nil booleanv.client.Sys().CapabilitiesSelf(path): Capabilities handles empty bodies inhasCapability- also thenilarray is handled with proper fail-safe default.v.client.Logical().Read(fmt.Sprintf("auth/token/roles/%s", role))handles whenrsecretis nil