mirror of
https://gitlab.com/apparmor/apparmor
synced 2025-08-30 13:58:22 +00:00
Introduce 'final_name' to hashlog and handle exec choices
'final_name' by default is the profile name, but ask_exec() will change
it for the target profile (which is a null-* profile at this stage)
based on exec mode choice. ask_addhat() will also change it based on the
chosen hat.
Choosing "deny" or "unconfined" will result in an empty final_name and
ignoring these log events.
All other choices set final_name to the full profile name ("foo" for Px,
"foo//bar" for Cx, current profile for ix).
Also fix the order of handling log events - since ask_exec() changes the
hashlog final_name, it has to run first so that ask_addhat() (which
"only" adjusts the hat name in final_name) and handle_hashlog() can work
with the updated profile name.
Finally, update test-libapparmor-test_multi.py to ignore final_name when
checking if hashlog is empty, and fix the call order of ask_exec() etc.
This commit is contained in:
Christian Boltz
parent
d1b8772a1d
commit
c77426ed62
@ -888,10 +888,12 @@ def build_x_functions(default, options, exec_toggle):
|
||||
def handle_hashlog(hashlog):
|
||||
'''Copy hashlog content to prelog'''
|
||||
|
||||
# TODO: translate null-* to the profile name after deciding about exec mode (currently, events get lost/ignored at the exec boundary)
|
||||
for aamode in hashlog.keys():
|
||||
for full_profile in hashlog[aamode].keys():
|
||||
profile, hat = split_name(full_profile) # XXX limited to two levels to avoid an Exception on nested child profiles or nested null-*
|
||||
if hashlog[aamode][full_profile]['final_name'] == '':
|
||||
continue # user chose "deny" or "unconfined" for this target, therefore ignore log events
|
||||
|
||||
profile, hat = split_name(hashlog[aamode][full_profile]['final_name']) # XXX limited to two levels to avoid an Exception on nested child profiles or nested null-*
|
||||
# TODO: support nested child profiles
|
||||
|
||||
for typ in hashlog[aamode][full_profile].keys():
|
||||
@ -902,12 +904,12 @@ def ask_addhat(hashlog):
|
||||
|
||||
for aamode in hashlog:
|
||||
for profile in hashlog[aamode]:
|
||||
if '//' in profile and hashlog[aamode][profile]['change_hat'].keys():
|
||||
if '//' in hashlog[aamode][profile]['final_name'] and hashlog[aamode][profile]['change_hat'].keys():
|
||||
aaui.UI_Important('Ignoring change_hat event for %s, nested profiles are not supported yet.' % profile)
|
||||
continue
|
||||
|
||||
for hat in hashlog[aamode][profile]['change_hat']:
|
||||
hat = hat.split('//')[-1]
|
||||
for full_hat in hashlog[aamode][profile]['change_hat']:
|
||||
hat = full_hat.split('//')[-1]
|
||||
|
||||
if aa[profile].get(hat, False):
|
||||
continue # no need to ask if the hat already exists
|
||||
@ -954,9 +956,11 @@ def ask_addhat(hashlog):
|
||||
if ans == 'CMD_ADDHAT':
|
||||
aa[profile][hat] = ProfileStorage(profile, hat, 'ask_addhat addhat')
|
||||
aa[profile][hat]['flags'] = aa[profile][profile]['flags']
|
||||
hashlog[aamode][full_hat]['final_name'] = '%s//%s' % (profile, hat)
|
||||
changed[profile] = True
|
||||
elif ans == 'CMD_USEDEFAULT':
|
||||
hat = default_hat
|
||||
hashlog[aamode][full_hat]['final_name'] = '%s//%s' % (profile, default_hat)
|
||||
if not aa[profile].get(hat, False):
|
||||
# create default hat if it doesn't exist yet
|
||||
aa[profile][hat] = ProfileStorage(profile, hat, 'ask_addhat default hat')
|
||||
@ -964,6 +968,7 @@ def ask_addhat(hashlog):
|
||||
changed[profile] = True
|
||||
elif ans == 'CMD_DENY':
|
||||
# As unknown hat is denied no entry for it should be made
|
||||
hashlog[aamode][full_hat]['final_name'] = ''
|
||||
continue
|
||||
|
||||
def ask_exec(hashlog):
|
||||
@ -971,9 +976,9 @@ def ask_exec(hashlog):
|
||||
|
||||
for aamode in hashlog:
|
||||
for profile in hashlog[aamode]:
|
||||
if '//' in profile and hashlog[aamode][profile]['exec'].keys():
|
||||
if '//' in hashlog[aamode][profile]['final_name'] and hashlog[aamode][profile]['exec'].keys():
|
||||
# TODO: is this really needed? Or would removing Cx from the options be good enough?
|
||||
aaui.UI_Important('WARNING: Ignoring exec event in %s, nested profiles are not supported yet.' % profile)
|
||||
aaui.UI_Important('WARNING: Ignoring exec event in %s, nested profiles are not supported yet.' % hashlog[aamode][profile]['final_name'])
|
||||
continue
|
||||
|
||||
hat = profile # XXX temporary solution to avoid breaking the existing code
|
||||
@ -1109,6 +1114,7 @@ def ask_exec(hashlog):
|
||||
if ans == 'CMD_DENY':
|
||||
aa[profile][hat]['file'].add(FileRule(exec_target, None, 'x', FileRule.ALL, owner=False, log_event=True, deny=True))
|
||||
changed[profile] = True
|
||||
hashlog[aamode][target_profile]['final_name'] = ''
|
||||
# Skip remaining events if they ask to deny exec
|
||||
continue
|
||||
|
||||
@ -1137,11 +1143,14 @@ def ask_exec(hashlog):
|
||||
# Update tracking info based on kind of change
|
||||
|
||||
if ans == 'CMD_ix':
|
||||
pass
|
||||
hashlog[aamode][target_profile]['final_name'] = profile
|
||||
|
||||
elif re.search('^CMD_(px|nx|pix|nix)', ans):
|
||||
if to_name:
|
||||
exec_target = to_name
|
||||
|
||||
hashlog[aamode][target_profile]['final_name'] = exec_target
|
||||
|
||||
# Check profile exists for px
|
||||
if not os.path.exists(get_profile_filename_from_attachment(exec_target, True)):
|
||||
ynans = 'y'
|
||||
@ -1154,6 +1163,9 @@ def ask_exec(hashlog):
|
||||
else:
|
||||
autodep(exec_target, '')
|
||||
reload_base(exec_target)
|
||||
else:
|
||||
hashlog[aamode][target_profile]['final_name'] = profile # not creating the target profile effectively results in ix mode
|
||||
|
||||
elif ans.startswith('CMD_cx') or ans.startswith('CMD_cix'):
|
||||
if to_name:
|
||||
exec_target = to_name
|
||||
@ -1177,6 +1189,11 @@ def ask_exec(hashlog):
|
||||
file_name = aa[profile][profile]['filename']
|
||||
filelist[file_name]['profiles'][profile][exec_target] = True
|
||||
|
||||
hashlog[aamode][target_profile]['final_name'] = '%s//%s' % (profile, exec_target)
|
||||
|
||||
else:
|
||||
hashlog[aamode][target_profile]['final_name'] = profile # not creating the target profile effectively results in ix mode
|
||||
|
||||
elif ans.startswith('CMD_ux'):
|
||||
continue
|
||||
|
||||
@ -1693,9 +1710,9 @@ def do_logprof_pass(logmark='', passno=0):
|
||||
log_reader = apparmor.logparser.ReadLog(logfile, active_profiles, profile_dir)
|
||||
hashlog = log_reader.read_log(logmark)
|
||||
|
||||
handle_hashlog(hashlog)
|
||||
ask_exec(hashlog)
|
||||
ask_addhat(hashlog)
|
||||
handle_hashlog(hashlog)
|
||||
|
||||
#read_log(logmark)
|
||||
|
||||
|
||||
@ -59,6 +59,7 @@ class ReadLog:
|
||||
return # already initialized, don't overwrite existing data
|
||||
|
||||
self.hashlog[aamode][profile] = {
|
||||
'final_name': profile, # might be changed for null-* profiles based on exec decisions
|
||||
'capability': {}, # flat, no hasher needed
|
||||
'change_hat': {}, # flat, no hasher needed
|
||||
'dbus': hasher(),
|
||||
|
||||
@ -237,9 +237,9 @@ def logfile_to_profile(logfile):
|
||||
log_reader = ReadLog(logfile, apparmor.aa.active_profiles, '')
|
||||
hashlog = log_reader.read_log('')
|
||||
|
||||
apparmor.aa.handle_hashlog(hashlog)
|
||||
apparmor.aa.ask_exec(hashlog)
|
||||
apparmor.aa.ask_addhat(hashlog)
|
||||
apparmor.aa.handle_hashlog(hashlog)
|
||||
|
||||
log_dict = apparmor.aa.collapse_log()
|
||||
|
||||
@ -261,6 +261,8 @@ def logfile_to_profile(logfile):
|
||||
for tmpaamode in hashlog:
|
||||
for tmpprofile in hashlog[tmpaamode]:
|
||||
for tmpruletype in hashlog[tmpaamode][tmpprofile]:
|
||||
if tmpruletype == 'final_name' and hashlog[tmpaamode][tmpprofile]['final_name'] == tmpprofile:
|
||||
continue # final_name is a copy of the profile name (may be changed by ask_exec(), but that won't happen in this test)
|
||||
if hashlog[tmpaamode][tmpprofile][tmpruletype]:
|
||||
log_is_empty = False
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user