-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 On Sun, 2018-07-01 at 13:45 +0200, Peter Müller wrote: > Hello Michael, > > > Hi, > > > > On Sun, 2018-07-01 at 07:49 +0200, Peter Müller wrote: > > > Hello Michael, > > > yes, I built IPfire 2.x yesterday, and the image data were included > > > into /srv/web/ipfire/html/redirect-templates/legacy/template.html . > > > Is there anything wrong with this patch? > > > > Yes, see below... > > > > > Best regards, > > > Peter Müller > > > > Hey, > > > > > > > > On Sat, 2018-06-30 at 09:56 +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) 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üller > > > > > --- > > > > > 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 @@ > > > > > > > > > > > > > > > ACCESS MESSAGE > > > > > + > > > > > > > > > > > > > > > > > > > > > > > > > - > > > > > > > > > >
> > > > height='130' > > > > > align="center" background=" > > > > NAME="ADDRESS">/images/background.gif"> > > > > > + > > > > height='152px' > > > > > align="center" class="image"> 
> > > > > > > > > bgcolor='#CC000000' > > > > > width='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="$( 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. > > This sounds correct. However, in case I ran "./make.sh build", there actually > is some image data in the built file: > > ~> cat ~/devel/ipfire-2.x/build/srv/web/ipfire/html/redirect- > templates/legacy/template.html | head -n 8 > > > > > ACCESS MESSAGE >