upstream/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-05-28 04:10:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

add check for enable_multiseal with sighup (#26105)

Browse source
This commit is contained in:
Rachel Culpepper 2024-03-22 11:21:32 -05:00 committed by GitHub
parent 30667916b7
commit f7301bc5fa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
command/server.go
View file

@ -3404,6 +3404,9 @@ func (c *ServerCommand) reloadSeals(ctx context.Context, grabStateLock bool, cor
currentConfig := core.GetCoreConfigInternal()
// we need to persist seal information if multiseal is being enabled
addEnableMultiseal := !currentConfig.IsMultisealEnabled() && newConfig.IsMultisealEnabled()
if core.SealAccess().BarrierSealConfigType() == vault.SealConfigTypeShamir {
switch {
case len(newConfig.Seals) == 0:
@ -3425,7 +3428,7 @@ func (c *ServerCommand) reloadSeals(ctx context.Context, grabStateLock bool, cor
}
}
if cmp.Equal(currentConfig.Seals, newConfig.Seals) {
if cmp.Equal(currentConfig.Seals, newConfig.Seals) && !addEnableMultiseal {
return false, nil
}