Skip to content

Commit c750567

Browse files
konstincharliermarsh
konstin
authored and
charliermarsh
committed
Make allow insecure host a global option
Not verifying the certificates of certain hosts should be supported for all kinds of HTTPS connections, so we're making it a global option, just like native tls. This fixes the remaining places using a client but were not configuring allow insecure host. Fixes #6983 (i think) Closes #6983
1 parent 27825d8 commit c750567

30 files changed

+727
-363
lines changed

‎crates/uv-cli/src/lib.rs

+20-97
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,26 @@ pub struct GlobalArgs {
205205
#[arg(global = true, long, overrides_with("offline"), hide = true)]
206206
pub no_offline: bool,
207207

208+
/// Allow insecure connections to a host.
209+
///
210+
/// Can be provided multiple times.
211+
///
212+
/// Expects to receive either a hostname (e.g., `localhost`), a host-port pair (e.g.,
213+
/// `localhost:8080`), or a URL (e.g., `https://localhost`).
214+
///
215+
/// WARNING: Hosts included in this list will not be verified against the system's certificate
216+
/// store. Only use `--allow-insecure-host` in a secure network with verified sources, as it
217+
/// bypasses SSL verification and could expose you to MITM attacks.
218+
#[arg(
219+
global = true,
220+
long,
221+
alias = "trusted-host",
222+
env = EnvVars::UV_INSECURE_HOST,
223+
value_delimiter = ' ',
224+
value_parser = parse_insecure_host,
225+
)]
226+
pub allow_insecure_host: Option<Vec<Maybe<TrustedHost>>>,
227+
208228
/// Whether to enable experimental, preview features.
209229
///
210230
/// Preview features may change without warning.
@@ -1771,25 +1791,6 @@ pub struct PipUninstallArgs {
17711791
#[arg(long, value_enum, env = EnvVars::UV_KEYRING_PROVIDER)]
17721792
pub keyring_provider: Option<KeyringProviderType>,
17731793

1774-
/// Allow insecure connections to a host.
1775-
///
1776-
/// Can be provided multiple times.
1777-
///
1778-
/// Expects to receive either a hostname (e.g., `localhost`), a host-port pair (e.g.,
1779-
/// `localhost:8080`), or a URL (e.g., `https://localhost`).
1780-
///
1781-
/// WARNING: Hosts included in this list will not be verified against the system's certificate
1782-
/// store. Only use `--allow-insecure-host` in a secure network with verified sources, as it
1783-
/// bypasses SSL verification and could expose you to MITM attacks.
1784-
#[arg(
1785-
long,
1786-
alias = "trusted-host",
1787-
env = EnvVars::UV_INSECURE_HOST,
1788-
value_delimiter = ' ',
1789-
value_parser = parse_insecure_host,
1790-
)]
1791-
pub allow_insecure_host: Option<Vec<Maybe<TrustedHost>>>,
1792-
17931794
/// Use the system Python to uninstall packages.
17941795
///
17951796
/// By default, uv uninstalls from the virtual environment in the current working directory or
@@ -2363,25 +2364,6 @@ pub struct VenvArgs {
23632364
#[arg(long, value_enum, env = EnvVars::UV_KEYRING_PROVIDER)]
23642365
pub keyring_provider: Option<KeyringProviderType>,
23652366

2366-
/// Allow insecure connections to a host.
2367-
///
2368-
/// Can be provided multiple times.
2369-
///
2370-
/// Expects to receive either a hostname (e.g., `localhost`), a host-port pair (e.g.,
2371-
/// `localhost:8080`), or a URL (e.g., `https://localhost`).
2372-
///
2373-
/// WARNING: Hosts included in this list will not be verified against the system's certificate
2374-
/// store. Only use `--allow-insecure-host` in a secure network with verified sources, as it
2375-
/// bypasses SSL verification and could expose you to MITM attacks.
2376-
#[arg(
2377-
long,
2378-
alias = "trusted-host",
2379-
env = EnvVars::UV_INSECURE_HOST,
2380-
value_delimiter = ' ',
2381-
value_parser = parse_insecure_host,
2382-
)]
2383-
pub allow_insecure_host: Option<Vec<Maybe<TrustedHost>>>,
2384-
23852367
/// Limit candidate packages to those that were uploaded prior to the given date.
23862368
///
23872369
/// Accepts both RFC 3339 timestamps (e.g., `2006-12-02T02:07:43Z`) and local dates in the same
@@ -4219,26 +4201,6 @@ pub struct InstallerArgs {
42194201
)]
42204202
pub keyring_provider: Option<KeyringProviderType>,
42214203

4222-
/// Allow insecure connections to a host.
4223-
///
4224-
/// Can be provided multiple times.
4225-
///
4226-
/// Expects to receive either a hostname (e.g., `localhost`), a host-port pair (e.g.,
4227-
/// `localhost:8080`), or a URL (e.g., `https://localhost`).
4228-
///
4229-
/// WARNING: Hosts included in this list will not be verified against the system's certificate
4230-
/// store. Only use `--allow-insecure-host` in a secure network with verified sources, as it
4231-
/// bypasses SSL verification and could expose you to MITM attacks.
4232-
#[arg(
4233-
long,
4234-
alias = "trusted-host",
4235-
env = EnvVars::UV_INSECURE_HOST,
4236-
value_delimiter = ' ',
4237-
value_parser = parse_insecure_host,
4238-
help_heading = "Index options"
4239-
)]
4240-
pub allow_insecure_host: Option<Vec<Maybe<TrustedHost>>>,
4241-
42424204
/// Settings to pass to the PEP 517 build backend, specified as `KEY=VALUE` pairs.
42434205
#[arg(
42444206
long,
@@ -4381,26 +4343,6 @@ pub struct ResolverArgs {
43814343
)]
43824344
pub keyring_provider: Option<KeyringProviderType>,
43834345

4384-
/// Allow insecure connections to a host.
4385-
///
4386-
/// Can be provided multiple times.
4387-
///
4388-
/// Expects to receive either a hostname (e.g., `localhost`), a host-port pair (e.g.,
4389-
/// `localhost:8080`), or a URL (e.g., `https://localhost`).
4390-
///
4391-
/// WARNING: Hosts included in this list will not be verified against the system's certificate
4392-
/// store. Only use `--allow-insecure-host` in a secure network with verified sources, as it
4393-
/// bypasses SSL verification and could expose you to MITM attacks.
4394-
#[arg(
4395-
long,
4396-
alias = "trusted-host",
4397-
env = EnvVars::UV_INSECURE_HOST,
4398-
value_delimiter = ' ',
4399-
value_parser = parse_insecure_host,
4400-
help_heading = "Index options"
4401-
)]
4402-
pub allow_insecure_host: Option<Vec<Maybe<TrustedHost>>>,
4403-
44044346
/// The strategy to use when selecting between the different compatible versions for a given
44054347
/// package requirement.
44064348
///
@@ -4794,25 +4736,6 @@ pub struct PublishArgs {
47944736
/// Defaults to `disabled`.
47954737
#[arg(long, value_enum, env = EnvVars::UV_KEYRING_PROVIDER)]
47964738
pub keyring_provider: Option<KeyringProviderType>,
4797-
4798-
/// Allow insecure connections to a host.
4799-
///
4800-
/// Can be provided multiple times.
4801-
///
4802-
/// Expects to receive either a hostname (e.g., `localhost`), a host-port pair (e.g.,
4803-
/// `localhost:8080`), or a URL (e.g., `https://localhost`).
4804-
///
4805-
/// WARNING: Hosts included in this list will not be verified against the system's certificate
4806-
/// store. Only use `--allow-insecure-host` in a secure network with verified sources, as it
4807-
/// bypasses SSL verification and could expose you to MITM attacks.
4808-
#[arg(
4809-
long,
4810-
alias = "trusted-host",
4811-
env = EnvVars::UV_INSECURE_HOST,
4812-
value_delimiter = ' ',
4813-
value_parser = parse_insecure_host,
4814-
)]
4815-
pub allow_insecure_host: Option<Vec<Maybe<TrustedHost>>>,
48164739
}
48174740

48184741
/// See [PEP 517](https://peps.python.org/pep-0517/) and

‎crates/uv-cli/src/options.rs

-21
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ impl From<ResolverArgs> for PipOptions {
4040
upgrade_package,
4141
index_strategy,
4242
keyring_provider,
43-
allow_insecure_host,
4443
resolution,
4544
prerelease,
4645
pre,
@@ -58,12 +57,6 @@ impl From<ResolverArgs> for PipOptions {
5857
upgrade_package: Some(upgrade_package),
5958
index_strategy,
6059
keyring_provider,
61-
allow_insecure_host: allow_insecure_host.map(|allow_insecure_host| {
62-
allow_insecure_host
63-
.into_iter()
64-
.filter_map(Maybe::into_option)
65-
.collect()
66-
}),
6760
resolution,
6861
prerelease: if pre {
6962
Some(PrereleaseMode::Allow)
@@ -91,7 +84,6 @@ impl From<InstallerArgs> for PipOptions {
9184
reinstall_package,
9285
index_strategy,
9386
keyring_provider,
94-
allow_insecure_host,
9587
config_setting,
9688
no_build_isolation,
9789
build_isolation,
@@ -107,12 +99,6 @@ impl From<InstallerArgs> for PipOptions {
10799
reinstall_package: Some(reinstall_package),
108100
index_strategy,
109101
keyring_provider,
110-
allow_insecure_host: allow_insecure_host.map(|allow_insecure_host| {
111-
allow_insecure_host
112-
.into_iter()
113-
.filter_map(Maybe::into_option)
114-
.collect()
115-
}),
116102
config_settings: config_setting
117103
.map(|config_settings| config_settings.into_iter().collect::<ConfigSettings>()),
118104
no_build_isolation: flag(no_build_isolation, build_isolation),
@@ -235,7 +221,6 @@ pub fn resolver_options(
235221
upgrade_package,
236222
index_strategy,
237223
keyring_provider,
238-
allow_insecure_host,
239224
resolution,
240225
prerelease,
241226
pre,
@@ -289,12 +274,6 @@ pub fn resolver_options(
289274
upgrade_package: Some(upgrade_package),
290275
index_strategy,
291276
keyring_provider,
292-
allow_insecure_host: allow_insecure_host.map(|allow_insecure_host| {
293-
allow_insecure_host
294-
.into_iter()
295-
.filter_map(Maybe::into_option)
296-
.collect()
297-
}),
298277
resolution,
299278
prerelease: if pre {
300279
Some(PrereleaseMode::Allow)

‎crates/uv-settings/src/settings.rs

+18-4
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,22 @@ pub struct GlobalOptions {
246246
"#
247247
)]
248248
pub concurrent_installs: Option<NonZeroUsize>,
249+
/// Allow insecure connections to host.
250+
///
251+
/// Expects to receive either a hostname (e.g., `localhost`), a host-port pair (e.g.,
252+
/// `localhost:8080`), or a URL (e.g., `https://localhost`).
253+
///
254+
/// WARNING: Hosts included in this list will not be verified against the system's certificate
255+
/// store. Only use `--allow-insecure-host` in a secure network with verified sources, as it
256+
/// bypasses SSL verification and could expose you to MITM attacks.
257+
#[option(
258+
default = "[]",
259+
value_type = "list[str]",
260+
example = r#"
261+
allow-insecure-host = ["localhost:8080"]
262+
"#
263+
)]
264+
pub allow_insecure_host: Option<Vec<TrustedHost>>,
249265
}
250266

251267
/// Settings relevant to all installer operations.
@@ -258,7 +274,6 @@ pub struct InstallerOptions {
258274
pub find_links: Option<Vec<PipFindLinks>>,
259275
pub index_strategy: Option<IndexStrategy>,
260276
pub keyring_provider: Option<KeyringProviderType>,
261-
pub allow_insecure_host: Option<Vec<TrustedHost>>,
262277
pub config_settings: Option<ConfigSettings>,
263278
pub exclude_newer: Option<ExcludeNewer>,
264279
pub link_mode: Option<LinkMode>,
@@ -283,7 +298,6 @@ pub struct ResolverOptions {
283298
pub find_links: Option<Vec<PipFindLinks>>,
284299
pub index_strategy: Option<IndexStrategy>,
285300
pub keyring_provider: Option<KeyringProviderType>,
286-
pub allow_insecure_host: Option<Vec<TrustedHost>>,
287301
pub resolution: Option<ResolutionMode>,
288302
pub prerelease: Option<PrereleaseMode>,
289303
pub dependency_metadata: Option<Vec<StaticMetadata>>,
@@ -1374,7 +1388,6 @@ impl From<ResolverInstallerOptions> for ResolverOptions {
13741388
find_links: value.find_links,
13751389
index_strategy: value.index_strategy,
13761390
keyring_provider: value.keyring_provider,
1377-
allow_insecure_host: value.allow_insecure_host,
13781391
resolution: value.resolution,
13791392
prerelease: value.prerelease,
13801393
dependency_metadata: value.dependency_metadata,
@@ -1404,7 +1417,6 @@ impl From<ResolverInstallerOptions> for InstallerOptions {
14041417
find_links: value.find_links,
14051418
index_strategy: value.index_strategy,
14061419
keyring_provider: value.keyring_provider,
1407-
allow_insecure_host: value.allow_insecure_host,
14081420
config_settings: value.config_settings,
14091421
exclude_newer: value.exclude_newer,
14101422
link_mode: value.link_mode,
@@ -1656,6 +1668,8 @@ impl From<OptionsWire> for Options {
16561668
concurrent_downloads,
16571669
concurrent_builds,
16581670
concurrent_installs,
1671+
// Used twice for backwards compatibility
1672+
allow_insecure_host: allow_insecure_host.clone(),
16591673
},
16601674
top_level: ResolverInstallerOptions {
16611675
index,

‎crates/uv/src/commands/build_frontend.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ pub(crate) async fn build_frontend(
5858
connectivity: Connectivity,
5959
concurrency: Concurrency,
6060
native_tls: bool,
61+
allow_insecure_host: &[TrustedHost],
6162
cache: &Cache,
6263
printer: Printer,
6364
) -> Result<ExitStatus> {
@@ -80,6 +81,7 @@ pub(crate) async fn build_frontend(
8081
connectivity,
8182
concurrency,
8283
native_tls,
84+
allow_insecure_host,
8385
cache,
8486
printer,
8587
)
@@ -120,6 +122,7 @@ async fn build_impl(
120122
connectivity: Connectivity,
121123
concurrency: Concurrency,
122124
native_tls: bool,
125+
allow_insecure_host: &[TrustedHost],
123126
cache: &Cache,
124127
printer: Printer,
125128
) -> Result<BuildResult> {
@@ -128,7 +131,6 @@ async fn build_impl(
128131
index_locations,
129132
index_strategy,
130133
keyring_provider,
131-
allow_insecure_host,
132134
resolution: _,
133135
prerelease: _,
134136
dependency_metadata,
@@ -144,7 +146,8 @@ async fn build_impl(
144146

145147
let client_builder = BaseClientBuilder::default()
146148
.connectivity(connectivity)
147-
.native_tls(native_tls);
149+
.native_tls(native_tls)
150+
.allow_insecure_host(allow_insecure_host.to_vec());
148151

149152
// Determine the source to build.
150153
let src = if let Some(src) = src {

‎crates/uv/src/commands/pip/compile.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ pub(crate) async fn pip_compile(
7676
index_strategy: IndexStrategy,
7777
dependency_metadata: DependencyMetadata,
7878
keyring_provider: KeyringProviderType,
79-
allow_insecure_host: Vec<TrustedHost>,
79+
allow_insecure_host: &[TrustedHost],
8080
config_settings: ConfigSettings,
8181
connectivity: Connectivity,
8282
no_build_isolation: bool,
@@ -110,7 +110,7 @@ pub(crate) async fn pip_compile(
110110
.connectivity(connectivity)
111111
.native_tls(native_tls)
112112
.keyring(keyring_provider)
113-
.allow_insecure_host(allow_insecure_host);
113+
.allow_insecure_host(allow_insecure_host.to_vec());
114114

115115
// Read all requirements from the provided sources.
116116
let RequirementsSpecification {

‎crates/uv/src/commands/pip/install.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ pub(crate) async fn pip_install(
5656
index_strategy: IndexStrategy,
5757
dependency_metadata: DependencyMetadata,
5858
keyring_provider: KeyringProviderType,
59-
allow_insecure_host: Vec<TrustedHost>,
6059
reinstall: Reinstall,
6160
link_mode: LinkMode,
6261
compile: bool,
@@ -79,6 +78,7 @@ pub(crate) async fn pip_install(
7978
prefix: Option<Prefix>,
8079
concurrency: Concurrency,
8180
native_tls: bool,
81+
allow_insecure_host: &[TrustedHost],
8282
cache: Cache,
8383
dry_run: bool,
8484
printer: Printer,
@@ -89,7 +89,7 @@ pub(crate) async fn pip_install(
8989
.connectivity(connectivity)
9090
.native_tls(native_tls)
9191
.keyring(keyring_provider)
92-
.allow_insecure_host(allow_insecure_host);
92+
.allow_insecure_host(allow_insecure_host.to_vec());
9393

9494
// Read all requirements from the provided sources.
9595
let RequirementsSpecification {

‎crates/uv/src/commands/pip/sync.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ pub(crate) async fn pip_sync(
4848
index_strategy: IndexStrategy,
4949
dependency_metadata: DependencyMetadata,
5050
keyring_provider: KeyringProviderType,
51-
allow_insecure_host: Vec<TrustedHost>,
5251
allow_empty_requirements: bool,
5352
connectivity: Connectivity,
5453
config_settings: &ConfigSettings,
@@ -67,6 +66,7 @@ pub(crate) async fn pip_sync(
6766
sources: SourceStrategy,
6867
concurrency: Concurrency,
6968
native_tls: bool,
69+
allow_insecure_host: &[TrustedHost],
7070
cache: Cache,
7171
dry_run: bool,
7272
printer: Printer,
@@ -75,7 +75,7 @@ pub(crate) async fn pip_sync(
7575
.connectivity(connectivity)
7676
.native_tls(native_tls)
7777
.keyring(keyring_provider)
78-
.allow_insecure_host(allow_insecure_host);
78+
.allow_insecure_host(allow_insecure_host.to_vec());
7979

8080
// Initialize a few defaults.
8181
let overrides = &[];

0 commit comments

Comments
 (0)