Skip to content

fix(fetchers): enforce fetch options on YouTube secondary requests #117

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
chaliy merged 1 commit into from
May 17, 2026
Merged

fix(fetchers): enforce fetch options on YouTube secondary requests #117

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
28 changes: 22 additions & 6 deletions crates/fetchkit/src/fetchers/youtube.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ impl Fetcher for YouTubeFetcher {
let mut client_builder = reqwest::Client::builder()
.connect_timeout(API_TIMEOUT)
.timeout(API_TIMEOUT)
.redirect(reqwest::redirect::Policy::limited(3));
.redirect(reqwest::redirect::Policy::none());

if !options.respect_proxy_env {
client_builder = client_builder.no_proxy();
Expand All @@ -120,6 +120,7 @@ impl Fetcher for YouTubeFetcher {
// Fetch oEmbed metadata
// The canonical URL only contains safe ASCII chars, so it can be passed directly
let mut oembed_url = Url::parse("https://www.youtube.com/oembed").unwrap();
options.validate_url(&oembed_url)?;
oembed_url
.query_pairs_mut()
.append_pair("url", &canonical_url)
Expand All @@ -144,8 +145,7 @@ impl Fetcher for YouTubeFetcher {
let author_url = oembed.as_ref().and_then(|o| o.author_url.clone());

// Attempt transcript extraction via timedtext API
let transcript =
fetch_transcript(&client, &ua_header, &video_id, options.max_body_size).await;
let transcript = fetch_transcript(&client, &ua_header, &video_id, options).await;

let content = format_youtube_response(
&title,
Expand Down Expand Up @@ -173,16 +173,19 @@ async fn fetch_transcript(
client: &reqwest::Client,
ua: &HeaderValue,
video_id: &str,
max_body_size: Option<usize>,
options: &FetchOptions,
) -> Option<String> {
// Try the legacy timedtext API (auto-generated English captions)
let timedtext_url = format!(
"https://www.youtube.com/api/timedtext?v={}&lang=en&fmt=srv3",
video_id
);

let timedtext_url = Url::parse(&timedtext_url).ok()?;
options.validate_url(&timedtext_url).ok()?;

let resp = client
.get(&timedtext_url)
.get(timedtext_url.as_str())
.header(USER_AGENT, ua.clone())
.send()
.await
Expand All @@ -193,7 +196,7 @@ async fn fetch_transcript(
}

let xml = resp.text().await.ok()?;
if let Some(max_body_size) = max_body_size {
if let Some(max_body_size) = options.max_body_size {
if xml.len() > max_body_size {
return None;
}
Expand Down Expand Up @@ -475,6 +478,19 @@ mod tests {
assert!(segments.is_empty());
}

#[tokio::test]
async fn test_fetch_blocked_secondary_host() {
let fetcher = YouTubeFetcher::new();
let request = FetchRequest::new("https://youtu.be/dQw4w9WgXcQ");
let options = FetchOptions {
blocked_hosts: vec![".youtube.com".to_string()],
..Default::default()
};

let result = fetcher.fetch(&request, &options).await;
assert!(matches!(result, Err(FetchError::BlockedUrl)));
}

#[test]
fn test_decode_xml_entities() {
assert_eq!(decode_xml_entities("a &amp; b"), "a & b");
Expand Down
Loading