fix: alter the regex in the isValidDomain function to accept hyphens (#…

…33606)
RocketChat · Oct 16, 2024 · f810929 · f810929
1 parent 8bbe581
commit f810929
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.changeset/modern-trees-draw.md b/.changeset/modern-trees-draw.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixed the regex for domains in the isValidDomain function
diff --git a/apps/meteor/app/lib/server/functions/checkUrlForSsrf.ts b/apps/meteor/app/lib/server/functions/checkUrlForSsrf.ts
@@ -57,7 +57,7 @@ export const isValidIPv4 = (ip: string): boolean => {
 };
 
 export const isValidDomain = (domain: string): boolean => {
-	const domainPattern = /^(?!-)(?!.*--)[A-Za-z0-9-]{1,63}(?<!-)\.?([A-Za-z]{2,63}\.?)*[A-Za-z]{2,63}$/;
+	const domainPattern = /^(?!-)(?!.*--)[A-Za-z0-9-]{1,63}(?<!-)\.?([A-Za-z0-9-]{2,63}\.?)*[A-Za-z]{2,63}$/;
 	if (!domainPattern.test(domain)) {
 		return false;
 	}