Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tm2/pkg/p2p/transport.go
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ func exchangeNodeInfo(
}

// Validate the received node information
if err := nodeInfo.Validate(); err != nil {
if err := peerNodeInfo.Validate(); err != nil {
return types.NodeInfo{}, fmt.Errorf("unable to validate node info, %w", err)
}

Expand Down
67 changes: 67 additions & 0 deletions tm2/pkg/p2p/transport_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,73 @@ func TestMultiplexTransport_Accept(t *testing.T) {
require.Nil(t, p)
})

t.Run("peer node info missing net address", func(t *testing.T) {
t.Parallel()

var (
network = "dev"
mCfg = conn.DefaultMConnConfig()
logger = log.NewNoopLogger()
keys = []*types.NodeKey{
types.GenerateNodeKey(),
types.GenerateNodeKey(),
}

peerBehavior = &reactorPeerBehavior{
chDescs: make([]*conn.ChannelDescriptor, 0),
reactorsByCh: make(map[byte]Reactor),
handlePeerErrFn: func(_ PeerConn, err error) {
require.NoError(t, err)
},
isPersistentPeerFn: func(_ types.ID) bool {
return false
},
isPrivatePeerFn: func(_ types.ID) bool {
return false
},
}
)

peers := make([]*MultiplexTransport, 0, len(keys))

for index, key := range keys {
addr, err := net.ResolveTCPAddr("tcp", "localhost:0")
require.NoError(t, err)

na, err := types.NewNetAddress(key.ID(), addr)
require.NoError(t, err)

ni := types.NodeInfo{
Network: network,
NetAddress: na,
Version: "v1.0.0-rc.0",
Moniker: fmt.Sprintf("node-%d", index),
VersionSet: make(versionset.VersionSet, 0),
Channels: []byte{42},
}
if index == 1 {
ni.NetAddress = nil // malformed handshake payload
}

tr := NewMultiplexTransport(ni, *key, mCfg, logger)
require.NoError(t, tr.Listen(*na))

t.Cleanup(func() {
assert.NoError(t, tr.Close())
})

peers = append(peers, tr)
}

ctx, cancelFn := context.WithTimeout(context.Background(), 5*time.Second)
defer cancelFn()

p, err := peers[0].Dial(ctx, peers[1].netAddr, peerBehavior)
require.Error(t, err)
assert.ErrorContains(t, err, "unable to validate node info")
require.Nil(t, p)
})

t.Run("incompatible peers", func(t *testing.T) {
t.Parallel()

Expand Down
4 changes: 4 additions & 0 deletions tm2/pkg/p2p/types/node_info.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@ type NodeInfoOther struct {
// if the NetAddress is malformed, or if the NetAddress is a host name
// that can not be resolved to some IP
func (info NodeInfo) Validate() error {
if info.NetAddress == nil {
return fmt.Errorf("invalid net address in node info, %w", ErrInvalidNetAddress)
}

// There are a few checks that need to be performed when validating
// the node info's net address:
// - the ID needs to be valid
Expand Down
10 changes: 10 additions & 0 deletions tm2/pkg/p2p/types/node_info_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,16 @@ func TestNodeInfo_Validate(t *testing.T) {
assert.ErrorIs(t, info.Validate(), crypto.ErrZeroID)
})

t.Run("missing net address", func(t *testing.T) {
t.Parallel()

info := &NodeInfo{
NetAddress: nil,
}

assert.ErrorIs(t, info.Validate(), ErrInvalidNetAddress)
})

t.Run("invalid version", func(t *testing.T) {
t.Parallel()

Expand Down
Loading