rationalize return logic in validateHeader()

This commit is contained in:
Notealot 2021-10-27 00:19:06 +08:00
parent 1f30270b0c
commit 513b59fa88

29
gin.go
View File

@ -416,24 +416,23 @@ func (engine *Engine) isTrustedProxy(ip net.IP) bool {
} }
func (engine *Engine) validateHeader(header string) (clientIP string, valid bool) { func (engine *Engine) validateHeader(header string) (clientIP string, valid bool) {
if header == "" { if header != "" {
return "", false items := strings.Split(header, ",")
} for i := len(items) - 1; i >= 0; i-- {
items := strings.Split(header, ",") ipStr := strings.TrimSpace(items[i])
for i := len(items) - 1; i >= 0; i-- { ip := net.ParseIP(ipStr)
ipStr := strings.TrimSpace(items[i]) if ip == nil {
ip := net.ParseIP(ipStr) return "", false
if ip == nil { }
return "", false
}
// X-Forwarded-For is appended by proxy // X-Forwarded-For is appended by proxy
// Check IPs in reverse order and stop when find untrusted proxy // Check IPs in reverse order and stop when find untrusted proxy
if (i == 0) || (!engine.isTrustedProxy(ip)) { if (i == 0) || (!engine.isTrustedProxy(ip)) {
return ipStr, true return ipStr, true
}
} }
} }
return return "", false
} }
// parseTrustedProxies parse Engine.trustedProxies to Engine.trustedCIDRs // parseTrustedProxies parse Engine.trustedProxies to Engine.trustedCIDRs