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 2500F695EF for ; Wed, 23 Mar 2022 14:10:27 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1BDE527323 for ; Wed, 23 Mar 2022 14:09:57 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 222112730B for ; Wed, 23 Mar 2022 14:09:56 +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 CCE5741C5E for ; Wed, 23 Mar 2022 14:01:16 +0100 (CET) From: Matthias Heiserer To: pbs-devel@lists.proxmox.com Date: Wed, 23 Mar 2022 14:01:10 +0100 Message-Id: <20220323130111.2552347-2-m.heiserer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220323130111.2552347-1-m.heiserer@proxmox.com> References: <20220323130111.2552347-1-m.heiserer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.008 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH proxmox-backup 2/3] fix #3939: set default value in domains endpoint 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, 23 Mar 2022 13:10:27 -0000 Because the default realm is stored in node.cfg, here we have to add it to the returned information. Signed-off-by: Matthias Heiserer --- src/api2/access/domain.rs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/api2/access/domain.rs b/src/api2/access/domain.rs index 3518e5ca..1dbc8a0e 100644 --- a/src/api2/access/domain.rs +++ b/src/api2/access/domain.rs @@ -5,7 +5,7 @@ use serde_json::{json, Value}; use proxmox_router::{Router, RpcEnvironment, Permission}; use proxmox_schema::api; - +use crate::config::node; use pbs_api_types::BasicRealmInfo; #[api( @@ -24,17 +24,19 @@ use pbs_api_types::BasicRealmInfo; /// Authentication domain/realm index. fn list_domains(mut rpcenv: &mut dyn RpcEnvironment) -> Result, Error> { let mut list = Vec::new(); + let default_realm = node::config()?.0.default_realm; list.push(serde_json::from_value(json!({ "realm": "pam", "type": "pam", "comment": "Linux PAM standard authentication", - "default": Some(true), + "default": default_realm.as_ref().map(|value|value == "pam"), }))?); list.push(serde_json::from_value(json!({ "realm": "pbs", "type": "pbs", "comment": "Proxmox Backup authentication server", + "default": default_realm.as_ref().map(|value|value == "pbs"), }))?); let (config, digest) = pbs_config::domains::config()?; @@ -42,6 +44,11 @@ fn list_domains(mut rpcenv: &mut dyn RpcEnvironment) -> Result