mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-22 10:07:12 +00:00
Code Issues Releases Wiki Activity

Merge Split priority rules with unsafe keyword to separate tests

Browse Source 
This helps to limit the amount of rules skipped in the utils tests
(because the utils don't support the `unsafe` keyword)

MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/1671
Approved-by: Maxime Bélair <maxime.belair@canonical.com>
Approved-by: Georgia Garcia <georgia.garcia@canonical.com>
Approved-by: Ryan Lee <rlee287@yahoo.com>
Merged-by: Ryan Lee <rlee287@yahoo.com>
This commit is contained in:
Ryan Lee 2025-05-06 08:40:32 -07:00
commit 7d33bde1ea
5 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
parser/tst/simple_tests/file/priority/front_perms_ok_1.sd
View File

@ -15,10 +15,5 @@
priority=-1 file ux /foo3, priority=-1 file ux /foo3,
priority=-1 file Ux /foo4, priority=-1 file Ux /foo4,
priority=-1 file ix /foo5, priority=-1 file ix /foo5,
priority=-1 file unsafe px /foo6,
priority=-1 file unsafe Px /foo7,
priority=-1 file unsafe ux /foo8,
priority=-1 file unsafe Ux /foo9,
priority=-1 file unsafe ix /foo10,
} }

5
parser/tst/simple_tests/file/priority/front_perms_ok_2.sd
View File

@ -15,10 +15,5 @@
priority=-1 ux /foo3, priority=-1 ux /foo3,
priority=-1 Ux /foo4, priority=-1 Ux /foo4,
priority=-1 ix /foo5, priority=-1 ix /foo5,
priority=-1 unsafe px /foo6,
priority=-1 unsafe Px /foo7,
priority=-1 unsafe ux /foo8,
priority=-1 unsafe Ux /foo9,
priority=-1 unsafe ix /foo10,
} }

12
parser/tst/simple_tests/file/priority/front_perms_ok_3.sd Normal file
View File

@ -0,0 +1,12 @@
#
#=DESCRIPTION perms before pathname + unsafe keyword
#=EXRESULT PASS
#
/usr/bin/foo {
priority=-1 file unsafe px /foo6,
priority=-1 file unsafe Px /foo7,
priority=-1 file unsafe ux /foo8,
priority=-1 file unsafe Ux /foo9,
priority=-1 file unsafe ix /foo10,
}

13
parser/tst/simple_tests/file/priority/front_perms_ok_4.sd Normal file
View File

@ -0,0 +1,13 @@
#
#=DESCRIPTION perms before pathname + unsafe keyword
#=EXRESULT PASS
#
/usr/bin/foo {
priority=-1 unsafe px /foo6,
priority=-1 unsafe Px /foo7,
priority=-1 unsafe ux /foo8,
priority=-1 unsafe Ux /foo9,
priority=-1 unsafe ix /foo10,
}

4
utils/test/test-parser-simple-tests.py
View File

@ -251,8 +251,8 @@ unknown_line = (
'file/file/front_perms_ok_2.sd', 'file/file/front_perms_ok_2.sd',
'file/front_perms_ok_2.sd', 'file/front_perms_ok_2.sd',
'xtrans/simple_ok_cx_1.sd', 'xtrans/simple_ok_cx_1.sd',
'file/priority/front_perms_ok_1.sd', 'file/priority/front_perms_ok_3.sd',
'file/priority/front_perms_ok_2.sd', 'file/priority/front_perms_ok_4.sd',
# owner / audit {...} blocks # owner / audit {...} blocks
'file/file/owner/ok_1.sd', 'file/file/owner/ok_1.sd',