From: Max Carrara <m.carrara@proxmox.com>
To: "Proxmox VE development discussion" <pve-devel@lists.proxmox.com>,
"Fabian Grünbichler" <f.gruenbichler@proxmox.com>
Subject: Re: [pve-devel] [PATCH common 2/2] certificate: fix formatting and whitespace
Date: Thu, 2 Mar 2023 16:44:16 +0100 [thread overview]
Message-ID: <83cf2c2b-260f-66ca-94f4-b75024e1321c@proxmox.com> (raw)
In-Reply-To: <1677665918.8biiyl17j5.astroid@yuna.none>
On 3/1/23 11:27, Fabian Grünbichler wrote:
> On February 28, 2023 5:36 pm, Max Carrara wrote:
>> Signed-off-by: Max Carrara <m.carrara@proxmox.com>
>> ---
>> src/PVE/Certificate.pm | 23 ++++++++++++-----------
>> 1 file changed, 12 insertions(+), 11 deletions(-)
>>
>> diff --git a/src/PVE/Certificate.pm b/src/PVE/Certificate.pm
>> index 5ec1c6b..31def4c 100644
>> --- a/src/PVE/Certificate.pm
>> +++ b/src/PVE/Certificate.pm
>> @@ -385,19 +385,19 @@ sub generate_csr {
>> $ssl_die->("Failed to allocate X509_NAME object\n") if !$name;
>> my $add_name_entry = sub {
>> my ($k, $v) = @_;
>> - if (!Net::SSLeay::X509_NAME_add_entry_by_txt($name,
>> - $k,
>> - &Net::SSLeay::MBSTRING_UTF8,
>> - encode('utf-8', $v))) {
>> + if (!Net::SSLeay::X509_NAME_add_entry_by_txt(
>> + $name, $k, &Net::SSLeay::MBSTRING_UTF8, encode('utf-8', $v)
>
> not sure if I wouldn't prefer
>
> if (!Net::SSLeay::X509_NAME_add_entry_by_txt(
> $name,
> $k,
> &Net::SSLeay::MBSTRING_UTF8,
> encode('utf-8', $v),
> )) {
>
> here, it's kinda ugly in both variants to be honest ;)
>
> maybe
>
> my $res = Net::SSLeay::X509_NAME_add_entry_by_txt(
> $name,
> $k,
> &Net::SSLeay::MBSTRING_UTF8,
> encode('utf-8', $v),
> );
>
> $cleanup->(..) if !$res;
>
> would be nicer?
>
That does look much nicer -- including that in v2. Thanks!
>> + )
>> + ) {
>> $cleanup->(1, "Failed to add '$k'='$v' to DN\n");
>> }
>> };
>>
>> $add_name_entry->('CN', $common_name);
>> for (qw(C ST L O OU)) {
>> - if (defined(my $v = $attr{$_})) {
>> + if (defined(my $v = $attr{$_})) {
>> $add_name_entry->($_, $v);
>> - }
>> + }
>> }
>>
>> if (defined($pem_key)) {
>> @@ -431,11 +431,12 @@ sub generate_csr {
>> if (!Net::SSLeay::X509_REQ_set_subject_name($req, $name));
>>
>> $cleanup->(1, "Failed to add extensions to CSR\n")
>> - if !Net::SSLeay::P_X509_REQ_add_extensions($req,
>> - &Net::SSLeay::NID_key_usage => 'digitalSignature,keyEncipherment',
>> - &Net::SSLeay::NID_basic_constraints => 'CA:FALSE',
>> - &Net::SSLeay::NID_ext_key_usage => 'serverAuth,clientAuth',
>> - &Net::SSLeay::NID_subject_alt_name => join(',', map { "DNS:$_" } @$san),
>> + if !Net::SSLeay::P_X509_REQ_add_extensions(
>> + $req,
>> + &Net::SSLeay::NID_key_usage => 'digitalSignature,keyEncipherment',
>> + &Net::SSLeay::NID_basic_constraints => 'CA:FALSE',
>> + &Net::SSLeay::NID_ext_key_usage => 'serverAuth,clientAuth',
>> + &Net::SSLeay::NID_subject_alt_name => join(',', map { "DNS:$_" } @$san),
>> );
>
> this one is actually against our style guide in both old and new, it should use
> a regular if with proper wrapping, not a post-if, like the first hunk of this
> patch :)
>
> https://pve.proxmox.com/wiki/Perl_Style_Guide#Breaking_long_lines_and_strings
Mea culpa; missed that.
>
> could also use the 'store result in variable' style if it helps with readability.
>
Either way feels a bit "clumsy" to be honest.
Maybe let it short-circuit on success? Something like this:
Net::SSLeay::P_X509_REQ_add_extensions(
$req,
&Net::SSLeay::NID_key_usage => 'digitalSignature,keyEncipherment',
&Net::SSLeay::NID_basic_constraints => 'CA:FALSE',
&Net::SSLeay::NID_ext_key_usage => 'serverAuth,clientAuth',
&Net::SSLeay::NID_subject_alt_name => join(',', map { "DNS:$_" } @$san),
) or $cleanup->(1, "Failed to add extensions to CSR\n");
>>
>> $cleanup->(1, "Failed to set public key\n")
>> --
>> 2.30.2
>>
>>
>>
>> _______________________________________________
>> pve-devel mailing list
>> pve-devel@lists.proxmox.com
>> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>>
>>
>>
>
>
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>
>
next prev parent reply other threads:[~2023-03-02 15:44 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 [this message]
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
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=83cf2c2b-260f-66ca-94f4-b75024e1321c@proxmox.com \
--to=m.carrara@proxmox.com \
--cc=f.gruenbichler@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