use net.JoinHostPort

using fmt.Sprintf to concatenate tcp addresses will give an incorrect result
childe · Sep 3, 2024 · 6ee44fe · 6ee44fe
1 parent bdf8608
commit 6ee44fe
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/brokers.go b/brokers.go
@@ -5,6 +5,8 @@ package healer
 import (
 	"errors"
 	"fmt"
+	"net"
+	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -103,7 +105,7 @@ func newBrokersFromOne(broker *Broker, clientID string, config *BrokerConfig) (*
 	brokers.controllerID = metadataResponse.ControllerID
 	for _, brokerInfo := range metadataResponse.Brokers {
 		brokers.brokersInfo[brokerInfo.NodeID] = brokerInfo
-		if broker.GetAddress() == fmt.Sprintf("%s:%d", brokerInfo.Host, brokerInfo.Port) {
+		if broker.GetAddress() == net.JoinHostPort(brokerInfo.Host, strconv.Itoa(int(brokerInfo.Port))) {
 			brokers.brokers[brokerInfo.NodeID] = broker
 		}
 	}
@@ -157,7 +159,7 @@ func (brokers *Brokers) refreshMetadata() bool {
 	logger.Info("update metadata from latest brokersInfo")
 	// from latest brokersinfo
 	for _, brokerInfo := range brokers.brokersInfo {
-		brokerAddr := fmt.Sprintf("%s:%d", brokerInfo.Host, brokerInfo.Port)
+		brokerAddr := net.JoinHostPort(brokerInfo.Host, strconv.Itoa(int(brokerInfo.Port)))
 		broker, err := NewBroker(brokerAddr, -1, brokers.config)
 		if err != nil {
 			logger.Error(err, "create broker failed", "brokerAddress", brokerAddr)
@@ -188,7 +190,7 @@ func (brokers *Brokers) refreshMetadata() bool {
 func (brokers *Brokers) NewBroker(nodeID int32) (*Broker, error) {
 	if nodeID == -1 {
 		for nodeID, brokerInfo := range brokers.brokersInfo {
-			broker, err := NewBroker(fmt.Sprintf("%s:%d", brokerInfo.Host, brokerInfo.Port), nodeID, brokers.config)
+			broker, err := NewBroker(net.JoinHostPort(brokerInfo.Host, strconv.Itoa(int(brokerInfo.Port))), nodeID, brokers.config)
 			if err == nil {
 				return broker, nil
 			}
@@ -198,11 +200,11 @@ func (brokers *Brokers) NewBroker(nodeID int32) (*Broker, error) {
 	}
 
 	if brokerInfo, ok := brokers.brokersInfo[nodeID]; ok {
-		broker, err := NewBroker(fmt.Sprintf("%s:%d", brokerInfo.Host, brokerInfo.Port), brokerInfo.NodeID, brokers.config)
+		broker, err := NewBroker(net.JoinHostPort(brokerInfo.Host, strconv.Itoa(int(brokerInfo.Port))), brokerInfo.NodeID, brokers.config)
 		if err == nil {
 			return broker, nil
 		} else {
-			return nil, fmt.Errorf("could not init broker for node[%d](%s:%d), error: :%w", nodeID, brokerInfo.Host, brokerInfo.Port, err)
+			return nil, fmt.Errorf("could not init broker for node[%d](%s), error: :%w", nodeID, net.JoinHostPort(brokerInfo.Host, strconv.Itoa(int(brokerInfo.Port))), err)
 		}
 	} else {
 		logger.Info("could not get broker from cache, referesh medadata", "nodeID", nodeID)
@@ -213,11 +215,11 @@ func (brokers *Brokers) NewBroker(nodeID int32) (*Broker, error) {
 
 	// try again after refereshing metadata
 	if brokerInfo, ok := brokers.brokersInfo[nodeID]; ok {
-		broker, err := NewBroker(fmt.Sprintf("%s:%d", brokerInfo.Host, brokerInfo.Port), brokerInfo.NodeID, brokers.config)
+		broker, err := NewBroker(net.JoinHostPort(brokerInfo.Host, strconv.Itoa(int(brokerInfo.Port))), brokerInfo.NodeID, brokers.config)
 		if err == nil {
 			return broker, nil
 		}
-		return nil, fmt.Errorf("could not init broker for node[%d](%s:%d):%w", nodeID, brokerInfo.Host, brokerInfo.Port, err)
+		return nil, fmt.Errorf("could not init broker for node[%d](%s):%w", nodeID, net.JoinHostPort(brokerInfo.Host, strconv.Itoa(int(brokerInfo.Port))), err)
 	}
 	return nil, fmt.Errorf("could not get broker info with nodeID[%d]", nodeID)
 }
@@ -232,12 +234,12 @@ func (brokers *Brokers) GetBroker(nodeID int32) (*Broker, error) {
 	}
 
 	if brokerInfo, ok := brokers.brokersInfo[nodeID]; ok {
-		broker, err := NewBroker(fmt.Sprintf("%s:%d", brokerInfo.Host, brokerInfo.Port), brokerInfo.NodeID, brokers.config)
+		broker, err := NewBroker(net.JoinHostPort(brokerInfo.Host, strconv.Itoa(int(brokerInfo.Port))), brokerInfo.NodeID, brokers.config)
 		if err == nil {
 			brokers.brokers[nodeID] = broker
 			return broker, nil
 		} else {
-			return nil, fmt.Errorf("could not init broker for node[%d](%s:%d):%w", nodeID, brokerInfo.Host, brokerInfo.Port, err)
+			return nil, fmt.Errorf("could not init broker for node[%d](%s):%w", nodeID, net.JoinHostPort(brokerInfo.Host, strconv.Itoa(int(brokerInfo.Port))), err)
 		}
 	} else {
 		return nil, fmt.Errorf("could not get broker info with nodeID[%d]", nodeID)

diff --git a/command/cmd/api.go b/command/cmd/api.go
@@ -1,8 +1,9 @@
 package cmd
 
 import (
-	"fmt"
+	"net"
 	"net/http"
+	"strconv"
 
 	"github.com/childe/healer/command/cmd/apicontrollers"
 
@@ -28,7 +29,7 @@ var apiCmd = &cobra.Command{
 			client = "healer"
 		}
 
-		fullAddress := fmt.Sprintf("%s:%d", address, port)
+		fullAddress := net.JoinHostPort(address, strconv.Itoa(int(port)))
 		router := gin.Default()
 
 		if cors {

diff --git a/command/cmd/get-metadata.go b/command/cmd/get-metadata.go
@@ -3,6 +3,8 @@ package cmd
 import (
 	"encoding/json"
 	"fmt"
+	"net"
+	"strconv"
 
 	"github.com/childe/healer"
 	"github.com/spf13/cobra"
@@ -50,8 +52,9 @@ func catResponse(metadataResponse *healer.MetadataResponse) {
 	fmt.Println("brokers:")
 	bs := make(map[int32]string)
 	for _, b := range metadataResponse.Brokers {
-		fmt.Printf("%d %s:%d\n", b.NodeID, b.Host, b.Port)
-		bs[b.NodeID] = fmt.Sprintf("%s:%d", b.Host, b.Port)
+		address := net.JoinHostPort(b.Host, strconv.Itoa(int(b.Port)))
+		fmt.Printf("%d %s\n", b.NodeID, address)
+		bs[b.NodeID] = address
 	}
 
 	fmt.Println("topics:")