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

severity.py: use re_match_include()

Browse Source 
load_variables() used a nearly-correct regex. Drop it and use
re_match_include() instead.


Acked-by: Kshitij Gupta <kgupta8592@gmail.com>
This commit is contained in:
Christian Boltz
2015-06-19 21:43:19 +02:00
parent 2754e2964b
commit f9c60c06d7
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
utils/apparmor/severity.py
View File

@@ -15,6 +15,7 @@ from __future__ import with_statement
import os
import re
from apparmor.common import AppArmorException, open_file_read, warn, convert_regexp # , msg, error, debug
from apparmor.regex import re_match_include
class Severity(object):
def __init__(self, dbname=None, default_rank=10):
@@ -179,16 +180,14 @@ class Severity(object):
def load_variables(self, prof_path):
"""Loads the variables for the given profile"""
regex_include = re.compile('^#?include\s*<(\S*)>')
if os.path.isfile(prof_path):
with open_file_read(prof_path) as f_in:
for line in f_in:
line = line.strip()
# If any includes, load variables from them first
match = regex_include.search(line)
match = re_match_include(line)
if match:
new_path = match.groups()[0]
new_path = self.PROF_DIR + '/' + new_path
new_path = self.PROF_DIR + '/' + match
self.load_variables(new_path)
else:
# Remove any comments