luxolus/open-vault
2
0
Fork 0
Code Issues 1 Pull requests Releases Activity

Don't swallow logical.Unwrap error (#4258)

Browse source 
This PR fixes the error handling in the api packages logical.Unwrap
method. Previously if there was an error making the request to Vault,
the error was only returned if there was an HTTP response and the status
code was not a 404.

The new code returns all errors but does special case handling if the
response code is a 404.
This commit is contained in:
Alex Dadgar 2018-04-03 14:11:01 -07:00 committed by Jeff Mitchell
parent 8d33a0e089
commit 6a824383b6
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
api/logical.go
View file

@ -138,10 +138,11 @@ func (c *Logical) Unwrap(wrappingToken string) (*Secret, error) {
if resp != nil {
defer resp.Body.Close()
}
if err != nil {
if resp != nil && resp.StatusCode != 404 {
return nil, err
}
// Return all errors except those that are from a 404 as we handle the not
// found error as a special case.
if err != nil && (resp == nil || resp.StatusCode != 404) {
return nil, err
}
if resp == nil {
return nil, nil