Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests: check if qubes-firewall-user-script is called

Browse Source 
QubesOS/qubes-issues#3260
This commit is contained in:
Marek Marczykowski-Górecki 2018-02-05 18:17:29 +01:00
parent 6c33652ed4
commit 6b48d79d8c
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
qubesagent/test_firewall.py
View File

@ -63,6 +63,7 @@ class FirewallWorker(qubesagent.firewall.FirewallWorker):
self.init_called = False self.init_called = False
self.cleanup_called = False self.cleanup_called = False
self.user_script_called = False
self.rules = {} self.rules = {}
def apply_rules(self, source_addr, rules): def apply_rules(self, source_addr, rules):
@ -74,6 +75,9 @@ class FirewallWorker(qubesagent.firewall.FirewallWorker):
def init(self): def init(self):
self.cleanup_called = True self.cleanup_called = True
def run_user_script(self):
self.user_script_called = True
class IptablesWorker(qubesagent.firewall.IptablesWorker): class IptablesWorker(qubesagent.firewall.IptablesWorker):
'''Override methods actually modifying system state to only log what '''Override methods actually modifying system state to only log what
@ -522,10 +526,31 @@ class TestFirewallWorker(TestCase):
self.obj.handle_addr('10.137.0.4') self.obj.handle_addr('10.137.0.4')
self.assertEqual(self.obj.rules['10.137.0.4'], [{'action': 'drop'}]) self.assertEqual(self.obj.rules['10.137.0.4'], [{'action': 'drop'}])
@patch('os.path.isfile')
@patch('os.access')
@patch('subprocess.call')
def test_run_user_script(self, mock_subprocess, mock_os_access,
mock_os_path_isfile):
mock_os_path_isfile.return_value = False
mock_os_access.return_value = False
super(FirewallWorker, self.obj).run_user_script()
self.assertFalse(mock_subprocess.called)
mock_os_path_isfile.return_value = True
mock_os_access.return_value = False
super(FirewallWorker, self.obj).run_user_script()
self.assertFalse(mock_subprocess.called)
mock_os_path_isfile.return_value = True
mock_os_access.return_value = True
super(FirewallWorker, self.obj).run_user_script()
mock_subprocess.assert_called_once_with(
['/rw/config/qubes-firewall-user-script'])
def test_main(self): def test_main(self):
self.obj.main() self.obj.main()
self.assertTrue(self.obj.init_called) self.assertTrue(self.obj.init_called)
self.assertTrue(self.obj.cleanup_called) self.assertTrue(self.obj.cleanup_called)
self.assertTrue(self.obj.user_script_called)
self.assertEqual(set(self.obj.rules.keys()), self.obj.list_targets()) self.assertEqual(set(self.obj.rules.keys()), self.obj.list_targets())
# rules content were already tested # rules content were already tested