hi,
please use 'eslint' to check new javascript code, it
would have caught some things ;)
(though most things were just moved...)
comments inline
On 11/25/20 9:16 AM, Wolfgang Bumiller wrote:
Signed-off-by: Wolfgang Bumiller <w.bumil...@proxmox.com>
---
patch generated with --histogram diff algorithm
www/manager6/Toolkit.js | 47 ++++++++++++++++++++++++++++-------------
www/manager6/lxc/DNS.js | 2 +-
2 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/www/manager6/Toolkit.js b/www/manager6/Toolkit.js
index 55b127c5..ee48e2ef 100644
--- a/www/manager6/Toolkit.js
+++ b/www/manager6/Toolkit.js
@@ -2,6 +2,36 @@
Proxmox.Utils.toolkit = 'extjs';
+function pve_verify_ip64_address_list(v, with_suffix) {
please do not define global functions, put them in PVE.Utils instead
+ var list = v.split(/[\ \,\;]+/);
i know it's copied, but the escaping is not necessary
+ var i;
+ for (i = 0; i < list.length; i++) {
+ if (list[i] == '') {
same here, please use === instead of ==
+ continue;
+ }
+
+ let addr = list[i];
+ if (with_suffix) {
+ let parts = addr.split('%');
+ addr = parts[0];
+
+ if (parts.length < 1 || parts.length > 2) {
nit, split cannot return an empty array, it always returns at least one
element (the original string)
+ return false;
+ }
+
+ if (parts.length > 1 && !addr.startsWith('fe80:')) {
+ return false;
+ }
+ }
+
+ if (!Proxmox.Utils.IP64_match.test(addr)) {
+ return false;
+ }
+ }
+
+ return true;
+}
+
// custom PVE specific VTypes
Ext.apply(Ext.form.field.VTypes, {
@@ -9,21 +39,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_verify_ip64_address_list(v, false),
+ IP64AddressWithSuffixList: v => pve_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/lxc/DNS.js b/www/manager6/lxc/DNS.js
index a15db5a9..b1e03920 100644
--- a/www/manager6/lxc/DNS.js
+++ b/www/manager6/lxc/DNS.js
@@ -41,7 +41,7 @@ Ext.define('PVE.lxc.DNSInputPanel', {
{
xtype: 'proxmoxtextfield',
fieldLabel: gettext('DNS servers'),
- vtype: 'IP64AddressList',
+ vtype: 'IP64AddressWithSuffixList',
allowBlank: true,
emptyText: gettext('use host settings'),
name: 'nameserver',
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
