Merge lp:~laney/ubiquity/dbus-session-bus into lp:ubiquity

[Iain Lane]

Pass user session bus address through from desktop into ubiquity, & execute gsettings with that bus.

Also use SUDO_UID if PKEXEC_UID is not set.

[Iain Lane (laney)]

This is an alternative to https://code.launchpad.net/~seb128/ubiquity/gsettings-calls-environ/+merge/343829

[Sebastien Bacher (seb128)]

Looks good to me, thanks!

review: Approve

[Iain Lane (laney)]

My bad, I accidentally pushed this to trunk before an ~ubuntu-installer member reviewed.

Feel free to do so, or it'll get reviewed in the unapproved queue anyway.

[Sebastien Bacher (seb128)]

the version pushed with the extra XDG_RUNTIME_DIR env looks good/works fine, +1 from but I'm not in the ~ubuntu-installer so my review might not count

review: Approve

=== modified file 'data/ubiquity.desktop.in'
--- data/ubiquity.desktop.in	2016-09-27 02:36:35 +0000
+++ data/ubiquity.desktop.in	2018-04-23 17:21:26 +0000
@@ -6,7 +6,7 @@
 _Comment=Install this system permanently to your hard disk
 _Keywords=ubiquity;
 #use sh because pkexec is broken under xfce/lxce http://pad.lv/1193526
-Exec=sudo sh -c 'ubiquity gtk_ui'
+Exec=sudo --preserve-env=DBUS_SESSION_BUS_ADDRESS sh -c 'ubiquity gtk_ui'
 Icon=ubiquity
 Terminal=false
 Categories=GTK;System;Settings;

=== modified file 'debian/changelog'
--- debian/changelog	2018-04-23 16:43:06 +0000
+++ debian/changelog	2018-04-23 17:21:26 +0000
@@ -3,6 +3,11 @@
   [ Didier Roche ]
   * Record OEM installation mode in telemetry data. (LP: #1765693)
 
+  [ Iain Lane ]
+  * misc.py: Fall back to SUDO_UID if PKEXEC_UID is not set.
+  * ubiquity.desktop.in, misc.py: Pass through the ubuntu user's D-Bus session
+    bus, if set, so that we can communicate with it.
+
  -- Iain Lane <[e-mail]>  Mon, 23 Apr 2018 17:42:27 +0100
 
 ubiquity (18.04.10) bionic; urgency=medium

=== modified file 'ubiquity/gsettings.py'
--- ubiquity/gsettings.py	2017-07-18 15:21:41 +0000
+++ ubiquity/gsettings.py	2018-04-23 17:21:26 +0000
@@ -48,7 +48,8 @@
         user = os.getenv("SUDO_USER", os.getenv("USER", "root"))
 
     subp = subprocess.Popen(
-        ['sudo', '-H', '-u', user, 'gsettings', 'get', schema, key],
+        ['sudo', '--preserve-env=DBUS_SESSION_BUS_ADDRESS', '-H', '-u', user,
+         'gsettings', 'get', schema, key],
         stdout=subprocess.PIPE, stderr=subprocess.PIPE,
         preexec_fn=misc.drop_all_privileges, universal_newlines=True)
     value = subp.communicate()[0].rstrip('\n')
@@ -103,8 +104,9 @@
         value = "true" if value else "false"
 
     subprocess.call(
-        ['sudo', '-H', '-u', user, 'gsettings', 'set', schema, key,
-         str(value)], preexec_fn=misc.drop_all_privileges)
+        ['sudo', '--preserve-env=DBUS_SESSION_BUS_ADDRESS', '-H', '-u', user,
+         'gsettings', 'set', schema, key, str(value)],
+        preexec_fn=misc.drop_all_privileges)
 
 
 def set_list(schema, key, values, user=None):
@@ -123,5 +125,6 @@
         user = os.getenv("SUDO_USER", os.getenv("USER", "root"))
 
     subprocess.call(
-        ['sudo', '-H', '-u', user, 'gsettings', 'reset', schema, key],
+        ['sudo', '--preserve-env=DBUS_SESSION_BUS_ADDRESS', '-H', '-u', user,
+         'gsettings', 'reset', schema, key],
         preexec_fn=misc.drop_all_privileges)

=== modified file 'ubiquity/misc.py'
--- ubiquity/misc.py	2017-07-18 15:21:41 +0000
+++ ubiquity/misc.py	2018-04-23 17:21:26 +0000
@@ -50,7 +50,7 @@
 def drop_all_privileges():
     # gconf needs both the UID and effective UID set.
     global _dropped_privileges
-    uid = os.environ.get('PKEXEC_UID')
+    uid = os.environ.get('PKEXEC_UID', os.environ.get('SUDO_UID'))
     gid = None
     if uid is not None:
         uid = int(uid)
@@ -71,7 +71,7 @@
     global _dropped_privileges
     assert _dropped_privileges is not None
     if _dropped_privileges == 0:
-        uid = os.environ.get('PKEXEC_UID')
+        uid = os.environ.get('PKEXEC_UID', os.environ.get('SUDO_UID'))
         gid = None
         if uid is not None:
             uid = int(uid)
@@ -100,7 +100,7 @@
     # At the moment, we only know how to handle this when effective
     # privileges were already dropped.
     assert _dropped_privileges is not None and _dropped_privileges > 0
-    uid = os.environ.get('PKEXEC_UID')
+    uid = os.environ.get('PKEXEC_UID', os.environ.get('SUDO_UID'))
     gid = None
     if uid is not None:
         uid = int(uid)