Skip to content

Commit

Permalink
Auto merge of #10580 - jonhoo:restrict-config-cli, r=ehuss
Browse files Browse the repository at this point in the history
Disallow setting registry tokens with --config

As per the concern `restricted-values` in
#7722 (comment).

r? `@ehuss`
  • Loading branch information
bors committed Apr 21, 2022
2 parents 304a9e6 + 10c4f32 commit c85a71e
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 1 deletion.
20 changes: 19 additions & 1 deletion src/cargo/util/config/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1244,10 +1244,28 @@ impl Config {
);
}

let toml_v = toml::from_document(doc).with_context(|| {
let toml_v: toml::Value = toml::from_document(doc).with_context(|| {
format!("failed to parse value from --config argument `{arg}`")
})?;

if toml_v
.get("registry")
.and_then(|v| v.as_table())
.and_then(|t| t.get("token"))
.is_some()
{
bail!("registry.token cannot be set through --config for security reasons");
} else if let Some((k, _)) = toml_v
.get("registries")
.and_then(|v| v.as_table())
.and_then(|t| t.iter().find(|(_, v)| v.get("token").is_some()))
{
bail!(
"registries.{}.token cannot be set through --config for security reasons",
k
);
}

CV::from_toml(Definition::Cli, toml_v)
.with_context(|| format!("failed to convert --config argument `{arg}`"))?
};
Expand Down
18 changes: 18 additions & 0 deletions tests/testsuite/config_cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,24 @@ b=2` was not a TOML dotted key expression (such as `build.jobs = 2`)",
);
}

#[cargo_test]
fn no_disallowed_values() {
let config = ConfigBuilder::new()
.config_arg("registry.token=\"hello\"")
.build_err();
assert_error(
config.unwrap_err(),
"registry.token cannot be set through --config for security reasons",
);
let config = ConfigBuilder::new()
.config_arg("registries.crates-io.token=\"hello\"")
.build_err();
assert_error(
config.unwrap_err(),
"registries.crates-io.token cannot be set through --config for security reasons",
);
}

#[cargo_test]
fn no_inline_table_value() {
// Disallow inline tables
Expand Down

0 comments on commit c85a71e

Please sign in to comment.