diff --git a/autotests/folding/usr.bin.apparmor-profile-test.fold b/autotests/folding/usr.bin.apparmor-profile-test.fold --- a/autotests/folding/usr.bin.apparmor-profile-test.fold +++ b/autotests/folding/usr.bin.apparmor-profile-test.fold @@ -57,7 +57,7 @@ /usr/bin/* Pixr, /usr/bin/khelpcenter Cx -> sanitized_helper, /usr/bin/helloworld cxr -> - hello_world, + hello_world, # Dbus rules dbus (send) #No-Comment @@ -93,7 +93,6 @@ # Link rules (two ways) l /foo1 -> /bar, link /foo2 -> bar, - link /foo3 to bar, link subset /link* -> /**, # Network rules @@ -131,6 +130,7 @@ set rlimit nproc <= 10, set rlimit memlock <= 2GB, set rlimit rss <= infinity, + set rlimit nice <= -12, # Change Profile rules change_profile unsafe /** -> [^u/]**, diff --git a/autotests/html/usr.bin.apparmor-profile-test.html b/autotests/html/usr.bin.apparmor-profile-test.html --- a/autotests/html/usr.bin.apparmor-profile-test.html +++ b/autotests/html/usr.bin.apparmor-profile-test.html @@ -63,7 +63,7 @@ /usr/bin/* Pixr, /usr/bin/khelpcenter Cx -> sanitized_helper, /usr/bin/helloworld cxr -> - hello_world, + hello_world, # Dbus rules dbus (send) #No-Comment @@ -99,7 +99,6 @@ # Link rules (two ways) l /foo1 -> /bar, link /foo2 -> bar, - link /foo3 to bar, link subset /link* -> /**, # Network rules @@ -137,6 +136,7 @@ set rlimit nproc <= 10, set rlimit memlock <= 2GB, set rlimit rss <= infinity, + set rlimit nice <= -12, # Change Profile rules change_profile unsafe /** -> [^u/]**, diff --git a/autotests/input/usr.bin.apparmor-profile-test b/autotests/input/usr.bin.apparmor-profile-test --- a/autotests/input/usr.bin.apparmor-profile-test +++ b/autotests/input/usr.bin.apparmor-profile-test @@ -57,7 +57,7 @@ /usr/bin/* Pixr, /usr/bin/khelpcenter Cx -> sanitized_helper, /usr/bin/helloworld cxr -> - hello_world, + hello_world, # Dbus rules dbus (send) #No-Comment @@ -93,7 +93,6 @@ # Link rules (two ways) l /foo1 -> /bar, link /foo2 -> bar, - link /foo3 to bar, link subset /link* -> /**, # Network rules @@ -131,6 +130,7 @@ set rlimit nproc <= 10, set rlimit memlock <= 2GB, set rlimit rss <= infinity, + set rlimit nice <= -12, # Change Profile rules change_profile unsafe /** -> [^u/]**, diff --git a/autotests/reference/usr.bin.apparmor-profile-test.ref b/autotests/reference/usr.bin.apparmor-profile-test.ref --- a/autotests/reference/usr.bin.apparmor-profile-test.ref +++ b/autotests/reference/usr.bin.apparmor-profile-test.ref @@ -57,7 +57,7 @@ /usr/bin/* Pixr,
/usr/bin/khelpcenter Cx -> sanitized_helper,
/usr/bin/helloworld cxr ->
- hello_world,
+ hello_world,

# Dbus rules
dbus (send) #No-Comment
@@ -93,7 +93,6 @@ # Link rules (two ways)
l /foo1 -> /bar,
link /foo2 -> bar,
- link /foo3 to bar,
link subset /link* -> /**,

# Network rules
@@ -131,6 +130,7 @@ set rlimit nproc <= 10,
set rlimit memlock <= 2GB,
set rlimit rss <= infinity,
+ set rlimit nice <= -12,

# Change Profile rules
change_profile unsafe /** -> [^u/]**,
diff --git a/data/syntax/apparmor.xml b/data/syntax/apparmor.xml --- a/data/syntax/apparmor.xml +++ b/data/syntax/apparmor.xml @@ -36,12 +36,16 @@ ========================================================================================== Last update: - Syntax highlighting based on AppArmor 2.13.2 + Syntax highlighting based on AppArmor 2.13.3 For more details about the syntax of AppArmor profiles, visit: https://gitlab.com/apparmor/apparmor/wikis/Documentation - http://manpages.ubuntu.com/manpages/cosmic/en/man5/apparmor.d.5.html + https://manpages.ubuntu.com/manpages/disco/en/man5/apparmor.d.5.html Change log: + * Version 9 [20-Jun-2019]: (AppArmor 2.13.3): + - Add new network domain keywords. + - Fixes: drop unsupported 'to' operator for link rules and only highlight the 'in' + operator in mount rules. Only highlight valid numbers in rlimit rules. * Version 8 [02-Apr-2019]: (AppArmor 2.13.2) - Do not highlight variable assignments and alias rules within profiles. - Add keywords of "tunables/share" variables. @@ -60,15 +64,15 @@ * Version 3 [24-Sep-2017, by Nibaldo G.]: - Fix incorrect highlighting of the DBus rule 'name' keyword. * Version 2 [29-Aug-2017, by Nibaldo G.]: - - Improvements in highlighting and bug fixes. + - Improvements and bug fixes. - Each rule has its own context. - The profile name is highlighted in the profile header and profile transition rules. * Version 1 [22-Feb-2017, by Nibaldo González]: - Initial version. Support for profile syntax of Apparmor 2.11. --> owner - + other audit @@ -205,6 +209,8 @@ ib kcm smc + qipcrtr + xdp @@ -1047,13 +1053,15 @@ - - + + + + @@ -1064,7 +1072,6 @@ - @@ -1114,6 +1121,7 @@ + @@ -1205,11 +1213,9 @@ - - - - - + + + @@ -1321,9 +1327,9 @@ + -