diff --git a/utils/apparmor/regex.py b/utils/apparmor/regex.py index 01f7cc905..3fb48f9c8 100644 --- a/utils/apparmor/regex.py +++ b/utils/apparmor/regex.py @@ -46,7 +46,7 @@ RE_PROFILE_PATH_ENTRY = re.compile(RE_AUDIT_DENY + RE_OWNER + '(file\s+)?([\"@ RE_PROFILE_NETWORK = re.compile(RE_AUDIT_DENY + 'network(?P
\s+.*)?' + RE_COMMA_EOL) RE_PROFILE_CHANGE_HAT = re.compile('^\s*\^(\"??.+?\"??)' + RE_COMMA_EOL) RE_PROFILE_HAT_DEF = re.compile('^(?P\s*)(?P\^|hat\s+)(?P\"??.+?\"??)\s+((flags=)?\((?P.+)\)\s+)*\{' + RE_EOL) -RE_PROFILE_DBUS = re.compile(RE_AUDIT_DENY + '(dbus\s*,|dbus\s+[^#]*\s*,)' + RE_EOL) +RE_PROFILE_DBUS = re.compile(RE_AUDIT_DENY + '(dbus\s*,|dbus(?P
\s+[^#]*)\s*,)' + RE_EOL) RE_PROFILE_MOUNT = re.compile(RE_AUDIT_DENY + '((mount|remount|umount|unmount)(\s+[^#]*)?\s*,)' + RE_EOL) RE_PROFILE_SIGNAL = re.compile(RE_AUDIT_DENY + '(signal\s*,|signal(?P
\s+[^#]*)\s*,)' + RE_EOL) RE_PROFILE_PTRACE = re.compile(RE_AUDIT_DENY + '(ptrace\s*,|ptrace(?P
\s+[^#]*)\s*,)' + RE_EOL) diff --git a/utils/test/test-regex_matches.py b/utils/test/test-regex_matches.py index 3059ebf19..2b0c208a3 100644 --- a/utils/test/test-regex_matches.py +++ b/utils/test/test-regex_matches.py @@ -259,10 +259,10 @@ class AARegexDbus(AARegexTest): self.regex = aa.RE_PROFILE_DBUS tests = [ - (' dbus,', (None, None, 'dbus,', None)), - (' audit dbus,', ('audit', None, 'dbus,', None)), - (' dbus send member=no_comment,', (None, None, 'dbus send member=no_comment,', None)), - (' dbus send member=no_comment, # comment', (None, None, 'dbus send member=no_comment,', '# comment')), + (' dbus,', (None, None, 'dbus,', None, None)), + (' audit dbus,', ('audit', None, 'dbus,', None, None)), + (' dbus send member=no_comment,', (None, None, 'dbus send member=no_comment,', 'send member=no_comment', None)), + (' dbus send member=no_comment, # comment', (None, None, 'dbus send member=no_comment,', 'send member=no_comment', '# comment')), (' dbusdriver,', False), (' audit dbusdriver,', False),