YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix incompatibility with nftables

Browse source 
Also removed reference to port 1901
This commit is contained in:
David Buscher 2021-07-10 17:28:36 +01:00
parent 667dba421a
commit 0fce089c54
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/yunohost/firewall.py
View file

@ -35,11 +35,6 @@ from moulinette.utils.text import prependlines
FIREWALL_FILE = "/etc/yunohost/firewall.yml" FIREWALL_FILE = "/etc/yunohost/firewall.yml"
UPNP_CRON_JOB = "/etc/cron.d/yunohost-firewall-upnp" UPNP_CRON_JOB = "/etc/cron.d/yunohost-firewall-upnp"
# A UDP port to use for the SSDP discovery phase of UPNP.
# Assigned by IANA to "Fujitsu ICL Terminal Emulator Program A", so no-one else is
# likely to use it (unlike port 1900 which is used by SSDP servers such
# as miniupnpd)
SSDP_CLIENT_PORT = 1901
logger = getActionLogger("yunohost.firewall") logger = getActionLogger("yunohost.firewall")
@ -233,10 +228,10 @@ def firewall_reload(skip_upnp=False):
# IPv4 # IPv4
try: try:
process.check_output("iptables -w -L") process.check_output("nft list ruleset -n -a")
except process.CalledProcessError as e: except process.CalledProcessError as e:
logger.debug( logger.debug(
"iptables seems to be not available, it outputs:\n%s", "nftables/nft seems to be not available, it outputs:\n%s",
prependlines(e.output.rstrip(), "> "), prependlines(e.output.rstrip(), "> "),
) )
logger.warning(m18n.n("iptables_unavailable")) logger.warning(m18n.n("iptables_unavailable"))
@ -272,10 +267,10 @@ def firewall_reload(skip_upnp=False):
# IPv6 # IPv6
try: try:
process.check_output("ip6tables -L") process.check_output("nft list ruleset -n -a")
except process.CalledProcessError as e: except process.CalledProcessError as e:
logger.debug( logger.debug(
"ip6tables seems to be not available, it outputs:\n%s", "ip6tables/nft seems to be not available, it outputs:\n%s",
prependlines(e.output.rstrip(), "> "), prependlines(e.output.rstrip(), "> "),
) )
logger.warning(m18n.n("ip6tables_unavailable")) logger.warning(m18n.n("ip6tables_unavailable"))