scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-02 03:27:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better handle nil responses in logical unwrap

Browse Source
This commit is contained in:
Jeff Mitchell
2016-12-01 16:38:08 -05:00
parent 1d1af35c8c
commit 77d804e483
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/logical.go
View File

@@ -135,13 +135,17 @@ func (c *Logical) Unwrap(wrappingToken string) (*Secret, error) {
} }
resp, err := c.c.RawRequest(r) resp, err := c.c.RawRequest(r)
if resp != nil {
defer resp.Body.Close()
}
if err != nil {
if resp != nil && resp.StatusCode != 404 {
return nil, err
}
}
if resp == nil { if resp == nil {
return nil, nil return nil, nil
} }
defer resp.Body.Close()
if err != nil && resp.StatusCode != 404 {
return nil, err
}
switch resp.StatusCode { switch resp.StatusCode {
case http.StatusOK: // New method is supported case http.StatusOK: // New method is supported