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

aa.py: Add load_sev_db()

Browse source 
... to de-duplicate code loading the severity db.
This commit is contained in:
Christian Boltz 2024-10-20 22:32:35 +02:00
parent 183d00e087
commit 4276e80ed5
Failed to generate hash of commit
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
utils/aa-mergeprof
View file

@ -17,7 +17,6 @@ import argparse
import apparmor.aa
import apparmor.cleanprofile as cleanprofile
import apparmor.severity
import apparmor.ui as aaui
from apparmor.fail import enable_aa_exception_handler
from apparmor.translations import init_translation
@ -115,8 +114,7 @@ class Merge(object):
apparmor.aa.loadincludes()
if not apparmor.aa.sev_db:
apparmor.aa.sev_db = apparmor.severity.Severity(apparmor.aa.CONFDIR + '/severity.db', _('unknown'))
apparmor.aa.load_sev_db()
# ask about preamble rules
apparmor.aa.ask_rule_questions(

11
utils/apparmor/aa.py
View file

@ -1463,14 +1463,12 @@ def set_logfile(filename):
def do_logprof_pass(logmark='', out_dir=None):
# set up variables for this pass
global active_profiles
global sev_db
# aa = hasher()
# changed = dict()
aaui.UI_Info(_('Reading log entries from %s.') % logfile)
if not sev_db:
sev_db = apparmor.severity.Severity(CONFDIR + '/severity.db', _('unknown'))
load_sev_db()
# print(pid)
# print(active_profiles)
@ -2394,3 +2392,10 @@ def init_aa(confdir=None, profiledir=None):
parser = conf.find_first_file(cfg['settings'].get('parser')) or '/sbin/apparmor_parser'
if not os.path.isfile(parser) or not os.access(parser, os.EX_OK):
raise AppArmorException("Can't find apparmor_parser at %s" % (parser))
def load_sev_db():
global sev_db
if not sev_db:
sev_db = apparmor.severity.Severity(CONFDIR + '/severity.db', _('unknown'))