mirrors/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-05-04 12:01:23 +02:00
Code Issues Projects Releases Wiki Activity

Don't continue in a few places in pki tidy if value is nil (#7589)

Browse Source 
Fixes #7588
This commit is contained in:
Jeff Mitchell 2019-10-15 06:55:08 -07:00 committed by Chris Hoffman
parent 217a796a4d
commit acfc348d5d
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/logical/pki/path_tidy.go
View File

@ -118,6 +118,7 @@ func (b *backend) pathTidyWrite(ctx context.Context, req *logical.Request, d *fr
if err := req.Storage.Delete(ctx, "certs/"+serial); err != nil {
return errwrap.Wrapf(fmt.Sprintf("error deleting entry with nil value with serial %s: {{err}}", serial), err)
}
continue
}
cert, err := x509.ParseCertificate(certEntry.Value)
@ -156,6 +157,7 @@ func (b *backend) pathTidyWrite(ctx context.Context, req *logical.Request, d *fr
if err := req.Storage.Delete(ctx, "revoked/"+serial); err != nil {
return errwrap.Wrapf(fmt.Sprintf("error deleting nil revoked entry with serial %s: {{err}}", serial), err)
}
continue
}
if revokedEntry.Value == nil || len(revokedEntry.Value) == 0 {
@ -163,6 +165,7 @@ func (b *backend) pathTidyWrite(ctx context.Context, req *logical.Request, d *fr
if err := req.Storage.Delete(ctx, "revoked/"+serial); err != nil {
return errwrap.Wrapf(fmt.Sprintf("error deleting revoked entry with nil value with serial %s: {{err}}", serial), err)
}
continue
}
err = revokedEntry.DecodeJSON(&revInfo)