From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pbs-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 564B11FF16B for <inbox@lore.proxmox.com>; Thu, 6 Mar 2025 13:44:58 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BAA635F73; Thu, 6 Mar 2025 13:44:49 +0100 (CET) From: Shannon Sterz <s.sterz@proxmox.com> To: pbs-devel@lists.proxmox.com Date: Thu, 6 Mar 2025 13:43:39 +0100 Message-Id: <20250306124349.288370-10-s.sterz@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250306124349.288370-1-s.sterz@proxmox.com> References: <20250306124349.288370-1-s.sterz@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -1.448 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 FSL_BULK_SIG 0.001 Bulk signature with no Unsubscribe KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RAZOR2_CF_RANGE_51_100 1.886 Razor2 gives confidence level above 50% RAZOR2_CHECK 0.922 Listed in Razor2 (http://razor.sf.net/) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_SBL_A 0.1 Contains URL's A record listed in the Spamhaus SBL blocklist [185.199.110.153, 185.199.111.153] Subject: [pbs-devel] [PATCH proxmox 09/19] auth-api/tfa: prefer `Display` over `ToString`/an inherent function X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion <pbs-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>, <mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/> List-Post: <mailto:pbs-devel@lists.proxmox.com> List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>, <mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox Backup Server development discussion <pbs-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" <pbs-devel-bounces@lists.proxmox.com> this fixes two clippy lints that check if either `ToString` or an inherent `to_string()` function is implement [1, 2]. `Display` provides `ToString` for free and, thus, is preferable. [1]: https://rust-lang.github.io/rust-clippy/master/index.html#/inherent_to_string [2]: https://rust-lang.github.io/rust-clippy/master/index.html#to_string_trait_impl Signed-off-by: Shannon Sterz <s.sterz@proxmox.com> --- proxmox-auth-api/src/ticket.rs | 9 +++++---- proxmox-tfa/src/api/webauthn.rs | 10 ++++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/proxmox-auth-api/src/ticket.rs b/proxmox-auth-api/src/ticket.rs index 59293492..df6c4eb6 100644 --- a/proxmox-auth-api/src/ticket.rs +++ b/proxmox-auth-api/src/ticket.rs @@ -1,6 +1,7 @@ //! Generate and verify Authentication tickets use std::borrow::Cow; +use std::fmt::Display; use std::marker::PhantomData; use anyhow::{bail, format_err, Error}; @@ -14,13 +15,13 @@ use crate::TICKET_LIFETIME; /// Stringified ticket data must not contain colons... const TICKET_ASCIISET: &AsciiSet = &percent_encoding::CONTROLS.add(b':'); -/// An empty type implementing [`ToString`] and [`FromStr`](std::str::FromStr), used for tickets +/// An empty type implementing [`Display`] and [`FromStr`](std::str::FromStr), used for tickets /// with no data. pub struct Empty; -impl ToString for Empty { - fn to_string(&self) -> String { - String::new() +impl Display for Empty { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(f, "") } } diff --git a/proxmox-tfa/src/api/webauthn.rs b/proxmox-tfa/src/api/webauthn.rs index 1793df97..7e04c328 100644 --- a/proxmox-tfa/src/api/webauthn.rs +++ b/proxmox-tfa/src/api/webauthn.rs @@ -1,5 +1,7 @@ //! Webauthn configuration and challenge data. +use std::fmt::Display; + use anyhow::{format_err, Error}; use serde::{Deserialize, Serialize}; use url::Url; @@ -42,9 +44,9 @@ impl From<OriginUrl> for String { } } -impl OriginUrl { - fn to_string(&self) -> String { - self.0.origin().ascii_serialization() +impl Display for OriginUrl { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(f, "{}", self.0.origin().ascii_serialization()) } } @@ -91,7 +93,7 @@ impl WebauthnConfig { pub fn digest(&self) -> [u8; 32] { let mut data = format!("rp={:?}\nid={:?}\n", self.rp, self.id,); if let Some(origin) = &self.origin { - data.push_str(&format!("origin={}\n", origin.to_string())); + data.push_str(&format!("origin={}\n", origin)); } openssl::sha::sha256(data.as_bytes()) } -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel