mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-31 14:25:52 +00:00
Code Issues Releases Wiki Activity

extend re_match_include_parse() to also match abi rules

Browse Source 
... and add some tests
This commit is contained in:
Christian Boltz
2020-05-09 00:35:10 +02:00
parent b96fd81184
commit 8ca486715f
3 changed files with 56 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
utils/test/test-regex_matches.py
View File

@@ -567,10 +567,47 @@ class Test_re_match_include_parse(AATest):
(' /etc/fstab r,', (None, None, None ) ),
('/usr/include r,', (None, None, None ) ),
('/include r,', (None, None, None ) ),
('abi <abi/4.19>,', (None, None, None ) ), # abi rule
]
def _run_test(self, params, expected):
self.assertEqual(re_match_include_parse(params), expected)
self.assertEqual(re_match_include_parse(params, 'include'), expected)
class Test_re_match_include_parse_abi(AATest):
tests = [
# path if exists magic path
('abi <abi/4.19>,', ('abi/4.19', False, True ) ), # magic path
('abi <abi/4.19>, # comment', ('abi/4.19', False, True ) ),
(' abi <abi/4.19> , # comment', ('abi/4.19', False, True ) ),
('abi "/abi/4.19" ,', ('/abi/4.19', False, False) ), # quoted path starting with /
('abi "/abi/4.19", # comment', ('/abi/4.19', False, False) ),
(' abi "/abi/4.19" , # comment ', ('/abi/4.19', False, False) ),
# (' abi "abi/4.19" , # comment ', ('abi/4.19', False, False) ), # quoted path, no leading /
# ('abi abi/4.19,', ('abi/4.19', False, False) ), # without quotes
('some abi <abi/4.19>,', (None, None, None ) ), # non-matching
(' /etc/fstab r,', (None, None, None ) ),
('/usr/abi r,', (None, None, None ) ),
('/abi r,', (None, None, None ) ),
('#include <abstractions/base>', (None, None, None ) ), # include rule path
]
def _run_test(self, params, expected):
self.assertEqual(re_match_include_parse(params, 'abi'), expected)
class Test_re_match_include_parse_empty_filename(AATest):
tests = [
(('include <>', 'include'), AppArmorException),
(('include ""', 'include'), AppArmorException),
(('include ', 'include'), AppArmorException),
(('abi <>,', 'abi'), AppArmorException),
(('abi "",', 'abi'), AppArmorException),
(('abi ,', 'abi'), AppArmorException),
]
def _run_test(self, params, expected):
with self.assertRaises(expected):
rule, rule_name = params
re_match_include_parse(rule, rule_name)
class TestStripParenthesis(AATest):
tests = [