felipe/apparmor.d
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tests: improve check.sh

Browse source
This commit is contained in:
Alexandre Pujol 2025-08-10 18:24:29 +02:00
parent 9790ca7ebc
commit a724af9ded
No known key found for this signature in database
GPG key ID: C5469996F0DF68EC
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tests/check.sh
View file

@ -153,6 +153,8 @@ declare -A ABS_DEPRECATED=(
["dbus-network-manager-strict"]="bus/org.freedesktop.NetworkManager" ["dbus-network-manager-strict"]="bus/org.freedesktop.NetworkManager"
["dbus-session-strict"]="bus-session" ["dbus-session-strict"]="bus-session"
["dbus-system-strict"]="bus-system" ["dbus-system-strict"]="bus-system"
["gnome"]="gnome-strict"
["kde"]="kde-strict"
) )
_check_abstractions() { _check_abstractions() {
_is_enabled abstractions || return 0 _is_enabled abstractions || return 0
@ -216,7 +218,7 @@ readonly TRANSITION_MUST_CI=( # Must transition to 'ix' or 'Cx'
sed shred stat tail tee test timeout touch truncate unlink sed shred stat tail tee test timeout touch truncate unlink
) )
readonly TRANSITION_MUST_PC=( # Must transition to 'Px' readonly TRANSITION_MUST_PC=( # Must transition to 'Px'
ischroot ischroot who
) )
readonly TRANSITION_MUST_C=( # Must transition to 'Cx' readonly TRANSITION_MUST_C=( # Must transition to 'Cx'
sysctl kmod pgrep pkexec sudo systemctl udevadm sysctl kmod pgrep pkexec sudo systemctl udevadm
@ -226,19 +228,19 @@ readonly TRANSITION_MUST_C=( # Must transition to 'Cx'
_check_transition() { _check_transition() {
_is_enabled transition || return 0 _is_enabled transition || return 0
for prgmname in "${!TRANSITION_MUST_CI[@]}"; do for prgmname in "${!TRANSITION_MUST_CI[@]}"; do
if [[ "$line" =~ "@{bin}/${TRANSITION_MUST_CI[$prgmname]} ".*([uU]x|[pP][uU]x|[pP]x) ]]; then if [[ "$line" =~ "/${TRANSITION_MUST_CI[$prgmname]} ".*([uU]x|[pP][uU]x|[pP]x) ]]; then
_err transition "$file:$line_number" \ _err transition "$file:$line_number" \
"@{bin}/${TRANSITION_MUST_CI[$prgmname]} should be used inherited: 'ix' | 'Cx'" "@{bin}/${TRANSITION_MUST_CI[$prgmname]} should be used inherited: 'ix' | 'Cx'"
fi fi
done done
for prgmname in "${!TRANSITION_MUST_PC[@]}"; do for prgmname in "${!TRANSITION_MUST_PC[@]}"; do
if [[ "$line" =~ "@{bin}/${TRANSITION_MUST_PC[$prgmname]} ".*(Pix|ix) ]]; then if [[ "$line" =~ "/${TRANSITION_MUST_PC[$prgmname]} ".*(Pix|ix) ]]; then
_err transition "$file:$line_number" \ _err transition "$file:$line_number" \
"@{bin}/${TRANSITION_MUST_PC[$prgmname]} should transition to another (sub)profile with 'Px' or 'Cx'" "@{bin}/${TRANSITION_MUST_PC[$prgmname]} should transition to another (sub)profile with 'Px' or 'Cx'"
fi fi
done done
for prgmname in "${!TRANSITION_MUST_C[@]}"; do for prgmname in "${!TRANSITION_MUST_C[@]}"; do
if [[ "$line" =~ "@{bin}/${TRANSITION_MUST_C[$prgmname]} ".*([pP]ix|[uU]x|[pP][uU]x|ix) ]]; then if [[ "$line" =~ "/${TRANSITION_MUST_C[$prgmname]} ".*([pP]ix|[uU]x|[pP][uU]x|ix) ]]; then
_warn transition "$file:$line_number" \ _warn transition "$file:$line_number" \
"@{bin}/${TRANSITION_MUST_C[$prgmname]} should transition to a subprofile with 'Cx'" "@{bin}/${TRANSITION_MUST_C[$prgmname]} should transition to a subprofile with 'Cx'"
fi fi
@ -455,7 +457,6 @@ _check_subprofiles() {
elif $_CHEK_IN_SUBPROFILE; then elif $_CHEK_IN_SUBPROFILE; then
if [[ "$line" == *"$include" ]]; then if [[ "$line" == *"$include" ]]; then
_RES_SUBPROFILES["$subprofile"]=true _RES_SUBPROFILES["$subprofile"]=true
fi fi
fi fi
} }