- client: remove wildcard from domain validation

AdguardTeam · Jan 25, 2021 · 0647ab4 · 0647ab4
1 parent b1aec04
commit 0647ab4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/client/src/helpers/constants.js b/client/src/helpers/constants.js
@@ -15,8 +15,6 @@ export const R_CIDR_IPV6 = /^s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([
 
 export const R_DOMAIN = /^[a-zA-Z0-9][a-zA-Z0-9-]{1,61}[a-zA-Z0-9]\.[a-zA-Z]{2,}$/;
 
-export const R_SERVER_NAME = /^(\*\.)?[a-zA-Z0-9][a-zA-Z0-9-]{1,61}[a-zA-Z0-9]\.[a-zA-Z]{2,}$/;
-
 export const R_PATH_LAST_PART = /\/[^/]*$/;
 
 // eslint-disable-next-line no-control-regex

diff --git a/client/src/helpers/validators.js b/client/src/helpers/validators.js
@@ -10,7 +10,7 @@ import {
     STANDARD_WEB_PORT,
     UNSAFE_PORTS,
     R_CLIENT_ID,
-    R_SERVER_NAME,
+    R_DOMAIN,
 } from './constants';
 import { getLastIpv4Octet, isValidAbsolutePath } from './form';
 
@@ -89,7 +89,7 @@ export const validateServerName = (value) => {
         return undefined;
     }
     const formattedValue = value ? value.trim() : value;
-    if (formattedValue && !R_SERVER_NAME.test(formattedValue)) {
+    if (formattedValue && !R_DOMAIN.test(formattedValue)) {
         return 'form_error_server_name';
     }
     return undefined;