Store mesh key in the database

kylecarbs · kylecarbs · commit ae956fbc00df · 2022-10-15T05:44:04.000Z
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -127,7 +127,6 @@ func New(options *Options) *API {
 	}
 	if options.DERPServer == nil {
 		options.DERPServer = derp.NewServer(key.NewNode(), tailnet.Logger(options.Logger.Named("derp")))
-		options.DERPServer.SetMeshKey("todo-kyle-change-this")
 	}
 	if options.Auditor == nil {
 		options.Auditor = audit.NewNop()
diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -110,10 +110,11 @@ type data struct {
 	replicas                       []database.Replica
 
 	deploymentID  string
+	derpMeshKey   string
 	lastLicenseID int32
 }
 
-func (q *fakeQuerier) Ping(_ context.Context) (time.Duration, error) {
+func (*fakeQuerier) Ping(_ context.Context) (time.Duration, error) {
 	return 0, nil
 }
 
@@ -2890,6 +2891,21 @@ func (q *fakeQuerier) GetDeploymentID(_ context.Context) (string, error) {
 	return q.deploymentID, nil
 }
 
+func (q *fakeQuerier) InsertDERPMeshKey(_ context.Context, id string) error {
+	q.mutex.Lock()
+	defer q.mutex.Unlock()
+
+	q.derpMeshKey = id
+	return nil
+}
+
+func (q *fakeQuerier) GetDERPMeshKey(_ context.Context) (string, error) {
+	q.mutex.RLock()
+	defer q.mutex.RUnlock()
+
+	return q.derpMeshKey, nil
+}
+
 func (q *fakeQuerier) InsertLicense(
 	_ context.Context, arg database.InsertLicenseParams,
 ) (database.License, error) {
@@ -3156,7 +3172,7 @@ func (q *fakeQuerier) DeleteGroupByID(_ context.Context, id uuid.UUID) error {
 	return sql.ErrNoRows
 }
 
-func (q *fakeQuerier) DeleteReplicasUpdatedBefore(ctx context.Context, before time.Time) error {
+func (q *fakeQuerier) DeleteReplicasUpdatedBefore(_ context.Context, before time.Time) error {
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
 
diff --git a/coderd/database/querier.go b/coderd/database/querier.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/siteconfig.sql b/coderd/database/queries/siteconfig.sql
@@ -3,3 +3,9 @@ INSERT INTO site_configs (key, value) VALUES ('deployment_id', $1);
 
 -- name: GetDeploymentID :one
 SELECT value FROM site_configs WHERE key = 'deployment_id';
+
+-- name: InsertDERPMeshKey :exec
+INSERT INTO site_configs (key, value) VALUES ('derp_mesh_key', $1);
+
+-- name: GetDERPMeshKey :one
+SELECT value FROM site_configs WHERE key = 'derp_mesh_key';
diff --git a/enterprise/cli/server.go b/enterprise/cli/server.go
@@ -2,14 +2,20 @@ package cli
 
 import (
 	"context"
+	"database/sql"
+	"errors"
 	"io"
 	"net/url"
 
 	"github.com/spf13/cobra"
 	"golang.org/x/xerrors"
+	"tailscale.com/derp"
+	"tailscale.com/types/key"
 
 	"github.com/coder/coder/cli/deployment"
+	"github.com/coder/coder/cryptorand"
 	"github.com/coder/coder/enterprise/coderd"
+	"github.com/coder/coder/tailnet"
 
 	agpl "github.com/coder/coder/cli"
 	agplcoderd "github.com/coder/coder/coderd"
@@ -25,6 +31,23 @@ func server() *cobra.Command {
 			}
 		}
 
+		options.DERPServer = derp.NewServer(key.NewNode(), tailnet.Logger(options.Logger.Named("derp")))
+		meshKey, err := options.Database.GetDERPMeshKey(ctx)
+		if err != nil {
+			if !errors.Is(err, sql.ErrNoRows) {
+				return nil, nil, xerrors.Errorf("get mesh key: %w", err)
+			}
+			meshKey, err = cryptorand.String(32)
+			if err != nil {
+				return nil, nil, xerrors.Errorf("generate mesh key: %w", err)
+			}
+			err = options.Database.InsertDERPMeshKey(ctx, meshKey)
+			if err != nil {
+				return nil, nil, xerrors.Errorf("insert mesh key: %w", err)
+			}
+		}
+		options.DERPServer.SetMeshKey(meshKey)
+
 		o := &coderd.Options{
 			AuditLogging:           dflags.AuditLogging.Value,
 			BrowserOnly:            dflags.BrowserOnly.Value,

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,6 @@ func New(options Options) API {`
`127`	`127`	`}`
`128`	`128`	`if options.DERPServer == nil {`
`129`	`129`	`options.DERPServer = derp.NewServer(key.NewNode(), tailnet.Logger(options.Logger.Named("derp")))`
`130`		`- options.DERPServer.SetMeshKey("todo-kyle-change-this")`
`131`	`130`	`}`
`132`	`131`	`if options.Auditor == nil {`
`133`	`132`	`options.Auditor = audit.NewNop()`