Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ tar = { version = "0.4", optional = true }
semver = "1.0"
zip = { version = "2", default-features = false, features = ["time"], optional = true }
either = { version = "1", optional = true }
reqwest = { version = "0.12", default-features = false, features = ["blocking", "json", "rustls-tls", "http2"] }
reqwest = { version = "0.12", default-features = false, features = ["blocking", "json", "http2"] }
hyper = "1"
indicatif = "0.17"
quick-xml = "0.37"
Expand Down
19 changes: 4 additions & 15 deletions src/backends/gitea.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use std::path::{Path, PathBuf};
use reqwest::{self, header};

use crate::backends::find_rel_next_link;
use crate::client;
use crate::version::bump_is_greater;
use crate::{
errors::*,
Expand Down Expand Up @@ -155,7 +156,6 @@ impl ReleaseList {
/// Retrieve a list of `Release`s.
/// If specified, filter for those containing a specified `target`
pub fn fetch(self) -> Result<Vec<Release>> {
set_ssl_vars!();
let api_url = format!(
"{}/api/v1/repos/{}/{}/releases",
self.host, self.repo_owner, self.repo_name
Expand All @@ -173,10 +173,7 @@ impl ReleaseList {
}

fn fetch_releases(&self, url: &str) -> Result<Vec<Release>> {
let client = reqwest::blocking::ClientBuilder::new()
.use_rustls_tls()
.http2_adaptive_window(true)
.build()?;
let client = client()?;
let resp = client
.get(url)
.headers(api_headers(&self.auth_token)?)
Expand Down Expand Up @@ -514,15 +511,11 @@ impl Update {

impl ReleaseUpdate for Update {
fn get_latest_release(&self) -> Result<Release> {
set_ssl_vars!();
let api_url = format!(
"{}/api/v1/repos/{}/{}/releases",
self.host, self.repo_owner, self.repo_name
);
let client = reqwest::blocking::ClientBuilder::new()
.use_rustls_tls()
.http2_adaptive_window(true)
.build()?;
let client = client()?;
let resp = client
.get(&api_url)
.headers(self.api_headers(&self.auth_token)?)
Expand Down Expand Up @@ -575,15 +568,11 @@ impl ReleaseUpdate for Update {
}

fn get_release_version(&self, ver: &str) -> Result<Release> {
set_ssl_vars!();
let api_url = format!(
"{}/api/v1/repos/{}/{}/releases/tags/{}",
self.host, self.repo_owner, self.repo_name, ver
);
let client = reqwest::blocking::ClientBuilder::new()
.use_rustls_tls()
.http2_adaptive_window(true)
.build()?;
let client = client()?;
let resp = client
.get(&api_url)
.headers(self.api_headers(&self.auth_token)?)
Expand Down
19 changes: 4 additions & 15 deletions src/backends/github.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use std::path::{Path, PathBuf};
use reqwest::{self, header};

use crate::backends::find_rel_next_link;
use crate::client;
use crate::version::bump_is_greater;
use crate::{
errors::*,
Expand Down Expand Up @@ -154,7 +155,6 @@ impl ReleaseList {
/// Retrieve a list of `Release`s.
/// If specified, filter for those containing a specified `target`
pub fn fetch(self) -> Result<Vec<Release>> {
set_ssl_vars!();
let api_url = format!(
"{}/repos/{}/{}/releases",
self.custom_url
Expand All @@ -175,10 +175,7 @@ impl ReleaseList {
}

fn fetch_releases(&self, url: &str) -> Result<Vec<Release>> {
let client = reqwest::blocking::ClientBuilder::new()
.use_rustls_tls()
.http2_adaptive_window(true)
.build()?;
let client = client()?;
let resp = client
.get(url)
.headers(api_headers(&self.auth_token)?)
Expand Down Expand Up @@ -515,7 +512,6 @@ impl Update {

impl ReleaseUpdate for Update {
fn get_latest_release(&self) -> Result<Release> {
set_ssl_vars!();
let api_url = format!(
"{}/repos/{}/{}/releases/latest",
self.custom_url
Expand All @@ -524,10 +520,7 @@ impl ReleaseUpdate for Update {
self.repo_owner,
self.repo_name
);
let client = reqwest::blocking::ClientBuilder::new()
.use_rustls_tls()
.http2_adaptive_window(true)
.build()?;
let client = client()?;
let resp = client
.get(&api_url)
.headers(api_headers(&self.auth_token)?)
Expand Down Expand Up @@ -584,7 +577,6 @@ impl ReleaseUpdate for Update {
}

fn get_release_version(&self, ver: &str) -> Result<Release> {
set_ssl_vars!();
let api_url = format!(
"{}/repos/{}/{}/releases/tags/{}",
self.custom_url
Expand All @@ -594,10 +586,7 @@ impl ReleaseUpdate for Update {
self.repo_name,
ver
);
let client = reqwest::blocking::ClientBuilder::new()
.use_rustls_tls()
.http2_adaptive_window(true)
.build()?;
let client = client()?;
let resp = client
.get(&api_url)
.headers(api_headers(&self.auth_token)?)
Expand Down
23 changes: 6 additions & 17 deletions src/backends/gitlab.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use std::path::{Path, PathBuf};
use reqwest::{self, header};

use crate::backends::find_rel_next_link;
use crate::client;
use crate::version::bump_is_greater;
use crate::{
errors::*,
Expand Down Expand Up @@ -151,7 +152,6 @@ impl ReleaseList {
/// Retrieve a list of `Release`s.
/// If specified, filter for those containing a specified `target`
pub fn fetch(self) -> Result<Vec<Release>> {
set_ssl_vars!();
let api_url = format!(
"{}/api/v4/projects/{}%2F{}/releases",
self.host,
Expand All @@ -170,10 +170,7 @@ impl ReleaseList {
}

fn fetch_releases(&self, url: &str) -> Result<Vec<Release>> {
let client = reqwest::blocking::ClientBuilder::new()
.use_rustls_tls()
.http2_adaptive_window(true)
.build()?;
let client = client()?;
let resp = client
.get(url)
.headers(api_headers(&self.auth_token)?)
Expand Down Expand Up @@ -496,17 +493,13 @@ impl Update {

impl ReleaseUpdate for Update {
fn get_latest_release(&self) -> Result<Release> {
set_ssl_vars!();
let api_url = format!(
"{}/api/v4/projects/{}%2F{}/releases",
self.host,
urlencoding::encode(&self.repo_owner),
self.repo_name
);
let client = reqwest::blocking::ClientBuilder::new()
.use_rustls_tls()
.http2_adaptive_window(true)
.build()?;
let client = client()?;
let resp = client
.get(&api_url)
.headers(self.api_headers(&self.auth_token)?)
Expand All @@ -524,14 +517,14 @@ impl ReleaseUpdate for Update {
}

fn get_latest_releases(&self, current_version: &str) -> Result<Vec<Release>> {
set_ssl_vars!();
let api_url = format!(
"{}/api/v4/projects/{}%2F{}/releases",
self.host,
urlencoding::encode(&self.repo_owner),
self.repo_name
);
let resp = reqwest::blocking::Client::new()
let client = client()?;
let resp = client
.get(&api_url)
.headers(self.api_headers(&self.auth_token)?)
.send()?;
Expand Down Expand Up @@ -561,18 +554,14 @@ impl ReleaseUpdate for Update {
}

fn get_release_version(&self, ver: &str) -> Result<Release> {
set_ssl_vars!();
let api_url = format!(
"{}/api/v4/projects/{}%2F{}/releases/{}",
self.host,
urlencoding::encode(&self.repo_owner),
self.repo_name,
ver
);
let client = reqwest::blocking::ClientBuilder::new()
.use_rustls_tls()
.http2_adaptive_window(true)
.build()?;
let client = client()?;
let resp = client
.get(&api_url)
.headers(self.api_headers(&self.auth_token)?)
Expand Down
6 changes: 2 additions & 4 deletions src/backends/s3.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
Amazon S3 releases
*/
use crate::{
client,
errors::*,
get_target,
update::{Release, ReleaseAsset, ReleaseUpdate},
Expand Down Expand Up @@ -601,10 +602,7 @@ fn fetch_releases_from_s3(

debug!("using api url: {:?}", api_url);

let client = reqwest::blocking::ClientBuilder::new()
.use_rustls_tls()
.http2_adaptive_window(true)
.build()?;
let client = client()?;
let resp = client.get(&api_url).send()?;
if !resp.status().is_success() {
bail!(
Expand Down
20 changes: 15 additions & 5 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,20 @@ fn confirm(msg: &str) -> Result<()> {
Ok(())
}

/// Build a blocking `reqwest` client.
/// The Rustls TLS backend is used if and only if the `rustls` feature is enabled.
fn client() -> Result<reqwest::blocking::Client> {
set_ssl_vars!();
#[cfg(not(feature = "rustls"))]
let client = reqwest::blocking::ClientBuilder::new();
#[cfg(feature = "rustls")]
let client = reqwest::blocking::ClientBuilder::new().use_rustls_tls();
client
.http2_adaptive_window(true)
.build()
.map_err(Into::into)
}

/// Status returned after updating
///
/// Wrapped `String`s are version tags
Expand Down Expand Up @@ -689,11 +703,7 @@ impl Download {
);
}

set_ssl_vars!();
let client = reqwest::blocking::ClientBuilder::new()
.use_rustls_tls()
.http2_adaptive_window(true)
.build()?;
let client = client()?;
let resp = client.get(&self.url).headers(headers).send()?;
let size = resp
.headers()
Expand Down