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 A8F811FF15C for ; Fri, 14 Nov 2025 13:11:32 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BD08511524; Fri, 14 Nov 2025 13:12:24 +0100 (CET) From: Dominik Csapak To: pdm-devel@lists.proxmox.com Date: Fri, 14 Nov 2025 13:11:32 +0100 Message-ID: <20251114121218.2479318-19-d.csapak@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251114121218.2479318-1-d.csapak@proxmox.com> References: <20251114121218.2479318-1-d.csapak@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.029 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: [pdm-devel] [PATCH datacenter-manager v2 18/18] server: api: views: check layout string for validity X-BeenThere: pdm-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Datacenter Manager development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Datacenter Manager development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pdm-devel-bounces@lists.proxmox.com Sender: "pdm-devel" check the validity by trying to serialize into a ViewTemplate, since that is what the ui expects. Fail the api call if that does not work. Signed-off-by: Dominik Csapak --- server/src/api/config/views.rs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/server/src/api/config/views.rs b/server/src/api/config/views.rs index 8c5a1d29..8c6744e2 100644 --- a/server/src/api/config/views.rs +++ b/server/src/api/config/views.rs @@ -6,7 +6,7 @@ use proxmox_router::{http_bail, http_err, Permission, Router, RpcEnvironment}; use proxmox_schema::{api, param_bail}; use pdm_api_types::{ - views::{ViewConfig, ViewConfigEntry, ViewConfigUpdater}, + views::{ViewConfig, ViewConfigEntry, ViewConfigUpdater, ViewTemplate}, PRIV_RESOURCE_AUDIT, PRIV_RESOURCE_MODIFY, }; use serde::{Deserialize, Serialize}; @@ -91,6 +91,12 @@ pub fn add_view(view: ViewConfig, digest: Option) -> Result<(), Er let id = view.id.clone(); + if !view.layout.is_empty() { + if let Err(err) = serde_json::from_str::(&view.layout) { + param_bail!("layout", "layout is not valid: '{}'", err) + } + } + if let Some(ViewConfigEntry::View(_)) = config.insert(id.clone(), ViewConfigEntry::View(view)) { param_bail!("id", "view '{}' already exists.", id) } @@ -181,6 +187,11 @@ pub fn update_view( } if let Some(layout) = view.layout { + if !layout.is_empty() { + if let Err(err) = serde_json::from_str::(&layout) { + param_bail!("layout", "layout is not valid: '{}'", err) + } + } conf.layout = layout; } -- 2.47.3 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel