fix: strip port from client ip

fingerprintjs · Jun 17, 2024 · 0ccf5a2 · 0ccf5a2
1 parent 4e0db7b
commit 0ccf5a2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/proxy/utils/headers.test.ts b/proxy/utils/headers.test.ts
@@ -27,8 +27,8 @@ const mockReq = {
     'strict-transport-security': 'max-age=600',
     '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-for': '127.0.0.1:12345',
+    'x-azure-clientip': '127.0.0.1:12345',
     'x-forwarded-host': 'fpjs.sh',
   },
   user: null,
@@ -163,23 +163,23 @@ describe('prepareHeadersForIngressAPI', () => {
   it('should set client ip and proxy secret', () => {
     const result = prepareHeadersForIngressAPI(mockReq, 'secret')
 
-    expect(result['fpjs-proxy-client-ip']).toBe(mockReq.headers['x-forwarded-for'])
+    expect(result['fpjs-proxy-client-ip']).toBe('127.0.0.1')
     expect(result['fpjs-proxy-secret']).toBe('secret')
     expect(result['fpjs-proxy-forwarded-host']).toBe('fpjs.sh')
   })
 
   it('should set correct host', () => {
     const result = prepareHeadersForIngressAPI(mockReq, 'secret')
 
-    expect(result['fpjs-proxy-client-ip']).toBe(mockReq.headers['x-forwarded-for'])
+    expect(result['fpjs-proxy-client-ip']).toBe('127.0.0.1')
     expect(result['fpjs-proxy-secret']).toBe('secret')
     expect(result['fpjs-proxy-forwarded-host']).toBe('fpjs.sh')
   })
 
   it('should not set secret if it is undefined', () => {
     const result = prepareHeadersForIngressAPI(mockReq, undefined)
 
-    expect(result['fpjs-proxy-client-ip']).toBe(mockReq.headers['x-azure-clientip'])
+    expect(result['fpjs-proxy-client-ip']).toBe('127.0.0.1')
     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,13 +70,22 @@ export function updateResponseHeaders(
 }
 
 function resolveClientIp(request: HttpRequest, logger?: Logger) {
-  const clientIp = request.headers['x-azure-clientip'] || request.headers['x-client-ip'] || request.headers['x-real-ip']
+  const clientIp =
+    request.headers['x-azure-clientip'] || request.headers['x-client-ip'] || request.headers['x-real-ip'] || ''
 
   logger?.verbose('Client IP resolved', {
     clientIp,
   })
 
-  return clientIp
+  return stripPort(clientIp)
+}
+
+function stripPort(ip: string) {
+  if (!ip.includes(':')) {
+    return ip
+  }
+
+  return ip.split(':')[0]
 }
 
 export function getHost(request: Pick<HttpRequest, 'headers' | 'url'>) {