Merge pull request #537 from TheThingsNetwork/develop

v2.6.0

.env/broker/ca.cert

@@ -0,0 +1 @@
+../discovery/server.cert

.env/broker/server.cert

@@ -1,11 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBjjCCATSgAwIBAgIQFzR5quaK8FbcvukuVI94uDAKBggqhkjOPQQDAjAdMRsw
-GQYDVQQKExJUaGUgVGhpbmdzIE5ldHdvcmswHhcNMTYwNzI5MTIxMTU2WhcNMTcw
-NzI5MTIxMTU2WjAdMRswGQYDVQQKExJUaGUgVGhpbmdzIE5ldHdvcmswWTATBgcq
+MIIBszCCAVmgAwIBAgIQdB+Af49pdScsT7qifQr/BzAKBggqhkjOPQQDAjAdMRsw
+GQYDVQQKExJUaGUgVGhpbmdzIE5ldHdvcmswHhcNMTcwMzA5MTkwNzAyWhcNMTgw
+MzA5MTkwNzAyWjAdMRswGQYDVQQKExJUaGUgVGhpbmdzIE5ldHdvcmswWTATBgcq
 hkjOPQIBBggqhkjOPQMBBwNCAARKJiC1vanAuqbOtVYPwSM8D6oSseAOeUra5dHi
-Xtp72d59+kgaEfa6Zgp0KSaes+D2fxE+RJ4G6v7DYbKgWOGto1YwVDAOBgNVHQ8B
-Af8EBAMCAqQwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zAc
-BgNVHREEFTATgglsb2NhbGhvc3SCBmJyb2tlcjAKBggqhkjOPQQDAgNIADBFAiAU
-fiL3mhXOFbG9T3QVv2lH7H58pnhdrJmIBN1n6qvDXgIhAPgpd2ZCkJ04GHQyTuoU
-v75tKrSlLiJw62QdY+s93uSh
+Xtp72d59+kgaEfa6Zgp0KSaes+D2fxE+RJ4G6v7DYbKgWOGto3sweTAOBgNVHQ8B
+Af8EBAMCAqQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA8GA1UdEwEB
+/wQFMAMBAf8wNwYDVR0RBDAwLoIJbG9jYWxob3N0gglsb2NhbGhvc3SHBH8AAAGH
+EAAAAAAAAAAAAAAAAAAAAAEwCgYIKoZIzj0EAwIDSAAwRQIhAO1tHZhOntbGCh1C
+NUDGy2XbNF4XP2s/f5N3Rjz/hsvLAiA7WKRmVCu57WTcVEeDmmTHApglmmTmB73N
+Bt+Gmd8yaQ==
 -----END CERTIFICATE-----

.env/discovery/dev.yml

@@ -4,6 +4,7 @@ discovery-address: "localhost:1900"
 auth-servers:
   ttn-account-v2: "https://account.thethingsnetwork.org"
   local: "file://.env/discovery/server.pub"
+tls: true
 key-dir: "./.env/discovery/"
 discovery:
   master-auth-servers:

.env/discovery/server.cert

@@ -0,0 +1,11 @@
+-----BEGIN CERTIFICATE-----
+MIIBqDCCAU6gAwIBAgIQaz96pn/63+3HrDdym3o44TAKBggqhkjOPQQDAjAdMRsw
+GQYDVQQKExJUaGUgVGhpbmdzIE5ldHdvcmswHhcNMTcwMzA5MTkwNzAyWhcNMTgw
+MzA5MTkwNzAyWjAdMRswGQYDVQQKExJUaGUgVGhpbmdzIE5ldHdvcmswWTATBgcq
+hkjOPQIBBggqhkjOPQMBBwNCAAQZ3BU/el/lQZz4hJ2/NAb+oOPNtCJm5dV+WbIS
+Q+RRIXHKo9G6mDMEhuwrFA4LyikZ1yftNxKoJR7LIJ3wkdR+o3AwbjAOBgNVHQ8B
+Af8EBAMCAqQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA8GA1UdEwEB
+/wQFMAMBAf8wLAYDVR0RBCUwI4IJbG9jYWxob3N0hwR/AAABhxAAAAAAAAAAAAAA
+AAAAAAABMAoGCCqGSM49BAMCA0gAMEUCIQCAzEFCWNstqZUdxnmk+kXMZSFwg3v9
+L18WGBi7jj95DgIgY0QJWSdMU4BhZVGdCoW4Yq+awY2R1s9NC+nHsnL4tV0=
+-----END CERTIFICATE-----

.env/gencerts.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+env=$(dirname $0)
+
+for service in discovery router broker networkserver handler
+do
+  # ttn $service gen-keypair --key-dir "$env/$service"
+  ttn $service gen-cert --key-dir "$env/$service" "localhost" "127.0.0.1" "::1"
+done

.env/handler/ca.cert

@@ -0,0 +1 @@
+../discovery/server.cert

.env/handler/server.cert

@@ -1,11 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBkDCCATagAwIBAgIRANJJ3rP0cNrdrouE2GCkkaYwCgYIKoZIzj0EAwIwHTEb
-MBkGA1UEChMSVGhlIFRoaW5ncyBOZXR3b3JrMB4XDTE2MDcyOTEyMTIwNloXDTE3
-MDcyOTEyMTIwNlowHTEbMBkGA1UEChMSVGhlIFRoaW5ncyBOZXR3b3JrMFkwEwYH
-KoZIzj0CAQYIKoZIzj0DAQcDQgAEiXbWvyYjOMP4ebTYtVvdIsBwS+U3laWltR7V
-ox4+kQWcGLLEg+suI9SRZyKK+frhw9JPKbVNIgEv/S50YKfMEaNXMFUwDgYDVR0P
-AQH/BAQDAgKkMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8w
-HQYDVR0RBBYwFIIJbG9jYWxob3N0ggdoYW5kbGVyMAoGCCqGSM49BAMCA0gAMEUC
-IQDbNJPUIfKZ/1CkTF3+ukl64l3fn613hnMiqAJYO7yz7QIgTAwlr3vkLquSQZUO
-yraf7CGvuvulKs4S8sd8im6Bdgs=
+MIIBszCCAVmgAwIBAgIQcrThDOgGdbi+Yz4obDgN5zAKBggqhkjOPQQDAjAdMRsw
+GQYDVQQKExJUaGUgVGhpbmdzIE5ldHdvcmswHhcNMTcwMzA5MTkwNzAyWhcNMTgw
+MzA5MTkwNzAyWjAdMRswGQYDVQQKExJUaGUgVGhpbmdzIE5ldHdvcmswWTATBgcq
+hkjOPQIBBggqhkjOPQMBBwNCAASJdta/JiM4w/h5tNi1W90iwHBL5TeVpaW1HtWj
+Hj6RBZwYssSD6y4j1JFnIor5+uHD0k8ptU0iAS/9LnRgp8wRo3sweTAOBgNVHQ8B
+Af8EBAMCAqQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA8GA1UdEwEB
+/wQFMAMBAf8wNwYDVR0RBDAwLoIJbG9jYWxob3N0gglsb2NhbGhvc3SHBH8AAAGH
+EAAAAAAAAAAAAAAAAAAAAAEwCgYIKoZIzj0EAwIDSAAwRQIhAKyfSZf1tXd1/PeE
+vwpltxjtTsHtHrTaOHcz/RENVdKYAiBZRmpzDQbbEStFKhNubYDfv/HIh74RPoUU
+y5j6P1kTTg==
 -----END CERTIFICATE-----

.env/networkserver/server.cert

@@ -1,11 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBljCCATygAwIBAgIRAOs3B7qZNgejMf+laNHTRuYwCgYIKoZIzj0EAwIwHTEb
-MBkGA1UEChMSVGhlIFRoaW5ncyBOZXR3b3JrMB4XDTE2MDcyOTEyMTIxNVoXDTE3
-MDcyOTEyMTIxNVowHTEbMBkGA1UEChMSVGhlIFRoaW5ncyBOZXR3b3JrMFkwEwYH
-KoZIzj0CAQYIKoZIzj0DAQcDQgAEsfIDb4Va9ocbwGuc375Bxw5ICTCXZ60mbgdx
-3JSyWm19DW5dihzPFrB0Ezu+lak91rTEaon9WNcVibhFNG5wMqNdMFswDgYDVR0P
-AQH/BAQDAgKkMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8w
-IwYDVR0RBBwwGoIJbG9jYWxob3N0gg1uZXR3b3Jrc2VydmVyMAoGCCqGSM49BAMC
-A0gAMEUCIBrRl5a2PX+fn68Uefq15Cn1C1XE6NGVmI+HvmP1sA1JAiEA0L4WgKdo
-HcUc8PnKlUUgN9nLVx98W9Sb2TvOaldspVE=
+MIIBszCCAVmgAwIBAgIQDU92ZmhSjs5+l/Hh53oA0DAKBggqhkjOPQQDAjAdMRsw
+GQYDVQQKExJUaGUgVGhpbmdzIE5ldHdvcmswHhcNMTcwMzA5MTkwNzAyWhcNMTgw
+MzA5MTkwNzAyWjAdMRswGQYDVQQKExJUaGUgVGhpbmdzIE5ldHdvcmswWTATBgcq
+hkjOPQIBBggqhkjOPQMBBwNCAASx8gNvhVr2hxvAa5zfvkHHDkgJMJdnrSZuB3Hc
+lLJabX0Nbl2KHM8WsHQTO76VqT3WtMRqif1Y1xWJuEU0bnAyo3sweTAOBgNVHQ8B
+Af8EBAMCAqQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA8GA1UdEwEB
+/wQFMAMBAf8wNwYDVR0RBDAwLoIJbG9jYWxob3N0gglsb2NhbGhvc3SHBH8AAAGH
+EAAAAAAAAAAAAAAAAAAAAAEwCgYIKoZIzj0EAwIDSAAwRQIhAKl5ksLQouswffPg
+uW1TjDcBNAv0icKXc5uGThz6lv9LAiAJAcpAzY1FUqNGYIqF+3W7AnzWjiF7SVfM
+NQthfc/8LQ==
 -----END CERTIFICATE-----

.env/router/ca.cert

@@ -0,0 +1 @@
+../discovery/server.cert

.env/router/server.cert

@@ -1,11 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBjjCCATSgAwIBAgIQS/57LijDDb+PB9+WltoR1DAKBggqhkjOPQQDAjAdMRsw
-GQYDVQQKExJUaGUgVGhpbmdzIE5ldHdvcmswHhcNMTYwNzI5MTIxMTQ2WhcNMTcw
-NzI5MTIxMTQ2WjAdMRswGQYDVQQKExJUaGUgVGhpbmdzIE5ldHdvcmswWTATBgcq
+MIIBszCCAVmgAwIBAgIQDqPxNkrxxJN7VEA7IwQVWzAKBggqhkjOPQQDAjAdMRsw
+GQYDVQQKExJUaGUgVGhpbmdzIE5ldHdvcmswHhcNMTcwMzA5MTkwNzAyWhcNMTgw
+MzA5MTkwNzAyWjAdMRswGQYDVQQKExJUaGUgVGhpbmdzIE5ldHdvcmswWTATBgcq
 hkjOPQIBBggqhkjOPQMBBwNCAAQrcb9XbpbPrXWn8Qh8kRNxzt+Y3BpxyVgRkeST
-30VcppXAv83B64oqklFFTr9BmOSsSXY1iKxcDUV+25TEkuCro1YwVDAOBgNVHQ8B
-Af8EBAMCAqQwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zAc
-BgNVHREEFTATgglsb2NhbGhvc3SCBnJvdXRlcjAKBggqhkjOPQQDAgNIADBFAiEA
-sI4vft9oNO2iT5The9qOzgnM5UxIc/XPrQhpKMgELTwCIFn9pkIsZ0jeeb99uBdS
-4MhSRxk4jgkBaWDPjCznaHVm
+30VcppXAv83B64oqklFFTr9BmOSsSXY1iKxcDUV+25TEkuCro3sweTAOBgNVHQ8B
+Af8EBAMCAqQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA8GA1UdEwEB
+/wQFMAMBAf8wNwYDVR0RBDAwLoIJbG9jYWxob3N0gglsb2NhbGhvc3SHBH8AAAGH
+EAAAAAAAAAAAAAAAAAAAAAEwCgYIKoZIzj0EAwIDSAAwRQIgQYkT8K9tgFCgNinA
+FKsH1wD3SnISi59MHHwciOVvl5wCIQDlWvtf9tGDZjdfWIBLZkQDz+a15WOD0yAE
+1jNJNybDAQ==
 -----END CERTIFICATE-----

.travis.yml

@@ -10,10 +10,6 @@ services:
 go:
     - 1.8
 
-cache:
-  directories:
-    - vendor
-
 install:
     - make deps
     - make cover-deps

Makefile

@@ -39,7 +39,7 @@ COMPILED_PROTO_FILES = $(patsubst api%.proto, api%.pb.go, $(PROTO_FILES))
 PROTOC_IMPORTS= -I/usr/local/include -I$(GO_PATH)/src -I$(PARENT_DIRECTORY) \
 -I$(GO_PATH)/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis
 PROTOC = protoc $(PROTOC_IMPORTS) \
---gogofast_out=Mgoogle/api/annotations.proto=github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/google/api,plugins=grpc:$(GO_SRC) \
+--gogofast_out=plugins=grpc:$(GO_SRC) \
 --grpc-gateway_out=:$(GO_SRC) `pwd`/
 
 protos-clean:

README.md

@@ -39,6 +39,7 @@ When you get started with The Things Network, you'll probably have some question
 7. Run `make dev` to install the go binaries into `$GOPATH/bin/`
     * Optionally on Linux or Mac you can use `make link` to link them to `$GOPATH/bin/` (In order to run the commands, you should have `export PATH="$GOPATH/bin:$PATH"` in your profile).
 8. Configure your `ttnctl` with the settings in `.env/ttnctl.yml.dev-example` by copying that file to `~/.ttnctl.yml`.
+9. Trust the CA certificate of your local discovery server by copying `.env/discovery/server.cert` to `~/.ttnctl/ca.cert`.
 
 You can check your `ttnctl` configuration by running `ttnctl config`. It should look like this: