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

Rename profile variable to prof_filename

Browse Source 
... if it contains the profile filename. This avoids confusion with the
"real" 'profile' variable that contains a profile name.
This commit is contained in:
Christian Boltz
2023-10-12 13:04:29 +02:00
parent 4f51c93f9d
commit 1d5f90efcd
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
utils/apparmor/tools.py
View File

@@ -131,41 +131,41 @@ class aa_tools:
sys.exit(1) sys.exit(1)
def cmd_disable(self): def cmd_disable(self):
for (program, profile, output_name) in self.get_next_for_modechange(): for (program, prof_filename, output_name) in self.get_next_for_modechange():
aaui.UI_Info(_('Disabling %s.') % output_name) aaui.UI_Info(_('Disabling %s.') % output_name)
apparmor.create_symlink('disable', profile) apparmor.create_symlink('disable', prof_filename)
self.unload_profile(profile) self.unload_profile(prof_filename)
def cmd_enforce(self): def cmd_enforce(self):
for (program, profile, output_name) in self.get_next_for_modechange(): for (program, prof_filename, output_name) in self.get_next_for_modechange():
apparmor.set_enforce(profile, program) apparmor.set_enforce(prof_filename, program)
self.reload_profile(profile) self.reload_profile(prof_filename)
def cmd_complain(self): def cmd_complain(self):
for (program, profile, output_name) in self.get_next_for_modechange(): for (program, prof_filename, output_name) in self.get_next_for_modechange():
apparmor.set_complain(profile, program) apparmor.set_complain(prof_filename, program)
self.reload_profile(profile) self.reload_profile(prof_filename)
def cmd_audit(self): def cmd_audit(self):
for (program, profile, output_name) in self.get_next_for_modechange(): for (program, prof_filename, output_name) in self.get_next_for_modechange():
# keep this to allow toggling 'audit' flags # keep this to allow toggling 'audit' flags
if not self.remove: if not self.remove:
aaui.UI_Info(_('Setting %s to audit mode.') % output_name) aaui.UI_Info(_('Setting %s to audit mode.') % output_name)
else: else:
aaui.UI_Info(_('Removing audit mode from %s.') % output_name) aaui.UI_Info(_('Removing audit mode from %s.') % output_name)
apparmor.change_profile_flags(profile, program, 'audit', not self.remove) apparmor.change_profile_flags(prof_filename, program, 'audit', not self.remove)
disable_link = '%s/disable/%s' % (apparmor.profile_dir, os.path.basename(profile)) disable_link = '%s/disable/%s' % (apparmor.profile_dir, os.path.basename(prof_filename))
if os.path.exists(disable_link): if os.path.exists(disable_link):
aaui.UI_Info(_('\nWarning: the profile %s is disabled. Use aa-enforce or aa-complain to enable it.') % os.path.basename(profile)) aaui.UI_Info(_('\nWarning: the profile %s is disabled. Use aa-enforce or aa-complain to enable it.') % os.path.basename(prof_filename))
self.reload_profile(profile) self.reload_profile(prof_filename)
def cmd_autodep(self): def cmd_autodep(self):
apparmor.loadincludes() apparmor.loadincludes()
@@ -219,18 +219,18 @@ class aa_tools:
else: else:
raise AppArmorException(_('The profile for %s does not exists. Nothing to clean.') % program) raise AppArmorException(_('The profile for %s does not exists. Nothing to clean.') % program)
def unload_profile(self, profile): def unload_profile(self, prof_filename):
if not self.do_reload: if not self.do_reload:
return return
# FIXME: should ensure profile is loaded before unloading # FIXME: should ensure profile is loaded before unloading
cmd_info = cmd([apparmor.parser, '-I%s' % apparmor.profile_dir, '--base', apparmor.profile_dir, '-R', profile]) cmd_info = cmd([apparmor.parser, '-I%s' % apparmor.profile_dir, '--base', apparmor.profile_dir, '-R', prof_filename])
if cmd_info[0] != 0: if cmd_info[0] != 0:
raise AppArmorException(cmd_info[1]) raise AppArmorException(cmd_info[1])
def reload_profile(self, profile): def reload_profile(self, prof_filename):
if not self.do_reload: if not self.do_reload:
return return
apparmor.reload_profile(profile, raise_exc=True) apparmor.reload_profile(prof_filename, raise_exc=True)