context_test TestContextClientIP

context_test.go

@@ -1392,14 +1392,10 @@ func TestContextAbortWithError(t *testing.T) {
 	assert.True(t, c.IsAborted())
 }
 
-func resetTrustedCIDRs(c *Context) {
-	c.engine.trustedCIDRs, _ = c.engine.prepareTrustedCIDRs()
-}
-
 func TestContextClientIP(t *testing.T) {
 	c, _ := CreateTestContext(httptest.NewRecorder())
 	c.Request, _ = http.NewRequest("POST", "/", nil)
-	resetTrustedCIDRs(c)
+	c.engine.trustedCIDRs, _ = c.engine.prepareTrustedCIDRs()
 	resetContextForClientIPTests(c)
 
 	// Legacy tests (validating that the defaults don't break the
@@ -1428,57 +1424,47 @@ func TestContextClientIP(t *testing.T) {
 	resetContextForClientIPTests(c)
 
 	// No trusted proxies
-	c.engine.TrustedProxies = []string{}
+	_ = c.engine.SetTrustedProxies([]string{})
-	resetTrustedCIDRs(c)
 	c.engine.RemoteIPHeaders = []string{"X-Forwarded-For"}
 	assert.Equal(t, "40.40.40.40", c.ClientIP())
 
 	// Last proxy is trusted, but the RemoteAddr is not
-	c.engine.TrustedProxies = []string{"30.30.30.30"}
+	_ = c.engine.SetTrustedProxies([]string{"30.30.30.30"})
-	resetTrustedCIDRs(c)
 	assert.Equal(t, "40.40.40.40", c.ClientIP())
 
 	// Only trust RemoteAddr
-	c.engine.TrustedProxies = []string{"40.40.40.40"}
+	_ = c.engine.SetTrustedProxies([]string{"40.40.40.40"})
-	resetTrustedCIDRs(c)
 	assert.Equal(t, "20.20.20.20", c.ClientIP())
 
 	// All steps are trusted
-	c.engine.TrustedProxies = []string{"40.40.40.40", "30.30.30.30", "20.20.20.20"}
+	_ = c.engine.SetTrustedProxies([]string{"40.40.40.40", "30.30.30.30", "20.20.20.20"})
-	resetTrustedCIDRs(c)
 	assert.Equal(t, "20.20.20.20", c.ClientIP())
 
 	// Use CIDR
-	c.engine.TrustedProxies = []string{"40.40.25.25/16", "30.30.30.30"}
+	_ = c.engine.SetTrustedProxies([]string{"40.40.25.25/16", "30.30.30.30"})
-	resetTrustedCIDRs(c)
 	assert.Equal(t, "20.20.20.20", c.ClientIP())
 
 	// Use hostname that resolves to all the proxies
-	c.engine.TrustedProxies = []string{"foo"}
+	_ = c.engine.SetTrustedProxies([]string{"foo"})
-	resetTrustedCIDRs(c)
 	assert.Equal(t, "40.40.40.40", c.ClientIP())
 
 	// Use hostname that returns an error
-	c.engine.TrustedProxies = []string{"bar"}
+	_ = c.engine.SetTrustedProxies([]string{"bar"})
-	resetTrustedCIDRs(c)
 	assert.Equal(t, "40.40.40.40", c.ClientIP())
 
 	// X-Forwarded-For has a non-IP element
-	c.engine.TrustedProxies = []string{"40.40.40.40"}
+	_ = c.engine.SetTrustedProxies([]string{"40.40.40.40"})
-	resetTrustedCIDRs(c)
 	c.Request.Header.Set("X-Forwarded-For", " blah ")
 	assert.Equal(t, "40.40.40.40", c.ClientIP())
 
 	// Result from LookupHost has non-IP element. This should never
 	// happen, but we should test it to make sure we handle it
 	// gracefully.
-	c.engine.TrustedProxies = []string{"baz"}
+	_ = c.engine.SetTrustedProxies([]string{"baz"})
-	resetTrustedCIDRs(c)
 	c.Request.Header.Set("X-Forwarded-For", " 30.30.30.30 ")
 	assert.Equal(t, "40.40.40.40", c.ClientIP())
 
-	c.engine.TrustedProxies = []string{"40.40.40.40"}
+	_ = c.engine.SetTrustedProxies([]string{"40.40.40.40"})
-	resetTrustedCIDRs(c)
 	c.Request.Header.Del("X-Forwarded-For")
 	c.engine.RemoteIPHeaders = []string{"X-Forwarded-For", "X-Real-IP"}
 	assert.Equal(t, "10.10.10.10", c.ClientIP())

gin.go

@@ -368,7 +368,7 @@ func (engine *Engine) prepareTrustedCIDRs() ([]*net.IPNet, error) {
 
 // SetTrustedProxies  set Engine.TrustedProxies
 func (engine *Engine) SetTrustedProxies(trustedProxies []string) error {
-	engine.ForwardedByClientIP = true
+	//engine.ForwardedByClientIP = true
 	engine.TrustedProxies = trustedProxies
 	return engine.parseTrustedProxies()
 }
@@ -376,11 +376,8 @@ func (engine *Engine) SetTrustedProxies(trustedProxies []string) error {
 // parseTrustedProxies parse Engine.TrustedProxies to Engine.trustedCIDRs
 func (engine *Engine) parseTrustedProxies() error {
 	trustedCIDRs, err := engine.prepareTrustedCIDRs()
-	if err != nil {
-		return err
-	}
 	engine.trustedCIDRs = trustedCIDRs
-	return nil
+	return err
 }
 
 // parseIP parse a string representation of an IP and returns a net.IP with the