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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id C80B4E46E for ; Tue, 18 Jul 2023 14:45:12 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A82E21AE48 for ; Tue, 18 Jul 2023 14:44: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 ; Tue, 18 Jul 2023 14:44:42 +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 D02D540015 for ; Tue, 18 Jul 2023 14:44:41 +0200 (CEST) Date: Tue, 18 Jul 2023 14:44:40 +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-9-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230717150051.710464-9-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. [gotify.rs, mod.rs] Subject: Re: [pve-devel] [PATCH v3 proxmox 08/66] notify: api: add API for gotify 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:45:12 -0000 On Mon, Jul 17, 2023 at 04:59:53PM +0200, Lukas Wagner wrote: > Signed-off-by: Lukas Wagner > --- > proxmox-notify/src/api/gotify.rs | 284 +++++++++++++++++++++++++++++++ > proxmox-notify/src/api/mod.rs | 6 + > 2 files changed, 290 insertions(+) > create mode 100644 proxmox-notify/src/api/gotify.rs > > diff --git a/proxmox-notify/src/api/gotify.rs b/proxmox-notify/src/api/gotify.rs > new file mode 100644 > index 00000000..fcc1aabf > --- /dev/null > +++ b/proxmox-notify/src/api/gotify.rs > @@ -0,0 +1,284 @@ > +use crate::api::ApiError; > +use crate::endpoints::gotify::{ > + DeleteableGotifyProperty, GotifyConfig, GotifyConfigUpdater, GotifyPrivateConfig, > + GotifyPrivateConfigUpdater, GOTIFY_TYPENAME, > +}; > +use crate::Config; > + > +/// Get a list of all gotify endpoints. > +/// > +/// The caller is responsible for any needed permission checks. > +/// Returns a list of all gotify endpoints or an `ApiError` if the config is erroneous. > +pub fn get_endpoints(config: &Config) -> Result, ApiError> { > + config > + .config > + .convert_to_typed_array(GOTIFY_TYPENAME) > + .map_err(|e| ApiError::internal_server_error("Could not fetch endpoints", Some(e.into()))) > +} > + > +/// Get gotify 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(GOTIFY_TYPENAME, name) > + .map_err(|_| ApiError::not_found(format!("endpoint '{name}' not found"), None)) > +} > + > +/// Add a new gotify endpoint. > +/// > +/// The caller is responsible for any needed permission checks. > +/// The caller also responsible for locking the configuration files. > +/// Returns an `ApiError` if an endpoint with the same name already exists, > +/// or if the endpoint could not be saved. > +pub fn add_endpoint( > + config: &mut Config, > + endpoint_config: &GotifyConfig, > + private_endpoint_config: &GotifyPrivateConfig, > +) -> Result<(), ApiError> { > + if endpoint_config.name != private_endpoint_config.name { > + // Programming error by the user of the crate, thus we panic > + panic!("name for endpoint config and private config must be identical"); > + } > + > + if super::endpoint_exists(config, &endpoint_config.name) { (*could* dedup the whole if into a helper in `super` so we don't need to copy-pasta the message to every new endpoint - we already have this twice now ;-) ) > + return Err(ApiError::bad_request( > + format!( > + "endpoint with name '{}' already exists!", > + endpoint_config.name > + ), > + None, > + )); > + } > + > + set_private_config_entry(config, private_endpoint_config)?; > + > + config > + .config > + .set_data(&endpoint_config.name, GOTIFY_TYPENAME, endpoint_config) > + .map_err(|e| { > + ApiError::internal_server_error( > + format!("could not save endpoint '{}'", endpoint_config.name), > + Some(e.into()), > + ) > + })?; > + > + Ok(()) > +} > + (...)