Merge lp:~seb128/ubiquity/remove-ecryptfs-option into lp:ubiquity

[Sebastien Bacher]

Remove the encrypted userdir option from the gtk installer since
ecryptfs is going to move to universe. The keep the base code in case
the option is added back later using another technology.

Remove the encrypted userdir option from the gtk installer since
ecryptfs is going to move to universe. The keep the base code in case
the option is added back later using another technology.

[Jean-Baptiste Lallement (jibel)]

Thanks for this update.

The object login_encrypt has been removed from the page of the GTK frontend (and initialized to None in the page's constructor) but is still used in ubi-usersetup in on_authentication_toggled(). Ubiquity crashes when the user selects auto-login.

review: Needs Fixing

[lp:~seb128/ubiquity/remove-ecryptfs-option]

6590. By Sebastien Bacher on 2018-02-28

Don't use the deleted object and remove the corresponding callback

6591. By Sebastien Bacher on 2018-02-28

Remove the corresponding autopilot reference

[Sebastien Bacher (seb128)]

Thanks for catching that, I remove that callback/widget and the corresponding autopilot reference

[Jean-Baptiste Lallement (jibel)]

pep8 tests are failing:
ubiquity/plugins/ubi-usersetup.py:432:1: E302 expected 2 blank lines, found 1
autopilot/ubiquity_autopilot_tests/emulators/gtkcontainers.py:273:1: E302 expected 2 blank lines, found 1

Unit tests are failing:
test_interface_translated (test_gtkui.TestFrontend) ... Exception in GTK frontend (invoking crash handler):
Traceback (most recent call last):
  File "/usr/lib/python3/dist-packages/gi/overrides/Gtk.py", line 103, in _builder_connect_callback
    handler, args = _extract_handler_and_args(obj_or_map, handler_name)
  File "/usr/lib/python3/dist-packages/gi/overrides/Gtk.py", line 83, in _extract_handler_and_args
    raise AttributeError('Handler %s not found' % handler_name)
AttributeError: Handler on_authentication_toggled not found

Traceback (most recent call last):
  File "/usr/lib/python3/dist-packages/gi/overrides/Gtk.py", line 103, in _builder_connect_callback
    handler, args = _extract_handler_and_args(obj_or_map, handler_name)
  File "/usr/lib/python3/dist-packages/gi/overrides/Gtk.py", line 83, in _extract_handler_and_args
    raise AttributeError('Handler %s not found' % handler_name)
AttributeError: Handler on_authentication_toggled not found

review: Needs Fixing

[Jean-Baptiste Lallement (jibel)]

This diff fixes the build:
=== modified file 'autopilot/ubiquity_autopilot_tests/emulators/gtkcontainers.py'
--- autopilot/ubiquity_autopilot_tests/emulators/gtkcontainers.py 2018-02-28 11:45:21 +0000
+++ autopilot/ubiquity_autopilot_tests/emulators/gtkcontainers.py 2018-02-28 14:19:21 +0000
@@ -270,6 +270,7 @@
         else:
             return False

+
 class GtkAlignment(GtkContainers):
     """ Emulator class for a GtkAlignment instance """
     def __init__(self, *args):

=== modified file 'gui/gtk/stepUserInfo.ui'
--- gui/gtk/stepUserInfo.ui 2018-02-27 14:28:33 +0000
+++ gui/gtk/stepUserInfo.ui 2018-02-28 14:22:16 +0000
@@ -88,7 +88,6 @@
                 <property name="xalign">0</property>
                 <property name="draw_indicator">True</property>
                 <property name="group">login_pass</property>
- <signal name="clicked" handler="on_authentication_toggled" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>

=== modified file 'ubiquity/plugins/ubi-usersetup.py'
--- ubiquity/plugins/ubi-usersetup.py 2018-02-28 11:41:07 +0000
+++ ubiquity/plugins/ubi-usersetup.py 2018-02-28 14:19:09 +0000
@@ -429,6 +429,7 @@
         else:
             self.resolver_ok = False

+
 class PageKde(PageBase):
     plugin_breadcrumb = 'ubiquity/text/breadcrumb_user'

[Jean-Baptiste Lallement (jibel)]

with the changes above applied, it builds successfully and manual verification shows that the "encrypt home directory" option is gone and installation is successful.

Approved.

review: Approve

=== modified file 'autopilot/ubiquity-autopilot-runner/jenkins/config/ubuntu.cfg'
--- autopilot/ubiquity-autopilot-runner/jenkins/config/ubuntu.cfg	2015-02-17 11:28:23 +0000
+++ autopilot/ubiquity-autopilot-runner/jenkins/config/ubuntu.cfg	2018-02-28 11:46:13 +0000
@@ -7,7 +7,6 @@
     - test_english_default
     - test_english_lvm
     - test_english_encrypt_lvm
-    - test_english_encrypt_home
     - test_nonenglish_default
     - test_nonenglish_lvm
     - test_nonenglish_encrypt_lvm

=== modified file 'autopilot/ubiquity_autopilot_tests/configs/english_label_conf.py'
--- autopilot/ubiquity_autopilot_tests/configs/english_label_conf.py	2018-01-29 11:02:41 +0000
+++ autopilot/ubiquity_autopilot_tests/configs/english_label_conf.py	2018-02-28 11:46:13 +0000
@@ -136,7 +136,6 @@
     stepUserInfo["verified_password_label"] = 'Confirm your password:'
     stepUserInfo["hostname_extra_label"] = \
         'The name it uses when it talks to other computers.'
-    stepUserInfo["login_encrypt"] = 'Require my password to log in'
 
     # write config to tmp file
     with open('/tmp/english_config.ini', 'w') as configfile:

=== modified file 'autopilot/ubiquity_autopilot_tests/emulators/gtkcontainers.py'
--- autopilot/ubiquity_autopilot_tests/emulators/gtkcontainers.py	2017-06-02 14:01:43 +0000
+++ autopilot/ubiquity_autopilot_tests/emulators/gtkcontainers.py	2018-02-28 11:46:13 +0000
@@ -270,33 +270,6 @@
         else:
             return False
 
-    def encrypt_home_dir(self, encrypt=None):
-        """ Check the login_encrypt box """
-        chk_encrypt = self.select_single(BuilderName='login_encrypt')
-        active = chk_encrypt.active
-
-        if encrypt is None:
-            # Switch checkbox and ensure it switched
-            self.pointing_device.click_object(chk_encrypt)
-            expectThat(chk_encrypt.active).equals(
-                not active,
-                msg='encrypt home checkbox state did not change. Current '
-                'state: {0}'.format(chk_encrypt.active))
-        elif encrypt and not active:
-            self.pointing_device.click_object(chk_encrypt)
-            expectThat(chk_encrypt.active).equals(
-                True,
-                msg='encrypt home checkbox not active and should be.')
-        elif not encrypt and active:
-            self.pointing_device.click_object(chk_encrypt)
-            expectThat(chk_encrypt.active).equals(
-                False,
-                msg='encrypt home checkbox active and should not be.')
-        else:
-            raise ValueError("Invalid value for 'encrypt' parameter: {}"
-                             .format(encrypt))
-
-
 class GtkAlignment(GtkContainers):
     """ Emulator class for a GtkAlignment instance """
     def __init__(self, *args):

=== modified file 'autopilot/ubiquity_autopilot_tests/tests/__init__.py'
--- autopilot/ubiquity_autopilot_tests/tests/__init__.py	2018-02-05 15:08:56 +0000
+++ autopilot/ubiquity_autopilot_tests/tests/__init__.py	2018-02-28 11:46:13 +0000
@@ -577,15 +577,13 @@
                                        quit_button=True, skip_button=False)
 
     def user_info_page_tests(self, username, pwd,
-                             encrypted=False, autologin=False):
+                             autologin=False):
         """ Runs tests for the User Info Page
 
         :param username:*String*, name of user
 
         :param pwd: *String*, password for user
 
-        :param encrypted: *Bool* if true encypts the home directory
-
         :param autologin: *Bool* if true sets the user account to login
                            automagically
 
@@ -607,8 +605,6 @@
 
         user_info_page.create_user(username, pwd)
         # TODO: get these working
-        if encrypted:
-            user_info_page.encrypt_home_dir(encrypt=True)
         if autologin:
             user_info_page.set_auto_login()
 

=== removed file 'autopilot/ubiquity_autopilot_tests/tests/test_english_encrypt_home.py'
--- autopilot/ubiquity_autopilot_tests/tests/test_english_encrypt_home.py	2018-02-05 15:08:56 +0000
+++ autopilot/ubiquity_autopilot_tests/tests/test_english_encrypt_home.py	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-# Testing Default Install for the Ubiquity Installer
-# Author:
-#   Dan Chapman <[e-mail]>
-#   Jean-Baptiste Lallement <[e-mail]>
-#
-# Copyright (C) 2013-2014
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 3 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-from ubiquity_autopilot_tests.tests import UbiquityAutopilotTestCase
-from testtools.matchers import Equals
-from autopilot.matchers import Eventually
-from ubiquity_autopilot_tests.emulators import gtktoplevel
-
-
-class EnglishEncryptHomeTestCase(UbiquityAutopilotTestCase):
-    """
-    A default install testcase just generally clicks through the installer
-    using all the default values
-    """
-
-    def test_encrypthome_install(self, ):
-        # first check we have an emulator instance
-        flavor = self.get_distribution()
-        self.assertIsInstance(self.main_window, gtktoplevel.GtkWindow)
-        self.assertThat(self.main_window.visible, Eventually(Equals(True)))
-        self.welcome_page_tests(lang='English')
-        self.go_to_next_page()
-        self.keyboard_layout_page_tests()
-        self.go_to_next_page()
-        self.preparing_page_tests()
-        self.go_to_next_page()
-        if flavor == 'Edubuntu':
-            self.edubuntu_addon_window_tests(gnome=True)
-            self.go_to_next_page()
-            self.edubuntu_packages_window_tests()
-            self.go_to_next_page()
-        self.installation_type_page_tests(default=True)
-        self.go_to_next_page(wait=True)
-        self.location_page_tests()
-        self.go_to_next_page()
-        self.user_info_page_tests('Autopilot', 'password', encrypted=True)
-        self.go_to_progress_page()
-
-        self.progress_page_tests()
-        self.assertThat(lambda: self.app.select_single(
-            'GtkDialog',
-            name='finished_dialog').visible,
-            Eventually(Equals(True), timeout=180))
-        # XXX: Uncomment if you want to restart after install complete
-        # we need to sleep here to wait for dialog to fully load. It appears
-        # in dbus before its actually visible. As the test has already passed
-        # this doesn't affect outcome
-        # time.sleep(5)
-        #
-        # self.keyboard.press_and_release('Enter')

=== modified file 'debian/changelog'
--- debian/changelog	2018-02-26 15:17:13 +0000
+++ debian/changelog	2018-02-28 11:46:13 +0000
@@ -1,3 +1,11 @@
+ubiquity (18.04.3) UNRELEASED; urgency=medium
+
+  * Remove the encrypted userdir option from the gtk installer since
+    ecryptfs is going to move to universe. The keep the base code in case 
+    the option is added back later using another technology.
+
+ -- Sebastien Bacher <[e-mail]>  Tue, 27 Feb 2018 15:06:34 +0100
+
 ubiquity (18.04.2) bionic; urgency=medium
 
   [ Didier Roche ]

=== modified file 'debian/control'
--- debian/control	2018-02-06 11:37:06 +0000
+++ debian/control	2018-02-28 11:46:13 +0000
@@ -11,7 +11,7 @@
 
 Package: ubiquity
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, python3-debconf, ubiquity-frontend-${mangled-version}, ubiquity-artwork-${mangled-version}, laptop-detect, lsb-release, ubiquity-casper, python3-apt (>= 0.7.100.3~), ${console-setup-depends}, iso-codes, passwd, adduser, os-prober, rdate, ntfs-3g (>= 1:2011.1.15AR.4+2011.4.12-1) [any-alpha any-amd64 any-i386], ecryptfs-utils, cryptsetup, policykit-1, python3-icu (>= 1.0), python3-pam, language-selector-common (>= 0.4.16), archdetect-deb, dpkg-repack, apt-clone, wget, grub-common [any-amd64 any-i386], dbus-x11, sbsigntool [amd64]
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, python3-debconf, ubiquity-frontend-${mangled-version}, ubiquity-artwork-${mangled-version}, laptop-detect, lsb-release, ubiquity-casper, python3-apt (>= 0.7.100.3~), ${console-setup-depends}, iso-codes, passwd, adduser, os-prober, rdate, ntfs-3g (>= 1:2011.1.15AR.4+2011.4.12-1) [any-alpha any-amd64 any-i386], cryptsetup, policykit-1, python3-icu (>= 1.0), python3-pam, language-selector-common (>= 0.4.16), archdetect-deb, dpkg-repack, apt-clone, wget, grub-common [any-amd64 any-i386], dbus-x11, sbsigntool [amd64]
 Recommends: grub-pc [any-amd64 any-i386] | grub [any-amd64 any-i386] | grub-efi [any-amd64 any-i386], flash-kernel [armel armhf], u-boot-tools [armel armhf], yaboot [powerpc], hfsutils [powerpc], dmraid, btrfs-tools, ubuntu-drivers-common, lvm2
 Conflicts: ubuntu-express, espresso, espresso-utils, espresso-locale, espresso-keyboard-setup, espresso-kbd-chooser, espresso-timezone, user-setup (<< 0.05ubuntu6), partman, espresso-grub, espresso-yaboot
 Replaces: ubuntu-express, espresso, espresso-utils, espresso-locale, espresso-keyboard-setup, espresso-kbd-chooser, espresso-timezone, user-setup (<< 0.05ubuntu6), partman, espresso-grub, espresso-yaboot, ubiquity-frontend-gtk (<< 2.3.8)

=== modified file 'gui/gtk/stepUserInfo.ui'
--- gui/gtk/stepUserInfo.ui	2014-02-21 13:46:40 +0000
+++ gui/gtk/stepUserInfo.ui	2018-02-28 11:46:13 +0000
@@ -113,30 +113,6 @@
                 <property name="position">1</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkAlignment" id="alignment1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="left_padding">20</property>
-                <child>
-                  <object class="GtkCheckButton" id="login_encrypt">
-                    <property name="label" translatable="yes">Encrypt my home folder</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_action_appearance">False</property>
-                    <property name="xalign">0</property>
-                    <property name="draw_indicator">True</property>
-                    <signal name="clicked" handler="on_authentication_toggled" swapped="no"/>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
           </object>
           <packing>
             <property name="left_attach">1</property>

=== modified file 'tests/test_usersetup.py'
--- tests/test_usersetup.py	2016-06-30 14:33:17 +0000
+++ tests/test_usersetup.py	2018-02-28 11:46:13 +0000
@@ -106,17 +106,6 @@
         self.gtk.info_loop(self.gtk.fullname)
         self.gtk.info_loop(self.gtk.username)
 
-    def test_on_authentication_toggled(self):
-        self.gtk.login_encrypt.set_active(True)
-        self.gtk.login_auto.set_active(True)
-        self.gtk.on_authentication_toggled(self.gtk.login_auto)
-        self.assertFalse(self.gtk.login_encrypt.get_active())
-
-        self.gtk.login_auto.set_active(True)
-        self.gtk.login_encrypt.set_active(True)
-        self.gtk.on_authentication_toggled(self.gtk.login_encrypt)
-        self.assertTrue(self.gtk.login_pass.get_active())
-
     def test_default_username(self):
         self.gtk.controller.get_string = mock_get_string
         self.gtk.set_fullname('Example Person')

=== modified file 'ubiquity/plugins/ubi-usersetup.py'
--- ubiquity/plugins/ubi-usersetup.py	2018-02-06 11:05:22 +0000
+++ ubiquity/plugins/ubi-usersetup.py	2018-02-28 11:46:13 +0000
@@ -186,7 +186,6 @@
         self.password = builder.get_object('password')
         self.verified_password = builder.get_object('verified_password')
         self.login_auto = builder.get_object('login_auto')
-        self.login_encrypt = builder.get_object('login_encrypt')
         self.login_pass = builder.get_object('login_pass')
         self.username_error_label = builder.get_object('username_error_label')
         self.hostname_error_label = builder.get_object('hostname_error_label')
@@ -262,13 +261,14 @@
         return self.login_auto.get_active()
 
     def set_encrypt_home(self, value):
-        self.login_encrypt.set_active(value)
+        print('Ecryptfs is deprecated')
 
     def set_force_encrypt_home(self, value):
-        self.login_vbox.set_sensitive(not value)
+        print('Ecryptfs is deprecated')
 
+    # Ecryptfs is deprecated
     def get_encrypt_home(self):
-        return self.login_encrypt.get_active()
+        return False
 
     def username_error(self, msg):
         self.username_ok.hide()
@@ -429,15 +429,6 @@
         else:
             self.resolver_ok = False
 
-    def on_authentication_toggled(self, w):
-        if w == self.login_auto and w.get_active():
-            self.login_encrypt.set_active(False)
-        elif w == self.login_encrypt and w.get_active():
-            # TODO why is this so slow to activate the login_pass radio button
-            # when checking encrypted home?
-            self.login_pass.set_active(True)
-
-
 class PageKde(PageBase):
     plugin_breadcrumb = 'ubiquity/text/breadcrumb_user'
 
@@ -652,13 +643,14 @@
         return self.auto_login
 
     def set_encrypt_home(self, value):
-        self.encrypt_home = value
+        print('Ecryptfs is deprecated')
 
     def set_force_encrypt_home(self, value):
-        self.set_encrypt_home(value)
+        print('Ecryptfs is deprecated')
 
+    # Ecrypts is deprecated
     def get_encrypt_home(self):
-        return self.encrypt_home
+        return False
 
     def username_error(self, msg):
         """The selected username was bad."""