update dependencies, refactor some backup code, increase default pid

0x7d8 · 0x7d8 · commit 6662481458b8 · 2026-02-16T19:42:50.000+01:00
limit
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/application/Cargo.toml b/application/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "wings-rs"
 rust-version = { workspace = true }
-version = "0.24.8"
+version = "0.24.9"
 edition = "2024"
 
 [dependencies]
@@ -31,7 +31,7 @@ tokio-util = { workspace = true }
 uuid = { workspace = true }
 rand = { workspace = true }
 tar = "0.4.44"
-zip = { version = "7.0.0", default-features = false, features = ["bzip2", "deflate", "time", "zstd", "lzma", "xz"] }
+zip = { version = "8.0.0", default-features = false, features = ["bzip2", "deflate", "time", "zstd", "lzma", "xz"] }
 sevenz-rust2 = { version = "0.20.0", features = ["deflate", "compress", "brotli", "zstd", "bzip2", "ppmd", "lz4"] }
 flate2 = { version = "1.1.1", default-features = false, features = ["zlib-rs"] }
 jwt = "0.16.0"
@@ -62,7 +62,7 @@ async-trait = "0.1.88"
 cron = { version = "0.15.0", features = ["serde"] }
 chrono-tz = "0.10.4"
 gzp = "2.0.0"
-lzma-rust2 = { version = "0.15.4", features = ["optimization"] }
+lzma-rust2 = { version = "0.16.1", features = ["optimization"] }
 bzip2 = "0.6.0"
 zstd = { version = "0.13.3", features = ["zstdmt"] }
 base64 = "0.22.1"
@@ -83,7 +83,7 @@ positioned-io = "0.3.5"
 rmp-serde = "1.3.1"
 accept-header = "0.2.3"
 mime = "0.3.17"
-toml = { version = "0.9.11", features = ["preserve_order"] }
+toml = { version = "1.0.1", features = ["preserve_order"] }
 sntpc-net-tokio = "1.0.1"
 sntpc = { version = "0.8.1", features = ["std"] }
 
diff --git a/application/src/config.rs b/application/src/config.rs
@@ -338,7 +338,7 @@ fn docker_tmpfs_size() -> u64 {
     100
 }
 fn docker_container_pid_limit() -> u64 {
-    512
+    5120
 }
 
 fn docker_installer_limits_timeout() -> u64 {
diff --git a/application/src/io/mod.rs b/application/src/io/mod.rs
@@ -3,8 +3,6 @@ use std::{
     os::fd::AsFd,
 };
 
-use crate::io::abort::AbortListener;
-
 pub mod abort;
 pub mod compression;
 pub mod counting_reader;
@@ -46,7 +44,7 @@ pub fn copy_file_progress(
     reader: &mut (impl AsFd + std::io::Read + ?Sized),
     writer: &mut (impl AsFd + std::io::Write + ?Sized),
     mut progress: impl FnMut(usize) -> Result<(), std::io::Error>,
-    listener: AbortListener,
+    listener: abort::AbortListener,
 ) -> Result<u64, std::io::Error> {
     let mut total_copied = 0;
 
diff --git a/application/src/server/backup/adapters/btrfs.rs b/application/src/server/backup/adapters/btrfs.rs
@@ -10,7 +10,6 @@ use crate::{
         },
     },
 };
-use axum::http::HeaderMap;
 use std::{
     path::{Path, PathBuf},
     sync::{
@@ -310,19 +309,16 @@ impl BackupExt for BtrfsBackup {
             }
         });
 
-        let mut headers = HeaderMap::with_capacity(2);
-        headers.insert(
-            "Content-Disposition",
-            format!(
-                "attachment; filename={}.{}",
-                self.uuid,
-                archive_format.extension()
+        Ok(ApiResponse::new_stream(reader)
+            .with_header(
+                "Content-Disposition",
+                &format!(
+                    "attachment; filename={}.{}",
+                    self.uuid,
+                    archive_format.extension()
+                ),
             )
-            .parse()?,
-        );
-        headers.insert("Content-Type", archive_format.mime_type().parse()?);
-
-        Ok(ApiResponse::new_stream(reader).with_headers(headers))
+            .with_header("Content-Type", archive_format.mime_type()))
     }
 
     async fn restore(
diff --git a/application/src/server/backup/adapters/ddup_bak.rs b/application/src/server/backup/adapters/ddup_bak.rs
@@ -16,7 +16,6 @@ use crate::{
         },
     },
 };
-use axum::http::HeaderMap;
 use cap_std::fs::Permissions;
 use chrono::{Datelike, Timelike};
 use ddup_bak::archive::entries::Entry;
@@ -457,19 +456,16 @@ impl BackupExt for DdupBakBackup {
             }
         }
 
-        let mut headers = HeaderMap::with_capacity(2);
-        headers.insert(
-            "Content-Disposition",
-            format!(
-                "attachment; filename={}.{}",
-                self.uuid,
-                archive_format.extension()
+        Ok(ApiResponse::new_stream(reader)
+            .with_header(
+                "Content-Disposition",
+                &format!(
+                    "attachment; filename={}.{}",
+                    self.uuid,
+                    archive_format.extension()
+                ),
             )
-            .parse()?,
-        );
-        headers.insert("Content-Type", archive_format.mime_type().parse()?);
-
-        Ok(ApiResponse::new_stream(reader).with_headers(headers))
+            .with_header("Content-Type", archive_format.mime_type()))
     }
 
     async fn restore(
@@ -554,10 +550,6 @@ impl BackupExt for DdupBakBackup {
                         if let Err(err) = server.filesystem.symlink(&symlink.target, &path) {
                             tracing::debug!(path = %path.display(), "failed to create symlink from backup: {:?}", err);
                         } else {
-                            server.filesystem.set_symlink_permissions(
-                                &path,
-                                cap_std::fs::Permissions::from_std(symlink.mode.into()),
-                            )?;
                             server.filesystem.set_times(&path, symlink.mtime, None)?;
                         }
                     }
diff --git a/application/src/server/backup/adapters/restic.rs b/application/src/server/backup/adapters/restic.rs
@@ -21,10 +21,8 @@ use crate::{
     },
     utils::PortableModeExt,
 };
-use axum::http::HeaderMap;
 use chrono::{Datelike, Timelike};
 use compact_str::ToCompactString;
-use human_bytes::human_bytes;
 use serde::Deserialize;
 use std::{
     collections::HashMap,
@@ -45,8 +43,14 @@ static RESTIC_BACKUP_CACHE: LazyLock<ResticBackupCache> =
 #[derive(Debug, Deserialize)]
 struct ResticSnapshot {
     short_id: String,
-    tags: Vec<String>,
-    paths: Vec<String>,
+    tags: Vec<compact_str::CompactString>,
+    paths: Vec<compact_str::CompactString>,
+    summary: ResticSnapshotSummary,
+}
+
+#[derive(Debug, Deserialize)]
+struct ResticSnapshotSummary {
+    total_bytes_processed: u64,
 }
 
 #[derive(Deserialize)]
@@ -69,6 +73,7 @@ pub struct ResticDirectoryEntry {
 pub struct ResticBackup {
     uuid: uuid::Uuid,
     short_id: String,
+    total_bytes_processed: u64,
 
     config: Arc<crate::config::Config>,
     server_path: PathBuf,
@@ -217,6 +222,7 @@ impl BackupFindExt for ResticBackup {
             return Ok(Some(Backup::Restic(ResticBackup {
                 uuid,
                 short_id: snapshot.short_id.clone(),
+                total_bytes_processed: snapshot.summary.total_bytes_processed,
                 config: Arc::clone(config),
                 server_path: match snapshot.paths.first() {
                     Some(path) => PathBuf::from(path),
@@ -280,6 +286,7 @@ impl BackupFindExt for ResticBackup {
                         backup = Some(ResticBackup {
                             uuid,
                             short_id: snapshot.short_id.clone(),
+                            total_bytes_processed: snapshot.summary.total_bytes_processed,
                             config: Arc::clone(config),
                             server_path: match snapshot.paths.first() {
                                 Some(path) => PathBuf::from(path),
@@ -343,6 +350,7 @@ impl BackupFindExt for ResticBackup {
                         backup = Some(ResticBackup {
                             uuid,
                             short_id: snapshot.short_id.clone(),
+                            total_bytes_processed: snapshot.summary.total_bytes_processed,
                             config: Arc::clone(config),
                             server_path: match snapshot.paths.first() {
                                 Some(path) => PathBuf::from(path),
@@ -562,8 +570,11 @@ impl BackupCreateExt for ResticBackup {
                 (
                     ResticSnapshot {
                         short_id: snapshot_id.clone(),
-                        tags: vec![uuid.to_string()],
-                        paths: vec![server.filesystem.base_path.to_string_lossy().to_string()],
+                        tags: vec![uuid.to_compact_string()],
+                        paths: vec![server.filesystem.base_path.to_string_lossy().into()],
+                        summary: ResticSnapshotSummary {
+                            total_bytes_processed,
+                        },
                     },
                     Arc::new(configuration),
                 ),
@@ -711,19 +722,16 @@ impl BackupExt for ResticBackup {
             }
         }
 
-        let mut headers = HeaderMap::with_capacity(2);
-        headers.insert(
-            "Content-Disposition",
-            format!(
-                "attachment; filename={}.{}",
-                self.uuid,
-                archive_format.extension()
+        Ok(ApiResponse::new_stream(reader)
+            .with_header(
+                "Content-Disposition",
+                &format!(
+                    "attachment; filename={}.{}",
+                    self.uuid,
+                    archive_format.extension()
+                ),
             )
-            .parse()?,
-        );
-        headers.insert("Content-Type", archive_format.mime_type().parse()?);
-
-        Ok(ApiResponse::new_stream(reader).with_headers(headers))
+            .with_header("Content-Type", archive_format.mime_type()))
     }
 
     async fn restore(
@@ -733,6 +741,8 @@ impl BackupExt for ResticBackup {
         total: Arc<AtomicU64>,
         _download_url: Option<compact_str::CompactString>,
     ) -> Result<(), anyhow::Error> {
+        total.store(self.total_bytes_processed, Ordering::SeqCst);
+
         let child = Command::new("restic")
             .envs(&self.configuration.environment)
             .arg("--json")
@@ -748,38 +758,28 @@ impl BackupExt for ResticBackup {
             .arg(&server.filesystem.base_path)
             .arg("--limit-download")
             .arg((server.app_state.config.system.backups.read_limit.as_kib()).to_compact_string())
+            .arg("-vv")
             .stdout(std::process::Stdio::piped())
             .spawn()?;
 
         let mut line_reader = tokio::io::BufReader::new(child.stdout.unwrap()).lines();
 
         while let Ok(Some(line)) = line_reader.next_line().await {
             if let Ok(json) = serde_json::from_str::<serde_json::Value>(&line)
-                && json.get("message_type").and_then(|v| v.as_str()) == Some("status")
+                && json.get("message_type").and_then(|v| v.as_str()) == Some("verbose_status")
             {
-                let total_bytes = json
-                    .get("total_bytes")
-                    .and_then(|v| v.as_u64())
-                    .unwrap_or(0);
-                let bytes_restored = json
-                    .get("bytes_restored")
-                    .and_then(|v| v.as_u64())
-                    .unwrap_or(0);
-                let percent_done = json
-                    .get("percent_done")
-                    .and_then(|v| v.as_f64())
-                    .unwrap_or(0.0);
-                let percent_done = (percent_done * 10000.0).round() / 100.0;
-
-                progress.store(bytes_restored, Ordering::SeqCst);
-                total.store(total_bytes, Ordering::SeqCst);
-
-                server.log_daemon(compact_str::format_compact!(
-                    "(restoring): {} of {} ({}%)",
-                    human_bytes(bytes_restored as f64),
-                    human_bytes(total_bytes as f64),
-                    percent_done
-                ));
+                let Some(item) = json.get("item").and_then(|v| v.as_str()) else {
+                    continue;
+                };
+                let size = json.get("size").and_then(|v| v.as_u64()).unwrap_or(0);
+
+                if size == 0 {
+                    continue;
+                }
+
+                progress.fetch_add(size, Ordering::SeqCst);
+
+                server.log_daemon(compact_str::format_compact!("(restoring): {}", item));
             }
         }
 
diff --git a/application/src/server/backup/adapters/zfs.rs b/application/src/server/backup/adapters/zfs.rs
@@ -10,7 +10,6 @@ use crate::{
         },
     },
 };
-use axum::http::HeaderMap;
 use std::{
     path::{Path, PathBuf},
     sync::{
@@ -297,19 +296,16 @@ impl BackupExt for ZfsBackup {
             }
         });
 
-        let mut headers = HeaderMap::with_capacity(2);
-        headers.insert(
-            "Content-Disposition",
-            format!(
-                "attachment; filename={}.{}",
-                self.uuid,
-                archive_format.extension()
+        Ok(ApiResponse::new_stream(reader)
+            .with_header(
+                "Content-Disposition",
+                &format!(
+                    "attachment; filename={}.{}",
+                    self.uuid,
+                    archive_format.extension()
+                ),
             )
-            .parse()?,
-        );
-        headers.insert("Content-Type", archive_format.mime_type().parse()?);
-
-        Ok(ApiResponse::new_stream(reader).with_headers(headers))
+            .with_header("Content-Type", archive_format.mime_type()))
     }
 
     async fn restore(
diff --git a/application/src/server/filesystem/virtualfs/cap.rs b/application/src/server/filesystem/virtualfs/cap.rs
@@ -1,5 +1,3 @@
-use tokio::io::AsyncWriteExt;
-
 use super::{
     AsyncFileRead, AsyncReadableFileStream, AsyncWritableSeekableFileStream, ByteRange,
     DirectoryListing, DirectoryStreamWalk, DirectoryWalk, FileMetadata, FileRead, FileType,
@@ -17,6 +15,7 @@ use std::{
     path::{Path, PathBuf},
     sync::{Arc, atomic::AtomicU64},
 };
+use tokio::io::AsyncWriteExt;
 
 pub struct VirtualCapFilesystem {
     pub inner: crate::server::filesystem::cap::CapFilesystem,

Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@ fn docker_tmpfs_size() -> u64 {`
`338`	`338`	`100`
`339`	`339`	`}`
`340`	`340`	`fn docker_container_pid_limit() -> u64 {`
`341`		`- 512`
	`341`	`+ 5120`
`342`	`342`	`}`
`343`	`343`
`344`	`344`	`fn docker_installer_limits_timeout() -> u64 {`