Skip to content

Remove "cargo login" from user input when asking for login token. #7588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 4 commits into from
Nov 15, 2019
Merged

Remove "cargo login" from user input when asking for login token. #7588

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
99a5778
Add some safety rails :D
Nov 14, 2019
4ec6aac
Remove ";"
Nov 14, 2019
290db51
Update registry.rs
Nov 14, 2019
648b39e
Run code through rustfmt
Nov 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/cargo/ops/registry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -598,7 +599,8 @@ pub fn registry_login(
.read_line(&mut line)
.chain_err(|| "failed to read stdin")
.map_err(failure::Error::from)?;
line.trim().to_string()
// Automatically remove `cargo login` from an inputted token to allow direct pastes from `registry.host()`/me.
line.replace("cargo login", "").trim().to_string()
}
};

Expand Down