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 83A3A91BB1 for ; Thu, 9 Feb 2023 14:31:37 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 69BBD2493F for ; Thu, 9 Feb 2023 14:31:37 +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 for ; Thu, 9 Feb 2023 14:31:36 +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 81BA746549 for ; Thu, 9 Feb 2023 14:31:36 +0100 (CET) From: Lukas Wagner To: pbs-devel@lists.proxmox.com Date: Thu, 9 Feb 2023 14:31:24 +0100 Message-Id: <20230209133128.695211-15-l.wagner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230209133128.695211-1-l.wagner@proxmox.com> References: <20230209133128.695211-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.224 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. [auth.rs] Subject: [pbs-devel] [PATCH v3 proxmox-backup 14/18] auth: unify naming for all authenticator implementations 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: Thu, 09 Feb 2023 13:31:37 -0000 This also removes the need for two clippy-allow directives. Signed-off-by: Lukas Wagner --- src/auth.rs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/auth.rs b/src/auth.rs index a90123d5..ee5a5983 100644 --- a/src/auth.rs +++ b/src/auth.rs @@ -28,10 +28,9 @@ pub trait ProxmoxAuthenticator { fn remove_password(&self, username: &UsernameRef) -> Result<(), Error>; } -#[allow(clippy::upper_case_acronyms)] -struct PAM(); +struct PamAuthenticator(); -impl ProxmoxAuthenticator for PAM { +impl ProxmoxAuthenticator for PamAuthenticator { fn authenticate_user<'a>( &self, username: &'a UsernameRef, @@ -91,12 +90,11 @@ impl ProxmoxAuthenticator for PAM { } } -#[allow(clippy::upper_case_acronyms)] -struct PBS(); +struct PbsAuthenticator(); const SHADOW_CONFIG_FILENAME: &str = configdir!("/shadow.json"); -impl ProxmoxAuthenticator for PBS { +impl ProxmoxAuthenticator for PbsAuthenticator { fn authenticate_user<'a>( &self, username: &'a UsernameRef, @@ -260,8 +258,8 @@ pub fn lookup_authenticator( realm: &RealmRef, ) -> Result, Error> { match realm.as_str() { - "pam" => Ok(Box::new(PAM())), - "pbs" => Ok(Box::new(PBS())), + "pam" => Ok(Box::new(PamAuthenticator())), + "pbs" => Ok(Box::new(PbsAuthenticator())), realm => { let (domains, _digest) = pbs_config::domains::config()?; if let Ok(config) = domains.lookup::("ldap", realm) { -- 2.30.2