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

utils: rewrite parse_profile_start()

Browse Source 
Merge from trunk revision 2990

Rewrite parse_profile_start() in aa.py to a more readable version.
The behaviour remains unchanged (and is covered by tests).

Acked-by: Kshitij Gupta <kgupta8592@gmail.com>
This commit is contained in:
Christian Boltz
2015-04-13 18:49:37 -07:00
committed by Steve Beattie
parent 5390777e45
commit 8d5569f20b
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
utils/apparmor/aa.py
View File

@@ -2633,31 +2633,31 @@ def attach_profile_data(profiles, profile_data):
def parse_profile_start(line, file, lineno, profile, hat): def parse_profile_start(line, file, lineno, profile, hat):
matches = parse_profile_start_line(line, file) matches = parse_profile_start_line(line, file)
pps_set_profile = False if profile: # we are inside a profile, so we expect a child profile
pps_set_hat_external = False if not matches['profile_keyword']:
raise AppArmorException(_('%(profile)s profile in %(file)s contains syntax errors in line %(line)s: missing "profile" keyword.') % {
'profile': profile, 'file': file, 'line': lineno + 1 })
if profile != hat:
# nesting limit reached - a child profile can't contain another child profile
raise AppArmorException(_('%(profile)s profile in %(file)s contains syntax errors in line %(line)s: a child profile inside another child profile is not allowed.') % {
'profile': profile, 'file': file, 'line': lineno + 1 })
if profile:
#print(profile, hat)
if profile != hat or not matches['profile_keyword']:
raise AppArmorException(_('%(profile)s profile in %(file)s contains syntax errors in line: %(line)s.') % { 'profile': profile, 'file': file, 'line': lineno + 1 })
# Keep track of the start of a profile
if profile and profile == hat and matches['profile_keyword']:
# local profile
hat = matches['profile'] hat = matches['profile']
in_contained_hat = True in_contained_hat = True
pps_set_profile = True pps_set_profile = True
else: pps_set_hat_external = False
else: # stand-alone profile
profile = matches['profile'] profile = matches['profile']
#print(profile)
if len(profile.split('//')) >= 2: if len(profile.split('//')) >= 2:
profile, hat = profile.split('//')[:2] profile, hat = profile.split('//')[:2]
else:
hat = None
in_contained_hat = False
if hat:
pps_set_hat_external = True pps_set_hat_external = True
else: else:
hat = profile hat = profile
pps_set_hat_external = False
in_contained_hat = False
pps_set_profile = False
attachment = matches['attachment'] attachment = matches['attachment']
flags = matches['flags'] flags = matches['flags']