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

Replace mutable default arguments in utils

Browse Source 
(cherry picked from commit 2742d1f1ee)
This commit is contained in:
Mark Grassi
2023-02-19 17:17:35 -05:00
parent 7526ba4b0a
commit c8ce78e00c
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utils/apparmor/aa.py
View File

@@ -1732,7 +1732,7 @@ def collapse_log(hashlog, ignore_null_profiles=True):
return log_dict
def read_profiles(ui_msg=False, skip_profiles=[]):
def read_profiles(ui_msg=False, skip_profiles=()):
# we'll read all profiles from disk, so reset the storage first (autodep() might have created/stored
# a profile already, which would cause a 'Conflicting profile' error in attach_profile_data())
#
@@ -1762,7 +1762,7 @@ def read_profiles(ui_msg=False, skip_profiles=[]):
read_profile(full_file, True)
def read_inactive_profiles(skip_profiles=[]):
def read_inactive_profiles(skip_profiles=()):
# The skip_profiles parameter should only be specified by tests.
if hasattr(read_inactive_profiles, 'already_read'):

5
utils/apparmor/sandbox.py
View File

@@ -117,7 +117,7 @@ def set_environ(env):
os.environ[k] = env[k]
def aa_exec(command, opt, environ={}, verify_rules=[]):
def aa_exec(command, opt, environ=None, verify_rules=()):
"""Execute binary under specified policy"""
if opt.profile is not None:
policy_name = opt.profile
@@ -162,7 +162,8 @@ def aa_exec(command, opt, environ={}, verify_rules=[]):
if not found:
raise AppArmorException("Could not find required rule: %s" % r)
set_environ(environ)
if environ:
set_environ(environ)
args = ['aa-exec', '-p', policy_name, '--']
args.extend(command)
rc, report = cmd(args)