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 017DFF0C2 for ; Thu, 20 Jul 2023 16:33:43 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A2F1514D8A for ; Thu, 20 Jul 2023 16:33:30 +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 ; Thu, 20 Jul 2023 16:33:28 +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 0BC5B41FBD for ; Thu, 20 Jul 2023 16:33:08 +0200 (CEST) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Thu, 20 Jul 2023 16:31:53 +0200 Message-Id: <20230720143236.652292-27-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230720143236.652292-1-l.wagner@proxmox.com> References: <20230720143236.652292-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.071 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v4 proxmox-perl-rs 26/69] add PVE::RS::Notify module 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: Thu, 20 Jul 2023 14:33:43 -0000 Signed-off-by: Lukas Wagner --- Notes: Changes since v3: - parse_config now takes a &[u8] instead of a &str in order to avoid encoding issues pve-rs/Cargo.toml | 1 + pve-rs/Makefile | 1 + pve-rs/src/lib.rs | 1 + pve-rs/src/notify.rs | 74 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 77 insertions(+) create mode 100644 pve-rs/src/notify.rs diff --git a/pve-rs/Cargo.toml b/pve-rs/Cargo.toml index 3076a13..b28c118 100644 --- a/pve-rs/Cargo.toml +++ b/pve-rs/Cargo.toml @@ -34,6 +34,7 @@ perlmod = { version = "0.13", features = [ "exporter" ] } proxmox-apt = "0.10" proxmox-http = { version = "0.9", features = ["client-sync", "client-trait"] } +proxmox-notify = "0.1" proxmox-openid = "0.10" proxmox-resource-scheduling = "0.3.0" proxmox-subscription = "0.4" diff --git a/pve-rs/Makefile b/pve-rs/Makefile index de35c69..9d737c0 100644 --- a/pve-rs/Makefile +++ b/pve-rs/Makefile @@ -27,6 +27,7 @@ PERLMOD_GENPACKAGE := /usr/lib/perlmod/genpackage.pl \ PERLMOD_PACKAGES := \ PVE::RS::APT::Repositories \ + PVE::RS::Notify \ PVE::RS::OpenId \ PVE::RS::ResourceScheduling::Static \ PVE::RS::TFA diff --git a/pve-rs/src/lib.rs b/pve-rs/src/lib.rs index eb6ae02..0d63c28 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 notify; pub mod openid; pub mod resource_scheduling; pub mod tfa; diff --git a/pve-rs/src/notify.rs b/pve-rs/src/notify.rs new file mode 100644 index 0000000..6ea9b78 --- /dev/null +++ b/pve-rs/src/notify.rs @@ -0,0 +1,74 @@ +#[perlmod::package(name = "PVE::RS::Notify")] +mod export { + use anyhow::{bail, Error}; + use perlmod::Value; + + use std::sync::Mutex; + + use proxmox_notify::Config; + + pub struct NotificationConfig { + config: Mutex, + } + + perlmod::declare_magic!(Box : &NotificationConfig as "PVE::RS::Notify"); + + /// 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 parse_config( + #[raw] class: Value, + raw_config: &[u8], + raw_private_config: &[u8], + ) -> Result { + let raw_config = std::str::from_utf8(raw_config)?; + let raw_private_config = std::str::from_utf8(raw_private_config)?; + + Ok(perlmod::instantiate_magic!(&class, MAGIC => Box::new( + NotificationConfig { + config: Mutex::new(Config::new(raw_config, raw_private_config)?) + } + ))) + } + + #[export] + fn write_config(#[try_from_ref] this: &NotificationConfig) -> Result<(String, String), Error> { + Ok(this.config.lock().unwrap().write()?) + } + + #[export] + fn digest(#[try_from_ref] this: &NotificationConfig) -> String { + let config = this.config.lock().unwrap(); + hex::encode(config.digest()) + } +} -- 2.39.2