add consensus ip whitelist

app/config/config.go

@@ -137,6 +137,9 @@ type OecConfig struct {
 	maxSubscriptionClients int
 
 	maxTxLimitPerPeer uint64
+
+	enableConsensusIPWhitelist bool
+	consensusIPWhitelist       []string
 }
 
 const (
@@ -175,6 +178,8 @@ const (
 	FlagCsTimeoutPrecommit         = "consensus.timeout_precommit"
 	FlagCsTimeoutPrecommitDelta    = "consensus.timeout_precommit_delta"
 	FlagCsTimeoutCommit            = "consensus.timeout_commit"
+	FlagEnableConsensusIPWhitelist = "consensus.enable_ip_whitelist"
+	FlagConsensusIPWhitelist       = "consensus.ip_whitelist"
 	FlagEnableHasBlockPartMsg      = "enable-blockpart-ack"
 	FlagDebugGcInterval            = "debug.gc-interval"
 	FlagCommitGapOffset            = "commit-gap-offset"
@@ -331,6 +336,8 @@ func (c *OecConfig) loadFromConfig() {
 	c.SetCommitGapHeight(viper.GetInt64(server.FlagCommitGapHeight))
 	c.SetSentryAddrs(viper.GetString(FlagSentryAddrs))
 	c.SetNodeKeyWhitelist(viper.GetString(FlagNodeKeyWhitelist))
+	c.SetEnableConsensusIPWhitelist(viper.GetBool(FlagEnableConsensusIPWhitelist))
+	c.SetConsensusIPWhitelist(viper.GetString(FlagConsensusIPWhitelist))
 	c.SetEnableWtx(viper.GetBool(FlagEnableWrappedTx))
 	c.SetEnableAnalyzer(viper.GetBool(trace.FlagEnableAnalyzer))
 	c.SetDeliverTxsExecuteMode(viper.GetInt(state.FlagDeliverTxsExecMode))
@@ -511,6 +518,14 @@ func (c *OecConfig) updateFromKVStr(k, v string) {
 		c.SetPendingPoolBlacklist(v)
 	case FlagNodeKeyWhitelist:
 		c.SetNodeKeyWhitelist(v)
+	case FlagEnableConsensusIPWhitelist:
+		r, err := strconv.ParseBool(v)
+		if err != nil {
+			return
+		}
+		c.SetEnableConsensusIPWhitelist(r)
+	case FlagConsensusIPWhitelist:
+		c.SetConsensusIPWhitelist(v)
 	case FlagMempoolCheckTxCost:
 		r, err := strconv.ParseBool(v)
 		if err != nil {
@@ -810,6 +825,14 @@ func (c *OecConfig) GetNodeKeyWhitelist() []string {
 	return c.nodeKeyWhitelist
 }
 
+func (c *OecConfig) GetEnableConsensusIPWhitelist() bool {
+	return c.enableConsensusIPWhitelist
+}
+
+func (c *OecConfig) GetConsensusIPWhitelist() []string {
+	return c.consensusIPWhitelist
+}
+
 func (c *OecConfig) GetMempoolCheckTxCost() bool {
 	return c.mempoolCheckTxCost
 }
@@ -831,6 +854,17 @@ func (c *OecConfig) SetNodeKeyWhitelist(value string) {
 	}
 }
 
+func (c *OecConfig) SetEnableConsensusIPWhitelist(value bool) {
+	c.enableConsensusIPWhitelist = value
+}
+
+func (c *OecConfig) SetConsensusIPWhitelist(value string) {
+	ipList := resolveNodeKeyWhitelist(value)
+	for _, ip := range ipList {
+		c.consensusIPWhitelist = append(c.consensusIPWhitelist, strings.TrimSpace(ip))
+	}
+}
+
 func (c *OecConfig) GetSentryAddrs() []string {
 	return c.sentryAddrs
 }

libs/tendermint/blockchain/v0/reactor.go

@@ -9,6 +9,7 @@ import (
 
 	amino "github.com/tendermint/go-amino"
 
+	cfg "github.com/okex/exchain/libs/tendermint/config"
 	"github.com/okex/exchain/libs/tendermint/libs/log"
 	"github.com/okex/exchain/libs/tendermint/p2p"
 	sm "github.com/okex/exchain/libs/tendermint/state"
@@ -202,6 +203,20 @@ func (bcR *BlockchainReactor) respondToPeer(msg *bcBlockRequestMessage,
 
 // Receive implements Reactor by handling 4 types of messages (look below).
 func (bcR *BlockchainReactor) Receive(chID byte, src p2p.Peer, msgBytes []byte) {
+	if cfg.DynamicConfig.GetEnableConsensusIPWhitelist() {
+		okIP := false
+		for _, ip := range cfg.DynamicConfig.GetConsensusIPWhitelist() {
+			if src.RemoteIP().String() == ip {
+				okIP = true
+				break
+			}
+		}
+		if !okIP {
+			bcR.Logger.Error("consensus msg:IP not in whitelist", "IP", src.RemoteIP().String())
+			return
+		}
+	}
+
 	msg, err := decodeMsg(msgBytes)
 	if err != nil {
 		bcR.Logger.Error("Error decoding message", "src", src, "chId", chID, "msg", msg, "err", err, "bytes", msgBytes)

libs/tendermint/config/dynamic_config_okchain.go

@@ -41,6 +41,8 @@ type IDynamicConfig interface {
 	GetMaxSubscriptionClients() int
 	GetPendingPoolBlacklist() string
 	GetMaxTxLimitPerPeer() uint64
+	GetEnableConsensusIPWhitelist() bool
+	GetConsensusIPWhitelist() []string
 }
 
 var DynamicConfig IDynamicConfig = MockDynamicConfig{}
@@ -233,3 +235,9 @@ func (d MockDynamicConfig) GetPendingPoolBlacklist() string {
 func (c MockDynamicConfig) GetMaxTxLimitPerPeer() uint64 {
 	return DefaultMempoolConfig().MaxTxLimitPerPeer
 }
+
+func (c MockDynamicConfig) GetEnableConsensusIPWhitelist() bool { return false }
+
+func (c MockDynamicConfig) GetConsensusIPWhitelist() []string {
+	return []string{}
+}

libs/tendermint/consensus/reactor.go

@@ -3,17 +3,17 @@ package consensus
 import (
 	"bytes"
 	"fmt"
-	"github.com/okex/exchain/libs/tendermint/crypto"
-	"github.com/okex/exchain/libs/tendermint/libs/automation"
 	"reflect"
 	"sync"
 	"time"
 
 	"github.com/pkg/errors"
-
 	amino "github.com/tendermint/go-amino"
 
+	cfg "github.com/okex/exchain/libs/tendermint/config"
 	cstypes "github.com/okex/exchain/libs/tendermint/consensus/types"
+	"github.com/okex/exchain/libs/tendermint/crypto"
+	"github.com/okex/exchain/libs/tendermint/libs/automation"
 	"github.com/okex/exchain/libs/tendermint/libs/bits"
 	tmevents "github.com/okex/exchain/libs/tendermint/libs/events"
 	"github.com/okex/exchain/libs/tendermint/libs/log"
@@ -343,6 +343,20 @@ func (conR *Reactor) Receive(chID byte, src p2p.Peer, msgBytes []byte) {
 		return
 	}
 
+	if cfg.DynamicConfig.GetEnableConsensusIPWhitelist() {
+		okIP := false
+		for _, ip := range cfg.DynamicConfig.GetConsensusIPWhitelist() {
+			if src.RemoteIP().String() == ip {
+				okIP = true
+				break
+			}
+		}
+		if !okIP {
+			conR.Logger.Error("consensus msg:IP not in whitelist", "IP", src.RemoteIP().String())
+			return
+		}
+	}
+
 	msg, err := decodeMsg(msgBytes)
 	if err != nil {
 		conR.Logger.Error("Error decoding message", "src", src, "chId", chID, "msg", msg, "err", err, "bytes", msgBytes)

libs/tendermint/evidence/reactor.go

@@ -7,6 +7,7 @@ import (
 
 	amino "github.com/tendermint/go-amino"
 
+	cfg "github.com/okex/exchain/libs/tendermint/config"
 	clist "github.com/okex/exchain/libs/tendermint/libs/clist"
 	"github.com/okex/exchain/libs/tendermint/libs/log"
 	"github.com/okex/exchain/libs/tendermint/p2p"
@@ -63,6 +64,20 @@ func (evR *Reactor) AddPeer(peer p2p.Peer) {
 // Receive implements Reactor.
 // It adds any received evidence to the evpool.
 func (evR *Reactor) Receive(chID byte, src p2p.Peer, msgBytes []byte) {
+	if cfg.DynamicConfig.GetEnableConsensusIPWhitelist() {
+		okIP := false
+		for _, ip := range cfg.DynamicConfig.GetConsensusIPWhitelist() {
+			if src.RemoteIP().String() == ip {
+				okIP = true
+				break
+			}
+		}
+		if !okIP {
+			evR.Logger.Error("consensus msg:IP not in whitelist", "IP", src.RemoteIP().String())
+			return
+		}
+	}
+
 	msg, err := decodeMsg(msgBytes)
 	if err != nil {
 		evR.Logger.Error("Error decoding message", "src", src, "chId", chID, "msg", msg, "err", err, "bytes", msgBytes)