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 A685A90A01 for ; Tue, 2 Apr 2024 19:16:45 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B609BA809 for ; Tue, 2 Apr 2024 19:16:41 +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:39 +0200 (CEST) Received: by lana.proxmox.com (Postfix, from userid 10043) id 938AE2C379F; 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:16 +0200 Message-Id: <20240402171629.536804-25-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.326 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 24/37] nftables: types: add conversion traits 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:45 -0000 Some parts of the firewall config map directly to nftables objects, so we introduce conversion traits for convenient conversion into the respective nftables objects / types. They are guarded behind a feature, so the nftables crate can be used standalone without depending on the proxmox-ve-config crate. Co-authored-by: Wolfgang Bumiller Signed-off-by: Stefan Hanreich --- proxmox-nftables/src/types.rs | 54 +++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/proxmox-nftables/src/types.rs b/proxmox-nftables/src/types.rs index f9dc9b6..10e569c 100644 --- a/proxmox-nftables/src/types.rs +++ b/proxmox-nftables/src/types.rs @@ -7,6 +7,11 @@ use crate::{Expression, Statement}; use serde::{Deserialize, Serialize}; +#[cfg(feature = "config-ext")] +use proxmox_ve_config::firewall::types::address::Family; + +#[cfg(feature = "config-ext")] +use proxmox_ve_config::firewall::types::ipset::IpsetName; #[derive(Clone, Debug, Eq, PartialEq, Deserialize, Serialize)] pub struct Handle(i32); @@ -31,6 +36,15 @@ impl TableFamily { _ => vec![IpFamily::Ip, IpFamily::Ip6], } } + + #[cfg(feature = "config-ext")] + pub fn families(&self) -> Vec { + match self { + TableFamily::Ip => vec![Family::V4], + TableFamily::Ip6 => vec![Family::V6], + _ => vec![Family::V4, Family::V6], + } + } } #[derive(Clone, Copy, Debug, Eq, PartialEq, Deserialize, Serialize)] @@ -155,6 +169,21 @@ pub enum RateTimescale { Day, } +#[cfg(feature = "config-ext")] +use proxmox_ve_config::firewall::types::log::LogRateLimitTimescale; + +#[cfg(feature = "config-ext")] +impl From for RateTimescale { + fn from(value: LogRateLimitTimescale) -> Self { + match value { + LogRateLimitTimescale::Second => RateTimescale::Second, + LogRateLimitTimescale::Minute => RateTimescale::Minute, + LogRateLimitTimescale::Hour => RateTimescale::Hour, + LogRateLimitTimescale::Day => RateTimescale::Day, + } + } +} + #[derive(Clone, Debug, Deserialize, Serialize)] pub struct TableName { family: TableFamily, @@ -584,6 +613,21 @@ impl SetName { name: name.into(), } } + + #[cfg(feature = "config-ext")] + pub fn ipset_name(family: Family, name: &IpsetName, nomatch: bool) -> String { + let prefix = match family { + Family::V4 => "v4", + Family::V6 => "v6", + }; + + let suffix = match nomatch { + true => "-nomatch", + false => "", + }; + + format!("{prefix}-{name}{suffix}") + } } #[derive(Clone, Debug, Deserialize, Serialize)] @@ -786,6 +830,16 @@ pub enum L3Protocol { Ip6, } +#[cfg(feature = "config-ext")] +impl From for L3Protocol { + fn from(value: Family) -> Self { + match value { + Family::V4 => L3Protocol::Ip, + Family::V6 => L3Protocol::Ip6, + } + } +} + #[derive(Clone, Debug, Deserialize, Serialize)] #[serde(rename_all = "lowercase")] pub enum CtHelperProtocol { -- 2.39.2