From 2c51d80036ba07218d21f931e5f7aaed1539c958 Mon Sep 17 00:00:00 2001 From: Stephane de Labrusse Date: Thu, 22 Feb 2024 09:30:13 +0100 Subject: [PATCH 1/6] Change format to hostname for mail domain in validator-definitions.json --- imageroot/validator-definitions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/imageroot/validator-definitions.json b/imageroot/validator-definitions.json index 316e49d4..140d1d43 100644 --- a/imageroot/validator-definitions.json +++ b/imageroot/validator-definitions.json @@ -124,7 +124,7 @@ "domain": { "title": "Mail domain", "description": "The standard-compliant domain name", - "format": "idn-hostname", + "format": "hostname", "pattern": "\\." }, "addusers": { From 5837950906ad6fe37364d13b3e894a07b21e362c Mon Sep 17 00:00:00 2001 From: Stephane de Labrusse Date: Thu, 22 Feb 2024 09:31:17 +0100 Subject: [PATCH 2/6] Update hostname format in validator-definitions.json --- imageroot/validator-definitions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/imageroot/validator-definitions.json b/imageroot/validator-definitions.json index 140d1d43..ce4926cb 100644 --- a/imageroot/validator-definitions.json +++ b/imageroot/validator-definitions.json @@ -303,7 +303,7 @@ "domain": { "type": "string", "title": "Address domain part", - "format": "idn-hostname", + "format": "hostname", "pattern": "\\." }, "local": { From 003168fd421132972adc4e2f7c5ec41ca4849c56 Mon Sep 17 00:00:00 2001 From: Stephane de Labrusse Date: Thu, 22 Feb 2024 09:31:35 +0100 Subject: [PATCH 3/6] Update hostname format in validate-input.json --- imageroot/actions/configure-module/validate-input.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/imageroot/actions/configure-module/validate-input.json b/imageroot/actions/configure-module/validate-input.json index ac5a988b..b9601a06 100644 --- a/imageroot/actions/configure-module/validate-input.json +++ b/imageroot/actions/configure-module/validate-input.json @@ -27,7 +27,7 @@ "title": "Initial mail domain", "description": "Create the first mail domain with default values. Ignored if the module was already configured.", "minLength": 1, - "format": "idn-hostname", + "format": "hostname", "pattern": "\\." }, "hostname": { @@ -35,7 +35,8 @@ "title": "Mail host name", "description": "Host name used as SMTP/HELO and for the TLS certificate", "minLength": 1, - "format": "idn-hostname" + "format": "hostname", + "pattern": "\\." } } } From 0a8ea08532433f84e81df85a9f6fcbd954721835 Mon Sep 17 00:00:00 2001 From: Stephane de Labrusse Date: Thu, 22 Feb 2024 09:31:43 +0100 Subject: [PATCH 4/6] Update translation.json with hostname validation messages --- ui/public/i18n/en/translation.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ui/public/i18n/en/translation.json b/ui/public/i18n/en/translation.json index 92cb322f..4ee1fed7 100644 --- a/ui/public/i18n/en/translation.json +++ b/ui/public/i18n/en/translation.json @@ -118,7 +118,10 @@ "no_domain_configured": "No user domain configured", "no_domain_configured_description": "Please configure a user domain first", "go_to_domains_and_users": "Go to Domains and users", - "mail_domain_pattern": "Invalid domain" + "hostname_pattern": "Must be a valid fully qualified domain name", + "hostname_format": "Must be a valid fully qualified domain name", + "mail_domain_pattern": "Must be a valid fully qualified domain name", + "mail_domain_format": "Must be a valid fully qualified domain name" }, "domains": { "title": "Domains", From fe1dd8a50f8e803e96ad91c174072825f00d08ff Mon Sep 17 00:00:00 2001 From: Stephane de Labrusse Date: Thu, 22 Feb 2024 10:26:44 +0100 Subject: [PATCH 5/6] Update translation.json file with mail domain validation --- ui/public/i18n/en/translation.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ui/public/i18n/en/translation.json b/ui/public/i18n/en/translation.json index 4ee1fed7..3f8f3acf 100644 --- a/ui/public/i18n/en/translation.json +++ b/ui/public/i18n/en/translation.json @@ -141,7 +141,6 @@ "delete_domain": "Delete domain", "delete_domain_confirm": "Delete domain {name}?", "delete_domain_explanation": "All associated email addresses will be deleted as well. However, all email messages received and sent by this domain will be preserved.", - "domain_pattern": "Invalid domain", "required_if_accept_unknown_recipients": "Required if \"Accept unknown recipients\" is enabled", "required_if_copy_inbound_messages": "Required if \"Copy inbound messages\" is enabled", "bccaddr_format": "Invalid email format", @@ -155,7 +154,10 @@ "configure_dkim_for_domain": "Configure DKIM for {domain}", "dkim_txt_record_description": "Create the TXT record required by DKIM at your {domain} DNS service provider by choosing one of the following procedures", "dkim_txt_record_key_procedure": "Set default._domainkey as record key and paste the record data", - "dkim_txt_record_raw_procedure": "Paste the full TXT record in raw form" + "dkim_txt_record_raw_procedure": "Paste the full TXT record in raw form", + "domain_pattern": "Must be a valid fully qualified domain name", + "domain_format": "Must be a valid fully qualified domain name", + "mail_domain_already_exists": "Domain already exists" }, "addresses": { "title": "Addresses", From 1f53e5ec3677b44bba53deab04604c4337aa3271 Mon Sep 17 00:00:00 2001 From: Stephane de Labrusse Date: Thu, 22 Feb 2024 10:47:07 +0100 Subject: [PATCH 6/6] Add new error messages for domain and catchall mailbox not found --- ui/public/i18n/en/translation.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ui/public/i18n/en/translation.json b/ui/public/i18n/en/translation.json index 3f8f3acf..fe40a0f1 100644 --- a/ui/public/i18n/en/translation.json +++ b/ui/public/i18n/en/translation.json @@ -157,7 +157,9 @@ "dkim_txt_record_raw_procedure": "Paste the full TXT record in raw form", "domain_pattern": "Must be a valid fully qualified domain name", "domain_format": "Must be a valid fully qualified domain name", - "mail_domain_already_exists": "Domain already exists" + "mail_domain_already_exists": "Domain already exists", + "catchall_mailbox_not_found": "Catchall mailbox not found", + "domain_not_found": "Domain not found" }, "addresses": { "title": "Addresses",