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 D94D1CCB8 for ; Wed, 16 Aug 2023 16:49:04 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BB72E18054 for ; Wed, 16 Aug 2023 16:49:04 +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 ; Wed, 16 Aug 2023 16:49:03 +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 75F7441025 for ; Wed, 16 Aug 2023 16:49:03 +0200 (CEST) From: Christoph Heiss To: pbs-devel@lists.proxmox.com Date: Wed, 16 Aug 2023 16:47:34 +0200 Message-ID: <20230816144746.1265108-5-c.heiss@proxmox.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230816144746.1265108-1-c.heiss@proxmox.com> References: <20230816144746.1265108-1-c.heiss@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.041 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: [pbs-devel] [PATCH proxmox-backup v2 04/15] api-types: factor out `LdapMode` -> `ConnectionMode` conversion into own fn 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: Wed, 16 Aug 2023 14:49:04 -0000 This will be needed by the AD authenticator as well, so avoid duplicate code. No functional changes. Signed-off-by: Christoph Heiss --- Changes v1 -> v2: * Use module-local function instead of implementing `From` in `pbs-api-types`. See also [0] [0] https://lists.proxmox.com/pipermail/pbs-devel/2023-August/006444.html src/auth.rs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/auth.rs b/src/auth.rs index 318d1ff2..e473da08 100644 --- a/src/auth.rs +++ b/src/auth.rs @@ -185,12 +185,6 @@ impl LdapAuthenticator { servers.push(server.clone()); } - let tls_mode = match config.mode.unwrap_or_default() { - LdapMode::Ldap => ConnectionMode::Ldap, - LdapMode::StartTls => ConnectionMode::StartTls, - LdapMode::Ldaps => ConnectionMode::Ldaps, - }; - let (ca_store, trusted_cert) = if let Some(capath) = config.capath.as_deref() { let path = PathBuf::from(capath); if path.is_dir() { @@ -209,7 +203,7 @@ impl LdapAuthenticator { base_dn: config.base_dn.clone(), bind_dn: config.bind_dn.clone(), bind_password: password, - tls_mode, + tls_mode: ldap_to_conn_mode(config.mode.unwrap_or_default()), verify_certificate: config.verify.unwrap_or_default(), additional_trusted_certificates: trusted_cert, certificate_store_path: ca_store, @@ -217,6 +211,14 @@ impl LdapAuthenticator { } } +fn ldap_to_conn_mode(mode: LdapMode) -> ConnectionMode { + match mode { + LdapMode::Ldap => ConnectionMode::Ldap, + LdapMode::StartTls => ConnectionMode::StartTls, + LdapMode::Ldaps => ConnectionMode::Ldaps, + } +} + /// Lookup the autenticator for the specified realm pub(crate) fn lookup_authenticator( realm: &RealmRef, -- 2.41.0