Merge ~nteodosio/update-manager:bionic-ua into update-manager:ubuntu/bionic

[Nathan Teodosio]

Fix the crash caused by incomplete response of the 'ua security-status' when ubuntu-advantage-tools (UAT) is an older version.

As the documentation[1] states, this call returns no exceptions, so in my opinion it is simpler to switch to it than patching our old call to security-status.

However, this crash would also occur by using the version 27 of the API, so the effective fix here is to force ubuntu-advantage-tools >= 30.

Note that we already use the API in Noble[2].

[1] https://canonical-ubuntu-pro-client.readthedocs-hosted.com/en/latest/references/api/#u-pro-packages-updates-v1
[2] https://code.launchpad.net/~nteodosio/update-manager/+git/update-manager/+merge/456088

[Sebastien Bacher (seb128)]

Thanks!

review: Approve

diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index 3430c5c..6cb2ead 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -27,6 +27,7 @@ from gi.repository import Gdk, GdkX11
 from gi.repository import Gio
 from gi.repository import GLib
 from gi.repository import GObject
+import uaclient.api.u.pro.packages.updates.v1 as ua
 
 GdkX11  # pyflakes
 
@@ -36,10 +37,10 @@ warnings.filterwarnings("ignore", "Accessed deprecated property",
 
 import apt_pkg
 import distro_info
-import json
 import os
 import subprocess
 import sys
+import threading
 import time
 from gettext import gettext as _
 
@@ -249,36 +250,37 @@ class UpdateManager(Gtk.Window):
                                          cancelled_update, error_occurred)
         self._start_pane(pane)
 
+    def _fetch_ua_updates(self):
+        self.ua_updates = ua.updates().updates
+
     def _get_ua_security_status(self):
         self.ua_security_packages = []
-        try:
-            p = subprocess.Popen(['pro', 'security-status', '--format=json'],
-                                 stdout=subprocess.PIPE)
-        except OSError:
-            pass
-        else:
-            while p.poll() is None:
-                while Gtk.events_pending():
-                    Gtk.main_iteration()
-                time.sleep(0.05)
-            s = json.load(p.stdout)
-            for package in s.get('packages', []):
-                if package.get('service_name', '') == 'standard-security':
-                    continue
-                status = package.get('status', '')
-                if (
-                    status == 'pending_attach'
-                    or status == 'pending_enable'
-                    or status == 'upgrade_available'
-                ):
-                    name = package.get('package', '')
-                    version = package.get('version', '')
-                    size = package.get('download_size', 0)
-                    downloadable = status == 'upgrade_available'
-                    self.ua_security_packages.append(
-                        (name, version, size, downloadable)
-                    )
-            self.cache.create_pro_cache(self.ua_security_packages)
+        t = threading.Thread(target=self._fetch_ua_updates, daemon=True)
+        t.start()
+        while t.is_alive():
+            while Gtk.events_pending():
+                Gtk.main_iteration()
+            time.sleep(0.05)
+        for package in self.ua_updates:
+            if (
+                package.provided_by == 'standard-security'
+                or package.provided_by == 'standard-updates'
+            ):
+                continue
+            status = package.status
+            if (
+                status == 'pending_attach'
+                or status == 'pending_enable'
+                or status == 'upgrade_available'
+            ):
+                name = package.package
+                version = package.version
+                size = package.download_size
+                downloadable = status == 'upgrade_available'
+                self.ua_security_packages.append(
+                    (name, version, size, downloadable)
+                )
+        self.cache.create_pro_cache(self.ua_security_packages)
 
     def _make_available_pane(self, install_count, need_reboot=False,
                              cancelled_update=False, error_occurred=False):
diff --git a/debian/changelog b/debian/changelog
index 9e83e4e..c53d2bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+update-manager (1:18.04.11.23) UNRELEASED; urgency=medium
+
+  * Drop call to ua security-status --format=json.
+    Use uaclient.api.u.pro.packages.updates.v1.updates instead.
+  * d/control: Depend on ubuntu-advantage-tools >= 30~.
+    Fixes edge case whereby the program crashes upon an incomplete
+    response from ua security-status (LP: #2049785).
+
+ -- Nathan Pratta Teodosio <[e-mail]>  Fri, 19 Jan 2024 12:58:34 +0100
+
 update-manager (1:18.04.11.22) bionic; urgency=medium
 
   * Add back removed widgets to UI file to fix crash when updating
diff --git a/debian/control b/debian/control
index ad91c50..4fc5710 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,7 @@ Depends: ${python3:Depends},
          python3-yaml,
          distro-info-data,
          lsb-release,
-         ubuntu-advantage-tools,
+         ubuntu-advantage-tools (>= 30~),
          ubuntu-release-upgrader-core (>= 1:18.04.9)
 Recommends: libpam-modules (>= 1.0.1-9ubuntu3)
 Replaces: update-manager (<< 1:0.146.2)