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

Drop now-unused split_to_merged() and its tests

Browse Source
This commit is contained in:
Christian Boltz
2024-11-01 22:05:48 +01:00
parent 695e472b2c
commit f66ada256a
2 changed files with 1 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
utils/apparmor/aa.py
View File

@@ -1946,23 +1946,6 @@ def merged_to_split(profile_data):
return compat return compat
def split_to_merged(profile_data):
"""(temporary) helper function to convert a traditional compat['foo']['bar'] to a profile['foo//bar'] list"""
merged = {}
for profile in profile_data:
for hat in profile_data[profile]:
if profile == hat:
merged_name = profile
else:
merged_name = combine_profname((profile, hat))
merged[merged_name] = profile_data[profile][hat]
return merged
def write_piece(profile_data, depth, name, nhat): def write_piece(profile_data, depth, name, nhat):
pre = ' ' * depth pre = ' ' * depth
data = [] data = []

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

@@ -16,7 +16,7 @@ import unittest
import apparmor.aa # needed to set global vars in some tests import apparmor.aa # needed to set global vars in some tests
from apparmor.aa import ( from apparmor.aa import (
change_profile_flags, check_for_apparmor, create_new_profile, get_file_perms, get_interpreter_and_abstraction, get_profile_flags, change_profile_flags, check_for_apparmor, create_new_profile, get_file_perms, get_interpreter_and_abstraction, get_profile_flags,
merged_to_split, parse_profile_data, propose_file_rules, set_options_audit_mode, set_options_owner_mode, split_to_merged) merged_to_split, parse_profile_data, propose_file_rules, set_options_audit_mode, set_options_owner_mode)
from apparmor.aare import AARE from apparmor.aare import AARE
from apparmor.common import AppArmorBug, AppArmorException, is_skippable_file from apparmor.common import AppArmorBug, AppArmorException, is_skippable_file
from apparmor.rule.file import FileRule from apparmor.rule.file import FileRule
@@ -761,25 +761,6 @@ class AaTest_merged_to_split(AATest):
self.assertTrue(result[profile][hat]) self.assertTrue(result[profile][hat])
class AaTest_split_to_merged(AATest):
tests = (
(("foo", "foo"), "foo"),
(("foo", "bar"), "foo//bar"),
)
def _run_test(self, params, expected):
old = {}
profile = params[0]
hat = params[1]
old[profile] = {}
old[profile][hat] = True # simplified, but enough for this test
result = split_to_merged(old)
self.assertEqual(list(result.keys()), [expected])
self.assertTrue(result[expected])
setup_aa(apparmor.aa) setup_aa(apparmor.aa)
setup_all_loops(__name__) setup_all_loops(__name__)
if __name__ == '__main__': if __name__ == '__main__':