scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-10-29 17:52:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't rely on post-unseal funcs being run in any particular order. (#22362)

Browse Source
This commit is contained in:
Nick Cabatoff
2023-08-16 09:59:21 -04:00
committed by GitHub
parent 5374b3b046
commit 5a60c98a46
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
changelog/24170.txt → changelog/21470.txt
View File

3
changelog/22362.txt Normal file
View File

@@ -0,0 +1,3 @@
```release-note:bug
core: Fix readonly errors that could occur while loading mounts/auths during unseal
```

7
vault/auth.go
View File

@@ -798,10 +798,6 @@ func (c *Core) setupCredentials(ctx context.Context) error {
view.setReadOnlyErr(logical.ErrSetupReadOnly)
if strutil.StrListContains(singletonMounts, entry.Type) {
defer view.setReadOnlyErr(origViewReadOnlyErr)
} else {
c.postUnsealFuncs = append(c.postUnsealFuncs, func() {
view.setReadOnlyErr(origViewReadOnlyErr)
})
}
// Initialize the backend
@@ -914,6 +910,9 @@ func (c *Core) setupCredentials(ctx context.Context) error {
postUnsealLogger.Error("skipping initialization for nil auth backend")
return
}
if !strutil.StrListContains(singletonMounts, localEntry.Type) {
view.setReadOnlyErr(origViewReadOnlyErr)
}
err := backend.Initialize(ctx, &logical.InitializationRequest{Storage: view})
if err != nil {

7
vault/mount.go
View File

@@ -1514,10 +1514,6 @@ func (c *Core) setupMounts(ctx context.Context) error {
view.setReadOnlyErr(logical.ErrSetupReadOnly)
if strutil.StrListContains(singletonMounts, entry.Type) {
defer view.setReadOnlyErr(origReadOnlyErr)
} else {
c.postUnsealFuncs = append(c.postUnsealFuncs, func() {
view.setReadOnlyErr(origReadOnlyErr)
})
}
var backend logical.Backend
@@ -1603,6 +1599,9 @@ func (c *Core) setupMounts(ctx context.Context) error {
postUnsealLogger.Error("skipping initialization for nil backend", "path", localEntry.Path)
return
}
if !strutil.StrListContains(singletonMounts, localEntry.Type) {
view.setReadOnlyErr(origReadOnlyErr)
}
err := backend.Initialize(ctx, &logical.InitializationRequest{Storage: view})
if err != nil {