mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-07 01:41:00 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge Catch PermissionError when trying to write a profile

Browse source 
... and re-raise it as AppArmorException so that only the actual error
(without a backtrace) gets displayed.

Fixes: https://gitlab.com/apparmor/apparmor/-/issues/282

I propose this patch for 3.0..master.

Closes #282
MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/946
Approved-by: Jon Tourville <jon.tourville@canonical.com>
Merged-by: Christian Boltz <apparmor@cboltz.de>


(cherry picked from commit 50074a3c01)

d0ec2aca Catch PermissionError when trying to write a profile
This commit is contained in:
Christian Boltz 2022-11-15 20:45:59 +00:00
parent 465c861b02
commit 9d826aae65
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
utils/apparmor/aa.py
View file

@ -2277,14 +2277,18 @@ def write_profile(profile, is_attachment=False):
serialize_options = {'METADATA': True, 'is_attachment': is_attachment} serialize_options = {'METADATA': True, 'is_attachment': is_attachment}
profile_string = serialize_profile(split_to_merged(aa), profile, serialize_options) profile_string = serialize_profile(split_to_merged(aa), profile, serialize_options)
with NamedTemporaryFile('w', suffix='~', delete=False, dir=profile_dir) as newprof: try:
if os.path.exists(prof_filename): with NamedTemporaryFile('w', suffix='~', delete=False, dir=profile_dir) as newprof:
shutil.copymode(prof_filename, newprof.name) if os.path.exists(prof_filename):
else: shutil.copymode(prof_filename, newprof.name)
# permission_600 = stat.S_IRUSR | stat.S_IWUSR # Owner read and write else:
# os.chmod(newprof.name, permission_600) # permission_600 = stat.S_IRUSR | stat.S_IWUSR # Owner read and write
pass # os.chmod(newprof.name, permission_600)
newprof.write(profile_string) pass
newprof.write(profile_string)
except PermissionError as e:
raise AppArmorException(e)
os.rename(newprof.name, prof_filename) os.rename(newprof.name, prof_filename)
if profile in changed: if profile in changed: