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

tools.py: call apparmor.read_profiles() in __init__()

Browse Source 
... instead of calling it in every cmd_* function.
This commit is contained in:
Christian Boltz
2023-10-11 22:53:28 +02:00
parent 7eff621fc7
commit fc8c7722a1
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
utils/apparmor/tools.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) 2015-2022 Christian Boltz <apparmor@cboltz.de> # Copyright (C) 2015-2023 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
@@ -27,6 +27,7 @@ _ = init_translation()
class aa_tools: class aa_tools:
def __init__(self, tool_name, args): def __init__(self, tool_name, args):
apparmor.init_aa(profiledir=args.dir, confdir=args.configdir) apparmor.init_aa(profiledir=args.dir, confdir=args.configdir)
apparmor.read_profiles()
if not user_perm(apparmor.profile_dir): if not user_perm(apparmor.profile_dir):
raise AppArmorException("Cannot write to profile directory: %s" % (apparmor.profile_dir)) raise AppArmorException("Cannot write to profile directory: %s" % (apparmor.profile_dir))
@@ -92,9 +93,6 @@ class aa_tools:
yield (program, profile) yield (program, profile)
def cleanprof_act(self): def cleanprof_act(self):
# used by aa-cleanprof
apparmor.read_profiles()
for (program, profile) in self.get_next_to_profile(): for (program, profile) in self.get_next_to_profile():
if program is None: if program is None:
program = profile program = profile
@@ -118,8 +116,6 @@ class aa_tools:
sys.exit(1) sys.exit(1)
def cmd_disable(self): def cmd_disable(self):
apparmor.read_profiles()
for (program, profile) in self.get_next_to_profile(): for (program, profile) in self.get_next_to_profile():
output_name = profile if program is None else program output_name = profile if program is None else program
@@ -134,8 +130,6 @@ class aa_tools:
self.unload_profile(profile) self.unload_profile(profile)
def cmd_enforce(self): def cmd_enforce(self):
apparmor.read_profiles()
for (program, profile) in self.get_next_to_profile(): for (program, profile) in self.get_next_to_profile():
output_name = profile if program is None else program output_name = profile if program is None else program
@@ -149,8 +143,6 @@ class aa_tools:
self.reload_profile(profile) self.reload_profile(profile)
def cmd_complain(self): def cmd_complain(self):
apparmor.read_profiles()
for (program, profile) in self.get_next_to_profile(): for (program, profile) in self.get_next_to_profile():
output_name = profile if program is None else program output_name = profile if program is None else program
@@ -164,8 +156,6 @@ class aa_tools:
self.reload_profile(profile) self.reload_profile(profile)
def cmd_audit(self): def cmd_audit(self):
apparmor.read_profiles()
for (program, profile) in self.get_next_to_profile(): for (program, profile) in self.get_next_to_profile():
output_name = profile if program is None else program output_name = profile if program is None else program
@@ -189,7 +179,6 @@ class aa_tools:
self.reload_profile(profile) self.reload_profile(profile)
def cmd_autodep(self): def cmd_autodep(self):
apparmor.read_profiles()
apparmor.loadincludes() apparmor.loadincludes()
for (program, profile) in self.get_next_to_profile(): for (program, profile) in self.get_next_to_profile():