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 5ABB881F93 for ; Fri, 26 Nov 2021 14:56:20 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2C1A61936C for ; Fri, 26 Nov 2021 14:55:49 +0100 (CET) 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 id 8B454191F0 for ; Fri, 26 Nov 2021 14:55:41 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 6851744CA1 for ; Fri, 26 Nov 2021 14:55:41 +0100 (CET) From: Wolfgang Bumiller To: pmg-devel@lists.proxmox.com Date: Fri, 26 Nov 2021 14:55:21 +0100 Message-Id: <20211126135524.117846-18-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211126135524.117846-1-w.bumiller@proxmox.com> References: <20211126135524.117846-1-w.bumiller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.436 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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. [webauthn.rs] Subject: [pmg-devel] [PATCH proxmox 3/6] tfa: let OriginUrl deref to its inner Url, add FromStr impl X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Nov 2021 13:56:20 -0000 Signed-off-by: Wolfgang Bumiller --- proxmox-tfa/src/api/webauthn.rs | 35 +++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/proxmox-tfa/src/api/webauthn.rs b/proxmox-tfa/src/api/webauthn.rs index 6453808..486e4f5 100644 --- a/proxmox-tfa/src/api/webauthn.rs +++ b/proxmox-tfa/src/api/webauthn.rs @@ -1,14 +1,13 @@ //! Webauthn configuration and challenge data. +use anyhow::Error; use serde::{Deserialize, Serialize}; +use url::Url; +use webauthn_rs::proto::{COSEKey, Credential, CredentialID, UserVerificationPolicy}; #[cfg(feature = "api-types")] use proxmox_schema::{api, Updater, UpdaterType}; -use url::Url; - -use webauthn_rs::proto::{COSEKey, Credential, CredentialID, UserVerificationPolicy}; - use super::IsExpired; #[derive(Clone, Deserialize, Serialize)] @@ -20,6 +19,34 @@ impl UpdaterType for OriginUrl { type Updater = Option; } +impl std::str::FromStr for OriginUrl { + type Err = Error; + + fn from_str(s: &str) -> Result { + Ok(Self(s.parse()?)) + } +} + +impl std::ops::Deref for OriginUrl { + type Target = Url; + + fn deref(&self) -> &Url { + &self.0 + } +} + +impl std::ops::DerefMut for OriginUrl { + fn deref_mut(&mut self) -> &mut Url { + &mut self.0 + } +} + +impl Into for OriginUrl { + fn into(self) -> String { + self.0.into() + } +} + #[cfg_attr(feature = "api-types", api( properties: { rp: { type: String }, -- 2.30.2