From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 38C9C1FF16C for ; Fri, 16 Aug 2024 13:17:44 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7DEA714484; Fri, 16 Aug 2024 13:18:00 +0200 (CEST) From: Christoph Heiss To: pbs-devel@lists.proxmox.com Date: Fri, 16 Aug 2024 13:16:39 +0200 Message-ID: <20240816111648.483368-8-c.heiss@proxmox.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240816111648.483368-1-c.heiss@proxmox.com> References: <20240816111648.483368-1-c.heiss@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.033 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 v3 07/14] fix #5379: api-types: add `default` field to all realm types 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 v2 -> v3: * make `default` property deletable Changes v1 -> v2: * no changes pbs-api-types/src/ad.rs | 7 +++++++ pbs-api-types/src/ldap.rs | 7 +++++++ pbs-api-types/src/openid.rs | 7 +++++++ src/api2/config/access/ad.rs | 5 +++++ src/api2/config/access/ldap.rs | 5 +++++ src/api2/config/access/openid.rs | 5 +++++ 6 files changed, 36 insertions(+) diff --git a/pbs-api-types/src/ad.rs b/pbs-api-types/src/ad.rs index 910571a0..5c236325 100644 --- a/pbs-api-types/src/ad.rs +++ b/pbs-api-types/src/ad.rs @@ -16,6 +16,10 @@ use super::{ optional: true, schema: SINGLE_LINE_COMMENT_SCHEMA, }, + "default": { + optional: true, + default: false, + }, "verify": { optional: true, default: false, @@ -64,6 +68,9 @@ pub struct AdRealmConfig { /// Comment #[serde(skip_serializing_if = "Option::is_none")] pub comment: Option, + /// True if it should be the default realm to login in + #[serde(skip_serializing_if = "Option::is_none")] + pub default: Option, /// Connection security #[serde(skip_serializing_if = "Option::is_none")] pub mode: Option, diff --git a/pbs-api-types/src/ldap.rs b/pbs-api-types/src/ldap.rs index a3e0407b..79735d93 100644 --- a/pbs-api-types/src/ldap.rs +++ b/pbs-api-types/src/ldap.rs @@ -29,6 +29,10 @@ pub enum LdapMode { optional: true, schema: SINGLE_LINE_COMMENT_SCHEMA, }, + "default": { + optional: true, + default: false, + }, "verify": { optional: true, default: false, @@ -75,6 +79,9 @@ pub struct LdapRealmConfig { /// Comment #[serde(skip_serializing_if = "Option::is_none")] pub comment: Option, + /// True if it should be the default realm to login in + #[serde(skip_serializing_if = "Option::is_none")] + pub default: Option, /// Connection security #[serde(skip_serializing_if = "Option::is_none")] pub mode: Option, diff --git a/pbs-api-types/src/openid.rs b/pbs-api-types/src/openid.rs index 2c95c5c6..e8ec19d9 100644 --- a/pbs-api-types/src/openid.rs +++ b/pbs-api-types/src/openid.rs @@ -80,6 +80,10 @@ pub const OPENID_USERNAME_CLAIM_SCHEMA: Schema = StringSchema::new( optional: true, schema: SINGLE_LINE_COMMENT_SCHEMA, }, + "default": { + optional: true, + default: false, + }, autocreate: { optional: true, default: false, @@ -111,6 +115,9 @@ pub struct OpenIdRealmConfig { pub client_key: Option, #[serde(skip_serializing_if = "Option::is_none")] pub comment: Option, + /// True if it should be the default realm to login in + #[serde(skip_serializing_if = "Option::is_none")] + pub default: Option, /// Automatically create users if they do not exist. #[serde(skip_serializing_if = "Option::is_none")] pub autocreate: Option, diff --git a/src/api2/config/access/ad.rs b/src/api2/config/access/ad.rs index c202291a..4106e0f4 100644 --- a/src/api2/config/access/ad.rs +++ b/src/api2/config/access/ad.rs @@ -136,6 +136,8 @@ pub enum DeletableProperty { Port, /// Comment Comment, + /// Is default realm + Default, /// Verify server certificate Verify, /// Mode (ldap, ldap+starttls or ldaps), @@ -217,6 +219,9 @@ pub async fn update_ad_realm( DeletableProperty::Comment => { config.comment = None; } + DeletableProperty::Default => { + config.default = None; + } DeletableProperty::Port => { config.port = None; } diff --git a/src/api2/config/access/ldap.rs b/src/api2/config/access/ldap.rs index e60dc9c1..7dcf7990 100644 --- a/src/api2/config/access/ldap.rs +++ b/src/api2/config/access/ldap.rs @@ -171,6 +171,8 @@ pub enum DeletableProperty { Port, /// Comment Comment, + /// Is default realm + Default, /// Verify server certificate Verify, /// Mode (ldap, ldap+starttls or ldaps), @@ -252,6 +254,9 @@ pub fn update_ldap_realm( DeletableProperty::Comment => { config.comment = None; } + DeletableProperty::Default => { + config.default = None; + } DeletableProperty::Port => { config.port = None; } diff --git a/src/api2/config/access/openid.rs b/src/api2/config/access/openid.rs index 4901880e..2fbcd1b1 100644 --- a/src/api2/config/access/openid.rs +++ b/src/api2/config/access/openid.rs @@ -149,6 +149,8 @@ pub enum DeletableProperty { ClientKey, /// Delete the comment property. Comment, + /// Delete the default property. + Default, /// Delete the autocreate property Autocreate, /// Delete the scopes property @@ -217,6 +219,9 @@ pub fn update_openid_realm( DeletableProperty::Comment => { config.comment = None; } + DeletableProperty::Default => { + config.default = None; + } DeletableProperty::Autocreate => { config.autocreate = None; } -- 2.45.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel