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

rbd: configure the DEKStore if the configuration suggests to use metadata

Browse Source 
NewVolumeEncryption() will return an indication that an alternative
DEKStore needs to be configured in case the KMS does not support it.

setKMS() will also set the DEKStore if needed, so renaming it to
configureEncryption() makes things clearer.

Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2021-02-25 17:26:05 +01:00 committed by mergify[bot]
parent e4431edaf9
commit cffec0b3f3
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/rbd/encryption.go
View File

@ -192,7 +192,7 @@ func (rv *rbdVolume) initKMS(ctx context.Context, volOptions, credentials map[st
return nil return nil
} }
err = rv.setKMS(volOptions["encryptionKMSID"], credentials) err = rv.configureEncryption(volOptions["encryptionKMSID"], credentials)
if err != nil { if err != nil {
return fmt.Errorf("invalid encryption kms configuration: %w", err) return fmt.Errorf("invalid encryption kms configuration: %w", err)
} }
@ -200,13 +200,21 @@ func (rv *rbdVolume) initKMS(ctx context.Context, volOptions, credentials map[st
return nil return nil
} }
func (rv *rbdVolume) setKMS(kmsID string, credentials map[string]string) error { // configureEncryption sets up the VolumeEncryption for this rbdVolume. Once
// configured, use isEncrypted() to see if the volume supports encryption.
func (rv *rbdVolume) configureEncryption(kmsID string, credentials map[string]string) error {
kms, err := util.GetKMS(rv.Owner, kmsID, credentials) kms, err := util.GetKMS(rv.Owner, kmsID, credentials)
if err != nil { if err != nil {
return err return err
} }
rv.encryption = &util.VolumeEncryption{KMS: kms} rv.encryption, err = util.NewVolumeEncryption(kms)
// if the KMS can not store the DEK itself, we'll store it in the
// metadata of the RBD image itself
if errors.Is(err, util.ErrDEKStoreNeeded) {
rv.encryption.SetDEKStore(rv)
}
return nil return nil
} }

2
internal/rbd/rbd_util.go
View File

@ -833,7 +833,7 @@ func genVolFromVolID(ctx context.Context, volumeID string, cr *util.Credentials,
rbdVol.Owner = imageAttributes.Owner rbdVol.Owner = imageAttributes.Owner
if imageAttributes.KmsID != "" { if imageAttributes.KmsID != "" {
err = rbdVol.setKMS(imageAttributes.KmsID, secrets) err = rbdVol.configureEncryption(imageAttributes.KmsID, secrets)
if err != nil { if err != nil {
return rbdVol, err return rbdVol, err
} }