Merge lp:~xnox/ubiquity/pam-logind into lp:ubiquity

[Dimitri John Ledkov]

[Colin Watson (cjwatson)]

This is fine, with the various small amendments suggested on IRC ("for query, type in query_list:", maybe avoiding hardcoding the VT number). Thanks!

review: Approve

[lp:~xnox/ubiquity/pam-logind]

6004. By Dimitri John Ledkov on 2013-09-25

Refactor & do not hard-code vt #

[Dimitri John Ledkov (xnox)]

Updated with irc comments & re-tested.

=== modified file 'bin/ubiquity-dm'
--- bin/ubiquity-dm	2013-09-24 13:00:05 +0000
+++ bin/ubiquity-dm	2013-09-25 12:18:48 +0000
@@ -3,6 +3,7 @@
 from __future__ import print_function
 
 import errno
+import getpass
 import grp
 import imp
 import os
@@ -13,6 +14,7 @@
 import time
 
 import debconf
+import PAM
 
 sys.path.insert(0, '/usr/lib/ubiquity')
 
@@ -23,6 +25,23 @@
 from ubiquity.misc import create_bool, utf8
 
 
+def _pam_conv(auth, query_list, userData):
+    resp = []
+    for query, type in query_list:
+        if type == PAM.PAM_PROMPT_ECHO_ON:
+            val = input(query)
+            resp.append((val, 0))
+        elif type == PAM.PAM_PROMPT_ECHO_OFF:
+            val = getpass.getpass(query)
+            resp.append((val, 0))
+        elif type in (PAM.PAM_PROMPT_ERROR_MSG, PAM.PAM_PROMPT_TEXT_INFO):
+            print(query)
+            resp.append(('', 0))
+        else:
+            return None
+    return resp
+
+
 def set_locale():
     db = DebconfCommunicator('ubiquity', cloexec=True)
     locale = ''
@@ -69,6 +88,7 @@
 
 class DM:
     def __init__(self, vt, display, default_username):
+        self.auth = PAM.pam()
         self.vt = vt
         self.display = display
         self.server_started = False
@@ -151,6 +171,28 @@
                         hook, stdout=logfile, stderr=logfile,
                         preexec_fn=self.drop_privileges)
 
+    def pam_open_session(self):
+            self.auth.start('su')
+            self.auth.set_item(PAM.PAM_USER, self.username)
+            self.auth.set_item(PAM.PAM_CONV, _pam_conv)
+            self.auth.putenv('XDG_SESSION_CLASS=greeter')
+            self.auth.putenv('XDG_SEAT=seat0')
+            # at the time pam_open_session is called self.vt is the
+            # correct vt: either the one originally passed as cmd line
+            # arg or as determined by active_vt()
+            #
+            # self.vt is of the form str("vt10")
+            self.auth.putenv('XDG_VTNR=%s' % self.vt[2:])
+            self.auth.authenticate()
+            self.auth.open_session()
+            os.environ.update(
+                [i.split('=', 1) for i in self.auth.getenvlist()])
+
+    def pam_close_session(self):
+        if self.auth:
+            self.auth.close_session()
+            self.auth = None
+
     def run(self, *program):
         # Extract the program basename to see if we are in oem-config or
         # ubiquity.
@@ -258,13 +300,14 @@
 
         os.environ['DISPLAY'] = self.display
         os.environ['HOME'] = self.homedir
-        os.environ['XDG_SESSION_ID'] = 'c1'
         # Give ubiquity a UID and GID that it can drop privileges to.
         os.environ['PKEXEC_UID'] = str(self.uid)
         os.environ['GVFS_DISABLE_FUSE'] = '1'
         # Overlay scrollbars are now a gtk module
         os.environ['GTK_MODULES'] = 'overlay-scrollbar'
 
+        self.pam_open_session()
+
         # run simple, custom scripts during install time
         if program_basename == 'ubiquity':
             self.run_hooks('/usr/lib/ubiquity/dm-scripts/install')
@@ -634,4 +677,5 @@
 ret = dm.run(*sys.argv[4:])
 if ret == 0:
     set_locale()
+dm.pam_close_session()
 sys.exit(ret)
 
=== modified file 'd-i/update-control'
--- d-i/update-control	2013-09-24 09:57:36 +0000
+++ d-i/update-control	2013-09-25 12:18:48 +0000
@@ -67,6 +67,7 @@
     'python3-icu (>= 1.0)',
     'python3-mock (>= 0.7.0)',
     'python3-oauthlib',
+    'python3-pam',
     'gir1.2-xkl-1.0',
     'ubuntu-artwork',
     'udev',
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-09-24 13:00:05 +0000
+++ debian/changelog	2013-09-25 12:18:48 +0000
@@ -6,6 +6,14 @@
   [ Howard Chan ]
   * Fix the new Ubuntu Studio wallpaper backdrop for ubiquity. (LP: #1229651)
 
+  [ Dmitrijs Ledkovs ]
+  * Add dependencies on python3-pam.
+  * Establish a PAM session with logind "greeter" mode in ubiquity-dm,
+    resolving the following bugs:
+    - WiFi page not working (LP: #1178638) (LP: #1220193)
+    - Sound system / a11y not available (LP: #1229416)
+    - and maybe others.
+
  -- Colin Watson <[e-mail]>  Tue, 24 Sep 2013 10:57:15 +0100
 
 ubiquity (2.15.19) saucy; urgency=low
 
=== modified file 'debian/control'
--- debian/control	2013-09-24 09:57:36 +0000
+++ debian/control	2013-09-25 12:18:48 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Installer Team <[e-mail]>
 Uploaders: Colin Watson <[e-mail]>, Evan Dandrea <[e-mail]>
-Build-Depends: apt, autopoint, bf-utf-source, dctrl-tools, debconf (>= 1.5.43), debconf-utils, debhelper (>= 9), devio, dh-autoreconf, dh-di (>= 3), dpkg-dev (>= 1.15.7), gir1.2-gnomekeyring-1.0, gir1.2-soup-2.4, gir1.2-timezonemap-1.0, gir1.2-webkit-3.0, gir1.2-xkl-1.0, gnome-icon-theme, gobject-introspection, 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, libparted0-dev (>= 2.2), locales, pep8, pkg-config, po-debconf (>= 1.0), pyflakes (>= 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-oauthlib, tzdata, ubuntu-artwork, udev, wget, xkb-data (>= 0.9), xkb-data-i18n, xvfb
+Build-Depends: apt, autopoint, bf-utf-source, dctrl-tools, debconf (>= 1.5.43), debconf-utils, debhelper (>= 9), devio, dh-autoreconf, dh-di (>= 3), dpkg-dev (>= 1.15.7), gir1.2-gnomekeyring-1.0, gir1.2-soup-2.4, gir1.2-timezonemap-1.0, gir1.2-webkit-3.0, gir1.2-xkl-1.0, gnome-icon-theme, gobject-introspection, 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, libparted0-dev (>= 2.2), locales, pep8, pkg-config, po-debconf (>= 1.0), pyflakes (>= 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-oauthlib, 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
@@ -11,7 +11,7 @@
 
 Package: ubiquity
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, debconf (>= 1.5.43), 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] | ntfsprogs [any-alpha any-amd64 any-i386], ecryptfs-utils, cryptsetup, policykit-1, python3-icu (>= 1.0), 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}, debconf (>= 1.5.43), 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] | ntfsprogs [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]
 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)