From 97e973c48b3aff0ccd544c8ace47d59db6c6dfda Mon Sep 17 00:00:00 2001 From: Robin MacPherson Date: Thu, 12 Sep 2024 15:46:19 +0100 Subject: [PATCH 1/3] Add some logging --- packages/web/resolvers/utils/getPostingIpAddress.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/web/resolvers/utils/getPostingIpAddress.ts b/packages/web/resolvers/utils/getPostingIpAddress.ts index 4acc5047..0163d2de 100644 --- a/packages/web/resolvers/utils/getPostingIpAddress.ts +++ b/packages/web/resolvers/utils/getPostingIpAddress.ts @@ -6,6 +6,9 @@ const isNextRequest = (req: NextRequest | Request): req is NextRequest => { } export const getPostingIpAddress = (req: NextRequest | Request) => { + console.log('headers', req?.headers) + console.log('ip', (req as any)?.ip) + if (isNextRequest(req)) return req.ip const headers = req?.headers['X-Forwarded-For'] From 06b25c8434268dc1d6a62377d2a0845c1a5011bf Mon Sep 17 00:00:00 2001 From: Robin MacPherson Date: Thu, 12 Sep 2024 16:08:53 +0100 Subject: [PATCH 2/3] Make the fix --- packages/web/resolvers/utils/getPostingIpAddress.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/web/resolvers/utils/getPostingIpAddress.ts b/packages/web/resolvers/utils/getPostingIpAddress.ts index 0163d2de..3b548d88 100644 --- a/packages/web/resolvers/utils/getPostingIpAddress.ts +++ b/packages/web/resolvers/utils/getPostingIpAddress.ts @@ -11,7 +11,11 @@ export const getPostingIpAddress = (req: NextRequest | Request) => { if (isNextRequest(req)) return req.ip - const headers = req?.headers['X-Forwarded-For'] + const headers = + req?.headers['x-forwarded-for'] || + req?.headers['x-real-ip'] || + req?.headers['X-Forwarded-For'] || + req?.headers['X-Real-IP'] if (typeof headers === 'string') return headers.split(',')?.[0] return undefined From 5fb8306377bf5ed8c0bcaee9138dde4bfccdfaee Mon Sep 17 00:00:00 2001 From: Robin MacPherson Date: Thu, 12 Sep 2024 16:18:42 +0100 Subject: [PATCH 3/3] Clean up logs --- packages/web/resolvers/utils/getPostingIpAddress.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/web/resolvers/utils/getPostingIpAddress.ts b/packages/web/resolvers/utils/getPostingIpAddress.ts index 3b548d88..dfa5237e 100644 --- a/packages/web/resolvers/utils/getPostingIpAddress.ts +++ b/packages/web/resolvers/utils/getPostingIpAddress.ts @@ -6,9 +6,6 @@ const isNextRequest = (req: NextRequest | Request): req is NextRequest => { } export const getPostingIpAddress = (req: NextRequest | Request) => { - console.log('headers', req?.headers) - console.log('ip', (req as any)?.ip) - if (isNextRequest(req)) return req.ip const headers =