From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 746D278E65 for ; Fri, 1 Jul 2022 02:10:09 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6A1E53A55 for ; Fri, 1 Jul 2022 02:10:09 +0200 (CEST) Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 1 Jul 2022 02:10:05 +0200 (CEST) Received: by mail-pj1-x1035.google.com with SMTP id l2so1036882pjf.1 for ; Thu, 30 Jun 2022 17:10:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bowdernet.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ats5EMZjsoPLK27KjFHNEiWZpsz7aVOdmIZkmUwt3Yo=; b=NIbp9+tItFVMOZWL9kZ0Ho4PTGcs22MO0SVNYkGhlf+OZqHwqH6YNeoTVAaL6gcFc5 IKESlvhHk3Lj/Yuv3uK5q780OULcBqV5p/xkbRbIs6yzqnaJbYPM/OsA6upPNEIbp6oP MxxVaqBiudnNsfetL/o3rIzuNFMpPi1LAo9mPw1TaLwtaYj+iKl84WIY7DOHNxczb1Wp JRWRTlnr7EHepEn/NHdggJVGOjrDEhYHwvhgjWA8dpg3FlWW1aWd9KSZqFGFtib8j+a2 c7t+AfVwOFLOaUcibEme6GXHmVDwPZ45Kfb14hswRv3qZsXFQmSPyzhdm5/Tg4wlGBGq 1Smg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ats5EMZjsoPLK27KjFHNEiWZpsz7aVOdmIZkmUwt3Yo=; b=2Zd07ov7c+8GDk72vrAUSA00w8ZCzmp0X4LPtHh+PhRYP1wjmFsuGaFpuBjgwBh2hl h0Ttz9v9U5weqvxsnqU+pY7c16kAEHnbd8iCGaSty2nLsYTrs/dcmgZO0ebs3HaPkrn9 ZUqnAAXsyVQim3KewaCX5hD5CxMtLMzTClwPCuphkBp5J+sY7nz1D1k20OiUGJUNYrEp sCYEJ55fv7uL0kvmxzr0xbbz6U4ga+4N3SyOxohUNp/4LWRLMubA1D46g9hyMysWpP5y I9SiM7oRHKLMTxTckodKRj+XDmH07S3hXsHZZKuzz4NFH5685Gfq4FszL9RXkpVKSoQB J81g== X-Gm-Message-State: AJIora8ozGl3vwelNrhMHFKTEwZZIJhsq4kRtUiOj4WFZ7iV9wMjV2zw P0QaovXDmlbiR9FV7OEyL4AUubl9rlB2krvE X-Google-Smtp-Source: AGRyM1tXsvpSTMwf4AYUMctFqC6iDZcsVE+EXJgBXCBJsdZFcoyAQVJ998/W5zGbH2C4vvzm4kad+w== X-Received: by 2002:a17:902:c405:b0:16a:25ae:78b5 with SMTP id k5-20020a170902c40500b0016a25ae78b5mr18283012plk.110.1656634197243; Thu, 30 Jun 2022 17:09:57 -0700 (PDT) Received: from localhost.localdomain (c-24-19-168-226.hsd1.wa.comcast.net. [24.19.168.226]) by smtp.gmail.com with ESMTPSA id g6-20020a631106000000b004114aad90ebsm7296066pgl.49.2022.06.30.17.09.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jun 2022 17:09:56 -0700 (PDT) From: Daniel Bowder To: pve-devel@lists.proxmox.com Cc: Daniel Bowder Date: Thu, 30 Jun 2022 17:09:47 -0700 Message-Id: <20220701000948.148496-4-daniel@bowdernet.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220701000948.148496-1-daniel@bowdernet.com> References: <20220701000948.148496-1-daniel@bowdernet.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.031 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DKIM_SIGNED 0.1 Message has a DKIM or DK signature, not necessarily valid DKIM_VALID -0.1 Message has at least one valid DKIM or DK signature DKIM_VALID_AU -0.1 Message has a valid DKIM or DK signature from author's domain DKIM_VALID_EF -0.1 Message has a valid DKIM or DK signature from envelope-from domain RCVD_IN_DNSWL_NONE -0.0001 Sender listed at https://www.dnswl.org/, no trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v2 proxmox-widget-toolkit 3/4] fix #3593: add CpuSet type to js X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Jul 2022 00:10:09 -0000 Regex parses a cpuset via 2 matches. Find number(s) or range(s) folowed by a comma, then, find a single number or a single range not followed by a comma. E.g., 0-1,4-5,6,7,10,11,14-15 CpuSet function first checks regex, then ensures left num <= right num Signed-off-by: Daniel Bowder --- src/Toolkit.js | 20 ++++++++++++++++++++ src/Utils.js | 2 ++ 2 files changed, 22 insertions(+) diff --git a/src/Toolkit.js b/src/Toolkit.js index a1d291e..ebdc545 100644 --- a/src/Toolkit.js +++ b/src/Toolkit.js @@ -121,6 +121,26 @@ Ext.apply(Ext.form.field.VTypes, { }, HttpProxyText: gettext('Example') + ": http://username:password@host:port/", + CpuSet: function(v) { + if (!Proxmox.Utils.CpuSet_match.test(v)) { + return false; + } + let groups = v.split(","); + for (let i = 0; i < groups.length; i++) { + if (!groups[i].includes("-")) { + continue; + } + let values = groups[i].split("-"); + let left = parseInt(values[0], 10); + let right = parseInt(values[1], 10); + if (left > right) { + return false; + } + } + return true; + }, + CpuSetText: gettext('This is not a valid CpuSet'), + DnsName: function(v) { return Proxmox.Utils.DnsName_match.test(v); }, diff --git a/src/Utils.js b/src/Utils.js index 6a03057..87afbea 100644 --- a/src/Utils.js +++ b/src/Utils.js @@ -1315,6 +1315,8 @@ utilities: { me.DnsName_match = new RegExp("^" + DnsName_REGEXP + "$"); me.DnsName_or_Wildcard_match = new RegExp("^(?:\\*\\.)?" + DnsName_REGEXP + "$"); + me.CpuSet_match = /^(?:(?:[0-9]+,)|(?:[0-9]+-[0-9]+,))*(?:(?:[0-9]+)$|(?:[0-9]+-[0-9]+)$)/; + me.HostPort_match = new RegExp("^(" + IPV4_REGEXP + "|" + DnsName_REGEXP + ")(?::(\\d+))?$"); me.HostPortBrackets_match = new RegExp("^\\[(" + IPV6_REGEXP + "|" + IPV4_REGEXP + "|" + DnsName_REGEXP + ")\\](?::(\\d+))?$"); me.IP6_dotnotation_match = new RegExp("^(" + IPV6_REGEXP + ")(?:\\.(\\d+))?$"); -- 2.36.1