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 B9541E3E8 for ; Tue, 18 Jul 2023 14:02:36 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9A8361A3D7 for ; Tue, 18 Jul 2023 14:02:06 +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:02:06 +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 C36144305A for ; Tue, 18 Jul 2023 14:02:05 +0200 (CEST) Date: Tue, 18 Jul 2023 14:02:04 +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-4-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230717150051.710464-4-l.wagner@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.120 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: Re: [pve-devel] [PATCH v3 proxmox 03/66] notify: preparation for the API 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:02:36 -0000 FYI: I'm not through the entire series yet, but I think it's fine for the *API* methods to use `anyhow::Error` instead. Also: I'd like to move this here to a separate crate to replace `proxmox_router::HttpError` (since the router one has no `source` support atm and we don't want to depend on the router here, since *this* crate also ends up in perl bindings), along with the `http_bail!` and `http_err!` macros. To make sure that we don't have any HTTP error types which might get past our server's automatic "delay on auth issues" mechanism. Specifically, the rest server code uses `downcast` on an `anyhow::Error` to check if it's a `HttpError` with status code `UNAUTHORIZED` and then introduces a delay. On Mon, Jul 17, 2023 at 04:59:48PM +0200, Lukas Wagner wrote: > Signed-off-by: Lukas Wagner > --- > proxmox-notify/src/api/mod.rs | 94 +++++++++++++++++++++++++++++++++++ > proxmox-notify/src/lib.rs | 1 + > 2 files changed, 95 insertions(+) > create mode 100644 proxmox-notify/src/api/mod.rs > > diff --git a/proxmox-notify/src/api/mod.rs b/proxmox-notify/src/api/mod.rs > new file mode 100644 > index 00000000..be596b93 > --- /dev/null > +++ b/proxmox-notify/src/api/mod.rs > @@ -0,0 +1,94 @@ > +use std::error::Error as StdError; > +use std::fmt::Display; > + > +use crate::Config; > +use serde::Serialize; > + > +#[derive(Debug, Serialize)] > +pub struct ApiError { > + /// HTTP Error code > + code: u16, > + /// Error message > + message: String, > + #[serde(skip_serializing)] > + /// The underlying cause of the error > + source: Option>, > +} > + > +impl ApiError { > + fn new>( > + message: S, > + code: u16, > + source: Option>, > + ) -> Self { > + Self { > + message: message.as_ref().into(), > + code, > + source, > + } > + } > + > + pub fn bad_request>( > + message: S, > + source: Option>, > + ) -> Self { > + Self::new(message, 400, source) > + } > + > + pub fn not_found>( > + message: S, > + source: Option>, > + ) -> Self { > + Self::new(message, 404, source) > + } > + > + pub fn internal_server_error>( > + message: S, > + source: Option>, > + ) -> Self { > + Self::new(message, 500, source) > + } > +} > + > +impl Display for ApiError { > + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { > + f.write_str(&format!("{} {}", self.code, self.message)) > + } > +} > + > +impl StdError for ApiError { > + fn source(&self) -> Option<&(dyn StdError + 'static)> { > + match &self.source { > + None => None, > + Some(source) => Some(&**source), > + } > + } > +} > + > +fn verify_digest(config: &Config, digest: Option<&[u8]>) -> Result<(), ApiError> { > + if let Some(digest) = digest { > + if config.digest != *digest { > + return Err(ApiError::bad_request( > + "detected modified configuration - file changed by other user? Try again.", > + None, > + )); > + } > + } > + > + Ok(()) > +} > + > +fn endpoint_exists(config: &Config, name: &str) -> bool { > + let mut exists = false; > + > + exists > +} > + > +#[cfg(test)] > +mod test_helpers { > + use crate::Config; > + > + pub fn empty_config() -> Config { > + Config::new("", "").unwrap() > + } > +} > diff --git a/proxmox-notify/src/lib.rs b/proxmox-notify/src/lib.rs > index 7b90ee15..43feac25 100644 > --- a/proxmox-notify/src/lib.rs > +++ b/proxmox-notify/src/lib.rs > @@ -9,6 +9,7 @@ use serde_json::Value; > > use std::error::Error as StdError; > > +pub mod api; > mod config; > pub mod endpoints; > pub mod schema; > -- > 2.39.2