Skip to content

Add timeout to GitHub update-check HTTP client #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jrozner merged 1 commit into from
Jun 18, 2026
+13 −1
Merged

Add timeout to GitHub update-check HTTP client #201

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 13 additions & 1 deletion src/update.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,17 @@
//! considered. This mirrors the Go implementation it replaces.

use std::fmt;
use std::time::Duration;

use serde::Deserialize;
use thiserror::Error;

/// Connection-establishment timeout for the update-check client.
const CONNECT_TIMEOUT: Duration = Duration::from_secs(10);
/// Overall per-request timeout so an unresponsive GitHub never hangs the update
/// check forever. Mirrors the ASHIRT client in [`crate::ashirt::http`].
const REQUEST_TIMEOUT: Duration = Duration::from_secs(30);

/// Errors produced while checking for updates.
#[derive(Debug, Error)]
pub enum UpdateError {
Expand Down Expand Up @@ -226,7 +233,12 @@ pub fn fetch_release_tags(owner: &str, repo: &str) -> Result<Vec<String>, Update
let url = format!("https://api.github.com/repos/{owner}/{repo}/releases");
let user_agent = concat!("aterm/", env!("CARGO_PKG_VERSION"));

let releases: Vec<GithubRelease> = reqwest::blocking::Client::new()
let client = reqwest::blocking::Client::builder()
.connect_timeout(CONNECT_TIMEOUT)
.timeout(REQUEST_TIMEOUT)
.build()?;

let releases: Vec<GithubRelease> = client
.get(url)
.header(reqwest::header::USER_AGENT, user_agent)
.header(reqwest::header::ACCEPT, "application/vnd.github+json")
Expand Down