From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 57E1C63E99 for ; Fri, 17 Jul 2020 15:38:41 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4BF2E1C97A for ; Fri, 17 Jul 2020 15:38:41 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 56D7B1C972 for ; Fri, 17 Jul 2020 15:38:40 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 226254314E for ; Fri, 17 Jul 2020 15:38:40 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Fri, 17 Jul 2020 15:38:37 +0200 Message-Id: <20200717133838.7244-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200717133838.7244-1-d.csapak@proxmox.com> References: <20200717133838.7244-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.007 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an 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. [config.rs, proxmox-backup-proxy.rs, rest.rs] Subject: [pbs-devel] [PATCH proxmox-backup 1/2] server/config: add mechanism to update template 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: , X-List-Received-Date: Fri, 17 Jul 2020 13:38:41 -0000 instead of exposing handlebars itself, offer a register_template and a render_template ourselves. render_template checks if the template file was modified since the last render and reloads it when necessary Signed-off-by: Dominik Csapak --- src/bin/proxmox-backup-proxy.rs | 6 ++- src/server/config.rs | 67 +++++++++++++++++++++++++++++---- src/server/rest.rs | 13 +++---- 3 files changed, 70 insertions(+), 16 deletions(-) diff --git a/src/bin/proxmox-backup-proxy.rs b/src/bin/proxmox-backup-proxy.rs index 75f53b9..1e93886 100644 --- a/src/bin/proxmox-backup-proxy.rs +++ b/src/bin/proxmox-backup-proxy.rs @@ -1,5 +1,5 @@ use std::sync::Arc; -use std::path::Path; +use std::path::{Path, PathBuf}; use anyhow::{bail, format_err, Error}; use futures::*; @@ -53,6 +53,10 @@ async fn run() -> Result<(), Error> { config.add_alias("css", "/usr/share/javascript/proxmox-backup/css"); config.add_alias("docs", "/usr/share/doc/proxmox-backup/html"); + let mut indexpath = PathBuf::from(buildcfg::JS_DIR); + indexpath.push("index.hbs"); + config.register_template("index", &indexpath)?; + let rest_server = RestServer::new(config); //openssl req -x509 -newkey rsa:4096 -keyout /etc/proxmox-backup/proxy.key -out /etc/proxmox-backup/proxy.pem -nodes diff --git a/src/server/config.rs b/src/server/config.rs index e8b3c94..3ee4ea1 100644 --- a/src/server/config.rs +++ b/src/server/config.rs @@ -1,9 +1,13 @@ use std::collections::HashMap; -use std::path::{PathBuf}; -use anyhow::Error; +use std::path::PathBuf; +use std::time::SystemTime; +use std::fs::metadata; +use std::sync::RwLock; +use anyhow::{bail, Error, format_err}; use hyper::Method; use handlebars::Handlebars; +use serde::Serialize; use proxmox::api::{ApiMethod, Router, RpcEnvironmentType}; @@ -12,21 +16,20 @@ pub struct ApiConfig { router: &'static Router, aliases: HashMap, env_type: RpcEnvironmentType, - pub templates: Handlebars<'static>, + templates: RwLock>, + template_files: RwLock>, } impl ApiConfig { pub fn new>(basedir: B, router: &'static Router, env_type: RpcEnvironmentType) -> Result { - let mut templates = Handlebars::new(); - let basedir = basedir.into(); - templates.register_template_file("index", basedir.join("index.hbs"))?; Ok(Self { - basedir, + basedir: basedir.into(), router, aliases: HashMap::new(), env_type, - templates + templates: RwLock::new(Handlebars::new()), + template_files: RwLock::new(HashMap::new()), }) } @@ -67,4 +70,52 @@ impl ApiConfig { pub fn env_type(&self) -> RpcEnvironmentType { self.env_type } + + pub fn register_template

(&self, name: &str, path: P) -> Result<(), Error> + where + P: Into + { + if self.template_files.read().unwrap().contains_key(name) { + bail!("template already registered"); + } + + let path: PathBuf = path.into(); + let metadata = metadata(&path)?; + let mtime = metadata.modified()?; + + self.templates.write().unwrap().register_template_file(name, &path)?; + self.template_files.write().unwrap().insert(name.to_string(), (mtime, path)); + + Ok(()) + } + + /// Checks if the template was modified since the last rendering + /// if yes, it loads a the new version of the template + pub fn render_template(&self, name: &str, data: &T) -> Result + where + T: Serialize, + { + let path; + let mtime; + { + let template_files = self.template_files.read().unwrap(); + let (old_mtime, old_path) = template_files.get(name).ok_or_else(|| format_err!("template not found"))?; + + mtime = metadata(old_path)?.modified()?; + if mtime <= *old_mtime { + return self.templates.read().unwrap().render(name, data).map_err(|err| format_err!("{}", err)); + } + path = old_path.to_path_buf(); + } + + { + let mut template_files = self.template_files.write().unwrap(); + let mut templates = self.templates.write().unwrap(); + + templates.register_template_file(name, &path)?; + template_files.insert(name.to_string(), (mtime, path)); + + templates.render(name, data).map_err(|err| format_err!("{}", err)) + } + } } diff --git a/src/server/rest.rs b/src/server/rest.rs index d05e51a..a7b0a23 100644 --- a/src/server/rest.rs +++ b/src/server/rest.rs @@ -16,7 +16,6 @@ use serde_json::{json, Value}; use tokio::fs::File; use tokio::time::Instant; use url::form_urlencoded; -use handlebars::Handlebars; use proxmox::http_err; use proxmox::api::{ApiHandler, ApiMethod, HttpError}; @@ -312,7 +311,7 @@ pub async fn handle_api_request, token: Option, template: &Handlebars, parts: Parts) -> Response { +fn get_index(username: Option, token: Option, api: &Arc, parts: Parts) -> Response { let nodename = proxmox::tools::nodename(); let username = username.unwrap_or_else(|| String::from("")); @@ -338,11 +337,11 @@ fn get_index(username: Option, token: Option, template: &Handleb let mut ct = "text/html"; - let index = match template.render("index", &data) { + let index = match api.render_template("index", &data) { Ok(index) => index, Err(err) => { ct = "text/plain"; - format!("Error rendering template: {}", err.desc) + format!("Error rendering template: {}", err) }, }; @@ -580,15 +579,15 @@ pub async fn handle_request(api: Arc, req: Request) -> Result { let new_token = assemble_csrf_prevention_token(csrf_secret(), &username); - return Ok(get_index(Some(username), Some(new_token), &api.templates, parts)); + return Ok(get_index(Some(username), Some(new_token), &api, parts)); } _ => { tokio::time::delay_until(Instant::from_std(delay_unauth_time)).await; - return Ok(get_index(None, None, &api.templates, parts)); + return Ok(get_index(None, None, &api, parts)); } } } else { - return Ok(get_index(None, None, &api.templates, parts)); + return Ok(get_index(None, None, &api, parts)); } } else { let filename = api.find_alias(&components); -- 2.20.1