From 586e7f08bba81006187dba9a921e8f95fb03c1a4 Mon Sep 17 00:00:00 2001 From: pitwegner Date: Thu, 9 Mar 2023 12:28:37 +0100 Subject: [PATCH] replace dns validation regex Signed-off-by: pitwegner --- .../src/validation/CommonValidatorFunctions.test.ts | 1 + .../catalog-model/src/validation/CommonValidatorFunctions.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/catalog-model/src/validation/CommonValidatorFunctions.test.ts b/packages/catalog-model/src/validation/CommonValidatorFunctions.test.ts index a887a9aa2e..5dc3f80694 100644 --- a/packages/catalog-model/src/validation/CommonValidatorFunctions.test.ts +++ b/packages/catalog-model/src/validation/CommonValidatorFunctions.test.ts @@ -155,6 +155,7 @@ describe('CommonValidatorFunctions', () => { ['-a-b', false], ['a-b-', false], ['a--b', false], + ['xn--c6h', true], ['a_b', false], [`${'a'.repeat(63)}`, true], [`${'a'.repeat(64)}`, false], diff --git a/packages/catalog-model/src/validation/CommonValidatorFunctions.ts b/packages/catalog-model/src/validation/CommonValidatorFunctions.ts index 40a85c5331..4532dd9844 100644 --- a/packages/catalog-model/src/validation/CommonValidatorFunctions.ts +++ b/packages/catalog-model/src/validation/CommonValidatorFunctions.ts @@ -91,7 +91,7 @@ export class CommonValidatorFunctions { typeof value === 'string' && value.length >= 1 && value.length <= 63 && - /^[a-z0-9]+(\-[a-z0-9]+)*$/.test(value) + /^((?!\-))(xn\-\-)?[a-z0-9\-]+[a-z0-9]$/.test(value) ); }