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 01765C652 for ; Mon, 14 Aug 2023 11:40:55 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DE054D0A for ; Mon, 14 Aug 2023 11:40:54 +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, 14 Aug 2023 11:40:54 +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 2FB4C4744A for ; Mon, 14 Aug 2023 11:40:54 +0200 (CEST) Date: Mon, 14 Aug 2023 11:40:53 +0200 From: Christoph Heiss To: Wolfgang Bumiller Cc: pbs-devel@lists.proxmox.com Message-ID: References: <20230808122239.1025524-1-c.heiss@proxmox.com> <20230808122239.1025524-6-c.heiss@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-SPAM-LEVEL: Spam detection results: 0 AWL -0.042 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: Re: [pbs-devel] [PATCH proxmox-backup 05/12] api-types: implement `Display`, `FromStr` for `RealmType` X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2023 09:40:55 -0000 Thanks for the review & insights (on this and the other patches too)! On Fri, Aug 11, 2023 at 12:58:21PM +0200, Wolfgang Bumiller wrote: > > On Tue, Aug 08, 2023 at 02:22:07PM +0200, Christoph Heiss wrote: > > Signed-off-by: Christoph Heiss > > --- > > pbs-api-types/src/lib.rs | 31 +++++++++++++++++++++++++++++++ > > 1 file changed, 31 insertions(+) > > > > diff --git a/pbs-api-types/src/lib.rs b/pbs-api-types/src/lib.rs > > index 4764c51a..6ebbe514 100644 > > --- a/pbs-api-types/src/lib.rs > > +++ b/pbs-api-types/src/lib.rs > > @@ -1,5 +1,9 @@ > > //! Basic API types used by most of the PBS code. > > > > +use core::fmt; > > + > > +use anyhow::{format_err, Error}; > > + > > use serde::{Deserialize, Serialize}; > > > > use proxmox_auth_api::{APITOKEN_ID_REGEX_STR, USER_ID_REGEX_STR}; > > @@ -508,6 +512,33 @@ pub enum RealmType { > > Ldap, > > } > > > RealmType implements Serialize and Deserialize, but uses lowercase for > its serialized values. > > To my knowledge we don't yet have any types where Serialize+Deserialize > vs Display+FromStr differ like this. I'll change it so that these two implementations match. > > If we really want this it should be commented + described in the commit > message. I do wonder though, if there's any harm in just also changing > the deserializer to use the case-insensitive `FromStr` by replacing the > derive with `serde_plain::derive_deserialize_from_fromstr!()`. `serde_plain` does look interesting, didn't know about this crate! Although I guess it would make more sense to instead just use `serde_plain::derive_display_from_serialize()` and its `FromStr` counterpart for the below, seeing as `Serialize` + `Deserialize` are already implemented anyway (instead of switching things around). > > > > > +impl fmt::Display for RealmType { > > + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { > > + use RealmType::*; > > + match self { > > + Pam => write!(f, "PAM"), > > + Pbs => write!(f, "PBS"), > > + OpenId => write!(f, "OpenID"), > > + Ldap => write!(f, "LDAP"), > > + } > > + } > > +} > > + > > +impl std::str::FromStr for RealmType { > > + type Err = Error; > > + > > + fn from_str(realm_type: &str) -> Result { > > + use RealmType::*; > > + match realm_type.to_lowercase().as_str() { > > + "pam" => Ok(Pam), > > + "pbs" => Ok(Pbs), > > + "openid" => Ok(OpenId), > > + "ldap" => Ok(Ldap), > > + _ => Err(format_err!("unknown realm type {realm_type}")), > > + } > > + } > > +} > > + > > #[api( > > properties: { > > realm: { > > -- > > 2.41.0