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

backport of commit a70aaf24c0dc1e7a6ece249dfbcc387e2a581fba (#22256) 

Co-authored-by: Austin Gebauer <34121980+austingebauer@users.noreply.github.com>
This commit is contained in:
hc-github-team-secure-vault-core 2023-08-08 19:48:36 -04:00 committed by GitHub
parent 0ecf0f300e
commit c92b422bdb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
builtin/logical/database/rotation.go
View File

@ -92,9 +92,7 @@ func (b *databaseBackend) populateQueue(ctx context.Context, s logical.Storage)
log.Warn("unable to delete WAL", "error", err, "WAL ID", walEntry.walID) log.Warn("unable to delete WAL", "error", err, "WAL ID", walEntry.walID)
} }
} else { } else {
log.Info("found WAL for role", log.Info("found WAL for role", "role", item.Key, "WAL ID", walEntry.walID)
"role", item.Key,
"WAL ID", walEntry.walID)
item.Value = walEntry.walID item.Value = walEntry.walID
item.Priority = time.Now().Unix() item.Priority = time.Now().Unix()
} }
@ -191,39 +189,45 @@ func (b *databaseBackend) rotateCredential(ctx context.Context, s logical.Storag
return false return false
} }
roleName := item.Key
logger := b.Logger().With("role", roleName)
// Grab the exclusive lock for this Role, to make sure we don't incur and // Grab the exclusive lock for this Role, to make sure we don't incur and
// writes during the rotation process // writes during the rotation process
lock := locksutil.LockForKey(b.roleLocks, item.Key) lock := locksutil.LockForKey(b.roleLocks, roleName)
lock.Lock() lock.Lock()
defer lock.Unlock() defer lock.Unlock()
// Validate the role still exists // Validate the role still exists
role, err := b.StaticRole(ctx, s, item.Key) role, err := b.StaticRole(ctx, s, roleName)
if err != nil { if err != nil {
b.logger.Error("unable to load role", "role", item.Key, "error", err) logger.Error("unable to load role", "error", err)
item.Priority = time.Now().Add(10 * time.Second).Unix() item.Priority = time.Now().Add(10 * time.Second).Unix()
if err := b.pushItem(item); err != nil { if err := b.pushItem(item); err != nil {
b.logger.Error("unable to push item on to queue", "error", err) logger.Error("unable to push item on to queue", "error", err)
} }
return true return true
} }
if role == nil { if role == nil {
b.logger.Warn("role not found", "role", item.Key, "error", err) logger.Warn("role not found", "error", err)
return true return true
} }
logger = logger.With("database", role.DBName)
// If "now" is less than the Item priority, then this item does not need to // If "now" is less than the Item priority, then this item does not need to
// be rotated // be rotated
if time.Now().Unix() < item.Priority { if time.Now().Unix() < item.Priority {
if err := b.pushItem(item); err != nil { if err := b.pushItem(item); err != nil {
b.logger.Error("unable to push item on to queue", "error", err) logger.Error("unable to push item on to queue", "error", err)
} }
// Break out of the for loop // Break out of the for loop
return false return false
} }
input := &setStaticAccountInput{ input := &setStaticAccountInput{
RoleName: item.Key, RoleName: roleName,
Role: role, Role: role,
} }
@ -235,7 +239,8 @@ func (b *databaseBackend) rotateCredential(ctx context.Context, s logical.Storag
resp, err := b.setStaticAccount(ctx, s, input) resp, err := b.setStaticAccount(ctx, s, input)
if err != nil { if err != nil {
b.logger.Error("unable to rotate credentials in periodic function", "error", err) logger.Error("unable to rotate credentials in periodic function", "error", err)
// Increment the priority enough so that the next call to this method // Increment the priority enough so that the next call to this method
// likely will not attempt to rotate it, as a back-off of sorts // likely will not attempt to rotate it, as a back-off of sorts
item.Priority = time.Now().Add(10 * time.Second).Unix() item.Priority = time.Now().Add(10 * time.Second).Unix()
@ -246,7 +251,7 @@ func (b *databaseBackend) rotateCredential(ctx context.Context, s logical.Storag
} }
if err := b.pushItem(item); err != nil { if err := b.pushItem(item); err != nil {
b.logger.Error("unable to push item on to queue", "error", err) logger.Error("unable to push item on to queue", "error", err)
} }
// Go to next item // Go to next item
return true return true
@ -263,7 +268,7 @@ func (b *databaseBackend) rotateCredential(ctx context.Context, s logical.Storag
nextRotation := lvr.Add(role.StaticAccount.RotationPeriod) nextRotation := lvr.Add(role.StaticAccount.RotationPeriod)
item.Priority = nextRotation.Unix() item.Priority = nextRotation.Unix()
if err := b.pushItem(item); err != nil { if err := b.pushItem(item); err != nil {
b.logger.Warn("unable to push item on to queue", "error", err) logger.Warn("unable to push item on to queue", "error", err)
} }
return true return true
} }

3
changelog/22253.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:improvement
secrets/database: Improves error logging for static role rotations by including the database and role names.
```