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 042A9BF23 for ; Fri, 11 Aug 2023 12:58:53 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DB56BC045 for ; Fri, 11 Aug 2023 12:58: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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 11 Aug 2023 12:58: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 01BA045F7E for ; Fri, 11 Aug 2023 12:58:22 +0200 (CEST) Date: Fri, 11 Aug 2023 12:58:21 +0200 From: Wolfgang Bumiller To: Christoph Heiss 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: <20230808122239.1025524-6-c.heiss@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.105 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [lib.rs] 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: Fri, 11 Aug 2023 10:58:53 -0000 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. 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!()`. > > +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