Skip to content
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

fix a panic on a malformed session request #168

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

fix a panic on a malformed session request #168

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
44 changes: 26 additions & 18 deletions socket/server/src/session.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,24 +108,32 @@ async fn serve(mut session_endpoint: SessionEndpoint, mut stream: Arc<Async<TcpS
if byte == b'\r' {
continue;
} else if byte == b'\n' {
let mut str = String::from_utf8(line.clone())
.expect("unable to parse string from UTF-8 bytes");
line.clear();

if rtc_url_match {
if str.to_lowercase().starts_with("content-length: ") {
let (_, last) = str.split_at(16);
str = last.to_string();
content_length = str.parse::<usize>().ok();
} else if str.is_empty() {
headers_read = true;
}
} else if str.starts_with(
RTC_URL_PATH
.get()
.expect("unable to retrieve URL path, was it not configured?"),
) {
rtc_url_match = true;
match String::from_utf8(line.clone()) {
Ok(mut str) => {
line.clear();
if rtc_url_match {
if str.to_lowercase().starts_with("content-length: ") {
let (_, last) = str.split_at(16);
str = last.to_string();
content_length = str.parse::<usize>().ok();
} else if str.is_empty() {
headers_read = true;
}
} else if str.starts_with(
RTC_URL_PATH
.get()
.expect("unable to retrieve URL path, was it not configured?"),
) {
rtc_url_match = true;
}
},
Err(err) => {
info!(
"Invalid WebRTC session request from {}. Error: {}",
remote_addr, err
);
break;
},
}
} else {
line.push(byte);
Expand Down