Re: [pve-devel] [PATCH v2 manager] ad #3140: allow interface suffix in dns entries

[Thomas Lamprecht <t.lamprecht@proxmox.com>]

On 25.11.20 09:54, Wolfgang Bumiller wrote:
> Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
> ---
> Changes to v1:
> * moved helper to PVE.Utils
> * lint fixups
> 
>  www/manager6/Toolkit.js | 17 ++---------------
>  www/manager6/Utils.js   | 30 ++++++++++++++++++++++++++++++
>  www/manager6/lxc/DNS.js |  2 +-
>  3 files changed, 33 insertions(+), 16 deletions(-)
> 
> diff --git a/www/manager6/Toolkit.js b/www/manager6/Toolkit.js
> index 55b127c5..0569d649 100644
> --- a/www/manager6/Toolkit.js
> +++ b/www/manager6/Toolkit.js
> @@ -9,21 +9,8 @@ Ext.apply(Ext.form.field.VTypes, {
>  	return (/^(now|\d{4}-\d{1,2}-\d{1,2}(T\d{1,2}:\d{1,2}:\d{1,2})?)$/).test(v);
>      },
>      QemuStartDateText: gettext('Format') + ': "now" or "2006-06-17T16:01:21" or "2006-06-17"',
> -    IP64AddressList: function(v) {
> -	var list = v.split(/[\ \,\;]+/);
> -	var i;
> -	for (i = 0; i < list.length; i++) {
> -	    if (list[i] == '') {
> -		continue;
> -	    }
> -
> -	    if (!Proxmox.Utils.IP64_match.test(list[i])) {
> -		return false;
> -	    }
> -	}
> -
> -	return true;
> -    },
> +    IP64AddressList: v => PVE.Utils.verify_ip64_address_list(v, false),
> +    IP64AddressWithSuffixList: v => PVE.Utils.verify_ip64_address_list(v, true),
>      IP64AddressListText: gettext('Example') + ': 192.168.1.1,192.168.1.2',
>      IP64AddressListMask: /[A-Fa-f0-9\,\:\.\;\ ]/
>  });
> diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
> index 6d2f7a04..9330c49a 100644
> --- a/www/manager6/Utils.js
> +++ b/www/manager6/Utils.js
> @@ -1612,6 +1612,36 @@ Ext.define('PVE.Utils', { utilities: {
>  	"Host": 4,
>  	"_default_": 5, // includes custom models
>      },
> +
> +    verify_ip64_address_list: function(value, with_suffix) {
> +	let list = value.split(/[ ,;]+/);
> +	let i;
> +	for (i = 0; i < list.length; i++) {

I know you mostly copied it but why not a slight cleanup?

for (let addr of value.split(/[ ,;]+/)) {
    ...
}

saves about four lines without loosing clarity, IMO


> +	    if (list[i] === '') {
> +		continue;
> +	    }
> +
> +	    let addr = list[i];
> +	    if (with_suffix) {
> +		let parts = addr.split('%');
> +		addr = parts[0];
> +
> +		if (parts.length > 2) {
> +		    return false;
> +		}
> +
> +		if (parts.length > 1 && !addr.startsWith('fe80:')) {
> +		    return false;
> +		}
> +	    }
> +
> +	    if (!Proxmox.Utils.IP64_match.test(addr)) {
> +		return false;
> +	    }
> +	}
> +
> +	return true;
> +    },
>  },
>  
>      singleton: true,