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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 10CE869C6F for ; Wed, 28 Jul 2021 14:11:52 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EEEFF24B29 for ; Wed, 28 Jul 2021 14:11:21 +0200 (CEST) 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 id 6DAB824B1F for ; Wed, 28 Jul 2021 14:11:21 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 3E18A42A43 for ; Wed, 28 Jul 2021 14:11:21 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Wed, 28 Jul 2021 14:11:20 +0200 Message-Id: <20210728121120.263471-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.496 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. [influxdb.pm] Subject: [pve-devel] [PATCH manager v2] Status/InfluxDB: add 'verify-certificate' option to disable ssl verification 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: Wed, 28 Jul 2021 12:11:52 -0000 Signed-off-by: Dominik Csapak --- changes from v1: * rename to 'verify-certificate' * factor out the options setting i left the 'verify_hostname' => 0 in there, because it would not work with it enabled for self-signed certificates, even with the correct SAN/CN PVE/Status/InfluxDB.pm | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/PVE/Status/InfluxDB.pm b/PVE/Status/InfluxDB.pm index fcb28800..ba434569 100644 --- a/PVE/Status/InfluxDB.pm +++ b/PVE/Status/InfluxDB.pm @@ -55,7 +55,13 @@ sub properties { type => 'integer', minimum => 1, default => 25_000_000, - } + }, + 'verify-certificate' => { + description => "Set to 0 to disable certificate verification for https endpoints.", + type => 'boolean', + optional => 1, + default => 1, + }, }; } sub options { @@ -71,9 +77,24 @@ sub options { timeout => { optional => 1}, 'max-body-size' => { optional => 1 }, 'api-path-prefix' => { optional => 1 }, + 'verify-certificate' => { optional => 1 }, }; } +my $set_ssl_opts = sub { + my ($cfg, $ua) = @_; + + my $cert_verify = $cfg->{'verify-certificate'} // 1; + if (!$cert_verify) { + $ua->ssl_opts( + verify_hostname => 0, + SSL_verify_mode => IO::Socket::SSL::SSL_VERIFY_NONE, + ); + } + + return; +}; + # Plugin implementation sub update_node_status { my ($class, $txn, $node, $data, $ctime) = @_; @@ -145,6 +166,7 @@ sub send { return $class->SUPER::send($connection, $data, $cfg); } elsif ($proto =~ m/^https?$/) { my $ua = LWP::UserAgent->new(); + $set_ssl_opts->($cfg, $ua); $ua->timeout($cfg->{timeout} // 1); $connection->content($data); my $response = $ua->request($connection); @@ -228,6 +250,7 @@ sub test_connection { } elsif ($proto =~ m/^https?$/) { my $url = _get_v2url($cfg, "health"); my $ua = LWP::UserAgent->new(); + $set_ssl_opts->($cfg, $ua); $ua->timeout($cfg->{timeout} // 1); # in the initial add connection test, the token may still be in $cfg my $token = $cfg->{token} // get_credentials($id, 1); -- 2.30.2