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 DD6E8852E7 for ; Fri, 17 Dec 2021 13:57:48 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CE6B22B258 for ; Fri, 17 Dec 2021 13:57:48 +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 C72D32B24B for ; Fri, 17 Dec 2021 13:57:47 +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 9F78D45386 for ; Fri, 17 Dec 2021 13:57:47 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Fri, 17 Dec 2021 13:57:28 +0100 Message-Id: <20211217125733.548305-3-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.244 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] Subject: [pve-devel] [PATCH http-server 2/3] fix #3745: allow overriding TLS key location 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:57:48 -0000 when using a custom pveproxy certificate. actual handling is done in pve-manager. Signed-off-by: Fabian Grünbichler --- src/PVE/APIServer/Utils.pm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/PVE/APIServer/Utils.pm b/src/PVE/APIServer/Utils.pm index 0124f44..2ec2dad 100644 --- a/src/PVE/APIServer/Utils.pm +++ b/src/PVE/APIServer/Utils.pm @@ -21,6 +21,7 @@ sub read_proxy_config { $shcmd .= 'echo \"CIPHERS:\$CIPHERS\";'; $shcmd .= 'echo \"CIPHERSUITES:\$CIPHERSUITES\";'; $shcmd .= 'echo \"DHPARAMS:\$DHPARAMS\";'; + $shcmd .= 'echo \"TLS_KEY_FILE:\$TLS_KEY_FILE\";'; $shcmd .= 'echo \"HONOR_CIPHER_ORDER:\$HONOR_CIPHER_ORDER\";'; $shcmd .= 'echo \"COMPRESSION:\$COMPRESSION\";'; @@ -53,6 +54,8 @@ sub read_proxy_config { $res->{$key} = $value; } elsif ($key eq 'DHPARAMS') { $res->{$key} = $value; + } elsif ($key eq 'TLS_KEY_FILE') { + $res->{$key} = $value; } elsif ($key eq 'HONOR_CIPHER_ORDER' || $key eq 'COMPRESSION') { die "unknown value '$value' - use 0 or 1\n" if $value !~ m/^(0|1)$/; $res->{$key} = $value; -- 2.30.2