From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id A9E441FF16C for ; Mon, 12 Aug 2024 15:56:06 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1D2FD34593; Mon, 12 Aug 2024 15:56:17 +0200 (CEST) From: Christoph Heiss To: pbs-devel@lists.proxmox.com Date: Mon, 12 Aug 2024 15:55:05 +0200 Message-ID: <20240812135550.1461574-9-c.heiss@proxmox.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240812135550.1461574-1-c.heiss@proxmox.com> References: <20240812135550.1461574-1-c.heiss@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.031 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH proxmox-backup v2 08/14] fix #5379: api2: access: set default realm accordingly on individual update 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: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Signed-off-by: Christoph Heiss --- Changes v1 -> v2: * documented unset_default_realm() * added early return to unset_default_realm() pbs-config/src/domains.rs | 16 ++++++++++++++++ src/api2/config/access/ad.rs | 7 +++++++ src/api2/config/access/ldap.rs | 7 +++++++ src/api2/config/access/openid.rs | 7 +++++++ 4 files changed, 37 insertions(+) diff --git a/pbs-config/src/domains.rs b/pbs-config/src/domains.rs index 5b6ce480..d002c113 100644 --- a/pbs-config/src/domains.rs +++ b/pbs-config/src/domains.rs @@ -63,6 +63,22 @@ pub fn save_config(config: &SectionConfigData) -> Result<(), Error> { replace_backup_config(DOMAINS_CFG_FILENAME, raw.as_bytes()) } +/// Unsets the default login realm for users by deleting the `default` property +/// from the respective realm. +/// +/// This only updates the configuration as given in `config`, making it +/// permanent is left to the caller. +pub fn unset_default_realm(config: &mut SectionConfigData) -> Result<(), Error> { + for (_, data) in &mut config.sections.values_mut() { + if let Some(obj) = data.as_object_mut() { + obj.remove("default"); + return Ok(()); + } + } + + Ok(()) +} + /// Check if a realm with the given name exists pub fn exists(domains: &SectionConfigData, realm: &str) -> bool { realm == "pbs" || realm == "pam" || domains.sections.contains_key(realm) diff --git a/src/api2/config/access/ad.rs b/src/api2/config/access/ad.rs index c202291a..04b84136 100644 --- a/src/api2/config/access/ad.rs +++ b/src/api2/config/access/ad.rs @@ -273,6 +273,13 @@ pub async fn update_ad_realm( } } + if let Some(true) = update.default { + pbs_config::domains::unset_default_realm(&mut domains)?; + config.default = Some(true); + } else { + config.default = None; + } + if let Some(mode) = update.mode { config.mode = Some(mode); } diff --git a/src/api2/config/access/ldap.rs b/src/api2/config/access/ldap.rs index e60dc9c1..ec89e068 100644 --- a/src/api2/config/access/ldap.rs +++ b/src/api2/config/access/ldap.rs @@ -312,6 +312,13 @@ pub fn update_ldap_realm( } } + if let Some(true) = update.default { + pbs_config::domains::unset_default_realm(&mut domains)?; + config.default = Some(true); + } else { + config.default = None; + } + if let Some(mode) = update.mode { config.mode = Some(mode); } diff --git a/src/api2/config/access/openid.rs b/src/api2/config/access/openid.rs index 4901880e..77ff98a3 100644 --- a/src/api2/config/access/openid.rs +++ b/src/api2/config/access/openid.rs @@ -242,6 +242,13 @@ pub fn update_openid_realm( } } + if let Some(true) = update.default { + pbs_config::domains::unset_default_realm(&mut domains)?; + config.default = Some(true); + } else { + config.default = None; + } + if let Some(issuer_url) = update.issuer_url { config.issuer_url = issuer_url; } -- 2.45.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel