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 076628526D for ; Fri, 17 Dec 2021 13:58:14 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EF6252B24A for ; Fri, 17 Dec 2021 13:57:43 +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 id 732C92B23F for ; Fri, 17 Dec 2021 13:57:43 +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 4AEAC45386 for ; Fri, 17 Dec 2021 13:57:43 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Fri, 17 Dec 2021 13:57:27 +0100 Message-Id: <20211217125733.548305-2-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211217125733.548305-1-f.gruenbichler@proxmox.com> References: <20211217125733.548305-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.245 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 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. [utils.pm, anyevent.pm] Subject: [pve-devel] [PATCH http-server 1/3] fix #3790: allow setting TLS 1.3 cipher suites 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: Fri, 17 Dec 2021 12:58:14 -0000 like the TLS <= 1.2 cipher list, but needs a different option since the format and values are incompatible. AnyEvent doesn't yet handle this directly like the cipher list, so set it directly on the context. requires corresponding patch in pve-manager (which reads the config, and passes relevant parts back to the API server). Signed-off-by: Fabian Grünbichler --- src/PVE/APIServer/AnyEvent.pm | 4 ++++ src/PVE/APIServer/Utils.pm | 3 +++ 2 files changed, 7 insertions(+) diff --git a/src/PVE/APIServer/AnyEvent.pm b/src/PVE/APIServer/AnyEvent.pm index f0305b3..e31cf7d 100644 --- a/src/PVE/APIServer/AnyEvent.pm +++ b/src/PVE/APIServer/AnyEvent.pm @@ -1885,6 +1885,9 @@ sub new { honor_cipher_order => 1, }; + # workaround until anyevent supports TLS 1.3 ciphersuites directly + my $ciphersuites = delete $self->{ssl}->{ciphersuites}; + foreach my $k (keys %$ssl_defaults) { $self->{ssl}->{$k} //= $ssl_defaults->{$k}; } @@ -1904,6 +1907,7 @@ sub new { $self->{tls_ctx} = AnyEvent::TLS->new(%{$self->{ssl}}); Net::SSLeay::CTX_set_options($self->{tls_ctx}->{ctx}, $tls_ctx_flags); + Net::SSLeay::CTX_set_ciphersuites($self->{tls_ctx}->{ctx}, $ciphersuites) if defined($ciphersuites); } if ($self->{spiceproxy}) { diff --git a/src/PVE/APIServer/Utils.pm b/src/PVE/APIServer/Utils.pm index 449d764..0124f44 100644 --- a/src/PVE/APIServer/Utils.pm +++ b/src/PVE/APIServer/Utils.pm @@ -19,6 +19,7 @@ sub read_proxy_config { $shcmd .= 'echo \"DENY_FROM:\$DENY_FROM\";'; $shcmd .= 'echo \"POLICY:\$POLICY\";'; $shcmd .= 'echo \"CIPHERS:\$CIPHERS\";'; + $shcmd .= 'echo \"CIPHERSUITES:\$CIPHERSUITES\";'; $shcmd .= 'echo \"DHPARAMS:\$DHPARAMS\";'; $shcmd .= 'echo \"HONOR_CIPHER_ORDER:\$HONOR_CIPHER_ORDER\";'; $shcmd .= 'echo \"COMPRESSION:\$COMPRESSION\";'; @@ -48,6 +49,8 @@ sub read_proxy_config { $res->{$key} = $value; } elsif ($key eq 'CIPHERS') { $res->{$key} = $value; + } elsif ($key eq 'CIPHERSUITES') { + $res->{$key} = $value; } elsif ($key eq 'DHPARAMS') { $res->{$key} = $value; } elsif ($key eq 'HONOR_CIPHER_ORDER' || $key eq 'COMPRESSION') { -- 2.30.2