debug

Author: skosito

p2p/whitelist_connection_gater.go

@@ -1,6 +1,9 @@
 package p2p
 
 import (
+	"fmt"
+	"strings"
+
 	"github.com/libp2p/go-libp2p/core/control"
 	"github.com/libp2p/go-libp2p/core/network"
 	"github.com/rs/zerolog"
@@ -40,7 +43,7 @@ func (wg *WhitelistConnectionGater) InterceptPeerDial(p peer.ID) (allow bool) {
 }
 
 func (wg *WhitelistConnectionGater) InterceptAddrDial(p peer.ID, m maddr.Multiaddr) (allow bool) {
-	wg.logger.Info().Msgf("InterceptAddrDial %s", p.String())
+	wg.logger.Info().Msgf("InterceptAddrDial %s %s", p.String(), m.String())
 	if !wg.disableWhitelist {
 		wg.logger.Info().Msgf("peer allowed %t", wg.whitelistedPeers[p.String()])
 		return wg.whitelistedPeers[p.String()]
@@ -49,12 +52,16 @@ func (wg *WhitelistConnectionGater) InterceptAddrDial(p peer.ID, m maddr.Multiad
 	return true
 }
 
-func (wg *WhitelistConnectionGater) InterceptAccept(network.ConnMultiaddrs) (allow bool) {
+func (wg *WhitelistConnectionGater) InterceptAccept(m network.ConnMultiaddrs) (allow bool) {
+	hasAllowedPort := hasAllowedPort(m, "6668")
+	wg.logger.Info().Msgf("InterceptAccept %t", hasAllowedPort)
+
 	return true
 }
 
-func (wg *WhitelistConnectionGater) InterceptSecured(direction network.Direction, p peer.ID, _ network.ConnMultiaddrs) (allow bool) {
-	wg.logger.Info().Msgf("InterceptSecured %s", p.String())
+func (wg *WhitelistConnectionGater) InterceptSecured(direction network.Direction, p peer.ID, m network.ConnMultiaddrs) (allow bool) {
+	hasAllowedPort := hasAllowedPort(m, "6668")
+	wg.logger.Info().Msgf("InterceptSecured %t %s", hasAllowedPort, p.String())
 	if !wg.disableWhitelist {
 		wg.logger.Info().Msgf("peer allowed %t", wg.whitelistedPeers[p.String()])
 		return wg.whitelistedPeers[p.String()]
@@ -67,3 +74,9 @@ func (wg *WhitelistConnectionGater) InterceptUpgraded(network.Conn) (bool, contr
 	// Allow connection upgrades
 	return true, 0
 }
+
+// Helper function to check if multiaddr has the correct TCP port
+func hasAllowedPort(multiaddrs network.ConnMultiaddrs, allowedPort string) bool {
+	fmt.Println("multiaddrs", multiaddrs.RemoteMultiaddr().String(), multiaddrs.RemoteMultiaddr().Protocols())
+	return strings.Contains(multiaddrs.RemoteMultiaddr().String(), "/tcp/"+allowedPort)
+}