1
=== modified file 'client/client.go'
2
--- client/client.go	2014-04-11 16:37:48 +0000
3
+++ client/client.go	2014-04-23 11:53:01 +0000
4
@@ -57,7 +57,7 @@
5
57
	// The PEM-encoded server certificate
57
	// The PEM-encoded server certificate
6
58
	CertPEMFile string `json:"cert_pem_file"`
58
	CertPEMFile string `json:"cert_pem_file"`
7
59
	// The logging level (one of "debug", "info", "error")
59
	// The logging level (one of "debug", "info", "error")
9
60
	LogLevel string `json:"log_level"`
60
	LogLevel logger.ConfigLogLevel `json:"log_level"`
10
61
}
61
}
11
62
62
12
63
// PushClient is the Ubuntu Push Notifications client-side daemon.
63
// PushClient is the Ubuntu Push Notifications client-side daemon.
13
@@ -95,13 +95,13 @@
14
95
95
15
96
// configure loads its configuration, and sets it up.
96
// configure loads its configuration, and sets it up.
16
97
func (client *PushClient) configure() error {
97
func (client *PushClient) configure() error {
18
98
	f, err := os.Open(client.configPath)
98
	_, err := os.Stat(client.configPath)
19
99
	if err != nil {
99
	if err != nil {
21
100
		return fmt.Errorf("opening config: %v", err)
100
		return fmt.Errorf("config: %v", err)
22
101
	}
101
	}
24
102
	err = config.ReadConfig(f, &client.config)
102
	err = config.ReadFiles(&client.config, client.configPath, "<flags>")
25
103
	if err != nil {
103
	if err != nil {
27
104
		return fmt.Errorf("reading config: %v", err)
104
		return fmt.Errorf("config: %v", err)
28
105
	}
105
	}
29
106
	// ignore spaces
106
	// ignore spaces
30
107
	client.config.Addr = strings.Replace(client.config.Addr, " ", "", -1)
107
	client.config.Addr = strings.Replace(client.config.Addr, " ", "", -1)
31
@@ -110,7 +110,7 @@
32
110
	}
110
	}
33
111
111
34
112
	// later, we'll be specifying more logging options in the config file
112
	// later, we'll be specifying more logging options in the config file
36
113
	client.log = logger.NewSimpleLogger(os.Stderr, client.config.LogLevel)
113
	client.log = logger.NewSimpleLogger(os.Stderr, client.config.LogLevel.Level())
37
114
114
38
115
	// overridden for testing
115
	// overridden for testing
39
116
	client.idder = identifier.New()
116
	client.idder = identifier.New()
40
@@ -285,9 +285,6 @@
41
285
	h := map[string]*dbus.Variant{"x-canonical-switch-to-application": &dbus.Variant{true}}
285
	h := map[string]*dbus.Variant{"x-canonical-switch-to-application": &dbus.Variant{true}}
42
286
	nots := notifications.Raw(client.notificationsEndp, client.log)
286
	nots := notifications.Raw(client.notificationsEndp, client.log)
43
287
	body := "Tap to open the system updater."
287
	body := "Tap to open the system updater."
44
288
	if msg != nil {
45
289
		body = fmt.Sprintf("[%d] %s", msg.TopLevel, body)
46
290
	}
47
291
	not_id, err := nots.Notify(
288
	not_id, err := nots.Notify(
48
292
		"ubuntu-push-client",               // app name
289
		"ubuntu-push-client",               // app name
49
293
		uint32(0),                          // id
290
		uint32(0),                          // id
50
294
291
51
=== modified file 'client/client_test.go'
52
--- client/client_test.go	2014-04-11 16:21:45 +0000
53
+++ client/client_test.go	2014-04-23 11:53:01 +0000
54
@@ -19,10 +19,12 @@
55
19
import (
19
import (
56
20
	"encoding/json"
20
	"encoding/json"
57
21
	"errors"
21
	"errors"
58
22
	"flag"
59
22
	"fmt"
23
	"fmt"
60
23
	"io/ioutil"
24
	"io/ioutil"
61
24
	"net/http"
25
	"net/http"
62
25
	"net/http/httptest"
26
	"net/http/httptest"
63
27
	"os"
64
26
	"path/filepath"
28
	"path/filepath"
65
27
	"reflect"
29
	"reflect"
66
28
	"testing"
30
	"testing"
67
@@ -37,6 +39,7 @@
68
37
	testibus "launchpad.net/ubuntu-push/bus/testing"
39
	testibus "launchpad.net/ubuntu-push/bus/testing"
69
38
	"launchpad.net/ubuntu-push/client/session"
40
	"launchpad.net/ubuntu-push/client/session"
70
39
	"launchpad.net/ubuntu-push/client/session/levelmap"
41
	"launchpad.net/ubuntu-push/client/session/levelmap"
71
42
	"launchpad.net/ubuntu-push/config"
72
40
	helpers "launchpad.net/ubuntu-push/testing"
43
	helpers "launchpad.net/ubuntu-push/testing"
73
41
	"launchpad.net/ubuntu-push/testing/condition"
44
	"launchpad.net/ubuntu-push/testing/condition"
74
42
	"launchpad.net/ubuntu-push/util"
45
	"launchpad.net/ubuntu-push/util"
75
@@ -79,6 +82,7 @@
76
79
}
82
}
77
80
83
78
81
func (cs *clientSuite) SetUpSuite(c *C) {
84
func (cs *clientSuite) SetUpSuite(c *C) {
79
85
	config.IgnoreParsedFlags = true // because configure() uses <flags>
80
82
	cs.timeouts = util.SwapTimeouts([]time.Duration{0})
86
	cs.timeouts = util.SwapTimeouts([]time.Duration{0})
81
83
	cs.leveldbPath = ""
87
	cs.leveldbPath = ""
82
84
}
88
}
83
@@ -142,6 +146,16 @@
84
142
	c.Check(cli.config.ExchangeTimeout.TimeDuration(), Equals, time.Duration(10*time.Millisecond))
146
	c.Check(cli.config.ExchangeTimeout.TimeDuration(), Equals, time.Duration(10*time.Millisecond))
85
143
}
147
}
86
144
148
87
149
func (cs *clientSuite) TestConfigureWorksWithFlags(c *C) {
88
150
	flag.CommandLine = flag.NewFlagSet("client", flag.ContinueOnError)
89
151
	os.Args = []string{"client", "-addr", "foo:7777"}
90
152
	cli := NewPushClient(cs.configPath, cs.leveldbPath)
91
153
	err := cli.configure()
92
154
	c.Assert(err, IsNil)
93
155
	c.Assert(cli.config, NotNil)
94
156
	c.Check(cli.config.Addr, Equals, "foo:7777")
95
157
}
96
158
97
145
func (cs *clientSuite) TestConfigureSetsUpLog(c *C) {
159
func (cs *clientSuite) TestConfigureSetsUpLog(c *C) {
98
146
	cli := NewPushClient(cs.configPath, cs.leveldbPath)
160
	cli := NewPushClient(cs.configPath, cs.leveldbPath)
99
147
	c.Check(cli.log, IsNil)
161
	c.Check(cli.log, IsNil)
100
@@ -163,7 +177,7 @@
101
163
	c.Check(cli.idder, IsNil)
177
	c.Check(cli.idder, IsNil)
102
164
	err := cli.configure()
178
	err := cli.configure()
103
165
	c.Assert(err, IsNil)
179
	c.Assert(err, IsNil)
105
166
	c.Assert(cli.idder, DeepEquals, identifier.New())
180
	c.Assert(cli.idder, FitsTypeOf, identifier.New())
106
167
}
181
}
107
168
182
108
169
func (cs *clientSuite) TestConfigureSetsUpEndpoints(c *C) {
183
func (cs *clientSuite) TestConfigureSetsUpEndpoints(c *C) {
109
170
184
110
=== modified file 'client/gethosts/gethost.go'
111
--- client/gethosts/gethost.go	2014-03-24 15:32:29 +0000
112
+++ client/gethosts/gethost.go	2014-04-23 11:53:01 +0000
113
@@ -49,8 +49,10 @@
114
49
	}
49
	}
115
50
}
50
}
116
51
51
119
52
type expected struct {
52
// Host contains the domain and hosts returned by the remote endpoint
120
53
	Hosts []string
53
type Host struct {
121
54
	Domain string
122
55
	Hosts  []string
123
54
}
56
}
124
55
57
125
56
var (
58
var (
126
@@ -60,7 +62,7 @@
127
60
)
62
)
128
61
63
129
62
// Get gets a list of hosts consulting the endpoint.
64
// Get gets a list of hosts consulting the endpoint.
131
63
func (gh *GetHost) Get() ([]string, error) {
65
func (gh *GetHost) Get() (*Host, error) {
132
64
	resp, err := gh.cli.Get(gh.endpointUrl + "?h=" + gh.hash)
66
	resp, err := gh.cli.Get(gh.endpointUrl + "?h=" + gh.hash)
133
65
	if err != nil {
67
	if err != nil {
134
66
		return nil, err
68
		return nil, err
135
@@ -80,7 +82,7 @@
136
80
	if err != nil {
82
	if err != nil {
137
81
		return nil, err
83
		return nil, err
138
82
	}
84
	}
140
83
	var parsed expected
85
	var parsed Host
141
84
	err = json.Unmarshal(body, &parsed)
86
	err = json.Unmarshal(body, &parsed)
142
85
	if err != nil {
87
	if err != nil {
143
86
		return nil, ErrTemporary
88
		return nil, ErrTemporary
144
@@ -88,5 +90,5 @@
145
88
	if len(parsed.Hosts) == 0 {
90
	if len(parsed.Hosts) == 0 {
146
89
		return nil, ErrTemporary
91
		return nil, ErrTemporary
147
90
	}
92
	}
149
91
	return parsed.Hosts, nil
93
	return &parsed, nil
150
92
}
94
}
151
93
95
152
=== modified file 'client/gethosts/gethost_test.go'
153
--- client/gethosts/gethost_test.go	2014-03-31 14:31:07 +0000
154
+++ client/gethosts/gethost_test.go	2014-04-23 11:53:01 +0000
155
@@ -45,7 +45,8 @@
156
45
	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
45
	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
157
46
		x := r.FormValue("h")
46
		x := r.FormValue("h")
158
47
		b, err := json.Marshal(map[string]interface{}{
47
		b, err := json.Marshal(map[string]interface{}{
160
48
			"hosts": []string{"http://" + x},
48
			"domain": "example.com",
161
49
			"hosts":  []string{"http://" + x},
162
49
		})
50
		})
163
50
		if err != nil {
51
		if err != nil {
164
51
			panic(err)
52
			panic(err)
165
@@ -57,7 +58,8 @@
166
57
	gh := New("foobar", ts.URL, 1*time.Second)
58
	gh := New("foobar", ts.URL, 1*time.Second)
167
58
	res, err := gh.Get()
59
	res, err := gh.Get()
168
59
	c.Assert(err, IsNil)
60
	c.Assert(err, IsNil)
170
60
	c.Check(res, DeepEquals, []string{"http://c1130408a700afe0"})
61
	c.Check(*res, DeepEquals,
171
62
		Host{Domain: "example.com", Hosts: []string{"http://c1130408a700afe0"}})
172
61
}
63
}
173
62
64
174
63
func (s *getHostsSuite) TestGetTimeout(c *C) {
65
func (s *getHostsSuite) TestGetTimeout(c *C) {
175
@@ -97,4 +99,6 @@
176
97
99
177
98
	scenario(http.StatusOK, "{", ErrTemporary)
100
	scenario(http.StatusOK, "{", ErrTemporary)
178
99
	scenario(http.StatusOK, "{}", ErrTemporary)
101
	scenario(http.StatusOK, "{}", ErrTemporary)
179
102
	scenario(http.StatusOK, `{"domain": "example.com"}`, ErrTemporary)
180
103
	scenario(http.StatusOK, `{"hosts": ["one"]}`, nil)
181
100
}
104
}
182
101
105
183
=== modified file 'client/session/session.go'
184
--- client/session/session.go	2014-04-04 13:55:00 +0000
185
+++ client/session/session.go	2014-04-23 11:53:01 +0000
186
@@ -73,7 +73,7 @@
187
73
)
73
)
188
74
74
189
75
type hostGetter interface {
75
type hostGetter interface {
191
76
	Get() ([]string, error)
76
	Get() (*gethosts.Host, error)
192
77
}
77
}
193
78
78
194
79
// ClientSessionConfig groups the client session configuration.
79
// ClientSessionConfig groups the client session configuration.
195
@@ -115,6 +115,26 @@
196
115
	stateP *uint32
115
	stateP *uint32
197
116
	ErrCh  chan error
116
	ErrCh  chan error
198
117
	MsgCh  chan *Notification
117
	MsgCh  chan *Notification
199
118
	// autoredial knobs
200
119
	shouldDelayP    *uint32
201
120
	lastAutoRedial  time.Time
202
121
	redialDelay     func(*ClientSession) time.Duration
203
122
	redialJitter    func(time.Duration) time.Duration
204
123
	redialDelays    []time.Duration
205
124
	redialDelaysIdx int
206
125
}
207
126
208
127
func redialDelay(sess *ClientSession) time.Duration {
209
128
	if sess.ShouldDelay() {
210
129
		t := sess.redialDelays[sess.redialDelaysIdx]
211
130
		if len(sess.redialDelays) > sess.redialDelaysIdx+1 {
212
131
			sess.redialDelaysIdx++
213
132
		}
214
133
		return t + sess.redialJitter(t)
215
134
	} else {
216
135
		sess.redialDelaysIdx = 0
217
136
		return 0
218
137
	}
219
118
}
138
}
220
119
139
221
120
func NewSession(serverAddrSpec string, conf ClientSessionConfig,
140
func NewSession(serverAddrSpec string, conf ClientSessionConfig,
222
@@ -131,6 +151,7 @@
223
131
	if hostsEndpoint != "" {
151
	if hostsEndpoint != "" {
224
132
		getHost = gethosts.New(deviceId, hostsEndpoint, conf.ExchangeTimeout)
152
		getHost = gethosts.New(deviceId, hostsEndpoint, conf.ExchangeTimeout)
225
133
	}
153
	}
226
154
	var shouldDelay uint32 = 0
227
134
	sess := &ClientSession{
155
	sess := &ClientSession{
228
135
		ClientSessionConfig: conf,
156
		ClientSessionConfig: conf,
229
136
		getHost:             getHost,
157
		getHost:             getHost,
230
@@ -139,10 +160,14 @@
231
139
		Log:                 log,
160
		Log:                 log,
232
140
		Protocolator:        protocol.NewProtocol0,
161
		Protocolator:        protocol.NewProtocol0,
233
141
		Levels:              levels,
162
		Levels:              levels,
235
142
		TLS:                 &tls.Config{InsecureSkipVerify: true}, // XXX
163
		TLS:                 &tls.Config{},
236
143
		stateP:              &state,
164
		stateP:              &state,
237
144
		timeSince:           time.Since,
165
		timeSince:           time.Since,
238
166
		shouldDelayP:        &shouldDelay,
239
167
		redialDelay:         redialDelay,
240
168
		redialDelays:        util.Timeouts(),
241
145
	}
169
	}
242
170
	sess.redialJitter = sess.Jitter
243
146
	if sess.PEM != nil {
171
	if sess.PEM != nil {
244
147
		cp := x509.NewCertPool()
172
		cp := x509.NewCertPool()
245
148
		ok := cp.AppendCertsFromPEM(sess.PEM)
173
		ok := cp.AppendCertsFromPEM(sess.PEM)
246
@@ -154,6 +179,18 @@
247
154
	return sess, nil
179
	return sess, nil
248
155
}
180
}
249
156
181
250
182
func (sess *ClientSession) ShouldDelay() bool {
251
183
	return atomic.LoadUint32(sess.shouldDelayP) != 0
252
184
}
253
185
254
186
func (sess *ClientSession) setShouldDelay() {
255
187
	atomic.StoreUint32(sess.shouldDelayP, uint32(1))
256
188
}
257
189
258
190
func (sess *ClientSession) clearShouldDelay() {
259
191
	atomic.StoreUint32(sess.shouldDelayP, uint32(0))
260
192
}
261
193
262
157
func (sess *ClientSession) State() ClientSessionState {
194
func (sess *ClientSession) State() ClientSessionState {
263
158
	return ClientSessionState(atomic.LoadUint32(sess.stateP))
195
	return ClientSessionState(atomic.LoadUint32(sess.stateP))
264
159
}
196
}
265
@@ -180,14 +217,17 @@
266
180
		if sess.deliveryHosts != nil && sess.timeSince(sess.deliveryHostsTimestamp) < sess.HostsCachingExpiryTime {
217
		if sess.deliveryHosts != nil && sess.timeSince(sess.deliveryHostsTimestamp) < sess.HostsCachingExpiryTime {
267
181
			return nil
218
			return nil
268
182
		}
219
		}
270
183
		hosts, err := sess.getHost.Get()
220
		host, err := sess.getHost.Get()
271
184
		if err != nil {
221
		if err != nil {
272
185
			sess.Log.Errorf("getHosts: %v", err)
222
			sess.Log.Errorf("getHosts: %v", err)
273
186
			sess.setState(Error)
223
			sess.setState(Error)
274
187
			return err
224
			return err
275
188
		}
225
		}
276
189
		sess.deliveryHostsTimestamp = time.Now()
226
		sess.deliveryHostsTimestamp = time.Now()
278
190
		sess.deliveryHosts = hosts
227
		sess.deliveryHosts = host.Hosts
279
228
		if sess.TLS != nil {
280
229
			sess.TLS.ServerName = host.Domain
281
230
		}
282
191
	} else {
231
	} else {
283
192
		sess.deliveryHosts = sess.fallbackHosts
232
		sess.deliveryHosts = sess.fallbackHosts
284
193
	}
233
	}
285
@@ -234,6 +274,7 @@
286
234
// connect to a server using the configuration in the ClientSession
274
// connect to a server using the configuration in the ClientSession
287
235
// and set up the connection.
275
// and set up the connection.
288
236
func (sess *ClientSession) connect() error {
276
func (sess *ClientSession) connect() error {
289
277
	sess.setShouldDelay()
290
237
	sess.startConnectionAttempt()
278
	sess.startConnectionAttempt()
291
238
	var err error
279
	var err error
292
239
	var conn net.Conn
280
	var conn net.Conn
293
@@ -263,7 +304,12 @@
294
263
304
295
264
func (sess *ClientSession) AutoRedial(doneCh chan uint32) {
305
func (sess *ClientSession) AutoRedial(doneCh chan uint32) {
296
265
	sess.stopRedial()
306
	sess.stopRedial()
297
307
	if time.Since(sess.lastAutoRedial) < 2*time.Second {
298
308
		sess.setShouldDelay()
299
309
	}
300
310
	time.Sleep(sess.redialDelay(sess))
301
266
	sess.retrier = util.NewAutoRedialer(sess)
311
	sess.retrier = util.NewAutoRedialer(sess)
302
312
	sess.lastAutoRedial = time.Now()
303
267
	go func() { doneCh <- sess.retrier.Redial() }()
313
	go func() { doneCh <- sess.retrier.Redial() }()
304
268
}
314
}
305
269
315
306
@@ -289,6 +335,7 @@
307
289
	err := sess.proto.WriteMessage(protocol.PingPongMsg{Type: "pong"})
335
	err := sess.proto.WriteMessage(protocol.PingPongMsg{Type: "pong"})
308
290
	if err == nil {
336
	if err == nil {
309
291
		sess.Log.Debugf("ping.")
337
		sess.Log.Debugf("ping.")
310
338
		sess.clearShouldDelay()
311
292
	} else {
339
	} else {
312
293
		sess.setState(Error)
340
		sess.setState(Error)
313
294
		sess.Log.Errorf("unable to pong: %s", err)
341
		sess.Log.Errorf("unable to pong: %s", err)
314
@@ -330,6 +377,7 @@
315
330
		sess.Log.Errorf("unable to ack broadcast: %s", err)
377
		sess.Log.Errorf("unable to ack broadcast: %s", err)
316
331
		return err
378
		return err
317
332
	}
379
	}
318
380
	sess.clearShouldDelay()
319
333
	sess.Log.Debugf("broadcast chan:%v app:%v topLevel:%d payloads:%s",
381
	sess.Log.Debugf("broadcast chan:%v app:%v topLevel:%d payloads:%s",
320
334
		bcast.ChanId, bcast.AppId, bcast.TopLevel, bcast.Payloads)
382
		bcast.ChanId, bcast.AppId, bcast.TopLevel, bcast.Payloads)
321
335
	if bcast.ChanId == protocol.SystemChannelId {
383
	if bcast.ChanId == protocol.SystemChannelId {
322
336
384
323
=== modified file 'client/session/session_test.go'
324
--- client/session/session_test.go	2014-04-04 13:55:00 +0000
325
+++ client/session/session_test.go	2014-04-23 11:53:01 +0000
326
@@ -32,12 +32,13 @@
327
32
32
328
33
	. "launchpad.net/gocheck"
33
	. "launchpad.net/gocheck"
329
34
34
330
35
	"launchpad.net/ubuntu-push/client/gethosts"
331
35
	"launchpad.net/ubuntu-push/client/session/levelmap"
36
	"launchpad.net/ubuntu-push/client/session/levelmap"
332
36
	//"launchpad.net/ubuntu-push/client/gethosts"
333
37
	"launchpad.net/ubuntu-push/logger"
37
	"launchpad.net/ubuntu-push/logger"
334
38
	"launchpad.net/ubuntu-push/protocol"
38
	"launchpad.net/ubuntu-push/protocol"
335
39
	helpers "launchpad.net/ubuntu-push/testing"
39
	helpers "launchpad.net/ubuntu-push/testing"
336
40
	"launchpad.net/ubuntu-push/testing/condition"
40
	"launchpad.net/ubuntu-push/testing/condition"
337
41
	"launchpad.net/ubuntu-push/util"
338
41
)
42
)
339
42
43
340
43
func TestSession(t *testing.T) { TestingT(t) }
44
func TestSession(t *testing.T) { TestingT(t) }
341
@@ -214,6 +215,10 @@
342
214
	c.Check(sess, NotNil)
215
	c.Check(sess, NotNil)
343
215
	c.Check(err, IsNil)
216
	c.Check(err, IsNil)
344
216
	c.Check(sess.fallbackHosts, DeepEquals, []string{"foo:443"})
217
	c.Check(sess.fallbackHosts, DeepEquals, []string{"foo:443"})
345
218
	// the session is happy and redial delayer is default
346
219
	c.Check(sess.ShouldDelay(), Equals, false)
347
220
	c.Check(fmt.Sprintf("%#v", sess.redialDelay), Equals, fmt.Sprintf("%#v", redialDelay))
348
221
	c.Check(sess.redialDelays, DeepEquals, util.Timeouts())
349
217
	// but no root CAs set
222
	// but no root CAs set
350
218
	c.Check(sess.TLS.RootCAs, IsNil)
223
	c.Check(sess.TLS.RootCAs, IsNil)
351
219
	c.Check(sess.State(), Equals, Disconnected)
224
	c.Check(sess.State(), Equals, Disconnected)
352
@@ -264,16 +269,17 @@
353
264
}
269
}
354
265
270
355
266
type testHostGetter struct {
271
type testHostGetter struct {
358
267
	hosts []string
272
	domain string
359
268
	err   error
273
	hosts  []string
360
274
	err    error
361
269
}
275
}
362
270
276
365
271
func (thg *testHostGetter) Get() ([]string, error) {
277
func (thg *testHostGetter) Get() (*gethosts.Host, error) {
366
272
	return thg.hosts, thg.err
278
	return &gethosts.Host{thg.domain, thg.hosts}, thg.err
367
273
}
279
}
368
274
280
369
275
func (cs *clientSessionSuite) TestGetHostsRemote(c *C) {
281
func (cs *clientSessionSuite) TestGetHostsRemote(c *C) {
371
276
	hostGetter := &testHostGetter{[]string{"foo:443", "bar:443"}, nil}
282
	hostGetter := &testHostGetter{"example.com", []string{"foo:443", "bar:443"}, nil}
372
277
	sess := &ClientSession{getHost: hostGetter, timeSince: time.Since}
283
	sess := &ClientSession{getHost: hostGetter, timeSince: time.Since}
373
278
	err := sess.getHosts()
284
	err := sess.getHosts()
374
279
	c.Assert(err, IsNil)
285
	c.Assert(err, IsNil)
375
@@ -284,7 +290,7 @@
376
284
	sess, err := NewSession("", dummyConf, "", cs.lvls, cs.log)
290
	sess, err := NewSession("", dummyConf, "", cs.lvls, cs.log)
377
285
	c.Assert(err, IsNil)
291
	c.Assert(err, IsNil)
378
286
	hostsErr := errors.New("failed")
292
	hostsErr := errors.New("failed")
380
287
	hostGetter := &testHostGetter{nil, hostsErr}
293
	hostGetter := &testHostGetter{"", nil, hostsErr}
381
288
	sess.getHost = hostGetter
294
	sess.getHost = hostGetter
382
289
	err = sess.getHosts()
295
	err = sess.getHosts()
383
290
	c.Assert(err, Equals, hostsErr)
296
	c.Assert(err, Equals, hostsErr)
384
@@ -293,7 +299,7 @@
385
293
}
299
}
386
294
300
387
295
func (cs *clientSessionSuite) TestGetHostsRemoteCaching(c *C) {
301
func (cs *clientSessionSuite) TestGetHostsRemoteCaching(c *C) {
389
296
	hostGetter := &testHostGetter{[]string{"foo:443", "bar:443"}, nil}
302
	hostGetter := &testHostGetter{"example.com", []string{"foo:443", "bar:443"}, nil}
390
297
	sess := &ClientSession{
303
	sess := &ClientSession{
391
298
		getHost: hostGetter,
304
		getHost: hostGetter,
392
299
		ClientSessionConfig: ClientSessionConfig{
305
		ClientSessionConfig: ClientSessionConfig{
393
@@ -318,7 +324,7 @@
394
318
}
324
}
395
319
325
396
320
func (cs *clientSessionSuite) TestGetHostsRemoteCachingReset(c *C) {
326
func (cs *clientSessionSuite) TestGetHostsRemoteCachingReset(c *C) {
398
321
	hostGetter := &testHostGetter{[]string{"foo:443", "bar:443"}, nil}
327
	hostGetter := &testHostGetter{"example.com", []string{"foo:443", "bar:443"}, nil}
399
322
	sess := &ClientSession{
328
	sess := &ClientSession{
400
323
		getHost: hostGetter,
329
		getHost: hostGetter,
401
324
		ClientSessionConfig: ClientSessionConfig{
330
		ClientSessionConfig: ClientSessionConfig{
402
@@ -427,7 +433,9 @@
403
427
	sess, err := NewSession("", dummyConf, "wah", cs.lvls, cs.log)
433
	sess, err := NewSession("", dummyConf, "wah", cs.lvls, cs.log)
404
428
	c.Assert(err, IsNil)
434
	c.Assert(err, IsNil)
405
429
	sess.deliveryHosts = []string{"nowhere"}
435
	sess.deliveryHosts = []string{"nowhere"}
406
436
	sess.clearShouldDelay()
407
430
	err = sess.connect()
437
	err = sess.connect()
408
438
	c.Check(sess.ShouldDelay(), Equals, true)
409
431
	c.Check(err, ErrorMatches, ".*connect.*address.*")
439
	c.Check(err, ErrorMatches, ".*connect.*address.*")
410
432
	c.Check(sess.State(), Equals, Error)
440
	c.Check(sess.State(), Equals, Error)
411
433
}
441
}
412
@@ -439,7 +447,9 @@
413
439
	sess, err := NewSession("", dummyConf, "wah", cs.lvls, cs.log)
447
	sess, err := NewSession("", dummyConf, "wah", cs.lvls, cs.log)
414
440
	c.Assert(err, IsNil)
448
	c.Assert(err, IsNil)
415
441
	sess.deliveryHosts = []string{srv.Addr().String()}
449
	sess.deliveryHosts = []string{srv.Addr().String()}
416
450
	sess.clearShouldDelay()
417
442
	err = sess.connect()
451
	err = sess.connect()
418
452
	c.Check(sess.ShouldDelay(), Equals, true)
419
443
	c.Check(err, IsNil)
453
	c.Check(err, IsNil)
420
444
	c.Check(sess.Connection, NotNil)
454
	c.Check(sess.Connection, NotNil)
421
445
	c.Check(sess.State(), Equals, Connected)
455
	c.Check(sess.State(), Equals, Connected)
422
@@ -452,7 +462,9 @@
423
452
	sess, err := NewSession("", dummyConf, "wah", cs.lvls, cs.log)
462
	sess, err := NewSession("", dummyConf, "wah", cs.lvls, cs.log)
424
453
	c.Assert(err, IsNil)
463
	c.Assert(err, IsNil)
425
454
	sess.deliveryHosts = []string{"nowhere", srv.Addr().String()}
464
	sess.deliveryHosts = []string{"nowhere", srv.Addr().String()}
426
465
	sess.clearShouldDelay()
427
455
	err = sess.connect()
466
	err = sess.connect()
428
467
	c.Check(sess.ShouldDelay(), Equals, true)
429
456
	c.Check(err, IsNil)
468
	c.Check(err, IsNil)
430
457
	c.Check(sess.Connection, NotNil)
469
	c.Check(sess.Connection, NotNil)
431
458
	c.Check(sess.State(), Equals, Connected)
470
	c.Check(sess.State(), Equals, Connected)
432
@@ -466,7 +478,9 @@
433
466
	srv.Close()
478
	srv.Close()
434
467
	c.Assert(err, IsNil)
479
	c.Assert(err, IsNil)
435
468
	sess.deliveryHosts = []string{srv.Addr().String()}
480
	sess.deliveryHosts = []string{srv.Addr().String()}
436
481
	sess.clearShouldDelay()
437
469
	err = sess.connect()
482
	err = sess.connect()
438
483
	c.Check(sess.ShouldDelay(), Equals, true)
439
470
	c.Check(err, ErrorMatches, ".*connection refused")
484
	c.Check(err, ErrorMatches, ".*connection refused")
440
471
	c.Check(sess.State(), Equals, Error)
485
	c.Check(sess.State(), Equals, Error)
441
472
}
486
}
442
@@ -548,6 +562,27 @@
443
548
	c.Check(<-ch, Not(Equals), 0)
562
	c.Check(<-ch, Not(Equals), 0)
444
549
}
563
}
445
550
564
446
565
func (cs *clientSessionSuite) TestAutoRedialCallsRedialDelay(c *C) {
447
566
	sess, err := NewSession("", dummyConf, "wah", cs.lvls, cs.log)
448
567
	c.Assert(err, IsNil)
449
568
	flag := false
450
569
	sess.redialDelay = func(sess *ClientSession) time.Duration { flag = true; return 0 }
451
570
	sess.AutoRedial(nil)
452
571
	c.Check(flag, Equals, true)
453
572
}
454
573
455
574
func (cs *clientSessionSuite) TestAutoRedialSetsRedialDelayIfTooQuick(c *C) {
456
575
	sess, err := NewSession("", dummyConf, "wah", cs.lvls, cs.log)
457
576
	c.Assert(err, IsNil)
458
577
	sess.redialDelay = func(sess *ClientSession) time.Duration { return 0 }
459
578
	sess.AutoRedial(nil)
460
579
	c.Check(sess.ShouldDelay(), Equals, false)
461
580
	sess.stopRedial()
462
581
	sess.clearShouldDelay()
463
582
	sess.AutoRedial(nil)
464
583
	c.Check(sess.ShouldDelay(), Equals, true)
465
584
}
466
585
467
551
/****************************************************************
586
/****************************************************************
468
552
  handlePing() tests
587
  handlePing() tests
469
553
****************************************************************/
588
****************************************************************/
470
@@ -594,6 +629,24 @@
471
594
	c.Check(s.sess.State(), Equals, Error)
629
	c.Check(s.sess.State(), Equals, Error)
472
595
}
630
}
473
596
631
474
632
func (s *msgSuite) TestHandlePingClearsDelay(c *C) {
475
633
	s.sess.setShouldDelay()
476
634
	s.upCh <- nil // no error
477
635
	c.Check(s.sess.handlePing(), IsNil)
478
636
	c.Assert(len(s.downCh), Equals, 1)
479
637
	c.Check(<-s.downCh, Equals, protocol.PingPongMsg{Type: "pong"})
480
638
	c.Check(s.sess.ShouldDelay(), Equals, false)
481
639
}
482
640
483
641
func (s *msgSuite) TestHandlePingDoesNotClearsDelayOnError(c *C) {
484
642
	s.sess.setShouldDelay()
485
643
	s.upCh <- errors.New("Pong")
486
644
	c.Check(s.sess.handlePing(), NotNil)
487
645
	c.Assert(len(s.downCh), Equals, 1)
488
646
	c.Check(<-s.downCh, Equals, protocol.PingPongMsg{Type: "pong"})
489
647
	c.Check(s.sess.ShouldDelay(), Equals, true)
490
648
}
491
649
492
597
/****************************************************************
650
/****************************************************************
493
598
  handleBroadcast() tests
651
  handleBroadcast() tests
494
599
****************************************************************/
652
****************************************************************/
495
@@ -687,6 +740,32 @@
496
687
	c.Check(takeNext(s.downCh), Equals, protocol.AckMsg{"nak"})
740
	c.Check(takeNext(s.downCh), Equals, protocol.AckMsg{"nak"})
497
688
}
741
}
498
689
742
499
743
func (s *msgSuite) TestHandleBroadcastClearsDelay(c *C) {
500
744
	s.sess.setShouldDelay()
501
745
502
746
	msg := serverMsg{"broadcast", protocol.BroadcastMsg{},
503
747
		protocol.NotificationsMsg{}, protocol.ConnBrokenMsg{}}
504
748
	go func() { s.errCh <- s.sess.handleBroadcast(&msg) }()
505
749
	c.Check(takeNext(s.downCh), Equals, protocol.AckMsg{"ack"})
506
750
	s.upCh <- nil // ack ok
507
751
	c.Check(<-s.errCh, IsNil)
508
752
509
753
	c.Check(s.sess.ShouldDelay(), Equals, false)
510
754
}
511
755
512
756
func (s *msgSuite) TestHandleBroadcastDoesNotClearDelayOnError(c *C) {
513
757
	s.sess.setShouldDelay()
514
758
515
759
	msg := serverMsg{"broadcast", protocol.BroadcastMsg{},
516
760
		protocol.NotificationsMsg{}, protocol.ConnBrokenMsg{}}
517
761
	go func() { s.errCh <- s.sess.handleBroadcast(&msg) }()
518
762
	c.Check(takeNext(s.downCh), Equals, protocol.AckMsg{"ack"})
519
763
	s.upCh <- errors.New("bcast")
520
764
	c.Check(<-s.errCh, NotNil)
521
765
522
766
	c.Check(s.sess.ShouldDelay(), Equals, true)
523
767
}
524
768
525
690
/****************************************************************
769
/****************************************************************
526
691
  handleConnBroken() tests
770
  handleConnBroken() tests
527
692
****************************************************************/
771
****************************************************************/
528
@@ -1087,9 +1166,64 @@
529
1087
1166
530
1088
var (
1167
var (
531
1089
	dialTestTimeout = 100 * time.Millisecond
1168
	dialTestTimeout = 100 * time.Millisecond
533
1090
	dialTestConf    = ClientSessionConfig{ExchangeTimeout: dialTestTimeout}
1169
	dialTestConf    = ClientSessionConfig{
534
1170
		ExchangeTimeout: dialTestTimeout,
535
1171
		PEM:             helpers.TestCertPEMBlock,
536
1172
	}
537
1091
)
1173
)
538
1092
1174
539
1175
func (cs *clientSessionSuite) TestDialBadServerName(c *C) {
540
1176
	// a borked server name
541
1177
	cert, err := tls.X509KeyPair(helpers.TestCertPEMBlock, helpers.TestKeyPEMBlock)
542
1178
	c.Assert(err, IsNil)
543
1179
	tlsCfg := &tls.Config{
544
1180
		Certificates:           []tls.Certificate{cert},
545
1181
		SessionTicketsDisabled: true,
546
1182
	}
547
1183
548
1184
	lst, err := tls.Listen("tcp", "localhost:0", tlsCfg)
549
1185
	c.Assert(err, IsNil)
550
1186
	// advertise
551
1187
	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
552
1188
		b, err := json.Marshal(map[string]interface{}{
553
1189
			"domain": "xyzzy", // <-- *** THIS *** is the bit that'll break it
554
1190
			"hosts":  []string{"nowhere", lst.Addr().String()},
555
1191
		})
556
1192
		if err != nil {
557
1193
			panic(err)
558
1194
		}
559
1195
		w.Header().Set("Content-Type", "application/json")
560
1196
		w.Write(b)
561
1197
	}))
562
1198
	defer ts.Close()
563
1199
564
1200
	sess, err := NewSession(ts.URL, dialTestConf, "wah", cs.lvls, cs.log)
565
1201
	c.Assert(err, IsNil)
566
1202
	tconn := &testConn{}
567
1203
	sess.Connection = tconn
568
1204
569
1205
	upCh := make(chan interface{}, 5)
570
1206
	downCh := make(chan interface{}, 5)
571
1207
	errCh := make(chan error, 1)
572
1208
	proto := &testProtocol{up: upCh, down: downCh}
573
1209
	sess.Protocolator = func(net.Conn) protocol.Protocol { return proto }
574
1210
575
1211
	go func() {
576
1212
		errCh <- sess.Dial()
577
1213
	}()
578
1214
579
1215
	srv, err := lst.Accept()
580
1216
	c.Assert(err, IsNil)
581
1217
582
1218
	// connect done
583
1219
584
1220
	_, err = protocol.ReadWireFormatVersion(srv, dialTestTimeout)
585
1221
	c.Check(err, NotNil)
586
1222
587
1223
	c.Check(<-errCh, NotNil)
588
1224
	c.Check(sess.State(), Equals, Error)
589
1225
}
590
1226
591
1093
func (cs *clientSessionSuite) TestDialWorks(c *C) {
1227
func (cs *clientSessionSuite) TestDialWorks(c *C) {
592
1094
	// happy path thoughts
1228
	// happy path thoughts
593
1095
	cert, err := tls.X509KeyPair(helpers.TestCertPEMBlock, helpers.TestKeyPEMBlock)
1229
	cert, err := tls.X509KeyPair(helpers.TestCertPEMBlock, helpers.TestKeyPEMBlock)
594
@@ -1104,7 +1238,8 @@
595
1104
	// advertise
1238
	// advertise
596
1105
	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
1239
	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
597
1106
		b, err := json.Marshal(map[string]interface{}{
1240
		b, err := json.Marshal(map[string]interface{}{
599
1107
			"hosts": []string{"nowhere", lst.Addr().String()},
1241
			"domain": "localhost",
600
1242
			"hosts":  []string{"nowhere", lst.Addr().String()},
601
1108
		})
1243
		})
602
1109
		if err != nil {
1244
		if err != nil {
603
1110
			panic(err)
1245
			panic(err)
604
@@ -1223,3 +1358,38 @@
605
1223
	c.Assert(err, IsNil)
1358
	c.Assert(err, IsNil)
606
1224
	// connect done
1359
	// connect done
607
1225
}
1360
}
608
1361
609
1362
/****************************************************************
610
1363
  redialDelay() tests
611
1364
****************************************************************/
612
1365
613
1366
func (cs *clientSessionSuite) TestShouldDelay(c *C) {
614
1367
	sess, err := NewSession("foo:443", dummyConf, "", cs.lvls, cs.log)
615
1368
	c.Assert(err, IsNil)
616
1369
	c.Check(sess.ShouldDelay(), Equals, false)
617
1370
	sess.setShouldDelay()
618
1371
	c.Check(sess.ShouldDelay(), Equals, true)
619
1372
	sess.clearShouldDelay()
620
1373
	c.Check(sess.ShouldDelay(), Equals, false)
621
1374
}
622
1375
623
1376
func (cs *clientSessionSuite) TestRedialDelay(c *C) {
624
1377
	sess, err := NewSession("foo:443", dummyConf, "", cs.lvls, cs.log)
625
1378
	c.Assert(err, IsNil)
626
1379
	sess.redialDelays = []time.Duration{17, 42}
627
1380
	n := 0
628
1381
	sess.redialJitter = func(time.Duration) time.Duration { n++; return 0 }
629
1382
	// we get increasing delays while we're unhappy
630
1383
	sess.setShouldDelay()
631
1384
	c.Check(redialDelay(sess), Equals, time.Duration(17))
632
1385
	c.Check(redialDelay(sess), Equals, time.Duration(42))
633
1386
	c.Check(redialDelay(sess), Equals, time.Duration(42))
634
1387
	// once we're happy, delays drop to 0
635
1388
	sess.clearShouldDelay()
636
1389
	c.Check(redialDelay(sess), Equals, time.Duration(0))
637
1390
	// and start again from the top if we become unhappy again
638
1391
	sess.setShouldDelay()
639
1392
	c.Check(redialDelay(sess), Equals, time.Duration(17))
640
1393
	// and redialJitter got called every time shouldDelay was true
641
1394
	c.Check(n, Equals, 4)
642
1395
}
643
1226
1396
644
=== modified file 'config/config.go'
645
--- config/config.go	2014-03-25 18:49:18 +0000
646
+++ config/config.go	2014-04-23 11:53:01 +0000
647
@@ -20,6 +20,7 @@
648
20
import (
20
import (
649
21
	"encoding/json"
21
	"encoding/json"
650
22
	"errors"
22
	"errors"
651
23
	"flag"
652
23
	"fmt"
24
	"fmt"
653
24
	"io"
25
	"io"
654
25
	"io/ioutil"
26
	"io/ioutil"
655
@@ -27,6 +28,7 @@
656
27
	"os"
28
	"os"
657
28
	"path/filepath"
29
	"path/filepath"
658
29
	"reflect"
30
	"reflect"
659
31
	"strconv"
660
30
	"strings"
32
	"strings"
661
31
	"time"
33
	"time"
662
32
)
34
)
663
@@ -118,6 +120,22 @@
664
118
	return fillDestConfig(destValue, p1)
120
	return fillDestConfig(destValue, p1)
665
119
}
121
}
666
120
122
667
123
// FromString are config holders that can be set by parsing a string.
668
124
type FromString interface {
669
125
	SetFromString(enc string) error
670
126
}
671
127
672
128
// UnmarshalJSONViaString helps unmarshalling from JSON for FromString
673
129
// supporting config holders.
674
130
func UnmarshalJSONViaString(dest FromString, b []byte) error {
675
131
	var enc string
676
132
	err := json.Unmarshal(b, &enc)
677
133
	if err != nil {
678
134
		return err
679
135
	}
680
136
	return dest.SetFromString(enc)
681
137
}
682
138
683
121
// ConfigTimeDuration can hold a time.Duration in a configuration struct,
139
// ConfigTimeDuration can hold a time.Duration in a configuration struct,
684
122
// that is parsed from a string as supported by time.ParseDuration.
140
// that is parsed from a string as supported by time.ParseDuration.
685
123
type ConfigTimeDuration struct {
141
type ConfigTimeDuration struct {
686
@@ -125,13 +143,11 @@
687
125
}
143
}
688
126
144
689
127
func (ctd *ConfigTimeDuration) UnmarshalJSON(b []byte) error {
145
func (ctd *ConfigTimeDuration) UnmarshalJSON(b []byte) error {
697
128
	var enc string
146
	return UnmarshalJSONViaString(ctd, b)
698
129
	var v time.Duration
147
}
699
130
	err := json.Unmarshal(b, &enc)
148
700
131
	if err != nil {
149
func (ctd *ConfigTimeDuration) SetFromString(enc string) error {
701
132
		return err
150
	v, err := time.ParseDuration(enc)
695
133
	}
696
134
	v, err = time.ParseDuration(enc)
702
135
	if err != nil {
151
	if err != nil {
703
136
		return err
152
		return err
704
137
	}
153
	}
705
@@ -148,12 +164,11 @@
706
148
type ConfigHostPort string
164
type ConfigHostPort string
707
149
165
708
150
func (chp *ConfigHostPort) UnmarshalJSON(b []byte) error {
166
func (chp *ConfigHostPort) UnmarshalJSON(b []byte) error {
715
151
	var enc string
167
	return UnmarshalJSONViaString(chp, b)
716
152
	err := json.Unmarshal(b, &enc)
168
}
717
153
	if err != nil {
169
718
154
		return err
170
func (chp *ConfigHostPort) SetFromString(enc string) error {
719
155
	}
171
	_, _, err := net.SplitHostPort(enc)
714
156
	_, _, err = net.SplitHostPort(enc)
720
157
	if err != nil {
172
	if err != nil {
721
158
		return err
173
		return err
722
159
	}
174
	}
723
@@ -198,23 +213,117 @@
724
198
	return ioutil.ReadFile(p)
213
	return ioutil.ReadFile(p)
725
199
}
214
}
726
200
215
728
201
// ReadFiles reads configuration from a set of files. Uses ReadConfig internally.
216
// used to implement getting config values with flag.Parse()
729
217
type val struct {
730
218
	destField destField
731
219
	accu      map[string]json.RawMessage
732
220
}
733
221
734
222
func (v *val) String() string { // used to show default
735
223
	return string(v.accu[v.destField.configName()])
736
224
}
737
225
738
226
func (v *val) IsBoolFlag() bool {
739
227
	return v.destField.fld.Type.Kind() == reflect.Bool
740
228
}
741
229
742
230
func (v *val) marshalAsNeeded(s string) (json.RawMessage, error) {
743
231
	var toMarshal interface{}
744
232
	switch v.destField.dest.(type) {
745
233
	case *string, FromString:
746
234
		toMarshal = s
747
235
	case *bool:
748
236
		bit, err := strconv.ParseBool(s)
749
237
		if err != nil {
750
238
			return nil, err
751
239
		}
752
240
		toMarshal = bit
753
241
	default:
754
242
		return json.RawMessage(s), nil
755
243
	}
756
244
	return json.Marshal(toMarshal)
757
245
}
758
246
759
247
func (v *val) Set(s string) error {
760
248
	marshalled, err := v.marshalAsNeeded(s)
761
249
	if err != nil {
762
250
		return err
763
251
	}
764
252
	v.accu[v.destField.configName()] = marshalled
765
253
	return nil
766
254
}
767
255
768
256
func readOneConfig(accu map[string]json.RawMessage, cfgPath string) error {
769
257
	r, err := os.Open(cfgPath)
770
258
	if err != nil {
771
259
		return err
772
260
	}
773
261
	defer r.Close()
774
262
	err = json.NewDecoder(r).Decode(&accu)
775
263
	if err != nil {
776
264
		return err
777
265
	}
778
266
	return nil
779
267
}
780
268
781
269
// used to implement -cfg@=
782
270
type readConfigAtVal struct {
783
271
	accu map[string]json.RawMessage
784
272
}
785
273
786
274
func (v *readConfigAtVal) String() string {
787
275
	return "<config.json>"
788
276
}
789
277
790
278
func (v *readConfigAtVal) Set(path string) error {
791
279
	return readOneConfig(v.accu, path)
792
280
}
793
281
794
282
// readUsingFlags gets config values from command line flags.
795
283
func readUsingFlags(accu map[string]json.RawMessage, destValue reflect.Value) error {
796
284
	if flag.Parsed() {
797
285
		if IgnoreParsedFlags {
798
286
			return nil
799
287
		}
800
288
		return fmt.Errorf("too late, flags already parsed")
801
289
	}
802
290
	destStruct := destValue.Elem()
803
291
	for destField := range traverseStruct(destStruct) {
804
292
		help := destField.fld.Tag.Get("help")
805
293
		flag.Var(&val{destField, accu}, destField.configName(), help)
806
294
	}
807
295
	flag.Var(&readConfigAtVal{accu}, "cfg@", "get config values from file")
808
296
	flag.Parse()
809
297
	return nil
810
298
}
811
299
812
300
// IgnoreParsedFlags will just have ReadFiles ignore <flags> if the
813
301
// command line was already parsed.
814
302
var IgnoreParsedFlags = false
815
303
816
304
// ReadFiles reads configuration from a set of files. The string
817
305
// "<flags>" can be used as a pseudo file-path, it will consider
818
306
// command line flags, invoking flag.Parse(). Among those the flag
819
307
// -cfg@=FILE can be used to get further config values from FILE.
820
202
func ReadFiles(destConfig interface{}, cfgFpaths ...string) error {
308
func ReadFiles(destConfig interface{}, cfgFpaths ...string) error {
821
203
	destValue, err := checkDestConfig("destConfig", destConfig)
309
	destValue, err := checkDestConfig("destConfig", destConfig)
822
204
	if err != nil {
310
	if err != nil {
823
205
		return err
311
		return err
824
206
	}
312
	}
825
207
	// do the parsing in two phases for better error handling
313
	// do the parsing in two phases for better error handling
827
208
	var p1 map[string]json.RawMessage
314
	p1 := make(map[string]json.RawMessage)
828
209
	readOne := false
315
	readOne := false
829
210
	for _, cfgPath := range cfgFpaths {
316
	for _, cfgPath := range cfgFpaths {
830
317
		if cfgPath == "<flags>" {
831
318
			err := readUsingFlags(p1, destValue)
832
319
			if err != nil {
833
320
				return err
834
321
			}
835
322
			readOne = true
836
323
			continue
837
324
		}
838
211
		if _, err := os.Stat(cfgPath); err == nil {
325
		if _, err := os.Stat(cfgPath); err == nil {
845
212
			r, err := os.Open(cfgPath)
326
			err := readOneConfig(p1, cfgPath)
840
213
			if err != nil {
841
214
				return err
842
215
			}
843
216
			defer r.Close()
844
217
			err = json.NewDecoder(r).Decode(&p1)
846
218
			if err != nil {
327
			if err != nil {
847
219
				return err
328
				return err
848
220
			}
329
			}
849
221
330
850
=== modified file 'config/config_test.go'
851
--- config/config_test.go	2014-03-25 18:49:18 +0000
852
+++ config/config_test.go	2014-04-23 11:53:01 +0000
853
@@ -18,6 +18,9 @@
854
18
18
855
19
import (
19
import (
856
20
	"bytes"
20
	"bytes"
857
21
	"encoding/json"
858
22
	"flag"
859
23
	"fmt"
860
21
	"io/ioutil"
24
	"io/ioutil"
861
22
	"os"
25
	"os"
862
23
	"path/filepath"
26
	"path/filepath"
863
@@ -230,3 +233,105 @@
864
230
	c.Check(res, DeepEquals, []string{"b", "c_list", "d"})
233
	c.Check(res, DeepEquals, []string{"b", "c_list", "d"})
865
231
234
866
232
}
235
}
867
236
868
237
type testConfig3 struct {
869
238
	A bool
870
239
	B string
871
240
	C []string           `json:"c_list"`
872
241
	D ConfigTimeDuration `help:"duration"`
873
242
	E ConfigHostPort
874
243
	F string
875
244
}
876
245
877
246
type configFlagsSuite struct{}
878
247
879
248
var _ = Suite(&configFlagsSuite{})
880
249
881
250
func (s *configFlagsSuite) SetUpTest(c *C) {
882
251
	flag.CommandLine = flag.NewFlagSet("cmd", flag.PanicOnError)
883
252
	// supress outputs
884
253
	flag.Usage = func() { flag.PrintDefaults() }
885
254
	flag.CommandLine.SetOutput(ioutil.Discard)
886
255
}
887
256
888
257
func (s *configFlagsSuite) TestReadUsingFlags(c *C) {
889
258
	os.Args = []string{"cmd", "-a=1", "-b=foo", "-c_list", `["x","y"]`, "-d", "10s", "-e=localhost:80"}
890
259
	var cfg testConfig3
891
260
	p := make(map[string]json.RawMessage)
892
261
	err := readUsingFlags(p, reflect.ValueOf(&cfg))
893
262
	c.Assert(err, IsNil)
894
263
	c.Check(p, DeepEquals, map[string]json.RawMessage{
895
264
		"a":      json.RawMessage("true"),
896
265
		"b":      json.RawMessage(`"foo"`),
897
266
		"c_list": json.RawMessage(`["x","y"]`),
898
267
		"d":      json.RawMessage(`"10s"`),
899
268
		"e":      json.RawMessage(`"localhost:80"`),
900
269
	})
901
270
}
902
271
903
272
func (s *configFlagsSuite) TestReadUsingFlagsBoolError(c *C) {
904
273
	os.Args = []string{"cmd", "-a=zoo"}
905
274
	var cfg testConfig3
906
275
	p := make(map[string]json.RawMessage)
907
276
	c.Check(func() { readUsingFlags(p, reflect.ValueOf(&cfg)) }, PanicMatches, ".*invalid boolean.*-a.*")
908
277
}
909
278
910
279
func (s *configFlagsSuite) TestReadFilesAndFlags(c *C) {
911
280
	// test <flags> pseudo file
912
281
	os.Args = []string{"cmd", "-b=x"}
913
282
	tmpDir := c.MkDir()
914
283
	cfgPath := filepath.Join(tmpDir, "cfg.json")
915
284
	err := ioutil.WriteFile(cfgPath, []byte(`{"a": 42, "c_list": ["y", "z"]}`), os.ModePerm)
916
285
	c.Assert(err, IsNil)
917
286
	var cfg testConfig1
918
287
	err = ReadFiles(&cfg, cfgPath, "<flags>")
919
288
	c.Assert(err, IsNil)
920
289
	c.Check(cfg.A, Equals, 42)
921
290
	c.Check(cfg.B, Equals, "x")
922
291
	c.Check(cfg.C, DeepEquals, []string{"y", "z"})
923
292
}
924
293
925
294
func (s *configFlagsSuite) TestReadFilesAndFlagsConfigAtSupport(c *C) {
926
295
	// test <flags> pseudo file
927
296
	tmpDir := c.MkDir()
928
297
	cfgPath := filepath.Join(tmpDir, "cfg.json")
929
298
	os.Args = []string{"cmd", "-a=42", fmt.Sprintf("-cfg@=%s", cfgPath)}
930
299
	err := ioutil.WriteFile(cfgPath, []byte(`{"b": "x", "c_list": ["y", "z"]}`), os.ModePerm)
931
300
	c.Assert(err, IsNil)
932
301
	var cfg testConfig1
933
302
	err = ReadFiles(&cfg, "<flags>")
934
303
	c.Assert(err, IsNil)
935
304
	c.Check(cfg.A, Equals, 42)
936
305
	c.Check(cfg.B, Equals, "x")
937
306
	c.Check(cfg.C, DeepEquals, []string{"y", "z"})
938
307
}
939
308
940
309
func (s *configFlagsSuite) TestReadUsingFlagsHelp(c *C) {
941
310
	os.Args = []string{"cmd", "-h"}
942
311
	buf := bytes.NewBufferString("")
943
312
	flag.CommandLine.Init("cmd", flag.ContinueOnError)
944
313
	flag.CommandLine.SetOutput(buf)
945
314
	var cfg testConfig3
946
315
	p := map[string]json.RawMessage{
947
316
		"d": json.RawMessage(`"2s"`),
948
317
	}
949
318
	readUsingFlags(p, reflect.ValueOf(&cfg))
950
319
	c.Check(buf.String(), Matches, `(?s).*-cfg@=<config.json>: get config values from file\n.*-d="2s": duration.*`)
951
320
}
952
321
953
322
func (s *configFlagsSuite) TestReadUsingFlagsAlreadyParsed(c *C) {
954
323
	os.Args = []string{"cmd"}
955
324
	flag.Parse()
956
325
	var cfg struct{}
957
326
	p := make(map[string]json.RawMessage)
958
327
	err := readUsingFlags(p, reflect.ValueOf(&cfg))
959
328
	c.Assert(err, ErrorMatches, "too late, flags already parsed")
960
329
	err = ReadFiles(&cfg, "<flags>")
961
330
	c.Assert(err, ErrorMatches, "too late, flags already parsed")
962
331
	IgnoreParsedFlags = true
963
332
	defer func() {
964
333
		IgnoreParsedFlags = false
965
334
	}()
966
335
	err = ReadFiles(&cfg, "<flags>")
967
336
	c.Assert(err, IsNil)
968
337
}
969
233
338
970
=== modified file 'debian/changelog'
971
--- debian/changelog	2014-04-11 18:31:57 +0000
972
+++ debian/changelog	2014-04-23 11:53:01 +0000
973
@@ -1,3 +1,22 @@
974
1
ubuntu-push (0.2.1-0ubuntu1) UNRELEASED; urgency=high
975
2
976
3
  [ Samuele Pedroni ]
977
4
  * gave the client the ability to get config from commandline
978
5
    ( => easier automated testing) (LP: #1311600)
979
6
980
7
  [ John Lenton ]
981
8
  * Ensure ubuntu-push-client is the only one running in the session.
982
9
    (LP: #1309432)
983
10
  * Remove supurious numbers in brackets in notifications. (LP: #1308145)
984
11
  * Check the server certificate and server name. (LP: #1297969)
985
12
  * Loop whoopsie_identifier_generate until it starts working. (LP: #1309237)
986
13
  * In the session: set a flag on connect, clear it on successfully
987
14
    replying to ping or broadcast messages, check it at the top of
988
15
    autoredial. Also track the last autoredial, and set the delay flag if
989
16
    autoredial is re-called too quickly. (LP: #1309231)
990
17
991
18
 -- John Lenton <john.lenton@canonical.com>  Fri, 18 Apr 2014 10:42:31 +0100
992
19
993
1
ubuntu-push (0.2+14.04.20140411-0ubuntu1) trusty; urgency=medium
20
ubuntu-push (0.2+14.04.20140411-0ubuntu1) trusty; urgency=medium
994
2
21
995
3
  [ John Lenton ]
22
  [ John Lenton ]
996
4
23
997
=== modified file 'logger/logger.go'
998
--- logger/logger.go	2014-02-24 10:27:38 +0000
999
+++ logger/logger.go	2014-04-23 11:53:01 +0000
1000
@@ -23,6 +23,8 @@
1001
23
	"log"
23
	"log"
1002
24
	"os"
24
	"os"
1003
25
	"runtime"
25
	"runtime"
1004
26
1005
27
	"launchpad.net/ubuntu-push/config"
1006
26
)
28
)
1007
27
29
1008
28
// Logger is a simple logger interface with logging at levels.
30
// Logger is a simple logger interface with logging at levels.
1009
@@ -119,3 +121,28 @@
1010
119
		lg.outputFunc(2, fmt.Sprintf("DEBUG "+format, v...))
121
		lg.outputFunc(2, fmt.Sprintf("DEBUG "+format, v...))
1011
120
	}
122
	}
1012
121
}
123
}
1013
124
1014
125
// config bits
1015
126
1016
127
// ConfigLogLevel can hold a log level in a configuration struct.
1017
128
type ConfigLogLevel string
1018
129
1019
130
func (cll *ConfigLogLevel) ConfigFromJSONString() {}
1020
131
1021
132
func (cll *ConfigLogLevel) UnmarshalJSON(b []byte) error {
1022
133
	return config.UnmarshalJSONViaString(cll, b)
1023
134
}
1024
135
1025
136
func (cll *ConfigLogLevel) SetFromString(enc string) error {
1026
137
	_, ok := levelToNLevel[enc]
1027
138
	if !ok {
1028
139
		return fmt.Errorf("not a log level: %s", enc)
1029
140
	}
1030
141
	*cll = ConfigLogLevel(enc)
1031
142
	return nil
1032
143
}
1033
144
1034
145
// Level returns the log level string held in cll.
1035
146
func (cll ConfigLogLevel) Level() string {
1036
147
	return string(cll)
1037
148
}
1038
122
149
1039
=== modified file 'logger/logger_test.go'
1040
--- logger/logger_test.go	2014-02-10 22:51:43 +0000
1041
+++ logger/logger_test.go	2014-04-23 11:53:01 +0000
1042
@@ -25,6 +25,8 @@
1043
25
	"testing"
25
	"testing"
1044
26
26
1045
27
	. "launchpad.net/gocheck"
27
	. "launchpad.net/gocheck"
1046
28
1047
29
	"launchpad.net/ubuntu-push/config"
1048
28
)
30
)
1049
29
31
1050
30
func TestLogger(t *testing.T) { TestingT(t) }
32
func TestLogger(t *testing.T) { TestingT(t) }
1051
@@ -138,3 +140,26 @@
1052
138
	logger.Output(1, "foobaz")
140
	logger.Output(1, "foobaz")
1053
139
	c.Check(buf.String(), Matches, "logger_test.go:[0-9]+: foobar\nlogger_test.go:[0-9]+: foobaz\n")
141
	c.Check(buf.String(), Matches, "logger_test.go:[0-9]+: foobar\nlogger_test.go:[0-9]+: foobaz\n")
1054
140
}
142
}
1055
143
1056
144
type testLogLevelConfig struct {
1057
145
	Lvl ConfigLogLevel
1058
146
}
1059
147
1060
148
func (s *loggerSuite) TestReadConfigLogLevel(c *C) {
1061
149
	buf := bytes.NewBufferString(`{"lvl": "debug"}`)
1062
150
	var cfg testLogLevelConfig
1063
151
	err := config.ReadConfig(buf, &cfg)
1064
152
	c.Assert(err, IsNil)
1065
153
	c.Check(cfg.Lvl.Level(), Equals, "debug")
1066
154
}
1067
155
1068
156
func (s *loggerSuite) TestReadConfigLogLevelErrors(c *C) {
1069
157
	var cfg testLogLevelConfig
1070
158
	checkError := func(jsonCfg string, expectedError string) {
1071
159
		buf := bytes.NewBufferString(jsonCfg)
1072
160
		err := config.ReadConfig(buf, &cfg)
1073
161
		c.Check(err, ErrorMatches, expectedError)
1074
162
	}
1075
163
	checkError(`{"lvl": 1}`, "lvl:.*type string")
1076
164
	checkError(`{"lvl": "foo"}`, "lvl: not a log level: foo")
1077
165
}
1078
141
166
1079
=== modified file 'server/acceptance/cmd/acceptanceclient.go'
1080
--- server/acceptance/cmd/acceptanceclient.go	2014-04-10 13:52:31 +0000
1081
+++ server/acceptance/cmd/acceptanceclient.go	2014-04-23 11:53:01 +0000
1082
@@ -48,13 +48,18 @@
1083
48
		fmt.Fprintf(os.Stderr, "Usage: acceptancclient [options] <config.json> <device id>\n")
48
		fmt.Fprintf(os.Stderr, "Usage: acceptancclient [options] <config.json> <device id>\n")
1084
49
		flag.PrintDefaults()
49
		flag.PrintDefaults()
1085
50
	}
50
	}
1086
51
	missingArg := func(what string) {
1087
52
		fmt.Fprintf(os.Stderr, "missing %s\n", what)
1088
53
		flag.Usage()
1089
54
		os.Exit(2)
1090
55
	}
1091
51
	flag.Parse()
56
	flag.Parse()
1092
52
	narg := flag.NArg()
57
	narg := flag.NArg()
1093
53
	switch {
58
	switch {
1094
54
	case narg < 1:
59
	case narg < 1:
1096
55
		log.Fatal("missing config file")
60
		missingArg("config file")
1097
56
	case narg < 2:
61
	case narg < 2:
1099
57
		log.Fatal("missing device-id")
62
		missingArg("device-id")
1100
58
	}
63
	}
1101
59
	configFName := flag.Arg(0)
64
	configFName := flag.Arg(0)
1102
60
	f, err := os.Open(configFName)
65
	f, err := os.Open(configFName)
1103
61
66
1104
=== modified file 'ubuntu-push-client.go'
1105
--- ubuntu-push-client.go	2014-03-12 13:25:20 +0000
1106
+++ ubuntu-push-client.go	2014-04-23 11:53:01 +0000
1107
@@ -19,12 +19,37 @@
1108
19
import (
19
import (
1109
20
	"log"
20
	"log"
1110
21
21
1111
22
	"launchpad.net/go-dbus/v1"
1112
22
	"launchpad.net/go-xdg/v0"
23
	"launchpad.net/go-xdg/v0"
1113
23
24
1114
24
	"launchpad.net/ubuntu-push/client"
25
	"launchpad.net/ubuntu-push/client"
1115
25
)
26
)
1116
26
27
1117
28
const NAME = "com.ubuntu.PushNotifications"
1118
29
1119
30
// grabName grabs ownership of the dbus name, and bails the client as
1120
31
// soon as somebody else grabs it.
1121
32
func grabName() {
1122
33
	conn, err := dbus.Connect(dbus.SessionBus)
1123
34
	if err != nil {
1124
35
		log.Fatalf("bus: %v", err)
1125
36
	}
1126
37
1127
38
	flags := dbus.NameFlagAllowReplacement | dbus.NameFlagReplaceExisting
1128
39
	n := conn.RequestName(NAME, flags)
1129
40
	go func() {
1130
41
		for err := range n.C {
1131
42
			if err != nil {
1132
43
				log.Fatalf("FATAL: name channel got: %v", err)
1133
44
			}
1134
45
		}
1135
46
	}()
1136
47
}
1137
48
1138
27
func main() {
49
func main() {
1139
50
	// XXX: this is a quick hack to ensure unicity
1140
51
	grabName()
1141
52
1142
28
	cfgFname, err := xdg.Config.Find("ubuntu-push-client/config.json")
53
	cfgFname, err := xdg.Config.Find("ubuntu-push-client/config.json")
1143
29
	if err != nil {
54
	if err != nil {
1144
30
		log.Fatalf("unable to find a configuration file: %v", err)
55
		log.Fatalf("unable to find a configuration file: %v", err)
1145
31
56
1146
=== modified file 'whoopsie/identifier/identifier.go'
1147
--- whoopsie/identifier/identifier.go	2014-02-21 16:17:28 +0000
1148
+++ whoopsie/identifier/identifier.go	2014-04-23 11:53:01 +0000
1149
@@ -27,6 +27,7 @@
1150
27
import "C"
27
import "C"
1151
28
import "unsafe"
28
import "unsafe"
1152
29
import "errors"
29
import "errors"
1153
30
import "time"
1154
30
31
1155
31
// an Id knows how to generate itself, and how to stringify itself.
32
// an Id knows how to generate itself, and how to stringify itself.
1156
32
type Id interface {
33
type Id interface {
1157
@@ -36,12 +37,17 @@
1158
36
37
1159
37
// Identifier is the default Id implementation.
38
// Identifier is the default Id implementation.
1160
38
type Identifier struct {
39
type Identifier struct {
1162
39
	value string
40
	value     string
1163
41
	generator func(**C.char, **C.GError)
1164
42
}
1165
43
1166
44
func generator(csp **C.char, errp **C.GError) {
1167
45
	C.whoopsie_identifier_generate(csp, errp)
1168
40
}
46
}
1169
41
47
1170
42
// New creates an Identifier, but does not call Generate() on it.
48
// New creates an Identifier, but does not call Generate() on it.
1171
43
func New() Id {
49
func New() Id {
1173
44
	return &Identifier{}
50
	return &Identifier{generator: generator}
1174
45
}
51
}
1175
46
52
1176
47
// Generate makes the Identifier create the identifier itself.
53
// Generate makes the Identifier create the identifier itself.
1177
@@ -49,8 +55,18 @@
1178
49
	var gerr *C.GError
55
	var gerr *C.GError
1179
50
	var cs *C.char
56
	var cs *C.char
1180
51
	defer C.g_free((C.gpointer)(unsafe.Pointer(cs)))
57
	defer C.g_free((C.gpointer)(unsafe.Pointer(cs)))
1183
52
	C.whoopsie_identifier_generate(&cs, &gerr)
58
1184
53
59
	for i := 0; i < 200; i++ {
1185
60
		id.generator(&cs, &gerr)
1186
61
1187
62
		if cs != nil || gerr != nil {
1188
63
			goto SuccessMaybe
1189
64
		}
1190
65
		time.Sleep(600 * time.Millisecond)
1191
66
	}
1192
67
	return errors.New("whoopsie_identifier_generate still bad after 2m; giving up")
1193
68
1194
69
SuccessMaybe:
1195
54
	if gerr != nil {
70
	if gerr != nil {
1196
55
		return errors.New(C.GoString((*C.char)(gerr.message)))
71
		return errors.New(C.GoString((*C.char)(gerr.message)))
1197
56
	} else {
72
	} else {
1198
57
73
1199
=== modified file 'whoopsie/identifier/identifier_test.go'
1200
--- whoopsie/identifier/identifier_test.go	2014-01-15 15:51:50 +0000
1201
+++ whoopsie/identifier/identifier_test.go	2014-04-23 11:53:01 +0000
1202
@@ -41,3 +41,18 @@
1203
41
func (s *IdentifierSuite) TestIdentifierInterface(c *C) {
41
func (s *IdentifierSuite) TestIdentifierInterface(c *C) {
1204
42
	_ = []Id{New()}
42
	_ = []Id{New()}
1205
43
}
43
}
1206
44
1207
45
// TestFailure checks that Identifier survives whoopsie shenanigans
1208
46
func (s *IdentifierSuite) TestIdentifierSurvivesShenanigans(c *C) {
1209
47
	count := 0
1210
48
	// using _Ctype* as a workaround for gocheck also having a C
1211
49
	gen := func(csp **_Ctype_char, errp **_Ctype_GError) {
1212
50
		count++
1213
51
		if count > 3 {
1214
52
			generator(csp, errp)
1215
53
		}
1216
54
	}
1217
55
	id := &Identifier{generator: gen}
1218
56
	id.Generate()
1219
57
	c.Check(id.String(), HasLen, 128)
1220
58
}
Status:	Merged
Merged at revision:	101
Proposed branch:	lp:~chipaca/ubuntu-push/cherrypickings
Merge into:	lp:ubuntu-push
Diff against target:	1220 lines (+640/-59) 15 files modified client/client.go (+6/-9) client/client_test.go (+15/-1) client/gethosts/gethost.go (+7/-5) client/gethosts/gethost_test.go (+6/-2) client/session/session.go (+52/-4) client/session/session_test.go (+181/-11) config/config.go (+130/-21) config/config_test.go (+105/-0) debian/changelog (+19/-0) logger/logger.go (+27/-0) logger/logger_test.go (+25/-0) server/acceptance/cmd/acceptanceclient.go (+7/-2) ubuntu-push-client.go (+25/-0) whoopsie/identifier/identifier.go (+20/-4) whoopsie/identifier/identifier_test.go (+15/-0)
To merge this branch:	bzr merge lp:~chipaca/ubuntu-push/cherrypickings
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Ubuntu Push Hackers		2014-04-18	Pending
Review via email: mp+216466@code.launchpad.net