Skip to content

Commit fb89b64

Browse files
zaniebcharliermarsh
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 <charlie.r.marsh@gmail.com>
1 parent 6334675 commit fb89b64

31 files changed

+711
-522
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.
@@ -1768,25 +1788,6 @@ pub struct PipUninstallArgs {
17681788
#[arg(long, value_enum, env = EnvVars::UV_KEYRING_PROVIDER)]
17691789
pub keyring_provider: Option<KeyringProviderType>,
17701790

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

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

4287-
/// Allow insecure connections to a host.
4288-
///
4289-
/// Can be provided multiple times.
4290-
///
4291-
/// Expects to receive either a hostname (e.g., `localhost`), a host-port pair (e.g.,
4292-
/// `localhost:8080`), or a URL (e.g., `https://localhost`).
4293-
///
4294-
/// WARNING: Hosts included in this list will not be verified against the system's certificate
4295-
/// store. Only use `--allow-insecure-host` in a secure network with verified sources, as it
4296-
/// bypasses SSL verification and could expose you to MITM attacks.
4297-
#[arg(
4298-
long,
4299-
alias = "trusted-host",
4300-
env = EnvVars::UV_INSECURE_HOST,
4301-
value_delimiter = ' ',
4302-
value_parser = parse_insecure_host,
4303-
help_heading = "Index options"
4304-
)]
4305-
pub allow_insecure_host: Option<Vec<Maybe<TrustedHost>>>,
4306-
43074269
/// Settings to pass to the PEP 517 build backend, specified as `KEY=VALUE` pairs.
43084270
#[arg(
43094271
long,
@@ -4446,26 +4408,6 @@ pub struct ResolverArgs {
44464408
)]
44474409
pub keyring_provider: Option<KeyringProviderType>,
44484410

4449-
/// Allow insecure connections to a host.
4450-
///
4451-
/// Can be provided multiple times.
4452-
///
4453-
/// Expects to receive either a hostname (e.g., `localhost`), a host-port pair (e.g.,
4454-
/// `localhost:8080`), or a URL (e.g., `https://localhost`).
4455-
///
4456-
/// WARNING: Hosts included in this list will not be verified against the system's certificate
4457-
/// store. Only use `--allow-insecure-host` in a secure network with verified sources, as it
4458-
/// bypasses SSL verification and could expose you to MITM attacks.
4459-
#[arg(
4460-
long,
4461-
alias = "trusted-host",
4462-
env = EnvVars::UV_INSECURE_HOST,
4463-
value_delimiter = ' ',
4464-
value_parser = parse_insecure_host,
4465-
help_heading = "Index options"
4466-
)]
4467-
pub allow_insecure_host: Option<Vec<Maybe<TrustedHost>>>,
4468-
44694411
/// The strategy to use when selecting between the different compatible versions for a given
44704412
/// package requirement.
44714413
///
@@ -4638,26 +4580,6 @@ pub struct ResolverInstallerArgs {
46384580
)]
46394581
pub keyring_provider: Option<KeyringProviderType>,
46404582

4641-
/// Allow insecure connections to a host.
4642-
///
4643-
/// Can be provided multiple times.
4644-
///
4645-
/// Expects to receive either a hostname (e.g., `localhost`), a host-port pair (e.g.,
4646-
/// `localhost:8080`), or a URL (e.g., `https://localhost`).
4647-
///
4648-
/// WARNING: Hosts included in this list will not be verified against the system's certificate
4649-
/// store. Only use `--allow-insecure-host` in a secure network with verified sources, as it
4650-
/// bypasses SSL verification and could expose you to MITM attacks.
4651-
#[arg(
4652-
long,
4653-
alias = "trusted-host",
4654-
env = EnvVars::UV_INSECURE_HOST,
4655-
value_delimiter = ' ',
4656-
value_parser = parse_insecure_host,
4657-
help_heading = "Index options"
4658-
)]
4659-
pub allow_insecure_host: Option<Vec<Maybe<TrustedHost>>>,
4660-
46614583
/// The strategy to use when selecting between the different compatible versions for a given
46624584
/// package requirement.
46634585
///
@@ -4864,25 +4786,6 @@ pub struct PublishArgs {
48644786
#[arg(long, value_enum, env = EnvVars::UV_KEYRING_PROVIDER)]
48654787
pub keyring_provider: Option<KeyringProviderType>,
48664788

4867-
/// Allow insecure connections to a host.
4868-
///
4869-
/// Can be provided multiple times.
4870-
///
4871-
/// Expects to receive either a hostname (e.g., `localhost`), a host-port pair (e.g.,
4872-
/// `localhost:8080`), or a URL (e.g., `https://localhost`).
4873-
///
4874-
/// WARNING: Hosts included in this list will not be verified against the system's certificate
4875-
/// store. Only use `--allow-insecure-host` in a secure network with verified sources, as it
4876-
/// bypasses SSL verification and could expose you to MITM attacks.
4877-
#[arg(
4878-
long,
4879-
alias = "trusted-host",
4880-
env = EnvVars::UV_INSECURE_HOST,
4881-
value_delimiter = ' ',
4882-
value_parser = parse_insecure_host,
4883-
)]
4884-
pub allow_insecure_host: Option<Vec<Maybe<TrustedHost>>>,
4885-
48864789
/// Check an index URL for existing files to skip duplicate uploads.
48874790
///
48884791
/// This option allows retrying publishing that failed after only some, but not all files have

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)