Skip to content

fix(headers): sanitize CRLF and comma injection in HTTP headers #439

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(headers): sanitize CRLF and comma injection in HTTP headers #439

Show file tree
Hide file tree
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
6 changes: 4 additions & 2 deletions src-tauri/src/mpv.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,12 @@ fn set_headers(
let headers = headers.unwrap_or_default();
let mut headers_vec: Vec<String> = Vec::with_capacity(2);
if let Some(origin) = headers.http_origin {
headers_vec.push(format!("{HTTP_ORIGIN}{origin}"));
let safe_origin = origin.replace('\r', "").replace('\n', "").replace(',', "");
headers_vec.push(format!("{HTTP_ORIGIN}{safe_origin}"));
}
if let Some(referrer) = headers.referrer {
headers_vec.push(format!("{HTTP_REFERRER}{referrer}"));
let safe_referrer = referrer.replace('\r', "").replace('\n', "").replace(',', "");
headers_vec.push(format!("{HTTP_REFERRER}{safe_referrer}"));
}
if let Some(user_agent) = headers
.user_agent
Expand Down
6 changes: 4 additions & 2 deletions src-tauri/src/restream.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,18 @@ fn start_ffmpeg_listening(channel: Channel, restream_dir: PathBuf) -> Result<Chi
let mut command = Command::new(get_bin(FFMPEG_BIN_NAME));
if let Some(headers) = headers {
if let Some(referrer) = headers.referrer {
let safe_referrer = referrer.replace('\r', "").replace('\n', "");
command.arg("-headers");
command.arg(format!("Referer: {referrer}"));
command.arg(format!("Referer: {safe_referrer}"));
}
if let Some(user_agent) = headers.user_agent {
command.arg("-headers");
command.arg(format!("User-Agent: {user_agent}"));
}
if let Some(origin) = headers.http_origin {
let safe_origin = origin.replace('\r', "").replace('\n', "");
command.arg("-headers");
command.arg(format!("Origin: {origin}"));
command.arg(format!("Origin: {safe_origin}"));
}
if let Some(ignore_ssl) = headers.ignore_ssl {
if ignore_ssl {
Expand Down