From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH v3] embed background image in redirect template
Date: Mon, 27 Aug 2018 07:37:12 +0100 [thread overview]
Message-ID: <53963aa7a6dd33e84c3fbeef9e0cf7a38703a959.camel@ipfire.org> (raw)
In-Reply-To: <40ee64c6-91d2-802d-8f2d-61c345f0a2c3@link38.eu>
[-- 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-----
next prev parent reply other threads:[~2018-08-27 6:37 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-26 19:15 Peter Müller
2018-08-27 6:37 ` Michael Tremer [this message]
2018-08-27 15:24 ` [PATCH v4] " Peter Müller
2018-08-27 15:46 ` [PATCH v3] " Peter Müller
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=53963aa7a6dd33e84c3fbeef9e0cf7a38703a959.camel@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox