tfa: handle incompatible challenge data

[proxmox-backup.git] / proxmox-backup-client / src / main.rs

diff --git a/proxmox-backup-client/src/main.rs b/proxmox-backup-client/src/main.rs
index cb083006484c736a88c3623993ba79a8313f6a9f..c5189e04ca0bce29ed1971e1e438a453465ec7d9 100644 (file)
--- a/proxmox-backup-client/src/main.rs
+++ b/proxmox-backup-client/src/main.rs
@@ -20,8 +20,10 @@ use proxmox_time::{strftime_local, epoch_i64};
 use pxar::accessor::{MaybeReady, ReadAt, ReadAtOperation};
 
 use pbs_api_types::{
-    BACKUP_ID_SCHEMA, BACKUP_TIME_SCHEMA, BACKUP_TYPE_SCHEMA, Authid, CryptMode, GroupListItem,
-    PruneListItem, SnapshotListItem, StorageStatus, Fingerprint, PruneOptions,
+    BACKUP_ID_SCHEMA, BACKUP_TIME_SCHEMA, BACKUP_TYPE_SCHEMA,
+    TRAFFIC_CONTROL_BURST_SCHEMA, TRAFFIC_CONTROL_RATE_SCHEMA,
+    Authid, CryptMode, Fingerprint, GroupListItem, PruneListItem, PruneOptions,
+    SnapshotListItem, StorageStatus,
 };
 use pbs_client::{
     BACKUP_SOURCE_SCHEMA,
@@ -45,7 +47,7 @@ use pbs_client::tools::{
     complete_archive_name, complete_auth_id, complete_backup_group, complete_backup_snapshot,
     complete_backup_source, complete_chunk_size, complete_group_or_snapshot,
     complete_img_archive_name, complete_pxar_archive_name, complete_repository, connect,
-    extract_repository_from_value,
+    connect_rate_limited, extract_repository_from_value,
     key_source::{
         crypto_parameters, format_key_source, get_encryption_key_password, KEYFD_SCHEMA,
         KEYFILE_SCHEMA, MASTER_PUBKEY_FD_SCHEMA, MASTER_PUBKEY_FILE_SCHEMA,
@@ -582,6 +584,14 @@ fn spawn_catalog_upload(
                schema: CHUNK_SIZE_SCHEMA,
                optional: true,
            },
+           rate: {
+               schema: TRAFFIC_CONTROL_RATE_SCHEMA,
+               optional: true,
+           },
+           burst: {
+               schema: TRAFFIC_CONTROL_BURST_SCHEMA,
+               optional: true,
+           },
            "exclude": {
                type: Array,
                description: "List of paths or patterns for matching files to exclude.",
@@ -630,6 +640,9 @@ async fn create_backup(
         verify_chunk_size(size)?;
     }
 
+    let rate_limit = param["rate"].as_u64();
+    let bucket_size = param["burst"].as_u64();
+
     let crypto = crypto_parameters(&param)?;
 
     let backup_id = param["backup-id"].as_str().unwrap_or(&proxmox::tools::nodename());
@@ -724,7 +737,7 @@ async fn create_backup(
 
     let backup_time = backup_time_opt.unwrap_or_else(epoch_i64);
 
-    let client = connect(&repo)?;
+    let client = connect_rate_limited(&repo, rate_limit, bucket_size)?;
     record_repository(&repo);
 
     println!("Starting backup: {}/{}/{}", backup_type, backup_id, BackupDir::backup_time_to_string(backup_time)?);
@@ -1041,6 +1054,14 @@ We do not extract '.pxar' archives when writing to standard output.
 
 "###
            },
+           rate: {
+               schema: TRAFFIC_CONTROL_RATE_SCHEMA,
+               optional: true,
+           },
+           burst: {
+               schema: TRAFFIC_CONTROL_BURST_SCHEMA,
+               optional: true,
+           },
            "allow-existing-dirs": {
                type: Boolean,
                description: "Do not fail if directories already exists.",
@@ -1071,8 +1092,10 @@ async fn restore(param: Value) -> Result<Value, Error> {
 
     let archive_name = json::required_string_param(&param, "archive-name")?;
 
-    let client = connect(&repo)?;
+    let rate_limit = param["rate"].as_u64();
+    let bucket_size = param["burst"].as_u64();
 
+    let client = connect_rate_limited(&repo, rate_limit, bucket_size)?;
     record_repository(&repo);
 
     let path = json::required_string_param(&param, "snapshot")?;