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 86879E3FA for ; Tue, 18 Jul 2023 14:36:22 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6F6961AC83 for ; Tue, 18 Jul 2023 14:36:22 +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 ; Tue, 18 Jul 2023 14:36:22 +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 B76A542BC1 for ; Tue, 18 Jul 2023 14:36:21 +0200 (CEST) Date: Tue, 18 Jul 2023 14:36:20 +0200 From: Wolfgang Bumiller To: Lukas Wagner Cc: pve-devel@lists.proxmox.com Message-ID: References: <20230717150051.710464-1-l.wagner@proxmox.com> <20230717150051.710464-7-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230717150051.710464-7-l.wagner@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.119 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [sendmail.rs, mod.rs] Subject: Re: [pve-devel] [PATCH v3 proxmox 06/66] notify: api: add API for sendmail endpoints 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: Tue, 18 Jul 2023 12:36:22 -0000 On Mon, Jul 17, 2023 at 04:59:51PM +0200, Lukas Wagner wrote: > Signed-off-by: Lukas Wagner > --- > proxmox-notify/src/api/mod.rs | 7 + > proxmox-notify/src/api/sendmail.rs | 254 +++++++++++++++++++++++++++++ > 2 files changed, 261 insertions(+) > create mode 100644 proxmox-notify/src/api/sendmail.rs > > diff --git a/proxmox-notify/src/api/mod.rs b/proxmox-notify/src/api/mod.rs > index db9ad1ca..4baae899 100644 > --- a/proxmox-notify/src/api/mod.rs > +++ b/proxmox-notify/src/api/mod.rs > @@ -5,6 +5,8 @@ use crate::Config; > use serde::Serialize; > > pub mod common; > +#[cfg(feature = "sendmail")] > +pub mod sendmail; > > #[derive(Debug, Serialize)] > pub struct ApiError { > @@ -83,6 +85,11 @@ fn verify_digest(config: &Config, digest: Option<&[u8]>) -> Result<(), ApiError> > fn endpoint_exists(config: &Config, name: &str) -> bool { > let mut exists = false; > > + #[cfg(feature = "sendmail")] > + { > + exists = exists || sendmail::get_endpoint(config, name).is_ok(); > + } > + > exists > } > > diff --git a/proxmox-notify/src/api/sendmail.rs b/proxmox-notify/src/api/sendmail.rs > new file mode 100644 > index 00000000..8eafe359 > --- /dev/null > +++ b/proxmox-notify/src/api/sendmail.rs > @@ -0,0 +1,254 @@ > +use crate::api::ApiError; > +use crate::endpoints::sendmail::{ > + DeleteableSendmailProperty, SendmailConfig, SendmailConfigUpdater, SENDMAIL_TYPENAME, > +}; > +use crate::Config; > + > +/// Get a list of all sendmail endpoints. > +/// > +/// The caller is responsible for any needed permission checks. > +/// Returns a list of all sendmail endpoints or an `ApiError` if the config is erroneous. > +pub fn get_endpoints(config: &Config) -> Result, ApiError> { > + config > + .config > + .convert_to_typed_array(SENDMAIL_TYPENAME) > + .map_err(|e| ApiError::internal_server_error("Could not fetch endpoints", Some(e.into()))) > +} > + > +/// Get sendmail endpoint with given `name`. > +/// > +/// The caller is responsible for any needed permission checks. > +/// Returns the endpoint or an `ApiError` if the endpoint was not found. > +pub fn get_endpoint(config: &Config, name: &str) -> Result { > + config > + .config > + .lookup(SENDMAIL_TYPENAME, name) > + .map_err(|_| ApiError::not_found(format!("endpoint '{name}' not found"), None)) ^ Technically `.lookup()` could have found the name but as a wrong type. It might make sense to not use `.lookup()` in this case. > +} > + (...)