From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id A81E31FF385 for ; Wed, 26 Jun 2024 14:16:09 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1C3151F837; Wed, 26 Jun 2024 14:16:03 +0200 (CEST) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Date: Wed, 26 Jun 2024 14:15:40 +0200 Message-Id: <20240626121550.292290-12-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240626121550.292290-1-s.hanreich@proxmox.com> References: <20240626121550.292290-1-s.hanreich@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.261 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 11/21] 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 `+dc/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 | 54 ++++++++++++++++++- 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/proxmox-ve-config/src/firewall/types/address.rs b/proxmox-ve-config/src/firewall/types/address.rs index 3ad1a7a..cd1d649 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 682bbe7..febbc0b 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,54 @@ 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<'a>( + &self, + filter: impl Into>>, + ) -> impl Iterator + '_ { + let filter = filter.into(); + + self.entries + .iter() + .flat_map(|(_, entries)| entries.iter()) + .filter_map(|entry| { + if let IpamData::Vm(data) = &entry.data() { + if filter + .map(|list| list.is_allowed(&data.vmid)) + .unwrap_or(true) + { + return Some(data); + } + } + + None + }) + .fold(HashMap::::new(), |mut acc, entry| { + match acc.get_mut(&entry.vmid) { + Some(ipset) => { + ipset.push(IpsetEntry::from(entry.ip)); + } + None => { + let ipset_name = format!("guest-ipam-{}", entry.vmid); + let mut ipset = Ipset::from_parts(IpsetScope::Datacenter, ipset_name); + ipset.push(IpsetEntry::from(entry.ip)); + acc.insert(entry.vmid, ipset); + } + }; + + acc + }) + .into_values() + } +} + impl TryFrom for Ipam { type Error = IpamError; -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel