From 99a577871e97b4f7e728980c17ece3d65a47db4f Mon Sep 17 00:00:00 2001 From: t11s Date: Wed, 13 Nov 2019 19:49:49 -0800 Subject: [PATCH 1/4] Add some safety rails :D --- src/cargo/ops/registry.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cargo/ops/registry.rs b/src/cargo/ops/registry.rs index 1d81c04c6c7..d029d56234e 100644 --- a/src/cargo/ops/registry.rs +++ b/src/cargo/ops/registry.rs @@ -598,7 +598,7 @@ pub fn registry_login( .read_line(&mut line) .chain_err(|| "failed to read stdin") .map_err(failure::Error::from)?; - line.trim().to_string() + line.replace("cargo login", "").trim().to_string(); } }; From 4ec6aac5cf2833b2851b7952e6bd8318aab14801 Mon Sep 17 00:00:00 2001 From: t11s Date: Wed, 13 Nov 2019 19:52:52 -0800 Subject: [PATCH 2/4] Remove ";" --- src/cargo/ops/registry.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cargo/ops/registry.rs b/src/cargo/ops/registry.rs index d029d56234e..10f9c3314b6 100644 --- a/src/cargo/ops/registry.rs +++ b/src/cargo/ops/registry.rs @@ -598,7 +598,7 @@ pub fn registry_login( .read_line(&mut line) .chain_err(|| "failed to read stdin") .map_err(failure::Error::from)?; - line.replace("cargo login", "").trim().to_string(); + line.replace("cargo login", "").trim().to_string() } }; From 290db5123119ecaf22ec48e97ff9088ea84f9303 Mon Sep 17 00:00:00 2001 From: t11s Date: Thu, 14 Nov 2019 10:04:55 -0800 Subject: [PATCH 3/4] Update registry.rs --- src/cargo/ops/registry.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/cargo/ops/registry.rs b/src/cargo/ops/registry.rs index 10f9c3314b6..bd76db3648e 100644 --- a/src/cargo/ops/registry.rs +++ b/src/cargo/ops/registry.rs @@ -434,6 +434,7 @@ pub fn configure_http_handle(config: &Config, handle: &mut Easy) -> CargoResult< if let Some(check) = http.check_revoke { handle.ssl_options(SslOpt::new().no_revoke(!check))?; } + if let Some(user_agent) = &http.user_agent { handle.useragent(user_agent)?; } else { @@ -598,6 +599,7 @@ pub fn registry_login( .read_line(&mut line) .chain_err(|| "failed to read stdin") .map_err(failure::Error::from)?; + // Automatically remove `cargo login` from an inputted token to allow direct pastes from `registry.host()`/me. line.replace("cargo login", "").trim().to_string() } }; From 648b39e98101f9b6417fc6ebc88fa7f397a5f509 Mon Sep 17 00:00:00 2001 From: t11s Date: Thu, 14 Nov 2019 19:13:19 -0800 Subject: [PATCH 4/4] Run code through rustfmt --- src/cargo/ops/registry.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cargo/ops/registry.rs b/src/cargo/ops/registry.rs index bd76db3648e..91dcf303c03 100644 --- a/src/cargo/ops/registry.rs +++ b/src/cargo/ops/registry.rs @@ -434,7 +434,7 @@ pub fn configure_http_handle(config: &Config, handle: &mut Easy) -> CargoResult< if let Some(check) = http.check_revoke { handle.ssl_options(SslOpt::new().no_revoke(!check))?; } - + if let Some(user_agent) = &http.user_agent { handle.useragent(user_agent)?; } else { @@ -599,7 +599,7 @@ pub fn registry_login( .read_line(&mut line) .chain_err(|| "failed to read stdin") .map_err(failure::Error::from)?; - // Automatically remove `cargo login` from an inputted token to allow direct pastes from `registry.host()`/me. + // Automatically remove `cargo login` from an inputted token to allow direct pastes from `registry.host()`/me. line.replace("cargo login", "").trim().to_string() } };