Debug

daemons/node/stream/handler.go

@@ -86,6 +86,7 @@ func (abs *StreamService) verifyResponse(event *common.Event) error { //
 }
 
 func (abs *StreamService) sendPlanner(event *common.Event) error { //
+	fmt.Println("sendPlanner", len(event.Payload))
 	if len(event.Payload) == 0 {
 		if plan, err := planner.GenerateShallow(&tools.APIRequest{Admin: true}); err == nil {
 			if b, err := json.Marshal(plan); err == nil {
@@ -166,8 +167,6 @@ func (ps *StreamService) handleEventFromPartner(evt *common.Event, protocol stri
 			}, evt.From, false)
 			if len(peers.Data) > 0 {
 				p := peers.Data[0].(*peer.Peer)
-				fmt.Println(evt.From, p.GetID(), peers.Data)
-
 				ps.SendResponse(p, evt, fmt.Sprintf("%v", search))
 			} else if p, err := ps.Node.GetPeerRecord(context.Background(), evt.From); err == nil && len(p) > 0 { // peer from is peerID
 				ps.SendResponse(p[0], evt, fmt.Sprintf("%v", search))
@@ -182,7 +181,7 @@ func (ps *StreamService) handleEventFromPartner(evt *common.Event, protocol stri
 			})
 		}
 	case ProtocolCreateResource, ProtocolUpdateResource:
-		fmt.Println("RECEIVED Protocol.Update")
+		fmt.Println("RECEIVED Protocol.Update", string(evt.Payload))
 		go tools.NewNATSCaller().SetNATSPub(tools.CREATE_RESOURCE, tools.NATSResponse{
 			FromApp:  "oc-discovery",
 			Datatype: tools.DataType(evt.DataType),
@@ -218,13 +217,10 @@ func (abs *StreamService) SendResponse(p *peer.Peer, event *common.Event, search
 	} else {
 		for _, dt := range dts {
 			access := oclib.NewRequestAdmin(oclib.LibDataEnum(dt), nil)
-			peerID := p.GetID()
 			searched := access.Search(abs.FilterPeer(self.GetID(), event.Groups, search), "", false)
-			fmt.Println("SEND SEARCH_EVENT", self.GetID(), dt, len(searched.Data), peerID)
 			for _, ss := range searched.Data {
 				if j, err := json.Marshal(ss); err == nil {
-					_, err := abs.PublishCommon(&dt, event.User, event.Groups, p.PeerID, ProtocolSearchResource, j)
-					fmt.Println("Publish ERR", err)
+					abs.PublishCommon(&dt, event.User, event.Groups, p.PeerID, ProtocolSearchResource, j)
 				}
 			}
 		}

daemons/node/stream/publish.go

@@ -26,7 +26,7 @@ func (ps *StreamService) PublishesCommon(dt *tools.DataType, user string, groups
 	for _, pes := range p.Data {
 		for _, proto := range protos {
 			if _, err := ps.PublishCommon(dt, user, groups, pes.(*peer.Peer).PeerID, proto, resource); err != nil {
-				return err
+				continue
 			}
 		}
 	}
@@ -57,7 +57,6 @@ func (ps *StreamService) PublishCommon(dt *tools.DataType, user string, groups [
 		if err != nil {
 			return nil, err
 		}
-		fmt.Println("WRITE")
 		return ps.write(toPeerID, ad, dt, user, resource, proto)
 	}
 	return nil, errors.New("peer unvalid " + toPeerID)
@@ -131,21 +130,17 @@ func (s *StreamService) write(
 		return nil, errors.New("no stream available for protocol " + fmt.Sprintf("%v", proto) + " from PID " + peerID.ID.String())
 
 	}
-	if self, err := oclib.GetMySelf(); err != nil {
-		return nil, err
-	} else {
-		stream := s.Streams[proto][peerID.ID]
-		evt := common.NewEvent(string(proto), self.PeerID, dt, user, payload)
-		fmt.Println("SEND EVENT ", peerID, proto, evt.From, evt.DataType, evt.Timestamp)
-		if err := json.NewEncoder(stream.Stream).Encode(evt); err != nil {
-			stream.Stream.Close()
-			logger.Err(err)
-			return nil, err
-		}
-		if protocolInfo, ok := protocols[proto]; ok && protocolInfo.WaitResponse {
-			go s.readLoop(stream, peerID.ID, proto, &common.ProtocolInfo{PersistantStream: true})
-		}
-		return stream, nil
-	}
 
+	stream := s.Streams[proto][peerID.ID]
+	evt := common.NewEvent(string(proto), s.Host.ID().String(), dt, user, payload)
+	fmt.Println("SEND EVENT ", peerID, proto, evt.From, evt.DataType, evt.Timestamp)
+	if err := json.NewEncoder(stream.Stream).Encode(evt); err != nil {
+		stream.Stream.Close()
+		logger.Err(err)
+		return nil, err
+	}
+	if protocolInfo, ok := protocols[proto]; ok && protocolInfo.WaitResponse {
+		go s.readLoop(stream, peerID.ID, proto, &common.ProtocolInfo{PersistantStream: true})
+	}
+	return stream, nil
 }

daemons/node/stream/service.go

@@ -51,13 +51,16 @@ var protocolsPartners = map[protocol.ID]*common.ProtocolInfo{
 }
 
 type StreamService struct {
-	Key             pp.ID
-	Host            host.Host
-	Node            common.DiscoveryPeer
-	Streams         common.ProtocolStream
-	maxNodesConn    int
-	Mu              sync.RWMutex
+	Key              pp.ID
+	Host             host.Host
+	Node             common.DiscoveryPeer
+	Streams          common.ProtocolStream
+	maxNodesConn     int
+	Mu               sync.RWMutex
 	ResourceSearches *common.SearchTracker
+	// IsPeerKnown, when set, is called at stream open for every inbound protocol.
+	// Return false to reset the stream immediately. Left nil until wired by the node.
+	IsPeerKnown func(pid pp.ID) bool
 }
 
 func InitStream(ctx context.Context, h host.Host, key pp.ID, maxNode int, node common.DiscoveryPeer) (*StreamService, error) {
@@ -71,7 +74,7 @@ func InitStream(ctx context.Context, h host.Host, key pp.ID, maxNode int, node c
 		ResourceSearches: common.NewSearchTracker(),
 	}
 	for proto := range protocols {
-		service.Host.SetStreamHandler(proto, service.HandleResponse)
+		service.Host.SetStreamHandler(proto, service.gate(service.HandleResponse))
 	}
 	logger.Info().Msg("connect to partners...")
 	service.connectToPartners() // we set up a stream
@@ -79,6 +82,21 @@ func InitStream(ctx context.Context, h host.Host, key pp.ID, maxNode int, node c
 	return service, nil
 }
 
+// gate wraps a stream handler with IsPeerKnown validation.
+// If the peer is unknown the entire connection is closed and the handler is not called.
+// IsPeerKnown is read at stream-open time so it works even when set after InitStream.
+func (s *StreamService) gate(h func(network.Stream)) func(network.Stream) {
+	return func(stream network.Stream) {
+		if s.IsPeerKnown != nil && !s.IsPeerKnown(stream.Conn().RemotePeer()) {
+			logger := oclib.GetLogger()
+			logger.Warn().Str("peer", stream.Conn().RemotePeer().String()).Msg("[stream] unknown peer, closing connection")
+			stream.Conn().Close()
+			return
+		}
+		h(stream)
+	}
+}
+
 func (s *StreamService) HandleResponse(stream network.Stream) {
 	s.Mu.Lock()
 	defer s.Mu.Unlock()
@@ -119,7 +137,7 @@ func (s *StreamService) connectToPartners() error {
 			go s.readLoop(s.Streams[proto][ss.Conn().RemotePeer()], ss.Conn().RemotePeer(), proto, info)
 		}
 		logger.Info().Msg("SetStreamHandler " + string(proto))
-		s.Host.SetStreamHandler(proto, f)
+		s.Host.SetStreamHandler(proto, s.gate(f))
 	}
 	return nil
 }