From: Christian Ebner <c.ebner@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [PATCH proxmox-backup v2 29/43] datastore/config: parse and enforce maximum retention timespan
Date: Fri, 6 Nov 2026 18:22:21 +0100 [thread overview]
Message-ID: <20261106172235.890542-30-c.ebner@proxmox.com> (raw)
In-Reply-To: <20261106172235.890542-1-c.ebner@proxmox.com>
Allows to limit the maximum retention timespan which can be set on
snapshots, so users cannot block contents for unintended extended
periods of time.
Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
pbs-datastore/src/datastore.rs | 34 +++++++++++++++++++++++++++++++++-
src/api2/backup/mod.rs | 4 ++++
src/api2/config/datastore.rs | 9 +++++++++
src/server/pull.rs | 13 +++++++++----
4 files changed, 55 insertions(+), 5 deletions(-)
diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs
index d5608d4da..c8f14c5d0 100644
--- a/pbs-datastore/src/datastore.rs
+++ b/pbs-datastore/src/datastore.rs
@@ -34,7 +34,7 @@ use pbs_api_types::{
ArchiveType, Authid, BackupGroupDeleteStats, BackupNamespace, BackupType, ChunkOrder,
DEFAULT_SNAPSHOT_TIME_SKEW_SECS, DataStoreConfig, DatastoreBackendConfig, DatastoreBackendType,
GarbageCollectionCacheStats, GarbageCollectionStatus, MAX_NAMESPACE_DEPTH, MaintenanceMode,
- MaintenanceType, Operation, S3Statistics, UPID,
+ MaintenanceType, Operation, RetentionTimespan, S3Statistics, UPID,
};
use pbs_config::s3::S3_CFG_TYPE_ID;
use pbs_config::{BackupLockGuard, ConfigVersionCache};
@@ -213,6 +213,7 @@ pub struct DataStoreImpl {
request_counters: Option<Arc<SharedRequestCounters>>,
thresholds_exceeded_callback: Option<ThresholdsExceededCallback>,
max_snapshot_time_skew: i64,
+ max_retention_timespan: Option<RetentionTimespan>,
}
impl DataStoreImpl {
@@ -232,6 +233,7 @@ impl DataStoreImpl {
request_counters: None,
thresholds_exceeded_callback: None,
max_snapshot_time_skew: i64::try_from(DEFAULT_SNAPSHOT_TIME_SKEW_SECS).unwrap(),
+ max_retention_timespan: None,
})
}
}
@@ -814,6 +816,7 @@ impl DataStore {
request_counters,
thresholds_exceeded_callback,
max_snapshot_time_skew,
+ max_retention_timespan: config.max_retention_timespan,
})
}
@@ -859,6 +862,35 @@ impl DataStore {
Ok(())
}
+ /// Return the configured maximum retention timespan
+ pub fn max_retention_timespan(&self) -> Option<&RetentionTimespan> {
+ self.inner.max_retention_timespan.as_ref()
+ }
+
+ /// Check if the given retention timestamp is contained within the maximum
+ /// retention timespan relative to current system allowed by the datastore.
+ ///
+ /// Fails if there is no maximum retention configured for this datastore.
+ pub fn check_max_retention(&self, retain_until: i64) -> Result<(), Error> {
+ if retain_until <= proxmox_time::epoch_i64() {
+ bail!("retention timestamp must be in the future");
+ }
+ if let Some(max_retention) = self.max_retention_timespan() {
+ let max_timestamp = max_retention
+ .to_timestamp_from_systemtime()?
+ .saturating_add(self.inner.max_snapshot_time_skew);
+ if retain_until > max_timestamp {
+ bail!(
+ "retention timestamp '{}' exceeds datastore limit of '{}'",
+ proxmox_time::epoch_to_rfc3339_utc(retain_until)?,
+ proxmox_time::epoch_to_rfc3339_utc(max_timestamp)?,
+ );
+ }
+ return Ok(());
+ }
+ bail!("no maximum retention timespan configured for datastore");
+ }
+
// Requires obtaining a shared chunk store lock beforehand
pub fn create_fixed_writer<P: AsRef<Path>>(
&self,
diff --git a/src/api2/backup/mod.rs b/src/api2/backup/mod.rs
index 7d2236c9e..a057340ca 100644
--- a/src/api2/backup/mod.rs
+++ b/src/api2/backup/mod.rs
@@ -157,6 +157,10 @@ fn upgrade_to_backup_protocol(
"backup"
};
+ if let Some(retain_until) = retain_until {
+ datastore.check_max_retention(retain_until)?;
+ }
+
// lock backup group to only allow one backup per group at a time
let (owner, group_guard) = datastore.create_locked_backup_group(
backup_group.backup_ns(),
diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs
index 350e48acc..03ff19fc3 100644
--- a/src/api2/config/datastore.rs
+++ b/src/api2/config/datastore.rs
@@ -442,6 +442,8 @@ pub enum DeletableProperty {
CounterResetSchedule,
/// Delete the maximum snapshot time skew property.
MaxSnapshotTimeSkew,
+ /// Delete the max-retention-timespan
+ MaxRetentionTimespan,
}
#[api(
@@ -550,6 +552,9 @@ pub fn update_datastore(
DeletableProperty::MaxSnapshotTimeSkew => {
data.max_snapshot_time_skew = None;
}
+ DeletableProperty::MaxRetentionTimespan => {
+ data.max_retention_timespan = None;
+ }
}
}
}
@@ -655,6 +660,10 @@ pub fn update_datastore(
data.max_snapshot_time_skew = update.max_snapshot_time_skew;
}
+ if update.max_retention_timespan.is_some() {
+ data.max_retention_timespan = update.max_retention_timespan;
+ }
+
config.set_data(&name, "datastore", &data)?;
pbs_config::datastore::save_config(&config)?;
diff --git a/src/server/pull.rs b/src/server/pull.rs
index c1531ebda..44347c3ad 100644
--- a/src/server/pull.rs
+++ b/src/server/pull.rs
@@ -139,13 +139,18 @@ impl PullParameters {
let lookup = crate::tools::lookup_with(store, Operation::Write);
let store = DataStore::lookup_datastore(lookup)?;
let backend = store.backend()?;
- let target = PullTarget { store, ns, backend };
let group_filter = group_filter.unwrap_or_default();
- let retain_until = retention_timespan
- .map(|timespan| timespan.to_timestamp_from_systemtime())
- .transpose()?;
+ let retain_until = if let Some(retention) = retention_timespan {
+ let retain_until = retention.to_timestamp_from_systemtime()?;
+ (*store).check_max_retention(retain_until)?;
+ Some(retain_until)
+ } else {
+ None
+ };
+
+ let target = PullTarget { store, ns, backend };
let crypt_configs = if let Some(key_ids) = &decryption_keys {
let mut crypt_configs = Vec::with_capacity(key_ids.len());
--
2.47.3
next prev parent reply other threads:[~2026-11-06 17:24 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-06 17:21 [PATCH proxmox{-widget-toolkit,,-backup} v2 00/43] append-only sync jobs and snapshot retention timespan Christian Ebner
2026-11-06 17:21 ` [PATCH proxmox-widget-toolkit v2 01/43] form: date time field: init with now instead of epoch on empty fields Christian Ebner
2026-11-06 17:21 ` [PATCH proxmox-widget-toolkit v2 02/43] form: date time field: set min/max value limits passed via config Christian Ebner
2026-11-06 17:21 ` [PATCH proxmox-widget-toolkit v2 03/43] form: date time field: update to new limits when switching day/time Christian Ebner
2026-11-06 17:21 ` [PATCH proxmox-widget-toolkit v2 04/43] form: date time field: submit combined datetime instead of item fields Christian Ebner
2026-11-06 17:21 ` [PATCH proxmox-widget-toolkit v2 05/43] form: date time field: track value like other form fields Christian Ebner
2026-11-06 17:21 ` [PATCH proxmox v2 06/43] pbs-api-types: add append only privilege and role Christian Ebner
2026-11-06 17:21 ` [PATCH proxmox v2 07/43] pbs-api-types: add remote datastore append " Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox v2 08/43] pbs-api-types: extend snapshot list items by retention timestamp Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox v2 09/43] pbs-api-types: extend sync job config by retention-timespan parameter Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox v2 10/43] pbs-api-types: add max/default retention timespan property to datastore Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox v2 11/43] pbs-api-types: store: expose max/default retention timespans in status Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 12/43] config/tools: add new fields for sync and snapshot/datastore list items Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 13/43] api: admin: improve code style for status endpoint Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 14/43] client: avoid error in status if user lacks permissions Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 15/43] server: allow iterating contents for Datastore.Append permissions Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 16/43] api: backup: fix possible information leak in multi-tenant datastores Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 17/43] datastore: s3: fix namespace level bulk remove not honoring group locks Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 18/43] api: backup: allow backup for user/token with append permission Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 19/43] api: allow namespace creation on append permissions Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 20/43] api: sync: allow pull to target for user/token with append permission Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 21/43] sync: pull: allow pulling " Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 22/43] sync: push: allow push and ns creation on Remote.DatastoreAppend Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 23/43] datastore: conditionally treat missing manifest as error or benign Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 24/43] api: backup: provide retain-until timestamp for extended prune protection Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 25/43] tools: include retain-until timestamp in snapshot list items Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 26/43] client: backup writer: allow to send retain-until timestamp on backup Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 27/43] sync: push: allow to set retention timestamp for synced snapshots Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 28/43] sync: pull: set retention timestamp from sync job for new snapshots Christian Ebner
2026-11-06 17:22 ` Christian Ebner [this message]
2026-11-06 17:22 ` [PATCH proxmox-backup v2 30/43] api: config: allow to set or delete retention timespan for sync jobs Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 31/43] api: admin: allow to modify snapshot retention for root user Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 32/43] tape/s3-refresh: check for retentions outside datastore limits Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 33/43] ui: add retention timespan form and use it for sync job edit window Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 34/43] ui: allow datastore wide max retention timespan configuration Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 35/43] ui: show snapshot retention in datastore contents and allow extension Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 36/43] group: destroy: s3: skip snapshots with active retentions Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 37/43] prune: " Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 38/43] api/ui: expose default retention setting as datastore config option Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 39/43] api: datastore: expose max/default retention timespans in status listing Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 40/43] backup/sync: fallback to datastore default-retention-timespan Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 41/43] client: add flags to set snapshot retention via timestamp/timespan Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 42/43] docs: describe the privileges and roles for append only backup/sync Christian Ebner
2026-11-06 17:22 ` [PATCH proxmox-backup v2 43/43] docs: document snapshot retention for new backup snapshots Christian Ebner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261106172235.890542-30-c.ebner@proxmox.com \
--to=c.ebner@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox