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 DFAFD9E37B for ; Mon, 27 Nov 2023 12:40:20 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C605E6702 for ; Mon, 27 Nov 2023 12:40: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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 27 Nov 2023 12:40:20 +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 D63B744C0B for ; Mon, 27 Nov 2023 12:40:19 +0100 (CET) From: Philipp Hufnagl To: pve-devel@lists.proxmox.com Date: Mon, 27 Nov 2023 12:39:58 +0100 Message-Id: <20231127114001.189590-2-p.hufnagl@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127114001.189590-1-p.hufnagl@proxmox.com> References: <20231127114001.189590-1-p.hufnagl@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.050 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [pbsplugin.pm] Subject: [pve-devel] [PATCH storage v4 1/4] pbs: Move pbs_api_connect earlyer in the code 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: Mon, 27 Nov 2023 11:40:20 -0000 Because it is needed later in this patch series, the method pbs_api_connect is moved earlyer in the code Signed-off-by: Philipp Hufnagl --- src/PVE/Storage/PBSPlugin.pm | 63 ++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/src/PVE/Storage/PBSPlugin.pm b/src/PVE/Storage/PBSPlugin.pm index 4320974..96373a4 100644 --- a/src/PVE/Storage/PBSPlugin.pm +++ b/src/PVE/Storage/PBSPlugin.pm @@ -112,6 +112,38 @@ sub pbs_get_password { return PVE::Tools::file_read_firstline($pwfile); } +# +# TODO: use a client with native rust/proxmox-backup bindings to profit from +# API schema checks and types +my sub pbs_api_connect { + my ($scfg, $password, $timeout) = @_; + + my $params = {}; + + my $user = $scfg->{username} // 'root@pam'; + + if (my $tokenid = PVE::AccessControl::pve_verify_tokenid($user, 1)) { + $params->{apitoken} = "PBSAPIToken=${tokenid}:${password}"; + } else { + $params->{password} = $password; + $params->{username} = $user; + } + + if (my $fp = $scfg->{fingerprint}) { + $params->{cached_fingerprints}->{uc($fp)} = 1; + } + + my $conn = PVE::APIClient::LWP->new( + %$params, + host => $scfg->{server}, + port => $scfg->{port} // 8007, + timeout => ($timeout // 7), # cope with a 401 (3s api delay) and high latency + cookie_name => 'PBSAuthCookie', + ); + + return $conn; +} + sub pbs_encryption_key_file_name { my ($scfg, $storeid) = @_; @@ -691,37 +723,6 @@ my sub snapshot_files_encrypted { return $any && $all; } -# TODO: use a client with native rust/proxmox-backup bindings to profit from -# API schema checks and types -my sub pbs_api_connect { - my ($scfg, $password, $timeout) = @_; - - my $params = {}; - - my $user = $scfg->{username} // 'root@pam'; - - if (my $tokenid = PVE::AccessControl::pve_verify_tokenid($user, 1)) { - $params->{apitoken} = "PBSAPIToken=${tokenid}:${password}"; - } else { - $params->{password} = $password; - $params->{username} = $user; - } - - if (my $fp = $scfg->{fingerprint}) { - $params->{cached_fingerprints}->{uc($fp)} = 1; - } - - my $conn = PVE::APIClient::LWP->new( - %$params, - host => $scfg->{server}, - port => $scfg->{port} // 8007, - timeout => ($timeout // 7), # cope with a 401 (3s api delay) and high latency - cookie_name => 'PBSAuthCookie', - ); - - return $conn; -} - sub list_volumes { my ($class, $storeid, $scfg, $vmid, $content_types) = @_; -- 2.39.2