albert/ipinfo
1
0
Fork 0
mirror of https://github.com/skidoodle/ipinfo.git synced 2025-02-15 08:29:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

chore: Refactor IP address retrieval logic in main.go

Browse source
This commit is contained in:
skidoodle 2024-06-13 12:34:13 +02:00
parent 7e607bf733
commit f4b529eb7f
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
main.go
View file

@ -187,14 +187,15 @@ func handler(w http.ResponseWriter, r *http.Request) {
IPAddress = requestedThings[1] IPAddress = requestedThings[1]
} }
if IPAddress == "" || IPAddress == "self" { if IPAddress == "" || IPAddress == "self" {
if realIP, ok := r.Header["X-Forwarded-For"]; ok && len(realIP) > 0 { if realIP := r.Header.Get("CF-Connecting-IP"); realIP != "" {
IPAddress = realIP[0] IPAddress = realIP
} else { } else if realIP := r.Header.Get("X-Forwarded-For"); realIP != "" {
IPAddress = extractIP(r.RemoteAddr) IPAddress = strings.Split(realIP, ",")[0]
} } else {
} IPAddress = extractIP(r.RemoteAddr)
}
}
ip := net.ParseIP(IPAddress) ip := net.ParseIP(IPAddress)
if ip == nil { if ip == nil {
w.Header().Set("Content-Type", "text/plain; charset=utf-8") w.Header().Set("Content-Type", "text/plain; charset=utf-8")