Skip to content

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

fix(provider): harden moviebox signing

Samir Hossainsf711805d82a2
diff --git a/src/providers/moviebox/crypto.rs b/src/providers/moviebox/crypto.rs
index 1488035..f8b9fd0 100644
--- a/src/providers/moviebox/crypto.rs
+++ b/src/providers/moviebox/crypto.rs
@@ -33,6 +33,21 @@ fn b64_encode(data: &[u8]) -> String {
base64::engine::general_purpose::STANDARD.encode(data)
}
+fn insert_header(
+ headers: &mut reqwest::header::HeaderMap,
+ name: reqwest::header::HeaderName,
+ value: &str,
+) {
+ match value.parse() {
+ Ok(parsed) => {
+ headers.insert(name, parsed);
+ }
+ Err(error) => {
+ log::warn!("moviebox signing header skipped: {error}");
+ }
+ }
+}
+
pub fn generate_x_client_token(ts: u64) -> String {
let ts_str = ts.to_string();
let reversed_ts: String = ts_str.chars().rev().collect();
@@ -74,13 +89,16 @@ pub fn build_canonical_string(
body: Option<&str>,
timestamp_ms: u64,
) -> String {
- let parsed = Url::parse(url).expect("URL is valid by construction from base and path");
- let path = parsed.path();
- let query = sorted_query_string(url);
- let canonical_url = if query.is_empty() {
- path.to_string()
+ let canonical_url = if let Ok(parsed) = Url::parse(url) {
+ let path = parsed.path();
+ let query = sorted_query_string(url);
+ if query.is_empty() {
+ path.to_string()
+ } else {
+ format!("{}?{}", path, query)
+ }
} else {
- format!("{}?{}", path, query)
+ url.to_string()
};
let body_bytes = body.map(|b| b.as_bytes());
@@ -119,7 +137,10 @@ pub fn generate_x_tr_signature(
let canonical = build_canonical_string(method, accept, content_type, url, body, timestamp_ms);
let secret_bytes = b64_decode(SECRET_KEY_DEFAULT);
- let mut mac = HmacMd5::new_from_slice(&secret_bytes).expect("HMAC can take key of any size");
+ let Ok(mut mac) = HmacMd5::new_from_slice(&secret_bytes) else {
+ log::warn!("moviebox signature fallback: invalid HMAC key material");
+ return format!("{}|2|", timestamp_ms);
+ };
mac.update(canonical.as_bytes());
let sig_b64 = b64_encode(&mac.finalize().into_bytes());
@@ -137,7 +158,7 @@ pub fn build_signed_headers(
) -> reqwest::header::HeaderMap {
let ts = SystemTime::now()
.duration_since(UNIX_EPOCH)
- .expect("System time is after UNIX EPOCH")
+ .unwrap_or_default()
.as_millis() as u64;
let accept = "application/json";
@@ -149,25 +170,39 @@ pub fn build_signed_headers(
let mut headers = reqwest::header::HeaderMap::new();
- headers.insert(
- reqwest::header::USER_AGENT,
- user_agent.parse().expect("Valid ASCII"),
+ insert_header(&mut headers, reqwest::header::USER_AGENT, user_agent);
+ insert_header(&mut headers, reqwest::header::ACCEPT, accept);
+ insert_header(&mut headers, reqwest::header::CONTENT_TYPE, content_type);
+ insert_header(&mut headers, reqwest::header::CONNECTION, "keep-alive");
+ insert_header(
+ &mut headers,
+ reqwest::header::HeaderName::from_static("x-client-token"),
+ &client_token,
+ );
+ insert_header(
+ &mut headers,
+ reqwest::header::HeaderName::from_static("x-tr-signature"),
+ &signature,
+ );
+ insert_header(
+ &mut headers,
+ reqwest::header::HeaderName::from_static("x-client-info"),
+ client_info,
+ );
+ insert_header(
+ &mut headers,
+ reqwest::header::HeaderName::from_static("x-client-status"),
+ "0",
+ );
+ insert_header(
+ &mut headers,
+ reqwest::header::HeaderName::from_static("x-forwarded-for"),
+ spoofed_ip,
);
- headers.insert("Accept", accept.parse().expect("Valid ASCII"));
- headers.insert("Content-Type", content_type.parse().expect("Valid ASCII"));
- headers.insert("Connection", "keep-alive".parse().expect("Valid ASCII"));
- headers.insert("X-Client-Token", client_token.parse().expect("Valid ASCII"));
- headers.insert("x-tr-signature", signature.parse().expect("Valid ASCII"));
- headers.insert("X-Client-Info", client_info.parse().expect("Valid ASCII"));
- headers.insert("X-Client-Status", "0".parse().expect("Valid ASCII"));
-
- headers.insert("X-Forwarded-For", spoofed_ip.parse().expect("Valid ASCII"));
if let Some(token) = auth_token {
- headers.insert(
- reqwest::header::AUTHORIZATION,
- format!("Bearer {}", token).parse().expect("Valid ASCII"),
- );
+ let bearer = format!("Bearer {}", token);
+ insert_header(&mut headers, reqwest::header::AUTHORIZATION, &bearer);
}
headers