feat(ip): Detect Fly-Client-IP header when available (#751)

Closes #558 This detects IP via the `Fly-Client-IP` header if it is available. This follows the same pattern of other providers we support.
arcjet · May 13, 2024 · 73359f6 · 73359f6
1 parent 0ff6abc
commit 73359f6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/ip/index.ts b/ip/index.ts
@@ -637,6 +637,13 @@ function findIP(request: RequestLike, headers: Headers): string {
     return trueClientIP;
   }
 
+  // Fly.io
+  // Fly-Client-IP: https://fly.io/docs/networking/request-headers/#fly-client-ip
+  const flyClientIP = headers.get("fly-client-ip");
+  if (isGlobalIP(flyClientIP)) {
+    return flyClientIP;
+  }
+
   // Default nginx proxy/fcgi; alternative to x-forwarded-for, used by some proxies
   // X-Real-IP
   const xRealIP = headers.get("x-real-ip");

diff --git a/ip/test/ipv4.test.ts b/ip/test/ipv4.test.ts
@@ -206,6 +206,7 @@ describe("find public IPv4", () => {
   headerSuite("CF-Connecting-IP");
   headerSuite("DO-Connecting-IP");
   headerSuite("Fastly-Client-IP");
+  headerSuite("Fly-Client-IP");
   headerSuite("True-Client-IP");
   headerSuite("X-Real-IP");
   headerSuite("X-Cluster-Client-IP");

diff --git a/ip/test/ipv6.test.ts b/ip/test/ipv6.test.ts
@@ -169,6 +169,7 @@ describe("find public IPv4", () => {
   headerSuite("CF-Connecting-IP");
   headerSuite("DO-Connecting-IP");
   headerSuite("Fastly-Client-IP");
+  headerSuite("Fly-Client-IP");
   headerSuite("True-Client-IP");
   headerSuite("X-Real-IP");
   headerSuite("X-Cluster-Client-IP");