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)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 8D09B80FD for ; Thu, 2 Mar 2023 11:42:06 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6D1382A6C for ; Thu, 2 Mar 2023 11:42:06 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 2 Mar 2023 11:42:05 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 50F3146375 for ; Thu, 2 Mar 2023 11:42:05 +0100 (CET) Message-ID: Date: Thu, 2 Mar 2023 11:42:03 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Content-Language: en-US To: Matthias Heiserer , Proxmox VE development discussion References: <20230228163634.299137-1-m.carrara@proxmox.com> <20230228163634.299137-5-m.carrara@proxmox.com> <6647f746-8547-8165-3dbc-58e3c6ac6add@proxmox.com> From: Max Carrara In-Reply-To: <6647f746-8547-8165-3dbc-58e3c6ac6add@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.053 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.09 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [certificates.pm, mozilla.org, sencha.com] Subject: Re: [pve-devel] [PATCH manager 2/2] ui: cert upload: fix private key field sending empty string 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: Thu, 02 Mar 2023 10:42:06 -0000 On 3/1/23 10:35, Matthias Heiserer wrote: > On 28.02.2023 17:36, Max Carrara wrote: >> The private key's field is now excluded from the upload form's >> JSON data if it's considered empty by Ext.js. >> >> Prior to this change, the form still sent an empty string if no >> private key was provided by the user, even though the private key's >> field is marked as optional in `pve-manager/PVE/API2/Certificates.pm`, >> causing the JSONSchema validation to fail. >> >> Signed-off-by: Max Carrara >> --- >>   www/manager6/node/Certificates.js | 7 +++++++ >>   1 file changed, 7 insertions(+) >> >> diff --git a/www/manager6/node/Certificates.js >> b/www/manager6/node/Certificates.js >> index 34013b44..4c0b18d1 100644 >> --- a/www/manager6/node/Certificates.js >> +++ b/www/manager6/node/Certificates.js >> @@ -173,6 +173,13 @@ Ext.define('PVE.node.CertUpload', { >>           emptyText: gettext('No change'), >>           name: 'key', >>           xtype: 'textarea', >> +        getSubmitValue: function() { >> +        let value = this.getValue(); >> +        if (Ext.isEmpty(value)) { >> +            return null; >> +        } >> +        return value; > I guess you could save space and write "return this.getValue() || null;" > The SubmitValue is a string anyways, so behaviour for Ext.isEmpty and > || should be the same > (https://docs.sencha.com/extjs/7.0.0/classic/Ext.html#method-isEmpty > and > https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Logical_OR) Good point! Will include that in v2. >> +        }, >>       }, >>       { >>           xtype: 'filebutton', >