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

Fix panic when unwrapping if the server EOFs

This commit is contained in:
Jeff Mitchell 2016-11-29 16:50:07 -05:00
parent 736a4b111c
commit 0f5b847748
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/logical.go
View File

@ -135,9 +135,10 @@ func (c *Logical) Unwrap(wrappingToken string) (*Secret, error) {
}
resp, err := c.c.RawRequest(r)
if resp != nil {
defer resp.Body.Close()
if resp == nil {
return nil, nil
}
defer resp.Body.Close()
if err != nil && resp.StatusCode != 404 {
return nil, err
}

2
command/unwrap.go
View File

@ -62,7 +62,7 @@ func (c *UnwrapCommand) Run(args []string) int {
return 1
}
if secret == nil {
c.Ui.Error("Secret returned was nil")
c.Ui.Error("Server gave empty response or secret returned was empty")
return 1
}