Merge pull request #583 from NethServer/dev6856

Add hostname, IPv4, and IPv6 format validation for TCP backend endpoint configuration NethServer/dev#6856
NethServer · Feb 26, 2024 · 078fb9a · 078fb9a
2 parents a52971a + 2c092af
commit 078fb9a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/core/imageroot/var/lib/nethserver/cluster/actions/add-external-domain/validate-input.json b/core/imageroot/var/lib/nethserver/cluster/actions/add-external-domain/validate-input.json
@@ -70,7 +70,15 @@
             "description": "Initial TCP backend endpoint configuration",
             "properties": {
                 "host": {
-                    "type": "string"
+                    "type": "string",
+                    "oneOf": [
+                        {
+                            "format": "hostname",
+                        },
+                        {
+                            "format": "ipv6"
+                        }
+                    ]
                 },
                 "port": {
                     "type": "integer",

diff --git a/core/ui/public/i18n/en/translation.json b/core/ui/public/i18n/en/translation.json
@@ -1046,7 +1046,8 @@
         "users_admin_page_title": "User portal",
         "open_users_admin_portal": "Open user portal",
         "users_admin_page_tooltips": "User portal permits domain users to change their own password. The portal is accessible to users also on any node running the domain provider replica. The generic URL is https://{node_fqdn_or_ip}/users-admin/{domain}/",
-        "users_admin_page_description": "User administration self service portal"
+        "users_admin_page_description": "User administration self service portal",
+        "host_format": "Must be a valid domain name or IP address",
     },
     "samba": {
         "adminuser": "Samba admin username",