actions/cargo-binstall
1
0
Fork 0
mirror of https://github.com/cargo-bins/cargo-binstall.git synced 2025-04-20 12:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Deprecate --secure, enforce HTTPS (#343)

Browse source 
Resolves #124
This commit is contained in:
Félix Saparelli 2022-09-05 16:18:14 +12:00 • committed by GitHub
parent 73f7719e53
commit db82c6935f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/scripts/tests.sh vendored
View file

@ -24,14 +24,12 @@ cargo binstall --help >/dev/null
# Test that the installed binaries can be run # Test that the installed binaries can be run
cargo binstall --help >/dev/null cargo binstall --help >/dev/null
# Install binaries using secure mode
min_tls=1.3 min_tls=1.3
[[ "${2:-}" == "Windows" ]] && min_tls=1.2 # WinTLS on GHA doesn't support 1.3 yet [[ "${2:-}" == "Windows" ]] && min_tls=1.2 # WinTLS on GHA doesn't support 1.3 yet
"./$1" binstall \ "./$1" binstall \
--force \ --force \
--log-level debug \ --log-level debug \
--secure \
--min-tls-version $min_tls \ --min-tls-version $min_tls \
--no-confirm \ --no-confirm \
cargo-binstall cargo-binstall

11
crates/bin/src/args.rs
View file

@ -113,15 +113,8 @@ pub struct Args {
#[clap(help_heading = "Options", long)] #[clap(help_heading = "Options", long)]
pub install_path: Option<PathBuf>, pub install_path: Option<PathBuf>,
/// Enforce downloads over secure transports only. /// Deprecated, here for back-compat only. Secure is now on by default.
/// #[clap(hide(true), long)]
/// Insecure HTTP downloads will be removed completely in the future; in the meantime this
/// option forces a fail when the remote endpoint uses plaintext HTTP or insecure TLS suites.
///
/// Without this option, plain HTTP will warn.
///
/// Implies `--min-tls-version=1.2`.
#[clap(help_heading = "Options", long)]
pub secure: bool, pub secure: bool,
/// Force a crate to be installed even if it is already installed. /// Force a crate to be installed even if it is already installed.

2
crates/bin/src/entry.rs
View file

@ -32,7 +32,7 @@ pub async fn install_crates(mut args: Args, jobserver_client: LazyJobserverClien
let desired_targets = get_desired_targets(args.targets.take()); let desired_targets = get_desired_targets(args.targets.take());
// Initialize reqwest client // Initialize reqwest client
let client = create_reqwest_client(args.secure, args.min_tls_version.map(|v| v.into()))?; let client = create_reqwest_client(args.min_tls_version.map(|v| v.into()))?;
// Build crates.io api client // Build crates.io api client
let crates_io_api_client = crates_io_api::AsyncClient::new( let crates_io_api_client = crates_io_api::AsyncClient::new(

12
crates/lib/src/helpers/remote.rs
View file

@ -8,19 +8,13 @@ use url::Url;
use crate::errors::BinstallError; use crate::errors::BinstallError;
pub fn create_reqwest_client( pub fn create_reqwest_client(min_tls: Option<tls::Version>) -> Result<Client, BinstallError> {
secure: bool,
min_tls: Option<tls::Version>,
) -> Result<Client, BinstallError> {
const USER_AGENT: &str = concat!(env!("CARGO_PKG_NAME"), "/", env!("CARGO_PKG_VERSION")); const USER_AGENT: &str = concat!(env!("CARGO_PKG_NAME"), "/", env!("CARGO_PKG_VERSION"));
let mut builder = ClientBuilder::new().user_agent(USER_AGENT); let mut builder = ClientBuilder::new()
.user_agent(USER_AGENT)
if secure {
builder = builder
.https_only(true) .https_only(true)
.min_tls_version(tls::Version::TLS_1_2); .min_tls_version(tls::Version::TLS_1_2);
}
if let Some(ver) = min_tls { if let Some(ver) = min_tls {
builder = builder.min_tls_version(ver); builder = builder.min_tls_version(ver);