Remove plaintext transport support.

thetatoken · Jul 26, 2019 · 8edbebd · 8edbebd
1 parent 0f38178
commit 8edbebd
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 55 deletions.
diff --git a/common/config.go b/common/config.go
@@ -37,8 +37,6 @@ const (
 	CfgP2PMessageQueueSize = "p2p.messageQueueSize"
 	// CfgP2PSeedPeerOnlyOutbound decides whether only the seed peers can be outbound peers.
 	CfgP2PSeedPeerOnlyOutbound = "p2p.seedPeerOnlyOutbound"
-	// CfgP2PPlainTextSupport decides whether to support plaintext transport.
-	CfgP2PPlainTextSupport = "p2p.plaintextSupport"
 
 	// CfgSyncInboundResponseWhitelist filters inbound messages based on peer ID.
 	CfgSyncInboundResponseWhitelist = "sync.inboundResponseWhitelist"
@@ -83,7 +81,6 @@ func init() {
 	viper.SetDefault(CfgP2PPort, 50001)
 	viper.SetDefault(CfgP2PSeeds, "")
 	viper.SetDefault(CfgP2PSeedPeerOnlyOutbound, false)
-	viper.SetDefault(CfgP2PPlainTextSupport, true)
 
 	viper.SetDefault(CfgRPCAddress, "0.0.0.0")
 	viper.SetDefault(CfgRPCPort, "16888")

diff --git a/p2p/peer/peer.go b/p2p/peer/peer.go
@@ -149,70 +149,63 @@ func (peer *Peer) Handshake(sourceNodeInfo *p2ptypes.NodeInfo) error {
 	targetPeerNodeInfo.PubKey = targetNodePubKey
 	peer.nodeInfo = targetPeerNodeInfo
 
-	if targetPeerNodeInfo.Port != 0 {
-		// Forward compatibility.
-		localChainID := viper.GetString(common.CfgGenesisChainID)
-		cmn.Parallel(
-			func() {
-				sendError = rlp.Encode(peer.connection.GetBufNetconn(), localChainID)
-				if sendError != nil {
-					return
-				}
-				sendError = rlp.Encode(peer.connection.GetBufNetconn(), "EOH")
-			},
-			func() {
-				var msg string
+	// Forward compatibility.
+	localChainID := viper.GetString(common.CfgGenesisChainID)
+	cmn.Parallel(
+		func() {
+			sendError = rlp.Encode(peer.connection.GetBufNetconn(), localChainID)
+			if sendError != nil {
+				return
+			}
+			sendError = rlp.Encode(peer.connection.GetBufNetconn(), "EOH")
+		},
+		func() {
+			var msg string
+			recvError = s.Decode(&msg)
+			if recvError != nil {
+				return
+			}
+			if msg == "EOH" {
+				return
+			}
+			if msg != localChainID {
+				recvError = fmt.Errorf("ChainID mismatch: peer chainID: %v, local ChainID: %v", msg, localChainID)
+				return
+			}
+			logger.Infof("Peer ChainID: %v", msg)
+			for {
 				recvError = s.Decode(&msg)
 				if recvError != nil {
 					return
 				}
 				if msg == "EOH" {
 					return
 				}
-				if msg != localChainID {
-					recvError = fmt.Errorf("ChainID mismatch: peer chainID: %v, local ChainID: %v", msg, localChainID)
-					return
-				}
-				logger.Infof("Peer ChainID: %v", msg)
-				for {
-					recvError = s.Decode(&msg)
-					if recvError != nil {
-						return
-					}
-					if msg == "EOH" {
-						return
-					}
-				}
-			},
-		)
-		if sendError != nil {
-			logger.Errorf("Error during handshake/send extra info: %v", sendError)
-			return sendError
-		}
-		if recvError != nil {
-			logger.Errorf("Error during handshake/recv extra info: %v", recvError)
-			return recvError
-		}
+			}
+		},
+	)
+	if sendError != nil {
+		logger.Errorf("Error during handshake/send extra info: %v", sendError)
+		return sendError
+	}
+	if recvError != nil {
+		logger.Errorf("Error during handshake/recv extra info: %v", recvError)
+		return recvError
+	}
 
-		remotePub, err := peer.connection.DoEncHandshake(
-			crypto.PrivKeyToECDSA(sourceNodeInfo.PrivKey), crypto.PubKeyToECDSA(targetNodePubKey))
-		if err != nil {
+	remotePub, err := peer.connection.DoEncHandshake(
+		crypto.PrivKeyToECDSA(sourceNodeInfo.PrivKey), crypto.PubKeyToECDSA(targetNodePubKey))
+	if err != nil {
+		logger.Errorf("Error during handshake/key exchange: %v", err)
+		return err
+	} else {
+		if remotePub.Address() != targetNodePubKey.Address() {
+			err = fmt.Errorf("expected remote address: %v, actual address: %v", targetNodePubKey.Address(), remotePub.Address())
 			logger.Errorf("Error during handshake/key exchange: %v", err)
 			return err
-		} else {
-			if remotePub.Address() != targetNodePubKey.Address() {
-				err = fmt.Errorf("expected remote address: %v, actual address: %v", targetNodePubKey.Address(), remotePub.Address())
-				logger.Errorf("Error during handshake/key exchange: %v", err)
-				return err
-			}
 		}
-		logger.Infof("Using encrypted transport for peer: %v", targetNodePubKey.Address())
-	} else if viper.GetBool(common.CfgP2PPlainTextSupport) {
-		logger.Infof("Using plaintext transport for peer: %v", targetNodePubKey.Address())
-	} else {
-		logger.Errorf("Plaintext transport is not enabled")
-		return fmt.Errorf("Plaintext transport is not enabled")
 	}
+	logger.Infof("Using encrypted transport for peer: %v", targetNodePubKey.Address())
 
 	if !peer.isOutbound {
 		peer.SetNetAddress(nu.NewNetAddressWithEnforcedPort(netconn.RemoteAddr(), int(peer.nodeInfo.Port)))