WIP

hub/api/db/sanitize-validate.go

@@ -95,6 +95,9 @@ func Peer_Validate(p *Peer) error {
 		return ErrInvalidPort
 	}
 
+	if len(p.Name) == 0 {
+		return ErrInvalidPeerName
+	}
 	for _, c := range p.Name {
 		if c >= 'a' && c <= 'z' {
 			continue
@@ -102,7 +105,7 @@ func Peer_Validate(p *Peer) error {
 		if c >= '0' && c <= '9' {
 			continue
 		}
-		if c == '.' || c == '-' || c == '_' {
+		if c == '-' {
 			continue
 		}
 		return ErrInvalidPeerName

hub/handlers.go

@@ -332,8 +332,9 @@ func (a *App) _peerInit(peer *api.Peer, w http.ResponseWriter, r *http.Request)
 	}
 
 	resp := m.PeerInitResp{
-		PeerIP:  peer.PeerIP,
-		Network: net.Network,
+		PeerIP:      peer.PeerIP,
+		Network:     net.Network,
+		LocalDomain: net.LocalDomain,
 	}
 
 	resp.NetworkState.Peers, err = a.peersArray(net.NetworkID)
@@ -345,19 +346,11 @@ func (a *App) _peerInit(peer *api.Peer, w http.ResponseWriter, r *http.Request)
 }
 
 func (a *App) _peerFetchState(peer *api.Peer, w http.ResponseWriter, r *http.Request) error {
-	net, err := a.api.Network_Get(peer.NetworkID)
-	if err != nil {
-		return err
-	}
-
 	peers, err := a.peersArray(peer.NetworkID)
 	if err != nil {
 		return err
 	}
-	return a.sendJSON(w, m.NetworkState{
-		LocalDomain: net.LocalDomain,
-		Peers:       peers,
-	})
+	return a.sendJSON(w, m.NetworkState{Peers: peers})
 }
 
 func (a *App) peersArray(networkID int64) (peers [256]*m.Peer, err error) {