From: Lukas Wagner <l.wagner@proxmox.com>
To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>,
Christoph Heiss <c.heiss@proxmox.com>
Subject: Re: [pbs-devel] [PATCH proxmox-backup 10/14] config: use new dedicated PAM and PBS realm types
Date: Wed, 7 Aug 2024 11:24:19 +0200 [thread overview]
Message-ID: <7f5d7334-d6a8-4447-87a8-6c4400071544@proxmox.com> (raw)
In-Reply-To: <20240716134514.1656795-11-c.heiss@proxmox.com>
On 2024-07-16 15:45, Christoph Heiss wrote:
> diff --git a/src/config/mod.rs b/src/config/mod.rs
> index 324fabca..3931eee9 100644
> --- a/src/config/mod.rs
> +++ b/src/config/mod.rs
> @@ -12,6 +12,7 @@ use std::path::Path;
>
> use proxmox_lang::try_block;
>
> +use pbs_api_types::{PamRealmConfig, PbsRealmConfig};
> use pbs_buildcfg::{self, configdir};
>
> pub mod acme;
> @@ -194,3 +195,36 @@ pub(crate) fn set_proxy_certificate(cert_pem: &[u8], key_pem: &[u8]) -> Result<(
>
> Ok(())
> }
> +
> +pub fn update_default_realms() -> Result<(), Error> {
> + let _lock = pbs_config::domains::lock_config()?;
> + let (mut domains, _) = pbs_config::domains::config()?;
> +
> + if !pbs_config::domains::exists(&domains, "pam") {
> + domains.set_data(
> + "pam",
> + "pam",
> + PamRealmConfig {
> + realm: "pam".to_owned(),
> + comment: Some("Linux PAM standard authentication".to_owned()),
> + // Setting it as default here is safe, because if we perform this
> + // migration, the user had not had any chance to set a custom default anyway.
> + default: Some(true),
> + },
> + )?;
> + }
> +
> + if !pbs_config::domains::exists(&domains, "pbs") {
> + domains.set_data(
> + "pbs",
> + "pbs",
> + PbsRealmConfig {
> + realm: "pbs".to_owned(),
> + comment: Some("Proxmox Backup authentication server".to_owned()),
> + default: None,
> + },
> + )?;
> + }
Just wondering, would it be a good idea to encode these defaults as
the `Default::default()` impl for these two types? What do you think?
> +
> + pbs_config::domains::save_config(&domains)
> +}
--
- Lukas
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
next prev parent reply other threads:[~2024-08-07 9:24 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-16 13:44 [pbs-devel] [PATCH proxmox-backup/pwt 0/14] fix #5379: introduce default auth realm option Christoph Heiss
2024-07-16 13:45 ` [pbs-devel] [PATCH widget-toolkit 1/6] window: AuthEditBase: include more information in thrown errors Christoph Heiss
2024-07-16 13:45 ` [pbs-devel] [PATCH widget-toolkit 2/6] panel: AuthView: make `useTypeInUrl` property per-realm Christoph Heiss
2024-07-16 13:45 ` [pbs-devel] [PATCH widget-toolkit 3/6] window: add panel for editing simple, built-in realms Christoph Heiss
2024-07-16 13:45 ` [pbs-devel] [PATCH widget-toolkit 4/6] schema: make PAM realm editable using new AuthSimple panel Christoph Heiss
2024-07-16 13:45 ` [pbs-devel] [PATCH widget-toolkit 5/6] fix #5379: panel: AuthView: add column displaying whether the realm is default Christoph Heiss
2024-08-07 9:24 ` Lukas Wagner
2024-07-16 13:45 ` [pbs-devel] [PATCH widget-toolkit 6/6] fix #5379: window: AuthEdit{LDAP, OpenId}: add 'Default realm' checkbox Christoph Heiss
2024-07-16 13:45 ` [pbs-devel] [PATCH proxmox-backup 07/14] fix #5379: api-types: add `default` field to all realm types Christoph Heiss
2024-07-16 13:45 ` [pbs-devel] [PATCH proxmox-backup 08/14] fix #5379: api2: access: set default realm accordingly on individual update Christoph Heiss
2024-07-16 13:45 ` [pbs-devel] [PATCH proxmox-backup 09/14] api-types: introduce proper types for PAM and PBS realms Christoph Heiss
2024-08-07 9:24 ` Lukas Wagner
2024-07-16 13:45 ` [pbs-devel] [PATCH proxmox-backup 10/14] config: use new dedicated PAM and PBS realm types Christoph Heiss
2024-08-07 9:24 ` Lukas Wagner [this message]
2024-08-07 15:24 ` Christoph Heiss
2024-07-16 13:45 ` [pbs-devel] [PATCH proxmox-backup 11/14] api2: access: add update support for built-in PAM realm Christoph Heiss
2024-07-16 13:45 ` [pbs-devel] [PATCH proxmox-backup 12/14] api2: access: add update support for built-in PBS realm Christoph Heiss
2024-07-16 13:45 ` [pbs-devel] [PATCH proxmox-backup 13/14] www: AccessControl: make `useTypeInUrl` property per-realm Christoph Heiss
2024-07-16 13:45 ` [pbs-devel] [PATCH proxmox-backup 14/14] www: utils: make built-in pbs realm editable using new AuthSimplePanel Christoph Heiss
2024-08-07 9:23 ` [pbs-devel] [PATCH proxmox-backup/pwt 0/14] fix #5379: introduce default auth realm option Lukas Wagner
2024-08-07 15:27 ` Christoph Heiss
2024-08-08 14:25 ` Christoph Heiss
2024-08-09 11:12 ` Lukas Wagner
2024-08-12 13:57 ` Christoph Heiss
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7f5d7334-d6a8-4447-87a8-6c4400071544@proxmox.com \
--to=l.wagner@proxmox.com \
--cc=c.heiss@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox