Merge lp:~ralsina/ubuntu-push/merge-automatic into lp:ubuntu-push

[Roberto Alsina]

Latest changes from automatic

Latest changes from automatic:

* Use url-dispatcher C API
* Avoid busy-loop if powerd doesn't reply

[lp:~ralsina/ubuntu-push/merge-automatic]

127. By Roberto Alsina on 2014-09-02

Latest changes from automatic

=== modified file 'PACKAGE_DEPS'
--- PACKAGE_DEPS	2014-07-03 10:51:42 +0000
+++ PACKAGE_DEPS	2014-09-02 17:24:34 +0000
@@ -7,7 +7,7 @@
 libnih-dbus-dev
 libsqlite3-dev
 libubuntuoneauth-2.0-dev
-libwhoopsie-dev
 libmessaging-menu-dev
 libubuntu-app-launch2-dev
 libclick-0.4-dev
+liburl-dispatcher1-dev

=== removed directory 'bus/urldispatcher'
=== removed file 'bus/urldispatcher/urldispatcher.go'
--- bus/urldispatcher/urldispatcher.go	2014-07-25 21:50:53 +0000
+++ bus/urldispatcher/urldispatcher.go	1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-/*
- Copyright 2013-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/>.
-*/
-
-// Package urldispatcher wraps the url dispatcher's dbus api point
-package urldispatcher
-
-import (
-	"launchpad.net/ubuntu-push/bus"
-	"launchpad.net/ubuntu-push/click"
-	"launchpad.net/ubuntu-push/logger"
-)
-
-// UrlDispatcher lives on a well-known bus.Address
-var BusAddress bus.Address = bus.Address{
-	Interface: "com.canonical.URLDispatcher",
-	Path:      "/com/canonical/URLDispatcher",
-	Name:      "com.canonical.URLDispatcher",
-}
-
-// A URLDispatcher is a simple beast, with a single method that does what it
-// says on the box.
-type URLDispatcher interface {
-	DispatchURL(string, *click.AppId) error
-	TestURL(*click.AppId, []string) bool
-}
-
-type urlDispatcher struct {
-	endp bus.Endpoint
-	log  logger.Logger
-}
-
-// New builds a new URL dispatcher that uses the provided bus.Endpoint
-func New(endp bus.Endpoint, log logger.Logger) URLDispatcher {
-	return &urlDispatcher{endp, log}
-}
-
-var _ URLDispatcher = &urlDispatcher{} // ensures it conforms
-
-func (ud *urlDispatcher) DispatchURL(url string, app *click.AppId) error {
-	ud.log.Debugf("Dispatching %s", url)
-	err := ud.endp.Call("DispatchURL", bus.Args(url, app.DispatchPackage()))
-	if err != nil {
-		ud.log.Errorf("Dispatch to %s failed with %s", url, err)
-	}
-	return err
-}
-
-func (ud *urlDispatcher) TestURL(app *click.AppId, urls []string) bool {
-	ud.log.Debugf("TestURL: %s", urls)
-	var appIds []string
-	err := ud.endp.Call("TestURL", bus.Args(urls), &appIds)
-	if err != nil {
-		ud.log.Errorf("TestURL for %s failed with %s", urls, err)
-		return false
-	}
-	for _, appId := range appIds {
-		if appId != app.Versioned() {
-			ud.log.Debugf("Notification skipped because of different appid for actions: %v - %s != %s", urls, appId, app.Versioned())
-			return false
-		}
-	}
-	return true
-}

=== removed file 'bus/urldispatcher/urldispatcher_test.go'
--- bus/urldispatcher/urldispatcher_test.go	2014-07-25 16:55:55 +0000
+++ bus/urldispatcher/urldispatcher_test.go	1970-01-01 00:00:00 +0000
@@ -1,115 +0,0 @@
-/*
- Copyright 2013-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/>.
-*/
-
-package urldispatcher
-
-import (
-	. "launchpad.net/gocheck"
-	testibus "launchpad.net/ubuntu-push/bus/testing"
-	clickhelp "launchpad.net/ubuntu-push/click/testing"
-	helpers "launchpad.net/ubuntu-push/testing"
-	"launchpad.net/ubuntu-push/testing/condition"
-	"testing"
-)
-
-// hook up gocheck
-func TestUrldispatcher(t *testing.T) { TestingT(t) }
-
-type UDSuite struct {
-	log *helpers.TestLogger
-}
-
-var _ = Suite(&UDSuite{})
-
-func (s *UDSuite) SetUpTest(c *C) {
-	s.log = helpers.NewTestLogger(c, "debug")
-}
-
-func (s *UDSuite) TestDispatchURLWorks(c *C) {
-	endp := testibus.NewMultiValuedTestingEndpoint(nil, condition.Work(true), []interface{}{})
-	ud := New(endp, s.log)
-	appId := clickhelp.MustParseAppId("com.example.test_app_0.99")
-	err := ud.DispatchURL("this", appId)
-	c.Check(err, IsNil)
-}
-
-func (s *UDSuite) TestDispatchURLFailsIfCallFails(c *C) {
-	endp := testibus.NewTestingEndpoint(nil, condition.Work(false))
-	ud := New(endp, s.log)
-	appId := clickhelp.MustParseAppId("com.example.test_app_0.99")
-	err := ud.DispatchURL("this", appId)
-	c.Check(err, NotNil)
-}
-
-func (s *UDSuite) TestTestURLWorks(c *C) {
-	endp := testibus.NewMultiValuedTestingEndpoint(nil, condition.Work(true), []interface{}{[]string{"com.example.test_app_0.99"}})
-	ud := New(endp, s.log)
-	appId := clickhelp.MustParseAppId("com.example.test_app_0.99")
-	c.Check(ud.TestURL(appId, []string{"this"}), Equals, true)
-	c.Check(s.log.Captured(), Matches, `(?sm).*TestURL: \[this\].*`)
-}
-
-func (s *UDSuite) TestTestURLFailsIfCallFails(c *C) {
-	endp := testibus.NewTestingEndpoint(nil, condition.Work(false))
-	ud := New(endp, s.log)
-	appId := clickhelp.MustParseAppId("com.example.test_app_0.99")
-	c.Check(ud.TestURL(appId, []string{"this"}), Equals, false)
-}
-
-func (s *UDSuite) TestTestURLMultipleURLs(c *C) {
-	endp := testibus.NewTestingEndpoint(condition.Work(true), condition.Work(true), []string{"com.example.test_app_0.99", "com.example.test_app_0.99"})
-	ud := New(endp, s.log)
-	appId := clickhelp.MustParseAppId("com.example.test_app_0.99")
-	urls := []string{"potato://test-app", "potato_a://foo"}
-	c.Check(ud.TestURL(appId, urls), Equals, true)
-	c.Check(s.log.Captured(), Matches, `(?sm).*TestURL: \[potato://test-app potato_a://foo\].*`)
-}
-
-func (s *UDSuite) TestTestURLWrongApp(c *C) {
-	endp := testibus.NewTestingEndpoint(condition.Work(true), condition.Work(true), []string{"com.example.test_test-app_0.1"})
-	ud := New(endp, s.log)
-	appId := clickhelp.MustParseAppId("com.example.test_app_0.99")
-	urls := []string{"potato://test-app"}
-	c.Check(ud.TestURL(appId, urls), Equals, false)
-	c.Check(s.log.Captured(), Matches, `(?sm).*Notification skipped because of different appid for actions: \[potato://test-app\] - com.example.test_test-app_0.1 != com.example.test_app_0.99`)
-}
-
-func (s *UDSuite) TestTestURLOneWrongApp(c *C) {
-	endp := testibus.NewTestingEndpoint(condition.Work(true), condition.Work(true), []string{"com.example.test_test-app_0", "com.example.test_test-app1"})
-	ud := New(endp, s.log)
-	appId := clickhelp.MustParseAppId("com.example.test_test-app_0")
-	urls := []string{"potato://test-app", "potato_a://foo"}
-	c.Check(ud.TestURL(appId, urls), Equals, false)
-	c.Check(s.log.Captured(), Matches, `(?sm).*Notification skipped because of different appid for actions: \[potato://test-app potato_a://foo\] - com.example.test_test-app1 != com.example.test_test-app.*`)
-}
-
-func (s *UDSuite) TestTestURLInvalidURL(c *C) {
-	endp := testibus.NewTestingEndpoint(condition.Work(true), condition.Work(false), []string{"com.example.test_test-app_0.1"})
-	ud := New(endp, s.log)
-	appId := clickhelp.MustParseAppId("com.example.test_app_0.2")
-	urls := []string{"notsupported://test-app"}
-	c.Check(ud.TestURL(appId, urls), Equals, false)
-	c.Check(s.log.Captured(), Matches, `(?sm).*TestURL for \[notsupported://test-app\] failed with no way.*`)
-}
-
-func (s *UDSuite) TestTestURLLegacyApp(c *C) {
-	endp := testibus.NewTestingEndpoint(condition.Work(true), condition.Work(true), []string{"ubuntu-system-settings"})
-	ud := New(endp, s.log)
-	appId := clickhelp.MustParseAppId("_ubuntu-system-settings")
-	urls := []string{"settings://test-app"}
-	c.Check(ud.TestURL(appId, urls), Equals, true)
-	c.Check(s.log.Captured(), Matches, `(?sm).*TestURL: \[settings://test-app\].*`)
-}

=== modified file 'client/service/postal.go'
--- client/service/postal.go	2014-08-08 10:15:07 +0000
+++ client/service/postal.go	2014-09-02 17:24:34 +0000
@@ -27,7 +27,6 @@
 	"launchpad.net/ubuntu-push/bus/emblemcounter"
 	"launchpad.net/ubuntu-push/bus/haptic"
 	"launchpad.net/ubuntu-push/bus/notifications"
-	"launchpad.net/ubuntu-push/bus/urldispatcher"
 	"launchpad.net/ubuntu-push/bus/windowstack"
 	"launchpad.net/ubuntu-push/click"
 	"launchpad.net/ubuntu-push/click/cblacklist"
@@ -37,6 +36,7 @@
 	"launchpad.net/ubuntu-push/messaging/reply"
 	"launchpad.net/ubuntu-push/nih"
 	"launchpad.net/ubuntu-push/sounds"
+	"launchpad.net/ubuntu-push/urldispatcher"
 	"launchpad.net/ubuntu-push/util"
 )
 
@@ -76,7 +76,6 @@
 	EmblemCounterEndp bus.Endpoint
 	HapticEndp        bus.Endpoint
 	NotificationsEndp bus.Endpoint
-	URLDispatcherEndp bus.Endpoint
 	WindowStackEndp   bus.Endpoint
 	// presenters:
 	Presenters    []Presenter
@@ -116,7 +115,6 @@
 	svc.NotificationsEndp = bus.SessionBus.Endpoint(notifications.BusAddress, log)
 	svc.EmblemCounterEndp = bus.SessionBus.Endpoint(emblemcounter.BusAddress, log)
 	svc.HapticEndp = bus.SessionBus.Endpoint(haptic.BusAddress, log)
-	svc.URLDispatcherEndp = bus.SessionBus.Endpoint(urldispatcher.BusAddress, log)
 	svc.WindowStackEndp = bus.SessionBus.Endpoint(windowstack.BusAddress, log)
 	svc.msgHandler = svc.messageHandler
 	svc.launchers = launch_helper.DefaultLaunchers(log)
@@ -153,7 +151,7 @@
 	if err != nil {
 		return err
 	}
-	svc.urlDispatcher = urldispatcher.New(svc.URLDispatcherEndp, svc.Log)
+	svc.urlDispatcher = urldispatcher.New(svc.Log)
 	svc.notifications = notifications.Raw(svc.NotificationsEndp, svc.Log)
 	svc.emblemCounter = emblemcounter.New(svc.EmblemCounterEndp, svc.Log)
 	svc.haptic = haptic.New(svc.HapticEndp, svc.Log, svc.fallbackVibration)
@@ -226,7 +224,6 @@
 		{"notifications", svc.NotificationsEndp},
 		{"emblemcounter", svc.EmblemCounterEndp},
 		{"haptic", svc.HapticEndp},
-		{"urldispatcher", svc.URLDispatcherEndp},
 		{"windowstack", svc.WindowStackEndp},
 	}
 	for _, endp := range endps {

=== modified file 'client/service/postal_test.go'
--- client/service/postal_test.go	2014-08-08 10:35:42 +0000
+++ client/service/postal_test.go	2014-09-02 17:24:34 +0000
@@ -18,11 +18,13 @@
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"sort"
+	"sync"
 	"time"
 
 	"launchpad.net/go-dbus/v1"
@@ -131,6 +133,33 @@
 	return id, nil
 }
 
+type fakeUrlDispatcher struct {
+	DispatchCalls      [][]string
+	TestURLCalls       []map[string][]string
+	NextTestURLResult  bool
+	DispatchShouldFail bool
+	Lock               sync.Mutex
+}
+
+func (fud *fakeUrlDispatcher) DispatchURL(url string, app *click.AppId) error {
+	fud.Lock.Lock()
+	defer fud.Lock.Unlock()
+	fud.DispatchCalls = append(fud.DispatchCalls, []string{url, app.DispatchPackage()})
+	if fud.DispatchShouldFail {
+		return errors.New("fail!")
+	}
+	return nil
+}
+
+func (fud *fakeUrlDispatcher) TestURL(app *click.AppId, urls []string) bool {
+	fud.Lock.Lock()
+	defer fud.Lock.Unlock()
+	var args = make(map[string][]string, 1)
+	args[app.DispatchPackage()] = urls
+	fud.TestURLCalls = append(fud.TestURLCalls, args)
+	return fud.NextTestURLResult
+}
+
 type postalSuite struct {
 	log          *helpers.TestLogger
 	cfg          *PostalServiceSetup
@@ -138,7 +167,6 @@
 	notifBus     bus.Endpoint
 	counterBus   bus.Endpoint
 	hapticBus    bus.Endpoint
-	urlDispBus   bus.Endpoint
 	winStackBus  bus.Endpoint
 	fakeLauncher *fakeHelperLauncher
 	getTempDir   func(string) (string, error)
@@ -166,7 +194,6 @@
 	ps.notifBus = testibus.NewTestingEndpoint(condition.Work(true), condition.Work(true))
 	ps.counterBus = testibus.NewTestingEndpoint(condition.Work(true), condition.Work(true))
 	ps.hapticBus = testibus.NewTestingEndpoint(condition.Work(true), condition.Work(true))
-	ps.urlDispBus = testibus.NewTestingEndpoint(condition.Work(true), condition.Work(true))
 	ps.winStackBus = testibus.NewTestingEndpoint(condition.Work(true), condition.Work(true), []windowstack.WindowsInfo{})
 	ps.fakeLauncher = &fakeHelperLauncher{ch: make(chan []byte)}
 	ps.blacklisted = false
@@ -199,7 +226,6 @@
 	pst.NotificationsEndp = ps.notifBus
 	pst.EmblemCounterEndp = ps.counterBus
 	pst.HapticEndp = ps.hapticBus
-	pst.URLDispatcherEndp = ps.urlDispBus
 	pst.WindowStackEndp = ps.winStackBus
 	pst.launchers = map[string]launch_helper.HelperLauncher{}
 	return pst
@@ -517,7 +543,6 @@
 	svc.EmblemCounterEndp = endp
 	svc.HapticEndp = endp
 	svc.NotificationsEndp = endp
-	svc.URLDispatcherEndp = ps.urlDispBus
 	svc.WindowStackEndp = ps.winStackBus
 	svc.launchers = map[string]launch_helper.HelperLauncher{}
 	svc.fallbackVibration = &launch_helper.Vibration{Pattern: []uint32{1}}
@@ -593,14 +618,20 @@
 
 func (ps *postalSuite) TestMessageHandlerInvalidAction(c *C) {
 	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
-	endp := testibus.NewTestingEndpoint(condition.Work(true), condition.Work(false), []string{"com.example.test_test-app"})
-	svc.URLDispatcherEndp = endp
 	c.Assert(svc.Start(), IsNil)
+	fakeDisp := new(fakeUrlDispatcher)
+	svc.urlDispatcher = fakeDisp
+	fakeDisp.NextTestURLResult = false
 	card := launch_helper.Card{Actions: []string{"notsupported://test-app"}}
 	output := &launch_helper.HelperOutput{Notification: &launch_helper.Notification{Card: &card}}
-	b := svc.messageHandler(clickhelp.MustParseAppId("com.example.test_test-app_0"), "", output)
+	appId := clickhelp.MustParseAppId("com.example.test_test-app_0")
+	b := svc.messageHandler(appId, "", output)
 	c.Check(b, Equals, false)
-	c.Check(ps.log.Captured(), Matches, `(?sm).*TestURL for \[notsupported://test-app\] failed with no way.*`)
+	fakeDisp.Lock.Lock()
+	defer fakeDisp.Lock.Unlock()
+	c.Assert(len(fakeDisp.DispatchCalls), Equals, 0)
+	c.Assert(len(fakeDisp.TestURLCalls), Equals, 1)
+	c.Assert(fakeDisp.TestURLCalls[0][appId.DispatchPackage()], DeepEquals, []string{"notsupported://test-app"})
 }
 
 func (ps *postalSuite) TestHandleActionsDispatches(c *C) {
@@ -608,6 +639,9 @@
 	fmm := new(fakeMM)
 	app, _ := click.ParseAppId("com.example.test_test-app")
 	c.Assert(svc.Start(), IsNil)
+	fakeDisp := new(fakeUrlDispatcher)
+	svc.urlDispatcher = fakeDisp
+	fakeDisp.NextTestURLResult = true
 	svc.messagingMenu = fmm
 	aCh := make(chan *notifications.RawAction)
 	rCh := make(chan *reply.MMActionReply)
@@ -620,18 +654,20 @@
 	}()
 	go svc.handleActions(aCh, rCh)
 	takeNextBool(bCh)
-	args := testibus.GetCallArgs(ps.urlDispBus)
-	c.Assert(args, HasLen, 1)
-	c.Check(args[0].Member, Equals, "DispatchURL")
-	c.Assert(args[0].Args, HasLen, 2)
-	c.Assert(args[0].Args[0], Equals, "potato://")
-	c.Assert(args[0].Args[1], Equals, app.DispatchPackage())
+	fakeDisp.Lock.Lock()
+	defer fakeDisp.Lock.Unlock()
+	c.Assert(len(fakeDisp.DispatchCalls), Equals, 1)
+	c.Assert(fakeDisp.DispatchCalls[0][0], Equals, "potato://")
+	c.Assert(fakeDisp.DispatchCalls[0][1], Equals, app.DispatchPackage())
 	c.Check(fmm.calls, DeepEquals, []string{"remove:xyzzy:true"})
 }
 
 func (ps *postalSuite) TestHandleMMUActionsDispatches(c *C) {
 	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
 	c.Assert(svc.Start(), IsNil)
+	fakeDisp := new(fakeUrlDispatcher)
+	svc.urlDispatcher = fakeDisp
+	fakeDisp.NextTestURLResult = true
 	app, _ := click.ParseAppId("com.example.test_test-app")
 	aCh := make(chan *notifications.RawAction)
 	rCh := make(chan *reply.MMActionReply)
@@ -644,21 +680,21 @@
 	}()
 	go svc.handleActions(aCh, rCh)
 	takeNextBool(bCh)
-	args := testibus.GetCallArgs(ps.urlDispBus)
-	c.Assert(args, HasLen, 1)
-	c.Check(args[0].Member, Equals, "DispatchURL")
-	c.Assert(args[0].Args, HasLen, 2)
-	c.Assert(args[0].Args[0], Equals, "potato://")
-	c.Assert(args[0].Args[1], Equals, app.DispatchPackage())
+	fakeDisp.Lock.Lock()
+	defer fakeDisp.Lock.Unlock()
+	c.Assert(len(fakeDisp.DispatchCalls), Equals, 1)
+	c.Assert(fakeDisp.DispatchCalls[0][0], Equals, "potato://")
+	c.Assert(fakeDisp.DispatchCalls[0][1], Equals, app.DispatchPackage())
 }
 
 func (ps *postalSuite) TestValidateActions(c *C) {
 	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
-	endp := testibus.NewTestingEndpoint(condition.Work(true), condition.Work(true), []string{"com.example.test_test-app_0"})
-	svc.URLDispatcherEndp = endp
 	c.Assert(svc.Start(), IsNil)
 	card := launch_helper.Card{Actions: []string{"potato://test-app"}}
 	notif := &launch_helper.Notification{Card: &card}
+	fakeDisp := new(fakeUrlDispatcher)
+	svc.urlDispatcher = fakeDisp
+	fakeDisp.NextTestURLResult = true
 	b := svc.validateActions(clickhelp.MustParseAppId("com.example.test_test-app_0"), notif)
 	c.Check(b, Equals, true)
 }

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-28 19:15:56 +0000
+++ debian/changelog	2014-09-02 17:24:34 +0000
@@ -1,3 +1,13 @@
+ubuntu-push (0.63.2) UNRELEASED; urgency=medium
+
+  [ Roberto Alsina ]
+  * Avoid busy-loop wben powerd doesn't respond.
+
+  [ Guillermo Gonzalez ]
+  * Replace DBus url-dispatcher API with liburl-dispatcher1 C API.
+
+ -- Roberto Alsina <ralsina@yoga>  Mon, 01 Sep 2014 11:25:49 -0300
+
 ubuntu-push (0.63.1+14.10.20140828-0ubuntu1) utopic; urgency=medium
 
   [ Samuele Pedroni ]

=== modified file 'debian/control'
--- debian/control	2014-08-12 00:32:32 +0000
+++ debian/control	2014-09-02 17:24:34 +0000
@@ -15,12 +15,12 @@
                libgcrypt11-dev,
                libglib2.0-dev (>= 2.31.6),
                libmessaging-menu-dev,
-               libwhoopsie-dev,
                libubuntu-app-launch2-dev,
                libubuntuoneauth-2.0-dev,
                libdbus-1-dev,
                libnih-dbus-dev,
                libclick-0.4-dev,
+               liburl-dispatcher1-dev,
                cmake,
                python3,
 Standards-Version: 3.9.5

=== modified file 'poller/poller.go'
--- poller/poller.go	2014-08-21 10:47:12 +0000
+++ poller/poller.go	2014-09-02 17:24:34 +0000
@@ -147,6 +147,8 @@
 	_, err := p.powerd.RequestWakeup("ubuntu push client", t)
 	if err != nil {
 		p.log.Errorf("RequestWakeup got %v", err)
+		// Don't do this too quickly. Pretend we are just skipping one wakeup
+		time.Sleep(p.times.AlarmInterval)
 		return lockCookie
 	}
 	p.log.Debugf("requested wakeup at %s", t)

=== modified file 'server/acceptance/acceptanceclient.go'
--- server/acceptance/acceptanceclient.go	2014-08-20 19:48:59 +0000
+++ server/acceptance/acceptanceclient.go	2014-09-02 17:24:34 +0000
@@ -23,6 +23,7 @@
 	"fmt"
 	"net"
 	"strings"
+	"sync"
 	"time"
 
 	"launchpad.net/ubuntu-push/protocol"
@@ -43,10 +44,27 @@
 	TLSConfig       *tls.Config
 	Prefix          string // prefix for events
 	Auth            string
+	cookie          string
+	cookieLock      sync.RWMutex
+	ReportSetParams bool
 	// connection
 	Connection net.Conn
 }
 
+// GetCookie gets the current cookie.
+func (sess *ClientSession) GetCookie() string {
+	sess.cookieLock.RLock()
+	defer sess.cookieLock.RUnlock()
+	return sess.cookie
+}
+
+// SetCookie sets the current cookie.
+func (sess *ClientSession) SetCookie(cookie string) {
+	sess.cookieLock.Lock()
+	defer sess.cookieLock.Unlock()
+	sess.cookie = cookie
+}
+
 // Dial connects to a server using the configuration in the
 // ClientSession and sets up the connection.
 func (sess *ClientSession) Dial() error {
@@ -75,6 +93,7 @@
 	protocol.BroadcastMsg
 	protocol.NotificationsMsg
 	protocol.ConnWarnMsg
+	protocol.SetParamsMsg
 }
 
 // Run the session with the server, emits a stream of events.
@@ -96,6 +115,7 @@
 			"channel": sess.ImageChannel,
 		},
 		Authorization: sess.Auth,
+		Cookie:        sess.GetCookie(),
 	})
 	if err != nil {
 		return err
@@ -156,6 +176,11 @@
 			events <- fmt.Sprintf("%sbroadcast chan:%v app:%v topLevel:%d payloads:%s", sess.Prefix, recv.ChanId, recv.AppId, recv.TopLevel, pack)
 		case "warn", "connwarn":
 			events <- fmt.Sprintf("%sconnwarn %s", sess.Prefix, recv.Reason)
+		case "setparams":
+			sess.SetCookie(recv.SetCookie)
+			if sess.ReportSetParams {
+				events <- sess.Prefix + "setparams"
+			}
 		}
 	}
 	return nil

=== modified file 'server/acceptance/suites/suite.go'
--- server/acceptance/suites/suite.go	2014-08-20 19:48:59 +0000
+++ server/acceptance/suites/suite.go	2014-09-02 17:24:34 +0000
@@ -37,15 +37,17 @@
 	ServerAddr     string
 	ServerHTTPAddr string
 	ServerEvents   <-chan string
+	// last started session
+	LastSession *acceptance.ClientSession
 }
 
 // Start a client.
 func (h *ServerHandle) StartClient(c *C, devId string, levels map[string]int64) (events <-chan string, errorCh <-chan error, stop func()) {
-	return h.StartClientAuth(c, devId, levels, "")
+	return h.StartClientAuth(c, devId, levels, "", "")
 }
 
 // Start a client with auth.
-func (h *ServerHandle) StartClientAuth(c *C, devId string, levels map[string]int64, auth string) (events <-chan string, errorCh <-chan error, stop func()) {
+func (h *ServerHandle) StartClientAuth(c *C, devId string, levels map[string]int64, auth string, cookie string) (events <-chan string, errorCh <-chan error, stop func()) {
 	errCh := make(chan error, 1)
 	cliEvents := make(chan string, 10)
 	sess := testClientSession(h.ServerAddr, devId, "m1", "img1", false)
@@ -54,8 +56,13 @@
 	if auth != "" {
 		sess.ExchangeTimeout = 5 * time.Second
 	}
+	if cookie != "" {
+		sess.SetCookie(cookie)
+		sess.ReportSetParams = true
+	}
 	err := sess.Dial()
 	c.Assert(err, IsNil)
+	h.LastSession = sess
 	clientShutdown := make(chan bool, 1) // abused as an atomic flag
 	intercept := func(ic *interceptingConn, op string, b []byte) (bool, int, error) {
 		// read after ack

=== modified file 'server/acceptance/suites/unicast.go'
--- server/acceptance/suites/unicast.go	2014-08-15 09:33:48 +0000
+++ server/acceptance/suites/unicast.go	2014-09-02 17:24:34 +0000
@@ -47,7 +47,7 @@
 		AppId:    "app1",
 	})
 	c.Assert(err, IsNil, Commentf("%v", res))
-	events, errCh, stop := s.StartClientAuth(c, "DEV1", nil, auth)
+	events, errCh, stop := s.StartClientAuth(c, "DEV1", nil, auth, "")
 	got, err := s.PostRequest("/notify", &api.Unicast{
 		Token:    res["token"].(string),
 		AppId:    "app1",
@@ -65,9 +65,9 @@
 	userId1, auth1 := s.associatedAuth("DEV1")
 	userId2, auth2 := s.associatedAuth("DEV2")
 	// start 1st client
-	events1, errCh1, stop1 := s.StartClientAuth(c, "DEV1", nil, auth1)
+	events1, errCh1, stop1 := s.StartClientAuth(c, "DEV1", nil, auth1, "")
 	// start 2nd client
-	events2, errCh2, stop2 := s.StartClientAuth(c, "DEV2", nil, auth2)
+	events2, errCh2, stop2 := s.StartClientAuth(c, "DEV2", nil, auth2, "")
 	// unicast to one and the other
 	got, err := s.PostRequest("/notify", &api.Unicast{
 		UserId:   userId1,
@@ -108,7 +108,7 @@
 	c.Assert(err, IsNil, Commentf("%v", got))
 
 	// get pending on connect
-	events, errCh, stop := s.StartClientAuth(c, "DEV1", nil, auth)
+	events, errCh, stop := s.StartClientAuth(c, "DEV1", nil, auth, "")
 	c.Check(NextEvent(events, errCh), Equals, `unicast app:app1 payload:{"a":42};`)
 	stop()
 	c.Assert(NextEvent(s.ServerEvents, nil), Matches, `.* ended with:.*EOF`)
@@ -130,7 +130,7 @@
 		c.Assert(err, IsNil, Commentf("%v", got))
 	}
 
-	events, errCh, stop := s.StartClientAuth(c, "DEV2", nil, auth)
+	events, errCh, stop := s.StartClientAuth(c, "DEV2", nil, auth, "")
 	// getting pending on connect
 	n := 0
 	for {
@@ -185,7 +185,7 @@
 	})
 	c.Assert(err, IsNil, Commentf("%v", got))
 
-	events, errCh, stop := s.StartClientAuth(c, "DEV2", nil, auth)
+	events, errCh, stop := s.StartClientAuth(c, "DEV2", nil, auth, "")
 	// getting the 1 pending on connect
 	c.Check(NextEvent(events, errCh), Equals, `unicast app:app1 payload:{"serial":1000};`)
 	stop()
@@ -218,7 +218,7 @@
 	})
 	c.Assert(err, IsNil, Commentf("%v", got))
 
-	events, errCh, stop := s.StartClientAuth(c, "DEV2", nil, auth)
+	events, errCh, stop := s.StartClientAuth(c, "DEV2", nil, auth, "")
 	// getting the 1 pending on connect
 	c.Check(NextEvent(events, errCh), Equals, `unicast app:app1 payload:{"m":2};`)
 	stop()

=== modified file 'server/session/session_test.go'
--- server/session/session_test.go	2014-07-03 14:25:45 +0000
+++ server/session/session_test.go	2014-09-02 17:24:34 +0000
@@ -647,7 +647,7 @@
 	effectiveOfPing := float64(interval) / float64(50*time.Millisecond)
 	comment := Commentf("effectiveOfPing=%f", effectiveOfPing)
 	c.Check(effectiveOfPing > 0.95, Equals, true, comment)
-	c.Check(effectiveOfPing < 1.15, Equals, true, comment)
+	c.Check(effectiveOfPing < 1.19, Equals, true, comment)
 	up <- nil // no write error
 	up <- io.EOF
 	err := <-errCh

=== added directory 'urldispatcher'
=== added directory 'urldispatcher/curldispatcher'
=== added file 'urldispatcher/curldispatcher/curldispatcher.go'
--- urldispatcher/curldispatcher/curldispatcher.go	1970-01-01 00:00:00 +0000
+++ urldispatcher/curldispatcher/curldispatcher.go	2014-09-02 17:24:34 +0000
@@ -0,0 +1,95 @@
+/*
+ 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/>.
+*/
+
+// package cmessaging wraps libmessaging-menu
+package curldispatcher
+
+/*
+#cgo pkg-config: url-dispatcher-1
+
+#include <liburl-dispatcher-1/url-dispatcher.h>
+#include <glib.h>
+
+void dispatch_url(const gchar* url, gpointer user_data);
+
+gchar** test_url(const gchar** urls);
+*/
+import "C"
+import "unsafe"
+import "fmt"
+
+func gchar(s string) *C.gchar {
+	return (*C.gchar)(C.CString(s))
+}
+
+func gfree(s *C.gchar) {
+	C.g_free((C.gpointer)(s))
+}
+
+func getCharPtr(p uintptr) *C.char {
+	return *((**C.char)(unsafe.Pointer(p)))
+}
+
+func TestURL(urls []string) []string {
+	c_urls := make([]*C.gchar, len(urls)+1)
+	for i, url := range urls {
+		c_urls[i] = gchar(url)
+		defer gfree(c_urls[i])
+	}
+	results := C.test_url((**C.gchar)(unsafe.Pointer(&c_urls[0])))
+	// if there result is nil, just return empty []string
+	if results == nil {
+		return nil
+	}
+	packages := make([]string, len(urls))
+	ptrSz := unsafe.Sizeof(unsafe.Pointer(nil))
+	i := 0
+	for p := uintptr(unsafe.Pointer(results)); getCharPtr(p) != nil; p += ptrSz {
+		pkg := C.GoString(getCharPtr(p))
+		packages[i] = pkg
+		i += 1
+	}
+	return packages
+}
+
+type DispatchPayload struct {
+	doneCh chan bool
+}
+
+func DispatchURL(url string, appPackage string) error {
+	c_url := gchar(url)
+	defer gfree(c_url)
+	c_app_package := gchar(appPackage)
+	defer gfree(c_app_package)
+	doneCh := make(chan bool)
+	payload := DispatchPayload{doneCh: doneCh}
+	C.dispatch_url(c_url, (C.gpointer)(&payload))
+	success := <-doneCh
+	if !success {
+		return fmt.Errorf("Failed to DispatchURL: %s for %s", url, appPackage)
+	}
+	return nil
+}
+
+//export handleDispatchURLResult
+func handleDispatchURLResult(c_action *C.char, c_success C.gboolean, obj unsafe.Pointer) {
+	payload := (*DispatchPayload)(obj)
+	success := false
+	if c_success == C.TRUE {
+		success = true
+	}
+	payload.doneCh <- success
+}

=== added file 'urldispatcher/curldispatcher/curldispatcher_c.go'
--- urldispatcher/curldispatcher/curldispatcher_c.go	1970-01-01 00:00:00 +0000
+++ urldispatcher/curldispatcher/curldispatcher_c.go	2014-09-02 17:24:34 +0000
@@ -0,0 +1,39 @@
+/*
+ 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/>.
+*/
+
+// package curldispatcher wraps liburl-dispatch1
+package curldispatcher
+
+/*
+#cgo pkg-config: url-dispatcher-1
+
+#include <liburl-dispatcher-1/url-dispatcher.h>
+#include <glib.h>
+
+static void url_dispatch_callback(const gchar * url, gboolean success, gpointer user_data) {
+    handleDispatchURLResult(url, success, user_data);
+}
+
+void dispatch_url(const gchar* url, gpointer user_data) {
+    url_dispatch_send(url, (URLDispatchCallback)url_dispatch_callback, user_data);
+}
+
+gchar** test_url(const gchar** urls) {
+    char** result = url_dispatch_url_appid(urls);
+    return result;
+}
+*/
+import "C"

=== added file 'urldispatcher/urldispatcher.go'
--- urldispatcher/urldispatcher.go	1970-01-01 00:00:00 +0000
+++ urldispatcher/urldispatcher.go	2014-09-02 17:24:34 +0000
@@ -0,0 +1,70 @@
+/*
+ Copyright 2013-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/>.
+*/
+
+// Package urldispatcher wraps the url dispatcher's C API
+package urldispatcher
+
+import (
+	"launchpad.net/ubuntu-push/click"
+	"launchpad.net/ubuntu-push/logger"
+	"launchpad.net/ubuntu-push/urldispatcher/curldispatcher"
+)
+
+// A URLDispatcher wrapper.
+type URLDispatcher interface {
+	DispatchURL(string, *click.AppId) error
+	TestURL(*click.AppId, []string) bool
+}
+
+type urlDispatcher struct {
+	log logger.Logger
+}
+
+// New builds a new URL dispatcher that uses the provided bus.Endpoint
+func New(log logger.Logger) URLDispatcher {
+	return &urlDispatcher{log}
+}
+
+var _ URLDispatcher = &urlDispatcher{} // ensures it conforms
+
+var cDispatchURL = curldispatcher.DispatchURL
+var cTestURL = curldispatcher.TestURL
+
+func (ud *urlDispatcher) DispatchURL(url string, app *click.AppId) error {
+	ud.log.Debugf("Dispatching %s", url)
+	err := cDispatchURL(url, app.DispatchPackage())
+	if err != nil {
+		ud.log.Errorf("DispatchURL failed: %s", err)
+	}
+	return err
+}
+
+func (ud *urlDispatcher) TestURL(app *click.AppId, urls []string) bool {
+	ud.log.Debugf("TestURL: %s", urls)
+	var appIds []string
+	appIds = cTestURL(urls)
+	if len(appIds) == 0 {
+		ud.log.Debugf("TestURL: invalid urls: %s - %s", urls, app.Versioned())
+		return false
+	}
+	for _, appId := range appIds {
+		if appId != app.Versioned() {
+			ud.log.Debugf("Notification skipped because of different appid for actions: %v - %s != %s", urls, appId, app.Versioned())
+			return false
+		}
+	}
+	return true
+}

=== added file 'urldispatcher/urldispatcher_test.go'
--- urldispatcher/urldispatcher_test.go	1970-01-01 00:00:00 +0000
+++ urldispatcher/urldispatcher_test.go	2014-09-02 17:24:34 +0000
@@ -0,0 +1,142 @@
+/*
+ Copyright 2013-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/>.
+*/
+
+package urldispatcher
+
+import (
+	"errors"
+
+	. "launchpad.net/gocheck"
+	clickhelp "launchpad.net/ubuntu-push/click/testing"
+	helpers "launchpad.net/ubuntu-push/testing"
+	"testing"
+)
+
+// hook up gocheck
+func TestUrldispatcher(t *testing.T) { TestingT(t) }
+
+type UDSuite struct {
+	log          *helpers.TestLogger
+	cDispatchURL func(string, string) error
+	cTestURL     func([]string) []string
+}
+
+var _ = Suite(&UDSuite{})
+
+func (s *UDSuite) SetUpTest(c *C) {
+	s.log = helpers.NewTestLogger(c, "debug")
+	s.cDispatchURL = cDispatchURL
+	s.cTestURL = cTestURL
+	// replace it with a always succeed version
+	cDispatchURL = func(url string, appId string) error {
+		return nil
+	}
+}
+
+func (s *UDSuite) TearDownTest(c *C) {
+	cDispatchURL = s.cDispatchURL
+	cTestURL = s.cTestURL
+}
+
+func (s *UDSuite) TestDispatchURLWorks(c *C) {
+	ud := New(s.log)
+	appId := clickhelp.MustParseAppId("com.example.test_app_0.99")
+	err := ud.DispatchURL("this", appId)
+	c.Check(err, IsNil)
+}
+
+func (s *UDSuite) TestDispatchURLFailsIfCallFails(c *C) {
+	cDispatchURL = func(url string, appId string) error {
+		return errors.New("fail!")
+	}
+	ud := New(s.log)
+	appId := clickhelp.MustParseAppId("com.example.test_app_0.99")
+	err := ud.DispatchURL("this", appId)
+	c.Check(err, NotNil)
+}
+
+func (s *UDSuite) TestTestURLWorks(c *C) {
+	cTestURL = func(url []string) []string {
+		return []string{"com.example.test_app_0.99"}
+	}
+	ud := New(s.log)
+	appId := clickhelp.MustParseAppId("com.example.test_app_0.99")
+	c.Check(ud.TestURL(appId, []string{"this"}), Equals, true)
+	c.Check(s.log.Captured(), Matches, `(?sm).*TestURL: \[this\].*`)
+}
+
+func (s *UDSuite) TestTestURLFailsIfCallFails(c *C) {
+	cTestURL = func(url []string) []string {
+		return []string{}
+	}
+	ud := New(s.log)
+	appId := clickhelp.MustParseAppId("com.example.test_app_0.99")
+	c.Check(ud.TestURL(appId, []string{"this"}), Equals, false)
+}
+
+func (s *UDSuite) TestTestURLMultipleURLs(c *C) {
+	cTestURL = func(url []string) []string {
+		return []string{"com.example.test_app_0.99", "com.example.test_app_0.99"}
+	}
+	ud := New(s.log)
+	appId := clickhelp.MustParseAppId("com.example.test_app_0.99")
+	urls := []string{"potato://test-app", "potato_a://foo"}
+	c.Check(ud.TestURL(appId, urls), Equals, true)
+	c.Check(s.log.Captured(), Matches, `(?sm).*TestURL: \[potato://test-app potato_a://foo\].*`)
+}
+
+func (s *UDSuite) TestTestURLWrongApp(c *C) {
+	cTestURL = func(url []string) []string {
+		return []string{"com.example.test_test-app_0.1"}
+	}
+	ud := New(s.log)
+	appId := clickhelp.MustParseAppId("com.example.test_app_0.99")
+	urls := []string{"potato://test-app"}
+	c.Check(ud.TestURL(appId, urls), Equals, false)
+	c.Check(s.log.Captured(), Matches, `(?sm).*Notification skipped because of different appid for actions: \[potato://test-app\] - com.example.test_test-app_0.1 != com.example.test_app_0.99`)
+}
+
+func (s *UDSuite) TestTestURLOneWrongApp(c *C) {
+	cTestURL = func(url []string) []string {
+		return []string{"com.example.test_test-app_0", "com.example.test_test-app1"}
+	}
+	ud := New(s.log)
+	appId := clickhelp.MustParseAppId("com.example.test_test-app_0")
+	urls := []string{"potato://test-app", "potato_a://foo"}
+	c.Check(ud.TestURL(appId, urls), Equals, false)
+	c.Check(s.log.Captured(), Matches, `(?sm).*Notification skipped because of different appid for actions: \[potato://test-app potato_a://foo\] - com.example.test_test-app1 != com.example.test_test-app.*`)
+}
+
+func (s *UDSuite) TestTestURLInvalidURL(c *C) {
+	cTestURL = func(url []string) []string {
+		return []string{}
+	}
+	ud := New(s.log)
+	appId := clickhelp.MustParseAppId("com.example.test_app_0.2")
+	urls := []string{"notsupported://test-app"}
+	c.Check(ud.TestURL(appId, urls), Equals, false)
+}
+
+func (s *UDSuite) TestTestURLLegacyApp(c *C) {
+	cTestURL = func(url []string) []string {
+		return []string{"ubuntu-system-settings"}
+	}
+	ud := New(s.log)
+	appId := clickhelp.MustParseAppId("_ubuntu-system-settings")
+	urls := []string{"settings://test-app"}
+	c.Check(ud.TestURL(appId, urls), Equals, true)
+	c.Check(s.log.Captured(), Matches, `(?sm).*TestURL: \[settings://test-app\].*`)
+}