Merge lp:~chipaca/ubuntu-push/auth-packaging into lp:ubuntu-push/automatic

[John Lenton]

Packaging for the auth branch.

Packaging for the auth branch.

Includes the auth branch.

[Diogo Baeder (diogobaeder)]

Looks good to me.

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~chipaca/ubuntu-push/auth-packaging into lp:ubuntu-push/automatic failed. Below is the output from the failed tests.

mkdir -p /mnt/tarmac/cache/ubuntu-push-automatic/go-ws/bin
mkdir -p /mnt/tarmac/cache/ubuntu-push-automatic/go-ws/pkg
go get -u launchpad.net/godeps
go get -d -u launchpad.net/gocheck launchpad.net/go-dbus/v1 launchpad.net/go-xdg/v0 code.google.com/p/gosqlite/sqlite3 gopkg.in/qml.v0 gopkg.in/niemeyer/uoneauth.v1
/mnt/tarmac/cache/ubuntu-push-automatic/go-ws/bin/godeps -u dependencies.tsv
"/mnt/tarmac/cache/ubuntu-push-automatic/go-ws/src/launchpad.net/gocheck" now at <email address hidden>
"/mnt/tarmac/cache/ubuntu-push-automatic/go-ws/src/gopkg.in/qml.v0" now at master
"/mnt/tarmac/cache/ubuntu-push-automatic/go-ws/src/gopkg.in/niemeyer/uoneauth.v1" now at v1
go install launchpad.net/gocheck launchpad.net/go-dbus/v1 launchpad.net/go-xdg/v0 code.google.com/p/gosqlite/sqlite3 gopkg.in/qml.v0 gopkg.in/niemeyer/uoneauth.v1

# gopkg.in/qml.v0
../../gopkg.in/qml.v0/bridge.go:16: import /mnt/tarmac/cache/ubuntu-push-automatic/go-ws/pkg/linux_amd64/gopkg.in/qml.v0/tref.a: object is [linux amd64 go1.2 X:none] expected [linux amd64 go1.2.1 X:none]
make: *** [bootstrap] Error 2

=== modified file 'Makefile'
--- Makefile	2014-03-31 17:58:54 +0000
+++ Makefile	2014-04-15 14:48:44 +0000
@@ -11,10 +11,13 @@
 GODEPS += launchpad.net/go-dbus/v1
 GODEPS += launchpad.net/go-xdg/v0
 GODEPS += code.google.com/p/gosqlite/sqlite3
+GODEPS += gopkg.in/qml.v0
+GODEPS += gopkg.in/niemeyer/uoneauth.v1
 
 TOTEST = $(shell env GOPATH=$(GOPATH) go list $(PROJECT)/...|grep -v acceptance|grep -v http13client )
 
 bootstrap:
+	$(RM) -r $(GOPATH)/pkg
 	mkdir -p $(GOPATH)/bin
 	mkdir -p $(GOPATH)/pkg
 	go get -u launchpad.net/godeps

=== modified file 'README'
--- README	2014-03-31 17:58:54 +0000
+++ README	2014-04-15 14:48:44 +0000
@@ -6,11 +6,20 @@
 The code expects to be checked out as launchpad.net/ubuntu-push in a Go
 workspace, see "go help gopath".
 
-To setup Go dependencies, install libsqlite3-dev and run:
+To setup Go dependencies, install the following libraries:
+
+               libsqlite3-dev
+               qtbase5-private-dev
+               qtdeclarative5-dev
+               libqt5opengl5-dev
+               libubuntuoneauth-2.0-dev
+
+and run:
 
    make bootstrap
 
-To run tests, install libgcrypt11-dev and libwhoopsie-dev and run:
+To run tests, install libgcrypt11-dev, libwhoopsie-dev, and
+libubuntuoneauth-2.0-dev and run:
 
    make check
 

=== modified file 'client/client.go'
--- client/client.go	2014-04-11 19:09:11 +0000
+++ client/client.go	2014-04-15 14:48:44 +0000
@@ -26,6 +26,7 @@
 	"os"
 	"strings"
 
+	"gopkg.in/qml.v0"
 	"launchpad.net/go-dbus/v1"
 
 	"launchpad.net/ubuntu-push/bus"
@@ -42,6 +43,11 @@
 	"launchpad.net/ubuntu-push/whoopsie/identifier"
 )
 
+var (
+	getAuthorization = util.GetAuthorization
+	shouldGetAuth    = false
+)
+
 // ClientConfig holds the client configuration
 type ClientConfig struct {
 	connectivity.ConnectivityConfig // q.v.
@@ -79,6 +85,7 @@
 	actionsCh          <-chan notifications.RawActionReply
 	session            *session.ClientSession
 	sessionConnectedCh chan uint32
+	auth               string
 }
 
 var ACTION_ID_SNOWFLAKE = "::ubuntu-push-client::"
@@ -111,6 +118,17 @@
 
 	// later, we'll be specifying more logging options in the config file
 	client.log = logger.NewSimpleLogger(os.Stderr, client.config.LogLevel.Level())
+	qml.SetLogger(client.log)
+
+	// grab the authorization string from the accounts
+	// TODO: remove this condition when we have a way to deal with failing authorizations
+	if shouldGetAuth {
+		auth, err := getAuthorization()
+		if err != nil {
+			return fmt.Errorf("unable to get the authorization token from the account: %v", err)
+		}
+		client.auth = auth
+	}
 
 	// overridden for testing
 	client.idder = identifier.New()
@@ -144,8 +162,9 @@
 		ExchangeTimeout:        client.config.ExchangeTimeout.TimeDuration(),
 		HostsCachingExpiryTime: client.config.HostsCachingExpiryTime.TimeDuration(),
 		ExpectAllRepairedTime:  client.config.ExpectAllRepairedTime.TimeDuration(),
-		PEM:  client.pem,
-		Info: info,
+		PEM:           client.pem,
+		Info:          info,
+		Authorization: client.auth,
 	}
 }
 

=== modified file 'client/client_test.go'
--- client/client_test.go	2014-04-11 19:07:27 +0000
+++ client/client_test.go	2014-04-15 14:48:44 +0000
@@ -85,11 +85,17 @@
 	config.IgnoreParsedFlags = true // because configure() uses <flags>
 	cs.timeouts = util.SwapTimeouts([]time.Duration{0})
 	cs.leveldbPath = ""
+	getAuthorization = func() (string, error) {
+		return "some auth", nil
+	}
+	shouldGetAuth = true
 }
 
 func (cs *clientSuite) TearDownSuite(c *C) {
 	util.SwapTimeouts(cs.timeouts)
 	cs.timeouts = nil
+	getAuthorization = util.GetAuthorization
+	shouldGetAuth = false
 }
 
 func (cs *clientSuite) writeTestConfig(overrides map[string]interface{}) {
@@ -200,6 +206,14 @@
 	c.Assert(cli.connCh, NotNil)
 }
 
+func (cs *clientSuite) TestConfigureSetsUpAuth(c *C) {
+	cli := NewPushClient(cs.configPath, cs.leveldbPath)
+	c.Check(cli.auth, Equals, "")
+	err := cli.configure()
+	c.Assert(err, IsNil)
+	c.Assert(cli.auth, Equals, "some auth")
+}
+
 func (cs *clientSuite) TestConfigureBailsOnBadFilename(c *C) {
 	cli := NewPushClient("/does/not/exist", cs.leveldbPath)
 	err := cli.configure()
@@ -265,8 +279,9 @@
 		ExchangeTimeout:        10 * time.Millisecond,
 		HostsCachingExpiryTime: 1 * time.Hour,
 		ExpectAllRepairedTime:  30 * time.Minute,
-		PEM:  cli.pem,
-		Info: info,
+		PEM:           cli.pem,
+		Info:          info,
+		Authorization: "some auth",
 	}
 	// sanity check that we are looking at all fields
 	vExpected := reflect.ValueOf(expected)

=== modified file 'client/session/session.go'
--- client/session/session.go	2014-04-04 13:55:00 +0000
+++ client/session/session.go	2014-04-15 14:48:44 +0000
@@ -84,6 +84,7 @@
 	ExpectAllRepairedTime  time.Duration
 	PEM                    []byte
 	Info                   map[string]interface{}
+	Authorization          string
 }
 
 // ClientSession holds a client<->server session and its configuration.
@@ -115,6 +116,8 @@
 	stateP *uint32
 	ErrCh  chan error
 	MsgCh  chan *Notification
+	// authorization
+	auth string
 }
 
 func NewSession(serverAddrSpec string, conf ClientSessionConfig,
@@ -142,6 +145,7 @@
 		TLS:                 &tls.Config{InsecureSkipVerify: true}, // XXX
 		stateP:              &state,
 		timeSince:           time.Since,
+		auth:                conf.Authorization,
 	}
 	if sess.PEM != nil {
 		cp := x509.NewCertPool()
@@ -409,10 +413,9 @@
 		return err
 	}
 	err = proto.WriteMessage(protocol.ConnectMsg{
-		Type:     "connect",
-		DeviceId: sess.DeviceId,
-		// xxx get the SSO Authorization string from the phone
-		Authorization: "",
+		Type:          "connect",
+		DeviceId:      sess.DeviceId,
+		Authorization: sess.auth,
 		Levels:        levels,
 		Info:          sess.Info,
 	})

=== modified file 'client/session/session_test.go'
--- client/session/session_test.go	2014-04-04 13:55:00 +0000
+++ client/session/session_test.go	2014-04-15 14:48:44 +0000
@@ -852,9 +852,10 @@
 
 	c.Check(takeNext(downCh), Equals, "deadline 0")
 	c.Check(takeNext(downCh), DeepEquals, protocol.ConnectMsg{
-		Type:     "connect",
-		DeviceId: sess.DeviceId,
-		Levels:   map[string]int64{},
+		Type:          "connect",
+		DeviceId:      sess.DeviceId,
+		Levels:        map[string]int64{},
+		Authorization: "",
 	})
 	upCh <- errors.New("Overflow error in /dev/null")
 	err = <-errCh
@@ -940,7 +941,8 @@
 		"bar": "baz",
 	}
 	conf := ClientSessionConfig{
-		Info: info,
+		Info:          info,
+		Authorization: "some auth",
 	}
 	sess, err := NewSession("", conf, "wah", cs.lvls, cs.log)
 	c.Assert(err, IsNil)
@@ -959,6 +961,7 @@
 	msg, ok := takeNext(downCh).(protocol.ConnectMsg)
 	c.Check(ok, Equals, true)
 	c.Check(msg.DeviceId, Equals, "wah")
+	c.Check(msg.Authorization, Equals, "some auth")
 	c.Check(msg.Info, DeepEquals, info)
 	upCh <- nil // no error
 	upCh <- protocol.ConnAckMsg{

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-11 10:20:27 +0000
+++ debian/changelog	2014-04-15 14:48:44 +0000
@@ -1,8 +1,27 @@
-ubuntu-push (0.2-0ubuntu1) UNRELEASED; urgency=medium
-
+ubuntu-push (0.21-0.ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release: first auth bits, and Qt dependency.
+
+ -- John Lenton <[e-mail]>  Tue, 15 Apr 2014 14:04:35 +0100
+
+ubuntu-push (0.2+14.04.20140411-0ubuntu1) trusty; urgency=medium
+
+  [ John Lenton ]
   * New upstream release.
 
- -- John Lenton <[e-mail]>  Fri, 11 Apr 2014 11:19:42 +0100
+  [ Richard Huddie ]
+  * added basic autopilot framework
+  * configparser and http post updates
+  * removed tests folder
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 11 Apr 2014 18:31:57 +0000
+
+ubuntu-push (0.1+14.04.20140404-0ubuntu1) trusty; urgency=low
+
+  [ Tarmac ]
+  * Merge automatic into trunk.
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 04 Apr 2014 14:52:06 +0000
 
 ubuntu-push (0.1+14.04.20140327-0ubuntu1) trusty; urgency=medium
 

=== modified file 'debian/control'
--- debian/control	2014-03-25 16:26:20 +0000
+++ debian/control	2014-04-15 14:48:44 +0000
@@ -14,6 +14,10 @@
                libgcrypt11-dev,
                libglib2.0-dev (>= 2.31.6),
                libwhoopsie-dev,
+               qtbase5-private-dev,
+               qtdeclarative5-dev,
+               libqt5opengl5-dev,
+               libubuntuoneauth-2.0-dev,
 Standards-Version: 3.9.5
 Homepage: http://launchpad.net/ubuntu-push
 Vcs-Bzr: lp:ubuntu-push

=== modified file 'debian/rules'
--- debian/rules	2014-03-24 12:22:55 +0000
+++ debian/rules	2014-04-15 14:48:44 +0000
@@ -2,9 +2,12 @@
 # -*- makefile -*-
 
 export DH_GOPKG := launchpad.net/ubuntu-push
-export DEB_BUILD_OPTIONS := nostrip
 export UBUNTU_PUSH_TEST_RESOURCES_ROOT := $(CURDIR)
 
+override_dh_auto_build:
+	cd $$( find ./ -type d -regex '\./[^/]*/src/launchpad.net' -printf "%h\n" | head -n1) && tar xvzf ../../externals.tgz
+	dh_auto_build --buildsystem=golang
+
 override_dh_install:
 	dh_install -Xusr/bin/cmd -Xusr/bin/dev --fail-missing
 

=== modified file 'dependencies.tsv'
--- dependencies.tsv	2014-03-12 13:23:26 +0000
+++ dependencies.tsv	2014-04-15 14:48:44 +0000
@@ -2,3 +2,5 @@
 launchpad.net/go-dbus/v1	bzr	[e-mail]-20140206110213-pbzcr6ucaz3rqmnw	125
 launchpad.net/go-xdg/v0	bzr	[e-mail]-20140208094800-gubd5md7cro3mtxa	10
 launchpad.net/gocheck	bzr	[e-mail]-20140127131816-zshobk1qqme626xw	86
+gopkg.in/qml.v0	git	master	8adbc8c2bf2da9f609df366683ad0f47a89c3d49
+gopkg.in/niemeyer/uoneauth.v1	git	v1	0758ba882a143ad2862dbcac85a7ca145750b640

=== added file 'externals.tgz'
Binary files externals.tgz	1970-01-01 00:00:00 +0000 and externals.tgz	2014-04-15 14:48:44 +0000 differ
=== modified file 'ubuntu-push-client.go'
--- ubuntu-push-client.go	2014-04-15 11:27:38 +0000
+++ ubuntu-push-client.go	2014-04-15 14:48:44 +0000
@@ -19,6 +19,7 @@
 import (
 	"log"
 
+	"gopkg.in/qml.v0"
 	"launchpad.net/go-dbus/v1"
 	"launchpad.net/go-xdg/v0"
 
@@ -58,6 +59,9 @@
 	if err != nil {
 		log.Fatalf("unable to open the levels database: %v", err)
 	}
+
+	qml.Init(nil)
+
 	cli := client.NewPushClient(cfgFname, lvlFname)
 	err = cli.Start()
 	if err != nil {

=== added file 'util/auth.go'
--- util/auth.go	1970-01-01 00:00:00 +0000
+++ util/auth.go	2014-04-15 14:48:44 +0000
@@ -0,0 +1,36 @@
+/*
+ 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 util
+
+import (
+	"gopkg.in/niemeyer/uoneauth.v1"
+	"gopkg.in/qml.v0"
+)
+
+func GetAuthorization() (string, error) {
+	engine := qml.NewEngine()
+	defer engine.Destroy()
+	authService := uoneauth.NewService(engine)
+	var auth string
+	token, err := authService.Token()
+	if err != nil {
+		return "", err
+	} else {
+		auth = token.HeaderSignature("POST", "https://push.ubuntu.com")
+	}
+	return auth, nil
+}

=== added file 'util/auth_test.go'
--- util/auth_test.go	1970-01-01 00:00:00 +0000
+++ util/auth_test.go	2014-04-15 14:48:44 +0000
@@ -0,0 +1,53 @@
+/*
+ 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 util
+
+import (
+	"os"
+
+	"gopkg.in/qml.v0"
+
+	. "launchpad.net/gocheck"
+)
+
+type authSuite struct{}
+
+var _ = Suite(&authSuite{})
+
+func (s *authSuite) SetUpSuite(c *C) {
+	if os.Getenv("PUSH_AUTH_TEST") == "1" {
+		qml.Init(nil)
+	}
+}
+
+func (s *authSuite) SetUpTest(c *C) {
+	qml.SetLogger(c)
+}
+
+func (s *authSuite) TestGetAuth(c *C) {
+	/*
+	 * This test is only useful when the PUSH_AUTH_TEST environment
+	 * variable is set to "1" - in which case the runner should have
+	 * a Ubuntu One account setup via system-settings.
+	 */
+	if os.Getenv("PUSH_AUTH_TEST") != "1" {
+		c.Skip("PUSH_AUTH_TEST not set to '1'")
+	}
+	auth, err := GetAuthorization()
+	c.Assert(err, IsNil)
+	c.Assert(auth, Matches, "OAuth .*oauth_consumer_key=.*")
+}