TyleoDvDelaware3217/GoDoxy
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2025-06-09 13:02:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

improved handling of visitor IPs for prometheus metrics

Browse source
This commit is contained in:
yusing 2024-12-14 04:39:40 +08:00
parent 48430fd9c3
commit f948d05b90
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
internal/net/http/reverse_proxy_mod.go
View file

@ -274,12 +274,20 @@ func (p *ReverseProxy) handler(rw http.ResponseWriter, req *http.Request) {
if common.PrometheusEnabled { if common.PrometheusEnabled {
t := time.Now() t := time.Now()
var visitor string var visitor string
if realIPs := req.Header.Values("X-Real-IP"); len(realIPs) > 0 { if realIPs := req.Header.Values(HeaderXRealIP); len(realIPs) > 0 {
visitor = realIPs[0] if len(realIPs) == 1 {
visitor = realIPs[0]
} else {
p.Warn().Strs("real_ips", realIPs).
Str("remote_addr", req.RemoteAddr).
Str("request_url", req.URL.String()).
Msg("client sent multiple 'X-Real-IP' values, ignoring.")
}
} }
if visitor == "" { if visitor == "" {
if fwdIPs := req.Header.Values("X-Forwarded-For"); len(fwdIPs) > 0 { if fwdIPs := req.Header.Values(HeaderXForwardedFor); len(fwdIPs) > 0 {
visitor = fwdIPs[0] // right-most IP is the visitor
visitor = fwdIPs[len(fwdIPs)-1]
} }
} }
if visitor == "" { if visitor == "" {
@ -385,13 +393,13 @@ func (p *ReverseProxy) handler(rw http.ResponseWriter, req *http.Request) {
// If we aren't the first proxy retain prior // If we aren't the first proxy retain prior
// X-Forwarded-For information as a comma+space // X-Forwarded-For information as a comma+space
// separated list and fold multiple headers into one. // separated list and fold multiple headers into one.
prior, ok := outreq.Header["X-Forwarded-For"] prior, ok := outreq.Header[HeaderXForwardedFor]
omit := ok && prior == nil // Issue 38079: nil now means don't populate the header omit := ok && prior == nil // Issue 38079: nil now means don't populate the header
if len(prior) > 0 { if len(prior) > 0 {
clientIP = strings.Join(prior, ", ") + ", " + clientIP clientIP = strings.Join(prior, ", ") + ", " + clientIP
} }
if !omit { if !omit {
outreq.Header.Set("X-Forwarded-For", clientIP) outreq.Header.Set(HeaderXForwardedFor, clientIP)
} }
} }