[apparmor] [patch] More test_multi profiles
Christian Boltz
apparmor at cboltz.de
Sat Oct 29 21:01:06 UTC 2016
Hello,
this patch adds profiles for all log sniplets that are expected to
result in a profile rule.
This also means some changes in test-libapparmor-test_multi.py are
needed:
- split off log_to_profile_skip from log_to_profile_known_failures to
- only skip tests in log_to_profile_skip (causing a crash or requiring
user interaction)
- run tests in log_to_profile_known_failures, but expect a non-equal
result (caused by not added rules etc.)
- add quite some tests to log_to_profile_known_failures - they were
skipped before because they didn't have a *.profile file.
- add handling for hats to shorten list of known failures
- fixes testcase24 and testcase33 (after adjusting the profiles) and
lots of the new *.profile files
- since we have *.profile files for all log events that should result in
a profile rule, no longer ignore FileNotFoundError
[ 01-test_multi-all-profiles.diff ]
=== added file 'libraries/libapparmor/testsuite/test_multi/avc_audit_01.profile'
--- libraries/libapparmor/testsuite/test_multi/avc_audit_01.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/avc_audit_01.profile 2016-10-29 19:16:42 +0000
@@ -0,0 +1,4 @@
+/usr/sbin/cupsd {
+ /home/user/.ssh/ r,
+
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/avc_audit_03.profile'
--- libraries/libapparmor/testsuite/test_multi/avc_audit_03.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/avc_audit_03.profile 2016-10-29 19:12:06 +0000
@@ -0,0 +1,4 @@
+/tmp/cat {
+ /etc/passwd r,
+
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/avc_syslog_01.profile'
--- libraries/libapparmor/testsuite/test_multi/avc_syslog_01.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/avc_syslog_01.profile 2016-10-29 19:16:02 +0000
@@ -0,0 +1,4 @@
+/usr/sbin/cupsd {
+ /boot/ r,
+
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/avc_syslog_03.profile'
--- libraries/libapparmor/testsuite/test_multi/avc_syslog_03.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/avc_syslog_03.profile 2016-10-29 19:20:14 +0000
@@ -0,0 +1,4 @@
+/tmp/cat {
+ /etc/passwd r,
+
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/file_chown.profile'
--- libraries/libapparmor/testsuite/test_multi/file_chown.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/file_chown.profile 2016-10-29 18:53:39 +0000
@@ -0,0 +1,4 @@
+/usr/sbin/cupsd {
+ /run/cups/certs/ w,
+
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/syslog_audit_01.profile'
--- libraries/libapparmor/testsuite/test_multi/syslog_audit_01.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/syslog_audit_01.profile 2016-10-29 19:25:49 +0000
@@ -0,0 +1,4 @@
+/home/ubuntu/bzr/apparmor/tests/regression/apparmor/mkdir {
+ /tmp/sdtest.7283-14445-r31VAP/tmpdir/ w,
+
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/syslog_audit_02.profile'
--- libraries/libapparmor/testsuite/test_multi/syslog_audit_02.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/syslog_audit_02.profile 2016-10-29 19:22:35 +0000
@@ -0,0 +1,4 @@
+/home/simi/bin/aa-test {
+ /usr/bin/ r,
+
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/syslog_audit_05.profile'
--- libraries/libapparmor/testsuite/test_multi/syslog_audit_05.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/syslog_audit_05.profile 2016-10-29 19:19:38 +0000
@@ -0,0 +1,4 @@
+/bin/dash {
+ owner /bin/dash r,
+
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/syslog_audit_06.profile'
--- libraries/libapparmor/testsuite/test_multi/syslog_audit_06.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/syslog_audit_06.profile 2016-10-29 19:04:19 +0000
@@ -0,0 +1,4 @@
+/bin/dash {
+ owner /bin/dash r,
+
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/syslog_datetime_01.profile'
--- libraries/libapparmor/testsuite/test_multi/syslog_datetime_01.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/syslog_datetime_01.profile 2016-10-29 19:47:21 +0000
@@ -0,0 +1,7 @@
+/usr/lib/virtualbox/VBoxSVC {
+
+ ^null-2d {
+ /sys/class/power_supply/ r,
+
+ }
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/syslog_datetime_02.profile'
--- libraries/libapparmor/testsuite/test_multi/syslog_datetime_02.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/syslog_datetime_02.profile 2016-10-29 19:47:41 +0000
@@ -0,0 +1,7 @@
+/usr/lib/virtualbox/VBoxSVC {
+
+ ^null-2d {
+ /sys/class/power_supply/ r,
+
+ }
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/syslog_datetime_03.profile'
--- libraries/libapparmor/testsuite/test_multi/syslog_datetime_03.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/syslog_datetime_03.profile 2016-10-29 19:47:41 +0000
@@ -0,0 +1,7 @@
+/usr/lib/virtualbox/VBoxSVC {
+
+ ^null-2d {
+ /sys/class/power_supply/ r,
+
+ }
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/syslog_datetime_04.profile'
--- libraries/libapparmor/testsuite/test_multi/syslog_datetime_04.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/syslog_datetime_04.profile 2016-10-29 19:47:41 +0000
@@ -0,0 +1,7 @@
+/usr/lib/virtualbox/VBoxSVC {
+
+ ^null-2d {
+ /sys/class/power_supply/ r,
+
+ }
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/syslog_datetime_05.profile'
--- libraries/libapparmor/testsuite/test_multi/syslog_datetime_05.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/syslog_datetime_05.profile 2016-10-29 19:47:41 +0000
@@ -0,0 +1,7 @@
+/usr/lib/virtualbox/VBoxSVC {
+
+ ^null-2d {
+ /sys/class/power_supply/ r,
+
+ }
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/syslog_datetime_06.profile'
--- libraries/libapparmor/testsuite/test_multi/syslog_datetime_06.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/syslog_datetime_06.profile 2016-10-29 19:47:41 +0000
@@ -0,0 +1,7 @@
+/usr/lib/virtualbox/VBoxSVC {
+
+ ^null-2d {
+ /sys/class/power_supply/ r,
+
+ }
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/syslog_datetime_07.profile'
--- libraries/libapparmor/testsuite/test_multi/syslog_datetime_07.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/syslog_datetime_07.profile 2016-10-29 19:47:41 +0000
@@ -0,0 +1,7 @@
+/usr/lib/virtualbox/VBoxSVC {
+
+ ^null-2d {
+ /sys/class/power_supply/ r,
+
+ }
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/syslog_datetime_08.profile'
--- libraries/libapparmor/testsuite/test_multi/syslog_datetime_08.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/syslog_datetime_08.profile 2016-10-29 19:47:21 +0000
@@ -0,0 +1,7 @@
+/usr/lib/virtualbox/VBoxSVC {
+
+ ^null-2d {
+ /sys/class/power_supply/ r,
+
+ }
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/syslog_datetime_09.profile'
--- libraries/libapparmor/testsuite/test_multi/syslog_datetime_09.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/syslog_datetime_09.profile 2016-10-29 19:43:05 +0000
@@ -0,0 +1,7 @@
+/usr/lib/virtualbox/VBoxSVC {
+
+ ^null-2d {
+ /sys/class/power_supply/ r,
+
+ }
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/syslog_datetime_10.profile'
--- libraries/libapparmor/testsuite/test_multi/syslog_datetime_10.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/syslog_datetime_10.profile 2016-10-29 19:35:53 +0000
@@ -0,0 +1,6 @@
+/usr/lib/virtualbox/VBoxSVC {
+ ^null-2d {
+ /sys/class/power_supply/ r,
+
+ }
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/syslog_datetime_11.profile'
--- libraries/libapparmor/testsuite/test_multi/syslog_datetime_11.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/syslog_datetime_11.profile 2016-10-29 19:48:36 +0000
@@ -0,0 +1,7 @@
+/usr/lib/virtualbox/VBoxSVC {
+
+ ^null-2d {
+ /sys/class/power_supply/ r,
+
+ }
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/syslog_datetime_12.profile'
--- libraries/libapparmor/testsuite/test_multi/syslog_datetime_12.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/syslog_datetime_12.profile 2016-10-29 19:48:36 +0000
@@ -0,0 +1,7 @@
+/usr/lib/virtualbox/VBoxSVC {
+
+ ^null-2d {
+ /sys/class/power_supply/ r,
+
+ }
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/syslog_datetime_13.profile'
--- libraries/libapparmor/testsuite/test_multi/syslog_datetime_13.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/syslog_datetime_13.profile 2016-10-29 19:44:37 +0000
@@ -0,0 +1,7 @@
+/usr/lib/virtualbox/VBoxSVC {
+
+ ^null-2d {
+ /sys/class/power_supply/ r,
+
+ }
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/syslog_datetime_14.profile'
--- libraries/libapparmor/testsuite/test_multi/syslog_datetime_14.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/syslog_datetime_14.profile 2016-10-29 19:48:37 +0000
@@ -0,0 +1,7 @@
+/usr/lib/virtualbox/VBoxSVC {
+
+ ^null-2d {
+ /sys/class/power_supply/ r,
+
+ }
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/syslog_datetime_15.profile'
--- libraries/libapparmor/testsuite/test_multi/syslog_datetime_15.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/syslog_datetime_15.profile 2016-10-29 19:48:37 +0000
@@ -0,0 +1,7 @@
+/usr/lib/virtualbox/VBoxSVC {
+
+ ^null-2d {
+ /sys/class/power_supply/ r,
+
+ }
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/syslog_datetime_16.profile'
--- libraries/libapparmor/testsuite/test_multi/syslog_datetime_16.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/syslog_datetime_16.profile 2016-10-29 19:48:37 +0000
@@ -0,0 +1,7 @@
+/usr/lib/virtualbox/VBoxSVC {
+
+ ^null-2d {
+ /sys/class/power_supply/ r,
+
+ }
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/syslog_datetime_17.profile'
--- libraries/libapparmor/testsuite/test_multi/syslog_datetime_17.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/syslog_datetime_17.profile 2016-10-29 19:48:37 +0000
@@ -0,0 +1,7 @@
+/usr/lib/virtualbox/VBoxSVC {
+
+ ^null-2d {
+ /sys/class/power_supply/ r,
+
+ }
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/syslog_datetime_18.profile'
--- libraries/libapparmor/testsuite/test_multi/syslog_datetime_18.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/syslog_datetime_18.profile 2016-10-29 19:48:37 +0000
@@ -0,0 +1,7 @@
+/usr/lib/virtualbox/VBoxSVC {
+
+ ^null-2d {
+ /sys/class/power_supply/ r,
+
+ }
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/syslog_hostname_with_dot.profile'
--- libraries/libapparmor/testsuite/test_multi/syslog_hostname_with_dot.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/syslog_hostname_with_dot.profile 2016-10-29 18:56:15 +0000
@@ -0,0 +1,4 @@
+/opt/evoke/venv/bin/gunicorn {
+ /opt/evoke/venv/lib/python2.7/warnings.pyc r,
+
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/testcase01.profile'
--- libraries/libapparmor/testsuite/test_multi/testcase01.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/testcase01.profile 2016-10-29 19:06:13 +0000
@@ -0,0 +1,4 @@
+/bin/ping {
+ ping2 ix,
+
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/testcase12.profile'
--- libraries/libapparmor/testsuite/test_multi/testcase12.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/testcase12.profile 2016-10-29 19:20:56 +0000
@@ -0,0 +1,4 @@
+/bin/ping {
+ /bin/ping ix,
+
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/testcase13.profile'
--- libraries/libapparmor/testsuite/test_multi/testcase13.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/testcase13.profile 2016-10-29 19:09:43 +0000
@@ -0,0 +1,4 @@
+/bin/ping {
+ /bin/ping ix,
+
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/testcase18.profile'
--- libraries/libapparmor/testsuite/test_multi/testcase18.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/testcase18.profile 2016-10-29 18:59:07 +0000
@@ -0,0 +1,4 @@
+/home/jamie/foobar.sh {
+ /bin/dash r,
+
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/testcase19.profile'
--- libraries/libapparmor/testsuite/test_multi/testcase19.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/testcase19.profile 2016-10-29 19:15:06 +0000
@@ -0,0 +1,4 @@
+/home/jamie/foobar.sh {
+ /bin/dash r,
+
+}
=== modified file 'libraries/libapparmor/testsuite/test_multi/testcase24.profile'
--- libraries/libapparmor/testsuite/test_multi/testcase24.profile 2016-10-17 19:04:05 +0000
+++ libraries/libapparmor/testsuite/test_multi/testcase24.profile 2016-10-29 19:41:08 +0000
@@ -1,4 +1,7 @@
-/home/steve/aa-regression-tests/changehat_wrapper//net_raw {
- network packet raw,
-
+/home/steve/aa-regression-tests/changehat_wrapper {
+
+ ^net_raw {
+ network packet raw,
+
+ }
}
=== modified file 'libraries/libapparmor/testsuite/test_multi/testcase33.profile'
--- libraries/libapparmor/testsuite/test_multi/testcase33.profile 2016-10-17 19:04:05 +0000
+++ libraries/libapparmor/testsuite/test_multi/testcase33.profile 2016-10-29 19:40:46 +0000
@@ -1,3 +1,7 @@
-/home/steve/aa-regression-tests/changehat_wrapper//net_raw {
- network packet raw,
+/home/steve/aa-regression-tests/changehat_wrapper {
+
+ ^net_raw {
+ network packet raw,
+
+ }
}
=== added file 'libraries/libapparmor/testsuite/test_multi/testcase_changeprofile_01.profile'
--- libraries/libapparmor/testsuite/test_multi/testcase_changeprofile_01.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/testcase_changeprofile_01.profile 2016-10-29 19:23:57 +0000
@@ -0,0 +1,4 @@
+/tests/regression/apparmor/changeprofile {
+ change_profile -> /tests/regression/apparmor/rename,
+
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/testcase_dmesg_changeprofile_01.profile'
--- libraries/libapparmor/testsuite/test_multi/testcase_dmesg_changeprofile_01.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/testcase_dmesg_changeprofile_01.profile 2016-10-29 19:00:19 +0000
@@ -0,0 +1,4 @@
+/tests/regression/apparmor/changeprofile {
+ change_profile -> /tests/regression/apparmor/rename,
+
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/testcase_dmesg_link_01.profile'
--- libraries/libapparmor/testsuite/test_multi/testcase_dmesg_link_01.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/testcase_dmesg_link_01.profile 2016-10-29 18:58:24 +0000
@@ -0,0 +1,4 @@
+/home/ubuntu/bzr/apparmor/tests/regression/apparmor/link {
+ /tmp/sdtest.19088-12382-HWH57d/linkfile l,
+
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/testcase_dmesg_mkdir.profile'
--- libraries/libapparmor/testsuite/test_multi/testcase_dmesg_mkdir.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/testcase_dmesg_mkdir.profile 2016-10-29 19:35:15 +0000
@@ -0,0 +1,7 @@
+/usr/sbin/sshd {
+
+ ^ubuntu {
+ owner /tmp/ssh-gRozJw4786/ w,
+
+ }
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/testcase_dmesg_rename_dest.profile'
--- libraries/libapparmor/testsuite/test_multi/testcase_dmesg_rename_dest.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/testcase_dmesg_rename_dest.profile 2016-10-29 19:28:39 +0000
@@ -0,0 +1,4 @@
+/usr/sbin/sshd {
+ owner /var/run/motd w,
+
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/testcase_dmesg_rename_src.profile'
--- libraries/libapparmor/testsuite/test_multi/testcase_dmesg_rename_src.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/testcase_dmesg_rename_src.profile 2016-10-29 19:17:21 +0000
@@ -0,0 +1,4 @@
+/usr/sbin/sshd {
+ owner /var/run/motd.new r,
+
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/testcase_dmesg_truncate.profile'
--- libraries/libapparmor/testsuite/test_multi/testcase_dmesg_truncate.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/testcase_dmesg_truncate.profile 2016-10-29 19:25:16 +0000
@@ -0,0 +1,4 @@
+/etc/update-motd.d/91-release-upgrade {
+ owner /var/lib/update-notifier/release-upgrade-available w,
+
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/testcase_mount_01.profile'
--- libraries/libapparmor/testsuite/test_multi/testcase_mount_01.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/testcase_mount_01.profile 2016-10-29 19:54:59 +0000
@@ -0,0 +1,4 @@
+/home/ubuntu/bzr/apparmor/tests/regression/apparmor/mount {
+ mount fstype=ext2 options="rw, mand" /dev/loop0/ -> /tmp/sdtest.19033-29001-MPfz98/mountpoint/,
+
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/testcase_network_01.profile'
--- libraries/libapparmor/testsuite/test_multi/testcase_network_01.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/testcase_network_01.profile 2016-10-29 19:23:17 +0000
@@ -0,0 +1,4 @@
+/usr/bin/evince-thumbnailer {
+ network inet stream,
+
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/testcase_network_send_receive.profile'
--- libraries/libapparmor/testsuite/test_multi/testcase_network_send_receive.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/testcase_network_send_receive.profile 2016-10-29 19:33:22 +0000
@@ -0,0 +1,6 @@
+/usr/bin/nginx-amplify-agent.py {
+ ^null-/bin/dash {
+ network inet stream,
+
+ }
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/testcase_ouid.profile'
--- libraries/libapparmor/testsuite/test_multi/testcase_ouid.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/testcase_ouid.profile 2016-10-29 19:27:43 +0000
@@ -0,0 +1,4 @@
+/home/ubuntu/tmp/aashell {
+ owner /home/ubuntu/ r,
+
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/testcase_pivotroot_01.profile'
--- libraries/libapparmor/testsuite/test_multi/testcase_pivotroot_01.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/testcase_pivotroot_01.profile 2016-10-29 19:50:45 +0000
@@ -0,0 +1,4 @@
+/home/ubuntu/bzr/apparmor/tests/regression/apparmor/pivot_root {
+ pivot_root oldroot=/tmp/sdtest.21082-7446-EeefO6/new_root/put_old/ /tmp/sdtest.21082-7446-EeefO6/new_root/,
+
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/testcase_ptrace_01.profile'
--- libraries/libapparmor/testsuite/test_multi/testcase_ptrace_01.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/testcase_ptrace_01.profile 2016-10-29 19:11:17 +0000
@@ -0,0 +1,4 @@
+/home/ubuntu/bzr/apparmor/tests/regression/apparmor/ptrace {
+ ptrace tracedby peer=/home/ubuntu/bzr/apparmor/tests/regression/apparmor/ptrace,
+
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/testcase_signal_01.profile'
--- libraries/libapparmor/testsuite/test_multi/testcase_signal_01.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/testcase_signal_01.profile 2016-10-29 19:18:32 +0000
@@ -0,0 +1,4 @@
+/usr/bin/pulseaudio {
+ signal send set=term peer=/usr/bin/pulseaudio///usr/lib/pulseaudio/pulse/gconf-helper,
+
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/testcase_signal_02.profile'
--- libraries/libapparmor/testsuite/test_multi/testcase_signal_02.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/testcase_signal_02.profile 2016-10-29 19:32:54 +0000
@@ -0,0 +1,7 @@
+/usr/bin/pulseaudio {
+
+ ^/usr/lib/pulseaudio/pulse/gconf-helper {
+ signal receive set=term peer=/usr/bin/pulseaudio,
+
+ }
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/testcase_syslog_link_01.profile'
--- libraries/libapparmor/testsuite/test_multi/testcase_syslog_link_01.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/testcase_syslog_link_01.profile 2016-10-29 19:21:58 +0000
@@ -0,0 +1,4 @@
+/home/ubuntu/bzr/apparmor/tests/regression/apparmor/link {
+ /tmp/sdtest.19088-12382-HWH57d/linkfile l,
+
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/testcase_syslog_mkdir.profile'
--- libraries/libapparmor/testsuite/test_multi/testcase_syslog_mkdir.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/testcase_syslog_mkdir.profile 2016-10-29 19:34:12 +0000
@@ -0,0 +1,7 @@
+/usr/sbin/sshd {
+
+ ^ubuntu {
+ owner /tmp/ssh-gRozJw4786/ w,
+
+ }
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/testcase_syslog_rename_dest.profile'
--- libraries/libapparmor/testsuite/test_multi/testcase_syslog_rename_dest.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/testcase_syslog_rename_dest.profile 2016-10-29 18:55:04 +0000
@@ -0,0 +1,4 @@
+/usr/sbin/sshd {
+ owner /var/run/motd w,
+
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/testcase_syslog_rename_src.profile'
--- libraries/libapparmor/testsuite/test_multi/testcase_syslog_rename_src.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/testcase_syslog_rename_src.profile 2016-10-29 18:57:13 +0000
@@ -0,0 +1,4 @@
+/usr/sbin/sshd {
+ owner /var/run/motd.new r,
+
+}
=== added file 'libraries/libapparmor/testsuite/test_multi/testcase_syslog_truncate.profile'
--- libraries/libapparmor/testsuite/test_multi/testcase_syslog_truncate.profile 1970-01-01 00:00:00 +0000
+++ libraries/libapparmor/testsuite/test_multi/testcase_syslog_truncate.profile 2016-10-29 19:15:49 +0000
@@ -0,0 +1,4 @@
+/etc/update-motd.d/91-release-upgrade {
+ owner /var/lib/update-notifier/release-upgrade-available w,
+
+}
=== modified file 'utils/test/test-libapparmor-test_multi.py'
--- utils/test/test-libapparmor-test_multi.py 2016-10-17 19:04:05 +0000
+++ utils/test/test-libapparmor-test_multi.py 2016-10-29 20:49:46 +0000
@@ -137,12 +137,49 @@
return exresult
+# tests that do not produce the expected profile (checked with assertNotEqual)
log_to_profile_known_failures = [
+ 'testcase_dmesg_changeprofile_01', # change_profile not yet supported in logparser
+ 'testcase_changeprofile_01', # change_profile not yet supported in logparser
+
+ 'testcase_mount_01', # mount rules not yet supported in logparser
+
+ 'testcase_pivotroot_01', # pivot_rot not yet supported in logparser
+
+ # exec events
+ 'testcase01',
+ 'testcase12',
+ 'testcase13',
+
+ # null-* hats get ignored by handle_children() if it didn't see an exec event for that null-* hat
+ 'syslog_datetime_01',
+ 'syslog_datetime_02',
+ 'syslog_datetime_03',
+ 'syslog_datetime_04',
+ 'syslog_datetime_05',
+ 'syslog_datetime_06',
+ 'syslog_datetime_07',
+ 'syslog_datetime_08',
+ 'syslog_datetime_09',
+ 'syslog_datetime_10',
+ 'syslog_datetime_11',
+ 'syslog_datetime_12',
+ 'syslog_datetime_13',
+ 'syslog_datetime_14',
+ 'syslog_datetime_15',
+ 'syslog_datetime_16',
+ 'syslog_datetime_17',
+ 'syslog_datetime_18',
+ 'testcase_network_send_receive',
+]
+
+# tests that cause crashes or need user interaction (will be skipped)
+log_to_profile_skip = [
'testcase31', # XXX AppArmorBug: Log contains unknown mode mrwIxl
- 'testcase24', # XXX network with operation="socket_create"
- 'testcase33', # XXX network with operation="socket_create"
- 'testcase_dmesg_changehat_negative_error', # fails in write_header -> quote_if_needed because data is None
+
+ 'testcase_dmesg_changehat_negative_error', # fails in write_header -> quote_if_needed because data is None
'testcase_syslog_changehat_negative_error', # fails in write_header -> quote_if_needed because data is None
+
'testcase_changehat_01', # interactive, asks to add a hat
]
@@ -162,7 +199,7 @@
if not parsed_event: # AA_RECORD_INVALID
return
- if params.split('/')[-1] in log_to_profile_known_failures:
+ if params.split('/')[-1] in log_to_profile_skip:
return
aamode = parsed_event['aamode']
@@ -180,6 +217,9 @@
apparmor.aa.log_dict = apparmor.aa.hasher()
profile = parsed_event['profile']
+ hat = profile
+ if '//' in profile:
+ profile, hat = profile.split('//')
apparmor.aa.existing_profiles = {profile: profile_dummy_file}
@@ -196,13 +236,12 @@
new_profile = apparmor.aa.serialize_profile(apparmor.aa.log_dict[aamode][profile], profile, None)
- try:
- expected_profile = read_file('%s.profile' % params)
- except FileNotFoundError: # no .profile file
- # print('%s.profile not found, skipping' % params) # XXX enable this line to get a TODO list
- return # we don't have profiles for all testcases yet
+ expected_profile = read_file('%s.profile' % params)
- self.assertEqual(new_profile, expected_profile)
+ if params.split('/')[-1] in log_to_profile_known_failures:
+ self.assertNotEqual(new_profile, expected_profile) # known failure
+ else:
+ self.assertEqual(new_profile, expected_profile)
def find_test_multi(log_dir):
Hallo,
Regards,
Christian Boltz
--
Nichts its gefährlicher als sich in Gefahr zu begeben. das
merkst du spätestens dann, wenn du sein erstes Posting ins
Usernetz losgelassen hast. [WoKo in dag°]
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: This is a digitally signed message part.
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20161029/30011344/attachment.pgp>
More information about the AppArmor
mailing list