Skip to content

fix(xtream): validate HTTP response before JSON parsing (Closes #338) #437

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

Open
louzt wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(xtream): validate HTTP response before JSON parsing (Closes #338) #437

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
50 changes: 48 additions & 2 deletions src-tauri/src/xtream.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,35 @@ where
{
let client = Client::builder().user_agent(user_agent).build()?;
url.query_pairs_mut().append_pair("action", action);
let data = client.get(url).send().await?.json::<T>().await?;
let response = client.get(url).send().await?;
let status = response.status();
if !status.is_success() {
let body = response.text().await.unwrap_or_default();
return Err(anyhow!(
"Xtream API returned HTTP {} for action '{}'. Body preview: {}",
status.as_u16(),
action,
&body[..body.len().min(200)]
));
}
let text = response.text().await?;
if text.is_empty() {
return Err(anyhow!("Xtream API returned empty body for action '{}'.", action));
}
// Check if the response is valid JSON before parsing
if !text.starts_with('{') && !text.starts_with('[') {
return Err(anyhow!(
"Xtream API returned non-JSON body for action '{}': {}",
action,
&text[..text.len().min(200)]
));
}
let data = serde_json::from_str(&text).map_err(|e| anyhow!(
"Failed to parse JSON from Xtream API (action '{}'): {}. Body: {}",
action,
e,
&text[..text.len().min(200)]
))?;
Ok(data)
}

Expand Down Expand Up @@ -596,7 +624,25 @@ async fn get_status(source: &mut Source) -> Result<(i64, XtreamStatus)> {
let url = build_xtream_url(source)?;
let user_agent = get_user_agent_from_source(&source)?;
let client = Client::builder().user_agent(user_agent).build()?;
let data = client.get(url).send().await?.json::<XtreamStatus>().await?;
let response = client.get(url).send().await?;
let status = response.status();
if !status.is_success() {
let body = response.text().await.unwrap_or_default();
return Err(anyhow!(
"Xtream API returned HTTP {} in get_status. Body preview: {}",
status.as_u16(),
&body[..body.len().min(200)]
));
}
let text = response.text().await?;
if text.is_empty() {
return Err(anyhow!("Xtream API returned empty body in get_status."));
}
let data = serde_json::from_str::<XtreamStatus>(&text).map_err(|e| anyhow!(
"Failed to parse XtreamStatus JSON: {}. Body: {}",
e,
&text[..text.len().min(200)]
))?;
Ok((source.id.context("no id")?, data))
}

Expand Down