Merge lp:~chipaca/ubuntu-push/appname-from-dbus-path into lp:ubuntu-push/automatic

[John Lenton]

switch dbus api to retrieve appname from dbus path

switch dbus api to retrieve appname from dbus path

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'bus/endpoint.go'
--- bus/endpoint.go	2014-05-15 11:28:06 +0000
+++ bus/endpoint.go	2014-06-06 12:20:34 +0000
@@ -29,7 +29,7 @@
  *    Endpoint (and its implementation)
  */
 
-type BusMethod func([]interface{}, []interface{}) ([]interface{}, error)
+type BusMethod func(string, []interface{}, []interface{}) ([]interface{}, error)
 type DispatchMap map[string]BusMethod
 
 // bus.Endpoint represents the DBus connection itself.
@@ -249,12 +249,12 @@
 				endp.log.Errorf("WatchMethod: unknown method %s", msg.Member)
 			} else {
 				args := msg.AllArgs()
-				rvals, err := meth(args, extra)
+				rvals, err := meth(string(msg.Path), args, extra)
 				if err != nil {
 					reply = dbus.NewErrorMessage(msg, err_iface, err.Error())
-					endp.log.Errorf("WatchMethod: %s(%#v, %#v) failure: %#v", msg.Member, args, extra, err)
+					endp.log.Errorf("WatchMethod: %s(%v, %#v, %#v) failure: %#v", msg.Member, msg.Path, args, extra, err)
 				} else {
-					endp.log.Debugf("WatchMethod: %s(%#v, %#v) success: %#v", msg.Member, args, extra, rvals)
+					endp.log.Debugf("WatchMethod: %s(%v, %#v, %#v) success: %#v", msg.Member, msg.Path, args, extra, rvals)
 					reply = dbus.NewMethodReturnMessage(msg)
 					err = reply.AppendArgs(rvals...)
 					if err != nil {

=== modified file 'bus/testing/testing_endpoint_test.go'
--- bus/testing/testing_endpoint_test.go	2014-06-02 10:04:34 +0000
+++ bus/testing/testing_endpoint_test.go	2014-06-06 12:20:34 +0000
@@ -229,7 +229,7 @@
 // Test that WatchMethod updates callArgs
 func (s *TestingEndpointSuite) TestWatchMethodUpdatesCallArgs(c *C) {
 	endp := NewTestingEndpoint(nil, condition.Work(true))
-	foo := func([]interface{}, []interface{}) ([]interface{}, error) { return nil, nil }
+	foo := func(string, []interface{}, []interface{}) ([]interface{}, error) { return nil, nil }
 	foomp := bus.DispatchMap{"foo": foo}
 	endp.WatchMethod(foomp)
 	c.Check(GetCallArgs(endp), DeepEquals, []callArgs{

=== modified file 'client/service/service.go'
--- client/service/service.go	2014-05-21 10:03:18 +0000
+++ client/service/service.go	2014-06-06 12:20:34 +0000
@@ -21,10 +21,12 @@
 import (
 	"errors"
 	"os"
+	"strings"
 	"sync"
 
 	"launchpad.net/ubuntu-push/bus"
 	"launchpad.net/ubuntu-push/logger"
+	"launchpad.net/ubuntu-push/nih"
 )
 
 // Service is the dbus api
@@ -51,7 +53,7 @@
 	AlreadyStarted = errors.New("already started")
 	BusAddress     = bus.Address{
 		Interface: "com.ubuntu.PushNotifications",
-		Path:      "/com/ubuntu/PushNotifications",
+		Path:      "/com/ubuntu/PushNotifications/*",
 		Name:      "com.ubuntu.PushNotifications",
 	}
 )
@@ -133,31 +135,26 @@
 	BadArgType  = errors.New("Bad argument type")
 )
 
-func (svc *Service) register(args []interface{}, _ []interface{}) ([]interface{}, error) {
-	if len(args) != 1 {
+func (svc *Service) register(path string, args, _ []interface{}) ([]interface{}, error) {
+	if len(args) != 0 {
 		return nil, BadArgCount
 	}
-	appname, ok := args[0].(string)
-	if !ok {
-		return nil, BadArgType
-	}
+	raw_appname := path[strings.LastIndex(path, "/")+1:]
+	appname := string(nih.Unquote([]byte(raw_appname)))
 
-	rv := os.Getenv("PUSH_REG_" + appname)
+	rv := os.Getenv("PUSH_REG_" + raw_appname)
 	if rv == "" {
-		rv = "this-is-an-opaque-block-of-random-bits-i-promise"
+		rv = appname + "::this-is-an-opaque-block-of-random-bits-i-promise"
 	}
 
 	return []interface{}{rv}, nil
 }
 
-func (svc *Service) notifications(args []interface{}, _ []interface{}) ([]interface{}, error) {
-	if len(args) != 1 {
+func (svc *Service) notifications(path string, args, _ []interface{}) ([]interface{}, error) {
+	if len(args) != 0 {
 		return nil, BadArgCount
 	}
-	appname, ok := args[0].(string)
-	if !ok {
-		return nil, BadArgType
-	}
+	appname := string(nih.Unquote([]byte(path[strings.LastIndex(path, "/")+1:])))
 
 	svc.lock.Lock()
 	defer svc.lock.Unlock()
@@ -171,18 +168,15 @@
 	return []interface{}{msgs}, nil
 }
 
-func (svc *Service) inject(args []interface{}, _ []interface{}) ([]interface{}, error) {
-	if len(args) != 2 {
+func (svc *Service) inject(path string, args, _ []interface{}) ([]interface{}, error) {
+	if len(args) != 1 {
 		return nil, BadArgCount
 	}
-	appname, ok := args[0].(string)
-	if !ok {
-		return nil, BadArgType
-	}
-	notif, ok := args[1].(string)
-	if !ok {
-		return nil, BadArgType
-	}
+	notif, ok := args[0].(string)
+	if !ok {
+		return nil, BadArgType
+	}
+	appname := string(nih.Unquote([]byte(path[strings.LastIndex(path, "/")+1:])))
 
 	return nil, svc.Inject(appname, notif)
 }

=== modified file 'client/service/service_test.go'
--- client/service/service_test.go	2014-05-21 10:05:24 +0000
+++ client/service/service_test.go	2014-06-06 12:20:34 +0000
@@ -97,23 +97,13 @@
 // registration tests
 
 func (ss *serviceSuite) TestRegistrationFailsIfBadArgs(c *C) {
-	for i, s := range []struct {
-		args []interface{}
-		errt error
-	}{
-		{nil, BadArgCount},                 // no args
-		{[]interface{}{}, BadArgCount},     // still no args
-		{[]interface{}{42}, BadArgType},    // bad arg type
-		{[]interface{}{1, 2}, BadArgCount}, // too many args
-	} {
-		reg, err := new(Service).register(s.args, nil)
-		c.Check(reg, IsNil, Commentf("iteration #%d", i))
-		c.Check(err, Equals, s.errt, Commentf("iteration #%d", i))
-	}
+	reg, err := new(Service).register("", []interface{}{1}, nil)
+	c.Check(reg, IsNil)
+	c.Check(err, Equals, BadArgCount)
 }
 
 func (ss *serviceSuite) TestRegistrationWorks(c *C) {
-	reg, err := new(Service).register([]interface{}{"this"}, nil)
+	reg, err := new(Service).register("/this", nil, nil)
 	c.Assert(reg, HasLen, 1)
 	regs, ok := reg[0].(string)
 	c.Check(ok, Equals, true)
@@ -125,7 +115,7 @@
 	os.Setenv("PUSH_REG_stuff", "42")
 	defer os.Setenv("PUSH_REG_stuff", "")
 
-	reg, err := new(Service).register([]interface{}{"stuff"}, nil)
+	reg, err := new(Service).register("/stuff", nil, nil)
 	c.Assert(reg, HasLen, 1)
 	regs, ok := reg[0].(string)
 	c.Check(ok, Equals, true)
@@ -138,10 +128,10 @@
 
 func (ss *serviceSuite) TestInjectWorks(c *C) {
 	svc := NewService(ss.bus, ss.log)
-	rvs, err := svc.inject([]interface{}{"hello", "world"}, nil)
+	rvs, err := svc.inject("/hello", []interface{}{"world"}, nil)
 	c.Assert(err, IsNil)
 	c.Check(rvs, IsNil)
-	rvs, err = svc.inject([]interface{}{"hello", "there"}, nil)
+	rvs, err = svc.inject("/hello", []interface{}{"there"}, nil)
 	c.Assert(err, IsNil)
 	c.Check(rvs, IsNil)
 	c.Assert(svc.mbox, HasLen, 1)
@@ -162,7 +152,7 @@
 		condition.Work(false))
 	svc := NewService(bus, ss.log)
 	svc.SetMessageHandler(func([]byte) error { return errors.New("fail") })
-	_, err := svc.inject([]interface{}{"hello", "xyzzy"}, nil)
+	_, err := svc.inject("/hello", []interface{}{"xyzzy"}, nil)
 	c.Check(err, NotNil)
 }
 
@@ -173,13 +163,10 @@
 	}{
 		{nil, BadArgCount},
 		{[]interface{}{}, BadArgCount},
-		{[]interface{}{1}, BadArgCount},
-		{[]interface{}{1, 2}, BadArgType},
-		{[]interface{}{"1", 2}, BadArgType},
-		{[]interface{}{1, "2"}, BadArgType},
-		{[]interface{}{1, 2, 3}, BadArgCount},
+		{[]interface{}{1}, BadArgType},
+		{[]interface{}{1, 2}, BadArgCount},
 	} {
-		reg, err := new(Service).inject(s.args, nil)
+		reg, err := new(Service).inject("", s.args, nil)
 		c.Check(reg, IsNil, Commentf("iteration #%d", i))
 		c.Check(err, Equals, s.errt, Commentf("iteration #%d", i))
 	}
@@ -189,7 +176,7 @@
 // Notifications tests
 func (ss *serviceSuite) TestNotificationsWorks(c *C) {
 	svc := NewService(ss.bus, ss.log)
-	nots, err := svc.notifications([]interface{}{"hello"}, nil)
+	nots, err := svc.notifications("/hello", nil, nil)
 	c.Assert(err, IsNil)
 	c.Assert(nots, NotNil)
 	c.Assert(nots, HasLen, 1)
@@ -198,7 +185,7 @@
 		svc.mbox = make(map[string][]string)
 	}
 	svc.mbox["hello"] = append(svc.mbox["hello"], "this", "thing")
-	nots, err = svc.notifications([]interface{}{"hello"}, nil)
+	nots, err = svc.notifications("/hello", nil, nil)
 	c.Assert(err, IsNil)
 	c.Assert(nots, NotNil)
 	c.Assert(nots, HasLen, 1)
@@ -206,19 +193,9 @@
 }
 
 func (ss *serviceSuite) TestNotificationsFailsIfBadArgs(c *C) {
-	for i, s := range []struct {
-		args []interface{}
-		errt error
-	}{
-		{nil, BadArgCount},                 // no args
-		{[]interface{}{}, BadArgCount},     // still no args
-		{[]interface{}{42}, BadArgType},    // bad arg type
-		{[]interface{}{1, 2}, BadArgCount}, // too many args
-	} {
-		reg, err := new(Service).notifications(s.args, nil)
-		c.Check(reg, IsNil, Commentf("iteration #%d", i))
-		c.Check(err, Equals, s.errt, Commentf("iteration #%d", i))
-	}
+	reg, err := new(Service).notifications("/foo", []interface{}{1}, nil)
+	c.Check(reg, IsNil)
+	c.Check(err, Equals, BadArgCount)
 }
 
 func (ss *serviceSuite) TestMessageHandler(c *C) {

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-06 11:20:41 +0000
+++ debian/changelog	2014-06-06 12:20:34 +0000
@@ -7,6 +7,9 @@
   [ Roberto Alsina ]
   * Make signing-helper generate a HTTP header instead of a querystring.
 
+  [ John R. Lenton ]
+  * Switch dbus api to retrieve app name from dbus path.
+
  -- John R. Lenton <[e-mail]>  Fri, 06 Jun 2014 12:02:56 +0100
 
 ubuntu-push (0.3+14.10.20140605-0ubuntu1) utopic; urgency=medium

=== modified file 'nih/nih.go'
--- nih/nih.go	2014-05-23 12:56:27 +0000
+++ nih/nih.go	2014-06-06 12:20:34 +0000
@@ -45,7 +45,7 @@
 	return out
 }
 
-// Quote() takes a byte slice and undoes the damage done to it by the quoting.
+// Unquote() takes a byte slice and undoes the damage done to it by Quote().
 func Unquote(s []byte) []byte {
 	out := make([]byte, 0, len(s))