mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-29 13:28:19 +00:00
Code Issues Releases Wiki Activity

Use *Rule.match() in aa.py

Browse Source 
Replace usage of RE_PROFILE_CAP and RE_PROFILE_NETWORK with
CapabilityRule.match() and NetworkRule.match() calls.
This also means aa.py doesn't need to import those regexes anymore.

As a side effect of this change, test-regex_matches.py needs a small
fix because it imported RE_PROFILE_CAP from apparmor.aa instead of
apparmor.regex.


Acked-by: Seth Arnold <seth.arnold@canonical.com>
This commit is contained in:
Christian Boltz 2015-04-26 22:02:01 +02:00
parent 6dade51f92
commit c9fe061525
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
utils/apparmor/aa.py
View File

@ -40,11 +40,11 @@ from apparmor.aamode import (str_to_mode, mode_to_str, contains, split_mode,
mode_to_str_user, mode_contains, AA_OTHER, mode_to_str_user, mode_contains, AA_OTHER,
flatten_mode, owner_flatten_mode) flatten_mode, owner_flatten_mode)
from apparmor.regex import (RE_PROFILE_START, RE_PROFILE_END, RE_PROFILE_CAP, RE_PROFILE_LINK, from apparmor.regex import (RE_PROFILE_START, RE_PROFILE_END, RE_PROFILE_LINK,
RE_PROFILE_CHANGE_PROFILE, RE_PROFILE_ALIAS, RE_PROFILE_RLIMIT, RE_PROFILE_CHANGE_PROFILE, RE_PROFILE_ALIAS, RE_PROFILE_RLIMIT,
RE_PROFILE_BOOLEAN, RE_PROFILE_VARIABLE, RE_PROFILE_CONDITIONAL, RE_PROFILE_BOOLEAN, RE_PROFILE_VARIABLE, RE_PROFILE_CONDITIONAL,
RE_PROFILE_CONDITIONAL_VARIABLE, RE_PROFILE_CONDITIONAL_BOOLEAN, RE_PROFILE_CONDITIONAL_VARIABLE, RE_PROFILE_CONDITIONAL_BOOLEAN,
RE_PROFILE_BARE_FILE_ENTRY, RE_PROFILE_PATH_ENTRY, RE_PROFILE_NETWORK, RE_PROFILE_BARE_FILE_ENTRY, RE_PROFILE_PATH_ENTRY,
RE_PROFILE_CHANGE_HAT, RE_PROFILE_CHANGE_HAT,
RE_PROFILE_HAT_DEF, RE_PROFILE_DBUS, RE_PROFILE_MOUNT, RE_PROFILE_HAT_DEF, RE_PROFILE_DBUS, RE_PROFILE_MOUNT,
RE_PROFILE_SIGNAL, RE_PROFILE_PTRACE, RE_PROFILE_PIVOT_ROOT, RE_PROFILE_SIGNAL, RE_PROFILE_PTRACE, RE_PROFILE_PIVOT_ROOT,
@ -2701,7 +2701,7 @@ def parse_profile_data(data, file, do_include):
initial_comment = '' initial_comment = ''
elif RE_PROFILE_CAP.search(line): elif CapabilityRule.match(line):
if not profile: if not profile:
raise AppArmorException(_('Syntax Error: Unexpected capability entry found in file: %(file)s line: %(line)s') % { 'file': file, 'line': lineno + 1 }) raise AppArmorException(_('Syntax Error: Unexpected capability entry found in file: %(file)s line: %(line)s') % { 'file': file, 'line': lineno + 1 })
@ -2915,7 +2915,7 @@ def parse_profile_data(data, file, do_include):
if not include.get(include_name, False): if not include.get(include_name, False):
load_include(include_name) load_include(include_name)
elif RE_PROFILE_NETWORK.search(line): elif NetworkRule.match(line):
if not profile: if not profile:
raise AppArmorException(_('Syntax Error: Unexpected network entry found in file: %(file)s line: %(line)s') % { 'file': file, 'line': lineno + 1 }) raise AppArmorException(_('Syntax Error: Unexpected network entry found in file: %(file)s line: %(line)s') % { 'file': file, 'line': lineno + 1 })
@ -3830,7 +3830,7 @@ def serialize_profile_from_old_profile(profile_data, name, options):
else: else:
profile = None profile = None
elif RE_PROFILE_CAP.search(line): elif CapabilityRule.match(line):
cap = CapabilityRule.parse(line) cap = CapabilityRule.parse(line)
if write_prof_data[hat]['capability'].is_covered(cap, True, True): if write_prof_data[hat]['capability'].is_covered(cap, True, True):
if not segments['capability'] and True in segments.values(): if not segments['capability'] and True in segments.values():
@ -4069,7 +4069,7 @@ def serialize_profile_from_old_profile(profile_data, name, options):
write_filelist['include'].pop(include_name) write_filelist['include'].pop(include_name)
data.append(line) data.append(line)
elif RE_PROFILE_NETWORK.search(line): elif NetworkRule.match(line):
network_obj = NetworkRule.parse(line) network_obj = NetworkRule.parse(line)
if write_prof_data[hat]['network'].is_covered(network_obj, True, True): if write_prof_data[hat]['network'].is_covered(network_obj, True, True):
if not segments['network'] and True in segments.values(): if not segments['network'] and True in segments.values():

4
utils/test/test-regex_matches.py
View File

@ -14,7 +14,7 @@ import unittest
from common_test import AATest, setup_all_loops from common_test import AATest, setup_all_loops
from apparmor.common import AppArmorBug from apparmor.common import AppArmorBug
from apparmor.regex import strip_quotes, parse_profile_start_line, RE_PROFILE_START from apparmor.regex import strip_quotes, parse_profile_start_line, RE_PROFILE_START, RE_PROFILE_CAP
class AARegexTest(AATest): class AARegexTest(AATest):
@ -204,7 +204,7 @@ class AARegexCapability(AARegexTest):
'''Tests for RE_PROFILE_CAP''' '''Tests for RE_PROFILE_CAP'''
def setUp(self): def setUp(self):
self.regex = aa.RE_PROFILE_CAP self.regex = RE_PROFILE_CAP
tests = [ tests = [
(' capability net_raw,', (None, None, 'net_raw', 'net_raw', None)), (' capability net_raw,', (None, None, 'net_raw', 'net_raw', None)),