* [PATCH v3] embed background image in redirect template
@ 2018-08-26 19:15 Peter Müller
2018-08-27 6:37 ` Michael Tremer
0 siblings, 1 reply; 4+ messages in thread
From: Peter Müller @ 2018-08-26 19:15 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2367 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 and second 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..f3367713a 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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v3] embed background image in redirect template
2018-08-26 19:15 [PATCH v3] embed background image in redirect template Peter Müller
@ 2018-08-27 6:37 ` Michael Tremer
2018-08-27 15:24 ` [PATCH v4] " Peter Müller
2018-08-27 15:46 ` [PATCH v3] " Peter Müller
0 siblings, 2 replies; 4+ messages in thread
From: Michael Tremer @ 2018-08-27 6:37 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 3536 bytes --]
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Hi,
On Sun, 2018-08-26 at 21: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 and second 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..f3367713a 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
> +
${DIR_SRC} should be $(DIR_SRC) in order to be expanded from the Makefile and
not from the shell environment.
I am not even sure if DIR_SRC is guaranteed to be set.
> # Change CONFIG_ROOT in cgi-scripts
> for i in /srv/web/ipfire/cgi-bin/{*,logs.cgi/*,vpn.cgi/*}; do \
> if [ -f $$i ]; then \
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEE5/rW5l3GGe2ypktxgHnw/2+QCQcFAluDnBgACgkQgHnw/2+Q
CQc3iw/6A0zu4FLjp8XmNBgjZYxz3jfR6Js2wUQHkIRmuPqt6+RACNOsyHdeC58P
NPlIQpxwcPqXLzRlFRThGCBIXyER3ezs+4xWIFPQ/60yFYZwLGevKGYLtynCYPFv
Lmg+hc/zEnDsj0e+faocMr3yh1QtbVC8tNB/Q61kVRvMT3a4qIc0zAc01zLg15Hn
+av8SbW90p6cyzdd1AAYlql98vkh0K/S94TW5pBzN/NEADjvZXLQn+Ch89ibZfR3
VDDOsO0ETCPCvOO6us2YzuTvdCGvN1CCfaFgLZZ++lr4LMUW33T829Ssp6vEupLT
eJnUEE+J0NhTTACqeNUxbJ2Tv2K6H/5LsiYWwlZUiznXBaYiPBWbXeNucn2M+w7Y
nnfu/p3XISkQdXQHozsCVjkNtrFJF6YDex4HIx5RDdgNPz6K+0IfaEcxqqMFIVvg
dYajrnl18iP/Zlc5mzIzAaFIvVygK3LJmDUEGyeHXcYX00LmtzoWqiCd8WQnsFCW
8LXraT7Fekg5pDibrMWVCXOYSxce+++eDVzet7HKwM97SJeTkBw2F0cQ3dDnpE5C
cbrf93xHdoMdDoxu1RYoVQ9ZZLOCf8owOwvagesQXL6R/y4Ihm9Cqg0qDwFv+aFc
c7tBHuKmkE16WI4WI5uAWVISh/gAj/hjRLBF6+qHivqn20mvCbI=
=2yOA
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH v4] embed background image in redirect template
2018-08-27 6:37 ` Michael Tremer
@ 2018-08-27 15:24 ` Peter Müller
2018-08-27 15:46 ` [PATCH v3] " Peter Müller
1 sibling, 0 replies; 4+ messages in thread
From: Peter Müller @ 2018-08-27 15:24 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2374 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, second and third 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..f3367713a 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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v3] embed background image in redirect template
2018-08-27 6:37 ` Michael Tremer
2018-08-27 15:24 ` [PATCH v4] " Peter Müller
@ 2018-08-27 15:46 ` Peter Müller
1 sibling, 0 replies; 4+ messages in thread
From: Peter Müller @ 2018-08-27 15:46 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 3165 bytes --]
Hello,
> Hi,
>
> On Sun, 2018-08-26 at 21: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 and second 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..f3367713a 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
>> +
>
> ${DIR_SRC} should be $(DIR_SRC) in order to be expanded from the Makefile and
> not from the shell environment.
Sorry about this - fixed in v4, although it worked.
>
> I am not even sure if DIR_SRC is guaranteed to be set.
I must say, using shell commands in LFS files is somewhat tricky...
Best regards,
Peter Müller
>
>> # Change CONFIG_ROOT in cgi-scripts
>> for i in /srv/web/ipfire/cgi-bin/{*,logs.cgi/*,vpn.cgi/*}; do \
>> if [ -f $$i ]; then \
>
--
Microsoft DNS service terminates abnormally when it recieves a response
to a DNS query that was never made. Fix Information: Run your DNS
service on a different platform.
-- bugtraq
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-08-27 15:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-26 19:15 [PATCH v3] embed background image in redirect template Peter Müller
2018-08-27 6:37 ` Michael Tremer
2018-08-27 15:24 ` [PATCH v4] " Peter Müller
2018-08-27 15:46 ` [PATCH v3] " Peter Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox