feat: a little refactor about ip revise logic

Author: CarlJi

cmd/server.go

@@ -42,17 +42,17 @@ goc server --port=localhost:8080
 		if err != nil {
 			log.Fatalf("New file based server failed, err: %v", err)
 		}
-		server.IPRevise = iprevise
+		server.IPRevise = IPRevise
 		server.Run(port)
 	},
 }
 
 var port, localPersistence string
-var iprevise bool
+var IPRevise bool
 
 func init() {
 	serverCmd.Flags().StringVarP(&port, "port", "", ":7777", "listen port to start a coverage host center")
 	serverCmd.Flags().StringVarP(&localPersistence, "local-persistence", "", "_svrs_address.txt", "the file to save services address information")
-	serverCmd.Flags().BoolVarP(&iprevise, "ip_revise", "", true, "setting the network type(default:regist server use proxy or under nat、same network ect,direct:use register request parm)")
+	serverCmd.Flags().BoolVarP(&IPRevise, "ip_revise", "", true, "whether to do ip revise during registering. Recommend to set this as false if under NAT or Proxy environment")
 	rootCmd.AddCommand(serverCmd)
 }

pkg/cover/server.go

@@ -102,7 +102,7 @@ func (s *server) Route(w io.Writer) *gin.Engine {
 type ServiceUnderTest struct {
 	Name     string `form:"name" json:"name" binding:"required"`
 	Address  string `form:"address" json:"address" binding:"required"`
-	IPRevise string `form:"iprevise" json:"-"`
+	IPRevise string `form:"ip_revise" json:"-"` // whether to do ip revise during registering
 }
 
 // ProfileParam is param of profile API
@@ -126,13 +126,7 @@ func (s *server) registerService(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 		return
 	}
-	if service.IPRevise == "" {
-		service.IPRevise = strconv.FormatBool(s.IPRevise)
-	}
-	isrevise, err := strconv.ParseBool(service.IPRevise)
-	if err != nil {
-		isrevise = s.IPRevise
-	}
+
 	u, err := url.Parse(service.Address)
 	if err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
@@ -141,44 +135,44 @@ func (s *server) registerService(c *gin.Context) {
 	if u.Scheme != "https" && u.Scheme != "http" {
 		c.JSON(http.StatusBadRequest, gin.H{"error": "unsupport schema"})
 		return
-	} else if u.Path != "" {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "uri path must empty"})
+	}
+	if u.Host == "" {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "empty host"})
 		return
 	}
-	if !isrevise {
-		if u.Host == "" {
-			c.JSON(http.StatusBadRequest, gin.H{"error": "address is empty"})
-			return
-		}
-		if u.Hostname() == "" {
-			c.JSON(http.StatusBadRequest, gin.H{"error": "empty host name"})
-			return
-		}
-	} else {
-		host := u.Hostname()
-		port := u.Port()
-		if host == "" {
-			host = c.ClientIP()
-		}
-		if port == "" {
-			port = "80"
-		}
-		u.Host = fmt.Sprintf("%s:%s", host, port)
-		host, port, err := net.SplitHostPort(u.Host)
+	host, port, err := net.SplitHostPort(u.Host)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+		return
+	}
+
+	var doIPRevise bool
+	// Prefer user's decision first.
+	if service.IPRevise != "" {
+		doIPRevise, err = strconv.ParseBool(service.IPRevise)
 		if err != nil {
 			c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 			return
 		}
+	} else {
+		doIPRevise = s.IPRevise
+	}
 
+	if doIPRevise {
 		realIP := c.ClientIP()
 		// only for IPV4
 		// refer: https://github.com/qiniu/goc/issues/177
 		if net.ParseIP(realIP).To4() != nil && host != realIP {
 			log.Printf("the registered host %s of service %s is different with the real one %s, here we choose the real one", service.Name, host, realIP)
-			service.Address = fmt.Sprintf("%s://%s:%s", u.Scheme, realIP, port)
+			host = realIP
 		}
 	}
 
+	service.Address = fmt.Sprintf("%s://%s", u.Scheme, host)
+	if port != "" {
+		service.Address = fmt.Sprintf("%s:%s", service.Address, port)
+	}
+
 	address := s.Store.Get(service.Name)
 	if !contains(address, service.Address) {
 		if err := s.Store.Add(service); err != nil && err != ErrServiceAlreadyRegistered {