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 4884E1FF13F for ; Thu, 18 Jun 2026 12:21:38 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C89CA129A1; Thu, 18 Jun 2026 12:21:35 +0200 (CEST) From: Shannon Sterz To: pdm-devel@lists.proxmox.com Subject: [PATCH yew-comp 2/3] auth_view: enable editing of default realms Date: Thu, 18 Jun 2026 12:21:25 +0200 Message-ID: <20260618102126.177217-3-s.sterz@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260618102126.177217-1-s.sterz@proxmox.com> References: <20260618102126.177217-1-s.sterz@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1781778033221 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.043 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 POISEN_SPAM_PILL 0.1 Meta: its spam POISEN_SPAM_PILL_2 0.1 random spam to be learned in bayes POISEN_SPAM_PILL_4 0.1 random spam to be learned in bayes SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [mod.rs] Message-ID-Hash: PVFDZI7RIPYZZV4TIVC4YCA7SDK6BKZY X-Message-ID-Hash: PVFDZI7RIPYZZV4TIVC4YCA7SDK6BKZY X-MailFrom: s.sterz@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Datacenter Manager development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: so users can set custom comments and mark them as default realm if required. Signed-off-by: Shannon Sterz --- src/auth_view.rs | 52 ++++++++++++++++++++++++++++++++++++++++++++++-- src/utils/mod.rs | 4 ++-- 2 files changed, 52 insertions(+), 4 deletions(-) diff --git a/src/auth_view.rs b/src/auth_view.rs index 9a06979..8be682a 100644 --- a/src/auth_view.rs +++ b/src/auth_view.rs @@ -5,7 +5,7 @@ use std::rc::Rc; use anyhow::Error; use proxmox_client::ApiResponseData; -use pwt::widget::form::{Checkbox, FormContext, TristateBoolean}; +use pwt::widget::form::{Checkbox, DisplayField, Field, FormContext, TristateBoolean}; use serde_json::Value; use yew::html::IntoPropValue; use yew::virtual_dom::{VComp, VNode}; @@ -19,6 +19,7 @@ use pwt::widget::{Button, Container, Fa, InputPanel, Toolbar}; use pwt_macros::builder; +use crate::form::delete_empty_values; use crate::{ AuthEditLDAP, AuthEditOpenID, EditWindow, LoadableComponent, LoadableComponentContext, LoadableComponentMaster, LoadableComponentScope, LoadableComponentScopeExt, @@ -37,6 +38,12 @@ pub struct AuthView { /// The base url for pub base_url: AttrValue, + /// The base URL to edit the default realms (pam, pve, pdm, pbs etc.). Specify `None` if + /// editing the default realms is not supported. + #[prop_or(Some("/config/access/".into()))] + #[builder(IntoPropValue, into_prop_value)] + pub edit_default_realms_base_url: Option, + /// Allow to add/edit OpenID entries #[builder(IntoPropValue, into_prop_value)] #[prop_or_default] @@ -73,6 +80,7 @@ pub enum ViewState { EditOpenID(AttrValue), EditLDAP(AttrValue), EditAd(AttrValue), + EditDefaultRealm(AttrValue), Sync(BasicRealmInfo), } @@ -164,6 +172,33 @@ async fn load_realm(url: impl Into) -> Result, Er Ok(response) } +fn edit_default_realm(realm: AttrValue, url: AttrValue) -> EditWindow { + let url = format!("{url}/{realm}"); + EditWindow::new(tr!("Edit: {realm}", realm)) + .loader(url.clone()) + .renderer({ + move |_form_ctx: &FormContext| { + InputPanel::new() + .padding(4) + .with_field( + tr!("Realm"), + DisplayField::new().name("realm").submit(false), + ) + .with_right_field(tr!("Default Realm"), Checkbox::new().name("default")) + .with_large_field(tr!("Comment"), Field::new().name("comment")) + .into() + } + }) + .on_submit(move |form_ctx: FormContext| { + let url = url.clone(); + async move { + let data = form_ctx.get_submit_data(); + let data = delete_empty_values(&data, &["comment"], true); + crate::http_put(&url, Some(data)).await + } + }) +} + impl ProxmoxAuthView { fn get_selected_record(&self) -> Option { let selected_key = self.selection.selected_key(); @@ -254,6 +289,11 @@ impl LoadableComponent for ProxmoxAuthView { "ad" if props.ad_base_url.is_some() => { Some(ViewState::EditAd(info.realm.into())) } + "pam" | "pbs" | "pdm" | "pve" + if props.edit_default_realms_base_url.is_some() => + { + Some(ViewState::EditDefaultRealm(info.realm.into())) + } _ => return true, }; @@ -285,7 +325,7 @@ impl LoadableComponent for ProxmoxAuthView { if let Some(auth_info) = crate::utils::get_auth_domain_info(&realm_info.ty) { sync_disabled = !auth_info.sync; remove_disabled = !auth_info.add; - edit_disabled = !auth_info.add; + edit_disabled = !auth_info.edit; } } @@ -408,6 +448,14 @@ impl LoadableComponent for ProxmoxAuthView { .on_close(ctx.link().change_view_callback(|_| None)) .into(), ), + ViewState::EditDefaultRealm(realm) => Some( + edit_default_realm( + realm.clone(), + props.edit_default_realms_base_url.clone().unwrap(), + ) + .on_done(ctx.link().change_view_callback(|_| None)) + .into(), + ), ViewState::Sync(realm) => { let link = ctx.link().clone(); let url = format!( diff --git a/src/utils/mod.rs b/src/utils/mod.rs index c007286..25fd414 100644 --- a/src/utils/mod.rs +++ b/src/utils/mod.rs @@ -172,7 +172,7 @@ pub fn get_auth_domain_info(ty: &str) -> Option { ty: ty.to_string(), //description: tr!("Linux PAM"), add: false, - edit: false, + edit: true, tfa: true, pwchange: false, sync: false, @@ -184,7 +184,7 @@ pub fn get_auth_domain_info(ty: &str) -> Option { ty: ty.to_string(), //description: tr!("Proxmox VE authentication server"), add: false, - edit: false, + edit: true, tfa: true, pwchange: true, sync: false, -- 2.47.3