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

Use helper for existence check. Avoid panic by fetching default values for field data

Browse source
This commit is contained in:
vishalnayak 2016-03-16 11:26:33 -04:00
parent 1513ade19a
commit 2914ff7502
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
builtin/credential/userpass/path_users.go
View file

@ -60,12 +60,12 @@ func (b *backend) userExistenceCheck(req *logical.Request, data *framework.Field
return false, fmt.Errorf("missing username") return false, fmt.Errorf("missing username")
} }
entry, err := req.Storage.Get("user/" + strings.ToLower(username)) userEntry, err := b.user(req.Storage, username)
if err != nil { if err != nil {
return false, err return false, err
} }
return entry != nil, nil return userEntry != nil, nil
} }
func (b *backend) user(s logical.Storage, n string) (*UserEntry, error) { func (b *backend) user(s logical.Storage, n string) (*UserEntry, error) {
@ -150,11 +150,11 @@ func (b *backend) userCreateUpdate(req *logical.Request, d *framework.FieldData)
userEntry.Policies = policies userEntry.Policies = policies
} }
ttlStrRaw, ttlSet := d.GetOk("ttl") _, ttlSet := d.GetOk("ttl")
maxTTLStrRaw, maxTTLSet := d.GetOk("max_ttl") _, maxTTLSet := d.GetOk("max_ttl")
if ttlSet || maxTTLSet { if ttlSet || maxTTLSet {
ttlStr := ttlStrRaw.(string) ttlStr := d.Get("ttl").(string)
maxTTLStr := maxTTLStrRaw.(string) maxTTLStr := d.Get("max_ttl").(string)
userEntry.TTL, userEntry.MaxTTL, err = b.SanitizeTTL(ttlStr, maxTTLStr) userEntry.TTL, userEntry.MaxTTL, err = b.SanitizeTTL(ttlStr, maxTTLStr)
if err != nil { if err != nil {
return logical.ErrorResponse(fmt.Sprintf("err: %s", err)), nil return logical.ErrorResponse(fmt.Sprintf("err: %s", err)), nil

1
website/source/docs/auth/userpass.html.md
View file

@ -102,6 +102,7 @@ necessary.
<dt>Description</dt> <dt>Description</dt>
<dd> <dd>
Create a new user or update an existing user. Create a new user or update an existing user.
This path honors the distinction between the `create` and `update` capabilities inside ACL policies.
</dd> </dd>
<dt>Method</dt> <dt>Method</dt>