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 CE89F1FF17E for ; Thu, 30 Oct 2025 15:34:12 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5071F24525; Thu, 30 Oct 2025 15:34:47 +0100 (CET) From: Hannes Laimer To: pdm-devel@lists.proxmox.com Date: Thu, 30 Oct 2025 15:34:00 +0100 Message-ID: <20251030143406.193744-8-h.laimer@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251030143406.193744-1-h.laimer@proxmox.com> References: <20251030143406.193744-1-h.laimer@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1761834836045 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.042 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 RCVD_IN_MSPIKE_H2 0.001 Average reputation (+2) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pdm-devel] [PATCH proxmox-yew-comp 2/4] firewall: add FirewallContext X-BeenThere: pdm-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Datacenter Manager development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Datacenter Manager development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pdm-devel-bounces@lists.proxmox.com Sender: "pdm-devel" Both the options edit form and the rules table share the same layout for multiple endpoints/entities. This unifies that so we can use the same components by just initialising this context depending on where we get our data from or have to send it to. Signed-off-by: Hannes Laimer --- src/firewall/context.rs | 142 ++++++++++++++++++++++++++++++++++++++++ src/firewall/mod.rs | 2 + src/lib.rs | 3 + 3 files changed, 147 insertions(+) create mode 100644 src/firewall/context.rs create mode 100644 src/firewall/mod.rs diff --git a/src/firewall/context.rs b/src/firewall/context.rs new file mode 100644 index 0000000..6495fa3 --- /dev/null +++ b/src/firewall/context.rs @@ -0,0 +1,142 @@ +use crate::percent_encoding::percent_encode_component; +use pwt::prelude::*; + +/// Context defining the scope of firewall configuration (Cluster, Node, or Guest level) +#[derive(Clone, PartialEq)] +pub enum FirewallContext { + Cluster { + remote: AttrValue, + }, + Node { + remote: AttrValue, + node: AttrValue, + }, + Guest { + remote: AttrValue, + node: AttrValue, + vmid: u64, + vmtype: AttrValue, + }, +} + +impl FirewallContext { + pub fn cluster(remote: impl Into) -> Self { + Self::Cluster { + remote: remote.into(), + } + } + + pub fn node(remote: impl Into, node: impl Into) -> Self { + Self::Node { + remote: remote.into(), + node: node.into(), + } + } + + pub fn guest( + remote: impl Into, + node: impl Into, + vmid: u64, + vmtype: impl Into, + ) -> Self { + Self::Guest { + remote: remote.into(), + node: node.into(), + vmid, + vmtype: vmtype.into(), + } + } + + pub fn rules_url(&self) -> String { + match self { + Self::Cluster { remote } => { + format!( + "/pve/remotes/{}/firewall/rules", + percent_encode_component(remote) + ) + } + Self::Node { remote, node } => { + format!( + "/pve/remotes/{}/nodes/{}/firewall/rules", + percent_encode_component(remote), + percent_encode_component(node) + ) + } + Self::Guest { + remote, + node, + vmid, + vmtype, + } => { + let mut url = format!( + "/pve/remotes/{}/{}/{}/firewall/rules", + percent_encode_component(remote), + percent_encode_component(vmtype), + vmid + ); + if !node.is_empty() { + url = format!("{}?node={}", url, percent_encode_component(node)); + } + url + } + } + } + + pub fn options_url(&self) -> String { + match self { + Self::Cluster { remote } => { + format!( + "/pve/remotes/{}/firewall/options", + percent_encode_component(remote) + ) + } + Self::Node { remote, node } => { + format!( + "/pve/remotes/{}/nodes/{}/firewall/options", + percent_encode_component(remote), + percent_encode_component(node) + ) + } + Self::Guest { + remote, + node, + vmid, + vmtype, + } => { + let mut url = format!( + "/pve/remotes/{}/{}/{}/firewall/options", + percent_encode_component(remote), + percent_encode_component(vmtype), + vmid + ); + if !node.is_empty() { + url = format!("{}?node={}", url, percent_encode_component(node)); + } + url + } + } + } + + pub fn title(&self, prefix: &str) -> String { + match self { + Self::Cluster { remote } => { + if !remote.is_empty() { + format!("{}: {}", prefix, remote) + } else { + prefix.to_string() + } + } + Self::Node { remote, node } => { + format!("{}: {}/{}", prefix, remote, node) + } + Self::Guest { + remote, + vmtype, + vmid, + .. + } => { + format!("{}: {}/{} {}", prefix, remote, vmtype.to_uppercase(), vmid) + } + } + } +} diff --git a/src/firewall/mod.rs b/src/firewall/mod.rs new file mode 100644 index 0000000..49dcf23 --- /dev/null +++ b/src/firewall/mod.rs @@ -0,0 +1,2 @@ +mod context; +pub use context::FirewallContext; diff --git a/src/lib.rs b/src/lib.rs index 3a9e32b..e2e2721 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -129,6 +129,9 @@ mod rrd_timeframe_selector; #[cfg(feature = "rrd")] pub use rrd_timeframe_selector::{RRDTimeframe, RRDTimeframeSelector}; +mod firewall; +pub use firewall::FirewallContext; + mod running_tasks; pub use running_tasks::{ProxmoxRunningTasks, RunningTasks}; -- 2.47.3 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel