add ban score when receiving an invalid block form sync peer

copernet · Nov 30, 2018 · 1ff5fe2 · 1ff5fe2
1 parent 5fb5eaf
commit 1ff5fe2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/conf/bitcoincash.yml b/conf/bitcoincash.yml
@@ -33,7 +33,7 @@ P2PNet:
   MaxPeers:
   TargetOutbound:
   ConnectPeersOnStart:
-  DisableBanning: true
+  DisableBanning: false
   SimNet: false
   DisableListen: false
   BlocksOnly: false

diff --git a/conf/conf.go b/conf/conf.go
@@ -83,7 +83,7 @@ type Configuration struct {
 		MaxPeers            int      `default:"128"`
 		TargetOutbound      int      `default:"64"`
 		ConnectPeersOnStart []string
-		DisableBanning      bool   `default:"true"`
+		DisableBanning      bool   `default:"false"`
 		BanThreshold        uint32 `default:"100"`
 		TestNet             bool
 		RegTest             bool `default:"false"`

diff --git a/conf/conf_test.go b/conf/conf_test.go
@@ -231,7 +231,7 @@ func getDefaultConfiguration(args defaultArgs) *Configuration {
 			MaxPeers            int      `default:"128"`
 			TargetOutbound      int      `default:"64"`
 			ConnectPeersOnStart []string
-			DisableBanning      bool   `default:"true"`
+			DisableBanning      bool   `default:"false"`
 			BanThreshold        uint32 `default:"100"`
 			TestNet             bool
 			RegTest             bool `default:"false"`
@@ -254,7 +254,7 @@ func getDefaultConfiguration(args defaultArgs) *Configuration {
 			ListenAddrs:       []string{"1234"},
 			MaxPeers:          128,
 			TargetOutbound:    64,
-			DisableBanning:    true,
+			DisableBanning:    false,
 			BanThreshold:      100,
 			DisableListen:     true,
 			BlocksOnly:        false,

diff --git a/net/syncmanager/syncmanager.go b/net/syncmanager/syncmanager.go
@@ -641,10 +641,17 @@ func (sm *SyncManager) handleBlockMsg(bmsg *blockMsg) {
 
 		if !sm.headersFirstMode {
 			log.Debug("len of Requested block:%d, sm.allowdGetBlocksTimes: %d", len(sm.requestedBlocks), sm.allowdGetBlocksTimes)
-			if peer == sm.syncPeer && sm.allowdGetBlocksTimes > 0 {
-				if len(state.requestedBlocks) == 0 {
+			if peer == sm.syncPeer {
+				activeChain := chain.GetInstance()
+				tipHash := activeChain.Tip().Header.GetHash()
+				// add ban score when receiving an invalid new block (next of the tip) from sync peer
+				if bmsg.block.Header.HashPrevBlock.IsEqual(&tipHash) {
+					log.Error("handleBlockMsg receive an invalid block[%s] from sync peer[%s]", blockHash.String(), peer.Addr())
+					sm.misbehaving(peer.Addr(), 100, err.Error())
+					return
+				}
+				if sm.allowdGetBlocksTimes > 0 && len(state.requestedBlocks) == 0 {
 					sm.allowdGetBlocksTimes--
-					activeChain := chain.GetInstance()
 					locator := activeChain.GetLocator(nil)
 					peer.PushGetBlocksMsg(*locator, &zeroHash)
 				}