From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH v2] embed background image in redirect template Date: Sun, 01 Jul 2018 10:36:48 +0100 Message-ID: <62c066635c2dabc0643f405e3a1b22520bd4c870.camel@ipfire.org> In-Reply-To: <7cac879b-faef-ef9e-90f4-4fceec7d6c62@link38.eu> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5396306933757779077==" List-Id: --===============5396306933757779077== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Hi, On Sun, 2018-07-01 at 07:49 +0200, Peter M=C3=BCller wrote: > Hello Michael, >=20 > yes, I built IPfire 2.x yesterday, and the image data were included > into /srv/web/ipfire/html/redirect-templates/legacy/template.html . >=20 > Is there anything wrong with this patch? Yes, see below... > Best regards, > Peter M=C3=BCller >=20 > > Hey, > >=20 > > On Sat, 2018-06-30 at 09:56 +0200, Peter M=C3=BCller 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) and > > > fixes #11650. > > > This patch inserts the base64 encoded image during build so > > > nothing needs to be updated twice in case background image > > > changes. > > > Signed-off-by: Peter M=C3=BCller > > > --- > > > html/html/redirect-templates/legacy/template.html | 7 ++++++- > > > lfs/web-user-interface | 4 ++++ > > > 2 files changed, 10 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 @@ > > > > > > > > charset=3Dutf-8">=20 > > > ACCESS MESSAGE > > > + > > > > > > > > > > > > > > > - > > > > > >
> > align=3D"center" background=3D" > > NAME=3D"ADDRESS">/images/background.gif"> > > > + > > height=3D'152px' > > > align=3D"center" class=3D"image"> 
> > > > > width=3D'80%'> > > > diff --git a/lfs/web-user-interface b/lfs/web-user-interface > > > index 0c5688252..b023cbd86 100644 > > > --- a/lfs/web-user-interface > > > +++ b/lfs/web-user-interface > > > @@ -50,6 +50,10 @@ md5: > > > $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > > > @$(PREBUILD) > > > + # Add base64 encoded background image to Squid content access > > > page > > > + basedata=3D"$( base64 $(DIR_SRC)/html/html/images/background.gif )" > > > + sed -i "s/IMAGEDATAPLACEHOLDER/${basedata}/g" > > > $(DIR_SRC)/html/html/redirect-templates/legacy/template.html This isn't a shell script. It is make in which every line invokes a new shell. Therefore the variable assignment happens in one shell and then the next line= in executed in a new one which knows nothing about the previous variable assignment. You will have an empty image in the result file I think. - -Michael > >=20 > > Did you actually test this? > >=20 > > > + > > > # Copy all html/cgi-bin files > > > mkdir -p /srv/web/ipfire/{cgi-bin,html} > > > mkdir -p /var/updatecache/{download,metadata} > >=20 > > -Michael > >=20 >=20 >=20 -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEE5/rW5l3GGe2ypktxgHnw/2+QCQcFAls4oLEACgkQgHnw/2+Q CQeJPA//TaqkNL0v9LL6IHEdI2hgHi64CjySvcDvdl3OjCw0oB5EEU5NivgI2jne Wbdlgq6GwJdZaMAUP753MQVCFznO29RSSwKxo9wlCaqMnYxmPe0f83WepWV4c7dL Fo8CplgYDdRk24wI7p68Gmexg2ZJj83IYHNTLQhqCI23WVhKtjiXQu0hRen/rreW KVoz/xqmjge2a34MhGOlbx7ZKDK0qzvpQC3ZmNgDn9BEOHHBdaxPal6b0NbyyaAu rNssQxhf5gAWGWvqCnKSf+hDgAckhpS5O6yvKp3SzlDvq2YSfVsAWSpTlAv4L/JY gGXRsd0cu9JMjLWD2gafCJ2cPHTZAYDo9Ll+NLIUi0deHTKPIsc+8XeL6U2z51qE SoWUtE0RI9Qbz80r7N/EDOVc6mIMJ1dxCQdEA2M+JDyBKyZOJRfpxG3Hf0k+JxxD N/V/u5IXxgb8CVOGQ99pPYVqI7qDVcP4eGjB49p32UxAplxg4z+d0E6JAYUjyjET uhlHUv9T/vlp8bt+GZTTyInTu/5qF5JWxeL78EIgcM868BnxI4S1Fq222P9suTy5 G9rxLK6Omf2I/YhLi9aTdjY358Qh6MUuxT0GCpr6FJFM+XnYnymsvACNM68Cji5s MNhDre+R68qb9KOcWv5kAi4lOH6sQaimzXSDalZ0QnWV1m+2ch8=3D =3D31DP -----END PGP SIGNATURE----- --===============5396306933757779077==--