]> git.proxmox.com Git - proxmox-backup.git/blobdiff - src/bin/proxmox-backup-client.rs
src/bin/proxmox-backup-client.rs: cleanup restore
[proxmox-backup.git] / src / bin / proxmox-backup-client.rs
index 4df7de160be02fa761cdddc98ee942193d2e537a..16c5f6a772f970b468ccf695edfa886c3ac60a35 100644 (file)
@@ -1,34 +1,82 @@
+//#[macro_use]
 extern crate proxmox_backup;
 
 use failure::*;
-//use std::os::unix::io::AsRawFd;
-use chrono::{DateTime, Local, TimeZone};
+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::HashMap;
+use std::collections::{HashSet, HashMap};
+use std::ffi::OsStr;
+use std::io::{BufReader, 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};
 
 use proxmox_backup::tools;
 use proxmox_backup::cli::*;
+use proxmox_backup::api2::types::*;
 use proxmox_backup::api_schema::*;
 use proxmox_backup::api_schema::router::*;
 use proxmox_backup::client::*;
 use proxmox_backup::backup::*;
+use proxmox_backup::pxar::{ self, catalog::* };
+
 //use proxmox_backup::backup::image_index::*;
 //use proxmox_backup::config::datastore;
 //use proxmox_backup::pxar::encoder::*;
 //use proxmox_backup::backup::datastore::*;
 
 use serde_json::{json, Value};
-use hyper::Body;
-use std::sync::Arc;
+//use hyper::Body;
+use std::sync::{Arc, Mutex};
 use regex::Regex;
 use xdg::BaseDirectories;
 
 use lazy_static::lazy_static;
+use futures::*;
+use tokio::sync::mpsc;
 
 lazy_static! {
-    static ref BACKUPSPEC_REGEX: Regex = Regex::new(r"^([a-zA-Z0-9_-]+\.(?:pxar|raw)):(.+)$").unwrap();
+    static ref BACKUPSPEC_REGEX: Regex = Regex::new(r"^([a-zA-Z0-9_-]+\.(?:pxar|img|conf|log)):(.+)$").unwrap();
+
+    static ref REPO_URL_SCHEMA: Arc<Schema> = Arc::new(
+        StringSchema::new("Repository URL.")
+            .format(BACKUP_REPO_URL.clone())
+            .max_length(256)
+            .into()
+    );
+}
+
+
+fn get_default_repository() -> Option<String> {
+    std::env::var("PBS_REPOSITORY").ok()
+}
+
+fn extract_repository_from_value(
+    param: &Value,
+) -> Result<BackupRepository, Error> {
+
+    let repo_url = param["repository"]
+        .as_str()
+        .map(String::from)
+        .or_else(get_default_repository)
+        .ok_or_else(|| format_err!("unable to get (default) repository"))?;
+
+    let repo: BackupRepository = repo_url.parse()?;
+
+    Ok(repo)
 }
 
+fn extract_repository_from_map(
+    param: &HashMap<String, String>,
+) -> Option<BackupRepository> {
+
+    param.get("repository")
+        .map(String::from)
+        .or_else(get_default_repository)
+        .and_then(|repo_url| repo_url.parse::<BackupRepository>().ok())
+}
 
 fn record_repository(repo: &BackupRepository) {
 
@@ -43,7 +91,7 @@ fn record_repository(repo: &BackupRepository) {
         _ => return,
     };
 
-    let mut data = tools::file_get_json(&path, None).unwrap_or(json!({}));
+    let mut data = file_get_json(&path, None).unwrap_or(json!({}));
 
     let repo = repo.to_string();
 
@@ -75,7 +123,7 @@ fn record_repository(repo: &BackupRepository) {
 
     let new_data = json!(map);
 
-    let _ = tools::file_set_contents(path, new_data.to_string().as_bytes(), None);
+    let _ = file_set_contents(path, new_data.to_string().as_bytes(), None);
 }
 
 fn complete_repository(_arg: &str, _param: &HashMap<String, String>) -> Vec<String> {
@@ -93,7 +141,7 @@ fn complete_repository(_arg: &str, _param: &HashMap<String, String>) -> Vec<Stri
         _ => return result,
     };
 
-    let data = tools::file_get_json(&path, None).unwrap_or(json!({}));
+    let data = file_get_json(&path, None).unwrap_or(json!({}));
 
     if let Some(map) = data.as_object() {
         for (repo, _count) in map {
@@ -104,142 +152,119 @@ fn complete_repository(_arg: &str, _param: &HashMap<String, String>) -> Vec<Stri
     result
 }
 
-fn backup_directory<P: AsRef<Path>>(
-    client: &mut HttpClient,
-    repo: &BackupRepository,
-    dir_path: P,
-    archive_name: &str,
-    backup_id: &str,
-    backup_time: DateTime<Local>,
-    chunk_size: Option<u64>,
-    all_file_systems: bool,
-    verbose: bool,
-) -> Result<(), Error> {
-
-    let mut param = json!({
-        "archive-name": archive_name,
-        "backup-type": "host",
-        "backup-id": backup_id,
-        "backup-time": backup_time.timestamp(),
-    });
-
-    if let Some(size) = chunk_size {
-        param["chunk-size"] = size.into();
-    }
-
-    let query = tools::json_object_to_query(param)?;
-
-    let path = format!("api2/json/admin/datastore/{}/pxar?{}", repo.store(), query);
-
-    let stream = PxarBackupStream::open(dir_path.as_ref(), all_file_systems, verbose)?;
-
-    let body = Body::wrap_stream(stream);
-
-    client.upload("application/x-proxmox-backup-pxar", body, &path)?;
+fn compute_file_csum(file: &mut std::fs::File) -> Result<([u8; 32], u64), Error> {
 
-    Ok(())
-}
+    file.seek(SeekFrom::Start(0))?;
 
-/****
-fn backup_image(datastore: &DataStore, file: &std::fs::File, size: usize, target: &str, chunk_size: usize) -> Result<(), Error> {
+    let mut hasher = openssl::sha::Sha256::new();
+    let mut buffer = proxmox::tools::vec::undefined(256*1024);
+    let mut size: u64 = 0;
 
-    let mut target = PathBuf::from(target);
-
-    if let Some(ext) = target.extension() {
-        if ext != "fidx" {
-            bail!("got wrong file extension - expected '.fidx'");
+    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;
         }
-    } else {
-        target.set_extension("fidx");
+        size += count as u64;
+        hasher.update(&buffer[..count]);
     }
 
-    let mut index = datastore.create_image_writer(&target, size, chunk_size)?;
-
-    tools::file_chunker(file, chunk_size, |pos, chunk| {
-        index.add_chunk(pos, chunk)?;
-        Ok(true)
-    })?;
-
-    index.close()?; // commit changes
+    let csum = hasher.finish();
 
-    Ok(())
+    Ok((csum, size))
 }
-*/
 
-fn strip_chunked_file_expenstions(list: Vec<String>) -> Vec<String> {
 
-    let mut result = vec![];
+async fn backup_directory<P: AsRef<Path>>(
+    client: &BackupClient,
+    dir_path: P,
+    archive_name: &str,
+    chunk_size: Option<usize>,
+    device_set: Option<HashSet<u64>>,
+    verbose: bool,
+    skip_lost_and_found: bool,
+    crypt_config: Option<Arc<CryptConfig>>,
+    catalog: Arc<Mutex<CatalogBlobWriter<std::fs::File>>>,
+) -> Result<BackupStats, Error> {
 
-    for file in list.into_iter() {
-        if file.ends_with(".didx") {
-            result.push(file[..file.len()-5].to_owned());
-        } else if file.ends_with(".fidx") {
-            result.push(file[..file.len()-5].to_owned());
-        } else {
-            result.push(file); // should not happen
-        }
-    }
+    let pxar_stream = PxarBackupStream::open(dir_path.as_ref(), device_set, verbose, skip_lost_and_found, catalog)?;
+    let mut chunk_stream = ChunkStream::new(pxar_stream, chunk_size);
 
-    result
-}
+    let (mut tx, rx) = mpsc::channel(10); // allow to buffer 10 chunks
 
-/* not used:
-fn list_backups(
-    param: Value,
-    _info: &ApiMethod,
-    _rpcenv: &mut RpcEnvironment,
-) -> Result<Value, Error> {
+    let stream = rx
+        .map_err(Error::from);
 
-    let repo_url = tools::required_string_param(&param, "repository")?;
-    let repo: BackupRepository = repo_url.parse()?;
+    // spawn chunker inside a separate task so that it can run parallel
+    tokio::spawn(async move {
+        let _ = tx.send_all(&mut chunk_stream).await;
+    });
 
-    let mut client = HttpClient::new(repo.host(), repo.user());
+    let stats = client
+        .upload_stream(archive_name, stream, "dynamic", None, crypt_config)
+        .await?;
 
-    let path = format!("api2/json/admin/datastore/{}/backups", repo.store());
+    Ok(stats)
+}
 
-    let result = client.get(&path)?;
+async fn backup_image<P: AsRef<Path>>(
+    client: &BackupClient,
+    image_path: P,
+    archive_name: &str,
+    image_size: u64,
+    chunk_size: Option<usize>,
+    _verbose: bool,
+    crypt_config: Option<Arc<CryptConfig>>,
+) -> Result<BackupStats, Error> {
 
-    record_repository(&repo);
+    let path = image_path.as_ref().to_owned();
 
-    // fixme: implement and use output formatter instead ..
-    let list = result["data"].as_array().unwrap();
+    let file = tokio::fs::File::open(path).await?;
 
-    for item in list {
+    let stream = tokio::codec::FramedRead::new(file, tokio::codec::BytesCodec::new())
+        .map_err(Error::from);
 
-        let id = item["backup-id"].as_str().unwrap();
-        let btype = item["backup-type"].as_str().unwrap();
-        let epoch = item["backup-time"].as_i64().unwrap();
+    let stream = FixedChunkStream::new(stream, chunk_size.unwrap_or(4*1024*1024));
 
-        let backup_dir = BackupDir::new(btype, id, epoch);
+    let stats = client
+        .upload_stream(archive_name, stream, "fixed", Some(image_size), crypt_config)
+        .await?;
 
-        let files = item["files"].as_array().unwrap().iter().map(|v| v.as_str().unwrap().to_owned()).collect();
-        let files = strip_chunked_file_expenstions(files);
+    Ok(stats)
+}
 
-        for filename in files {
-            let path = backup_dir.relative_path().to_str().unwrap().to_owned();
-            println!("{} | {}/{}", backup_dir.backup_time().format("%c"), path, filename);
-        }
-    }
+fn strip_server_file_expenstion(name: &str) -> String {
 
-    //Ok(result)
-    Ok(Value::Null)
+    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();
+    } else {
+        return name.to_owned(); // should not happen
+    }
 }
- */
 
 fn list_backup_groups(
     param: Value,
     _info: &ApiMethod,
-    _rpcenv: &mut RpcEnvironment,
+    _rpcenv: &mut dyn RpcEnvironment,
 ) -> Result<Value, Error> {
 
-    let repo_url = tools::required_string_param(&param, "repository")?;
-    let repo: BackupRepository = repo_url.parse()?;
+    let repo = extract_repository_from_value(&param)?;
 
-    let mut 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)?;
+    let mut result = async_main(async move {
+        client.get(&path, None).await
+    })?;
 
     record_repository(&repo);
 
@@ -260,58 +285,80 @@ fn list_backup_groups(
         }
     });
 
+    let output_format = param["output-format"].as_str().unwrap_or("text").to_owned();
+
+    let mut result = vec![];
+
     for item in list {
 
         let id = item["backup-id"].as_str().unwrap();
         let btype = item["backup-type"].as_str().unwrap();
         let epoch = item["last-backup"].as_i64().unwrap();
-        let last_backup = Local.timestamp(epoch, 0);
+        let last_backup = Utc.timestamp(epoch, 0);
         let backup_count = item["backup-count"].as_u64().unwrap();
 
         let group = BackupGroup::new(btype, id);
 
         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);
-
-        println!("{:20} | {} | {:5} | {}", path, last_backup.format("%c"),
-                 backup_count, tools::join(&files, ' '));
+        let files = item["files"].as_array().unwrap().iter()
+            .map(|v| strip_server_file_expenstion(v.as_str().unwrap())).collect();
+
+        if output_format == "text" {
+            println!(
+                "{:20} | {} | {:5} | {}",
+                path,
+                BackupDir::backup_time_to_string(last_backup),
+                backup_count,
+                tools::join(&files, ' '),
+            );
+        } else {
+            result.push(json!({
+                "backup-type": btype,
+                "backup-id": id,
+                "last-backup": epoch,
+                "backup-count": backup_count,
+                "files": files,
+            }));
+        }
     }
 
-    //Ok(result)
+    if output_format != "text" { format_and_print_result(&result.into(), &output_format); }
+
     Ok(Value::Null)
 }
 
 fn list_snapshots(
     param: Value,
     _info: &ApiMethod,
-    _rpcenv: &mut RpcEnvironment,
+    _rpcenv: &mut dyn RpcEnvironment,
 ) -> Result<Value, Error> {
 
-    let repo_url = tools::required_string_param(&param, "repository")?;
-    let repo: BackupRepository = repo_url.parse()?;
+    let repo = extract_repository_from_value(&param)?;
 
-    let path = tools::required_string_param(&param, "group")?;
-    let group = BackupGroup::parse(path)?;
+    let output_format = param["output-format"].as_str().unwrap_or("text").to_owned();
 
-    let query = tools::json_object_to_query(json!({
-        "backup-type": group.backup_type(),
-        "backup-id": group.backup_id(),
-    }))?;
+    let client = HttpClient::new(repo.host(), repo.user(), None)?;
 
-    let mut client = HttpClient::new(repo.host(), repo.user());
+    let path = format!("api2/json/admin/datastore/{}/snapshots", repo.store());
 
-    let path = format!("api2/json/admin/datastore/{}/snapshots?{}", repo.store(), query);
+    let mut args = json!({});
+    if let Some(path) = param["group"].as_str() {
+        let group = BackupGroup::parse(path)?;
+        args["backup-type"] = group.backup_type().into();
+        args["backup-id"] = group.backup_id().into();
+    }
 
-    // fixme: params
-    let result = client.get(&path)?;
+    let result = async_main(async move {
+        client.get(&path, Some(args)).await
+    })?;
 
     record_repository(&repo);
 
-    // fixme: implement and use output formatter instead ..
     let list = result["data"].as_array().unwrap();
 
+    let mut result = vec![];
+
     for item in list {
 
         let id = item["backup-id"].as_str().unwrap();
@@ -322,58 +369,208 @@ fn list_snapshots(
 
         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 = item["files"].as_array().unwrap().iter()
+            .map(|v|  strip_server_file_expenstion(v.as_str().unwrap())).collect();
 
-        println!("{} | {} | {}", path, snapshot.backup_time().format("%c"), tools::join(&files, ' '));
+        if output_format == "text" {
+            let size_str = if let Some(size) = item["size"].as_u64() {
+                size.to_string()
+            } else {
+                String::from("-")
+            };
+            println!("{} | {} | {}", path, size_str, tools::join(&files, ' '));
+        } else {
+            let mut data = json!({
+                "backup-type": btype,
+                "backup-id": id,
+                "backup-time": epoch,
+                "files": files,
+            });
+            if let Some(size) = item["size"].as_u64() {
+                data["size"] = size.into();
+            }
+            result.push(data);
+        }
     }
 
+    if output_format != "text" { format_and_print_result(&result.into(), &output_format); }
+
     Ok(Value::Null)
 }
 
 fn forget_snapshots(
     param: Value,
     _info: &ApiMethod,
-    _rpcenv: &mut RpcEnvironment,
+    _rpcenv: &mut dyn RpcEnvironment,
 ) -> Result<Value, Error> {
 
-    let repo_url = tools::required_string_param(&param, "repository")?;
-    let repo: BackupRepository = repo_url.parse()?;
+    let repo = extract_repository_from_value(&param)?;
 
     let path = tools::required_string_param(&param, "snapshot")?;
     let snapshot = BackupDir::parse(path)?;
 
-    let query = tools::json_object_to_query(json!({
-        "backup-type": snapshot.group().backup_type(),
-        "backup-id": snapshot.group().backup_id(),
-        "backup-time": snapshot.backup_time().timestamp(),
-    }))?;
-
-    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(), query);
+    let path = format!("api2/json/admin/datastore/{}/snapshots", repo.store());
 
-    let result = client.delete(&path)?;
+    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(&param)?;
+
+    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(&param)?;
+
+    delete_ticket_info(repo.host(), repo.user())?;
+
+    Ok(Value::Null)
+}
+
+fn dump_catalog(
+    param: Value,
+    _info: &ApiMethod,
+    _rpcenv: &mut dyn RpcEnvironment,
+) -> Result<Value, Error> {
+
+    let repo = extract_repository_from_value(&param)?;
+
+    let path = tools::required_string_param(&param, "snapshot")?;
+    let snapshot = BackupDir::parse(path)?;
+
+    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 client = HttpClient::new(repo.host(), repo.user(), None)?;
+
+    async_main(async move {
+        let client = client.start_backup_reader(
+            repo.store(),
+            &snapshot.group().backup_type(),
+            &snapshot.group().backup_id(),
+            snapshot.backup_time(), true).await?;
+
+        let backup_index_data = download_index_blob(client.clone(), crypt_config.clone()).await?;
+        let backup_index: Value = serde_json::from_slice(&backup_index_data[..])?;
+
+        let blob_file = std::fs::OpenOptions::new()
+            .read(true)
+            .write(true)
+            .custom_flags(libc::O_TMPFILE)
+            .open("/tmp")?;
+
+        let mut blob_file = client.download(CATALOG_BLOB_NAME, blob_file).await?;
+
+        let (csum, size) = compute_file_csum(&mut blob_file)?;
+        verify_index_file(&backup_index, CATALOG_BLOB_NAME, &csum, size)?;
+
+        blob_file.seek(SeekFrom::Start(0))?;
+
+        let reader = BufReader::new(blob_file);
+        let mut catalog_reader = CatalogBlobReader::new(reader, crypt_config)?;
+
+        catalog_reader.dump()?;
+
+        record_repository(&repo);
+
+        Ok::<(), Error>(())
+    })?;
+
+    Ok(Value::Null)
+}
+
+fn list_snapshot_files(
+    param: Value,
+    _info: &ApiMethod,
+    _rpcenv: &mut dyn RpcEnvironment,
+) -> Result<Value, Error> {
+
+    let repo = extract_repository_from_value(&param)?;
+
+    let path = tools::required_string_param(&param, "snapshot")?;
+    let snapshot = BackupDir::parse(path)?;
+
+    let output_format = param["output-format"].as_str().unwrap_or("text").to_owned();
+
+    let client = HttpClient::new(repo.host(), repo.user(), None)?;
+
+    let path = format!("api2/json/admin/datastore/{}/files", repo.store());
+
+    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 list: Value = result["data"].take();
+
+    if output_format == "text" {
+        for item in list.as_array().unwrap().iter() {
+            println!(
+                "{} {}",
+                strip_server_file_expenstion(item["filename"].as_str().unwrap()),
+                item["size"].as_u64().unwrap_or(0),
+            );
+        }
+    } else {
+        format_and_print_result(&list, &output_format);
+    }
+
+    Ok(Value::Null)
+}
+
 fn start_garbage_collection(
     param: Value,
     _info: &ApiMethod,
-    _rpcenv: &mut RpcEnvironment,
+    _rpcenv: &mut dyn RpcEnvironment,
 ) -> Result<Value, Error> {
 
-    let repo_url = tools::required_string_param(&param, "repository")?;
-    let repo: BackupRepository = repo_url.parse()?;
+    let repo = extract_repository_from_value(&param)?;
 
-    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)?;
+    let result = async_main(async move { client.post(&path, None).await })?;
 
     record_repository(&repo);
 
@@ -391,82 +588,270 @@ fn parse_backupspec(value: &str) -> Result<(&str, &str), Error> {
 fn create_backup(
     param: Value,
     _info: &ApiMethod,
-    _rpcenv: &mut RpcEnvironment,
+    _rpcenv: &mut dyn RpcEnvironment,
 ) -> Result<Value, Error> {
 
-    let repo_url = tools::required_string_param(&param, "repository")?;
+    let repo = extract_repository_from_value(&param)?;
 
     let backupspec_list = tools::required_array_param(&param, "backupspec")?;
 
-    let repo: BackupRepository = repo_url.parse()?;
-
     let all_file_systems = param["all-file-systems"].as_bool().unwrap_or(false);
 
+    let skip_lost_and_found = param["skip-lost-and-found"].as_bool().unwrap_or(false);
+
     let verbose = param["verbose"].as_bool().unwrap_or(false);
 
-    let chunk_size_opt = param["chunk-size"].as_u64().map(|v| v*1024);
+    let backup_time_opt = param["backup-time"].as_i64();
+
+    let chunk_size_opt = param["chunk-size"].as_u64().map(|v| (v*1024) as usize);
 
     if let Some(size) = chunk_size_opt {
         verify_chunk_size(size)?;
     }
 
-    let backup_id = param["host-id"].as_str().unwrap_or(&tools::nodename());
+    let keyfile = param["keyfile"].as_str().map(|p| PathBuf::from(p));
+
+    let backup_id = param["backup-id"].as_str().unwrap_or(&proxmox::tools::nodename());
+
+    let backup_type = param["backup-type"].as_str().unwrap_or("host");
+
+    let include_dev = param["include-dev"].as_array();
+
+    let mut devices = if all_file_systems { None } else { Some(HashSet::new()) };
+
+    if let Some(include_dev) = include_dev {
+        if all_file_systems {
+            bail!("option 'all-file-systems' conflicts with option 'include-dev'");
+        }
+
+        let mut set = HashSet::new();
+        for path in include_dev {
+            let path = path.as_str().unwrap();
+            let stat = nix::sys::stat::stat(path)
+                .map_err(|err| format_err!("fstat {:?} failed - {}", path, err))?;
+            set.insert(stat.st_dev);
+        }
+        devices = Some(set);
+    }
 
     let mut upload_list = vec![];
 
+    enum BackupType { PXAR, IMAGE, CONFIG, LOGFILE };
+
     for backupspec in backupspec_list {
         let (target, filename) = parse_backupspec(backupspec.as_str().unwrap())?;
 
-        let stat = match nix::sys::stat::stat(filename) {
-            Ok(s) => s,
-            Err(err) => bail!("unable to access '{}' - {}", filename, err),
-        };
+        use std::os::unix::fs::FileTypeExt;
 
-        if (stat.st_mode & libc::S_IFDIR) != 0 {
+        let metadata = std::fs::metadata(filename)
+            .map_err(|err| format_err!("unable to access '{}' - {}", filename, err))?;
+        let file_type = metadata.file_type();
 
-            upload_list.push((filename.to_owned(), target.to_owned()));
+        let extension = target.rsplit('.').next()
+            .ok_or(format_err!("missing target file extenion '{}'", target))?;
 
-        } else if (stat.st_mode & (libc::S_IFREG|libc::S_IFBLK)) != 0 {
-            if stat.st_size <= 0 { bail!("got strange file size '{}'", stat.st_size); }
-            let _size = stat.st_size as usize;
+        match extension {
+            "pxar" => {
+                if !file_type.is_dir() {
+                    bail!("got unexpected file type (expected directory)");
+                }
+                upload_list.push((BackupType::PXAR, filename.to_owned(), format!("{}.didx", target), 0));
+            }
+            "img" => {
 
-            panic!("implement me");
+                if !(file_type.is_file() || file_type.is_block_device()) {
+                    bail!("got unexpected file type (expected file or block device)");
+                }
 
-            //backup_image(&datastore, &file, size, &target, chunk_size)?;
+                let size = image_size(&PathBuf::from(filename))?;
 
-            // let idx = datastore.open_image_reader(target)?;
-            // idx.print_info();
+                if size == 0 { bail!("got zero-sized file '{}'", filename); }
 
-        } else {
-            bail!("unsupported file type (expected a directory, file or block device)");
+                upload_list.push((BackupType::IMAGE, filename.to_owned(), format!("{}.fidx", target), size));
+            }
+            "conf" => {
+                if !file_type.is_file() {
+                    bail!("got unexpected file type (expected regular file)");
+                }
+                upload_list.push((BackupType::CONFIG, filename.to_owned(), format!("{}.blob", target), metadata.len()));
+            }
+            "log" => {
+                if !file_type.is_file() {
+                    bail!("got unexpected file type (expected regular file)");
+                }
+                upload_list.push((BackupType::LOGFILE, filename.to_owned(), format!("{}.blob", target), metadata.len()));
+            }
+            _ => {
+                bail!("got unknown archive extension '{}'", extension);
+            }
         }
     }
 
-    let backup_time = Local.timestamp(Local::now().timestamp(), 0);
+    let backup_time = Utc.timestamp(backup_time_opt.unwrap_or(Utc::now().timestamp()), 0);
+
+    let client = HttpClient::new(repo.host(), repo.user(), None)?;
+    record_repository(&repo);
 
-    let mut client = HttpClient::new(repo.host(), repo.user());
+    println!("Starting backup: {}/{}/{}", backup_type, backup_id, BackupDir::backup_time_to_string(backup_time));
 
-    client.login()?; // login before starting backup
+    println!("Client name: {}", proxmox::tools::nodename());
 
-    record_repository(&repo);
+    let start_time = Local::now();
 
-    println!("Starting backup");
-    println!("Client name: {}", tools::nodename());
-    println!("Start Time: {}", backup_time.to_rfc3339());
+    println!("Starting protocol: {}", start_time.to_rfc3339_opts(chrono::SecondsFormat::Secs, false));
 
-    for (filename, target) in upload_list {
-        println!("Upload '{}' to '{:?}' as {}", filename, repo, target);
-        backup_directory(&mut client, &repo, &filename, &target, backup_id, backup_time,
-                         chunk_size_opt, all_file_systems, verbose)?;
-    }
+    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 = 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)
+            }
+        }
+    };
+
+    async_main(async move {
+        let client = client
+            .start_backup(repo.store(), backup_type, &backup_id, backup_time, verbose)
+            .await?;
+
+        let mut file_list = vec![];
+
+        // fixme: encrypt/sign catalog?
+         let catalog_file = std::fs::OpenOptions::new()
+            .write(true)
+            .read(true)
+            .custom_flags(libc::O_TMPFILE)
+            .open("/tmp")?;
+
+        let catalog = Arc::new(Mutex::new(CatalogBlobWriter::new_compressed(catalog_file)?));
+        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)
+                        .await?;
+                    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)
+                        .await?;
+                    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(),
+                    ).await?;
+                    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(),
+                    ).await?;
+                    file_list.push((target, stats));
+                }
+            }
+        }
 
-    let end_time = Local.timestamp(Local::now().timestamp(), 0);
-    let elapsed = end_time.signed_duration_since(backup_time);
-    println!("Duration: {}", elapsed);
+        // 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_file = mutex.into_inner().unwrap().finish()?;
 
-    println!("End Time: {}", end_time.to_rfc3339());
+            let target = CATALOG_BLOB_NAME;
 
-    Ok(Value::Null)
+            catalog_file.seek(SeekFrom::Start(0))?;
+
+            let stats = client.upload_blob(catalog_file, target).await?;
+            file_list.push((target.to_owned(), stats));
+        }
+
+        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?;
+            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);
+             */
+        }
+
+        // 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,
+        });
+
+        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)
+            .await?;
+
+        client.finish().await?;
+
+        let end_time = Local::now();
+        let elapsed = end_time.signed_duration_since(start_time);
+        println!("Duration: {}", elapsed);
+
+        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> {
@@ -493,101 +878,385 @@ fn complete_backup_source(arg: &str, param: &HashMap<String, String>) -> Vec<Str
 fn restore(
     param: Value,
     _info: &ApiMethod,
-    _rpcenv: &mut RpcEnvironment,
+    _rpcenv: &mut dyn RpcEnvironment,
 ) -> Result<Value, Error> {
+    async_main(restore_do(param))
+}
 
-    let repo_url = tools::required_string_param(&param, "repository")?;
-    let repo: BackupRepository = repo_url.parse()?;
+async fn download_index_blob(client: Arc<BackupReader>, crypt_config: Option<Arc<CryptConfig>>) -> Result<Vec<u8>, Error> {
 
-    let archive_name = tools::required_string_param(&param, "archive-name")?;
+    let index_data = client.download(INDEX_BLOB_NAME, Vec::with_capacity(64*1024)).await?;
+    let blob = DataBlob::from_raw(index_data)?;
+    blob.verify_crc()?;
+    blob.decode(crypt_config)
+}
 
-    let mut client = HttpClient::new(repo.host(), repo.user());
+fn verify_index_file(backup_index: &Value, name: &str, csum: &[u8; 32], size: u64) -> Result<(), Error> {
 
-    client.login()?; // login before starting
+    let files = backup_index["files"]
+        .as_array()
+        .ok_or_else(|| format_err!("mailformed index - missing 'files' property"))?;
 
-    record_repository(&repo);
+    let info = files.iter().find(|v| {
+        match v["filename"].as_str() {
+            Some(filename) => filename == name,
+            None => false,
+        }
+    });
 
-    let path = tools::required_string_param(&param, "snapshot")?;
+    let info = match info {
+        None => bail!("index does not contain file '{}'", name),
+        Some(info) => info,
+    };
 
-    let query;
+    match info["size"].as_u64() {
+        None => bail!("index does not contain property 'size' for file '{}'", name),
+        Some(expected_size) => {
+            if expected_size != size {
+                bail!("verify index failed - wrong size for file '{}' ({} != {}", name, expected_size, size);
+            }
+        }
+    };
 
-    if path.matches('/').count() == 1 {
-        let group = BackupGroup::parse(path)?;
+    match info["csum"].as_str() {
+        None => bail!("index does not contain property 'csum' for file '{}'", name),
+        Some(expected_csum) => {
+            let expected_csum = &proxmox::tools::hex_to_digest(expected_csum)?;
+            if expected_csum != csum {
+                bail!("verify index failed - wrong checksum for file '{}'", name);
+            }
+        }
+    };
 
-        let subquery = tools::json_object_to_query(json!({
-            "backup-type": group.backup_type(),
-            "backup-id": group.backup_id(),
-        }))?;
+    Ok(())
+}
 
-        let path = format!("api2/json/admin/datastore/{}/snapshots?{}", repo.store(), subquery);
-        let result = client.get(&path)?;
+fn dump_image<W: Write>(
+    client: Arc<BackupReader>,
+    crypt_config: Option<Arc<CryptConfig>>,
+    index: FixedIndexReader,
+    mut writer: W,
+) -> Result<(), Error> {
 
-        let list = result["data"].as_array().unwrap();
-        if list.len() == 0 {
-            bail!("backup group '{}' does not contain any snapshots:", path);
-        }
+    let most_used = index.find_most_used_chunks(8);
 
-        query = tools::json_object_to_query(json!({
-            "backup-type": group.backup_type(),
-            "backup-id": group.backup_id(),
-            "backup-time": list[0]["backup-time"].as_i64().unwrap(),
-            "archive-name": archive_name,
-        }))?;
-    } else {
-        let snapshot = BackupDir::parse(path)?;
+    let mut chunk_reader = RemoteChunkReader::new(client.clone(), crypt_config, most_used);
 
-        query = tools::json_object_to_query(json!({
-            "backup-type": snapshot.group().backup_type(),
-            "backup-id": snapshot.group().backup_id(),
-            "backup-time": snapshot.backup_time().timestamp(),
-            "archive-name": archive_name,
-        }))?;
+    // Note: we avoid using BufferedFixedReader, because that add an additional buffer/copy
+    // and thus slows down reading. Instead, directly use RemoteChunkReader
+
+    let mut size: usize = 0;
+
+    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)?;
     }
 
+    Ok(())
+}
+
+async fn restore_do(param: Value) -> Result<Value, Error> {
+    let repo = extract_repository_from_value(&param)?;
+
+    let verbose = param["verbose"].as_bool().unwrap_or(false);
+
+    let allow_existing_dirs = param["allow-existing-dirs"].as_bool().unwrap_or(false);
+
+    let archive_name = tools::required_string_param(&param, "archive-name")?;
+
+    let client = HttpClient::new(repo.host(), repo.user(), None)?;
+
+    record_repository(&repo);
+
+    let path = tools::required_string_param(&param, "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.len() == 0 {
+            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 target = tools::required_string_param(&param, "target")?;
+    let target = if target == "-" { None } else { Some(target) };
 
-    if archive_name.ends_with(".pxar") {
-        let path = format!("api2/json/admin/datastore/{}/pxar?{}", repo.store(), query);
+    let keyfile = param["keyfile"].as_str().map(|p| PathBuf::from(p));
 
-        println!("DOWNLOAD FILE {} to {}", path, target);
+    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 target = PathBuf::from(target);
-        let writer = PxarDecodeWriter::new(&target, true)?;
-        client.download(&path, Box::new(writer))?;
+    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 file extensions - unable to download '{}'", archive_name);
+        format!("{}.blob", archive_name)
+    };
+
+    let client = client
+        .start_backup_reader(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 backup_index_data = download_index_blob(client.clone(), crypt_config.clone()).await?;
+    let backup_index: Value = serde_json::from_slice(&backup_index_data[..])?;
+
+    if server_archive_name == INDEX_BLOB_NAME {
+        if let Some(target) = target {
+            file_set_contents(target, &backup_index_data, None)?;
+        } else {
+            let stdout = std::io::stdout();
+            let mut writer = stdout.lock();
+            writer.write_all(&backup_index_data)
+                .map_err(|err| format_err!("unable to pipe data - {}", err))?;
+        }
+
+    } 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)?;
+        verify_index_file(&backup_index, &server_archive_name, &csum, size)?;
+
+        tmpfile.seek(SeekFrom::Start(0))?;
+        let mut reader = DataBlobReader::new(tmpfile, crypt_config)?;
+
+        if let Some(target) = target {
+           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();
+            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).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();
+
+        verify_index_file(&backup_index, &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 mut reader = BufferedDynamicReader::new(index, chunk_reader);
+
+        if let Some(target) = target {
+
+            let feature_flags = pxar::flags::DEFAULT;
+            let mut decoder = pxar::SequentialDecoder::new(&mut reader, feature_flags, |path| {
+                if verbose {
+                    println!("{:?}", path);
+                }
+                Ok(())
+            });
+            decoder.set_allow_existing_dirs(allow_existing_dirs);
+
+
+            decoder.restore(Path::new(target), &Vec::new())?;
+        } else {
+            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).await?;
+
+        let index = FixedIndexReader::new(tmpfile)
+            .map_err(|err| format_err!("unable to read fixed index '{}' - {}", archive_name, err))?;
+
+        // Note: do not use values stored in index (not trusted) - instead, computed them again
+        let (csum, size) = index.compute_csum();
+
+        verify_index_file(&backup_index, &server_archive_name, &csum, size)?;
+
+        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))?
+        } else {
+            std::fs::OpenOptions::new()
+                .write(true)
+                .open("/dev/stdout")
+                .map_err(|err| format_err!("unable to open /dev/stdout - {}", err))?
+        };
+
+        dump_image(client.clone(), crypt_config.clone(), index, &mut writer)?;
+
+     } else {
+        bail!("unknown archive file extension (expected .pxar of .img)");
     }
 
     Ok(Value::Null)
 }
 
+fn upload_log(
+    param: Value,
+    _info: &ApiMethod,
+    _rpcenv: &mut dyn RpcEnvironment,
+) -> Result<Value, Error> {
+
+    let logfile = tools::required_string_param(&param, "logfile")?;
+    let repo = extract_repository_from_value(&param)?;
+
+    let snapshot = tools::required_string_param(&param, "snapshot")?;
+    let snapshot = BackupDir::parse(snapshot)?;
+
+    let mut client = HttpClient::new(repo.host(), repo.user(), None)?;
+
+    let keyfile = param["keyfile"].as_str().map(|p| PathBuf::from(p));
+
+    let crypt_config = match keyfile {
+        None => None,
+        Some(path) => {
+            let (key, _created) = load_and_decrtypt_key(&path, get_encryption_key_password)?;
+            let crypt_config = CryptConfig::new(key)?;
+            Some(Arc::new(crypt_config))
+        }
+    };
+
+    let data = file_get_contents(logfile)?;
+
+    let blob = DataBlob::encode(&data, crypt_config, true)?;
+
+    let raw_data = blob.into_inner();
+
+    let path = format!("api2/json/admin/datastore/{}/upload-backup-log", repo.store());
+
+    let args = json!({
+        "backup-type": snapshot.group().backup_type(),
+        "backup-id":  snapshot.group().backup_id(),
+        "backup-time": snapshot.backup_time().timestamp(),
+    });
+
+    let body = hyper::Body::from(raw_data);
+
+    async_main(async move {
+        client.upload("application/octet-stream", body, &path, Some(args)).await
+    })
+}
+
 fn prune(
     mut param: Value,
     _info: &ApiMethod,
-    _rpcenv: &mut RpcEnvironment,
+    _rpcenv: &mut dyn RpcEnvironment,
 ) -> Result<Value, Error> {
 
-    let repo_url = tools::required_string_param(&param, "repository")?;
-    let repo: BackupRepository = repo_url.parse()?;
+    let repo = extract_repository_from_value(&param)?;
 
-    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());
 
+    let group = tools::required_string_param(&param, "group")?;
+    let group = BackupGroup::parse(group)?;
+
     param.as_object_mut().unwrap().remove("repository");
+    param.as_object_mut().unwrap().remove("group");
+
+    param["backup-type"] = group.backup_type().into();
+    param["backup-id"] = group.backup_id().into();
 
-    let result = client.post_json(&path, param)?;
+    let _result = async_main(async move { client.post(&path, Some(param)).await })?;
 
     record_repository(&repo);
 
-    Ok(result)
+    Ok(Value::Null)
 }
 
-fn try_get(repo: &BackupRepository, url: &str) -> Value {
+fn status(
+    param: Value,
+    _info: &ApiMethod,
+    _rpcenv: &mut dyn RpcEnvironment,
+) -> Result<Value, Error> {
+
+    let repo = extract_repository_from_value(&param)?;
 
-    let mut client = HttpClient::new(repo.host(), repo.user());
+    let output_format = param["output-format"].as_str().unwrap_or("text").to_owned();
+
+    let client = HttpClient::new(repo.host(), repo.user(), None)?;
+
+    let path = format!("api2/json/admin/datastore/{}/status", repo.store());
+
+    let result = async_main(async move { client.get(&path, None).await })?;
+    let data = &result["data"];
+
+    record_repository(&repo);
+
+    if output_format == "text" {
+        let total = data["total"].as_u64().unwrap();
+        let used = data["used"].as_u64().unwrap();
+        let avail = data["avail"].as_u64().unwrap();
+        let roundup = total/200;
+
+        println!(
+            "total: {} used: {} ({} %) available: {}",
+            total,
+            used,
+            ((used+roundup)*100)/total,
+            avail,
+        );
+    } else {
+        format_and_print_result(data, &output_format);
+    }
+
+    Ok(Value::Null)
+}
 
-    let mut resp = match client.try_get(url) {
+// like get, but simply ignore errors and return Null instead
+async fn try_get(repo: &BackupRepository, url: &str) -> Value {
+
+    let client = match HttpClient::new(repo.host(), repo.user(), None) {
+        Ok(v) => v,
+        _ => return Value::Null,
+    };
+
+    let mut resp = match client.get(url, None).await {
         Ok(v) => v,
         _ => return Value::Null,
     };
@@ -600,33 +1269,22 @@ fn try_get(repo: &BackupRepository, url: &str) -> Value {
     Value::Null
 }
 
-fn extract_repo(param: &HashMap<String, String>) -> Option<BackupRepository> {
-
-    let repo_url = match param.get("repository") {
-        Some(v) => v,
-        _ => return None,
-    };
-
-    let repo: BackupRepository = match repo_url.parse() {
-        Ok(v) => v,
-        _ => return None,
-    };
-
-    Some(repo)
+fn complete_backup_group(_arg: &str, param: &HashMap<String, String>) -> Vec<String> {
+    async_main(async { complete_backup_group_do(param).await })
 }
 
-fn complete_backup_group(_arg: &str, param: &HashMap<String, String>) -> Vec<String> {
+async fn complete_backup_group_do(param: &HashMap<String, String>) -> Vec<String> {
 
     let mut result = vec![];
 
-    let repo = match extract_repo(param) {
+    let repo = match extract_repository_from_map(param) {
         Some(v) => v,
         _ => return result,
     };
 
     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 {
@@ -642,16 +1300,14 @@ fn complete_backup_group(_arg: &str, param: &HashMap<String, String>) -> Vec<Str
 }
 
 fn complete_group_or_snapshot(arg: &str, param: &HashMap<String, String>) -> Vec<String> {
+    async_main(async { complete_group_or_snapshot_do(arg, param).await })
+}
 
-    let mut result = vec![];
-
-     let repo = match extract_repo(param) {
-        Some(v) => v,
-        _ => return result,
-    };
+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());
             result.push(format!("{}/", group));
@@ -659,15 +1315,25 @@ fn complete_group_or_snapshot(arg: &str, param: &HashMap<String, String>) -> Vec
         return result;
     }
 
-    let mut parts = arg.split('/');
-    let query = tools::json_object_to_query(json!({
-        "backup-type": parts.next().unwrap(),
-        "backup-id": parts.next().unwrap(),
-    })).unwrap();
+    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(), query);
+    let repo = match extract_repository_from_map(param) {
+        Some(v) => v,
+        _ => return result,
+    };
 
-    let data = try_get(&repo, &path);
+    let path = format!("api2/json/admin/datastore/{}/snapshots", repo.store());
+
+    let data = try_get(&repo, &path).await;
 
     if let Some(list) = data.as_array() {
         for item in list {
@@ -683,11 +1349,15 @@ fn complete_group_or_snapshot(arg: &str, param: &HashMap<String, String>) -> Vec
     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> {
+    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 repo = match extract_repo(param) {
+    let repo = match extract_repository_from_map(param) {
         Some(v) => v,
         _ => return result,
     };
@@ -710,17 +1380,24 @@ fn complete_archive_name(_arg: &str, param: &HashMap<String, String>) -> Vec<Str
 
     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 {
-            if let Some(filename) = item.as_str() {
+            if let Some(filename) = item["filename"].as_str() {
                 result.push(filename.to_owned());
             }
         }
     }
 
-    strip_chunked_file_expenstions(result)
+    result
+}
+
+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()
 }
 
 fn complete_chunk_size(_arg: &str, _param: &HashMap<String, String>) -> Vec<String> {
@@ -737,15 +1414,395 @@ fn complete_chunk_size(_arg: &str, _param: &HashMap<String, String>) -> Vec<Stri
     result
 }
 
-fn main() {
+fn get_encryption_key_password() -> Result<Vec<u8>, Error> {
 
-    let repo_url_schema: Arc<Schema> = Arc::new(
-        StringSchema::new("Repository URL.")
-            .format(BACKUP_REPO_URL.clone())
-            .max_length(256)
+    // fixme: implement other input methods
+
+    use std::env::VarError::*;
+    match std::env::var("PBS_ENCRYPTION_PASSWORD") {
+        Ok(p) => return Ok(p.as_bytes().to_vec()),
+        Err(NotUnicode(_)) => bail!("PBS_ENCRYPTION_PASSWORD contains bad characters"),
+        Err(NotPresent) => {
+            // Try another method
+        }
+    }
+
+    // If we're on a TTY, query the user for a password
+    if crate::tools::tty::stdin_isatty() {
+        return Ok(crate::tools::tty::read_password("Encryption Key Password: ")?);
+    }
+
+    bail!("no password input mechanism available");
+}
+
+fn key_create(
+    param: Value,
+    _info: &ApiMethod,
+    _rpcenv: &mut dyn RpcEnvironment,
+) -> Result<Value, Error> {
+
+    let path = tools::required_string_param(&param, "path")?;
+    let path = PathBuf::from(path);
+
+    let kdf = param["kdf"].as_str().unwrap_or("scrypt");
+
+    let key = proxmox::sys::linux::random_data(32)?;
+
+    if kdf == "scrypt" {
+        // always read passphrase 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 key_config = encrypt_key_with_passphrase(&key, &password)?;
+
+        store_key_config(&path, false, key_config)?;
+
+        Ok(Value::Null)
+    } else if kdf == "none" {
+        let created =  Local.timestamp(Local::now().timestamp(), 0);
+
+        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")?;
+
+    // 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 path = tools::required_string_param(&param, "path")?;
+    let path = PathBuf::from(path);
+
+    let pem_data = file_get_contents(&path)?;
+
+    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()?;
+
+    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 create master key - no tty");
+    }
+
+    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("Master Key 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 pub_key: Vec<u8> = pkey.public_key_to_pem()?;
+    let filename_pub = "master-public.pem";
+    println!("Writing public master key to {}", filename_pub);
+    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);
+    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(&param, "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 {
+
+    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("path", StringSchema::new("File system path."))
+                .optional("kdf", kdf_schema.clone())
+        ))
+        .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("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!["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 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));
+    }
+
+    // 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 { child: _, .. }) => {
+            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(&param)?;
+    let archive_name = tools::required_string_param(&param, "archive-name")?;
+    let target = tools::required_string_param(&param, "target")?;
+    let client = HttpClient::new(repo.host(), repo.user(), None)?;
+
+    record_repository(&repo);
+
+    let path = tools::required_string_param(&param, "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.len() == 0 {
+            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(|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 {
+        bail!("Can only mount pxar archives.");
+    };
+
+    let client = client
+        .start_backup_reader(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 backup_index_data = download_index_blob(client.clone(), crypt_config.clone()).await?;
+    let backup_index: Value = serde_json::from_slice(&backup_index_data[..])?;
+    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();
+        verify_index_file(&backup_index, &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, &mut [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() {
+
     let backup_source_schema: Arc<Schema> = Arc::new(
         StringSchema::new("Backup source specification ([<label>:<path>]).")
             .format(Arc::new(ApiStringFormat::Pattern(&BACKUPSPEC_REGEX)))
@@ -756,7 +1813,6 @@ fn main() {
         ApiMethod::new(
             create_backup,
             ObjectSchema::new("Create (host) backup.")
-                .required("repository", repo_url_schema.clone())
                 .required(
                     "backupspec",
                     ArraySchema::new(
@@ -764,12 +1820,35 @@ fn main() {
                         backup_source_schema,
                     ).min_length(1)
                 )
+                .optional("repository", REPO_URL_SCHEMA.clone())
+                .optional(
+                    "include-dev",
+                    ArraySchema::new(
+                        "Include mountpoints with same st_dev number (see ``man fstat``) as specified files.",
+                        StringSchema::new("Path to file.").into()
+                    )
+                )
+                .optional(
+                    "keyfile",
+                    StringSchema::new("Path to encryption key. All data will be encrypted using this key."))
                 .optional(
                     "verbose",
                     BooleanSchema::new("Verbose output.").default(false))
                 .optional(
-                    "host-id",
-                    StringSchema::new("Use specified ID for the backup group name ('host/<id>'). The default is the system hostname."))
+                    "skip-lost-and-found",
+                    BooleanSchema::new("Skip lost+found directory").default(false))
+                .optional(
+                    "backup-type",
+                    BACKUP_TYPE_SCHEMA.clone()
+                )
+                .optional(
+                    "backup-id",
+                    BACKUP_ID_SCHEMA.clone()
+                )
+                .optional(
+                    "backup-time",
+                    BACKUP_TIME_SCHEMA.clone()
+                )
                 .optional(
                     "chunk-size",
                     IntegerSchema::new("Chunk size in KB. Must be a power of 2.")
@@ -778,28 +1857,47 @@ fn main() {
                         .default(4096)
                 )
         ))
-        .arg_param(vec!["repository", "backupspec"])
+        .arg_param(vec!["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 upload_log_cmd_def = CliCommand::new(
+        ApiMethod::new(
+            upload_log,
+            ObjectSchema::new("Upload backup log file.")
+                .required("snapshot", StringSchema::new("Snapshot path."))
+                .required("logfile", StringSchema::new("The path to the log file you want to upload."))
+                .optional("repository", REPO_URL_SCHEMA.clone())
+                .optional(
+                    "keyfile",
+                    StringSchema::new("Path to encryption key. All data will be encrypted using this key."))
+        ))
+        .arg_param(vec!["snapshot", "logfile"])
+        .completion_cb("snapshot", complete_backup_snapshot)
+        .completion_cb("logfile", tools::complete_file_name)
+        .completion_cb("keyfile", tools::complete_file_name)
+        .completion_cb("repository", complete_repository);
+
     let list_cmd_def = CliCommand::new(
         ApiMethod::new(
             list_backup_groups,
             ObjectSchema::new("List backup groups.")
-                .required("repository", repo_url_schema.clone())
+                .optional("repository", REPO_URL_SCHEMA.clone())
+                .optional("output-format", OUTPUT_FORMAT.clone())
         ))
-        .arg_param(vec!["repository"])
         .completion_cb("repository", complete_repository);
 
     let snapshots_cmd_def = CliCommand::new(
         ApiMethod::new(
             list_snapshots,
             ObjectSchema::new("List backup snapshots.")
-                .required("repository", repo_url_schema.clone())
-                .required("group", StringSchema::new("Backup group."))
+                .optional("group", StringSchema::new("Backup group."))
+                .optional("repository", REPO_URL_SCHEMA.clone())
+                .optional("output-format", OUTPUT_FORMAT.clone())
         ))
-        .arg_param(vec!["repository", "group"])
+        .arg_param(vec!["group"])
         .completion_cb("group", complete_backup_group)
         .completion_cb("repository", complete_repository);
 
@@ -807,57 +1905,150 @@ fn main() {
         ApiMethod::new(
             forget_snapshots,
             ObjectSchema::new("Forget (remove) backup snapshots.")
-                .required("repository", repo_url_schema.clone())
                 .required("snapshot", StringSchema::new("Snapshot path."))
+                .optional("repository", REPO_URL_SCHEMA.clone())
         ))
-        .arg_param(vec!["repository", "snapshot"])
+        .arg_param(vec!["snapshot"])
         .completion_cb("repository", complete_repository)
-        .completion_cb("snapshot", complete_group_or_snapshot);
+        .completion_cb("snapshot", complete_backup_snapshot);
 
     let garbage_collect_cmd_def = CliCommand::new(
         ApiMethod::new(
             start_garbage_collection,
             ObjectSchema::new("Start garbage collection for a specific repository.")
-                .required("repository", repo_url_schema.clone())
+                .optional("repository", REPO_URL_SCHEMA.clone())
         ))
-        .arg_param(vec!["repository"])
         .completion_cb("repository", complete_repository);
 
     let restore_cmd_def = CliCommand::new(
         ApiMethod::new(
             restore,
             ObjectSchema::new("Restore backup repository.")
-                .required("repository", repo_url_schema.clone())
                 .required("snapshot", StringSchema::new("Group/Snapshot path."))
                 .required("archive-name", StringSchema::new("Backup archive name."))
-                .required("target", StringSchema::new("Target directory path."))
+                .required("target", StringSchema::new(r###"Target directory path. Use '-' to write to stdandard output.
+
+We do not extraxt '.pxar' archives when writing to stdandard output.
+
+"###
+                ))
+                .optional(
+                    "allow-existing-dirs",
+                    BooleanSchema::new("Do not fail if directories already exists.").default(false))
+                .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!["repository", "snapshot", "archive-name", "target"])
+        .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 files_cmd_def = CliCommand::new(
+        ApiMethod::new(
+            list_snapshot_files,
+            ObjectSchema::new("List snapshot files.")
+                .required("snapshot", StringSchema::new("Snapshot path."))
+                .optional("repository", REPO_URL_SCHEMA.clone())
+                .optional("output-format", OUTPUT_FORMAT.clone())
+        ))
+        .arg_param(vec!["snapshot"])
+        .completion_cb("repository", complete_repository)
+        .completion_cb("snapshot", complete_backup_snapshot);
+
+    let catalog_cmd_def = CliCommand::new(
+        ApiMethod::new(
+            dump_catalog,
+            ObjectSchema::new("Dump catalog.")
+                .required("snapshot", StringSchema::new("Snapshot path."))
+                .optional("repository", REPO_URL_SCHEMA.clone())
+        ))
+        .arg_param(vec!["snapshot"])
+        .completion_cb("repository", complete_repository)
+        .completion_cb("snapshot", complete_backup_snapshot);
+
     let prune_cmd_def = CliCommand::new(
         ApiMethod::new(
             prune,
             proxmox_backup::api2::admin::datastore::add_common_prune_prameters(
                 ObjectSchema::new("Prune backup repository.")
-                    .required("repository", repo_url_schema.clone())
+                    .required("group", StringSchema::new("Backup group."))
+                    .optional("repository", REPO_URL_SCHEMA.clone())
             )
         ))
-        .arg_param(vec!["repository"])
+        .arg_param(vec!["group"])
+        .completion_cb("group", complete_backup_group)
+        .completion_cb("repository", complete_repository);
+
+    let status_cmd_def = CliCommand::new(
+        ApiMethod::new(
+            status,
+            ObjectSchema::new("Get repository status.")
+                .optional("repository", REPO_URL_SCHEMA.clone())
+                .optional("output-format", OUTPUT_FORMAT.clone())
+        ))
+        .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("forget".to_owned(), forget_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("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("mount".to_owned(), mount_cmd_def.into());
 
     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
 }