Merge ~ahasenack/ubuntu/+source/ubuntu-advantage-tools:jammy-uat-apparmor-dpkg-2067810 into ubuntu/+source/ubuntu-advantage-tools:ubuntu/jammy-devel

[Andreas Hasenack]

Adjust apparmor profile for /var/lib/dpkg/*.

The linked bug has the SRU template filled in, and testing details.

PPA: https://launchpad.net/~ahasenack/+archive/ubuntu/uat-test

[Renan Rodrigo (renanrodrigo)]

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks, uploaded:
Uploading ubuntu-advantage-tools_32.3.1~22.04.dsc
Uploading ubuntu-advantage-tools_32.3.1~22.04.tar.xz
Uploading ubuntu-advantage-tools_32.3.1~22.04_source.buildinfo
Uploading ubuntu-advantage-tools_32.3.1~22.04_source.changes

diff --git a/debian/apparmor/ubuntu_pro_esm_cache.jinja2 b/debian/apparmor/ubuntu_pro_esm_cache.jinja2
index 97d9217..43d611a 100644
--- a/debian/apparmor/ubuntu_pro_esm_cache.jinja2
+++ b/debian/apparmor/ubuntu_pro_esm_cache.jinja2
@@ -178,6 +178,9 @@ profile ubuntu_pro_esm_cache flags=(attach_disconnected) {
 
     /{,usr/}bin/dpkg mr,
 
+    # LP: #2067810
+    /var/lib/dpkg/** r,
+
   }
 
   profile ubuntu_distro_info flags=(attach_disconnected) {
@@ -213,6 +216,9 @@ profile ubuntu_pro_esm_cache flags=(attach_disconnected) {
 
     /usr/share/dpkg/** r,
 
+    # LP: #2067810
+    /var/lib/dpkg/** r,
+
     /var/lib/ubuntu-advantage/apt-esm/** rwk,
 
     @{PROC}/@{pid}/cgroup r,
@@ -252,6 +258,9 @@ profile ubuntu_pro_esm_cache flags=(attach_disconnected) {
     /etc/apt/** r,
     /var/lib/apt/** r,
 
+    # LP: #2067810
+    /var/lib/dpkg/** r,
+
   }
 
   # Site-specific additions and overrides. See local/README for details.
diff --git a/debian/changelog b/debian/changelog
index e7129f5..1864cb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+ubuntu-advantage-tools (32.3.1~22.04) jammy; urgency=medium
+
+  * Adjust the esm_cache apparmor profile to allow reading of dpkg data
+    directory (LP: #2067810):
+    - d/apparmor/ubuntu_pro_esm_cache.jinja2: allow /var/lib/dpkg/** for dpkg
+      and other profiles
+    - features/steps/machines.py: trigger the bug in the behave test suite,
+      which tests the fix
+  * version.py: update version to 32.3.1
+
+ -- Andreas Hasenack <[e-mail]>  Fri, 07 Jun 2024 14:52:55 -0300
+
 ubuntu-advantage-tools (32.3~22.04) jammy; urgency=medium
 
   * Backport 32.3 to jammy (LP: #2060732)
diff --git a/features/steps/machines.py b/features/steps/machines.py
index 35a90f5..8fcc9be 100644
--- a/features/steps/machines.py
+++ b/features/steps/machines.py
@@ -116,6 +116,14 @@ def given_a_machine(
             context, "python3-coverage", machine_name=machine_name
         )
 
+    # trigger GH: #3137
+    when_i_run_command(
+        context,
+        "touch /var/lib/dpkg/arch",
+        "with sudo",
+        machine_name=machine_name,
+    )
+
     if cleanup:
 
         def cleanup_instance():
diff --git a/uaclient/version.py b/uaclient/version.py
index 665a028..fe9b400 100644
--- a/uaclient/version.py
+++ b/uaclient/version.py
@@ -15,7 +15,7 @@ from uaclient.defaults import CANDIDATE_CACHE_PATH, UAC_RUN_PATH
 from uaclient.exceptions import ProcessExecutionError
 from uaclient.system import subp
 
-__VERSION__ = "32.3"
+__VERSION__ = "32.3.1"
 PACKAGED_VERSION = "@@PACKAGED_VERSION@@"