From: Matthias Heiserer <m.heiserer@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Max Carrara <m.carrara@proxmox.com>
Subject: Re: [pve-devel] [PATCH manager 2/2] ui: cert upload: fix private key field sending empty string
Date: Wed, 1 Mar 2023 10:35:40 +0100 [thread overview]
Message-ID: <6647f746-8547-8165-3dbc-58e3c6ac6add@proxmox.com> (raw)
In-Reply-To: <20230228163634.299137-5-m.carrara@proxmox.com>
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 <m.carrara@proxmox.com>
> ---
> 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)
> + },
> },
> {
> xtype: 'filebutton',
next prev parent reply other threads:[~2023-03-01 9:36 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-28 16:36 [pve-devel] [PATCH-SERIES common/manager] Fix SSL Certificate and Key Upload Issues Max Carrara
2023-02-28 16:36 ` [pve-devel] [PATCH common 1/2] certificate: add subroutine that checks if cert and key match Max Carrara
2023-03-01 10:17 ` Fabian Grünbichler
2023-03-02 13:14 ` Max Carrara
2023-02-28 16:36 ` [pve-devel] [PATCH common 2/2] certificate: fix formatting and whitespace Max Carrara
2023-03-01 10:27 ` Fabian Grünbichler
2023-03-02 15:44 ` Max Carrara
2023-02-28 16:36 ` [pve-devel] [PATCH manager 1/2] fix #4552: certhelpers: check if custom cert and key match on change Max Carrara
2023-02-28 16:36 ` [pve-devel] [PATCH manager 2/2] ui: cert upload: fix private key field sending empty string Max Carrara
2023-03-01 9:35 ` Matthias Heiserer [this message]
2023-03-02 10:42 ` Max Carrara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6647f746-8547-8165-3dbc-58e3c6ac6add@proxmox.com \
--to=m.heiserer@proxmox.com \
--cc=m.carrara@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox