From: Dietmar Maurer <dietmar@proxmox.com>
To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>,
Wolfgang Bumiller <w.bumiller@proxmox.com>
Subject: Re: [pbs-devel] [PATCH backup] client: use build_authority in build_uri
Date: Thu, 6 May 2021 09:01:46 +0200 (CEST) [thread overview]
Message-ID: <228044467.236.1620284506924@webmail.proxmox.com> (raw)
In general a good idea, but we now merge code
from two independent http client implementation (making them
dependent)?
> On 05/06/2021 8:55 AM Wolfgang Bumiller <w.bumiller@proxmox.com> wrote:
>
>
> so we don't need to also duplicate the IPv6 bracket logic
>
> Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
> ---
> Just a little cleanup since we added 2 different bracket codes for ipv6
> in the recent commits...
>
> src/client/http_client.rs | 31 +++++++++++++------------------
> src/tools/http.rs | 2 +-
> 2 files changed, 14 insertions(+), 19 deletions(-)
>
> diff --git a/src/client/http_client.rs b/src/client/http_client.rs
> index f2fada23..785626e8 100644
> --- a/src/client/http_client.rs
> +++ b/src/client/http_client.rs
> @@ -26,7 +26,10 @@ use crate::tools::{
> self,
> BroadcastFuture,
> DEFAULT_ENCODE_SET,
> - http::HttpsConnector,
> + http::{
> + build_authority,
> + HttpsConnector,
> + },
> };
>
> /// Timeout used for several HTTP operations that are expected to finish quickly but may block in
> @@ -274,23 +277,15 @@ fn load_ticket_info(prefix: &str, server: &str, userid: &Userid) -> Option<(Stri
> }
>
> fn build_uri(server: &str, port: u16, path: &str, query: Option<String>) -> Result<Uri, Error> {
> - let path = path.trim_matches('/');
> - let bytes = server.as_bytes();
> - let len = bytes.len();
> - let uri = if len > 3 && bytes.contains(&b':') && bytes[0] != b'[' && bytes[len-1] != b']' {
> - if let Some(query) = query {
> - format!("https://[{}]:{}/{}?{}", server, port, path, query)
> - } else {
> - format!("https://[{}]:{}/{}", server, port, path)
> - }
> - } else {
> - if let Some(query) = query {
> - format!("https://{}:{}/{}?{}", server, port, path, query)
> - } else {
> - format!("https://{}:{}/{}", server, port, path)
> - }
> - };
> - Ok(uri.parse()?)
> + let builder = Uri::builder()
> + .scheme("https")
> + .authority(build_authority(server, port)?);
> + match query {
> + Some(query) => builder.path_and_query(format!("{}?{}", path, query)),
> + None => builder.path_and_query(path),
> + }
> + .build()
> + .map_err(Error::from)
> }
>
> impl HttpClient {
> diff --git a/src/tools/http.rs b/src/tools/http.rs
> index cfdd9b16..9adfc118 100644
> --- a/src/tools/http.rs
> +++ b/src/tools/http.rs
> @@ -29,7 +29,7 @@ use crate::tools::{
> };
>
> // Build a http::uri::Authority ("host:port"), use '[..]' around IPv6 addresses
> -fn build_authority(host: &str, port: u16) -> Result<Authority, Error> {
> +pub(crate) fn build_authority(host: &str, port: u16) -> Result<Authority, Error> {
> let bytes = host.as_bytes();
> let len = bytes.len();
> let authority = if len > 3 && bytes.contains(&b':') && bytes[0] != b'[' && bytes[len-1] != b']' {
> --
> 2.20.1
>
>
>
> _______________________________________________
> pbs-devel mailing list
> pbs-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
next reply other threads:[~2021-05-06 7:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-06 7:01 Dietmar Maurer [this message]
2021-05-06 7:14 ` Wolfgang Bumiller
-- strict thread matches above, loose matches on Subject: below --
2021-05-06 7:34 Dietmar Maurer
2021-05-06 7:43 ` Wolfgang Bumiller
2021-05-06 6:55 Wolfgang Bumiller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=228044467.236.1620284506924@webmail.proxmox.com \
--to=dietmar@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
--cc=w.bumiller@proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox