From a6b8db1cc4c7a0a28aa0d9158389b1cd22f16768 Mon Sep 17 00:00:00 2001
From: Wim Looman <git@nemo157.com>
Date: Sat, 6 Jun 2020 13:45:54 +0200
Subject: [PATCH] Set application specific user agent for crates.io

---
 src/index/api.rs | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/index/api.rs b/src/index/api.rs
index 7af4c7434..3011e84a5 100644
--- a/src/index/api.rs
+++ b/src/index/api.rs
@@ -1,11 +1,17 @@
 use crate::{error::Result, utils::MetadataPackage};
 use chrono::{DateTime, Utc};
 use failure::err_msg;
-use reqwest::{header::ACCEPT, Client};
+use reqwest::header::{HeaderValue, ACCEPT, USER_AGENT};
 use semver::Version;
 use serde_json::Value;
 use std::io::Read;
 
+const APP_USER_AGENT: &str = concat!(
+    env!("CARGO_PKG_NAME"),
+    " ",
+    include_str!(concat!(env!("OUT_DIR"), "/git_version"))
+);
+
 pub(crate) struct RegistryCrateData {
     pub(crate) release_time: DateTime<Utc>,
     pub(crate) yanked: bool,
@@ -34,13 +40,25 @@ impl RegistryCrateData {
     }
 }
 
+fn client() -> Result<reqwest::Client> {
+    let headers = vec![
+        (USER_AGENT, HeaderValue::from_static(APP_USER_AGENT)),
+        (ACCEPT, HeaderValue::from_static("application/json")),
+    ]
+    .into_iter()
+    .collect();
+
+    Ok(reqwest::Client::builder()
+        .default_headers(headers)
+        .build()?)
+}
+
 /// Get release_time, yanked and downloads from the registry's API
 fn get_release_time_yanked_downloads(pkg: &MetadataPackage) -> Result<(DateTime<Utc>, bool, i32)> {
     let url = format!("https://crates.io/api/v1/crates/{}/versions", pkg.name);
     // FIXME: There is probably better way to do this
     //        and so many unwraps...
-    let client = Client::new();
-    let mut res = client.get(&url).header(ACCEPT, "application/json").send()?;
+    let mut res = client()?.get(&url).send()?;
 
     let mut body = String::new();
     res.read_to_string(&mut body)?;
@@ -103,11 +121,7 @@ fn get_release_time_yanked_downloads(pkg: &MetadataPackage) -> Result<(DateTime<
 fn get_owners(pkg: &MetadataPackage) -> Result<Vec<CrateOwner>> {
     // owners available in: https://crates.io/api/v1/crates/rand/owners
     let owners_url = format!("https://crates.io/api/v1/crates/{}/owners", pkg.name);
-    let client = Client::new();
-    let mut res = client
-        .get(&owners_url[..])
-        .header(ACCEPT, "application/json")
-        .send()?;
+    let mut res = client()?.get(&owners_url[..]).send()?;
     // FIXME: There is probably better way to do this
     //        and so many unwraps...
     let mut body = String::new();