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 9DB7BAFFD for ; Tue, 8 Aug 2023 14:23:21 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 809409A65 for ; Tue, 8 Aug 2023 14:22:51 +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 ; Tue, 8 Aug 2023 14:22:50 +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 A6982437C9 for ; Tue, 8 Aug 2023 14:22:50 +0200 (CEST) From: Christoph Heiss To: pbs-devel@lists.proxmox.com Date: Tue, 8 Aug 2023 14:22:10 +0200 Message-ID: <20230808122239.1025524-9-c.heiss@proxmox.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230808122239.1025524-1-c.heiss@proxmox.com> References: <20230808122239.1025524-1-c.heiss@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.048 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 08/12] config: domains: add new "ad" section type for AD realms 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: Tue, 08 Aug 2023 12:23:21 -0000 Signed-off-by: Christoph Heiss --- pbs-config/src/domains.rs | 7 ++++++- src/auth.rs | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pbs-config/src/domains.rs b/pbs-config/src/domains.rs index 35aa11d5..dcf47f83 100644 --- a/pbs-config/src/domains.rs +++ b/pbs-config/src/domains.rs @@ -8,13 +8,14 @@ use proxmox_schema::{ApiType, ObjectSchema}; use proxmox_section_config::{SectionConfig, SectionConfigData, SectionConfigPlugin}; use crate::{open_backup_lockfile, replace_backup_config, BackupLockGuard}; -use pbs_api_types::{LdapRealmConfig, OpenIdRealmConfig, REALM_ID_SCHEMA}; +use pbs_api_types::{AdRealmConfig, LdapRealmConfig, OpenIdRealmConfig, REALM_ID_SCHEMA}; lazy_static! { pub static ref CONFIG: SectionConfig = init(); } fn init() -> SectionConfig { + const AD_SCHEMA: &ObjectSchema = AdRealmConfig::API_SCHEMA.unwrap_object_schema(); const LDAP_SCHEMA: &ObjectSchema = LdapRealmConfig::API_SCHEMA.unwrap_object_schema(); const OPENID_SCHEMA: &ObjectSchema = OpenIdRealmConfig::API_SCHEMA.unwrap_object_schema(); @@ -33,6 +34,10 @@ fn init() -> SectionConfig { config.register_plugin(plugin); + let plugin = SectionConfigPlugin::new("ad".to_string(), Some(String::from("realm")), AD_SCHEMA); + + config.register_plugin(plugin); + config } diff --git a/src/auth.rs b/src/auth.rs index ce234990..12b8dc51 100644 --- a/src/auth.rs +++ b/src/auth.rs @@ -302,6 +302,8 @@ pub(crate) fn lookup_authenticator( let (domains, _digest) = pbs_config::domains::config()?; if let Ok(config) = domains.lookup::("ldap", realm) { Ok(Box::new(LdapAuthenticator { config })) + } else if let Ok(config) = domains.lookup::("ad", realm) { + Ok(Box::new(AdAuthenticator { config })) } else if domains.lookup::("openid", realm).is_ok() { Ok(Box::new(OpenIdAuthenticator())) } else { -- 2.41.0