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 F1E891FF389 for ; Wed, 22 May 2024 15:19:38 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 39927E0E7; Wed, 22 May 2024 15:19:56 +0200 (CEST) From: Gabriel Goller To: pbs-devel@lists.proxmox.com Date: Wed, 22 May 2024 15:19:41 +0200 Message-ID: <20240522131950.247728-2-g.goller@proxmox.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240522131950.247728-1-g.goller@proxmox.com> References: <20240522131950.247728-1-g.goller@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.070 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: [pbs-devel] [PATCH proxmox-backup 1/4] api: add consent api handler and config 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" Add config function to retrieve consent text from file and add it to template function. Signed-off-by: Gabriel Goller --- src/bin/proxmox-backup-proxy.rs | 6 ++++++ src/config/consent.rs | 11 +++++++++++ src/config/mod.rs | 1 + 3 files changed, 18 insertions(+) create mode 100644 src/config/consent.rs diff --git a/src/bin/proxmox-backup-proxy.rs b/src/bin/proxmox-backup-proxy.rs index 15444685..16b7fb6c 100644 --- a/src/bin/proxmox-backup-proxy.rs +++ b/src/bin/proxmox-backup-proxy.rs @@ -152,6 +152,11 @@ async fn get_index_future(env: RestEnvironment, parts: Parts) -> Response let theme = get_theme(&parts.headers); + let consent = if let Ok(text) = proxmox_backup::config::consent::config() { + text + } else { + "".to_string() + }; let data = json!({ "NodeName": nodename, "UserName": user, @@ -160,6 +165,7 @@ async fn get_index_future(env: RestEnvironment, parts: Parts) -> Response "theme": theme, "auto": theme == "auto", "debug": debug, + "consentText": consent, }); let (ct, index) = match api.render_template(template_file, &data) { diff --git a/src/config/consent.rs b/src/config/consent.rs new file mode 100644 index 00000000..55ef201c --- /dev/null +++ b/src/config/consent.rs @@ -0,0 +1,11 @@ +use anyhow::Error; + +use pbs_buildcfg::configdir; + +const CONF_FILE: &str = configdir!("/consent.txt"); + +/// Read the Consent config. +pub fn config() -> Result { + let content = proxmox_sys::fs::file_read_optional_string(CONF_FILE)?.unwrap_or_default(); + Ok(content) +} diff --git a/src/config/mod.rs b/src/config/mod.rs index 324fabca..81caf0d5 100644 --- a/src/config/mod.rs +++ b/src/config/mod.rs @@ -15,6 +15,7 @@ use proxmox_lang::try_block; use pbs_buildcfg::{self, configdir}; pub mod acme; +pub mod consent; pub mod node; pub mod tfa; -- 2.43.0 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel