Merge pull request #33 from delta10/fix/parse-x-forwarded-for

fix: correctly parse X-Forwarded-For when there are multiple IPs
delta10 · Feb 20, 2024 · c024395 · c024395
2 parents 436d046 + 179ecff
commit c024395
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/internal/utils/utils.go b/internal/utils/utils.go
@@ -85,12 +85,14 @@ func EnvSubst(input string) string {
 }
 
 func ReadUserIP(r *http.Request) string {
-	IPAddress := r.Header.Get("X-Forwarded-For")
-	if IPAddress == "" {
-		host, _, _ := net.SplitHostPort(r.RemoteAddr)
-		IPAddress = host
+	forwardedFor := r.Header.Get("X-Forwarded-For")
+	if forwardedFor != "" {
+		ips := strings.Split(forwardedFor, ",")
+		return strings.TrimSpace(ips[0])
 	}
-	return IPAddress
+
+	host, _, _ := net.SplitHostPort(r.RemoteAddr)
+	return host
 }
 
 func StringInSlice(a string, list []string) bool {