external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2024-11-22 02:17:26 +00:00
Code Issues Releases Wiki Activity

Fix status checks for ufw when the system doesn't support iptables (#961)

Browse Source
This commit is contained in:
Michael Kroes 2016-10-08 20:35:19 +02:00 committed by Joshua Tauberer
parent 9331dbc519
commit a658abc95f
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -7,6 +7,7 @@ In Development
Control panel: Control panel:
* Remove recommendations for Certificate Providers * Remove recommendations for Certificate Providers
* Status checks failed if the system doesn't support iptables
v0.20 (September 23, 2016) v0.20 (September 23, 2016)
-------------------------- --------------------------

9
management/status_checks.py
View File

@ -169,8 +169,15 @@ def run_system_checks(rounded_values, env, output):
check_free_memory(rounded_values, env, output) check_free_memory(rounded_values, env, output)
def check_ufw(env, output): def check_ufw(env, output):
ufw = shell('check_output', ['ufw', 'status']).splitlines() code, ufw = shell('check_output', ['ufw', 'status'], trap=True)
if code != 0:
# The command failed, it's safe to say the firewall is disabled
output.print_warning("""The firewall is not working on this machine. An error was received
while trying to check the firewall. To investigate run 'sudo ufw status'.""")
return
ufw = ufw.splitlines()
if ufw[0] == "Status: active": if ufw[0] == "Status: active":
not_allowed_ports = 0 not_allowed_ports = 0
for service in get_services(): for service in get_services():