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

utils: fix cleanprof regression on header generation

Browse Source 
Commit c9d41a3ebb introduced a regression on profile header
generation.

This commit removes the name parameter from the get_header function
since the ProfileStorage should already contain all the information
required to generate the header for profiles and hats. The tests
needed to be updated as well to make sure the ProfileStorage object
contained the information needed by the get_header method.

Fixes: c9d41a3ebb ("utils: fix profile and hat header generation")
Signed-off-by: Georgia Garcia <georgia.garcia@canonical.com>
This commit is contained in:
Georgia Garcia
2025-03-28 17:52:23 -03:00
parent fda4f8140f
commit 699d7b5c83
4 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,7 +79,7 @@ class AaTest_get_header(AATest):
prof_storage['profile_keyword'] = params[6]
prof_storage['header_comment'] = params[7]
result = prof_storage.get_header(depth, name, embedded_hat)
result = prof_storage.get_header(depth, embedded_hat)
self.assertEqual(result, [expected])
@@ -103,7 +103,7 @@ class AaTest_get_header_01(AATest):
if params.get(param) is not None:
prof_storage[param] = params[param]
result = prof_storage.get_header(depth, name, embedded_hat)
result = prof_storage.get_header(depth, embedded_hat)
self.assertEqual(result, [expected])
@@ -166,7 +166,7 @@ class AaTest_get_header_after_parse(AATest):
def _run_test(self, params, expected):
(profile, hat, prof_storage) = ProfileStorage.parse(params[0], 'somefile', 1, params[1], params[2])
header = prof_storage.get_header(params[4], profile, params[3])
header = prof_storage.get_header(params[4], params[3])
self.assertEqual(header, [expected], prof_storage.data)
@@ -194,7 +194,7 @@ class TestSetInvalid(AATest):
class AaTest_repr(AATest):
def testRepr(self):
prof_storage = ProfileStorage('/test/foo', 'hat', 'TEST')
prof_storage = ProfileStorage('foo', 'hat', 'TEST')
prof_storage['name'] = 'foo'
prof_storage['xattrs'] = 'user.bar=bar'
prof_storage['capability'].add(CapabilityRule('dac_override'))