Merge branch 'develop'

.travis.yml

@@ -1,12 +1,18 @@
 language: go
 
+go_import_path: github.com/TheThingsNetwork/ttn
+
 sudo: required
 
 services:
     - docker
 
 go:
-    - 1.7
+    - 1.8
+
+cache:
+  directories:
+    - vendor
 
 install:
     - make deps

api/auth/auth.go

@@ -0,0 +1,49 @@
+package auth
+
+import (
+	"github.com/TheThingsNetwork/ttn/api"
+	"golang.org/x/net/context"
+	"google.golang.org/grpc"
+)
+
+const tokenKey = "token"
+
+// TokenCredentials RPC Credentials
+type TokenCredentials struct {
+	token     string
+	tokenFunc func(id string) string
+}
+
+// WithStaticToken injects a static token on each request
+func WithStaticToken(token string) *TokenCredentials {
+	return &TokenCredentials{token: token}
+}
+
+// WithTokenFunc returns TokenCredentials that execute the tokenFunc on each request
+func WithTokenFunc(tokenFunc func(id string) string) *TokenCredentials {
+	return &TokenCredentials{tokenFunc: tokenFunc}
+}
+
+// RequireTransportSecurity implements credentials.PerRPCCredentials
+func (c *TokenCredentials) RequireTransportSecurity() bool { return true }
+
+// GetRequestMetadata implements credentials.PerRPCCredentials
+func (c *TokenCredentials) GetRequestMetadata(ctx context.Context, uri ...string) (map[string]string, error) {
+	token, _ := api.TokenFromContext(ctx)
+	if token != "" {
+		return map[string]string{tokenKey: token}, nil
+	}
+	if c.tokenFunc != nil {
+		id, _ := api.IDFromContext(ctx)
+		return map[string]string{tokenKey: c.tokenFunc(id)}, nil
+	}
+	if c.token != "" {
+		return map[string]string{tokenKey: c.token}, nil
+	}
+	return map[string]string{tokenKey: ""}, nil
+}
+
+// DialOption returns a DialOption for the TokenCredentials
+func (c *TokenCredentials) DialOption() grpc.DialOption {
+	return grpc.WithPerRPCCredentials(c)
+}

api/monitor/monitor.go

@@ -437,30 +437,50 @@ func (c *Client) NewBrokerStreams(id string, token string) GenericStream {
 				}
 			}
 
+			chUplink := make(chan *broker.DeduplicatedUplinkMessage, c.config.BufferSize)
+			chDownlink := make(chan *broker.DownlinkMessage, c.config.BufferSize)
+
+			defer func() {
+				s.mu.Lock()
+				defer s.mu.Unlock()
+				delete(s.uplink, server.name)
+				delete(s.downlink, server.name)
+				close(chUplink)
+				close(chDownlink)
+			}()
+
 			// Uplink stream
 			uplink, err := cli.BrokerUplink(ctx)
 			if err != nil {
 				log.WithError(err).Warn("Could not set up BrokerUplink stream")
 			} else {
-				go monitor("BrokerUplink", uplink)
+				s.mu.Lock()
+				s.uplink[server.name] = chUplink
+				s.mu.Unlock()
+				go func() {
+					monitor("BrokerUplink", uplink)
+					s.mu.Lock()
+					defer s.mu.Unlock()
+					delete(s.uplink, server.name)
+				}()
 			}
 
 			// Downlink stream
 			downlink, err := cli.BrokerDownlink(ctx)
 			if err != nil {
 				log.WithError(err).Warn("Could not set up BrokerDownlink stream")
 			} else {
-				go monitor("BrokerDownlink", downlink)
+				s.mu.Lock()
+				s.downlink[server.name] = chDownlink
+				s.mu.Unlock()
+				go func() {
+					monitor("BrokerDownlink", downlink)
+					s.mu.Lock()
+					defer s.mu.Unlock()
+					delete(s.downlink, server.name)
+				}()
 			}
 
-			chUplink := make(chan *broker.DeduplicatedUplinkMessage, c.config.BufferSize)
-			chDownlink := make(chan *broker.DownlinkMessage, c.config.BufferSize)
-
-			s.mu.Lock()
-			s.uplink[server.name] = chUplink
-			s.downlink[server.name] = chDownlink
-			s.mu.Unlock()
-
 			log.Debug("Start handling Broker streams")
 			defer log.Debug("Done handling Broker streams")
 			for {
@@ -470,12 +490,16 @@ func (c *Client) NewBrokerStreams(id string, token string) GenericStream {
 				case msg := <-chUplink:
 					if err := uplink.Send(msg); err != nil {
 						log.WithError(err).Warn("Could not send UplinkMessage to monitor")
-						return
+						if err == restartstream.ErrStreamClosed {
+							return
+						}
 					}
 				case msg := <-chDownlink:
 					if err := downlink.Send(msg); err != nil {
 						log.WithError(err).Warn("Could not send DownlinkMessage to monitor")
-						return
+						if err == restartstream.ErrStreamClosed {
+							return
+						}
 					}
 				}
 			}

api/monitor/monitor_test.go

@@ -40,6 +40,8 @@ func TestMonitor(t *testing.T) {
 
 	cli.AddServer("tls-without-tls", lis.Addr().String())
 
+	testLogger.Print(t)
+
 	cli.AddServer("test", lis.Addr().String())
 	time.Sleep(waitTime)
 	defer func() {
@@ -48,6 +50,8 @@ func TestMonitor(t *testing.T) {
 		s.Stop()
 	}()
 
+	testLogger.Print(t)
+
 	gtw := cli.NewGatewayStreams("test", "token")
 	time.Sleep(waitTime)
 	for i := 0; i < 20; i++ {
@@ -64,6 +68,8 @@ func TestMonitor(t *testing.T) {
 	a.So(server.metrics.downlinkMessages, ShouldEqual, 20)
 	a.So(server.metrics.gatewayStatuses, ShouldEqual, 20)
 
+	testLogger.Print(t)
+
 	brk := cli.NewBrokerStreams("test", "token")
 	time.Sleep(waitTime)
 	brk.Send(&broker.DeduplicatedUplinkMessage{})
@@ -75,6 +81,8 @@ func TestMonitor(t *testing.T) {
 	a.So(server.metrics.brokerUplinkMessages, ShouldEqual, 1)
 	a.So(server.metrics.brokerDownlinkMessages, ShouldEqual, 1)
 
+	testLogger.Print(t)
+
 	cli.AddConn("test2", cli.serverConns[1].conn)
 
 	brk = cli.NewBrokerStreams("test", "token")