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

Merge pull request #1684 from hashicorp/issue-1683

Browse source 
Add extra nil check for an error response/use duration helper for TTL values
This commit is contained in:
Jeff Mitchell 2016-08-02 16:36:50 -04:00 committed by GitHub
parent 4d5de08a46 31b36fe2c2
commit c4992fa3e5
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
http/handler.go
View file

@ -232,7 +232,7 @@ func respondErrorCommon(w http.ResponseWriter, resp *logical.Response, err error
} }
} }
if resp != nil { if resp != nil && resp.IsError(){
err = fmt.Errorf("%s", resp.Data["error"].(string)) err = fmt.Errorf("%s", resp.Data["error"].(string))
} }

5
vault/token_store.go
View file

@ -10,6 +10,7 @@ import (
"github.com/armon/go-metrics" "github.com/armon/go-metrics"
"github.com/hashicorp/go-uuid" "github.com/hashicorp/go-uuid"
"github.com/hashicorp/vault/helper/duration"
"github.com/hashicorp/vault/helper/jsonutil" "github.com/hashicorp/vault/helper/jsonutil"
"github.com/hashicorp/vault/helper/locksutil" "github.com/hashicorp/vault/helper/locksutil"
"github.com/hashicorp/vault/helper/policyutil" "github.com/hashicorp/vault/helper/policyutil"
@ -1179,7 +1180,7 @@ func (ts *TokenStore) handleCreateCommon(
} }
if data.ExplicitMaxTTL != "" { if data.ExplicitMaxTTL != "" {
dur, err := time.ParseDuration(data.ExplicitMaxTTL) dur, err := duration.ParseDurationSecond(data.ExplicitMaxTTL)
if err != nil { if err != nil {
return logical.ErrorResponse(err.Error()), logical.ErrInvalidRequest return logical.ErrorResponse(err.Error()), logical.ErrInvalidRequest
} }
@ -1191,7 +1192,7 @@ func (ts *TokenStore) handleCreateCommon(
// Parse the TTL/lease if any // Parse the TTL/lease if any
if data.TTL != "" { if data.TTL != "" {
dur, err := time.ParseDuration(data.TTL) dur, err := duration.ParseDurationSecond(data.TTL)
if err != nil { if err != nil {
return logical.ErrorResponse(err.Error()), logical.ErrInvalidRequest return logical.ErrorResponse(err.Error()), logical.ErrInvalidRequest
} }