Merge lp:~ted/ubuntu-app-launch/install-root into lp:ubuntu-app-launch

[Ted Gould]

Adjust UAL for working inside a snap

This branch is various changes that make it so that UAL works well inside the Unity8 Session Snap.

The majority of the changes are basically adjustments to the environment variables and other tweaks to the various calls to look for the SNAP environment variable and change how UAL behaves in those cases. There are also some cases where variables have been removed as they were determined to not be needed when testing in the unity8-session snap.

A bigger change that exists in this branch is the addition of the snappy helpers for setting up xmir. This works a little bit different in that it gives a small utility to the XMir setup functions that then sends the environment over a socket to the helper. This allows us to go in and out of the snap confinement for X11. These utilities are written in conservative low-level C to ensure they'll work on ubuntu-core with a minimal set of libraries.

[Ted Gould (ted)]

Resubmitted this with a better description of what the branch actually does today.

[Ted Gould (ted)]

Resubmitted this with a better description of what the branch actually does today.

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:316
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/192/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1575
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1582
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1360
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1360/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1360
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1360/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1360
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1360/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1360
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1360/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1360
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1360/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1360
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1360/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/192/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Mostly looks good. A handful of little tweaks + one more serious issue w/easy fix. Comments inline.

review: Needs Fixing

[lp:~ted/ubuntu-app-launch/install-root]

317. By Ted Gould on 2017-01-31

Fix docs to include default path for LEGACY_EXEC

318. By Ted Gould on 2017-01-31

Cache snap env var

319. By Ted Gould on 2017-01-31

Make sure we only use references in loops

320. By Ted Gould on 2017-01-31

Don't store if we have the variable

321. By Ted Gould on 2017-01-31

Return const pointer

322. By Ted Gould on 2017-01-31

Handle larger possible pids

323. By Ted Gould on 2017-01-31

Make sure we're gettin' data

324. By Ted Gould on 2017-01-31

Move debug outside of the print loop

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:324
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/193/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1576/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1583
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1361
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1361/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1361
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1361/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1361/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1361
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1361/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1361
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1361/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1361
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1361/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/193/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ted/ubuntu-app-launch/install-root]

325. By Ted Gould on 2017-02-01

A read failure is a helper failure

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:325
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/196/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1583/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1590
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1368
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1368/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1368/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1368
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1368/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1368
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1368/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1368
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1368/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1368
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1368/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/196/rebuild

review: Needs Fixing (continuous-integration)

[Charles Kerr (charlesk)]

Approving these changes, feel free to top-approve when Jenkins is happy or if the Jenkins failure is a red herring

review: Approve

[lp:~ted/ubuntu-app-launch/install-root]

326. By Ted Gould on 2017-02-02

If we don't have a MIR_SOCKET use the default one

327. By Ted Gould on 2017-02-02

Special case legacy apps on Unity8 from debs

328. By Ted Gould on 2017-02-02

Put on the dunce cap and sit in the corner

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-01-23 21:32:16 +0000
+++ CMakeLists.txt	2017-02-02 15:08:16 +0000
@@ -111,6 +111,7 @@
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
 
 add_definitions( -DXMIR_HELPER="${pkglibexecdir}/xmir-helper" )
+add_definitions( -DSNAPPY_XMIR="${CMAKE_INSTALL_FULL_BINDIR}/snappy-xmir" )
 
 ####################
 # Helpers
@@ -210,6 +211,30 @@
 install(TARGETS socket-demangler-helper RUNTIME DESTINATION "${pkglibexecdir}")
 
 ####################
+# snappy-xmir
+####################
+
+####################
+# NOTE: This only can link to libraries that are in
+# the base UBUNTU CORE image. Which is basically libc
+# and not much else. Don't add libs.
+####################
+
+add_executable(snappy-xmir snappy-xmir.c)
+set_target_properties(snappy-xmir PROPERTIES OUTPUT_NAME "snappy-xmir")
+install(TARGETS snappy-xmir RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}")
+
+####################
+# snappy-xmir-envvars
+####################
+
+add_executable(snappy-xmir-envvars snappy-xmir-envvars.c)
+set_target_properties(snappy-xmir-envvars PROPERTIES OUTPUT_NAME "snappy-xmir-envvars")
+# No libs, otherwise we have to worry about how to handle finding them
+install(TARGETS snappy-xmir-envvars RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}")
+
+
+####################
 # ubuntu-app-launch-desktop.click-hook
 ####################
 

=== modified file 'debian/ubuntu-app-launch.install'
--- debian/ubuntu-app-launch.install	2014-04-30 15:14:26 +0000
+++ debian/ubuntu-app-launch.install	2017-02-02 15:08:16 +0000
@@ -1,2 +1,3 @@
 usr/share/upstart/sessions/*
 usr/lib/*/ubuntu-app-launch/*
+usr/bin/snappy-xmir*

=== modified file 'docs/index.rst'
--- docs/index.rst	2016-09-30 20:46:07 +0000
+++ docs/index.rst	2017-02-02 15:08:16 +0000
@@ -18,6 +18,56 @@
 
 .. _Upstart: http://upstart.ubuntu.com/
 
+
+Environment Variables
+=====================
+
+There are a few environment variables that can effect the behavior of UAL while
+it is running.
+
+UBUNTU_APP_LAUNCH_CG_MANAGER_NAME
+  The DBus name that CG Manager registers under if it is on the session bus.
+
+UBUNTU_APP_LAUNCH_CG_MANAGER_SESSION_BUS
+  Tell UAL to look on the session bus for CG Manager.
+
+UBUNTU_APP_LAUNCH_DEMANGLER
+  Path to the UAL demangler tool that will get the Mir FD for trusted prompt session.
+
+UBUNTU_APP_LAUNCH_DISABLE_SNAPD_TIMEOUT
+  Wait as long as Snapd wants to return data instead of erroring after 100ms.
+
+UBUNTU_APP_LAUNCH_LEGACY_ROOT
+  Set the path that represents the root for legacy applications.
+
+UBUNTU_APP_LAUNCH_LIBERTINE_LAUNCH
+  Path to the libertine launch utility for setting up libertine containers and XMir based legacy apps.
+
+UBUNTU_APP_LAUNCH_LINK_FARM
+  Path to the link farm that is created by Click of all the installed Click applications.
+
+UBUNTU_APP_LAUNCH_OOM_HELPER
+  Path to the setuid helper that configures OOM values on application processes that we otherwise couldn't, mostly this is for Oxide.
+
+UBUNTU_APP_LAUNCH_OOM_PROC_PATH
+  Path to look for the files to set OOM values, defaults to `/proc`.
+
+UBUNTU_APP_LAUNCH_SNAP_BASEDIR
+  The place where snaps are installed in the system, `/snap` is the default.
+
+UBUNTU_APP_LAUNCH_SNAP_LEGACY_EXEC
+  A snappy command that is used to launch legacy applications in the current snap, to ensure the environment gets configured correctly, defaults to `/snap/bin/unity8-session.legacy-exec`
+
+UBUNTU_APP_LAUNCH_SNAPD_SOCKET
+  Path to the snapd socket.
+
+UBUNTU_APP_LAUNCH_XMIR_HELPER
+  Tool that helps to start XMir and sets the DISPLAY variable for applications
+
+UBUNTU_APP_LAUNCH_XMIR_PATH
+  Specifies the location of the XMir binary to use
+
+
 API Documentation
 =================
 

=== modified file 'libubuntu-app-launch/application-impl-legacy.cpp'
--- libubuntu-app-launch/application-impl-legacy.cpp	2017-02-02 15:08:16 +0000
+++ libubuntu-app-launch/application-impl-legacy.cpp	2017-02-02 15:08:16 +0000
@@ -299,7 +299,25 @@
     info();
 
     retval.emplace_back(std::make_pair("APP_XMIR_ENABLE", appinfo_->xMirEnable().value() ? "1" : "0"));
-    if (appinfo_->xMirEnable())
+    auto execline = appinfo_->execLine().value();
+
+    auto snappath = getenv("SNAP");
+    if (snappath != nullptr)
+    {
+        /* This means we're inside a snap, and if we're in a snap then
+           the legacy application is in a snap. We need to try and set
+           up the proper environment for that app */
+        retval.emplace_back(std::make_pair("SNAP", snappath));
+
+        const char* legacyexec = getenv("UBUNTU_APP_LAUNCH_SNAP_LEGACY_EXEC");
+        if (legacyexec == nullptr)
+        {
+            legacyexec = "/snap/bin/unity8-session.legacy-exec";
+        }
+
+        execline = std::string{legacyexec} + " " + execline;
+    }
+    else if (appinfo_->xMirEnable().value())
     {
         /* If we're setting up XMir we also need the other helpers
            that libertine is helping with */
@@ -309,13 +327,10 @@
             libertine_launch = LIBERTINE_LAUNCH;
         }
 
-        retval.emplace_back(
-            std::make_pair("APP_EXEC", std::string(libertine_launch) + " " + appinfo_->execLine().value()));
-    }
-    else
-    {
-        retval.emplace_back(std::make_pair("APP_EXEC", appinfo_->execLine().value()));
-    }
+        execline = std::string{libertine_launch} + " " + execline;
+    }
+
+    retval.emplace_back(std::make_pair("APP_EXEC", execline));
 
     /* Honor the 'Path' key if it is in the desktop file */
     if (g_key_file_has_key(_keyfile.get(), "Desktop Entry", "Path", nullptr))

=== modified file 'libubuntu-app-launch/application-impl-snap.cpp'
--- libubuntu-app-launch/application-impl-snap.cpp	2017-02-02 15:08:16 +0000
+++ libubuntu-app-launch/application-impl-snap.cpp	2017-02-02 15:08:16 +0000
@@ -441,7 +441,7 @@
     std::list<std::pair<std::string, std::string>> retval;
 
     retval.emplace_back(std::make_pair("APP_XMIR_ENABLE", info_->xMirEnable().value() ? "1" : "0"));
-    if (info_->xMirEnable())
+    if (info_->xMirEnable() && getenv("SNAP") == nullptr)
     {
         /* If we're setting up XMir we also need the other helpers
            that libertine is helping with */
@@ -456,6 +456,8 @@
     }
     else
     {
+        /* If we're in a snap the libertine helpers are setup by
+           the snap stuff */
         retval.emplace_back(std::make_pair("APP_EXEC", info_->execLine().value()));
     }
 

=== modified file 'libubuntu-app-launch/jobs-systemd.cpp'
--- libubuntu-app-launch/jobs-systemd.cpp	2017-02-02 15:08:16 +0000
+++ libubuntu-app-launch/jobs-systemd.cpp	2017-02-02 15:08:16 +0000
@@ -441,7 +441,28 @@
     if (findEnv("APP_XMIR_ENABLE", env) == "1" && getenv("DISPLAY") == nullptr)
     {
         retval.emplace(retval.begin(), findEnv("APP_ID", env));
-        retval.emplace(retval.begin(), XMIR_HELPER);
+
+        auto snapenv = getenv("SNAP");
+        if (snapenv == nullptr)
+        {
+            auto xmirenv = getenv("UBUNTU_APP_LAUNCH_XMIR_HELPER");
+            if (xmirenv == nullptr)
+            {
+                retval.emplace(retval.begin(), XMIR_HELPER);
+            }
+            else
+            {
+                retval.emplace(retval.begin(), xmirenv);
+            }
+        }
+        else
+        {
+            /* If we're in a snap we need to use the utility which
+               gets us back into the snap */
+            std::string snappath{snapenv};
+
+            retval.emplace(retval.begin(), snappath + SNAPPY_XMIR);
+        }
     }
 
     /* See if we're doing apparmor by hand */
@@ -588,11 +609,35 @@
             env.emplace_back(std::make_pair("APP_LAUNCHER_PID", std::to_string(getpid()))); /* Who we are, for bugs */
 
             copyEnv("DISPLAY", env);
-            for (const auto prefix : {"DBUS_", "MIR_", "QT_", "UBUNTU_", "UNITY_", "XDG_"})
+
+            for (const auto& prefix : {"DBUS_", "MIR_", "UBUNTU_APP_LAUNCH_"})
             {
                 copyEnvByPrefix(prefix, env);
             }
 
+            /* If we're in deb mode and launching legacy apps, they're gonna need
+             * more context, they really have no other way to get it. */
+            if (g_getenv("SNAP") == nullptr && appId.package.value().empty())
+            {
+                copyEnvByPrefix("QT_", env);
+                copyEnvByPrefix("XDG_", env);
+                copyEnv("UBUNTU_APP_LAUNCH_XMIR_PATH", env);
+
+                /* If we're in Unity8 we don't want to pass it's platform, we want
+                 * an application platform. */
+                if (findEnv("QT_QPA_PLATFORM", env) == "mirserver")
+                {
+                    removeEnv("QT_QPA_PLATFORM", env);
+                    env.emplace_back(std::make_pair("QT_QPA_PLATFORM", "ubuntumirclient"));
+                }
+            }
+
+            /* Mir socket if we don't have one in our env */
+            if (findEnv("MIR_SOCKET", env).empty())
+            {
+                env.emplace_back(std::make_pair("MIR_SOCKET", g_get_user_runtime_dir() + std::string{"/mir_socket"}));
+            }
+
             if (!urls.empty())
             {
                 auto accumfunc = [](const std::string& prev, Application::URL thisurl) -> std::string {
@@ -702,7 +747,7 @@
             }
 
             /* Clean up env before shipping it */
-            for (const auto rmenv :
+            for (const auto& rmenv :
                  {"APP_XMIR_ENABLE", "APP_DIR", "APP_URIS", "APP_EXEC", "APP_EXEC_POLICY", "APP_LAUNCHER_PID",
                   "INSTANCE_ID", "MIR_SERVER_PLATFORM_PATH", "MIR_SERVER_PROMPT_FILE", "MIR_SERVER_HOST_SOCKET",
                   "UBUNTU_APP_LAUNCH_DEMANGLER", "UBUNTU_APP_LAUNCH_OOM_HELPER", "UBUNTU_APP_LAUNCH_LEGACY_ROOT",

=== modified file 'libubuntu-app-launch/registry-impl.cpp'
--- libubuntu-app-launch/registry-impl.cpp	2017-02-02 15:08:16 +0000
+++ libubuntu-app-launch/registry-impl.cpp	2017-02-02 15:08:16 +0000
@@ -48,6 +48,17 @@
         return std::shared_ptr<GDBusConnection>(g_bus_get_sync(G_BUS_TYPE_SESSION, cancel.get(), nullptr),
                                                 [](GDBusConnection* bus) { g_clear_object(&bus); });
     });
+
+    /* Determine where we're getting the helper from */
+    auto goomHelper = g_getenv("UBUNTU_APP_LAUNCH_OOM_HELPER");
+    if (goomHelper != nullptr)
+    {
+        oomHelper_ = goomHelper;
+    }
+    else
+    {
+        oomHelper_ = OOM_HELPER;
+    }
 }
 
 void Registry::Impl::initClick()

=== modified file 'libubuntu-app-launch/registry-impl.h'
--- libubuntu-app-launch/registry-impl.h	2017-01-11 22:38:42 +0000
+++ libubuntu-app-launch/registry-impl.h	2017-02-02 15:08:16 +0000
@@ -84,6 +84,11 @@
     static void watchingAppStarting(bool rWatching);
     static bool isWatchingAppStarting();
 
+    const std::string& oomHelper() const
+    {
+        return oomHelper_;
+    }
+
 private:
     Registry* _registry; /**< The Registry that we're spawned from */
 
@@ -98,6 +103,9 @@
     /** All of our icon finders based on the path that they're looking
         into */
     std::unordered_map<std::string, std::shared_ptr<IconFinder>> _iconFinders;
+
+    /** Path to the OOM Helper */
+    std::string oomHelper_;
 };
 
 }  // namespace app_launch

=== modified file 'libubuntu-app-launch/ubuntu-app-launch.cpp'
--- libubuntu-app-launch/ubuntu-app-launch.cpp	2017-01-23 22:43:47 +0000
+++ libubuntu-app-launch/ubuntu-app-launch.cpp	2017-02-02 15:08:16 +0000
@@ -1608,7 +1608,11 @@
 	/* The exec value */
 	gchar * envstr = NULL;
 	if (demangler) {
-		envstr = g_strdup_printf("APP_EXEC=%s %s", DEMANGLER_PATH, execline);
+		const gchar * demangler_path = g_getenv("UBUNTU_APP_LAUNCH_DEMANGLER");
+		if (demangler_path == nullptr) {
+			demangler_path = DEMANGLER_PATH;
+		}
+		envstr = g_strdup_printf("APP_EXEC=%s %s", demangler_path, execline);
 	} else {
 		envstr = g_strdup_printf("APP_EXEC=%s", execline);
 	}

=== added file 'snappy-xmir-envvars.c'
--- snappy-xmir-envvars.c	1970-01-01 00:00:00 +0000
+++ snappy-xmir-envvars.c	2017-02-02 15:08:16 +0000
@@ -0,0 +1,112 @@
+/*
+ * Copyright © 2016 Canonical Ltd.
+ *
+ * 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 warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
+ *
+ * Authors:
+ *     Ted Gould <[e-mail]>
+ */
+
+#define _POSIX_C_SOURCE 200212L
+
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/wait.h>
+#include <signal.h>
+#include <string.h>
+
+void
+copyenv (int fd, const char * envname, const char * envval)
+{
+	if (envval == NULL) {
+		fprintf(stderr, "Unable to get environment variable '%s'\n", envname);
+		exit(EXIT_FAILURE);
+	}
+
+	int writesize;
+
+	writesize = write(fd, envname, strlen(envname) + 1);
+
+	if (writesize <= 0) {
+		fprintf(stderr, "Unable to write to socket '%s'\n", envname);
+		exit(EXIT_FAILURE);
+	}
+
+	writesize = write(fd, envval, strlen(envval) + 1);
+
+	if (writesize <= 0) {
+		fprintf(stderr, "Unable to write to socket '%s'\n", envval);
+		exit(EXIT_FAILURE);
+	}
+
+	if (getenv("G_MESSAGES_DEBUG") != NULL)
+		printf("Wrote envvar '%s=%s'\n", envname, envval);
+}
+
+void
+termhandler (int sig)
+{
+	exit(EXIT_SUCCESS);
+}
+
+int
+main (int argc, char * argv[])
+{
+	/* Grab socket */
+	if (argc != 2) {
+		fprintf(stderr, "Usage: %s <socket name>\n", argv[0]);
+		return(EXIT_FAILURE);
+	}
+
+	char * socketname = argv[1];
+
+	int socketfd = socket(AF_UNIX, SOCK_STREAM, 0);
+	if (socketfd <= 0) {
+		fprintf(stderr, "%s: Unable to create socket\n", argv[0]);
+		return EXIT_FAILURE;
+	}
+
+	struct sockaddr_un socketaddr = {0};
+	socketaddr.sun_family = AF_UNIX;
+	strncpy(socketaddr.sun_path, socketname, sizeof(socketaddr.sun_path) - 1);
+	socketaddr.sun_path[0] = 0;
+
+	if (connect(socketfd, (const struct sockaddr *)&socketaddr, sizeof(struct sockaddr_un)) < 0) {
+		fprintf(stderr, "Unable to connect socket\n");
+		return EXIT_FAILURE;
+	}
+
+	/* Dump envvars to socket */
+	copyenv(socketfd, "DISPLAY", getenv("DISPLAY"));
+	copyenv(socketfd, "DBUS_SESSION_BUS_ADDRESS", getenv("DBUS_SESSION_BUS_ADDRESS"));
+
+	char mypid[16];
+	snprintf(mypid, 16, "%ld", (long)getpid());
+	copyenv(socketfd, "UBUNTU_APP_LAUNCH_SNAPPY_XMIR_ENVVARS_PID", mypid);
+
+	/* Close the socket */
+	close(socketfd);
+
+	/* Wait for sigterm */
+	signal(SIGTERM, termhandler);
+
+	for (;;) {
+		sleep(24 * 60 * 60); // taking things one day at a time
+	}
+
+	return EXIT_FAILURE;
+}

=== added file 'snappy-xmir.c'
--- snappy-xmir.c	1970-01-01 00:00:00 +0000
+++ snappy-xmir.c	2017-02-02 15:08:16 +0000
@@ -0,0 +1,212 @@
+/*
+ * Copyright © 2016 Canonical Ltd.
+ *
+ * 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 warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
+ *
+ * Authors:
+ *     Ted Gould <[e-mail]>
+ */
+
+#define _POSIX_C_SOURCE 200212L
+
+#include <errno.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <signal.h>
+#include <string.h>
+#include <fcntl.h>
+#include <time.h>
+
+#define ENVVAR_SIZE 4096
+#define SOCKETNAME_SIZE 256
+#define ENVNAME_SIZE 64
+
+void
+sigchild_handler (int signal)
+{
+	fprintf(stderr, "XMir has closed unexpectedly\n");
+	exit(EXIT_FAILURE);
+}
+
+struct sigaction sigchild_action = {
+	.sa_handler = sigchild_handler,
+	.sa_flags = SA_NOCLDWAIT
+};
+
+int
+main (int argc, char * argv[])
+{
+	if (argc < 3) {
+		fprintf(stderr, "%s: Usage: [appid] [command to execute...]\n", argv[0]);
+		return EXIT_FAILURE;
+	}
+
+	char * appid = argv[1];
+
+	/* Build Socket Name */
+	srand(time(NULL));
+	char socketname[SOCKETNAME_SIZE] = {0};
+	snprintf(socketname, sizeof(socketname), "/ual-socket-%08X-%s", rand(), appid);
+
+	/* Setup abstract socket */
+	int socketfd = socket(AF_UNIX, SOCK_STREAM, 0);
+	if (socketfd <= 0) {
+		fprintf(stderr, "%s: Unable to create socket\n", argv[0]);
+		return EXIT_FAILURE;
+	}
+
+	struct sockaddr_un socketaddr = {0};
+	socketaddr.sun_family = AF_UNIX;
+	strncpy(socketaddr.sun_path, socketname, sizeof(socketaddr.sun_path) - 1);
+	socketaddr.sun_path[0] = 0;
+
+	if (bind(socketfd, (const struct sockaddr *)&socketaddr, sizeof(struct sockaddr_un)) < 0) {
+		fprintf(stderr, "%s: Unable to bind socket '%s'\n", argv[0], socketname);
+		return EXIT_FAILURE;
+	}
+
+	/* Fork and exec the x11 setup under it's confiment */
+	if (sigaction(SIGCHLD, &sigchild_action, NULL) != 0) {
+		fprintf(stderr, "Unable to setup child signal handler\n");
+		return EXIT_FAILURE;
+	}
+
+	if (fork() == 0) {
+		/* XMir start here */
+		/* GOAL: /snap/bin/unity8-session.xmir-helper $appid libertine-launch /snap/unity8-session/current/usr/bin/snappy-xmir-envvars socketname */
+
+		char * snappyhelper = getenv("UBUNTU_APP_LAUNCH_SNAPPY_XMIR_HELPER");
+		if (snappyhelper == NULL) {
+			snappyhelper = "xmir-helper";
+		}
+
+		char * libertinelaunch = getenv("UBUNTU_APP_LAUNCH_LIBERTINE_LAUNCH");
+		if (libertinelaunch == NULL) {
+			libertinelaunch = "libertine-launch";
+		}
+
+		/* envvar is like us, but a little more */
+		char envvars[256] = {0};
+		snprintf(envvars, sizeof(envvars), "%s-envvars", argv[0]);
+
+		char * xmirexec[6] = {
+			snappyhelper,
+			appid,
+			libertinelaunch,
+			envvars,
+			socketname,
+			NULL
+		};
+
+		printf("Executing xmir-helper on PID: %d\n", getpid());
+
+		fflush(stdout);
+
+		return execv(xmirexec[0], xmirexec);
+	}
+
+	listen(socketfd, 1); /* 1 is the number of people who can connect */
+	int readsocket = accept(socketfd, NULL, NULL);
+
+	if (getenv("G_MESSAGES_DEBUG") != NULL) {
+		printf("Got a socket connection on: %s\n", socketname);
+	}
+
+	/* Read our socket until we get all of the environment */
+	char readbuf[ENVVAR_SIZE] = {0};
+	int amountread = 0;
+	int thisread = 0;
+	while ((thisread = read(readsocket, readbuf + amountread, ENVVAR_SIZE - amountread)) > 0) {
+		amountread += thisread;
+
+		if (amountread == ENVVAR_SIZE) {
+			fprintf(stderr, "Environment is too large, abort!\n");
+			exit(EXIT_FAILURE);
+		}
+	}
+
+	if (thisread < 0) {
+		fprintf(stderr, "Error reading environment variables from Xmir utilities: %s", strerror(errno));
+		exit(EXIT_FAILURE);
+	}
+
+	close(readsocket);
+	close(socketfd);
+
+	/* Parse the environment into variables we can insert */
+	if (amountread > 0) {
+		char * startvar = readbuf;
+		int debug = (getenv("G_MESSAGES_DEBUG") != NULL);
+
+		do {
+			char * startval = startvar + strlen(startvar) + 1;
+			setenv(startvar, startval, 1);
+
+			if (debug) {
+				printf("Got env: %s=%s\n", startvar, startval);
+			}
+
+			startvar = startval + strlen(startval) + 1;
+		}
+		while (startvar < readbuf + amountread);
+	}
+
+	/* Clear MIR_* variables from the environment */
+	/* Unfortunately calling unsetenv resets the environ array so
+	   it can become invalid. So we need to start over, though this
+	   is fast */
+	int unset = 1;
+	while (unset) {
+		unset = 0;
+
+		unsigned int i;
+		for (i = 0; __environ[i] != NULL; i++) {
+			const char * env = __environ[i];
+			/* Not checking the length becasue imagining that block
+			   size will always be larger than 4 bytes on 32-bit systems.
+			   Compiler should fold this into one comparison. */
+			if (env[0] == 'M' && env[1] == 'I' && env[2] == 'R' && env[3] == '_') {
+				char envname[ENVNAME_SIZE] = {0};
+				unset = 1;
+
+				strncpy(envname, env, ENVNAME_SIZE - 1);
+				unsigned int j;
+				for (j = 0; j < ENVNAME_SIZE && envname[j] != '\0'; j++) {
+					if (envname[j] == '=') {
+						envname[j] = '\0';
+
+						if (unsetenv(envname) != 0) {
+							/* Shouldn't happen unless we're out of memory,
+							   might as well bail now if that's the case. */
+							fprintf(stderr, "Unable to unset '%s' environment variable\n", envname);
+							exit(EXIT_FAILURE);
+						}
+
+						break;
+					}
+				}
+
+				break;
+			}
+		}
+	}
+
+	fflush(stdout);
+
+	/* Exec the application with the new environment under its confinement */
+	return execv(argv[2], &(argv[2]));
+}

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2017-02-02 15:08:16 +0000
+++ tests/CMakeLists.txt	2017-02-02 15:08:16 +0000
@@ -165,6 +165,11 @@
 configure_file ("xmir-helper-test.in" "${CMAKE_CURRENT_BINARY_DIR}/xmir-helper-test" @ONLY)
 add_test (xmir-helper-test xmir-helper-test)
 
+# Snappy XMir Wrapper Test
+
+configure_file("snappy-xmir-test.sh.in" "${CMAKE_CURRENT_BINARY_DIR}/snappy-xmir-test.sh" @ONLY) 
+add_test (NAME snappy-xmir-test COMMAND ${CMAKE_CURRENT_BINARY_DIR}/snappy-xmir-test.sh)
+
 # Formatted code
 
 add_custom_target(format-tests

=== added file 'tests/snappy-xmir-test-check.sh'
--- tests/snappy-xmir-test-check.sh	1970-01-01 00:00:00 +0000
+++ tests/snappy-xmir-test-check.sh	2017-02-02 15:08:16 +0000
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+set -ex
+
+if [ -z ${DISPLAY} ] ; then
+	echo DISPLAY is not set
+	exit 1
+fi
+
+if [ ${DISPLAY} != "foo" ] ; then
+	echo DISPLAY is not set to 'foo'
+	exit 1
+fi
+
+if [ -z ${DBUS_SESSION_BUS_ADDRESS} ] ; then
+	echo DBUS_SESSION_BUS_ADDRESS is not set
+	exit 1
+fi
+
+if [ ${DBUS_SESSION_BUS_ADDRESS} != "bar" ] ; then
+	echo DBUS_SESSION_BUS_ADDRESS is not set to 'bar'
+	exit 1
+fi
+
+if [ ! -z ${MIR_SOCKET} ] ; then
+	echo Mir variables are leaking in
+	exit 1
+fi
+
+if [ ! -z ${UBUNTU_APP_LAUNCH_SNAPPY_XMIR_ENVVARS_PID} ] ; then
+	kill -TERM ${UBUNTU_APP_LAUNCH_SNAPPY_XMIR_ENVVARS_PID}
+fi

=== added file 'tests/snappy-xmir-test-helper-long.sh'
--- tests/snappy-xmir-test-helper-long.sh	1970-01-01 00:00:00 +0000
+++ tests/snappy-xmir-test-helper-long.sh	2017-02-02 15:08:16 +0000
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -ex
+
+if [ $1 != "this-is-a-really-really-really_long_appid-that-we-shouldnt-reallyhave_13523432324235.234.234.234234+foo" ] ; then
+	exit 1
+fi
+
+export DISPLAY=foo
+export DBUS_SESSION_BUS_ADDRESS=bar
+
+exec $2 $3 $4 $5

=== added file 'tests/snappy-xmir-test-helper.sh'
--- tests/snappy-xmir-test-helper.sh	1970-01-01 00:00:00 +0000
+++ tests/snappy-xmir-test-helper.sh	2017-02-02 15:08:16 +0000
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -ex
+
+if [ $1 != "appid" ] ; then
+	exit 1
+fi
+
+export DISPLAY=foo
+export DBUS_SESSION_BUS_ADDRESS=bar
+
+exec $2 $3 $4 $5

=== added file 'tests/snappy-xmir-test-libertine-launch.sh'
--- tests/snappy-xmir-test-libertine-launch.sh	1970-01-01 00:00:00 +0000
+++ tests/snappy-xmir-test-libertine-launch.sh	2017-02-02 15:08:16 +0000
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -ex
+
+exec $@

=== added file 'tests/snappy-xmir-test.sh.in'
--- tests/snappy-xmir-test.sh.in	1970-01-01 00:00:00 +0000
+++ tests/snappy-xmir-test.sh.in	2017-02-02 15:08:16 +0000
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -ex
+
+# Unset MIR_SOCKET as we might be in an environment it exists in
+
+export MIR_SOCKET=
+
+# Test the test harness
+
+@CMAKE_CURRENT_SOURCE_DIR@/snappy-xmir-test-helper.sh appid @CMAKE_CURRENT_SOURCE_DIR@/snappy-xmir-test-check.sh
+
+# Test our pass through
+
+export UBUNTU_APP_LAUNCH_SNAPPY_XMIR_HELPER="@CMAKE_CURRENT_SOURCE_DIR@/snappy-xmir-test-helper.sh"
+export UBUNTU_APP_LAUNCH_LIBERTINE_LAUNCH="@CMAKE_CURRENT_SOURCE_DIR@/snappy-xmir-test-libertine-launch.sh"
+
+@CMAKE_BINARY_DIR@/snappy-xmir appid @CMAKE_CURRENT_SOURCE_DIR@/snappy-xmir-test-check.sh
+
+# Add a Mir variable to make sure it gets cleared
+
+export MIR_SOCKET="/this/is/a/socket"
+
+@CMAKE_BINARY_DIR@/snappy-xmir appid @CMAKE_CURRENT_SOURCE_DIR@/snappy-xmir-test-check.sh
+
+# This is a long appid test
+
+export UBUNTU_APP_LAUNCH_SNAPPY_XMIR_HELPER="@CMAKE_CURRENT_SOURCE_DIR@/snappy-xmir-test-helper-long.sh"
+
+@CMAKE_BINARY_DIR@/snappy-xmir "this-is-a-really-really-really_long_appid-that-we-shouldnt-reallyhave_13523432324235.234.234.234234+foo" @CMAKE_CURRENT_SOURCE_DIR@/snappy-xmir-test-check.sh

=== modified file 'upstart-jobs/application-click.conf.in'
--- upstart-jobs/application-click.conf.in	2015-08-17 21:34:39 +0000
+++ upstart-jobs/application-click.conf.in	2017-02-02 15:08:16 +0000
@@ -14,7 +14,6 @@
 env APP_XMIR_ENABLE
 
 env UBUNTU_APP_LAUNCH_ARCH="@ubuntu_app_launch_arch@"
-export UBUNTU_APP_LAUNCH_ARCH
 
 apparmor switch ${APP_ID}
 cgroup freezer

=== modified file 'upstart-jobs/application-snap.conf.in'
--- upstart-jobs/application-snap.conf.in	2016-09-08 15:05:06 +0000
+++ upstart-jobs/application-snap.conf.in	2017-02-02 15:08:16 +0000
@@ -15,7 +15,6 @@
 env INSTANCE_ID=""
 
 env UBUNTU_APP_LAUNCH_ARCH="@ubuntu_app_launch_arch@"
-export UBUNTU_APP_LAUNCH_ARCH
 
 # apparmor is taken care of by confine
 cgroup freezer

=== modified file 'upstart-jobs/untrusted-helper.conf.in'
--- upstart-jobs/untrusted-helper.conf.in	2014-08-07 16:16:05 +0000
+++ upstart-jobs/untrusted-helper.conf.in	2017-02-02 15:08:16 +0000
@@ -12,7 +12,6 @@
 env APP_URIS
 
 env UBUNTU_APP_LAUNCH_ARCH="@ubuntu_app_launch_arch@"
-export UBUNTU_APP_LAUNCH_ARCH
 
 apparmor switch ${APP_ID}
 cgroup freezer

=== modified file 'xmir-helper.c'
--- xmir-helper.c	2017-02-02 15:08:16 +0000
+++ xmir-helper.c	2017-02-02 15:08:16 +0000
@@ -30,7 +30,7 @@
 sigchild_handler (int signal)
 {
 	fprintf(stderr, "XMir has closed unexpectedly\n");
-	exit(1);
+	exit(EXIT_FAILURE);
 }
 
 struct sigaction sigchild_action = {
@@ -43,7 +43,7 @@
 {
 	if (argc < 3) {
 		fprintf(stderr, "xmir-helper needs more arguments: xmir-helper $(appid) $(thing to exec) ... \n");
-		return 1;
+		return EXIT_FAILURE;
 	}
 
 	/* Make nice variables for the things we need */
@@ -57,7 +57,7 @@
 	int sockets[2];
 	if (socketpair(AF_LOCAL, SOCK_STREAM, 0, sockets) != 0) {
 		fprintf(stderr, "Unable to create socketpair for communicating with XMir\n");
-		return 1;
+		return EXIT_FAILURE;
 	}
 
 	/* Give them nice names, the compiler will optimize out */
@@ -67,7 +67,7 @@
 	/* Watch for the child dying */
 	if (sigaction(SIGCHLD, &sigchild_action, NULL) != 0) {
 		fprintf(stderr, "Unable to setup child signal handler\n");
-		return 1;
+		return EXIT_FAILURE;
 	}
 
 	/* Start XMir */