mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-01 23:05:11 +00:00
Code Issues Releases Wiki Activity

aa.py: let parse_audit_allow also match comments

Browse Source 
Note: this is v1 of the patch - I'll send a patch for RE_EOL to trim 
whitespace.


Acked-by: Kshitij Gupta <kgupta8592@gmail.com>
This commit is contained in:
Christian Boltz
2014-11-08 16:47:39 +01:00
parent 43f8bd778f
commit a3d9de704c
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
utils/apparmor/aa.py
View File

@@ -2752,8 +2752,8 @@ def parse_profile_data(data, file, do_include):
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 })
audit, allow, allow_keyword = parse_audit_allow(matches) audit, allow, allow_keyword, comment = parse_audit_allow(matches)
# TODO: honor allow_keyword # TODO: honor allow_keyword and comment
capability = ALL capability = ALL
if matches.group('capability'): if matches.group('capability'):
@@ -2870,8 +2870,8 @@ def parse_profile_data(data, file, do_include):
if not profile: if not profile:
raise AppArmorException(_('Syntax Error: Unexpected bare file rule found in file: %(file)s line: %(line)s') % { 'file': file, 'line': lineno + 1 }) raise AppArmorException(_('Syntax Error: Unexpected bare file rule found in file: %(file)s line: %(line)s') % { 'file': file, 'line': lineno + 1 })
audit, allow, allow_keyword = parse_audit_allow(matches) audit, allow, allow_keyword, comment = parse_audit_allow(matches)
# TODO: honor allow_keyword # TODO: honor allow_keyword and comment
mode = apparmor.aamode.AA_BARE_FILE_MODE mode = apparmor.aamode.AA_BARE_FILE_MODE
if not matches.group('owner'): if not matches.group('owner'):
@@ -3222,7 +3222,12 @@ def parse_audit_allow(matches):
if allow != 'allow' and allow != 'deny': # should never happen if allow != 'allow' and allow != 'deny': # should never happen
raise AppArmorException(_("Invalid allow/deny keyword %s" % allow)) raise AppArmorException(_("Invalid allow/deny keyword %s" % allow))
return (audit, allow, allow_keyword) comment = ''
if matches.group('comment'):
# include a space so that we don't need to add it everywhere when writing the rule
comment = ' %s' % matches.group('comment')
return (audit, allow, allow_keyword, comment)
# RE_DBUS_ENTRY = re.compile('^dbus\s*()?,\s*$') # RE_DBUS_ENTRY = re.compile('^dbus\s*()?,\s*$')
# use stuff like '(?P<action>(send|write|w|receive|read|r|rw))' # use stuff like '(?P<action>(send|write|w|receive|read|r|rw))'