From b3b656e05fb37feb2ef9f55abce18189cded6fdb Mon Sep 17 00:00:00 2001 From: MaskDuck Date: Sun, 8 Sep 2024 12:52:42 +0700 Subject: [PATCH 1/5] ci: fix CNAME validations for ACME records --- utils/validations.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/validations.js b/utils/validations.js index 51f242b8b..fd56366c9 100644 --- a/utils/validations.js +++ b/utils/validations.js @@ -17,7 +17,7 @@ const isValidURL = and([R.is(String), testRegex(/^https?:\/\//gi)]); const isValidDomain = and([ R.is(String), - testRegex(/^(([a-z0-9-]+)\.)+[a-z]+$/gi), + testRegex(/^(([a-z0-9-_]+)\.)+[a-z]+$/gi), ]); const validateCnameRecord = (type) => From 85e66b668682f99855d1b9d7f3ad6b563e5fa611 Mon Sep 17 00:00:00 2001 From: MaskDuck Date: Sun, 8 Sep 2024 12:58:15 +0700 Subject: [PATCH 2/5] Update validations.js --- utils/validations.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/validations.js b/utils/validations.js index fd56366c9..6bcc1f3f7 100644 --- a/utils/validations.js +++ b/utils/validations.js @@ -17,7 +17,7 @@ const isValidURL = and([R.is(String), testRegex(/^https?:\/\//gi)]); const isValidDomain = and([ R.is(String), - testRegex(/^(([a-z0-9-_]+)\.)+[a-z]+$/gi), + testRegex(/^(([a-z0-9-_]+)\.)+(([a-z0-9-]+)\.)+[a-z]+$/gi), ]); const validateCnameRecord = (type) => From 3ae599694ff754f77e0e03c7b078aa0dad7a8865 Mon Sep 17 00:00:00 2001 From: MaskDuck Date: Sun, 8 Sep 2024 13:04:38 +0700 Subject: [PATCH 3/5] Update validations.js --- utils/validations.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/validations.js b/utils/validations.js index 6bcc1f3f7..207981e73 100644 --- a/utils/validations.js +++ b/utils/validations.js @@ -17,7 +17,7 @@ const isValidURL = and([R.is(String), testRegex(/^https?:\/\//gi)]); const isValidDomain = and([ R.is(String), - testRegex(/^(([a-z0-9-_]+)\.)+(([a-z0-9-]+)\.)+[a-z]+$/gi), + testRegex(/^(([a-z0-9-_]+)\.)*(([a-z0-9-]+)\.)+[a-z]+$/gi), ]); const validateCnameRecord = (type) => From d07b34dfdf8e02b9e8fc4174664c94336226c817 Mon Sep 17 00:00:00 2001 From: MaskDuck Date: Sun, 8 Sep 2024 13:07:54 +0700 Subject: [PATCH 4/5] Update validations.js --- utils/validations.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/validations.js b/utils/validations.js index 207981e73..29f6d8e72 100644 --- a/utils/validations.js +++ b/utils/validations.js @@ -17,7 +17,7 @@ const isValidURL = and([R.is(String), testRegex(/^https?:\/\//gi)]); const isValidDomain = and([ R.is(String), - testRegex(/^(([a-z0-9-_]+)\.)*(([a-z0-9-]+)\.)+[a-z]+$/gi), + testRegex(/^((?:[a-z0-9-]+|_acme)\.)*(([a-z0-9-]+)\.)+[a-z]+$/gi), ]); const validateCnameRecord = (type) => From 4db19fce2e521822e3d14c2933f457cf7f1b52f4 Mon Sep 17 00:00:00 2001 From: MaskDuck Date: Sun, 8 Sep 2024 13:28:16 +0700 Subject: [PATCH 5/5] Update validations.js --- utils/validations.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/validations.js b/utils/validations.js index 29f6d8e72..207981e73 100644 --- a/utils/validations.js +++ b/utils/validations.js @@ -17,7 +17,7 @@ const isValidURL = and([R.is(String), testRegex(/^https?:\/\//gi)]); const isValidDomain = and([ R.is(String), - testRegex(/^((?:[a-z0-9-]+|_acme)\.)*(([a-z0-9-]+)\.)+[a-z]+$/gi), + testRegex(/^(([a-z0-9-_]+)\.)*(([a-z0-9-]+)\.)+[a-z]+$/gi), ]); const validateCnameRecord = (type) =>