From: Michael Tremer Date: Tue, 2 Mar 2021 18:43:06 +0000 (+0000) Subject: firewall: Remove ALGs from UI X-Git-Tag: v2.25-core155~51 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=ffafaa71a6970a8c3d0942247feb37facfe24d25 firewall: Remove ALGs from UI This change drops the UIs that could enable ALGs for various protocols. Those have been all forcibly disabled because "NAT Slipstream". Signed-off-by: Stefan Schantl Signed-off-by: Peter Müller Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/core/155/filelists/files b/config/rootfiles/core/155/filelists/files index 83979493f3..c209e54854 100644 --- a/config/rootfiles/core/155/filelists/files +++ b/config/rootfiles/core/155/filelists/files @@ -1,4 +1,5 @@ srv/web/ipfire/cgi-bin/country.cgi +srv/web/ipfire/cgi-bin/optionsfw.cgi srv/web/ipfire/cgi-bin/wirelessclient.cgi srv/web/ipfire/cgi-bin/zoneconf.cgi srv/web/ipfire/html/include/zoneconf.js diff --git a/doc/language_issues.de b/doc/language_issues.de index 0e13af5626..8fa34fb4c1 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -112,6 +112,7 @@ WARNING: translation string unused: alt information WARNING: translation string unused: alt ovpn WARNING: translation string unused: alt vpn WARNING: translation string unused: and +WARNING: translation string unused: application layer gateways WARNING: translation string unused: apply WARNING: translation string unused: archive not exist WARNING: translation string unused: attemps diff --git a/doc/language_issues.en b/doc/language_issues.en index 6e30eb9957..7819541c2a 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -320,7 +320,6 @@ WARNING: untranslated string: alt proxy = Proxy WARNING: untranslated string: alt services = Services WARNING: untranslated string: alt system = System WARNING: untranslated string: apcupsd = APC-UPS status -WARNING: untranslated string: application layer gateways = Application Layer Gateways WARNING: untranslated string: april = April WARNING: untranslated string: are you sure = Are you sure? WARNING: untranslated string: arp table entries = ARP Table Entries diff --git a/doc/language_issues.es b/doc/language_issues.es index a544283629..952321fbe4 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -811,7 +811,6 @@ WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to wor WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC) WARNING: untranslated string: advproxy wpad view pac = Open PAC File WARNING: untranslated string: age second = second -WARNING: untranslated string: application layer gateways = Application Layer Gateways WARNING: untranslated string: asn lookup failed = AS lookup failed WARNING: untranslated string: atm device = Device: WARNING: untranslated string: attention = ATTENTION diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 942be73ecd..9fe5ca21c1 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -117,6 +117,7 @@ WARNING: translation string unused: alt information WARNING: translation string unused: alt ovpn WARNING: translation string unused: alt vpn WARNING: translation string unused: and +WARNING: translation string unused: application layer gateways WARNING: translation string unused: apply WARNING: translation string unused: archive not exist WARNING: translation string unused: attemps diff --git a/doc/language_issues.it b/doc/language_issues.it index 98074e59f2..29c9c7d58e 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -898,7 +898,6 @@ WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the Wiki. WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC) WARNING: untranslated string: advproxy wpad view pac = Open PAC File -WARNING: untranslated string: application layer gateways = Application Layer Gateways WARNING: untranslated string: asn lookup failed = AS lookup failed WARNING: untranslated string: autonomous system = Autonomous System WARNING: untranslated string: block = Block diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 8eebbd57f3..d6cad0deeb 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -892,7 +892,6 @@ WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the Wiki. WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC) WARNING: untranslated string: advproxy wpad view pac = Open PAC File -WARNING: untranslated string: application layer gateways = Application Layer Gateways WARNING: untranslated string: asn lookup failed = AS lookup failed WARNING: untranslated string: atm device = Device: WARNING: untranslated string: autonomous system = Autonomous System diff --git a/doc/language_issues.pl b/doc/language_issues.pl index f1a4756482..b8fba938f8 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -826,7 +826,6 @@ WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to wor WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC) WARNING: untranslated string: advproxy wpad view pac = Open PAC File WARNING: untranslated string: age second = second -WARNING: untranslated string: application layer gateways = Application Layer Gateways WARNING: untranslated string: asn lookup failed = AS lookup failed WARNING: untranslated string: atm device = Device: WARNING: untranslated string: attention = ATTENTION diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 43c1f8c088..d507911f1a 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -822,7 +822,6 @@ WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to wor WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC) WARNING: untranslated string: advproxy wpad view pac = Open PAC File WARNING: untranslated string: age second = second -WARNING: untranslated string: application layer gateways = Application Layer Gateways WARNING: untranslated string: asn lookup failed = AS lookup failed WARNING: untranslated string: atm device = Device: WARNING: untranslated string: attention = ATTENTION diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 439a588906..04343d527d 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -114,6 +114,7 @@ WARNING: translation string unused: alt ovpn WARNING: translation string unused: alt vpn WARNING: translation string unused: and WARNING: translation string unused: ansi t1.483 +WARNING: translation string unused: application layer gateways WARNING: translation string unused: apply WARNING: translation string unused: archive not exist WARNING: translation string unused: attemps diff --git a/html/cgi-bin/optionsfw.cgi b/html/cgi-bin/optionsfw.cgi index 8c996802c5..321642e82e 100644 --- a/html/cgi-bin/optionsfw.cgi +++ b/html/cgi-bin/optionsfw.cgi @@ -128,24 +128,6 @@ $checked{'SHOWTABLES'}{$settings{'SHOWTABLES'}} = "checked='checked'"; $checked{'SHOWDROPDOWN'}{'off'} = ''; $checked{'SHOWDROPDOWN'}{'on'} = ''; $checked{'SHOWDROPDOWN'}{$settings{'SHOWDROPDOWN'}} = "checked='checked'"; -$checked{'CONNTRACK_FTP'}{'off'} = ''; -$checked{'CONNTRACK_FTP'}{'on'} = ''; -$checked{'CONNTRACK_FTP'}{$settings{'CONNTRACK_FTP'}} = "checked='checked'"; -$checked{'CONNTRACK_H323'}{'off'} = ''; -$checked{'CONNTRACK_H323'}{'on'} = ''; -$checked{'CONNTRACK_H323'}{$settings{'CONNTRACK_H323'}} = "checked='checked'"; -$checked{'CONNTRACK_IRC'}{'off'} = ''; -$checked{'CONNTRACK_IRC'}{'on'} = ''; -$checked{'CONNTRACK_IRC'}{$settings{'CONNTRACK_IRC'}} = "checked='checked'"; -$checked{'CONNTRACK_PPTP'}{'off'} = ''; -$checked{'CONNTRACK_PPTP'}{'on'} = ''; -$checked{'CONNTRACK_PPTP'}{$settings{'CONNTRACK_PPTP'}} = "checked='checked'"; -$checked{'CONNTRACK_SIP'}{'off'} = ''; -$checked{'CONNTRACK_SIP'}{'on'} = ''; -$checked{'CONNTRACK_SIP'}{$settings{'CONNTRACK_SIP'}} = "checked='checked'"; -$checked{'CONNTRACK_TFTP'}{'off'} = ''; -$checked{'CONNTRACK_TFTP'}{'on'} = ''; -$checked{'CONNTRACK_TFTP'}{$settings{'CONNTRACK_TFTP'}} = "checked='checked'"; $selected{'FWPOLICY'}{$settings{'FWPOLICY'}}= 'selected'; $selected{'FWPOLICY1'}{$settings{'FWPOLICY1'}}= 'selected'; $selected{'FWPOLICY2'}{$settings{'FWPOLICY2'}}= 'selected'; @@ -251,58 +233,6 @@ END $Lang::tr{'off'} -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- $Lang::tr{'application layer gateways'} -
FTP - $Lang::tr{'on'} / - $Lang::tr{'off'} -
H.323 - $Lang::tr{'on'} / - $Lang::tr{'off'} -
IRC - $Lang::tr{'on'} / - $Lang::tr{'off'} -
PPTP - $Lang::tr{'on'} / - $Lang::tr{'off'} -
SIP - $Lang::tr{'on'} / - $Lang::tr{'off'} -
TFTP - $Lang::tr{'on'} / - $Lang::tr{'off'} -
-
$Lang::tr{'fw default drop'}