itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-10-01 11:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Validate registry token before operations that require it.

Browse Source
This commit is contained in:
Alex Helfet 2019-04-15 19:00:42 +01:00
parent ef0223f125
commit d9bc8c0dc5
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/cargo/ops/registry.rs
View File

@ -69,6 +69,7 @@ pub fn publish(ws: &Workspace<'_>, opts: &PublishOpts<'_>) -> CargoResult<()> {
opts.index.clone(), opts.index.clone(),
opts.registry.clone(), opts.registry.clone(),
true, true,
!opts.dry_run
)?; )?;
verify_dependencies(pkg, &registry, reg_id)?; verify_dependencies(pkg, &registry, reg_id)?;
@ -334,12 +335,13 @@ pub fn registry_configuration(
Ok(RegistryConfig { index, token }) Ok(RegistryConfig { index, token })
} }
pub fn registry( fn registry(
config: &Config, config: &Config,
token: Option<String>, token: Option<String>,
index: Option<String>, index: Option<String>,
registry: Option<String>, registry: Option<String>,
force_update: bool, force_update: bool,
validate_token: bool
) -> CargoResult<(Registry, SourceId)> { ) -> CargoResult<(Registry, SourceId)> {
// Parse all configuration options // Parse all configuration options
let RegistryConfig { let RegistryConfig {
@ -363,6 +365,9 @@ pub fn registry(
.ok_or_else(|| format_err!("{} does not support API commands", sid))? .ok_or_else(|| format_err!("{} does not support API commands", sid))?
}; };
let handle = http_handle(config)?; let handle = http_handle(config)?;
if validate_token && token.is_none() {
bail!("no upload token found, please run `cargo login`");
};
Ok((Registry::new_handle(api_host, token, handle), sid)) Ok((Registry::new_handle(api_host, token, handle), sid))
} }
@ -536,7 +541,7 @@ pub fn registry_login(
token: Option<String>, token: Option<String>,
reg: Option<String>, reg: Option<String>,
) -> CargoResult<()> { ) -> CargoResult<()> {
let (registry, _) = registry(config, token.clone(), None, reg.clone(), false)?; let (registry, _) = registry(config, token.clone(), None, reg.clone(), false, false)?;
let token = match token { let token = match token {
Some(token) => token, Some(token) => token,
@ -604,6 +609,7 @@ pub fn modify_owners(config: &Config, opts: &OwnersOptions) -> CargoResult<()> {
opts.index.clone(), opts.index.clone(),
opts.registry.clone(), opts.registry.clone(),
true, true,
true
)?; )?;
if let Some(ref v) = opts.to_add { if let Some(ref v) = opts.to_add {
@ -664,7 +670,7 @@ pub fn yank(
None => bail!("a version must be specified to yank"), None => bail!("a version must be specified to yank"),
}; };
let (mut registry, _) = registry(config, token, index, reg, true)?; let (mut registry, _) = registry(config, token, index, reg, true, true)?;
if undo { if undo {
config config
@ -720,7 +726,7 @@ pub fn search(
prefix prefix
} }
let (mut registry, source_id) = registry(config, None, index, reg, false)?; let (mut registry, source_id) = registry(config, None, index, reg, false, false)?;
let (crates, total_crates) = registry let (crates, total_crates) = registry
.search(query, limit) .search(query, limit)
.chain_err(|| "failed to retrieve search results from the registry")?; .chain_err(|| "failed to retrieve search results from the registry")?;

3
tests/testsuite/alt_registry.rs
View File

@ -289,6 +289,9 @@ fn cannot_publish_to_crates_io_with_registry_dependency() {
) )
.build(); .build();
// Login so that we have the token available
p.cargo("login --registry fakeio TOKEN").run();
p.cargo("publish --registry fakeio") p.cargo("publish --registry fakeio")
.with_status(101) .with_status(101)
.with_stderr_contains("[ERROR] crates cannot be published to crates.io[..]") .with_stderr_contains("[ERROR] crates cannot be published to crates.io[..]")