itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-28 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow usernames in alt registry URLs

Browse Source 
We want to forbid secrets since they'll commonly end up checked into
source control, but usernames are fine (and are commonly going to be
`git`).

Closes #6241
This commit is contained in:
Steven Fackler 2018-10-30 18:01:44 -07:00
parent 63cd1cbe4c
commit 6e90641759
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cargo/util/config.rs
View File

@ -669,8 +669,8 @@ impl Config {
match self.get_string(&format!("registries.{}.index", registry))? { match self.get_string(&format!("registries.{}.index", registry))? {
Some(index) => { Some(index) => {
let url = index.val.to_url()?; let url = index.val.to_url()?;
if url.username() != "" || url.password().is_some() { if url.password().is_some() {
bail!("Registry URLs may not contain credentials"); bail!("Registry URLs may not contain passwords");
} }
url url
} }

4
tests/testsuite/alt_registry.rs
View File

@ -458,7 +458,7 @@ fn publish_with_crates_io_dep() {
} }
#[test] #[test]
fn credentials_in_url_forbidden() { fn passwords_in_url_forbidden() {
registry::init(); registry::init();
let config = paths::home().join(".cargo/config"); let config = paths::home().join(".cargo/config");
@ -489,6 +489,6 @@ fn credentials_in_url_forbidden() {
p.cargo("publish --registry alternative -Zunstable-options") p.cargo("publish --registry alternative -Zunstable-options")
.masquerade_as_nightly_cargo() .masquerade_as_nightly_cargo()
.with_status(101) .with_status(101)
.with_stderr_contains("error: Registry URLs may not contain credentials") .with_stderr_contains("error: Registry URLs may not contain passwords")
.run(); .run();
} }