Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

added support for 'x-client-ip-address' header

Blue Mousee43067d65ace
diff --git a/apps/production/src/analytics/analytics.controller.ts b/apps/production/src/analytics/analytics.controller.ts
index e3d9ee57b..311304c4b 100644
--- a/apps/production/src/analytics/analytics.controller.ts
+++ b/apps/production/src/analytics/analytics.controller.ts
@@ -874,7 +874,7 @@ export class AnalyticsController {
): Promise<any> {
const { 'user-agent': userAgent, origin } = headers
- const ip = getIPFromHeaders(headers) || reqIP || ''
+ const ip = getIPFromHeaders(headers, true) || reqIP || ''
await this.analyticsService.validate(eventsDTO, origin, 'custom', ip)
@@ -946,7 +946,7 @@ export class AnalyticsController {
): Promise<any> {
const { 'user-agent': userAgent } = headers
const { pid } = logDTO
- const ip = getIPFromHeaders(headers) || reqIP || ''
+ const ip = getIPFromHeaders(headers, true) || reqIP || ''
const sessionID = await this.analyticsService.getSessionHash(
pid,
@@ -975,7 +975,7 @@ export class AnalyticsController {
): Promise<any> {
const { 'user-agent': userAgent, origin } = headers
- const ip = getIPFromHeaders(headers) || reqIP || ''
+ const ip = getIPFromHeaders(headers, true) || reqIP || ''
await this.analyticsService.validate(logDTO, origin, 'log', ip)
diff --git a/apps/production/src/common/utils.ts b/apps/production/src/common/utils.ts
index e0fc70b73..5d80df001 100644
--- a/apps/production/src/common/utils.ts
+++ b/apps/production/src/common/utils.ts
@@ -209,7 +209,11 @@ const getGeoDetails = (ip: string, tz?: string): IPGeoDetails => {
}
}
-const getIPFromHeaders = (headers: any) => {
+const getIPFromHeaders = (headers: any, tryXClientIPAddress?: boolean) => {
+ if (tryXClientIPAddress && headers['x-client-ip-address']) {
+ return headers['x-client-ip-address']
+ }
+
if (isProxiedByCloudflare && headers['cf-connecting-ip']) {
return headers['cf-connecting-ip']
}