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 C82F161B0D for ; Thu, 3 Dec 2020 12:44:12 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C553228DE0 for ; Thu, 3 Dec 2020 12:43:42 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 24F8828DC4 for ; Thu, 3 Dec 2020 12:43:41 +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 E723744C66 for ; Thu, 3 Dec 2020 12:43:40 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 3 Dec 2020 12:43:38 +0100 Message-Id: <20201203114340.23733-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201203114340.23733-1-d.csapak@proxmox.com> References: <20201203114340.23733-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.297 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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. [pbsclient.pm] Subject: [pve-devel] [PATCH common 1/1] PBSClient: add get_repository to generate repository urls from configs 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: Thu, 03 Dec 2020 11:44:12 -0000 we can use this everywhere we need to have a repository url Signed-off-by: Dominik Csapak --- src/PVE/PBSClient.pm | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/src/PVE/PBSClient.pm b/src/PVE/PBSClient.pm index 44e3176..f05471c 100644 --- a/src/PVE/PBSClient.pm +++ b/src/PVE/PBSClient.pm @@ -10,7 +10,35 @@ use JSON; use POSIX qw(strftime ENOENT); use PVE::JSONSchema qw(get_standard_option); -use PVE::Tools qw(run_command file_set_contents file_get_contents file_read_firstline); +use PVE::Tools qw(run_command file_set_contents file_get_contents file_read_firstline $IPV6RE); + +# returns a repository string suitable for proxmox-backup-client, pbs-restore, etc. +# $scfg must have the following structure: +# { +# datastore +# server +# port (optional defaults to 8007) +# username (optional defaults to 'root@pam') +# } +sub get_repository { + my ($scfg) = @_; + + my $server = $scfg->{server}; + die "no server given\n" if !defined($server); + + $server = "[$server]" if $server =~ /^$IPV6RE$/; + + if (my $port = $scfg->{port}) { + $server .= ":$port" if $port != 8007; + } + + my $datastore = $scfg->{datastore}; + die "no datastore given\n" if !defined($datastore); + + my $username = $scfg->{username} // 'root@pam'; + + return "$username\@$server:$datastore"; +} sub new { my ($class, $scfg, $storeid, $sdir) = @_; @@ -116,9 +144,7 @@ my sub do_raw_client_cmd { if ! -x $client_exe; my $scfg = $self->{scfg}; - my $server = $scfg->{server}; - my $datastore = $scfg->{datastore}; - my $username = $scfg->{username} // 'root@pam'; + my $repo = get_repository($scfg); my $userns_cmd = delete $opts{userns_cmd}; @@ -144,7 +170,7 @@ my sub do_raw_client_cmd { push @$cmd, @$param if defined($param); - push @$cmd, "--repository", "$username\@$server:$datastore"; + push @$cmd, "--repository", $repo; local $ENV{PBS_PASSWORD} = $self->get_password(); -- 2.20.1