mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-01 06:45:38 +00:00
Code Issues Releases Wiki Activity

ProfileStorage: merge parse_profile_start() into parse()

Browse Source 
... which avoids handing several values around.

Also adjust the tests so that only the end result (of parse() gets
tested.
This commit is contained in:
Christian Boltz
2021-05-16 17:44:06 +02:00
parent 1642fea228
commit 42fe65de71
2 changed files with 7 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
utils/apparmor/profile_storage.py
View File

@@ -201,7 +201,9 @@ class ProfileStorage:
return data return data
@classmethod @classmethod
def parse_profile_start(cls, line, file, lineno, profile, hat): def parse(cls, line, file, lineno, profile, hat):
''' parse a profile start line (using parse_profile_startline()) and convert it to a ProfileStorage '''
matches = parse_profile_start_line(line, file) matches = parse_profile_start_line(line, file)
if profile: # we are inside a profile, so we expect a child profile if profile: # we are inside a profile, so we expect a child profile
@@ -227,30 +229,14 @@ class ProfileStorage:
hat = profile hat = profile
pps_set_hat_external = False pps_set_hat_external = False
attachment = matches['attachment']
flags = matches['flags']
xattrs = matches['xattrs']
return (profile, hat, attachment, xattrs, flags, pps_set_hat_external)
@classmethod
def parse(cls, line, file, lineno, profile, hat):
''' parse a profile start line (using parse_profile_startline()) and convert it to a ProfileStorage '''
(profile, hat, attachment, xattrs, flags, pps_set_hat_external) = cls.parse_profile_start(line, file, lineno, profile, hat)
prof_storage = ProfileStorage(profile, hat, 'ProfileStorage.parse()') prof_storage = ProfileStorage(profile, hat, 'ProfileStorage.parse()')
if attachment:
prof_storage['attachment'] = attachment
if pps_set_hat_external:
prof_storage['external'] = True
prof_storage['name'] = profile prof_storage['name'] = profile
prof_storage['filename'] = file prof_storage['filename'] = file
prof_storage['xattrs'] = xattrs prof_storage['external'] = pps_set_hat_external
prof_storage['flags'] = flags prof_storage['attachment'] = matches['attachment'] or ''
prof_storage['flags'] = matches['flags']
prof_storage['xattrs'] = matches['xattrs']
return (profile, hat, prof_storage) return (profile, hat, prof_storage)

7
utils/test/test-profile-storage.py
View File

@@ -152,10 +152,6 @@ class AaTest_parse_profile_start(AATest):
] ]
def _run_test(self, params, expected): def _run_test(self, params, expected):
parsed = ProfileStorage.parse_profile_start(params[0], 'somefile', 1, params[1], params[2])
self.assertEqual(parsed, expected)
(profile, hat, prof_storage) = ProfileStorage.parse(params[0], 'somefile', 1, params[1], params[2]) (profile, hat, prof_storage) = ProfileStorage.parse(params[0], 'somefile', 1, params[1], params[2])
self.assertEqual(profile, expected[0]) self.assertEqual(profile, expected[0])
@@ -177,9 +173,6 @@ class AaTest_parse_profile_start_errors(AATest):
] ]
def _run_test(self, params, expected): def _run_test(self, params, expected):
with self.assertRaises(expected):
ProfileStorage.parse_profile_start(params[0], 'somefile', 1, params[1], params[2])
with self.assertRaises(expected): with self.assertRaises(expected):
ProfileStorage.parse(params[0], 'somefile', 1, params[1], params[2]) ProfileStorage.parse(params[0], 'somefile', 1, params[1], params[2])