Skip to content

<feature>[kvm]: support TPM revert without KMS #3696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
MatheMatrix wants to merge 1 commit into from
+19 −15
Closed

<feature>[kvm]: support TPM revert without KMS #3696

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 19 additions & 15 deletions plugin/kvm/src/main/java/org/zstack/kvm/tpm/SnapshotGroupRevertTpmHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@

import java.util.List;

import static org.zstack.compute.vm.VmGlobalConfig.ALLOWED_TPM_VM_WITHOUT_KMS;

@Configurable(preConstruction = true, autowire = Autowire.BY_TYPE)
public class SnapshotGroupRevertTpmHelper {
private static final CLogger logger = Utils.getLogger(SnapshotGroupRevertTpmHelper.class);
Expand Down Expand Up @@ -98,23 +100,25 @@ public void setupFromApi(APICreateVmInstanceFromVolumeSnapshotGroupMsg apiMsg, C
tpmSpec.setBackupFileUuid(tpmBackupFile.getUuid());
}

String keyProviderName = KVMSystemTags.TPM_KEY_PROVIDER_NAME
.getTokenByResourceUuid(tpmBackupFile.getUuid(), KVMSystemTags.TPM_KEY_PROVIDER_NAME_TOKEN);
if (keyProviderName == null) {
logger.warn(String.format(
"failed to find keyProvider from snapshotGroup[uuid:%s] by tpmBackupFile[uuid:%s]",
snapshotGroupUuid, tpmBackupFile.getUuid()));
if (tpmSpec.getKeyProviderUuid() == null) {
tpmSpec.setKeyProviderUuid(tpmKeyBackend.defaultKeyProviderUuid()); // maybe null
}
} else {
String keyProviderUuid = tpmKeyBackend.findKeyProviderUuidByName(keyProviderName);
if (keyProviderUuid == null) {
if (ALLOWED_TPM_VM_WITHOUT_KMS.value(Boolean.class) != Boolean.TRUE) {
String keyProviderName = KVMSystemTags.TPM_KEY_PROVIDER_NAME
.getTokenByResourceUuid(tpmBackupFile.getUuid(), KVMSystemTags.TPM_KEY_PROVIDER_NAME_TOKEN);
if (keyProviderName == null) {
logger.warn(String.format(
"failed to resolve keyProvider[name:%s] from snapshotGroup[uuid:%s] by tpmBackupFile[uuid:%s], keep keyProviderUuid unset",
keyProviderName, snapshotGroupUuid, tpmBackupFile.getUuid()));
"failed to find keyProvider from snapshotGroup[uuid:%s] by tpmBackupFile[uuid:%s]",
snapshotGroupUuid, tpmBackupFile.getUuid()));
if (tpmSpec.getKeyProviderUuid() == null) {
tpmSpec.setKeyProviderUuid(tpmKeyBackend.defaultKeyProviderUuid()); // maybe null
}
} else {
tpmSpec.setKeyProviderUuid(keyProviderUuid);
String keyProviderUuid = tpmKeyBackend.findKeyProviderUuidByName(keyProviderName);
if (keyProviderUuid == null) {
logger.warn(String.format(
"failed to resolve keyProvider[name:%s] from snapshotGroup[uuid:%s] by tpmBackupFile[uuid:%s], keep keyProviderUuid unset",
keyProviderName, snapshotGroupUuid, tpmBackupFile.getUuid()));
} else {
tpmSpec.setKeyProviderUuid(keyProviderUuid);
}
}
}
}
Expand Down