Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(op-node): p2p rpc input validation #9897

Merged
merged 1 commit into from
Mar 19, 2024
+56 −8
Merged

feat(op-node): p2p rpc input validation #9897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions op-node/p2p/host_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,17 @@ func TestP2PFull(t *testing.T) {
require.Equal(t, []peer.ID{hostB.ID()}, blockedPeers)
require.NoError(t, p2pClientA.UnblockPeer(ctx, hostB.ID()))

require.Error(t, p2pClientA.BlockAddr(ctx, nil))
require.Error(t, p2pClientA.UnblockAddr(ctx, nil))
require.Error(t, p2pClientA.BlockSubnet(ctx, nil))
require.Error(t, p2pClientA.UnblockSubnet(ctx, nil))
require.Error(t, p2pClientA.BlockPeer(ctx, ""))
require.Error(t, p2pClientA.UnblockPeer(ctx, ""))
require.Error(t, p2pClientA.ProtectPeer(ctx, ""))
require.Error(t, p2pClientA.UnprotectPeer(ctx, ""))
require.Error(t, p2pClientA.ConnectPeer(ctx, ""))
require.Error(t, p2pClientA.DisconnectPeer(ctx, ""))

require.NoError(t, p2pClientA.BlockAddr(ctx, net.IP{123, 123, 123, 123}))
blockedIPs, err := p2pClientA.ListBlockedAddrs(ctx)
require.NoError(t, err)
Expand Down
53 changes: 45 additions & 8 deletions op-node/p2p/rpc_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ var (
ErrDisabledDiscovery = errors.New("discovery disabled")
ErrNoConnectionManager = errors.New("no connection manager")
ErrNoConnectionGater = errors.New("no connection gater")
ErrInvalidRequest = errors.New("invalid request")
)

type Node interface {
Expand Down Expand Up @@ -244,23 +245,31 @@ func (s *APIBackend) DiscoveryTable(_ context.Context) ([]*enode.Node, error) {
}
}

func (s *APIBackend) BlockPeer(_ context.Context, p peer.ID) error {
func (s *APIBackend) BlockPeer(_ context.Context, id peer.ID) error {
recordDur := s.m.RecordRPCServerRequest("opp2p_blockPeer")
if err := id.Validate(); err != nil {
log.Warn("invalid peer ID", "method", "BlockPeer", "peer", id, "err", err)
return ErrInvalidRequest
}
defer recordDur()
if gater := s.node.ConnectionGater(); gater == nil {
return ErrNoConnectionGater
} else {
return gater.BlockPeer(p)
return gater.BlockPeer(id)
}
}

func (s *APIBackend) UnblockPeer(_ context.Context, p peer.ID) error {
func (s *APIBackend) UnblockPeer(_ context.Context, id peer.ID) error {
recordDur := s.m.RecordRPCServerRequest("opp2p_unblockPeer")
if err := id.Validate(); err != nil {
log.Warn("invalid peer ID", "method", "UnblockPeer", "peer", id, "err", err)
return ErrInvalidRequest
}
defer recordDur()
if gater := s.node.ConnectionGater(); gater == nil {
return ErrNoConnectionGater
} else {
return gater.UnblockPeer(p)
return gater.UnblockPeer(id)
}
}

Expand All @@ -278,6 +287,10 @@ func (s *APIBackend) ListBlockedPeers(_ context.Context) ([]peer.ID, error) {
// Note: active connections to the IP address are not automatically closed.
func (s *APIBackend) BlockAddr(_ context.Context, ip net.IP) error {
recordDur := s.m.RecordRPCServerRequest("opp2p_blockAddr")
if ip == nil {
log.Warn("invalid IP", "method", "BlockAddr")
return ErrInvalidRequest
}
defer recordDur()
if gater := s.node.ConnectionGater(); gater == nil {
return ErrNoConnectionGater
Expand All @@ -288,6 +301,10 @@ func (s *APIBackend) BlockAddr(_ context.Context, ip net.IP) error {

func (s *APIBackend) UnblockAddr(_ context.Context, ip net.IP) error {
recordDur := s.m.RecordRPCServerRequest("opp2p_unblockAddr")
if ip == nil {
log.Warn("invalid IP", "method", "UnblockAddr")
return ErrInvalidRequest
}
defer recordDur()
if gater := s.node.ConnectionGater(); gater == nil {
return ErrNoConnectionGater
Expand All @@ -310,6 +327,10 @@ func (s *APIBackend) ListBlockedAddrs(_ context.Context) ([]net.IP, error) {
// Note: active connections to the IP subnet are not automatically closed.
func (s *APIBackend) BlockSubnet(_ context.Context, ipnet *net.IPNet) error {
recordDur := s.m.RecordRPCServerRequest("opp2p_blockSubnet")
if ipnet == nil {
log.Warn("invalid IPNet", "method", "BlockSubnet")
return ErrInvalidRequest
}
defer recordDur()
if gater := s.node.ConnectionGater(); gater == nil {
return ErrNoConnectionGater
Expand All @@ -320,6 +341,10 @@ func (s *APIBackend) BlockSubnet(_ context.Context, ipnet *net.IPNet) error {

func (s *APIBackend) UnblockSubnet(_ context.Context, ipnet *net.IPNet) error {
recordDur := s.m.RecordRPCServerRequest("opp2p_unblockSubnet")
if ipnet == nil {
log.Warn("invalid IPNet", "method", "UnblockSubnet")
return ErrInvalidRequest
}
defer recordDur()
if gater := s.node.ConnectionGater(); gater == nil {
return ErrNoConnectionGater
Expand All @@ -338,24 +363,32 @@ func (s *APIBackend) ListBlockedSubnets(_ context.Context) ([]*net.IPNet, error)
}
}

func (s *APIBackend) ProtectPeer(_ context.Context, p peer.ID) error {
func (s *APIBackend) ProtectPeer(_ context.Context, id peer.ID) error {
recordDur := s.m.RecordRPCServerRequest("opp2p_protectPeer")
if err := id.Validate(); err != nil {
log.Warn("invalid peer ID", "method", "ProtectPeer", "peer", id, "err", err)
return ErrInvalidRequest
}
defer recordDur()
if manager := s.node.ConnectionManager(); manager == nil {
return ErrNoConnectionManager
} else {
manager.Protect(p, "api-protected")
manager.Protect(id, "api-protected")
return nil
}
}

func (s *APIBackend) UnprotectPeer(_ context.Context, p peer.ID) error {
func (s *APIBackend) UnprotectPeer(_ context.Context, id peer.ID) error {
recordDur := s.m.RecordRPCServerRequest("opp2p_unprotectPeer")
if err := id.Validate(); err != nil {
log.Warn("invalid peer ID", "method", "UnprotectPeer", "peer", id, "err", err)
return ErrInvalidRequest
}
defer recordDur()
if manager := s.node.ConnectionManager(); manager == nil {
return ErrNoConnectionManager
} else {
manager.Unprotect(p, "api-protected")
manager.Unprotect(id, "api-protected")
return nil
}
}
Expand All @@ -377,6 +410,10 @@ func (s *APIBackend) ConnectPeer(ctx context.Context, addr string) error {

func (s *APIBackend) DisconnectPeer(_ context.Context, id peer.ID) error {
recordDur := s.m.RecordRPCServerRequest("opp2p_disconnectPeer")
if err := id.Validate(); err != nil {
log.Warn("invalid peer ID", "method", "DisconnectPeer", "peer", id, "err", err)
return ErrInvalidRequest
}
defer recordDur()
err := s.node.Host().Network().ClosePeer(id)
if err != nil {
Expand Down