From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 1AE0990930 for ; Tue, 2 Apr 2024 19:16:36 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 32393A658 for ; Tue, 2 Apr 2024 19:16:35 +0200 (CEST) Received: from lana.proxmox.com (unknown [94.136.29.99]) by firstgate.proxmox.com (Proxmox) with ESMTP for ; Tue, 2 Apr 2024 19:16:33 +0200 (CEST) Received: by lana.proxmox.com (Postfix, from userid 10043) id 0B3EB2C3462; Tue, 2 Apr 2024 19:16:31 +0200 (CEST) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Cc: Stefan Hanreich , Wolfgang Bumiller Date: Tue, 2 Apr 2024 19:16:02 +0200 Message-Id: <20240402171629.536804-11-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240402171629.536804-1-s.hanreich@proxmox.com> References: <20240402171629.536804-1-s.hanreich@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.338 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Subject: [pve-devel] [PATCH proxmox-firewall 10/37] config: firewall: add types for security groups X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Apr 2024 17:16:36 -0000 Co-authored-by: Wolfgang Bumiller Signed-off-by: Stefan Hanreich --- proxmox-ve-config/src/firewall/types/group.rs | 36 +++++++++++++++++++ proxmox-ve-config/src/firewall/types/mod.rs | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 proxmox-ve-config/src/firewall/types/group.rs diff --git a/proxmox-ve-config/src/firewall/types/group.rs b/proxmox-ve-config/src/firewall/types/group.rs new file mode 100644 index 0000000..7455268 --- /dev/null +++ b/proxmox-ve-config/src/firewall/types/group.rs @@ -0,0 +1,36 @@ +use anyhow::Error; + +use crate::firewall::types::Rule; + +#[derive(Debug)] +#[cfg_attr(test, derive(Eq, PartialEq))] +pub struct Group { + rules: Vec, + comment: Option, +} + +impl Group { + pub const fn new() -> Self { + Self { + rules: Vec::new(), + comment: None, + } + } + + pub fn rules(&self) -> &Vec { + &self.rules + } + + pub fn comment(&self) -> Option<&str> { + self.comment.as_deref() + } + + pub fn set_comment(&mut self, comment: Option) { + self.comment = comment; + } + + pub(crate) fn parse_entry(&mut self, line: &str) -> Result<(), Error> { + self.rules.push(line.parse()?); + Ok(()) + } +} diff --git a/proxmox-ve-config/src/firewall/types/mod.rs b/proxmox-ve-config/src/firewall/types/mod.rs index b4a6b12..8fd551e 100644 --- a/proxmox-ve-config/src/firewall/types/mod.rs +++ b/proxmox-ve-config/src/firewall/types/mod.rs @@ -1,5 +1,6 @@ pub mod address; pub mod alias; +pub mod group; pub mod ipset; pub mod log; pub mod port; @@ -8,5 +9,6 @@ pub mod rule_match; pub use address::Cidr; pub use alias::Alias; +pub use group::Group; pub use ipset::Ipset; pub use rule::Rule; -- 2.39.2