cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

close existing connections that match the filters when adding rules to the connection gater

Browse Source
This commit is contained in:
vyzo 2020-11-13 14:38:13 +02:00
parent b8884adaf1
commit 4b187b85eb
1 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
node/impl/common/conngater.go
View File

@ -6,15 +6,28 @@ import (
"golang.org/x/xerrors" "golang.org/x/xerrors"
logging "github.com/ipfs/go-log/v2"
manet "github.com/multiformats/go-multiaddr/net"
"github.com/filecoin-project/lotus/node/modules/dtypes" "github.com/filecoin-project/lotus/node/modules/dtypes"
) )
var cLog = logging.Logger("conngater")
func (a *CommonAPI) NetBlockAdd(ctx context.Context, acl dtypes.NetBlockList) error { func (a *CommonAPI) NetBlockAdd(ctx context.Context, acl dtypes.NetBlockList) error {
for _, p := range acl.Peers { for _, p := range acl.Peers {
err := a.ConnGater.BlockPeer(p) err := a.ConnGater.BlockPeer(p)
if err != nil { if err != nil {
return xerrors.Errorf("error blocking peer %s: %w", p, err) return xerrors.Errorf("error blocking peer %s: %w", p, err)
} }
for _, c := range a.Host.Network().ConnsToPeer(p) {
err = c.Close()
if err != nil {
// just log this, don't fail
cLog.Warnf("error closing connection to %s: %s", p, err)
}
}
} }
for _, addr := range acl.IPAddrs { for _, addr := range acl.IPAddrs {
@ -27,6 +40,22 @@ func (a *CommonAPI) NetBlockAdd(ctx context.Context, acl dtypes.NetBlockList) er
if err != nil { if err != nil {
return xerrors.Errorf("error blocking IP address %s: %w", addr, err) return xerrors.Errorf("error blocking IP address %s: %w", addr, err)
} }
for _, c := range a.Host.Network().Conns() {
remote := c.RemoteMultiaddr()
remoteIP, err := manet.ToIP(remote)
if err != nil {
continue
}
if ip.Equal(remoteIP) {
err = c.Close()
if err != nil {
// just log this, don't fail
cLog.Warnf("error closing connection to %s: %s", remoteIP, err)
}
}
}
} }
for _, subnet := range acl.IPSubnets { for _, subnet := range acl.IPSubnets {
@ -39,6 +68,22 @@ func (a *CommonAPI) NetBlockAdd(ctx context.Context, acl dtypes.NetBlockList) er
if err != nil { if err != nil {
return xerrors.Errorf("error blocking subunet %s: %w", subnet, err) return xerrors.Errorf("error blocking subunet %s: %w", subnet, err)
} }
for _, c := range a.Host.Network().Conns() {
remote := c.RemoteMultiaddr()
remoteIP, err := manet.ToIP(remote)
if err != nil {
continue
}
if cidr.Contains(remoteIP) {
err = c.Close()
if err != nil {
// just log this, don't fail
cLog.Warnf("error closing connection to %s: %s", remoteIP, err)
}
}
}
} }
return nil return nil