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

DB engine: Check ErrPluginStaticUnsupported in rollback code (#11601)

This commit is contained in:
Michael Golowka 2021-05-12 17:09:56 -06:00 committed by GitHub
parent 8b7cd1bff7
commit b27a3e9f70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/logical/database/rollback.go
View File

@ -4,6 +4,8 @@ import (
"context"
"errors"
"github.com/hashicorp/vault/sdk/database/dbplugin"
v5 "github.com/hashicorp/vault/sdk/database/dbplugin/v5"
"github.com/hashicorp/vault/sdk/logical"
"github.com/mitchellh/mapstructure"
@ -104,7 +106,7 @@ func (b *databaseBackend) rollbackDatabaseCredentials(ctx context.Context, confi
// It actually is the root user here, but we only want to use SetCredentials since
// RotateRootCredentials doesn't give any control over what password is used
_, err = dbi.database.UpdateUser(ctx, updateReq, false)
if status.Code(err) == codes.Unimplemented {
if status.Code(err) == codes.Unimplemented || err == dbplugin.ErrPluginStaticUnsupported {
return nil
}
return err

3
changelog/11585.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:bug
secrets/database: Fixes issue for V4 database interface where `SetCredentials` wasn't falling back to using `RotateRootCredentials` if `SetCredentials` is `Unimplemented`
```