From 1470fd6c3610cd0c84fb3e9a7ee33190039aca39 Mon Sep 17 00:00:00 2001 From: Baptiste Boussemart Date: Thu, 29 Jul 2021 14:51:30 +0200 Subject: [PATCH 1/6] inclusive terms: whitelist for p2p package --- p2p/dial.go | 16 ++++++++-------- p2p/discover/common.go | 2 +- p2p/discover/v4_udp.go | 2 +- p2p/server.go | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/p2p/dial.go b/p2p/dial.go index d36d6655019..1f70300914c 100644 --- a/p2p/dial.go +++ b/p2p/dial.go @@ -73,12 +73,12 @@ func nodeAddr(n *enode.Node) net.Addr { // checkDial errors: var ( - errSelf = errors.New("is self") - errAlreadyDialing = errors.New("already dialing") - errAlreadyConnected = errors.New("already connected") - errRecentlyDialed = errors.New("recently dialed") - errNotWhitelisted = errors.New("not contained in netrestrict whitelist") - errNoPort = errors.New("node does not provide TCP port") + errSelf = errors.New("is self") + errAlreadyDialing = errors.New("already dialing") + errAlreadyConnected = errors.New("already connected") + errRecentlyDialed = errors.New("recently dialed") + errNotNetRestrictListed = errors.New("not contained in netrestrict list") + errNoPort = errors.New("node does not provide TCP port") ) // dialer creates outbound connections and submits them into Server. @@ -133,7 +133,7 @@ type dialConfig struct { self enode.ID // our own ID maxDialPeers int // maximum number of dialed peers maxActiveDials int // maximum number of active dials - netRestrict *netutil.Netlist // IP whitelist, disabled if nil + netRestrict *netutil.Netlist // IP netrestrict list, disabled if nil resolver nodeResolver dialer NodeDialer log log.Logger @@ -402,7 +402,7 @@ func (d *dialScheduler) checkDial(n *enode.Node) error { return errAlreadyConnected } if d.netRestrict != nil && !d.netRestrict.Contains(n.IP()) { - return errNotWhitelisted + return errNotNetRestrictListed } if d.history.contains(string(n.ID().Bytes())) { return errRecentlyDialed diff --git a/p2p/discover/common.go b/p2p/discover/common.go index 3708bfb72c4..b747cd291eb 100644 --- a/p2p/discover/common.go +++ b/p2p/discover/common.go @@ -41,7 +41,7 @@ type Config struct { PrivateKey *ecdsa.PrivateKey // These settings are optional: - NetRestrict *netutil.Netlist // network whitelist + NetRestrict *netutil.Netlist // network restriction list Bootnodes []*enode.Node // list of bootstrap nodes Unhandled chan<- ReadPacket // unhandled packets are sent on this channel Log log.Logger // if set, log messages go here diff --git a/p2p/discover/v4_udp.go b/p2p/discover/v4_udp.go index 2b3eb48391b..c1c60e14fa9 100644 --- a/p2p/discover/v4_udp.go +++ b/p2p/discover/v4_udp.go @@ -583,7 +583,7 @@ func (t *UDPv4) nodeFromRPC(sender *net.UDPAddr, rn v4wire.Node) (*node, error) return nil, err } if t.netrestrict != nil && !t.netrestrict.Contains(rn.IP) { - return nil, errors.New("not contained in netrestrict whitelist") + return nil, errors.New("not contained in netrestrict allow list") } key, err := v4wire.DecodePubkey(crypto.S256(), rn.ID) if err != nil { diff --git a/p2p/server.go b/p2p/server.go index 04fdecaec1a..f32597e35ca 100644 --- a/p2p/server.go +++ b/p2p/server.go @@ -353,7 +353,7 @@ func (srv *Server) RemovePeer(node *enode.Node) { } } -// AddTrustedPeer adds the given node to a reserved whitelist which allows the +// AddTrustedPeer adds the given node to a reserved trusted list which allows the // node to always connect, even if the slot are full. func (srv *Server) AddTrustedPeer(node *enode.Node) { select { @@ -903,7 +903,7 @@ func (srv *Server) checkInboundConn(remoteIP net.IP) error { } // Reject connections that do not match NetRestrict. if srv.NetRestrict != nil && !srv.NetRestrict.Contains(remoteIP) { - return fmt.Errorf("not whitelisted in NetRestrict") + return fmt.Errorf("not in the NetRestrict list") } // Reject Internet peers that try too often. now := srv.clock.Now() From 25c7d6edeb0cebf39d55f562630b1edcbe0f9be6 Mon Sep 17 00:00:00 2001 From: baptiste-b-pegasys <85155432+baptiste-b-pegasys@users.noreply.github.com> Date: Thu, 29 Jul 2021 15:01:53 +0200 Subject: [PATCH 2/6] Update p2p/discover/v4_udp.go --- p2p/discover/v4_udp.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/p2p/discover/v4_udp.go b/p2p/discover/v4_udp.go index c1c60e14fa9..334716aebed 100644 --- a/p2p/discover/v4_udp.go +++ b/p2p/discover/v4_udp.go @@ -583,7 +583,7 @@ func (t *UDPv4) nodeFromRPC(sender *net.UDPAddr, rn v4wire.Node) (*node, error) return nil, err } if t.netrestrict != nil && !t.netrestrict.Contains(rn.IP) { - return nil, errors.New("not contained in netrestrict allow list") + return nil, errors.New("not contained in netrestrict list") } key, err := v4wire.DecodePubkey(crypto.S256(), rn.ID) if err != nil { From 3ec4013df19719654e806e2caa195e0b16d24b29 Mon Sep 17 00:00:00 2001 From: Baptiste Boussemart Date: Thu, 29 Jul 2021 15:19:29 +0200 Subject: [PATCH 3/6] fix for review --- p2p/dial.go | 12 ++++++------ p2p/discover/common.go | 2 +- p2p/server.go | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/p2p/dial.go b/p2p/dial.go index 1f70300914c..ea70d8d7e48 100644 --- a/p2p/dial.go +++ b/p2p/dial.go @@ -73,12 +73,12 @@ func nodeAddr(n *enode.Node) net.Addr { // checkDial errors: var ( - errSelf = errors.New("is self") - errAlreadyDialing = errors.New("already dialing") - errAlreadyConnected = errors.New("already connected") - errRecentlyDialed = errors.New("recently dialed") - errNotNetRestrictListed = errors.New("not contained in netrestrict list") - errNoPort = errors.New("node does not provide TCP port") + errSelf = errors.New("is self") + errAlreadyDialing = errors.New("already dialing") + errAlreadyConnected = errors.New("already connected") + errRecentlyDialed = errors.New("recently dialed") + errNotNetRestrict = errors.New("not contained in netrestrict list") + errNoPort = errors.New("node does not provide TCP port") ) // dialer creates outbound connections and submits them into Server. diff --git a/p2p/discover/common.go b/p2p/discover/common.go index b747cd291eb..e389821fda8 100644 --- a/p2p/discover/common.go +++ b/p2p/discover/common.go @@ -41,7 +41,7 @@ type Config struct { PrivateKey *ecdsa.PrivateKey // These settings are optional: - NetRestrict *netutil.Netlist // network restriction list + NetRestrict *netutil.Netlist // list of allowed IP networks Bootnodes []*enode.Node // list of bootstrap nodes Unhandled chan<- ReadPacket // unhandled packets are sent on this channel Log log.Logger // if set, log messages go here diff --git a/p2p/server.go b/p2p/server.go index f32597e35ca..bcfc1bd10bd 100644 --- a/p2p/server.go +++ b/p2p/server.go @@ -903,7 +903,7 @@ func (srv *Server) checkInboundConn(remoteIP net.IP) error { } // Reject connections that do not match NetRestrict. if srv.NetRestrict != nil && !srv.NetRestrict.Contains(remoteIP) { - return fmt.Errorf("not in the NetRestrict list") + return fmt.Errorf("not in netrestrict list") } // Reject Internet peers that try too often. now := srv.clock.Now() From 5774281797d77ea55d1af04d04efed84621a60dc Mon Sep 17 00:00:00 2001 From: Baptiste Boussemart Date: Thu, 29 Jul 2021 15:38:56 +0200 Subject: [PATCH 4/6] fix: error not changed --- p2p/dial.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/p2p/dial.go b/p2p/dial.go index ea70d8d7e48..6811c2cce73 100644 --- a/p2p/dial.go +++ b/p2p/dial.go @@ -402,7 +402,7 @@ func (d *dialScheduler) checkDial(n *enode.Node) error { return errAlreadyConnected } if d.netRestrict != nil && !d.netRestrict.Contains(n.IP()) { - return errNotNetRestrictListed + return errNotNetRestrict } if d.history.contains(string(n.ID().Bytes())) { return errRecentlyDialed From 7a3514208dd6fa5491e9126988735ecfe7abe567 Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Thu, 29 Jul 2021 15:58:26 +0200 Subject: [PATCH 5/6] Update dial.go --- p2p/dial.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/p2p/dial.go b/p2p/dial.go index 6811c2cce73..56c44d33194 100644 --- a/p2p/dial.go +++ b/p2p/dial.go @@ -77,7 +77,7 @@ var ( errAlreadyDialing = errors.New("already dialing") errAlreadyConnected = errors.New("already connected") errRecentlyDialed = errors.New("recently dialed") - errNotNetRestrict = errors.New("not contained in netrestrict list") + errNetRestrict = errors.New("not contained in netrestrict list") errNoPort = errors.New("node does not provide TCP port") ) @@ -402,7 +402,7 @@ func (d *dialScheduler) checkDial(n *enode.Node) error { return errAlreadyConnected } if d.netRestrict != nil && !d.netRestrict.Contains(n.IP()) { - return errNotNetRestrict + return errNetRestrict } if d.history.contains(string(n.ID().Bytes())) { return errRecentlyDialed From 48c0d99487ca86c0b0aaec919cae2738662e2773 Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Thu, 29 Jul 2021 15:59:09 +0200 Subject: [PATCH 6/6] Update dial.go --- p2p/dial.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/p2p/dial.go b/p2p/dial.go index 56c44d33194..83ced3cb328 100644 --- a/p2p/dial.go +++ b/p2p/dial.go @@ -77,7 +77,7 @@ var ( errAlreadyDialing = errors.New("already dialing") errAlreadyConnected = errors.New("already connected") errRecentlyDialed = errors.New("recently dialed") - errNetRestrict = errors.New("not contained in netrestrict list") + errNetRestrict = errors.New("not contained in netrestrict list") errNoPort = errors.New("node does not provide TCP port") )