use proxmox_backup::api_schema::router::*;
use proxmox_backup::client::*;
use proxmox_backup::backup::*;
+use proxmox_backup::pxar;
+
//use proxmox_backup::backup::image_index::*;
//use proxmox_backup::config::datastore;
//use proxmox_backup::pxar::encoder::*;
Ok(())
}
-fn strip_chunked_file_expenstions(list: Vec<String>) -> Vec<String> {
+fn strip_server_file_expenstions(list: Vec<String>) -> Vec<String> {
let mut result = vec![];
result.push(file[..file.len()-5].to_owned());
} else if file.ends_with(".fidx") {
result.push(file[..file.len()-5].to_owned());
+ } else if file.ends_with(".blob") {
+ result.push(file[..file.len()-5].to_owned());
} else {
result.push(file); // should not happen
}
let backup_dir = BackupDir::new(btype, id, epoch);
let files = item["files"].as_array().unwrap().iter().map(|v| v.as_str().unwrap().to_owned()).collect();
- let files = strip_chunked_file_expenstions(files);
+ let files = strip_server_file_expenstions(files);
for filename in files {
let path = backup_dir.relative_path().to_str().unwrap().to_owned();
let path = group.group_path().to_str().unwrap().to_owned();
let files = item["files"].as_array().unwrap().iter().map(|v| v.as_str().unwrap().to_owned()).collect();
- let files = strip_chunked_file_expenstions(files);
+ let files = strip_server_file_expenstions(files);
println!("{:20} | {} | {:5} | {}", path, last_backup.format("%c"),
backup_count, tools::join(&files, ' '));
let path = snapshot.relative_path().to_str().unwrap().to_owned();
let files = item["files"].as_array().unwrap().iter().map(|v| v.as_str().unwrap().to_owned()).collect();
- let files = strip_chunked_file_expenstions(files);
+ let files = strip_server_file_expenstions(files);
println!("{} | {} | {}", path, snapshot.backup_time().format("%c"), tools::join(&files, ' '));
}
verify_chunk_size(size)?;
}
+ let keyfile = param["keyfile"].as_str().map(|p| PathBuf::from(p));
+
let backup_id = param["host-id"].as_str().unwrap_or(&tools::nodename());
let mut upload_list = vec![];
println!("Client name: {}", tools::nodename());
println!("Start Time: {}", backup_time.to_rfc3339());
- let crypt_config = None;
+ let (crypt_config, rsa_encrypted_key) = match keyfile {
+ None => (None, None),
+ Some(path) => {
+ let (key, created) = load_and_decrtypt_key(&path, get_encryption_key_password)?;
+
+ let crypt_config = CryptConfig::new(key)?;
+
+ let path = master_pubkey_path()?;
+ if path.exists() {
+ let pem_data = proxmox_backup::tools::file_get_contents(&path)?;
+ let rsa = openssl::rsa::Rsa::public_key_from_pem(&pem_data)?;
+ let enc_key = crypt_config.generate_rsa_encoded_key(rsa, created)?;
+ (Some(Arc::new(crypt_config)), Some(enc_key))
+ } else {
+ (Some(Arc::new(crypt_config)), None)
+ }
+ }
+ };
let client = client.start_backup(repo.store(), "host", &backup_id, verbose).wait()?;
match backup_type {
BackupType::CONFIG => {
println!("Upload config file '{}' to '{:?}' as {}", filename, repo, target);
- client.upload_config(&filename, &target).wait()?;
+ client.upload_blob_from_file(&filename, &target, crypt_config.clone(), true).wait()?;
}
BackupType::PXAR => {
println!("Upload directory '{}' to '{:?}' as {}", filename, repo, target);
}
}
+ if let Some(rsa_encrypted_key) = rsa_encrypted_key {
+ let target = "rsa-encrypted.key";
+ println!("Upload RSA encoded key to '{:?}' as {}", repo, target);
+ client.upload_blob_from_data(rsa_encrypted_key, target, None, false).wait()?;
+
+ // openssl rsautl -decrypt -inkey master-private.pem -in rsa-encrypted.key -out t
+ /*
+ let mut buffer2 = vec![0u8; rsa.size() as usize];
+ let pem_data = proxmox_backup::tools::file_get_contents("master-private.pem")?;
+ let rsa = openssl::rsa::Rsa::private_key_from_pem(&pem_data)?;
+ let len = rsa.private_decrypt(&buffer, &mut buffer2, openssl::rsa::Padding::PKCS1)?;
+ println!("TEST {} {:?}", len, buffer2);
+ */
+ }
+
client.finish().wait()?;
let end_time = Local.timestamp(Local::now().timestamp(), 0);
let repo_url = tools::required_string_param(¶m, "repository")?;
let repo: BackupRepository = repo_url.parse()?;
+ let verbose = param["verbose"].as_bool().unwrap_or(false);
+
let archive_name = tools::required_string_param(¶m, "archive-name")?;
+ let client = HttpClient::new(repo.host(), repo.user())?;
+
+ record_repository(&repo);
+
+ let path = tools::required_string_param(¶m, "snapshot")?;
+
+ let (backup_type, backup_id, backup_time) = if path.matches('/').count() == 1 {
+ let group = BackupGroup::parse(path)?;
+
+ let path = format!("api2/json/admin/datastore/{}/snapshots", repo.store());
+ let result = client.get(&path, Some(json!({
+ "backup-type": group.backup_type(),
+ "backup-id": group.backup_id(),
+ }))).wait()?;
+
+ let list = result["data"].as_array().unwrap();
+ if list.len() == 0 {
+ bail!("backup group '{}' does not contain any snapshots:", path);
+ }
+
+ let epoch = list[0]["backup-time"].as_i64().unwrap();
+ let backup_time = Local.timestamp(epoch, 0);
+ (group.backup_type().to_owned(), group.backup_id().to_owned(), backup_time)
+ } else {
+ let snapshot = BackupDir::parse(path)?;
+ (snapshot.group().backup_type().to_owned(), snapshot.group().backup_id().to_owned(), snapshot.backup_time())
+ };
+
+ let target = tools::required_string_param(¶m, "target")?;
+
+ let keyfile = param["keyfile"].as_str().map(|p| PathBuf::from(p));
+
+ let crypt_config = match keyfile {
+ None => None,
+ Some(path) => {
+ let (key, _) = load_and_decrtypt_key(&path, get_encryption_key_password)?;
+ Some(Arc::new(CryptConfig::new(key)?))
+ }
+ };
+
+ let server_archive_name = if archive_name.ends_with(".pxar") {
+ format!("{}.didx", archive_name)
+ } else if archive_name.ends_with(".img") {
+ format!("{}.fidx", archive_name)
+ } else {
+ bail!("unknown archive file extension (expected .pxar of .img)");
+ };
+
+ let client = client.start_backup_reader(repo.store(), &backup_type, &backup_id, backup_time, true).wait()?;
+
+ use std::os::unix::fs::OpenOptionsExt;
+
+ let tmpfile = std::fs::OpenOptions::new()
+ .write(true)
+ .read(true)
+ .custom_flags(libc::O_TMPFILE)
+ .open("/tmp")?;
+
+ if server_archive_name.ends_with(".didx") {
+ let tmpfile = client.download(&server_archive_name, tmpfile).wait()?;
+
+ let index = DynamicIndexReader::new(tmpfile)
+ .map_err(|err| format_err!("unable to read dynamic index '{}' - {}", archive_name, err))?;
+
+ let most_used = index.find_most_used_chunks(8);
+
+ let chunk_reader = RemoteChunkReader::new(client.clone(), crypt_config, most_used);
+
+ let mut reader = BufferedDynamicReader::new(index, chunk_reader);
+
+ let feature_flags = pxar::CA_FORMAT_DEFAULT;
+ let mut decoder = pxar::SequentialDecoder::new(&mut reader, feature_flags, |path| {
+ if verbose {
+ println!("{:?}", path);
+ }
+ Ok(())
+ });
+
+ decoder.restore(Path::new(target))?;
+
+ } else if server_archive_name.ends_with(".fidx") {
+ let tmpfile = client.download(&server_archive_name, tmpfile).wait()?;
+
+ let index = FixedIndexReader::new(tmpfile)
+ .map_err(|err| format_err!("unable to read fixed index '{}' - {}", archive_name, err))?;
+
+ let most_used = index.find_most_used_chunks(8);
+
+ let chunk_reader = RemoteChunkReader::new(client.clone(), crypt_config, most_used);
+
+ let mut reader = BufferedFixedReader::new(index, chunk_reader);
+
+ let mut writer = std::fs::OpenOptions::new()
+ .write(true)
+ .create(true)
+ .create_new(true)
+ .open(target)
+ .map_err(|err| format_err!("unable to create target file {:?} - {}", target, err))?;
+
+ std::io::copy(&mut reader, &mut writer)
+ .map_err(|err| format_err!("unable to store data - {}", err))?;
+ }
+
+ Ok(Value::Null)
+}
+
+fn download(
+ param: Value,
+ _info: &ApiMethod,
+ _rpcenv: &mut dyn RpcEnvironment,
+) -> Result<Value, Error> {
+
+ let repo_url = tools::required_string_param(¶m, "repository")?;
+ let repo: BackupRepository = repo_url.parse()?;
+
+ let file_name = tools::required_string_param(¶m, "file-name")?;
+
+ let keyfile = param["keyfile"].as_str().map(|p| PathBuf::from(p));
+
+ let crypt_config = match keyfile {
+ None => None,
+ Some(path) => {
+ let (key, _) = load_and_decrtypt_key(&path, get_encryption_key_password)?;
+ Some(CryptConfig::new(key)?)
+ }
+ };
+
let mut client = HttpClient::new(repo.host(), repo.user())?;
record_repository(&repo);
"backup-type": group.backup_type(),
"backup-id": group.backup_id(),
"backup-time": list[0]["backup-time"].as_i64().unwrap(),
- "archive-name": archive_name,
+ "file-name": file_name,
}))?;
} else {
let snapshot = BackupDir::parse(path)?;
"backup-type": snapshot.group().backup_type(),
"backup-id": snapshot.group().backup_id(),
"backup-time": snapshot.backup_time().timestamp(),
- "archive-name": archive_name,
+ "file-name": file_name,
}))?;
}
let target = tools::required_string_param(¶m, "target")?;
- if archive_name.ends_with(".pxar") {
- let path = format!("api2/json/admin/datastore/{}/pxar?{}", repo.store(), query);
+ let path = format!("api2/json/admin/datastore/{}/download?{}", repo.store(), query);
- println!("DOWNLOAD FILE {} to {}", path, target);
+ println!("DOWNLOAD FILE {} to {}", path, target);
- let target = PathBuf::from(target);
- let writer = PxarDecodeWriter::new(&target, true)?;
- client.download(&path, Box::new(writer)).wait()?;
- } else {
- bail!("unknown file extensions - unable to download '{}'", archive_name);
+ if file_name.ends_with(".blob") {
+ let writer = Vec::with_capacity(1024*1024);
+ let blob_data = client.download(&path, writer).wait()?;
+ let blob = DataBlob::from_raw(blob_data)?;
+ blob.verify_crc()?;
+ let raw_data = blob.decode(crypt_config.as_ref())?; // fixme
+
+ crate::tools::file_set_contents(target, &raw_data, None)?;
+
+ } else {
+ unimplemented!();
}
Ok(Value::Null)
result
}
-fn complete_archive_name(_arg: &str, param: &HashMap<String, String>) -> Vec<String> {
+fn complete_server_file_name(_arg: &str, param: &HashMap<String, String>) -> Vec<String> {
let mut result = vec![];
}
}
- strip_chunked_file_expenstions(result)
+ result
+}
+
+fn complete_archive_name(arg: &str, param: &HashMap<String, String>) -> Vec<String> {
+
+ let result = complete_server_file_name(arg, param);
+
+ strip_server_file_expenstions(result)
}
fn complete_chunk_size(_arg: &str, _param: &HashMap<String, String>) -> Vec<String> {
_rpcenv: &mut dyn RpcEnvironment,
) -> Result<Value, Error> {
- let repo_url = tools::required_string_param(¶m, "repository")?;
- let repo: BackupRepository = repo_url.parse()?;
+ let path = tools::required_string_param(¶m, "path")?;
+ let path = PathBuf::from(path);
- let base = BaseDirectories::with_prefix("proxmox-backup")?;
+ let kdf = param["kdf"].as_str().unwrap_or("scrypt");
- let repo = repo.to_string();
+ let key = proxmox::sys::linux::random_data(32)?;
- // usually $HOME/.config/proxmox-backup/xxx.enc_key
- let path = base.place_config_file(&format!("{}.enc_key", repo))?;
+ if kdf == "scrypt" {
+ // always read passphrase from tty
+ if !crate::tools::tty::stdin_isatty() {
+ bail!("unable to read passphrase - no tty");
+ }
- // always read from tty
- if !crate::tools::tty::stdin_isatty() {
- bail!("unable to read passphrase - no tty");
- }
+ let password = crate::tools::tty::read_password("Encryption Key Password: ")?;
- let password = crate::tools::tty::read_password("Encryption Key Password: ")?;
+ let key_config = encrypt_key_with_passphrase(&key, &password)?;
- let key = proxmox::sys::linux::random_data(32)?;
+ store_key_config(&path, false, key_config)?;
- store_key_with_passphrase(&path, &key, &password, false)?;
+ Ok(Value::Null)
+ } else if kdf == "none" {
+ let created = Local.timestamp(Local::now().timestamp(), 0);
- Ok(Value::Null)
+ store_key_config(&path, false, KeyConfig {
+ kdf: None,
+ created,
+ modified: created,
+ data: key,
+ })?;
+
+ Ok(Value::Null)
+ } else {
+ unreachable!();
+ }
}
+fn master_pubkey_path() -> Result<PathBuf, Error> {
+ let base = BaseDirectories::with_prefix("proxmox-backup")?;
-fn key_change_passphrase(
+ // usually $HOME/.config/proxmox-backup/master-public.pem
+ let path = base.place_config_file("master-public.pem")?;
+
+ Ok(path)
+}
+
+fn key_import_master_pubkey(
param: Value,
_info: &ApiMethod,
_rpcenv: &mut dyn RpcEnvironment,
) -> Result<Value, Error> {
- let repo_url = tools::required_string_param(¶m, "repository")?;
- let repo: BackupRepository = repo_url.parse()?;
+ let path = tools::required_string_param(¶m, "path")?;
+ let path = PathBuf::from(path);
- let base = BaseDirectories::with_prefix("proxmox-backup")?;
+ let pem_data = proxmox_backup::tools::file_get_contents(&path)?;
- let repo = repo.to_string();
+ if let Err(err) = openssl::pkey::PKey::public_key_from_pem(&pem_data) {
+ bail!("Unable to decode PEM data - {}", err);
+ }
+
+ let target_path = master_pubkey_path()?;
- // usually $HOME/.config/proxmox-backup/xxx.enc_key
- let path = base.place_config_file(&format!("{}.enc_key", repo))?;
+ proxmox_backup::tools::file_set_contents(&target_path, &pem_data, None)?;
+
+ println!("Imported public master key to {:?}", target_path);
+
+ Ok(Value::Null)
+}
+
+fn key_create_master_key(
+ _param: Value,
+ _info: &ApiMethod,
+ _rpcenv: &mut dyn RpcEnvironment,
+) -> Result<Value, Error> {
// we need a TTY to query the new password
if !crate::tools::tty::stdin_isatty() {
- bail!("unable to change passphrase - no tty");
+ bail!("unable to create master key - no tty");
}
- let key = load_and_decrtypt_key(&path, get_encryption_key_password)?;
+ let rsa = openssl::rsa::Rsa::generate(4096)?;
+ let pkey = openssl::pkey::PKey::from_rsa(rsa)?;
- let new_pw = String::from_utf8(crate::tools::tty::read_password("New Password: ")?)?;
+ let new_pw = String::from_utf8(crate::tools::tty::read_password("Master Key Password: ")?)?;
let verify_pw = String::from_utf8(crate::tools::tty::read_password("Verify Password: ")?)?;
if new_pw != verify_pw {
bail!("Password is too short!");
}
- store_key_with_passphrase(&path, &key, new_pw.as_bytes(), true)?;
+ let pub_key: Vec<u8> = pkey.public_key_to_pem()?;
+ let filename_pub = "master-public.pem";
+ println!("Writing public master key to {}", filename_pub);
+ proxmox_backup::tools::file_set_contents(filename_pub, pub_key.as_slice(), None)?;
+
+ let cipher = openssl::symm::Cipher::aes_256_cbc();
+ let priv_key: Vec<u8> = pkey.private_key_to_pem_pkcs8_passphrase(cipher, new_pw.as_bytes())?;
+
+ let filename_priv = "master-private.pem";
+ println!("Writing private master key to {}", filename_priv);
+ proxmox_backup::tools::file_set_contents(filename_priv, priv_key.as_slice(), None)?;
Ok(Value::Null)
}
+fn key_change_passphrase(
+ param: Value,
+ _info: &ApiMethod,
+ _rpcenv: &mut dyn RpcEnvironment,
+) -> Result<Value, Error> {
+
+ let path = tools::required_string_param(¶m, "path")?;
+ let path = PathBuf::from(path);
+
+ let kdf = param["kdf"].as_str().unwrap_or("scrypt");
+
+ // we need a TTY to query the new password
+ if !crate::tools::tty::stdin_isatty() {
+ bail!("unable to change passphrase - no tty");
+ }
+
+ let (key, created) = load_and_decrtypt_key(&path, get_encryption_key_password)?;
+
+ if kdf == "scrypt" {
+
+ let new_pw = String::from_utf8(crate::tools::tty::read_password("New Password: ")?)?;
+ let verify_pw = String::from_utf8(crate::tools::tty::read_password("Verify Password: ")?)?;
+
+ if new_pw != verify_pw {
+ bail!("Password verification fail!");
+ }
+
+ if new_pw.len() < 5 {
+ bail!("Password is too short!");
+ }
+
+ let mut new_key_config = encrypt_key_with_passphrase(&key, new_pw.as_bytes())?;
+ new_key_config.created = created; // keep original value
+
+ store_key_config(&path, true, new_key_config)?;
+
+ Ok(Value::Null)
+ } else if kdf == "none" {
+ let modified = Local.timestamp(Local::now().timestamp(), 0);
+
+ store_key_config(&path, true, KeyConfig {
+ kdf: None,
+ created, // keep original value
+ modified,
+ data: key.to_vec(),
+ })?;
+
+ Ok(Value::Null)
+ } else {
+ unreachable!();
+ }
+}
+
fn key_mgmt_cli() -> CliCommandMap {
- // fixme: change-passphrase, import, export, list
+ let kdf_schema: Arc<Schema> = Arc::new(
+ StringSchema::new("Key derivation function. Choose 'none' to store the key unecrypted.")
+ .format(Arc::new(ApiStringFormat::Enum(&["scrypt", "none"])))
+ .default("scrypt")
+ .into()
+ );
+
let key_create_cmd_def = CliCommand::new(
ApiMethod::new(
key_create,
ObjectSchema::new("Create a new encryption key.")
- .required("repository", REPO_URL_SCHEMA.clone())
+ .required("path", StringSchema::new("File system path."))
+ .optional("kdf", kdf_schema.clone())
))
- .arg_param(vec!["repository"])
- .completion_cb("repository", complete_repository);
+ .arg_param(vec!["path"])
+ .completion_cb("path", tools::complete_file_name);
let key_change_passphrase_cmd_def = CliCommand::new(
ApiMethod::new(
key_change_passphrase,
ObjectSchema::new("Change the passphrase required to decrypt the key.")
- .required("repository", REPO_URL_SCHEMA.clone())
+ .required("path", StringSchema::new("File system path."))
+ .optional("kdf", kdf_schema.clone())
+ ))
+ .arg_param(vec!["path"])
+ .completion_cb("path", tools::complete_file_name);
+
+ let key_create_master_key_cmd_def = CliCommand::new(
+ ApiMethod::new(
+ key_create_master_key,
+ ObjectSchema::new("Create a new 4096 bit RSA master pub/priv key pair.")
+ ));
+
+ let key_import_master_pubkey_cmd_def = CliCommand::new(
+ ApiMethod::new(
+ key_import_master_pubkey,
+ ObjectSchema::new("Import a new RSA public key and use it as master key. The key is expected to be in '.pem' format.")
+ .required("path", StringSchema::new("File system path."))
))
- .arg_param(vec!["repository"])
- .completion_cb("repository", complete_repository);
+ .arg_param(vec!["path"])
+ .completion_cb("path", tools::complete_file_name);
let cmd_def = CliCommandMap::new()
.insert("create".to_owned(), key_create_cmd_def.into())
+ .insert("create-master-key".to_owned(), key_create_master_key_cmd_def.into())
+ .insert("import-master-pubkey".to_owned(), key_import_master_pubkey_cmd_def.into())
.insert("change-passphrase".to_owned(), key_change_passphrase_cmd_def.into());
cmd_def
}
-
fn main() {
let backup_source_schema: Arc<Schema> = Arc::new(
backup_source_schema,
).min_length(1)
)
+ .optional(
+ "keyfile",
+ StringSchema::new("Path to encryption key. All data will be encrypted using this key."))
.optional(
"verbose",
BooleanSchema::new("Verbose output.").default(false))
.arg_param(vec!["repository", "backupspec"])
.completion_cb("repository", complete_repository)
.completion_cb("backupspec", complete_backup_source)
+ .completion_cb("keyfile", tools::complete_file_name)
.completion_cb("chunk-size", complete_chunk_size);
let list_cmd_def = CliCommand::new(
.arg_param(vec!["repository"])
.completion_cb("repository", complete_repository);
+ let download_cmd_def = CliCommand::new(
+ ApiMethod::new(
+ download,
+ ObjectSchema::new("Download data from backup repository.")
+ .required("repository", REPO_URL_SCHEMA.clone())
+ .required("snapshot", StringSchema::new("Group/Snapshot path."))
+ .required("file-name", StringSchema::new("File name."))
+ .required("target", StringSchema::new("Target directory path."))
+ .optional("keyfile", StringSchema::new("Path to encryption key."))
+ ))
+ .arg_param(vec!["repository", "snapshot", "file-name", "target"])
+ .completion_cb("repository", complete_repository)
+ .completion_cb("snapshot", complete_group_or_snapshot)
+ .completion_cb("file-name", complete_server_file_name)
+ .completion_cb("keyfile", tools::complete_file_name)
+ .completion_cb("target", tools::complete_file_name);
+
let restore_cmd_def = CliCommand::new(
ApiMethod::new(
restore,
.required("snapshot", StringSchema::new("Group/Snapshot path."))
.required("archive-name", StringSchema::new("Backup archive name."))
.required("target", StringSchema::new("Target directory path."))
+ .optional("keyfile", StringSchema::new("Path to encryption key."))
+ .optional(
+ "verbose",
+ BooleanSchema::new("Verbose output.").default(false)
+ )
))
.arg_param(vec!["repository", "snapshot", "archive-name", "target"])
.completion_cb("repository", complete_repository)
.insert("garbage-collect".to_owned(), garbage_collect_cmd_def.into())
.insert("list".to_owned(), list_cmd_def.into())
.insert("prune".to_owned(), prune_cmd_def.into())
+ .insert("download".to_owned(), download_cmd_def.into())
.insert("restore".to_owned(), restore_cmd_def.into())
.insert("snapshots".to_owned(), snapshots_cmd_def.into())
.insert("key".to_owned(), key_mgmt_cli().into());
projects / proxmox-backup.git / blobdiff