From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter =?utf-8?q?M=C3=BCller?= To: development@lists.ipfire.org Subject: [PATCH v3] embed background image in redirect template Date: Sun, 26 Aug 2018 21:15:39 +0200 Message-ID: <40ee64c6-91d2-802d-8f2d-61c345f0a2c3@link38.eu> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3013004416912807391==" List-Id: --===============3013004416912807391== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=C3=BCller --- 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/re= direct-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 + -
/images/background.gif"> +  
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 =20 + # Add base64 encoded background image to Squid content access page + basedata=3D"$$( 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 \ --=20 2.16.4 --===============3013004416912807391== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KCmlRSXpCQUVCQ2dBZEZpRUV2UDRTaUdoRVlE SnlyUkxrMlVqeUQzMTduMmdGQWx1Qy9Gc0FDZ2tRMlVqeUQzMTcKbjJoNTRBLzhDVndDazVaaG84 Q1dXUjkrejlLdGdoQnZqVUZnTXVUcEpLeXNWUE9jVDVzMmpzVm04MEFSYklsNApZNjVnMjh6cTcw KzlVZG44QWNhRCtFMFEzUjNLYnpBTGFSa2tVWjVWY21zUFhNWlBXUVFKWmpXUFI5SW40SndZCita QnQ4aDZDamo1aFhSWmc1R2h1Nnl4Zkt6T3JlbFZMazF2emg4YnRYY1dOdnNGWnhJQXpkZ1FBbmEv bW5GWEcKOE1YUU1DWEFjVGdkeFllVTQwME1nVjZ2aWxnaHYyWmVjWUJ5VWdIaGxBK3pBSFd6MktL Z1czVzFhSGJDQXNVQgp5VGZCME9YZllkb0VKNmhzaGg4d2M1N3pFUENuRHFyVE9SdVlzZFFQNUhp emVsWklLWjhqclgvOVRCK1R6U2x0CjE3Wk05WnluVHFCaGwxT2xtV2xRb21vNXJPZ2d6cmJnZmhO NDRmVFEyTjF5Qmt2Qi9RaERLSVloY2xoK2IzQzQKckw1UjVOZXNtMkxQSlhMZmlxWWtScU9ycG5h ZjRDVmZsM3R1dlN1MHNWT3g5a1k2blhrRkFielNmTHBPMmVQYQp0MDljclVqVzJBV3ZGZHMwY3VI bVptb0RWQnpHQWljNWVDenp3aW1OQ05jdFdlQmQyQUtnOGlpelJOVlBuYmw4Ck5MdS9DRmZsK0NU aGdWRWR4R3RyQWpqdGNuZFVPQ0lCcTRaQ3ZaQjdaRVpGMThpMUdCM3lNRWRkVER6bG5RNjcKSHlY QVhlUDBzcHhqanJWZHRNSEFKVyswbDhmUU15Q0dHendwZ1dhbXJjWE9ETGE2OGI3bjFCamEyS24w RUJSVgpZWDUxcGtTb3RYemRTdy9ud0V4eTRtdStUWnpiWTc2NDI1NnE2U1d3cXFGZHovRlNmTGs9 Cj1UTDVMCi0tLS0tRU5EIFBHUCBTSUdOQVRVUkUtLS0tLQo= --===============3013004416912807391==--