Merge lp:~xnox/ubiquity/xenial-proposed into lp:~ubuntu-installer/ubiquity/xenial-proposed

[Dimitri John Ledkov]

[Dimitri John Ledkov (xnox)]

With fixed up network-manager-applet this works fine. Uploading to proposed.

=== modified file 'd-i/manifest'
--- d-i/manifest	2017-07-24 15:35:47 +0000
+++ d-i/manifest	2017-10-26 13:58:07 +0000
@@ -3,7 +3,7 @@
 bterm-unifont 1.4
 choose-mirror 2.65ubuntu6
 clock-setup 0.126ubuntu1
-console-setup 1.108ubuntu15.3
+console-setup 1.108ubuntu15.4
 debian-installer-utils 1.113ubuntu1
 flash-kernel 3.0~rc.4ubuntu62.2
 grub-installer 1.128ubuntu5.1

=== modified file 'd-i/update-control'
--- d-i/update-control	2016-03-15 14:18:44 +0000
+++ d-i/update-control	2017-10-26 13:58:07 +0000
@@ -39,6 +39,7 @@
     'dh-di (>= 3)',
     'dh-systemd',
     'dpkg-dev (>= 1.14.4)',
+    'gir1.2-nma-1.0',
     'gir1.2-soup-2.4',
     'gir1.2-timezonemap-1.0',
     'gir1.2-webkit2-4.0',

=== modified file 'debian/changelog'
--- debian/changelog	2017-07-24 15:37:02 +0000
+++ debian/changelog	2017-10-26 13:58:07 +0000
@@ -1,3 +1,11 @@
+ubiquity (2.21.63.5) UNRELEASED; urgency=medium
+
+  * Cherry-pick support for WPA2 Enterprise. LP: #1107935
+  * Automatic update of included source packages: console-setup
+    1.108ubuntu15.4.
+
+ -- Dimitri John Ledkov <[e-mail]>  Thu, 26 Oct 2017 12:25:06 +0100
+
 ubiquity (2.21.63.4) xenial; urgency=medium
 
   * src/panel/panel.c: set stricter size/extend rules for the panel so that it

=== modified file 'debian/control'
--- debian/control	2016-03-15 14:18:44 +0000
+++ debian/control	2017-10-26 13:58:07 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Installer Team <[e-mail]>
 Uploaders: Colin Watson <[e-mail]>, Evan Dandrea <[e-mail]>
-Build-Depends: adwaita-icon-theme, apt, autopoint, bf-utf-source, check, dctrl-tools, debconf (>= 1.5.43), debconf-utils, debhelper (>= 9), devio, dh-autoreconf, dh-di (>= 3), dh-systemd, dpkg-dev (>= 1.15.7), gir1.2-soup-2.4, gir1.2-timezonemap-1.0, gir1.2-webkit2-4.0, gir1.2-xkl-1.0, gobject-introspection, imagemagick, intltool (>= 0.40.0), intltool-debian (>= 0.30+20040212), iso-codes, isoquery, keymapper (>= 0.5.3-7), libbogl-dev, libcairo2-dev, libdebconfclient0-dev (>= 0.68), libdebian-installer4-dev (>= 0.76), libgirepository1.0-dev, libglib2.0-dev, libgtk-3-dev, libido3-0.1-dev, libindicator3-dev, libiw-dev (>= 27+28pre9), liblocale-gettext-perl, libparted-dev (>= 2.2), librsvg2-bin, libsubunit-dev, locales, pep8, pkg-config, po-debconf (>= 1.0), pyflakes3 (>= 0.7.2), python-gi-dev, python-scour, python3-all (>= 3.1), python3-apt (>= 0.7.100.3~), python3-cairo, python3-dbus, python3-gi, python3-gi-cairo, python3-icu (>= 1.0), python3-mock (>= 0.7.0), python3-pam, tzdata, ubuntu-artwork, udev, wget, xkb-data (>= 0.9), xkb-data-i18n, xvfb
+Build-Depends: adwaita-icon-theme, apt, autopoint, bf-utf-source, check, dctrl-tools, debconf (>= 1.5.43), debconf-utils, debhelper (>= 9), devio, dh-autoreconf, dh-di (>= 3), dh-systemd, dpkg-dev (>= 1.15.7), gir1.2-nma-1.0, gir1.2-soup-2.4, gir1.2-timezonemap-1.0, gir1.2-webkit2-4.0, gir1.2-xkl-1.0, gobject-introspection, imagemagick, intltool (>= 0.40.0), intltool-debian (>= 0.30+20040212), iso-codes, isoquery, keymapper (>= 0.5.3-7), libbogl-dev, libcairo2-dev, libdebconfclient0-dev (>= 0.68), libdebian-installer4-dev (>= 0.76), libgirepository1.0-dev, libglib2.0-dev, libgtk-3-dev, libido3-0.1-dev, libindicator3-dev, libiw-dev (>= 27+28pre9), liblocale-gettext-perl, libparted-dev (>= 2.2), librsvg2-bin, libsubunit-dev, locales, pep8, pkg-config, po-debconf (>= 1.0), pyflakes3 (>= 0.7.2), python-gi-dev, python-scour, python3-all (>= 3.1), python3-apt (>= 0.7.100.3~), python3-cairo, python3-dbus, python3-gi, python3-gi-cairo, python3-icu (>= 1.0), python3-mock (>= 0.7.0), python3-pam, tzdata, ubuntu-artwork, udev, wget, xkb-data (>= 0.9), xkb-data-i18n, xvfb
 Standards-Version: 3.9.4
 X-Python3-Version: >= 3.1
 XS-Testsuite: autopkgtest
@@ -45,7 +45,7 @@
 Package: ubiquity-frontend-gtk
 Architecture: amd64 arm64 armhf i386 powerpc ppc64el
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, ubiquity (= ${binary:Version}), python3-dbus, gir1.2-gtk-3.0, gir1.2-pango-1.0, gir1.2-soup-2.4, gir1.2-vte-2.91, gir1.2-webkit2-4.0, iso-codes, metacity | marco | xfwm4 | matchbox-window-manager | lubuntu-default-settings | openbox | gnome-shell, gir1.2-xkl-1.0, gir1.2-timezonemap-1.0, python3-gi, python3-cairo, python3-gi-cairo, gir1.2-appindicator3-0.1, busybox-static | busybox
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, ubiquity (= ${binary:Version}), python3-dbus, gir1.2-gtk-3.0, gir1.2-nma-1.0, gir1.2-pango-1.0, gir1.2-soup-2.4, gir1.2-vte-2.91, gir1.2-webkit2-4.0, iso-codes, metacity | marco | xfwm4 | matchbox-window-manager | lubuntu-default-settings | openbox | gnome-shell, gir1.2-xkl-1.0, gir1.2-timezonemap-1.0, python3-gi, python3-cairo, python3-gi-cairo, gir1.2-appindicator3-0.1, busybox-static | busybox
 Suggests: gnome-control-center | feh
 Conflicts: ubuntu-express-frontend-gtk, espresso-frontend-gtk, ubiquity (<< 2.4.3)
 Replaces: ubuntu-express-frontend-gtk, espresso-frontend-gtk, ubiquity (<< 2.4.3)

=== modified file 'tests/test_wireless.py'
--- tests/test_wireless.py	2012-07-16 14:29:13 +0000
+++ tests/test_wireless.py	2017-10-26 13:58:07 +0000
@@ -4,7 +4,7 @@
 
 import mock
 
-from ubiquity import gtkwidgets, nm, plugin_manager
+from ubiquity import nm, plugin_manager
 
 
 class WirelessTests(unittest.TestCase):
@@ -22,20 +22,3 @@
         self.manager = self.nmwidget.view.wifi_model
         self.model = self.manager.model
         self.manager.passphrases_cache = {}
-
-    @mock.patch('ubiquity.nm.NetworkManager.is_connected')
-    def test_secure_ap_can_enter_password(self, is_connected):
-        is_connected.return_value = False
-        iterator = self.model.append(None, ['/foo', 'Intel', 'Wireless'])
-        iterator_insecure = self.model.append(iterator, ['Insecure', False, 0])
-        iterator_secure = self.model.append(iterator, ['Secure', True, 0])
-        gtkwidgets.refresh()
-        self.assertFalse(self.nmwidget.hbox.get_sensitive())
-        self.nmwidget.view.set_cursor(
-            self.model.get_path(iterator_secure), None, False)
-        gtkwidgets.refresh()
-        self.assertTrue(self.nmwidget.hbox.get_sensitive())
-        self.nmwidget.view.set_cursor(
-            self.model.get_path(iterator_insecure), None, False)
-        gtkwidgets.refresh()
-        self.assertFalse(self.nmwidget.hbox.get_sensitive())

=== modified file 'ubiquity/frontend/gtk_components/nmwidgets.py'
--- ubiquity/frontend/gtk_components/nmwidgets.py	2014-06-30 13:09:16 +0000
+++ ubiquity/frontend/gtk_components/nmwidgets.py	2017-10-26 13:58:07 +0000
@@ -1,11 +1,10 @@
-import string
-
 from dbus.mainloop.glib import DBusGMainLoop
 DBusGMainLoop(set_as_default=True)
 
 from gi.repository import Gtk, GObject, GLib
+from gi.repository import NM, NMA
 
-from ubiquity.nm import QueuedCaller, NetworkStore, NetworkManager
+from ubiquity.nm import decode_ssid, QueuedCaller, NetworkStore, NetworkManager
 
 
 class GLibQueuedCaller(QueuedCaller):
@@ -92,9 +91,8 @@
 class NetworkManagerTreeView(Gtk.TreeView):
     __gtype_name__ = 'NetworkManagerTreeView'
 
-    def __init__(self, password_entry=None, state_changed=None):
+    def __init__(self, state_changed=None):
         Gtk.TreeView.__init__(self)
-        self.password_entry = password_entry
         self.configure_icons()
         model = GtkNetworkStore()
         model.set_sort_column_id(0, Gtk.SortType.ASCENDING)
@@ -102,6 +100,10 @@
         self.wifi_model = NetworkManager(model,
                                          GLibQueuedCaller,
                                          state_changed)
+
+        self.nm_client = None
+        self.nm_connection = None
+
         self.set_model(model)
 
         ssid_column = Gtk.TreeViewColumn('')
@@ -157,17 +159,21 @@
                 self.expand_row(path, False)
             i = model.iter_next(i)
 
+    def row_activated(self, unused, path, column):
+        self.connect_to_selection()
+
     def get_state(self):
         return self.wifi_model.get_state()
 
     def disconnect_from_ap(self):
-        self.wifi_model.disconnect_from_ap()
+        if self.nm_connection:
+            if not self.nm_client:
+                self.nm_client = NM.Client.new()
 
-    def row_activated(self, unused, path, column):
-        passphrase = None
-        if self.password_entry:
-            passphrase = self.password_entry.get_text()
-        self.connect_to_selection(passphrase)
+            self.nm_client.deactivate_connection(self.nm_connection)
+            self.nm_connection = None
+        else:
+            self.wifi_model.disconnect_from_ap()
 
     def configure_icons(self):
         it = Gtk.IconTheme()
@@ -220,13 +226,6 @@
         else:
             cell.set_property('text', ssid)
 
-    def get_passphrase(self, ssid):
-        try:
-            cached = self.wifi_model.passphrases_cache[ssid]
-        except KeyError:
-            return ''
-        return cached
-
     def is_row_an_ap(self):
         model, iterator = self.get_selection().get_selected()
         if iterator is None:
@@ -244,12 +243,72 @@
         else:
             return False
 
-    def connect_to_selection(self, passphrase):
+    def find_ap(self, device, ssid):
+        for ap in device.get_access_points():
+            ap_ssid = ap.get_ssid()
+            if ap_ssid and decode_ssid(ap_ssid.get_data()) == ssid:
+                return ap
+        return None
+
+    def connect_cb(self, client, result, user_data):
+        self.nm_connection = client.add_and_activate_connection_finish(result)
+
+    def connect_dialog_cb(self, dialog, response):
+        if response == Gtk.ResponseType.OK:
+            connection, device, ap = dialog.get_connection()
+
+            if not self.nm_client:
+                self.nm_client = NM.Client.new()
+
+            self.nm_client.add_and_activate_connection_async(
+                connection, device, None, None, self.connect_cb, None
+            )
+        dialog.hide()
+
+    def connect_to_selection(self):
         model, iterator = self.get_selection().get_selected()
-        ssid = model[iterator][0]
+        if iterator is None:
+            return
         parent = model.iter_parent(iterator)
         if parent:
-            self.wifi_model.connect_to_ap(model[parent][0], ssid, passphrase)
+            try:
+                devid = model[parent][0]
+                ssid = model[iterator][0]
+                if model[iterator][1]:
+                    if not self.nm_client:
+                        self.nm_client = NM.Client.new()
+
+                    device = self.nm_client.get_device_by_path(devid)
+                    ap = self.find_ap(device, ssid)
+
+                    connection = NM.SimpleConnection()
+                    connection.add_setting(NM.SettingConnection(
+                        uuid=NM.utils_uuid_generate()
+                    ))
+                    connection.add_setting(NM.SettingWireless(
+                        ssid=ap.get_property("ssid")
+                    ))
+
+                    dialog = NMA.WifiDialog.new(
+                        self.nm_client,
+                        connection,
+                        device,
+                        ap,
+                        False
+                    )
+                    dialog.connect("response", self.connect_dialog_cb)
+                    dialog.run()
+                else:
+                    self.wifi_model.connect_to_ap(devid, ssid)
+            except Exception as e:
+                dialog = Gtk.MessageDialog(
+                    None, Gtk.DialogFlags.MODAL,
+                    Gtk.MessageType.ERROR, Gtk.ButtonsType.CLOSE,
+                    "Failed to connect to wireless network"
+                )
+                dialog.format_secondary_text("{}".format(e))
+                dialog.run()
+                dialog.hide()
 
 GObject.type_register(NetworkManagerTreeView)
 
@@ -261,44 +320,23 @@
             GObject.SignalFlags.RUN_FIRST, GObject.TYPE_NONE,
             (GObject.TYPE_UINT,)),
         'selection_changed': (
-            GObject.SignalFlags.RUN_FIRST, GObject.TYPE_NONE, ()),
-        'pw_validated': (
-            GObject.SignalFlags.RUN_FIRST, GObject.TYPE_NONE,
-            (GObject.TYPE_BOOLEAN,))}
+            GObject.SignalFlags.RUN_FIRST, GObject.TYPE_NONE, ())}
 
     def __init__(self):
         Gtk.Box.__init__(self)
         self.set_orientation(Gtk.Orientation.VERTICAL)
         self.set_spacing(12)
-        self.password_entry = Gtk.Entry()
-        self.view = NetworkManagerTreeView(self.password_entry,
-                                           self.state_changed)
+        self.view = NetworkManagerTreeView(self.state_changed)
         scrolled_window = Gtk.ScrolledWindow()
         scrolled_window.set_policy(
             Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
         scrolled_window.set_shadow_type(Gtk.ShadowType.IN)
         scrolled_window.add(self.view)
         self.pack_start(scrolled_window, True, True, 0)
-        self.hbox = Gtk.Box(spacing=6)
-        self.pack_start(self.hbox, False, True, 0)
-        self.password_label = Gtk.Label(label='Password:')
-        self.password_entry.set_visibility(False)
-        self.password_entry.connect('activate', self.connect_to_ap)
-        self.password_entry.connect('changed', self.password_entry_changed)
-        self.display_password = Gtk.CheckButton(label='Display password')
-        self.display_password.connect('toggled', self.display_password_toggled)
-        self.hbox.pack_start(self.password_label, False, True, 0)
-        self.hbox.pack_start(self.password_entry, True, True, 0)
-        self.hbox.pack_start(self.display_password, False, True, 0)
-        self.hbox.set_sensitive(False)
         self.selection = self.view.get_selection()
         self.selection.connect('changed', self.changed)
         self.show_all()
 
-    def translate(self, password_label_text, display_password_text):
-        self.password_label.set_label(password_label_text)
-        self.display_password.set_label(display_password_text)
-
     def get_state(self):
         return self.view.get_state()
 
@@ -314,48 +352,16 @@
     def state_changed(self, state):
         self.emit('connection', state)
 
-    def password_is_valid(self):
-        passphrase = self.password_entry.get_text()
-        if len(passphrase) >= 8 and len(passphrase) < 64:
-            return True
-        if len(passphrase) == 64:
-            for c in passphrase:
-                if c not in string.hexdigits:
-                    return False
-            return True
-        else:
-            return False
-
     def connect_to_ap(self, *args):
-        if self.password_is_valid():
-            passphrase = self.password_entry.get_text()
-            self.view.connect_to_selection(passphrase)
+        self.view.connect_to_selection()
 
     def disconnect_from_ap(self):
         self.view.disconnect_from_ap()
 
-    def password_entry_changed(self, *args):
-        self.emit('pw_validated', self.password_is_valid())
-
-    def display_password_toggled(self, *args):
-        self.password_entry.set_visibility(self.display_password.get_active())
-
     def changed(self, selection):
         iterator = selection.get_selected()[1]
         if not iterator:
             return
-        row = selection.get_tree_view().get_model()[iterator]
-        secure = row[1]
-        ssid = row[0]
-        if secure:
-            self.hbox.set_sensitive(True)
-            passphrase = self.view.get_passphrase(ssid)
-            self.password_entry.set_text(passphrase)
-            self.emit('pw_validated', False)
-        else:
-            self.hbox.set_sensitive(False)
-            self.password_entry.set_text('')
-            self.emit('pw_validated', True)
         self.emit('selection_changed')
 
 GObject.type_register(NetworkManagerWidget)

=== modified file 'ubiquity/frontend/kde_components/nmwidgets.py'
--- ubiquity/frontend/kde_components/nmwidgets.py	2015-08-31 16:30:49 +0000
+++ ubiquity/frontend/kde_components/nmwidgets.py	2017-10-26 13:58:07 +0000
@@ -268,7 +268,13 @@
 
     def connect_to_selection(self, passphrase):
         devid, ssid = self._get_selected_row_ids()
-        self.wifi_model.connect_to_ap(devid, ssid, passphrase)
+        try:
+            self.wifi_model.connect_to_ap(devid, ssid, passphrase)
+        except Exception as e:
+            dialog = QtGui.QMessageBox()
+            dialog.setWindowTitle("Failed to connect to wireless network")
+            dialog.setText("{}".format(e))
+            dialog.exec_()
 
     def get_cached_passphrase(self):
         index = self.currentIndex()

=== modified file 'ubiquity/plugins/ubi-wireless.py'
--- ubiquity/plugins/ubi-wireless.py	2014-06-30 13:09:16 +0000
+++ ubiquity/plugins/ubi-wireless.py	2017-10-26 13:58:07 +0000
@@ -83,7 +83,6 @@
         self.nmwidget = builder.get_object('nmwidget')
         self.nmwidget.connect('connection', self.state_changed)
         self.nmwidget.connect('selection_changed', self.selection_changed)
-        self.nmwidget.connect('pw_validated', self.pw_validated)
         self.no_wireless = builder.get_object('no_wireless')
         self.use_wireless = builder.get_object('use_wireless')
         self.use_wireless.connect('toggled', self.wireless_toggled)
@@ -98,10 +97,6 @@
 
     def plugin_translate(self, lang):
         get_s = self.controller.get_string
-        label_text = get_s('ubiquity/text/wireless_password_label')
-        display_text = get_s('ubiquity/text/wireless_display_password')
-        self.nmwidget.translate(label_text, display_text)
-
         self.connect_text = get_s('ubiquity/text/connect', lang)
         self.stop_text = get_s('ubiquity/text/stop', lang)
         frontend = self.controller._wizard
@@ -140,7 +135,6 @@
             frontend.connecting_spinner.stop()
             frontend.connecting_label.hide()
             frontend.translate_widget(frontend.next)
-            self.nmwidget.hbox.set_sensitive(False)
             self.next_normal = True
             self.controller.allow_go_forward(True)
 
@@ -178,7 +172,6 @@
             frontend.connecting_spinner.hide()
             frontend.connecting_spinner.stop()
             frontend.connecting_label.hide()
-            self.controller.allow_go_forward(True)
 
             frontend.translate_widget(frontend.back)
             self.back_normal = True
@@ -195,9 +188,6 @@
             frontend.back.set_sensitive(True)
         self.selection_changed(None)
 
-    def pw_validated(self, unused, validated):
-        self.controller.allow_go_forward(validated)
-
 
 class PageKde(WirelessPageBase):
     plugin_breadcrumb = 'ubiquity/text/breadcrumb_wireless'