Merge lp:~dobey/pay-service/backport-ual-session into lp:pay-service/15.04

[dobey]

Use libubuntu-app-launch >= 0.5 for trusted session helper code.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:47
http://jenkins.qa.ubuntu.com/job/pay-service-15.04-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-service-15.04-vivid-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-service-15.04-vivid-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/pay-service-15.04-vivid-armhf-ci/4/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-service-15.04-ci/4/rebuild

review: Approve (continuous-integration)

[Kyle Fazzari (kyrofa)]

I see one typo (that can be fixed later if you want), but I don't see any real problems with this. That said, I'm not sure I should be the only reviewer here since the context is not entirely clear to me.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-07-01 21:23:27 +0000
+++ CMakeLists.txt	2015-09-03 14:04:08 +0000
@@ -37,7 +37,7 @@
                    accounts-qt5
                    libcurl
                    jsoncpp
-                   ubuntu-app-launch-2
+                   ubuntu-app-launch-2>=0.5
                    dbustest-1
                    gio-2.0
                    gio-unix-2.0

=== modified file 'debian/control'
--- debian/control	2015-07-06 16:52:08 +0000
+++ debian/control	2015-09-03 14:04:08 +0000
@@ -19,7 +19,7 @@
                libgtest-dev,
                libmirclient-dev (>= 0.5),
                libprocess-cpp-dev (>= 2.0.0),
-               libubuntu-app-launch2-dev,
+               libubuntu-app-launch2-dev (>= 0.5),
                libubuntuoneauth-2.0-dev,
                libjsoncpp-dev,
                python3-dbusmock,

=== modified file 'debian/pay-service.install'
--- debian/pay-service.install	2014-08-06 15:07:19 +0000
+++ debian/pay-service.install	2015-09-03 14:04:08 +0000
@@ -1,5 +1,4 @@
 usr/lib/*/pay-service/pay-service
 usr/lib/*/pay-service/setup-staging.sh
-usr/lib/*/pay-service/mir-connection-demangler
 usr/lib/*/ubuntu-app-launch/pay-ui/*
 usr/share/upstart/sessions/*

=== modified file 'service/CMakeLists.txt'
--- service/CMakeLists.txt	2015-07-06 16:52:08 +0000
+++ service/CMakeLists.txt	2015-09-03 14:04:08 +0000
@@ -41,7 +41,6 @@
 
 add_gdbus_codegen_with_namespace(SERVICE_LIB_GEN_SOURCES proxy-service com.canonical. proxy ${CMAKE_SOURCE_DIR}/data/com.canonical.pay.xml)
 add_gdbus_codegen_with_namespace(SERVICE_LIB_GEN_SOURCES proxy-package com.canonical. proxy ${CMAKE_SOURCE_DIR}/data/com.canonical.pay.package.xml)
-add_gdbus_codegen_with_namespace(SERVICE_LIB_GEN_SOURCES proxy-payui com.canonical. proxy ${CMAKE_SOURCE_DIR}/data/com.canonical.pay.payui.xml)
 
 add_library(pay-service-lib STATIC ${SERVICE_LIB_SOURCES} ${SERVICE_LIB_GEN_SOURCES})
 
@@ -54,19 +53,10 @@
 
 install(TARGETS pay-service RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_PKGLIBEXECDIR})
 
-###########################
-# Mir Connection Demangler
-###########################
-
-add_executable(mir-connection-demangler mir-connection-demangler.c proxy-payui.c proxy-payui.h)
-target_link_libraries(mir-connection-demangler ${SERVICE_DEPS_LIBRARIES})
-install(TARGETS mir-connection-demangler RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_PKGLIBEXECDIR})
-
 #############################
 # Untrusted Helper Exec Tool
 #############################
 
-add_definitions(-DSOCKET_TOOL="${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}/mir-connection-demangler")
 add_executable(exec-tool exec-tool.c)
 target_link_libraries(exec-tool ${SERVICE_DEPS_LIBRARIES})
 install(TARGETS exec-tool RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_LIBEXECDIR}/ubuntu-app-launch/pay-ui")

=== modified file 'service/exec-tool.c'
--- service/exec-tool.c	2014-07-24 17:37:40 +0000
+++ service/exec-tool.c	2015-09-03 14:04:08 +0000
@@ -22,198 +22,127 @@
 #include <ubuntu-app-launch.h>
 
 gchar *
-build_exec_envvar (const gchar * appid)
-{
-	gchar * appid_desktop = g_strdup_printf("%s.desktop", appid);
-	gchar * desktopfilepath = g_build_filename(g_get_user_cache_dir(), "pay-service", "pay-ui", appid_desktop, NULL);
-	g_free(appid_desktop);
-
-	if (!g_file_test(desktopfilepath, G_FILE_TEST_EXISTS)) {
-		g_error("Can not file desktop file for '%s', expecting: '%s'", appid, desktopfilepath);
-		g_free(desktopfilepath);
-		return NULL;
-	}
-
-	GError * error = NULL;
-	GKeyFile * keyfile = g_key_file_new();
-	g_key_file_load_from_file(keyfile, desktopfilepath, G_KEY_FILE_NONE, &error);
-
-	if (error != NULL) {
-		g_error("Unable to read pay-ui desktop file '%s': %s", desktopfilepath, error->message);
-		g_free(desktopfilepath);
-		g_key_file_free(keyfile);
-		g_error_free(error);
-		return NULL;
-	}
-
-	g_free(desktopfilepath);
-
-	if (!g_key_file_has_key(keyfile, "Desktop Entry", "Exec", NULL)) {
-		g_error("Desktop file does not have 'Exec' key");
-		g_key_file_free(keyfile);
-		return NULL;
-	}
-
-	gchar * exec = g_key_file_get_string(keyfile, "Desktop Entry", "Exec", NULL);
-	g_key_file_free(keyfile);
-
-	gchar * prepend = g_strdup_printf("%s %s", SOCKET_TOOL, exec);
-	g_free(exec);
-	g_debug("Final Exec line: %s", prepend);
-
-	gchar * envvar = g_strdup_printf("APP_EXEC=%s", prepend);
-	g_free(prepend);
-
-	return envvar;
-}
-
-gboolean
-build_uri_envvar(const gchar * appuris, gchar ** euri, gchar ** esocket)
-{
-	gint argc;
-	gchar ** argv;
-	GError * error = NULL;
-
-	g_shell_parse_argv(appuris, &argc, &argv, &error);
-	if (error != NULL) {
-		g_critical("Unable to parse URIs '%s': %s", appuris, error->message);
-		g_error_free(error);
-		return FALSE;
-	}
-
-	if (argc != 2) {
-		g_critical("We should be getting 2 entries from '%s' but got %d", appuris, argc);
-		g_strfreev(argv);
-		return FALSE;
-	}
-
-	*esocket = g_strdup_printf("PAY_SERVICE_MIR_SOCKET=%s", argv[0]);
-	gchar * quoted = g_shell_quote(argv[1]);
-	*euri = g_strdup_printf("APP_URIS=%s", quoted);
-	
-	g_free(quoted);
-	g_strfreev(argv);
-
-	return TRUE;
+build_exec (const gchar * appid)
+{
+    gchar * appid_desktop = g_strdup_printf("%s.desktop", appid);
+    gchar * desktopfilepath = g_build_filename(g_get_user_cache_dir(), "pay-service", "pay-ui", appid_desktop, NULL);
+    g_free(appid_desktop);
+
+    if (!g_file_test(desktopfilepath, G_FILE_TEST_EXISTS)) {
+        g_error("Can not file desktop file for '%s', expecting: '%s'", appid, desktopfilepath);
+        g_free(desktopfilepath);
+        return NULL;
+    }
+
+    GError * error = NULL;
+    GKeyFile * keyfile = g_key_file_new();
+    g_key_file_load_from_file(keyfile, desktopfilepath, G_KEY_FILE_NONE, &error);
+
+    if (error != NULL) {
+        g_error("Unable to read pay-ui desktop file '%s': %s", desktopfilepath, error->message);
+        g_free(desktopfilepath);
+        g_key_file_free(keyfile);
+        g_error_free(error);
+        return NULL;
+    }
+
+    g_free(desktopfilepath);
+
+    if (!g_key_file_has_key(keyfile, "Desktop Entry", "Exec", NULL)) {
+        g_error("Desktop file does not have 'Exec' key");
+        g_key_file_free(keyfile);
+        return NULL;
+    }
+
+    gchar * exec = g_key_file_get_string(keyfile, "Desktop Entry", "Exec", NULL);
+    g_key_file_free(keyfile);
+
+    return exec;
 }
 
 gchar *
-build_dir_envvar (const gchar * appid)
+build_dir (const gchar * appid)
 {
-	GError * error = NULL;
-	gchar * package = NULL;
-	/* 'Parse' the App ID */
-	if (!ubuntu_app_launch_app_id_parse(appid, &package, NULL, NULL)) {
-		g_warning("Unable to parse App ID: '%s'", appid);
-		return NULL;
-	}
-
-	/* Check click to find out where the files are */
-	ClickDB * db = click_db_new();
-	/* If TEST_CLICK_DB is unset, this reads the system database. */
-	click_db_read(db, g_getenv("TEST_CLICK_DB"), &error);
-	if (error != NULL) {
-		g_warning("Unable to read Click database: %s", error->message);
-		g_error_free(error);
-		g_free(package);
-		return NULL;
-	}
-	/* If TEST_CLICK_USER is unset, this uses the current user name. */
-	ClickUser * user = click_user_new_for_user(db, g_getenv("TEST_CLICK_USER"), &error);
-	if (error != NULL) {
-		g_warning("Unable to read Click database: %s", error->message);
-		g_error_free(error);
-		g_free(package);
-		g_object_unref(db);
-		return NULL;
-	}
-	gchar * pkgdir = click_user_get_path(user, package, &error);
-
-	g_object_unref(user);
-	g_object_unref(db);
-	g_free(package);
-
-	if (error != NULL) {
-		g_warning("Unable to get the Click package directory for %s: %s", package, error->message);
-		g_error_free(error);
-		return NULL;
-	}
-
-	gchar * envvar = g_strdup_printf("APP_DIR=%s", pkgdir);
-	g_free(pkgdir);
-	return envvar;
+    GError * error = NULL;
+    gchar * package = NULL;
+
+    /* 'Parse' the App ID */
+    if (!ubuntu_app_launch_app_id_parse(appid, &package, NULL, NULL)) {
+        g_warning("Unable to parse App ID: '%s'", appid);
+        return NULL;
+    }
+
+    /* Check click to find out where the files are */
+    ClickDB * db = click_db_new();
+
+    /* If TEST_CLICK_DB is unset, this reads the system database. */
+    click_db_read(db, g_getenv("TEST_CLICK_DB"), &error);
+    if (error != NULL) {
+        g_warning("Unable to read Click database: %s", error->message);
+        g_error_free(error);
+        g_free(package);
+        return NULL;
+    }
+
+    /* If TEST_CLICK_USER is unset, this uses the current user name. */
+    ClickUser * user = click_user_new_for_user(db, g_getenv("TEST_CLICK_USER"), &error);
+    if (error != NULL) {
+        g_warning("Unable to read Click database: %s", error->message);
+        g_error_free(error);
+        g_free(package);
+        g_object_unref(db);
+        return NULL;
+    }
+
+    gchar * pkgdir = click_user_get_path(user, package, &error);
+
+    g_object_unref(user);
+    g_object_unref(db);
+    g_free(package);
+
+    if (error != NULL) {
+        g_warning("Unable to get the Click package directory for %s: %s", package, error->message);
+        g_error_free(error);
+        return NULL;
+    }
+
+    return pkgdir;
 }
 
 int
 main (int argc, char * argv[])
 {
-	GError * error = NULL;
-
-	/* Build up our exec */
-	const gchar * appid = g_getenv("APP_ID");
-	if (appid == NULL) {
-		g_error("Environment variable 'APP_ID' required");
-		return -1;
-	}
-
-	gchar * envexec = build_exec_envvar(appid);
-	if (envexec == NULL) {
-		return -1;
-	}
-
-	/* Build up our socket name URL */
-	const gchar * appuris = g_getenv("APP_URIS");
-	if (appuris == NULL) {
-		g_error("Environment variable 'APP_URIS' required");
-		g_free(envexec);
-		return -1;
-	}
-
-	gchar * envuri = NULL;
-	gchar * envsocket = NULL;
-
-	if (!build_uri_envvar(appuris, &envuri, &envsocket)) {
-		g_free(envexec);
-		return -1;
-	}
-
-	gchar * envdir = build_dir_envvar(appid);
-	/* envdir might be NULL if not a click */
-
-	/* Execute the setting of the variables! */
-
-	gchar * initctlargv[7] = {
-		"initctl",
-		"set-env",
-		envexec,
-		envuri,
-		envsocket,
-		envdir,
-		NULL
-	};
-
-	g_spawn_sync(
-		NULL, /* pwd */
-		initctlargv,
-		NULL, /* env */
-		G_SPAWN_SEARCH_PATH,
-		NULL, /* child setup */
-		NULL, /* user data ^ */
-		NULL, /* stdout */
-		NULL, /* stderr */
-		NULL, /* return code */
-		&error
-	);
-
-	g_free(envexec);
-	g_free(envuri);
-	g_free(envsocket);
-
-	if (error == NULL) {
-		return 0;
-	} else {
-		g_error("Unable to spawn 'initctl': %s", error->message);
-		g_error_free(error);
-		return -1;
-	}
+    GError * error = NULL;
+
+    /* Build up our exec */
+    const gchar * appid = g_getenv("APP_ID");
+    if (appid == NULL) {
+        g_error("Environment variable 'APP_ID' required");
+        return -1;
+    }
+
+    gchar * exec = build_exec(appid);
+    if (exec == NULL) {
+        return -1;
+    }
+
+    gchar * dir = build_dir(appid);
+    if (dir == NULL) {
+        return -1;
+    }
+
+    GDBusConnection * bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
+    g_return_val_if_fail(bus != NULL, -1);
+
+    g_debug("Pay UI Exec: %s", exec);
+    g_debug("Pay UI Dir:  %s", dir);
+    ubuntu_app_launch_helper_set_exec(exec, dir);
+    g_free(exec);
+    g_free(dir);
+
+    /* Ensuring the messages get on the bus before we quit */
+    g_dbus_connection_flush_sync(bus, NULL, NULL);
+    g_clear_object(&bus);
+
+    return 0;
 }

=== removed file 'service/mir-connection-demangler.c'
--- service/mir-connection-demangler.c	2014-08-06 15:03:54 +0000
+++ service/mir-connection-demangler.c	1970-01-01 00:00:00 +0000
@@ -1,116 +0,0 @@
-/*
- * Copyright © 2014 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]>
- */
-
-#include <gio/gio.h>
-#include <gio/gunixfdlist.h>
-
-#include <errno.h>
-#include <fcntl.h>
-
-int
-main (int argc, char * argv[])
-{
-	const gchar * mir_socket = g_getenv("PAY_SERVICE_MIR_SOCKET");
-	if (mir_socket == NULL || mir_socket[0] == '\0') {
-		g_error("Unable to find Mir connection from Pay Service");
-		return -1;
-	}
-
-	g_print("Mir Connection Path: %s\n", mir_socket);
-
-	GError * error = NULL;
-	GDBusConnection * bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &error);
-
-	if (error != NULL) {
-		g_error("Unable to get session bus: %s", error->message);
-		g_error_free(error);
-		return -1;
-	}
-
-	GVariant * retval;
-	GUnixFDList * fdlist;
-
-	retval = g_dbus_connection_call_with_unix_fd_list_sync(
-		bus,
-		"com.canonical.pay",
-		mir_socket,
-		"com.canonical.pay.payui",
-		"GetMirSocket",
-		NULL,
-		G_VARIANT_TYPE("(h)"),
-		G_DBUS_CALL_FLAGS_NO_AUTO_START,
-		-1, /* timeout */
-		NULL, /* fd list in */
-		&fdlist,
-		NULL, /* cancelable */
-		&error);
-
-	g_clear_object(&bus);
-
-	if (error != NULL) {
-		g_error("Unable to get Mir socket over dbus: %s", error->message);
-		g_error_free(error);
-		return -1;
-	}
-
-	GVariant * outhandle = g_variant_get_child_value(retval, 0);
-
-	if (outhandle == NULL) {
-		g_error("Unable to get data from function");
-		return -1;
-	}
-
-	gint32 handle = g_variant_get_handle(outhandle);
-	g_variant_unref(outhandle);
-	g_variant_unref(retval);
-
-	if (handle >= g_unix_fd_list_get_length(fdlist)) {
-		g_error("Handle is %d but the FD list only has %d entries", handle, g_unix_fd_list_get_length(fdlist));
-		g_clear_object(&fdlist);
-		return -1;
-	}
-
-	gint32 fd = g_unix_fd_list_get(fdlist, handle, &error);
-	g_clear_object(&fdlist);
-
-	if (error != NULL) {
-		g_error("Unable to Unix FD: %s", error->message);
-		g_error_free(error);
-		return -1;
-	}
-
-	errno = 0;
-	fcntl(fd, F_GETFD);
-	if (errno != 0) {
-		perror("File descriptor is invalid");
-		return -1;
-	}
-
-	/* Make sure the FD doesn't close on exec */
-	fcntl(fd, F_SETFD, 0);
-
-	gchar * mirsocketbuf = g_strdup_printf("fd://%d", fd);
-	setenv("MIR_SOCKET", mirsocketbuf, 1);
-	g_print("Setting MIR_SOCKET to: '%s'\n", mirsocketbuf);
-
-	g_free(mirsocketbuf);
-
-	/* Thought, is argv NULL terminated? */
-	return execvp(argv[1], argv + 1);
-}

=== modified file 'service/purchase-ual.cpp'
--- service/purchase-ual.cpp	2015-03-24 22:11:07 +0000
+++ service/purchase-ual.cpp	2015-09-03 14:04:08 +0000
@@ -18,7 +18,6 @@
  */
 
 #include "purchase-ual.h"
-#include "proxy-payui.h"
 
 #include <thread>
 #include <future>
@@ -38,462 +37,11 @@
 
 class UalItem : public Item
 {
-private:
-    class HelperThread
-    {
-    private:
-        /* Members Only */
-        std::string socketname;
-        GLib::ContextThread thread;
-        std::string helperid;
-        std::string appid;
-        std::string purchaseUrl;
-        Item::Status status = Item::ERROR;
-
-        static void helper_stop_static_helper (const gchar* appid, const gchar* instanceid, const gchar* helpertype,
-                                               gpointer user_data)
-        {
-            auto notthis = static_cast<HelperThread*>(user_data);
-            notthis->helperStop(std::string(appid));
-        }
-
-        void helperStop (std::string stop_appid)
-        {
-            if (stop_appid != appid)
-            {
-                return;
-            }
-
-            status = Item::PURCHASED;
-            helperid.clear(); /* It has stopped, now an invalid ID */
-            thread.quit();
-        }
-
-    public:
-        core::Signal<Item::Status> helperFinished;
-
-        HelperThread (const std::string& in_socketname, const std::string& in_appid, const std::string& in_purchaseUrl)
-            : socketname(in_socketname)
-            , appid(in_appid)
-            , purchaseUrl(in_purchaseUrl)
-            , thread([this]
-        {
-            if (!ubuntu_app_launch_observer_add_helper_stop(helper_stop_static_helper, HELPER_TYPE, this))
-                throw std::runtime_error("Unable to register Stop Helper");
-            /* TODO: Add failed when in UAL */
-        },
-        [this]
-        {
-            /* Clean up */
-            if (!ubuntu_app_launch_observer_delete_helper_stop(helper_stop_static_helper, HELPER_TYPE, this))
-                throw std::runtime_error("Unable to unregister Stop Helper");
-
-            /* If we've still got a helper ID we need to kill it. */
-            if (!helperid.empty())
-            {
-                ubuntu_app_launch_stop_multiple_helper(HELPER_TYPE, appid.c_str(), helperid.c_str());
-                helperid.clear();
-            }
-
-            helperFinished(status);
-        })
-
-        {
-            helperid = thread.executeOnThread<std::string>([this]() -> std::string
-            {
-                /* Building a URL to pass info to the Pay UI */
-                std::string retval;
-                std::array<const gchar*, 3> urls{
-                    socketname.c_str(),
-                    purchaseUrl.c_str(),
-                    nullptr
-                };
-
-                gchar* helperid = ubuntu_app_launch_start_multiple_helper(HELPER_TYPE, appid.c_str(), urls.data());
-                if (helperid != nullptr)
-                {
-                    retval = helperid;
-                    g_free(helperid);
-                }
-
-                return retval;
-            });
-        }
-
-        ~HelperThread (void)
-        {
-            /* Quit before other variables are free'd */
-            thread.quit();
-        }
-    };
-
-    class MirSocketThread
-    {
-        /* From Init */
-        std::shared_ptr<MirConnection> connection;
-        std::string appid;
-        std::string ui_appid;
-
-        /* Built at Init */
-        std::shared_ptr<MirPromptSession> session;
-        std::string socketName;
-
-        /* On thread */
-        std::shared_ptr<proxyPayPayui> payuiobj;
-        std::shared_ptr<GDBusConnection> bus;
-        int fdlist[1] = {0};
-        GLib::ContextThread thread;
-
-        /* Creates a Mir Prompt Session by finding the overlay pid and making it. */
-        std::shared_ptr<MirPromptSession> setupSession (void)
-        {
-            pid_t overlaypid = appid2pid(appid);
-            if (overlaypid == 0)
-            {
-                /* We can't overlay nothin' */
-                g_warning("Unable to find PID for: %s", appid.c_str());
-                return nullptr;
-            }
-
-            /* Setup the trusted prompt session */
-            auto session = std::shared_ptr<MirPromptSession>(
-                               mir_connection_create_prompt_session_sync(connection.get(), overlaypid, stateChanged, this),
-                               [](MirPromptSession * session)
-            {
-                if (session != nullptr)
-                {
-                    mir_prompt_session_release_sync(session);
-                }
-            });
-
-            if (!session)
-            {
-                g_critical("Unable to create a trusted prompt session");
-            }
-
-            return session;
-        }
-
-        /* Creates the abstract socket for communicating the file handle to the
-           Pay UI and builds a thread to service it */
-        std::string setupSocket ()
-        {
-            return thread.executeOnThread<std::string>([this]()
-            {
-                GError* error = nullptr;
-                std::string socketName;
-
-                bus = std::shared_ptr<GDBusConnection>(g_bus_get_sync(G_BUS_TYPE_SESSION, nullptr,
-                                                                      nullptr), [](GDBusConnection * bus)
-                {
-                    g_clear_object(&bus);
-                });
-                if (!bus)
-                {
-                    g_critical("Unable to get session bus");
-                    return std::string();
-                }
-
-                /* Export an Object on DBus */
-                payuiobj = std::shared_ptr<proxyPayPayui>(
-                               proxy_pay_payui_skeleton_new(),
-                               [](proxyPayPayui * payui)
-                {
-                    if (payui != nullptr)
-                    {
-                        g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(payui));
-                        g_object_unref(payui);
-                    }
-                });
-                g_signal_connect(payuiobj.get(), "handle-get-mir-socket", G_CALLBACK(mirHandle), fdlist);
-
-                auto encodedAppId = encodePath(ui_appid);
-                /* Loop until we fine an object path that isn't taken (probably only once) */
-                while (socketName.empty())
-                {
-                    gchar* tryname = g_strdup_printf("/com/canonical/pay/%s/%X", encodedAppId.c_str(), g_random_int());
-                    g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(payuiobj.get()),
-                                                     bus.get(),
-                                                     tryname,
-                                                     &error);
-
-                    if (error == NULL)
-                    {
-                        socketName = std::string(tryname);
-                    }
-                    else
-                    {
-                        /* Always print the error, but if the object path is in use let's
-                           not exit the loop. Let's just try again. */
-                        bool exitnow = (error->domain != G_DBUS_ERROR || error->code != G_DBUS_ERROR_OBJECT_PATH_IN_USE);
-                        g_critical("Unable to export payui object: %s", error->message);
-                        g_error_free(error);
-                        if (exitnow)
-                        {
-                            g_free(tryname);
-                            break;
-                        }
-                    }
-
-                    g_free(tryname);
-                }
-
-                /* If we didn't get a socket name, we should just exit. And
-                   make sure to clean up the socket. */
-                if (socketName.empty())
-                {
-                    g_critical("Unable to export object to any name");
-                    return std::string();
-                }
-
-                auto mirwait = mir_prompt_session_new_fds_for_prompt_providers(session.get(),
-                                                                               1,
-                                                                               [](MirPromptSession * session, size_t count, int const * fdsin, void* context) -> void
-                {
-                    g_debug("FDs %d Returned from Mir", count);
-                    if (count != 1) return;
-                    int* fdout = reinterpret_cast<int*>(context);
-                    fdout[0] = fdsin[0];
-                },
-                fdlist);
-
-                mir_wait_for(mirwait);
-
-                if (fdlist[0] == 0)
-                {
-                    g_critical("FD from Mir was a 0");
-                    return std::string();
-                }
-
-                return socketName;
-            });
-        }
-
-        static bool mirHandle (GObject* obj, GDBusMethodInvocation* invocation, gpointer user_data)
-        {
-            int* fds = reinterpret_cast<int*>(user_data);
-
-            if (fds[0] == 0)
-            {
-                g_critical("No FDs to give!");
-                return false;
-            }
-
-            /* Index into fds */
-            GVariant* handle = g_variant_new_handle(0);
-            GVariant* tuple = g_variant_new_tuple(&handle, 1);
-
-            GError* error = nullptr;
-            GUnixFDList* list = g_unix_fd_list_new();
-            g_unix_fd_list_append(list, fds[0], &error);
-
-            if (error == nullptr)
-            {
-                g_dbus_method_invocation_return_value_with_unix_fd_list(invocation, tuple, list);
-            }
-
-            g_object_unref(list);
-
-            if (error != nullptr)
-            {
-                g_critical("Unable to pass FD %d: %s", fds[0], error->message);
-                g_error_free(error);
-                return false;
-            }
-
-            return true;
-        }
-
-        static std::string encodePath (const std::string& input)
-        {
-            std::string output = "";
-            bool first = true;
-
-            for (unsigned char c : input)
-            {
-                if ((c >= 'a' && c <= 'z') ||
-                        (c >= 'A' && c <= 'Z') ||
-                        (c >= '0' && c <= '9' && !first))
-                {
-                    output += c;
-                }
-                else
-                {
-                    char buffer[5] = {0};
-                    std::snprintf(buffer, sizeof(buffer), "_%2X", c);
-                    output += buffer;
-                }
-
-                first = false;
-            }
-
-            return output;
-        }
-
-        static pid_t pidForUpstartJob (const gchar* jobname)
-        {
-            GError* error = nullptr;
-
-            if (jobname == nullptr)
-            {
-                return 0;
-            }
-
-            auto bus = std::shared_ptr<GDBusConnection>(g_bus_get_sync(G_BUS_TYPE_SESSION, nullptr,
-                                                                       NULL), [](GDBusConnection * bus)
-            {
-                g_clear_object(&bus);
-            });
-            if (!bus)
-            {
-                g_critical("Unable to get session bus");
-                return 0;
-            }
-
-            GVariant* retval = nullptr;
-            retval = g_dbus_connection_call_sync(
-                         bus.get(),
-                         "com.ubuntu.Upstart",
-                         "/com/ubuntu/Upstart",
-                         "com.ubuntu.Upstart0_6",
-                         "GetJobByName",
-                         g_variant_new("(s)", jobname),
-                         G_VARIANT_TYPE("(o)"),
-                         G_DBUS_CALL_FLAGS_NO_AUTO_START,
-                         -1, /* timeout */
-                         NULL, /* cancel */
-                         &error);
-
-            if (error != NULL)
-            {
-                g_warning("Unable to get path for job '%s': %s", jobname, error->message);
-                g_error_free(error);
-                return 0;
-            }
-
-            gchar* path = nullptr;
-            g_variant_get(retval, "(o)", &path);
-            g_variant_unref(retval);
-
-            retval = g_dbus_connection_call_sync(
-                         bus.get(),
-                         "com.ubuntu.Upstart",
-                         path,
-                         "com.ubuntu.Upstart0_6.Job",
-                         "GetInstanceByName",
-                         g_variant_new("(s)", ""),
-                         G_VARIANT_TYPE("(o)"),
-                         G_DBUS_CALL_FLAGS_NO_AUTO_START,
-                         -1, /* timeout */
-                         NULL, /* cancel */
-                         &error);
-
-            g_free(path);
-
-            if (error != NULL)
-            {
-                g_warning("Unable to get instance for job '%s': %s", jobname, error->message);
-                g_error_free(error);
-                return 0;
-            }
-
-            g_variant_get(retval, "(o)", &path);
-            g_variant_unref(retval);
-
-            retval = g_dbus_connection_call_sync(
-                         bus.get(),
-                         "com.ubuntu.Upstart",
-                         path,
-                         "org.freedesktop.DBus.Properties",
-                         "Get",
-                         g_variant_new("(ss)", "com.ubuntu.Upstart0_6.Instance", "processes"),
-                         G_VARIANT_TYPE("(v)"),
-                         G_DBUS_CALL_FLAGS_NO_AUTO_START,
-                         -1, /* timeout */
-                         NULL, /* cancel */
-                         &error);
-
-            g_free(path);
-
-            if (error != NULL)
-            {
-                g_warning("Unable to get processes for job '%s': %s", jobname, error->message);
-                g_error_free(error);
-                return 0;
-            }
-
-            GPid pid = 0;
-            GVariant* variant = g_variant_get_child_value(retval, 0);
-            GVariant* array = g_variant_get_variant(variant);
-            if (g_variant_n_children(array) > 0)
-            {
-                /* (si) */
-                GVariant* firstitem = g_variant_get_child_value(array, 0);
-                GVariant* vpid = g_variant_get_child_value(firstitem, 1);
-                pid = g_variant_get_int32(vpid);
-                g_variant_unref(vpid);
-                g_variant_unref(firstitem);
-            }
-            g_variant_unref(variant);
-            g_variant_unref(array);
-            g_variant_unref(retval);
-
-            return pid;
-        }
-
-        /* Figures out the PID that we should be overlaying with the PayUI */
-        static pid_t appid2pid (std::string& appid)
-        {
-            if (appid == "click-scope")
-            {
-                /* FIXME: Before other scopes can use pay, we'll need to figure out
-                   how to detect if they're scopes or not. But for now we'll only just
-                   look for 'click-scope' as it's our primary use-case */
-                return pidForUpstartJob("unity8-dash");
-            }
-            else
-            {
-                return ubuntu_app_launch_get_primary_pid(appid.c_str());
-            }
-        }
-
-        static void stateChanged (MirPromptSession* session, MirPromptSessionState state, void* user_data)
-        {
-            g_debug("Mir Prompt session is in state: %d", state);
-        }
-
-    public:
-        MirSocketThread (std::shared_ptr<MirConnection> in_connection, const std::string& in_appid,
-                         const std::string& in_ui_appid)
-            : connection(in_connection)
-            , appid(in_appid)
-            , ui_appid(in_ui_appid)
-            , thread([]() {}, [this]()
-        {
-            payuiobj.reset();
-            bus.reset();
-        })
-        {
-            session = setupSession();
-            socketName = setupSocket();
-        }
-
-        ~MirSocketThread (void)
-        {
-            /* Quit before other variables are free'd */
-            thread.quit();
-        }
-
-        std::string getSocketName (void)
-        {
-            return socketName;
-        }
-    };
-
 public:
     typedef std::shared_ptr<Item> Ptr;
 
     UalItem (const std::string& in_appid, const std::string& in_itemid, const std::shared_ptr<MirConnection>& mir) :
+        status(Item::ERROR),
         appid(in_appid),
         itemid(in_itemid),
         connection(mir)
@@ -503,10 +51,6 @@
 
     ~UalItem ()
     {
-        helperFinishedConnection->disconnect();
-        helperFinishedConnection.reset();
-        helperThread.reset();
-        socketThread.reset();
     }
 
     /* Goes through the basis phases of building up the environment for the
@@ -514,42 +58,89 @@
        the socket to pass the session. And then starts the UI. */
     virtual bool run (void)
     {
-        helperThread.reset();
-        socketThread.reset();
-
-        auto ui_appid = discoverUiAppid();
-
+        ui_appid = discoverUiAppid();
         if (ui_appid.empty())
         {
-            g_debug("Empty UI App ID");
-            return false;
-        }
-
-        socketThread = std::make_shared<MirSocketThread>(connection, appid, ui_appid);
-        helperThread = std::make_shared<HelperThread>(socketThread->getSocketName(), ui_appid, buildPurchaseUrl());
-
-        helperFinishedConnection = std::make_shared<core::Connection>(helperThread->helperFinished.connect([this](
-                                                                                                               Item::Status status)
-        {
+            g_warning("Empty UI App ID for PayUI");
+            return false;
+        }
+
+        auto purchase_url = buildPurchaseUrl();
+        if (purchase_url.empty())
+        {
+            g_warning("Unable to determine purchase URL");
+            return false;
+        }
+
+        thread = std::make_shared<GLib::ContextThread>([]() {}, [this]()
+        {
+            if (!instanceid.empty())
+            {
+                ubuntu_app_launch_stop_multiple_helper(HELPER_TYPE, ui_appid.c_str(), instanceid.c_str());
+                instanceid.clear();
+            }
+
+            if (session)
+            {
+                session.reset();
+            }
+
             purchaseComplete(status);
-        }));
-
-        return true;
+            ubuntu_app_launch_observer_delete_helper_stop(helper_stop_static_helper, HELPER_TYPE, this);
+        });
+        instanceid = thread->executeOnThread<std::string>([this, purchase_url]()
+        {
+            std::string instid;
+
+            pid_t overlaypid = appid2pid(appid);
+            if (overlaypid == 0)
+            {
+                return instid;
+            }
+
+            session = std::shared_ptr<MirPromptSession>(
+                          mir_connection_create_prompt_session_sync(connection.get(), overlaypid, stateChanged, this),
+                          [](MirPromptSession * session)
+            {
+                if (session != nullptr)
+                {
+                    mir_prompt_session_release_sync(session);
+                }
+            });
+
+            if (!session)
+            {
+                return instid;
+            }
+
+            ubuntu_app_launch_observer_add_helper_stop(helper_stop_static_helper, HELPER_TYPE, this);
+
+            std::array<const gchar*, 2>urls {purchase_url.c_str(), nullptr};
+            auto instance_c = ubuntu_app_launch_start_session_helper(HELPER_TYPE,
+                                                                     session.get(),
+                                                                     ui_appid.c_str(),
+                                                                     urls.data());
+            instid = std::string(instance_c);
+            g_free(instance_c);
+            return instid;
+        });
+
+        return !instanceid.empty();
     }
 
 private:
     /* Set at init */
     std::string appid;
+    std::string ui_appid;
     std::string itemid;
+    std::string instanceid;
+    std::shared_ptr<GLib::ContextThread> thread;
+    std::shared_ptr<MirPromptSession> session;
+    Item::Status status;
 
     /* Given to us by our parents */
     std::shared_ptr<MirConnection> connection;
 
-    /* Created by run, destroyed with the object */
-    std::shared_ptr<HelperThread> helperThread;
-    std::shared_ptr<MirSocketThread> socketThread;
-    std::shared_ptr<core::Connection> helperFinishedConnection;
-
     /* Looks through a directory to find the first entry that is a .desktop file
        and uses that as our AppID. We don't support more than one entry being in
        a directory */
@@ -560,7 +151,7 @@
         const gchar* clickhookdir = g_getenv("PAY_SERVICE_CLICK_DIR");
         if (clickhookdir == nullptr)
         {
-            gchar* cacheclickdir = g_build_filename(g_get_user_cache_dir(), "pay-service", "pay-ui", nullptr);
+            gchar* cacheclickdir = g_build_filename(g_get_user_cache_dir(), "pay-service", HELPER_TYPE, nullptr);
             g_debug("Looking for Pay UI in: %s", cacheclickdir);
             dir = g_dir_open(cacheclickdir, 0, nullptr);
             g_free(cacheclickdir);
@@ -618,6 +209,170 @@
         return purchase_url;
     }
 
+    static pid_t pidForUpstartJob (const gchar* jobname)
+    {
+        GError* error = nullptr;
+
+        if (jobname == nullptr)
+        {
+            return 0;
+        }
+
+        auto bus = std::shared_ptr<GDBusConnection>(g_bus_get_sync(G_BUS_TYPE_SESSION, nullptr,
+                                                                   NULL), [](GDBusConnection * bus)
+        {
+            g_clear_object(&bus);
+        });
+        if (!bus)
+        {
+            g_critical("Unable to get session bus");
+            return 0;
+        }
+
+        GVariant* retval = nullptr;
+        retval = g_dbus_connection_call_sync(
+                     bus.get(),
+                     "com.ubuntu.Upstart",
+                     "/com/ubuntu/Upstart",
+                     "com.ubuntu.Upstart0_6",
+                     "GetJobByName",
+                     g_variant_new("(s)", jobname),
+                     G_VARIANT_TYPE("(o)"),
+                     G_DBUS_CALL_FLAGS_NO_AUTO_START,
+                     -1, /* timeout */
+                     NULL, /* cancel */
+                     &error);
+
+        if (error != NULL)
+        {
+            g_warning("Unable to get path for job '%s': %s", jobname, error->message);
+            g_error_free(error);
+            return 0;
+        }
+
+        gchar* path = nullptr;
+        g_variant_get(retval, "(o)", &path);
+        g_variant_unref(retval);
+
+        retval = g_dbus_connection_call_sync(
+                     bus.get(),
+                     "com.ubuntu.Upstart",
+                     path,
+                     "com.ubuntu.Upstart0_6.Job",
+                     "GetInstanceByName",
+                     g_variant_new("(s)", ""),
+                     G_VARIANT_TYPE("(o)"),
+                     G_DBUS_CALL_FLAGS_NO_AUTO_START,
+                     -1, /* timeout */
+                     NULL, /* cancel */
+                     &error);
+
+        g_free(path);
+
+        if (error != NULL)
+        {
+            g_warning("Unable to get instance for job '%s': %s", jobname, error->message);
+            g_error_free(error);
+            return 0;
+        }
+
+        g_variant_get(retval, "(o)", &path);
+        g_variant_unref(retval);
+
+        retval = g_dbus_connection_call_sync(
+                     bus.get(),
+                     "com.ubuntu.Upstart",
+                     path,
+                     "org.freedesktop.DBus.Properties",
+                     "Get",
+                     g_variant_new("(ss)", "com.ubuntu.Upstart0_6.Instance", "processes"),
+                     G_VARIANT_TYPE("(v)"),
+                     G_DBUS_CALL_FLAGS_NO_AUTO_START,
+                     -1, /* timeout */
+                     NULL, /* cancel */
+                     &error);
+
+        g_free(path);
+
+        if (error != NULL)
+        {
+            g_warning("Unable to get processes for job '%s': %s", jobname, error->message);
+            g_error_free(error);
+            return 0;
+        }
+
+        GPid pid = 0;
+        GVariant* variant = g_variant_get_child_value(retval, 0);
+        GVariant* array = g_variant_get_variant(variant);
+        if (g_variant_n_children(array) > 0)
+        {
+            /* (si) */
+            GVariant* firstitem = g_variant_get_child_value(array, 0);
+            GVariant* vpid = g_variant_get_child_value(firstitem, 1);
+            pid = g_variant_get_int32(vpid);
+            g_variant_unref(vpid);
+            g_variant_unref(firstitem);
+        }
+        g_variant_unref(variant);
+        g_variant_unref(array);
+        g_variant_unref(retval);
+
+        return pid;
+    }
+
+    /* Figures out the PID that we should be overlaying with the PayUI */
+    static pid_t appid2pid (std::string& appid)
+    {
+        if (appid == "click-scope")
+        {
+            /* FIXME: Before other scopes can use pay, we'll need to figure out
+               how to detect if they're scopes or not. But for now we'll only just
+               look for 'click-scope' as it's our primary use-case */
+            return pidForUpstartJob("unity8-dash");
+        }
+        else
+        {
+            return ubuntu_app_launch_get_primary_pid(appid.c_str());
+        }
+    }
+
+    static void stateChanged (MirPromptSession* session, MirPromptSessionState state, void* user_data)
+    {
+        g_debug("Mir Prompt session is in state: %d", state);
+    }
+
+    static void helper_stop_static_helper (const gchar* appid,
+                                           const gchar* instanceid,
+                                           const gchar* helpertype,
+                                           gpointer user_data)
+    {
+        UalItem* notthis = static_cast<UalItem*>(user_data);
+        g_debug("UAL Stop callback, appid: '%s', instance: '%s', helper: '%s'", appid, instanceid, helpertype);
+
+        if (instanceid == nullptr) /* Causes std::string to hate us, and we don't care about it if not set */
+        {
+            return;
+        }
+
+        notthis->helperStop(std::string(appid), std::string(instanceid));
+    }
+
+    void helperStop (std::string stop_appid, std::string stop_instanceid)
+    {
+        if (stop_appid != ui_appid)
+        {
+            return;
+        }
+
+        if (instanceid.empty() || instanceid != stop_instanceid)
+        {
+            return;
+        }
+
+        status = Item::PURCHASED;
+        instanceid.clear();
+        thread->quit();
+    }
 };
 
 class UalFactory::Impl

=== modified file 'tests/purchase-ual-tests.cpp'
--- tests/purchase-ual-tests.cpp	2015-03-23 15:59:38 +0000
+++ tests/purchase-ual-tests.cpp	2015-09-03 14:04:08 +0000
@@ -27,150 +27,154 @@
 
 struct PurchaseUALTests : public ::testing::Test
 {
-	protected:
-		DbusTestService * service = NULL;
-		DbusTestDbusMock * mock = NULL;
-		DbusTestDbusMockObject * obj = NULL;
-		DbusTestDbusMockObject * jobobj = NULL;
-		DbusTestDbusMockObject * instobj = NULL;
-		GDBusConnection * bus = NULL;
-
-		virtual void SetUp() {
-			g_setenv("PAY_SERVICE_CLICK_DIR", CMAKE_SOURCE_DIR "/click-hook-data", TRUE);
-
-			service = dbus_test_service_new(NULL);
-
-			mock = dbus_test_dbus_mock_new("com.ubuntu.Upstart");
-
-			obj = dbus_test_dbus_mock_get_object(mock, "/com/ubuntu/Upstart", "com.ubuntu.Upstart0_6", NULL);
-
-			dbus_test_dbus_mock_object_add_method(mock, obj,
-				"GetJobByName",
-				G_VARIANT_TYPE_STRING,
-				G_VARIANT_TYPE_OBJECT_PATH, /* out */
-				"ret = dbus.ObjectPath('/job')", /* python */
-				NULL); /* error */
-
-			jobobj = dbus_test_dbus_mock_get_object(mock, "/job", "com.ubuntu.Upstart0_6.Job", NULL);
-
-			dbus_test_dbus_mock_object_add_method(mock, jobobj,
-				"Start",
-				G_VARIANT_TYPE("(asb)"),
-				G_VARIANT_TYPE_OBJECT_PATH, /* out */
-				"ret = dbus.ObjectPath('/instance')", /* python */
-				NULL); /* error */
-			dbus_test_dbus_mock_object_add_method(mock, jobobj,
-				"GetAllInstances",
-				NULL,
-				G_VARIANT_TYPE("ao"), /* out */
-				"ret = [dbus.ObjectPath('/instance')]", /* python */
-				NULL); /* error */
-			dbus_test_dbus_mock_object_add_method(mock, jobobj,
-				"GetInstanceByName",
-				G_VARIANT_TYPE_STRING,
-				G_VARIANT_TYPE_OBJECT_PATH, /* out */
-				"ret = dbus.ObjectPath('/instance')", /* python */
-				NULL); /* error */
-
-			instobj = dbus_test_dbus_mock_get_object(mock, "/instance", "com.ubuntu.Upstart0_6.Instance", NULL);
-
-			dbus_test_dbus_mock_object_add_property(mock, instobj,
-				"processes",
-				G_VARIANT_TYPE("a(si)"),
-				g_variant_new_parsed("[('main', 1234)]"),
-				NULL);
-
-			dbus_test_service_add_task(service, DBUS_TEST_TASK(mock));
-
-			dbus_test_service_start_tasks(service);
-
-			bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
-			g_dbus_connection_set_exit_on_close(bus, FALSE);
-			g_object_add_weak_pointer(G_OBJECT(bus), (gpointer *)&bus);
-		}
-
-		virtual void TearDown() {
-			g_clear_object(&mock);
-			g_clear_object(&service);
-
-			g_object_unref(bus);
-
-			unsigned int cleartry = 0;
-			while (bus != NULL && cleartry < 100) {
-				g_usleep(100000);
-				while (g_main_pending())
-					g_main_iteration(TRUE);
-				cleartry++;
-			}
-
-			ASSERT_LT(cleartry, 100);
-		}
+    protected:
+        DbusTestService * service = NULL;
+        DbusTestDbusMock * mock = NULL;
+        DbusTestDbusMockObject * obj = NULL;
+        DbusTestDbusMockObject * jobobj = NULL;
+        DbusTestDbusMockObject * instobj = NULL;
+        GDBusConnection * bus = NULL;
+
+        virtual void SetUp() {
+            g_setenv("PAY_SERVICE_CLICK_DIR", CMAKE_SOURCE_DIR "/click-hook-data", TRUE);
+
+            service = dbus_test_service_new(NULL);
+
+            mock = dbus_test_dbus_mock_new("com.ubuntu.Upstart");
+
+            obj = dbus_test_dbus_mock_get_object(mock, "/com/ubuntu/Upstart", "com.ubuntu.Upstart0_6", NULL);
+
+            dbus_test_dbus_mock_object_add_method(mock, obj,
+                "GetJobByName",
+                G_VARIANT_TYPE_STRING,
+                G_VARIANT_TYPE_OBJECT_PATH, /* out */
+                "ret = dbus.ObjectPath('/job')", /* python */
+                NULL); /* error */
+
+            jobobj = dbus_test_dbus_mock_get_object(mock, "/job", "com.ubuntu.Upstart0_6.Job", NULL);
+
+            dbus_test_dbus_mock_object_add_method(mock, jobobj,
+                "Start",
+                G_VARIANT_TYPE("(asb)"),
+                G_VARIANT_TYPE_OBJECT_PATH, /* out */
+                "ret = dbus.ObjectPath('/instance')", /* python */
+                NULL); /* error */
+            dbus_test_dbus_mock_object_add_method(mock, jobobj,
+                "GetAllInstances",
+                NULL,
+                G_VARIANT_TYPE("ao"), /* out */
+                "ret = [dbus.ObjectPath('/instance')]", /* python */
+                NULL); /* error */
+            dbus_test_dbus_mock_object_add_method(mock, jobobj,
+                "GetInstanceByName",
+                G_VARIANT_TYPE_STRING,
+                G_VARIANT_TYPE_OBJECT_PATH, /* out */
+                "ret = dbus.ObjectPath('/instance')", /* python */
+                NULL); /* error */
+
+            instobj = dbus_test_dbus_mock_get_object(mock, "/instance", "com.ubuntu.Upstart0_6.Instance", NULL);
+
+            dbus_test_dbus_mock_object_add_property(mock, instobj,
+                "processes",
+                G_VARIANT_TYPE("a(si)"),
+                g_variant_new_parsed("[('main', 1234)]"),
+                NULL);
+
+            dbus_test_service_add_task(service, DBUS_TEST_TASK(mock));
+
+            dbus_test_service_start_tasks(service);
+
+            bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
+            g_dbus_connection_set_exit_on_close(bus, FALSE);
+            g_object_add_weak_pointer(G_OBJECT(bus), (gpointer *)&bus);
+        }
+
+        virtual void TearDown() {
+            g_clear_object(&mock);
+            g_clear_object(&service);
+
+            g_object_unref(bus);
+
+            unsigned int cleartry = 0;
+            while (bus != NULL && cleartry < 100) {
+                g_usleep(100000);
+                while (g_main_pending())
+                    g_main_iteration(TRUE);
+                cleartry++;
+            }
+
+            ASSERT_LT(cleartry, 100);
+        }
 };
 
 TEST_F(PurchaseUALTests, InitTest) {
-	auto purchase = std::make_shared<Purchase::UalFactory>();
-	EXPECT_NE(nullptr, purchase);
-	purchase.reset();
-	EXPECT_EQ(nullptr, purchase);
+    auto purchase = std::make_shared<Purchase::UalFactory>();
+    EXPECT_NE(nullptr, purchase);
+    purchase.reset();
+    EXPECT_EQ(nullptr, purchase);
 }
 
 static gchar *
 find_env (GVariant * env, const gchar * varname)
 {
-	GVariantIter iter;
-	g_variant_iter_init(&iter, env);
-	const gchar * entry = NULL;
-
-	while (g_variant_iter_loop(&iter, "&s", &entry)) {
-		if (g_str_has_prefix(entry, varname)) {
-			const gchar * value = entry + strlen(varname) + 1;
-			return g_strdup(value);
-		}
-	}
-
-	return NULL;
+    GVariantIter iter;
+    g_variant_iter_init(&iter, env);
+    const gchar * entry = NULL;
+
+    while (g_variant_iter_loop(&iter, "&s", &entry)) {
+        if (g_str_has_prefix(entry, varname)) {
+            const gchar * value = entry + strlen(varname) + 1;
+            return g_strdup(value);
+        }
+    }
+
+    return NULL;
 }
 
 TEST_F(PurchaseUALTests, PurchaseTest) {
-	auto purchase = std::make_shared<Purchase::UalFactory>();
-	ASSERT_NE(nullptr, purchase);
-
-	/*** Purchase an item ***/
-	std::string appname("click-scope");
-	std::string itemname("item");
-	auto item = purchase->purchaseItem(appname, itemname);
-
-	ASSERT_NE(nullptr, item);
-
-	Purchase::Item::Status status = Purchase::Item::Status::ERROR;
-	item->purchaseComplete.connect([&status](Purchase::Item::Status in_status) {
-		std::cout << "Purchase Status Callback: " << in_status << std::endl;
-		status = in_status;
-	});
-
-	EXPECT_TRUE(item->run());
-	usleep(20 * 1000);
-
-	guint callcount = 0;
-	auto calls = dbus_test_dbus_mock_object_get_method_calls(mock, jobobj,
-		"Start", &callcount, NULL);
-	ASSERT_EQ(1, callcount);
-
-	GVariant * env = g_variant_get_child_value(calls->params, 0);
-
-	gchar * helpertype = find_env(env, "HELPER_TYPE");
-	EXPECT_STREQ("pay-ui", helpertype);
-	g_free(helpertype);
-
-	gchar * untrustedappid = find_env(env, "APP_ID");
-	EXPECT_STREQ("payuihelper", untrustedappid);
-	g_free(untrustedappid);
-
-	gchar * instanceid = find_env(env, "INSTANCE_ID");
-	dbus_test_dbus_mock_object_emit_signal(mock, obj, "EventEmitted", G_VARIANT_TYPE("(sas)"), g_variant_new_parsed("('stopped', ['JOB=untrusted-helper', 'INSTANCE=pay-ui:%1:payuihelper'])", instanceid), NULL);
-	g_free(instanceid);
-
-	usleep(20 * 1000);
-
-	EXPECT_EQ(Purchase::Item::Status::PURCHASED, status);
+    auto purchase = std::make_shared<Purchase::UalFactory>();
+    ASSERT_NE(nullptr, purchase);
+
+    /*** Purchase an item ***/
+    std::string appname("click-scope");
+    std::string itemname("item");
+    auto item = purchase->purchaseItem(appname, itemname);
+
+    ASSERT_NE(nullptr, item);
+
+    Purchase::Item::Status status = Purchase::Item::Status::ERROR;
+    item->purchaseComplete.connect([&status](Purchase::Item::Status in_status) {
+        std::cout << "Purchase Status Callback: " << in_status << std::endl;
+        status = in_status;
+    });
+
+    EXPECT_TRUE(item->run());
+    usleep(20 * 1000);
+
+    guint callcount = 0;
+    auto calls = dbus_test_dbus_mock_object_get_method_calls(mock, jobobj,
+        "Start", &callcount, NULL);
+    ASSERT_EQ(1, callcount);
+
+    GVariant * env = g_variant_get_child_value(calls->params, 0);
+
+    gchar * helpertype = find_env(env, "HELPER_TYPE");
+    EXPECT_STREQ("pay-ui", helpertype);
+    g_free(helpertype);
+
+    gchar * untrustedappid = find_env(env, "APP_ID");
+    EXPECT_STREQ("payuihelper", untrustedappid);
+    g_free(untrustedappid);
+
+    gchar * instanceid = find_env(env, "INSTANCE_ID");
+    gchar * gvariantstr = g_strdup_printf("('stopped', ['JOB=untrusted-helper', 'INSTANCE=pay-ui:%s:payuihelper'])", instanceid);
+    dbus_test_dbus_mock_object_emit_signal(mock, obj, "EventEmitted", G_VARIANT_TYPE("(sas)"), g_variant_new_parsed(gvariantstr), NULL);
+    g_free(gvariantstr);
+    g_free(instanceid);
+
+    g_variant_unref(env);
+
+    usleep(20 * 1000);
+
+    EXPECT_EQ(Purchase::Item::Status::PURCHASED, status);
 }