From patchwork Sun Oct 10 19:43:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 4783 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4HSC5h57lNz3wbT for ; Sun, 10 Oct 2021 19:43:20 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4HSC5h1Ywmzmp; Sun, 10 Oct 2021 19:43:20 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4HSC5g5bjxz2yWb; Sun, 10 Oct 2021 19:43:19 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4HSC5f3RCLz2xJj for ; Sun, 10 Oct 2021 19:43:18 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4HSC5d300lzmp for ; Sun, 10 Oct 2021 19:43:17 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1633894998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UaqE7vZDnwvxbxgtxtDEUEQ4PPlyUmudhb1qDG/yhio=; b=UMd3ZJYGpIFrOT4nx+buTqiQG2I4KhCrx8EAEg0CLQyx9FILEUpA3mWwoAV43K7JXiyw3T 4nCr1MQNFGkTfuBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1633894998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UaqE7vZDnwvxbxgtxtDEUEQ4PPlyUmudhb1qDG/yhio=; b=Z9RAYCETRTd0OI6CB0KSk30PoVg9hY5obA6XydaIrn3+/T525SSBObXuY7WJ4oJ5CsDrwS KLWzZGvMm0EUFVh5J0se9KxHtaQ/7bNDa85NQwLtKNw3D8Mwu6Oc8t93CjnOOKv0X4FmVT iToEQzjwJrqPaDekRlnU1M8ypUEkAnmILZ6fwEQL/caLedrYsxdLDmw/u+5+lNtFaRwVMp 1ynDXkmBKbAtQYWp9Qgw0LDF2ZB+vKvBOH9YXS/57o6XIxquqCzGVB5uoLvSkYHWWQD8pO uo7U/XKZ20WMXQxxuoUG6TSN5Dui0WxCQOvKs3PuSCUMkxgQOv+P20qd+19nNQ== To: "IPFire: Development" From: =?utf-8?q?Peter_M=C3=BCller?= Subject: [PATCH] proxy.cgi: Remove option to show Squid's version entirely Message-ID: Date: Sun, 10 Oct 2021 21:43:14 +0200 MIME-Version: 1.0 Content-Language: en-US X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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üller Acked-by: Michael Tremer --- 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'} = ''; $proxysettings{'ADMIN_PASSWORD'} = ''; $proxysettings{'ERR_LANGUAGE'} = 'en'; $proxysettings{'ERR_DESIGN'} = 'ipfire'; -$proxysettings{'SUPPRESS_VERSION'} = 'on'; $proxysettings{'FORWARD_VIA'} = 'off'; $proxysettings{'FORWARD_IPADDRESS'} = 'off'; $proxysettings{'FORWARD_USERNAME'} = 'off'; @@ -706,10 +705,6 @@ $checked{'TRANSPARENT_BLUE'}{'off'} = ''; $checked{'TRANSPARENT_BLUE'}{'on'} = ''; $checked{'TRANSPARENT_BLUE'}{$proxysettings{'TRANSPARENT_BLUE'}} = "checked='checked'"; -$checked{'SUPPRESS_VERSION'}{'off'} = ''; -$checked{'SUPPRESS_VERSION'}{'on'} = ''; -$checked{'SUPPRESS_VERSION'}{$proxysettings{'SUPPRESS_VERSION'}} = "checked='checked'"; - $checked{'FORWARD_IPADDRESS'}{'off'} = ''; $checked{'FORWARD_IPADDRESS'}{'on'} = ''; $checked{'FORWARD_IPADDRESS'}{$proxysettings{'FORWARD_IPADDRESS'}} = "checked='checked'"; @@ -962,20 +957,14 @@ print < - $Lang::tr{'advproxy suppress version'}: - +   +   $Lang::tr{'advproxy error design'}: - - $Lang::tr{'advproxy squid version'}: -  [ $squidversion[0] ] -   -   -
@@ -3070,6 +3059,7 @@ sub writeconfig shutdown_lifetime 5 seconds icp_port 0 +httpd_suppress_version_string on END ; @@ -3868,8 +3858,6 @@ END } - if ($proxysettings{'SUPPRESS_VERSION'} eq 'on') { print FILE "httpd_suppress_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 IPFire_unrestricted_ips\n"; } if (!-z $acl_src_unrestricted_mac) { print FILE "http_reply_access allow IPFire_unrestricted_mac\n"; }