From: Thomas Lamprecht <t.lamprecht@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Max Carrara <m.carrara@proxmox.com>
Subject: Re: [pve-devel] [PATCH v2 manager 2/2] ui: cert upload: fix private key field sending empty string
Date: Tue, 7 Mar 2023 19:33:34 +0100 [thread overview]
Message-ID: <d6ac5805-2029-73ea-f15f-5c2a10b426fc@proxmox.com> (raw)
In-Reply-To: <20230303175705.214121-5-m.carrara@proxmox.com>
Am 03/03/2023 um 18:57 schrieb Max Carrara:
> The private key's field is now excluded from the upload form's
> JSON data if it's considered empty by Ext.js.
nit: 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`,
nit: I'd avoid file system paths, they're an internal detail here, if use the
api path or just in "... optional in the upload cert API endpoint"
> causing the JSONSchema validation to fail.
>
> Signed-off-by: Max Carrara <m.carrara@proxmox.com>
> ---
> www/manager6/node/Certificates.js | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/www/manager6/node/Certificates.js b/www/manager6/node/Certificates.js
> index 34013b44..84fc12ff 100644
> --- a/www/manager6/node/Certificates.js
> +++ b/www/manager6/node/Certificates.js
> @@ -173,6 +173,9 @@ Ext.define('PVE.node.CertUpload', {
> emptyText: gettext('No change'),
> name: 'key',
> xtype: 'textarea',
> + getSubmitValue: function() {
> + return this.getValue() || null;
> + },
This works by luck, submitData is a boolean config for the textarea [0], and
getSubmitValue has nothing to do with the actual value, but just is the getter
for the submitValue bool, which the private actual getSubmitData fn checks [1]
[0]: https://docs.sencha.com/extjs/7.0.0/classic/Ext.form.field.TextArea.html#cfg-submitValue
[1]: https://docs.sencha.com/extjs/7.0.0/classic/src/Base.js-2.html#Ext.form.field.Base-method-getSubmitData
So if, then this would need to return boolean false not null to avoid being
confusing - but there's an alternative: wrap this in a inputpanel and use it's
onGetValues helper to filter this out, as that allows to also set the hard-coded
`force` and `reload` params directly, we could drop the hidden fields too, with
also dropping the now finally visible (but ugly) 'hr' autoEl we actually would
need fewer lines.
I.e., something like:
items: {
xtype: 'inputpanel',
onGetValues: function(values) {
values.restart = 1;
values.force = 1;
if (!values.key) {
delete values.key;
}
return values;
},
items: [
....
> },
> {
> xtype: 'filebutton',
next prev parent reply other threads:[~2023-03-07 18:33 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-03 17:57 [pve-devel] [PATCH-SERIES v2 common/manager] Fix SSL Certificate and Key Upload Issues Max Carrara
2023-03-03 17:57 ` [pve-devel] [PATCH v2 common 1/2] certificate: add subroutine that checks if cert and key match Max Carrara
2023-03-07 10:52 ` [pve-devel] applied: " Fabian Grünbichler
2023-03-07 17:47 ` Thomas Lamprecht
2023-03-03 17:57 ` [pve-devel] [PATCH v2 common 2/2] certificate: fix formatting and whitespace Max Carrara
2023-03-07 10:52 ` [pve-devel] applied: " Fabian Grünbichler
2023-03-03 17:57 ` [pve-devel] [PATCH v2 manager 1/2] fix #4552: certhelpers: check if custom cert and key match on change Max Carrara
2023-03-07 11:07 ` Fabian Grünbichler
2023-03-07 15:45 ` Max Carrara
2023-03-03 17:57 ` [pve-devel] [PATCH v2 manager 2/2] ui: cert upload: fix private key field sending empty string Max Carrara
2023-03-07 10:53 ` Fabian Grünbichler
2023-03-07 18:33 ` Thomas Lamprecht [this message]
2023-03-08 6:34 ` Thomas Lamprecht
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=d6ac5805-2029-73ea-f15f-5c2a10b426fc@proxmox.com \
--to=t.lamprecht@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