Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Merge branch 'master' into fix-ip-header-ordering

Mike Cao2826daad1ab2
diff --cc src/lib/constants.ts
index 9c9ecd96c,18fc652b7..6192f3423
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@@ -333,20 -333,19 +333,22 @@@ export const BROWSERS =
yandexbrowser: 'Yandex',
};
+// The order here is important and influences how IPs are detected by lib/detect.ts
+// Please do not change the order unless you know exactly what you're doing - read https://developers.cloudflare.com/fundamentals/reference/http-headers/
export const IP_ADDRESS_HEADERS = [
- 'cf-connecting-ip',
+ 'x-client-ip',
+ 'x-forwarded-for',
+ 'cf-connecting-ip', // This should be *after* x-forwarded-for, so that x-forwarded-for is respected if present
'do-connecting-ip',
'fastly-client-ip',
- 'forwarded',
'true-client-ip',
- 'x-appengine-user-ip',
- 'x-client-ip',
+ 'x-real-ip',
'x-cluster-client-ip',
'x-forwarded',
- 'x-forwarded-for',
+ 'forwarded',
+ 'x-appengine-user-ip',
+ 'x-nf-client-connection-ip',
+ 'x-real-ip',
];
export const SOCIAL_DOMAINS = [