fix(web): read the client address from the proxy end of forwarded headers

getRemoteIp took a trusted proxy's X-Real-IP first, otherwise the leftmost
X-Forwarded-For entry. A proxy that forwards a client-sent X-Real-IP
unchanged (Caddy, HAProxy) or appends to X-Forwarded-For leaves both values
to the client. X-Forwarded-For is now read from the right, skipping trusted
proxies. X-Real-IP is believed only when it agrees with that hop or stands
alone, and a disagreement falls back to the proxy's own address.

The documented Caddyfile and the docs reverse-proxy generator now overwrite
X-Real-IP with the address Caddy saw.
This commit is contained in:
MHSanaei
2026-10-24 01:39:23 +02:00
parent 1df8ab29f8
commit d50c419e28
8 changed files with 87 additions and 24 deletions
+32 -13
View File
@@ -22,24 +22,43 @@ func getRemoteIp(c *gin.Context) string {
if !ok {
return "unknown"
}
if isTrustedProxy(remoteIP) {
if ip, ok := extractTrustedIP(c.GetHeader("X-Real-IP")); ok {
return ip
}
if xff := c.GetHeader("X-Forwarded-For"); xff != "" {
for part := range strings.SplitSeq(xff, ",") {
if ip, ok := extractTrustedIP(part); ok {
return ip
}
}
}
if !isTrustedProxy(remoteIP) {
return remoteIP
}
realIP, hasRealIP := extractTrustedIP(c.GetHeader("X-Real-IP"))
forwardedIP, hasForwarded := forwardedForClient(c.GetHeader("X-Forwarded-For"))
switch {
case hasRealIP && hasForwarded && realIP != forwardedIP:
// A proxy rewrites at most one of the two, so the other is the client's
// own claim; neither may pick the identity the login limiter keys on.
return remoteIP
case hasForwarded:
return forwardedIP
case hasRealIP:
return realIP
}
return remoteIP
}
// forwardedForClient walks X-Forwarded-For from the proxy end: entries a client sent
// come first, so the first hop that is not a trusted proxy is the address one saw.
func forwardedForClient(xff string) (string, bool) {
parts := strings.Split(xff, ",")
client := ""
for i := len(parts) - 1; i >= 0; i-- {
ip, ok := extractTrustedIP(parts[i])
if !ok {
break
}
client = ip
if !isTrustedProxy(ip) {
break
}
}
return client, client != ""
}
func isTrustedForwardedRequest(c *gin.Context) bool {
remoteIP, ok := extractTrustedIP(c.Request.RemoteAddr)
return ok && isTrustedProxy(remoteIP)