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 995621FF17E for ; Thu, 30 Oct 2025 15:33:48 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 22586242CF; Thu, 30 Oct 2025 15:34:18 +0100 (CET) From: Hannes Laimer To: pdm-devel@lists.proxmox.com Date: Thu, 30 Oct 2025 15:34:02 +0100 Message-ID: <20251030143406.193744-10-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: 1761834836206 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.008 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 PROLO_LEO1 0.1 Meta Catches all Leo drug variations so far 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 4/4] firewall: add rules table 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" Displays the list of firewall rules, this is read-only currently, so it doesn't include any buttons for editing or adding rules. Signed-off-by: Hannes Laimer --- src/firewall/mod.rs | 3 + src/firewall/rules.rs | 217 ++++++++++++++++++++++++++++++++++++++++++ src/lib.rs | 2 +- 3 files changed, 221 insertions(+), 1 deletion(-) create mode 100644 src/firewall/rules.rs diff --git a/src/firewall/mod.rs b/src/firewall/mod.rs index 379b958..8cc4977 100644 --- a/src/firewall/mod.rs +++ b/src/firewall/mod.rs @@ -4,5 +4,8 @@ pub use context::FirewallContext; mod options_edit; pub use options_edit::EditFirewallOptions; +mod rules; +pub use rules::FirewallRules; + mod log_ratelimit_field; pub use log_ratelimit_field::LogRatelimitField; diff --git a/src/firewall/rules.rs b/src/firewall/rules.rs new file mode 100644 index 0000000..9a96379 --- /dev/null +++ b/src/firewall/rules.rs @@ -0,0 +1,217 @@ +use std::rc::Rc; + +use yew::html::{IntoEventCallback, IntoPropValue}; +use yew::virtual_dom::{Key, VComp, VNode}; + +use pwt::prelude::*; +use pwt::state::{Loader, LoaderState, SharedStateObserver, Store}; +use pwt::widget::data_table::{DataTable, DataTableColumn, DataTableHeader}; +use pwt::widget::Container; +use pwt_macros::builder; + +use super::context::FirewallContext; + +#[derive(Clone, PartialEq, Properties)] +#[builder] +pub struct FirewallRules { + #[builder(IntoPropValue, into_prop_value)] + pub context: FirewallContext, + + #[builder_cb(IntoEventCallback, into_event_callback, ())] + #[prop_or_default] + pub on_close: Option>, +} + +impl FirewallRules { + pub fn cluster(remote: impl Into) -> Self { + yew::props!(Self { + context: FirewallContext::cluster(remote), + }) + } + + pub fn node(remote: impl Into, node: impl Into) -> Self { + yew::props!(Self { + context: FirewallContext::node(remote, node), + }) + } + + pub fn guest( + remote: impl Into, + node: impl Into, + vmid: u64, + vmtype: impl Into, + ) -> Self { + yew::props!(Self { + context: FirewallContext::guest(remote, node, vmid, vmtype), + }) + } +} + +pub enum FirewallMsg { + DataChange, +} + +#[doc(hidden)] +pub struct ProxmoxFirewallRules { + store: Store, + loader: Loader>, + _listener: SharedStateObserver>>, +} + +impl ProxmoxFirewallRules { + fn update_data(&mut self) { + if let Some(Ok(data)) = &self.loader.read().data { + self.store.set_data((**data).clone()); + } + } + + fn columns() -> Rc>> { + Rc::new(vec![ + DataTableColumn::new(tr!("Enabled")) + .width("80px") + .render( + |rule: &pve_api_types::ListFirewallRules| match rule.enable { + Some(1) => html! {}, + Some(0) | None => html! {}, + _ => html! {"-"}, + }, + ) + .into(), + DataTableColumn::new(tr!("Type")) + .width("80px") + .render(|rule: &pve_api_types::ListFirewallRules| html! {&rule.ty}) + .into(), + DataTableColumn::new(tr!("Action")) + .width("100px") + .render(|rule: &pve_api_types::ListFirewallRules| html! {&rule.action}) + .into(), + DataTableColumn::new(tr!("Macro")) + .width("120px") + .render(|rule: &pve_api_types::ListFirewallRules| { + rule.r#macro.as_deref().unwrap_or("-").into() + }) + .into(), + DataTableColumn::new(tr!("Interface")) + .width("100px") + .render(|rule: &pve_api_types::ListFirewallRules| { + rule.iface.as_deref().unwrap_or("-").into() + }) + .into(), + DataTableColumn::new(tr!("Protocol")) + .width("100px") + .render(|rule: &pve_api_types::ListFirewallRules| { + rule.proto.as_deref().unwrap_or("-").into() + }) + .into(), + DataTableColumn::new(tr!("Source")) + .flex(1) + .render(|rule: &pve_api_types::ListFirewallRules| { + rule.source.as_deref().unwrap_or("-").into() + }) + .into(), + DataTableColumn::new(tr!("S.Port")) + .width("80px") + .render(|rule: &pve_api_types::ListFirewallRules| { + rule.sport.as_deref().unwrap_or("-").into() + }) + .into(), + DataTableColumn::new(tr!("Destination")) + .flex(1) + .render(|rule: &pve_api_types::ListFirewallRules| { + rule.dest.as_deref().unwrap_or("-").into() + }) + .into(), + DataTableColumn::new(tr!("D.Port")) + .width("80px") + .render(|rule: &pve_api_types::ListFirewallRules| { + rule.dport.as_deref().unwrap_or("-").into() + }) + .into(), + DataTableColumn::new(tr!("Log Level")) + .width("100px") + .render(|rule: &pve_api_types::ListFirewallRules| { + rule.log + .as_ref() + .map(|l| format!("{:?}", l)) + .unwrap_or("-".to_string()) + .into() + }) + .into(), + DataTableColumn::new(tr!("Comment")) + .flex(1) + .render(|rule: &pve_api_types::ListFirewallRules| { + rule.comment.as_deref().unwrap_or("-").into() + }) + .into(), + ]) + } +} + +impl Component for ProxmoxFirewallRules { + type Message = FirewallMsg; + type Properties = FirewallRules; + + fn create(ctx: &Context) -> Self { + let props = ctx.props(); + + let url: AttrValue = props.context.rules_url().into(); + + let store = Store::with_extract_key(|item: &pve_api_types::ListFirewallRules| { + Key::from(item.pos.to_string()) + }); + + let loader = Loader::new().loader({ + let url = url.clone(); + move || { + let url = url.clone(); + async move { crate::http_get(url.to_string(), None).await } + } + }); + + let _listener = loader.add_listener(ctx.link().callback(|_| FirewallMsg::DataChange)); + + loader.load(); + + let mut me = Self { + store, + loader, + _listener, + }; + + me.update_data(); + me + } + + fn update(&mut self, _ctx: &Context, msg: Self::Message) -> bool { + match msg { + FirewallMsg::DataChange => { + self.update_data(); + true + } + } + } + + fn view(&self, _ctx: &Context) -> Html { + self.loader.render(|_data| -> Html { + if self.store.data_len() == 0 { + Container::new() + .padding(2) + .with_child(tr!("No firewall rules configured")) + .into() + } else { + let columns = Self::columns(); + DataTable::new(columns, self.store.clone()) + .show_header(true) + .striped(true) + .into() + } + }) + } +} + +impl From for VNode { + fn from(val: FirewallRules) -> Self { + let comp = VComp::new::(Rc::new(val), None); + VNode::from(comp) + } +} diff --git a/src/lib.rs b/src/lib.rs index 852d65d..d7d8c7e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -130,7 +130,7 @@ mod rrd_timeframe_selector; pub use rrd_timeframe_selector::{RRDTimeframe, RRDTimeframeSelector}; mod firewall; -pub use firewall::{EditFirewallOptions, FirewallContext}; +pub use firewall::{EditFirewallOptions, FirewallContext, FirewallRules}; 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