development/cargo
development/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo synced 2024-10-13 11:12:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not error for auth-required: true without -Z sparse-registry

Browse source
This commit is contained in:
Arlo Siemsen 2023-01-31 11:03:02 -06:00
parent 0de0e80548
commit f1dadb6309
3 changed files with 30 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/cargo/sources/registry/http_remote.rs
View file

@ -334,13 +334,6 @@ impl<'cfg> HttpRegistry<'cfg> {
}
}
fn check_registry_auth_unstable(&self) -> CargoResult<()> {
if self.auth_required && !self.config.cli_unstable().registry_auth {
anyhow::bail!("authenticated registries require `-Z registry-auth`");
}
Ok(())
}
/// Get the cached registry configuration, if it exists.
fn config_cached(&mut self) -> CargoResult<Option<&RegistryConfig>> {
if self.registry_config.is_some() {
@ -486,7 +479,9 @@ impl<'cfg> RegistryData for HttpRegistry<'cfg> {
return Poll::Ready(Ok(LoadResponse::NotFound));
}
StatusCode::Unauthorized
if !self.auth_required && path == Path::new("config.json") =>
if !self.auth_required
&& path == Path::new("config.json")
&& self.config.cli_unstable().registry_auth =>
{
debug!("re-attempting request for config.json with authorization included.");
self.fresh.remove(path);
@ -542,6 +537,10 @@ impl<'cfg> RegistryData for HttpRegistry<'cfg> {
}
}
if !self.config.cli_unstable().registry_auth {
self.auth_required = false;
}
// Looks like we're going to have to do a network request.
self.start_fetch()?;
@ -587,7 +586,6 @@ impl<'cfg> RegistryData for HttpRegistry<'cfg> {
}
}
if self.auth_required {
self.check_registry_auth_unstable()?;
let authorization =
auth::auth_token(self.config, &self.source_id, self.login_url.as_ref(), None)?;
headers.append(&format!("Authorization: {}", authorization))?;
@ -660,8 +658,10 @@ impl<'cfg> RegistryData for HttpRegistry<'cfg> {
}
fn config(&mut self) -> Poll<CargoResult<Option<RegistryConfig>>> {
let cfg = ready!(self.config()?).clone();
self.check_registry_auth_unstable()?;
let mut cfg = ready!(self.config()?).clone();
if !self.config.cli_unstable().registry_auth {
cfg.auth_required = false;
}
Poll::Ready(Ok(Some(cfg)))
}

8
src/cargo/sources/registry/remote.rs
View file

@ -245,11 +245,9 @@ impl<'cfg> RegistryData for RemoteRegistry<'cfg> {
match ready!(self.load(Path::new(""), Path::new("config.json"), None)?) {
LoadResponse::Data { raw_data, .. } => {
trace!("config loaded");
let cfg: RegistryConfig = serde_json::from_slice(&raw_data)?;
if cfg.auth_required && !self.config.cli_unstable().registry_auth {
return Poll::Ready(Err(anyhow::anyhow!(
"authenticated registries require `-Z registry-auth`"
)));
let mut cfg: RegistryConfig = serde_json::from_slice(&raw_data)?;
if !self.config.cli_unstable().registry_auth {
cfg.auth_required = false;
}
Poll::Ready(Ok(Some(cfg)))
}

18
tests/testsuite/registry_auth.rs
View file

@ -42,12 +42,26 @@ static SUCCESS_OUTPUT: &'static str = "\
#[cargo_test]
fn requires_nightly() {
let _registry = RegistryBuilder::new().alternative().auth_required().build();
let _registry = RegistryBuilder::new()
.alternative()
.auth_required()
.http_api()
.build();
let p = make_project();
p.cargo("build")
.with_status(101)
.with_stderr_contains(" authenticated registries require `-Z registry-auth`")
.with_stderr(
r#"[UPDATING] `alternative` index
[DOWNLOADING] crates ...
error: failed to download from `[..]/dl/bar/0.0.1/download`
Caused by:
failed to get successful HTTP response from `[..]`, got 401
body:
Unauthorized message from server.
"#,
)
.run();
}