Merge ~robert-ancell/software-properties:esm-xenial into software-properties:ubuntu/xenial

[Robert Ancell]

[Robert Ancell (robert-ancell)]

See https://code.launchpad.net/~robert-ancell/software-properties/+git/software-properties/+merge/400153 for the related change to master.

Unmerged commits

7b8920c... by Robert Ancell on 2021-03-08

Show extended security maintenance status

diff --git a/data/gtkbuilder/main.ui b/data/gtkbuilder/main.ui
index ed4abc1..d1704e9 100644
--- a/data/gtkbuilder/main.ui
+++ b/data/gtkbuilder/main.ui
@@ -547,7 +547,18 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Snap package updates are checked routinely and installed automatically.</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
                   </packing>
                 </child>
                 <child>
@@ -562,6 +573,98 @@
                         <property name="can_focus">False</property>
                         <property name="spacing">6</property>
                         <child>
+                          <object class="GtkHBox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkLabel" id="label_esm_heading">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">1</property>
+                                <property name="label" translatable="yes">For other packages, this system has:</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <object class="GtkLabel" id="label_esm_status">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="label_esm_subscribe">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">1</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkHBox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkLabel" id="label_eol_heading">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label_eol">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
                           <object class="GtkHBox" id="hbox_check_for_updates">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
@@ -601,7 +704,6 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
-                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
@@ -644,7 +746,6 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
-                            <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
@@ -687,7 +788,6 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
-                            <property name="position">2</property>
                           </packing>
                         </child>
                       </object>
@@ -696,7 +796,6 @@
                   <packing>
                     <property name="expand">True</property>
                     <property name="fill">True</property>
-                    <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
@@ -746,7 +845,6 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="position">2</property>
                   </packing>
                 </child>
               </object>
@@ -1180,6 +1278,8 @@
   </object>
   <object class="GtkSizeGroup" id="sizegroup1">
     <widgets>
+      <widget name="label_esm_heading"/>
+      <widget name="label_eol_heading"/>
       <widget name="label3"/>
       <widget name="label4"/>
       <widget name="label5"/>
diff --git a/debian/changelog b/debian/changelog
index ce037cf..1d17ec0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+software-properties (0.96.20.11) UNRELEASED; urgency=medium
+
+  * Show ESM support status (LP: #1920836)
+
+ -- Robert Ancell <[e-mail]>  Tue, 23 Mar 2021 11:51:12 +1300
+
 software-properties (0.96.20.10) xenial-security; urgency=medium
 
   * SECURITY UPDATE: malicious repo could send ANSI sequences to terminal
diff --git a/debian/control b/debian/control
index 20d0e4b..a1dd141 100644
--- a/debian/control
+++ b/debian/control
@@ -64,6 +64,7 @@ Depends: ${python3:Depends}, ${misc:Depends}, python3,
  ubuntu-drivers-common (>= 1:0.2.75),
  python3-gi,
  libgtk2-perl,
+ distro-info-data,
 Description: manage the repositories that you install software from (gtk)
  This software provides an abstraction of the used apt repositories.
  It allows you to easily manage your distribution and independent software
diff --git a/softwareproperties/gtk/SoftwarePropertiesGtk.py b/softwareproperties/gtk/SoftwarePropertiesGtk.py
index 033c6b8..d9e462e 100644
--- a/softwareproperties/gtk/SoftwarePropertiesGtk.py
+++ b/softwareproperties/gtk/SoftwarePropertiesGtk.py
@@ -26,6 +26,7 @@ from __future__ import absolute_import, print_function
 
 import apt
 import apt_pkg
+import datetime
 import dbus
 from gettext import gettext as _
 import gettext
@@ -51,6 +52,12 @@ import softwareproperties.distro
 from softwareproperties.SoftwareProperties import SoftwareProperties
 import softwareproperties.SoftwareProperties
 
+from softwareproperties.gtk.utils import (
+    get_esm_apps_status,
+    current_distro_eol,
+    current_distro_eol_esm
+)
+
 from UbuntuDrivers import detect
 
 if GLib.pyglib_version < (3, 9, 1):
@@ -349,6 +356,22 @@ class SoftwarePropertiesGtk(SoftwareProperties, SimpleGtkbuilderApp):
                 self.vbox_updates.add(checkbox)
             checkbox.show()
 
+        (esm_available, esm_enabled) = get_esm_apps_status()
+        if esm_enabled:
+                eol_text = _("Extended Security Maintenance")
+                eol_date = current_distro_eol_esm()
+        else:
+                eol_text = _("Basic Security Maintenance")
+                eol_date = current_distro_eol()
+        self.label_esm_status.set_markup(eol_text)
+        self.label_esm_subscribe.set_markup("<a href=\"https://ubuntu.com/security/esm\">%s</a>" % _("Extend…"))
+        self.label_esm_subscribe.set_visible(esm_available and not esm_enabled)
+        if datetime.datetime.now().date() > eol_date:
+                eol_expiry_text = _("Ended %s") % eol_date.strftime("%x")
+        else:
+                eol_expiry_text = _("Active until %s") % eol_date.strftime("%x")
+        self.label_eol.set_label(eol_expiry_text);
+
         # setup the server chooser
         cell = Gtk.CellRendererText()
         self.combobox_server.pack_start(cell, True)
diff --git a/softwareproperties/gtk/utils.py b/softwareproperties/gtk/utils.py
index 9554fea..8fe682c 100644
--- a/softwareproperties/gtk/utils.py
+++ b/softwareproperties/gtk/utils.py
@@ -19,6 +19,11 @@
 from __future__ import print_function
 
 from gi.repository import Gtk
+import aptsources.distro
+import csv
+import datetime
+import json
+import subprocess
 import logging
 LOG=logging.getLogger(__name__)
 
@@ -34,3 +39,73 @@ def setup_ui(self, path, domain):
             setattr(self, name, o)
         else:
             logging.debug("can not get name for object '%s'" % o)
+
+class DistroInfo:
+    def __init__ (self, version, codename, series, created, release, eol, eol_server, eol_esm):
+        self.version = version
+        self.codename = codename
+        self.series = series
+        self.created = created
+        self.release = release
+        self.eol = eol
+        self.eol_server = eol_server
+        self.eol_esm = eol_esm
+
+def _parse_date(date_string):
+    if date_string is None:
+        return None
+    try:
+        return datetime.datetime.strptime(date_string, '%Y-%m-%d').date()
+    except ValueError:
+        return None
+
+def _current_distro():
+    distro = aptsources.distro.get_distro()
+    try:
+        reader = csv.reader(open('/usr/share/distro-info/ubuntu.csv'))
+    except Exception as e:
+        print("Failed to read distro info:\n%s" % e)
+        reader = []
+
+    for line in reader:
+        (version, codename, series, created, release, eol, eol_server, eol_esm) = line[:8] + [None] * max(0, 8 - len(line))
+        if series == distro.codename:
+            return DistroInfo(version, codename, series, _parse_date(created), _parse_date(release), _parse_date(eol), _parse_date(eol_server), _parse_date(eol_esm))
+
+    return DistroInfo('', '', '', datetime.date.today(), datetime.date.today(), datetime.date.today(), datetime.date.today(), datetime.date.today())
+
+def current_distro_eol():
+    return _current_distro().eol
+
+def current_distro_eol_esm():
+    return _current_distro().eol_esm
+
+def get_esm_apps_status():
+    try:
+        result = subprocess.run(['ua', 'status', '--format=json'], stdout=subprocess.PIPE)
+    except Exception as e:
+        print("Failed to call ubuntu advantage client:\n%s" % e)
+        return (False, False)
+
+    if result.returncode != 0:
+        print("Ubuntu advantage client returned code %d" % result.returncode)
+        return (False, False)
+
+    try:
+        status = json.loads(result.stdout.decode("utf-8"))
+    except Exception as e:
+        print("Failed to parse ubuntu advantage client JSON:\n%s" % e)
+        return (False, False)
+
+    services = status.get("services")
+    if services == None:
+        services = []
+
+    for service in services:
+        if service.get("name") == "esm-apps":
+            available = service.get("available") == "yes"
+            entitled = service.get("entitled") == "yes"
+            service_status = service.get("status")
+            return (available or entitled, service_status == "enabled")
+
+    return (False, False)