bump version to 1.1.14-1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "proxmox-backup"
-version = "2.0.12"
+version = "1.1.14"
 authors = [
     "Dietmar Maurer <dietmar@proxmox.com>",
     "Dominik Csapak <d.csapak@proxmox.com>",
@@ -15,31 +15,10 @@ edition = "2018"
 license = "AGPL-3"
 description = "Proxmox Backup"
 homepage = "https://www.proxmox.com"
+build = "build.rs"
 
 exclude = [ "build", "debian", "tests/catar_data/test_symlink/symlink1"]
 
-[workspace]
-members = [
-    "pbs-buildcfg",
-    "pbs-client",
-    "pbs-config",
-    "pbs-datastore",
-    "pbs-fuse-loop",
-    "pbs-runtime",
-    "proxmox-rest-server",
-    "proxmox-rrd-api-types",
-    "proxmox-rrd",
-    "proxmox-systemd",
-    "pbs-tape",
-    "pbs-tools",
-
-    "proxmox-backup-banner",
-    "proxmox-backup-client",
-    "proxmox-file-restore",
-    "proxmox-restore-daemon",
-    "pxar-bin",
-]
-
 [lib]
 name = "proxmox_backup"
 path = "src/lib.rs"
@@ -54,11 +33,11 @@ endian_trait = { version = "0.6", features = ["arrays"] }
 env_logger = "0.7"
 flate2 = "1.0"
 anyhow = "1.0"
+foreign-types = "0.3"
 thiserror = "1.0"
 futures = "0.3"
 h2 = { version = "0.3", features = [ "stream" ] }
 handlebars = "3.0"
-hex = "0.4.3"
 http = "0.2"
 hyper = { version = "0.14", features = [ "full" ] }
 lazy_static = "1.4"
@@ -71,6 +50,8 @@ openssl = "0.10"
 pam = "0.7"
 pam-sys = "0.5"
 percent-encoding = "2.1"
+pin-utils = "0.1.0"
+pin-project = "1.0"
 regex = "1.2"
 rustyline = "7"
 serde = { version = "1.0", features = ["derive"] }
@@ -88,49 +69,24 @@ url = "2.1"
 walkdir = "2"
 webauthn-rs = "0.2.5"
 xdg = "2.2"
+zstd = { version = "0.4", features = [ "bindgen" ] }
 nom = "5.1"
 crossbeam-channel = "0.5"
 
-# Used only by examples currently:
-zstd = { version = "0.6", features = [ "bindgen" ] }
-
 pathpatterns = "0.1.2"
 pxar = { version = "0.10.1", features = [ "tokio-io" ] }
 
-proxmox = { version = "0.14.0", features = [ "sortable-macro" ] }
+proxmox = { version = "0.11.6", features = [ "sortable-macro", "api-macro", "cli", "router", "tfa" ] }
-proxmox-http = { version = "0.5.0", features = [ "client", "http-helpers", "websocket" ] }
+proxmox-acme-rs = "0.3"
-proxmox-io = "1"
+proxmox-fuse = "0.1.1"
-proxmox-lang = "1"
+proxmox-http = { version = "0.2.1", features = [ "client", "http-helpers", "websocket" ] }
-proxmox-router = { version = "1", features = [ "cli" ] }
-proxmox-schema = { version = "1", features = [ "api-macro" ] }
-proxmox-section-config = "1"
-proxmox-tfa = { version = "1", features = [ "u2f" ] }
-proxmox-time = "1"
-proxmox-uuid = "1"
-
-proxmox-acme-rs = "0.2.1"
-proxmox-apt = "0.8.0"
-proxmox-openid = "0.8.0"
-
-pbs-api-types = { path = "pbs-api-types" }
-pbs-buildcfg = { path = "pbs-buildcfg" }
-pbs-client = { path = "pbs-client" }
-pbs-config = { path = "pbs-config" }
-pbs-datastore = { path = "pbs-datastore" }
-pbs-runtime = { path = "pbs-runtime" }
-proxmox-rest-server = { path = "proxmox-rest-server" }
-proxmox-rrd-api-types = { path = "proxmox-rrd-api-types" }
-proxmox-rrd = { path = "proxmox-rrd" }
-proxmox-systemd = { path = "proxmox-systemd" }
-pbs-tools = { path = "pbs-tools" }
-pbs-tape = { path = "pbs-tape" }
 
 # Local path overrides
 # NOTE: You must run `cargo update` after changing this for it to take effect!
 [patch.crates-io]
-#proxmox = { path = "../proxmox/proxmox" }
+#proxmox = { path = "../proxmox/proxmox", features = [ "sortable-macro", "api-macro", "cli", "router", "tfa" ] }
-#proxmox-http = { path = "../proxmox/proxmox-http" }
+#proxmox-http = { path = "../proxmox/proxmox-http", features = [ "client", "http-helpers", "websocket" ] }
-#pxar = { path = "../pxar" }
+#pxar = { path = "../pxar", features = [ "tokio-io" ] }
 
 [features]
 default = []

Makefile

@@ -17,8 +17,7 @@ USR_BIN := \
 
 # Binaries usable by admins
 USR_SBIN := \
-	proxmox-backup-manager \
+	proxmox-backup-manager
-	proxmox-backup-debug \
 
 # Binaries for services:
 SERVICE_BIN := \
@@ -31,26 +30,6 @@ SERVICE_BIN := \
 RESTORE_BIN := \
 	proxmox-restore-daemon
 
-SUBCRATES := \
-	pbs-api-types \
-	pbs-buildcfg \
-	pbs-client \
-	pbs-config \
-	pbs-datastore \
-	pbs-fuse-loop \
-	pbs-runtime \
-	proxmox-rest-server \
-	proxmox-rrd-api-types \
-	proxmox-rrd \
-	proxmox-systemd \
-	pbs-tape \
-	pbs-tools \
-	proxmox-backup-banner \
-	proxmox-backup-client \
-	proxmox-file-restore \
-	proxmox-restore-daemon \
-	pxar-bin
-
 ifeq ($(BUILD_MODE), release)
 CARGO_BUILD_ARGS += --release
 COMPILEDIR := target/release
@@ -78,15 +57,13 @@ RESTORE_DBG_DEB=proxmox-backup-file-restore-dbgsym_${DEB_VERSION}_${ARCH}.deb
 DOC_DEB=${PACKAGE}-docs_${DEB_VERSION}_all.deb
 
 DEBS=${SERVER_DEB} ${SERVER_DBG_DEB} ${CLIENT_DEB} ${CLIENT_DBG_DEB} \
-     ${RESTORE_DEB} ${RESTORE_DBG_DEB} ${DEBUG_DEB} ${DEBUG_DBG_DEB}
+     ${RESTORE_DEB} ${RESTORE_DBG_DEB}
 
 DSC = rust-${PACKAGE}_${DEB_VERSION}.dsc
 
 DESTDIR=
 
-tests ?= --workspace
+all: cargo-build $(SUBDIRS)
-
-all: $(SUBDIRS)
 
 .PHONY: $(SUBDIRS)
 $(SUBDIRS):
@@ -98,23 +75,25 @@ test:
 	$(CARGO) test $(tests) $(CARGO_BUILD_ARGS)
 
 doc:
-	$(CARGO) doc --workspace --no-deps $(CARGO_BUILD_ARGS)
+	$(CARGO) doc --no-deps $(CARGO_BUILD_ARGS)
 
 # always re-create this dir
 .PHONY: build
 build:
-	@echo "Setting pkg-buildcfg version to: $(DEB_VERSION_UPSTREAM)"
-	sed -i -e 's/^version =.*$$/version = "$(DEB_VERSION_UPSTREAM)"/' \
-	  pbs-buildcfg/Cargo.toml
 	rm -rf build
-	mkdir build
+	rm -f debian/control
-	cp -a debian \
+	debcargo package \
-	  Cargo.toml src \
+	   --config debian/debcargo.toml \
-	  $(SUBCRATES) \
+	   --changelog-ready \
-	  docs etc examples tests www zsh-completions \
+	   --no-overlay-write-back \
-	  defines.mk Makefile \
+	   --directory build \
-	  ./build/
+	   proxmox-backup \
-	rm -f build/Cargo.lock
+	   $(shell dpkg-parsechangelog -l debian/changelog -SVersion | sed -e 's/-.*//')
+	sed -e '1,/^$$/ ! d' build/debian/control > build/debian/control.src
+	cat build/debian/control.src build/debian/control.in > build/debian/control
+	rm build/debian/control.in build/debian/control.src
+	cp build/debian/control debian/control
+	rm build/Cargo.lock
 	find build/debian -name "*.hint" -delete
 	$(foreach i,$(SUBDIRS), \
 	    $(MAKE) -C build/$(i) clean ;)
@@ -144,61 +123,27 @@ $(DSC): build
 	cd build; dpkg-buildpackage -S -us -uc -d -nc
 	lintian $(DSC)
 
-.PHONY: clean distclean deb clean
 distclean: clean
-clean: clean-deb
+
+clean:
 	$(foreach i,$(SUBDIRS), \
 	    $(MAKE) -C $(i) clean ;)
 	$(CARGO) clean
-	rm -f .do-cargo-build
+	rm -rf *.deb *.dsc *.tar.gz *.buildinfo *.changes build
 	find . -name '*~' -exec rm {} ';'
 
-# allows one to avoid running cargo clean when one just wants to tidy up after a packgae build
-clean-deb:
-	rm -rf *.deb *.dsc *.tar.gz *.buildinfo *.changes build/
-
 .PHONY: dinstall
-dinstall: ${SERVER_DEB} ${SERVER_DBG_DEB} ${CLIENT_DEB} ${CLIENT_DBG_DEB} \
+dinstall: ${SERVER_DEB} ${SERVER_DBG_DEB} ${CLIENT_DEB} ${CLIENT_DBG_DEB}
-  ${DEBUG_DEB} ${DEBUG_DBG_DEB}
 	dpkg -i $^
 
 # make sure we build binaries before docs
-docs: $(COMPILEDIR)/dump-catalog-shell-cli $(COMPILEDIR)/docgen
+docs: cargo-build
 
 .PHONY: cargo-build
 cargo-build:
-	rm -f .do-cargo-build
+	$(CARGO) build $(CARGO_BUILD_ARGS)
-	$(MAKE) $(COMPILED_BINS)
-
-$(COMPILED_BINS) $(COMPILEDIR)/dump-catalog-shell-cli $(COMPILEDIR)/docgen: .do-cargo-build
-.do-cargo-build:
-	$(CARGO) build $(CARGO_BUILD_ARGS) \
-	    --package proxmox-backup-banner \
-	    --bin proxmox-backup-banner \
-	    --package proxmox-backup-client \
-	    --bin proxmox-backup-client \
-	    --bin dump-catalog-shell-cli \
-	    --bin proxmox-backup-debug \
-	    --package proxmox-file-restore \
-	    --bin proxmox-file-restore \
-	    --package pxar-bin \
-	    --bin pxar \
-	    --package pbs-tape \
-	    --bin pmt \
-	    --bin pmtx \
-	    --package proxmox-restore-daemon \
-	    --bin proxmox-restore-daemon \
-	    --package proxmox-backup \
-	    --bin docgen \
-	    --bin proxmox-backup-api \
-	    --bin proxmox-backup-manager \
-	    --bin proxmox-backup-proxy \
-	    --bin proxmox-daily-update \
-	    --bin proxmox-file-restore \
-	    --bin proxmox-tape \
-	    --bin sg-tape-cmd
-	touch "$@"
 
+$(COMPILED_BINS): cargo-build
 
 .PHONY: lint
 lint:
@@ -224,16 +169,12 @@ install: $(COMPILED_BINS)
 	    install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(LIBEXECDIR)/proxmox-backup/ ;)
 	$(MAKE) -C www install
 	$(MAKE) -C docs install
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	$(MAKE) test # HACK, only test now to avoid clobbering build files with wrong config
-endif
 
 .PHONY: upload
-upload: ${SERVER_DEB} ${CLIENT_DEB} ${RESTORE_DEB} ${DOC_DEB} ${DEBUG_DEB}
+upload: ${SERVER_DEB} ${CLIENT_DEB} ${RESTORE_DEB} ${DOC_DEB}
 	# check if working directory is clean
 	git diff --exit-code --stat && git diff --exit-code --stat --staged
-	tar cf - ${SERVER_DEB} ${SERVER_DBG_DEB} ${DOC_DEB} ${CLIENT_DEB} \
+	tar cf - ${SERVER_DEB} ${SERVER_DBG_DEB} ${DOC_DEB} ${CLIENT_DEB} ${CLIENT_DBG_DEB} | \
-	    ${CLIENT_DBG_DEB} ${DEBUG_DEB} ${DEBUG_DBG_DEB} \
+	    ssh -X repoman@repo.proxmox.com upload --product pbs --dist buster
-	  | ssh -X repoman@repo.proxmox.com upload --product pbs --dist bullseye
+	tar cf - ${CLIENT_DEB} ${CLIENT_DBG_DEB} | ssh -X repoman@repo.proxmox.com upload --product "pve,pmg,pbs-client" --dist buster
-	tar cf - ${CLIENT_DEB} ${CLIENT_DBG_DEB} | ssh -X repoman@repo.proxmox.com upload --product "pve,pmg,pbs-client" --dist bullseye
+	tar cf - ${RESTORE_DEB} ${RESTORE_DBG_DEB} | ssh -X repoman@repo.proxmox.com upload --product "pve" --dist buster
-	tar cf - ${RESTORE_DEB} ${RESTORE_DBG_DEB} | ssh -X repoman@repo.proxmox.com upload --product "pve" --dist bullseye

build.rs

@@ -0,0 +1,23 @@
+// build.rs
+use std::env;
+use std::process::Command;
+
+fn git_command(args: &[&str]) -> String {
+    match Command::new("git").args(args).output() {
+        Ok(output) => String::from_utf8(output.stdout).unwrap().trim_end().to_string(),
+        Err(err) => {
+            panic!("git {:?} failed: {}", args, err);
+        }
+    }
+}
+
+fn main() {
+    let repo_path = git_command(&["rev-parse", "--show-toplevel"]);
+    let repoid = match env::var("REPOID") {
+        Ok(repoid) => repoid,
+        Err(_) => git_command(&["rev-parse", "HEAD"]),
+    };
+
+    println!("cargo:rustc-env=REPOID={}", repoid);
+    println!("cargo:rerun-if-changed={}/.git/HEAD", repo_path);
+}

debian/changelog

@@ -1,215 +1,39 @@
-rust-proxmox-backup (2.0.12-1) bullseye; urgency=medium
+rust-proxmox-backup (1.1.14-1) buster; urgency=medium
 
-  * proxmox-backup-proxy: clean up old tasks when their reference was rotated
+  * drop RawWaker usage to avoid a leaking a refcount
-    out of the task-log index
 
-  * api daemons: fix sending log-reopen command
+  * pbs-tools: LruCache: implement Drop to fix a memory leak for the cache
 
- -- Proxmox Support Team <support@proxmox.com>  Tue, 19 Oct 2021 10:48:28 +0200
+  * ui: add notice for nearing PBS 1.1 End-of-Life
 
-rust-proxmox-backup (2.0.11-1) bullseye; urgency=medium
+  * backport "datastore: lookup: reuse ChunkStore on stale datastore re-open"
 
-  * drop aritifical limits for task-UPID length
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 02 Jun 2022 18:07:54 +0200
 
-  * tools: smart: only throw error for the fatal usage errors of smartctl
+rust-proxmox-backup (1.1.13-3) buster; urgency=medium
 
-  * api: improve returning errors for extjs formatter
+  * fix sending log-rotation command to API daemons
 
-  * proxmox-rest-server: improve logging
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 19 Oct 2021 10:21:18 +0200
 
-  * subscription: switch verification domain over to shop.proxmox.com
+rust-proxmox-backup (1.1.13-2) buster; urgency=medium
 
-  * rest-server/daemon: use new sd_notify_barrier helper for handling
+  * revert "auth: improve thread safety of 'crypt' C-library", not safe for
-    synchronization with systemd on service reloading
+    Debian buster based releases.
 
-  * ui: datastore/Content: add empty text for no snapshots
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 26 Jul 2021 16:40:07 +0200
 
-  * ui: datastore/Content: move first store-load into activate listener to
+rust-proxmox-backup (1.1.13-1) buster; urgency=medium
-    ensure we've a proper loading mask for better UX
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 05 Oct 2021 16:34:14 +0200
-
-rust-proxmox-backup (2.0.10-1) bullseye; urgency=medium
-
-  * ui: fix order of prune keep reasons
-
-  * server: add proxmox-backup-debug binary with chunk/file inspection, an API
-    shell with completion support
-
-  * restructured code base to reduce linkage and libraray ABI version
-    constraints for all non-server binaries (client, pxar, file-restore)
-
-  * zsh: fix passign parameters in auto-completion scripts
-
-  * tape: also add 'force-media-set' to availablea CLI options
-
-  * api: nodes: add missing node list (index) api endpoint
-
-  * docs: proxmox-backup-debug: add info about the  new 'api' subcommand
-
-  * docs/technical-overview: add troubleshooting section
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 21 Sep 2021 14:00:48 +0200
-
-rust-proxmox-backup (2.0.9-2) bullseye; urgency=medium
-
-  * tape backup: mention groups that were empty
-
-  * tape: compute next-media-label for each tape backup job
-
-  * tape: lto: increase default timeout to 10 minutes
-
-  * ui: display next-media-label for tape backup jobs
-
-  * cli: proxmox-tape backup-job list: use status api and display next-run
-    and next-media-label
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 24 Aug 2021 14:44:12 +0200
-
-rust-proxmox-backup (2.0.8-1) bullseye; urgency=medium
-
-  * use proxmox-apt to 0.6
-
-  * api: apt: adapt to proxmox-apt back-end changes
-
-  * api/ui: allow zstd compression for new zpools
-
-  * tape: media_catalog: add snapshot list cache for catalog
-
-  * api2: tape: media: use MediaCatalog::snapshot_list for content listing
-
-  * tape: lock media_catalog file to to get a consistent view with load_catalog
-
-  * tape: changer: handle libraries that sends wrong amount of data
-
-  * tape: changer: remove unnecesary inquiry parameter
-
-  * api2: tape/restore: commit temporary catalog at the end
-
-  * docs: tape: add instructions on how to restore the catalog
-
-  * ui: tape/ChangerStatus: improve layout for large libraries
-
-  * tape: changer: handle invalid descriptor data from library in status page
-
-  * datastore config: cleanup code (use flatten attribute)
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 02 Aug 2021 10:34:55 +0200
-
-rust-proxmox-backup (2.0.7-1) bullseye; urgency=medium
-
-  * tape changer: better cope with models that are not following spec
-    proposals when returning the status page
-
-  * tape changer: make DVCID information optional, not all devices return it
-
-  * restore daemon: setup the 'backup' system user and group in the minimal
-    restore environment, as we like to ensure that all state files are ownend
-    by them.
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 23 Jul 2021 08:43:51 +0200
-
-rust-proxmox-backup (2.0.6-1) bullseye; urgency=medium
-
-  * increase maximum drives per changer to 255
-
-  * allow one to pass a secret not only directly through the environment value,
-    but also indirectly through a file path, an open file descriptor or a
-    command that can write the secret to standard out.
-
-  * pull in new proxmox library version to improve the file system
-    comaptibility on creation of atomic files, e.g., lock files.
-
- -- Proxmox Support Team <support@proxmox.com>  Thu, 22 Jul 2021 10:22:19 +0200
-
-rust-proxmox-backup (2.0.5-2) bullseye; urgency=medium
-
-  * ui: tape: backup overview: increase timeout for media-set content
-
-  * tape: changer: always retry until timeout
-
-  * file-restore: increase lock timeout on QEMU map
-
-  * fix #3515: file-restore-daemon: allow LVs/PVs with dash in name
-
-  * fix #3526: correctly filter tasks with 'since' and 'until'
-
-  * tape: changer: make scsi request for DVCID a separate one, as some
-    libraries cannot handle requesting that combined with volume tags in one
-    go
-
-  * api, ui: datastore: add new 'prune-datastore' api call and expose it with
-    a 'Prune All' button
-
-  * make creating log files more robust so that theys are always owned by the
-    less privileged `backup` user
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 21 Jul 2021 09:12:39 +0200
-
-rust-proxmox-backup (2.0.4-1) bullseye; urgency=medium
-
-  * change tape drive lock path to avoid issues with sticky bit on tmpfs
-    mountpoint
-
-  * tape: changer: query transport-element types separately
 
   * auth: improve thread safety of 'crypt' C-library
 
- -- Proxmox Support Team <support@proxmox.com>  Mon, 12 Jul 2021 18:51:21 +0200
+  * file-restore: increase lock timeout on QEMU map
-
-rust-proxmox-backup (2.0.3-1) bullseye; urgency=medium
-
-  * api: apt: add repositories info and update calls
-
-  * ui: administration: add APT repositories status and update panel
-
-  * api: access domains: add get/create/update/delete endpoints for realms
-
-  * ui: access control: add 'Realm' tab for adding and editing OpenID Connect
-    identity provider
-
-  * fix #3447: ui: Dashboard: disallow selection of datastore statistics row
-
-  * ui: tapeRestore: make window non-resizable
-
-  * ui: dashboard: rework resource-load panel to a more detailed status panel,
-    showing, among other things, uptime, Kernel version, CPU info and
-    repository status.
-
-  * ui: adminsitration/dashboard: auto-scale columns count and add
-    browser-local setting to override that to a fixed value of columns.
-
-  * fix #3212: api, ui: add support for notes on backup groups
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 12 Jul 2021 08:07:41 +0200
-
-rust-proxmox-backup (2.0.2-1) bullseye; urgency=medium
-
-  * ui: use task list component from widget toolkit
-
-  * api: add keep-job-configs flag to datastore remove endpoint
-
-  * api: config: delete datastore: also remove tape backup jobs
-
-  * ui: tape restore: mark datastore selector as 'not a form field' to fix
-    compatibility with ExtJS 7.0
-
-  * ui: datastore removal: only navigate away when the user actually confirmed
-    the removal of that datastore
-
- -- Proxmox Support Team <support@proxmox.com>  Thu, 08 Jul 2021 14:44:12 +0200
-
-rust-proxmox-backup (2.0.1-2) bullseye; urgency=medium
 
   * file restore daemon: log basic startup steps
 
   * REST-API: set error message extension for bad-request response log to
     ensure the actual error is logged in any (access) log, making debugging
-    such issues easier
+    such issues easier.
-
-  * restore daemon: create /run/proxmox-backup on startup as there's now some
-    runtime state saved there, which failed all API requests to the restore
-    daemon otherwise
 
   * restore daemon: use millisecond log resolution
 
@@ -217,19 +41,33 @@ rust-proxmox-backup (2.0.1-2) bullseye; urgency=medium
     ensuring DNS propagation of that record. This makes it catch up with the
     docs/web-interface, where the option was already available.
 
-  * docs: initial update to repositories for bullseye
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 23 Jul 2021 12:34:29 +0200
 
- -- Proxmox Support Team <support@proxmox.com>  Sat, 03 Jul 2021 23:14:49 +0200
+rust-proxmox-backup (1.1.12-1) buster; urgency=medium
 
-rust-proxmox-backup (2.0.0-2) bullseye; urgency=medium
+  * subscription: set higher-level error to message instead of bailing out, to
+    ensure a force-check gets through
 
-  * file-restore-daemon/disk: add LVM (thin) support
+  * ui: dashboard: datastore stats: fix closing <i> tag
 
- -- Proxmox Support Team <support@proxmox.com>  Sat, 03 Jul 2021 02:15:16 +0200
+  * ui: datastore: option view: only navigate up when we actually removed the
+    datastore
 
-rust-proxmox-backup (2.0.0-1) bullseye; urgency=medium
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 09 Jul 2021 12:56:35 +0200
 
-  * initial bump for Debian 11 Bullseye / Proxmox Backup Server 2.0
+rust-proxmox-backup (1.1.11-1) buster; urgency=medium
+
+  * tape/drive: fix logging when requesting media
+
+  * tape: fix LTO locate_file for HP drives
+
+  * fix #3393 (again): pxar/create: try to read xattrs/fcaps/acls by default
+
+  * proxmox-backup-manager: show task log on datastore create
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 30 Jun 2021 11:24:20 +0200
+
+rust-proxmox-backup (1.1.10-1) buster; urgency=medium
 
   * ui: datastore list summary: catch and show errors per datastore
 
@@ -246,7 +84,7 @@ rust-proxmox-backup (2.0.0-1) bullseye; urgency=medium
   * ui: datastore options: add remove button to drop a datastore from the
     configuration, without removing any actual data
 
-  * ui: tape: drive selector: do not auto select the drive
+  * ui: tape: drive selector: do not autoselect the drive
 
   * ui: tape: backup job: use correct default value for pbsUserSelector
 
@@ -255,22 +93,7 @@ rust-proxmox-backup (2.0.0-1) bullseye; urgency=medium
   * backup: add helpers for async last recently used (LRU) caches for chunk
     and index reading of backup snapshot
 
-  * fix #3459: manager: add --ignore-verified and --outdated-after parameters
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 16 Jun 2021 09:46:15 +0200
-
-  * proxmox-backup-manager: show task log on datastore create
-
-  * tape: snapshot reader: read chunks sorted by inode (per index) to improve
-    sequential reads when backing up data from slow spinning disks to tape.
-
-  * file-restore: support ZFS pools
-
-  * improve fix for #3393: pxar create: try to read xattrs/fcaps/acls by default
-
-  * fix compatibility with ExtJS 7.0
-
-  * docs: build api-viewer from widget-toolkit-dev
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 28 Jun 2021 19:35:40 +0200
 
 rust-proxmox-backup (1.1.9-1) stable; urgency=medium
 

debian/control

@@ -1,8 +1,8 @@
 Source: rust-proxmox-backup
 Section: admin
 Priority: optional
-Build-Depends: debhelper (>= 12),
+Build-Depends: debhelper (>= 11),
- dh-cargo (>= 24),
+ dh-cargo (>= 18),
  cargo:native,
  rustc:native,
  libstd-rust-dev,
@@ -22,7 +22,6 @@ Build-Depends: debhelper (>= 12),
  librust-h2-0.3+default-dev,
  librust-h2-0.3+stream-dev,
  librust-handlebars-3+default-dev,
- librust-hex-0.4+default-dev (>= 0.4.3-~~),
  librust-http-0.2+default-dev,
  librust-hyper-0.14+default-dev,
  librust-hyper-0.14+full-dev,
@@ -38,25 +37,20 @@ Build-Depends: debhelper (>= 12),
  librust-pam-sys-0.5+default-dev,
  librust-pathpatterns-0.1+default-dev (>= 0.1.2-~~),
  librust-percent-encoding-2+default-dev (>= 2.1-~~),
- librust-pin-project-lite-0.2+default-dev,
+ librust-pin-project-1+default-dev,
- librust-proxmox-0.14+sortable-macro-dev,
+ librust-pin-utils-0.1+default-dev,
- librust-proxmox-acme-rs-0.2+default-dev (>= 0.2.1-~~),
+ librust-proxmox-0.11+api-macro-dev (>= 0.11.6-~~),
- librust-proxmox-apt-0.8+default-dev,
+ librust-proxmox-0.11+cli-dev (>= 0.11.6-~~),
- librust-proxmox-borrow-1+default-dev,
+ librust-proxmox-0.11+default-dev (>= 0.11.6-~~),
+ librust-proxmox-0.11+router-dev (>= 0.11.6-~~),
+ librust-proxmox-0.11+sortable-macro-dev (>= 0.11.6-~~),
+ librust-proxmox-0.11+tfa-dev (>= 0.11.6-~~),
+ librust-proxmox-acme-rs-0.3+default-dev,
  librust-proxmox-fuse-0.1+default-dev (>= 0.1.1-~~),
- librust-proxmox-http-0.5+client-dev,
+ librust-proxmox-http-0.2+client-dev (>= 0.2.1-~~),
- librust-proxmox-http-0.5+default-dev ,
+ librust-proxmox-http-0.2+default-dev (>= 0.2.1-~~),
- librust-proxmox-http-0.5+http-helpers-dev,
+ librust-proxmox-http-0.2+http-helpers-dev (>= 0.2.1-~~),
- librust-proxmox-http-0.5+websocket-dev,
+ librust-proxmox-http-0.2+websocket-dev (>= 0.2.1-~~),
- librust-proxmox-io-1+tokio-dev,
- librust-proxmox-lang-1+default-dev,
- librust-proxmox-openid-0.8+default-dev,
- librust-proxmox-router-1+cli-dev (>= 1.1.0-~~),
- librust-proxmox-schema-1+api-macro-dev,
- librust-proxmox-section-config-1+default-dev,
- librust-proxmox-tfa-1+u2f-dev,
- librust-proxmox-time-1+default-dev,
- librust-proxmox-uuid-1+default-dev,
  librust-pxar-0.10+default-dev (>= 0.10.1-~~),
  librust-pxar-0.10+tokio-io-dev (>= 0.10.1-~~),
  librust-regex-1+default-dev (>= 1.2-~~),
@@ -90,11 +84,11 @@ Build-Depends: debhelper (>= 12),
  librust-walkdir-2+default-dev,
  librust-webauthn-rs-0.2+default-dev (>= 0.2.5-~~),
  librust-xdg-2+default-dev (>= 2.2-~~),
- librust-zstd-0.6+bindgen-dev,
+ librust-zstd-0.4+bindgen-dev,
- librust-zstd-0.6+default-dev,
+ librust-zstd-0.4+default-dev,
  libacl1-dev,
  libfuse3-dev,
- libsystemd-dev (>= 246-~~),
+ libsystemd-dev,
  uuid-dev,
  libsgutils2-dev,
  bash-completion,
@@ -105,7 +99,6 @@ Build-Depends: debhelper (>= 12),
  graphviz <!nodoc>,
  latexmk <!nodoc>,
  patchelf,
- proxmox-widget-toolkit-dev <!nodoc>,
  pve-eslint (>= 7.18.0-1),
  python3-docutils,
  python3-pygments,
@@ -116,16 +109,15 @@ Build-Depends: debhelper (>= 12),
  texlive-xetex <!nodoc>,
  xindy <!nodoc>
 Maintainer: Proxmox Support Team <support@proxmox.com>
-Standards-Version: 4.5.1
+Standards-Version: 4.4.1
 Vcs-Git: git://git.proxmox.com/git/proxmox-backup.git
 Vcs-Browser: https://git.proxmox.com/?p=proxmox-backup.git;a=summary
 Homepage: https://www.proxmox.com
-Rules-Requires-Root: binary-targets
 
 Package: proxmox-backup-server
 Architecture: any
 Depends: fonts-font-awesome,
-         libjs-extjs (>= 7~),
+         libjs-extjs (>= 6.0.1),
          libjs-qrcodejs (>= 1.20201119),
          libproxmox-acme-plugins,
          libsgutils2-2,
@@ -136,7 +128,7 @@ Depends: fonts-font-awesome,
          postfix | mail-transport-agent,
          proxmox-backup-docs,
          proxmox-mini-journalreader,
-         proxmox-widget-toolkit (>= 3.3-2),
+         proxmox-widget-toolkit (>= 2.6-2),
          pve-xtermjs (>= 4.7.0-1),
          sg3-utils,
          smartmontools,
@@ -160,8 +152,7 @@ Description: Proxmox Backup Client tools
 Package: proxmox-backup-docs
 Build-Profiles: <!nodoc>
 Section: doc
-Depends: fonts-font-awesome,
+Depends: libjs-extjs,
-         libjs-extjs,
          libjs-mathjax,
          ${misc:Depends},
 Architecture: all
@@ -174,7 +165,6 @@ Depends: ${misc:Depends},
          ${shlibs:Depends},
 Recommends: pve-qemu-kvm (>= 5.0.0-9),
             proxmox-backup-restore-image,
-Breaks: proxmox-backup-restore-image (<< 0.3.1)
 Description: Proxmox Backup single file restore tools for pxar and block device backups
  This package contains the Proxmox Backup single file restore client for
  restoring individual files and folders from both host/container and VM/block

debian/control.in

@@ -0,0 +1,55 @@
+Package: proxmox-backup-server
+Architecture: any
+Depends: fonts-font-awesome,
+         libjs-extjs (>= 6.0.1),
+         libjs-qrcodejs (>= 1.20201119),
+         libproxmox-acme-plugins,
+         libsgutils2-2,
+         libzstd1 (>= 1.3.8),
+         lvm2,
+         openssh-server,
+         pbs-i18n,
+         postfix | mail-transport-agent,
+         proxmox-backup-docs,
+         proxmox-mini-journalreader,
+         proxmox-widget-toolkit (>= 2.6-2),
+         pve-xtermjs (>= 4.7.0-1),
+         sg3-utils,
+         smartmontools,
+         ${misc:Depends},
+         ${shlibs:Depends},
+Recommends: zfsutils-linux,
+            ifupdown2,
+Description: Proxmox Backup Server daemon with tools and GUI
+ This package contains the Proxmox Backup Server daemons and related
+ tools. This includes a web-based graphical user interface.
+
+Package: proxmox-backup-client
+Architecture: any
+Depends: qrencode,
+         ${misc:Depends},
+         ${shlibs:Depends},
+Description: Proxmox Backup Client tools
+ This package contains the Proxmox Backup client, which provides a
+ simple command line tool to create and restore backups.
+
+Package: proxmox-backup-docs
+Build-Profiles: <!nodoc>
+Section: doc
+Depends: libjs-extjs,
+         libjs-mathjax,
+         ${misc:Depends},
+Architecture: all
+Description: Proxmox Backup Documentation
+ This package contains the Proxmox Backup Documentation files.
+
+Package: proxmox-backup-file-restore
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Recommends: pve-qemu-kvm (>= 5.0.0-9),
+            proxmox-backup-restore-image,
+Description: Proxmox Backup single file restore tools for pxar and block device backups
+ This package contains the Proxmox Backup single file restore client for
+ restoring individual files and folders from both host/container and VM/block
+ device backups. It includes a block device restore driver using QEMU.

debian/debcargo.toml

@@ -0,0 +1,42 @@
+overlay = "."
+crate_src_path = ".."
+whitelist = ["tests/*.c"]
+
+maintainer = "Proxmox Support Team <support@proxmox.com>"
+
+[source]
+vcs_git = "git://git.proxmox.com/git/proxmox-backup.git"
+vcs_browser = "https://git.proxmox.com/?p=proxmox-backup.git;a=summary"
+section = "admin"
+build_depends = [
+  "bash-completion",
+  "debhelper (>= 12~)",
+  "fonts-dejavu-core <!nodoc>",
+  "fonts-lato <!nodoc>",
+  "fonts-open-sans <!nodoc>",
+  "graphviz <!nodoc>",
+  "latexmk <!nodoc>",
+  "patchelf",
+  "pve-eslint (>= 7.18.0-1)",
+  "python3-docutils",
+  "python3-pygments",
+  "python3-sphinx <!nodoc>",
+  "rsync",
+  "texlive-fonts-extra <!nodoc>",
+  "texlive-fonts-recommended <!nodoc>",
+  "texlive-xetex <!nodoc>",
+  "xindy <!nodoc>",
+]
+
+build_depends_excludes = [
+  "debhelper (>=11)",
+]
+
+[packages.lib]
+depends = [
+  "libacl1-dev",
+  "libfuse3-dev",
+  "libsystemd-dev",
+  "uuid-dev",
+  "libsgutils2-dev",
+]

debian/postinst

@@ -26,7 +26,43 @@ case "$1" in
 	fi
 	deb-systemd-invoke $_dh_action proxmox-backup.service proxmox-backup-proxy.service >/dev/null || true
 
+	# FIXME: Remove with 1.1
 	if test -n "$2"; then
+		if dpkg --compare-versions "$2" 'lt' '0.9.4-1'; then
+			if grep -s -q  -P -e '^\s+verify-schedule ' /etc/proxmox-backup/datastore.cfg; then
+				echo "NOTE: drop all verify schedules from datastore config."
+				echo "You can now add more flexible verify jobs"
+				flock -w 30 /etc/proxmox-backup/.datastore.lck \
+				    sed -i '/^\s\+verify-schedule /d' /etc/proxmox-backup/datastore.cfg || true
+			fi
+		fi
+		if dpkg --compare-versions "$2" 'le' '0.9.5-1'; then
+			chown --quiet backup:backup /var/log/proxmox-backup/api/auth.log || true
+		fi
+		if dpkg --compare-versions "$2" 'le' '0.9.7-1'; then
+			if [ -e /etc/proxmox-backup/remote.cfg ]; then
+				echo "NOTE: Switching over remote.cfg to new field names.."
+				flock -w 30 /etc/proxmox-backup/.remote.lck \
+				    sed -i \
+				        -e 's/^\s\+userid /\tauth-id /g' \
+				        /etc/proxmox-backup/remote.cfg || true
+			fi
+		fi
+		if dpkg --compare-versions "$2" 'le' '1.0.14-1'; then
+			# FIXME: Remove with 2.0
+			if grep -s -q  -P -e '^linux:' /etc/proxmox-backup/tape.cfg; then
+				echo "========="
+				echo "= NOTE: You have now unsupported 'linux' tape drives configured."
+				echo "= * Execute 'udevadm control --reload-rules && udevadm trigger' to update /dev"
+				echo "= * Edit '/etc/proxmox-backup/tape.cfg', remove 'linux' entries and re-add over CLI/GUI"
+				echo "========="
+			fi
+		fi
+		# FIXME: remove with 2.0
+		if [ -d "/var/lib/proxmox-backup/tape" ] &&
+		   [ "$(stat --printf '%a' '/var/lib/proxmox-backup/tape')" != "750" ]; then
+			chmod 0750 /var/lib/proxmox-backup/tape || true
+		fi
 		# FIXME: Remove in future version once we're sure no broken entries remain in anyone's files
 		if grep -q -e ':termproxy::[^@]\+: ' /var/log/proxmox-backup/tasks/active; then
 			echo "Fixing up termproxy user id in task log..."

debian/proxmox-backup-debug.bc

@@ -1,8 +0,0 @@
-# proxmox-backup-debug bash completion
-
-# see http://tiswww.case.edu/php/chet/bash/FAQ
-# and __ltrim_colon_completions() in /usr/share/bash-completion/bash_completion
-# this modifies global var, but I found no better way
-COMP_WORDBREAKS=${COMP_WORDBREAKS//:}
-
-complete -C 'proxmox-backup-debug bashcomplete' proxmox-backup-debug

debian/proxmox-backup-docs.links

@@ -1,6 +1,5 @@
 /usr/share/doc/proxmox-backup/proxmox-backup.pdf /usr/share/doc/proxmox-backup/html/proxmox-backup.pdf
 /usr/share/javascript/extjs /usr/share/doc/proxmox-backup/html/prune-simulator/extjs
 /usr/share/javascript/extjs /usr/share/doc/proxmox-backup/html/lto-barcode/extjs
-/usr/share/fonts-font-awesome/ /usr/share/doc/proxmox-backup/html/lto-barcode/font-awesome
 /usr/share/javascript/extjs /usr/share/doc/proxmox-backup/html/api-viewer/extjs
 /usr/share/javascript/mathjax /usr/share/doc/proxmox-backup/html/_static/mathjax

debian/proxmox-backup-server.bash-completion

@@ -1,5 +1,4 @@
 debian/proxmox-backup-manager.bc proxmox-backup-manager
-debian/proxmox-backup-debug.bc proxmox-backup-debug
 debian/proxmox-tape.bc proxmox-tape
 debian/pmtx.bc pmtx
 debian/pmt.bc pmt

debian/proxmox-backup-server.install

@@ -9,7 +9,6 @@ usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-backup-proxy
 usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-backup-banner
 usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-daily-update
 usr/lib/x86_64-linux-gnu/proxmox-backup/sg-tape-cmd
-usr/sbin/proxmox-backup-debug
 usr/sbin/proxmox-backup-manager
 usr/bin/pmtx
 usr/bin/pmt
@@ -18,7 +17,6 @@ usr/share/javascript/proxmox-backup/index.hbs
 usr/share/javascript/proxmox-backup/css/ext6-pbs.css
 usr/share/javascript/proxmox-backup/images
 usr/share/javascript/proxmox-backup/js/proxmox-backup-gui.js
-usr/share/man/man1/proxmox-backup-debug.1
 usr/share/man/man1/proxmox-backup-manager.1
 usr/share/man/man1/proxmox-backup-proxy.1
 usr/share/man/man1/proxmox-tape.1
@@ -33,7 +31,6 @@ usr/share/man/man5/verification.cfg.5
 usr/share/man/man5/media-pool.cfg.5
 usr/share/man/man5/tape.cfg.5
 usr/share/man/man5/tape-job.cfg.5
-usr/share/zsh/vendor-completions/_proxmox-backup-debug
 usr/share/zsh/vendor-completions/_proxmox-backup-manager
 usr/share/zsh/vendor-completions/_proxmox-tape
 usr/share/zsh/vendor-completions/_pmtx

debian/rules

@@ -32,9 +32,6 @@ override_dh_auto_build:
 override_dh_missing:
 	dh_missing --fail-missing
 
-override_dh_auto_test:
-	# ignore here to avoid rebuilding the binaries with the wrong target
-
 override_dh_auto_install:
 	dh_auto_install -- \
 	    PROXY_USER=backup \
@@ -48,6 +45,11 @@ override_dh_installsystemd:
 override_dh_fixperms:
 	dh_fixperms --exclude sg-tape-cmd
 
+# workaround https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=933541
+# TODO: remove once available (Debian 11 ?)
+override_dh_dwz:
+	dh_dwz --no-dwz-multifile
+
 override_dh_strip:
 	dh_strip
 	for exe in $$(find \

docs/Makefile

@@ -5,7 +5,6 @@ GENERATED_SYNOPSIS := 						\
 	proxmox-backup-client/synopsis.rst			\
 	proxmox-backup-client/catalog-shell-synopsis.rst 	\
 	proxmox-backup-manager/synopsis.rst			\
-	proxmox-backup-debug/synopsis.rst			\
 	proxmox-file-restore/synopsis.rst			\
 	pxar/synopsis.rst					\
 	pmtx/synopsis.rst					\
@@ -28,8 +27,7 @@ MAN1_PAGES := 				\
 	proxmox-backup-proxy.1		\
 	proxmox-backup-client.1		\
 	proxmox-backup-manager.1	\
-	proxmox-file-restore.1		\
+	proxmox-file-restore.1
-	proxmox-backup-debug.1
 
 MAN5_PAGES :=				\
 	media-pool.cfg.5		\
@@ -48,35 +46,23 @@ PRUNE_SIMULATOR_FILES := 					\
 	prune-simulator/clear-trigger.png			\
 	prune-simulator/prune-simulator.js
 
-PRUNE_SIMULATOR_JS_SOURCE :=						\
-	/usr/share/javascript/proxmox-widget-toolkit-dev/Toolkit.js	\
-	prune-simulator/prune-simulator_source.js
-
-LTO_BARCODE_JS_SOURCE :=						\
-	/usr/share/javascript/proxmox-widget-toolkit-dev/Toolkit.js	\
-	lto-barcode/code39.js						\
-	lto-barcode/prefix-field.js					\
-	lto-barcode/label-style.js					\
-	lto-barcode/tape-type.js					\
-	lto-barcode/paper-size.js					\
-	lto-barcode/page-layout.js					\
-	lto-barcode/page-calibration.js					\
-	lto-barcode/label-list.js					\
-	lto-barcode/label-setup.js					\
-	lto-barcode/lto-barcode.js
-
 LTO_BARCODE_FILES :=						\
 	lto-barcode/index.html					\
-	lto-barcode/lto-barcode-generator.js
+	lto-barcode/code39.js					\
+	lto-barcode/prefix-field.js				\
+	lto-barcode/label-style.js				\
+	lto-barcode/tape-type.js				\
+	lto-barcode/paper-size.js				\
+	lto-barcode/page-layout.js				\
+	lto-barcode/page-calibration.js				\
+	lto-barcode/label-list.js				\
+	lto-barcode/label-setup.js				\
+	lto-barcode/lto-barcode.js
 
 API_VIEWER_SOURCES=				\
 	api-viewer/index.html			\
 	api-viewer/apidoc.js
 
-API_VIEWER_FILES :=							\
-	api-viewer/apidata.js						\
-	/usr/share/javascript/proxmox-widget-toolkit-dev/APIViewer.js	\
-
 # Sphinx documentation setup
 SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
@@ -201,12 +187,6 @@ proxmox-file-restore/synopsis.rst: ${COMPILEDIR}/proxmox-file-restore
 proxmox-file-restore.1: proxmox-file-restore/man1.rst  proxmox-file-restore/description.rst proxmox-file-restore/synopsis.rst
 	rst2man $< >$@
 
-proxmox-backup-debug/synopsis.rst: ${COMPILEDIR}/proxmox-backup-debug
-	${COMPILEDIR}/proxmox-backup-debug printdoc > proxmox-backup-debug/synopsis.rst
-
-proxmox-backup-debug.1: proxmox-backup-debug/man1.rst  proxmox-backup-debug/description.rst proxmox-backup-debug/synopsis.rst
-	rst2man $< >$@
-
 .PHONY: onlinehelpinfo
 onlinehelpinfo:
 	@echo "Generating OnlineHelpInfo.js..."
@@ -216,17 +196,8 @@ onlinehelpinfo:
 api-viewer/apidata.js: ${COMPILEDIR}/docgen
 	${COMPILEDIR}/docgen apidata.js >$@
 
-api-viewer/apidoc.js: ${API_VIEWER_FILES}
+api-viewer/apidoc.js: api-viewer/apidata.js api-viewer/PBSAPI.js
-	cat ${API_VIEWER_FILES} >$@.tmp
+	cat api-viewer/apidata.js api-viewer/PBSAPI.js >$@
-	mv $@.tmp $@
-
-prune-simulator/prune-simulator.js: ${PRUNE_SIMULATOR_JS_SOURCE}
-	cat ${PRUNE_SIMULATOR_JS_SOURCE} >$@.tmp
-	mv $@.tmp $@
-
-lto-barcode/lto-barcode-generator.js: ${LTO_BARCODE_JS_SOURCE}
-	cat ${LTO_BARCODE_JS_SOURCE} >$@.tmp
-	mv $@.tmp $@
 
 .PHONY: html
 html: ${GENERATED_SYNOPSIS} images/proxmox-logo.svg custom.css conf.py ${PRUNE_SIMULATOR_FILES} ${LTO_BARCODE_FILES} ${API_VIEWER_SOURCES}
@@ -257,7 +228,7 @@ epub3: ${GENERATED_SYNOPSIS}
 
 clean:
 	rm -r -f *~ *.1 ${BUILDDIR} ${GENERATED_SYNOPSIS} api-viewer/apidata.js
-	rm -f api-viewer/apidoc.js lto-barcode/lto-barcode-generator.js prune-simulator/prune-simulator.js
+	rm -f api-viewer/apidoc.js lto-barcode/lto-barcode-generator.js
 
 
 install_manual_pages: ${MAN1_PAGES} ${MAN5_PAGES}

docs/api-viewer/PBSAPI.js

@@ -0,0 +1,526 @@
+// avoid errors when running without development tools
+if (!Ext.isDefined(Ext.global.console)) {
+    var console = {
+        dir: function() {},
+        log: function() {}
+    };
+}
+
+Ext.onReady(function() {
+
+    Ext.define('pve-param-schema', {
+        extend: 'Ext.data.Model',
+        fields:  [
+	    'name', 'type', 'typetext', 'description', 'verbose_description',
+	    'enum', 'minimum', 'maximum', 'minLength', 'maxLength',
+	    'pattern', 'title', 'requires', 'format', 'default',
+	    'disallow', 'extends', 'links',
+	    {
+		name: 'optional',
+		type: 'boolean'
+	    }
+	]
+    });
+
+    var store = Ext.define('pve-updated-treestore', {
+	extend: 'Ext.data.TreeStore',
+	model: Ext.define('pve-api-doc', {
+            extend: 'Ext.data.Model',
+            fields:  [
+		'path', 'info', 'text',
+	    ]
+	}),
+        proxy: {
+            type: 'memory',
+            data: pbsapi
+        },
+        sorters: [{
+            property: 'leaf',
+            direction: 'ASC'
+        }, {
+            property: 'text',
+            direction: 'ASC'
+	}],
+	filterer: 'bottomup',
+	doFilter: function(node) {
+	    this.filterNodes(node, this.getFilters().getFilterFn(), true);
+	},
+
+	filterNodes: function(node, filterFn, parentVisible) {
+	    var me = this,
+		bottomUpFiltering = me.filterer === 'bottomup',
+		match = filterFn(node) && parentVisible || (node.isRoot() && !me.getRootVisible()),
+		childNodes = node.childNodes,
+		len = childNodes && childNodes.length, i, matchingChildren;
+
+	    if (len) {
+		for (i = 0; i < len; ++i) {
+		    matchingChildren = me.filterNodes(childNodes[i], filterFn, match || bottomUpFiltering) || matchingChildren;
+		}
+		if (bottomUpFiltering) {
+		    match = matchingChildren || match;
+		}
+	    }
+
+	    node.set("visible", match, me._silentOptions);
+	    return match;
+	},
+
+    }).create();
+
+    var render_description = function(value, metaData, record) {
+	var pdef = record.data;
+
+	value = pdef.verbose_description || value;
+
+	// TODO: try to render asciidoc correctly
+
+	metaData.style = 'white-space:pre-wrap;'
+
+	return Ext.htmlEncode(value);
+    };
+
+    var render_type = function(value, metaData, record) {
+	var pdef = record.data;
+
+	return pdef['enum'] ? 'enum' : (pdef.type || 'string');
+    };
+
+    let render_simple_format = function(pdef, type_fallback) {
+	if (pdef.typetext)
+	    return pdef.typetext;
+
+	if (pdef['enum'])
+	    return pdef['enum'].join(' | ');
+
+	if (pdef.format)
+	    return pdef.format;
+
+	if (pdef.pattern)
+	    return pdef.pattern;
+
+	if (pdef.type === 'boolean')
+	    return `<true|false>`;
+
+	if (type_fallback && pdef.type)
+	    return `<${pdef.type}>`;
+
+	return;
+    };
+
+    let render_format = function(value, metaData, record) {
+	let pdef = record.data;
+
+	metaData.style = 'white-space:normal;'
+
+	if (pdef.type === 'array' && pdef.items) {
+	    let format = render_simple_format(pdef.items, true);
+	    return `[${Ext.htmlEncode(format)}, ...]`;
+	}
+
+	return Ext.htmlEncode(render_simple_format(pdef) || '');
+    };
+
+    var real_path = function(path) {
+	return path.replace(/^.*\/_upgrade_(\/)?/, "/");
+    };
+
+    var permission_text = function(permission) {
+	let permhtml = "";
+
+	if (permission.user) {
+	    if (!permission.description) {
+		if (permission.user === 'world') {
+		    permhtml += "Accessible without any authentication.";
+		} else if (permission.user === 'all') {
+		    permhtml += "Accessible by all authenticated users.";
+		} else {
+		    permhtml += 'Onyl accessible by user "' +
+			permission.user + '"';
+		}
+	    }
+	} else if (permission.check) {
+	    permhtml += "<pre>Check: " +
+		Ext.htmlEncode(Ext.JSON.encode(permission.check))  + "</pre>";
+	} else if (permission.userParam) {
+	    permhtml += `<div>Check if user matches parameter '${permission.userParam}'`;
+	} else if (permission.or) {
+	    permhtml += "<div>Or<div style='padding-left: 10px;'>";
+	    Ext.Array.each(permission.or, function(sub_permission) {
+		permhtml += permission_text(sub_permission);
+	    })
+	    permhtml += "</div></div>";
+	} else if (permission.and) {
+	    permhtml += "<div>And<div style='padding-left: 10px;'>";
+	    Ext.Array.each(permission.and, function(sub_permission) {
+		permhtml += permission_text(sub_permission);
+	    })
+	    permhtml += "</div></div>";
+	} else {
+	    //console.log(permission);
+	    permhtml += "Unknown syntax!";
+	}
+
+	return permhtml;
+    };
+
+    var render_docu = function(data) {
+	var md = data.info;
+
+	// console.dir(data);
+
+	var items = [];
+
+	var clicmdhash = {
+	    GET: 'get',
+	    POST: 'create',
+	    PUT: 'set',
+	    DELETE: 'delete'
+	};
+
+	Ext.Array.each(['GET', 'POST', 'PUT', 'DELETE'], function(method) {
+	    var info = md[method];
+	    if (info) {
+
+		var usage = "";
+
+		usage += "<table><tr><td>HTTP:&nbsp;&nbsp;&nbsp;</td><td>"
+		    + method + " " + real_path("/api2/json" + data.path) + "</td></tr>";
+
+		var sections = [
+		    {
+			title: 'Description',
+			html: Ext.htmlEncode(info.description),
+			bodyPadding: 10
+		    },
+		    {
+			title: 'Usage',
+			html: usage,
+			bodyPadding: 10
+		    }
+		];
+
+		if (info.parameters && info.parameters.properties) {
+
+		    var pstore = Ext.create('Ext.data.Store', {
+			model: 'pve-param-schema',
+			proxy: {
+			    type: 'memory'
+			},
+			groupField: 'optional',
+			sorters: [
+			    {
+				property: 'name',
+				direction: 'ASC'
+			    }
+			]
+		    });
+
+		    Ext.Object.each(info.parameters.properties, function(name, pdef) {
+			pdef.name = name;
+			pstore.add(pdef);
+		    });
+
+		    pstore.sort();
+
+		    var groupingFeature = Ext.create('Ext.grid.feature.Grouping',{
+			enableGroupingMenu: false,
+			groupHeaderTpl: '<tpl if="groupValue">Optional</tpl><tpl if="!groupValue">Required</tpl>'
+		    });
+
+		    sections.push({
+			xtype: 'gridpanel',
+			title: 'Parameters',
+			features: [groupingFeature],
+			store: pstore,
+			viewConfig: {
+			    trackOver: false,
+			    stripeRows: true
+			},
+			columns: [
+			    {
+				header: 'Name',
+				dataIndex: 'name',
+				flex: 1
+			    },
+			    {
+				header: 'Type',
+				dataIndex: 'type',
+				renderer: render_type,
+				flex: 1
+			    },
+			    {
+				header: 'Default',
+				dataIndex: 'default',
+				flex: 1
+			    },
+			    {
+				header: 'Format',
+				dataIndex: 'type',
+				renderer: render_format,
+				flex: 2
+			    },
+			    {
+				header: 'Description',
+				dataIndex: 'description',
+				renderer: render_description,
+				flex: 6
+			    }
+			]
+		    });
+
+		}
+
+		if (info.returns) {
+
+		    var retinf = info.returns;
+		    var rtype = retinf.type;
+		    if (!rtype && retinf.items)
+			rtype = 'array';
+		    if (!rtype)
+			rtype = 'object';
+
+		    var rpstore = Ext.create('Ext.data.Store', {
+			model: 'pve-param-schema',
+			proxy: {
+			    type: 'memory'
+			},
+			groupField: 'optional',
+			sorters: [
+			    {
+				property: 'name',
+				direction: 'ASC'
+			   }
+			]
+		    });
+
+		    var properties;
+		    if (rtype === 'array' && retinf.items.properties) {
+			properties = retinf.items.properties;
+		    }
+
+		    if (rtype === 'object' && retinf.properties) {
+			properties = retinf.properties;
+		    }
+
+		    Ext.Object.each(properties, function(name, pdef) {
+			pdef.name = name;
+			rpstore.add(pdef);
+		    });
+
+		    rpstore.sort();
+
+		    var groupingFeature = Ext.create('Ext.grid.feature.Grouping',{
+			enableGroupingMenu: false,
+			groupHeaderTpl: '<tpl if="groupValue">Optional</tpl><tpl if="!groupValue">Obligatory</tpl>'
+		    });
+		    var returnhtml;
+		    if (retinf.items) {
+			returnhtml = '<pre>items: ' + Ext.htmlEncode(JSON.stringify(retinf.items, null, 4)) + '</pre>';
+		    }
+
+		    if (retinf.properties) {
+			returnhtml = returnhtml || '';
+			returnhtml += '<pre>properties:' + Ext.htmlEncode(JSON.stringify(retinf.properties, null, 4)) + '</pre>';
+		    }
+
+		    var rawSection = Ext.create('Ext.panel.Panel', {
+			bodyPadding: '0px 10px 10px 10px',
+			html: returnhtml,
+			hidden: true
+		    });
+
+		    sections.push({
+			xtype: 'gridpanel',
+			title: 'Returns: ' + rtype,
+			features: [groupingFeature],
+			store: rpstore,
+			viewConfig: {
+			    trackOver: false,
+			    stripeRows: true
+			},
+		    columns: [
+			{
+			    header: 'Name',
+			    dataIndex: 'name',
+			    flex: 1
+			},
+			{
+			    header: 'Type',
+			    dataIndex: 'type',
+			    renderer: render_type,
+			    flex: 1
+			},
+			{
+			    header: 'Default',
+			    dataIndex: 'default',
+			    flex: 1
+			},
+			{
+			    header: 'Format',
+			    dataIndex: 'type',
+			    renderer: render_format,
+			    flex: 2
+			},
+			{
+			    header: 'Description',
+			    dataIndex: 'description',
+			    renderer: render_description,
+			    flex: 6
+			}
+		    ],
+		    bbar: [
+			{
+			    xtype: 'button',
+			    text: 'Show RAW',
+			    handler: function(btn) {
+				rawSection.setVisible(!rawSection.isVisible());
+				btn.setText(rawSection.isVisible() ? 'Hide RAW' : 'Show RAW');
+			    }}
+		    ]
+		});
+
+		sections.push(rawSection);
+
+
+		}
+
+		if (!data.path.match(/\/_upgrade_/)) {
+		    var permhtml = '';
+
+		    if (!info.permissions) {
+			permhtml = "Root only.";
+		    } else {
+			if (info.permissions.description) {
+			    permhtml += "<div style='white-space:pre-wrap;padding-bottom:10px;'>" +
+				Ext.htmlEncode(info.permissions.description) + "</div>";
+			}
+			permhtml += permission_text(info.permissions);
+		    }
+
+		    // we do not have this information for PBS api
+		    //if (!info.allowtoken) {
+		    //    permhtml += "<br />This API endpoint is not available for API tokens."
+		    //}
+
+		    sections.push({
+			title: 'Required permissions',
+			bodyPadding: 10,
+			html: permhtml
+		    });
+		}
+
+		items.push({
+		    title: method,
+		    autoScroll: true,
+		    defaults: {
+			border: false
+		    },
+		    items: sections
+		});
+	    }
+	});
+
+	var ct = Ext.getCmp('docview');
+	ct.setTitle("Path: " +  real_path(data.path));
+	ct.removeAll(true);
+	ct.add(items);
+	ct.setActiveTab(0);
+    };
+
+    Ext.define('Ext.form.SearchField', {
+	extend: 'Ext.form.field.Text',
+	alias: 'widget.searchfield',
+
+	emptyText: 'Search...',
+
+	flex: 1,
+
+	inputType: 'search',
+	listeners: {
+	    'change': function(){
+
+		var value = this.getValue();
+		if (!Ext.isEmpty(value)) {
+		    store.filter({
+			property: 'path',
+			value: value,
+			anyMatch: true
+		    });
+		} else {
+		    store.clearFilter();
+		}
+	    }
+	}
+    });
+
+    var tree = Ext.create('Ext.tree.Panel', {
+	title: 'Resource Tree',
+	tbar: [
+	    {
+		xtype: 'searchfield',
+	    }
+	],
+	tools: [
+	    {
+		type: 'expand',
+		tooltip: 'Expand all',
+		tooltipType: 'title',
+		callback: (tree) => tree.expandAll(),
+	    },
+	    {
+		type: 'collapse',
+		tooltip: 'Collapse all',
+		tooltipType: 'title',
+		callback: (tree) => tree.collapseAll(),
+	    },
+	],
+        store: store,
+	width: 200,
+        region: 'west',
+        split: true,
+        margins: '5 0 5 5',
+        rootVisible: false,
+	listeners: {
+	    selectionchange: function(v, selections) {
+		if (!selections[0])
+		    return;
+		var rec = selections[0];
+		render_docu(rec.data);
+		location.hash = '#' + rec.data.path;
+	    }
+	}
+    });
+
+    Ext.create('Ext.container.Viewport', {
+	layout: 'border',
+	renderTo: Ext.getBody(),
+	items: [
+	    tree,
+	    {
+		xtype: 'tabpanel',
+		title: 'Documentation',
+		id: 'docview',
+		region: 'center',
+		margins: '5 5 5 0',
+		layout: 'fit',
+		items: []
+	    }
+	]
+    });
+
+    var deepLink = function() {
+	var path = window.location.hash.substring(1).replace(/\/\s*$/, '')
+	var endpoint = store.findNode('path', path);
+
+	if (endpoint) {
+	    tree.getSelectionModel().select(endpoint);
+	    tree.expandPath(endpoint.getPath());
+	    render_docu(endpoint.data);
+	}
+    }
+    window.onhashchange = deepLink;
+
+    deepLink();
+
+});

docs/backup-client.rst

@@ -1,33 +1,31 @@
 Backup Client Usage
 ===================
 
-The command line client for Proxmox Backup Server is called
+The command line client is called :command:`proxmox-backup-client`.
-:command:`proxmox-backup-client`.
 
 .. _client_repository:
 
 Backup Repository Locations
 ---------------------------
 
-The client uses the following format to specify a datastore repository
+The client uses the following notation to specify a datastore repository
-on the backup server (where username is specified in the form of user@realm):
+on the backup server.
 
   [[username@]server[:port]:]datastore
 
 The default value for ``username`` is ``root@pam``. If no server is specified,
 the default is the local host (``localhost``).
 
-You can specify a port if your backup server is only reachable on a non-default
+You can specify a port if your backup server is only reachable on a different
-port (for example, with NAT and port forwarding configurations).
+port (e.g. with NAT and port forwarding).
 
-Note that if the server uses an IPv6 address, you have to write it with square
+Note that if the server is an IPv6 address, you have to write it with square
 brackets (for example, `[fe80::01]`).
 
 You can pass the repository with the ``--repository`` command line option, or
 by setting the ``PBS_REPOSITORY`` environment variable.
 
-Below are some examples of valid repositories and their corresponding real
+Here some examples of valid repositories and the real values
-values:
 
 ================================ ================== ================== ===========
 Example                          User               Host:Port          Datastore
@@ -48,31 +46,16 @@ Environment Variables
   The default backup repository.
 
 ``PBS_PASSWORD``
-  When set, this value is used as the password for the backup server.
+  When set, this value is used for the password required for the backup server.
-  You can also set this to an API token secret.
+  You can also set this to a API token secret.
-
-``PBS_PASSWORD_FD``, ``PBS_PASSWORD_FILE``, ``PBS_PASSWORD_CMD``
-  Like ``PBS_PASSWORD``, but read data from an open file descriptor, a file
-  name or from the `stdout` of a command, respectively. The first defined
-  environment variable from the order above is preferred.
 
 ``PBS_ENCRYPTION_PASSWORD``
   When set, this value is used to access the secret encryption key (if
   protected by password).
 
-``PBS_ENCRYPTION_PASSWORD_FD``, ``PBS_ENCRYPTION_PASSWORD_FILE``, ``PBS_ENCRYPTION_PASSWORD_CMD``
+``PBS_FINGERPRINT`` When set, this value is used to verify the server
-  Like ``PBS_ENCRYPTION_PASSWORD``, but read data from an open file descriptor,
+  certificate (only used if the system CA certificates cannot validate the
-  a file name or from the `stdout` of a command, respectively. The first
+  certificate).
-  defined environment variable from the order above is preferred.
-
-``PBS_FINGERPRINT``
-  When set, this value is used to verify the server certificate (only used if
-  the system CA certificates cannot validate the certificate).
-
-
-.. Note:: Passwords must be valid UTF-8 and may not contain newlines. For your
-   convienience, Proxmox Backup Server only uses the first line as password, so
-   you can add arbitrary comments after the first newline.
 
 
 Output Format
@@ -87,15 +70,14 @@ Creating Backups
 ----------------
 
 This section explains how to create a backup from within the machine. This can
-be a physical host, a virtual machine, or a container. Such backups may contain
+be a physical host, a virtual machine, or a container. Such backups may contain file
-file and image archives. There are no restrictions in this case.
+and image archives. There are no restrictions in this case.
 
-.. Note:: If you want to backup virtual machines or containers on Proxmox VE,
+.. note:: If you want to backup virtual machines or containers on Proxmox VE, see :ref:`pve-integration`.
-   see :ref:`pve-integration`.
 
-For the following example, you need to have a backup server set up, have working
+For the following example you need to have a backup server set up, working
-credentials, and know the repository name.
+credentials and need to know the repository name.
-In the following examples, we use ``backup-server:store1``.
+In the following examples we use ``backup-server:store1``.
 
 .. code-block:: console
 
@@ -109,12 +91,12 @@ In the following examples, we use ``backup-server:store1``.
   Uploaded 12129 chunks in 87 seconds (564 MB/s).
   End Time: 2019-12-03T10:36:29+01:00
 
-This will prompt you for a password, then upload a file archive named
+This will prompt you for a password and then uploads a file archive named
 ``root.pxar`` containing all the files in the ``/`` directory.
 
-.. Caution:: Please note that proxmox-backup-client does not
+.. Caution:: Please note that the proxmox-backup-client does not
    automatically include mount points. Instead, you will see a short
-   ``skip mount point`` message for each of them. The idea is to
+   ``skip mount point`` notice for each of them. The idea is to
    create a separate file archive for each mounted disk. You can
    explicitly include them using the ``--include-dev`` option
    (i.e. ``--include-dev /boot/efi``). You can use this option
@@ -122,19 +104,19 @@ This will prompt you for a password, then upload a file archive named
 
 The ``--repository`` option can get quite long and is used by all
 commands. You can avoid having to enter this value by setting the
-environment variable ``PBS_REPOSITORY``. Note that if you would like this to
+environment variable ``PBS_REPOSITORY``. Note that if you would like this to remain set
-remain set over multiple sessions, you should instead add the below line to your
+over multiple sessions, you should instead add the below line to your
 ``.bashrc`` file.
 
 .. code-block:: console
 
   # export PBS_REPOSITORY=backup-server:store1
 
-After this, you can execute all commands without having to specify the
+After this you can execute all commands without specifying the ``--repository``
-``--repository`` option.
+option.
 
-A single backup is allowed to contain more than one archive. For example, if
+One single backup is allowed to contain more than one archive. For example, if
-you want to back up two disks mounted at ``/mnt/disk1`` and ``/mnt/disk2``:
+you want to backup two disks mounted at ``/mnt/disk1`` and ``/mnt/disk2``:
 
 .. code-block:: console
 
@@ -148,26 +130,26 @@ archive source at the client. The format is:
 
     <archive-name>.<type>:<source-path>
 
-Common types are ``.pxar`` for file archives and ``.img`` for block
+Common types are ``.pxar`` for file archives, and ``.img`` for block
-device images. To create a backup of a block device, run the following command:
+device images. To create a backup of a block device run the following command:
 
 .. code-block:: console
 
   # proxmox-backup-client backup mydata.img:/dev/mylvm/mydata
 
 
-Excluding Files/Directories from a Backup
+Excluding files/folders from a backup
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Sometimes it is desired to exclude certain files or directories from a backup archive.
+Sometimes it is desired to exclude certain files or folders from a backup archive.
 To tell the Proxmox Backup client when and how to ignore files and directories,
-place a text file named ``.pxarexclude`` in the filesystem hierarchy.
+place a text file called ``.pxarexclude`` in the filesystem hierarchy.
 Whenever the backup client encounters such a file in a directory, it interprets
-each line as a glob match pattern for files and directories that are to be excluded
+each line as glob match patterns for files and directories that are to be excluded
 from the backup.
 
-The file must contain a single glob pattern per line. Empty lines and lines
+The file must contain a single glob pattern per line. Empty lines are ignored.
-starting with ``#`` (indicating a comment) are ignored.
+The same is true for lines starting with ``#``, which indicates a comment.
 A ``!`` at the beginning of a line reverses the glob match pattern from an exclusion
 to an explicit inclusion. This makes it possible to exclude all entries in a
 directory except for a few single files/subdirectories.
@@ -178,24 +160,23 @@ the given patterns. It is only possible to match files in this directory and its
 ``\`` is used to escape special glob characters.
 ``?`` matches any single character.
 ``*`` matches any character, including an empty string.
-``**`` is used to match current directory and subdirectories. For example, with
+``**`` is used to match subdirectories. It can be used to, for example, exclude
-the pattern ``**/*.tmp``, it would exclude all files ending in ``.tmp`` within
+all files ending in ``.tmp`` within the directory or subdirectories with the
-a directory and its subdirectories.
+following pattern ``**/*.tmp``.
 ``[...]`` matches a single character from any of the provided characters within
 the brackets. ``[!...]`` does the complementary and matches any single character
 not contained within the brackets. It is also possible to specify ranges with two
 characters separated by ``-``. For example, ``[a-z]`` matches any lowercase
-alphabetic character, and ``[0-9]`` matches any single digit.
+alphabetic character and ``[0-9]`` matches any one single digit.
 
 The order of the glob match patterns defines whether a file is included or
-excluded, that is to say, later entries override earlier ones.
+excluded, that is to say later entries override previous ones.
 This is also true for match patterns encountered deeper down the directory tree,
 which can override a previous exclusion.
-
+Be aware that excluded directories will **not** be read by the backup client.
-.. Note:: Excluded directories will **not** be read by the backup client. Thus,
+Thus, a ``.pxarexclude`` file in an excluded subdirectory will have no effect.
-   a ``.pxarexclude`` file in an excluded subdirectory will have no effect.
+``.pxarexclude`` files are treated as regular files and will be included in the
-   ``.pxarexclude`` files are treated as regular files and will be included in
+backup archive.
-   the backup archive.
 
 For example, consider the following directory structure:
 
@@ -283,7 +264,7 @@ You can avoid entering the passwords by setting the environment
 variables ``PBS_PASSWORD`` and ``PBS_ENCRYPTION_PASSWORD``.
 
 
-Using a Master Key to Store and Recover Encryption Keys
+Using a master key to store and recover encryption keys
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 You can also use ``proxmox-backup-client key`` to create an RSA public/private
@@ -363,7 +344,7 @@ To set up a master key:
   keep keys ordered and in a place that is separate from the contents being
   backed up. It can happen, for example, that you back up an entire system, using
   a key on that system. If the system then becomes inaccessible for any reason
-  and needs to be restored, this will not be possible, as the encryption key will be
+  and needs to be restored, this will not be possible as the encryption key will be
   lost along with the broken system.
 
 It is recommended that you keep your master key safe, but easily accessible, in
@@ -385,10 +366,10 @@ version of your master key. The following command sends the output of the
 Restoring Data
 --------------
 
-The regular creation of backups is a necessary step in avoiding data loss. More
+The regular creation of backups is a necessary step to avoiding data
-importantly, however, is the restoration. It is good practice to perform
+loss. More importantly, however, is the restoration. It is good practice to perform
-periodic recovery tests to ensure that you can access the data in case of
+periodic recovery tests to ensure that you can access the data in
-disaster.
+case of problems.
 
 First, you need to find the snapshot which you want to restore. The snapshot
 list command provides a list of all the snapshots on the server:
@@ -447,22 +428,23 @@ to use the interactive recovery shell.
 
 The interactive recovery shell is a minimal command line interface that
 utilizes the metadata stored in the catalog to quickly list, navigate and
-search for files in a file archive.
+search files in a file archive.
 To restore files, you can select them individually or match them with a glob
 pattern.
 
 Using the catalog for navigation reduces the overhead considerably because only
 the catalog needs to be downloaded and, optionally, decrypted.
-The actual chunks are only accessed if the metadata in the catalog is
+The actual chunks are only accessed if the metadata in the catalog is not enough
-insufficient or for the actual restore.
+or for the actual restore.
 
-Similar to common UNIX shells, ``cd`` and ``ls`` are the commands used to change
+Similar to common UNIX shells ``cd`` and ``ls`` are the commands used to change
 working directory and list directory contents in the archive.
 ``pwd`` shows the full path of the current working directory with respect to the
 archive root.
 
-The ability to quickly search the contents of the archive is a commonly required
+Being able to quickly search the contents of the archive is a commonly needed feature.
-feature. That's where the catalog is most valuable. For example:
+That's where the catalog is most valuable.
+For example:
 
 .. code-block:: console
 
@@ -473,8 +455,8 @@ feature. That's where the catalog is most valuable. For example:
   pxar:/ > restore-selected /target/path
   ...
 
-This will find and print all files ending in ``.txt`` located in ``etc/`` or its
+This will find and print all files ending in ``.txt`` located in ``etc/`` or a
-subdirectories, and add the corresponding pattern to the list for subsequent restores.
+subdirectory and add the corresponding pattern to the list for subsequent restores.
 ``list-selected`` shows these patterns and ``restore-selected`` finally restores
 all files in the archive matching the patterns to ``/target/path`` on the local
 host. This will scan the whole archive.
@@ -499,7 +481,7 @@ Mounting of Archives via FUSE
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The :term:`FUSE` implementation for the pxar archive allows you to mount a
-file archive as a read-only filesystem to a mount point on your host.
+file archive as a read-only filesystem to a mountpoint on your host.
 
 .. code-block:: console
 
@@ -515,7 +497,7 @@ This allows you to access the full contents of the archive in a seamless manner.
     load on your host, depending on the operations you perform on the mounted
     filesystem.
 
-To unmount the filesystem, use the ``umount`` command on the mount point:
+To unmount the filesystem use the ``umount`` command on the mountpoint:
 
 .. code-block:: console
 
@@ -524,7 +506,7 @@ To unmount the filesystem, use the ``umount`` command on the mount point:
 Login and Logout
 ----------------
 
-The client tool prompts you to enter the login password as soon as you
+The client tool prompts you to enter the logon password as soon as you
 want to access the backup server. The server checks your credentials
 and responds with a ticket that is valid for two hours. The client
 tool automatically stores that ticket and uses it for further requests
@@ -553,7 +535,7 @@ Changing the Owner of a Backup Group
 By default, the owner of a backup group is the user which was used to originally
 create that backup group (or in the case of sync jobs, ``root@pam``). This
 means that if a user ``mike@pbs`` created a backup, another user ``john@pbs``
-can not be used to create backups in that same backup group. In case you want
+can not be used to create backups in that same backup group.  In case you want
 to change the owner of a backup, you can do so with the below command, using a
 user that has ``Datastore.Modify`` privileges on the datastore.
 
@@ -679,7 +661,7 @@ unused data blocks are removed.
    (access time) property. Filesystems are mounted with the ``relatime`` option
    by default. This results in a better performance by only updating the
    ``atime`` property if the last access has been at least 24 hours ago. The
-   downside is that touching a chunk within these 24 hours will not always
+   downside is, that touching a chunk within these 24 hours will not always
    update its ``atime`` property.
 
    Chunks in the grace period will be logged at the end of the garbage
@@ -703,8 +685,8 @@ unused data blocks are removed.
   Average chunk size: 2486565
   TASK OK
 
-Garbage collection can also be scheduled using ``promxox-backup-manager`` or
+
-from the Proxmox Backup Server's web interface.
+.. todo:: howto run garbage-collection at regular intervals (cron)
 
 Benchmarking
 ------------

docs/command-line-tools.rst

@@ -21,7 +21,3 @@ Command Line Tools
 
 .. include:: pxar/description.rst
 
-``proxmox-backup-debug``
-~~~~~~~~
-
-.. include:: proxmox-backup-debug/description.rst

docs/epilog.rst

@@ -1,5 +1,5 @@
 .. Epilog (included at top of each file)
-
+   
    We use this file to define external links and common replacement
    patterns.
 
@@ -13,6 +13,7 @@
 .. _Proxmox: https://www.proxmox.com
 .. _Proxmox Community Forum: https://forum.proxmox.com
 .. _Proxmox Virtual Environment: https://www.proxmox.com/proxmox-ve
+.. FIXME
 .. _Proxmox Backup: https://pbs.proxmox.com/wiki/index.php/Main_Page
 .. _PBS Development List: https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
 .. _reStructuredText: https://www.sphinx-doc.org/en/master/usage/restructuredtext/index.html
@@ -22,7 +23,6 @@
 .. _Virtual machine: https://en.wikipedia.org/wiki/Virtual_machine
 .. _APT: http://en.wikipedia.org/wiki/Advanced_Packaging_Tool
 .. _QEMU: https://www.qemu.org/
-.. _LXC: https://linuxcontainers.org/lxc/introduction/
 
 .. _Client-server model: https://en.wikipedia.org/wiki/Client-server_model
 .. _AE: https://en.wikipedia.org/wiki/Authenticated_encryption

docs/faq.rst

@@ -24,13 +24,11 @@ future plans to support 32-bit processors.
 How long will my Proxmox Backup Server version be supported?
 ------------------------------------------------------------
 
-+-----------------------+----------------------+---------------+------------+--------------------+
++-----------------------+--------------------+---------------+------------+--------------------+
-|Proxmox Backup Version | Debian Version       | First Release | Debian EOL | Proxmox Backup EOL |
+|Proxmox Backup Version | Debian Version     | First Release | Debian EOL | Proxmox Backup EOL |
-+=======================+======================+===============+============+====================+
++=======================+====================+===============+============+====================+
-|Proxmox Backup 2.x     | Debian 11 (Bullseye) | 2021-07       | tba        | tba                |
+|Proxmox Backup 1.x     | Debian 10 (Buster) | 2020-11       | tba        | tba                |
-+-----------------------+----------------------+---------------+------------+--------------------+
++-----------------------+--------------------+---------------+------------+--------------------+
-|Proxmox Backup 1.x     | Debian 10 (Buster)   | 2020-11       | ~Q2/2022   | Q2-Q3/2022         |
-+-----------------------+----------------------+---------------+------------+--------------------+
 
 
 Can I copy or synchronize my datastore to another location?

docs/file-formats.rst

@@ -51,7 +51,7 @@ data:
 
    * - ``MAGIC: [u8; 8]``
    * - ``CRC32: [u8; 4]``
-   * - ``IV: [u8; 16]``
+   * - ``ÌV: [u8; 16]``
    * - ``TAG: [u8; 16]``
    * - ``Data: (max 16MiB)``
 

docs/gui.rst

@@ -8,9 +8,8 @@ tools. The web interface also provides a built-in console, so if you prefer the
 command line or need some extra control, you have this option.
 
 The web interface can be accessed via https://youripaddress:8007. The default
-login is `root`, and the password is either the one specified during the
+login is `root`, and the password is the one specified during the installation
-installation process or the password of the root user, in case of installation
+process.
-on top of Debian.
 
 
 Features
@@ -49,13 +48,12 @@ GUI Overview
 
 The Proxmox Backup Server web interface consists of 3 main sections:
 
-* **Header**: At the top. This shows version information and contains buttons to
+* **Header**: At the top. This shows version information, and contains buttons to view
-  view documentation, monitor running tasks, set the language, configure various
+  documentation, monitor running tasks, set the language and logout.
-  display settings, and logout.
+* **Sidebar**: On the left. This contains the configuration options for
-* **Sidebar**: On the left. This contains the administration options for
   the server.
-* **Configuration Panel**: In the center. This contains the respective control
+* **Configuration Panel**: In the center. This contains the control interface for the
-  interfaces for the administration options in the *Sidebar*.
+  configuration options in the *Sidebar*.
 
 
 Sidebar
@@ -76,14 +74,12 @@ previous and currently running tasks, and subscription information.
 Configuration
 ^^^^^^^^^^^^^
 
-The Configuration section contains some system options, such as time, network,
+The Configuration section contains some system configuration options, such as
-WebAuthn, and HTTP proxy configuration. It also contains the following
+time and network configuration. It also contains the following subsections:
-subsections:
 
 * **Access Control**: Add and manage users, API tokens, and the permissions
   associated with these items
 * **Remotes**: Add, edit and remove remotes (see :term:`Remote`)
-* **Certificates**: Manage ACME accounts and create SSL certificates.
 * **Subscription**: Upload a subscription key, view subscription status and
   access a text-based system report.
 
@@ -102,7 +98,6 @@ tasks and information. These are:
   resource usage statistics
 * **Services**: Manage and monitor system services
 * **Updates**: An interface for upgrading packages
-* **Repositories**: An interface for configuring APT repositories
 * **Syslog**: View log messages from the server
 * **Tasks**: Task history with multiple filter options
 
@@ -115,7 +110,7 @@ The administration menu item also contains a disk management subsection:
 * **Disks**: View information on available disks
 
   * **Directory**: Create and view information on *ext4* and *xfs* disks
-  * **ZFS**: Create and view information on *ZFS* disks
+  * **ZFS**: Create and view information on *ZFS* disks 
 
 Tape Backup
 ^^^^^^^^^^^
@@ -124,20 +119,11 @@ Tape Backup
   :align: right
   :alt: Tape Backup: Tape changer overview
 
-The `Tape Backup`_ section contains a top panel, with options for managing tape
+The `Tape Backup`_ section contains a top panel, managing tape media sets,
-media sets, inventories, drives, changers, encryption keys, and the tape backup
+inventories, drives, changers and the tape backup jobs itself.
-jobs itself. The tabs are as follows:
 
-* **Content**: Information on the contents of the tape backup
+It also contains a subsection per standalone drive and per changer, with a
-* **Inventory**: Manage the tapes attached to the system
+status and management view for those devices.
-* **Changers**: Manage tape loading devices
-* **Drives**: Manage drives used for reading and writing to tapes
-* **Media Pools**: Manage logical pools of tapes
-* **Encryption Keys**: Manage tape backup encryption keys
-* **Backup Jobs**: Manage tape backup jobs
-
-The section also contains a subsection per standalone drive and per changer,
-with a status and management view for those devices.
 
 Datastore
 ^^^^^^^^^
@@ -147,9 +133,9 @@ Datastore
   :alt: Datastore Configuration
 
 The Datastore section contains interfaces for creating and managing
-datastores. It also contains a button for creating a new datastore on the
+datastores. It contains a button to create a new datastore on the server, as
-server, as well as a subsection for each datastore on the system, in which you
+well as a subsection for each datastore on the system, in which you can use the
-can use the top panel to view:
+top panel to view:
 
 * **Summary**: Access a range of datastore usage statistics
 * **Content**: Information on the datastore's backup groups and their respective
@@ -158,7 +144,5 @@ can use the top panel to view:
   collection <client_garbage-collection>` operations, and run garbage collection
   manually
 * **Sync Jobs**: Create, manage and run :ref:`syncjobs` from remote servers
-* **Verify Jobs**: Create, manage and run :ref:`maintenance_verification` jobs
+* **Verify Jobs**: Create, manage and run :ref:`maintenance_verification` jobs on the
-  on the datastore
+  datastore
-* **Options**: Configure notification and verification settings
-* **Permissions**: Manage permissions on the datastore

docs/installation.rst

@@ -19,24 +19,24 @@ for various management tasks such as disk management.
    `Proxmox Backup`_ without the server part.
 
 The disk image (ISO file) provided by Proxmox includes a complete Debian system
-as well as all necessary packages for the `Proxmox Backup`_ Server.
+("buster" for version 1.x) as well as all necessary packages for the `Proxmox Backup`_ server.
 
 The installer will guide you through the setup process and allow
-you to partition the local disk(s), apply basic system configuration
+you to partition the local disk(s), apply basic system configurations
-(for example timezone, language, network), and install all required packages.
+(e.g. timezone, language, network), and install all required packages.
 The provided ISO will get you started in just a few minutes, and is the
 recommended method for new and existing users.
 
-Alternatively, `Proxmox Backup`_ Server can be installed on top of an
+Alternatively, `Proxmox Backup`_ server can be installed on top of an
 existing Debian system.
 
-Install `Proxmox Backup`_ Server using the Installer
+Install `Proxmox Backup`_ with the Installer
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Download the ISO from |DOWNLOADS|.
 It includes the following:
 
-* The `Proxmox Backup`_ Server installer, which partitions the local
+* The `Proxmox Backup`_ server installer, which partitions the local
   disk(s) with ext4, xfs or ZFS, and installs the operating system
 
 * Complete operating system (Debian Linux, 64-bit)
@@ -63,7 +63,7 @@ standard Debian installation. After configuring the
   # apt-get update
   # apt-get install proxmox-backup-server
 
-The above commands keep the current (Debian) kernel and install a minimal
+The commands above keep the current (Debian) kernel and install a minimal
 set of required packages.
 
 If you want to install the same set of packages as the installer

docs/introduction.rst

@@ -4,15 +4,15 @@ Introduction
 What is Proxmox Backup Server?
 ------------------------------
 
-Proxmox Backup Server is an enterprise-class, client-server backup solution that
+Proxmox Backup Server is an enterprise-class, client-server backup software
-is capable of backing up :term:`virtual machine`\ s, :term:`container`\ s, and
+package that backs up :term:`virtual machine`\ s, :term:`container`\ s, and
 physical hosts. It is specially optimized for the `Proxmox Virtual Environment`_
 platform and allows you to back up your data securely, even between remote
-sites, providing easy management through a web-based user interface.
+sites, providing easy management with a web-based user interface.
 
 It supports deduplication, compression, and authenticated
-encryption (AE_). Using :term:`Rust` as the implementation language guarantees
+encryption (AE_). Using :term:`Rust` as the implementation language guarantees high
-high performance, low resource usage, and a safe, high-quality codebase.
+performance, low resource usage, and a safe, high-quality codebase.
 
 Proxmox Backup uses state of the art cryptography for both client-server
 communication and backup content :ref:`encryption <client_encryption>`. All
@@ -28,23 +28,22 @@ Proxmox Backup Server uses a `client-server model`_. The server stores the
 backup data and provides an API to create and manage datastores. With the
 API, it's also possible to manage disks and other server-side resources.
 
-The backup client uses this API to access the backed up data. You can use the
+The backup client uses this API to access the backed up data. With the command
-``proxmox-backup-client`` command line tool to create and restore file backups.
+line tool ``proxmox-backup-client`` you can create backups and restore data.
-For QEMU_ and LXC_ within `Proxmox Virtual Environment`_, we deliver an
+For QEMU_ with `Proxmox Virtual Environment`_ we deliver an integrated client.
-integrated client.
 
 A single backup is allowed to contain several archives. For example, when you
 backup a :term:`virtual machine`, each disk is stored as a separate archive
 inside that backup. The VM configuration itself is stored as an extra file.
-This way, it's easy to access and restore only the important parts of the
+This way, it's easy to access and restore only important parts of the backup,
-backup, without the need to scan the whole backup.
+without the need to scan the whole backup.
 
 
 Main Features
 -------------
 
 :Support for Proxmox VE: The `Proxmox Virtual Environment`_ is fully
-   supported, and you can easily backup :term:`virtual machine`\ s and
+   supported and you can easily backup :term:`virtual machine`\ s and
    :term:`container`\ s.
 
 :Performance: The whole software stack is written in :term:`Rust`,
@@ -71,10 +70,6 @@ Main Features
    modern hardware. In addition to client-side encryption, all data is
    transferred via a secure TLS connection.
 
-:Tape backup: For long-term archiving of data, Proxmox Backup Server also
-   provides extensive support for backing up to tape and managing tape
-   libraries.
-
 :Web interface: Manage the Proxmox Backup Server with the integrated, web-based
    user interface.
 
@@ -85,7 +80,7 @@ Main Features
    backup-clients.
 
 :Enterprise Support: Proxmox Server Solutions GmbH offers enterprise support in
-   the form of `Proxmox Backup Server Subscription Plans
+   form of `Proxmox Backup Server Subscription Plans
    <https://www.proxmox.com/en/proxmox-backup-server/pricing>`_. Users at every
    subscription level get access to the Proxmox Backup :ref:`Enterprise
    Repository <sysadmin_package_repos_enterprise>`. In addition, with a Basic,
@@ -178,7 +173,7 @@ Bug Tracker
 ~~~~~~~~~~~
 
 Proxmox runs a public bug tracker at `<https://bugzilla.proxmox.com>`_. If an
-issue appears, file your report there. An issue can be a bug, as well as a
+issue appears, file your report there. An issue can be a bug as well as a
 request for a new feature or enhancement. The bug tracker helps to keep track
 of the issue and will send a notification once it has been solved.
 
@@ -229,6 +224,5 @@ requirements.
 
 In July 2020, we released the first beta version of Proxmox Backup
 Server, followed by the first stable version in November 2020. With support for
-encryption and incremental, fully deduplicated backups, Proxmox Backup offers a
+incremental, fully deduplicated backups, Proxmox Backup significantly reduces
-secure environment, which significantly reduces network load and saves valuable
+network load and saves valuable storage space.
-storage space.

docs/local-zfs.rst

@@ -4,17 +4,17 @@
 ZFS on Linux
 ------------
 
-ZFS is a combined file system and logical volume manager, designed by
+ZFS is a combined file system and logical volume manager designed by
 Sun Microsystems. There is no need to manually compile ZFS modules - all
 packages are included.
 
 By using ZFS, it's possible to achieve maximum enterprise features with
-low budget hardware, and also high performance systems by leveraging
+low budget hardware, but also high performance systems by leveraging
-SSD caching or even SSD only setups. ZFS can replace expensive
+SSD caching or even SSD only setups. ZFS can replace cost intense
-hardware raid cards with moderate CPU and memory load, combined with easy
+hardware raid cards by moderate CPU and memory load combined with easy
 management.
 
-General advantages of ZFS:
+General ZFS advantages
 
 * Easy configuration and management with GUI and CLI.
 * Reliable
@@ -34,18 +34,18 @@ General advantages of ZFS:
 Hardware
 ~~~~~~~~~
 
-ZFS depends heavily on memory, so it's recommended to have at least 8GB to
+ZFS depends heavily on memory, so you need at least 8GB to start. In
-start. In practice, use as much you can get for your hardware/budget. To prevent
+practice, use as much you can get for your hardware/budget. To prevent
 data corruption, we recommend the use of high quality ECC RAM.
 
 If you use a dedicated cache and/or log disk, you should use an
-enterprise class SSD (for example, Intel SSD DC S3700 Series). This can
+enterprise class SSD (e.g. Intel SSD DC S3700 Series). This can
 increase the overall performance significantly.
 
-IMPORTANT: Do not use ZFS on top of a hardware controller which has its
+IMPORTANT: Do not use ZFS on top of hardware controller which has its
 own cache management. ZFS needs to directly communicate with disks. An
-HBA adapter or something like an LSI controller flashed in ``IT`` mode is
+HBA adapter is the way to go, or something like LSI controller flashed
-recommended.
+in ``IT`` mode.
 
 
 ZFS Administration
@@ -53,7 +53,7 @@ ZFS Administration
 
 This section gives you some usage examples for common tasks. ZFS
 itself is really powerful and provides many options. The main commands
-to manage ZFS are `zfs` and `zpool`. Both commands come with extensive
+to manage ZFS are `zfs` and `zpool`. Both commands come with great
 manual pages, which can be read with:
 
 .. code-block:: console
@@ -123,7 +123,7 @@ Create a new pool with cache (L2ARC)
 It is possible to use a dedicated cache drive partition to increase
 the performance (use SSD).
 
-For `<device>`, you can use multiple devices, as is shown in
+As `<device>` it is possible to use more devices, like it's shown in
 "Create a new pool with RAID*".
 
 .. code-block:: console
@@ -136,7 +136,7 @@ Create a new pool with log (ZIL)
 It is possible to use a dedicated cache drive partition to increase
 the performance (SSD).
 
-For `<device>`, you can use multiple devices, as is shown in
+As `<device>` it is possible to use more devices, like it's shown in
 "Create a new pool with RAID*".
 
 .. code-block:: console
@@ -146,9 +146,8 @@ For `<device>`, you can use multiple devices, as is shown in
 Add cache and log to an existing pool
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-You can add cache and log devices to a pool after its creation. In this example,
+If you have a pool without cache and log. First partition the SSD in
-we will use a single drive for both cache and log. First, you need to create
+2 partition with `parted` or `gdisk`
-2 partitions on the SSD with `parted` or `gdisk`
 
 .. important:: Always use GPT partition tables.
 
@@ -172,12 +171,12 @@ Changing a failed device
 Changing a failed bootable device
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Depending on how Proxmox Backup was installed, it is either using `grub` or
+Depending on how Proxmox Backup was installed it is either using `grub` or `systemd-boot`
-`systemd-boot` as a bootloader.
+as bootloader.
 
-In either case, the first steps of copying the partition table, reissuing GUIDs
+The first steps of copying the partition table, reissuing GUIDs and replacing
-and replacing the ZFS partition are the same. To make the system bootable from
+the ZFS partition are the same. To make the system bootable from the new disk,
-the new disk, different steps are needed which depend on the bootloader in use.
+different steps are needed which depend on the bootloader in use.
 
 .. code-block:: console
 
@@ -208,7 +207,7 @@ Usually `grub.cfg` is located in `/boot/grub/grub.cfg`
   # grub-mkconfig -o /path/to/grub.cfg
 
 
-Activate e-mail notification
+Activate E-Mail Notification
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 ZFS comes with an event daemon, which monitors events generated by the
@@ -220,24 +219,24 @@ and you can install it using `apt-get`:
 
   # apt-get install zfs-zed
 
-To activate the daemon, it is necessary to to uncomment the ZED_EMAIL_ADDR
+To activate the daemon it is necessary to edit `/etc/zfs/zed.d/zed.rc` with your
-setting, in the file `/etc/zfs/zed.d/zed.rc`.
+favorite editor, and uncomment the `ZED_EMAIL_ADDR` setting:
 
 .. code-block:: console
 
   ZED_EMAIL_ADDR="root"
 
-Please note that Proxmox Backup forwards mails to `root` to the email address
+Please note Proxmox Backup forwards mails to `root` to the email address
 configured for the root user.
 
 IMPORTANT: The only setting that is required is `ZED_EMAIL_ADDR`. All
 other settings are optional.
 
-Limit ZFS memory usage
+Limit ZFS Memory Usage
 ^^^^^^^^^^^^^^^^^^^^^^
 
 It is good to use at most 50 percent (which is the default) of the
-system memory for ZFS ARC, to prevent performance degradation of the
+system memory for ZFS ARC to prevent performance shortage of the
 host. Use your preferred editor to change the configuration in
 `/etc/modprobe.d/zfs.conf` and insert:
 
@@ -245,42 +244,27 @@ host. Use your preferred editor to change the configuration in
 
   options zfs zfs_arc_max=8589934592
 
-The above example limits the usage to 8 GiB ('8 * 2^30^').
+This example setting limits the usage to 8GB.
 
-.. IMPORTANT:: In case your desired `zfs_arc_max` value is lower than or equal
+.. IMPORTANT:: If your root file system is ZFS you must update your initramfs every time this value changes:
-   to `zfs_arc_min` (which defaults to 1/32 of the system memory), `zfs_arc_max`
-   will be ignored. Thus, for it to work in this case, you must set
-   `zfs_arc_min` to at most `zfs_arc_max - 1`. This would require updating the
-   configuration in `/etc/modprobe.d/zfs.conf`, with:
-
-.. code-block:: console
-  options zfs zfs_arc_min=8589934591
-  options zfs zfs_arc_max=8589934592
-
-This example setting limits the usage to 8 GiB ('8 * 2^30^') on
-systems with more than 256 GiB of total memory, where simply setting
-`zfs_arc_max` alone would not work.
-
-.. IMPORTANT:: If your root file system is ZFS, you must update your initramfs
-   every time this value changes.
 
 .. code-block:: console
 
   # update-initramfs -u
 
 
-Swap on ZFS
+SWAP on ZFS
 ^^^^^^^^^^^
 
-Swap-space created on a zvol may cause some issues, such as blocking the
+Swap-space created on a zvol may generate some troubles, like blocking the
 server or generating a high IO load, often seen when starting a Backup
 to an external Storage.
 
-We strongly recommend using enough memory, so that you normally do not
+We strongly recommend to use enough memory, so that you normally do not
 run into low memory situations. Should you need or want to add swap, it is
-preferred to create a partition on a physical disk and use it as a swap device.
+preferred to create a partition on a physical disk and use it as swap device.
 You can leave some space free for this purpose in the advanced options of the
-installer. Additionally, you can lower the `swappiness` value.
+installer. Additionally, you can lower the `swappiness` value. 
 A good value for servers is 10:
 
 .. code-block:: console
@@ -307,7 +291,7 @@ an editor of your choice and add the following line:
    vm.swappiness = 100  The kernel will swap aggressively.
   ====================  ===============================================================
 
-ZFS compression
+ZFS Compression
 ^^^^^^^^^^^^^^^
 
 To activate compression:
@@ -316,11 +300,10 @@ To activate compression:
   # zpool set compression=lz4 <pool>
 
 We recommend using the `lz4` algorithm, since it adds very little CPU overhead.
-Other algorithms such as `lzjb` and `gzip-N` (where `N` is an integer from `1-9`
+Other algorithms such as `lzjb` and `gzip-N` (where `N` is an integer `1-9` representing
-representing the compression ratio, where 1 is fastest and 9 is best
+the compression ratio, 1 is fastest and 9 is best compression) are also available.
-compression) are also available. Depending on the algorithm and how
+Depending on the algorithm and how compressible the data is, having compression enabled can even increase
-compressible the data is, having compression enabled can even increase I/O
+I/O performance.
-performance.
 
 You can disable compression at any time with:
 .. code-block:: console
@@ -331,26 +314,26 @@ Only new blocks will be affected by this change.
 
 .. _local_zfs_special_device:
 
-ZFS special device
+ZFS Special Device
 ^^^^^^^^^^^^^^^^^^
 
-Since version 0.8.0, ZFS supports `special` devices. A `special` device in a
+Since version 0.8.0 ZFS supports `special` devices. A `special` device in a
 pool is used to store metadata, deduplication tables, and optionally small
 file blocks.
 
 A `special` device can improve the speed of a pool consisting of slow spinning
-hard disks with a lot of metadata changes. For example, workloads that involve
+hard disks with a lot of metadata changes. For example workloads that involve
 creating, updating or deleting a large number of files will benefit from the
 presence of a `special` device. ZFS datasets can also be configured to store
-small files on the `special` device, which can further improve the
+whole small files on the `special` device which can further improve the
 performance. Use fast SSDs for the `special` device.
 
 .. IMPORTANT:: The redundancy of the `special` device should match the one of the
-  pool, since the `special` device is a point of failure for the entire pool.
+  pool, since the `special` device is a point of failure for the whole pool.
 
 .. WARNING:: Adding a `special` device to a pool cannot be undone!
 
-To create a pool with `special` device and RAID-1:
+Create a pool with `special` device and RAID-1:
 
 .. code-block:: console
 
@@ -363,8 +346,8 @@ Adding a `special` device to an existing pool with RAID-1:
   # zpool add <pool> special mirror <device1> <device2>
 
 ZFS datasets expose the `special_small_blocks=<size>` property. `size` can be
-`0` to disable storing small file blocks on the `special` device, or a power of
+`0` to disable storing small file blocks on the `special` device or a power of
-two in the range between `512B` to `128K`. After setting this property, new file
+two in the range between `512B` to `128K`. After setting the property new file
 blocks smaller than `size` will be allocated on the `special` device.
 
 .. IMPORTANT:: If the value for `special_small_blocks` is greater than or equal to
@@ -372,10 +355,10 @@ blocks smaller than `size` will be allocated on the `special` device.
   the `special` device, so be careful!
 
 Setting the `special_small_blocks` property on a pool will change the default
-value of that property for all child ZFS datasets (for example, all containers
+value of that property for all child ZFS datasets (for example all containers
 in the pool will opt in for small file blocks).
 
-Opt in for all files smaller than 4K-blocks pool-wide:
+Opt in for all file smaller than 4K-blocks pool-wide:
 
 .. code-block:: console
 
@@ -396,15 +379,10 @@ Opt out from small file blocks for a single dataset:
 Troubleshooting
 ^^^^^^^^^^^^^^^
 
-Corrupt cache file
+Corrupted cachefile
-""""""""""""""""""
 
-`zfs-import-cache.service` imports ZFS pools using the ZFS cache file. If this
+In case of a corrupted ZFS cachefile, some volumes may not be mounted during
-file becomes corrupted, the service won't be able to import the pools that it's
+boot until mounted manually later.
-unable to read from it.
-
-As a result, in case of a corrupted ZFS cache file, some volumes may not be
-mounted during boot and must be mounted manually later.
 
 For each pool, run:
 
@@ -412,13 +390,16 @@ For each pool, run:
 
   # zpool set cachefile=/etc/zfs/zpool.cache POOLNAME
 
-then, update the `initramfs` by running:
+and afterwards update the `initramfs` by running:
 
 .. code-block:: console
 
   # update-initramfs -u -k all
 
-and finally, reboot the node.
+and finally reboot your node.
+
+Sometimes the ZFS cachefile can get corrupted, and `zfs-import-cache.service`
+doesn't import the pools that aren't present in the cachefile.
 
 Another workaround to this problem is enabling the `zfs-import-scan.service`,
 which searches and imports pools via device scanning (usually slower).

docs/lto-barcode/index.html

@@ -34,7 +34,17 @@
   </style>
   <link rel="stylesheet" type="text/css" href="font-awesome/css/font-awesome.css"/>
   <script type="text/javascript" src="extjs/ext-all.js"></script>
-  <script type="text/javascript" src="lto-barcode-generator.js"></script>
+  
+  <script type="text/javascript" src="code39.js"></script>
+  <script type="text/javascript" src="prefix-field.js"></script>
+  <script type="text/javascript" src="label-style.js"></script>
+  <script type="text/javascript" src="tape-type.js"></script>
+  <script type="text/javascript" src="paper-size.js"></script>
+  <script type="text/javascript" src="page-layout.js"></script>
+  <script type="text/javascript" src="page-calibration.js"></script>
+  <script type="text/javascript" src="label-list.js"></script>
+  <script type="text/javascript" src="label-setup.js"></script>
+  <script type="text/javascript" src="lto-barcode.js"></script>
 </head>
 <body>
 </body>

docs/lto-barcode/lto-barcode.js

@@ -1,5 +1,7 @@
-// for toolkit.js
+// FIXME: HACK! Makes scrolling in number spinner work again. fixed in ExtJS >= 6.1
-function gettext(val) { return val; };
+if (Ext.isFirefox) {
+    Ext.$eventNameMap.DOMMouseScroll = 'DOMMouseScroll';
+}
 
 function draw_labels(target_id, label_list, page_layout, calibration) {
     let max_labels = compute_max_labels(page_layout);

docs/maintenance.rst

@@ -14,15 +14,15 @@ following retention options are available:
 
 ``keep-hourly <N>``
   Keep backups for the last ``<N>`` hours. If there is more than one
-  backup for a single hour, only the latest is retained.
+  backup for a single hour, only the latest is kept.
 
 ``keep-daily <N>``
   Keep backups for the last ``<N>`` days. If there is more than one
-  backup for a single day, only the latest is retained.
+  backup for a single day, only the latest is kept.
 
 ``keep-weekly <N>``
   Keep backups for the last ``<N>`` weeks. If there is more than one
-  backup for a single week, only the latest is retained.
+  backup for a single week, only the latest is kept.
 
   .. note:: Weeks start on Monday and end on Sunday. The software
      uses the `ISO week date`_ system and handles weeks at
@@ -30,17 +30,17 @@ following retention options are available:
 
 ``keep-monthly <N>``
   Keep backups for the last ``<N>`` months. If there is more than one
-  backup for a single month, only the latest is retained.
+  backup for a single month, only the latest is kept.
 
 ``keep-yearly <N>``
   Keep backups for the last ``<N>`` years. If there is more than one
-  backup for a single year, only the latest is retained.
+  backup for a single year, only the latest is kept.
 
 The retention options are processed in the order given above. Each option
 only covers backups within its time period. The next option does not take care
 of already covered backups. It will only consider older backups.
 
-Unfinished and incomplete backups will be removed by the prune command, unless
+Unfinished and incomplete backups will be removed by the prune command unless
 they are newer than the last successful backup. In this case, the last failed
 backup is retained.
 
@@ -48,7 +48,7 @@ Prune Simulator
 ^^^^^^^^^^^^^^^
 
 You can use the built-in `prune simulator <prune-simulator/index.html>`_
-to explore the effect of different retention options with various backup
+to explore the effect of different retetion options with various backup
 schedules.
 
 Manual Pruning
@@ -59,10 +59,10 @@ Manual Pruning
   :align: right
   :alt: Prune and garbage collection options
 
-To manually prune a specific backup group, you can use
+To access pruning functionality for a specific backup group, you can use the
-``proxmox-backup-client``'s ``prune`` subcommand, discussed in
+prune command line option discussed in :ref:`backup-pruning`, or navigate to
-:ref:`backup-pruning`, or navigate to the **Content** tab of the datastore and
+the **Content** tab of the datastore and click the scissors icon in the
-click the scissors icon in the **Actions** column of the relevant backup group.
+**Actions** column of the relevant backup group.
 
 Prune Schedules
 ^^^^^^^^^^^^^^^
@@ -81,7 +81,7 @@ Retention Settings Example
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The backup frequency and retention of old backups may depend on how often data
-changes and how important an older state may be in a specific workload.
+changes, and how important an older state may be, in a specific work load.
 When backups act as a company's document archive, there may also be legal
 requirements for how long backup snapshots must be kept.
 
@@ -125,8 +125,8 @@ start garbage collection on an entire datastore and the ``status`` subcommand to
 see attributes relating to the :ref:`garbage collection <client_garbage-collection>`.
 
 This functionality can also be accessed in the GUI, by navigating to **Prune &
-GC** from the top panel of a datastore. From here, you can edit the schedule at
+GC** from the top panel. From here, you can edit the schedule at which garbage
-which garbage collection runs and manually start the operation.
+collection runs and manually start the operation.
 
 
 .. _maintenance_verification:
@@ -139,13 +139,13 @@ Verification
   :align: right
   :alt: Adding a verify job
 
-Proxmox Backup Server offers various verification options to ensure that backup
+Proxmox Backup offers various verification options to ensure that backup data is
-data is intact. Verification is generally carried out through the creation of
+intact.  Verification is generally carried out through the creation of verify
-verify jobs. These are scheduled tasks that run verification at a given interval
+jobs. These are scheduled tasks that run verification at a given interval (see
-(see :ref:`calendar-event-scheduling`). With these, you can also set whether
+:ref:`calendar-event-scheduling`). With these, you can set whether already verified
-already verified snapshots are ignored, as well as set a time period, after
+snapshots are ignored, as well as set a time period, after which verified jobs
-which snapshots are checked again. The interface for creating verify jobs can be
+are checked again. The interface for creating verify jobs can be found under the
-found under the **Verify Jobs** tab of the datastore.
+**Verify Jobs** tab of the datastore.
 
 .. Note:: It is recommended that you reverify all backups at least monthly, even
   if a previous verification was successful. This is because physical drives
@@ -158,9 +158,9 @@ found under the **Verify Jobs** tab of the datastore.
   data.
 
 Aside from using verify jobs, you can also run verification manually on entire
-datastores, backup groups or snapshots. To do this, navigate to the **Content**
+datastores, backup groups, or snapshots. To do this, navigate to the **Content**
-tab of the datastore and either click *Verify All* or select the *V.* icon from
+tab of the datastore and either click *Verify All*, or select the *V.* icon from
-the **Actions** column in the table.
+the *Actions* column in the table.
 
 .. _maintenance_notification:
 
@@ -170,8 +170,8 @@ Notifications
 Proxmox Backup Server can send you notification emails about automatically
 scheduled verification, garbage-collection and synchronization tasks results.
 
-By default, notifications are sent to the email address configured for the
+By default, notifications are send to the email address configured for the
-`root@pam` user. You can instead set this user for each datastore.
+`root@pam` user. You can set that user for each datastore.
 
 You can also change the level of notification received per task type, the
 following options are available:
@@ -179,6 +179,6 @@ following options are available:
 * Always: send a notification for any scheduled task, independent of the
   outcome
 
-* Errors: send a notification for any scheduled task that results in an error
+* Errors: send a notification for any scheduled task resulting in an error
 
 * Never: do not send any notification at all

docs/managing-remotes.rst

@@ -17,8 +17,8 @@ configuration information for remotes is stored in the file
   :align: right
   :alt: Add a remote
 
-To add a remote, you need its hostname or IP address, a userid and password on
+To add a remote, you need its hostname or IP, a userid and password on the
-the remote, and its certificate fingerprint. To get the fingerprint, use the
+remote, and its certificate fingerprint. To get the fingerprint, use the
 ``proxmox-backup-manager cert info`` command on the remote, or navigate to
 **Dashboard** in the remote's web interface and select **Show Fingerprint**.
 
@@ -60,13 +60,12 @@ Sync Jobs
 
 Sync jobs are configured to pull the contents of a datastore on a **Remote** to
 a local datastore. You can manage sync jobs in the web interface, from the
-**Sync Jobs** tab of the **Datastore** panel or from that of the Datastore
+**Sync Jobs** tab of the datastore which you'd like to set one up for, or using
-itself. Alternatively, you can manage them with the ``proxmox-backup-manager
+the ``proxmox-backup-manager sync-job`` command.  The configuration information
-sync-job`` command. The configuration information for sync jobs is stored at
+for sync jobs is stored at ``/etc/proxmox-backup/sync.cfg``. To create a new
-``/etc/proxmox-backup/sync.cfg``. To create a new sync job, click the add button
+sync job, click the add button in the GUI, or use the ``create`` subcommand.
-in the GUI, or use the ``create`` subcommand. After creating a sync job, you can
+After creating a sync job, you can either start it manually from the GUI or
-either start it manually from the GUI or provide it with a schedule (see
+provide it with a schedule (see :ref:`calendar-event-scheduling`) to run regularly.
-:ref:`calendar-event-scheduling`) to run regularly.
 
 .. code-block:: console
 
@@ -80,14 +79,14 @@ either start it manually from the GUI or provide it with a schedule (see
   └────────────┴───────┴────────┴──────────────┴───────────┴─────────┘
   # proxmox-backup-manager sync-job remove pbs2-local
 
-To set up sync jobs, the configuring user needs the following permissions:
+For setting up sync jobs, the configuring user needs the following permissions:
 
 #. ``Remote.Read`` on the ``/remote/{remote}/{remote-store}`` path
-#. At least ``Datastore.Backup`` on the local target datastore (``/datastore/{store}``)
+#. at least ``Datastore.Backup`` on the local target datastore (``/datastore/{store}``)
 
 If the ``remove-vanished`` option is set, ``Datastore.Prune`` is required on
 the local datastore as well. If the ``owner`` option is not set (defaulting to
-``root@pam``) or is set to something other than the configuring user,
+``root@pam``) or set to something other than the configuring user,
 ``Datastore.Modify`` is required as well.
 
 .. note:: A sync job can only sync backup groups that the configured remote's

docs/network-management.rst

@@ -82,8 +82,7 @@ is:
 .. note:: This command and corresponding GUI button rely on the ``ifreload``
   command, from the package ``ifupdown2``. This package is included within the
   Proxmox Backup Server installation, however, you may have to install it yourself,
-  if you have installed Proxmox Backup Server on top of Debian or a Proxmox VE
+  if you have installed Proxmox Backup Server on top of Debian or Proxmox VE.
-  version prior to version 7.
 
 You can also configure DNS settings, from the **DNS** section
 of **Configuration** or by using the ``dns`` subcommand of

docs/package-repositories.rst

@@ -17,13 +17,15 @@ update``.
 .. code-block:: sources.list
   :caption: File: ``/etc/apt/sources.list``
 
-  deb http://ftp.debian.org/debian bullseye main contrib
+  deb http://ftp.debian.org/debian buster main contrib
-  deb http://ftp.debian.org/debian bullseye-updates main contrib
+  deb http://ftp.debian.org/debian buster-updates main contrib
 
   # security updates
-  deb http://security.debian.org/debian-security bullseye-security main contrib
+  deb http://security.debian.org/debian-security buster/updates main contrib
 
 
+.. FIXME for 7.0: change security update suite to bullseye-security
+
 In addition, you need a package repository from Proxmox to get Proxmox Backup
 updates.
 
@@ -43,21 +45,31 @@ key with the following commands:
 
 .. code-block:: console
 
- # wget https://enterprise.proxmox.com/debian/proxmox-release-bullseye.gpg -O /etc/apt/trusted.gpg.d/proxmox-release-bullseye.gpg
+ # wget http://download.proxmox.com/debian/proxmox-ve-release-6.x.gpg -O /etc/apt/trusted.gpg.d/proxmox-ve-release-6.x.gpg
 
-Verify the SHA512 checksum afterwards with the expected output below:
+Verify the SHA512 checksum afterwards with:
 
 .. code-block:: console
 
- # sha512sum /etc/apt/trusted.gpg.d/proxmox-release-bullseye.gpg
+ # sha512sum /etc/apt/trusted.gpg.d/proxmox-ve-release-6.x.gpg
- 7fb03ec8a1675723d2853b84aa4fdb49a46a3bb72b9951361488bfd19b29aab0a789a4f8c7406e71a69aabbc727c936d3549731c4659ffa1a08f44db8fdcebfa  /etc/apt/trusted.gpg.d/proxmox-release-bullseye.gpg
 
-and the md5sum, with the expected output below:
+The output should be:
 
 .. code-block:: console
 
- # md5sum /etc/apt/trusted.gpg.d/proxmox-release-bullseye.gpg
+ acca6f416917e8e11490a08a1e2842d500b3a5d9f322c6319db0927b2901c3eae23cfb5cd5df6facf2b57399d3cfa52ad7769ebdd75d9b204549ca147da52626 /etc/apt/trusted.gpg.d/proxmox-ve-release-6.x.gpg
- bcc35c7173e0845c0d6ad6470b70f50e /etc/apt/trusted.gpg.d/proxmox-release-bullseye.gpg
+
+and the md5sum:
+
+.. code-block:: console
+
+ # md5sum /etc/apt/trusted.gpg.d/proxmox-ve-release-6.x.gpg
+
+Here, the output should be:
+
+.. code-block:: console
+
+ f3f6c5a3a67baf38ad178e5ff1ee270c /etc/apt/trusted.gpg.d/proxmox-ve-release-6.x.gpg
 
 .. _sysadmin_package_repos_enterprise:
 
@@ -72,7 +84,7 @@ enabled by default:
 .. code-block:: sources.list
   :caption: File: ``/etc/apt/sources.list.d/pbs-enterprise.list``
 
-  deb https://enterprise.proxmox.com/debian/pbs bullseye pbs-enterprise
+  deb https://enterprise.proxmox.com/debian/pbs buster pbs-enterprise
 
 
 To never miss important security fixes, the superuser (``root@pam`` user) is
@@ -102,15 +114,15 @@ We recommend to configure this repository in ``/etc/apt/sources.list``.
 .. code-block:: sources.list
   :caption: File: ``/etc/apt/sources.list``
 
-  deb http://ftp.debian.org/debian bullseye main contrib
+  deb http://ftp.debian.org/debian buster main contrib
-  deb http://ftp.debian.org/debian bullseye-updates main contrib
+  deb http://ftp.debian.org/debian buster-updates main contrib
 
   # PBS pbs-no-subscription repository provided by proxmox.com,
   # NOT recommended for production use
-  deb http://download.proxmox.com/debian/pbs bullseye pbs-no-subscription
+  deb http://download.proxmox.com/debian/pbs buster pbs-no-subscription
 
   # security updates
-  deb http://security.debian.org/debian-security bullseye-security main contrib
+  deb http://security.debian.org/debian-security buster/updates main contrib
 
 
 `Proxmox Backup`_ Test Repository
@@ -128,7 +140,7 @@ You can access this repository by adding the following line to
 .. code-block:: sources.list
   :caption: sources.list entry for ``pbstest``
 
-  deb http://download.proxmox.com/debian/pbs bullseye pbstest
+  deb http://download.proxmox.com/debian/pbs buster pbstest
 
 .. _package_repositories_client_only:
 
@@ -149,26 +161,6 @@ APT-based Proxmox Backup Client Repository
 For modern Linux distributions using `apt` as package manager, like all Debian
 and Ubuntu Derivative do, you may be able to use the APT-based repository.
 
-In order to configure this repository you need to first :ref:`setup the Proxmox
-release key <package_repos_secure_apt>`. After that, add the repository URL to
-the APT sources lists.
-
-**Repositories for Debian 11 (Bullseye) based releases**
-
-This repository is tested with:
-
-- Debian Bullseye
-
-Edit the file ``/etc/apt/sources.list.d/pbs-client.list`` and add the following
-snipped
-
-.. code-block:: sources.list
-  :caption: File: ``/etc/apt/sources.list``
-
-  deb http://download.proxmox.com/debian/pbs-client bullseye main
-
-**Repositories for Debian 10 (Buster) based releases**
-
 This repository is tested with:
 
 - Debian Buster
@@ -176,6 +168,9 @@ This repository is tested with:
 
 It may work with older, and should work with more recent released versions.
 
+In order to configure this repository you need to first :ref:`setup the Proxmox
+release key <package_repos_secure_apt>`. After that, add the repository URL to
+the APT sources lists.
 Edit the file ``/etc/apt/sources.list.d/pbs-client.list`` and add the following
 snipped
 

docs/proxmox-backup-debug/description.rst

@@ -1,14 +0,0 @@
-Implements debugging functionality to inspect Proxmox Backup datastore
-files, verify the integrity of chunks.
-
-Also contains an 'api' subcommand where arbitrary api paths can be called
-(get/create/set/delete) as well as display their parameters (usage) and
-their child-links (ls).
-
-By default, it connects to the proxmox-backup-proxy on localhost via https,
-but by setting the environment variable `PROXMOX_DEBUG_API_CODE` to `1` the
-tool directly calls the corresponding code.
-
-.. WARNING:: Using `PROXMOX_DEBUG_API_CODE` can be dangerous and is only intended
-   for debugging purposes. It is not intended for use on a production system.
-

docs/proxmox-backup-debug/man1.rst

@@ -1,33 +0,0 @@
-==========================
-proxmox-backup-debug
-==========================
-
-.. include:: ../epilog.rst
-
--------------------------------------------------------------
-Debugging command line tool for Backup and Restore
--------------------------------------------------------------
-
-:Author: |AUTHOR|
-:Version: Version |VERSION|
-:Manual section: 1
-
-
-Synopsis
-==========
-
-.. include:: synopsis.rst
-
-Common Options
-==============
-
-.. include:: ../output-format.rst
-
-
-Description
-============
-
-.. include:: description.rst
-
-
-.. include:: ../pbs-copyright.rst

docs/proxmox-backup-proxy/description.rst

@@ -1,5 +1,5 @@
 This daemon exposes the whole Proxmox Backup Server API on TCP port
 8007 using HTTPS. It runs as user ``backup`` and has very limited
-permissions. Operations requiring more permissions are forwarded to
+permissions. Operation requiring more permissions are forwarded to
 the local ``proxmox-backup`` service.
 

docs/prune-simulator/prune-simulator.js

@@ -1,5 +1,7 @@
-// for Toolkit.js
+// FIXME: HACK! Makes scrolling in number spinner work again. fixed in ExtJS >= 6.1
-function gettext(val) { return val; };
+if (Ext.isFirefox) {
+    Ext.$eventNameMap.DOMMouseScroll = 'DOMMouseScroll';
+}
 
 Ext.onReady(function() {
     const NOW = new Date();
@@ -35,6 +37,7 @@ Ext.onReady(function() {
 
 	editable: true,
 
+	displayField: 'text',
 	valueField: 'value',
 	queryMode: 'local',
 

docs/pve-integration.rst

@@ -3,8 +3,8 @@
 `Proxmox VE`_ Integration
 -------------------------
 
-Proxmox Backup Server can be integrated into a Proxmox VE standalone or cluster
+A Proxmox Backup Server can be integrated into a Proxmox VE setup by adding the
-setup, by adding it as a storage in Proxmox VE.
+former as a storage in a Proxmox VE standalone or cluster setup.
 
 See also the `Proxmox VE Storage - Proxmox Backup Server
 <https://pve.proxmox.com/pve-docs/pve-admin-guide.html#storage_pbs>`_ section
@@ -14,8 +14,8 @@ of the Proxmox VE Administration Guide for Proxmox VE specific documentation.
 Using the Proxmox VE Web-Interface
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Proxmox VE has native API and web interface integration of Proxmox Backup
+Proxmox VE has native API and web-interface integration of Proxmox Backup
-Server as of `Proxmox VE 6.3
+Server since the `Proxmox VE 6.3 release
 <https://pve.proxmox.com/wiki/Roadmap#Proxmox_VE_6.3>`_.
 
 A Proxmox Backup Server can be added under ``Datacenter -> Storage``.
@@ -24,8 +24,8 @@ Using the Proxmox VE Command-Line
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 You need to define a new storage with type 'pbs' on your `Proxmox VE`_
-node. The following example uses ``store2`` as the storage's name, and
+node. The following example uses ``store2`` as storage name, and
-assumes the server address is ``localhost`` and you want to connect
+assumes the server address is ``localhost``, and you want to connect
 as ``user1@pbs``.
 
 .. code-block:: console
@@ -33,7 +33,7 @@ as ``user1@pbs``.
   # pvesm add pbs store2 --server localhost --datastore store2
   # pvesm set store2 --username user1@pbs --password <secret>
 
-.. note:: If you would rather not enter your password as plain text, you can pass
+.. note:: If you would rather not pass your password as plain text, you can pass
   the ``--password`` parameter, without any arguments. This will cause the
   program to prompt you for a password upon entering the command.
 
@@ -53,7 +53,7 @@ relationship:
 
   # pvesm set store2 --fingerprint  64:d3:ff:3a:50:38:53:5a:9b:f7:50:...:ab:fe
 
-After that, you should be able to view storage status with:
+After that you should be able to see storage status with:
 
 .. code-block:: console
 

docs/pxar/description.rst

@@ -1,12 +1,12 @@
-``pxar`` is a command line utility for creating and manipulating archives in the
+``pxar`` is a command line utility to create and manipulate archives in the
 :ref:`pxar-format`.
 It is inspired by `casync file archive format
 <http://0pointer.net/blog/casync-a-tool-for-distributing-file-system-images.html>`_,
 which caters to a similar use-case.
 The ``.pxar`` format is adapted to fulfill the specific needs of the Proxmox
-Backup Server, for example, efficient storage of hard links.
+Backup Server, for example, efficient storage of hardlinks.
-The format is designed to reduce the required storage on the server by
+The format is designed to reduce storage space needed on the server by achieving
-achieving a high level of deduplication.
+a high level of deduplication.
 
 Creating an Archive
 ^^^^^^^^^^^^^^^^^^^
@@ -24,10 +24,10 @@ This will create a new archive called ``archive.pxar`` with the contents of the
     the same name is already present in the target folder, the creation will
     fail.
 
-By default, ``pxar`` will skip certain mount points and will not follow device
+By default, ``pxar`` will skip certain mountpoints and will not follow device
 boundaries. This design decision is based on the primary use case of creating
-archives for backups. It makes sense to ignore the contents of certain
+archives for backups. It makes sense to not back up the contents of certain
-temporary or system specific files in a backup.
+temporary or system specific files.
 To alter this behavior and follow device boundaries, use the
 ``--all-file-systems`` flag.
 
@@ -41,38 +41,40 @@ by running:
 
     # pxar create archive.pxar /path/to/source --exclude '**/*.txt'
 
-Be aware that the shell itself will try to expand glob patterns before invoking
+Be aware that the shell itself will try to expand all of the glob patterns before
-``pxar``. In order to avoid this, all globs have to be quoted correctly.
+invoking ``pxar``.
+In order to avoid this, all globs have to be quoted correctly.
 
 It is possible to pass the ``--exclude`` parameter multiple times, in order to
 match more than one pattern. This allows you to use more complex
-file inclusion/exclusion behavior. However, it is recommended to use
+file exclusion/inclusion behavior. However, it is recommended to use
 ``.pxarexclude`` files instead for such cases.
 
-For example you might want to exclude all ``.txt`` files except a specific
+For example you might want to exclude all ``.txt`` files except for a specific
-one from the archive. This would be achieved via the negated match pattern,
+one from the archive. This is achieved via the negated match pattern, prefixed
-prefixed by ``!``.  All the glob patterns are relative to the ``source``
+by ``!``.
-directory.
+All the glob patterns are relative to the ``source`` directory.
 
 .. code-block:: console
 
     # pxar create archive.pxar /path/to/source --exclude '**/*.txt' --exclude '!/folder/file.txt'
 
-.. NOTE:: The order of the glob match patterns matters, as later ones override
+.. NOTE:: The order of the glob match patterns matters as later ones override
-   earlier ones. Permutations of the same patterns lead to different results.
+    previous ones. Permutations of the same patterns lead to different results.
 
 ``pxar`` will store the list of glob match patterns passed as parameters via the
-command line, in a file called ``.pxarexclude-cli``, at the root of the archive.
+command line, in a file called ``.pxarexclude-cli`` at the root of
+the archive.
 If a file with this name is already present in the source folder during archive
-creation, this file is not included in the archive, and the file containing the
+creation, this file is not included in the archive and the file containing the
-new patterns is added to the archive instead. The original file is not altered.
+new patterns is added to the archive instead, the original file is not altered.
 
 A more convenient and persistent way to exclude files from the archive is by
 placing the glob match patterns in ``.pxarexclude`` files.
 It is possible to create and place these files in any directory of the filesystem
 tree.
-These files must contain one pattern per line, and later patterns override
+These files must contain one pattern per line, again later patterns win over
-earlier ones.
+previous ones.
 The patterns control file exclusions of files present within the given directory
 or further below it in the tree.
 The behavior is the same as described in :ref:`client_creating_backups`.
@@ -87,7 +89,7 @@ with the following command:
 
     # pxar extract archive.pxar /path/to/target
 
-If no target is provided, the contents of the archive is extracted to the current
+If no target is provided, the content of the archive is extracted to the current
 working directory.
 
 In order to restore only parts of an archive, single files, and/or folders,
@@ -114,13 +116,13 @@ run the following command:
     # pxar list archive.pxar
 
 This displays the full path of each file or directory with respect to the
-archive's root.
+archives root.
 
 Mounting an Archive
 ^^^^^^^^^^^^^^^^^^^
 
 ``pxar`` allows you to mount and inspect the contents of an archive via _`FUSE`.
-In order to mount an archive named ``archive.pxar`` to the mount point ``/mnt``,
+In order to mount an archive named ``archive.pxar`` to the mountpoint ``/mnt``,
 run the command:
 
 .. code-block:: console
@@ -128,7 +130,7 @@ run the command:
     # pxar mount archive.pxar /mnt
 
 Once the archive is mounted, you can access its content under the given
-mount point.
+mountpoint.
 
 .. code-block:: console
 

docs/storage.rst

@@ -15,7 +15,7 @@ accessed using the ``disk`` subcommand. This subcommand allows you to initialize
 disks, create various filesystems, and get information about the disks.
 
 To view the disks connected to the system, navigate to **Administration ->
-Storage/Disks** in the web interface or use the ``list`` subcommand of
+Disks** in the web interface or use the ``list`` subcommand of
 ``disk``:
 
 .. code-block:: console
@@ -42,9 +42,9 @@ To initialize a disk with a new GPT, use the ``initialize`` subcommand:
   :alt: Create a directory
 
 You can create an ``ext4`` or ``xfs`` filesystem on a disk using ``fs
-create``, or by navigating to **Administration -> Storage/Disks -> Directory**
+create``, or by navigating to **Administration -> Disks -> Directory** in the
-in the web interface and creating one from there. The following command creates
+web interface and creating one from there. The following command creates an
-an ``ext4`` filesystem and passes the ``--add-datastore`` parameter, in order to
+``ext4`` filesystem and passes the ``--add-datastore`` parameter, in order to
 automatically create a datastore on the disk (in this case ``sdd``). This will
 create a datastore at the location ``/mnt/datastore/store1``:
 
@@ -57,7 +57,7 @@ create a datastore at the location ``/mnt/datastore/store1``:
   :alt: Create ZFS
 
 You can also create a ``zpool`` with various raid levels from **Administration
--> Storage/Disks -> ZFS** in the web interface, or by using ``zpool create``. The command
+-> Disks -> Zpool** in the web interface, or by using ``zpool create``. The command
 below creates a mirrored ``zpool`` using two disks (``sdb`` & ``sdc``) and
 mounts it under ``/mnt/datastore/zpool1``:
 
@@ -102,7 +102,7 @@ is stored in the file ``/etc/proxmox-backup/datastore.cfg``.
    subdirectories per directory. That number comes from the 2\ :sup:`16`
    pre-created chunk namespace directories, and the ``.`` and ``..`` default
    directory entries. This requirement excludes certain filesystems and
-   filesystem configurations from being supported for a datastore. For example,
+   filesystem configuration from being supported for a datastore. For example,
    ``ext3`` as a whole or ``ext4`` with the ``dir_nlink`` feature manually disabled.
 
 
@@ -113,15 +113,14 @@ Datastore Configuration
   :align: right
   :alt: Datastore Overview
 
-You can configure multiple datastores. A minimum of one datastore needs to be
+You can configure multiple datastores. Minimum one datastore needs to be
 configured. The datastore is identified by a simple *name* and points to a
 directory on the filesystem. Each datastore also has associated retention
 settings of how many backup snapshots for each interval of ``hourly``,
 ``daily``, ``weekly``, ``monthly``, ``yearly`` as well as a time-independent
 number of backups to keep in that store. :ref:`backup-pruning` and
-:ref:`garbage collection <client_garbage-collection>` can also be configured to
+:ref:`garbage collection <client_garbage-collection>` can also be configured to run
-run periodically, based on a configured schedule (see
+periodically based on a configured schedule (see :ref:`calendar-event-scheduling`) per datastore.
-:ref:`calendar-event-scheduling`) per datastore.
 
 
 .. _storage_datastore_create:
@@ -147,8 +146,7 @@ window:
 * *Comment* can be used to add some contextual information to the datastore.
 
 Alternatively you can create a new datastore from the command line. The
-following command creates a new datastore called ``store1`` on
+following command creates a new datastore called ``store1`` on :file:`/backup/disk1/store1`
-:file:`/backup/disk1/store1`
 
 .. code-block:: console
 
@@ -158,7 +156,7 @@ following command creates a new datastore called ``store1`` on
 Managing Datastores
 ^^^^^^^^^^^^^^^^^^^
 
-To list existing datastores from the command line, run:
+To list existing datastores from the command line run:
 
 .. code-block:: console
 
@@ -218,9 +216,8 @@ After creating a datastore, the following default layout will appear:
 
 `.lock` is an empty file used for process locking.
 
-The `.chunks` directory contains folders, starting from `0000` and increasing in
+The `.chunks` directory contains folders, starting from `0000` and taking hexadecimal values until `ffff`. These
-hexadecimal values until `ffff`. These directories will store the chunked data,
+directories will store the chunked data after a backup operation has been executed.
-categorized by checksum, after a backup operation has been executed.
 
 .. code-block:: console
 

docs/sysadmin.rst

@@ -4,8 +4,8 @@ Host System Administration
 ==========================
 
 `Proxmox Backup`_ is based on the famous Debian_ Linux
-distribution. This means that you have access to the entire range of
+distribution. That means that you have access to the whole world of
-Debian packages, and that the base system is well documented. The `Debian
+Debian packages, and the base system is well documented. The `Debian
 Administrator's Handbook`_ is available online, and provides a
 comprehensive introduction to the Debian operating system.
 
@@ -17,11 +17,11 @@ updates to some Debian packages when necessary.
 
 We also deliver a specially optimized Linux kernel, where we enable
 all required virtualization and container features. That kernel
-includes drivers for ZFS_, as well as several hardware drivers. For example,
+includes drivers for ZFS_, and several hardware drivers. For example,
 we ship Intel network card drivers to support their newest hardware.
 
 The following sections will concentrate on backup related topics. They
-will explain things which are different on `Proxmox Backup`_, or
+either explain things which are different on `Proxmox Backup`_, or
 tasks which are commonly used on `Proxmox Backup`_. For other topics,
 please refer to the standard Debian documentation.
 

docs/tape-backup.rst

@@ -3,6 +3,9 @@
 Tape Backup
 ===========
 
+.. CAUTION:: Tape Backup is a technical preview feature, not meant for
+   production use.
+
 .. image:: images/screenshots/pbs-gui-tape-changer-overview.png
   :align: right
   :alt: Tape Backup: Tape changer overview
@@ -845,17 +848,6 @@ Update Inventory
 Restore Catalog
 ~~~~~~~~~~~~~~~
 
-To restore a catalog from an existing tape, just insert the tape into the drive
-and execute:
-
-.. code-block:: console
-
-  # proxmox-tape catalog
-
-
-You can restore from a tape even without an existing catalog, but only the
-whole media set. If you do this, the catalog will be automatically created.
-
 
 Encryption Key Management
 ~~~~~~~~~~~~~~~~~~~~~~~~~

docs/technical-overview.rst

@@ -8,7 +8,7 @@ Datastores
 
 A Datastore is the logical place where :ref:`Backup Snapshots
 <term_backup_snapshot>` and their chunks are stored. Snapshots consist of a
-manifest, blobs, and dynamic- and fixed-indexes (see :ref:`terms`), and are
+manifest, blobs, dynamic- and fixed-indexes (see :ref:`terms`), and are
 stored in the following directory structure:
 
  <datastore-root>/<type>/<id>/<time>/
@@ -32,8 +32,8 @@ The chunks of a datastore are found in
 
  <datastore-root>/.chunks/
 
-This chunk directory is further subdivided by the first four bytes of the
+This chunk directory is further subdivided by the first four byte of the chunks
-chunk's checksum, so a chunk with the checksum
+checksum, so the chunk with the checksum
 
  a342e8151cbf439ce65f3df696b54c67a114982cc0aa751f2852c2f7acc19a8b
 
@@ -47,7 +47,7 @@ per directory can be bad for file system performance.
 These chunk directories ('0000'-'ffff') will be preallocated when a datastore
 is created.
 
-Fixed-Sized Chunks
+Fixed-sized Chunks
 ^^^^^^^^^^^^^^^^^^
 
 For block based backups (like VMs), fixed-sized chunks are used. The content
@@ -58,10 +58,10 @@ often tries to allocate files in contiguous pieces, so new files get new
 blocks, and changing existing files changes only their own blocks.
 
 As an optimization, VMs in `Proxmox VE`_ can make use of 'dirty bitmaps', which
-can track the changed blocks of an image. Since these bitmaps are also a
+can track the changed blocks of an image. Since these bitmap are also a
 representation of the image split into chunks, there is a direct relation
-between the dirty blocks of the image and chunks which need to be uploaded.
+between dirty blocks of the image and chunks which need to get uploaded, so
-Thus, only modified chunks of the disk need to be uploaded to a backup.
+only modified chunks of the disk have to be uploaded for a backup.
 
 Since the image is always split into chunks of the same size, unchanged blocks
 will result in identical checksums for those chunks, so such chunks do not need
@@ -71,24 +71,24 @@ changed blocks.
 For consistency, `Proxmox VE`_ uses a QEMU internal snapshot mechanism, that
 does not rely on storage snapshots either.
 
-Dynamically Sized Chunks
+Dynamically sized Chunks
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
-When working with file-based systems rather than block-based systems,
+If one does not want to backup block-based systems but rather file-based
-using fixed-sized chunks is not a good idea, since every time a file
+systems, using fixed-sized chunks is not a good idea, since every time a file
-would change in size, the remaining data would be shifted around,
+would change in size, the remaining data gets shifted around and this would
-resulting in many chunks changing and the amount of deduplication being reduced.
+result in many chunks changing, reducing the amount of deduplication.
 
 To improve this, `Proxmox Backup`_ Server uses dynamically sized chunks
 instead. Instead of splitting an image into fixed sizes, it first generates a
 consistent file archive (:ref:`pxar <pxar-format>`) and uses a rolling hash
 over this on-the-fly generated archive to calculate chunk boundaries.
 
-We use a variant of Buzhash which is a cyclic polynomial algorithm. It works
+We use a variant of Buzhash which is a cyclic polynomial algorithm.  It works
 by continuously calculating a checksum while iterating over the data, and on
-certain conditions, it triggers a hash boundary.
+certain conditions it triggers a hash boundary.
 
-Assuming that most files on the system that is to be backed up have not
+Assuming that most files of the system that is to be backed up have not
 changed, eventually the algorithm triggers the boundary on the same data as a
 previous backup, resulting in chunks that can be reused.
 
@@ -100,8 +100,8 @@ can be encrypted, and they are handled in a slightly different manner than
 normal chunks.
 
 The hashes of encrypted chunks are calculated not with the actual (encrypted)
-chunk content, but with the plain-text content, concatenated with the encryption
+chunk content, but with the plain-text content concatenated with the encryption
-key. This way, two chunks with the same data but encrypted with different keys
+key. This way, two chunks of the same data encrypted with different keys
 generate two different checksums and no collisions occur for multiple
 encryption keys.
 
@@ -112,14 +112,14 @@ the previous backup, do not need to be encrypted and uploaded.
 Caveats and Limitations
 -----------------------
 
-Notes on Hash Collisions
+Notes on hash collisions
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
 Every hashing algorithm has a chance to produce collisions, meaning two (or
 more) inputs generate the same checksum. For SHA-256, this chance is
-negligible. To calculate the chances of such a collision, one can use the ideas
+negligible.  To calculate such a collision, one can use the ideas of the
-of the 'birthday problem' from probability theory. For big numbers, this is
+'birthday problem' from probability theory. For big numbers, this is actually
-actually unfeasible to calculate with regular computers, but there is a good
+infeasible to calculate with regular computers, but there is a good
 approximation:
 
 .. math::
@@ -127,7 +127,7 @@ approximation:
  p(n, d) = 1 - e^{-n^2/(2d)}
 
 Where `n` is the number of tries, and `d` is the number of possibilities.
-For a concrete example, lets assume a large datastore of 1 PiB and an average
+For a concrete example lets assume a large datastore of 1 PiB, and an average
 chunk size of 4 MiB. That means :math:`n = 268435456` tries, and :math:`d =
 2^{256}` possibilities. Inserting those values in the formula from earlier you
 will see that the probability of a collision in that scenario is:
@@ -136,96 +136,31 @@ will see that the probability of a collision in that scenario is:
 
  3.1115 * 10^{-61}
 
-For context, in a lottery game of guessing 6 numbers out of 45, the chance to
+For context, in a lottery game of guessing 6 out of 45, the chance to correctly
-correctly guess all 6 numbers is only :math:`1.2277 * 10^{-7}`. This means the
+guess all 6 numbers is only :math:`1.2277 * 10^{-7}`, that means the chance of
-chance of a collision is about the same as winning 13 such lottery games *in a
+a collision is about the same as winning 13 such lotto games *in a row*.
-row*.
 
 In conclusion, it is extremely unlikely that such a collision would occur by
 accident in a normal datastore.
 
 Additionally, SHA-256 is prone to length extension attacks, but since there is
-an upper limit for how big the chunks are, this is not a problem, because a
+an upper limit for how big the chunk are, this is not a problem, since a
 potential attacker cannot arbitrarily add content to the data beyond that
 limit.
 
-File-Based Backup
+File-based Backup
 ^^^^^^^^^^^^^^^^^
 
 Since dynamically sized chunks (for file-based backups) are created on a custom
 archive format (pxar) and not over the files directly, there is no relation
-between the files and chunks. This means that the Proxmox Backup Client has to
+between files and the chunks. This means  that the Proxmox Backup client has to
 read all files again for every backup, otherwise it would not be possible to
-generate a consistent, independent pxar archive where the original chunks can be
+generate a consistent independent pxar archive where the original chunks can be
-reused. Note that in spite of this, only new or changed chunks will be uploaded.
+reused. Note that there will be still only new or change chunks be uploaded.
 
-Verification of Encrypted Chunks
+Verification of encrypted chunks
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 For encrypted chunks, only the checksum of the original (plaintext) data is
-available, making it impossible for the server (without the encryption key) to
+available, making it impossible for the server (without the encryption key), to
 verify its content against it. Instead only the CRC-32 checksum gets checked.
-
-Troubleshooting
----------------
-
-Index files(*.fidx*, *.didx*) contain information about how to rebuild a file.
-More precisely, they contain an ordered list of references to the chunks that
-the original file was split into. If there is something wrong with a snapshot,
-it might be useful to find out which chunks are referenced in it, and check
-whether they are present and intact. The ``proxmox-backup-debug`` command line
-tool can be used to inspect such files and recover their contents. For example,
-to get a list of the referenced chunks of a *.fidx* index:
-
-.. code-block:: console
-
-    # proxmox-backup-debug inspect file drive-scsi0.img.fidx
-
-The same command can be used to inspect *.blob* files. Without the ``--decode``
-parameter, just the size and the encryption type, if any, are printed. If
-``--decode`` is set, the blob file is decoded into the specified file ('-' will
-decode it directly to stdout).
-
-The following example would print the decoded contents of
-`qemu-server.conf.blob`. If the file you're trying to inspect is encrypted, a
-path to the key file must be provided using ``--keyfile``.
-
-.. code-block:: console
-
-    # proxmox-backup-debug inspect file qemu-server.conf.blob --decode -
-
-You can also check in which index files a specific chunk file is referenced
-with:
-
-.. code-block:: console
-
-    # proxmox-backup-debug inspect chunk b531d3ffc9bd7c65748a61198c060678326a431db7eded874c327b7986e595e0 --reference-filter /path/in/a/datastore/directory
-
-Here ``--reference-filter`` specifies where index files should be searched. This
-can be an arbitrary path. If, for some reason, the filename of the chunk was
-changed, you can explicitly specify the digest using ``--digest``. By default, the
-chunk filename is used as the digest to look for. If no ``--reference-filter``
-is specified, it will only print the CRC and encryption status of the chunk. You
-can also decode chunks, by setting the ``--decode`` flag. If the chunk is
-encrypted, a ``--keyfile`` must be provided, in order to decode it.
-
-Restore without a Running Proxmox Backup Server
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-It's possible to restore specific files from a snapshot, without a running
-Proxmox Backup Server instance, using the ``recover`` subcommand, provided you
-have access to the intact index and chunk files. Note that you also need the
-corresponding key file if the backup was encrypted.
-
-.. code-block:: console
-
-    # proxmox-backup-debug recover index drive-scsi0.img.fidx /path/to/.chunks
-
-In the above example, the `/path/to/.chunks` argument is the path to the
-directory that contains the chunks, and `drive-scsi0.img.fidx` is the index file
-of the file you'd like to restore. Both paths can be absolute or relative. With
-``--skip-crc``, it's possible to disable the CRC checks of the chunks. This
-will speed up the process slightly and allow for trying to restore (partially)
-corrupt chunks. It's recommended to always try without the skip-CRC option
-first.
-

docs/terminology.rst

@@ -41,23 +41,23 @@ Binary Data (BLOBs)
 ~~~~~~~~~~~~~~~~~~~
 
 This type is used to store smaller (< 16MB) binary data such as
-configuration files. Larger files should be stored as image archives.
+configuration files. Larger files should be stored as image archive.
 
 .. caution:: Please do not store all files as BLOBs. Instead, use the
-   file archive to store entire directory trees.
+   file archive to store whole directory trees.
 
 
 Catalog File: ``catalog.pcat1``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The catalog file is an index for file archives. It contains
-the list of included files and is used to speed up search operations.
+the list of files and is used to speed up search operations.
 
 
 The Manifest: ``index.json``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The manifest contains a list of all backed up files, and their
+The manifest contains the list of all backup files, their
 sizes and checksums. It is used to verify the consistency of a
 backup.
 
@@ -68,19 +68,18 @@ Backup Type
 The backup server groups backups by *type*, where *type* is one of:
 
 ``vm``
-    This type is used for :term:`virtual machine`\ s. It typically
+    This type is used for :term:`virtual machine`\ s. Typically
     consists of the virtual machine's configuration file and an image archive
     for each disk.
 
 ``ct``
-    This type is used for :term:`container`\ s. It consists of the container's
+    This type is used for :term:`container`\ s. Consists of the container's
-    configuration and a single file archive for the filesystem's contents.
+    configuration and a single file archive for the filesystem content.
 
 ``host``
-    This type is used for file/directory backups created from within a machine.
+    This type is used for backups created from within the backed up machine.
-    Typically this would be a physical host, but could also be a virtual machine
+    Typically this would be a physical host but could also be a virtual machine
-    or container. Such backups may contain file and image archives; there are no
+    or container. Such backups may contain file and image archives, there are no restrictions in this regard.
-    restrictions in this regard.
 
 
 Backup ID

docs/user-management.rst

@@ -15,19 +15,17 @@ Proxmox Backup Server supports several authentication realms, and you need to
 choose the realm when you add a new user. Possible realms are:
 
 :pam: Linux PAM standard authentication. Use this if you want to
-      authenticate as a Linux system user (users need to exist on the
+      authenticate as Linux system user (Users need to exist on the
       system).
 
 :pbs: Proxmox Backup Server realm. This type stores hashed passwords in
       ``/etc/proxmox-backup/shadow.json``.
 
-:openid: OpenID Connect server. Users can authenticate against an external
+After installation, there is a single user ``root@pam``, which
-         OpenID Connect server.
+corresponds to the Unix superuser. User configuration information is stored in the file
-
+``/etc/proxmox-backup/user.cfg``. You can use the
-After installation, there is a single user, ``root@pam``, which corresponds to
+``proxmox-backup-manager`` command line tool to list or manipulate
-the Unix superuser. User configuration information is stored in the file
+users:
-``/etc/proxmox-backup/user.cfg``. You can use the ``proxmox-backup-manager``
-command line tool to list or manipulate users:
 
 .. code-block:: console
 
@@ -42,13 +40,13 @@ command line tool to list or manipulate users:
   :align: right
   :alt: Add a new user
 
-The superuser has full administration rights on everything, so it's recommended
+The superuser has full administration rights on everything, so you
-to add other users with less privileges. You can add a new
+normally want to add other users with less privileges. You can add a new
 user with the ``user create`` subcommand or through the web
 interface, under the **User Management** tab of **Configuration -> Access
 Control**. The ``create`` subcommand lets you specify many options like
 ``--email`` or ``--password``. You can update or change any user properties
-using the ``user update`` subcommand later (**Edit** in the GUI):
+using the ``update`` subcommand later (**Edit** in the GUI):
 
 
 .. code-block:: console
@@ -73,16 +71,16 @@ The resulting user list looks like this:
   │ root@pam │      1 │        │           │          │                  │ Superuser        │
   └──────────┴────────┴────────┴───────────┴──────────┴──────────────────┴──────────────────┘
 
-Newly created users do not have any permissions. Please read the :ref:`user_acl`
+Newly created users do not have any permissions. Please read the Access Control
 section to learn how to set access permissions.
 
-You can disable a user account by setting ``--enable`` to ``0``:
+If you want to disable a user account, you can do that by setting ``--enable`` to ``0``
 
 .. code-block:: console
 
   # proxmox-backup-manager user update john@pbs --enable 0
 
-Or completely remove a user with:
+Or completely remove the user with:
 
 .. code-block:: console
 
@@ -97,7 +95,7 @@ API Tokens
   :align: right
   :alt: API Token Overview
 
-Any authenticated user can generate API tokens, which can in turn be used to
+Any authenticated user can generate API tokens which can in turn be used to
 configure various clients, instead of directly providing the username and
 password.
 
@@ -119,7 +117,7 @@ The API token is passed from the client to the server by setting the
 ``Authorization`` HTTP header with method ``PBSAPIToken`` to the value
 ``TOKENID:TOKENSECRET``.
 
-You can generate tokens from the GUI or by using ``proxmox-backup-manager``:
+Generating new tokens can done using ``proxmox-backup-manager`` or the GUI:
 
 .. code-block:: console
 
@@ -156,9 +154,9 @@ section to learn how to set access permissions.
 Access Control
 --------------
 
-By default, new users and API tokens do not have any permissions. Instead you
+By default new users and API tokens do not have any permission. Instead you
 need to specify what is allowed and what is not. You can do this by assigning
-roles to users/tokens on specific objects, like datastores or remotes. The
+roles to users/tokens on specific objects like datastores or remotes. The
 following roles exist:
 
 **NoAccess**
@@ -178,7 +176,7 @@ following roles exist:
   is not allowed to read the actual data.
 
 **DatastoreReader**
-  Can Inspect datastore content and do restores.
+  Can Inspect datastore content and can do restores.
 
 **DatastoreBackup**
   Can backup and restore owned backups.
@@ -195,18 +193,6 @@ following roles exist:
 **RemoteSyncOperator**
   Is allowed to read data from a remote.
 
-**TapeAudit**
-  Can view tape related configuration and status
-
-**TapeAdministrat**
-  Can do anything related to tape backup
-
-**TapeOperator**
-  Can do tape backup and restore (but no configuration changes)
-
-**TapeReader**
-  Can read and inspect tape configuration and media content
-
 .. image:: images/screenshots/pbs-gui-user-management-add-user.png
   :align: right
   :alt: Add permissions for user
@@ -250,8 +236,7 @@ You can list the ACLs of each user/token using the following command:
    │ john@pbs │ /datastore/store1 │         1 │ DatastoreAdmin │
    └──────────┴───────────────────┴───────────┴────────────────┘
 
-A single user/token can be assigned multiple permission sets for different
+A single user/token can be assigned multiple permission sets for different datastores.
-datastores.
 
 .. Note::
   Naming convention is important here. For datastores on the host,
@@ -262,11 +247,11 @@ datastores.
   remote (see `Remote` below) and ``{storename}`` is the name of the datastore on
   the remote.
 
-API Token Permissions
+API Token permissions
 ~~~~~~~~~~~~~~~~~~~~~
 
-API token permissions are calculated based on ACLs containing their ID,
+API token permissions are calculated based on ACLs containing their ID
-independently of those of their corresponding user. The resulting permission set
+independent of those of their corresponding user. The resulting permission set
 on a given path is then intersected with that of the corresponding user.
 
 In practice this means:
@@ -274,17 +259,17 @@ In practice this means:
 #. API tokens require their own ACL entries
 #. API tokens can never do more than their corresponding user
 
-Effective Permissions
+Effective permissions
 ~~~~~~~~~~~~~~~~~~~~~
 
-To calculate and display the effective permission set of a user or API token,
+To calculate and display the effective permission set of a user or API token
 you can use the ``proxmox-backup-manager user permission`` command:
 
 .. code-block:: console
 
   # proxmox-backup-manager user permissions john@pbs --path /datastore/store1
   Privileges with (*) have the propagate flag set
-
+  
   Path: /datastore/store1
   - Datastore.Audit (*)
   - Datastore.Backup (*)
@@ -292,17 +277,17 @@ you can use the ``proxmox-backup-manager user permission`` command:
   - Datastore.Prune (*)
   - Datastore.Read (*)
   - Datastore.Verify (*)
-
+  
   # proxmox-backup-manager acl update /datastore/store1 DatastoreBackup --auth-id 'john@pbs!client1'
   # proxmox-backup-manager user permissions 'john@pbs!client1' --path /datastore/store1
   Privileges with (*) have the propagate flag set
-
+  
   Path: /datastore/store1
   - Datastore.Backup (*)
 
 .. _user_tfa:
 
-Two-Factor Authentication
+Two-factor authentication
 -------------------------
 
 Introduction
@@ -311,7 +296,7 @@ Introduction
 With simple authentication, only a password (single factor) is required to
 successfully claim an identity (authenticate), for example, to be able to log in
 as `root@pam` on a specific instance of Proxmox Backup Server. In this case, if
-the password gets leaked or stolen, anybody can use it to log in - even if they
+the password gets stolen or leaked, anybody can use it to log in - even if they
 should not be allowed to do so.
 
 With two-factor authentication (TFA), a user is asked for an additional factor
@@ -374,18 +359,16 @@ WebAuthn
 
 For WebAuthn to work, you need to have two things:
 
-* A trusted HTTPS certificate (for example, by using `Let's Encrypt
+* a trusted HTTPS certificate (for example, by using `Let's Encrypt
   <https://pbs.proxmox.com/wiki/index.php/HTTPS_Certificate_Configuration>`_).
   While it probably works with an untrusted certificate, some browsers may warn
   or refuse WebAuthn operations if it is not trusted.
 
-* Setup the WebAuthn configuration (see **Configuration -> Authentication** in
+* setup the WebAuthn configuration (see *Configuration -> Authentication* in the
-  the Proxmox Backup Server web interface). This can be auto-filled in most
+  Proxmox Backup Server web-interface). This can be auto-filled in most setups.
-  setups.
 
 Once you have fulfilled both of these requirements, you can add a WebAuthn
-configuration in the **Two Factor Authentication** tab of the **Access Control**
+configuration in the *Access Control* panel.
-panel.
 
 .. _user_tfa_setup_recovery_keys:
 
@@ -397,8 +380,7 @@ Recovery Keys
   :alt: Add a new user
 
 Recovery key codes do not need any preparation; you can simply create a set of
-recovery keys in the **Two Factor Authentication** tab of the **Access Control**
+recovery keys in the *Access Control* panel.
-panel.
 
 .. note:: There can only be one set of single-use recovery keys per user at any
  time.

etc/pbs-enterprise.list

@@ -1 +1 @@
-deb https://enterprise.proxmox.com/debian/pbs bullseye pbs-enterprise
+deb https://enterprise.proxmox.com/debian/pbs buster pbs-enterprise

examples/cipherbench.rs

@@ -1,4 +1,4 @@
-use anyhow::Error;
+use anyhow::{Error};
 
 //  chacha20-poly1305
 

examples/completion.rs

@@ -1,7 +1,6 @@
 use anyhow::{Error};
 
-use proxmox_schema::*;
+use proxmox::api::{*, cli::*};
-use proxmox_router::cli::*;
 
 #[api(
     input: {

examples/download-speed.rs

@@ -1,9 +1,9 @@
 use std::io::Write;
 
-use anyhow::Error;
+use anyhow::{Error};
 
-use pbs_api_types::Authid;
+use proxmox_backup::api2::types::Authid;
-use pbs_client::{HttpClient, HttpClientOptions, BackupReader};
+use proxmox_backup::client::{HttpClient, HttpClientOptions, BackupReader};
 
 pub struct DummyWriter {
     bytes: usize,
@@ -34,7 +34,7 @@ async fn run() -> Result<(), Error> {
 
     let client = HttpClient::new(host, 8007, auth_id, options)?;
 
-    let backup_time = proxmox_time::parse_rfc3339("2019-06-28T10:49:48Z")?;
+    let backup_time = proxmox::tools::time::parse_rfc3339("2019-06-28T10:49:48Z")?;
 
     let client = BackupReader::start(client, None, "store2", "host", "elsa", backup_time, true)
         .await?;
@@ -59,7 +59,7 @@ async fn run() -> Result<(), Error> {
 }
 
 fn main() {
-    if let Err(err) = pbs_runtime::main(run()) {
+    if let Err(err) = proxmox_backup::tools::runtime::main(run()) {
         eprintln!("ERROR: {}", err);
     }
     println!("DONE");

examples/dynamic-files.rs

@@ -1,9 +1,9 @@
+use anyhow::{bail, Error};
+
 use std::thread;
 use std::path::PathBuf;
 use std::io::Write;
 
-use anyhow::{bail, Error};
-
 // tar handle files that shrink during backup, by simply padding with zeros.
 //
 // this binary run multiple thread which writes some large files, then truncates

examples/h2client.rs

@@ -69,7 +69,7 @@ fn send_request(
 }
 
 fn main() -> Result<(), Error> {
-    pbs_runtime::main(run())
+    proxmox_backup::tools::runtime::main(run())
 }
 
 async fn run() -> Result<(), Error> {

examples/h2s-client.rs

@@ -69,7 +69,7 @@ fn send_request(
 }
 
 fn main() -> Result<(), Error> {
-    pbs_runtime::main(run())
+    proxmox_backup::tools::runtime::main(run())
 }
 
 async fn run() -> Result<(), Error> {

examples/h2s-server.rs

@@ -6,10 +6,10 @@ use hyper::{Body, Request, Response};
 use openssl::ssl::{SslAcceptor, SslFiletype, SslMethod};
 use tokio::net::{TcpListener, TcpStream};
 
-use pbs_buildcfg::configdir;
+use proxmox_backup::configdir;
 
 fn main() -> Result<(), Error> {
-    pbs_runtime::main(run())
+    proxmox_backup::tools::runtime::main(run())
 }
 
 async fn run() -> Result<(), Error> {

examples/h2server.rs

@@ -5,7 +5,7 @@ use hyper::{Body, Request, Response};
 use tokio::net::{TcpListener, TcpStream};
 
 fn main() -> Result<(), Error> {
-    pbs_runtime::main(run())
+    proxmox_backup::tools::runtime::main(run())
 }
 
 async fn run() -> Result<(), Error> {

examples/test_chunk_size.rs

@@ -5,7 +5,7 @@ extern crate proxmox_backup;
 use anyhow::{Error};
 use std::io::{Read, Write};
 
-use pbs_datastore::Chunker;
+use proxmox_backup::backup::*;
 
 struct ChunkWriter {
     chunker: Chunker,

examples/test_chunk_speed.rs

@@ -1,6 +1,7 @@
 extern crate proxmox_backup;
 
-use pbs_datastore::Chunker;
+//use proxmox_backup::backup::chunker::*;
+use proxmox_backup::backup::*;
 
 fn main() {
 

examples/test_chunk_speed2.rs

@@ -3,7 +3,7 @@ use futures::*;
 
 extern crate proxmox_backup;
 
-use pbs_client::ChunkStream;
+use proxmox_backup::backup::*;
 
 // Test Chunker with real data read from a file.
 //
@@ -13,7 +13,7 @@ use pbs_client::ChunkStream;
 // Note: I can currently get about 830MB/s
 
 fn main() {
-    if let Err(err) = pbs_runtime::main(run()) {
+    if let Err(err) = proxmox_backup::tools::runtime::main(run()) {
         panic!("ERROR: {}", err);
     }
 }

examples/upload-speed.rs

@@ -1,7 +1,7 @@
 use anyhow::{Error};
 
-use pbs_client::{HttpClient, HttpClientOptions, BackupWriter};
+use proxmox_backup::api2::types::Authid;
-use pbs_api_types::Authid;
+use proxmox_backup::client::*;
 
 async fn upload_speed() -> Result<f64, Error> {
 
@@ -16,7 +16,7 @@ async fn upload_speed() -> Result<f64, Error> {
 
     let client = HttpClient::new(host, 8007, auth_id, options)?;
 
-    let backup_time = proxmox_time::epoch_i64();
+    let backup_time = proxmox::tools::time::epoch_i64();
 
     let client = BackupWriter::start(client, None, datastore, "host", "speedtest", backup_time, false, true).await?;
 
@@ -27,7 +27,7 @@ async fn upload_speed() -> Result<f64, Error> {
 }
 
 fn main()  {
-    match pbs_runtime::main(upload_speed()) {
+    match proxmox_backup::tools::runtime::main(upload_speed()) {
         Ok(mbs) => {
             println!("average upload speed: {} MB/s", mbs);
         }

pbs-api-types/Cargo.toml

@@ -1,25 +0,0 @@
-[package]
-name = "pbs-api-types"
-version = "0.1.0"
-authors = ["Proxmox Support Team <support@proxmox.com>"]
-edition = "2018"
-description = "general API type helpers for PBS"
-
-[dependencies]
-anyhow = "1.0"
-lazy_static = "1.4"
-libc = "0.2"
-nix = "0.19.1"
-openssl = "0.10"
-regex = "1.2"
-serde = { version = "1.0", features = ["derive"] }
-
-proxmox = "0.14.0"
-proxmox-lang = "1.0.0"
-proxmox-schema = { version = "1.0.0", features = [ "api-macro" ] }
-proxmox-time = "1.0.0"
-proxmox-uuid = { version = "1.0.0", features = [ "serde" ] }
-
-proxmox-rrd-api-types = { path = "../proxmox-rrd-api-types" }
-proxmox-systemd = { path = "../proxmox-systemd" }
-pbs-tools = { path = "../pbs-tools" }

pbs-api-types/src/acl.rs

@@ -1,280 +0,0 @@
-use std::str::FromStr;
-
-use serde::de::{value, IntoDeserializer};
-use serde::{Deserialize, Serialize};
-
-use proxmox_lang::constnamedbitmap;
-use proxmox_schema::{
-    api, const_regex, ApiStringFormat, BooleanSchema, EnumEntry, Schema, StringSchema,
-};
-
-const_regex! {
-    pub ACL_PATH_REGEX = concat!(r"^(?:/|", r"(?:/", PROXMOX_SAFE_ID_REGEX_STR!(), ")+", r")$");
-}
-
-// define Privilege bitfield
-
-constnamedbitmap! {
-    /// Contains a list of privilege name to privilege value mappings.
-    ///
-    /// The names are used when displaying/persisting privileges anywhere, the values are used to
-    /// allow easy matching of privileges as bitflags.
-    PRIVILEGES: u64 => {
-        /// Sys.Audit allows knowing about the system and its status
-        PRIV_SYS_AUDIT("Sys.Audit");
-        /// Sys.Modify allows modifying system-level configuration
-        PRIV_SYS_MODIFY("Sys.Modify");
-        /// Sys.Modify allows to poweroff/reboot/.. the system
-        PRIV_SYS_POWER_MANAGEMENT("Sys.PowerManagement");
-
-        /// Datastore.Audit allows knowing about a datastore,
-        /// including reading the configuration entry and listing its contents
-        PRIV_DATASTORE_AUDIT("Datastore.Audit");
-        /// Datastore.Allocate allows creating or deleting datastores
-        PRIV_DATASTORE_ALLOCATE("Datastore.Allocate");
-        /// Datastore.Modify allows modifying a datastore and its contents
-        PRIV_DATASTORE_MODIFY("Datastore.Modify");
-        /// Datastore.Read allows reading arbitrary backup contents
-        PRIV_DATASTORE_READ("Datastore.Read");
-        /// Allows verifying a datastore
-        PRIV_DATASTORE_VERIFY("Datastore.Verify");
-
-        /// Datastore.Backup allows Datastore.Read|Verify and creating new snapshots,
-        /// but also requires backup ownership
-        PRIV_DATASTORE_BACKUP("Datastore.Backup");
-        /// Datastore.Prune allows deleting snapshots,
-        /// but also requires backup ownership
-        PRIV_DATASTORE_PRUNE("Datastore.Prune");
-
-        /// Permissions.Modify allows modifying ACLs
-        PRIV_PERMISSIONS_MODIFY("Permissions.Modify");
-
-        /// Remote.Audit allows reading remote.cfg and sync.cfg entries
-        PRIV_REMOTE_AUDIT("Remote.Audit");
-        /// Remote.Modify allows modifying remote.cfg
-        PRIV_REMOTE_MODIFY("Remote.Modify");
-        /// Remote.Read allows reading data from a configured `Remote`
-        PRIV_REMOTE_READ("Remote.Read");
-
-        /// Sys.Console allows access to the system's console
-        PRIV_SYS_CONSOLE("Sys.Console");
-
-        /// Tape.Audit allows reading tape backup configuration and status
-        PRIV_TAPE_AUDIT("Tape.Audit");
-        /// Tape.Modify allows modifying tape backup configuration
-        PRIV_TAPE_MODIFY("Tape.Modify");
-        /// Tape.Write allows writing tape media
-        PRIV_TAPE_WRITE("Tape.Write");
-        /// Tape.Read allows reading tape backup configuration and media contents
-        PRIV_TAPE_READ("Tape.Read");
-
-        /// Realm.Allocate allows viewing, creating, modifying and deleting realms
-        PRIV_REALM_ALLOCATE("Realm.Allocate");
-    }
-}
-
-/// Admin always has all privileges. It can do everything except a few actions
-/// which are limited to the 'root@pam` superuser
-pub const ROLE_ADMIN: u64 = u64::MAX;
-
-/// NoAccess can be used to remove privileges from specific (sub-)paths
-pub const ROLE_NO_ACCESS: u64 = 0;
-
-#[rustfmt::skip]
-#[allow(clippy::identity_op)]
-/// Audit can view configuration and status information, but not modify it.
-pub const ROLE_AUDIT: u64 = 0
-    | PRIV_SYS_AUDIT
-    | PRIV_DATASTORE_AUDIT;
-
-#[rustfmt::skip]
-#[allow(clippy::identity_op)]
-/// Datastore.Admin can do anything on the datastore.
-pub const ROLE_DATASTORE_ADMIN: u64 = 0
-    | PRIV_DATASTORE_AUDIT
-    | PRIV_DATASTORE_MODIFY
-    | PRIV_DATASTORE_READ
-    | PRIV_DATASTORE_VERIFY
-    | PRIV_DATASTORE_BACKUP
-    | PRIV_DATASTORE_PRUNE;
-
-#[rustfmt::skip]
-#[allow(clippy::identity_op)]
-/// Datastore.Reader can read/verify datastore content and do restore
-pub const ROLE_DATASTORE_READER: u64 = 0
-    | PRIV_DATASTORE_AUDIT
-    | PRIV_DATASTORE_VERIFY
-    | PRIV_DATASTORE_READ;
-
-#[rustfmt::skip]
-#[allow(clippy::identity_op)]
-/// Datastore.Backup can do backup and restore, but no prune.
-pub const ROLE_DATASTORE_BACKUP: u64 = 0
-    | PRIV_DATASTORE_BACKUP;
-
-#[rustfmt::skip]
-#[allow(clippy::identity_op)]
-/// Datastore.PowerUser can do backup, restore, and prune.
-pub const ROLE_DATASTORE_POWERUSER: u64 = 0
-    | PRIV_DATASTORE_PRUNE
-    | PRIV_DATASTORE_BACKUP;
-
-#[rustfmt::skip]
-#[allow(clippy::identity_op)]
-/// Datastore.Audit can audit the datastore.
-pub const ROLE_DATASTORE_AUDIT: u64 = 0
-    | PRIV_DATASTORE_AUDIT;
-
-#[rustfmt::skip]
-#[allow(clippy::identity_op)]
-/// Remote.Audit can audit the remote
-pub const ROLE_REMOTE_AUDIT: u64 = 0
-    | PRIV_REMOTE_AUDIT;
-
-#[rustfmt::skip]
-#[allow(clippy::identity_op)]
-/// Remote.Admin can do anything on the remote.
-pub const ROLE_REMOTE_ADMIN: u64 = 0
-    | PRIV_REMOTE_AUDIT
-    | PRIV_REMOTE_MODIFY
-    | PRIV_REMOTE_READ;
-
-#[rustfmt::skip]
-#[allow(clippy::identity_op)]
-/// Remote.SyncOperator can do read and prune on the remote.
-pub const ROLE_REMOTE_SYNC_OPERATOR: u64 = 0
-    | PRIV_REMOTE_AUDIT
-    | PRIV_REMOTE_READ;
-
-#[rustfmt::skip]
-#[allow(clippy::identity_op)]
-/// Tape.Audit can audit the tape backup configuration and media content
-pub const ROLE_TAPE_AUDIT: u64 = 0
-    | PRIV_TAPE_AUDIT;
-
-#[rustfmt::skip]
-#[allow(clippy::identity_op)]
-/// Tape.Admin can do anything on the tape backup
-pub const ROLE_TAPE_ADMIN: u64 = 0
-    | PRIV_TAPE_AUDIT
-    | PRIV_TAPE_MODIFY
-    | PRIV_TAPE_READ
-    | PRIV_TAPE_WRITE;
-
-#[rustfmt::skip]
-#[allow(clippy::identity_op)]
-/// Tape.Operator can do tape backup and restore (but no configuration changes)
-pub const ROLE_TAPE_OPERATOR: u64 = 0
-    | PRIV_TAPE_AUDIT
-    | PRIV_TAPE_READ
-    | PRIV_TAPE_WRITE;
-
-#[rustfmt::skip]
-#[allow(clippy::identity_op)]
-/// Tape.Reader can do read and inspect tape content
-pub const ROLE_TAPE_READER: u64 = 0
-    | PRIV_TAPE_AUDIT
-    | PRIV_TAPE_READ;
-
-/// NoAccess can be used to remove privileges from specific (sub-)paths
-pub const ROLE_NAME_NO_ACCESS: &str = "NoAccess";
-
-#[api(
-    type_text: "<role>",
-)]
-#[repr(u64)]
-#[derive(Serialize, Deserialize)]
-/// Enum representing roles via their [PRIVILEGES] combination.
-///
-/// Since privileges are implemented as bitflags, each unique combination of privileges maps to a
-/// single, unique `u64` value that is used in this enum definition.
-pub enum Role {
-    /// Administrator
-    Admin = ROLE_ADMIN,
-    /// Auditor
-    Audit = ROLE_AUDIT,
-    /// Disable Access
-    NoAccess = ROLE_NO_ACCESS,
-    /// Datastore Administrator
-    DatastoreAdmin = ROLE_DATASTORE_ADMIN,
-    /// Datastore Reader (inspect datastore content and do restores)
-    DatastoreReader = ROLE_DATASTORE_READER,
-    /// Datastore Backup (backup and restore owned backups)
-    DatastoreBackup = ROLE_DATASTORE_BACKUP,
-    /// Datastore PowerUser (backup, restore and prune owned backup)
-    DatastorePowerUser = ROLE_DATASTORE_POWERUSER,
-    /// Datastore Auditor
-    DatastoreAudit = ROLE_DATASTORE_AUDIT,
-    /// Remote Auditor
-    RemoteAudit = ROLE_REMOTE_AUDIT,
-    /// Remote Administrator
-    RemoteAdmin = ROLE_REMOTE_ADMIN,
-    /// Syncronisation Opertator
-    RemoteSyncOperator = ROLE_REMOTE_SYNC_OPERATOR,
-    /// Tape Auditor
-    TapeAudit = ROLE_TAPE_AUDIT,
-    /// Tape Administrator
-    TapeAdmin = ROLE_TAPE_ADMIN,
-    /// Tape Operator
-    TapeOperator = ROLE_TAPE_OPERATOR,
-    /// Tape Reader
-    TapeReader = ROLE_TAPE_READER,
-}
-
-impl FromStr for Role {
-    type Err = value::Error;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        Self::deserialize(s.into_deserializer())
-    }
-}
-
-pub const ACL_PATH_FORMAT: ApiStringFormat = ApiStringFormat::Pattern(&ACL_PATH_REGEX);
-
-pub const ACL_PATH_SCHEMA: Schema = StringSchema::new("Access control path.")
-    .format(&ACL_PATH_FORMAT)
-    .min_length(1)
-    .max_length(128)
-    .schema();
-
-pub const ACL_PROPAGATE_SCHEMA: Schema =
-    BooleanSchema::new("Allow to propagate (inherit) permissions.")
-        .default(true)
-        .schema();
-
-pub const ACL_UGID_TYPE_SCHEMA: Schema = StringSchema::new("Type of 'ugid' property.")
-    .format(&ApiStringFormat::Enum(&[
-        EnumEntry::new("user", "User"),
-        EnumEntry::new("group", "Group"),
-    ]))
-    .schema();
-
-#[api(
-    properties: {
-        propagate: {
-            schema: ACL_PROPAGATE_SCHEMA,
-        },
-	path: {
-            schema: ACL_PATH_SCHEMA,
-        },
-        ugid_type: {
-            schema: ACL_UGID_TYPE_SCHEMA,
-        },
-	ugid: {
-            type: String,
-            description: "User or Group ID.",
-        },
-	roleid: {
-            type: Role,
-        }
-    }
-)]
-#[derive(Serialize, Deserialize)]
-/// ACL list entry.
-pub struct AclListItem {
-    pub path: String,
-    pub ugid: String,
-    pub ugid_type: String,
-    pub propagate: bool,
-    pub roleid: String,
-}

pbs-api-types/src/crypto.rs

@@ -1,57 +0,0 @@
-use std::fmt::{self, Display};
-
-use anyhow::Error;
-use serde::{Deserialize, Serialize};
-
-use proxmox_schema::api;
-
-use pbs_tools::format::{as_fingerprint, bytes_as_fingerprint};
-
-#[api(default: "encrypt")]
-#[derive(Copy, Clone, Debug, Eq, PartialEq, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
-/// Defines whether data is encrypted (using an AEAD cipher), only signed, or neither.
-pub enum CryptMode {
-    /// Don't encrypt.
-    None,
-    /// Encrypt.
-    Encrypt,
-    /// Only sign.
-    SignOnly,
-}
-
-#[derive(Debug, Eq, PartialEq, Hash, Clone, Deserialize, Serialize)]
-#[serde(transparent)]
-/// 32-byte fingerprint, usually calculated with SHA256.
-pub struct Fingerprint {
-    #[serde(with = "bytes_as_fingerprint")]
-    bytes: [u8; 32],
-}
-
-impl Fingerprint {
-    pub fn new(bytes: [u8; 32]) -> Self {
-        Self { bytes }
-    }
-    pub fn bytes(&self) -> &[u8; 32] {
-        &self.bytes
-    }
-}
-
-/// Display as short key ID
-impl Display for Fingerprint {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", as_fingerprint(&self.bytes[0..8]))
-    }
-}
-
-impl std::str::FromStr for Fingerprint {
-    type Err = Error;
-
-    fn from_str(s: &str) -> Result<Self, Error> {
-        let mut tmp = s.to_string();
-        tmp.retain(|c| c != ':');
-        let bytes = proxmox::tools::hex_to_digest(&tmp)?;
-        Ok(Fingerprint::new(bytes))
-    }
-}
-

pbs-api-types/src/datastore.rs

@@ -1,619 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-use proxmox_schema::{
-    api, const_regex, ApiStringFormat, ApiType, ArraySchema, EnumEntry, IntegerSchema, ReturnType,
-    Schema, StringSchema, Updater,
-};
-
-use crate::{
-    PROXMOX_SAFE_ID_FORMAT, SHA256_HEX_REGEX, SINGLE_LINE_COMMENT_SCHEMA, CryptMode, UPID,
-    Fingerprint, Userid, Authid,
-    GC_SCHEDULE_SCHEMA, DATASTORE_NOTIFY_STRING_SCHEMA, PRUNE_SCHEDULE_SCHEMA,
-
-};
-
-const_regex!{
-    pub BACKUP_TYPE_REGEX = concat!(r"^(", BACKUP_TYPE_RE!(), r")$");
-
-    pub BACKUP_ID_REGEX = concat!(r"^", BACKUP_ID_RE!(), r"$");
-
-    pub BACKUP_DATE_REGEX = concat!(r"^", BACKUP_TIME_RE!() ,r"$");
-
-    pub GROUP_PATH_REGEX = concat!(r"^(", BACKUP_TYPE_RE!(), ")/(", BACKUP_ID_RE!(), r")$");
-
-    pub BACKUP_FILE_REGEX = r"^.*\.([fd]idx|blob)$";
-
-    pub SNAPSHOT_PATH_REGEX = concat!(r"^", SNAPSHOT_PATH_REGEX_STR!(), r"$");
-
-    pub DATASTORE_MAP_REGEX = concat!(r"(:?", PROXMOX_SAFE_ID_REGEX_STR!(), r"=)?", PROXMOX_SAFE_ID_REGEX_STR!());
-}
-
-pub const CHUNK_DIGEST_FORMAT: ApiStringFormat = ApiStringFormat::Pattern(&SHA256_HEX_REGEX);
-
-pub const DIR_NAME_SCHEMA: Schema = StringSchema::new("Directory name")
-    .min_length(1)
-    .max_length(4096)
-    .schema();
-
-pub const BACKUP_ARCHIVE_NAME_SCHEMA: Schema = StringSchema::new("Backup archive name.")
-    .format(&PROXMOX_SAFE_ID_FORMAT)
-    .schema();
-
-pub const BACKUP_ID_FORMAT: ApiStringFormat = ApiStringFormat::Pattern(&BACKUP_ID_REGEX);
-
-pub const BACKUP_ID_SCHEMA: Schema = StringSchema::new("Backup ID.")
-    .format(&BACKUP_ID_FORMAT)
-    .schema();
-
-pub const BACKUP_TYPE_SCHEMA: Schema = StringSchema::new("Backup type.")
-    .format(&ApiStringFormat::Enum(&[
-        EnumEntry::new("vm", "Virtual Machine Backup"),
-        EnumEntry::new("ct", "Container Backup"),
-        EnumEntry::new("host", "Host Backup"),
-    ]))
-    .schema();
-
-pub const BACKUP_TIME_SCHEMA: Schema = IntegerSchema::new("Backup time (Unix epoch.)")
-    .minimum(1_547_797_308)
-    .schema();
-
-pub const DATASTORE_SCHEMA: Schema = StringSchema::new("Datastore name.")
-    .format(&PROXMOX_SAFE_ID_FORMAT)
-    .min_length(3)
-    .max_length(32)
-    .schema();
-
-pub const CHUNK_DIGEST_SCHEMA: Schema = StringSchema::new("Chunk digest (SHA256).")
-    .format(&CHUNK_DIGEST_FORMAT)
-    .schema();
-
-pub const DATASTORE_MAP_FORMAT: ApiStringFormat = ApiStringFormat::Pattern(&DATASTORE_MAP_REGEX);
-
-pub const DATASTORE_MAP_SCHEMA: Schema = StringSchema::new("Datastore mapping.")
-    .format(&DATASTORE_MAP_FORMAT)
-    .min_length(3)
-    .max_length(65)
-    .type_text("(<source>=)?<target>")
-    .schema();
-
-pub const DATASTORE_MAP_ARRAY_SCHEMA: Schema = ArraySchema::new(
-    "Datastore mapping list.", &DATASTORE_MAP_SCHEMA)
-    .schema();
-
-pub const DATASTORE_MAP_LIST_SCHEMA: Schema = StringSchema::new(
-    "A list of Datastore mappings (or single datastore), comma separated. \
-    For example 'a=b,e' maps the source datastore 'a' to target 'b and \
-    all other sources to the default 'e'. If no default is given, only the \
-    specified sources are mapped.")
-    .format(&ApiStringFormat::PropertyString(&DATASTORE_MAP_ARRAY_SCHEMA))
-    .schema();
-
-pub const PRUNE_SCHEMA_KEEP_DAILY: Schema = IntegerSchema::new("Number of daily backups to keep.")
-    .minimum(1)
-    .schema();
-
-pub const PRUNE_SCHEMA_KEEP_HOURLY: Schema =
-    IntegerSchema::new("Number of hourly backups to keep.")
-        .minimum(1)
-        .schema();
-
-pub const PRUNE_SCHEMA_KEEP_LAST: Schema = IntegerSchema::new("Number of backups to keep.")
-    .minimum(1)
-    .schema();
-
-pub const PRUNE_SCHEMA_KEEP_MONTHLY: Schema =
-    IntegerSchema::new("Number of monthly backups to keep.")
-        .minimum(1)
-        .schema();
-
-pub const PRUNE_SCHEMA_KEEP_WEEKLY: Schema =
-    IntegerSchema::new("Number of weekly backups to keep.")
-        .minimum(1)
-        .schema();
-
-pub const PRUNE_SCHEMA_KEEP_YEARLY: Schema =
-    IntegerSchema::new("Number of yearly backups to keep.")
-        .minimum(1)
-        .schema();
-
-#[api(
-    properties: {
-        "keep-last": {
-            schema: PRUNE_SCHEMA_KEEP_LAST,
-            optional: true,
-        },
-        "keep-hourly": {
-            schema: PRUNE_SCHEMA_KEEP_HOURLY,
-            optional: true,
-        },
-        "keep-daily": {
-            schema: PRUNE_SCHEMA_KEEP_DAILY,
-            optional: true,
-        },
-        "keep-weekly": {
-            schema: PRUNE_SCHEMA_KEEP_WEEKLY,
-            optional: true,
-        },
-        "keep-monthly": {
-            schema: PRUNE_SCHEMA_KEEP_MONTHLY,
-            optional: true,
-        },
-        "keep-yearly": {
-            schema: PRUNE_SCHEMA_KEEP_YEARLY,
-            optional: true,
-        },
-    }
-)]
-#[derive(Serialize, Deserialize, Default)]
-#[serde(rename_all = "kebab-case")]
-/// Common pruning options
-pub struct PruneOptions {
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub keep_last: Option<u64>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub keep_hourly: Option<u64>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub keep_daily: Option<u64>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub keep_weekly: Option<u64>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub keep_monthly: Option<u64>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub keep_yearly: Option<u64>,
-}
-
-#[api(
-    properties: {
-        name: {
-            schema: DATASTORE_SCHEMA,
-        },
-        path: {
-            schema: DIR_NAME_SCHEMA,
-        },
-        "notify-user": {
-            optional: true,
-            type: Userid,
-        },
-        "notify": {
-            optional: true,
-            schema: DATASTORE_NOTIFY_STRING_SCHEMA,
-        },
-        comment: {
-            optional: true,
-            schema: SINGLE_LINE_COMMENT_SCHEMA,
-        },
-        "gc-schedule": {
-            optional: true,
-            schema: GC_SCHEDULE_SCHEMA,
-        },
-        "prune-schedule": {
-            optional: true,
-            schema: PRUNE_SCHEDULE_SCHEMA,
-        },
-        "keep-last": {
-            optional: true,
-            schema: PRUNE_SCHEMA_KEEP_LAST,
-        },
-        "keep-hourly": {
-            optional: true,
-            schema: PRUNE_SCHEMA_KEEP_HOURLY,
-        },
-        "keep-daily": {
-            optional: true,
-            schema: PRUNE_SCHEMA_KEEP_DAILY,
-        },
-        "keep-weekly": {
-            optional: true,
-            schema: PRUNE_SCHEMA_KEEP_WEEKLY,
-        },
-        "keep-monthly": {
-            optional: true,
-            schema: PRUNE_SCHEMA_KEEP_MONTHLY,
-        },
-        "keep-yearly": {
-            optional: true,
-            schema: PRUNE_SCHEMA_KEEP_YEARLY,
-        },
-        "verify-new": {
-            description: "If enabled, all new backups will be verified right after completion.",
-            optional: true,
-            type: bool,
-        },
-    }
-)]
-#[derive(Serialize,Deserialize,Updater)]
-#[serde(rename_all="kebab-case")]
-/// Datastore configuration properties.
-pub struct DataStoreConfig {
-    #[updater(skip)]
-    pub name: String,
-    #[updater(skip)]
-    pub path: String,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub comment: Option<String>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub gc_schedule: Option<String>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub prune_schedule: Option<String>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub keep_last: Option<u64>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub keep_hourly: Option<u64>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub keep_daily: Option<u64>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub keep_weekly: Option<u64>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub keep_monthly: Option<u64>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub keep_yearly: Option<u64>,
-    /// If enabled, all backups will be verified right after completion.
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub verify_new: Option<bool>,
-    /// Send job email notification to this user
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub notify_user: Option<Userid>,
-    /// Send notification only for job errors
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub notify: Option<String>,
-}
-
-#[api(
-    properties: {
-        store: {
-            schema: DATASTORE_SCHEMA,
-        },
-        comment: {
-            optional: true,
-            schema: SINGLE_LINE_COMMENT_SCHEMA,
-        },
-    },
-)]
-#[derive(Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
-/// Basic information about a datastore.
-pub struct DataStoreListItem {
-    pub store: String,
-    pub comment: Option<String>,
-}
-
-#[api(
-    properties: {
-        "filename": {
-            schema: BACKUP_ARCHIVE_NAME_SCHEMA,
-        },
-        "crypt-mode": {
-            type: CryptMode,
-            optional: true,
-        },
-    },
-)]
-#[derive(Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
-/// Basic information about archive files inside a backup snapshot.
-pub struct BackupContent {
-    pub filename: String,
-    /// Info if file is encrypted, signed, or neither.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub crypt_mode: Option<CryptMode>,
-    /// Archive size (from backup manifest).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub size: Option<u64>,
-}
-
-#[api()]
-#[derive(Debug, Copy, Clone, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "lowercase")]
-/// Result of a verify operation.
-pub enum VerifyState {
-    /// Verification was successful
-    Ok,
-    /// Verification reported one or more errors
-    Failed,
-}
-
-#[api(
-    properties: {
-        upid: {
-            type: UPID,
-        },
-        state: {
-            type: VerifyState,
-        },
-    },
-)]
-#[derive(Serialize, Deserialize)]
-/// Task properties.
-pub struct SnapshotVerifyState {
-    /// UPID of the verify task
-    pub upid: UPID,
-    /// State of the verification. Enum.
-    pub state: VerifyState,
-}
-
-
-#[api(
-    properties: {
-        "backup-type": {
-            schema: BACKUP_TYPE_SCHEMA,
-        },
-        "backup-id": {
-            schema: BACKUP_ID_SCHEMA,
-        },
-        "backup-time": {
-            schema: BACKUP_TIME_SCHEMA,
-        },
-        comment: {
-            schema: SINGLE_LINE_COMMENT_SCHEMA,
-            optional: true,
-        },
-        verification: {
-            type: SnapshotVerifyState,
-            optional: true,
-        },
-        fingerprint: {
-            type: String,
-            optional: true,
-        },
-        files: {
-            items: {
-                schema: BACKUP_ARCHIVE_NAME_SCHEMA
-            },
-        },
-        owner: {
-            type: Authid,
-            optional: true,
-        },
-    },
-)]
-#[derive(Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
-/// Basic information about backup snapshot.
-pub struct SnapshotListItem {
-    pub backup_type: String, // enum
-    pub backup_id: String,
-    pub backup_time: i64,
-    /// The first line from manifest "notes"
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub comment: Option<String>,
-    /// The result of the last run verify task
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub verification: Option<SnapshotVerifyState>,
-    /// Fingerprint of encryption key
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub fingerprint: Option<Fingerprint>,
-    /// List of contained archive files.
-    pub files: Vec<BackupContent>,
-    /// Overall snapshot size (sum of all archive sizes).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub size: Option<u64>,
-    /// The owner of the snapshots group
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub owner: Option<Authid>,
-}
-
-#[api(
-    properties: {
-        "backup-type": {
-            schema: BACKUP_TYPE_SCHEMA,
-        },
-        "backup-id": {
-            schema: BACKUP_ID_SCHEMA,
-        },
-        "last-backup": {
-            schema: BACKUP_TIME_SCHEMA,
-        },
-        "backup-count": {
-            type: Integer,
-        },
-        files: {
-            items: {
-                schema: BACKUP_ARCHIVE_NAME_SCHEMA
-            },
-        },
-        owner: {
-            type: Authid,
-            optional: true,
-        },
-    },
-)]
-#[derive(Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
-/// Basic information about a backup group.
-pub struct GroupListItem {
-    pub backup_type: String, // enum
-    pub backup_id: String,
-    pub last_backup: i64,
-    /// Number of contained snapshots
-    pub backup_count: u64,
-    /// List of contained archive files.
-    pub files: Vec<String>,
-    /// The owner of group
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub owner: Option<Authid>,
-    /// The first line from group "notes"
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub comment: Option<String>,
-}
-
-#[api(
-    properties: {
-        "backup-type": {
-            schema: BACKUP_TYPE_SCHEMA,
-        },
-        "backup-id": {
-            schema: BACKUP_ID_SCHEMA,
-        },
-        "backup-time": {
-            schema: BACKUP_TIME_SCHEMA,
-        },
-    },
-)]
-#[derive(Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
-/// Prune result.
-pub struct PruneListItem {
-    pub backup_type: String, // enum
-    pub backup_id: String,
-    pub backup_time: i64,
-    /// Keep snapshot
-    pub keep: bool,
-}
-
-#[api(
-    properties: {
-        ct: {
-            type: TypeCounts,
-            optional: true,
-        },
-        host: {
-            type: TypeCounts,
-            optional: true,
-        },
-        vm: {
-            type: TypeCounts,
-            optional: true,
-        },
-        other: {
-            type: TypeCounts,
-            optional: true,
-        },
-    },
-)]
-#[derive(Serialize, Deserialize, Default)]
-/// Counts of groups/snapshots per BackupType.
-pub struct Counts {
-    /// The counts for CT backups
-    pub ct: Option<TypeCounts>,
-    /// The counts for Host backups
-    pub host: Option<TypeCounts>,
-    /// The counts for VM backups
-    pub vm: Option<TypeCounts>,
-    /// The counts for other backup types
-    pub other: Option<TypeCounts>,
-}
-
-#[api()]
-#[derive(Serialize, Deserialize, Default)]
-/// Backup Type group/snapshot counts.
-pub struct TypeCounts {
-    /// The number of groups of the type.
-    pub groups: u64,
-    /// The number of snapshots of the type.
-    pub snapshots: u64,
-}
-
-#[api(
-    properties: {
-        "upid": {
-            optional: true,
-            type: UPID,
-        },
-    },
-)]
-#[derive(Clone, Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
-/// Garbage collection status.
-pub struct GarbageCollectionStatus {
-    pub upid: Option<String>,
-    /// Number of processed index files.
-    pub index_file_count: usize,
-    /// Sum of bytes referred by index files.
-    pub index_data_bytes: u64,
-    /// Bytes used on disk.
-    pub disk_bytes: u64,
-    /// Chunks used on disk.
-    pub disk_chunks: usize,
-    /// Sum of removed bytes.
-    pub removed_bytes: u64,
-    /// Number of removed chunks.
-    pub removed_chunks: usize,
-    /// Sum of pending bytes (pending removal - kept for safety).
-    pub pending_bytes: u64,
-    /// Number of pending chunks (pending removal - kept for safety).
-    pub pending_chunks: usize,
-    /// Number of chunks marked as .bad by verify that have been removed by GC.
-    pub removed_bad: usize,
-    /// Number of chunks still marked as .bad after garbage collection.
-    pub still_bad: usize,
-}
-
-impl Default for GarbageCollectionStatus {
-    fn default() -> Self {
-        GarbageCollectionStatus {
-            upid: None,
-            index_file_count: 0,
-            index_data_bytes: 0,
-            disk_bytes: 0,
-            disk_chunks: 0,
-            removed_bytes: 0,
-            removed_chunks: 0,
-            pending_bytes: 0,
-            pending_chunks: 0,
-            removed_bad: 0,
-            still_bad: 0,
-        }
-    }
-}
-
-#[api(
-    properties: {
-        "gc-status": {
-            type: GarbageCollectionStatus,
-            optional: true,
-        },
-        counts: {
-            type: Counts,
-            optional: true,
-        },
-    },
-)]
-#[derive(Serialize, Deserialize)]
-#[serde(rename_all="kebab-case")]
-/// Overall Datastore status and useful information.
-pub struct DataStoreStatus {
-    /// Total space (bytes).
-    pub total: u64,
-    /// Used space (bytes).
-    pub used: u64,
-    /// Available space (bytes).
-    pub avail: u64,
-    /// Status of last GC
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub gc_status: Option<GarbageCollectionStatus>,
-    /// Group/Snapshot counts
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub counts: Option<Counts>,
-}
-
-pub const ADMIN_DATASTORE_LIST_SNAPSHOTS_RETURN_TYPE: ReturnType = ReturnType {
-    optional: false,
-    schema: &ArraySchema::new(
-        "Returns the list of snapshots.",
-        &SnapshotListItem::API_SCHEMA,
-    ).schema(),
-};
-
-pub const ADMIN_DATASTORE_LIST_SNAPSHOT_FILES_RETURN_TYPE: ReturnType = ReturnType {
-    optional: false,
-    schema: &ArraySchema::new(
-        "Returns the list of archive files inside a backup snapshots.",
-        &BackupContent::API_SCHEMA,
-    ).schema(),
-};
-
-pub const ADMIN_DATASTORE_LIST_GROUPS_RETURN_TYPE: ReturnType = ReturnType {
-    optional: false,
-    schema: &ArraySchema::new(
-        "Returns the list of backup groups.",
-        &GroupListItem::API_SCHEMA,
-    ).schema(),
-};
-
-pub const ADMIN_DATASTORE_PRUNE_RETURN_TYPE: ReturnType = ReturnType {
-    optional: false,
-    schema: &ArraySchema::new(
-        "Returns the list of snapshots and a flag indicating if there are kept or removed.",
-        &PruneListItem::API_SCHEMA,
-    ).schema(),
-};

pbs-api-types/src/jobs.rs

@@ -1,390 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-use proxmox_schema::*;
-
-use crate::{
-    Userid, Authid, REMOTE_ID_SCHEMA, DRIVE_NAME_SCHEMA, MEDIA_POOL_NAME_SCHEMA,
-    SINGLE_LINE_COMMENT_SCHEMA, PROXMOX_SAFE_ID_FORMAT, DATASTORE_SCHEMA,
-};
-
-const_regex!{
-
-    /// Regex for verification jobs 'DATASTORE:ACTUAL_JOB_ID'
-    pub VERIFICATION_JOB_WORKER_ID_REGEX = concat!(r"^(", PROXMOX_SAFE_ID_REGEX_STR!(), r"):");
-    /// Regex for sync jobs 'REMOTE:REMOTE_DATASTORE:LOCAL_DATASTORE:ACTUAL_JOB_ID'
-    pub SYNC_JOB_WORKER_ID_REGEX = concat!(r"^(", PROXMOX_SAFE_ID_REGEX_STR!(), r"):(", PROXMOX_SAFE_ID_REGEX_STR!(), r"):(", PROXMOX_SAFE_ID_REGEX_STR!(), r"):");
-}
-
-pub const JOB_ID_SCHEMA: Schema = StringSchema::new("Job ID.")
-    .format(&PROXMOX_SAFE_ID_FORMAT)
-    .min_length(3)
-    .max_length(32)
-    .schema();
-
-pub const SYNC_SCHEDULE_SCHEMA: Schema = StringSchema::new(
-    "Run sync job at specified schedule.")
-    .format(&ApiStringFormat::VerifyFn(proxmox_systemd::time::verify_calendar_event))
-    .type_text("<calendar-event>")
-    .schema();
-
-pub const GC_SCHEDULE_SCHEMA: Schema = StringSchema::new(
-    "Run garbage collection job at specified schedule.")
-    .format(&ApiStringFormat::VerifyFn(proxmox_systemd::time::verify_calendar_event))
-    .type_text("<calendar-event>")
-    .schema();
-
-pub const PRUNE_SCHEDULE_SCHEMA: Schema = StringSchema::new(
-    "Run prune job at specified schedule.")
-    .format(&ApiStringFormat::VerifyFn(proxmox_systemd::time::verify_calendar_event))
-    .type_text("<calendar-event>")
-    .schema();
-
-pub const VERIFICATION_SCHEDULE_SCHEMA: Schema = StringSchema::new(
-    "Run verify job at specified schedule.")
-    .format(&ApiStringFormat::VerifyFn(proxmox_systemd::time::verify_calendar_event))
-    .type_text("<calendar-event>")
-    .schema();
-
-pub const REMOVE_VANISHED_BACKUPS_SCHEMA: Schema = BooleanSchema::new(
-    "Delete vanished backups. This remove the local copy if the remote backup was deleted.")
-    .default(true)
-    .schema();
-
-#[api(
-    properties: {
-        "next-run": {
-            description: "Estimated time of the next run (UNIX epoch).",
-            optional: true,
-            type: Integer,
-        },
-        "last-run-state": {
-            description: "Result of the last run.",
-            optional: true,
-            type: String,
-        },
-        "last-run-upid": {
-            description: "Task UPID of the last run.",
-            optional: true,
-            type: String,
-        },
-        "last-run-endtime": {
-            description: "Endtime of the last run.",
-            optional: true,
-            type: Integer,
-        },
-    }
-)]
-#[derive(Serialize,Deserialize,Default)]
-#[serde(rename_all="kebab-case")]
-/// Job Scheduling Status
-pub struct JobScheduleStatus {
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub next_run: Option<i64>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub last_run_state: Option<String>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub last_run_upid: Option<String>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub last_run_endtime: Option<i64>,
-}
-
-#[api()]
-#[derive(Debug, Copy, Clone, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "lowercase")]
-/// When do we send notifications
-pub enum Notify {
-    /// Never send notification
-    Never,
-    /// Send notifications for failed and successful jobs
-    Always,
-    /// Send notifications for failed jobs only
-    Error,
-}
-
-#[api(
-    properties: {
-        gc: {
-            type: Notify,
-            optional: true,
-        },
-        verify: {
-            type: Notify,
-            optional: true,
-        },
-        sync: {
-            type: Notify,
-            optional: true,
-        },
-    },
-)]
-#[derive(Debug, Serialize, Deserialize)]
-/// Datastore notify settings
-pub struct DatastoreNotify {
-    /// Garbage collection settings
-    pub gc: Option<Notify>,
-    /// Verify job setting
-    pub verify: Option<Notify>,
-    /// Sync job setting
-    pub sync: Option<Notify>,
-}
-
-pub const DATASTORE_NOTIFY_STRING_SCHEMA: Schema = StringSchema::new(
-    "Datastore notification setting")
-    .format(&ApiStringFormat::PropertyString(&DatastoreNotify::API_SCHEMA))
-    .schema();
-
-pub const IGNORE_VERIFIED_BACKUPS_SCHEMA: Schema = BooleanSchema::new(
-    "Do not verify backups that are already verified if their verification is not outdated.")
-    .default(true)
-    .schema();
-
-pub const VERIFICATION_OUTDATED_AFTER_SCHEMA: Schema = IntegerSchema::new(
-    "Days after that a verification becomes outdated")
-    .minimum(1)
-    .schema();
-
-#[api(
-    properties: {
-        id: {
-            schema: JOB_ID_SCHEMA,
-        },
-        store: {
-            schema: DATASTORE_SCHEMA,
-        },
-        "ignore-verified": {
-            optional: true,
-            schema: IGNORE_VERIFIED_BACKUPS_SCHEMA,
-        },
-        "outdated-after": {
-            optional: true,
-            schema: VERIFICATION_OUTDATED_AFTER_SCHEMA,
-        },
-        comment: {
-            optional: true,
-            schema: SINGLE_LINE_COMMENT_SCHEMA,
-        },
-        schedule: {
-            optional: true,
-            schema: VERIFICATION_SCHEDULE_SCHEMA,
-        },
-    }
-)]
-#[derive(Serialize,Deserialize,Updater)]
-#[serde(rename_all="kebab-case")]
-/// Verification Job
-pub struct VerificationJobConfig {
-    /// unique ID to address this job
-    #[updater(skip)]
-    pub id: String,
-    /// the datastore ID this verificaiton job affects
-    pub store: String,
-    #[serde(skip_serializing_if="Option::is_none")]
-    /// if not set to false, check the age of the last snapshot verification to filter
-    /// out recent ones, depending on 'outdated_after' configuration.
-    pub ignore_verified: Option<bool>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    /// Reverify snapshots after X days, never if 0. Ignored if 'ignore_verified' is false.
-    pub outdated_after: Option<i64>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub comment: Option<String>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    /// when to schedule this job in calendar event notation
-    pub schedule: Option<String>,
-}
-
-#[api(
-    properties: {
-        config: {
-            type: VerificationJobConfig,
-        },
-        status: {
-            type: JobScheduleStatus,
-        },
-    },
-)]
-#[derive(Serialize,Deserialize)]
-#[serde(rename_all="kebab-case")]
-/// Status of Verification Job
-pub struct VerificationJobStatus {
-    #[serde(flatten)]
-    pub config: VerificationJobConfig,
-    #[serde(flatten)]
-    pub status: JobScheduleStatus,
-}
-
-#[api(
-    properties: {
-        store: {
-           schema: DATASTORE_SCHEMA,
-        },
-        pool: {
-            schema: MEDIA_POOL_NAME_SCHEMA,
-        },
-        drive: {
-            schema: DRIVE_NAME_SCHEMA,
-        },
-        "eject-media": {
-            description: "Eject media upon job completion.",
-            type: bool,
-            optional: true,
-        },
-        "export-media-set": {
-            description: "Export media set upon job completion.",
-            type: bool,
-            optional: true,
-        },
-        "latest-only": {
-            description: "Backup latest snapshots only.",
-            type: bool,
-            optional: true,
-        },
-        "notify-user": {
-            optional: true,
-            type: Userid,
-        },
-    }
-)]
-#[derive(Serialize,Deserialize,Clone,Updater)]
-#[serde(rename_all="kebab-case")]
-/// Tape Backup Job Setup
-pub struct TapeBackupJobSetup {
-    pub store: String,
-    pub pool: String,
-    pub drive: String,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub eject_media: Option<bool>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub export_media_set: Option<bool>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub latest_only: Option<bool>,
-    /// Send job email notification to this user
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub notify_user: Option<Userid>,
-}
-
-#[api(
-    properties: {
-        id: {
-            schema: JOB_ID_SCHEMA,
-        },
-        setup: {
-            type: TapeBackupJobSetup,
-        },
-        comment: {
-            optional: true,
-            schema: SINGLE_LINE_COMMENT_SCHEMA,
-        },
-        schedule: {
-            optional: true,
-            schema: SYNC_SCHEDULE_SCHEMA,
-        },
-    }
-)]
-#[derive(Serialize,Deserialize,Clone,Updater)]
-#[serde(rename_all="kebab-case")]
-/// Tape Backup Job
-pub struct TapeBackupJobConfig {
-    #[updater(skip)]
-    pub id: String,
-    #[serde(flatten)]
-    pub setup: TapeBackupJobSetup,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub comment: Option<String>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub schedule: Option<String>,
-}
-
-#[api(
-    properties: {
-        config: {
-            type: TapeBackupJobConfig,
-        },
-        status: {
-            type: JobScheduleStatus,
-        },
-    },
-)]
-#[derive(Serialize,Deserialize)]
-#[serde(rename_all="kebab-case")]
-/// Status of Tape Backup Job
-pub struct TapeBackupJobStatus {
-    #[serde(flatten)]
-    pub config: TapeBackupJobConfig,
-    #[serde(flatten)]
-    pub status: JobScheduleStatus,
-    /// Next tape used (best guess)
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub next_media_label: Option<String>,
-}
-
-#[api(
-    properties: {
-        id: {
-            schema: JOB_ID_SCHEMA,
-        },
-        store: {
-           schema: DATASTORE_SCHEMA,
-        },
-        "owner": {
-            type: Authid,
-            optional: true,
-        },
-        remote: {
-            schema: REMOTE_ID_SCHEMA,
-        },
-        "remote-store": {
-            schema: DATASTORE_SCHEMA,
-        },
-        "remove-vanished": {
-            schema: REMOVE_VANISHED_BACKUPS_SCHEMA,
-            optional: true,
-        },
-        comment: {
-            optional: true,
-            schema: SINGLE_LINE_COMMENT_SCHEMA,
-        },
-        schedule: {
-            optional: true,
-            schema: SYNC_SCHEDULE_SCHEMA,
-        },
-    }
-)]
-#[derive(Serialize,Deserialize,Clone,Updater)]
-#[serde(rename_all="kebab-case")]
-/// Sync Job
-pub struct SyncJobConfig {
-    #[updater(skip)]
-    pub id: String,
-    pub store: String,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub owner: Option<Authid>,
-    pub remote: String,
-    pub remote_store: String,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub remove_vanished: Option<bool>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub comment: Option<String>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub schedule: Option<String>,
-}
-
-#[api(
-    properties: {
-        config: {
-            type: SyncJobConfig,
-        },
-        status: {
-            type: JobScheduleStatus,
-        },
-    },
-)]
-
-#[derive(Serialize,Deserialize)]
-#[serde(rename_all="kebab-case")]
-/// Status of Sync Job
-pub struct SyncJobStatus {
-    #[serde(flatten)]
-    pub config: SyncJobConfig,
-    #[serde(flatten)]
-    pub status: JobScheduleStatus,
-}

pbs-api-types/src/key_derivation.rs

@@ -1,56 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-use proxmox_schema::api;
-
-use crate::CERT_FINGERPRINT_SHA256_SCHEMA;
-
-#[api(default: "scrypt")]
-#[derive(Clone, Copy, Debug, Deserialize, Serialize)]
-#[serde(rename_all = "lowercase")]
-/// Key derivation function for password protected encryption keys.
-pub enum Kdf {
-    /// Do not encrypt the key.
-    None,
-    /// Encrypt they key with a password using SCrypt.
-    Scrypt,
-    /// Encrtypt the Key with a password using PBKDF2
-    PBKDF2,
-}
-
-impl Default for Kdf {
-    #[inline]
-    fn default() -> Self {
-        Kdf::Scrypt
-    }
-}
-
-#[api(
-    properties: {
-        kdf: {
-            type: Kdf,
-        },
-        fingerprint: {
-            schema: CERT_FINGERPRINT_SHA256_SCHEMA,
-            optional: true,
-        },
-    },
-)]
-#[derive(Deserialize, Serialize)]
-/// Encryption Key Information
-pub struct KeyInfo {
-    /// Path to key (if stored in a file)
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub path: Option<String>,
-    pub kdf: Kdf,
-    /// Key creation time
-    pub created: i64,
-    /// Key modification time
-    pub modified: i64,
-    /// Key fingerprint
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub fingerprint: Option<String>,
-    /// Password hint
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub hint: Option<String>,
-}
-

pbs-api-types/src/lib.rs

@@ -1,427 +0,0 @@
-//! Basic API types used by most of the PBS code.
-
-use serde::{Deserialize, Serialize};
-use anyhow::bail;
-
-use proxmox_schema::{
-    api, const_regex, ApiStringFormat, ApiType, ArraySchema, Schema, StringSchema, ReturnType,
-};
-use proxmox::{IPRE, IPRE_BRACKET, IPV4OCTET, IPV4RE, IPV6H16, IPV6LS32, IPV6RE};
-
-#[rustfmt::skip]
-#[macro_export]
-macro_rules! PROXMOX_SAFE_ID_REGEX_STR { () => { r"(?:[A-Za-z0-9_][A-Za-z0-9._\-]*)" }; }
-
-#[rustfmt::skip]
-#[macro_export]
-macro_rules! BACKUP_ID_RE { () => (r"[A-Za-z0-9_][A-Za-z0-9._\-]*") }
-
-#[rustfmt::skip]
-#[macro_export]
-macro_rules! BACKUP_TYPE_RE { () => (r"(?:host|vm|ct)") }
-
-#[rustfmt::skip]
-#[macro_export]
-macro_rules! BACKUP_TIME_RE { () => (r"[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z") }
-
-#[rustfmt::skip]
-#[macro_export]
-macro_rules! SNAPSHOT_PATH_REGEX_STR {
-    () => (
-        concat!(r"(", BACKUP_TYPE_RE!(), ")/(", BACKUP_ID_RE!(), ")/(", BACKUP_TIME_RE!(), r")")
-    );
-}
-
-mod acl;
-pub use acl::*;
-
-mod datastore;
-pub use datastore::*;
-
-mod jobs;
-pub use jobs::*;
-
-mod key_derivation;
-pub use key_derivation::{Kdf, KeyInfo};
-
-mod network;
-pub use network::*;
-
-#[macro_use]
-mod userid;
-pub use userid::Authid;
-pub use userid::Userid;
-pub use userid::{Realm, RealmRef};
-pub use userid::{Tokenname, TokennameRef};
-pub use userid::{Username, UsernameRef};
-pub use userid::{PROXMOX_GROUP_ID_SCHEMA, PROXMOX_TOKEN_ID_SCHEMA, PROXMOX_TOKEN_NAME_SCHEMA};
-
-#[macro_use]
-mod user;
-pub use user::*;
-
-pub use proxmox_schema::upid::*;
-
-mod crypto;
-pub use crypto::{CryptMode, Fingerprint};
-
-pub mod file_restore;
-
-mod remote;
-pub use remote::*;
-
-mod tape;
-pub use tape::*;
-
-mod zfs;
-pub use zfs::*;
-
-
-#[rustfmt::skip]
-#[macro_use]
-mod local_macros {
-    macro_rules! DNS_LABEL { () => (r"(?:[a-zA-Z0-9](?:[a-zA-Z0-9\-]*[a-zA-Z0-9])?)") }
-    macro_rules! DNS_NAME { () => (concat!(r"(?:(?:", DNS_LABEL!() , r"\.)*", DNS_LABEL!(), ")")) }
-    macro_rules! CIDR_V4_REGEX_STR { () => (concat!(r"(?:", IPV4RE!(), r"/\d{1,2})$")) }
-    macro_rules! CIDR_V6_REGEX_STR { () => (concat!(r"(?:", IPV6RE!(), r"/\d{1,3})$")) }
-    macro_rules! DNS_ALIAS_LABEL { () => (r"(?:[a-zA-Z0-9_](?:[a-zA-Z0-9\-]*[a-zA-Z0-9])?)") }
-    macro_rules! DNS_ALIAS_NAME {
-        () => (concat!(r"(?:(?:", DNS_ALIAS_LABEL!() , r"\.)*", DNS_ALIAS_LABEL!(), ")"))
-    }
-}
-
-const_regex! {
-    pub IP_V4_REGEX = concat!(r"^", IPV4RE!(), r"$");
-    pub IP_V6_REGEX = concat!(r"^", IPV6RE!(), r"$");
-    pub IP_REGEX = concat!(r"^", IPRE!(), r"$");
-    pub CIDR_V4_REGEX =  concat!(r"^", CIDR_V4_REGEX_STR!(), r"$");
-    pub CIDR_V6_REGEX =  concat!(r"^", CIDR_V6_REGEX_STR!(), r"$");
-    pub CIDR_REGEX =  concat!(r"^(?:", CIDR_V4_REGEX_STR!(), "|",  CIDR_V6_REGEX_STR!(), r")$");
-    pub HOSTNAME_REGEX = r"^(?:[a-zA-Z0-9](?:[a-zA-Z0-9\-]*[a-zA-Z0-9])?)$";
-    pub DNS_NAME_REGEX =  concat!(r"^", DNS_NAME!(), r"$");
-    pub DNS_ALIAS_REGEX =  concat!(r"^", DNS_ALIAS_NAME!(), r"$");
-    pub DNS_NAME_OR_IP_REGEX = concat!(r"^(?:", DNS_NAME!(), "|",  IPRE!(), r")$");
-
-    pub SHA256_HEX_REGEX = r"^[a-f0-9]{64}$"; // fixme: define in common_regex ?
-
-    pub PASSWORD_REGEX = r"^[[:^cntrl:]]*$"; // everything but control characters
-
-    pub UUID_REGEX = r"^[0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{12}$";
-
-    pub SYSTEMD_DATETIME_REGEX = r"^\d{4}-\d{2}-\d{2}( \d{2}:\d{2}(:\d{2})?)?$"; //  fixme: define in common_regex ?
-
-    pub FINGERPRINT_SHA256_REGEX = r"^(?:[0-9a-fA-F][0-9a-fA-F])(?::[0-9a-fA-F][0-9a-fA-F]){31}$";
-
-    /// Regex for safe identifiers.
-    ///
-    /// This
-    /// [article](https://dwheeler.com/essays/fixing-unix-linux-filenames.html)
-    /// contains further information why it is reasonable to restict
-    /// names this way. This is not only useful for filenames, but for
-    /// any identifier command line tools work with.
-    pub PROXMOX_SAFE_ID_REGEX = concat!(r"^", PROXMOX_SAFE_ID_REGEX_STR!(), r"$");
-
-    pub SINGLE_LINE_COMMENT_REGEX = r"^[[:^cntrl:]]*$";
-
-    pub BACKUP_REPO_URL_REGEX = concat!(
-        r"^^(?:(?:(",
-        USER_ID_REGEX_STR!(), "|", APITOKEN_ID_REGEX_STR!(),
-        ")@)?(",
-        DNS_NAME!(), "|",  IPRE_BRACKET!(),
-        "):)?(?:([0-9]{1,5}):)?(", PROXMOX_SAFE_ID_REGEX_STR!(), r")$"
-    );
-
-    pub BLOCKDEVICE_NAME_REGEX = r"^(:?(:?h|s|x?v)d[a-z]+)|(:?nvme\d+n\d+)$";
-    pub SUBSCRIPTION_KEY_REGEX = concat!(r"^pbs(?:[cbsp])-[0-9a-f]{10}$");
-}
-
-pub const IP_V4_FORMAT: ApiStringFormat = ApiStringFormat::Pattern(&IP_V4_REGEX);
-pub const IP_V6_FORMAT: ApiStringFormat = ApiStringFormat::Pattern(&IP_V6_REGEX);
-pub const IP_FORMAT: ApiStringFormat = ApiStringFormat::Pattern(&IP_REGEX);
-pub const CIDR_V4_FORMAT: ApiStringFormat = ApiStringFormat::Pattern(&CIDR_V4_REGEX);
-pub const CIDR_V6_FORMAT: ApiStringFormat = ApiStringFormat::Pattern(&CIDR_V6_REGEX);
-pub const CIDR_FORMAT: ApiStringFormat = ApiStringFormat::Pattern(&CIDR_REGEX);
-pub const PVE_CONFIG_DIGEST_FORMAT: ApiStringFormat = ApiStringFormat::Pattern(&SHA256_HEX_REGEX);
-pub const PASSWORD_FORMAT: ApiStringFormat = ApiStringFormat::Pattern(&PASSWORD_REGEX);
-pub const UUID_FORMAT: ApiStringFormat = ApiStringFormat::Pattern(&UUID_REGEX);
-pub const BLOCKDEVICE_NAME_FORMAT: ApiStringFormat = ApiStringFormat::Pattern(&BLOCKDEVICE_NAME_REGEX);
-pub const SUBSCRIPTION_KEY_FORMAT: ApiStringFormat = ApiStringFormat::Pattern(&SUBSCRIPTION_KEY_REGEX);
-pub const SYSTEMD_DATETIME_FORMAT: ApiStringFormat = ApiStringFormat::Pattern(&SYSTEMD_DATETIME_REGEX);
-pub const HOSTNAME_FORMAT: ApiStringFormat = ApiStringFormat::Pattern(&HOSTNAME_REGEX);
-
-pub const DNS_ALIAS_FORMAT: ApiStringFormat =
-    ApiStringFormat::Pattern(&DNS_ALIAS_REGEX);
-
-pub const SEARCH_DOMAIN_SCHEMA: Schema =
-    StringSchema::new("Search domain for host-name lookup.").schema();
-
-pub const FIRST_DNS_SERVER_SCHEMA: Schema =
-    StringSchema::new("First name server IP address.")
-    .format(&IP_FORMAT)
-    .schema();
-
-pub const SECOND_DNS_SERVER_SCHEMA: Schema =
-    StringSchema::new("Second name server IP address.")
-    .format(&IP_FORMAT)
-    .schema();
-
-pub const THIRD_DNS_SERVER_SCHEMA: Schema =
-    StringSchema::new("Third name server IP address.")
-    .format(&IP_FORMAT)
-    .schema();
-
-pub const HOSTNAME_SCHEMA: Schema = StringSchema::new("Hostname (as defined in RFC1123).")
-    .format(&HOSTNAME_FORMAT)
-    .schema();
-
-pub const DNS_NAME_FORMAT: ApiStringFormat =
-    ApiStringFormat::Pattern(&DNS_NAME_REGEX);
-
-pub const DNS_NAME_OR_IP_FORMAT: ApiStringFormat =
-    ApiStringFormat::Pattern(&DNS_NAME_OR_IP_REGEX);
-
-pub const DNS_NAME_OR_IP_SCHEMA: Schema = StringSchema::new("DNS name or IP address.")
-    .format(&DNS_NAME_OR_IP_FORMAT)
-    .schema();
-
-pub const NODE_SCHEMA: Schema = StringSchema::new("Node name (or 'localhost')")
-    .format(&ApiStringFormat::VerifyFn(|node| {
-        if node == "localhost" || node == proxmox::tools::nodename() {
-            Ok(())
-        } else {
-            bail!("no such node '{}'", node);
-        }
-    }))
-    .schema();
-
-pub const TIME_ZONE_SCHEMA: Schema = StringSchema::new(
-    "Time zone. The file '/usr/share/zoneinfo/zone.tab' contains the list of valid names.")
-    .format(&SINGLE_LINE_COMMENT_FORMAT)
-    .min_length(2)
-    .max_length(64)
-    .schema();
-
-pub const BLOCKDEVICE_NAME_SCHEMA: Schema = StringSchema::new("Block device name (/sys/block/<name>).")
-    .format(&BLOCKDEVICE_NAME_FORMAT)
-    .min_length(3)
-    .max_length(64)
-    .schema();
-
-pub const DISK_ARRAY_SCHEMA: Schema = ArraySchema::new(
-    "Disk name list.", &BLOCKDEVICE_NAME_SCHEMA)
-    .schema();
-
-pub const DISK_LIST_SCHEMA: Schema = StringSchema::new(
-    "A list of disk names, comma separated.")
-    .format(&ApiStringFormat::PropertyString(&DISK_ARRAY_SCHEMA))
-    .schema();
-
-pub const PASSWORD_SCHEMA: Schema = StringSchema::new("Password.")
-    .format(&PASSWORD_FORMAT)
-    .min_length(1)
-    .max_length(1024)
-    .schema();
-
-pub const PBS_PASSWORD_SCHEMA: Schema = StringSchema::new("User Password.")
-    .format(&PASSWORD_FORMAT)
-    .min_length(5)
-    .max_length(64)
-    .schema();
-
-pub const REALM_ID_SCHEMA: Schema = StringSchema::new("Realm name.")
-    .format(&PROXMOX_SAFE_ID_FORMAT)
-    .min_length(2)
-    .max_length(32)
-    .schema();
-
-pub const FINGERPRINT_SHA256_FORMAT: ApiStringFormat =
-    ApiStringFormat::Pattern(&FINGERPRINT_SHA256_REGEX);
-
-pub const CERT_FINGERPRINT_SHA256_SCHEMA: Schema =
-    StringSchema::new("X509 certificate fingerprint (sha256).")
-        .format(&FINGERPRINT_SHA256_FORMAT)
-        .schema();
-
-pub const PROXMOX_SAFE_ID_FORMAT: ApiStringFormat =
-    ApiStringFormat::Pattern(&PROXMOX_SAFE_ID_REGEX);
-
-pub const SINGLE_LINE_COMMENT_FORMAT: ApiStringFormat =
-    ApiStringFormat::Pattern(&SINGLE_LINE_COMMENT_REGEX);
-
-pub const SINGLE_LINE_COMMENT_SCHEMA: Schema = StringSchema::new("Comment (single line).")
-    .format(&SINGLE_LINE_COMMENT_FORMAT)
-    .schema();
-
-pub const SUBSCRIPTION_KEY_SCHEMA: Schema = StringSchema::new("Proxmox Backup Server subscription key.")
-    .format(&SUBSCRIPTION_KEY_FORMAT)
-    .min_length(15)
-    .max_length(16)
-    .schema();
-
-pub const SERVICE_ID_SCHEMA: Schema = StringSchema::new("Service ID.")
-    .max_length(256)
-    .schema();
-
-pub const PROXMOX_CONFIG_DIGEST_SCHEMA: Schema = StringSchema::new(
-    "Prevent changes if current configuration file has different \
-    SHA256 digest. This can be used to prevent concurrent \
-    modifications.",
-)
-.format(&PVE_CONFIG_DIGEST_FORMAT)
-.schema();
-
-/// API schema format definition for repository URLs
-pub const BACKUP_REPO_URL: ApiStringFormat = ApiStringFormat::Pattern(&BACKUP_REPO_URL_REGEX);
-
-
-// Complex type definitions
-
-
-#[api()]
-#[derive(Default, Serialize, Deserialize)]
-/// Storage space usage information.
-pub struct StorageStatus {
-    /// Total space (bytes).
-    pub total: u64,
-    /// Used space (bytes).
-    pub used: u64,
-    /// Available space (bytes).
-    pub avail: u64,
-}
-
-pub const PASSWORD_HINT_SCHEMA: Schema = StringSchema::new("Password hint.")
-    .format(&SINGLE_LINE_COMMENT_FORMAT)
-    .min_length(1)
-    .max_length(64)
-    .schema();
-
-
-#[api]
-#[derive(Deserialize, Serialize)]
-/// RSA public key information
-pub struct RsaPubKeyInfo {
-    /// Path to key (if stored in a file)
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub path: Option<String>,
-    /// RSA exponent
-    pub exponent: String,
-    /// Hex-encoded RSA modulus
-    pub modulus: String,
-    /// Key (modulus) length in bits
-    pub length: usize,
-}
-
-impl std::convert::TryFrom<openssl::rsa::Rsa<openssl::pkey::Public>> for RsaPubKeyInfo {
-    type Error = anyhow::Error;
-
-    fn try_from(value: openssl::rsa::Rsa<openssl::pkey::Public>) -> Result<Self, Self::Error> {
-        let modulus = value.n().to_hex_str()?.to_string();
-        let exponent = value.e().to_dec_str()?.to_string();
-        let length = value.size() as usize * 8;
-
-        Ok(Self {
-            path: None,
-            exponent,
-            modulus,
-            length,
-        })
-    }
-}
-
-#[api()]
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "PascalCase")]
-/// Describes a package for which an update is available.
-pub struct APTUpdateInfo {
-    /// Package name
-    pub package: String,
-    /// Package title
-    pub title: String,
-    /// Package architecture
-    pub arch: String,
-    /// Human readable package description
-    pub description: String,
-    /// New version to be updated to
-    pub version: String,
-    /// Old version currently installed
-    pub old_version: String,
-    /// Package origin
-    pub origin: String,
-    /// Package priority in human-readable form
-    pub priority: String,
-    /// Package section
-    pub section: String,
-    /// URL under which the package's changelog can be retrieved
-    pub change_log_url: String,
-    /// Custom extra field for additional package information
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub extra_info: Option<String>,
-}
-
-
-#[api()]
-#[derive(Debug, Copy, Clone, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "lowercase")]
-/// Node Power command type.
-pub enum NodePowerCommand {
-    /// Restart the server
-    Reboot,
-    /// Shutdown the server
-    Shutdown,
-}
-
-
-#[api()]
-#[derive(Eq, PartialEq, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "lowercase")]
-pub enum TaskStateType {
-    /// Ok
-    OK,
-    /// Warning
-    Warning,
-    /// Error
-    Error,
-    /// Unknown
-    Unknown,
-}
-
-#[api(
-    properties: {
-        upid: { schema: UPID::API_SCHEMA },
-    },
-)]
-#[derive(Serialize, Deserialize)]
-/// Task properties.
-pub struct TaskListItem {
-    pub upid: String,
-    /// The node name where the task is running on.
-    pub node: String,
-    /// The Unix PID
-    pub pid: i64,
-    /// The task start time (Epoch)
-    pub pstart: u64,
-    /// The task start time (Epoch)
-    pub starttime: i64,
-    /// Worker type (arbitrary ASCII string)
-    pub worker_type: String,
-    /// Worker ID (arbitrary ASCII string)
-    pub worker_id: Option<String>,
-    /// The authenticated entity who started the task
-    pub user: String,
-    /// The task end time (Epoch)
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub endtime: Option<i64>,
-    /// Task end status
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub status: Option<String>,
-}
-
-pub const NODE_TASKS_LIST_TASKS_RETURN_TYPE: ReturnType = ReturnType {
-    optional: false,
-    schema: &ArraySchema::new(
-        "A list of tasks.",
-        &TaskListItem::API_SCHEMA,
-    ).schema(),
-};
-
-pub use proxmox_rrd_api_types::{RRDMode, RRDTimeFrameResolution};

pbs-api-types/src/network.rs

@@ -1,308 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-use proxmox_schema::*;
-
-use crate::{
-    PROXMOX_SAFE_ID_REGEX,
-    IP_V4_FORMAT, IP_V6_FORMAT, IP_FORMAT,
-    CIDR_V4_FORMAT, CIDR_V6_FORMAT, CIDR_FORMAT,
-};
-
-pub const NETWORK_INTERFACE_FORMAT: ApiStringFormat =
-    ApiStringFormat::Pattern(&PROXMOX_SAFE_ID_REGEX);
-
-pub const IP_V4_SCHEMA: Schema =
-    StringSchema::new("IPv4 address.")
-    .format(&IP_V4_FORMAT)
-    .max_length(15)
-    .schema();
-
-pub const IP_V6_SCHEMA: Schema =
-    StringSchema::new("IPv6 address.")
-    .format(&IP_V6_FORMAT)
-    .max_length(39)
-    .schema();
-
-pub const IP_SCHEMA: Schema =
-    StringSchema::new("IP (IPv4 or IPv6) address.")
-    .format(&IP_FORMAT)
-    .max_length(39)
-    .schema();
-
-pub const CIDR_V4_SCHEMA: Schema =
-    StringSchema::new("IPv4 address with netmask (CIDR notation).")
-    .format(&CIDR_V4_FORMAT)
-    .max_length(18)
-    .schema();
-
-pub const CIDR_V6_SCHEMA: Schema =
-    StringSchema::new("IPv6 address with netmask (CIDR notation).")
-    .format(&CIDR_V6_FORMAT)
-    .max_length(43)
-    .schema();
-
-pub const CIDR_SCHEMA: Schema =
-    StringSchema::new("IP address (IPv4 or IPv6) with netmask (CIDR notation).")
-    .format(&CIDR_FORMAT)
-    .max_length(43)
-    .schema();
-
-#[api()]
-#[derive(Debug, Copy, Clone, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "lowercase")]
-/// Interface configuration method
-pub enum NetworkConfigMethod {
-    /// Configuration is done manually using other tools
-    Manual,
-    /// Define interfaces with statically allocated addresses.
-    Static,
-    /// Obtain an address via DHCP
-    DHCP,
-    /// Define the loopback interface.
-    Loopback,
-}
-
-#[api()]
-#[derive(Debug, Copy, Clone, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
-#[allow(non_camel_case_types)]
-#[repr(u8)]
-/// Linux Bond Mode
-pub enum LinuxBondMode {
-    /// Round-robin policy
-    balance_rr = 0,
-    /// Active-backup policy
-    active_backup = 1,
-    /// XOR policy
-    balance_xor = 2,
-    /// Broadcast policy
-    broadcast = 3,
-    /// IEEE 802.3ad Dynamic link aggregation
-    #[serde(rename = "802.3ad")]
-    ieee802_3ad = 4,
-    /// Adaptive transmit load balancing
-    balance_tlb = 5,
-    /// Adaptive load balancing
-    balance_alb = 6,
-}
-
-#[api()]
-#[derive(Debug, Copy, Clone, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
-#[allow(non_camel_case_types)]
-#[repr(u8)]
-/// Bond Transmit Hash Policy for LACP (802.3ad)
-pub enum BondXmitHashPolicy {
-    /// Layer 2
-    layer2 = 0,
-    /// Layer 2+3
-    #[serde(rename = "layer2+3")]
-    layer2_3 = 1,
-    /// Layer 3+4
-    #[serde(rename = "layer3+4")]
-    layer3_4 = 2,
-}
-
-#[api()]
-#[derive(Debug, Copy, Clone, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "lowercase")]
-/// Network interface type
-pub enum NetworkInterfaceType {
-    /// Loopback
-    Loopback,
-    /// Physical Ethernet device
-    Eth,
-    /// Linux Bridge
-    Bridge,
-    /// Linux Bond
-    Bond,
-    /// Linux VLAN (eth.10)
-    Vlan,
-    /// Interface Alias (eth:1)
-    Alias,
-    /// Unknown interface type
-    Unknown,
-}
-
-pub const NETWORK_INTERFACE_NAME_SCHEMA: Schema = StringSchema::new("Network interface name.")
-    .format(&NETWORK_INTERFACE_FORMAT)
-    .min_length(1)
-    .max_length(libc::IFNAMSIZ-1)
-    .schema();
-
-pub const NETWORK_INTERFACE_ARRAY_SCHEMA: Schema = ArraySchema::new(
-    "Network interface list.", &NETWORK_INTERFACE_NAME_SCHEMA)
-    .schema();
-
-pub const NETWORK_INTERFACE_LIST_SCHEMA: Schema = StringSchema::new(
-    "A list of network devices, comma separated.")
-    .format(&ApiStringFormat::PropertyString(&NETWORK_INTERFACE_ARRAY_SCHEMA))
-    .schema();
-
-#[api(
-    properties: {
-        name: {
-            schema: NETWORK_INTERFACE_NAME_SCHEMA,
-        },
-        "type": {
-            type: NetworkInterfaceType,
-        },
-        method: {
-            type: NetworkConfigMethod,
-            optional: true,
-        },
-        method6: {
-            type: NetworkConfigMethod,
-            optional: true,
-        },
-        cidr: {
-            schema: CIDR_V4_SCHEMA,
-            optional: true,
-        },
-        cidr6: {
-            schema: CIDR_V6_SCHEMA,
-            optional: true,
-        },
-        gateway: {
-            schema: IP_V4_SCHEMA,
-            optional: true,
-        },
-        gateway6: {
-            schema: IP_V6_SCHEMA,
-            optional: true,
-        },
-        options: {
-            description: "Option list (inet)",
-            type: Array,
-            items: {
-                description: "Optional attribute line.",
-                type: String,
-            },
-        },
-        options6: {
-            description: "Option list (inet6)",
-            type: Array,
-            items: {
-                description: "Optional attribute line.",
-                type: String,
-            },
-        },
-        comments: {
-            description: "Comments (inet, may span multiple lines)",
-            type: String,
-            optional: true,
-        },
-        comments6: {
-            description: "Comments (inet6, may span multiple lines)",
-            type: String,
-            optional: true,
-        },
-        bridge_ports: {
-            schema: NETWORK_INTERFACE_ARRAY_SCHEMA,
-            optional: true,
-        },
-        slaves: {
-            schema: NETWORK_INTERFACE_ARRAY_SCHEMA,
-            optional: true,
-        },
-        bond_mode: {
-            type: LinuxBondMode,
-            optional: true,
-        },
-        "bond-primary": {
-            schema: NETWORK_INTERFACE_NAME_SCHEMA,
-            optional: true,
-        },
-        bond_xmit_hash_policy: {
-            type: BondXmitHashPolicy,
-            optional: true,
-        },
-    }
-)]
-#[derive(Debug, Serialize, Deserialize)]
-/// Network Interface configuration
-pub struct Interface {
-    /// Autostart interface
-    #[serde(rename = "autostart")]
-    pub autostart: bool,
-    /// Interface is active (UP)
-    pub active: bool,
-    /// Interface name
-    pub name: String,
-    /// Interface type
-    #[serde(rename = "type")]
-    pub interface_type: NetworkInterfaceType,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub method: Option<NetworkConfigMethod>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub method6: Option<NetworkConfigMethod>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    /// IPv4 address with netmask
-    pub cidr: Option<String>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    /// IPv4 gateway
-    pub gateway: Option<String>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    /// IPv6 address with netmask
-    pub cidr6: Option<String>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    /// IPv6 gateway
-    pub gateway6: Option<String>,
-
-    #[serde(skip_serializing_if="Vec::is_empty")]
-    pub options: Vec<String>,
-    #[serde(skip_serializing_if="Vec::is_empty")]
-    pub options6: Vec<String>,
-
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub comments: Option<String>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub comments6: Option<String>,
-
-    #[serde(skip_serializing_if="Option::is_none")]
-    /// Maximum Transmission Unit
-    pub mtu: Option<u64>,
-
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub bridge_ports: Option<Vec<String>>,
-    /// Enable bridge vlan support.
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub bridge_vlan_aware: Option<bool>,
-
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub slaves: Option<Vec<String>>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub bond_mode: Option<LinuxBondMode>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    #[serde(rename = "bond-primary")]
-    pub bond_primary: Option<String>,
-    pub bond_xmit_hash_policy: Option<BondXmitHashPolicy>,
-}
-
-impl Interface {
-    pub fn new(name: String) -> Self {
-        Self  {
-            name,
-            interface_type: NetworkInterfaceType::Unknown,
-            autostart: false,
-            active: false,
-            method: None,
-            method6: None,
-            cidr: None,
-            gateway: None,
-            cidr6: None,
-            gateway6: None,
-            options: Vec::new(),
-            options6: Vec::new(),
-            comments: None,
-            comments6: None,
-            mtu: None,
-            bridge_ports: None,
-            bridge_vlan_aware: None,
-            slaves: None,
-            bond_mode: None,
-            bond_primary: None,
-            bond_xmit_hash_policy: None,
-        }
-    }
-}

pbs-api-types/src/remote.rs

@@ -1,86 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-use super::*;
-use proxmox_schema::*;
-
-pub const REMOTE_PASSWORD_SCHEMA: Schema = StringSchema::new("Password or auth token for remote host.")
-    .format(&PASSWORD_FORMAT)
-    .min_length(1)
-    .max_length(1024)
-    .schema();
-
-pub const REMOTE_PASSWORD_BASE64_SCHEMA: Schema = StringSchema::new("Password or auth token for remote host (stored as base64 string).")
-    .format(&PASSWORD_FORMAT)
-    .min_length(1)
-    .max_length(1024)
-    .schema();
-
-pub const REMOTE_ID_SCHEMA: Schema = StringSchema::new("Remote ID.")
-    .format(&PROXMOX_SAFE_ID_FORMAT)
-    .min_length(3)
-    .max_length(32)
-    .schema();
-
-
-#[api(
-    properties: {
-        comment: {
-            optional: true,
-            schema: SINGLE_LINE_COMMENT_SCHEMA,
-        },
-        host: {
-            schema: DNS_NAME_OR_IP_SCHEMA,
-        },
-        port: {
-            optional: true,
-            description: "The (optional) port",
-            type: u16,
-        },
-        "auth-id": {
-            type: Authid,
-        },
-        fingerprint: {
-            optional: true,
-            schema: CERT_FINGERPRINT_SHA256_SCHEMA,
-        },
-    },
-)]
-#[derive(Serialize,Deserialize,Updater)]
-#[serde(rename_all = "kebab-case")]
-/// Remote configuration properties.
-pub struct RemoteConfig {
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub comment: Option<String>,
-    pub host: String,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub port: Option<u16>,
-    pub auth_id: Authid,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub fingerprint: Option<String>,
-}
-
-#[api(
-    properties: {
-        name: {
-            schema: REMOTE_ID_SCHEMA,
-        },
-        config: {
-            type: RemoteConfig,
-        },
-        password: {
-            schema: REMOTE_PASSWORD_BASE64_SCHEMA,
-        },
-    },
-)]
-#[derive(Serialize,Deserialize)]
-#[serde(rename_all = "kebab-case")]
-/// Remote properties.
-pub struct Remote {
-    pub name: String,
-    // Note: The stored password is base64 encoded
-    #[serde(skip_serializing_if="String::is_empty")]
-    #[serde(with = "proxmox::tools::serde::string_as_base64")]
-    pub password: String,
-    #[serde(flatten)]
-    pub config: RemoteConfig,
-}

pbs-api-types/src/tape/mod.rs

@@ -1,91 +0,0 @@
-//! Types for tape backup API
-
-mod device;
-pub use device::*;
-
-mod changer;
-pub use changer::*;
-
-mod drive;
-pub use drive::*;
-
-mod media_pool;
-pub use media_pool::*;
-
-mod media_status;
-pub use media_status::*;
-
-mod media_location;
-
-pub use media_location::*;
-
-mod media;
-pub use media::*;
-
-use serde::{Deserialize, Serialize};
-
-use proxmox_schema::{api, const_regex, Schema, StringSchema, ApiStringFormat};
-use proxmox_uuid::Uuid;
-
-use crate::{
-    FINGERPRINT_SHA256_FORMAT, BACKUP_ID_SCHEMA, BACKUP_TYPE_SCHEMA,
-};
-
-const_regex!{
-    pub TAPE_RESTORE_SNAPSHOT_REGEX = concat!(r"^", PROXMOX_SAFE_ID_REGEX_STR!(), r":", SNAPSHOT_PATH_REGEX_STR!(), r"$");
-}
-
-pub const TAPE_RESTORE_SNAPSHOT_FORMAT: ApiStringFormat =
-    ApiStringFormat::Pattern(&TAPE_RESTORE_SNAPSHOT_REGEX);
-
-pub const TAPE_ENCRYPTION_KEY_FINGERPRINT_SCHEMA: Schema = StringSchema::new(
-    "Tape encryption key fingerprint (sha256)."
-)
-    .format(&FINGERPRINT_SHA256_FORMAT)
-    .schema();
-
-pub const TAPE_RESTORE_SNAPSHOT_SCHEMA: Schema = StringSchema::new(
-    "A snapshot in the format: 'store:type/id/time")
-    .format(&TAPE_RESTORE_SNAPSHOT_FORMAT)
-    .type_text("store:type/id/time")
-    .schema();
-
-#[api(
-    properties: {
-        pool: {
-            schema: MEDIA_POOL_NAME_SCHEMA,
-            optional: true,
-        },
-        "label-text": {
-            schema: MEDIA_LABEL_SCHEMA,
-            optional: true,
-        },
-        "media": {
-            schema: MEDIA_UUID_SCHEMA,
-            optional: true,
-        },
-        "media-set": {
-            schema: MEDIA_SET_UUID_SCHEMA,
-            optional: true,
-        },
-        "backup-type": {
-            schema: BACKUP_TYPE_SCHEMA,
-            optional: true,
-        },
-        "backup-id": {
-            schema: BACKUP_ID_SCHEMA,
-            optional: true,
-        },
-    },
-)]
-#[derive(Serialize,Deserialize)]
-#[serde(rename_all="kebab-case")]
-/// Content list filter parameters
-pub struct MediaContentListFilter {
-    pub pool: Option<String>,
-    pub label_text: Option<String>,
-    pub media: Option<Uuid>,
-    pub media_set: Option<Uuid>,
-    pub backup_type: Option<String>,
-    pub backup_id: Option<String>,
-}

pbs-api-types/src/user.rs

@@ -1,207 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-use proxmox_schema::{
-    api, BooleanSchema, IntegerSchema, Schema, StringSchema, Updater,
-};
-
-use super::{SINGLE_LINE_COMMENT_FORMAT, SINGLE_LINE_COMMENT_SCHEMA};
-use super::userid::{Authid, Userid, PROXMOX_TOKEN_ID_SCHEMA};
-
-pub const ENABLE_USER_SCHEMA: Schema = BooleanSchema::new(
-    "Enable the account (default). You can set this to '0' to disable the account.")
-    .default(true)
-    .schema();
-
-pub const EXPIRE_USER_SCHEMA: Schema = IntegerSchema::new(
-    "Account expiration date (seconds since epoch). '0' means no expiration date.")
-    .default(0)
-    .minimum(0)
-    .schema();
-
-pub const FIRST_NAME_SCHEMA: Schema = StringSchema::new("First name.")
-    .format(&SINGLE_LINE_COMMENT_FORMAT)
-    .min_length(2)
-    .max_length(64)
-    .schema();
-
-pub const LAST_NAME_SCHEMA: Schema = StringSchema::new("Last name.")
-    .format(&SINGLE_LINE_COMMENT_FORMAT)
-    .min_length(2)
-    .max_length(64)
-    .schema();
-
-pub const EMAIL_SCHEMA: Schema = StringSchema::new("E-Mail Address.")
-    .format(&SINGLE_LINE_COMMENT_FORMAT)
-    .min_length(2)
-    .max_length(64)
-    .schema();
-
-#[api(
-    properties: {
-        userid: {
-            type: Userid,
-        },
-        comment: {
-            optional: true,
-            schema: SINGLE_LINE_COMMENT_SCHEMA,
-        },
-        enable: {
-            optional: true,
-            schema: ENABLE_USER_SCHEMA,
-        },
-        expire: {
-            optional: true,
-            schema: EXPIRE_USER_SCHEMA,
-        },
-        firstname: {
-            optional: true,
-            schema: FIRST_NAME_SCHEMA,
-        },
-        lastname: {
-            schema: LAST_NAME_SCHEMA,
-            optional: true,
-         },
-        email: {
-            schema: EMAIL_SCHEMA,
-            optional: true,
-        },
-        tokens: {
-            type: Array,
-            optional: true,
-            description: "List of user's API tokens.",
-            items: {
-                type: ApiToken
-            },
-        },
-    }
-)]
-#[derive(Serialize,Deserialize)]
-/// User properties with added list of ApiTokens
-pub struct UserWithTokens {
-    pub userid: Userid,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub comment: Option<String>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub enable: Option<bool>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub expire: Option<i64>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub firstname: Option<String>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub lastname: Option<String>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub email: Option<String>,
-    #[serde(skip_serializing_if="Vec::is_empty", default)]
-    pub tokens: Vec<ApiToken>,
-}
-
-#[api(
-    properties: {
-        tokenid: {
-            schema: PROXMOX_TOKEN_ID_SCHEMA,
-        },
-        comment: {
-            optional: true,
-            schema: SINGLE_LINE_COMMENT_SCHEMA,
-        },
-        enable: {
-            optional: true,
-            schema: ENABLE_USER_SCHEMA,
-        },
-        expire: {
-            optional: true,
-            schema: EXPIRE_USER_SCHEMA,
-        },
-    }
-)]
-#[derive(Serialize,Deserialize)]
-/// ApiToken properties.
-pub struct ApiToken {
-    pub tokenid: Authid,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub comment: Option<String>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub enable: Option<bool>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub expire: Option<i64>,
-}
-
-impl ApiToken {
-    pub fn is_active(&self) -> bool {
-        if !self.enable.unwrap_or(true) {
-            return false;
-        }
-        if let Some(expire) = self.expire {
-            let now =  proxmox_time::epoch_i64();
-            if expire > 0 && expire <= now {
-                return false;
-            }
-        }
-        true
-    }
-}
-
-#[api(
-    properties: {
-        userid: {
-            type: Userid,
-        },
-        comment: {
-            optional: true,
-            schema: SINGLE_LINE_COMMENT_SCHEMA,
-        },
-        enable: {
-            optional: true,
-            schema: ENABLE_USER_SCHEMA,
-        },
-        expire: {
-            optional: true,
-            schema: EXPIRE_USER_SCHEMA,
-        },
-        firstname: {
-            optional: true,
-            schema: FIRST_NAME_SCHEMA,
-        },
-        lastname: {
-            schema: LAST_NAME_SCHEMA,
-            optional: true,
-         },
-        email: {
-            schema: EMAIL_SCHEMA,
-            optional: true,
-        },
-    }
-)]
-#[derive(Serialize,Deserialize,Updater)]
-/// User properties.
-pub struct User {
-    #[updater(skip)]
-    pub userid: Userid,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub comment: Option<String>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub enable: Option<bool>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub expire: Option<i64>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub firstname: Option<String>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub lastname: Option<String>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub email: Option<String>,
-}
-
-impl User {
-    pub fn is_active(&self) -> bool {
-        if !self.enable.unwrap_or(true) {
-            return false;
-        }
-        if let Some(expire) = self.expire {
-            let now =  proxmox_time::epoch_i64();
-            if expire > 0 && expire <= now {
-                return false;
-            }
-        }
-        true
-    }
-}

pbs-api-types/src/zfs.rs

@@ -1,79 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-use proxmox_schema::*;
-
-const_regex! {
-    pub ZPOOL_NAME_REGEX = r"^[a-zA-Z][a-z0-9A-Z\-_.:]+$";
-}
-
-pub const ZFS_ASHIFT_SCHEMA: Schema = IntegerSchema::new(
-    "Pool sector size exponent.")
-    .minimum(9)
-    .maximum(16)
-    .default(12)
-    .schema();
-
-pub const ZPOOL_NAME_SCHEMA: Schema = StringSchema::new("ZFS Pool Name")
-    .format(&ApiStringFormat::Pattern(&ZPOOL_NAME_REGEX))
-    .schema();
-
-#[api(default: "On")]
-#[derive(Debug, Copy, Clone, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "lowercase")]
-/// The ZFS compression algorithm to use.
-pub enum ZfsCompressionType {
-    /// Gnu Zip
-    Gzip,
-    /// LZ4
-    Lz4,
-    /// LZJB
-    Lzjb,
-    /// ZLE
-    Zle,
-    /// ZStd
-    ZStd,
-    /// Enable compression using the default algorithm.
-    On,
-    /// Disable compression.
-    Off,
-}
-
-#[api()]
-#[derive(Debug, Copy, Clone, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "lowercase")]
-/// The ZFS RAID level to use.
-pub enum ZfsRaidLevel {
-    /// Single Disk
-    Single,
-    /// Mirror
-    Mirror,
-    /// Raid10
-    Raid10,
-    /// RaidZ
-    RaidZ,
-    /// RaidZ2
-    RaidZ2,
-    /// RaidZ3
-    RaidZ3,
-}
-
-#[api()]
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all="kebab-case")]
-/// zpool list item
-pub struct ZpoolListItem {
-    /// zpool name
-    pub name: String,
-    /// Health
-    pub health: String,
-    /// Total size
-    pub size: u64,
-    /// Used size
-    pub alloc: u64,
-    /// Free space
-    pub free: u64,
-    /// ZFS fragnentation level
-    pub frag: u64,
-    /// ZFS deduplication ratio
-    pub dedup: f64,
-}

pbs-buildcfg/Cargo.toml

@@ -1,9 +0,0 @@
-[package]
-name = "pbs-buildcfg"
-version = "2.0.12"
-authors = ["Proxmox Support Team <support@proxmox.com>"]
-edition = "2018"
-description = "macros used for pbs related paths such as configdir and rundir"
-build = "build.rs"
-
-[dependencies]

pbs-buildcfg/build.rs

@@ -1,24 +0,0 @@
-// build.rs
-use std::env;
-use std::process::Command;
-
-fn main() {
-    let repoid = match env::var("REPOID") {
-        Ok(repoid) => repoid,
-        Err(_) => {
-            match Command::new("git")
-                .args(&["rev-parse", "HEAD"])
-                .output()
-            {
-                Ok(output) => {
-                    String::from_utf8(output.stdout).unwrap()
-                }
-                Err(err) => {
-                    panic!("git rev-parse failed: {}", err);
-                }
-            }
-        }
-    };
-
-    println!("cargo:rustc-env=REPOID={}", repoid);
-}

pbs-client/Cargo.toml

@@ -1,45 +0,0 @@
-[package]
-name = "pbs-client"
-version = "0.1.0"
-authors = ["Wolfgang Bumiller <w.bumiller@proxmox.com>"]
-edition = "2018"
-description = "The main proxmox backup client crate"
-
-[dependencies]
-anyhow = "1.0"
-bitflags = "1.2.1"
-bytes = "1.0"
-futures = "0.3"
-h2 = { version = "0.3", features = [ "stream" ] }
-http = "0.2"
-hyper = { version = "0.14", features = [ "full" ] }
-lazy_static = "1.4"
-libc = "0.2"
-nix = "0.19.1"
-openssl = "0.10"
-percent-encoding = "2.1"
-pin-project-lite = "0.2"
-regex = "1.2"
-rustyline = "7"
-serde_json = "1.0"
-tokio = { version = "1.6", features = [ "fs", "signal" ] }
-tokio-stream = "0.1.0"
-tower-service = "0.3.0"
-xdg = "2.2"
-
-pathpatterns = "0.1.2"
-proxmox = "0.14.0"
-proxmox-fuse = "0.1.1"
-proxmox-http = { version = "0.5.0", features = [ "client", "http-helpers", "websocket" ] }
-proxmox-io = { version = "1", features = [ "tokio" ] }
-proxmox-lang = "1"
-proxmox-router = { version = "1", features = [ "cli" ] }
-proxmox-schema = "1"
-proxmox-time = "1"
-pxar = { version = "0.10.1", features = [ "tokio-io" ] }
-
-pbs-api-types = { path = "../pbs-api-types" }
-pbs-buildcfg = { path = "../pbs-buildcfg" }
-pbs-datastore = { path = "../pbs-datastore" }
-pbs-runtime = { path = "../pbs-runtime" }
-pbs-tools = { path = "../pbs-tools" }

pbs-client/src/lib.rs

@@ -1,43 +0,0 @@
-//! Client side interface to the proxmox backup server
-//!
-//! This library implements the client side to access the backups
-//! server using https.
-
-pub mod catalog_shell;
-pub mod pxar;
-pub mod tools;
-
-mod merge_known_chunks;
-pub mod pipe_to_stream;
-
-mod http_client;
-pub use http_client::*;
-
-mod vsock_client;
-pub use vsock_client::*;
-
-mod task_log;
-pub use task_log::*;
-
-mod backup_reader;
-pub use backup_reader::*;
-
-mod backup_writer;
-pub use backup_writer::*;
-
-mod remote_chunk_reader;
-pub use remote_chunk_reader::*;
-
-mod pxar_backup_stream;
-pub use pxar_backup_stream::*;
-
-mod backup_repo;
-pub use backup_repo::*;
-
-mod backup_specification;
-pub use backup_specification::*;
-
-mod chunk_stream;
-pub use chunk_stream::{ChunkStream, FixedChunkStream};
-
-pub const PROXMOX_BACKUP_TCP_KEEPALIVE_TIME: u32 = 120;

pbs-config/Cargo.toml

@@ -1,29 +0,0 @@
-[package]
-name = "pbs-config"
-version = "0.1.0"
-authors = ["Proxmox Support Team <support@proxmox.com>"]
-edition = "2018"
-description = "Configuration file management for PBS"
-
-[dependencies]
-anyhow = "1.0"
-hex = "0.4.3"
-lazy_static = "1.4"
-libc = "0.2"
-nix = "0.19.1"
-once_cell = "1.3.1"
-openssl = "0.10"
-regex = "1.2"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-
-proxmox = "0.14.0"
-proxmox-lang = "1"
-proxmox-router = { version = "1", default-features = false }
-proxmox-schema = "1"
-proxmox-section-config = "1"
-proxmox-time = "1"
-
-pbs-api-types = { path = "../pbs-api-types" }
-pbs-buildcfg = { path = "../pbs-buildcfg" }
-pbs-tools = { path = "../pbs-tools" }

pbs-config/src/datastore.rs

@@ -1,94 +0,0 @@
-use anyhow::{Error};
-use lazy_static::lazy_static;
-use std::collections::HashMap;
-
-use proxmox_schema::{ApiType, Schema};
-use proxmox_section_config::{SectionConfig, SectionConfigData, SectionConfigPlugin};
-
-use pbs_api_types::{DataStoreConfig, DATASTORE_SCHEMA};
-
-use crate::{open_backup_lockfile, replace_backup_config, BackupLockGuard};
-
-lazy_static! {
-    pub static ref CONFIG: SectionConfig = init();
-}
-
-fn init() -> SectionConfig {
-    let obj_schema = match DataStoreConfig::API_SCHEMA {
-        Schema::Object(ref obj_schema) => obj_schema,
-        _ => unreachable!(),
-    };
-
-    let plugin = SectionConfigPlugin::new("datastore".to_string(), Some(String::from("name")), obj_schema);
-    let mut config = SectionConfig::new(&DATASTORE_SCHEMA);
-    config.register_plugin(plugin);
-
-    config
-}
-
-pub const DATASTORE_CFG_FILENAME: &str = "/etc/proxmox-backup/datastore.cfg";
-pub const DATASTORE_CFG_LOCKFILE: &str = "/etc/proxmox-backup/.datastore.lck";
-
-/// Get exclusive lock
-pub fn lock_config() -> Result<BackupLockGuard, Error> {
-    open_backup_lockfile(DATASTORE_CFG_LOCKFILE, None, true)
-}
-
-pub fn config() -> Result<(SectionConfigData, [u8;32]), Error> {
-
-    let content = proxmox::tools::fs::file_read_optional_string(DATASTORE_CFG_FILENAME)?
-        .unwrap_or_else(|| "".to_string());
-
-    let digest = openssl::sha::sha256(content.as_bytes());
-    let data = CONFIG.parse(DATASTORE_CFG_FILENAME, &content)?;
-    Ok((data, digest))
-}
-
-pub fn save_config(config: &SectionConfigData) -> Result<(), Error> {
-    let raw = CONFIG.write(DATASTORE_CFG_FILENAME, &config)?;
-    replace_backup_config(DATASTORE_CFG_FILENAME, raw.as_bytes())
-}
-
-// shell completion helper
-pub fn complete_datastore_name(_arg: &str, _param: &HashMap<String, String>) -> Vec<String> {
-    match config() {
-        Ok((data, _digest)) => data.sections.iter().map(|(id, _)| id.to_string()).collect(),
-        Err(_) => return vec![],
-    }
-}
-
-pub fn complete_acl_path(_arg: &str, _param: &HashMap<String, String>) -> Vec<String> {
-    let mut list = Vec::new();
-
-    list.push(String::from("/"));
-    list.push(String::from("/datastore"));
-    list.push(String::from("/datastore/"));
-
-    if let Ok((data, _digest)) = config() {
-        for id in data.sections.keys() {
-            list.push(format!("/datastore/{}", id));
-        }
-    }
-
-    list.push(String::from("/remote"));
-    list.push(String::from("/remote/"));
-
-    list.push(String::from("/tape"));
-    list.push(String::from("/tape/"));
-    list.push(String::from("/tape/drive"));
-    list.push(String::from("/tape/drive/"));
-    list.push(String::from("/tape/changer"));
-    list.push(String::from("/tape/changer/"));
-    list.push(String::from("/tape/pool"));
-    list.push(String::from("/tape/pool/"));
-    list.push(String::from("/tape/job"));
-    list.push(String::from("/tape/job/"));
-
-    list
-}
-
-pub fn complete_calendar_event(_arg: &str, _param: &HashMap<String, String>) -> Vec<String> {
-    // just give some hints about possible values
-    ["minutely", "hourly", "daily", "mon..fri", "0:0"]
-        .iter().map(|s| String::from(*s)).collect()
-}

pbs-config/src/domains.rs

@@ -1,130 +0,0 @@
-use std::collections::HashMap;
-
-use anyhow::{Error};
-use lazy_static::lazy_static;
-use serde::{Serialize, Deserialize};
-
-use proxmox_schema::{api, ApiType, Updater, Schema};
-use proxmox_section_config::{SectionConfig, SectionConfigData, SectionConfigPlugin};
-
-use pbs_api_types::{REALM_ID_SCHEMA, SINGLE_LINE_COMMENT_SCHEMA};
-use crate::{open_backup_lockfile, replace_backup_config, BackupLockGuard};
-
-lazy_static! {
-    pub static ref CONFIG: SectionConfig = init();
-}
-
-#[api()]
-#[derive(Eq, PartialEq, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "lowercase")]
-/// Use the value of this attribute/claim as unique user name. It is
-/// up to the identity provider to guarantee the uniqueness. The
-/// OpenID specification only guarantees that Subject ('sub') is unique. Also
-/// make sure that the user is not allowed to change that attribute by
-/// himself!
-pub enum OpenIdUserAttribute {
-    /// Subject (OpenId 'sub' claim)
-    Subject,
-    /// Username (OpenId 'preferred_username' claim)
-    Username,
-    /// Email (OpenId 'email' claim)
-    Email,
-}
-
-#[api(
-    properties: {
-        realm: {
-            schema: REALM_ID_SCHEMA,
-        },
-        "client-key": {
-            optional: true,
-        },
-        comment: {
-            optional: true,
-            schema: SINGLE_LINE_COMMENT_SCHEMA,
-        },
-        autocreate: {
-            optional: true,
-            default: false,
-        },
-        "username-claim": {
-            type: OpenIdUserAttribute,
-            optional: true,
-        },
-    },
-)]
-#[derive(Serialize, Deserialize, Updater)]
-#[serde(rename_all="kebab-case")]
-/// OpenID configuration properties.
-pub struct OpenIdRealmConfig {
-    #[updater(skip)]
-    pub realm: String,
-    /// OpenID Issuer Url
-    pub issuer_url: String,
-    /// OpenID Client ID
-    pub client_id: String,
-    /// OpenID Client Key
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub client_key: Option<String>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub comment: Option<String>,
-    /// Automatically create users if they do not exist.
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub autocreate: Option<bool>,
-    #[updater(skip)]
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub username_claim: Option<OpenIdUserAttribute>,
-}
-
-fn init() -> SectionConfig {
-    let obj_schema = match OpenIdRealmConfig::API_SCHEMA {
-        Schema::Object(ref obj_schema) => obj_schema,
-        _ => unreachable!(),
-    };
-
-    let plugin = SectionConfigPlugin::new("openid".to_string(), Some(String::from("realm")), obj_schema);
-    let mut config = SectionConfig::new(&REALM_ID_SCHEMA);
-    config.register_plugin(plugin);
-
-    config
-}
-
-pub const DOMAINS_CFG_FILENAME: &str = "/etc/proxmox-backup/domains.cfg";
-pub const DOMAINS_CFG_LOCKFILE: &str = "/etc/proxmox-backup/.domains.lck";
-
-/// Get exclusive lock
-pub fn lock_config() -> Result<BackupLockGuard, Error> {
-    open_backup_lockfile(DOMAINS_CFG_LOCKFILE, None, true)
-}
-
-pub fn config() -> Result<(SectionConfigData, [u8;32]), Error> {
-
-    let content = proxmox::tools::fs::file_read_optional_string(DOMAINS_CFG_FILENAME)?
-        .unwrap_or_else(|| "".to_string());
-
-    let digest = openssl::sha::sha256(content.as_bytes());
-    let data = CONFIG.parse(DOMAINS_CFG_FILENAME, &content)?;
-    Ok((data, digest))
-}
-
-pub fn save_config(config: &SectionConfigData) -> Result<(), Error> {
-    let raw = CONFIG.write(DOMAINS_CFG_FILENAME, &config)?;
-    replace_backup_config(DOMAINS_CFG_FILENAME, raw.as_bytes())
-}
-
-// shell completion helper
-pub fn complete_realm_name(_arg: &str, _param: &HashMap<String, String>) -> Vec<String> {
-    match config() {
-        Ok((data, _digest)) => data.sections.iter().map(|(id, _)| id.to_string()).collect(),
-        Err(_) => return vec![],
-    }
-}
-
-pub fn complete_openid_realm_name(_arg: &str, _param: &HashMap<String, String>) -> Vec<String> {
-    match config() {
-        Ok((data, _digest)) => data.sections.iter()
-            .filter_map(|(id, (t, _))| if t == "openid" { Some(id.to_string()) } else { None })
-            .collect(),
-        Err(_) => return vec![],
-    }
-}

pbs-config/src/lib.rs

@@ -1,106 +0,0 @@
-pub mod acl;
-mod cached_user_info;
-pub use cached_user_info::CachedUserInfo;
-pub mod datastore;
-pub mod domains;
-pub mod drive;
-pub mod key_config;
-pub mod media_pool;
-pub mod network;
-pub mod remote;
-pub mod sync;
-pub mod tape_encryption_keys;
-pub mod tape_job;
-pub mod token_shadow;
-pub mod user;
-pub mod verify;
-
-pub(crate) mod memcom;
-
-use anyhow::{format_err, Error};
-
-pub use pbs_buildcfg::{BACKUP_USER_NAME, BACKUP_GROUP_NAME};
-
-/// Return User info for the 'backup' user (``getpwnam_r(3)``)
-pub fn backup_user() -> Result<nix::unistd::User, Error> {
-    pbs_tools::sys::query_user(BACKUP_USER_NAME)?
-        .ok_or_else(|| format_err!("Unable to lookup '{}' user.", BACKUP_USER_NAME))
-}
-
-/// Return Group info for the 'backup' group (``getgrnam(3)``)
-pub fn backup_group() -> Result<nix::unistd::Group, Error> {
-    pbs_tools::sys::query_group(BACKUP_GROUP_NAME)?
-        .ok_or_else(|| format_err!("Unable to lookup '{}' group.", BACKUP_GROUP_NAME))
-}
-pub struct BackupLockGuard(Option<std::fs::File>);
-
-#[doc(hidden)]
-/// Note: do not use for production code, this is only intended for tests
-pub unsafe fn create_mocked_lock() -> BackupLockGuard {
-    BackupLockGuard(None)
-}
-
-/// Open or create a lock file owned by user "backup" and lock it.
-///
-/// Owner/Group of the file is set to backup/backup.
-/// File mode is 0660.
-/// Default timeout is 10 seconds.
-///
-/// Note: This method needs to be called by user "root" or "backup".
-pub fn open_backup_lockfile<P: AsRef<std::path::Path>>(
-    path: P,
-    timeout: Option<std::time::Duration>,
-    exclusive: bool,
-) -> Result<BackupLockGuard, Error> {
-    let user = backup_user()?;
-    let options = proxmox::tools::fs::CreateOptions::new()
-        .perm(nix::sys::stat::Mode::from_bits_truncate(0o660))
-        .owner(user.uid)
-        .group(user.gid);
-
-    let timeout = timeout.unwrap_or(std::time::Duration::new(10, 0));
-
-    let file = proxmox::tools::fs::open_file_locked(&path, timeout, exclusive, options)?;
-    Ok(BackupLockGuard(Some(file)))
-}
-
-/// Atomically write data to file owned by "root:backup" with permission "0640"
-///
-/// Only the superuser can write those files, but group 'backup' can read them.
-pub fn replace_backup_config<P: AsRef<std::path::Path>>(
-    path: P,
-    data: &[u8],
-) -> Result<(), Error> {
-    let backup_user = backup_user()?;
-    let mode = nix::sys::stat::Mode::from_bits_truncate(0o0640);
-    // set the correct owner/group/permissions while saving file
-    // owner(rw) = root, group(r)= backup
-    let options = proxmox::tools::fs::CreateOptions::new()
-        .perm(mode)
-        .owner(nix::unistd::ROOT)
-        .group(backup_user.gid);
-
-    proxmox::tools::fs::replace_file(path, data, options)?;
-
-    Ok(())
-}
-
-/// Atomically write data to file owned by "root:root" with permission "0600"
-///
-/// Only the superuser can read and write those files.
-pub fn replace_secret_config<P: AsRef<std::path::Path>>(
-    path: P,
-    data: &[u8],
-) -> Result<(), Error> {
-    let mode = nix::sys::stat::Mode::from_bits_truncate(0o0600);
-    // set the correct owner/group/permissions while saving file
-    // owner(rw) = root, group(r)= root
-    let options = proxmox::tools::fs::CreateOptions::new()
-        .perm(mode)
-        .owner(nix::unistd::ROOT)
-        .group(nix::unistd::Gid::from_raw(0));
-
-    proxmox::tools::fs::replace_file(path, data, options)?;
-
-    Ok(())
-}

pbs-config/src/memcom.rs

@@ -1,81 +0,0 @@
-//! Memory based communication channel between proxy & daemon for things such as cache
-//! invalidation.
-
-use std::os::unix::io::AsRawFd;
-use std::sync::atomic::{AtomicUsize, Ordering};
-use std::sync::Arc;
-
-use anyhow::Error;
-use nix::fcntl::OFlag;
-use nix::sys::mman::{MapFlags, ProtFlags};
-use nix::sys::stat::Mode;
-use once_cell::sync::OnceCell;
-
-use proxmox::tools::fs::CreateOptions;
-use proxmox::tools::mmap::Mmap;
-
-/// In-memory communication channel.
-pub struct Memcom {
-    mmap: Mmap<u8>,
-}
-
-#[repr(C)]
-struct Head {
-    // User (user.cfg) cache generation/version.
-    user_cache_generation: AtomicUsize,
-}
-
-static INSTANCE: OnceCell<Arc<Memcom>> = OnceCell::new();
-
-const MEMCOM_FILE_PATH: &str = pbs_buildcfg::rundir!("/proxmox-backup-memcom");
-const EMPTY_PAGE: [u8; 4096] = [0u8; 4096];
-
-impl Memcom {
-    /// Open the memory based communication channel singleton.
-    pub fn new() -> Result<Arc<Self>, Error> {
-        INSTANCE.get_or_try_init(Self::open).map(Arc::clone)
-    }
-
-    // Actual work of `new`:
-    fn open() -> Result<Arc<Self>, Error> {
-        let user = crate::backup_user()?;
-        let options = CreateOptions::new()
-            .perm(Mode::from_bits_truncate(0o660))
-            .owner(user.uid)
-            .group(user.gid);
-
-        let file = proxmox::tools::fs::atomic_open_or_create_file(
-            MEMCOM_FILE_PATH,
-            OFlag::O_RDWR | OFlag::O_CLOEXEC,
-            &EMPTY_PAGE, options)?;
-
-        let mmap = unsafe {
-            Mmap::<u8>::map_fd(
-                file.as_raw_fd(),
-                0,
-                4096,
-                ProtFlags::PROT_READ | ProtFlags::PROT_WRITE,
-                MapFlags::MAP_SHARED | MapFlags::MAP_NORESERVE | MapFlags::MAP_POPULATE,
-            )?
-        };
-
-        Ok(Arc::new(Self { mmap }))
-    }
-
-    // Shortcut to get the mapped `Head` as a `Head`.
-    fn head(&self) -> &Head {
-        unsafe { &*(self.mmap.as_ptr() as *const u8 as *const Head) }
-    }
-
-    /// Returns the user cache generation number.
-    pub fn user_cache_generation(&self) -> usize {
-        self.head().user_cache_generation.load(Ordering::Acquire)
-    }
-
-    /// Increase the user cache generation number.
-    pub fn increase_user_cache_generation(&self) {
-        self.head()
-            .user_cache_generation
-            .fetch_add(1, Ordering::AcqRel);
-    }
-}

pbs-config/src/remote.rs

@@ -1,59 +0,0 @@
-use std::collections::HashMap;
-
-use anyhow::Error;
-use lazy_static::lazy_static;
-
-use proxmox_schema::*;
-use proxmox_section_config::{SectionConfig, SectionConfigData, SectionConfigPlugin};
-
-use pbs_api_types::{Remote, REMOTE_ID_SCHEMA};
-
-use crate::{open_backup_lockfile, BackupLockGuard};
-
-lazy_static! {
-    pub static ref CONFIG: SectionConfig = init();
-}
-
-fn init() -> SectionConfig {
-    let obj_schema = match Remote::API_SCHEMA {
-        Schema::AllOf(ref allof_schema) => allof_schema,
-        _ => unreachable!(),
-    };
-
-    let plugin = SectionConfigPlugin::new("remote".to_string(), Some("name".to_string()), obj_schema);
-    let mut config = SectionConfig::new(&REMOTE_ID_SCHEMA);
-    config.register_plugin(plugin);
-
-    config
-}
-
-pub const REMOTE_CFG_FILENAME: &str = "/etc/proxmox-backup/remote.cfg";
-pub const REMOTE_CFG_LOCKFILE: &str = "/etc/proxmox-backup/.remote.lck";
-
-/// Get exclusive lock
-pub fn lock_config() -> Result<BackupLockGuard, Error> {
-    open_backup_lockfile(REMOTE_CFG_LOCKFILE, None, true)
-}
-
-pub fn config() -> Result<(SectionConfigData, [u8;32]), Error> {
-
-    let content = proxmox::tools::fs::file_read_optional_string(REMOTE_CFG_FILENAME)?
-        .unwrap_or_else(|| "".to_string());
-
-    let digest = openssl::sha::sha256(content.as_bytes());
-    let data = CONFIG.parse(REMOTE_CFG_FILENAME, &content)?;
-    Ok((data, digest))
-}
-
-pub fn save_config(config: &SectionConfigData) -> Result<(), Error> {
-    let raw = CONFIG.write(REMOTE_CFG_FILENAME, &config)?;
-    crate::replace_backup_config(REMOTE_CFG_FILENAME, raw.as_bytes())
-}
-
-// shell completion helper
-pub fn complete_remote_name(_arg: &str, _param: &HashMap<String, String>) -> Vec<String> {
-    match config() {
-        Ok((data, _digest)) => data.sections.iter().map(|(id, _)| id.to_string()).collect(),
-        Err(_) => return vec![],
-    }
-}

pbs-config/src/sync.rs

@@ -1,60 +0,0 @@
-use std::collections::HashMap;
-
-use anyhow::Error;
-use lazy_static::lazy_static;
-
-use proxmox_schema::{ApiType, Schema};
-use proxmox_section_config::{SectionConfig, SectionConfigData, SectionConfigPlugin};
-
-use pbs_api_types::{JOB_ID_SCHEMA, SyncJobConfig};
-
-use crate::{open_backup_lockfile, replace_backup_config, BackupLockGuard};
-
-lazy_static! {
-    pub static ref CONFIG: SectionConfig = init();
-}
-
-
-fn init() -> SectionConfig {
-    let obj_schema = match SyncJobConfig::API_SCHEMA {
-        Schema::Object(ref obj_schema) => obj_schema,
-        _ => unreachable!(),
-    };
-
-    let plugin = SectionConfigPlugin::new("sync".to_string(), Some(String::from("id")), obj_schema);
-    let mut config = SectionConfig::new(&JOB_ID_SCHEMA);
-    config.register_plugin(plugin);
-
-    config
-}
-
-pub const SYNC_CFG_FILENAME: &str = "/etc/proxmox-backup/sync.cfg";
-pub const SYNC_CFG_LOCKFILE: &str = "/etc/proxmox-backup/.sync.lck";
-
-/// Get exclusive lock
-pub fn lock_config() -> Result<BackupLockGuard, Error> {
-    open_backup_lockfile(SYNC_CFG_LOCKFILE, None, true)
-}
-
-pub fn config() -> Result<(SectionConfigData, [u8;32]), Error> {
-
-    let content = proxmox::tools::fs::file_read_optional_string(SYNC_CFG_FILENAME)?
-        .unwrap_or_else(|| "".to_string());
-
-    let digest = openssl::sha::sha256(content.as_bytes());
-    let data = CONFIG.parse(SYNC_CFG_FILENAME, &content)?;
-    Ok((data, digest))
-}
-
-pub fn save_config(config: &SectionConfigData) -> Result<(), Error> {
-    let raw = CONFIG.write(SYNC_CFG_FILENAME, &config)?;
-    replace_backup_config(SYNC_CFG_FILENAME, raw.as_bytes())
-}
-
-// shell completion helper
-pub fn complete_sync_job_id(_arg: &str, _param: &HashMap<String, String>) -> Vec<String> {
-    match config() {
-        Ok((data, _digest)) => data.sections.iter().map(|(id, _)| id.to_string()).collect(),
-        Err(_) => return vec![],
-    }
-}

pbs-config/src/tape_job.rs

@@ -1,60 +0,0 @@
-use anyhow::{Error};
-use lazy_static::lazy_static;
-use std::collections::HashMap;
-
-use proxmox_schema::{Schema, ApiType};
-use proxmox_section_config::{SectionConfig, SectionConfigData, SectionConfigPlugin};
-
-use pbs_api_types::{TapeBackupJobConfig, JOB_ID_SCHEMA};
-
-use crate::{open_backup_lockfile, replace_backup_config, BackupLockGuard};
-
-lazy_static! {
-    pub static ref CONFIG: SectionConfig = init();
-}
-
-fn init() -> SectionConfig {
-    let obj_schema = match TapeBackupJobConfig::API_SCHEMA {
-        Schema::AllOf(ref allof_schema) => allof_schema,
-        _ => unreachable!(),
-    };
-
-    let plugin = SectionConfigPlugin::new("backup".to_string(), Some(String::from("id")), obj_schema);
-    let mut config = SectionConfig::new(&JOB_ID_SCHEMA);
-    config.register_plugin(plugin);
-
-    config
-}
-
-pub const TAPE_JOB_CFG_FILENAME: &str = "/etc/proxmox-backup/tape-job.cfg";
-pub const TAPE_JOB_CFG_LOCKFILE: &str = "/etc/proxmox-backup/.tape-job.lck";
-
-/// Get exclusive lock
-pub fn lock() -> Result<BackupLockGuard, Error> {
-    open_backup_lockfile( TAPE_JOB_CFG_LOCKFILE, None, true)
-}
-
-pub fn config() -> Result<(SectionConfigData, [u8;32]), Error> {
-
-    let content = proxmox::tools::fs::file_read_optional_string(TAPE_JOB_CFG_FILENAME)?
-        .unwrap_or_else(|| "".to_string());
-
-    let digest = openssl::sha::sha256(content.as_bytes());
-    let data = CONFIG.parse(TAPE_JOB_CFG_FILENAME, &content)?;
-    Ok((data, digest))
-}
-
-pub fn save_config(config: &SectionConfigData) -> Result<(), Error> {
-    let raw = CONFIG.write(TAPE_JOB_CFG_FILENAME, &config)?;
-    replace_backup_config(TAPE_JOB_CFG_FILENAME, raw.as_bytes())
-}
-
-// shell completion helper
-
-/// List all tape job IDs
-pub fn complete_tape_job_id(_arg: &str, _param: &HashMap<String, String>) -> Vec<String> {
-    match config() {
-        Ok((data, _digest)) => data.sections.iter().map(|(id, _)| id.to_string()).collect(),
-        Err(_) => return vec![],
-    }
-}

pbs-config/src/verify.rs

@@ -1,59 +0,0 @@
-use std::collections::HashMap;
-
-use anyhow::Error;
-use lazy_static::lazy_static;
-
-use proxmox_schema::*;
-use proxmox_section_config::{SectionConfig, SectionConfigData, SectionConfigPlugin};
-
-use pbs_api_types::{JOB_ID_SCHEMA, VerificationJobConfig};
-
-use crate::{open_backup_lockfile, replace_backup_config, BackupLockGuard};
-
-lazy_static! {
-    pub static ref CONFIG: SectionConfig = init();
-}
-
-fn init() -> SectionConfig {
-    let obj_schema = match VerificationJobConfig::API_SCHEMA {
-        Schema::Object(ref obj_schema) => obj_schema,
-        _ => unreachable!(),
-    };
-
-    let plugin = SectionConfigPlugin::new("verification".to_string(), Some(String::from("id")), obj_schema);
-    let mut config = SectionConfig::new(&JOB_ID_SCHEMA);
-    config.register_plugin(plugin);
-
-    config
-}
-
-pub const VERIFICATION_CFG_FILENAME: &str = "/etc/proxmox-backup/verification.cfg";
-pub const VERIFICATION_CFG_LOCKFILE: &str = "/etc/proxmox-backup/.verification.lck";
-
-/// Get exclusive lock
-pub fn lock_config() -> Result<BackupLockGuard, Error> {
-    open_backup_lockfile(VERIFICATION_CFG_LOCKFILE, None, true)
-}
-
-pub fn config() -> Result<(SectionConfigData, [u8;32]), Error> {
-
-    let content = proxmox::tools::fs::file_read_optional_string(VERIFICATION_CFG_FILENAME)?;
-    let content = content.unwrap_or_else(String::new);
-
-    let digest = openssl::sha::sha256(content.as_bytes());
-    let data = CONFIG.parse(VERIFICATION_CFG_FILENAME, &content)?;
-    Ok((data, digest))
-}
-
-pub fn save_config(config: &SectionConfigData) -> Result<(), Error> {
-    let raw = CONFIG.write(VERIFICATION_CFG_FILENAME, &config)?;
-    replace_backup_config(VERIFICATION_CFG_FILENAME, raw.as_bytes())
-}
-
-// shell completion helper
-pub fn complete_verification_job_id(_arg: &str, _param: &HashMap<String, String>) -> Vec<String> {
-    match config() {
-        Ok((data, _digest)) => data.sections.iter().map(|(id, _)| id.to_string()).collect(),
-        Err(_) => return vec![],
-    }
-}

pbs-datastore/Cargo.toml

@@ -1,38 +0,0 @@
-[package]
-name = "pbs-datastore"
-version = "0.1.0"
-authors = ["Proxmox Support Team <support@proxmox.com>"]
-edition = "2018"
-description = "low level pbs data storage access"
-
-[dependencies]
-anyhow = "1.0"
-base64 = "0.12"
-crc32fast = "1"
-endian_trait = { version = "0.6", features = [ "arrays" ] }
-futures = "0.3"
-lazy_static = "1.4"
-libc = "0.2"
-log = "0.4"
-nix = "0.19.1"
-openssl = "0.10"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-tokio = { version = "1.6", features = [] }
-walkdir = "2"
-zstd = { version = "0.6", features = [ "bindgen" ] }
-
-pathpatterns = "0.1.2"
-pxar = "0.10.1"
-
-proxmox = "0.14.0"
-proxmox-borrow = "1"
-proxmox-io = "1"
-proxmox-lang = "1"
-proxmox-schema = { version = "1", features = [ "api-macro" ] }
-proxmox-time = "1"
-proxmox-uuid = "1"
-
-pbs-api-types = { path = "../pbs-api-types" }
-pbs-tools = { path = "../pbs-tools" }
-pbs-config = { path = "../pbs-config" }

pbs-datastore/src/data_blob_reader.rs

@@ -1,179 +0,0 @@
-use std::io::{BufReader, Read};
-use std::sync::Arc;
-
-use anyhow::{bail, format_err, Error};
-
-use proxmox_io::ReadExt;
-
-use pbs_tools::crypt_config::CryptConfig;
-
-use crate::checksum_reader::ChecksumReader;
-use crate::crypt_reader::CryptReader;
-use crate::file_formats::{self, DataBlobHeader};
-
-enum BlobReaderState<'reader, R: Read> {
-    Uncompressed {
-        expected_crc: u32,
-        csum_reader: ChecksumReader<R>,
-    },
-    Compressed {
-        expected_crc: u32,
-        decompr: zstd::stream::read::Decoder<'reader, BufReader<ChecksumReader<R>>>,
-    },
-    Encrypted {
-        expected_crc: u32,
-        decrypt_reader: CryptReader<BufReader<ChecksumReader<R>>>,
-    },
-    EncryptedCompressed {
-        expected_crc: u32,
-        decompr: zstd::stream::read::Decoder<
-            'reader,
-            BufReader<CryptReader<BufReader<ChecksumReader<R>>>>,
-        >,
-    },
-}
-
-/// Read data blobs
-pub struct DataBlobReader<'reader, R: Read> {
-    state: BlobReaderState<'reader, R>,
-}
-
-// zstd_safe::DCtx is not sync but we are, since
-// the only public interface is on mutable reference
-unsafe impl<R: Read> Sync for DataBlobReader<'_, R> {}
-
-impl<R: Read> DataBlobReader<'_, R> {
-    pub fn new(mut reader: R, config: Option<Arc<CryptConfig>>) -> Result<Self, Error> {
-        let head: DataBlobHeader = unsafe { reader.read_le_value()? };
-        match head.magic {
-            file_formats::UNCOMPRESSED_BLOB_MAGIC_1_0 => {
-                let expected_crc = u32::from_le_bytes(head.crc);
-                let csum_reader = ChecksumReader::new(reader, None);
-                Ok(Self {
-                    state: BlobReaderState::Uncompressed {
-                        expected_crc,
-                        csum_reader,
-                    },
-                })
-            }
-            file_formats::COMPRESSED_BLOB_MAGIC_1_0 => {
-                let expected_crc = u32::from_le_bytes(head.crc);
-                let csum_reader = ChecksumReader::new(reader, None);
-
-                let decompr = zstd::stream::read::Decoder::new(csum_reader)?;
-                Ok(Self {
-                    state: BlobReaderState::Compressed {
-                        expected_crc,
-                        decompr,
-                    },
-                })
-            }
-            file_formats::ENCRYPTED_BLOB_MAGIC_1_0 => {
-                let config = config
-                    .ok_or_else(|| format_err!("unable to read encrypted blob without key"))?;
-                let expected_crc = u32::from_le_bytes(head.crc);
-                let mut iv = [0u8; 16];
-                let mut expected_tag = [0u8; 16];
-                reader.read_exact(&mut iv)?;
-                reader.read_exact(&mut expected_tag)?;
-                let csum_reader = ChecksumReader::new(reader, None);
-                let decrypt_reader = CryptReader::new(
-                    BufReader::with_capacity(64 * 1024, csum_reader),
-                    iv,
-                    expected_tag,
-                    config,
-                )?;
-                Ok(Self {
-                    state: BlobReaderState::Encrypted {
-                        expected_crc,
-                        decrypt_reader,
-                    },
-                })
-            }
-            file_formats::ENCR_COMPR_BLOB_MAGIC_1_0 => {
-                let config = config
-                    .ok_or_else(|| format_err!("unable to read encrypted blob without key"))?;
-                let expected_crc = u32::from_le_bytes(head.crc);
-                let mut iv = [0u8; 16];
-                let mut expected_tag = [0u8; 16];
-                reader.read_exact(&mut iv)?;
-                reader.read_exact(&mut expected_tag)?;
-                let csum_reader = ChecksumReader::new(reader, None);
-                let decrypt_reader = CryptReader::new(
-                    BufReader::with_capacity(64 * 1024, csum_reader),
-                    iv,
-                    expected_tag,
-                    config,
-                )?;
-                let decompr = zstd::stream::read::Decoder::new(decrypt_reader)?;
-                Ok(Self {
-                    state: BlobReaderState::EncryptedCompressed {
-                        expected_crc,
-                        decompr,
-                    },
-                })
-            }
-            _ => bail!("got wrong magic number {:?}", head.magic),
-        }
-    }
-
-    pub fn finish(self) -> Result<R, Error> {
-        match self.state {
-            BlobReaderState::Uncompressed {
-                csum_reader,
-                expected_crc,
-            } => {
-                let (reader, crc, _) = csum_reader.finish()?;
-                if crc != expected_crc {
-                    bail!("blob crc check failed");
-                }
-                Ok(reader)
-            }
-            BlobReaderState::Compressed {
-                expected_crc,
-                decompr,
-            } => {
-                let csum_reader = decompr.finish().into_inner();
-                let (reader, crc, _) = csum_reader.finish()?;
-                if crc != expected_crc {
-                    bail!("blob crc check failed");
-                }
-                Ok(reader)
-            }
-            BlobReaderState::Encrypted {
-                expected_crc,
-                decrypt_reader,
-            } => {
-                let csum_reader = decrypt_reader.finish()?.into_inner();
-                let (reader, crc, _) = csum_reader.finish()?;
-                if crc != expected_crc {
-                    bail!("blob crc check failed");
-                }
-                Ok(reader)
-            }
-            BlobReaderState::EncryptedCompressed {
-                expected_crc,
-                decompr,
-            } => {
-                let decrypt_reader = decompr.finish().into_inner();
-                let csum_reader = decrypt_reader.finish()?.into_inner();
-                let (reader, crc, _) = csum_reader.finish()?;
-                if crc != expected_crc {
-                    bail!("blob crc check failed");
-                }
-                Ok(reader)
-            }
-        }
-    }
-}
-
-impl<R: Read> Read for DataBlobReader<'_, R> {
-    fn read(&mut self, buf: &mut [u8]) -> Result<usize, std::io::Error> {
-        match &mut self.state {
-            BlobReaderState::Uncompressed { csum_reader, .. } => csum_reader.read(buf),
-            BlobReaderState::Compressed { decompr, .. } => decompr.read(buf),
-            BlobReaderState::Encrypted { decrypt_reader, .. } => decrypt_reader.read(buf),
-            BlobReaderState::EncryptedCompressed { decompr, .. } => decompr.read(buf),
-        }
-    }
-}

pbs-datastore/src/data_blob_writer.rs

@@ -1,212 +0,0 @@
-use std::io::{Seek, SeekFrom, Write};
-use std::sync::Arc;
-
-use anyhow::Error;
-
-use proxmox_io::WriteExt;
-
-use pbs_tools::crypt_config::CryptConfig;
-
-use crate::checksum_writer::ChecksumWriter;
-use crate::crypt_writer::CryptWriter;
-use crate::file_formats::{self, DataBlobHeader, EncryptedDataBlobHeader};
-
-enum BlobWriterState<'writer, W: Write> {
-    Uncompressed {
-        csum_writer: ChecksumWriter<W>,
-    },
-    Compressed {
-        compr: zstd::stream::write::Encoder<'writer, ChecksumWriter<W>>,
-    },
-    Encrypted {
-        crypt_writer: CryptWriter<ChecksumWriter<W>>,
-    },
-    EncryptedCompressed {
-        compr: zstd::stream::write::Encoder<'writer, CryptWriter<ChecksumWriter<W>>>,
-    },
-}
-
-/// Data blob writer
-pub struct DataBlobWriter<'writer, W: Write> {
-    state: BlobWriterState<'writer, W>,
-}
-
-impl<W: Write + Seek> DataBlobWriter<'_, W> {
-    pub fn new_uncompressed(mut writer: W) -> Result<Self, Error> {
-        writer.seek(SeekFrom::Start(0))?;
-        let head = DataBlobHeader {
-            magic: file_formats::UNCOMPRESSED_BLOB_MAGIC_1_0,
-            crc: [0; 4],
-        };
-        unsafe {
-            writer.write_le_value(head)?;
-        }
-        let csum_writer = ChecksumWriter::new(writer, None);
-        Ok(Self {
-            state: BlobWriterState::Uncompressed { csum_writer },
-        })
-    }
-
-    pub fn new_compressed(mut writer: W) -> Result<Self, Error> {
-        writer.seek(SeekFrom::Start(0))?;
-        let head = DataBlobHeader {
-            magic: file_formats::COMPRESSED_BLOB_MAGIC_1_0,
-            crc: [0; 4],
-        };
-        unsafe {
-            writer.write_le_value(head)?;
-        }
-        let csum_writer = ChecksumWriter::new(writer, None);
-        let compr = zstd::stream::write::Encoder::new(csum_writer, 1)?;
-        Ok(Self {
-            state: BlobWriterState::Compressed { compr },
-        })
-    }
-
-    pub fn new_encrypted(mut writer: W, config: Arc<CryptConfig>) -> Result<Self, Error> {
-        writer.seek(SeekFrom::Start(0))?;
-        let head = EncryptedDataBlobHeader {
-            head: DataBlobHeader {
-                magic: file_formats::ENCRYPTED_BLOB_MAGIC_1_0,
-                crc: [0; 4],
-            },
-            iv: [0u8; 16],
-            tag: [0u8; 16],
-        };
-        unsafe {
-            writer.write_le_value(head)?;
-        }
-
-        let csum_writer = ChecksumWriter::new(writer, None);
-        let crypt_writer = CryptWriter::new(csum_writer, config)?;
-        Ok(Self {
-            state: BlobWriterState::Encrypted { crypt_writer },
-        })
-    }
-
-    pub fn new_encrypted_compressed(
-        mut writer: W,
-        config: Arc<CryptConfig>,
-    ) -> Result<Self, Error> {
-        writer.seek(SeekFrom::Start(0))?;
-        let head = EncryptedDataBlobHeader {
-            head: DataBlobHeader {
-                magic: file_formats::ENCR_COMPR_BLOB_MAGIC_1_0,
-                crc: [0; 4],
-            },
-            iv: [0u8; 16],
-            tag: [0u8; 16],
-        };
-        unsafe {
-            writer.write_le_value(head)?;
-        }
-
-        let csum_writer = ChecksumWriter::new(writer, None);
-        let crypt_writer = CryptWriter::new(csum_writer, config)?;
-        let compr = zstd::stream::write::Encoder::new(crypt_writer, 1)?;
-        Ok(Self {
-            state: BlobWriterState::EncryptedCompressed { compr },
-        })
-    }
-
-    pub fn finish(self) -> Result<W, Error> {
-        match self.state {
-            BlobWriterState::Uncompressed { csum_writer } => {
-                // write CRC
-                let (mut writer, crc, _) = csum_writer.finish()?;
-                let head = DataBlobHeader {
-                    magic: file_formats::UNCOMPRESSED_BLOB_MAGIC_1_0,
-                    crc: crc.to_le_bytes(),
-                };
-
-                writer.seek(SeekFrom::Start(0))?;
-                unsafe {
-                    writer.write_le_value(head)?;
-                }
-
-                Ok(writer)
-            }
-            BlobWriterState::Compressed { compr } => {
-                let csum_writer = compr.finish()?;
-                let (mut writer, crc, _) = csum_writer.finish()?;
-
-                let head = DataBlobHeader {
-                    magic: file_formats::COMPRESSED_BLOB_MAGIC_1_0,
-                    crc: crc.to_le_bytes(),
-                };
-
-                writer.seek(SeekFrom::Start(0))?;
-                unsafe {
-                    writer.write_le_value(head)?;
-                }
-
-                Ok(writer)
-            }
-            BlobWriterState::Encrypted { crypt_writer } => {
-                let (csum_writer, iv, tag) = crypt_writer.finish()?;
-                let (mut writer, crc, _) = csum_writer.finish()?;
-
-                let head = EncryptedDataBlobHeader {
-                    head: DataBlobHeader {
-                        magic: file_formats::ENCRYPTED_BLOB_MAGIC_1_0,
-                        crc: crc.to_le_bytes(),
-                    },
-                    iv,
-                    tag,
-                };
-                writer.seek(SeekFrom::Start(0))?;
-                unsafe {
-                    writer.write_le_value(head)?;
-                }
-                Ok(writer)
-            }
-            BlobWriterState::EncryptedCompressed { compr } => {
-                let crypt_writer = compr.finish()?;
-                let (csum_writer, iv, tag) = crypt_writer.finish()?;
-                let (mut writer, crc, _) = csum_writer.finish()?;
-
-                let head = EncryptedDataBlobHeader {
-                    head: DataBlobHeader {
-                        magic: file_formats::ENCR_COMPR_BLOB_MAGIC_1_0,
-                        crc: crc.to_le_bytes(),
-                    },
-                    iv,
-                    tag,
-                };
-                writer.seek(SeekFrom::Start(0))?;
-                unsafe {
-                    writer.write_le_value(head)?;
-                }
-                Ok(writer)
-            }
-        }
-    }
-}
-
-impl<W: Write + Seek> Write for DataBlobWriter<'_, W> {
-    fn write(&mut self, buf: &[u8]) -> Result<usize, std::io::Error> {
-        match self.state {
-            BlobWriterState::Uncompressed {
-                ref mut csum_writer,
-            } => csum_writer.write(buf),
-            BlobWriterState::Compressed { ref mut compr } => compr.write(buf),
-            BlobWriterState::Encrypted {
-                ref mut crypt_writer,
-            } => crypt_writer.write(buf),
-            BlobWriterState::EncryptedCompressed { ref mut compr } => compr.write(buf),
-        }
-    }
-
-    fn flush(&mut self) -> Result<(), std::io::Error> {
-        match self.state {
-            BlobWriterState::Uncompressed {
-                ref mut csum_writer,
-            } => csum_writer.flush(),
-            BlobWriterState::Compressed { ref mut compr } => compr.flush(),
-            BlobWriterState::Encrypted {
-                ref mut crypt_writer,
-            } => crypt_writer.flush(),
-            BlobWriterState::EncryptedCompressed { ref mut compr } => compr.flush(),
-        }
-    }
-}

pbs-datastore/src/read_chunk.rs

@@ -1,29 +0,0 @@
-use std::future::Future;
-use std::pin::Pin;
-
-use anyhow::Error;
-
-use crate::data_blob::DataBlob;
-
-/// The ReadChunk trait allows reading backup data chunks (local or remote)
-pub trait ReadChunk {
-    /// Returns the encoded chunk data
-    fn read_raw_chunk(&self, digest: &[u8; 32]) -> Result<DataBlob, Error>;
-
-    /// Returns the decoded chunk data
-    fn read_chunk(&self, digest: &[u8; 32]) -> Result<Vec<u8>, Error>;
-}
-
-pub trait AsyncReadChunk: Send {
-    /// Returns the encoded chunk data
-    fn read_raw_chunk<'a>(
-        &'a self,
-        digest: &'a [u8; 32],
-    ) -> Pin<Box<dyn Future<Output = Result<DataBlob, Error>> + Send + 'a>>;
-
-    /// Returns the decoded chunk data
-    fn read_chunk<'a>(
-        &'a self,
-        digest: &'a [u8; 32],
-    ) -> Pin<Box<dyn Future<Output = Result<Vec<u8>, Error>> + Send + 'a>>;
-}

pbs-fuse-loop/Cargo.toml

@@ -1,20 +0,0 @@
-[package]
-name = "pbs-fuse-loop"
-version = "0.1.0"
-authors = ["Proxmox Support Team <support@proxmox.com>"]
-edition = "2018"
-description = "fuse and loop device helpers"
-
-[dependencies]
-anyhow = "1.0"
-futures = "0.3"
-lazy_static = "1.4"
-libc = "0.2"
-nix = "0.19.1"
-regex = "1.2"
-tokio = { version = "1.6", features = [] }
-
-proxmox-time = "1"
-proxmox-fuse = "0.1.1"
-
-pbs-tools = { path = "../pbs-tools" }

pbs-fuse-loop/src/lib.rs

@@ -1,5 +0,0 @@
-pub mod loopdev;
-
-
-mod fuse_loop;
-pub use fuse_loop::*;

pbs-runtime/Cargo.toml

@@ -1,11 +0,0 @@
-[package]
-name = "pbs-runtime"
-version = "0.1.0"
-authors = ["Proxmox Support Team <support@proxmox.com>"]
-edition = "2018"
-description = "tokio runtime related helpers required for binaries"
-
-[dependencies]
-lazy_static = "1.4"
-pin-utils = "0.1.0"
-tokio = { version = "1.6", features = [ "rt", "rt-multi-thread" ] }

pbs-tape/Cargo.toml

@@ -1,34 +0,0 @@
-[package]
-name = "pbs-tape"
-version = "0.1.0"
-authors = ["Proxmox Support Team <support@proxmox.com>"]
-edition = "2018"
-description = "LTO tage support"
-
-[dependencies]
-lazy_static = "1.4"
-libc = "0.2"
-anyhow = "1.0"
-thiserror = "1.0"
-endian_trait = { version = "0.6", features = ["arrays"] }
-nix = "0.19.1"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-bitflags = "1.2.1"
-regex = "1.2"
-udev = ">= 0.3, <0.5"
-
-proxmox = "0.14.0"
-proxmox-io = "1"
-proxmox-lang = "1"
-# api-macro is only used by the binaries, so maybe we should split them out
-proxmox-schema = { version = "1", features = [ "api-macro" ] }
-proxmox-time = "1"
-proxmox-uuid = "1"
-
-# router::cli is only used by binaries, so maybe we should split them out
-proxmox-router = "1"
-
-pbs-api-types = { path = "../pbs-api-types" }
-pbs-tools = { path = "../pbs-tools" }
-pbs-config = { path = "../pbs-config" }

pbs-tape/src/lib.rs

@@ -1,334 +0,0 @@
-use std::collections::HashSet;
-
-use anyhow::{bail, Error};
-use bitflags::bitflags;
-use endian_trait::Endian;
-use serde::{Serialize, Deserialize};
-use serde_json::Value;
-
-use proxmox_schema::parse_property_string;
-use proxmox_uuid::Uuid;
-
-use pbs_api_types::{ScsiTapeChanger, SLOT_ARRAY_SCHEMA};
-
-pub mod linux_list_drives;
-
-pub mod sgutils2;
-
-mod blocked_reader;
-pub use blocked_reader::BlockedReader;
-
-mod blocked_writer;
-pub use blocked_writer::BlockedWriter;
-
-mod tape_write;
-pub use tape_write::*;
-
-mod tape_read;
-pub use tape_read::*;
-
-mod emulate_tape_reader;
-pub use emulate_tape_reader::EmulateTapeReader;
-
-mod emulate_tape_writer;
-pub use  emulate_tape_writer::EmulateTapeWriter;
-
-pub mod sg_tape;
-
-pub mod sg_pt_changer;
-
-/// We use 256KB blocksize (always)
-pub const PROXMOX_TAPE_BLOCK_SIZE: usize = 256*1024;
-
-// openssl::sha::sha256(b"Proxmox Tape Block Header v1.0")[0..8]
-pub const PROXMOX_TAPE_BLOCK_HEADER_MAGIC_1_0: [u8; 8] = [220, 189, 175, 202, 235, 160, 165, 40];
-
-// openssl::sha::sha256(b"Proxmox Backup Content Header v1.0")[0..8];
-pub const PROXMOX_BACKUP_CONTENT_HEADER_MAGIC_1_0: [u8; 8] = [99, 238, 20, 159, 205, 242, 155, 12];
-// openssl::sha::sha256(b"Proxmox Backup Tape Label v1.0")[0..8];
-pub const PROXMOX_BACKUP_MEDIA_LABEL_MAGIC_1_0: [u8; 8] = [42, 5, 191, 60, 176, 48, 170, 57];
-// openssl::sha::sha256(b"Proxmox Backup MediaSet Label v1.0")
-pub const PROXMOX_BACKUP_MEDIA_SET_LABEL_MAGIC_1_0: [u8; 8] = [8, 96, 99, 249, 47, 151, 83, 216];
-
-/// Tape Block Header with data payload
-///
-/// All tape files are written as sequence of blocks.
-///
-/// Note: this struct is large, never put this on the stack!
-/// so we use an unsized type to avoid that.
-///
-/// Tape data block are always read/written with a fixed size
-/// (`PROXMOX_TAPE_BLOCK_SIZE`). But they may contain less data, so the
-/// header has an additional size field. For streams of blocks, there
-/// is a sequence number (`seq_nr`) which may be use for additional
-/// error checking.
-#[repr(C,packed)]
-pub struct BlockHeader {
-    /// fixed value `PROXMOX_TAPE_BLOCK_HEADER_MAGIC_1_0`
-    pub magic: [u8; 8],
-    pub flags: BlockHeaderFlags,
-    /// size as 3 bytes unsigned, little endian
-    pub size: [u8; 3],
-    /// block sequence number
-    pub seq_nr: u32,
-    pub payload: [u8],
-}
-
-bitflags! {
-    /// Header flags (e.g. `END_OF_STREAM` or `INCOMPLETE`)
-    pub struct BlockHeaderFlags: u8 {
-        /// Marks the last block in a stream.
-        const END_OF_STREAM = 0b00000001;
-        /// Mark multivolume streams (when set in the last block)
-        const INCOMPLETE    = 0b00000010;
-    }
-}
-
-#[derive(Endian, Copy, Clone, Debug)]
-#[repr(C,packed)]
-/// Media Content Header
-///
-/// All tape files start with this header. The header may contain some
-/// informational data indicated by `size`.
-///
-/// `| MediaContentHeader | header data (size) | stream data |`
-///
-/// Note: The stream data following may be of any size.
-pub struct MediaContentHeader {
-    /// fixed value `PROXMOX_BACKUP_CONTENT_HEADER_MAGIC_1_0`
-    pub magic: [u8; 8],
-    /// magic number for the content following
-    pub content_magic: [u8; 8],
-    /// unique ID to identify this data stream
-    pub uuid: [u8; 16],
-    /// stream creation time
-    pub ctime: i64,
-    /// Size of header data
-    pub size: u32,
-    /// Part number for multipart archives.
-    pub part_number: u8,
-    /// Reserved for future use
-    pub reserved_0: u8,
-    /// Reserved for future use
-    pub reserved_1: u8,
-    /// Reserved for future use
-    pub reserved_2: u8,
-}
-
-impl MediaContentHeader {
-
-    /// Create a new instance with autogenerated Uuid
-    pub fn new(content_magic: [u8; 8], size: u32) -> Self {
-        let uuid = *Uuid::generate()
-            .into_inner();
-        Self {
-            magic: PROXMOX_BACKUP_CONTENT_HEADER_MAGIC_1_0,
-            content_magic,
-            uuid,
-            ctime: proxmox_time::epoch_i64(),
-            size,
-            part_number: 0,
-            reserved_0: 0,
-            reserved_1: 0,
-            reserved_2: 0,
-        }
-    }
-
-    /// Helper to check magic numbers and size constraints
-    pub fn check(&self, content_magic: [u8; 8], min_size: u32, max_size: u32) -> Result<(), Error> {
-        if self.magic != PROXMOX_BACKUP_CONTENT_HEADER_MAGIC_1_0 {
-            bail!("MediaContentHeader: wrong magic");
-        }
-        if self.content_magic != content_magic {
-            bail!("MediaContentHeader: wrong content magic");
-        }
-        if self.size < min_size || self.size > max_size {
-            bail!("MediaContentHeader: got unexpected size");
-        }
-        Ok(())
-    }
-
-    /// Returns the content Uuid
-    pub fn content_uuid(&self) -> Uuid {
-        Uuid::from(self.uuid)
-    }
-}
-
-
-impl BlockHeader {
-
-    pub const SIZE: usize = PROXMOX_TAPE_BLOCK_SIZE;
-
-    /// Allocates a new instance on the heap
-    pub fn new() -> Box<Self> {
-        use std::alloc::{alloc_zeroed, Layout};
-
-        // align to PAGESIZE, so that we can use it with SG_IO
-        let page_size = unsafe { libc::sysconf(libc::_SC_PAGESIZE) } as usize;
-
-        let mut buffer = unsafe {
-            let ptr = alloc_zeroed(
-                 Layout::from_size_align(Self::SIZE, page_size)
-                    .unwrap(),
-            );
-            Box::from_raw(
-                std::slice::from_raw_parts_mut(ptr, Self::SIZE - 16)
-                    as *mut [u8] as *mut Self
-            )
-        };
-        buffer.magic = PROXMOX_TAPE_BLOCK_HEADER_MAGIC_1_0;
-        buffer
-    }
-
-    /// Set the `size` field
-    pub fn set_size(&mut self, size: usize) {
-        let size = size.to_le_bytes();
-        self.size.copy_from_slice(&size[..3]);
-    }
-
-    /// Returns the `size` field
-    pub fn size(&self) -> usize {
-        (self.size[0] as usize) + ((self.size[1] as usize)<<8) + ((self.size[2] as usize)<<16)
-    }
-
-    /// Set the `seq_nr` field
-    pub fn set_seq_nr(&mut self, seq_nr: u32) {
-        self.seq_nr = seq_nr.to_le();
-    }
-
-    /// Returns the `seq_nr` field
-    pub fn seq_nr(&self) -> u32 {
-        u32::from_le(self.seq_nr)
-    }
-}
-
-/// Changer element status.
-///
-/// Drive and slots may be `Empty`, or contain some media, either
-/// with known volume tag `VolumeTag(String)`, or without (`Full`).
-#[derive(Serialize, Deserialize, Debug)]
-pub enum ElementStatus {
-    Empty,
-    Full,
-    VolumeTag(String),
-}
-
-/// Changer drive status.
-#[derive(Serialize, Deserialize)]
-pub struct DriveStatus {
-    /// The slot the element was loaded from (if known).
-    pub loaded_slot: Option<u64>,
-    /// The status.
-    pub status: ElementStatus,
-    /// Drive Identifier (Serial number)
-    pub drive_serial_number: Option<String>,
-    /// Drive Vendor
-    pub vendor: Option<String>,
-    /// Drive Model
-    pub model: Option<String>,
-    /// Element Address
-    pub element_address: u16,
-}
-
-/// Storage element status.
-#[derive(Serialize, Deserialize)]
-pub struct StorageElementStatus {
-    /// Flag for Import/Export slots
-    pub import_export: bool,
-    /// The status.
-    pub status: ElementStatus,
-    /// Element Address
-    pub element_address: u16,
-}
-
-/// Transport element status.
-#[derive(Serialize, Deserialize)]
-pub struct TransportElementStatus {
-    /// The status.
-    pub status: ElementStatus,
-    /// Element Address
-    pub element_address: u16,
-}
-
-/// Changer status - show drive/slot usage
-#[derive(Serialize, Deserialize)]
-pub struct MtxStatus {
-    /// List of known drives
-    pub drives: Vec<DriveStatus>,
-    /// List of known storage slots
-    pub slots: Vec<StorageElementStatus>,
-    /// Transport elements
-    ///
-    /// Note: Some libraries do not report transport elements.
-    pub transports: Vec<TransportElementStatus>,
-}
-
-impl MtxStatus {
-
-    pub fn slot_address(&self, slot: u64) -> Result<u16, Error> {
-        if slot == 0 {
-            bail!("invalid slot number '{}' (slots numbers starts at 1)", slot);
-        }
-        if slot > (self.slots.len() as u64) {
-            bail!("invalid slot number '{}' (max {} slots)", slot, self.slots.len());
-        }
-
-        Ok(self.slots[(slot -1) as usize].element_address)
-    }
-
-    pub fn drive_address(&self, drivenum: u64) -> Result<u16, Error> {
-        if drivenum >= (self.drives.len() as u64) {
-            bail!("invalid drive number '{}'", drivenum);
-        }
-
-        Ok(self.drives[drivenum as usize].element_address)
-    }
-
-    pub fn transport_address(&self) -> u16 {
-        // simply use first transport
-        // (are there changers exposing more than one?)
-        // defaults to 0 for changer that do not report transports
-        self
-            .transports
-            .get(0)
-            .map(|t| t.element_address)
-        .unwrap_or(0u16)
-    }
-
-    pub fn find_free_slot(&self, import_export: bool) -> Option<u64> {
-        let mut free_slot = None;
-        for (i, slot_info) in self.slots.iter().enumerate() {
-            if slot_info.import_export != import_export {
-                continue; // skip slots of wrong type
-            }
-            if let ElementStatus::Empty = slot_info.status {
-                free_slot = Some((i+1) as u64);
-                break;
-            }
-        }
-        free_slot
-    }
-
-    pub fn mark_import_export_slots(&mut self, config: &ScsiTapeChanger) -> Result<(), Error>{
-        let mut export_slots: HashSet<u64> = HashSet::new();
-
-        if let Some(slots) = &config.export_slots {
-            let slots: Value = parse_property_string(&slots, &SLOT_ARRAY_SCHEMA)?;
-            export_slots = slots
-                .as_array()
-                .unwrap()
-                .iter()
-                .filter_map(|v| v.as_u64())
-                .collect();
-        }
-
-        for (i, entry) in self.slots.iter_mut().enumerate() {
-            let slot = i as u64 + 1;
-            if export_slots.contains(&slot) {
-                entry.import_export = true; // mark as IMPORT/EXPORT
-            }
-        }
-
-        Ok(())
-    }
-}

pbs-tools/Cargo.toml

@@ -1,45 +0,0 @@
-[package]
-name = "pbs-tools"
-version = "0.1.0"
-authors = ["Proxmox Support Team <support@proxmox.com>"]
-edition = "2018"
-description = "common tools used throughout pbs"
-
-# This must not depend on any subcrates more closely related to pbs itself.
-[dependencies]
-anyhow = "1.0"
-base64 = "0.12"
-bytes = "1.0"
-crc32fast = "1"
-endian_trait = { version = "0.6", features = ["arrays"] }
-flate2 = "1.0"
-foreign-types = "0.3"
-futures = "0.3"
-hex = "0.4.3"
-lazy_static = "1.4"
-libc = "0.2"
-log = "0.4"
-nix = "0.19.1"
-nom = "5.1"
-openssl = "0.10"
-percent-encoding = "2.1"
-regex = "1.2"
-serde = "1.0"
-serde_json = "1.0"
-# rt-multi-thread is required for block_in_place
-tokio = { version = "1.6", features = [ "fs", "io-util", "rt", "rt-multi-thread", "sync" ] }
-url = "2.1"
-walkdir = "2"
-zstd = { version = "0.6", features = [ "bindgen" ] }
-
-proxmox = { version = "0.14.0", default-features = false, features = [ "tokio" ] }
-proxmox-borrow = "1"
-proxmox-io = { version = "1", features = [ "tokio" ] }
-proxmox-lang = { version = "1" }
-proxmox-time = { version = "1" }
-
-pbs-buildcfg = { path = "../pbs-buildcfg" }
-pbs-runtime = { path = "../pbs-runtime" }
-
-[dev-dependencies]
-tokio = { version = "1.6", features = [ "macros" ] }

pbs-tools/src/cli.rs

@@ -1,16 +0,0 @@
-use std::fs::File;
-use std::io::{self, stdout, Write};
-use std::path::Path;
-use std::panic::{RefUnwindSafe, UnwindSafe};
-
-/// Returns either a new file, if a path is given, or stdout, if no path is given.
-pub fn outfile_or_stdout<P: AsRef<Path>>(
-    path: Option<P>,
-) -> io::Result<Box<dyn Write + Send + Sync + Unpin + RefUnwindSafe + UnwindSafe>> {
-    if let Some(path) = path {
-        let f = File::create(path)?;
-        Ok(Box::new(f) as Box<_>)
-    } else {
-        Ok(Box::new(stdout()) as Box<_>)
-    }
-}

pbs-tools/src/command.rs

@@ -1,64 +0,0 @@
-use anyhow::{bail, format_err, Error};
-
-/// Helper to check result from std::process::Command output
-///
-/// The exit_code_check() function should return true if the exit code
-/// is considered successful.
-pub fn command_output(
-    output: std::process::Output,
-    exit_code_check: Option<fn(i32) -> bool>,
-) -> Result<Vec<u8>, Error> {
-    if !output.status.success() {
-        match output.status.code() {
-            Some(code) => {
-                let is_ok = match exit_code_check {
-                    Some(check_fn) => check_fn(code),
-                    None => code == 0,
-                };
-                if !is_ok {
-                    let msg = String::from_utf8(output.stderr)
-                        .map(|m| {
-                            if m.is_empty() {
-                                String::from("no error message")
-                            } else {
-                                m
-                            }
-                        })
-                        .unwrap_or_else(|_| String::from("non utf8 error message (suppressed)"));
-
-                    bail!("status code: {} - {}", code, msg);
-                }
-            }
-            None => bail!("terminated by signal"),
-        }
-    }
-
-    Ok(output.stdout)
-}
-
-/// Helper to check result from std::process::Command output, returns String.
-///
-/// The exit_code_check() function should return true if the exit code
-/// is considered successful.
-pub fn command_output_as_string(
-    output: std::process::Output,
-    exit_code_check: Option<fn(i32) -> bool>,
-) -> Result<String, Error> {
-    let output = command_output(output, exit_code_check)?;
-    let output = String::from_utf8(output)?;
-    Ok(output)
-}
-
-pub fn run_command(
-    mut command: std::process::Command,
-    exit_code_check: Option<fn(i32) -> bool>,
-) -> Result<String, Error> {
-    let output = command
-        .output()
-        .map_err(|err| format_err!("failed to execute {:?} - {}", command, err))?;
-
-    let output = command_output_as_string(output, exit_code_check)
-        .map_err(|err| format_err!("command {:?} failed - {}", command, err))?;
-
-    Ok(output)
-}

pbs-tools/src/crypt.rs

@@ -1,68 +0,0 @@
-use std::ffi::CStr;
-
-use anyhow::{bail, Error};
-
-// from libcrypt1, 'lib/crypt.h.in'
-const CRYPT_OUTPUT_SIZE: usize = 384;
-const CRYPT_MAX_PASSPHRASE_SIZE: usize = 512;
-const CRYPT_DATA_RESERVED_SIZE: usize = 767;
-const CRYPT_DATA_INTERNAL_SIZE: usize = 30720;
-
-#[repr(C)]
-struct crypt_data {
-    output: [libc::c_char; CRYPT_OUTPUT_SIZE],
-    setting: [libc::c_char; CRYPT_OUTPUT_SIZE],
-    input: [libc::c_char; CRYPT_MAX_PASSPHRASE_SIZE],
-    reserved: [libc::c_char; CRYPT_DATA_RESERVED_SIZE],
-    initialized: libc::c_char,
-    internal: [libc::c_char; CRYPT_DATA_INTERNAL_SIZE],
-}
-
-pub fn crypt(password: &[u8], salt: &[u8]) -> Result<String, Error> {
-    #[link(name = "crypt")]
-    extern "C" {
-        #[link_name = "crypt_r"]
-        fn __crypt_r(
-            key: *const libc::c_char,
-            salt: *const libc::c_char,
-            data: *mut crypt_data,
-        ) -> *mut libc::c_char;
-    }
-
-    let mut data: crypt_data = unsafe { std::mem::zeroed() };
-    for (i, c) in salt.iter().take(data.setting.len() - 1).enumerate() {
-        data.setting[i] = *c as libc::c_char;
-    }
-    for (i, c) in password.iter().take(data.input.len() - 1).enumerate() {
-        data.input[i] = *c as libc::c_char;
-    }
-
-    let res = unsafe {
-        let status = __crypt_r(
-            &data.input as *const _,
-            &data.setting as *const _,
-            &mut data as *mut _,
-        );
-        if status.is_null() {
-            bail!("internal error: crypt_r returned null pointer");
-        }
-        CStr::from_ptr(&data.output as *const _)
-    };
-    Ok(String::from(res.to_str()?))
-}
-
-pub fn encrypt_pw(password: &str) -> Result<String, Error> {
-
-    let salt = proxmox::sys::linux::random_data(8)?;
-    let salt = format!("$5${}$", base64::encode_config(&salt, base64::CRYPT));
-
-    crypt(password.as_bytes(), salt.as_bytes())
-}
-
-pub fn verify_crypt_pw(password: &str, enc_password: &str) -> Result<(), Error> {
-    let verify = crypt(password.as_bytes(), enc_password.as_bytes())?;
-    if verify != enc_password {
-        bail!("invalid credentials");
-    }
-    Ok(())
-}

pbs-tools/src/crypt_config.rs

@@ -1,115 +0,0 @@
-//! Wrappers for OpenSSL crypto functions
-//!
-//! We use this to encrypt and decrypt data chunks. Cipher is
-//! AES_256_GCM, which is fast and provides authenticated encryption.
-//!
-//! See the Wikipedia Artikel for [Authenticated
-//! encryption](https://en.wikipedia.org/wiki/Authenticated_encryption)
-//! for a short introduction.
-
-use anyhow::{Error};
-use openssl::hash::MessageDigest;
-use openssl::pkcs5::pbkdf2_hmac;
-use openssl::symm::{Cipher, Crypter, Mode};
-
-// openssl::sha::sha256(b"Proxmox Backup Encryption Key Fingerprint")
-/// This constant is used to compute fingerprints.
-const FINGERPRINT_INPUT: [u8; 32] = [
-    110, 208, 239, 119,  71,  31, 255,  77,
-    85, 199, 168, 254,  74, 157, 182,  33,
-    97,  64, 127,  19,  76, 114,  93, 223,
-    48, 153,  45,  37, 236,  69, 237,  38,
-];
-
-/// Encryption Configuration with secret key
-///
-/// This structure stores the secret key and provides helpers for
-/// authenticated encryption.
-pub struct CryptConfig {
-    // the Cipher
-    cipher: Cipher,
-    // A secrect key use to provide the chunk digest name space.
-    id_key: [u8; 32],
-    // Openssl hmac PKey of id_key
-    id_pkey: openssl::pkey::PKey<openssl::pkey::Private>,
-    // The private key used by the cipher.
-    enc_key: [u8; 32],
-}
-
-impl CryptConfig {
-
-    /// Create a new instance.
-    ///
-    /// We compute a derived 32 byte key using pbkdf2_hmac. This second
-    /// key is used in compute_digest.
-    pub fn new(enc_key: [u8; 32]) -> Result<Self, Error> {
-
-        let mut id_key = [0u8; 32];
-
-        pbkdf2_hmac(
-            &enc_key,
-            b"_id_key",
-            10,
-            MessageDigest::sha256(),
-            &mut id_key)?;
-
-        let id_pkey = openssl::pkey::PKey::hmac(&id_key).unwrap();
-
-        Ok(Self { id_key, id_pkey, enc_key, cipher: Cipher::aes_256_gcm() })
-    }
-
-    /// Expose Cipher (AES_256_GCM)
-    pub fn cipher(&self) -> &Cipher {
-        &self.cipher
-    }
-
-    /// Expose encryption key
-    pub fn enc_key(&self) -> &[u8; 32] {
-        &self.enc_key
-    }
-
-    /// Compute a chunk digest using a secret name space.
-    ///
-    /// Computes an SHA256 checksum over some secret data (derived
-    /// from the secret key) and the provided data. This ensures that
-    /// chunk digest values do not clash with values computed for
-    /// other sectret keys.
-    pub fn compute_digest(&self, data: &[u8]) -> [u8; 32] {
-        let mut hasher = openssl::sha::Sha256::new();
-        hasher.update(data);
-        hasher.update(&self.id_key); // at the end, to avoid length extensions attacks
-        hasher.finish()
-    }
-
-    /// Returns an openssl Signer using SHA256
-    pub fn data_signer(&self) -> openssl::sign::Signer {
-        openssl::sign::Signer::new(MessageDigest::sha256(), &self.id_pkey).unwrap()
-    }
-
-    /// Compute authentication tag (hmac/sha256)
-    ///
-    /// Computes an SHA256 HMAC using some secret data (derived
-    /// from the secret key) and the provided data.
-    pub fn compute_auth_tag(&self, data: &[u8]) -> [u8; 32] {
-        let mut signer = self.data_signer();
-        signer.update(data).unwrap();
-        let mut tag = [0u8; 32];
-        signer.sign(&mut tag).unwrap();
-        tag
-    }
-
-    /// Computes a fingerprint for the secret key.
-    ///
-    /// This computes a digest using the derived key (id_key) in order
-    /// to hinder brute force attacks.
-    pub fn fingerprint(&self) -> [u8; 32] {
-        self.compute_digest(&FINGERPRINT_INPUT)
-    }
-
-    /// Returns an openssl Crypter using AES_256_GCM,
-    pub fn data_crypter(&self, iv: &[u8; 16], mode: Mode) -> Result<Crypter, Error>  {
-        let mut crypter = openssl::symm::Crypter::new(self.cipher, mode, &self.enc_key, Some(iv))?;
-        crypter.aad_update(b"")?; //??
-        Ok(crypter)
-    }
-}

pbs-tools/src/fd.rs

@@ -1,14 +0,0 @@
-//! Raw file descriptor related utilities.
-
-use std::os::unix::io::RawFd;
-
-use anyhow::Error;
-use nix::fcntl::{fcntl, FdFlag, F_GETFD, F_SETFD};
-
-/// Change the `O_CLOEXEC` flag of an existing file descriptor.
-pub fn fd_change_cloexec(fd: RawFd, on: bool) -> Result<(), Error> {
-    let mut flags = unsafe { FdFlag::from_bits_unchecked(fcntl(fd, F_GETFD)?) };
-    flags.set(FdFlag::FD_CLOEXEC, on);
-    fcntl(fd, F_SETFD(flags))?;
-    Ok(())
-}

pbs-tools/src/io.rs

@@ -1,20 +0,0 @@
-//! I/O utilities.
-
-use proxmox::tools::fd::Fd;
-
-/// The `BufferedRead` trait provides a single function
-/// `buffered_read`. It returns a reference to an internal buffer. The
-/// purpose of this traid is to avoid unnecessary data copies.
-pub trait BufferedRead {
-    /// This functions tries to fill the internal buffers, then
-    /// returns a reference to the available data. It returns an empty
-    /// buffer if `offset` points to the end of the file.
-    fn buffered_read(&mut self, offset: u64) -> Result<&[u8], anyhow::Error>;
-}
-
-/// safe wrapper for `nix::unistd::pipe2` defaulting to `O_CLOEXEC` and guarding the file
-/// descriptors.
-pub fn pipe() -> Result<(Fd, Fd), nix::Error> {
-    let (pin, pout) = nix::unistd::pipe2(nix::fcntl::OFlag::O_CLOEXEC)?;
-    Ok((Fd(pin), Fd(pout)))
-}

pbs-tools/src/json.rs

@@ -1,134 +0,0 @@
-use anyhow::{bail, format_err, Error};
-use serde_json::Value;
-
-// Generate canonical json
-pub fn to_canonical_json(value: &Value) -> Result<Vec<u8>, Error> {
-    let mut data = Vec::new();
-    write_canonical_json(value, &mut data)?;
-    Ok(data)
-}
-
-pub fn write_canonical_json(value: &Value, output: &mut Vec<u8>) -> Result<(), Error> {
-    match value {
-        Value::Null => bail!("got unexpected null value"),
-        Value::String(_) | Value::Number(_) | Value::Bool(_) => {
-            serde_json::to_writer(output, &value)?;
-        }
-        Value::Array(list) => {
-            output.push(b'[');
-            let mut iter = list.iter();
-            if let Some(item) = iter.next() {
-                write_canonical_json(item, output)?;
-                for item in iter {
-                    output.push(b',');
-                    write_canonical_json(item, output)?;
-                }
-            }
-            output.push(b']');
-        }
-        Value::Object(map) => {
-            output.push(b'{');
-            let mut keys: Vec<&str> = map.keys().map(String::as_str).collect();
-            keys.sort_unstable();
-            let mut iter = keys.into_iter();
-            if let Some(key) = iter.next() {
-                serde_json::to_writer(&mut *output, &key)?;
-                output.push(b':');
-                write_canonical_json(&map[key], output)?;
-                for key in iter {
-                    output.push(b',');
-                    serde_json::to_writer(&mut *output, &key)?;
-                    output.push(b':');
-                    write_canonical_json(&map[key], output)?;
-                }
-            }
-            output.push(b'}');
-        }
-    }
-    Ok(())
-}
-
-pub fn json_object_to_query(data: Value) -> Result<String, Error> {
-    let mut query = url::form_urlencoded::Serializer::new(String::new());
-
-    let object = data.as_object().ok_or_else(|| {
-        format_err!("json_object_to_query: got wrong data type (expected object).")
-    })?;
-
-    for (key, value) in object {
-        match value {
-            Value::Bool(b) => {
-                query.append_pair(key, &b.to_string());
-            }
-            Value::Number(n) => {
-                query.append_pair(key, &n.to_string());
-            }
-            Value::String(s) => {
-                query.append_pair(key, &s);
-            }
-            Value::Array(arr) => {
-                for element in arr {
-                    match element {
-                        Value::Bool(b) => {
-                            query.append_pair(key, &b.to_string());
-                        }
-                        Value::Number(n) => {
-                            query.append_pair(key, &n.to_string());
-                        }
-                        Value::String(s) => {
-                            query.append_pair(key, &s);
-                        }
-                        _ => bail!(
-                            "json_object_to_query: unable to handle complex array data types."
-                        ),
-                    }
-                }
-            }
-            _ => bail!("json_object_to_query: unable to handle complex data types."),
-        }
-    }
-
-    Ok(query.finish())
-}
-
-pub fn required_string_param<'a>(param: &'a Value, name: &str) -> Result<&'a str, Error> {
-    match param[name].as_str() {
-        Some(s) => Ok(s),
-        None => bail!("missing parameter '{}'", name),
-    }
-}
-
-pub fn required_string_property<'a>(param: &'a Value, name: &str) -> Result<&'a str, Error> {
-    match param[name].as_str() {
-        Some(s) => Ok(s),
-        None => bail!("missing property '{}'", name),
-    }
-}
-
-pub fn required_integer_param(param: &Value, name: &str) -> Result<i64, Error> {
-    match param[name].as_i64() {
-        Some(s) => Ok(s),
-        None => bail!("missing parameter '{}'", name),
-    }
-}
-
-pub fn required_integer_property(param: &Value, name: &str) -> Result<i64, Error> {
-    match param[name].as_i64() {
-        Some(s) => Ok(s),
-        None => bail!("missing property '{}'", name),
-    }
-}
-
-pub fn required_array_param<'a>(param: &'a Value, name: &str) -> Result<&'a [Value], Error> {
-    match param[name].as_array() {
-        Some(s) => Ok(&s),
-        None => bail!("missing parameter '{}'", name),
-    }
-}
-
-pub fn required_array_property<'a>(param: &'a Value, name: &str) -> Result<&'a [Value], Error> {
-    match param[name].as_array() {
-        Some(s) => Ok(&s),
-        None => bail!("missing property '{}'", name),
-    }
-}

pbs-tools/src/lib.rs

@@ -1,33 +0,0 @@
-pub mod acl;
-pub mod blocking;
-pub mod broadcast_future;
-pub mod cert;
-pub mod cli;
-pub mod compression;
-pub mod crypt;
-pub mod crypt_config;
-pub mod format;
-pub mod fd;
-pub mod fs;
-pub mod io;
-pub mod json;
-pub mod logrotate;
-pub mod lru_cache;
-pub mod nom;
-pub mod percent_encoding;
-pub mod process_locker;
-pub mod sha;
-pub mod str;
-pub mod stream;
-pub mod sync;
-pub mod sys;
-pub mod task;
-pub mod ticket;
-pub mod tokio;
-pub mod xattr;
-pub mod zip;
-
-pub mod async_lru_cache;
-
-mod command;
-pub use command::{command_output, command_output_as_string, run_command};

pbs-tools/src/percent_encoding.rs

@@ -1,22 +0,0 @@
-use percent_encoding::{utf8_percent_encode, AsciiSet};
-
-/// This used to be: `SIMPLE_ENCODE_SET` plus space, `"`, `#`, `<`, `>`, backtick, `?`, `{`, `}`
-pub const DEFAULT_ENCODE_SET: &AsciiSet = &percent_encoding::CONTROLS // 0..1f and 7e
-    // The SIMPLE_ENCODE_SET adds space and anything >= 0x7e (7e itself is already included above)
-    .add(0x20)
-    .add(0x7f)
-    // the DEFAULT_ENCODE_SET added:
-    .add(b' ')
-    .add(b'"')
-    .add(b'#')
-    .add(b'<')
-    .add(b'>')
-    .add(b'`')
-    .add(b'?')
-    .add(b'{')
-    .add(b'}');
-
-/// percent encode a url component
-pub fn percent_encode_component(comp: &str) -> String {
-    utf8_percent_encode(comp, percent_encoding::NON_ALPHANUMERIC).to_string()
-}

pbs-tools/src/sha.rs

@@ -1,31 +0,0 @@
-//! SHA helpers.
-
-use std::io::Read;
-
-use anyhow::Error;
-
-use proxmox_io::vec;
-
-/// Calculate the sha256sum from a readable object.
-pub fn sha256(file: &mut dyn Read) -> Result<([u8; 32], u64), Error> {
-    let mut hasher = openssl::sha::Sha256::new();
-    let mut buffer = vec::undefined(256 * 1024);
-    let mut size: u64 = 0;
-
-    loop {
-        let count = match file.read(&mut buffer) {
-            Ok(0) => break,
-            Ok(count) => count,
-            Err(ref err) if err.kind() == std::io::ErrorKind::Interrupted => {
-                continue;
-            }
-            Err(err) => return Err(err.into()),
-        };
-        size += count as u64;
-        hasher.update(&buffer[..count]);
-    }
-
-    let csum = hasher.finish();
-
-    Ok((csum, size))
-}