WIP

hub/handlers.go

@@ -313,6 +313,15 @@ func (a *App) _peerInit(peer *api.Peer, w http.ResponseWriter, r *http.Request)
 		return err
 	}
 
+	if len(args.WGPubKey) != 32 {
+		http.Error(w, "invalid WGPubKey", http.StatusBadRequest)
+		return nil
+	}
+	if len(args.SignPubKey) != 32 {
+		http.Error(w, "invalid SignPubKey", http.StatusBadRequest)
+		return nil
+	}
+
 	net, err := a.api.Network_Get(peer.NetworkID)
 	if err != nil {
 		return err
@@ -353,14 +362,15 @@ func (a *App) peersArray(networkID int64) (peers [256]*m.Peer, err error) {
 	for _, p := range l {
 		if len(p.WGPubKey) != 0 {
 			peers[p.PeerIP] = &m.Peer{
-				PeerIP:   p.PeerIP,
-				Version:  p.Version,
-				Name:     p.Name,
-				Addr4: p.Addr4,
-				Addr6: p.Addr6,
-				Port:  p.Port,
-				Relay:    p.Relay,
-				WGPubKey: p.WGPubKey,
+				PeerIP:     p.PeerIP,
+				Version:    p.Version,
+				Name:       p.Name,
+				Addr4:      p.Addr4,
+				Addr6:      p.Addr6,
+				Port:       p.Port,
+				Relay:      p.Relay,
+				WGPubKey:   p.WGPubKey,
+				SignPubKey: p.SignPubKey,
 			}
 		}
 	}