From e9c45e642bad7b56b2f95d0441ddce913455f204 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Sat, 20 Apr 2024 14:40:17 -0400 Subject: set a user agent in our api client --- src/api.rs | 32 +++++++++++++++++++------------- src/error.rs | 9 +++------ 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/api.rs b/src/api.rs index ca3c43b..be8c538 100644 --- a/src/api.rs +++ b/src/api.rs @@ -709,20 +709,26 @@ impl Client { file: client_cert_path.clone(), } })?; - let pem = reqwest::Identity::from_pem(&buf).map_err(|e| { - Error::LoadClientCertReqwest { - source: e, - file: client_cert_path.clone(), - } - })?; - Ok(reqwest::Client::builder().identity(pem).build().map_err( - |e| Error::LoadClientCertReqwest { - source: e, - file: client_cert_path.clone(), - }, - )?) + let pem = reqwest::Identity::from_pem(&buf) + .map_err(|e| Error::CreateReqwestClient { source: e })?; + Ok(reqwest::Client::builder() + .user_agent(format!( + "{}-{}", + env!("CARGO_PKG_NAME"), + env!("CARGO_PKG_VERSION") + )) + .identity(pem) + .build() + .map_err(|e| Error::CreateReqwestClient { source: e })?) } else { - Ok(reqwest::Client::new()) + Ok(reqwest::Client::builder() + .user_agent(format!( + "{}-{}", + env!("CARGO_PKG_NAME"), + env!("CARGO_PKG_VERSION") + )) + .build() + .map_err(|e| Error::CreateReqwestClient { source: e })?) } } diff --git a/src/error.rs b/src/error.rs index 8a3b5e2..db0503a 100644 --- a/src/error.rs +++ b/src/error.rs @@ -15,6 +15,9 @@ pub enum Error { file: std::path::PathBuf, }, + #[error("failed to create reqwest client")] + CreateReqwestClient { source: reqwest::Error }, + #[error("failed to decrypt")] Decrypt { source: block_padding::UnpadError }, @@ -127,12 +130,6 @@ pub enum Error { file: std::path::PathBuf, }, - #[error("failed to load client cert from {}", .file.display())] - LoadClientCertReqwest { - source: reqwest::Error, - file: std::path::PathBuf, - }, - #[error("invalid padding")] Padding, -- cgit v1.2.3-54-g00ecf