file-restore: support encrypted VM backups
Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
This commit is contained in:
parent
9d8ab62769
commit
15998ed12a
|
@ -30,7 +30,7 @@ pub mod proxmox_client_tools;
|
||||||
use proxmox_client_tools::{
|
use proxmox_client_tools::{
|
||||||
complete_group_or_snapshot, complete_repository, connect, extract_repository_from_value,
|
complete_group_or_snapshot, complete_repository, connect, extract_repository_from_value,
|
||||||
key_source::{
|
key_source::{
|
||||||
crypto_parameters, format_key_source, get_encryption_key_password, KEYFD_SCHEMA,
|
crypto_parameters_keep_fd, format_key_source, get_encryption_key_password, KEYFD_SCHEMA,
|
||||||
KEYFILE_SCHEMA,
|
KEYFILE_SCHEMA,
|
||||||
},
|
},
|
||||||
REPO_URL_SCHEMA,
|
REPO_URL_SCHEMA,
|
||||||
|
@ -76,6 +76,18 @@ fn parse_path(path: String, base64: bool) -> Result<ExtractPath, Error> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn keyfile_path(param: &Value) -> Option<String> {
|
||||||
|
if let Some(Value::String(keyfile)) = param.get("keyfile") {
|
||||||
|
return Some(keyfile.to_owned());
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(Value::Number(keyfd)) = param.get("keyfd") {
|
||||||
|
return Some(format!("/dev/fd/{}", keyfd));
|
||||||
|
}
|
||||||
|
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
#[api(
|
#[api(
|
||||||
input: {
|
input: {
|
||||||
properties: {
|
properties: {
|
||||||
|
@ -138,7 +150,8 @@ async fn list(
|
||||||
let snapshot: BackupDir = snapshot.parse()?;
|
let snapshot: BackupDir = snapshot.parse()?;
|
||||||
let path = parse_path(path, base64)?;
|
let path = parse_path(path, base64)?;
|
||||||
|
|
||||||
let crypto = crypto_parameters(¶m)?;
|
let keyfile = keyfile_path(¶m);
|
||||||
|
let crypto = crypto_parameters_keep_fd(¶m)?;
|
||||||
let crypt_config = match crypto.enc_key {
|
let crypt_config = match crypto.enc_key {
|
||||||
None => None,
|
None => None,
|
||||||
Some(ref key) => {
|
Some(ref key) => {
|
||||||
|
@ -210,6 +223,7 @@ async fn list(
|
||||||
manifest,
|
manifest,
|
||||||
repo,
|
repo,
|
||||||
snapshot,
|
snapshot,
|
||||||
|
keyfile,
|
||||||
};
|
};
|
||||||
let driver: Option<BlockDriverType> = match param.get("driver") {
|
let driver: Option<BlockDriverType> = match param.get("driver") {
|
||||||
Some(drv) => Some(serde_json::from_value(drv.clone())?),
|
Some(drv) => Some(serde_json::from_value(drv.clone())?),
|
||||||
|
@ -309,7 +323,8 @@ async fn extract(
|
||||||
None => Some(std::env::current_dir()?),
|
None => Some(std::env::current_dir()?),
|
||||||
};
|
};
|
||||||
|
|
||||||
let crypto = crypto_parameters(¶m)?;
|
let keyfile = keyfile_path(¶m);
|
||||||
|
let crypto = crypto_parameters_keep_fd(¶m)?;
|
||||||
let crypt_config = match crypto.enc_key {
|
let crypt_config = match crypto.enc_key {
|
||||||
None => None,
|
None => None,
|
||||||
Some(ref key) => {
|
Some(ref key) => {
|
||||||
|
@ -360,6 +375,7 @@ async fn extract(
|
||||||
manifest,
|
manifest,
|
||||||
repo,
|
repo,
|
||||||
snapshot,
|
snapshot,
|
||||||
|
keyfile,
|
||||||
};
|
};
|
||||||
let driver: Option<BlockDriverType> = match param.get("driver") {
|
let driver: Option<BlockDriverType> = match param.get("driver") {
|
||||||
Some(drv) => Some(serde_json::from_value(drv.clone())?),
|
Some(drv) => Some(serde_json::from_value(drv.clone())?),
|
||||||
|
|
|
@ -21,6 +21,7 @@ pub struct SnapRestoreDetails {
|
||||||
pub repo: BackupRepository,
|
pub repo: BackupRepository,
|
||||||
pub snapshot: BackupDir,
|
pub snapshot: BackupDir,
|
||||||
pub manifest: BackupManifest,
|
pub manifest: BackupManifest,
|
||||||
|
pub keyfile: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Return value of a BlockRestoreDriver.status() call, 'id' must be valid for .stop(id)
|
/// Return value of a BlockRestoreDriver.status() call, 'id' must be valid for .stop(id)
|
||||||
|
|
|
@ -190,9 +190,14 @@ pub async fn start_vm(
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
drives.push("-drive".to_owned());
|
drives.push("-drive".to_owned());
|
||||||
|
let keyfile = if let Some(ref keyfile) = details.keyfile {
|
||||||
|
format!(",,keyfile={}", keyfile)
|
||||||
|
} else {
|
||||||
|
"".to_owned()
|
||||||
|
};
|
||||||
drives.push(format!(
|
drives.push(format!(
|
||||||
"file=pbs:repository={},,snapshot={},,archive={},read-only=on,if=none,id=drive{}",
|
"file=pbs:repository={},,snapshot={},,archive={}{},read-only=on,if=none,id=drive{}",
|
||||||
details.repo, details.snapshot, file, id
|
details.repo, details.snapshot, file, keyfile, id
|
||||||
));
|
));
|
||||||
drives.push("-device".to_owned());
|
drives.push("-device".to_owned());
|
||||||
// drive serial is used by VM to map .fidx files to /dev paths
|
// drive serial is used by VM to map .fidx files to /dev paths
|
||||||
|
|
Loading…
Reference in New Issue