all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Dietmar Maurer <dietmar@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [RFC proxmox 12/22] firewall-api-types: add FirewallIpsetReference type
Date: Mon, 16 Feb 2026 11:43:50 +0100	[thread overview]
Message-ID: <20260216104401.3959270-13-dietmar@proxmox.com> (raw)
In-Reply-To: <20260216104401.3959270-1-dietmar@proxmox.com>

This adds a new type to reference ipsets with proper scope handling
(Datacenter, Guest, SDN, or None for legacy ipsets).

The implementation includes:
- FirewallIpsetScope enum for scope variants
- FirewallIpsetReference struct with validation
- Proper encapsulation with constructor and accessor methods
- FromStr implementation for parsing ipset references

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
---
 proxmox-firewall-api-types/src/ipset.rs | 191 ++++++++++++++++++++++++
 proxmox-firewall-api-types/src/lib.rs   |   3 +
 2 files changed, 194 insertions(+)
 create mode 100644 proxmox-firewall-api-types/src/ipset.rs

diff --git a/proxmox-firewall-api-types/src/ipset.rs b/proxmox-firewall-api-types/src/ipset.rs
new file mode 100644
index 00000000..02659394
--- /dev/null
+++ b/proxmox-firewall-api-types/src/ipset.rs
@@ -0,0 +1,191 @@
+use std::fmt;
+use std::str::FromStr;
+
+use anyhow::{bail, Error};
+
+#[cfg(feature = "enum-fallback")]
+use proxmox_fixed_string::FixedString;
+
+/// The scope of an ipset.
+#[derive(Debug, Clone, Copy, Eq, PartialEq)]
+pub enum FirewallIpsetScope {
+    /// Datacenter scope.
+    Datacenter,
+    /// Guest scope.
+    Guest,
+    /// SDN scope.
+    Sdn,
+    /// No scope (e.g. for legacy ipsets).
+    None,
+    #[cfg(feature = "enum-fallback")]
+    /// Unknown variants for forward compatibility.
+    UnknownEnumValue(FixedString),
+}
+
+/// A reference to an ipset, including its scope.
+#[derive(Debug, Clone, Eq, PartialEq)]
+pub struct FirewallIpsetReference {
+    scope: FirewallIpsetScope,
+    name: String,
+}
+
+impl FirewallIpsetReference {
+    pub fn new(scope: FirewallIpsetScope, name: String) -> Result<Self, Error> {
+        verify_ipset_name(&name)?;
+        Ok(Self { scope, name })
+    }
+
+    pub fn scope(&self) -> FirewallIpsetScope {
+        self.scope
+    }
+
+    pub fn name(&self) -> &str {
+        &self.name
+    }
+}
+
+fn verify_ipset_name(name: &str) -> Result<(), Error> {
+    if name.is_empty() {
+        bail!("ipset name cannot be empty");
+    }
+
+    if !name.starts_with(|c: char| c.is_ascii_alphabetic()) {
+        bail!("ipset name must start with an ASCII letter");
+    }
+
+    if name.contains(|c: char| !c.is_ascii_alphanumeric() && c != '-' && c != '_') {
+        bail!("ipset name can only contain ASCII letters, digits, hyphens, and underscores");
+    }
+
+    Ok(())
+}
+
+impl fmt::Display for FirewallIpsetReference {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        "+".fmt(f)?;
+        match self.scope {
+            FirewallIpsetScope::Datacenter => write!(f, "dc/{}", self.name),
+            FirewallIpsetScope::Guest => write!(f, "guest/{}", self.name),
+            FirewallIpsetScope::Sdn => write!(f, "sdn/{}", self.name),
+            #[cfg(feature = "enum-fallback")]
+            FirewallIpsetScope::UnknownEnumValue(scope) => write!(f, "{}/{}", scope, self.name),
+            FirewallIpsetScope::None => self.name.fmt(f),
+        }
+    }
+}
+
+impl FromStr for FirewallIpsetReference {
+    type Err = Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let s = s.trim();
+
+        let s = match s.strip_prefix('+') {
+            Some(rest) => rest,
+            None => bail!("ipset reference must start with '+'"),
+        };
+
+        if s.is_empty() {
+            bail!("empty firewall ipset specification");
+        }
+
+        let (scope, name) = match s.split_once('/') {
+            Some(("dc", alias)) => (FirewallIpsetScope::Datacenter, alias),
+            Some(("guest", alias)) => (FirewallIpsetScope::Guest, alias),
+            Some(("sdn", alias)) => (FirewallIpsetScope::Sdn, alias),
+            #[cfg(not(feature = "enum-fallback"))]
+            Some((scope, _alias)) => bail!("invalid firewall ipset reference scope: {scope}"),
+            #[cfg(feature = "enum-fallback")]
+            Some((scope, alias)) => (
+                FirewallIpsetScope::UnknownEnumValue(FixedString::from_str(scope)?),
+                alias,
+            ),
+            None => (FirewallIpsetScope::None, s),
+        };
+
+        Self::new(scope, name.to_string())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_parse_ipset_name() {
+        for test_case in [
+            (
+                "+dc/proxmox-123",
+                FirewallIpsetScope::Datacenter,
+                "proxmox-123",
+            ),
+            (
+                "+guest/proxmox_123",
+                FirewallIpsetScope::Guest,
+                "proxmox_123",
+            ),
+        ] {
+            let ipset_name = test_case
+                .0
+                .parse::<FirewallIpsetReference>()
+                .expect("valid ipset name");
+
+            assert_eq!(
+                ipset_name,
+                FirewallIpsetReference {
+                    scope: test_case.1,
+                    name: test_case.2.to_string(),
+                }
+            )
+        }
+
+        for name in ["+dc/", "guest/proxmox_123"] {
+            name.parse::<FirewallIpsetReference>()
+                .expect_err("invalid ipset name");
+        }
+
+        #[cfg(feature = "enum-fallback")]
+        for name in ["+guests/proxmox_123", "+nonsense/abc"] {
+            name.parse::<FirewallIpsetReference>()
+                .expect("valid ipset name (enum fallback feature)");
+        }
+    }
+
+    #[test]
+    fn test_parse_legacy_ipset_name() {
+        for test_case in [
+            ("+proxmox_123", "proxmox_123"),
+            ("+proxmox_---123", "proxmox_---123"),
+        ] {
+            let ipset_name = test_case
+                .0
+                .parse::<FirewallIpsetReference>()
+                .expect("valid ipset name");
+
+            assert_eq!(
+                ipset_name,
+                FirewallIpsetReference {
+                    scope: FirewallIpsetScope::None,
+                    name: test_case.1.to_string(),
+                }
+            )
+        }
+
+        for name in ["guest/proxmox_123", "+-qwe", "+1qwe"] {
+            name.parse::<FirewallIpsetReference>()
+                .expect_err("invalid ipset name");
+        }
+    }
+
+    #[test]
+    fn test_new_ipset() {
+        let ipset =
+            FirewallIpsetReference::new(FirewallIpsetScope::Datacenter, "proxmox-123".to_string())
+                .expect("valid ipset name");
+        assert_eq!(ipset.scope(), FirewallIpsetScope::Datacenter);
+        assert_eq!(ipset.name(), "proxmox-123");
+
+        FirewallIpsetReference::new(FirewallIpsetScope::Datacenter, "+invalid".to_string())
+            .expect_err("invalid ipset name");
+    }
+}
diff --git a/proxmox-firewall-api-types/src/lib.rs b/proxmox-firewall-api-types/src/lib.rs
index 610282bb..abd78c98 100644
--- a/proxmox-firewall-api-types/src/lib.rs
+++ b/proxmox-firewall-api-types/src/lib.rs
@@ -4,6 +4,9 @@ pub use conntrack::FirewallConntrackHelper;
 mod icmp_type;
 pub use icmp_type::{FirewallIcmpType, FirewallIcmpTypeName};
 
+mod ipset;
+pub use ipset::{FirewallIpsetReference, FirewallIpsetScope};
+
 mod log;
 pub use log::{
     FirewallLogLevel, FirewallLogRateLimit, FirewallPacketRate, FirewallPacketRateTimescale,
-- 
2.47.3




  parent reply	other threads:[~2026-02-16 10:44 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-02-16 10:43 [RFC proxmox 00/22] New crate for firewall api types Dietmar Maurer
2026-02-16 10:43 ` [RFC proxmox 01/22] firewall-api-types: add new " Dietmar Maurer
2026-02-16 10:43 ` [RFC proxmox 02/22] firewall-api-types: add README.md Dietmar Maurer
2026-02-16 10:43 ` [RFC proxmox 03/22] firewall-api-types: add firewall policy types Dietmar Maurer
2026-02-16 10:43 ` [RFC proxmox 04/22] firewall-api-types: add logging types Dietmar Maurer
2026-02-16 10:43 ` [RFC proxmox 05/22] firewall-api-types: add FirewallClusterOptions Dietmar Maurer
2026-02-16 10:43 ` [RFC proxmox 06/22] firewall-api-types: add FirewallGuestOptions Dietmar Maurer
2026-02-16 10:43 ` [RFC proxmox 07/22] firewall-api-types: add FirewallConntrackHelper enum Dietmar Maurer
2026-02-16 10:43 ` [RFC proxmox 08/22] firewall-api-types: add FirewallNodeOptions struct Dietmar Maurer
2026-02-16 10:43 ` [RFC proxmox 09/22] firewall-api-types: add FirewallRef type Dietmar Maurer
2026-02-16 10:43 ` [RFC proxmox 10/22] firewall-api-types: add FirewallPortList types Dietmar Maurer
2026-02-16 10:43 ` [RFC proxmox 11/22] firewall-api-types: add FirewallIcmpType Dietmar Maurer
2026-02-16 10:43 ` Dietmar Maurer [this message]
2026-02-16 10:43 ` [RFC proxmox 13/22] firewall-api-types: add FirewallAliasReference type Dietmar Maurer
2026-02-16 10:43 ` [RFC proxmox 14/22] firewall-api-types: add firewall address types Dietmar Maurer
2026-02-16 10:43 ` [RFC proxmox 15/22] firewall-api-types: add FirewallRule type Dietmar Maurer
2026-02-16 10:43 ` [RFC proxmox 16/22] firewall-api-types: use ConfigDigest from proxmox-config-digest crate Dietmar Maurer
2026-02-16 10:43 ` [RFC proxmox 17/22] firewall-api-types: use COMMENT_SCHEMA from proxmox-schema crate Dietmar Maurer
2026-02-16 10:43 ` [RFC proxmox 18/22] firewall-api-types: add FirewallRuleUpdater type Dietmar Maurer
2026-02-16 10:43 ` [RFC proxmox 19/22] firewall-api-types: refactor FirewallRule and add FirewallRuleListEntry Dietmar Maurer
2026-02-16 10:43 ` [RFC proxmox 20/22] firewall-api-types: add DeletableFirewallRuleProperty enum Dietmar Maurer
2026-02-16 10:43 ` [RFC proxmox 21/22] firewall-api-types: add FirewallAliasEntry API type Dietmar Maurer
2026-02-16 10:44 ` [RFC proxmox 22/22] firewall-api-types: add FirewallIpsetListEntry and FirewallIpsetEntry api types Dietmar Maurer
2026-02-17  6:17 ` [RFC proxmox 00/22] New crate for firewall " Hannes Laimer
2026-02-17  6:39   ` Dietmar Maurer
2026-02-17  8:17     ` Hannes Laimer

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=20260216104401.3959270-13-dietmar@proxmox.com \
    --to=dietmar@proxmox.com \
    --cc=pve-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal