feat: special case CloudFlare client IP addrs (#148)

mccutchen · Oct 6, 2023 · e3c4f8d · e3c4f8d
1 parent 8cd8f9c
commit e3c4f8d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/httpbin/helpers.go b/httpbin/helpers.go
@@ -49,6 +49,9 @@ func getClientIP(r *http.Request) string {
 	if clientIP := r.Header.Get("Fly-Client-IP"); clientIP != "" {
 		return clientIP
 	}
+	if clientIP := r.Header.Get("CF-Connecting-IP"); clientIP != "" {
+		return clientIP
+	}
 
 	// Try to pull a reasonable value from the X-Forwarded-For header, if
 	// present, by taking the first entry in a comma-separated list of IPs.

diff --git a/httpbin/helpers_test.go b/httpbin/helpers_test.go
@@ -235,6 +235,16 @@ func TestGetClientIP(t *testing.T) {
 			},
 			want: "9.9.9.9",
 		},
+		"custom cloudflare header take precedence": {
+			given: &http.Request{
+				Header: makeHeaders(map[string]string{
+					"CF-Connecting-IP": "9.9.9.9",
+					"X-Forwarded-For":  "1.1.1.1,2.2.2.2,3.3.3.3",
+				}),
+				RemoteAddr: "0.0.0.0",
+			},
+			want: "9.9.9.9",
+		},
 		"x-forwarded-for is parsed": {
 			given: &http.Request{
 				Header: makeHeaders(map[string]string{