mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-02 15:25:27 +00:00
Code Issues Releases Wiki Activity

convert serialize_parse_profile_start() to use parse_profile_start_line()

Browse Source 
Convert serialize_parse_profile_start() to use
parse_profile_start_line(), and adjust a test to expect an AppArmorBug
instead of an AttributeError exception.

Also add two tests (they succeed with the old and the new code).
Note that these tests document interesting[tm] behaviour - I tend to
think that those cases should raise an exception, but I'm not sure about
this because serialize_profile_from_old_profile() is a good example for
interesting[tm] code :-/

I couldn't come up with a real-world test profile that would hit those
cases without erroring out aa-logprof earlier - maybe the (more
sane-looking) parse_profiles() / serialize_parse_profile_start()
protects us from hitting this interesting[tm] behaviour.



Acked-by: Steve Beattie <steve@nxnw.org>
This commit is contained in:
Christian Boltz
2015-04-01 10:58:27 +02:00
parent 90efcd7a92
commit b8f0a5cbb2
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
utils/apparmor/aa.py
View File

@@ -3707,17 +3707,15 @@ def serialize_profile(profile_data, name, options):
return string + '\n' return string + '\n'
def serialize_parse_profile_start(line, file, lineno, profile, hat, prof_data_profile, prof_data_external, correct): def serialize_parse_profile_start(line, file, lineno, profile, hat, prof_data_profile, prof_data_external, correct):
matches = RE_PROFILE_START.search(line).groups() matches = parse_profile_start_line(line, file)
if profile and profile == hat and matches[3]:
hat = matches[3] if profile and profile == hat and matches['profile_keyword']:
hat = matches['profile']
in_contained_hat = True in_contained_hat = True
if prof_data_profile: if prof_data_profile:
pass pass
else: else:
if matches[1]: profile = matches['profile']
profile = matches[1]
else:
profile = matches[3]
if len(profile.split('//')) >= 2: if len(profile.split('//')) >= 2:
profile, hat = profile.split('//')[:2] profile, hat = profile.split('//')[:2]
else: else:
@@ -3728,10 +3726,7 @@ def serialize_parse_profile_start(line, file, lineno, profile, hat, prof_data_pr
else: else:
hat = profile hat = profile
flags = matches[6] flags = matches['flags']
profile = strip_quotes(profile)
if hat:
hat = strip_quotes(hat)
return (profile, hat, flags, in_contained_hat, correct) return (profile, hat, flags, in_contained_hat, correct)

12
utils/test/test-aa.py
View File

@@ -261,9 +261,19 @@ class AaTest_serialize_parse_profile_start(unittest.TestCase):
expected = ('/foo', '/foo', None, False, True) # note that in_contained_hat == False and that profile == hat == child profile expected = ('/foo', '/foo', None, False, True) # note that in_contained_hat == False and that profile == hat == child profile
self.assertEqual(result, expected) self.assertEqual(result, expected)
def test_serialize_parse_profile_start_14(self):
result = self._parse('/ext//hat {', '/bar', '/bar', True, True) # external hat inside a profile - XXX should this error out?
expected = ('/ext', '/ext', None, False, True) # XXX additionally note that hat == profile, but should be 'hat'
self.assertEqual(result, expected)
def test_serialize_parse_profile_start_15(self):
result = self._parse('/ext//hat {', '/bar', '/bar', True, False) # external hat inside a profile - XXX should this error out?
expected = ('/ext', 'hat', None, False, False)
self.assertEqual(result, expected)
def test_serialize_parse_profile_start_invalid_01(self): def test_serialize_parse_profile_start_invalid_01(self):
with self.assertRaises(AttributeError): # XXX change to AppArmorBug? with self.assertRaises(AppArmorBug):
self._parse('xy', '/bar', '/bar', False, False) # not a profile start self._parse('xy', '/bar', '/bar', False, False) # not a profile start
# XXX not catched as error. See also test_serialize_parse_profile_start_13() - maybe this is wanted behaviour here? # XXX not catched as error. See also test_serialize_parse_profile_start_13() - maybe this is wanted behaviour here?