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

firewall_list: Don't miserably crash when trying to sort port range ("12300:12400", ain't an int)

Browse source
This commit is contained in:
Alexandre Aubin 2021-04-08 23:56:16 +02:00 • committed by GitHub
parent 0af05ea312
commit 278a95ab0e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/yunohost/firewall.py
View file

@ -188,18 +188,19 @@ def firewall_list(raw=False, by_ip_version=False, list_forwarded=False):
for i in ["ipv4", "ipv6"]: for i in ["ipv4", "ipv6"]:
f = firewall[i] f = firewall[i]
# Combine TCP and UDP ports # Combine TCP and UDP ports
ports[i] = sorted(set(f["TCP"]) | set(f["UDP"])) ports[i] = sorted(set(f["TCP"]) | set(f["UDP"]), key=lambda p: int(p.split(':')[0]) if isinstance(p, str) else p)
if not by_ip_version: if not by_ip_version:
# Combine IPv4 and IPv6 ports # Combine IPv4 and IPv6 ports
ports = sorted(set(ports["ipv4"]) | set(ports["ipv6"])) ports = sorted(set(ports["ipv4"]) | set(ports["ipv6"]), key=lambda p: int(p.split(':')[0]) if isinstance(p, str) else p)
# Format returned dict # Format returned dict
ret = {"opened_ports": ports} ret = {"opened_ports": ports}
if list_forwarded: if list_forwarded:
# Combine TCP and UDP forwarded ports # Combine TCP and UDP forwarded ports
ret["forwarded_ports"] = sorted( ret["forwarded_ports"] = sorted(
set(firewall["uPnP"]["TCP"]) | set(firewall["uPnP"]["UDP"]) set(firewall["uPnP"]["TCP"]) | set(firewall["uPnP"]["UDP"]),
key=lambda p: int(p.split(':')[0]) if isinstance(p, str) else p
) )
return ret return ret