Merge lp:~ted/url-dispatcher/devel into lp:~fboucault/url-dispatcher/crossbuild_fixes

[Ted Gould]

Pull all the branches together for merge conflicts

The merge conflicts were too difficult to make easy sense of, so pulled everything into a single branch that we can then land. This is the combination of a whole host of branches.

[lp:~ted/url-dispatcher/devel]

105. By Ted Gould on 2016-09-20

Merge issues from trunk

106. By Ted Gould on 2016-09-20

Forgot the container config

107. By Ted Gould on 2016-11-03

Fixes from review

108. By Ted Gould on 2016-11-07

Be more specific so that the packages don't conflict

Unmerged revisions

108. By Ted Gould on 2016-11-07

Be more specific so that the packages don't conflict

107. By Ted Gould on 2016-11-03

Fixes from review

106. By Ted Gould on 2016-09-20

Forgot the container config

105. By Ted Gould on 2016-09-20

Merge issues from trunk

104. By Ted Gould on 2016-09-20

Updating changelog to have all the branches in it

103. By Ted Gould on 2016-09-20

Fixing the environment for the appid test

102. By Ted Gould on 2016-08-30

Bad URL prompt

101. By Ted Gould on 2016-08-30

Merge lp:~ted/url-dispatcher/gui-tool/

100. By Ted Gould on 2016-08-30

Merge lp:~ted/url-dispatcher/ual-snappy-autopkgtest/

99. By Ted Gould on 2016-08-30

Merge lp:~ted/url-dispatcher/lp1608009-no-message/

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-06-11 21:38:13 +0000
+++ CMakeLists.txt	2016-09-20 21:26:50 +0000
@@ -3,7 +3,7 @@
 
 string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_lower) # Build types should always be lowercase but sometimes they are not.
 
-if (${cmake_build_type_lower} STREQUAL debug)
+if ("${cmake_build_type_lower}" STREQUAL "debug")
   option (werror "Treat warnings as errors." FALSE)
 else()
   option (werror "Treat warnings as errors." TRUE)
@@ -30,7 +30,7 @@
 include(UseConstantBuilder)
 
 # Workaround for libexecdir on debian
-if (EXISTS "/etc/debian_version") 
+if (EXISTS "/etc/debian_version")
   set(CMAKE_INSTALL_LIBEXECDIR ${CMAKE_INSTALL_LIBDIR})
   set(CMAKE_INSTALL_FULL_LIBEXECDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}")
 endif()
@@ -42,7 +42,7 @@
 # Since gdbus-codegen does not produce warning-free code
 # and we use -Werror, only enable these warnings for debug
 # builds. Drop this once the issue has been fixed and landed.
-if (${cmake_build_type_lower} STREQUAL debug)
+if ("${cmake_build_type_lower}" STREQUAL debug)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpedantic")# -Wextra")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wpedantic -Wextra")
 endif()
@@ -50,7 +50,7 @@
 if (${werror})
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
   set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
-endif() 
+endif()
 
 pkg_check_modules(UBUNTU_APP_LAUNCH REQUIRED ubuntu-app-launch-2>=0.5)
 include_directories(${UBUNTU_APP_LAUNCH_INCLUDE_DIRS})
@@ -79,6 +79,12 @@
 pkg_check_modules(CLICK REQUIRED click-0.4)
 include_directories(${CLICK_INCLUDE_DIRS})
 
+pkg_check_modules(SCOPES REQUIRED libunity-scopes)
+include_directories(${SCOPES_INCLUDE_DIRS})
+
+pkg_check_modules(APPARMOR REQUIRED libapparmor)
+include_directories(${APPARMOR_INCLUDE_DIRS})
+
 if(${LOCAL_INSTALL})
   set(DBUSSERVICEDIR "${CMAKE_INSTALL_DATADIR}/dbus-1/services/")
 else()
@@ -103,6 +109,7 @@
 add_subdirectory(service)
 add_subdirectory(liburl-dispatcher)
 add_subdirectory(tools)
+add_subdirectory(gui)
 
 # testing & coverage
 if (${enable_tests})
@@ -116,3 +123,4 @@
   add_subdirectory(tests)
 endif ()
 
+add_subdirectory(po)

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2015-11-06 22:59:11 +0000
+++ data/CMakeLists.txt	2016-09-20 21:26:50 +0000
@@ -102,3 +102,13 @@
 	@ONLY
 )
 
+###########################
+# QML
+###########################
+
+install(
+FILES
+bad-url.qml
+DESTINATION ${datadir}/url-dispatcher
+)
+

=== added file 'data/bad-url.qml'
--- data/bad-url.qml	1970-01-01 00:00:00 +0000
+++ data/bad-url.qml	2016-09-20 21:26:50 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.0
+import Ubuntu.Components.Popups 1.0
+
+MainView {
+	applicationName: "com.canonical.url-dispatcher.bad-url-prompt"
+	automaticOrientation: true
+	backgroundColor: "transparent"
+	anchors.fill: parent
+
+	Component {
+		id: dialog
+		Dialog {
+			title: i18n.tr("Unrecognized Address")
+			text: i18n.tr("Ubuntu can't open addresses of type “%1”.").arg(Qt.application.arguments[2].split(':')[0])
+
+			Button {
+				text: i18n.tr("OK")
+				color: UbuntuColors.orange
+				onClicked: Qt.quit()
+			}
+		}
+	}
+
+	Component.onCompleted: PopupUtils.open(dialog)
+}

=== modified file 'data/url-dispatcher-update-user.conf.in'
--- data/url-dispatcher-update-user.conf.in	2015-09-04 19:53:45 +0000
+++ data/url-dispatcher-update-user.conf.in	2016-09-20 21:26:50 +0000
@@ -13,4 +13,4 @@
 	fi
 end script
 
-exec @pkglibexecdir@/update-directory "~/.config/url-dispatcher/urls/*.url-dispatcher"
+exec @pkglibexecdir@/update-directory "${HOME}/.config/url-dispatcher/urls/"

=== modified file 'data/url-dispatcher.conf.in'
--- data/url-dispatcher.conf.in	2015-11-06 23:05:12 +0000
+++ data/url-dispatcher.conf.in	2016-09-20 21:26:50 +0000
@@ -7,6 +7,7 @@
 respawn
 
 emits application-start
+emits untrusted-helper-type-end
 
 script
 	@pkglibexecdir@/url-dispatcher
@@ -18,3 +19,6 @@
 	fi
 end script
 
+post-stop script
+	initctl emit untrusted-helper-type-end HELPER_TYPE=url-overlay
+end script

=== added directory 'debian/apparmor'
=== added file 'debian/apparmor/url-dispatcher-bad-url-helper'
--- debian/apparmor/url-dispatcher-bad-url-helper	1970-01-01 00:00:00 +0000
+++ debian/apparmor/url-dispatcher-bad-url-helper	2016-09-20 21:26:50 +0000
@@ -0,0 +1,15 @@
+# vim:syntax=apparmor
+#include <tunables/global>
+
+# Mostly unconfined. Don't allow capability or any mount rules. Also ensure that
+# exec inherits from this profile
+profile url-dispatcher-bad-url-helper (attach_disconnected) {
+  network,
+  / rwkl,
+  /** rwlkm,
+  /** pix,
+  dbus,
+  signal,
+  ptrace,
+  unix,
+}

=== modified file 'debian/changelog'
--- debian/changelog	2015-11-10 14:37:07 +0000
+++ debian/changelog	2016-09-20 21:26:50 +0000
@@ -1,3 +1,26 @@
+url-dispatcher (0.1+16.04.20151110-0ubuntu2) UNRELEASED; urgency=medium
+
+  [ Florian Boucault ]
+  * Crossbuilding Fixes
+
+  [ Larry Price ]
+  * App ID should allow package names with dots. (LP: #1591342) (LP: #1606498)
+
+  [ Ted Gould ]
+  * Check versions of appid:// urls to reduce the number of invalid appids
+    we send to UAL (LP: #1352656)
+  * Scope testing for the scope:// URL and overlays that should be over
+    the dash 
+  * Protect the dash from getting NULL urls (LP: #1476257)
+  * Make sure URL Overlays are shutdown on exit
+  * Remove the wildcard that is confusing the update script (LP: #1461496)
+  * Not using a message that isn't set properly (LP: #1608009)
+  * Fixing tests to adjust for UAL changes
+  * Add a small GUI helper tool for testing
+  * Show error dialog over apps that use Bad URLs (LP: #1370008)
+
+ -- Ted Gould <[e-mail]>  Tue, 20 Sep 2016 16:17:26 -0500
+
 url-dispatcher (0.1+16.04.20151110-0ubuntu1) xenial; urgency=medium
 
   [ CI Train Bot ]

=== modified file 'debian/control'
--- debian/control	2016-07-19 21:01:20 +0000
+++ debian/control	2016-09-20 21:26:50 +0000
@@ -7,8 +7,10 @@
                dbus-test-runner,
                debhelper (>= 9),
                dh-autoreconf,
+               dh-apparmor,
                gtester2xunit,
                intltool,
+               libapparmor-dev,
                libclick-0.4-dev,
                libdbus-1-dev,
                libdbustest1-dev (>= 14.04.0),
@@ -17,6 +19,7 @@
                libgtest-dev,
                libsqlite3-dev,
                libubuntu-app-launch2-dev (>= 0.5),
+               libunity-scopes-dev,
                python3:any,
                python3-dbusmock <!cross>,
                python3-fixtures <!cross>,
@@ -38,6 +41,9 @@
 Pre-Depends: ${misc:Pre-Depends},
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+# For the bad URL dialog
+         qtchooser,
+         qtdeclarative5-ubuntu-ui-toolkit-plugin,
 Description: service to allow sending of URLs and get handlers started
  Allows applications to request a URL to be opened and handled by another
  process without seeing the list of other applications on the system or
@@ -57,6 +63,19 @@
  .
  This package provides tools for working with the URL Dispatcher.
 
+Package: url-dispatcher-tools-gui
+Architecture: any
+Depends: url-dispatcher (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends},
+         qtchooser,
+Description: GUI tools for working with the URL Dispatcher.
+ Allows applications to request a URL to be opened and handled by another
+ process without seeing the list of other applications on the system or
+ starting them inside its own Application Confinement.
+ .
+ This package provides GUI tools for working with the URL Dispatcher.
+
 Package: liburl-dispatcher1
 Section: libs
 Architecture: any

=== modified file 'debian/rules'
--- debian/rules	2016-07-19 21:01:20 +0000
+++ debian/rules	2016-09-20 21:26:50 +0000
@@ -15,6 +15,7 @@
 	install -m 644 debian/source_url-dispatcher.py debian/url-dispatcher/usr/share/apport/package-hooks/
 	mkdir -p debian/url-dispatcher/etc/apport/crashdb.conf.d/
 	install -m 644 debian/url-dispatcher-crashdb.conf debian/url-dispatcher/etc/apport/crashdb.conf.d/
+	dh_apparmor --profile-name=url-dispatcher-bad-url-helper -p url-dispatcher
 	dh_install --fail-missing
 
 override_dh_click:

=== added file 'debian/url-dispatcher-tools-gui.install'
--- debian/url-dispatcher-tools-gui.install	1970-01-01 00:00:00 +0000
+++ debian/url-dispatcher-tools-gui.install	2016-09-20 21:26:50 +0000
@@ -0,0 +1,2 @@
+/usr/share/applications/
+/usr/share/url-dispatcher/gui/

=== modified file 'debian/url-dispatcher.install'
--- debian/url-dispatcher.install	2015-06-12 16:00:37 +0000
+++ debian/url-dispatcher.install	2016-09-20 21:26:50 +0000
@@ -1,5 +1,8 @@
 usr/lib/*/url-dispatcher
 usr/lib/*/ubuntu-app-launch/url-overlay/exec-tool
+usr/lib/*/ubuntu-app-launch/bad-url/exec-tool
 usr/share/dbus-1
 usr/share/upstart/sessions
+usr/share/url-dispatcher
 usr/bin/url-dispatcher-dump
+debian/apparmor/url-dispatcher-bad-url-helper etc/apparmor.d

=== added directory 'gui'
=== added file 'gui/CMakeLists.txt'
--- gui/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ gui/CMakeLists.txt	2016-09-20 21:26:50 +0000
@@ -0,0 +1,13 @@
+
+install(FILES
+	url-dispatcher-gui.qml
+	url-dispatcher-gui.svg
+	DESTINATION "${CMAKE_INSTALL_DATADIR}/url-dispatcher/gui/")
+install(FILES
+	${CMAKE_CURRENT_BINARY_DIR}/url-dispatcher-gui.desktop
+	DESTINATION "${CMAKE_INSTALL_DATADIR}/applications/")
+
+configure_file(
+	"url-dispatcher-gui.desktop.in"
+	"url-dispatcher-gui.desktop"
+	@ONLY)

=== added file 'gui/url-dispatcher-gui.desktop.in'
--- gui/url-dispatcher-gui.desktop.in	1970-01-01 00:00:00 +0000
+++ gui/url-dispatcher-gui.desktop.in	2016-09-20 21:26:50 +0000
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=URL Dispatcher GUI
+Icon=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/url-dispatcher/gui/url-dispatcher-gui.svg
+Type=Application
+Exec=qmlscene @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/url-dispatcher/gui/url-dispatcher-gui.qml
+X-Ubuntu-Touch=true

=== added file 'gui/url-dispatcher-gui.qml'
--- gui/url-dispatcher-gui.qml	1970-01-01 00:00:00 +0000
+++ gui/url-dispatcher-gui.qml	2016-09-20 21:26:50 +0000
@@ -0,0 +1,59 @@
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3
+
+MainView {
+	applicationName: "url-dispatcher-gui"
+
+	Page {
+		header: PageHeader {
+			title: "URL Dispatcher GUI"
+			flickable: flickme
+		}
+
+		Flickable {
+			id: flickme
+			anchors.fill: parent
+
+			Column {
+				anchors.fill: parent
+
+				ListItem {
+					contentItem.anchors {
+						leftMargin: units.gu(2)
+						rightMargin: units.gu(2)
+						topMargin: units.gu(1)
+						bottomMargin: units.gu(1)
+					}
+
+					TextField {
+						id: textbox
+						anchors.fill: parent
+						placeholderText: "URL (e.g. 'http://ubuntu.com')"
+					}
+				}
+
+				ListItem {
+					contentItem.anchors {
+						leftMargin: units.gu(2)
+						rightMargin: units.gu(2)
+						topMargin: units.gu(1)
+						bottomMargin: units.gu(1)
+					}
+
+					Button {
+						anchors.fill: parent
+						text: "Send URL"
+						onClicked: {
+							console.log("Sending URL: " + textbox.text)
+							Qt.openUrlExternally(textbox.text)
+						}
+					}
+				}
+			}
+		}
+
+	}
+
+
+}

=== added file 'gui/url-dispatcher-gui.svg'
--- gui/url-dispatcher-gui.svg	1970-01-01 00:00:00 +0000
+++ gui/url-dispatcher-gui.svg	2016-09-20 21:26:50 +0000
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="256"
+   height="256"
+   viewBox="0 0 67.733332 67.733335"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92pre1 15068"
+   sodipodi:docname="url-dispatcher-gui.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.375"
+     inkscape:cx="128"
+     inkscape:cy="128.88889"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g3484"
+     showgrid="false"
+     units="px"
+     inkscape:showpageshadow="false"
+     inkscape:pagecheckerboard="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1050"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-229.26665)">
+    <g
+       id="g3484"
+       transform="translate(0,-2.732619)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3486"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:17.4939785px;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.69975913px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 16.89882,270.19082 q -1.903345,0 -3.302863,-0.5878 -1.399518,-0.58779 -2.29521,-1.59545 -0.895692,-1.03564 -1.3435374,-2.43516 -0.4198555,-1.39952 -0.4198555,-3.02296 V 250.37364 H 12.25242 v 11.86792 q 0,2.911 1.287556,4.22654 1.287557,1.31555 3.358844,1.31555 1.035644,0 1.875355,-0.30789 0.867701,-0.33589 1.483489,-1.00766 0.615788,-0.67177 0.951673,-1.70741 0.335884,-1.06363 0.335884,-2.51913 v -11.86792 h 2.715066 v 12.17581 q 0,1.62344 -0.447846,3.02296 -0.419856,1.39952 -1.343538,2.43516 -0.895692,1.00766 -2.29521,1.59545 -1.371528,0.5878 -3.274873,0.5878 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3488"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:17.4939785px;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.69975913px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 38.409416,261.65376 q 0.447846,0.55981 1.119614,1.48349 0.69976,0.89569 1.427509,2.01531 0.72775,1.09162 1.427509,2.29521 0.727749,1.20358 1.231576,2.3232 h -2.966979 q -0.559807,-1.06364 -1.231576,-2.15526 -0.643778,-1.09163 -1.315547,-2.07129 -0.671769,-1.00765 -1.343538,-1.87535 -0.643778,-0.86771 -1.175595,-1.51148 -0.363875,0.028 -0.75574,0.028 -0.363875,0 -0.75574,0 h -2.435162 v 7.58539 h -2.715065 v -19.11742 q 1.147605,-0.27991 2.547123,-0.36388 1.427509,-0.11196 2.603104,-0.11196 4.086593,0 6.213861,1.53947 2.155258,1.53947 2.155258,4.59042 0,1.93133 -1.035643,3.30286 -1.007653,1.37153 -2.994969,2.0433 z m -4.114584,-9.09687 q -1.735403,0 -2.659085,0.084 v 7.30549 h 1.931335 q 1.399519,0 2.519133,-0.13995 1.119615,-0.13996 1.875355,-0.53182 0.78373,-0.39187 1.203586,-1.09163 0.419855,-0.72775 0.419855,-1.90334 0,-1.09163 -0.419855,-1.81937 -0.419856,-0.72775 -1.147605,-1.14761 -0.69976,-0.41986 -1.679422,-0.5878 -0.951673,-0.16794 -2.043297,-0.16794 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3490"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:17.4939785px;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.69975913px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 58.19598,267.41977 v 2.3512 H 46.523997 v -19.39733 h 2.715066 v 17.04613 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3493"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:6.10472965px;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.24418919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 16.002471,276.35782 q 0,0.87908 -0.273492,1.5335 -0.273492,0.64466 -0.771638,1.07444 -0.498145,0.42 -1.191643,0.63489 -0.693497,0.20512 -1.52374,0.20512 -0.410238,0 -0.908384,-0.0391 -0.488379,-0.0293 -0.888849,-0.12698 v -6.56381 q 0.40047,-0.0977 0.888849,-0.12698 0.498146,-0.0391 0.908384,-0.0391 0.830243,0 1.52374,0.21489 0.693498,0.20512 1.191643,0.63489 0.498146,0.42001 0.771638,1.07444 0.273492,0.64465 0.273492,1.52374 z m -3.682373,2.6177 q 1.347925,0 2.012119,-0.68373 0.664195,-0.69349 0.664195,-1.93397 0,-1.24049 -0.664195,-1.92421 -0.664194,-0.6935 -2.012119,-0.6935 -0.40047,0 -0.625124,0.01 -0.214887,0.01 -0.302795,0.0195 v 5.17681 q 0.08791,0.01 0.302795,0.0195 0.224654,0.01 0.625124,0.01 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3495"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:6.10472965px;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.24418919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 18.257711,279.74716 h -0.908384 v -5.07913 h 0.908384 z m -0.459076,-5.99728 q -0.244189,0 -0.420005,-0.15629 -0.166049,-0.16604 -0.166049,-0.43954 0,-0.27349 0.166049,-0.42977 0.175816,-0.16605 0.420005,-0.16605 0.244189,0 0.410238,0.16605 0.175816,0.15628 0.175816,0.42977 0,0.2735 -0.175816,0.43954 -0.166049,0.15629 -0.410238,0.15629 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3497"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:6.10472965px;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.24418919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 21.011249,279.09273 q 0.556751,0 0.820476,-0.14651 0.273492,-0.14651 0.273492,-0.46884 0,-0.3321 -0.263725,-0.52745 -0.263724,-0.19535 -0.869313,-0.43954 -0.293027,-0.11721 -0.566519,-0.23442 -0.263725,-0.12698 -0.459076,-0.29303 -0.195351,-0.16605 -0.312562,-0.40047 -0.117211,-0.23442 -0.117211,-0.57629 0,-0.67396 0.498146,-1.06466 0.498146,-0.40047 1.357692,-0.40047 0.214886,0 0.429773,0.0293 0.214886,0.0195 0.40047,0.0586 0.185584,0.0293 0.32233,0.0684 0.146514,0.0391 0.224654,0.0684 l -0.166049,0.78141 q -0.146513,-0.0781 -0.459075,-0.15628 -0.312562,-0.0879 -0.752103,-0.0879 -0.380935,0 -0.664195,0.15628 -0.283259,0.14651 -0.283259,0.46884 0,0.16605 0.05861,0.29303 0.06837,0.12698 0.195352,0.23442 0.136746,0.0977 0.332097,0.18559 0.195351,0.0879 0.468843,0.18558 0.3614,0.13675 0.64466,0.27349 0.283259,0.12698 0.478611,0.3028 0.205118,0.17581 0.312562,0.42977 0.107443,0.24419 0.107443,0.60559 0,0.70326 -0.527449,1.06466 -0.517681,0.3614 -1.48467,0.3614 -0.673962,0 -1.054897,-0.11721 -0.380935,-0.10744 -0.517681,-0.16605 l 0.166048,-0.7814 q 0.156281,0.0586 0.498146,0.17581 0.341865,0.11721 0.908384,0.11721 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3499"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:6.10472965px;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.24418919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 27.705085,277.21736 q 0,-0.88885 -0.43954,-1.36746 -0.439541,-0.47861 -1.172109,-0.47861 -0.410237,0 -0.644659,0.0293 -0.224654,0.0293 -0.3614,0.0684 v 3.20376 q 0.166049,0.13675 0.478611,0.26372 0.312562,0.12698 0.68373,0.12698 0.390702,0 0.664194,-0.13674 0.28326,-0.14652 0.459076,-0.39071 0.175816,-0.25395 0.253957,-0.58605 0.07814,-0.34187 0.07814,-0.73257 z m 0.947454,0 q 0,0.57629 -0.156281,1.06467 -0.146513,0.48838 -0.43954,0.84001 -0.293027,0.35163 -0.7228,0.54698 -0.420006,0.19535 -0.96699,0.19535 -0.43954,0 -0.781405,-0.11721 -0.332097,-0.11721 -0.498146,-0.22465 v 2.03165 h -0.908384 v -6.72985 q 0.32233,-0.0781 0.800941,-0.16605 0.488378,-0.0977 1.12327,-0.0977 0.586054,0 1.054897,0.18559 0.468844,0.18558 0.800941,0.52745 0.332097,0.34186 0.507913,0.84001 0.185584,0.48838 0.185584,1.10373 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3501"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:6.10472965px;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.24418919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 31.659424,279.09273 q 0.32233,0 0.566519,-0.01 0.253957,-0.0195 0.420006,-0.0586 v -1.51397 q -0.09768,-0.0488 -0.32233,-0.0781 -0.214887,-0.0391 -0.527449,-0.0391 -0.205119,0 -0.43954,0.0293 -0.224654,0.0293 -0.420006,0.12698 -0.185584,0.0879 -0.312562,0.25396 -0.126978,0.15628 -0.126978,0.42 0,0.48838 0.312562,0.68373 0.312562,0.18558 0.849778,0.18558 z m -0.07814,-4.55168 q 0.546984,0 0.918151,0.14651 0.380935,0.13675 0.605589,0.40047 0.234422,0.25396 0.332098,0.61536 0.09767,0.35163 0.09767,0.7814 v 3.17446 q -0.117211,0.0195 -0.332097,0.0586 -0.205119,0.0293 -0.468843,0.0586 -0.263725,0.0293 -0.576287,0.0488 -0.302794,0.0293 -0.605589,0.0293 -0.429773,0 -0.791173,-0.0879 -0.3614,-0.0879 -0.625124,-0.27349 -0.263725,-0.19536 -0.410238,-0.50792 -0.146514,-0.31256 -0.146514,-0.7521 0,-0.42001 0.166049,-0.7228 0.175816,-0.3028 0.468843,-0.48838 0.293027,-0.18558 0.68373,-0.27349 0.390703,-0.0879 0.820476,-0.0879 0.136746,0 0.283259,0.0195 0.146514,0.01 0.273492,0.0391 0.136746,0.0195 0.234422,0.0391 0.09768,0.0195 0.136746,0.0293 v -0.25396 q 0,-0.22465 -0.04884,-0.43954 -0.04884,-0.22465 -0.175816,-0.3907 -0.126979,-0.17582 -0.351633,-0.27349 -0.214886,-0.10745 -0.566519,-0.10745 -0.449308,0 -0.791173,0.0684 -0.332097,0.0586 -0.498146,0.12698 l -0.107443,-0.75211 q 0.175816,-0.0781 0.586054,-0.14651 0.410238,-0.0781 0.888849,-0.0781 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3503"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:6.10472965px;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.24418919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 35.883744,274.66803 h 1.924211 v 0.76187 h -1.924211 v 2.34421 q 0,0.38094 0.05861,0.6349 0.05861,0.24418 0.175816,0.3907 0.117211,0.13674 0.293027,0.19535 0.175816,0.0586 0.410238,0.0586 0.410238,0 0.654427,-0.0879 0.253957,-0.0977 0.351632,-0.13675 l 0.175817,0.7521 q -0.136746,0.0684 -0.478611,0.16605 -0.341865,0.10745 -0.781406,0.10745 -0.517681,0 -0.859546,-0.12698 -0.332097,-0.13675 -0.537216,-0.40047 -0.205119,-0.26373 -0.293027,-0.64466 -0.07814,-0.39071 -0.07814,-0.89862 v -4.53215 l 0.908383,-0.15628 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3505"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:6.10472965px;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.24418919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 41.037815,279.86437 q -0.615356,0 -1.0842,-0.19535 -0.459075,-0.19535 -0.781405,-0.54698 -0.312562,-0.35163 -0.468843,-0.83025 -0.156281,-0.48837 -0.156281,-1.07443 0,-0.58605 0.166048,-1.07443 0.175817,-0.48838 0.488379,-0.84001 0.312562,-0.3614 0.76187,-0.55675 0.459076,-0.20512 1.015827,-0.20512 0.341865,0 0.68373,0.0586 0.341865,0.0586 0.654427,0.18559 l -0.205119,0.77164 q -0.205119,-0.0977 -0.478611,-0.15629 -0.263724,-0.0586 -0.566519,-0.0586 -0.76187,0 -1.172108,0.47861 -0.40047,0.47861 -0.40047,1.39676 0,0.41024 0.08791,0.7521 0.09768,0.34187 0.293027,0.58606 0.205119,0.24419 0.517681,0.38093 0.312562,0.12698 0.76187,0.12698 0.3614,0 0.654427,-0.0684 0.293027,-0.0684 0.459076,-0.14651 l 0.126978,0.76187 q -0.07814,0.0488 -0.224654,0.0977 -0.146513,0.0391 -0.332097,0.0684 -0.185584,0.0391 -0.40047,0.0586 -0.205119,0.0293 -0.400471,0.0293 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3507"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:6.10472965px;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.24418919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 43.370739,279.74716 v -7.42335 l 0.908384,-0.15628 v 2.59817 q 0.253956,-0.0977 0.537216,-0.14651 0.293027,-0.0586 0.576286,-0.0586 0.60559,0 1.00606,0.17582 0.40047,0.16605 0.634892,0.47861 0.244189,0.3028 0.341865,0.73257 0.09768,0.42977 0.09768,0.94745 v 2.85213 h -0.908383 v -2.65678 q 0,-0.46884 -0.06837,-0.80094 -0.05861,-0.33209 -0.205119,-0.53721 -0.146514,-0.20512 -0.390703,-0.29303 -0.244189,-0.0977 -0.605589,-0.0977 -0.146514,0 -0.302795,0.0195 -0.156281,0.0195 -0.302794,0.0488 -0.136746,0.0195 -0.253957,0.0488 -0.107443,0.0293 -0.156281,0.0488 v 4.21959 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3509"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:6.10472965px;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.24418919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 48.658044,277.21736 q 0,-0.67396 0.195351,-1.17211 0.195351,-0.50791 0.517681,-0.84001 0.32233,-0.33209 0.742335,-0.49814 0.420006,-0.16605 0.859546,-0.16605 1.025595,0 1.572579,0.64466 0.546983,0.63489 0.546983,1.94374 0,0.0586 0,0.15628 0,0.0879 -0.0098,0.16605 h -3.477254 q 0.05861,0.79118 0.459075,1.20141 0.400471,0.41024 1.250249,0.41024 0.478611,0 0.800941,-0.0781 0.332097,-0.0879 0.498146,-0.16605 l 0.126978,0.76187 q -0.166049,0.0879 -0.586054,0.18559 -0.410238,0.0977 -0.937687,0.0977 -0.664194,0 -1.152573,-0.19535 -0.47861,-0.20512 -0.791172,-0.55675 -0.312563,-0.35163 -0.468844,-0.83024 -0.146513,-0.48838 -0.146513,-1.06467 z m 3.487021,-0.49814 q 0.0098,-0.61536 -0.312562,-1.00606 -0.312562,-0.40047 -0.869313,-0.40047 -0.312562,0 -0.556752,0.12697 -0.234421,0.11722 -0.40047,0.31257 -0.166049,0.19535 -0.263724,0.4493 -0.08791,0.25396 -0.117211,0.51769 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3511"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:6.10472965px;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.24418919px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 56.27278,274.56058 q 0.117211,0 0.263725,0.0195 0.156281,0.01 0.302794,0.0391 0.146514,0.0195 0.263725,0.0488 0.126978,0.0195 0.185584,0.0391 l -0.156282,0.79117 q -0.107443,-0.0391 -0.3614,-0.0879 -0.244189,-0.0586 -0.634891,-0.0586 -0.253957,0 -0.507914,0.0586 -0.244189,0.0488 -0.32233,0.0684 v 4.26843 h -0.908384 v -4.86425 q 0.32233,-0.11721 0.800941,-0.21488 0.478611,-0.10745 1.074432,-0.10745 z" />
+    </g>
+  </g>
+</svg>

=== added directory 'po'
=== added file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ po/CMakeLists.txt	2016-09-20 21:26:50 +0000
@@ -0,0 +1,39 @@
+include(FindGettext)
+find_program(GETTEXT_XGETTEXT_EXECUTABLE xgettext)
+find_program(INTLTOOL_UPDATE intltool-update)
+
+set(GETTEXT_PACKAGE ${PROJECT_NAME})
+set(POT_FILE ${GETTEXT_PACKAGE}.pot)
+file(GLOB POFILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po)
+
+# Creates POTFILES
+add_custom_target(POTFILES ALL
+    COMMENT "Generating POTFILES"
+    COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/genpotfiles.sh ${CMAKE_SOURCE_DIR}
+)
+
+# Creates the .pot file containing the translations template
+set(INTLTOOL_ENV
+    XGETTEXT="${GETTEXT_XGETTEXT_EXECUTABLE}"
+    XGETTEXT_ARGS="--keyword=Gettext;--keyword=NGettext:1,2;--keyword=tr;--keyword=tr:1,2;--keyword=N_"
+    srcdir="${CMAKE_CURRENT_SOURCE_DIR}"
+)
+add_custom_target(${POT_FILE}
+    COMMENT "Generating translation template"
+    COMMAND ${INTLTOOL_ENV} ${INTLTOOL_UPDATE} --gettext-package ${GETTEXT_PACKAGE} --pot
+    COMMAND cp -f ${POT_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/
+    DEPENDS POTFILES
+)
+
+# Builds the binary translations catalog for each language
+# it finds source translations (*.po) for
+foreach(POFILE ${POFILES})
+    string(REPLACE ".po" "" LANG ${POFILE})
+    list(APPEND PO_FILES "${POFILE}")
+    gettext_process_po_files(${LANG} ALL PO_FILES "${POFILE}")
+    set(INSTALL_DIR ${CMAKE_INSTALL_LOCALEDIR}/${LANG}/LC_MESSAGES)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LANG}.gmo
+            DESTINATION ${INSTALL_DIR}
+            RENAME ${GETTEXT_PACKAGE}.mo
+    )
+endforeach(POFILE)

=== added file 'po/POTFILES.in'
--- po/POTFILES.in	1970-01-01 00:00:00 +0000
+++ po/POTFILES.in	2016-09-20 21:26:50 +0000
@@ -0,0 +1,1 @@
+data/bad-url.qml

=== added file 'po/genpotfiles.sh'
--- po/genpotfiles.sh	1970-01-01 00:00:00 +0000
+++ po/genpotfiles.sh	2016-09-20 21:26:50 +0000
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+sed '/^#/d
+	 s/^[[].*] *//
+	 /^[ 	]*$/d' \
+      "`dirname ${0}`/POTFILES.in" | sed '$!s/$/ \\/' > POTFILES

=== modified file 'service/CMakeLists.txt'
--- service/CMakeLists.txt	2015-06-11 21:38:13 +0000
+++ service/CMakeLists.txt	2016-09-20 21:26:50 +0000
@@ -47,15 +47,20 @@
 	overlay-tracker.cpp
 	overlay-tracker-iface.h
 	overlay-tracker-mir.h
-	overlay-tracker-mir.cpp)
+	overlay-tracker-mir.cpp
+	scope-checker-facade.h
+	scope-checker.h
+	scope-checker.cpp)
 
 target_link_libraries(dispatcher-lib
 	url-db-lib
 	service-generated
 	-pthread
+	${APPARMOR_LIBRARIES}
 	${GLIB2_LIBRARIES}
 	${GOBJECT2_LIBRARIES}
 	${GIO2_LIBRARIES}
+	${SCOPES_LIBRARIES}
 	${SQLITE_LIBRARIES}
 	${UBUNTU_APP_LAUNCH_LIBRARIES}
 )
@@ -106,14 +111,6 @@
 target_link_libraries(update-directory ${GIO2_LIBRARIES} ${JSONGLIB_LIBRARIES} url-db-lib)
 
 ###########################
-# URL Overlay Exec Tool
-###########################
-
-add_executable(url-overlay-exec-tool url-overlay.c recoverable-problem.c)
-set_target_properties(url-overlay-exec-tool PROPERTIES OUTPUT_NAME "exec-tool")
-target_link_libraries(url-overlay-exec-tool ${GIO2_LIBRARIES} ${UBUNTU_APP_LAUNCH_LIBRARIES} ${CLICK_LIBRARIES})
-
-###########################
 # Installation
 ###########################
 
@@ -122,8 +119,9 @@
   RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_LIBEXECDIR}/url-dispatcher"
 )
 
-install(
-  TARGETS url-overlay-exec-tool
-  RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_LIBEXECDIR}/ubuntu-app-launch/url-overlay"
-)
+###########################
+# Exec Tools
+###########################
 
+add_subdirectory(url-overlay)
+add_subdirectory(bad-url)

=== added directory 'service/bad-url'
=== added file 'service/bad-url/CMakeLists.txt'
--- service/bad-url/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ service/bad-url/CMakeLists.txt	2016-09-20 21:26:50 +0000
@@ -0,0 +1,14 @@
+###########################
+# Bad URL Exec Tool
+###########################
+
+add_definitions( -DQML_BAD_URL="${CMAKE_INSTALL_FULL_DATADIR}/url-dispatcher/bad-url.qml" )
+add_executable(bad-url-exec-tool exec-tool.c)
+set_target_properties(bad-url-exec-tool PROPERTIES OUTPUT_NAME "exec-tool")
+target_link_libraries(bad-url-exec-tool ${GIO2_LIBRARIES} ${UBUNTU_APP_LAUNCH_LIBRARIES})
+
+install(
+  TARGETS bad-url-exec-tool
+  RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_LIBEXECDIR}/ubuntu-app-launch/bad-url"
+)
+

=== added file 'service/bad-url/exec-tool.c'
--- service/bad-url/exec-tool.c	1970-01-01 00:00:00 +0000
+++ service/bad-url/exec-tool.c	2016-09-20 21:26:50 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2015 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 <ubuntu-app-launch.h>
+
+int
+main (int argc, char * argv[])
+{
+	GDBusConnection * bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
+	g_return_val_if_fail(bus != NULL, -1);
+
+	gchar * exec = g_strdup_printf("qmlscene %s %s", QML_BAD_URL, g_getenv("APP_URIS"));
+
+	gboolean sended = ubuntu_app_launch_helper_set_exec(exec, NULL);
+	g_free(exec);
+
+	/* Ensuring the messages get on the bus before we quit */
+	g_dbus_connection_flush_sync(bus, NULL, NULL);
+	g_clear_object(&bus);
+
+	if (sended)
+		return 0;
+	else
+		return -1;
+}

=== modified file 'service/dispatcher.c'
--- service/dispatcher.c	2015-09-03 21:50:06 +0000
+++ service/dispatcher.c	2016-09-20 21:26:50 +0000
@@ -23,10 +23,12 @@
 #include "dispatcher.h"
 #include "service-iface.h"
 #include "recoverable-problem.h"
+#include "scope-checker.h"
 #include "url-db.h"
 
 /* Globals */
 static OverlayTracker * tracker = NULL;
+static ScopeChecker * checker = NULL;
 static GCancellable * cancellable = NULL;
 static ServiceIfaceComCanonicalURLDispatcher * skel = NULL;
 static GRegex * applicationre = NULL;
@@ -73,6 +75,10 @@
 	g_variant_get(pid_tuple, "(u)", &pid);
 	g_variant_unref(pid_tuple);
 
+	/* Popup the bad url dialog */
+	overlay_tracker_badurl(tracker, pid, badurl);
+
+	/* Report recoverable error */
 	const gchar * additional[3] = {
 		"BadURL",
 		badurl,
@@ -151,6 +157,11 @@
 gboolean
 send_to_dash (const gchar * url)
 {
+	if (url == NULL) {
+		g_warning("Can not send nothing to the dash");
+		return FALSE;
+	}
+
 	GDBusConnection * bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
 	g_return_val_if_fail(bus != NULL, FALSE);
 
@@ -210,13 +221,109 @@
 	return TRUE;
 }
 
+/* Queries Upstart for the PID of a given upstart job */
+pid_t
+pid_for_upstart_job (GDBusConnection * conn, const gchar* jobname)
+{
+	GError* error = NULL;
+
+	if (jobname == NULL) {
+		return 0;
+	}
+
+	GVariant* retval = g_dbus_connection_call_sync(
+				 conn,
+				 "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 = NULL;
+	g_variant_get(retval, "(o)", &path);
+	g_variant_unref(retval);
+
+	retval = g_dbus_connection_call_sync(
+				 conn,
+				 "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(
+				 conn,
+				 "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;
+}
+
+
 /* Handles setting up the overlay with the URL */
 gboolean
 dispatcher_send_to_overlay (const gchar * app_id, const gchar * url, GDBusConnection * conn, const gchar * sender)
 {
 	GError * error = NULL;
 
-	/* TODO: Detect if a scope is what we need to overlay on */
 	GVariant * callret = g_dbus_connection_call_sync(conn,
 		"org.freedesktop.DBus",
 		"/",
@@ -239,6 +346,12 @@
 	g_variant_get_child(callret, 0, "u", &pid);
 	g_variant_unref(callret);
 
+	/* If it is from a scope we need to overlay onto the
+	   dash instead */
+	if (scope_checker_is_scope_pid(checker, pid)) {
+		pid = pid_for_upstart_job(conn, "unity8-dash");
+	}
+
 	return overlay_tracker_add(tracker, app_id, pid, url);
 }
 
@@ -437,7 +550,17 @@
 
 		*out_appid = ubuntu_app_launch_triplet_to_app_id(package, app, version);
 		if (*out_appid != NULL) {
-			retval = TRUE;
+			/* Look at the current version of the app and ensure
+			   we're not asking for an older version */
+			gchar * testappid = ubuntu_app_launch_triplet_to_app_id(package, app, NULL);
+			if (g_strcmp0(*out_appid, testappid) != 0) {
+				retval = FALSE;
+				g_clear_pointer(out_appid, g_free);
+			} else {
+				retval = TRUE;
+			}
+
+			g_free(testappid);
 		}
 
 		g_free(package);
@@ -483,6 +606,17 @@
 			}
 		}
 
+		if (g_strcmp0(protocol, "scope") == 0) {
+			/* Add a check for the scope if we can do that, since it is
+			   a system URL that we can do more checking on */
+			if (!scope_checker_is_scope(checker, domain)) {
+				found = FALSE;
+				g_clear_pointer(out_appid, g_free);
+				if (out_url != NULL)
+					g_clear_pointer(out_url, g_free);
+			}
+		}
+
 		g_free(protocol);
 		g_free(domain);
 
@@ -517,7 +651,7 @@
 
 	if (error != NULL) {
 		if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
-			g_error("Unable to connect to D-Bus: %s", error->message);
+			g_error("Unable to connect to D-Bus");
 			g_main_loop_quit(mainloop);
 		}
 		g_error_free(error);
@@ -547,17 +681,18 @@
 
 /* Initialize all the globals */
 gboolean
-dispatcher_init (GMainLoop * mainloop, OverlayTracker * intracker)
+dispatcher_init (GMainLoop * mainloop, OverlayTracker * intracker, ScopeChecker * inchecker)
 {
 	tracker = intracker;
+	checker = inchecker;
 	cancellable = g_cancellable_new();
 
 	urldb = url_db_create_database();
 	g_return_val_if_fail(urldb != NULL, FALSE);
 
 	applicationre = g_regex_new("^application:///([a-zA-Z0-9_\\.-]*)\\.desktop$", 0, 0, NULL);
-	appidre = g_regex_new("^appid://([a-z0-9\\.-]*)/([a-zA-Z0-9-]*)/([a-zA-Z0-9\\.-]*)$", 0, 0, NULL);
-	genericre = g_regex_new("^([a-z][a-z0-9]*):(?://(?:.*@)?([a-zA-Z0-9\\.-]*)(?::[0-9]*)?/?)?(.*)?$", 0, 0, NULL);
+	appidre = g_regex_new("^appid://([a-z0-9\\.-]*)/([a-zA-Z0-9-\\.]*)/([a-zA-Z0-9\\.-]*)$", 0, 0, NULL);
+	genericre = g_regex_new("^([a-z][a-z0-9]*):(?://(?:.*@)?([a-zA-Z0-9\\.-_]*)(?::[0-9]*)?/?)?(.*)?$", 0, 0, NULL);
 	intentre = g_regex_new("^intent://.*package=([a-zA-Z0-9\\.]*);.*$", 0, 0, NULL);
 
 	g_bus_get(G_BUS_TYPE_SESSION, cancellable, bus_got, mainloop);

=== modified file 'service/dispatcher.h'
--- service/dispatcher.h	2015-06-11 21:47:17 +0000
+++ service/dispatcher.h	2016-09-20 21:26:50 +0000
@@ -22,10 +22,11 @@
 
 #include <gio/gio.h>
 #include "overlay-tracker.h"
+#include "scope-checker.h"
 
 G_BEGIN_DECLS
 
-gboolean dispatcher_init (GMainLoop * mainloop, OverlayTracker * tracker);
+gboolean dispatcher_init (GMainLoop * mainloop, OverlayTracker * tracker, ScopeChecker * checker);
 gboolean dispatcher_shutdown ();
 gboolean dispatcher_url_to_appid (const gchar * url, gchar ** out_appid, const gchar ** out_url);
 gboolean dispatcher_appid_restrict (const gchar * appid, const gchar * package);

=== modified file 'service/overlay-tracker-iface.h'
--- service/overlay-tracker-iface.h	2015-05-19 20:24:47 +0000
+++ service/overlay-tracker-iface.h	2016-09-20 21:26:50 +0000
@@ -23,4 +23,5 @@
 public:
 	virtual ~OverlayTrackerIface() = default;
 	virtual bool addOverlay (const char * appid, unsigned long pid, const char * url) = 0;
+	virtual bool badUrl (unsigned long pid, const char * url) = 0;
 };

=== modified file 'service/overlay-tracker-mir.cpp'
--- service/overlay-tracker-mir.cpp	2015-06-11 21:47:17 +0000
+++ service/overlay-tracker-mir.cpp	2016-09-20 21:26:50 +0000
@@ -20,16 +20,20 @@
 #include "overlay-tracker-mir.h"
 #include <ubuntu-app-launch.h>
 
-static const char * HELPER_TYPE = "url-overlay";
+static const char * OVERLAY_HELPER_TYPE = "url-overlay";
+static const char * BAD_URL_HELPER_TYPE = "bad-url";
+static const char * BAD_URL_APP_ID = "url-dispatcher-bad-url-helper";
 
 OverlayTrackerMir::OverlayTrackerMir () 
 	: thread([this] {
 		/* Setup Helper Observer */
-		ubuntu_app_launch_observer_add_helper_stop(untrustedHelperStoppedStatic, HELPER_TYPE, this);
+		ubuntu_app_launch_observer_add_helper_stop(overlayHelperStoppedStatic, OVERLAY_HELPER_TYPE, this);
+		ubuntu_app_launch_observer_add_helper_stop(overlayHelperStoppedStatic, BAD_URL_HELPER_TYPE, this);
 		},
 		[this] {
 		/* Remove Helper Observer */
-		ubuntu_app_launch_observer_delete_helper_stop(untrustedHelperStoppedStatic, HELPER_TYPE, this);
+		ubuntu_app_launch_observer_delete_helper_stop(overlayHelperStoppedStatic, OVERLAY_HELPER_TYPE, this);
+		ubuntu_app_launch_observer_delete_helper_stop(overlayHelperStoppedStatic, BAD_URL_HELPER_TYPE, this);
 		})
 {
 	mir = std::shared_ptr<MirConnection>([] {
@@ -52,8 +56,10 @@
 OverlayTrackerMir::~OverlayTrackerMir () 
 {
 	thread.executeOnThread<bool>([this] {
-		while (!ongoingSessions.empty()) {
-			removeSession(std::get<2>(*ongoingSessions.begin()).get());
+		for (auto& sessionType : ongoingSessions) {
+			while (!sessionType.second.empty()) {
+				removeSession(sessionType.first, sessionType.second.begin()->session.get());
+			}
 		}
 
 		return true;
@@ -65,53 +71,75 @@
 bool
 OverlayTrackerMir::addOverlay (const char * appid, unsigned long pid, const char * url)
 {
-	std::string sappid(appid);
+	return addOverlayCore(OVERLAY_HELPER_TYPE, appid, pid, url, overlaySessionStateChangedStatic);
+}
+
+bool
+OverlayTrackerMir::addOverlayCore (const char * helper_id, const char * appid, unsigned long pid, const char * url, void (*stateChangedFunction) (MirPromptSession*, MirPromptSessionState, void *))
+{
+	OverlayData data;
+	data.appid = appid;
 	std::string surl(url);
 
-	return thread.executeOnThread<bool>([this, sappid, pid, surl] {
-		g_debug("Setting up over lay for PID %d with '%s'", pid, sappid.c_str());
+	return thread.executeOnThread<bool>([this, helper_id, &data, pid, surl, stateChangedFunction] {
+		g_debug("Setting up over lay for PID %d with '%s'", (int)pid, data.appid.c_str());
 
-		auto session = std::shared_ptr<MirPromptSession>(
-			mir_connection_create_prompt_session_sync(mir.get(), pid, sessionStateChangedStatic, this),
+		data.session = std::shared_ptr<MirPromptSession>(
+			mir_connection_create_prompt_session_sync(mir.get(), pid, stateChangedFunction, this),
 			[] (MirPromptSession * session) { if (session) mir_prompt_session_release_sync(session); });
-		if (!session) {
-			g_critical("Unable to create trusted prompt session for %d with appid '%s'", pid, sappid.c_str());
+		if (!data.session) {
+			g_critical("Unable to create trusted prompt session for %d with appid '%s'", (int)pid, data.appid.c_str());
 			return false;
 		}
-		
+
 		std::array<const char *, 2> urls { surl.c_str(), nullptr };
-		auto instance = ubuntu_app_launch_start_session_helper(HELPER_TYPE, session.get(), sappid.c_str(), urls.data());
+		auto instance = ubuntu_app_launch_start_session_helper(helper_id, data.session.get(), data.appid.c_str(), urls.data());
 		if (instance == nullptr) {
-			g_critical("Unable to start helper for %d with appid '%s'", pid, sappid.c_str());
+			g_critical("Unable to start helper for %d with appid '%s'", (int)pid, data.appid.c_str());
 			return false;
 		}
+		data.instanceid = instance;
 
-		ongoingSessions.emplace(std::make_tuple(sappid, std::string(instance), session));
+		ongoingSessions[helper_id].push_back(data);
 		g_free(instance);
 		return true;
 	});
 }
 
-void
-OverlayTrackerMir::sessionStateChangedStatic (MirPromptSession * session, MirPromptSessionState state, void * user_data)
-{
-	reinterpret_cast<OverlayTrackerMir *>(user_data)->sessionStateChanged(session, state);
-}
-
-void
-OverlayTrackerMir::removeSession (MirPromptSession * session)
-{
-	for (auto it = ongoingSessions.begin(); it != ongoingSessions.end(); it++) {
-		if (std::get<2>(*it).get() == session) {
-			ubuntu_app_launch_stop_multiple_helper(HELPER_TYPE, std::get<0>(*it).c_str(), std::get<1>(*it).c_str());
-			ongoingSessions.erase(it);
+bool
+OverlayTrackerMir::badUrl (unsigned long pid, const char * url)
+{
+	return addOverlayCore(BAD_URL_HELPER_TYPE, BAD_URL_APP_ID, pid, url, badUrlSessionStateChangedStatic);
+}
+
+void
+OverlayTrackerMir::overlaySessionStateChangedStatic (MirPromptSession * session, MirPromptSessionState state, void * user_data)
+{
+	reinterpret_cast<OverlayTrackerMir *>(user_data)->sessionStateChanged(session, state, OVERLAY_HELPER_TYPE);
+}
+
+void
+OverlayTrackerMir::badUrlSessionStateChangedStatic (MirPromptSession * session, MirPromptSessionState state, void * user_data)
+{
+	reinterpret_cast<OverlayTrackerMir *>(user_data)->sessionStateChanged(session, state, BAD_URL_HELPER_TYPE);
+}
+
+void
+OverlayTrackerMir::removeSession (const std::string &type, MirPromptSession * session)
+{
+	g_debug("Removing session: %p", (void*)session);
+
+	for (auto it = ongoingSessions[type].begin(); it != ongoingSessions[type].end(); it++) {
+		if (it->session.get() == session) {
+			ubuntu_app_launch_stop_multiple_helper(type.c_str(), it->appid.c_str(), it->instanceid.c_str());
+			ongoingSessions[type].erase(it);
 			break;
 		}
 	}
 }
 
 void
-OverlayTrackerMir::sessionStateChanged (MirPromptSession * session, MirPromptSessionState state)
+OverlayTrackerMir::sessionStateChanged (MirPromptSession * session, MirPromptSessionState state, const std::string &type)
 {
 	if (state != mir_prompt_session_state_stopped) {
 		/* We only care about the stopped state */
@@ -120,23 +148,24 @@
 
 	/* Executing on the Mir thread, which is nice and all, but we
 	   want to get back on our thread */
-	thread.executeOnThread([this, session]() {
-		removeSession(session);
+	thread.executeOnThread([this, type, session]() {
+		removeSession(type, session);
 	});
 }
 
 void
-OverlayTrackerMir::untrustedHelperStoppedStatic (const gchar * appid, const gchar * instanceid, const gchar * helpertype, gpointer user_data)
+OverlayTrackerMir::overlayHelperStoppedStatic (const gchar * appid, const gchar * instanceid, const gchar * helpertype, gpointer user_data)
 {
-	reinterpret_cast<OverlayTrackerMir *>(user_data)->untrustedHelperStopped(appid, instanceid, helpertype);
+	reinterpret_cast<OverlayTrackerMir *>(user_data)->overlayHelperStopped(appid, instanceid, helpertype);
 }
 
 void 
-OverlayTrackerMir::untrustedHelperStopped(const gchar * appid, const gchar * instanceid, const gchar * helpertype)
+OverlayTrackerMir::overlayHelperStopped(const gchar * appid, const gchar * instanceid, const gchar * helpertype)
 {
 	/* This callback will happen on our thread already, we don't need
 	   to proxy it on */
-	if (g_strcmp0(helpertype, HELPER_TYPE) != 0) {
+	if (g_strcmp0(helpertype, OVERLAY_HELPER_TYPE) != 0
+			&& g_strcmp0(helpertype, BAD_URL_HELPER_TYPE) != 0) {
 		return;
 	}
 
@@ -144,10 +173,11 @@
 	std::string sappid(appid);
 	std::string sinstanceid(instanceid);
 
-	for (auto it = ongoingSessions.begin(); it != ongoingSessions.end(); it++) {
-		if (std::get<0>(*it) == sappid && std::get<1>(*it) == sinstanceid) {
-			ongoingSessions.erase(it);
+	for (auto it = ongoingSessions[helpertype].begin(); it != ongoingSessions[helpertype].end(); it++) {
+		if (it->appid == sappid && it->instanceid == sinstanceid) {
+			ongoingSessions[helpertype].erase(it);
 			break;
 		}
 	}
 }
+

=== modified file 'service/overlay-tracker-mir.h'
--- service/overlay-tracker-mir.h	2015-06-11 21:50:05 +0000
+++ service/overlay-tracker-mir.h	2016-09-20 21:26:50 +0000
@@ -19,7 +19,9 @@
 
 #pragma once
 
+#include <map>
 #include <set>
+#include <vector>
 
 #include <mir_toolkit/mir_connection.h>
 #include <mir_toolkit/mir_prompt_session.h>
@@ -29,21 +31,33 @@
 
 class OverlayTrackerMir : public OverlayTrackerIface {
 private:
+	struct OverlayData {
+		std::string appid;
+		std::string instanceid;
+		std::shared_ptr<MirPromptSession> session;
+	};
+
 	GLib::ContextThread thread;
 	std::shared_ptr<MirConnection> mir;
-	std::set<std::tuple<std::string, std::string, std::shared_ptr<MirPromptSession>>> ongoingSessions;
+	std::map<std::string, std::vector<OverlayData>> ongoingSessions;
 
 public:
 	OverlayTrackerMir (); 
 	~OverlayTrackerMir (); 
 	bool addOverlay (const char * appid, unsigned long pid, const char * url) override;
+	bool badUrl (unsigned long pid, const char * url) override;
 
 private:
-	void removeSession (MirPromptSession * session);
-
-	static void sessionStateChangedStatic (MirPromptSession * session, MirPromptSessionState state, void * user_data);
-	void sessionStateChanged (MirPromptSession * session, MirPromptSessionState state);
-
-	static void untrustedHelperStoppedStatic (const gchar * appid, const gchar * instanceid, const gchar * helpertype, gpointer user_data);
-	void untrustedHelperStopped(const gchar * appid, const gchar * instanceid, const gchar * helpertype);
+	/* Overlay Functions */
+	void removeSession (const std::string &type, MirPromptSession * session);
+
+	static void badUrlSessionStateChangedStatic (MirPromptSession * session, MirPromptSessionState state, void * user_data);
+	static void overlaySessionStateChangedStatic (MirPromptSession * session, MirPromptSessionState state, void * user_data);
+	void sessionStateChanged (MirPromptSession * session, MirPromptSessionState state, const std::string &type);
+
+	static void overlayHelperStoppedStatic (const gchar * appid, const gchar * instanceid, const gchar * helpertype, gpointer user_data);
+	void overlayHelperStopped(const gchar * appid, const gchar * instanceid, const gchar * helpertype);
+
+	bool addOverlayCore (const gchar * helperid, const gchar * appid, unsigned long pid, const gchar * url, void (*stateChangedFunction) (MirPromptSession*, MirPromptSessionState, void *));
+
 };

=== modified file 'service/overlay-tracker.cpp'
--- service/overlay-tracker.cpp	2015-06-11 21:47:17 +0000
+++ service/overlay-tracker.cpp	2016-09-20 21:26:50 +0000
@@ -52,3 +52,12 @@
 
 	return reinterpret_cast<OverlayTrackerIface *>(tracker)->addOverlay(appid, pid, url) ? TRUE : FALSE;
 }
+
+gboolean
+overlay_tracker_badurl (OverlayTracker * tracker, unsigned long pid, const gchar * url) {
+	g_return_val_if_fail(tracker != nullptr, FALSE);
+	g_return_val_if_fail(pid != 0, FALSE);
+	g_return_val_if_fail(url != nullptr, FALSE);
+
+	return reinterpret_cast<OverlayTrackerIface *>(tracker)->badUrl(pid, url) ? TRUE : FALSE;
+}

=== modified file 'service/overlay-tracker.h'
--- service/overlay-tracker.h	2015-06-11 21:47:17 +0000
+++ service/overlay-tracker.h	2016-09-20 21:26:50 +0000
@@ -25,4 +25,5 @@
 OverlayTracker * overlay_tracker_new ();
 void overlay_tracker_delete (OverlayTracker * tracker);
 gboolean overlay_tracker_add (OverlayTracker * tracker, const char * appid, unsigned long pid, const char * url);
+gboolean overlay_tracker_badurl (OverlayTracker * tracker, unsigned long pid, const char * url);
 

=== added file 'service/scope-checker-facade.h'
--- service/scope-checker-facade.h	1970-01-01 00:00:00 +0000
+++ service/scope-checker-facade.h	2016-09-20 21:26:50 +0000
@@ -0,0 +1,27 @@
+/**
+ * Copyright © 2016 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#pragma once
+
+#include <unity-scopes.h>
+
+class RuntimeFacade {
+public:
+	RuntimeFacade () = default;
+	virtual ~RuntimeFacade () = default;
+	virtual unity::scopes::RegistryProxy registry () = 0;
+};

=== added file 'service/scope-checker.cpp'
--- service/scope-checker.cpp	1970-01-01 00:00:00 +0000
+++ service/scope-checker.cpp	2016-09-20 21:26:50 +0000
@@ -0,0 +1,114 @@
+/**
+ * Copyright © 2016 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+extern "C" {
+#include "scope-checker.h"
+#include <sys/apparmor.h>
+#include <ubuntu-app-launch.h>
+}
+
+#include <unity-scopes.h>
+#include "scope-checker-facade.h"
+
+class RuntimeReal : public RuntimeFacade {
+public:
+	unity::scopes::Runtime::UPtr runtime;
+	RuntimeReal () {
+		runtime = unity::scopes::Runtime::create();
+	}
+
+	unity::scopes::RegistryProxy registry () override {
+		return runtime->registry();
+	}
+};
+
+ScopeChecker *
+scope_checker_new ()
+{
+	auto fu_runtime = new RuntimeReal();
+	return reinterpret_cast<ScopeChecker *>(fu_runtime);
+}
+
+void
+scope_checker_delete (ScopeChecker * checker)
+{
+	auto runtime = reinterpret_cast<RuntimeFacade *>(checker);
+	delete runtime;
+}
+
+bool
+scope_checker_is_scope (ScopeChecker * checker, const char * appid)
+{
+	if (checker == nullptr) {
+		g_warning("%s:%d: Checker is '(null)'", __FILE__, __LINE__);
+		return false;
+	}
+	if (appid == nullptr) {
+		g_warning("%s:%d: appid is '(null)'", __FILE__, __LINE__);
+		return false;
+	}
+
+	auto runtime = reinterpret_cast<RuntimeFacade *>(checker);
+
+	try {
+		auto registry = runtime->registry();
+		registry->get_metadata(appid);
+		return true;
+	} catch (unity::scopes::NotFoundException e) {
+		return false;
+	} catch (...) {
+		g_warning("Unable to read the Unity Scopes Registry");
+		return false;
+	}
+}
+
+bool
+scope_checker_is_scope_pid (ScopeChecker * checker, pid_t pid)
+{
+	if (pid == 0)
+		return false;
+
+	char * aa = nullptr;
+	if (aa_gettaskcon(pid, &aa, nullptr) != 0) {
+		return false;
+	}
+
+	if (aa == nullptr)
+		return false;
+
+	std::string appid(aa);
+	free(aa);
+
+	if (appid == "unconfined") {
+		/* We're not going to support unconfined scopes, too hard */
+		return false;
+	}
+
+	gchar * pkg = nullptr;
+	gchar * app = nullptr;
+	if (ubuntu_app_launch_app_id_parse(appid.c_str(), &pkg, &app, nullptr)) {
+		appid= pkg;
+		appid += "_";
+		appid += app;
+
+		g_free(pkg);
+		g_free(app);
+	}
+
+	g_debug("PID %d is short App ID %s", pid, appid.c_str());
+	return scope_checker_is_scope(checker, appid.c_str());
+}

=== added file 'service/scope-checker.h'
--- service/scope-checker.h	1970-01-01 00:00:00 +0000
+++ service/scope-checker.h	2016-09-20 21:26:50 +0000
@@ -0,0 +1,29 @@
+/**
+ * Copyright © 2016 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#pragma once
+
+#include <sys/types.h>
+#include <stdbool.h>
+
+typedef struct _ScopeChecker ScopeChecker;
+
+ScopeChecker * scope_checker_new ();
+void scope_checker_delete (ScopeChecker * checker);
+bool scope_checker_is_scope (ScopeChecker * checker, const char * appid);
+bool scope_checker_is_scope_pid (ScopeChecker * checker, pid_t pid);
+

=== modified file 'service/service.c'
--- service/service.c	2015-09-03 21:50:06 +0000
+++ service/service.c	2016-09-20 21:26:50 +0000
@@ -40,7 +40,14 @@
 	guint term_source = g_unix_signal_add(SIGTERM, sig_term, mainloop);
 
 	OverlayTracker * tracker = overlay_tracker_new();
-	if (!dispatcher_init(mainloop, tracker)) {
+
+	ScopeChecker * checker = NULL;
+	/* Allow disabing for testing */
+	if (g_getenv("URL_DISPATCHER_DISABLE_SCOPE_CHECKING") == NULL)
+		checker = scope_checker_new();
+
+	/* Initialize Dispatcher */
+	if (!dispatcher_init(mainloop, tracker, checker)) {
 		return -1;
 	}
 
@@ -50,6 +57,7 @@
 	/* Clean up globals */
 	dispatcher_shutdown();
 	overlay_tracker_delete(tracker);
+	scope_checker_delete(checker);
 	g_source_remove(term_source);
 	g_main_loop_unref(mainloop);
 

=== added directory 'service/url-overlay'
=== added file 'service/url-overlay/CMakeLists.txt'
--- service/url-overlay/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ service/url-overlay/CMakeLists.txt	2016-09-20 21:26:50 +0000
@@ -0,0 +1,14 @@
+
+###########################
+# URL Overlay Exec Tool
+###########################
+
+add_executable(url-overlay-exec-tool exec-tool.c ../recoverable-problem.c)
+set_target_properties(url-overlay-exec-tool PROPERTIES OUTPUT_NAME "exec-tool")
+target_link_libraries(url-overlay-exec-tool ${GIO2_LIBRARIES} ${UBUNTU_APP_LAUNCH_LIBRARIES} ${CLICK_LIBRARIES})
+
+install(
+  TARGETS url-overlay-exec-tool
+  RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_LIBEXECDIR}/ubuntu-app-launch/url-overlay"
+)
+

=== renamed file 'service/url-overlay.c' => 'service/url-overlay/exec-tool.c'
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2015-06-11 21:38:13 +0000
+++ tests/CMakeLists.txt	2016-09-20 21:26:50 +0000
@@ -25,6 +25,8 @@
 ###########################
 
 add_library(mock-lib STATIC
+	apparmor-mock.h
+	apparmor-mock.c
 	recoverable-problem-mock.c
 	ubuntu-app-launch-mock.h
 	ubuntu-app-launch-mock.c)
@@ -62,6 +64,7 @@
 	mock-lib
 	gtest
 	${UBUNTU_APP_LAUNCH_LIBRARIES}
+	${DBUSTEST_LIBRARIES}
 	${GTEST_LIBS})
 
 add_test (dispatcher-test dispatcher-test)

=== modified file 'tests/app-id-test.cc'
--- tests/app-id-test.cc	2015-05-15 21:24:15 +0000
+++ tests/app-id-test.cc	2016-09-20 21:26:50 +0000
@@ -23,6 +23,8 @@
 #include "ubuntu-app-launch-mock.h"
 #include "overlay-tracker-mock.h"
 
+#include "ubuntu-app-launch/registry.h"
+
 class AppIdTest : public ::testing::Test
 {
 	private:
@@ -33,9 +35,20 @@
 
 	protected:
 		virtual void SetUp() {
+			/* Click DB Config */
 			g_setenv("TEST_CLICK_DB", "click-db", TRUE);
 			g_setenv("TEST_CLICK_USER", "test-user", TRUE);
 
+			/* Make sure we don't use the local snapd */
+			g_setenv("UBUNTU_APP_LAUNCH_SNAPD_SOCKET", "/this/should/not/exist", TRUE);
+
+			/* UAL Desktop Hook check */
+			g_setenv("UBUNTU_APP_LAUNCH_LINK_FARM", CMAKE_SOURCE_DIR "/tests/ual-link-farm", TRUE);
+
+			/* XDG Data home for libertine */
+			g_setenv("XDG_DATA_HOME", CMAKE_SOURCE_DIR "/tests/xdg-data", TRUE);
+			g_setenv("XDG_CACHE_HOME", CMAKE_SOURCE_DIR "/tests/xdg-cache", TRUE);
+
 			cachedir = g_build_filename(CMAKE_BINARY_DIR, "app-id-test-cache", nullptr);
 			g_setenv("URL_DISPATCHER_CACHE_DIR", cachedir, TRUE);
 
@@ -43,13 +56,14 @@
 			g_test_dbus_up(testbus);
 
 			mainloop = g_main_loop_new(nullptr, FALSE);
-			dispatcher_init(mainloop, reinterpret_cast<OverlayTracker *>(&tracker));
+			dispatcher_init(mainloop, reinterpret_cast<OverlayTracker *>(&tracker), nullptr);
 
 			return;
 		}
 
 		virtual void TearDown() {
 			dispatcher_shutdown();
+			ubuntu::app_launch::Registry::clearDefault();
 
 			/* Clean up queued events */
 			while (g_main_pending()) {
@@ -88,6 +102,18 @@
 	g_clear_pointer(&out_appid, g_free);
 	out_url = nullptr;
 
+	/* App ID with periods */
+	dispatcher_url_to_appid("appid://container-id/org.canonical.app1/0.0", &out_appid, &out_url);
+	ASSERT_STREQ("container-id_org.canonical.app1_0.0", out_appid);
+	EXPECT_EQ(nullptr, out_url);
+
+	dispatcher_send_to_app(out_appid, out_url);
+	EXPECT_STREQ("container-id_org.canonical.app1_0.0", ubuntu_app_launch_mock_get_last_app_id());
+
+	ubuntu_app_launch_mock_clear_last_app_id();
+	g_clear_pointer(&out_appid, g_free);
+	out_url = nullptr;
+
 	/* No version at all */
 	dispatcher_url_to_appid("appid://com.test.good/app1", &out_appid, &out_url);
 
@@ -199,31 +225,3 @@
 
 	return;
 }
-
-TEST_F(AppIdTest, BadDirectory)
-{
-	gchar * out_appid = nullptr;
-	const gchar * out_url = nullptr;
-
-	g_setenv("TEST_CLICK_DB", "not-click-db", TRUE);
-
-	dispatcher_url_to_appid("appid://com.test.good/app1/current-user-version", &out_appid, &out_url);
-
-	EXPECT_EQ(nullptr, out_appid);
-	EXPECT_EQ(nullptr, out_url);
-
-	return;
-}
-
-TEST_F(AppIdTest, BadUser)
-{
-	gchar * out_appid = nullptr;
-	const gchar * out_url = nullptr;
-
-	g_setenv("TEST_CLICK_USER", "not-test-user", TRUE);
-
-	dispatcher_url_to_appid("appid://com.test.good/app1/current-user-version", &out_appid, &out_url);
-
-	EXPECT_EQ(nullptr, out_appid);
-	EXPECT_EQ(nullptr, out_url);
-}

=== added file 'tests/apparmor-mock.c'
--- tests/apparmor-mock.c	1970-01-01 00:00:00 +0000
+++ tests/apparmor-mock.c	2016-09-20 21:26:50 +0000
@@ -0,0 +1,36 @@
+/**
+ * Copyright © 2015 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <glib.h>
+#include <sys/apparmor.h>
+
+const char * aa_mock_gettask_profile = NULL;
+
+int aa_gettaskcon (pid_t pid, char ** profile, char ** mode)
+{
+	g_debug("Gettask Con '%s'", aa_mock_gettask_profile);
+
+	if (aa_mock_gettask_profile == NULL) {
+		return 1;
+	}
+
+	if (profile != NULL) {
+		*profile = g_strdup(aa_mock_gettask_profile);
+	}
+
+	return 0;
+}

=== added file 'tests/apparmor-mock.h'
--- tests/apparmor-mock.h	1970-01-01 00:00:00 +0000
+++ tests/apparmor-mock.h	2016-09-20 21:26:50 +0000
@@ -0,0 +1,20 @@
+/**
+ * Copyright © 2015 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#pragma once
+
+extern const char * aa_mock_gettask_profile;

=== modified file 'tests/click-data/manifests/com.test.good.manifest'
--- tests/click-data/manifests/com.test.good.manifest	2013-09-18 04:16:51 +0000
+++ tests/click-data/manifests/com.test.good.manifest	2016-09-20 21:26:50 +0000
@@ -3,7 +3,7 @@
 	"name": "com.test.good",
 	"hooks": {
 		"app1": {
-			"test": "test"
+			"desktop": "app1.desktop"
 		}
 	}
 }

=== modified file 'tests/click-data/manifests/com.test.multiple.manifest'
--- tests/click-data/manifests/com.test.multiple.manifest	2013-09-26 20:30:45 +0000
+++ tests/click-data/manifests/com.test.multiple.manifest	2016-09-20 21:26:50 +0000
@@ -3,13 +3,13 @@
 	"name": "com.test.good",
 	"hooks": {
 		"app-first": {
-			"test": "test"
+			"desktop": "app-first.desktop"
 		},
 		"app-middle": {
-			"test": "test"
+			"desktop": "app-middle.desktop"
 		},
 		"app-last": {
-			"test": "test"
+			"desktop": "app-last.desktop"
 		}
 	}
 }

=== modified file 'tests/dispatcher-test.cc'
--- tests/dispatcher-test.cc	2015-06-08 17:13:44 +0000
+++ tests/dispatcher-test.cc	2016-09-20 21:26:50 +0000
@@ -19,10 +19,13 @@
 
 #include <gio/gio.h>
 #include <gtest/gtest.h>
+#include <libdbustest/dbus-test.h>
 #include "dispatcher.h"
 #include "ubuntu-app-launch-mock.h"
 #include "overlay-tracker-mock.h"
 #include "url-db.h"
+#include "scope-mock.h"
+#include "apparmor-mock.h"
 
 class DispatcherTest : public ::testing::Test
 {
@@ -33,6 +36,7 @@
 
 	protected:
 		OverlayTrackerMock tracker;
+		RuntimeMock scope_runtime;
 		GDBusConnection * session = nullptr;
 
 		virtual void SetUp() {
@@ -66,6 +70,9 @@
 			url_db_set_file_motification_time(db, "/testdir/intenter.url-dispatcher", &timestamp);
 			url_db_insert_url(db, "/testdir/intenter.url-dispatcher", "intent", "my.android.package");
 
+			url_db_set_file_motification_time(db, "/testdir/scoper.url-dispatcher", &timestamp);
+			url_db_insert_url(db, "/testdir/scoper.url-dispatcher", "scope", nullptr);
+
 			sqlite3_close(db);
 
 			testbus = g_test_dbus_new(G_TEST_DBUS_NONE);
@@ -74,7 +81,7 @@
 			session = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
 
 			mainloop = g_main_loop_new(nullptr, FALSE);
-			dispatcher_init(mainloop, reinterpret_cast<OverlayTracker *>(&tracker));
+			dispatcher_init(mainloop, reinterpret_cast<OverlayTracker *>(&tracker), reinterpret_cast<ScopeChecker *>(&scope_runtime));
 
 			return;
 		}
@@ -90,6 +97,7 @@
 			g_main_loop_unref(mainloop);
 
 			ubuntu_app_launch_mock_clear_last_app_id();
+			scope_runtime.clearExceptions();
 
 			/* let other threads settle */
 			g_usleep(500000);
@@ -260,6 +268,42 @@
 	return;
 }
 
+DbusTestDbusMock *
+setupUpstartMock ()
+{
+	auto mock = dbus_test_dbus_mock_new("com.ubuntu.Upstart");
+	auto obj = dbus_test_dbus_mock_get_object(mock, "/com/ubuntu/Upstart", "com.ubuntu.Upstart0_6", nullptr);
+
+	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 */
+		nullptr); /* error */
+
+	auto jobobj = dbus_test_dbus_mock_get_object(mock, "/job", "com.ubuntu.Upstart0_6.Job", nullptr);
+
+	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 */
+
+	auto 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_task_set_name(DBUS_TEST_TASK(mock), "Upstart");
+	dbus_test_task_run(DBUS_TEST_TASK(mock));
+
+	return mock;
+}
+
 TEST_F(DispatcherTest, OverlayTest)
 {
 	EXPECT_TRUE(dispatcher_is_overlay("com.test.good_application_1.2.3"));
@@ -272,5 +316,44 @@
 	EXPECT_EQ(getpid(), std::get<1>(tracker.addedOverlays[0]));
 	EXPECT_EQ("overlay://ubuntu.com", std::get<2>(tracker.addedOverlays[0]));
 
+	tracker.addedOverlays.clear();
+	aa_mock_gettask_profile = "simplescope.scopemaster_simplescope_1.2.3";
+
+	auto upstartMock = setupUpstartMock();
+
+	EXPECT_TRUE(dispatcher_send_to_overlay ("com.test.good_application_1.2.3", "overlay://ubuntu.com", session, g_dbus_connection_get_unique_name(session)));
+
+	ASSERT_EQ(1, tracker.addedOverlays.size());
+	EXPECT_EQ("com.test.good_application_1.2.3", std::get<0>(tracker.addedOverlays[0]));
+	EXPECT_EQ(1234, std::get<1>(tracker.addedOverlays[0]));
+	EXPECT_EQ("overlay://ubuntu.com", std::get<2>(tracker.addedOverlays[0]));
+
+	g_object_unref(upstartMock);
+
 	return;
 }
+
+TEST_F(DispatcherTest, ScopeTest)
+{
+	gchar * out_appid = nullptr;
+
+	unity::scopes::NotFoundException scopeException("test", "badscope");
+	scope_runtime.addException("badscope.scopemaster_badscope", scopeException);
+	std::invalid_argument invalidException("confused");
+	scope_runtime.addException("confusedscope.scopemaster_confusedscope", invalidException);
+
+	/* Good sanity check */
+	dispatcher_url_to_appid("scope://simplescope.scopemaster_simplescope", &out_appid, nullptr);
+	EXPECT_STREQ("scoper", out_appid);
+	g_free(out_appid);
+
+	/* Bad scope */
+	dispatcher_url_to_appid("scope://badscope.scopemaster_badscope", &out_appid, nullptr);
+	EXPECT_STRNE("scoper", out_appid);
+	g_free(out_appid);
+
+	/* Confused scope */
+	dispatcher_url_to_appid("scope://confusedscope.scopemaster_confusedscope", &out_appid, nullptr);
+	EXPECT_STRNE("scoper", out_appid);
+	g_free(out_appid);
+}

=== modified file 'tests/overlay-tracker-mock.h'
--- tests/overlay-tracker-mock.h	2015-05-19 20:24:47 +0000
+++ tests/overlay-tracker-mock.h	2016-09-20 21:26:50 +0000
@@ -22,9 +22,15 @@
 {
 	public:
 		std::vector<std::tuple<std::string, unsigned long, std::string>> addedOverlays;
+		std::vector<std::pair<unsigned long, std::string>> addedBadUrl;
 
 		bool addOverlay (const char * appid, unsigned long pid, const char * url) {
 			addedOverlays.push_back(std::make_tuple(std::string(appid), pid, std::string(url)));
 			return true;
 		}
+
+		bool badUrl (unsigned long pid, const char * url) {
+			addedBadUrl.push_back(std::make_pair(pid, std::string(url)));
+			return true;
+		}
 };

=== modified file 'tests/overlay-tracker-test.cpp'
--- tests/overlay-tracker-test.cpp	2015-05-19 20:24:47 +0000
+++ tests/overlay-tracker-test.cpp	2016-09-20 21:26:50 +0000
@@ -95,23 +95,43 @@
 	}
 }
 
-TEST_F(OverlayTrackerTest, UALSignalStop) {
-	OverlayTrackerMir tracker;
+void
+ualStop (const char * helper_type, std::function<bool(OverlayTrackerMir *)> addFunc)
+{
+	auto tracker = new OverlayTrackerMir();
 
 	/* Call with the overlay before it is set */
-	ubuntu_app_launch_mock_observer_helper_stop_func("app-id", "instance", "url-overlay", ubuntu_app_launch_mock_observer_helper_stop_user_data);
+	ubuntu_app_launch_mock_observer_helper_stop_func("app-id", "instance", helper_type, ubuntu_app_launch_mock_observer_helper_stop_user_data);
 
-	EXPECT_TRUE(tracker.addOverlay("app-id", 5, "http://no-name-yet.com"));
+	EXPECT_TRUE(addFunc(tracker));
 
 	mir_mock_last_released_session = nullptr;
-	ubuntu_app_launch_mock_observer_helper_stop_func("app-id", "instance", "url-overlay", ubuntu_app_launch_mock_observer_helper_stop_user_data);
+	ubuntu_app_launch_mock_observer_helper_stop_func("app-id", "instance", helper_type, ubuntu_app_launch_mock_observer_helper_stop_user_data);
+
+	delete tracker;
+
 	EXPECT_NE(nullptr, mir_mock_last_released_session);
 }
 
-TEST_F(OverlayTrackerTest, MirSignalStop) {
-	OverlayTrackerMir tracker;
-
-	EXPECT_TRUE(tracker.addOverlay("app-id", 5, "http://no-name-yet.com"));
+TEST_F(OverlayTrackerTest, UALSignalStop) {
+	ualStop("url-overlay", [](OverlayTrackerMir * tracker) {
+		return tracker->addOverlay("app-id", 5, "http://no-name-yet.com");
+	});
+	ualStop("bad-url", [](OverlayTrackerMir * tracker) {
+		return tracker->badUrl(5, "http://no-name-yet.com");
+	});
+}
+
+void
+mirStop (const char * helper_type, const char * appid, std::function<bool(OverlayTrackerMir *)> addFunc)
+{
+	g_clear_pointer(&ubuntu_app_launch_mock_last_stop_helper, g_free);
+	g_clear_pointer(&ubuntu_app_launch_mock_last_stop_appid, g_free);
+	g_clear_pointer(&ubuntu_app_launch_mock_last_stop_instance, g_free);
+
+	auto tracker = new OverlayTrackerMir();
+
+	EXPECT_TRUE(addFunc(tracker));
 
 	/* Try a badie */
 	mir_mock_last_trust_func((MirPromptSession *)1337, mir_prompt_session_state_stopped, mir_mock_last_trust_data);
@@ -119,9 +139,18 @@
 	EXPECT_NE(nullptr, mir_mock_last_trust_func);
 	mir_mock_last_trust_func(mir_mock_valid_trust_session, mir_prompt_session_state_stopped, mir_mock_last_trust_data);
 
-	pause(100);
+	delete tracker;
 
-	EXPECT_STREQ("url-overlay", ubuntu_app_launch_mock_last_stop_helper);
-	EXPECT_STREQ("app-id", ubuntu_app_launch_mock_last_stop_appid);
+	EXPECT_STREQ(helper_type, ubuntu_app_launch_mock_last_stop_helper);
+	EXPECT_STREQ(appid, ubuntu_app_launch_mock_last_stop_appid);
 	EXPECT_STREQ("instance", ubuntu_app_launch_mock_last_stop_instance);
 }
+
+TEST_F(OverlayTrackerTest, MirSignalStop) {
+	mirStop("url-overlay", "app-id", [](OverlayTrackerMir * tracker) {
+		return tracker->addOverlay("app-id", 5, "http://no-name-yet.com");
+	});
+	mirStop("bad-url", "url-dispatcher-bad-url-helper", [](OverlayTrackerMir * tracker) {
+		return tracker->badUrl(5, "http://no-name-yet.com");
+	});
+}

=== added file 'tests/scope-mock.h'
--- tests/scope-mock.h	1970-01-01 00:00:00 +0000
+++ tests/scope-mock.h	2016-09-20 21:26:50 +0000
@@ -0,0 +1,95 @@
+/**
+ * Copyright © 2015 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <unity-scopes.h>
+#include <unity/scopes/testing/ScopeMetadataBuilder.h>
+
+#include "scope-checker-facade.h"
+
+class unity::scopes::internal::ScopeMetadataImpl {
+public:
+	ScopeMetadataImpl () { }
+	virtual ~ScopeMetadataImpl () {}
+
+};
+
+/********
+  TODO: Look at replacing this with: #include <unity/scopes/testing/MockRegistry.h>
+ *******/
+
+class RegistryMock : public virtual unity::scopes::Registry
+{
+	std::shared_ptr<std::map<std::string, std::exception>> scopeExceptions;
+
+public:
+	RegistryMock (std::shared_ptr<std::map<std::string, std::exception>> inexceptions)
+		: scopeExceptions(inexceptions)
+	{
+	}
+
+	unity::scopes::ScopeMetadata get_metadata(std::string const& scope_id) override {
+		std::cout << "Getting Metadata" << std::endl;
+		try {
+			auto exp = scopeExceptions->at(scope_id);
+			throw exp;
+		} catch (std::out_of_range e) {
+			unity::scopes::testing::ScopeMetadataBuilder builder;
+			builder.scope_id(scope_id);
+			std::shared_ptr<unity::scopes::Scope> foo((unity::scopes::Scope *)5, [](unity::scopes::Scope *) { return; });
+			builder.proxy(foo);
+			builder.display_name("foo");
+			builder.description("foo");
+			builder.author("foo");
+			return builder();
+		}
+	}
+
+	/* I hate C++ so much right now */
+	std::string endpoint() override { throw new std::invalid_argument("Not implemented"); }
+	std::string identity() override { throw new std::invalid_argument("Not implemented"); }
+	std::string target_category() override { throw new std::invalid_argument("Not implemented"); }
+	std::string to_string() override { throw new std::invalid_argument("Not implemented"); }
+	int64_t timeout() override { throw new std::invalid_argument("Not implemented"); }
+	unity::scopes::MetadataMap list() override { throw new std::invalid_argument("Not implemented"); }
+	unity::scopes::MetadataMap list_if(std::function<bool(unity::scopes::ScopeMetadata const& item)>) override { throw new std::invalid_argument("Not implemented"); }
+	bool is_scope_running(std::string const&) override { throw new std::invalid_argument("Not implemented"); }
+	core::ScopedConnection set_scope_state_callback(std::string const&, std::function<void(bool is_running)>) override { throw new std::invalid_argument("Not implemented"); }
+	core::ScopedConnection set_list_update_callback(std::function<void()>) override { throw new std::invalid_argument("Not implemented"); }
+};
+
+class RuntimeMock : public RuntimeFacade
+{
+	std::shared_ptr<std::map<std::string, std::exception>> scopeExceptions;
+
+public:
+	RuntimeMock() {
+		scopeExceptions = std::make_shared<std::map<std::string, std::exception>>();
+	}
+
+	unity::scopes::RegistryProxy registry () {
+		return std::make_shared<RegistryMock>(scopeExceptions);
+	}
+
+	void clearExceptions() {
+		scopeExceptions->clear();
+	}
+
+	void addException (std::string scopeid, std::exception exp) {
+		(*scopeExceptions)[scopeid] = exp;
+	}
+};
+

=== modified file 'tests/service-test.cc'
--- tests/service-test.cc	2015-05-20 16:27:27 +0000
+++ tests/service-test.cc	2016-09-20 21:26:50 +0000
@@ -38,6 +38,7 @@
 		virtual void SetUp() {
 			g_setenv("UBUNTU_APP_LAUNCH_USE_SESSION", "1", TRUE);
 			g_setenv("URL_DISPATCHER_DISABLE_RECOVERABLE_ERROR", "1", TRUE);
+			g_setenv("URL_DISPATCHER_DISABLE_SCOPE_CHECKING", "1", TRUE);
 			g_setenv("XDG_DATA_DIRS", XDG_DATA_DIRS, TRUE);
 			g_setenv("LD_PRELOAD", MIR_MOCK_PATH, TRUE);
 
@@ -95,6 +96,10 @@
 		}
 
 		virtual void TearDown() {
+			gchar * cmdline = g_strdup_printf("kill -TERM %d", dbus_test_process_get_pid(dispatcher));
+			g_spawn_command_line_sync(cmdline, nullptr, nullptr, nullptr, nullptr);
+			g_free(cmdline);
+
 			g_clear_object(&dispatcher);
 			g_clear_object(&mock);
 			g_clear_object(&dashmock);
@@ -123,7 +128,7 @@
 			GTimeVal time = {0, 0};
 			time.tv_sec = 5;
 			url_db_set_file_motification_time(db, "/unity8-dash.url-dispatcher", &time);
-			url_db_insert_url(db, "/unity8-dash.url-dispatcher", "scope", nullptr);
+			url_db_insert_url(db, "/unity8-dash.url-dispatcher", "scopeish", nullptr);
 			sqlite3_close(db);
 		}
 
@@ -271,7 +276,7 @@
 	GMainLoop * main = g_main_loop_new(nullptr, FALSE);
 
 	/* Send an invalid URL */
-	url_dispatch_send("scope://foo-bar", simple_cb, main);
+	url_dispatch_send("scopeish://foo-bar", simple_cb, main);
 
 	/* Give it some time to send and reply */
 	g_main_loop_run(main);
@@ -288,7 +293,7 @@
 	calls = dbus_test_dbus_mock_object_get_method_calls(dashmock, fdoobj, "Open", &callslen, nullptr);
 
 	EXPECT_EQ(1, callslen);
-	EXPECT_TRUE(g_variant_equal(calls[0].params, g_variant_new_parsed("(['scope://foo-bar'], @a{sv} {})")));
+	EXPECT_TRUE(g_variant_equal(calls[0].params, g_variant_new_parsed("(['scopeish://foo-bar'], @a{sv} {})")));
 
 	EXPECT_EQ(1, focus_count);
 

=== modified file 'tests/test-config.h.in'
--- tests/test-config.h.in	2015-06-08 16:39:15 +0000
+++ tests/test-config.h.in	2016-09-20 21:26:50 +0000
@@ -11,6 +11,6 @@
 #define UPDATE_DIRECTORY_VARIED "@CMAKE_CURRENT_SOURCE_DIR@/test-urls-varied"
 #define UPDATE_DIRECTORY_INTENT "@CMAKE_CURRENT_SOURCE_DIR@/test-urls-intent"
 #define OVERLAY_TEST_DIR "@CMAKE_CURRENT_SOURCE_DIR@/overlay-dir"
-#define EXEC_TOOL "@CMAKE_BINARY_DIR@/service/exec-tool"
+#define EXEC_TOOL "@CMAKE_BINARY_DIR@/service/url-overlay/exec-tool"
 #define MIR_MOCK_PATH "@CMAKE_CURRENT_BINARY_DIR@/libmir-mock.so"
 #define CLICK_DATA_DIR "@CMAKE_CURRENT_SOURCE_DIR@/click-data"

=== added directory 'tests/ual-link-farm'
=== added file 'tests/ual-link-farm/com.test.good_app1_1.2.3.desktop'
--- tests/ual-link-farm/com.test.good_app1_1.2.3.desktop	1970-01-01 00:00:00 +0000
+++ tests/ual-link-farm/com.test.good_app1_1.2.3.desktop	2016-09-20 21:26:50 +0000
@@ -0,0 +1,1 @@
+Needs to exist

=== added file 'tests/ual-link-farm/com.test.multiple_app-first_1.2.3.desktop'
--- tests/ual-link-farm/com.test.multiple_app-first_1.2.3.desktop	1970-01-01 00:00:00 +0000
+++ tests/ual-link-farm/com.test.multiple_app-first_1.2.3.desktop	2016-09-20 21:26:50 +0000
@@ -0,0 +1,1 @@
+Needs to exist

=== added directory 'tests/xdg-cache'
=== added directory 'tests/xdg-cache/libertine-container'
=== added directory 'tests/xdg-cache/libertine-container/container-id'
=== added directory 'tests/xdg-cache/libertine-container/container-id/rootfs'
=== added directory 'tests/xdg-cache/libertine-container/container-id/rootfs/usr'
=== added directory 'tests/xdg-cache/libertine-container/container-id/rootfs/usr/share'
=== added directory 'tests/xdg-cache/libertine-container/container-id/rootfs/usr/share/applications'
=== added file 'tests/xdg-cache/libertine-container/container-id/rootfs/usr/share/applications/org.canonical.app1.desktop'
--- tests/xdg-cache/libertine-container/container-id/rootfs/usr/share/applications/org.canonical.app1.desktop	1970-01-01 00:00:00 +0000
+++ tests/xdg-cache/libertine-container/container-id/rootfs/usr/share/applications/org.canonical.app1.desktop	2016-09-20 21:26:50 +0000
@@ -0,0 +1,4 @@
+[Desktop File]
+Name=App1
+Exec=app1
+Icon=app1.png

=== modified file 'tests/xdg-data/applications/foo-bar.desktop'
--- tests/xdg-data/applications/foo-bar.desktop	2014-09-17 22:12:21 +0000
+++ tests/xdg-data/applications/foo-bar.desktop	2016-09-20 21:26:50 +0000
@@ -2,3 +2,4 @@
 Name=Foo Bar
 Exec=foo-bar
 Type=Application
+Icon=foo-bar.png