From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <m.carrara@proxmox.com>
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 AE5EB8256
for <pve-devel@lists.proxmox.com>; Thu, 2 Mar 2023 16:44:20 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 7536A620F
for <pve-devel@lists.proxmox.com>; Thu, 2 Mar 2023 16:44:20 +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) server-digest SHA256)
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS
for <pve-devel@lists.proxmox.com>; Thu, 2 Mar 2023 16:44:18 +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 3DD944581D
for <pve-devel@lists.proxmox.com>; Thu, 2 Mar 2023 16:44:18 +0100 (CET)
Message-ID: <83cf2c2b-260f-66ca-94f4-b75024e1321c@proxmox.com>
Date: Thu, 2 Mar 2023 16:44:16 +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: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
=?UTF-8?Q?Fabian_Gr=c3=bcnbichler?= <f.gruenbichler@proxmox.com>
References: <20230228163634.299137-1-m.carrara@proxmox.com>
<20230228163634.299137-3-m.carrara@proxmox.com>
<1677665918.8biiyl17j5.astroid@yuna.none>
From: Max Carrara <m.carrara@proxmox.com>
In-Reply-To: <1677665918.8biiyl17j5.astroid@yuna.none>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.327 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
KAM_ASCII_DIVIDERS 0.8 Email that uses ascii formatting dividers and possible
spam tricks
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. [certificate.pm, proxmox.com]
Subject: Re: [pve-devel] [PATCH common 2/2] certificate: fix formatting and
whitespace
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Thu, 02 Mar 2023 15:44:20 -0000
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
>
>