-
Notifications
You must be signed in to change notification settings - Fork 1.3k
KVM: Improvements on upload direct download certificates #2995
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
6f0d898
Improvements on upload direct download certificates
nvazquez 547b008
Move upload direct download certificate logic to KVM plugin
nvazquez fc9e153
Extend unit test certificate expiration days
nvazquez efe35d3
Add marvin tests and command to revoke certificates
nvazquez f953268
Review comments
nvazquez 49b24ee
Do not include revoke certificates API
nvazquez File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
136 changes: 136 additions & 0 deletions
136
.../hypervisor/kvm/resource/wrapper/LibvirtSetupDirectDownloadCertificateCommandWrapper.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| // | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
| // | ||
| package com.cloud.hypervisor.kvm.resource.wrapper; | ||
|
|
||
| import com.cloud.agent.api.Answer; | ||
| import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource; | ||
| import com.cloud.resource.CommandWrapper; | ||
| import com.cloud.resource.ResourceWrapper; | ||
| import com.cloud.utils.PropertiesUtil; | ||
| import com.cloud.utils.exception.CloudRuntimeException; | ||
| import com.cloud.utils.script.Script; | ||
| import org.apache.cloudstack.agent.directdownload.SetupDirectDownloadCertificateCommand; | ||
| import org.apache.cloudstack.utils.security.KeyStoreUtils; | ||
| import org.apache.log4j.Logger; | ||
|
|
||
| import java.io.File; | ||
| import java.io.FileNotFoundException; | ||
| import java.io.IOException; | ||
|
|
||
| import static org.apache.commons.lang.StringUtils.isBlank; | ||
|
|
||
| @ResourceWrapper(handles = SetupDirectDownloadCertificateCommand.class) | ||
| public class LibvirtSetupDirectDownloadCertificateCommandWrapper extends CommandWrapper<SetupDirectDownloadCertificateCommand, Answer, LibvirtComputingResource> { | ||
|
|
||
| private static final String temporaryCertFilePrefix = "CSCERTIFICATE"; | ||
|
|
||
| private static final Logger s_logger = Logger.getLogger(LibvirtSetupDirectDownloadCertificateCommandWrapper.class); | ||
|
|
||
| /** | ||
| * Retrieve agent.properties file | ||
| */ | ||
| private File getAgentPropertiesFile() throws FileNotFoundException { | ||
| final File agentFile = PropertiesUtil.findConfigFile("agent.properties"); | ||
| if (agentFile == null) { | ||
| throw new FileNotFoundException("Failed to find agent.properties file"); | ||
| } | ||
| return agentFile; | ||
| } | ||
|
|
||
| /** | ||
| * Get the property 'keystore.passphrase' value from agent.properties file | ||
| */ | ||
| private String getKeystorePassword(File agentFile) { | ||
| String pass = null; | ||
| if (agentFile != null) { | ||
| try { | ||
| pass = PropertiesUtil.loadFromFile(agentFile).getProperty(KeyStoreUtils.KS_PASSPHRASE_PROPERTY); | ||
| } catch (IOException e) { | ||
| s_logger.error("Could not get 'keystore.passphrase' property value due to: " + e.getMessage()); | ||
| } | ||
| } | ||
| return pass; | ||
| } | ||
|
|
||
| /** | ||
| * Get keystore path | ||
| */ | ||
| private String getKeyStoreFilePath(File agentFile) { | ||
| return agentFile.getParent() + "/" + KeyStoreUtils.KS_FILENAME; | ||
| } | ||
|
|
||
| /** | ||
| * Import certificate from temporary file into keystore | ||
| */ | ||
| private void importCertificate(String tempCerFilePath, String keyStoreFile, String certificateName, String privatePassword) { | ||
| s_logger.debug("Importing certificate from temporary file to keystore"); | ||
| String importCommandFormat = "keytool -importcert -file %s -keystore %s -alias '%s' -storepass '%s' -noprompt"; | ||
| String importCmd = String.format(importCommandFormat, tempCerFilePath, keyStoreFile, certificateName, privatePassword); | ||
| int result = Script.runSimpleBashScriptForExitValue(importCmd); | ||
| if (result != 0) { | ||
| s_logger.debug("Certificate " + certificateName + " not imported as it already exist on keystore"); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Create temporary file and return its path | ||
| */ | ||
| private String createTemporaryFile(File agentFile, String certificateName, String certificate) { | ||
| String tempCerFilePath = String.format("%s/%s-%s", | ||
| agentFile.getParent(), temporaryCertFilePrefix, certificateName); | ||
| s_logger.debug("Creating temporary certificate file into: " + tempCerFilePath); | ||
| int result = Script.runSimpleBashScriptForExitValue(String.format("echo '%s' > %s", certificate, tempCerFilePath)); | ||
| if (result != 0) { | ||
| throw new CloudRuntimeException("Could not create the certificate file on path: " + tempCerFilePath); | ||
| } | ||
| return tempCerFilePath; | ||
| } | ||
|
|
||
| /** | ||
| * Remove temporary file | ||
| */ | ||
| private void cleanupTemporaryFile(String temporaryFile) { | ||
| s_logger.debug("Cleaning up temporary certificate file"); | ||
| Script.runSimpleBashScript("rm -f " + temporaryFile); | ||
| } | ||
|
|
||
| @Override | ||
| public Answer execute(SetupDirectDownloadCertificateCommand cmd, LibvirtComputingResource serverResource) { | ||
| String certificate = cmd.getCertificate(); | ||
| String certificateName = cmd.getCertificateName(); | ||
|
|
||
| try { | ||
| File agentFile = getAgentPropertiesFile(); | ||
| String privatePassword = getKeystorePassword(agentFile); | ||
| if (isBlank(privatePassword)) { | ||
| return new Answer(cmd, false, "No password found for keystore: " + KeyStoreUtils.KS_FILENAME); | ||
| } | ||
|
|
||
| final String keyStoreFile = getKeyStoreFilePath(agentFile); | ||
| String temporaryFile = createTemporaryFile(agentFile, certificateName, certificate); | ||
| importCertificate(temporaryFile, keyStoreFile, certificateName, privatePassword); | ||
| cleanupTemporaryFile(temporaryFile); | ||
| } catch (FileNotFoundException | CloudRuntimeException e) { | ||
| s_logger.error("Error while setting up certificate " + certificateName, e); | ||
| return new Answer(cmd, false, e.getMessage()); | ||
| } | ||
|
|
||
| return new Answer(cmd, true, "Certificate " + certificateName + " imported"); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So, this is not used anymore?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, but moved to specific KVM code. Let me update the description