Skip to content

Terminal interface to find, download, and stream movies, TV shows, and live TV using local media players.

fix(proxy): reject missing target host with 403 in sidecar

Samir Hossainsa15945ef0740
diff --git a/src/proxy.rs b/src/proxy.rs
index 3a33855..ae6b625 100644
--- a/src/proxy.rs
+++ b/src/proxy.rs
@@ -269,17 +269,18 @@ async fn handle_connection(
}
};
let extracted_host = extract_host_authority(&target_url);
- if let Some(allowed_host) = target_host {
- let sub_host = subtitle_url.and_then(extract_host_authority);
- let is_allowed = extracted_host.as_deref() == Some(allowed_host)
- || (sub_host.is_some() && extracted_host == sub_host);
- if !is_allowed {
- let response =
- "HTTP/1.1 403 Forbidden\r\nContent-Length: 0\r\nConnection: close\r\n\r\n";
- writer.write_all(response.as_bytes()).await?;
- writer.flush().await?;
- return Ok(());
+ let sub_host = subtitle_url.and_then(extract_host_authority);
+ let is_allowed = match (target_host, extracted_host.as_deref()) {
+ (Some(allowed), Some(extracted)) => {
+ extracted == allowed || (sub_host.is_some() && extracted_host == sub_host)
}
+ _ => false,
+ };
+ if !is_allowed {
+ let response = "HTTP/1.1 403 Forbidden\r\nContent-Length: 0\r\nConnection: close\r\n\r\n";
+ writer.write_all(response.as_bytes()).await?;
+ writer.flush().await?;
+ return Ok(());
}
let mut req = match method {
@@ -287,16 +288,11 @@ async fn handle_connection(
_ => client.get(&target_url),
};
- if extracted_host.as_deref() == target_host {
- for (name, val) in auth_headers {
+ let forward_all_headers = extracted_host.as_deref() == target_host;
+ for (name, val) in auth_headers {
+ if forward_all_headers || name.eq_ignore_ascii_case("user-agent") {
req = req.header(name.as_str(), val.as_str());
}
- } else {
- for (name, val) in auth_headers {
- if name.eq_ignore_ascii_case("user-agent") {
- req = req.header(name.as_str(), val.as_str());
- }
- }
}
if let Some(range) = range_header {
req = req.header("Range", range);
@@ -575,6 +571,25 @@ mod tests {
assert!(!is_allowed("https://evil.example.com/steal"));
assert!(!is_allowed("https://sub.evil.com/fake"));
}
+ #[test]
+ fn test_host_whitelist_rejects_missing_target_host() {
+ let target_host: Option<&str> = None;
+ let subtitle_url: Option<&str> = None;
+ let sub_host = subtitle_url.and_then(extract_host_authority);
+
+ let is_allowed = |url: &str| -> bool {
+ let extracted_host = extract_host_authority(url);
+ match (target_host, extracted_host.as_deref()) {
+ (Some(allowed), Some(extracted)) => {
+ extracted == allowed || (sub_host.is_some() && extracted_host == sub_host)
+ }
+ _ => false,
+ }
+ };
+
+ assert!(!is_allowed("https://video.example.com/chunk.m4s"));
+ assert!(!is_allowed("http://127.0.0.1:8080"));
+ }
#[test]
fn test_rewrite_dash_manifest_scoped_to_target_host() {