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 [IPv6:2a01:7e0:0:424::9])
by lore.proxmox.com (Postfix) with ESMTPS id 53F471FF15C
for <inbox@lore.proxmox.com>; Wed, 7 Aug 2024 11:24:38 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 001C43334;
Wed, 7 Aug 2024 11:24:46 +0200 (CEST)
Message-ID: <941f28a5-17c5-4742-8c44-94372031658c@proxmox.com>
Date: Wed, 7 Aug 2024 11:24:14 +0200
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
From: Lukas Wagner <l.wagner@proxmox.com>
To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>, Christoph Heiss <c.heiss@proxmox.com>
References: <20240716134514.1656795-1-c.heiss@proxmox.com>
<20240716134514.1656795-10-c.heiss@proxmox.com>
Content-Language: de-AT, en-US
In-Reply-To: <20240716134514.1656795-10-c.heiss@proxmox.com>
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.007 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
Subject: Re: [pbs-devel] [PATCH proxmox-backup 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
<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 2024-07-16 15:45, Christoph Heiss wrote:
> Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
> ---
> pbs-api-types/src/lib.rs | 76 ++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 76 insertions(+)
>
> diff --git a/pbs-api-types/src/lib.rs b/pbs-api-types/src/lib.rs
> index 40bcd8f1..01f8eb74 100644
> --- a/pbs-api-types/src/lib.rs
> +++ b/pbs-api-types/src/lib.rs
> @@ -1,6 +1,8 @@
> //! Basic API types used by most of the PBS code.
>
> use const_format::concatcp;
> +use proxmox_schema::EnumEntry;
> +use proxmox_schema::Updater;
Nit: proxmox_* imports should be separate from third-party imports
> use serde::{Deserialize, Serialize};
>
> pub mod percent_encoding;
> @@ -218,6 +220,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)
> @@ -394,3 +410,63 @@ pub struct BasicRealmInfo {
> #[serde(skip_serializing_if = "Option::is_none")]
> pub comment: Option<String>,
> }
> +
> +#[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<String>,
> + /// True if it should be the default realm to login in
> + #[serde(skip_serializing_if = "Option::is_none")]
> + pub default: Option<bool>,
> +}
> +
> +#[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<String>,
> + /// True if it should be the default realm to login in
> + #[serde(skip_serializing_if = "Option::is_none")]
> + pub default: Option<bool>,
> +}
--
- Lukas
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel