acme: allow wildcards as domain

allow wildcard dns-names as defined in [0,1] (only the prefix '*.' in
front of a valid dns-name) as domain.

[0] https://tools.ietf.org/html/rfc8555#section-7.1.3
[1] https://community.letsencrypt.org/t/acme-v2-production-environment-wildcards/55578

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

diff --git a/src/Toolkit.js b/src/Toolkit.js
index a08af4ef9a7926ecca06b036e313d4bf9bddea3a..33b701596bc568ef045837a7b9eda1ab77ad7e79 100644 (file)
--- a/src/Toolkit.js
+++ b/src/Toolkit.js
@@ -126,6 +126,11 @@ Ext.apply(Ext.form.field.VTypes, {
     },
     DnsNameText: gettext('This is not a valid DNS name'),
 
+    DnsNameOrWildcard: function(v) {
+       return Proxmox.Utils.DnsName_or_Wildcard_match.test(v);
+    },
+    DnsNameOrWildcardText: gettext('This is not a valid DNS name'),
+
     // workaround for https://www.sencha.com/forum/showthread.php?302150
     proxmoxMail: function(v) {
         return (/^(\w+)([-+.][\w]+)*@(\w[-\w]*\.){1,5}([A-Za-z]){2,63}$/).test(v);

diff --git a/src/Utils.js b/src/Utils.js
index 19ce1f2bb1b1d0278754e786d276c9b93cd2aa6e..c52bef2abc9ed5e6229f90c8aec158173fd5766a 100644 (file)
--- a/src/Utils.js
+++ b/src/Utils.js
@@ -1213,6 +1213,7 @@ utilities: {
 
        let DnsName_REGEXP = "(?:(?:(?:[a-zA-Z0-9](?:[a-zA-Z0-9\\-]*[a-zA-Z0-9])?)\\.)*(?:[A-Za-z0-9](?:[A-Za-z0-9\\-]*[A-Za-z0-9])?))";
        me.DnsName_match = new RegExp("^" + DnsName_REGEXP + "$");
+       me.DnsName_or_Wildcard_match = new RegExp("^(?:\\*\\.)?" + DnsName_REGEXP + "$");
 
        me.HostPort_match = new RegExp("^(" + IPV4_REGEXP + "|" + DnsName_REGEXP + ")(?::(\\d+))?$");
        me.HostPortBrackets_match = new RegExp("^\\[(" + IPV6_REGEXP + "|" + IPV4_REGEXP + "|" + DnsName_REGEXP + ")\\](?::(\\d+))?$");

diff --git a/src/window/ACMEDomains.js b/src/window/ACMEDomains.js
index b040e33bcd8408e794ce2eb548a3d7d3ff0b3ffc..1fcc7849acaab0eda5d36f80f8503d94bb9297c8 100644 (file)
--- a/src/window/ACMEDomains.js
+++ b/src/window/ACMEDomains.js
@@ -153,7 +153,7 @@ Ext.define('Proxmox.window.ACMEDomainEdit', {
                    xtype: 'proxmoxtextfield',
                    name: 'domain',
                    allowBlank: false,
-                   vtype: 'DnsName',
+                   vtype: 'DnsNameOrWildcard',
                    value: '',
                    fieldLabel: gettext('Domain'),
                },