fix: use x-azure-clientip first for resolving client ip

fingerprintjs · Jun 13, 2024 · 869c9f7 · 869c9f7
1 parent 341094f
commit 869c9f7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 16 deletions.
diff --git a/proxy/utils/headers.test.ts b/proxy/utils/headers.test.ts
@@ -28,6 +28,7 @@ const mockReq = {
     'x-azure-requestchain': 'hops=1',
     'x-azure-socketip': '46.204.4.119',
     'x-forwarded-for': '127.0.0.1',
+    'x-azure-clientip': '127.0.0.1',
     'x-forwarded-host': 'fpjs.sh',
   },
   user: null,
@@ -178,7 +179,7 @@ describe('prepareHeadersForIngressAPI', () => {
   it('should not set secret if it is undefined', () => {
     const result = prepareHeadersForIngressAPI(mockReq, undefined)
 
-    expect(result['fpjs-proxy-client-ip']).toBe(mockReq.headers['x-forwarded-for'])
+    expect(result['fpjs-proxy-client-ip']).toBe(mockReq.headers['x-azure-clientip'])
     expect(result['fpjs-proxy-secret']).toBe(undefined)
     expect(result['fpjs-proxy-forwarded-host']).toBe(undefined)
   })

diff --git a/proxy/utils/headers.ts b/proxy/utils/headers.ts
@@ -70,22 +70,9 @@ export function updateResponseHeaders(
 }
 
 function resolveClientIp(request: HttpRequest, logger?: Logger) {
-  const forwardedFor = request.headers['x-forwarded-for']
+  const clientIp = request.headers['x-azure-clientip'] || request.headers['x-client-ip'] || request.headers['x-real-ip']
 
-  if (forwardedFor) {
-    const [clientIp] = forwardedFor.split(',')
-
-    logger?.verbose('Client IP resolved from x-forwarded-for', {
-      clientIp,
-      forwardedFor,
-    })
-
-    return clientIp
-  }
-
-  const clientIp = request.headers['x-client-ip'] || request.headers['x-real-ip']
-
-  logger?.verbose('Client IP resolved from x-client-ip or x-real-ip', {
+  logger?.verbose('Client IP resolved', {
     clientIp,
   })
 

diff --git a/shared/test/azure.ts b/shared/test/azure.ts
@@ -39,6 +39,8 @@ export const mockRequestGet = (url: string, uri: string, query: HttpRequestQuery
       'x-azure-requestchain': 'hops=1',
       'x-azure-socketip': '46.204.4.119',
       'x-forwarded-for': '127.0.0.1',
+      'x-client-ip': '128.0.0.1',
+      'x-azure-clientip': '127.0.0.1',
     },
     query,
     params: {
@@ -66,6 +68,8 @@ export const mockRequestPost = (url: string, uri: string) => {
       'x-azure-requestchain': 'hops=1',
       'x-azure-socketip': '46.204.4.119',
       'x-forwarded-for': '127.0.0.1',
+      'x-client-ip': '128.0.0.1',
+      'x-azure-clientip': '127.0.0.1',
     },
     query: {},
     params: {