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!

fix hostname detection

Blue Mouse2e5ade8aec1d
diff --git a/backend/apps/cloud/src/analytics/analytics.controller.ts b/backend/apps/cloud/src/analytics/analytics.controller.ts
index 2c27d6fe2..f824bd515 100644
--- a/backend/apps/cloud/src/analytics/analytics.controller.ts
+++ b/backend/apps/cloud/src/analytics/analytics.controller.ts
@@ -1166,7 +1166,7 @@ export class AnalyticsController {
const transformed = errorEventTransformer(
this.analyticsService.getErrorID(errorDTO),
errorDTO.pid,
- headers.host,
+ this.analyticsService.getHostFromOrigin(headers.origin),
errorDTO.pg,
dv,
br,
@@ -1276,7 +1276,7 @@ export class AnalyticsController {
const transformed = customEventTransformer(
psid,
eventsDTO.pid,
- headers.host,
+ this.analyticsService.getHostFromOrigin(headers.origin),
eventsDTO.ev,
eventsDTO.pg,
dv,
@@ -1384,7 +1384,7 @@ export class AnalyticsController {
const transformed = trafficTransformer(
psid,
logDTO.pid,
- headers.host,
+ this.analyticsService.getHostFromOrigin(headers.origin),
logDTO.pg,
dv,
br,
@@ -1420,7 +1420,7 @@ export class AnalyticsController {
perfTransformed = performanceTransformer(
logDTO.pid,
- headers.host,
+ this.analyticsService.getHostFromOrigin(headers.origin),
logDTO.pg,
dv,
br,
@@ -1518,7 +1518,7 @@ export class AnalyticsController {
const transformed = trafficTransformer(
psid,
logDTO.pid,
- headers.host,
+ this.analyticsService.getHostFromOrigin(headers.origin),
null,
dv,
br,
diff --git a/backend/apps/cloud/src/analytics/analytics.service.ts b/backend/apps/cloud/src/analytics/analytics.service.ts
index bc96af96f..3bac6f31f 100644
--- a/backend/apps/cloud/src/analytics/analytics.service.ts
+++ b/backend/apps/cloud/src/analytics/analytics.service.ts
@@ -412,6 +412,15 @@ export class AnalyticsService {
}
}
+ getHostFromOrigin(origin: string): string | null {
+ try {
+ const { hostname } = new URL(origin)
+ return hostname || null
+ } catch (error) {
+ return null
+ }
+ }
+
checkIpBlacklist(project: Project, ip: string): void {
// For some reasons the project.ipBlacklist sometimes may look like [''], let's filter it out
// TODO: Properly validate the ipBlacklist on project update
diff --git a/backend/apps/community/src/analytics/analytics.controller.ts b/backend/apps/community/src/analytics/analytics.controller.ts
index abe91f37f..b1544a32b 100644
--- a/backend/apps/community/src/analytics/analytics.controller.ts
+++ b/backend/apps/community/src/analytics/analytics.controller.ts
@@ -945,7 +945,7 @@ export class AnalyticsController {
const transformed = customEventTransformer(
psid,
eventsDTO.pid,
- headers.host,
+ this.analyticsService.getHostFromOrigin(headers.origin),
eventsDTO.ev,
eventsDTO.pg,
dv,
@@ -1053,7 +1053,7 @@ export class AnalyticsController {
const transformed = trafficTransformer(
psid,
logDTO.pid,
- headers.host,
+ this.analyticsService.getHostFromOrigin(headers.origin),
logDTO.pg,
dv,
br,
@@ -1089,7 +1089,7 @@ export class AnalyticsController {
perfTransformed = performanceTransformer(
logDTO.pid,
- headers.host,
+ this.analyticsService.getHostFromOrigin(headers.origin),
logDTO.pg,
dv,
br,
@@ -1187,7 +1187,7 @@ export class AnalyticsController {
const transformed = trafficTransformer(
psid,
logDTO.pid,
- headers.host,
+ this.analyticsService.getHostFromOrigin(headers.origin),
null,
dv,
br,
@@ -1480,7 +1480,7 @@ export class AnalyticsController {
const transformed = errorEventTransformer(
this.analyticsService.getErrorID(errorDTO),
errorDTO.pid,
- headers.host,
+ this.analyticsService.getHostFromOrigin(headers.origin),
errorDTO.pg,
dv,
br,
diff --git a/backend/apps/community/src/analytics/analytics.service.ts b/backend/apps/community/src/analytics/analytics.service.ts
index 23250fb0f..4b0b36697 100644
--- a/backend/apps/community/src/analytics/analytics.service.ts
+++ b/backend/apps/community/src/analytics/analytics.service.ts
@@ -364,6 +364,15 @@ export class AnalyticsService {
}
}
+ getHostFromOrigin(origin: string): string | null {
+ try {
+ const { hostname } = new URL(origin)
+ return hostname || null
+ } catch (error) {
+ return null
+ }
+ }
+
checkIpBlacklist(project: Project, ip: string): void {
// For some reasons the project.ipBlacklist sometimes may look like [''], let's filter it out
// TODO: Properly validate the ipBlacklist on project update