Merge ~georgiag/qa-regression-testing:apparmor-dbus into qa-regression-testing:master

[Georgia Garcia]

[Steve Beattie (sbeattie)]

Awesome, thanks! Merged.

review: Approve

diff --git a/scripts/apparmor/patches/tests-force-dbus-daemon-to-generate-an-abstract-sock.patch b/scripts/apparmor/patches/tests-force-dbus-daemon-to-generate-an-abstract-sock.patch
 new file mode 100644
index 0000000..9d47cb7
--- /dev/null
+++ b/scripts/apparmor/patches/tests-force-dbus-daemon-to-generate-an-abstract-sock.patch
@@ -0,0 +1,41 @@
+From d73e244ed71b0b4f69b96a4cfe06ced399552337 Mon Sep 17 00:00:00 2001
+From: Georgia Garcia <[e-mail]>
+Date: Tue, 28 Mar 2023 14:23:01 +0000
+Subject: [PATCH] Merge tests: force dbus-daemon to generate an abstract socket
+
+dbus 1.14.4 changed the behavior of unix:tmpdir to be equivalent to
+unix:dir, which cases dbus-daemon to generate path based sockets,
+instead of the previous abstract sockets. [1]
+In this change we force dbus-daemon to generate an abstract socket by
+specifying the abstract socket address in the command.
+
+[1] https://gitlab.freedesktop.org/dbus/dbus/-/blob/dbus-1.14/NEWS#L64
+
+MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/999
+Approved-by: John Johansen <[e-mail]>
+Merged-by: Georgia Garcia <[e-mail]>
+
+(cherry picked from commit 904b7339482765551d3039cb74313a9afef29a79)
+
+53d4e341 tests: force dbus-daemon to generate an abstract socket
+---
+ tests/regression/apparmor/dbus.inc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/regression/apparmor/dbus.inc b/tests/regression/apparmor/dbus.inc
+index b234a348f..8055fb733 100755
+--- a/tests/regression/apparmor/dbus.inc
++++ b/tests/regression/apparmor/dbus.inc
+@@ -32,7 +32,8 @@ set_dbus_var()
+ 
+ start_bus()
+ {
+-	out=$(dbus-daemon --fork --print-pid --print-address --config-file=dbus.conf)
++	bus_addr=$(mktemp --dry-run /tmp/dbus-XXXXXX)
++	out=$(dbus-daemon --fork --print-pid --print-address --address="unix:abstract=$bus_addr" --config-file=dbus.conf)
+ 	if [ $? -ne 0 ]
+ 	then
+ 		fatalerror "Failed to start DBus daemon"
+-- 
+2.34.1
+
diff --git a/scripts/test-apparmor.py b/scripts/test-apparmor.py
index a51bba4..a5f1910 100755
--- a/scripts/test-apparmor.py
+++ b/scripts/test-apparmor.py
@@ -1813,6 +1813,13 @@ class ApparmorTestsuites(testlib.TestlibCase):
             if testlib.dpkg_compare_installed_version('apparmor', 'ge', '3.0.4-2ubuntu2.2'):
                 self._apply_patch('tests-fix-variable-type-for-getopt.patch')
 
+            # dbus 1.14.4 changed the behavior of unix:tmpdir to be equivalent to
+            # unix:dir, which cases dbus-daemon to generate path based sockets,
+            # instead of the previous abstract sockets.
+            # https://gitlab.freedesktop.org/dbus/dbus/-/blob/dbus-1.14/NEWS#L64
+            if testlib.dpkg_compare_installed_version('dbus', 'ge', '1.14.4') and testlib.dpkg_compare_installed_version('apparmor', 'lt', '3.1.0'):
+                self._apply_patch('tests-force-dbus-daemon-to-generate-an-abstract-sock.patch')
+
         print("done")
 
     def _prepare_old_trusty_source(self):