webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

embed background image in redirect template

Browse Source 
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 to fourth version of this patch and has
been successfully tested during a clean build.

Fixes #11650

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Peter Müller
2018-09-10 16:15:44 +02:00
committed by Michael Tremer
parent a0d612be7a
commit b67e79a4f1
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
html/html/redirect-templates/legacy/template.html
View File

@@ -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">&nbsp;</td>
<tr>
<td width='10%'>
<td align='center' bgcolor='#CC000000' width='80%'>

5
lfs/web-user-interface
View File

@@ -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 \