Warn about TLS for github specifically

diff --git a/src/cargo/sources/git/utils.rs b/src/cargo/sources/git/utils.rs
index 640138525ee93f2c98a3e5cb506cd4c2a204f5d7..a4e3fec9f09e735f3813b2cb4a2cfe17f59189a2 100644 (file)
--- a/src/cargo/sources/git/utils.rs
+++ b/src/cargo/sources/git/utils.rs
@@ -591,7 +591,7 @@ pub fn with_fetch_options(git_config: &git2::Config,
     -> CargoResult<()>
 {
     let mut progress = Progress::new("Fetch", config);
-    network::with_retry(config, || {
+    network::with_retry(config, url, || {
         with_authentication(url.as_str(), git_config, |f| {
             let mut rcb = git2::RemoteCallbacks::new();
             rcb.credentials(f);

diff --git a/src/cargo/sources/registry/remote.rs b/src/cargo/sources/registry/remote.rs
index 331183e6d1d4a268b2f29076bcf499c436716764..ecaaf97677850e90c2d4b4afa23a4ca39eeeff4f 100644 (file)
--- a/src/cargo/sources/registry/remote.rs
+++ b/src/cargo/sources/registry/remote.rs
@@ -224,14 +224,13 @@ impl<'cfg> RegistryData for RemoteRegistry<'cfg> {
         // TODO: don't download into memory, but ensure that if we ctrl-c a
         //       download we should resume either from the start or the middle
         //       on the next time
-        let url = url.to_string();
         let mut handle = self.config.http()?.borrow_mut();
         handle.get(true)?;
-        handle.url(&url)?;
+        handle.url(&url.to_string())?;
         handle.follow_location(true)?;
         let mut state = Sha256::new();
         let mut body = Vec::new();
-        network::with_retry(self.config, || {
+        network::with_retry(self.config, &url, || {
             state = Sha256::new();
             body = Vec::new();
             let mut pb = Progress::new("Fetch", self.config);
@@ -250,8 +249,10 @@ impl<'cfg> RegistryData for RemoteRegistry<'cfg> {
             }
             let code = handle.response_code()?;
             if code != 200 && code != 0 {
-                let url = handle.effective_url()?.unwrap_or(&url);
-                Err(HttpNot200 { code, url: url.to_string() }.into())
+                let url = handle.effective_url()?
+                    .map(|url| url.to_string())
+                    .unwrap_or_else(|| url.to_string());
+                Err(HttpNot200 { code, url }.into())
             } else {
                 Ok(())
             }

diff --git a/src/cargo/util/network.rs b/src/cargo/util/network.rs
index 37fa69f58078c302d7606c389cea74c0737d131b..19a3ddcce2f2e71780a4981db1ce1b90e49e77ef 100644 (file)
--- a/src/cargo/util/network.rs
+++ b/src/cargo/util/network.rs
@@ -1,5 +1,6 @@
 use curl;
 use git2;
+use url::Url;
 
 use failure::Error;
 
@@ -37,15 +38,17 @@ fn maybe_spurious(err: &Error) -> bool {
 /// Suggest the user to update their windows 7 to support modern TLS versions.
 /// See https://github.com/rust-lang/cargo/issues/5066 for details.
 #[cfg(windows)]
-fn should_warn_about_old_tls_for_win7(err: &Error) -> bool {
-    err.causes()
+fn should_warn_about_old_tls_for_win7(url: &Url, err: &Error) -> bool {
+    let is_github = url.host_str() == Some("github.com");
+    let is_cert_error = err.causes()
         .filter_map(|e| e.downcast_ref::<git2::Error>())
         .find(|e| e.class() == git2::ErrorClass::Net && e.code() == git2::ErrorCode::Certificate)
-        .is_some()
+        .is_some();
+    is_github && is_cert_error
 }
 
 #[cfg(not(windows))]
-fn should_warn_about_old_tls_for_win7(_err: &Error) -> bool {
+fn should_warn_about_old_tls_for_win7(_url: &Url, _err: &Error) -> bool {
     false
 }
 
@@ -71,9 +74,9 @@ See https://github.com/rust-lang/cargo/issues/5066 for details.
 ///
 /// ```ignore
 /// use util::network;
-/// cargo_result = network.with_retry(&config, || something.download());
+/// cargo_result = network::with_retry(&config, || something.download());
 /// ```
-pub fn with_retry<T, F>(config: &Config, mut callback: F) -> CargoResult<T>
+pub fn with_retry<T, F>(config: &Config, url: &Url, mut callback: F) -> CargoResult<T>
     where F: FnMut() -> CargoResult<T>
 {
     let mut remaining = config.net_retry()?;
@@ -85,7 +88,7 @@ pub fn with_retry<T, F>(config: &Config, mut callback: F) -> CargoResult<T>
                     format!("spurious network error ({} tries remaining): {}", remaining, e)
                 )?;
 
-                if should_warn_about_old_tls_for_win7(e) {
+                if should_warn_about_old_tls_for_win7(url, e) {
                     config.shell().warn(WIN7_TLS_WARNING)?;
                 }
 
@@ -103,7 +106,8 @@ fn with_retry_repeats_the_call_then_works() {
     let error2 = HttpNot200 { code: 502, url: "Uri".to_string() }.into();
     let mut results: Vec<CargoResult<()>> = vec![Ok(()), Err(error1), Err(error2)];
     let config = Config::default().unwrap();
-    let result = with_retry(&config, || results.pop().unwrap());
+    let url = "http://example.com".parse().unwrap();
+    let result = with_retry(&config, &url, || results.pop().unwrap());
     assert_eq!(result.unwrap(), ())
 }
 
@@ -119,6 +123,7 @@ fn with_retry_finds_nested_spurious_errors() {
     let error2 = CargoError::from(error2.context("A second chained error"));
     let mut results: Vec<CargoResult<()>> = vec![Ok(()), Err(error1), Err(error2)];
     let config = Config::default().unwrap();
-    let result = with_retry(&config, || results.pop().unwrap());
+    let url = "http://example.com".parse().unwrap();
+    let result = with_retry(&config, &url, || results.pop().unwrap());
     assert_eq!(result.unwrap(), ())
 }