Skip to content

Commit bf46289

Browse files
konstincharliermarsh
authored andcommitted
Make --allow-insecure-host a global option (#8476)
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 --------- Co-authored-by: Charlie Marsh <[email protected]>
1 parent bc3dced commit bf46289

31 files changed

+708
-518
lines changed

crates/uv-cli/src/lib.rs

+20-117
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
///
@@ -4573,26 +4515,6 @@ pub struct ResolverInstallerArgs {
45734515
)]
45744516
pub keyring_provider: Option<KeyringProviderType>,
45754517

4576-
/// Allow insecure connections to a host.
4577-
///
4578-
/// Can be provided multiple times.
4579-
///
4580-
/// Expects to receive either a hostname (e.g., `localhost`), a host-port pair (e.g.,
4581-
/// `localhost:8080`), or a URL (e.g., `https://localhost`).
4582-
///
4583-
/// WARNING: Hosts included in this list will not be verified against the system's certificate
4584-
/// store. Only use `--allow-insecure-host` in a secure network with verified sources, as it
4585-
/// bypasses SSL verification and could expose you to MITM attacks.
4586-
#[arg(
4587-
long,
4588-
alias = "trusted-host",
4589-
env = EnvVars::UV_INSECURE_HOST,
4590-
value_delimiter = ' ',
4591-
value_parser = parse_insecure_host,
4592-
help_heading = "Index options"
4593-
)]
4594-
pub allow_insecure_host: Option<Vec<Maybe<TrustedHost>>>,
4595-
45964518
/// The strategy to use when selecting between the different compatible versions for a given
45974519
/// package requirement.
45984520
///
@@ -4794,25 +4716,6 @@ pub struct PublishArgs {
47944716
/// Defaults to `disabled`.
47954717
#[arg(long, value_enum, env = EnvVars::UV_KEYRING_PROVIDER)]
47964718
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>>>,
48164719
}
48174720

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

crates/uv-cli/src/options.rs

-35
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),
@@ -137,7 +123,6 @@ impl From<ResolverInstallerArgs> for PipOptions {
137123
reinstall_package,
138124
index_strategy,
139125
keyring_provider,
140-
allow_insecure_host,
141126
resolution,
142127
prerelease,
143128
pre,
@@ -159,12 +144,6 @@ impl From<ResolverInstallerArgs> for PipOptions {
159144
reinstall_package: Some(reinstall_package),
160145
index_strategy,
161146
keyring_provider,
162-
allow_insecure_host: allow_insecure_host.map(|allow_insecure_host| {
163-
allow_insecure_host
164-
.into_iter()
165-
.filter_map(Maybe::into_option)
166-
.collect()
167-
}),
168147
resolution,
169148
prerelease: if pre {
170149
Some(PrereleaseMode::Allow)
@@ -235,7 +214,6 @@ pub fn resolver_options(
235214
upgrade_package,
236215
index_strategy,
237216
keyring_provider,
238-
allow_insecure_host,
239217
resolution,
240218
prerelease,
241219
pre,
@@ -289,12 +267,6 @@ pub fn resolver_options(
289267
upgrade_package: Some(upgrade_package),
290268
index_strategy,
291269
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-
}),
298270
resolution,
299271
prerelease: if pre {
300272
Some(PrereleaseMode::Allow)
@@ -331,7 +303,6 @@ pub fn resolver_installer_options(
331303
reinstall_package,
332304
index_strategy,
333305
keyring_provider,
334-
allow_insecure_host,
335306
resolution,
336307
prerelease,
337308
pre,
@@ -397,12 +368,6 @@ pub fn resolver_installer_options(
397368
},
398369
index_strategy,
399370
keyring_provider,
400-
allow_insecure_host: allow_insecure_host.map(|allow_insecure_host| {
401-
allow_insecure_host
402-
.into_iter()
403-
.filter_map(Maybe::into_option)
404-
.collect()
405-
}),
406371
resolution,
407372
prerelease: if pre {
408373
Some(PrereleaseMode::Allow)

0 commit comments

Comments
 (0)