From aa1b353d644d9cd1253bfd9d81681d2d069273a2 Mon Sep 17 00:00:00 2001 From: Sebastian Poeplau Date: Mon, 31 Mar 2025 11:48:23 +0200 Subject: [PATCH] Prevent undeclared public network access Stop a few tests which aren't marked with `public_network_test` from trying to access crates.io. While doing so, also make sure that other `cargo_add` and `cargo_info` tests initialize the registry. --- .../cargo_add/add_no_vendored_package_with_vendor/mod.rs | 1 + tests/testsuite/cargo_add/add_toolchain/mod.rs | 1 + tests/testsuite/cargo_add/dev_existing_path_base/mod.rs | 1 + .../cargo_add/invalid_key_inherit_dependency/mod.rs | 1 + .../invalid_key_overwrite_inherit_dependency/mod.rs | 1 + .../cargo_add/invalid_key_rename_inherit_dependency/mod.rs | 1 + tests/testsuite/cargo_add/merge_activated_features/mod.rs | 1 + .../testsuite/cargo_add/normalize_name_path_existing/mod.rs | 1 + .../cargo_add/normalize_name_path_existing/stderr.term.svg | 2 +- tests/testsuite/cargo_add/path_base/mod.rs | 1 + tests/testsuite/cargo_add/path_base_inferred_name/mod.rs | 1 + tests/testsuite/cargo_add/path_base_missing_base_path/mod.rs | 1 + tests/testsuite/cargo_add/path_base_unstable/mod.rs | 1 + tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs | 1 + .../cargo_info/specify_empty_version_with_url/mod.rs | 3 +++ .../mod.rs | 3 +++ .../cargo_info/within_ws_with_alternative_registry/mod.rs | 3 +++ .../within_ws_with_alternative_registry/stderr.term.svg | 2 +- tests/testsuite/package.rs | 5 +++-- 19 files changed, 27 insertions(+), 4 deletions(-) diff --git a/tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/mod.rs b/tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/mod.rs index 5ca79c7c5e8..7a2772a2a86 100644 --- a/tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/mod.rs +++ b/tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/mod.rs @@ -7,6 +7,7 @@ use cargo_test_support::Project; #[cargo_test] fn case() { + cargo_test_support::registry::init(); let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; diff --git a/tests/testsuite/cargo_add/add_toolchain/mod.rs b/tests/testsuite/cargo_add/add_toolchain/mod.rs index 9220aa7ed6b..7cfb71a6d8b 100644 --- a/tests/testsuite/cargo_add/add_toolchain/mod.rs +++ b/tests/testsuite/cargo_add/add_toolchain/mod.rs @@ -7,6 +7,7 @@ use cargo_test_support::Project; #[cargo_test] fn case() { + cargo_test_support::registry::init(); let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; diff --git a/tests/testsuite/cargo_add/dev_existing_path_base/mod.rs b/tests/testsuite/cargo_add/dev_existing_path_base/mod.rs index be1a8550392..5a4f2c4a9ac 100644 --- a/tests/testsuite/cargo_add/dev_existing_path_base/mod.rs +++ b/tests/testsuite/cargo_add/dev_existing_path_base/mod.rs @@ -7,6 +7,7 @@ use cargo_test_support::Project; #[cargo_test] fn case() { + cargo_test_support::registry::init(); let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = project_root.join("primary"); diff --git a/tests/testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs b/tests/testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs index 9aeea125127..fb0e0a16cf8 100644 --- a/tests/testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs +++ b/tests/testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs @@ -7,6 +7,7 @@ use cargo_test_support::Project; #[cargo_test] fn case() { + cargo_test_support::registry::init(); let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; diff --git a/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/mod.rs b/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/mod.rs index 9aeea125127..fb0e0a16cf8 100644 --- a/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/mod.rs +++ b/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/mod.rs @@ -7,6 +7,7 @@ use cargo_test_support::Project; #[cargo_test] fn case() { + cargo_test_support::registry::init(); let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; diff --git a/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/mod.rs b/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/mod.rs index c564fa4360f..e7acbf0f468 100644 --- a/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/mod.rs +++ b/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/mod.rs @@ -7,6 +7,7 @@ use cargo_test_support::Project; #[cargo_test] fn case() { + cargo_test_support::registry::init(); let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; diff --git a/tests/testsuite/cargo_add/merge_activated_features/mod.rs b/tests/testsuite/cargo_add/merge_activated_features/mod.rs index d006d2b655d..385046d04d4 100644 --- a/tests/testsuite/cargo_add/merge_activated_features/mod.rs +++ b/tests/testsuite/cargo_add/merge_activated_features/mod.rs @@ -7,6 +7,7 @@ use cargo_test_support::Project; #[cargo_test] fn case() { + cargo_test_support::registry::init(); let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; diff --git a/tests/testsuite/cargo_add/normalize_name_path_existing/mod.rs b/tests/testsuite/cargo_add/normalize_name_path_existing/mod.rs index 19c86524222..ef4f357047e 100644 --- a/tests/testsuite/cargo_add/normalize_name_path_existing/mod.rs +++ b/tests/testsuite/cargo_add/normalize_name_path_existing/mod.rs @@ -7,6 +7,7 @@ use cargo_test_support::Project; #[cargo_test] fn case() { + cargo_test_support::registry::init(); let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; diff --git a/tests/testsuite/cargo_add/normalize_name_path_existing/stderr.term.svg b/tests/testsuite/cargo_add/normalize_name_path_existing/stderr.term.svg index 6c9588b1a20..d65b354d1d4 100644 --- a/tests/testsuite/cargo_add/normalize_name_path_existing/stderr.term.svg +++ b/tests/testsuite/cargo_add/normalize_name_path_existing/stderr.term.svg @@ -19,7 +19,7 @@ - Updating crates.io index + Updating `dummy-registry` index error: the crate `fuzzy-name` could not be found in registry index. diff --git a/tests/testsuite/cargo_add/path_base/mod.rs b/tests/testsuite/cargo_add/path_base/mod.rs index 326a76283bc..f94d9652353 100644 --- a/tests/testsuite/cargo_add/path_base/mod.rs +++ b/tests/testsuite/cargo_add/path_base/mod.rs @@ -7,6 +7,7 @@ use cargo_test_support::Project; #[cargo_test] fn case() { + cargo_test_support::registry::init(); let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = project_root.join("primary"); diff --git a/tests/testsuite/cargo_add/path_base_inferred_name/mod.rs b/tests/testsuite/cargo_add/path_base_inferred_name/mod.rs index 005a9d75330..e65bca79f44 100644 --- a/tests/testsuite/cargo_add/path_base_inferred_name/mod.rs +++ b/tests/testsuite/cargo_add/path_base_inferred_name/mod.rs @@ -7,6 +7,7 @@ use cargo_test_support::Project; #[cargo_test] fn case() { + cargo_test_support::registry::init(); let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = project_root.join("primary"); diff --git a/tests/testsuite/cargo_add/path_base_missing_base_path/mod.rs b/tests/testsuite/cargo_add/path_base_missing_base_path/mod.rs index dbae05ad0a4..065aa1dfe01 100644 --- a/tests/testsuite/cargo_add/path_base_missing_base_path/mod.rs +++ b/tests/testsuite/cargo_add/path_base_missing_base_path/mod.rs @@ -7,6 +7,7 @@ use cargo_test_support::Project; #[cargo_test] fn case() { + cargo_test_support::registry::init(); let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = project_root.join("primary"); diff --git a/tests/testsuite/cargo_add/path_base_unstable/mod.rs b/tests/testsuite/cargo_add/path_base_unstable/mod.rs index c55fa83a123..aec0e7ce140 100644 --- a/tests/testsuite/cargo_add/path_base_unstable/mod.rs +++ b/tests/testsuite/cargo_add/path_base_unstable/mod.rs @@ -7,6 +7,7 @@ use cargo_test_support::Project; #[cargo_test] fn case() { + cargo_test_support::registry::init(); let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = project_root.join("primary"); diff --git a/tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs b/tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs index 5825d0a7f7d..000138fdcc7 100644 --- a/tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs +++ b/tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs @@ -7,6 +7,7 @@ use cargo_test_support::Project; #[cargo_test] fn case() { + cargo_test_support::registry::init(); let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; diff --git a/tests/testsuite/cargo_info/specify_empty_version_with_url/mod.rs b/tests/testsuite/cargo_info/specify_empty_version_with_url/mod.rs index ee6c90ec275..0e3a6b84be6 100644 --- a/tests/testsuite/cargo_info/specify_empty_version_with_url/mod.rs +++ b/tests/testsuite/cargo_info/specify_empty_version_with_url/mod.rs @@ -1,8 +1,11 @@ use cargo_test_support::prelude::*; use cargo_test_support::{file, registry::RegistryBuilder}; +use super::init_registry_without_token; + #[cargo_test] fn case() { + init_registry_without_token(); let _ = RegistryBuilder::new() .alternative() .no_configure_token() diff --git a/tests/testsuite/cargo_info/specify_version_with_url_but_registry_is_not_matched/mod.rs b/tests/testsuite/cargo_info/specify_version_with_url_but_registry_is_not_matched/mod.rs index 3d460ccf495..706f2d9da0c 100644 --- a/tests/testsuite/cargo_info/specify_version_with_url_but_registry_is_not_matched/mod.rs +++ b/tests/testsuite/cargo_info/specify_version_with_url_but_registry_is_not_matched/mod.rs @@ -1,8 +1,11 @@ use cargo_test_support::prelude::*; use cargo_test_support::{file, registry::RegistryBuilder}; +use super::init_registry_without_token; + #[cargo_test] fn case() { + init_registry_without_token(); let _ = RegistryBuilder::new() .alternative() .no_configure_token() diff --git a/tests/testsuite/cargo_info/within_ws_with_alternative_registry/mod.rs b/tests/testsuite/cargo_info/within_ws_with_alternative_registry/mod.rs index 21579d68194..4c504f901d9 100644 --- a/tests/testsuite/cargo_info/within_ws_with_alternative_registry/mod.rs +++ b/tests/testsuite/cargo_info/within_ws_with_alternative_registry/mod.rs @@ -2,8 +2,11 @@ use cargo_test_support::prelude::*; use cargo_test_support::{compare::assert_ui, registry::RegistryBuilder, Project}; use cargo_test_support::{current_dir, file}; +use super::init_registry_without_token; + #[cargo_test] fn case() { + init_registry_without_token(); let _ = RegistryBuilder::new() .alternative() .no_configure_token() diff --git a/tests/testsuite/cargo_info/within_ws_with_alternative_registry/stderr.term.svg b/tests/testsuite/cargo_info/within_ws_with_alternative_registry/stderr.term.svg index 69ddaf3115c..65cf880014f 100644 --- a/tests/testsuite/cargo_info/within_ws_with_alternative_registry/stderr.term.svg +++ b/tests/testsuite/cargo_info/within_ws_with_alternative_registry/stderr.term.svg @@ -18,7 +18,7 @@ - Updating crates.io index + Updating `dummy-registry` index Updating `alternative` index diff --git a/tests/testsuite/package.rs b/tests/testsuite/package.rs index 23606176a87..54d087747da 100644 --- a/tests/testsuite/package.rs +++ b/tests/testsuite/package.rs @@ -6065,6 +6065,7 @@ src/main.rs #[cargo_test] fn workspace_with_local_deps_index_mismatch() { + registry::init(); let alt_reg = registry::RegistryBuilder::new() .http_api() .http_index() @@ -6123,12 +6124,12 @@ fn workspace_with_local_deps_index_mismatch() { [PACKAGING] level2 v0.0.1 ([ROOT]/foo/level2) [PACKAGED] 4 files, [FILE_SIZE]B ([FILE_SIZE]B compressed) [PACKAGING] level1 v0.0.1 ([ROOT]/foo/level1) -[UPDATING] crates.io index +[UPDATING] `dummy-registry` index [ERROR] failed to prepare local package for uploading Caused by: no matching package named `level2` found - location searched: crates.io index + location searched: `dummy-registry` index (which is replacing registry `crates-io`) required by package `level1 v0.0.1 ([ROOT]/foo/level1)` "#]])