* [PATCH v5] embed background image in redirect template
@ 2018-09-10 14:15 Peter Müller
2018-09-10 15:31 ` Michael Tremer
0 siblings, 1 reply; 2+ messages in thread
From: Peter Müller @ 2018-09-10 14:15 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2366 bytes --]
Embed the IPFire background image into the redirect template
directly via CSS instead of loading it from somewhere else.
This is necessary because of Content Security Policy (CSP).
This patch inserts the base64 encoded image during build so
nothing needs to be updated twice in case background image
changes.
It supersedes first to fourth version of this patch and has
been successfully tested during a clean build.
Fixes #11650
Signed-off-by: Peter Müller <peter.mueller(a)link38.eu>
---
html/html/redirect-templates/legacy/template.html | 7 ++++++-
lfs/web-user-interface | 5 +++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/html/html/redirect-templates/legacy/template.html b/html/html/redirect-templates/legacy/template.html
index b5fb61ebe..297561e3a 100644
--- a/html/html/redirect-templates/legacy/template.html
+++ b/html/html/redirect-templates/legacy/template.html
@@ -3,11 +3,16 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>ACCESS MESSAGE</title>
+ <style content="text/css">
+ td.image {
+ background-image: url(data:image/gif;base64,IMAGEDATAPLACEHOLDER);
+ }
+ </style>
</head>
<body>
<table width="100%" height='100%' border="0">
<tr>
- <td colspan='3' width='100%' height='130' align="center" background="<TMPL_VAR NAME="ADDRESS">/images/background.gif">
+ <td colspan='3' width='100%' height='152px' align="center" class="image"> </td>
<tr>
<td width='10%'>
<td align='center' bgcolor='#CC000000' width='80%'>
diff --git a/lfs/web-user-interface b/lfs/web-user-interface
index 0c5688252..73aec3a8d 100644
--- a/lfs/web-user-interface
+++ b/lfs/web-user-interface
@@ -55,6 +55,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
mkdir -p /var/updatecache/{download,metadata}
cp -aR $(DIR_SRC)/html/* /srv/web/ipfire
+ # Add base64 encoded background image to Squid content access page
+ basedata="$$( base64 $(DIR_SRC)/html/html/images/background.gif | tr -d '\n' )"; \
+ sed -i "s|IMAGEDATAPLACEHOLDER|$${basedata}|g" \
+ /srv/web/ipfire/html/redirect-templates/legacy/template.html
+
# Change CONFIG_ROOT in cgi-scripts
for i in /srv/web/ipfire/cgi-bin/{*,logs.cgi/*,vpn.cgi/*}; do \
if [ -f $$i ]; then \
--
2.16.4
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH v5] embed background image in redirect template
2018-09-10 14:15 [PATCH v5] embed background image in redirect template Peter Müller
@ 2018-09-10 15:31 ` Michael Tremer
0 siblings, 0 replies; 2+ messages in thread
From: Michael Tremer @ 2018-09-10 15:31 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2495 bytes --]
Cool. Merged!
On Mon, 2018-09-10 at 16:15 +0200, Peter Müller wrote:
> Embed the IPFire background image into the redirect template
> directly via CSS instead of loading it from somewhere else.
> This is necessary because of Content Security Policy (CSP).
>
> This patch inserts the base64 encoded image during build so
> nothing needs to be updated twice in case background image
> changes.
>
> It supersedes first to fourth version of this patch and has
> been successfully tested during a clean build.
>
> Fixes #11650
>
> Signed-off-by: Peter Müller <peter.mueller(a)link38.eu>
> ---
> html/html/redirect-templates/legacy/template.html | 7 ++++++-
> lfs/web-user-interface | 5 +++++
> 2 files changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/html/html/redirect-templates/legacy/template.html
> b/html/html/redirect-templates/legacy/template.html
> index b5fb61ebe..297561e3a 100644
> --- a/html/html/redirect-templates/legacy/template.html
> +++ b/html/html/redirect-templates/legacy/template.html
> @@ -3,11 +3,16 @@
> <head>
> <meta http-equiv="Content-Type" content="text/html; charset=utf-
> 8">
> <title>ACCESS MESSAGE</title>
> + <style content="text/css">
> + td.image {
> + background-image:
> url(data:image/gif;base64,IMAGEDATAPLACEHOLDER);
> + }
> + </style>
> </head>
> <body>
> <table width="100%" height='100%' border="0">
> <tr>
> - <td colspan='3' width='100%' height='130'
> align="center" background="<TMPL_VAR NAME="ADDRESS">/images/background.gif">
> + <td colspan='3' width='100%' height='152px'
> align="center" class="image"> </td>
> <tr>
> <td width='10%'>
> <td align='center' bgcolor='#CC000000'
> width='80%'>
> diff --git a/lfs/web-user-interface b/lfs/web-user-interface
> index 0c5688252..73aec3a8d 100644
> --- a/lfs/web-user-interface
> +++ b/lfs/web-user-interface
> @@ -55,6 +55,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> mkdir -p /var/updatecache/{download,metadata}
> cp -aR $(DIR_SRC)/html/* /srv/web/ipfire
>
> + # Add base64 encoded background image to Squid content access page
> + basedata="$$( base64 $(DIR_SRC)/html/html/images/background.gif | tr -d
> '\n' )"; \
> + sed -i "s|IMAGEDATAPLACEHOLDER|$${basedata}|g" \
> + /srv/web/ipfire/html/redirect-templates/legacy/template.html
> +
> # Change CONFIG_ROOT in cgi-scripts
> for i in /srv/web/ipfire/cgi-bin/{*,logs.cgi/*,vpn.cgi/*}; do \
> if [ -f $$i ]; then \
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-09-10 15:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-10 14:15 [PATCH v5] embed background image in redirect template Peter Müller
2018-09-10 15:31 ` Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox