mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 00:14:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Switch aa-mergeprof from aa to active_profiles

Browse source
This commit is contained in:
Christian Boltz 2024-11-01 21:44:13 +01:00
parent 531f47676d
commit 695e472b2c
Failed to generate hash of commit
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
utils/aa-mergeprof
View file

@ -1,7 +1,7 @@
#! /usr/bin/python3 #! /usr/bin/python3
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Copyright (C) 2013 Kshitij Gupta <kgupta8592@gmail.com> # Copyright (C) 2013 Kshitij Gupta <kgupta8592@gmail.com>
# Copyright (C) 2014-2018 Christian Boltz <apparmor@cboltz.de> # Copyright (C) 2014-2024 Christian Boltz <apparmor@cboltz.de>
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
# modify it under the terms of version 2 of the GNU General Public # modify it under the terms of version 2 of the GNU General Public
@ -113,7 +113,7 @@ class Merge(object):
def ask_merge_questions(self): def ask_merge_questions(self):
other = self.base other = self.base
log_dict = {'merge': apparmor.aa.split_to_merged(other.aa)} log_dict = {'merge': other.active_profiles.get_all_profiles()}
apparmor.aa.loadincludes() apparmor.aa.loadincludes()

19
utils/apparmor/cleanprofile.py
View file

@ -1,6 +1,6 @@
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Copyright (C) 2013 Kshitij Gupta <kgupta8592@gmail.com> # Copyright (C) 2013 Kshitij Gupta <kgupta8592@gmail.com>
# Copyright (C) 2014-2015 Christian Boltz <apparmor@cboltz.de> # Copyright (C) 2014-2024 Christian Boltz <apparmor@cboltz.de>
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
# modify it under the terms of version 2 of the GNU General Public # modify it under the terms of version 2 of the GNU General Public
@ -18,7 +18,6 @@ import apparmor.aa as apparmor
class Prof: class Prof:
def __init__(self, filename): def __init__(self, filename):
apparmor.init_aa() apparmor.init_aa()
self.aa = apparmor.aa
self.active_profiles = apparmor.active_profiles self.active_profiles = apparmor.active_profiles
self.include = apparmor.include self.include = apparmor.include
self.filename = filename self.filename = filename
@ -36,7 +35,7 @@ class CleanProf:
deleted += self.other.active_profiles.delete_preamble_duplicates(self.other.filename) deleted += self.other.active_profiles.delete_preamble_duplicates(self.other.filename)
for profile in self.profile.aa.keys(): for profile in self.profile.active_profiles.get_all_profiles():
deleted += self.remove_duplicate_rules(profile) deleted += self.remove_duplicate_rules(profile)
return deleted return deleted
@ -50,22 +49,22 @@ class CleanProf:
deleted += self.profile.active_profiles.delete_preamble_duplicates(self.profile.filename) deleted += self.profile.active_profiles.delete_preamble_duplicates(self.profile.filename)
# Process every hat in the profile individually # Process every hat in the profile individually
for hat in sorted(self.profile.aa[program].keys()): for full_profile in sorted(self.profile.active_profiles.get_profile_and_childs(program)):
includes = self.profile.aa[program][hat]['inc_ie'].get_all_full_paths(apparmor.profile_dir) includes = self.profile.active_profiles[full_profile]['inc_ie'].get_all_full_paths(apparmor.profile_dir)
# Clean up superfluous rules from includes in the other profile # Clean up superfluous rules from includes in the other profile
for inc in includes: for inc in includes:
if not self.profile.include.get(inc, {}).get(inc, False): if not self.profile.include.get(inc, {}).get(inc, False):
apparmor.load_include(inc) apparmor.load_include(inc)
if self.other.aa[program].get(hat): # carefully avoid to accidentally initialize self.other.aa[program][hat] if self.other.active_profiles.profile_exists(full_profile):
deleted += apparmor.delete_all_duplicates(self.other.aa[program][hat], inc, apparmor.ruletypes) deleted += apparmor.delete_all_duplicates(self.other.active_profiles[full_profile], inc, apparmor.ruletypes)
# Clean duplicate rules in other profile # Clean duplicate rules in other profile
for ruletype in apparmor.ruletypes: for ruletype in apparmor.ruletypes:
if not self.same_file: if not self.same_file:
if self.other.aa[program].get(hat): # carefully avoid to accidentally initialize self.other.aa[program][hat] if self.other.active_profiles.profile_exists(full_profile):
deleted += self.other.aa[program][hat][ruletype].delete_duplicates(self.profile.aa[program][hat][ruletype]) deleted += self.other.active_profiles[full_profile][ruletype].delete_duplicates(self.profile.active_profiles[full_profile][ruletype])
else: else:
deleted += self.other.aa[program][hat][ruletype].delete_duplicates(None) deleted += self.other.active_profiles[full_profile][ruletype].delete_duplicates(None)
return deleted return deleted