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 DF24587B89 for ; Tue, 4 Jan 2022 12:48:34 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DB6221BC1D for ; Tue, 4 Jan 2022 12:48:34 +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 3ABD11BBF9 for ; Tue, 4 Jan 2022 12:48:33 +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 0D6EC44762 for ; Tue, 4 Jan 2022 12:48:33 +0100 (CET) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Tue, 4 Jan 2022 12:48:24 +0100 Message-Id: <20220104114826.20739-2-h.laimer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220104114826.20739-1-h.laimer@proxmox.com> References: <20220104114826.20739-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.055 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. [node.rs] Subject: [pbs-devel] [PATCH proxmox-backup v2 1/3] config: add cipher-suites to NodeConfig X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Jan 2022 11:48:34 -0000 for TLS 1.3 and for TLS <= 1.2 Signed-off-by: Hannes Laimer --- src/config/node.rs | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/config/node.rs b/src/config/node.rs index 4f2ab029..6a6038e6 100644 --- a/src/config/node.rs +++ b/src/config/node.rs @@ -1,5 +1,6 @@ use std::collections::HashSet; +use openssl::ssl::{SslAcceptor, SslMethod}; use anyhow::{bail, Error}; use serde::{Deserialize, Serialize}; @@ -91,6 +92,14 @@ pub struct AcmeConfig { schema: EMAIL_SCHEMA, optional: true, }, + "cipher-suites-tls3": { + optional: true, + type: String, + }, + "cipher-suites-tls2": { + optional: true, + type: String, + }, }, )] #[derive(Deserialize, Serialize, Updater)] @@ -121,6 +130,14 @@ pub struct NodeConfig { #[serde(skip_serializing_if = "Option::is_none")] pub email_from: Option, + + /// List of SSL ciphers for tls 1.3 that will be used by the proxy. (Proxy has to be restarted for changes to take effect) + #[serde(skip_serializing_if = "Option::is_none")] + pub cipher_suites_tls3: Option, + + /// List of SSL ciphers for tls <= 1.2 that will be used by the proxy. (Proxy has to be restarted for changes to take effect) + #[serde(skip_serializing_if = "Option::is_none")] + pub cipher_suites_tls2: Option, } impl NodeConfig { @@ -172,6 +189,13 @@ impl NodeConfig { bail!("duplicate domain '{}' in ACME config", domain.domain); } } + let mut dummy_acceptor = SslAcceptor::mozilla_intermediate_v5(SslMethod::tls()).unwrap(); + if let Some(cipher_suites) = self.cipher_suites_tls3.as_deref() { + dummy_acceptor.set_ciphersuites(cipher_suites)?; + } + if let Some(cipher_suites) = self.cipher_suites_tls2.as_deref() { + dummy_acceptor.set_cipher_list(cipher_suites)?; + } Ok(()) } -- 2.30.2