mirror of
https://gitlab.com/apparmor/apparmor.git
synced 2025-03-04 16:35:02 +01:00
d82e9a3bec
LOG_MODE_RE (used in validate_log_mode() in aamode.py) just checked if the given parameter contains one of the possible matches. This resulted in "invalid" being a valid log mode (from audit.log requested_mask or denied_mask) because it contains 'a', which is a valid file mode. This patch wraps the regex into ^(...)+$ to make sure the full string contains only allowed file modes. The patch also adds some tests for validate_log_mode(). Acked-by: Steve Beattie <steve@nxnw.org>
74 lines
3.2 KiB
Python
74 lines
3.2 KiB
Python
#! /usr/bin/env python
|
|
# ------------------------------------------------------------------
|
|
#
|
|
# Copyright (C) 2014 Christian Boltz
|
|
#
|
|
# This program is free software; you can redistribute it and/or
|
|
# modify it under the terms of version 2 of the GNU General Public
|
|
# License published by the Free Software Foundation.
|
|
#
|
|
# ------------------------------------------------------------------
|
|
|
|
import unittest
|
|
|
|
from apparmor.aamode import split_log_mode, sub_str_to_mode, validate_log_mode
|
|
from apparmor.common import AppArmorBug
|
|
|
|
class AamodeTest_split_log_mode(unittest.TestCase):
|
|
def test_split_log_mode_1(self):
|
|
self.assertEqual(split_log_mode(''), ('', ''))
|
|
def test_split_log_mode_2(self):
|
|
self.assertEqual(split_log_mode('r'), ('r', 'r'))
|
|
def test_split_log_mode_3(self):
|
|
self.assertEqual(split_log_mode('r::'), ('r', ''))
|
|
def test_split_log_mode_4(self):
|
|
self.assertEqual(split_log_mode('::r'), ('', 'r'))
|
|
def test_split_log_mode_5(self):
|
|
self.assertEqual(split_log_mode('r::w'), ('r', 'w'))
|
|
def test_split_log_mode_6(self):
|
|
self.assertEqual(split_log_mode('rw::rw'), ('rw', 'rw'))
|
|
def test_split_log_mode_invalid_1(self):
|
|
with self.assertRaises(AppArmorBug):
|
|
split_log_mode('r::w::r')
|
|
|
|
class AamodeTest_sub_str_to_mode(unittest.TestCase):
|
|
def test_sub_str_to_mode_1(self):
|
|
self.assertEqual(sub_str_to_mode(''), set())
|
|
def test_sub_str_to_mode_2(self):
|
|
self.assertEqual(sub_str_to_mode('ix'), {'i', 'x'})
|
|
def test_sub_str_to_mode_3(self):
|
|
self.assertEqual(sub_str_to_mode('rw'), {'r', 'w'})
|
|
def test_sub_str_to_mode_4(self):
|
|
self.assertEqual(sub_str_to_mode('rPix'), {'i', 'P', 'r', 'x'})
|
|
def test_sub_str_to_mode_5(self):
|
|
self.assertEqual(sub_str_to_mode('rPUx'), {'P', 'r', 'U', 'x'})
|
|
def test_sub_str_to_mode_6(self):
|
|
self.assertEqual(sub_str_to_mode('cix'), {'i', 'x', 'C', 'execunsafe'})
|
|
def test_sub_str_to_mode_7(self):
|
|
self.assertEqual(sub_str_to_mode('rwlk'), {'k', 'r', 'l', 'w'})
|
|
def test_sub_str_to_mode_8(self):
|
|
self.assertEqual(sub_str_to_mode('asdf42'), {'a'})
|
|
def test_sub_str_to_mode_dupes(self):
|
|
self.assertEqual(sub_str_to_mode('rwrwrw'), {'r', 'w'})
|
|
|
|
class AamodeTest_validate_log_mode(unittest.TestCase):
|
|
def test_validate_log_mode_1(self):
|
|
self.assertTrue(validate_log_mode('a'))
|
|
def test_validate_log_mode_2(self):
|
|
self.assertTrue(validate_log_mode('rw'))
|
|
def test_validate_log_mode_3(self):
|
|
self.assertTrue(validate_log_mode('Pixrw'))
|
|
def test_validate_log_mode_4(self):
|
|
self.assertTrue(validate_log_mode('rrrr'))
|
|
|
|
def test_validate_log_mode_invalid_1(self):
|
|
self.assertFalse(validate_log_mode('c')) # 'c' (create) must be converted to 'a' before calling validate_log_mode()
|
|
def test_validate_log_mode_invalid_2(self):
|
|
self.assertFalse(validate_log_mode('R')) # only lowercase 'r' is valid
|
|
def test_validate_log_mode_invalid_3(self):
|
|
self.assertFalse(validate_log_mode('foo'))
|
|
def test_validate_log_mode_invalid_4(self):
|
|
self.assertFalse(validate_log_mode(''))
|
|
|
|
if __name__ == '__main__':
|
|
unittest.main(verbosity=2)
|