Merge ~jibel/ubiquity:check_site_connectivity into ubiquity:master

[Jean-Baptiste Lallement]

Distinguish site and global connectivity

Make a distinction between local and global connectivity availability.
For example, AD can be enabled with a working site connection but no internet, while package download requires a global connection.

[Didier Roche-Tolomelli (didrocks)]

Tested and works

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 96772f9..caf876e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ubiquity (21.10.2) UNRELEASED; urgency=medium
+
+  [ Didier Roche ]
+  [ Jean-Baptiste Lallement ]
+  * connectity check: Make a distinction between local and global connection
+    availability. For example, AD can be enabled with a working site
+    connection but no internet, while package download requires a global
+    connection.
+
+ -- Jean-Baptiste Lallement <[e-mail]>  Fri, 04 Jun 2021 14:07:25 +0200
+
 ubiquity (21.10.1) impish; urgency=medium
 
   * choose-mirror: hirsute -> impish
diff --git a/ubiquity/frontend/gtk_ui.py b/ubiquity/frontend/gtk_ui.py
index 042f56f..ea0840e 100644
--- a/ubiquity/frontend/gtk_ui.py
+++ b/ubiquity/frontend/gtk_ui.py
@@ -574,6 +574,11 @@ class Wizard(BaseFrontend):
             GLib.source_remove(self.timeout_id)
         self.timeout_id = GLib.timeout_add(300, self.check_returncode)
 
+    def set_connectivity_state(self, state):
+        for p in self.pages:
+            if hasattr(p.ui, 'plugin_set_connectivity_state'):
+                p.ui.plugin_set_connectivity_state(state)
+
     def set_online_state(self, state):
         for p in self.pages:
             if hasattr(p.ui, 'plugin_set_online_state'):
@@ -1121,6 +1126,7 @@ class Wizard(BaseFrontend):
         self.allow_go_backward(False)
 
         misc.add_connection_watch(self.network_change)
+        misc.add_connection_watch(self.set_connectivity_state, global_only=False)
 
     def set_window_hints(self, widget):
         if (self.oem_user_config or
diff --git a/ubiquity/misc.py b/ubiquity/misc.py
index e7175cc..49512bb 100644
--- a/ubiquity/misc.py
+++ b/ubiquity/misc.py
@@ -880,6 +880,7 @@ def set_indicator_keymaps(lang):
 
 
 NM = 'org.freedesktop.NetworkManager'
+NM_STATE_CONNECTED_SITE = 60
 NM_STATE_CONNECTED_GLOBAL = 70
 
 
@@ -895,23 +896,33 @@ def get_prop(obj, iface, prop):
 
 
 def has_connection():
+    return connection_state() == NM_STATE_CONNECTED_GLOBAL
+
+
+def connection_state():
     import dbus
     bus = dbus.SystemBus()
     manager = bus.get_object(NM, '/org/freedesktop/NetworkManager')
-    state = get_prop(manager, NM, 'State')
-    return state == NM_STATE_CONNECTED_GLOBAL
+    return get_prop(manager, NM, 'State')
 
 
-def add_connection_watch(func):
+def add_connection_watch(func, global_only=True):
     import dbus
 
     def connection_cb(state):
-        func(state == NM_STATE_CONNECTED_GLOBAL)
+        is_connected = False
+        if global_only:
+            if state == NM_STATE_CONNECTED_GLOBAL:
+                is_connected = True
+        else:
+            if state == NM_STATE_CONNECTED_GLOBAL or state == NM_STATE_CONNECTED_SITE:
+                is_connected = True
+        func(is_connected)
 
     bus = dbus.SystemBus()
     bus.add_signal_receiver(connection_cb, 'StateChanged', NM, NM)
     try:
-        func(has_connection())
+        connection_cb(connection_state())
     except dbus.DBusException:
         # We can't talk to NM, so no idea.  Wild guess: we're connected
         # using ssh with X forwarding, and are therefore connected.  This
diff --git a/ubiquity/plugins/ubi-usersetup.py b/ubiquity/plugins/ubi-usersetup.py
index 1eb785c..ee3cc98 100644
--- a/ubiquity/plugins/ubi-usersetup.py
+++ b/ubiquity/plugins/ubi-usersetup.py
@@ -514,7 +514,9 @@ class PageGtk(PageBase):
 
         self.controller._wizard.set_page_title(self)
 
-    def plugin_set_online_state(self, state):
+    def plugin_set_connectivity_state(self, state):
+        # For AD we need network connectivity but it can be local and not
+        # necessarily internet connectivity
         if not state:
             self.login_directory.set_active(False)
         self.login_directory.set_sensitive(state)