mirror of
https://github.com/freedombox/FreedomBox.git
synced 2026-01-21 07:55:00 +00:00
firewall: Add diagnostic check for backend
Tests: - Change the backend to iptables, and restart firewalld. The diagnostic is failed. - Change the backend back to nftables, and restart firewalld. The diagnostic is passed. Signed-off-by: James Valleroy <jvalleroy@mailbox.org> [sunil: Use augeas transform operation] Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org> Reviewed-by: Sunil Mohan Adapa <sunil@medhas.org>
This commit is contained in:
parent
0a565bdd17
commit
be91d8e4e4
@ -98,7 +98,9 @@ class FirewallApp(app_module.App):
|
||||
def diagnose(self):
|
||||
"""Run diagnostics and return the results."""
|
||||
results = super().diagnose()
|
||||
results.append(_diagnose_default_zone())
|
||||
config = privileged.get_config()
|
||||
results.append(_diagnose_default_zone(config))
|
||||
results.append(_diagnose_firewall_backend(config))
|
||||
return results
|
||||
|
||||
|
||||
@ -261,9 +263,15 @@ def remove_passthrough(ipv, *args):
|
||||
config_direct.removePassthrough('(sas)', ipv, args)
|
||||
|
||||
|
||||
def _diagnose_default_zone():
|
||||
def _diagnose_default_zone(config):
|
||||
"""Diagnose whether the default zone is external."""
|
||||
default_zone = privileged.get_default_zone()
|
||||
testname = gettext('Default zone is external')
|
||||
result = 'passed' if default_zone == 'external' else 'failed'
|
||||
result = 'passed' if config['default_zone'] == 'external' else 'failed'
|
||||
return [testname, result]
|
||||
|
||||
|
||||
def _diagnose_firewall_backend(config):
|
||||
"""Diagnose whether the firewall backend is nftables."""
|
||||
testname = gettext('Firewall backend is nftables')
|
||||
result = 'passed' if config['backend'] == 'nftables' else 'failed'
|
||||
return [testname, result]
|
||||
|
||||
@ -132,7 +132,20 @@ def setup():
|
||||
|
||||
|
||||
@privileged
|
||||
def get_default_zone():
|
||||
"""Return the firewalld default zone."""
|
||||
def get_config():
|
||||
"""Return firewalld configuration for diagnostics."""
|
||||
config = {}
|
||||
|
||||
output = subprocess.check_output(['firewall-cmd', '--get-default-zone'])
|
||||
return output.decode().strip()
|
||||
config['default_zone'] = output.decode().strip()
|
||||
|
||||
conf_file = '/etc/firewalld/firewalld.conf'
|
||||
aug = augeas.Augeas(flags=augeas.Augeas.NO_LOAD +
|
||||
augeas.Augeas.NO_MODL_AUTOLOAD)
|
||||
aug.transform('Shellvars', conf_file)
|
||||
aug.set('/augeas/context', '/files' + conf_file)
|
||||
aug.load()
|
||||
|
||||
config['backend'] = aug.get('FirewallBackend')
|
||||
|
||||
return config
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user