set a user agent in our api client

doy · Apr 20, 2024 · e9c45e6 · e9c45e6
1 parent 72964bf
commit e9c45e6
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 19 deletions.
diff --git 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
@@ -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,