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 DDA8A1FF17A for ; Tue, 28 Oct 2025 17:36:06 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 84D8C1FF7E; Tue, 28 Oct 2025 17:36:39 +0100 (CET) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Tue, 28 Oct 2025 17:36:17 +0100 Message-ID: <20251028163628.79739-3-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251028163628.79739-1-s.ivanov@proxmox.com> References: <20251028163628.79739-1-s.ivanov@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1761669383233 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.072 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pmg-devel] [RFC pmg-yew-quarantine-gui 2/2] main view: handle optional quarantine action in spamreport links X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pmg-devel-bounces@lists.proxmox.com Sender: "pmg-devel" Our html verbose spamreports have included links for each possible action for each mail (delete, deliver, blocklist, welcomelist) in the action GET parameter. Currently the yew-based mobile view does not handle those actions. This patch adds the functionality by issueing a POST request in the view function if the a cselect (id) and action parameter are present. I tried adding the same call to the update function, but it seems the update function does not get the query-string after a login, or was not called in my tests. Big thanks to Dominik for walking me through our yew framework and providing other valuable suggestions! Reported in our community forum: https://forum.proxmox.com/threads/.174685/ Signed-off-by: Stoiko Ivanov --- src/main.rs | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index 8cd8a6b..366cdc7 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,7 @@ mod spam_list; +use std::str::FromStr; + pub use spam_list::SpamList; mod page_mail_view; @@ -14,7 +16,7 @@ pub use page_not_found::PageNotFound; mod page_login; pub use page_login::PageLogin; -use anyhow::Error; +use anyhow::{format_err, Error}; use gloo_utils::{document, format::JsValueSerdeExt}; use serde::Deserialize; use serde_json::{json, Value}; @@ -114,6 +116,15 @@ impl Component for PmgQuarantineApp { let logged_in = self.login_info.is_some(); MaterialApp::new(move |path: &str| { if logged_in { + let document = document(); + let location = document.location().unwrap(); + let search = location.search().unwrap(); + let param = web_sys::UrlSearchParams::new_with_str(&search).unwrap(); + if let (Some(id), Some(action)) = (param.get("cselect"), param.get("action")) { + wasm_bindgen_futures::spawn_local(async move { + _ = mail_action(&id, MailAction::from_str(&action).unwrap()).await + }); + } switch(path) } else { vec![PageLogin::new().on_login(link.callback(Msg::Login)).into()] @@ -187,6 +198,21 @@ impl std::fmt::Display for MailAction { } } +impl std::str::FromStr for MailAction { + type Err = anyhow::Error; + fn from_str(s: &str) -> Result { + match s { + "deliver" => Ok(MailAction::Deliver), + "delete" => Ok(MailAction::Delete), + "welcomelist" => Ok(MailAction::Welcomelist), + "whitelist" => Ok(MailAction::Welcomelist), + "blocklist" => Ok(MailAction::Blocklist), + "blacklist" => Ok(MailAction::Blocklist), + _ => Err(format_err!("unknown quarantine action")), + } + } +} + pub(crate) async fn mail_action(id: &str, action: MailAction) -> Result { let param = json!({ "action": action.to_string(), -- 2.47.3 _______________________________________________ pmg-devel mailing list pmg-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel