From: Hannes Laimer <h.laimer@proxmox.com>
To: pdm-devel@lists.proxmox.com
Subject: [pdm-devel] [PATCH proxmox-yew-comp v2 2/4] firewall: add FirewallContext
Date: Wed, 5 Nov 2025 17:35:40 +0100 [thread overview]
Message-ID: <20251105163546.450094-7-h.laimer@proxmox.com> (raw)
In-Reply-To: <20251105163546.450094-1-h.laimer@proxmox.com>
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 <h.laimer@proxmox.com>
---
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<AttrValue>) -> Self {
+ Self::Cluster {
+ remote: remote.into(),
+ }
+ }
+
+ pub fn node(remote: impl Into<AttrValue>, node: impl Into<AttrValue>) -> Self {
+ Self::Node {
+ remote: remote.into(),
+ node: node.into(),
+ }
+ }
+
+ pub fn guest(
+ remote: impl Into<AttrValue>,
+ node: impl Into<AttrValue>,
+ vmid: u64,
+ vmtype: impl Into<AttrValue>,
+ ) -> 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
next prev parent reply other threads:[~2025-11-05 16:35 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-05 16:35 [pdm-devel] [PATCH proxmox{, -yew-comp, -datacenter-manager} v2 00/12] add basic integration of PVE firewall Hannes Laimer
2025-11-05 16:35 ` [pdm-devel] [PATCH proxmox v2 1/4] pve-api-types: update pve-api.json Hannes Laimer
2025-11-05 16:35 ` [pdm-devel] [PATCH proxmox v2 2/4] pve-api-types: add get/update firewall options endpoints Hannes Laimer
2025-11-05 16:35 ` [pdm-devel] [PATCH proxmox v2 3/4] pve-api-types: add list firewall rules endpoints Hannes Laimer
2025-11-05 16:35 ` [pdm-devel] [PATCH proxmox v2 4/4] pve-api-types: regenerate Hannes Laimer
2025-11-05 16:35 ` [pdm-devel] [PATCH proxmox-yew-comp v2 1/4] form: add helpers for extractig data out of schemas Hannes Laimer
2025-11-05 16:35 ` Hannes Laimer [this message]
2025-11-05 16:35 ` [pdm-devel] [PATCH proxmox-yew-comp v2 3/4] firewall: add options edit form Hannes Laimer
2025-11-05 16:35 ` [pdm-devel] [PATCH proxmox-yew-comp v2 4/4] firewall: add rules table Hannes Laimer
2025-11-05 16:35 ` [pdm-devel] [PATCH proxmox-datacenter-manager v2 1/4] pdm-api-types: add firewall status types Hannes Laimer
2025-11-05 16:35 ` [pdm-devel] [PATCH proxmox-datacenter-manager v2 2/4] api: firewall: add option, rules and status endpoints Hannes Laimer
2025-11-05 16:35 ` [pdm-devel] [PATCH proxmox-datacenter-manager v2 3/4] pdm-client: add api methods for firewall options, " Hannes Laimer
2025-11-05 16:35 ` [pdm-devel] [PATCH proxmox-datacenter-manager v2 4/4] ui: add firewall status tree Hannes Laimer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251105163546.450094-7-h.laimer@proxmox.com \
--to=h.laimer@proxmox.com \
--cc=pdm-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox