Major update - symmetric encryption, UDP hole punching, code cleanup.

Reviewed-on: #1

hub/api/api.go

@@ -15,7 +15,6 @@ import (
 	"git.crumpington.com/lib/go/sqliteutil"
 	"golang.org/x/crypto/bcrypt"
 	"golang.org/x/crypto/nacl/box"
-	"golang.org/x/crypto/nacl/sign"
 )
 
 //go:embed migrations
@@ -146,7 +145,7 @@ type PeerCreateArgs struct {
 	Name     string
 	PublicIP []byte
 	Port     uint16
-	Mediator bool
+	Relay    bool
 }
 
 // Create the intention to add a peer. The returned code is used to complete
@@ -184,11 +183,6 @@ func (a *API) Peer_Create(creationCode string) (*m.PeerConfig, error) {
 		return nil, err
 	}
 
-	signPubKey, signPrivKey, err := sign.GenerateKey(rand.Reader)
-	if err != nil {
-		return nil, err
-	}
-
 	// Get peer IP.
 	peerIP := byte(0)
 
@@ -208,15 +202,14 @@ func (a *API) Peer_Create(creationCode string) (*m.PeerConfig, error) {
 	}
 
 	peer := &Peer{
-		PeerIP:     peerIP,
-		Version:    idgen.NextID(0),
-		APIKey:     idgen.NewToken(),
-		Name:       args.Name,
-		PublicIP:   args.PublicIP,
-		Port:       args.Port,
-		Mediator:   args.Mediator,
-		EncPubKey:  encPubKey[:],
-		SignPubKey: signPubKey[:],
+		PeerIP:   peerIP,
+		Version:  idgen.NextID(0),
+		APIKey:   idgen.NewToken(),
+		Name:     args.Name,
+		PublicIP: args.PublicIP,
+		Port:     args.Port,
+		Relay:    args.Relay,
+		PubKey:   encPubKey[:],
 	}
 
 	if err := db.Peer_Insert(a.db, peer); err != nil {
@@ -226,17 +219,15 @@ func (a *API) Peer_Create(creationCode string) (*m.PeerConfig, error) {
 	conf := a.Config_Get()
 
 	return &m.PeerConfig{
-		PeerIP:      peer.PeerIP,
-		HubAddress:  conf.HubAddress,
-		APIKey:      peer.APIKey,
-		Network:     conf.VPNNetwork,
-		PublicIP:    peer.PublicIP,
-		Port:        peer.Port,
-		Mediator:    peer.Mediator,
-		EncPubKey:   encPubKey[:],
-		EncPrivKey:  encPrivKey[:],
-		SignPubKey:  signPubKey[:],
-		SignPrivKey: signPrivKey[:],
+		PeerIP:     peer.PeerIP,
+		HubAddress: conf.HubAddress,
+		APIKey:     peer.APIKey,
+		Network:    conf.VPNNetwork,
+		PublicIP:   peer.PublicIP,
+		Port:       peer.Port,
+		Relay:   peer.Relay,
+		PubKey:     encPubKey[:],
+		PrivKey:    encPrivKey[:],
 	}, nil
 }