[pbs-devel] [PATCH v6 proxmox-backup 2/4] pxar: bin: use dedicated api type for restore pattern

[Christian Ebner]

Instead of taking a plain string as input parameter, use the
corresponding api type performing additional input validation.

Signed-off-by: Christian Ebner <c.ebner at proxmox.com>
---
changes since version 5:
- rebased to current master

 pxar-bin/Cargo.toml  |  1 +
 pxar-bin/src/main.rs | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/pxar-bin/Cargo.toml b/pxar-bin/Cargo.toml
index d0d7ab24d..37c980e28 100644
--- a/pxar-bin/Cargo.toml
+++ b/pxar-bin/Cargo.toml
@@ -25,5 +25,6 @@ proxmox-router = { workspace = true, features = ["cli", "server"] }
 proxmox-schema = { workspace = true, features = [ "api-macro" ] }
 proxmox-sys.workspace = true
 
+pbs-api-types.workspace = true
 pbs-client.workspace = true
 pbs-pxar-fuse.workspace = true
diff --git a/pxar-bin/src/main.rs b/pxar-bin/src/main.rs
index 2fc0d1bb5..eb3580d92 100644
--- a/pxar-bin/src/main.rs
+++ b/pxar-bin/src/main.rs
@@ -9,9 +9,11 @@ use std::sync::Arc;
 use anyhow::{bail, format_err, Error};
 use futures::future::FutureExt;
 use futures::select;
+use serde_json::Value;
 use tokio::signal::unix::{signal, SignalKind};
 
 use pathpatterns::{MatchEntry, MatchType, PatternFlag};
+use pbs_api_types::PathPatterns;
 use pbs_client::pxar::tools::format_single_line_entry;
 use pbs_client::pxar::{
     Flags, OverwriteFlags, PxarExtractOptions, PxarWriters, ENCODER_MAX_ENTRIES,
@@ -53,12 +55,7 @@ fn extract_archive_from_reader<R: std::io::Read>(
                 description: "Archive name.",
             },
             pattern: {
-                description: "List of paths or pattern matching files to restore",
-                type: Array,
-                items: {
-                    type: String,
-                    description: "Path or pattern matching files to restore.",
-                },
+                type: PathPatterns,
                 optional: true,
             },
             target: {
@@ -144,7 +141,6 @@ fn extract_archive_from_reader<R: std::io::Read>(
 #[allow(clippy::too_many_arguments)]
 fn extract_archive(
     archive: String,
-    pattern: Option<Vec<String>>,
     target: Option<String>,
     no_xattrs: bool,
     no_fcaps: bool,
@@ -161,6 +157,7 @@ fn extract_archive(
     strict: bool,
     payload_input: Option<String>,
     prelude_target: Option<String>,
+    param: Value,
 ) -> Result<(), Error> {
     let mut feature_flags = Flags::DEFAULT;
     if no_xattrs {
@@ -190,7 +187,6 @@ fn extract_archive(
         overwrite_flags.insert(OverwriteFlags::all());
     }
 
-    let pattern = pattern.unwrap_or_default();
     let target = target.as_ref().map_or_else(|| ".", String::as_str);
 
     let mut match_list = Vec::new();
@@ -204,11 +200,15 @@ fn extract_archive(
         }
     }
 
-    for entry in pattern {
-        match_list.push(
-            MatchEntry::parse_pattern(entry, PatternFlag::PATH_NAME, MatchType::Include)
-                .map_err(|err| format_err!("error in pattern: {}", err))?,
-        );
+    if let Some(pattern) = param["pattern"].as_array() {
+        for p in pattern {
+            if let Some(entry) = p.as_str() {
+                match_list.push(
+                    MatchEntry::parse_pattern(entry, PatternFlag::PATH_NAME, MatchType::Include)
+                        .map_err(|err| format_err!("error in pattern: {err}"))?,
+                );
+            }
+        }
     }
 
     let extract_match_default = match_list.is_empty();
-- 
2.39.5