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

Store extra profiles in 'extra_profiles' ProfileList

Browse Source 
... instead of the 'extras' hasher.

Also adjust all code that previously used 'extras' to use
'extra_profiles'. This affects get_profile() and read_profile().
This commit is contained in:
Christian Boltz
2021-04-05 15:00:53 +02:00
parent 179168f566
commit 286761271b
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
utils/apparmor/aa.py
View File

@@ -98,7 +98,6 @@ transitions = hasher()
aa = hasher() # Profiles originally in sd, replace by aa aa = hasher() # Profiles originally in sd, replace by aa
original_aa = hasher() original_aa = hasher()
extras = hasher() # Inactive profiles from extras
### end our ### end our
changed = dict() changed = dict()
@@ -510,15 +509,18 @@ def confirm_and_abort():
def get_profile(prof_name): def get_profile(prof_name):
'''search for inactive/extra profile, and ask if it should be used''' '''search for inactive/extra profile, and ask if it should be used'''
if not extras.get(prof_name, False): if not extra_profiles.profiles.get(prof_name, False):
return None # no inactive profile found return None # no inactive profile found
# TODO: search based on the attachment, not (only?) based on the profile name # TODO: search based on the attachment, not (only?) based on the profile name
# (Note: in theory, multiple inactive profiles (with different profile names) could exist for a binary.) # (Note: in theory, multiple inactive profiles (with different profile names) could exist for a binary.)
inactive_profile = {prof_name: extras[prof_name]} inactive_profile = deepcopy(extra_profiles.get_profile_and_childs(prof_name))
inactive_profile[prof_name][prof_name]['flags'] = 'complain'
orig_filename = inactive_profile[prof_name][prof_name]['filename'] # needed for CMD_VIEW_PROFILE orig_filename = inactive_profile[prof_name]['filename'] # needed for CMD_VIEW_PROFILE
inactive_profile[prof_name][prof_name]['filename'] = ''
for prof in inactive_profile:
inactive_profile[prof]['flags'] = 'complain' # TODO: preserve other flags, if any
inactive_profile[prof]['filename'] = ''
# ensure active_profiles has the /etc/apparmor.d/ filename initialized # ensure active_profiles has the /etc/apparmor.d/ filename initialized
# TODO: ideally serialize_profile() shouldn't always use active_profiles # TODO: ideally serialize_profile() shouldn't always use active_profiles
@@ -526,6 +528,8 @@ def get_profile(prof_name):
if not active_profiles.files.get(prof_filename): if not active_profiles.files.get(prof_filename):
active_profiles.init_file(prof_filename) active_profiles.init_file(prof_filename)
inactive_profile = merged_to_split(inactive_profile)
uname = 'Inactive local profile for %s' % prof_name uname = 'Inactive local profile for %s' % prof_name
profile_hash = { profile_hash = {
uname: { uname: {
@@ -1741,19 +1745,14 @@ def read_profile(file, active_profile):
active_profiles.add_profile(filename, profile, attachment) active_profiles.add_profile(filename, profile, attachment)
elif profile_data: elif profile_data:
attach_profile_data(extras, profile_data)
for profile in profile_data: for profile in profile_data:
if '//' in profile:
continue # TODO: handle hats/child profiles independent of main profiles
attachment = profile_data[profile]['attachment'] attachment = profile_data[profile]['attachment']
filename = profile_data[profile]['filename'] filename = profile_data[profile]['filename']
if not attachment and profile.startswith('/'): if not attachment and profile.startswith('/'):
extra_profiles.add_profile(filename, profile, profile) # use profile as name and attachment extra_profiles.add_profile(filename, profile, profile, profile_data[profile]) # use profile as name and attachment
else: else:
extra_profiles.add_profile(filename, profile, attachment) extra_profiles.add_profile(filename, profile, attachment, profile_data[profile])
def attach_profile_data(profiles, profile_data): def attach_profile_data(profiles, profile_data):
profile_data = merged_to_split(profile_data) profile_data = merged_to_split(profile_data)