From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 7CDD71FF168 for ; Tue, 12 Nov 2024 13:27:00 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A57CE1F421; Tue, 12 Nov 2024 13:26:14 +0100 (CET) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Date: Tue, 12 Nov 2024 13:25:50 +0100 Message-Id: <20241112122602.88598-13-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241112122602.88598-1-s.hanreich@proxmox.com> References: <20241112122602.88598-1-s.hanreich@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.251 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-ve-rs v3 12/24] sdn: ipam: add method for generating ipsets 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" For every guest that has at least one entry in the IPAM we generate an ipset with the name `+sdn/guest-ipam-{vmid}`. The ipset contains all IPs from all zones for a guest with {vmid}. Signed-off-by: Stefan Hanreich --- .../src/firewall/types/address.rs | 9 +++++ proxmox-ve-config/src/sdn/ipam.rs | 40 ++++++++++++++++++- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/proxmox-ve-config/src/firewall/types/address.rs b/proxmox-ve-config/src/firewall/types/address.rs index 3777dc3..9b73d3d 100644 --- a/proxmox-ve-config/src/firewall/types/address.rs +++ b/proxmox-ve-config/src/firewall/types/address.rs @@ -108,6 +108,15 @@ impl From for Cidr { } } +impl From for Cidr { + fn from(value: IpAddr) -> Self { + match value { + IpAddr::V4(addr) => Ipv4Cidr::from(addr).into(), + IpAddr::V6(addr) => Ipv6Cidr::from(addr).into(), + } + } +} + const IPV4_LENGTH: u8 = 32; #[derive(Clone, Copy, Debug, PartialOrd, Ord, PartialEq, Eq, Hash)] diff --git a/proxmox-ve-config/src/sdn/ipam.rs b/proxmox-ve-config/src/sdn/ipam.rs index 95e3ba7..598b835 100644 --- a/proxmox-ve-config/src/sdn/ipam.rs +++ b/proxmox-ve-config/src/sdn/ipam.rs @@ -8,7 +8,11 @@ use std::{ use serde::Deserialize; use crate::{ - firewall::types::Cidr, + common::Allowlist, + firewall::types::{ + ipset::{IpsetEntry, IpsetScope}, + Cidr, Ipset, + }, guest::{types::Vmid, vm::MacAddress}, sdn::{SdnNameError, SubnetName, ZoneName}, }; @@ -309,6 +313,40 @@ impl Ipam { } } +impl Ipam { + /// Generates an [`Ipset`] for all guests with at least one entry in the IPAM. + /// + /// # Arguments + /// * `filter` - A [`Allowlist`] for which IPsets should get returned + /// + /// It contains all IPs in all VNets, that a guest has stored in IPAM. + /// Ipset name is of the form `guest-ipam-` + pub fn ipsets(&self, filter: Option<&Allowlist>) -> impl Iterator + '_ { + self.entries + .iter() + .flat_map(|(_, entries)| entries.iter()) + .filter_map(|entry| { + if let IpamData::Vm(data) = &entry.data() { + if filter.is_none_or(|list| list.is_allowed(&data.vmid)) { + return Some(data); + } + } + + None + }) + .fold(HashMap::::new(), |mut acc, entry| { + acc.entry(entry.vmid) + .or_insert_with(|| { + Ipset::from_parts(IpsetScope::Sdn, format!("guest-ipam-{}", entry.vmid)) + }) + .push(IpsetEntry::from(entry.ip)); + + acc + }) + .into_values() + } +} + impl TryFrom for Ipam { type Error = IpamError; -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel