[pbs-devel] [PATCH proxmox-backup 2/2] tools/http: make user agent configurable

Wed Apr 28 16:23:39 CEST 2021

Do we really need to have more than 1 user agent string in what's
basically a non-exported utility, though?

On Wed, Apr 28, 2021 at 12:03:58PM +0200, Dietmar Maurer wrote:
> ---
>  src/tools/http.rs | 18 +++++++++++++-----
>  1 file changed, 13 insertions(+), 5 deletions(-)
> 
> diff --git a/src/tools/http.rs b/src/tools/http.rs
> index a4299fb4..8656e685 100644
> --- a/src/tools/http.rs
> +++ b/src/tools/http.rs
> @@ -103,6 +103,7 @@ impl ProxyConfig {
>  pub struct SimpleHttp {
>      client: Client<HttpsConnector, Body>,
>      proxy_authorization: Option<String>, // Proxy-Authorization header value
> +    user_agent: Option<String>,
>  }
>  
>  impl SimpleHttp {
> @@ -129,7 +130,12 @@ impl SimpleHttp {
>              https.set_proxy(proxy_config);
>          }
>          let client = Client::builder().build(https);
> -        Self { client, proxy_authorization}
> +        Self { client, proxy_authorization, user_agent: None }
> +    }
> +
> +    pub fn set_user_agent(&mut self, user_agent: &str) -> Result<(), Error> {
> +        self.user_agent = Some(user_agent.to_owned());
> +        Ok(())
>      }
>  
>      fn add_proxy_headers(&self, request: &mut Request<Body>) -> Result<(), Error> {
> @@ -147,11 +153,13 @@ impl SimpleHttp {
>      }
>  
>      pub async fn request(&self, mut request: Request<Body>) -> Result<Response<Body>, Error> {
> +        let user_agent = if let Some(ref user_agent) = self.user_agent {
> +            HeaderValue::from_str(&user_agent)?
> +        } else {
> +            HeaderValue::from_str(Self::DEFAULT_USER_AGENT_STRING)?
> +        };
>  
> -        request.headers_mut().insert(
> -            hyper::header::USER_AGENT,
> -            HeaderValue::from_str(Self::DEFAULT_USER_AGENT_STRING)?,
> -        );
> +        request.headers_mut().insert(hyper::header::USER_AGENT, user_agent);
>  
>          self.add_proxy_headers(&mut request)?;
>  
> -- 
> 2.20.1