From: Gabriel Goller <g.goller@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox v3 4/7] rest-server: add custom handlebars escape fn
Date: Fri, 7 Jun 2024 13:48:35 +0200 [thread overview]
Message-ID: <20240607114846.321729-5-g.goller@proxmox.com> (raw)
In-Reply-To: <20240607114846.321729-1-g.goller@proxmox.com>
Add a custom handlebars escape function. It's nearly identical to the
default `html_escape` fn [0], but it does not escape the '='. This is
needed to support base64 encoded values.
[0]: https://docs.rs/handlebars/latest/handlebars/fn.html_escape.html
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
proxmox-rest-server/src/api_config.rs | 28 ++++++++++++++++++++++++++-
1 file changed, 27 insertions(+), 1 deletion(-)
diff --git a/proxmox-rest-server/src/api_config.rs b/proxmox-rest-server/src/api_config.rs
index eaece05a..bf311f4b 100644
--- a/proxmox-rest-server/src/api_config.rs
+++ b/proxmox-rest-server/src/api_config.rs
@@ -60,7 +60,7 @@ impl ApiConfig {
privileged_addr: None,
#[cfg(feature = "templates")]
- templates: Default::default(),
+ templates: templates::Templates::with_escape_fn(),
}
}
@@ -333,6 +333,32 @@ mod templates {
}
impl Templates {
+ pub fn with_escape_fn() -> Templates {
+ let mut registry = Handlebars::new();
+ // This is the same as the default `html_escape` fn in
+ // handlebars, **but** it does not escape the '='. This
+ // is to preserve base64 values.
+ registry.register_escape_fn(|value| {
+ let mut output = String::new();
+ for c in value.chars() {
+ match c {
+ '<' => output.push_str("<"),
+ '>' => output.push_str(">"),
+ '"' => output.push_str("""),
+ '&' => output.push_str("&"),
+ '\'' => output.push_str("'"),
+ '`' => output.push_str("`"),
+ _ => output.push(c),
+ }
+ }
+ output
+ });
+ Self {
+ templates: RwLock::new(registry),
+ template_files: RwLock::new(HashMap::new()),
+ }
+ }
+
pub fn register<P>(&self, name: &str, path: P) -> Result<(), Error>
where
P: Into<PathBuf>,
--
2.43.0
_______________________________________________
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-06-07 11:48 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-07 11:48 [pbs-devel] [PATCH widget-toolkit/proxmox{, -backup} v3 0/7] fix #5463: add optional consent banner before login Gabriel Goller
2024-06-07 11:48 ` [pbs-devel] [PATCH widget-toolkit v3 1/7] utils: add base64 conversion helper Gabriel Goller
2024-06-07 11:48 ` [pbs-devel] [PATCH widget-toolkit v3 2/7] window: add consent modal Gabriel Goller
2024-06-07 11:48 ` [pbs-devel] [PATCH widget-toolkit v3 3/7] form: add support for multiline textarea Gabriel Goller
2024-06-07 11:48 ` Gabriel Goller [this message]
2024-06-07 11:48 ` [pbs-devel] [PATCH proxmox-backup v3 5/7] api: add consent api handler and config option Gabriel Goller
2024-06-07 11:48 ` [pbs-devel] [PATCH proxmox-backup v3 6/7] ui: show consent banner before login Gabriel Goller
2024-06-07 11:48 ` [pbs-devel] [PATCH proxmox-backup v3 7/7] docs: add section about consent banner Gabriel Goller
2024-09-13 13:10 ` [pbs-devel] [PATCH widget-toolkit/proxmox{, -backup} v3 0/7] fix #5463: add optional consent banner before login Gabriel Goller
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=20240607114846.321729-5-g.goller@proxmox.com \
--to=g.goller@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.