extern crate proxmox_backup;
use failure::*;
-//use std::os::unix::io::AsRawFd;
+use nix::unistd::{fork, ForkResult, pipe};
+use std::os::unix::io::RawFd;
use chrono::{Local, Utc, TimeZone};
use std::path::{Path, PathBuf};
use std::collections::{HashSet, HashMap};
-use std::io::Write;
+use std::ffi::OsStr;
+use std::io::{Read, Write, Seek, SeekFrom};
use std::os::unix::fs::OpenOptionsExt;
use proxmox::tools::fs::{file_get_contents, file_get_json, file_set_contents, image_size};
_ => return,
};
- let mut data = file_get_json(&path, None).unwrap_or(json!({}));
+ let mut data = file_get_json(&path, None).unwrap_or_else(|_| json!({}));
let repo = repo.to_string();
_ => return result,
};
- let data = file_get_json(&path, None).unwrap_or(json!({}));
+ let data = file_get_json(&path, None).unwrap_or_else(|_| json!({}));
if let Some(map) = data.as_object() {
for (repo, _count) in map {
result
}
-fn backup_directory<P: AsRef<Path>>(
- client: &BackupClient,
+fn compute_file_csum(file: &mut std::fs::File) -> Result<([u8; 32], u64), Error> {
+
+ file.seek(SeekFrom::Start(0))?;
+
+ let mut hasher = openssl::sha::Sha256::new();
+ let mut buffer = proxmox::tools::vec::undefined(256*1024);
+ let mut size: u64 = 0;
+
+ loop {
+ let count = match file.read(&mut buffer) {
+ Ok(count) => count,
+ Err(ref err) if err.kind() == std::io::ErrorKind::Interrupted => { continue; }
+ Err(err) => return Err(err.into()),
+ };
+ if count == 0 {
+ break;
+ }
+ size += count as u64;
+ hasher.update(&buffer[..count]);
+ }
+
+ let csum = hasher.finish();
+
+ Ok((csum, size))
+}
+
+
+async fn backup_directory<P: AsRef<Path>>(
+ client: &BackupWriter,
dir_path: P,
archive_name: &str,
chunk_size: Option<usize>,
verbose: bool,
skip_lost_and_found: bool,
crypt_config: Option<Arc<CryptConfig>>,
- catalog: Arc<Mutex<SimpleCatalog>>,
+ catalog: Arc<Mutex<CatalogWriter<SenderWriter>>>,
) -> Result<BackupStats, Error> {
let pxar_stream = PxarBackupStream::open(dir_path.as_ref(), device_set, verbose, skip_lost_and_found, catalog)?;
- let chunk_stream = ChunkStream::new(pxar_stream, chunk_size);
+ let mut chunk_stream = ChunkStream::new(pxar_stream, chunk_size);
- let (tx, rx) = mpsc::channel(10); // allow to buffer 10 chunks
+ let (mut tx, rx) = mpsc::channel(10); // allow to buffer 10 chunks
let stream = rx
- .map_err(Error::from)
- .and_then(|x| x); // flatten
+ .map_err(Error::from);
// spawn chunker inside a separate task so that it can run parallel
- tokio::spawn(
- tx.send_all(chunk_stream.then(|r| Ok(r)))
- .map_err(|_| {}).map(|_| ())
- );
+ tokio::spawn(async move {
+ let _ = tx.send_all(&mut chunk_stream).await;
+ });
- let stats = client.upload_stream(archive_name, stream, "dynamic", None, crypt_config).wait()?;
+ let stats = client
+ .upload_stream(archive_name, stream, "dynamic", None, crypt_config)
+ .await?;
Ok(stats)
}
-fn backup_image<P: AsRef<Path>>(
- client: &BackupClient,
+
async fn backup_image<P: AsRef<Path>>(
+ client: &BackupWriter,
image_path: P,
archive_name: &str,
image_size: u64,
let path = image_path.as_ref().to_owned();
- let file = tokio::fs::File::open(path).wait()?;
+ let file = tokio::fs::File::open(path).await?;
let stream = tokio::codec::FramedRead::new(file, tokio::codec::BytesCodec::new())
.map_err(Error::from);
let stream = FixedChunkStream::new(stream, chunk_size.unwrap_or(4*1024*1024));
- let stats = client.upload_stream(archive_name, stream, "fixed", Some(image_size), crypt_config).wait()?;
+ let stats = client
+ .upload_stream(archive_name, stream, "fixed", Some(image_size), crypt_config)
+ .await?;
Ok(stats)
}
fn strip_server_file_expenstion(name: &str) -> String {
- if name.ends_with(".didx") {
- return name[..name.len()-5].to_owned();
- } else if name.ends_with(".fidx") {
- return name[..name.len()-5].to_owned();
- } else if name.ends_with(".blob") {
- return name[..name.len()-5].to_owned();
+ if name.ends_with(".didx") || name.ends_with(".fidx") || name.ends_with(".blob") {
+ name[..name.len()-5].to_owned()
} else {
- return name.to_owned(); // should not happen
+ name.to_owned() // should not happen
}
}
let repo = extract_repository_from_value(¶m)?;
- let client = HttpClient::new(repo.host(), repo.user())?;
+ let client = HttpClient::new(repo.host(), repo.user(), None)?;
let path = format!("api2/json/admin/datastore/{}/groups", repo.store());
- let mut result = client.get(&path, None).wait()?;
+ let mut result = async_main(async move {
+ client.get(&path, None).await
+ })?;
record_repository(&repo);
let output_format = param["output-format"].as_str().unwrap_or("text").to_owned();
- let client = HttpClient::new(repo.host(), repo.user())?;
+ let client = HttpClient::new(repo.host(), repo.user(), None)?;
let path = format!("api2/json/admin/datastore/{}/snapshots", repo.store());
args["backup-id"] = group.backup_id().into();
}
- let result = client.get(&path, Some(args)).wait()?;
+ let result = async_main(async move {
+ client.get(&path, Some(args)).await
+ })?;
record_repository(&repo);
let path = tools::required_string_param(¶m, "snapshot")?;
let snapshot = BackupDir::parse(path)?;
- let mut client = HttpClient::new(repo.host(), repo.user())?;
+ let mut client = HttpClient::new(repo.host(), repo.user(), None)?;
let path = format!("api2/json/admin/datastore/{}/snapshots", repo.store());
- let result = client.delete(&path, Some(json!({
- "backup-type": snapshot.group().backup_type(),
- "backup-id": snapshot.group().backup_id(),
- "backup-time": snapshot.backup_time().timestamp(),
- }))).wait()?;
+ let result = async_main(async move {
+ client.delete(&path, Some(json!({
+ "backup-type": snapshot.group().backup_type(),
+ "backup-id": snapshot.group().backup_id(),
+ "backup-time": snapshot.backup_time().timestamp(),
+ }))).await
+ })?;
record_repository(&repo);
Ok(result)
}
+fn api_login(
+ param: Value,
+ _info: &ApiMethod,
+ _rpcenv: &mut dyn RpcEnvironment,
+) -> Result<Value, Error> {
+
+ let repo = extract_repository_from_value(¶m)?;
+
+ let client = HttpClient::new(repo.host(), repo.user(), None)?;
+ async_main(async move { client.login().await })?;
+
+ record_repository(&repo);
+
+ Ok(Value::Null)
+}
+
+fn api_logout(
+ param: Value,
+ _info: &ApiMethod,
+ _rpcenv: &mut dyn RpcEnvironment,
+) -> Result<Value, Error> {
+
+ let repo = extract_repository_from_value(¶m)?;
+
+ delete_ticket_info(repo.host(), repo.user())?;
+
+ Ok(Value::Null)
+}
+
fn dump_catalog(
param: Value,
_info: &ApiMethod,
let path = tools::required_string_param(¶m, "snapshot")?;
let snapshot = BackupDir::parse(path)?;
- let keyfile = param["keyfile"].as_str().map(|p| PathBuf::from(p));
+ let keyfile = param["keyfile"].as_str().map(PathBuf::from);
let crypt_config = match keyfile {
None => None,
Some(path) => {
- let (key, _) = load_and_decrtypt_key(&path, get_encryption_key_password)?;
+ let (key, _) = load_and_decrtypt_key(&path, &get_encryption_key_password)?;
Some(Arc::new(CryptConfig::new(key)?))
}
};
- let client = HttpClient::new(repo.host(), repo.user())?;
+ let client = HttpClient::new(repo.host(), repo.user(), None)?;
- let client = client.start_backup_reader(
- repo.store(),
- &snapshot.group().backup_type(),
- &snapshot.group().backup_id(),
- snapshot.backup_time(), true).wait()?;
-
- let writer = Vec::with_capacity(1024*1024);
- let blob_data = client.download("catalog.blob", writer).wait()?;
- let blob = DataBlob::from_raw(blob_data)?;
- blob.verify_crc()?;
-
- let raw_data = match crypt_config {
- Some(ref crypt_config) => blob.decode(Some(crypt_config))?,
- None => blob.decode(None)?,
- };
+ async_main(async move {
+ let client = BackupReader::start(
+ client,
+ crypt_config.clone(),
+ repo.store(),
+ &snapshot.group().backup_type(),
+ &snapshot.group().backup_id(),
+ snapshot.backup_time(),
+ true,
+ ).await?;
- let slice = &raw_data[..];
- let mut catalog_reader = pxar::catalog::SimpleCatalogReader::new(slice);
+ let tmpfile = std::fs::OpenOptions::new()
+ .write(true)
+ .read(true)
+ .custom_flags(libc::O_TMPFILE)
+ .open("/tmp")?;
- catalog_reader.dump()?;
+ let manifest = client.download_manifest().await?;
- record_repository(&repo);
+ let tmpfile = client.download(CATALOG_NAME, tmpfile).await?;
+
+ let index = DynamicIndexReader::new(tmpfile)
+ .map_err(|err| format_err!("unable to read catalog index - {}", err))?;
+
+ // Note: do not use values stored in index (not trusted) - instead, computed them again
+ let (csum, size) = index.compute_csum();
+ manifest.verify_file(CATALOG_NAME, &csum, size)?;
+
+ 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 mut catalogfile = std::fs::OpenOptions::new()
+ .write(true)
+ .read(true)
+ .custom_flags(libc::O_TMPFILE)
+ .open("/tmp")?;
+
+ std::io::copy(&mut reader, &mut catalogfile)
+ .map_err(|err| format_err!("unable to download catalog - {}", err))?;
+
+ catalogfile.seek(SeekFrom::Start(0))?;
+
+ let mut catalog_reader = CatalogReader::new(catalogfile);
+
+ catalog_reader.dump()?;
+
+ record_repository(&repo);
+
+ Ok::<(), Error>(())
+ })?;
Ok(Value::Null)
}
let output_format = param["output-format"].as_str().unwrap_or("text").to_owned();
- let client = HttpClient::new(repo.host(), repo.user())?;
+ let client = HttpClient::new(repo.host(), repo.user(), None)?;
let path = format!("api2/json/admin/datastore/{}/files", repo.store());
- let mut result = client.get(&path, Some(json!({
- "backup-type": snapshot.group().backup_type(),
- "backup-id": snapshot.group().backup_id(),
- "backup-time": snapshot.backup_time().timestamp(),
- }))).wait()?;
+ let mut result = async_main(async move {
+ client.get(&path, Some(json!({
+ "backup-type": snapshot.group().backup_type(),
+ "backup-id": snapshot.group().backup_id(),
+ "backup-time": snapshot.backup_time().timestamp(),
+ }))).await
+ })?;
record_repository(&repo);
let repo = extract_repository_from_value(¶m)?;
- let mut client = HttpClient::new(repo.host(), repo.user())?;
+ let mut client = HttpClient::new(repo.host(), repo.user(), None)?;
let path = format!("api2/json/admin/datastore/{}/gc", repo.store());
- let result = client.post(&path, None).wait()?;
+ let result = async_main(async move { client.post(&path, None).await })?;
record_repository(&repo);
bail!("unable to parse directory specification '{}'", value);
}
+fn spawn_catalog_upload(
+ client: Arc<BackupWriter>,
+ crypt_config: Option<Arc<CryptConfig>>,
+) -> Result<
+ (
+ Arc<Mutex<CatalogWriter<SenderWriter>>>,
+ tokio::sync::oneshot::Receiver<Result<BackupStats, Error>>
+ ), Error>
+{
+ let (catalog_tx, catalog_rx) = mpsc::channel(10); // allow to buffer 10 writes
+ let catalog_stream = catalog_rx.map_err(Error::from);
+ let catalog_chunk_size = 512*1024;
+ let catalog_chunk_stream = ChunkStream::new(catalog_stream, Some(catalog_chunk_size));
+
+ let catalog = Arc::new(Mutex::new(CatalogWriter::new(SenderWriter::new(catalog_tx))?));
+
+ let (catalog_result_tx, catalog_result_rx) = tokio::sync::oneshot::channel();
+
+ tokio::spawn(async move {
+ let catalog_upload_result = client
+ .upload_stream(CATALOG_NAME, catalog_chunk_stream, "dynamic", None, crypt_config)
+ .await;
+
+ if let Err(ref err) = catalog_upload_result {
+ eprintln!("catalog upload error - {}", err);
+ client.cancel();
+ }
+
+ let _ = catalog_result_tx.send(catalog_upload_result);
+ });
+
+ Ok((catalog, catalog_result_rx))
+}
+
fn create_backup(
param: Value,
_info: &ApiMethod,
verify_chunk_size(size)?;
}
- let keyfile = param["keyfile"].as_str().map(|p| PathBuf::from(p));
+ let keyfile = param["keyfile"].as_str().map(PathBuf::from);
let backup_id = param["backup-id"].as_str().unwrap_or(&proxmox::tools::nodename());
enum BackupType { PXAR, IMAGE, CONFIG, LOGFILE };
+ let mut upload_catalog = false;
+
for backupspec in backupspec_list {
let (target, filename) = parse_backupspec(backupspec.as_str().unwrap())?;
use std::os::unix::fs::FileTypeExt;
- let metadata = match std::fs::metadata(filename) {
- Ok(m) => m,
- Err(err) => bail!("unable to access '{}' - {}", filename, err),
- };
+ let metadata = std::fs::metadata(filename)
+ .map_err(|err| format_err!("unable to access '{}' - {}", filename, err))?;
let file_type = metadata.file_type();
let extension = target.rsplit('.').next()
- .ok_or(format_err!("missing target file extenion '{}'", target))?;
+ .ok_or_else(|| format_err!("missing target file extenion '{}'", target))?;
match extension {
"pxar" => {
bail!("got unexpected file type (expected directory)");
}
upload_list.push((BackupType::PXAR, filename.to_owned(), format!("{}.didx", target), 0));
+ upload_catalog = true;
}
"img" => {
}
}
- let backup_time = Utc.timestamp(backup_time_opt.unwrap_or(Utc::now().timestamp()), 0);
+ let backup_time = Utc.timestamp(backup_time_opt.unwrap_or_else(|| Utc::now().timestamp()), 0);
- let client = HttpClient::new(repo.host(), repo.user())?;
+ let client = HttpClient::new(repo.host(), repo.user(), None)?;
record_repository(&repo);
println!("Starting backup: {}/{}/{}", backup_type, backup_id, BackupDir::backup_time_to_string(backup_time));
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 (key, created) = load_and_decrtypt_key(&path, &get_encryption_key_password)?;
let crypt_config = CryptConfig::new(key)?;
}
};
- let client = client.start_backup(repo.store(), backup_type, &backup_id, backup_time, verbose).wait()?;
-
- let mut file_list = vec![];
-
- let catalog_filename = format!("/tmp/pbs-catalog-{}.cat", std::process::id());
- let catalog = Arc::new(Mutex::new(SimpleCatalog::new(&catalog_filename)?));
- let mut upload_catalog = false;
-
- for (backup_type, filename, target, size) in upload_list {
- match backup_type {
- BackupType::CONFIG => {
- println!("Upload config file '{}' to '{:?}' as {}", filename, repo, target);
- let stats = client.upload_blob_from_file(&filename, &target, crypt_config.clone(), true).wait()?;
- file_list.push((target, stats));
- }
- BackupType::LOGFILE => { // fixme: remove - not needed anymore ?
- println!("Upload log file '{}' to '{:?}' as {}", filename, repo, target);
- let stats = client.upload_blob_from_file(&filename, &target, crypt_config.clone(), true).wait()?;
- file_list.push((target, stats));
- }
- BackupType::PXAR => {
- upload_catalog = true;
- println!("Upload directory '{}' to '{:?}' as {}", filename, repo, target);
- catalog.lock().unwrap().start_directory(std::ffi::CString::new(target.as_str())?.as_c_str())?;
- let stats = backup_directory(
- &client,
- &filename,
- &target,
- chunk_size_opt,
- devices.clone(),
- verbose,
- skip_lost_and_found,
- crypt_config.clone(),
- catalog.clone(),
- )?;
- file_list.push((target, stats));
- catalog.lock().unwrap().end_directory()?;
- }
- BackupType::IMAGE => {
- println!("Upload image '{}' to '{:?}' as {}", filename, repo, target);
- let stats = backup_image(
- &client,
- &filename,
- &target,
- size,
- chunk_size_opt,
- verbose,
- crypt_config.clone(),
- )?;
- file_list.push((target, stats));
+ async_main(async move {
+ let client = BackupWriter::start(
+ client,
+ repo.store(),
+ backup_type,
+ &backup_id,
+ backup_time,
+ verbose,
+ ).await?;
+
+ let snapshot = BackupDir::new(backup_type, backup_id, backup_time.timestamp());
+ let mut manifest = BackupManifest::new(snapshot);
+
+ let (catalog, catalog_result_rx) = spawn_catalog_upload(client.clone(), crypt_config.clone())?;
+
+ for (backup_type, filename, target, size) in upload_list {
+ match backup_type {
+ BackupType::CONFIG => {
+ println!("Upload config file '{}' to '{:?}' as {}", filename, repo, target);
+ let stats = client
+ .upload_blob_from_file(&filename, &target, crypt_config.clone(), true)
+ .await?;
+ manifest.add_file(target, stats.size, stats.csum);
+ }
+ BackupType::LOGFILE => { // fixme: remove - not needed anymore ?
+ println!("Upload log file '{}' to '{:?}' as {}", filename, repo, target);
+ let stats = client
+ .upload_blob_from_file(&filename, &target, crypt_config.clone(), true)
+ .await?;
+ manifest.add_file(target, stats.size, stats.csum);
+ }
+ BackupType::PXAR => {
+ println!("Upload directory '{}' to '{:?}' as {}", filename, repo, target);
+ catalog.lock().unwrap().start_directory(std::ffi::CString::new(target.as_str())?.as_c_str())?;
+ let stats = backup_directory(
+ &client,
+ &filename,
+ &target,
+ chunk_size_opt,
+ devices.clone(),
+ verbose,
+ skip_lost_and_found,
+ crypt_config.clone(),
+ catalog.clone(),
+ ).await?;
+ manifest.add_file(target, stats.size, stats.csum);
+ catalog.lock().unwrap().end_directory()?;
+ }
+ BackupType::IMAGE => {
+ println!("Upload image '{}' to '{:?}' as {}", filename, repo, target);
+ let stats = backup_image(
+ &client,
+ &filename,
+ &target,
+ size,
+ chunk_size_opt,
+ verbose,
+ crypt_config.clone(),
+ ).await?;
+ manifest.add_file(target, stats.size, stats.csum);
+ }
}
}
- }
- // finalize and upload catalog
- if upload_catalog {
- let mutex = Arc::try_unwrap(catalog)
- .map_err(|_| format_err!("unable to get catalog (still used)"))?;
- drop(mutex); // close catalog
+ // finalize and upload catalog
+ if upload_catalog {
+ let mutex = Arc::try_unwrap(catalog)
+ .map_err(|_| format_err!("unable to get catalog (still used)"))?;
+ let mut catalog = mutex.into_inner().unwrap();
- let target = "catalog.blob";
- let stats = client.upload_blob_from_file(&catalog_filename, target, crypt_config.clone(), true).wait()?;
- file_list.push((target.to_owned(), stats));
+ catalog.finish()?;
- let _ = std::fs::remove_file(&catalog_filename);
- }
+ drop(catalog); // close upload stream
- if let Some(rsa_encrypted_key) = rsa_encrypted_key {
- let target = "rsa-encrypted.key";
- println!("Upload RSA encoded key to '{:?}' as {}", repo, target);
- let stats = client.upload_blob_from_data(rsa_encrypted_key, target, None, false, false).wait()?;
- file_list.push((format!("{}.blob", target), stats));
-
- // 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 = 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);
- */
- }
+ let stats = catalog_result_rx.await??;
- // create index.json
- let file_list = file_list.iter()
- .fold(vec![], |mut acc, (filename, stats)| {
- acc.push(json!({
- "filename": filename,
- "size": stats.size,
- "csum": proxmox::tools::digest_to_hex(&stats.csum),
- }));
- acc
- });
-
- let index = json!({
- "backup-type": backup_type,
- "backup-id": backup_id,
- "backup-time": backup_time.timestamp(),
- "files": file_list,
- });
+ manifest.add_file(CATALOG_NAME.to_owned(), stats.size, stats.csum);
+ }
+
+ if let Some(rsa_encrypted_key) = rsa_encrypted_key {
+ let target = "rsa-encrypted.key";
+ println!("Upload RSA encoded key to '{:?}' as {}", repo, target);
+ let stats = client
+ .upload_blob_from_data(rsa_encrypted_key, target, None, false, false)
+ .await?;
+ manifest.add_file(format!("{}.blob", target), stats.size, stats.csum);
+
+ // 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 = 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);
+ */
+ }
- println!("Upload index.json to '{:?}'", repo);
- let index_data = serde_json::to_string_pretty(&index)?.into();
- client.upload_blob_from_data(index_data, "index.json.blob", crypt_config.clone(), true, true).wait()?;
+ // create manifest (index.json)
+ let manifest = manifest.into_json();
- client.finish().wait()?;
+ println!("Upload index.json to '{:?}'", repo);
+ let manifest = serde_json::to_string_pretty(&manifest)?.into();
+ client
+ .upload_blob_from_data(manifest, MANIFEST_BLOB_NAME, crypt_config.clone(), true, true)
+ .await?;
- let end_time = Local::now();
- let elapsed = end_time.signed_duration_since(start_time);
- println!("Duration: {}", elapsed);
+ client.finish().await?;
- println!("End Time: {}", end_time.to_rfc3339_opts(chrono::SecondsFormat::Secs, false));
+ let end_time = Local::now();
+ let elapsed = end_time.signed_duration_since(start_time);
+ println!("Duration: {}", elapsed);
- Ok(Value::Null)
+ println!("End Time: {}", end_time.to_rfc3339_opts(chrono::SecondsFormat::Secs, false));
+
+ Ok(Value::Null)
+ })
}
fn complete_backup_source(arg: &str, param: &HashMap<String, String>) -> Vec<String> {
_info: &ApiMethod,
_rpcenv: &mut dyn RpcEnvironment,
) -> Result<Value, Error> {
+ async_main(restore_do(param))
+}
+
+fn dump_image<W: Write>(
+ client: Arc<BackupReader>,
+ crypt_config: Option<Arc<CryptConfig>>,
+ index: FixedIndexReader,
+ mut writer: W,
+ verbose: bool,
+) -> Result<(), Error> {
+
+ let most_used = index.find_most_used_chunks(8);
+
+ let mut chunk_reader = RemoteChunkReader::new(client.clone(), crypt_config, most_used);
+
+ // Note: we avoid using BufferedFixedReader, because that add an additional buffer/copy
+ // and thus slows down reading. Instead, directly use RemoteChunkReader
+ let mut per = 0;
+ let mut bytes = 0;
+ let start_time = std::time::Instant::now();
+
+ for pos in 0..index.index_count() {
+ let digest = index.index_digest(pos).unwrap();
+ let raw_data = chunk_reader.read_chunk(&digest)?;
+ writer.write_all(&raw_data)?;
+ bytes += raw_data.len();
+ if verbose {
+ let next_per = ((pos+1)*100)/index.index_count();
+ if per != next_per {
+ eprintln!("progress {}% (read {} bytes, duration {} sec)",
+ next_per, bytes, start_time.elapsed().as_secs());
+ per = next_per;
+ }
+ }
+ }
+
+ let end_time = std::time::Instant::now();
+ let elapsed = end_time.duration_since(start_time);
+ eprintln!("restore image complete (bytes={}, duration={:.2}s, speed={:.2}MB/s)",
+ bytes,
+ elapsed.as_secs_f64(),
+ bytes as f64/(1024.0*1024.0*elapsed.as_secs_f64())
+ );
+
+ Ok(())
+}
+
+async fn restore_do(param: Value) -> Result<Value, Error> {
let repo = extract_repository_from_value(¶m)?;
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())?;
+ let client = HttpClient::new(repo.host(), repo.user(), None)?;
record_repository(&repo);
let result = client.get(&path, Some(json!({
"backup-type": group.backup_type(),
"backup-id": group.backup_id(),
- }))).wait()?;
+ }))).await?;
let list = result["data"].as_array().unwrap();
- if list.len() == 0 {
+ if list.is_empty() {
bail!("backup group '{}' does not contain any snapshots:", path);
}
let target = tools::required_string_param(¶m, "target")?;
let target = if target == "-" { None } else { Some(target) };
- let keyfile = param["keyfile"].as_str().map(|p| PathBuf::from(p));
+ let keyfile = param["keyfile"].as_str().map(PathBuf::from);
let crypt_config = match keyfile {
None => None,
Some(path) => {
- let (key, _) = load_and_decrtypt_key(&path, get_encryption_key_password)?;
+ let (key, _) = load_and_decrtypt_key(&path, &get_encryption_key_password)?;
Some(Arc::new(CryptConfig::new(key)?))
}
};
format!("{}.blob", archive_name)
};
- let client = client.start_backup_reader(repo.store(), &backup_type, &backup_id, backup_time, true).wait()?;
+ let client = BackupReader::start(
+ client,
+ crypt_config.clone(),
+ repo.store(),
+ &backup_type,
+ &backup_id,
+ backup_time,
+ true,
+ ).await?;
let tmpfile = std::fs::OpenOptions::new()
.write(true)
.custom_flags(libc::O_TMPFILE)
.open("/tmp")?;
- if server_archive_name.ends_with(".blob") {
+ let manifest = client.download_manifest().await?;
- let writer = Vec::with_capacity(1024*1024);
- let blob_data = client.download(&server_archive_name, writer).wait()?;
- let blob = DataBlob::from_raw(blob_data)?;
- blob.verify_crc()?;
+ if server_archive_name == MANIFEST_BLOB_NAME {
+ let backup_index_data = manifest.into_json().to_string();
+ if let Some(target) = target {
+ file_set_contents(target, backup_index_data.as_bytes(), None)?;
+ } else {
+ let stdout = std::io::stdout();
+ let mut writer = stdout.lock();
+ writer.write_all(backup_index_data.as_bytes())
+ .map_err(|err| format_err!("unable to pipe data - {}", err))?;
+ }
- let raw_data = match crypt_config {
- Some(ref crypt_config) => blob.decode(Some(crypt_config))?,
- None => blob.decode(None)?,
- };
+ } else if server_archive_name.ends_with(".blob") {
+ let mut tmpfile = client.download(&server_archive_name, tmpfile).await?;
+
+ let (csum, size) = compute_file_csum(&mut tmpfile)?;
+ manifest.verify_file(&server_archive_name, &csum, size)?;
+
+ tmpfile.seek(SeekFrom::Start(0))?;
+ let mut reader = DataBlobReader::new(tmpfile, crypt_config)?;
if let Some(target) = target {
- file_set_contents(target, &raw_data, None)?;
+ 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)?;
} else {
let stdout = std::io::stdout();
let mut writer = stdout.lock();
- writer.write_all(&raw_data)
+ std::io::copy(&mut reader, &mut writer)
.map_err(|err| format_err!("unable to pipe data - {}", err))?;
}
} else if server_archive_name.ends_with(".didx") {
- let tmpfile = client.download(&server_archive_name, tmpfile).wait()?;
+ let tmpfile = client.download(&server_archive_name, tmpfile).await?;
let index = DynamicIndexReader::new(tmpfile)
.map_err(|err| format_err!("unable to read dynamic index '{}' - {}", archive_name, err))?;
+ // Note: do not use values stored in index (not trusted) - instead, computed them again
+ let (csum, size) = index.compute_csum();
+ manifest.verify_file(&server_archive_name, &csum, size)?;
+
let most_used = index.find_most_used_chunks(8);
let chunk_reader = RemoteChunkReader::new(client.clone(), crypt_config, most_used);
let feature_flags = pxar::flags::DEFAULT;
let mut decoder = pxar::SequentialDecoder::new(&mut reader, feature_flags, |path| {
if verbose {
- println!("{:?}", path);
+ eprintln!("{:?}", path);
}
Ok(())
});
decoder.set_allow_existing_dirs(allow_existing_dirs);
-
decoder.restore(Path::new(target), &Vec::new())?;
} else {
- let stdout = std::io::stdout();
- let mut writer = stdout.lock();
+ let mut writer = std::fs::OpenOptions::new()
+ .write(true)
+ .open("/dev/stdout")
+ .map_err(|err| format_err!("unable to open /dev/stdout - {}", err))?;
std::io::copy(&mut reader, &mut writer)
.map_err(|err| format_err!("unable to pipe data - {}", err))?;
}
} else if server_archive_name.ends_with(".fidx") {
- let tmpfile = client.download(&server_archive_name, tmpfile).wait()?;
+ let tmpfile = client.download(&server_archive_name, tmpfile).await?;
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);
+ // Note: do not use values stored in index (not trusted) - instead, computed them again
+ let (csum, size) = index.compute_csum();
+ manifest.verify_file(&server_archive_name, &csum, size)?;
- if let Some(target) = target {
- let mut writer = std::fs::OpenOptions::new()
+ let mut writer = if let Some(target) = target {
+ 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))?;
+ .map_err(|err| format_err!("unable to create target file {:?} - {}", target, err))?
} else {
- let stdout = std::io::stdout();
- let mut writer = stdout.lock();
+ std::fs::OpenOptions::new()
+ .write(true)
+ .open("/dev/stdout")
+ .map_err(|err| format_err!("unable to open /dev/stdout - {}", err))?
+ };
- std::io::copy(&mut reader, &mut writer)
- .map_err(|err| format_err!("unable to pipe data - {}", err))?;
- }
- } else {
+ dump_image(client.clone(), crypt_config.clone(), index, &mut writer, verbose)?;
+
+ } else {
bail!("unknown archive file extension (expected .pxar of .img)");
}
let snapshot = tools::required_string_param(¶m, "snapshot")?;
let snapshot = BackupDir::parse(snapshot)?;
- let mut client = HttpClient::new(repo.host(), repo.user())?;
+ let mut client = HttpClient::new(repo.host(), repo.user(), None)?;
- let keyfile = param["keyfile"].as_str().map(|p| PathBuf::from(p));
+ let keyfile = param["keyfile"].as_str().map(PathBuf::from);
let crypt_config = match keyfile {
None => None,
Some(path) => {
- let (key, _created) = load_and_decrtypt_key(&path, get_encryption_key_password)?;
+ let (key, _created) = load_and_decrtypt_key(&path, &get_encryption_key_password)?;
let crypt_config = CryptConfig::new(key)?;
- Some(crypt_config)
+ Some(Arc::new(crypt_config))
}
};
let data = file_get_contents(logfile)?;
- let blob = if let Some(ref crypt_config) = crypt_config {
- DataBlob::encode(&data, Some(crypt_config), true)?
- } else {
- DataBlob::encode(&data, None, true)?
- };
+ let blob = DataBlob::encode(&data, crypt_config.as_ref().map(Arc::as_ref), true)?;
let raw_data = blob.into_inner();
let body = hyper::Body::from(raw_data);
- let result = client.upload("application/octet-stream", body, &path, Some(args)).wait()?;
-
- Ok(result)
+ async_main(async move {
+ client.upload("application/octet-stream", body, &path, Some(args)).await
+ })
}
fn prune(
let repo = extract_repository_from_value(¶m)?;
- let mut client = HttpClient::new(repo.host(), repo.user())?;
+ let mut client = HttpClient::new(repo.host(), repo.user(), None)?;
let path = format!("api2/json/admin/datastore/{}/prune", repo.store());
param["backup-type"] = group.backup_type().into();
param["backup-id"] = group.backup_id().into();
- let _result = client.post(&path, Some(param)).wait()?;
+ let _result = async_main(async move { client.post(&path, Some(param)).await })?;
record_repository(&repo);
let output_format = param["output-format"].as_str().unwrap_or("text").to_owned();
- let client = HttpClient::new(repo.host(), repo.user())?;
+ let client = HttpClient::new(repo.host(), repo.user(), None)?;
let path = format!("api2/json/admin/datastore/{}/status", repo.store());
- let result = client.get(&path, None).wait()?;
+ let result = async_main(async move { client.get(&path, None).await })?;
let data = &result["data"];
record_repository(&repo);
}
// like get, but simply ignore errors and return Null instead
-fn try_get(repo: &BackupRepository, url: &str) -> Value {
+async fn try_get(repo: &BackupRepository, url: &str) -> Value {
- let client = match HttpClient::new(repo.host(), repo.user()) {
+ let client = match HttpClient::new(repo.host(), repo.user(), None) {
Ok(v) => v,
_ => return Value::Null,
};
- let mut resp = match client.get(url, None).wait() {
+ let mut resp = match client.get(url, None).await {
Ok(v) => v,
_ => return Value::Null,
};
}
fn complete_backup_group(_arg: &str, param: &HashMap<String, String>) -> Vec<String> {
+ async_main(async { complete_backup_group_do(param).await })
+}
+
+async fn complete_backup_group_do(param: &HashMap<String, String>) -> Vec<String> {
let mut result = vec![];
let path = format!("api2/json/admin/datastore/{}/groups", repo.store());
- let data = try_get(&repo, &path);
+ let data = try_get(&repo, &path).await;
if let Some(list) = data.as_array() {
for item in list {
}
fn complete_group_or_snapshot(arg: &str, param: &HashMap<String, String>) -> Vec<String> {
+ async_main(async { complete_group_or_snapshot_do(arg, param).await })
+}
+
+async fn complete_group_or_snapshot_do(arg: &str, param: &HashMap<String, String>) -> Vec<String> {
if arg.matches('/').count() < 2 {
- let groups = complete_backup_group(arg, param);
+ let groups = complete_backup_group_do(param).await;
let mut result = vec![];
for group in groups {
result.push(group.to_string());
return result;
}
- complete_backup_snapshot(arg, param)
+ complete_backup_snapshot_do(param).await
}
fn complete_backup_snapshot(_arg: &str, param: &HashMap<String, String>) -> Vec<String> {
+ async_main(async { complete_backup_snapshot_do(param).await })
+}
+
+async fn complete_backup_snapshot_do(param: &HashMap<String, String>) -> Vec<String> {
let mut result = vec![];
let path = format!("api2/json/admin/datastore/{}/snapshots", repo.store());
- let data = try_get(&repo, &path);
+ let data = try_get(&repo, &path).await;
if let Some(list) = data.as_array() {
for item in list {
}
fn complete_server_file_name(_arg: &str, param: &HashMap<String, String>) -> Vec<String> {
+ async_main(async { complete_server_file_name_do(param).await })
+}
+
+async fn complete_server_file_name_do(param: &HashMap<String, String>) -> Vec<String> {
let mut result = vec![];
let path = format!("api2/json/admin/datastore/{}/files?{}", repo.store(), query);
- let data = try_get(&repo, &path);
+ let data = try_get(&repo, &path).await;
if let Some(list) = data.as_array() {
for item in list {
}
fn complete_archive_name(arg: &str, param: &HashMap<String, String>) -> Vec<String> {
-
complete_server_file_name(arg, param)
- .iter().map(|v| strip_server_file_expenstion(&v)).collect()
+ .iter()
+ .map(|v| strip_server_file_expenstion(&v))
+ .collect()
}
fn complete_chunk_size(_arg: &str, _param: &HashMap<String, String>) -> Vec<String> {
let mut size = 64;
loop {
result.push(size.to_string());
- size = size * 2;
+ size *= 2;
if size > 4096 { break; }
}
bail!("unable to change passphrase - no tty");
}
- let (key, created) = load_and_decrtypt_key(&path, get_encryption_key_password)?;
+ let (key, created) = load_and_decrtypt_key(&path, &get_encryption_key_password)?;
if kdf == "scrypt" {
.arg_param(vec!["path"])
.completion_cb("path", tools::complete_file_name);
- let cmd_def = CliCommandMap::new()
+ 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());
+ .insert("change-passphrase".to_owned(), key_change_passphrase_cmd_def.into())
+}
+
+
+fn mount(
+ param: Value,
+ _info: &ApiMethod,
+ _rpcenv: &mut dyn RpcEnvironment,
+) -> Result<Value, Error> {
+ let verbose = param["verbose"].as_bool().unwrap_or(false);
+ if verbose {
+ // This will stay in foreground with debug output enabled as None is
+ // passed for the RawFd.
+ return async_main(mount_do(param, None));
+ }
- cmd_def
+ // Process should be deamonized.
+ // Make sure to fork before the async runtime is instantiated to avoid troubles.
+ let pipe = pipe()?;
+ match fork() {
+ Ok(ForkResult::Parent { .. }) => {
+ nix::unistd::close(pipe.1).unwrap();
+ // Blocks the parent process until we are ready to go in the child
+ let _res = nix::unistd::read(pipe.0, &mut [0]).unwrap();
+ Ok(Value::Null)
+ }
+ Ok(ForkResult::Child) => {
+ nix::unistd::close(pipe.0).unwrap();
+ nix::unistd::setsid().unwrap();
+ async_main(mount_do(param, Some(pipe.1)))
+ }
+ Err(_) => bail!("failed to daemonize process"),
+ }
+}
+
+async fn mount_do(param: Value, pipe: Option<RawFd>) -> Result<Value, Error> {
+ let repo = extract_repository_from_value(¶m)?;
+ let archive_name = tools::required_string_param(¶m, "archive-name")?;
+ let target = tools::required_string_param(¶m, "target")?;
+ let client = HttpClient::new(repo.host(), repo.user(), None)?;
+
+ 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(),
+ }))).await?;
+
+ let list = result["data"].as_array().unwrap();
+ if list.is_empty() {
+ bail!("backup group '{}' does not contain any snapshots:", path);
+ }
+
+ let epoch = list[0]["backup-time"].as_i64().unwrap();
+ let backup_time = Utc.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 keyfile = param["keyfile"].as_str().map(PathBuf::from);
+ 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 {
+ bail!("Can only mount pxar archives.");
+ };
+
+ let client = BackupReader::start(
+ client,
+ crypt_config.clone(),
+ repo.store(),
+ &backup_type,
+ &backup_id,
+ backup_time,
+ true,
+ ).await?;
+
+ let tmpfile = std::fs::OpenOptions::new()
+ .write(true)
+ .read(true)
+ .custom_flags(libc::O_TMPFILE)
+ .open("/tmp")?;
+
+ let manifest = client.download_manifest().await?;
+
+ if server_archive_name.ends_with(".didx") {
+ let tmpfile = client.download(&server_archive_name, tmpfile).await?;
+ let index = DynamicIndexReader::new(tmpfile)
+ .map_err(|err| format_err!("unable to read dynamic index '{}' - {}", archive_name, err))?;
+
+ // Note: do not use values stored in index (not trusted) - instead, computed them again
+ let (csum, size) = index.compute_csum();
+ manifest.verify_file(&server_archive_name, &csum, size)?;
+
+ let most_used = index.find_most_used_chunks(8);
+ let chunk_reader = RemoteChunkReader::new(client.clone(), crypt_config, most_used);
+ let reader = BufferedDynamicReader::new(index, chunk_reader);
+ let decoder =
+ pxar::Decoder::<Box<dyn pxar::fuse::ReadSeek>, fn(&Path) -> Result<(), Error>>::new(
+ Box::new(reader),
+ |_| Ok(()),
+ )?;
+ let options = OsStr::new("ro,default_permissions");
+ let mut session = pxar::fuse::Session::from_decoder(decoder, &options, pipe.is_none())
+ .map_err(|err| format_err!("pxar mount failed: {}", err))?;
+
+ // Mount the session but not call fuse deamonize as this will cause
+ // issues with the runtime after the fork
+ let deamonize = false;
+ session.mount(&Path::new(target), deamonize)?;
+
+ if let Some(pipe) = pipe {
+ nix::unistd::chdir(Path::new("/")).unwrap();
+ // Finish creation of deamon by redirecting filedescriptors.
+ let nullfd = nix::fcntl::open(
+ "/dev/null",
+ nix::fcntl::OFlag::O_RDWR,
+ nix::sys::stat::Mode::empty(),
+ ).unwrap();
+ nix::unistd::dup2(nullfd, 0).unwrap();
+ nix::unistd::dup2(nullfd, 1).unwrap();
+ nix::unistd::dup2(nullfd, 2).unwrap();
+ if nullfd > 2 {
+ nix::unistd::close(nullfd).unwrap();
+ }
+ // Signal the parent process that we are done with the setup and it can
+ // terminate.
+ nix::unistd::write(pipe, &[0u8])?;
+ nix::unistd::close(pipe).unwrap();
+ }
+
+ let multithreaded = true;
+ session.run_loop(multithreaded)?;
+ } else {
+ bail!("unknown archive file extension (expected .pxar)");
+ }
+
+ Ok(Value::Null)
}
fn main() {
))
.completion_cb("repository", complete_repository);
+ let login_cmd_def = CliCommand::new(
+ ApiMethod::new(
+ api_login,
+ ObjectSchema::new("Try to login. If successful, store ticket.")
+ .optional("repository", REPO_URL_SCHEMA.clone())
+ ))
+ .completion_cb("repository", complete_repository);
+
+ let logout_cmd_def = CliCommand::new(
+ ApiMethod::new(
+ api_logout,
+ ObjectSchema::new("Logout (delete stored ticket).")
+ .optional("repository", REPO_URL_SCHEMA.clone())
+ ))
+ .completion_cb("repository", complete_repository);
+
+ let mount_cmd_def = CliCommand::new(
+ ApiMethod::new(
+ mount,
+ ObjectSchema::new("Mount pxar archive.")
+ .required("snapshot", StringSchema::new("Group/Snapshot path."))
+ .required("archive-name", StringSchema::new("Backup archive name."))
+ .required("target", StringSchema::new("Target directory path."))
+ .optional("repository", REPO_URL_SCHEMA.clone())
+ .optional("keyfile", StringSchema::new("Path to encryption key."))
+ .optional("verbose", BooleanSchema::new("Verbose output.").default(false))
+ ))
+ .arg_param(vec!["snapshot", "archive-name", "target"])
+ .completion_cb("repository", complete_repository)
+ .completion_cb("snapshot", complete_group_or_snapshot)
+ .completion_cb("archive-name", complete_archive_name)
+ .completion_cb("target", tools::complete_file_name);
+
let cmd_def = CliCommandMap::new()
.insert("backup".to_owned(), backup_cmd_def.into())
.insert("upload-log".to_owned(), upload_log_cmd_def.into())
.insert("catalog".to_owned(), catalog_cmd_def.into())
.insert("garbage-collect".to_owned(), garbage_collect_cmd_def.into())
.insert("list".to_owned(), list_cmd_def.into())
+ .insert("login".to_owned(), login_cmd_def.into())
+ .insert("logout".to_owned(), logout_cmd_def.into())
.insert("prune".to_owned(), prune_cmd_def.into())
.insert("restore".to_owned(), restore_cmd_def.into())
.insert("snapshots".to_owned(), snapshots_cmd_def.into())
.insert("files".to_owned(), files_cmd_def.into())
.insert("status".to_owned(), status_cmd_def.into())
- .insert("key".to_owned(), key_mgmt_cli().into());
+ .insert("key".to_owned(), key_mgmt_cli().into())
+ .insert("mount".to_owned(), mount_cmd_def.into());
- hyper::rt::run(futures::future::lazy(move || {
- run_cli_command(cmd_def.into());
- Ok(())
- }));
+ run_cli_command(cmd_def.into());
+}
+fn async_main<F: Future>(fut: F) -> <F as Future>::Output {
+ let rt = tokio::runtime::Runtime::new().unwrap();
+ let ret = rt.block_on(fut);
+ rt.shutdown_now();
+ ret
}
projects / proxmox-backup.git / blobdiff