🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Update domain validation regex for improved accuracy
Bill Yang4b77be550966
diff --git a/client/src/lib/utils.ts b/client/src/lib/utils.tsindex d1450195d..4771f91f7 100644--- a/client/src/lib/utils.ts+++ b/client/src/lib/utils.ts@@ -116,7 +116,7 @@ export function normalizeDomain(domain: string): string {* - Requires the TLD to be alphabetical (e.g. .com)*/export function isValidDomain(domain: string): boolean {- const domainRegex = /^(?:https?:\/\/)?(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}$/;+ const domainRegex = /^(?:https?:\/\/)?(?:[\p{L}\p{N}](?:[\p{L}\p{N}-]{0,61}[\p{L}\p{N}])?\.)+\p{L}{2,}$/u;return domainRegex.test(domain);}diff --git a/server/src/api/sites/addSite.ts b/server/src/api/sites/addSite.tsindex eb3fb255f..0e1b49d1c 100644--- a/server/src/api/sites/addSite.ts+++ b/server/src/api/sites/addSite.ts@@ -22,7 +22,7 @@ export async function addSite(const { domain, name, public: isPublic, saltUserIds, blockBots } = request.body;// Validate domain format using regex- const domainRegex = /^(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}$/;+ const domainRegex = /^(?:[\p{L}\p{N}](?:[\p{L}\p{N}-]{0,61}[\p{L}\p{N}])?\.)+\p{L}{2,}$/u;if (!domainRegex.test(domain)) {return reply.status(400).send({error: "Invalid domain format. Must be a valid domain like example.com or sub.example.com",