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

ProfileList: add replace_profile()

Browse source 
... and some tests for it.
This commit is contained in:
Christian Boltz 2024-10-27 22:19:06 +01:00
parent a37c65957f
commit c5e495c56d
Failed to generate hash of commit
2 changed files with 37 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
utils/apparmor/profile_list.py
View file

@ -1,5 +1,5 @@
# ----------------------------------------------------------------------
# Copyright (C) 2018-2020 Christian Boltz <apparmor@cboltz.de>
# Copyright (C) 2018-2024 Christian Boltz <apparmor@cboltz.de>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of version 2 of the GNU General Public
@ -107,6 +107,21 @@ class ProfileList:
self.files[filename]['profiles'].append(attachment)
self.profiles[attachment] = prof_storage
def replace_profile(self, profile_name, prof_storage):
"""Replace the given profile in the profile list"""
if profile_name not in self.profiles:
raise AppArmorBug('Attempt to replace non-existing profile %s' % profile_name)
if type(prof_storage) is not ProfileStorage:
raise AppArmorBug('Invalid profile type: %s' % type(prof_storage))
# we might lift this restriction later, but for now, forbid changing the attachment instead of updating self.attachments
if self.profiles[profile_name]['attachment'] != prof_storage['attachment']:
raise AppArmorBug('Attempt to change atttachment while replacing profile %s - original: %s, new: %s' % (profile_name, self.profiles[profile_name]['attachment'], prof_storage['attachment']))
self.profiles[profile_name] = prof_storage
def add_rule(self, filename, ruletype, rule):
"""Store the given rule for the given profile filename preamble"""

22
utils/test/test-profile-list.py
View file

@ -1,7 +1,7 @@
#! /usr/bin/python3
# ------------------------------------------------------------------
#
# Copyright (C) 2018 Christian Boltz <apparmor@cboltz.de>
# Copyright (C) 2018-2024 Christian Boltz <apparmor@cboltz.de>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of version 2 of the GNU General Public
@ -12,6 +12,7 @@
import os
import shutil
import unittest
from copy import deepcopy
import apparmor.aa
from apparmor.common import AppArmorBug, AppArmorException
@ -120,6 +121,25 @@ class TestAdd_profile(AATest):
with self.assertRaises(AppArmorBug):
self.pl.add_profile('/etc/apparmor.d/bin.foo', 'foo', '/bin/foo', 'wrong_type')
def testReplace_profile_1(self):
self.pl.add_profile('/etc/apparmor.d/bin.foo', 'foo', '/bin/foo', self.dummy_profile)
# test if replacement works (but without checking if the content of the actual profile really changed)
self.pl.replace_profile('foo', self.dummy_profile)
with self.assertRaises(AppArmorBug):
self.pl.replace_profile('/bin/foo', self.dummy_profile)
def testReplace_profile_error_1(self):
self.pl.add_profile('/etc/apparmor.d/bin.foo', 'foo', '/bin/foo', self.dummy_profile)
dummy2 = deepcopy(self.dummy_profile)
dummy2['attachment'] = 'changed'
with self.assertRaises(AppArmorBug):
self.pl.replace_profile('foo', dummy2) # changed attachment
def testReplace_profile_error_2(self):
self.pl.add_profile('/etc/apparmor.d/bin.foo', 'foo', '/bin/foo', self.dummy_profile)
with self.assertRaises(AppArmorBug):
self.pl.replace_profile('foo', []) # [] is wrong type
class TestFilename_from_profile_name(AATest):
tests = (