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 81768807D3 for ; Thu, 18 Nov 2021 11:15:58 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 78CCF190E5 for ; Thu, 18 Nov 2021 11:15:58 +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 0BC98190DA for ; Thu, 18 Nov 2021 11:15:58 +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 D419543D1F for ; Thu, 18 Nov 2021 11:15:57 +0100 (CET) Date: Thu, 18 Nov 2021 11:15:57 +0100 From: Wolfgang Bumiller To: Stoiko Ivanov Cc: pbs-devel@lists.proxmox.com Message-ID: <20211118101557.7it5cxsewzfobqtn@olga.proxmox.com> References: <20211109165422.311089-1-s.ivanov@proxmox.com> <20211109165422.311089-3-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211109165422.311089-3-s.ivanov@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.465 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 Subject: [pbs-devel] applied: [PATCH proxmox-acme-rs 1/1] client: add support for proxies 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: Thu, 18 Nov 2021 10:15:58 -0000 applied, thanks On Tue, Nov 09, 2021 at 04:54:16PM +0000, Stoiko Ivanov wrote: > by storing the proxy url as string in the struct and setting it on > each invocation of `execute`, since execute calls reset on the > curl::easy::Easy object. > > Signed-off-by: Stoiko Ivanov > --- > src/client.rs | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/src/client.rs b/src/client.rs > index 8aeff97..9853fb6 100644 > --- a/src/client.rs > +++ b/src/client.rs > @@ -91,6 +91,7 @@ impl Headers { > struct Inner { > easy: easy::Easy, > nonce: Option, > + proxy: Option, > } > > impl Inner { > @@ -98,6 +99,7 @@ impl Inner { > Self { > easy: easy::Easy::new(), > nonce: None, > + proxy: None, > } > } > > @@ -120,6 +122,10 @@ impl Inner { > > self.easy.url(url)?; > > + if let Some(p) = &self.proxy { > + self.easy.proxy(&p)?; > + } > + > { > let mut transfer = self.easy.transfer(); > > @@ -156,6 +162,10 @@ impl Inner { > }) > } > > + pub fn set_proxy(&mut self, proxy: String) { > + self.proxy = Some(proxy); > + } > + > /// Low-level API to run an n API request. This automatically updates the current nonce! > fn run_request(&mut self, request: Request) -> Result { > self.easy.reset(); > @@ -586,6 +596,11 @@ impl Client { > } > } > } > + > + /// Set a proxy > + pub fn set_proxy(&mut self, proxy: String) { > + self.inner.set_proxy(proxy) > + } > } > > fn parse_header(data: &[u8]) -> Option<(&str, &str)> { > -- > 2.30.2