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 71F921FF169 for ; Mon, 12 Aug 2024 15:56:09 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 97E2134600; 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:06 +0200 Message-ID: <20240812135550.1461574-10-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 09/14] api-types: introduce proper types for PAM and PBS 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: , 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: * reorder new module imports * implement `Default` for new realms pbs-api-types/src/lib.rs | 97 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 96 insertions(+), 1 deletion(-) diff --git a/pbs-api-types/src/lib.rs b/pbs-api-types/src/lib.rs index 635292a5..6706875c 100644 --- a/pbs-api-types/src/lib.rs +++ b/pbs-api-types/src/lib.rs @@ -6,7 +6,8 @@ use serde::{Deserialize, Serialize}; pub mod percent_encoding; use proxmox_schema::{ - api, const_regex, ApiStringFormat, ApiType, ArraySchema, ReturnType, Schema, StringSchema, + api, const_regex, ApiStringFormat, ApiType, ArraySchema, EnumEntry, ReturnType, Schema, + StringSchema, Updater, }; use proxmox_time::parse_daily_duration; @@ -218,6 +219,20 @@ pub const REALM_ID_SCHEMA: Schema = StringSchema::new("Realm name.") .max_length(32) .schema(); +const PAM_REALM_ID_SCHEMA: Schema = StringSchema::new("Realm name.") + .format(&ApiStringFormat::Enum(&[EnumEntry::new( + "pam", + "Default PAM realm.", + )])) + .schema(); + +const PBS_REALM_ID_SCHEMA: Schema = StringSchema::new("Realm name.") + .format(&ApiStringFormat::Enum(&[EnumEntry::new( + "pbs", + "Default PBS realm.", + )])) + .schema(); + pub const SUBSCRIPTION_KEY_SCHEMA: Schema = StringSchema::new("Proxmox Backup Server subscription key.") .format(&SUBSCRIPTION_KEY_FORMAT) @@ -364,3 +379,83 @@ pub struct BasicRealmInfo { #[serde(skip_serializing_if = "Option::is_none")] pub comment: Option, } + +#[api( + properties: { + "realm": { + schema: PAM_REALM_ID_SCHEMA, + }, + "comment": { + optional: true, + schema: SINGLE_LINE_COMMENT_SCHEMA, + }, + "default": { + optional: true, + default: false, + }, + } +)] +#[derive(Serialize, Deserialize, Updater, Clone)] +#[serde(rename_all = "kebab-case")] +/// Built-in PAM realm configuration properties. +pub struct PamRealmConfig { + /// Realm name. Always "pam". + #[updater(skip)] + pub realm: String, + /// Comment for this realm + #[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, +} + +impl Default for PamRealmConfig { + fn default() -> Self { + Self { + realm: "pam".to_owned(), + comment: Some("Linux PAM standard authentication".to_owned()), + default: None, + } + } +} + +#[api( + properties: { + "realm": { + schema: PBS_REALM_ID_SCHEMA, + }, + "comment": { + optional: true, + schema: SINGLE_LINE_COMMENT_SCHEMA, + }, + "default": { + optional: true, + default: false, + }, + } +)] +#[derive(Serialize, Deserialize, Updater, Clone)] +#[serde(rename_all = "kebab-case")] +/// Built-in Proxmox Backup Server realm configuration properties. +pub struct PbsRealmConfig { + /// Realm name. Always "pbs". + #[updater(skip)] + pub realm: String, + /// Comment for this realm + #[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, +} + +impl Default for PbsRealmConfig { + fn default() -> Self { + Self { + realm: "pbs".to_owned(), + comment: Some("Proxmox Backup authentication server".to_owned()), + default: None, + } + } +} -- 2.45.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel