From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 25C2791E08 for ; Mon, 27 Mar 2023 17:25:42 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0996EDD49 for ; Mon, 27 Mar 2023 17:25:42 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 27 Mar 2023 17:25:41 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 39D3E46FD3 for ; Mon, 27 Mar 2023 17:19:23 +0200 (CEST) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Mon, 27 Mar 2023 17:18:47 +0200 Message-Id: <20230327151857.495565-9-l.wagner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230327151857.495565-1-l.wagner@proxmox.com> References: <20230327151857.495565-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.166 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: [pve-devel] [PATCH proxmox-perl-rs 08/18] add basic bindings for the proxmox_notification crate 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: , X-List-Received-Date: Mon, 27 Mar 2023 15:25:42 -0000 Signed-off-by: Lukas Wagner --- Notes: notifications.rs should be moved to common/src at some point. Currently it resides in pve-rs/src, since rust-analyzer breaks for me for all code in common/src. Cargo.toml | 2 + common/pkg/Makefile | 1 + pve-rs/Cargo.toml | 1 + pve-rs/src/lib.rs | 1 + pve-rs/src/notification.rs | 128 +++++++++++++++++++++++++++++++++++++ 5 files changed, 133 insertions(+) create mode 100644 pve-rs/src/notification.rs diff --git a/Cargo.toml b/Cargo.toml index 94e29d5..fc0f7c1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,6 +25,7 @@ perlmod = { version = "0.13", features = [ "exporter" ] } proxmox-acme-rs = { version = "0.4", features = ["client"] } proxmox-apt = "0.9" proxmox-http = { version = "0.8", features = ["client-sync", "client-trait"] } +proxmox-notification = "0.1" proxmox-openid = "0.9.8" proxmox-resource-scheduling = "0.2.1" proxmox-subscription = "0.3" @@ -37,3 +38,4 @@ proxmox-time = "1.1.3" #proxmox-tfa = { path = "../proxmox/proxmox-tfa" } #proxmox-time = { path = "../proxmox/proxmox-time" } #proxmox-uuid = { path = "../proxmox/proxmox-uuid" } +#proxmox-notification = { path = "../proxmox/proxmox-notification" } diff --git a/common/pkg/Makefile b/common/pkg/Makefile index bf22a7b..658d336 100644 --- a/common/pkg/Makefile +++ b/common/pkg/Makefile @@ -17,6 +17,7 @@ Proxmox/RS/CalendarEvent.pm: ../scripts/genpackage.pl perl ../scripts/genpackage.pl Common \ Proxmox::RS::APT::Repositories \ Proxmox::RS::CalendarEvent \ + Proxmox::RS::Notification \ Proxmox::RS::Subscription all: Proxmox/RS/CalendarEvent.pm diff --git a/pve-rs/Cargo.toml b/pve-rs/Cargo.toml index 0108eb2..9eafc25 100644 --- a/pve-rs/Cargo.toml +++ b/pve-rs/Cargo.toml @@ -33,6 +33,7 @@ perlmod.workspace = true proxmox-apt.workspace = true proxmox-http.workspace = true +proxmox-notification.workspace = true proxmox-openid.workspace = true proxmox-resource-scheduling.workspace = true proxmox-subscription.workspace = true diff --git a/pve-rs/src/lib.rs b/pve-rs/src/lib.rs index af3076e..7126e25 100644 --- a/pve-rs/src/lib.rs +++ b/pve-rs/src/lib.rs @@ -4,6 +4,7 @@ pub mod common; pub mod apt; +pub mod notification; pub mod openid; pub mod resource_scheduling; pub mod tfa; diff --git a/pve-rs/src/notification.rs b/pve-rs/src/notification.rs new file mode 100644 index 0000000..ab325a8 --- /dev/null +++ b/pve-rs/src/notification.rs @@ -0,0 +1,128 @@ +#[perlmod::package(name = "Proxmox::RS::Notification")] +mod export { + use anyhow::{bail, Error}; + use perlmod::Value; + use std::sync::Mutex; + + use std::collections::HashMap; + + use proxmox_notification::{ + filter::FilterModeOperator, methods, Config, Notification, Severity, + }; + + pub struct NotificationConfig { + config: Mutex, + } + + perlmod::declare_magic!(Box : &NotificationConfig as "Proxmox::RS::Notification"); + + /// Support `dclone` so this can be put into the `ccache` of `PVE::Cluster`. + #[export(name = "STORABLE_freeze", raw_return)] + fn storable_freeze( + #[try_from_ref] this: &NotificationConfig, + cloning: bool, + ) -> Result { + if !cloning { + bail!("freezing Notification config not supported!"); + } + + let mut cloned = Box::new(NotificationConfig { + config: Mutex::new(this.config.lock().unwrap().clone()), + }); + let value = Value::new_pointer::(&mut *cloned); + let _perl = Box::leak(cloned); + Ok(value) + } + + /// Instead of `thaw` we implement `attach` for `dclone`. + #[export(name = "STORABLE_attach", raw_return)] + fn storable_attach( + #[raw] class: Value, + cloning: bool, + #[raw] serialized: Value, + ) -> Result { + if !cloning { + bail!("STORABLE_attach called with cloning=false"); + } + let data = unsafe { Box::from_raw(serialized.pv_raw::()?) }; + Ok(perlmod::instantiate_magic!(&class, MAGIC => data)) + } + + #[export(raw_return)] + fn new(#[raw] class: Value, raw_config: &str) -> Result { + Ok(perlmod::instantiate_magic!(&class, MAGIC => Box::new( + NotificationConfig { + config: Mutex::new(Config::new(raw_config)?) + } + ))) + } + + #[export] + fn write(#[try_from_ref] this: &NotificationConfig) -> Result { + this.config.lock().unwrap().write() + } + + #[export] + fn send( + #[try_from_ref] this: &NotificationConfig, + severity: Severity, + title: &str, + message: &str, + properties: Option>, + ) -> Result<(), Error> { + let config = this.config.lock().unwrap(); + + let notification_bus = config.instantiate()?; + + let notification = Notification { + title: title.into(), + body: message.into(), + severity, + properties: properties.unwrap_or_default(), + }; + + notification_bus.send(¬ification)?; + + Ok(()) + } + + #[export] + fn add_sendmail_endpoint( + #[try_from_ref] this: &NotificationConfig, + name: &str, + recipient: Vec, + from_address: Option, + author: Option, + filter: Option, + ) -> Result<(), Error> { + let mut config = this.config.lock().unwrap(); + methods::add_sendmail_endpoint(&mut config, name, recipient, from_address, author, filter)?; + + Ok(()) + } + + #[export] + fn add_filter( + #[try_from_ref] this: &NotificationConfig, + name: &str, + min_severity: Option, + sub_filter: Option>, + mode: Option, + match_properties: Option>, + invert_match: Option, + ) -> Result<(), Error> { + let mut config = this.config.lock().unwrap(); + + methods::add_filter( + &mut config, + name, + min_severity, + sub_filter, + mode, + match_properties, + invert_match, + )?; + + Ok(()) + } +} -- 2.30.2