From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 408B21FF191 for ; Tue, 21 Oct 2025 12:03:21 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 15EFD1A62B; Tue, 21 Oct 2025 12:03:37 +0200 (CEST) From: Maximiliano Sandoval To: pve-devel@lists.proxmox.com Date: Tue, 21 Oct 2025 12:03:27 +0200 Message-ID: <20251021100332.251697-4-m.sandoval@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251021100332.251697-1-m.sandoval@proxmox.com> References: <20251021100332.251697-1-m.sandoval@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1761041006673 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.096 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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. [cluster.pm] Subject: [pve-devel] [PATCH cluster 3/3] cluster: add helper to retrieve proxies 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" This will take into account the multiple layers of fallbacks and has some rudimentary error handling. Signed-off-by: Maximiliano Sandoval --- src/PVE/Cluster.pm | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/src/PVE/Cluster.pm b/src/PVE/Cluster.pm index e829687..7e7f180 100644 --- a/src/PVE/Cluster.pm +++ b/src/PVE/Cluster.pm @@ -25,6 +25,7 @@ use PVE::Cluster::IPCConst; use base 'Exporter'; our @EXPORT_OK = qw( + get_proxy cfs_read_file cfs_write_file cfs_register_file @@ -904,4 +905,61 @@ sub cfs_backup_database { return $dbfile; } +=head3 get_proxy($scalar, $scalar, $scalar) + +Returns the proxy to be used for a given protocol and use-case. + +Parameters: + +=over + +=item C<$dccfg> + +The datacenter's configuration. + +=item C<$protocol> + +The protocol of the connection, can be one of C or C. + +=item C<$type> + +The use-case for the proxy. It can one of C, C, or C. + +=back + +=cut + +sub get_proxy { + my ($dccfg, $protocol, $type) = @_; + + if ($protocol ne 'http' && $protocol ne 'https') { + die "Unsupported protocol $protocol when obtaining a proxy\n"; + } + + my $proxy; + + # This could be simplified with some f-strings, but it is intentionally left + # out in a verbose form to accommodate for edge cases, like subscriptions + # which are exclusively handled with a HTTPS proxy. + if ($type eq 'subscription' && $protocol eq 'https') { + $proxy = $dccfg->{proxy}->{'https-subscription'}; + } elsif ($type eq 'download' && $protocol eq 'http') { + $proxy = $dccfg->{proxy}->{'http-download'}; + } elsif ($type eq 'download' && $protocol eq 'https') { + $proxy = $dccfg->{proxy}->{'https-download'}; + } elsif ($type eq 'apt' && $protocol eq 'http') { + $proxy = $dccfg->{proxy}->{'http-apt'}; + } elsif ($type eq 'apt' && $protocol eq 'https') { + $proxy = $dccfg->{proxy}->{'https-apt'}; + } else { + die "Unsupported type $type for protocol $protocol when obtaining a proxy\n"; + } + + $proxy //= $dccfg->{proxy}->{global}; + $proxy //= $dccfg->{http_proxy}; + $proxy = undef if $proxy eq 'none'; + + return $proxy; +} + 1; -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel