Fix network sharding eclipse attack

cmd/node/config/config.toml

@@ -227,16 +227,20 @@
     Size = 75000
     Type = "LRU"
 
-[PublicKeyShardId]
+#PublicKeyPeerId represents the main cache used to map Elrond block signing public keys to their associated peer id's.
+[PublicKeyPeerId]
     Size = 30000
     Type = "LRU"
 
-[PublicKeyPeerId]
-    Size = 30000
+#PublicKeyShardId is the fallback cache used to map public keys to the shard they belong.
+[PublicKeyShardId]
+    Size = 100
     Type = "LRU"
 
+#PeerIdShardId is the fallback cache used in network sharding to allow direct connection between peer id and shard.
+# Used for observers, size should be kept low.
 [PeerIdShardId]
-    Size = 30000
+    Size = 5
     Type = "LRU"
 
 [Address]

integrationTests/interface.go

@@ -30,7 +30,7 @@ type BlockProcessorInitializer interface {
 
 // NetworkShardingUpdater defines the updating methods used by the network sharding component
 type NetworkShardingUpdater interface {
-	ByID(pid p2p.PeerID) (shardId uint32)
+	GetShardID(pid p2p.PeerID) (shardId uint32)
 	UpdatePeerIdPublicKey(pid p2p.PeerID, pk []byte)
 	UpdatePublicKeyShardId(pk []byte, shardId uint32)
 	UpdatePeerIdShardId(pid p2p.PeerID, shardId uint32)

p2p/libp2p/netMessenger.go

@@ -684,7 +684,7 @@ func (netMes *networkMessenger) GetConnectedPeersInfo() *p2p.ConnectedPeersInfo
 		IntraShardPeers: make([]string, 0),
 		CrossShardPeers: make([]string, 0),
 	}
-	selfShardId := netMes.peerShardResolver.ByID(netMes.ID())
+	selfShardId := netMes.peerShardResolver.GetShardID(netMes.ID())
 
 	for _, p := range peers {
 		conns := netMes.p2pHost.Network().ConnsToPeer(p)
@@ -693,7 +693,7 @@ func (netMes *networkMessenger) GetConnectedPeersInfo() *p2p.ConnectedPeersInfo
 			connString = conns[0].RemoteMultiaddr().String() + "/p2p/" + p.Pretty()
 		}
 
-		shardId := netMes.peerShardResolver.ByID(p2p.PeerID(p))
+		shardId := netMes.peerShardResolver.GetShardID(p2p.PeerID(p))
 		switch shardId {
 		case core.UnknownShardId:
 			peerInfo.UnknownPeers = append(peerInfo.UnknownPeers, connString)

p2p/libp2p/networksharding/listsSharder.go

@@ -140,7 +140,7 @@ func has(pid peer.ID, list []peer.ID) bool {
 //TODO study if we need to hve a dedicated section for metanodes
 func (ls *listsSharder) splitPeerIds(peers []peer.ID) (sorting.PeerDistances, sorting.PeerDistances, sorting.PeerDistances) {
 	ls.mutResolver.RLock()
-	selfId := ls.peerShardResolver.ByID(p2p.PeerID(ls.selfPeerId))
+	selfId := ls.peerShardResolver.GetShardID(p2p.PeerID(ls.selfPeerId))
 	ls.mutResolver.RUnlock()
 
 	intraShard := sorting.PeerDistances{}
@@ -154,7 +154,7 @@ func (ls *listsSharder) splitPeerIds(peers []peer.ID) (sorting.PeerDistances, so
 		}
 		pid := p2p.PeerID(p)
 		ls.mutResolver.RLock()
-		shardId := ls.peerShardResolver.ByID(pid)
+		shardId := ls.peerShardResolver.GetShardID(pid)
 		ls.mutResolver.RUnlock()
 
 		switch shardId {

p2p/libp2p/networksharding/listsSharder_test.go

@@ -20,7 +20,7 @@ var crtPid = peer.ID(fmt.Sprintf("%d pid", crtShardId))
 
 func createStringPeersShardResolver() *mock.PeerShardResolverStub {
 	return &mock.PeerShardResolverStub{
-		ByIDCalled: func(pid p2p.PeerID) uint32 {
+		GetShardIDCalled: func(pid p2p.PeerID) uint32 {
 			strPid := string(pid)
 			if strings.Contains(strPid, fmt.Sprintf("%d", crtShardId)) {
 				return crtShardId

p2p/libp2p/networksharding/prioBitsSharder.go

@@ -54,7 +54,7 @@ func (pbs *prioBitsSharder) GetShard(id peer.ID) uint32 {
 	pbs.mutResolver.RLock()
 	defer pbs.mutResolver.RUnlock()
 
-	return pbs.resolver.ByID(p2p.PeerID(id))
+	return pbs.resolver.GetShardID(p2p.PeerID(id))
 }
 
 // Resets distance bits

p2p/libp2p/networksharding/prioBitsSharder_test.go

@@ -31,7 +31,7 @@ type testKadResolver struct {
 	f func(p2p.PeerID) uint32
 }
 
-func (tkr *testKadResolver) ByID(peer p2p.PeerID) uint32 {
+func (tkr *testKadResolver) GetShardID(peer p2p.PeerID) uint32 {
 	return tkr.f(peer)
 }
 

p2p/libp2p/unknownPeerShardResolver.go

@@ -8,8 +8,8 @@ import (
 type unknownPeerShardResolver struct {
 }
 
-// ByID returns the sharding.UnknownShardId value
-func (upsr *unknownPeerShardResolver) ByID(_ p2p.PeerID) uint32 {
+// GetShardID returns the sharding.UnknownShardId value
+func (upsr *unknownPeerShardResolver) GetShardID(_ p2p.PeerID) uint32 {
 	return core.UnknownShardId
 }
 

p2p/libp2p/unknownPeerShardResolver_test.go

@@ -18,10 +18,10 @@ func TestUnknownPeerShardResolver_IsInterfaceNil(t *testing.T) {
 	assert.False(t, check.IfNil(upsr))
 }
 
-func TestUnknownPeerShardResolver_ByIDShouldReturnUnknownId(t *testing.T) {
+func TestUnknownPeerShardResolver_GetShardIDShouldReturnUnknownId(t *testing.T) {
 	t.Parallel()
 
 	upsr := &unknownPeerShardResolver{}
 
-	assert.Equal(t, core.UnknownShardId, upsr.ByID(""))
+	assert.Equal(t, core.UnknownShardId, upsr.GetShardID(""))
 }

p2p/mock/peerShardResolverStub.go

@@ -2,14 +2,17 @@ package mock
 
 import "github.com/ElrondNetwork/elrond-go/p2p"
 
+// PeerShardResolverStub -
 type PeerShardResolverStub struct {
-	ByIDCalled func(pid p2p.PeerID) uint32
+	GetShardIDCalled func(pid p2p.PeerID) uint32
 }
 
-func (psrs *PeerShardResolverStub) ByID(pid p2p.PeerID) uint32 {
-	return psrs.ByIDCalled(pid)
+// GetShardID -
+func (psrs *PeerShardResolverStub) GetShardID(pid p2p.PeerID) uint32 {
+	return psrs.GetShardIDCalled(pid)
 }
 
+// IsInterfaceNil -
 func (psrs *PeerShardResolverStub) IsInterfaceNil() bool {
 	return psrs == nil
 }

p2p/p2p.go

@@ -234,8 +234,8 @@ func MessageOriginatorSeq(msg MessageP2P) string {
 
 // PeerShardResolver is able to resolve the link between the provided PeerID and the shardID
 type PeerShardResolver interface {
-	ByID(pid PeerID) uint32 //ByID get the shard id of the given peer.ID
-	IsInterfaceNil() bool   //IsInterfaceNil returns true if there is no value under the interface
+	GetShardID(pid PeerID) uint32 //GetShardID get the shard id of the given peer.ID
+	IsInterfaceNil() bool         //IsInterfaceNil returns true if there is no value under the interface
 }
 
 // ConnectedPeersInfo represents the DTO structure used to output the metrics for connected peers

sharding/networksharding/export_test.go

@@ -1,9 +1,17 @@
 package networksharding
 
-import "github.com/ElrondNetwork/elrond-go/p2p"
+import (
+	"github.com/ElrondNetwork/elrond-go/p2p"
+	"github.com/ElrondNetwork/elrond-go/storage"
+)
+
+const MaxNumPidsPerPk = maxNumPidsPerPk
 
 func (psm *PeerShardMapper) GetPkFromPidPk(pid p2p.PeerID) []byte {
-	pk, _ := psm.peerIdPk.Get([]byte(pid))
+	pk, ok := psm.peerIdPk.Get([]byte(pid))
+	if !ok {
+		return nil
+	}
 
 	return pk.([]byte)
 }
@@ -19,3 +27,28 @@ func (psm *PeerShardMapper) GetShardIdFromPidShardId(pid p2p.PeerID) uint32 {
 
 	return shard.(uint32)
 }
+
+func (psm *PeerShardMapper) GetFromPkPeerId(pk []byte) []p2p.PeerID {
+	objsPidsQueue, found := psm.pkPeerId.Get(pk)
+	if !found {
+		return nil
+	}
+
+	return objsPidsQueue.(*pidQueue).data
+}
+
+func (psm *PeerShardMapper) PeerIdPk() storage.Cacher {
+	return psm.peerIdPk
+}
+
+func (psm *PeerShardMapper) PkPeerId() storage.Cacher {
+	return psm.pkPeerId
+}
+
+func (psm *PeerShardMapper) FallbackPkShard() storage.Cacher {
+	return psm.fallbackPkShard
+}
+
+func (psm *PeerShardMapper) FallbackPidShard() storage.Cacher {
+	return psm.fallbackPidShard
+}