[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ffafaa71a6970a8c3d0942247feb37facfe24d25
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via ffafaa71a6970a8c3d0942247feb37facfe24d25 (commit) via 4eaa5b91763762e59f8456305bc15922ec92e370 (commit) from 69b3d63b82ad63d6d0ed3334a81bfe472b81a21a (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit ffafaa71a6970a8c3d0942247feb37facfe24d25 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Mar 2 18:43:06 2021 +0000
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 stefan.schantl@ipfire.org Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 4eaa5b91763762e59f8456305bc15922ec92e370 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Mar 2 18:35:13 2021 +0000
core155: Disable all connection tracking helpers
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/155/filelists/files | 1 + config/rootfiles/core/155/update.sh | 4 ++ doc/language_issues.de | 1 + doc/language_issues.en | 1 - doc/language_issues.es | 1 - doc/language_issues.fr | 1 + doc/language_issues.it | 1 - doc/language_issues.nl | 1 - doc/language_issues.pl | 1 - doc/language_issues.ru | 1 - doc/language_issues.tr | 1 + html/cgi-bin/optionsfw.cgi | 70 ------------------------------- 12 files changed, 8 insertions(+), 76 deletions(-)
Difference in files: diff --git a/config/rootfiles/core/155/filelists/files b/config/rootfiles/core/155/filelists/files index 83979493f..c209e5485 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/config/rootfiles/core/155/update.sh b/config/rootfiles/core/155/update.sh index 5c7a3d3a9..b0e8f9ad8 100644 --- a/config/rootfiles/core/155/update.sh +++ b/config/rootfiles/core/155/update.sh @@ -60,6 +60,10 @@ extract_files # update linker config ldconfig
+# Disable all connection tracking helper +sed -E -e "s/^CONNTRACK_(.*?)=on/CONNTRACK_\1=off/g" \ + -i /var/ipfire/firewall/optionsfw + # Update Language cache /usr/local/bin/update-lang-cache
diff --git a/doc/language_issues.de b/doc/language_issues.de index 0e13af562..8fa34fb4c 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 6e30eb995..7819541c2 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 a54428362..952321fbe 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 942be73ec..9fe5ca21c 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 98074e59f..29c9c7d58 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 <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>. 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 8eebbd57f..d6cad0dee 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 <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>. 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 f1a475648..b8fba938f 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 43c1f8c08..d507911f1 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 439a58890..04343d527 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 8c996802c..321642e82 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 <input type='radio' name='SHOWDROPDOWN' value='off' $checked{'SHOWDROPDOWN'}{'off'} /> $Lang::tr{'off'}</td></tr> </table>
-<br /> - -<table width='95%' cellspacing='0'> - <tr bgcolor='$color{'color20'}'> - <td colspan='2' align='left'> - <b>$Lang::tr{'application layer gateways'}</b> - </td> - </tr> - <tr> - <td align='left' width='60%'>FTP</td> - <td align='left'> - $Lang::tr{'on'} <input type='radio' name='CONNTRACK_FTP' value='on' $checked{'CONNTRACK_FTP'}{'on'} /> / - <input type='radio' name='CONNTRACK_FTP' value='off' $checked{'CONNTRACK_FTP'}{'off'} /> $Lang::tr{'off'} - </td> - </tr> - <tr> - <td align='left' width='60%'>H.323</td> - <td align='left'> - $Lang::tr{'on'} <input type='radio' name='CONNTRACK_H323' value='on' $checked{'CONNTRACK_H323'}{'on'} /> / - <input type='radio' name='CONNTRACK_H323' value='off' $checked{'CONNTRACK_H323'}{'off'} /> $Lang::tr{'off'} - </td> - </tr> - <tr> - <td align='left' width='60%'>IRC</td> - <td align='left'> - $Lang::tr{'on'} <input type='radio' name='CONNTRACK_IRC' value='on' $checked{'CONNTRACK_IRC'}{'on'} /> / - <input type='radio' name='CONNTRACK_IRC' value='off' $checked{'CONNTRACK_IRC'}{'off'} /> $Lang::tr{'off'} - </td> - </tr> - <tr> - <td align='left' width='60%'>PPTP</td> - <td align='left'> - $Lang::tr{'on'} <input type='radio' name='CONNTRACK_PPTP' value='on' $checked{'CONNTRACK_PPTP'}{'on'} /> / - <input type='radio' name='CONNTRACK_PPTP' value='off' $checked{'CONNTRACK_PPTP'}{'off'} /> $Lang::tr{'off'} - </td> - </tr> - <tr> - <td align='left' width='60%'>SIP</td> - <td align='left'> - $Lang::tr{'on'} <input type='radio' name='CONNTRACK_SIP' value='on' $checked{'CONNTRACK_SIP'}{'on'} /> / - <input type='radio' name='CONNTRACK_SIP' value='off' $checked{'CONNTRACK_SIP'}{'off'} /> $Lang::tr{'off'} - </td> - </tr> - <tr> - <td align='left' width='60%'>TFTP</td> - <td align='left'> - $Lang::tr{'on'} <input type='radio' name='CONNTRACK_TFTP' value='on' $checked{'CONNTRACK_TFTP'}{'on'} /> / - <input type='radio' name='CONNTRACK_TFTP' value='off' $checked{'CONNTRACK_TFTP'}{'off'} /> $Lang::tr{'off'} - </td> - </tr> -</table> - <br /> <table width='95%' cellspacing='0'> <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'fw default drop'}</b></td></tr>
hooks/post-receive -- IPFire 2.x development tree
-
Michael Tremer