WIP

peer/hub_poller.go

@@ -71,8 +71,14 @@ func (hp *HubPoller) poll() {
 		log.Printf("[HubPoller] fetch: %v", err)
 		return
 	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		log.Printf("[HubPoller] unexpected status %d", resp.StatusCode)
+		return
+	}
+
 	body, err := io.ReadAll(resp.Body)
-	_ = resp.Body.Close()
 	if err != nil {
 		log.Printf("[HubPoller] read body: %v", err)
 		return
@@ -93,7 +99,7 @@ func (hp *HubPoller) apply(state m.NetworkState) {
 	netAddr := hp.vpnNet.Addr().As4()
 
 	for _, p := range state.Peers {
-		if p == nil || len(p.WGPubKey) != wgtypes.KeyLen {
+		if p == nil || len(p.WGPubKey) != wgtypes.KeyLen || len(p.SignPubKey) != 32 {
 			continue
 		}
 
@@ -138,6 +144,8 @@ func hubPeerFrom(pubKey wgtypes.Key, vpnIP netip.Addr, p *m.Peer) HubPeer {
 			ep6 = netip.AddrPortFrom(addr, p.Port)
 		}
 	}
+	var signPubKey [32]byte
+	copy(signPubKey[:], p.SignPubKey)
 	return HubPeer{
 		PubKey:     pubKey,
 		VPNIP:      vpnIP,
@@ -145,5 +153,6 @@ func hubPeerFrom(pubKey wgtypes.Key, vpnIP netip.Addr, p *m.Peer) HubPeer {
 		IsPublic:   ep4.IsValid() || ep6.IsValid(),
 		EndpointV4: ep4,
 		EndpointV6: ep6,
+		SignPubKey: signPubKey,
 	}
 }