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

utils: ProfileList: rename add() to add_profile()

Browse Source 
Merge branch 'cboltz-profile-list-rename-add' into 'master'

See merge request apparmor/apparmor!502
Acked-by: Steve Beattie <steve.beattie@canonical.com>
This commit is contained in:
Steve Beattie
2020-05-04 19:47:17 +00:00
parent e416f51c26 5983598ef5
commit 64be247aae
4 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
utils/apparmor/aa.py
View File

@@ -1949,9 +1949,9 @@ def read_profile(file, active_profile):
filename = profile_data[profile][profile]['filename'] filename = profile_data[profile][profile]['filename']
if not attachment and name.startswith('/'): if not attachment and name.startswith('/'):
active_profiles.add(filename, name, name) # use name as name and attachment active_profiles.add_profile(filename, name, name) # use name as name and attachment
else: else:
active_profiles.add(filename, name, attachment) active_profiles.add_profile(filename, name, attachment)
elif profile_data: elif profile_data:
attach_profile_data(extras, profile_data) attach_profile_data(extras, profile_data)
@@ -1962,9 +1962,9 @@ def read_profile(file, active_profile):
filename = profile_data[profile][profile]['filename'] filename = profile_data[profile][profile]['filename']
if not attachment and name.startswith('/'): if not attachment and name.startswith('/'):
extra_profiles.add(filename, name, name) # use name as name and attachment extra_profiles.add_profile(filename, name, name) # use name as name and attachment
else: else:
extra_profiles.add(filename, name, attachment) extra_profiles.add_profile(filename, name, attachment)
def attach_profile_data(profiles, profile_data): def attach_profile_data(profiles, profile_data):
# Make deep copy of data to avoid changes to # Make deep copy of data to avoid changes to

2
utils/apparmor/profile_list.py
View File

@@ -28,7 +28,7 @@ class ProfileList:
self.attachments = {} # attachment -> filename self.attachments = {} # attachment -> filename
self.attachments_AARE = {} # AARE(attachment) -> filename self.attachments_AARE = {} # AARE(attachment) -> filename
def add(self, filename, profile_name, attachment): def add_profile(self, filename, profile_name, attachment):
''' Add the given profile and attachment to the list ''' ''' Add the given profile and attachment to the list '''
if not filename: if not filename:

4
utils/test/test-libapparmor-test_multi.py
View File

@@ -238,9 +238,9 @@ def logfile_to_profile(logfile):
# optional for now, might be needed one day # optional for now, might be needed one day
# if profile.startswith('/'): # if profile.startswith('/'):
# apparmor.aa.active_profiles.add(profile_dummy_file, profile, profile) # apparmor.aa.active_profiles.add_profile(profile_dummy_file, profile, profile)
# else: # else:
apparmor.aa.active_profiles.add(profile_dummy_file, profile, '') apparmor.aa.active_profiles.add_profile(profile_dummy_file, profile, '')
log_reader = ReadLog(logfile, apparmor.aa.active_profiles, '') log_reader = ReadLog(logfile, apparmor.aa.active_profiles, '')
hashlog = log_reader.read_log('') hashlog = log_reader.read_log('')

42
utils/test/test-profile-list.py
View File

@@ -24,53 +24,53 @@ class TestAdd(AATest):
self.assertEqual(self.pl.attachments, {}) self.assertEqual(self.pl.attachments, {})
def testAdd_1(self): def testAdd_1(self):
self.pl.add('/etc/apparmor.d/bin.foo', 'foo', '/bin/foo') self.pl.add_profile('/etc/apparmor.d/bin.foo', 'foo', '/bin/foo')
self.assertEqual(self.pl.profile_names, {'foo': '/etc/apparmor.d/bin.foo'}) self.assertEqual(self.pl.profile_names, {'foo': '/etc/apparmor.d/bin.foo'})
self.assertEqual(self.pl.attachments, {'/bin/foo': '/etc/apparmor.d/bin.foo'}) self.assertEqual(self.pl.attachments, {'/bin/foo': '/etc/apparmor.d/bin.foo'})
def testAdd_2(self): def testAdd_2(self):
self.pl.add('/etc/apparmor.d/bin.foo', None, '/bin/foo') self.pl.add_profile('/etc/apparmor.d/bin.foo', None, '/bin/foo')
self.assertEqual(self.pl.profile_names, {}) self.assertEqual(self.pl.profile_names, {})
self.assertEqual(self.pl.attachments, {'/bin/foo': '/etc/apparmor.d/bin.foo'}) self.assertEqual(self.pl.attachments, {'/bin/foo': '/etc/apparmor.d/bin.foo'})
def testAdd_3(self): def testAdd_3(self):
self.pl.add('/etc/apparmor.d/bin.foo', 'foo', None) self.pl.add_profile('/etc/apparmor.d/bin.foo', 'foo', None)
self.assertEqual(self.pl.profile_names, {'foo': '/etc/apparmor.d/bin.foo'}) self.assertEqual(self.pl.profile_names, {'foo': '/etc/apparmor.d/bin.foo'})
self.assertEqual(self.pl.attachments, {}) self.assertEqual(self.pl.attachments, {})
def testAddError_1(self): def testAddError_1(self):
with self.assertRaises(AppArmorBug): with self.assertRaises(AppArmorBug):
self.pl.add('', 'foo', '/bin/foo') # no filename self.pl.add_profile('', 'foo', '/bin/foo') # no filename
def testAddError_2(self): def testAddError_2(self):
with self.assertRaises(AppArmorBug): with self.assertRaises(AppArmorBug):
self.pl.add('/etc/apparmor.d/bin.foo', None, None) # neither attachment or profile name self.pl.add_profile('/etc/apparmor.d/bin.foo', None, None) # neither attachment or profile name
def testAddError_twice_1(self): def testAddError_twice_1(self):
self.pl.add('/etc/apparmor.d/bin.foo', 'foo', '/bin/foo') self.pl.add_profile('/etc/apparmor.d/bin.foo', 'foo', '/bin/foo')
with self.assertRaises(AppArmorException): with self.assertRaises(AppArmorException):
self.pl.add('/etc/apparmor.d/bin.foo', 'foo', '/bin/foo') self.pl.add_profile('/etc/apparmor.d/bin.foo', 'foo', '/bin/foo')
def testAddError_twice_2(self): def testAddError_twice_2(self):
self.pl.add('/etc/apparmor.d/bin.foo', 'foo', '/bin/foo') self.pl.add_profile('/etc/apparmor.d/bin.foo', 'foo', '/bin/foo')
with self.assertRaises(AppArmorException): with self.assertRaises(AppArmorException):
self.pl.add('/etc/apparmor.d/bin.foo', 'foo', None) self.pl.add_profile('/etc/apparmor.d/bin.foo', 'foo', None)
def testAddError_twice_3(self): def testAddError_twice_3(self):
self.pl.add('/etc/apparmor.d/bin.foo', None, '/bin/foo') self.pl.add_profile('/etc/apparmor.d/bin.foo', None, '/bin/foo')
with self.assertRaises(AppArmorException): with self.assertRaises(AppArmorException):
self.pl.add('/etc/apparmor.d/bin.foo', 'foo', '/bin/foo') self.pl.add_profile('/etc/apparmor.d/bin.foo', 'foo', '/bin/foo')
def testAddError_twice_4(self): def testAddError_twice_4(self):
self.pl.add('/etc/apparmor.d/bin.foo', None, '/bin/foo') self.pl.add_profile('/etc/apparmor.d/bin.foo', None, '/bin/foo')
with self.assertRaises(AppArmorException): with self.assertRaises(AppArmorException):
self.pl.add('/etc/apparmor.d/bin.foo', 'foo', '/bin/foo') self.pl.add_profile('/etc/apparmor.d/bin.foo', 'foo', '/bin/foo')
def testAddError_twice_5(self): def testAddError_twice_5(self):
self.pl.add('/etc/apparmor.d/bin.foo', 'foo', None) self.pl.add_profile('/etc/apparmor.d/bin.foo', 'foo', None)
with self.assertRaises(AppArmorException): with self.assertRaises(AppArmorException):
self.pl.add('/etc/apparmor.d/bin.foo', 'foo', '/bin/foo') self.pl.add_profile('/etc/apparmor.d/bin.foo', 'foo', '/bin/foo')
class TestFilename_from_profile_name(AATest): class TestFilename_from_profile_name(AATest):
tests = [ tests = [
@@ -83,8 +83,8 @@ class TestFilename_from_profile_name(AATest):
def AASetup(self): def AASetup(self):
self.pl = ProfileList() self.pl = ProfileList()
self.pl.add('/etc/apparmor.d/bin.foo', 'foo', '/bin/foo') self.pl.add_profile('/etc/apparmor.d/bin.foo', 'foo', '/bin/foo')
self.pl.add('/etc/apparmor.d/usr.bin.wine', '/usr{,{/lib,/lib32,/lib64}/wine}/bin/wine{,-preloader,server}{,-staging-*,-vanilla-*}', '/usr{,{/lib,/lib32,/lib64}/wine}/bin/wine{,-preloader,server}{,-staging-*,-vanilla-*}') self.pl.add_profile('/etc/apparmor.d/usr.bin.wine', '/usr{,{/lib,/lib32,/lib64}/wine}/bin/wine{,-preloader,server}{,-staging-*,-vanilla-*}', '/usr{,{/lib,/lib32,/lib64}/wine}/bin/wine{,-preloader,server}{,-staging-*,-vanilla-*}')
def _run_test(self, params, expected): def _run_test(self, params, expected):
self.assertEqual(self.pl.filename_from_profile_name(params), expected) self.assertEqual(self.pl.filename_from_profile_name(params), expected)
@@ -102,10 +102,10 @@ class TestFilename_from_attachment(AATest):
def AASetup(self): def AASetup(self):
self.pl = ProfileList() self.pl = ProfileList()
self.pl.add('/etc/apparmor.d/bin.foo', 'foo', '/bin/foo') self.pl.add_profile('/etc/apparmor.d/bin.foo', 'foo', '/bin/foo')
self.pl.add('/etc/apparmor.d/bin.baz', 'baz', '/bin/ba*') self.pl.add_profile('/etc/apparmor.d/bin.baz', 'baz', '/bin/ba*')
self.pl.add('/etc/apparmor.d/bin.foobar', 'foobar', '/bin/foo{bar,baz}') self.pl.add_profile('/etc/apparmor.d/bin.foobar', 'foobar', '/bin/foo{bar,baz}')
self.pl.add('/etc/apparmor.d/usr.bin.wine', '/usr{,{/lib,/lib32,/lib64}/wine}/bin/wine{,-preloader,server}{,-staging-*,-vanilla-*}', '/usr{,{/lib,/lib32,/lib64}/wine}/bin/wine{,-preloader,server}{,-staging-*,-vanilla-*}') self.pl.add_profile('/etc/apparmor.d/usr.bin.wine', '/usr{,{/lib,/lib32,/lib64}/wine}/bin/wine{,-preloader,server}{,-staging-*,-vanilla-*}', '/usr{,{/lib,/lib32,/lib64}/wine}/bin/wine{,-preloader,server}{,-staging-*,-vanilla-*}')
def _run_test(self, params, expected): def _run_test(self, params, expected):
self.assertEqual(self.pl.filename_from_attachment(params), expected) self.assertEqual(self.pl.filename_from_attachment(params), expected)