mirrors/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2025-11-17 16:51:45 +01:00
Code Issues Projects Releases Wiki Activity

Error on root rotation when username is empty (#10344)

Browse Source 
* Error on root rotation when username is empty

* Don't panic if the field doesn't exist
This commit is contained in:
Michael Golowka 2020-11-09 08:12:09 -07:00 committed by GitHub
parent 3e803c2a57
commit aa8fca6156
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/logical/database/path_rotate_credentials.go
View File

@ -68,6 +68,11 @@ func (b *databaseBackend) pathRotateRootCredentialsUpdate() framework.OperationF
return nil, err
}
rootUsername, ok := config.ConnectionDetails["username"].(string)
if !ok || rootUsername == "" {
return nil, fmt.Errorf("unable to rotate root credentials: no username in configuration")
}
dbi, err := b.GetConnection(ctx, req.Storage, name)
if err != nil {
return nil, err
@ -92,7 +97,6 @@ func (b *databaseBackend) pathRotateRootCredentialsUpdate() framework.OperationF
defer dbi.Unlock()
// Generate new credentials
username := config.ConnectionDetails["username"].(string)
oldPassword := config.ConnectionDetails["password"].(string)
newPassword, err := dbi.database.GeneratePassword(ctx, b.System(), config.PasswordPolicy)
if err != nil {
@ -103,7 +107,7 @@ func (b *databaseBackend) pathRotateRootCredentialsUpdate() framework.OperationF
// Write a WAL entry
walID, err := framework.PutWAL(ctx, req.Storage, rotateRootWALKey, &rotateRootCredentialsWAL{
ConnectionName: name,
UserName: username,
UserName: rootUsername,
OldPassword: oldPassword,
NewPassword: newPassword,
})
@ -112,7 +116,7 @@ func (b *databaseBackend) pathRotateRootCredentialsUpdate() framework.OperationF
}
updateReq := v5.UpdateUserRequest{
Username: username,
Username: rootUsername,
Password: &v5.ChangePassword{
NewPassword: newPassword,
Statements: v5.Statements{