From mboxrd@z Thu Jan  1 00:00:00 1970
From: Peter =?utf-8?q?M=C3=BCller?= <peter.mueller@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] proxy.cgi: Remove option to show Squid's version entirely
Date: Sun, 10 Oct 2021 21:43:14 +0200
Message-ID: <b4f59ffb-9a04-938f-7c0e-5a39ded292e8@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8111391313957972389=="
List-Id: <development.lists.ipfire.org>

--===============8111391313957972389==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

There is no sense to display this to anybody, and we do not reveal
version information anywhere else on purpose. The IT staff knows which
version of IPFire they are running (hopefully the latest), and it's
none of the rest of the world's business.

Fixes: #12665 (in some way)

Signed-off-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>
---
 html/cgi-bin/proxy.cgi | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 966593e4d..28321fa7f 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -192,7 +192,6 @@ $proxysettings{'ADMIN_MAIL_ADDRESS'} =3D '';
 $proxysettings{'ADMIN_PASSWORD'} =3D '';
 $proxysettings{'ERR_LANGUAGE'} =3D 'en';
 $proxysettings{'ERR_DESIGN'} =3D 'ipfire';
-$proxysettings{'SUPPRESS_VERSION'} =3D 'on';
 $proxysettings{'FORWARD_VIA'} =3D 'off';
 $proxysettings{'FORWARD_IPADDRESS'} =3D 'off';
 $proxysettings{'FORWARD_USERNAME'} =3D 'off';
@@ -706,10 +705,6 @@ $checked{'TRANSPARENT_BLUE'}{'off'} =3D '';
 $checked{'TRANSPARENT_BLUE'}{'on'} =3D '';
 $checked{'TRANSPARENT_BLUE'}{$proxysettings{'TRANSPARENT_BLUE'}} =3D "checke=
d=3D'checked'";
=20
-$checked{'SUPPRESS_VERSION'}{'off'} =3D '';
-$checked{'SUPPRESS_VERSION'}{'on'} =3D '';
-$checked{'SUPPRESS_VERSION'}{$proxysettings{'SUPPRESS_VERSION'}} =3D "checke=
d=3D'checked'";
-
 $checked{'FORWARD_IPADDRESS'}{'off'} =3D '';
 $checked{'FORWARD_IPADDRESS'}{'on'} =3D '';
 $checked{'FORWARD_IPADDRESS'}{$proxysettings{'FORWARD_IPADDRESS'}} =3D "chec=
ked=3D'checked'";
@@ -962,20 +957,14 @@ print <<END
 	</td>
 </tr>
 <tr>
-	<td class=3D'base'>$Lang::tr{'advproxy suppress version'}:</td>
-	<td><input type=3D'checkbox' name=3D'SUPPRESS_VERSION' $checked{'SUPPRESS_V=
ERSION'}{'on'} /></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
 	<td class=3D'base'>$Lang::tr{'advproxy error design'}:</td>
 	<td class=3D'base'><select name=3D'ERR_DESIGN'>
 		<option value=3D'ipfire' $selected{'ERR_DESIGN'}{'ipfire'}>IPFire</option>
 		<option value=3D'squid' $selected{'ERR_DESIGN'}{'squid'}>$Lang::tr{'advpro=
xy standard'}</option>
 	</select></td>
 </tr>
-<tr>
-	<td class=3D'base'>$Lang::tr{'advproxy squid version'}:</td>
-	<td class=3D'base'>&nbsp;[<font color=3D'$Header::colourred'> $squidversion=
[0] </font>]</td>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-</tr>
 </table>
 <hr size=3D'1'>
 <table width=3D'100%'>
@@ -3070,6 +3059,7 @@ sub writeconfig
=20
 shutdown_lifetime 5 seconds
 icp_port 0
+httpd_suppress_version_string on
=20
 END
 	;
@@ -3868,8 +3858,6 @@ END
=20
 	}
=20
-	if ($proxysettings{'SUPPRESS_VERSION'} eq 'on') { print FILE "httpd_suppres=
s_version_string on\n\n" }
-
 	if ((!-z $mimetypes) && ($proxysettings{'ENABLE_MIME_FILTER'} eq 'on')) {
 		if (!-z $acl_src_unrestricted_ip)  { print FILE "http_reply_access allow I=
PFire_unrestricted_ips\n"; }
 		if (!-z $acl_src_unrestricted_mac) { print FILE "http_reply_access allow I=
PFire_unrestricted_mac\n"; }
--=20
2.26.2

--===============8111391313957972389==--