mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-12-18 11:00:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: allow updating settings of vaultConnection

Browse Source 
Make it possible to calle initConnection() multiple times. This enables
the VaultTokensKMS type to override global settings with options from a
per-tenant configuration.

Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2020-12-02 21:26:08 +01:00 committed by mergify[bot]
parent f08182e2fc
commit eb1ef69cfb
1 changed files with 47 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
internal/util/vault.go
View File

@ -112,36 +112,52 @@ func (vc *vaultConnection) initConnection(kmsID string, config map[string]interf
vc.EncryptionKMSID = kmsID vc.EncryptionKMSID = kmsID
vaultAddress := "" firstInit := (vc.vaultConfig == nil)
vaultAddress := "" // required
err := setConfigString(&vaultAddress, config, "vaultAddress") err := setConfigString(&vaultAddress, config, "vaultAddress")
if err != nil { switch {
case errors.Is(err, errConfigOptionInvalid):
return err return err
case firstInit && errors.Is(err, errConfigOptionMissing):
return err
case !errors.Is(err, errConfigOptionMissing):
vaultConfig[api.EnvVaultAddress] = vaultAddress
} }
vaultConfig[api.EnvVaultAddress] = vaultAddress // default: !firstInit
vaultNamespace := vaultDefaultNamespace vaultNamespace := vaultDefaultNamespace // optional
err = setConfigString(&vaultNamespace, config, "vaultNamespace") err = setConfigString(&vaultNamespace, config, "vaultNamespace")
if err != nil { if errors.Is(err, errConfigOptionInvalid) {
return err return err
} }
vaultConfig[api.EnvVaultNamespace] = vaultNamespace // set the option if the value was not invalid
keyContext[loss.KeyVaultNamespace] = vaultNamespace if firstInit || !errors.Is(err, errConfigOptionMissing) {
vaultConfig[api.EnvVaultNamespace] = vaultNamespace
keyContext[loss.KeyVaultNamespace] = vaultNamespace
}
verifyCA := vaultDefaultCAVerify verifyCA := vaultDefaultCAVerify // optional
err = setConfigString(&verifyCA, config, "vaultCAVerify") err = setConfigString(&verifyCA, config, "vaultCAVerify")
if err != nil { if errors.Is(err, errConfigOptionInvalid) {
return err return err
} }
if firstInit || !errors.Is(err, errConfigOptionMissing) {
vaultCAVerify, err := strconv.ParseBool(verifyCA) vaultCAVerify := false
if err != nil { vaultCAVerify, err = strconv.ParseBool(verifyCA)
return fmt.Errorf("failed to parse 'vaultCAVerify': %w", err) if err != nil {
return fmt.Errorf("failed to parse 'vaultCAVerify': %w", err)
}
vaultConfig[api.EnvVaultInsecure] = !vaultCAVerify
} }
vaultConfig[api.EnvVaultInsecure] = !vaultCAVerify
vaultCAFromSecret := "" vaultCAFromSecret := "" // optional
err = setConfigString(&vaultCAFromSecret, config, "vaultCAFromSecret") err = setConfigString(&vaultCAFromSecret, config, "vaultCAFromSecret")
if err == nil && vaultCAFromSecret != "" { if errors.Is(err, errConfigOptionInvalid) {
return err
}
// ignore errConfigOptionMissing, no default was set
if vaultCAFromSecret != "" {
caPEM, ok := secrets[vaultCAFromSecret] caPEM, ok := secrets[vaultCAFromSecret]
if !ok { if !ok {
return fmt.Errorf("missing vault CA in secret %s", vaultCAFromSecret) return fmt.Errorf("missing vault CA in secret %s", vaultCAFromSecret)
@ -152,12 +168,23 @@ func (vc *vaultConnection) initConnection(kmsID string, config map[string]interf
return fmt.Errorf("failed to create temporary file for Vault CA: %w", err) return fmt.Errorf("failed to create temporary file for Vault CA: %w", err)
} }
// TODO: delete f.Name() when vaultConnection is destroyed // TODO: delete f.Name() when vaultConnection is destroyed
} else if !errors.Is(err, errConfigOptionMissing) {
return err
} }
vc.keyContext = keyContext // update the existing config only if no config is available yet
vc.vaultConfig = vaultConfig if vc.keyContext != nil {
for key, value := range keyContext {
vc.keyContext[key] = value
}
} else {
vc.keyContext = keyContext
}
if vc.vaultConfig != nil {
for key, value := range vaultConfig {
vc.vaultConfig[key] = value
}
} else {
vc.vaultConfig = vaultConfig
}
return nil return nil
} }