Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix x-forwarded-for header processing for ws connections #860

Merged
merged 2 commits into from
May 6, 2022
Merged

Fix x-forwarded-for header processing for ws connections #860

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96c2aa2
Fix x-forwarded-for header processing for ws connections
bn0ir Jan 11, 2022
e483a1b
Rewrite fabio X-Forwarded-For header set for WS connections based on …
bn0ir Apr 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion proxy/http_headers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,18 @@ func addHeaders(r *http.Request, cfg config.Proxy, stripPath string) error {
// http proxy which sets it.
ws := r.Header.Get("Upgrade") == "websocket"
if ws {
r.Header.Set("X-Forwarded-For", remoteIP)
clientIP := remoteIP
// If we aren't the first proxy retain prior
// X-Forwarded-For information as a comma+space
// separated list and fold multiple headers into one.
prior, ok := r.Header["X-Forwarded-For"]
omit := ok && prior == nil // Issue 38079: nil now means don't populate the header
if len(prior) > 0 {
clientIP = strings.Join(prior, ", ") + ", " + clientIP
}
if !omit {
r.Header.Set("X-Forwarded-For", clientIP)
}
}

// Issue #133: Setting the X-Forwarded-Proto header to
Expand Down