From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pbs-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
by lore.proxmox.com (Postfix) with ESMTPS id 3C3AD1FF189
for <inbox@lore.proxmox.com>; Fri, 21 Mar 2025 17:04:44 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id AC2A932EA7;
Fri, 21 Mar 2025 17:04:42 +0100 (CET)
Mime-Version: 1.0
Date: Fri, 21 Mar 2025 17:04:08 +0100
Message-Id: <D8M2LB37M5BG.2GKO1DQCXJ43Q@proxmox.com>
Cc: "pbs-devel" <pbs-devel-bounces@lists.proxmox.com>
From: "Shannon Sterz" <s.sterz@proxmox.com>
To: "Proxmox Backup Server development discussion"
<pbs-devel@lists.proxmox.com>
X-Mailer: aerc 0.20.1-0-g2ecb8770224a-dirty
References: <20250321134541.1106117-1-c.heiss@proxmox.com>
<20250321134541.1106117-2-c.heiss@proxmox.com>
In-Reply-To: <20250321134541.1106117-2-c.heiss@proxmox.com>
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.014 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
RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
Subject: Re: [pbs-devel] [PATCH proxmox v5 1/2] fix #5379: api-types: add
`default` field for 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
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pbs-devel-bounces@lists.proxmox.com
Sender: "pbs-devel" <pbs-devel-bounces@lists.proxmox.com>
On Fri Mar 21, 2025 at 2:45 PM CET, Christoph Heiss wrote:
> The field indicates whether the realm should be the default realm to
> select in the login dialog.
>
> Per definition, the field should only ever be set to `true` on exactly
> one realm - up to the consumer/storage to ensure that.
>
> Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
> ---
> Changes v4 -> v5:
> * rebased to `proxmox` repo
> * added "default" api type definition for `BasicRealmInfo`
>
> pbs-api-types/src/ad.rs | 7 +++++++
> pbs-api-types/src/ldap.rs | 7 +++++++
> pbs-api-types/src/lib.rs | 7 +++++++
> pbs-api-types/src/openid.rs | 7 +++++++
> 4 files changed, 28 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<String>,
> + /// True if it should be the default realm to login in
tiniest of nit: "realm to login in" sounds wrong. I think you could just
remove everything after realm.
> + #[serde(skip_serializing_if = "Option::is_none")]
> + pub default: Option<bool>,
> /// Connection security
> #[serde(skip_serializing_if = "Option::is_none")]
> pub mode: Option<LdapMode>,
> 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<String>,
> + /// True if it should be the default realm to login in
> + #[serde(skip_serializing_if = "Option::is_none")]
> + pub default: Option<bool>,
> /// Connection security
> #[serde(skip_serializing_if = "Option::is_none")]
> pub mode: Option<LdapMode>,
> diff --git a/pbs-api-types/src/lib.rs b/pbs-api-types/src/lib.rs
> index acc2fca3..e3896000 100644
> --- a/pbs-api-types/src/lib.rs
> +++ b/pbs-api-types/src/lib.rs
> @@ -356,18 +356,25 @@ serde_plain::derive_fromstr_from_deserialize!(RealmType);
> optional: true,
> schema: SINGLE_LINE_COMMENT_SCHEMA,
> },
> + "default": {
> + optional: true,
> + default: false,
> + },
> },
> )]
> #[derive(Deserialize, Serialize, Clone, PartialEq)]
> #[serde(rename_all = "kebab-case")]
> /// Basic Information about a realm
> pub struct BasicRealmInfo {
> + /// Realm name
> pub realm: String,
> + // Realm type
nit: this is not a doc-comment, just a regular one
> #[serde(rename = "type")]
> pub ty: RealmType,
> /// True if it is the default realm
> #[serde(skip_serializing_if = "Option::is_none")]
> pub default: Option<bool>,
> + /// Optional comment for this realm
> #[serde(skip_serializing_if = "Option::is_none")]
> pub comment: Option<String>,
> }
> 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<String>,
> #[serde(skip_serializing_if = "Option::is_none")]
> pub comment: Option<String>,
> + /// True if it should be the default realm to login in
> + #[serde(skip_serializing_if = "Option::is_none")]
> + pub default: Option<bool>,
> /// Automatically create users if they do not exist.
> #[serde(skip_serializing_if = "Option::is_none")]
> pub autocreate: Option<bool>,
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel