refactor: refactor make trust ip

gin-gonic · Jan 1, 2024 · 0dd4fe5 · 0dd4fe5
1 parent 162a228
commit 0dd4fe5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/gin.go b/gin.go
@@ -395,9 +395,8 @@ func (engine *Engine) prepareTrustedCIDRs() ([]*net.IPNet, error) {
 
 	cidr := make([]*net.IPNet, 0, len(engine.trustedProxies))
 	for _, trustedProxy := range engine.trustedProxies {
-		if !strings.Contains(trustedProxy, "/") {
-			trustedProxy, err = utils.MakeTrustIP(trustedProxy)	
-		}
+		trustedProxy, err = utils.MakeTrustIP(trustedProxy)	
+
 		if err != nil {
 			return cidr, err
 		}

diff --git a/utils/ip.go b/utils/ip.go
@@ -2,6 +2,7 @@ package utils
 
 import (
 	"net"
+	"strings"
 )
 
 func parseIP(ip string) (net.IP, error) {
@@ -17,6 +18,9 @@ func parseIP(ip string) (net.IP, error) {
 }
 
 func MakeTrustIP(trustedIP string) (string, error) {
+	if strings.Contains(trustedIP, "/") {
+		return trustedIP, nil	
+	}
 	ip, err := parseIP(trustedIP)
 
 	if err != nil {