Add user-agent header to outgoing http requests

jtgeibel · jtgeibel · commit 0b06ca882066 · 2020-02-06T00:03:44.000-05:00
The tests are also updated to ensure that the user-agent is set for
outgoing requests to GitHub and S3.
diff --git a/src/github.rs b/src/github.rs
@@ -24,6 +24,7 @@ where
         .get(&url)
         .header(header::ACCEPT, "application/vnd.github.v3+json")
         .header(header::AUTHORIZATION, format!("token {}", auth.secret()))
+        .header(header::USER_AGENT, "https://crates.io")
         .send()?
         .error_for_status()
         .map_err(|e| handle_error_response(&e))?
diff --git a/src/s3/lib.rs b/src/s3/lib.rs
@@ -63,6 +63,7 @@ impl Bucket {
             .header(header::AUTHORIZATION, auth)
             .header(header::CONTENT_TYPE, content_type)
             .header(header::DATE, date)
+            .header(header::USER_AGENT, "https://crates.io")
             .headers(extra_headers)
             .body(Body::sized(content, content_length))
             .send()?
diff --git a/src/tests/http-data/krate_good_badges b/src/tests/http-data/krate_good_badges
@@ -20,10 +20,6 @@
           "authorization",
           "AWS AKIAICL5IWUZYWWKA7JA:kDm23yhf8YuOKpTcbHhNBa6BtQw="
         ],
-        [
-          "user-agent",
-          "reqwest/0.9.1"
-        ],
         [
           "host",
           "alexcrichton-test.s3.amazonaws.com"
diff --git a/src/tests/http-data/krate_good_categories b/src/tests/http-data/krate_good_categories
@@ -28,10 +28,6 @@
           "date",
           "Fri, 15 Sep 2017 07:53:05 -0700"
         ],
-        [
-          "user-agent",
-          "reqwest/0.9.1"
-        ],
         [
           "accept",
           "*/*"
diff --git a/src/tests/http-data/krate_ignored_badges b/src/tests/http-data/krate_ignored_badges
@@ -20,10 +20,6 @@
           "content-length",
           "35"
         ],
-        [
-          "user-agent",
-          "reqwest/0.9.1"
-        ],
         [
           "accept-encoding",
           "gzip"
diff --git a/src/tests/http-data/krate_ignored_categories b/src/tests/http-data/krate_ignored_categories
@@ -8,10 +8,6 @@
           "content-length",
           "35"
         ],
-        [
-          "user-agent",
-          "reqwest/0.9.1"
-        ],
         [
           "authorization",
           "AWS AKIAICL5IWUZYWWKA7JA:V37kbEzeh57sB4yTSZIOJACPoP4="
diff --git a/src/tests/http-data/krate_new_krate b/src/tests/http-data/krate_new_krate
@@ -20,10 +20,6 @@
           "accept-encoding",
           "gzip"
         ],
-        [
-          "user-agent",
-          "reqwest/0.9.1"
-        ],
         [
           "content-type",
           "application/x-tar"
diff --git a/src/tests/http-data/krate_new_krate_git_upload b/src/tests/http-data/krate_new_krate_git_upload
@@ -31,10 +31,6 @@
         [
           "accept",
           "*/*"
-        ],
-        [
-          "user-agent",
-          "reqwest/0.9.1"
         ]
       ],
       "body": "H4sIAAAAAAAA/+3AAQEAAACCIP+vbkhQwKsBLq+17wAEAAA="
diff --git a/src/tests/http-data/krate_new_krate_git_upload_appends b/src/tests/http-data/krate_new_krate_git_upload_appends
@@ -20,10 +20,6 @@
           "accept",
           "*/*"
         ],
-        [
-          "user-agent",
-          "reqwest/0.9.1"
-        ],
         [
           "authorization",
           "AWS AKIAICL5IWUZYWWKA7JA:UgUqqHJ9cQAZDdbcsxpnC0BI2eE="
@@ -91,10 +87,6 @@
           "accept",
           "*/*"
         ],
-        [
-          "user-agent",
-          "reqwest/0.9.1"
-        ],
         [
           "authorization",
           "AWS AKIAICL5IWUZYWWKA7JA:UgUqqHJ9cQAZDdbcsxpnC0BI2eE="
diff --git a/src/tests/http-data/krate_new_krate_git_upload_with_conflicts b/src/tests/http-data/krate_new_krate_git_upload_with_conflicts
@@ -24,10 +24,6 @@
           "authorization",
           "AWS AKIAICL5IWUZYWWKA7JA:241ftMxnamoj94RBOB/al86Xwjk="
         ],
-        [
-          "user-agent",
-          "reqwest/0.9.1"
-        ],
         [
           "accept",
           "*/*"
diff --git a/src/tests/http-data/krate_new_krate_records_verified_email b/src/tests/http-data/krate_new_krate_records_verified_email
@@ -20,10 +20,6 @@
           "accept-encoding",
           "gzip"
         ],
-        [
-          "user-agent",
-          "reqwest/0.9.1"
-        ],
         [
           "content-type",
           "application/x-tar"
diff --git a/src/tests/http-data/krate_new_krate_too_big_but_whitelisted b/src/tests/http-data/krate_new_krate_too_big_but_whitelisted
@@ -31,10 +31,6 @@
         [
           "date",
           "Fri, 15 Sep 2017 07:53:06 -0700"
-        ],
-        [
-          "user-agent",
-          "reqwest/0.9.1"
         ]
       ],
       "body": "H4sIAAAAAAAA/+3GTQqAIBAG0DmKF8jUoDlOGPQzEAg50fVDon0rIfre6s0pDecqOm2StfHWW9eOslAN7tZxcM+Lcu4DUxVH1rgbQz8VAQAA4PMIAOClC25Yv/oADgAA"
diff --git a/src/tests/http-data/krate_new_krate_twice b/src/tests/http-data/krate_new_krate_twice
@@ -28,10 +28,6 @@
           "date",
           "Fri, 15 Sep 2017 07:53:06 -0700"
         ],
-        [
-          "user-agent",
-          "reqwest/0.9.1"
-        ],
         [
           "host",
           "alexcrichton-test.s3.amazonaws.com"
diff --git a/src/tests/http-data/krate_new_krate_weird_version b/src/tests/http-data/krate_new_krate_weird_version
@@ -12,10 +12,6 @@
           "accept-encoding",
           "gzip"
         ],
-        [
-          "user-agent",
-          "reqwest/0.9.1"
-        ],
         [
           "authorization",
           "AWS AKIAICL5IWUZYWWKA7JA:eW1SP7V3WdqHXWZLcbN1BI2Zo0g="
diff --git a/src/tests/http-data/krate_new_krate_with_dependency b/src/tests/http-data/krate_new_krate_with_dependency
@@ -28,10 +28,6 @@
           "content-length",
           "35"
         ],
-        [
-          "user-agent",
-          "reqwest/0.9.1"
-        ],
         [
           "accept",
           "*/*"
diff --git a/src/tests/http-data/krate_new_krate_with_readme b/src/tests/http-data/krate_new_krate_with_readme
@@ -20,10 +20,6 @@
           "accept-encoding",
           "gzip"
         ],
-        [
-          "user-agent",
-          "reqwest/0.9.1"
-        ],
         [
           "content-type",
           "application/x-tar"
@@ -99,10 +95,6 @@
           "host",
           "alexcrichton-test.s3.amazonaws.com"
         ],
-        [
-          "user-agent",
-          "reqwest/0.9.1"
-        ],
         [
           "content-length",
           "0"
diff --git a/src/tests/http-data/krate_new_krate_with_token b/src/tests/http-data/krate_new_krate_with_token
@@ -8,10 +8,6 @@
           "date",
           "Fri, 15 Sep 2017 07:53:06 -0700"
         ],
-        [
-          "user-agent",
-          "reqwest/0.9.1"
-        ],
         [
           "authorization",
           "AWS AKIAICL5IWUZYWWKA7JA:uDc39eNdF6CcwB+q+JwKsoDLQc4="
diff --git a/src/tests/http-data/krate_new_with_renamed_dependency b/src/tests/http-data/krate_new_with_renamed_dependency
@@ -4,10 +4,6 @@
       "uri": "http://alexcrichton-test.s3.amazonaws.com/crates/new-krate/new-krate-1.0.0.crate",
       "method": "PUT",
       "headers": [
-        [
-          "user-agent",
-          "reqwest/0.9.1"
-        ],
         [
           "accept",
           "*/*"
diff --git a/src/tests/http-data/krate_publish_after_removing_documentation b/src/tests/http-data/krate_publish_after_removing_documentation
@@ -24,10 +24,6 @@
           "host",
           "alexcrichton-test.s3.amazonaws.com"
         ],
-        [
-          "user-agent",
-          "reqwest/0.9.1"
-        ],
         [
           "date",
           "Fri, 15 Sep 2017 07:53:06 -0700"
@@ -99,10 +95,6 @@
           "accept-encoding",
           "gzip"
         ],
-        [
-          "user-agent",
-          "reqwest/0.9.1"
-        ],
         [
           "accept",
           "*/*"
diff --git a/src/tests/http-data/krate_publish_after_yank_max_version b/src/tests/http-data/krate_publish_after_yank_max_version
@@ -8,10 +8,6 @@
           "host",
           "alexcrichton-test.s3.amazonaws.com"
         ],
-        [
-          "user-agent",
-          "reqwest/0.9.1"
-        ],
         [
           "content-type",
           "application/x-tar"
@@ -83,10 +79,6 @@
           "authorization",
           "AWS AKIAICL5IWUZYWWKA7JA:umuWs3XoGqsDipgMq04QAhq9Spc="
         ],
-        [
-          "user-agent",
-          "reqwest/0.9.1"
-        ],
         [
           "date",
           "Fri, 15 Sep 2017 07:53:06 -0700"
diff --git a/src/tests/http-data/krate_publish_new_crate_rate_limited b/src/tests/http-data/krate_publish_new_crate_rate_limited
@@ -28,10 +28,6 @@
           "date",
           "Fri, 15 Sep 2017 07:53:06 -0700"
         ],
-        [
-          "user-agent",
-          "reqwest/0.9.1"
-        ],
         [
           "host",
           "alexcrichton-test.s3.amazonaws.com"
@@ -99,10 +95,6 @@
           "date",
           "Fri, 15 Sep 2017 07:53:06 -0700"
         ],
-        [
-          "user-agent",
-          "reqwest/0.9.1"
-        ],
         [
           "host",
           "alexcrichton-test.s3.amazonaws.com"
diff --git a/src/tests/http-data/krate_publish_rate_limit_doesnt_affect_existing_crates b/src/tests/http-data/krate_publish_rate_limit_doesnt_affect_existing_crates
@@ -28,10 +28,6 @@
           "date",
           "Fri, 15 Sep 2017 07:53:06 -0700"
         ],
-        [
-          "user-agent",
-          "reqwest/0.9.1"
-        ],
         [
           "host",
           "alexcrichton-test.s3.amazonaws.com"
@@ -99,10 +95,6 @@
           "date",
           "Fri, 15 Sep 2017 07:53:06 -0700"
         ],
-        [
-          "user-agent",
-          "reqwest/0.9.1"
-        ],
         [
           "host",
           "alexcrichton-test.s3.amazonaws.com"
diff --git a/src/tests/http-data/krate_publish_records_an_audit_action b/src/tests/http-data/krate_publish_records_an_audit_action
@@ -16,10 +16,6 @@
           "accept",
           "*/*"
         ],
-        [
-          "user-agent",
-          "reqwest/0.9.1"
-        ],
         [
           "authorization",
           "AWS AKIAICL5IWUZYWWKA7JA:xCp3sUdUdmScjI6ct58zFv6BoGQ="
diff --git a/src/tests/http-data/krate_unyank_records_an_audit_action b/src/tests/http-data/krate_unyank_records_an_audit_action
@@ -16,10 +16,6 @@
           "accept",
           "*/*"
         ],
-        [
-          "user-agent",
-          "reqwest/0.9.1"
-        ],
         [
           "authorization",
           "AWS AKIAICL5IWUZYWWKA7JA:xCp3sUdUdmScjI6ct58zFv6BoGQ="
diff --git a/src/tests/http-data/krate_uploading_new_version_touches_crate b/src/tests/http-data/krate_uploading_new_version_touches_crate
@@ -31,10 +31,6 @@
         [
           "content-type",
           "application/x-tar"
-        ],
-        [
-          "user-agent",
-          "reqwest/0.9.1"
         ]
       ],
       "body": "H4sIAAAAAAAA/+3AAQEAAACCIP+vbkhQwKsBLq+17wAEAAA="
@@ -91,10 +87,6 @@
           "accept-encoding",
           "gzip"
         ],
-        [
-          "user-agent",
-          "reqwest/0.9.1"
-        ],
         [
           "content-length",
           "35"
diff --git a/src/tests/http-data/krate_yank_max_version b/src/tests/http-data/krate_yank_max_version
@@ -28,10 +28,6 @@
           "date",
           "Fri, 15 Sep 2017 07:53:06 -0700"
         ],
-        [
-          "user-agent",
-          "reqwest/0.9.1"
-        ],
         [
           "accept-encoding",
           "gzip"
@@ -83,10 +79,6 @@
           "accept-encoding",
           "gzip"
         ],
-        [
-          "user-agent",
-          "reqwest/0.9.1"
-        ],
         [
           "authorization",
           "AWS AKIAICL5IWUZYWWKA7JA:umuWs3XoGqsDipgMq04QAhq9Spc="
diff --git a/src/tests/http-data/krate_yank_records_an_audit_action b/src/tests/http-data/krate_yank_records_an_audit_action
@@ -16,10 +16,6 @@
           "accept",
           "*/*"
         ],
-        [
-          "user-agent",
-          "reqwest/0.9.1"
-        ],
         [
           "authorization",
           "AWS AKIAICL5IWUZYWWKA7JA:xCp3sUdUdmScjI6ct58zFv6BoGQ="
diff --git a/src/tests/http-data/krate_yank_works_as_intended b/src/tests/http-data/krate_yank_works_as_intended
@@ -16,10 +16,6 @@
           "accept",
           "*/*"
         ],
-        [
-          "user-agent",
-          "reqwest/0.9.1"
-        ],
         [
           "authorization",
           "AWS AKIAICL5IWUZYWWKA7JA:xCp3sUdUdmScjI6ct58zFv6BoGQ="
diff --git a/src/tests/http-data/owners_new_crate_owner b/src/tests/http-data/owners_new_crate_owner
diff --git a/src/tests/http-data/team_add_owners_as_team_owner b/src/tests/http-data/team_add_owners_as_team_owner
diff --git a/src/tests/http-data/team_add_team_as_non_member b/src/tests/http-data/team_add_team_as_non_member
diff --git a/src/tests/http-data/team_add_team_mixed_case b/src/tests/http-data/team_add_team_mixed_case
diff --git a/src/tests/http-data/team_crates_by_team_id_not_including_deleted_owners b/src/tests/http-data/team_crates_by_team_id_not_including_deleted_owners
diff --git a/src/tests/http-data/team_nonexistent_team b/src/tests/http-data/team_nonexistent_team
diff --git a/src/tests/http-data/team_publish_not_owned b/src/tests/http-data/team_publish_not_owned
diff --git a/src/tests/http-data/team_publish_owned b/src/tests/http-data/team_publish_owned
diff --git a/src/tests/http-data/team_remove_team_as_named_owner b/src/tests/http-data/team_remove_team_as_named_owner
diff --git a/src/tests/http-data/team_remove_team_as_team_owner b/src/tests/http-data/team_remove_team_as_team_owner
diff --git a/src/tests/http-data/version_version_size b/src/tests/http-data/version_version_size
diff --git a/src/tests/record.rs b/src/tests/record.rs

Original file line number	Diff line number	Diff line change
`@@ -31,10 +31,6 @@`
`31`	`31`	`[`
`32`	`32`	`"accept",`
`33`	`33`	`"/"`
`34`		`- ],`
`35`		`- [`
`36`		`- "user-agent",`
`37`		`- "reqwest/0.9.1"`
`38`	`34`	`]`
`39`	`35`	`],`
`40`	`36`	`"body": "H4sIAAAAAAAA/+3AAQEAAACCIP+vbkhQwKsBLq+17wAEAAA="`