diff mbox series

[v5] embed background image in redirect template

Message ID	20180910141544.4669-1-peter.mueller@link38.eu
State	Accepted
Headers	From: =?utf-8?q?Peter_M=C3=BCller?= <peter.mueller@link38.eu> To: development@lists.ipfire.org Subject: [PATCH v5] embed background image in redirect template Date: Mon, 10 Sep 2018 16:15:44 +0200 Message-Id: <20180910141544.4669-1-peter.mueller@link38.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ipnet: 37.120.160.0/19(-4.96), asn: 197540(-3.96), country: DE(-0.09)]; ASN(0.00)[asn:197540, ipnet:37.120.160.0/19, country:DE]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%]; HAS_DATA_URI(0.00)[] Precedence: list Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org>
Series	[v5] embed background image in redirect template \| [v5] embed background image in redirect template

Commit Message

Peter Müller Sept. 11, 2018, 12:15 a.m. UTC

  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@link38.eu>
---
 html/html/redirect-templates/legacy/template.html | 7 ++++++-
 lfs/web-user-interface                            | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

Comments

Michael Tremer Sept. 11, 2018, 1:31 a.m. UTC | #1

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@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">&nbsp;</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 \

diff mbox series

Patch

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">&nbsp;</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 \