Skip to content

Fix multiple websocket connection issues. #58

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

Merged
merged 1 commit into from
Jan 20, 2025
Merged

Fix multiple websocket connection issues. #58

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
23 changes: 23 additions & 0 deletions edge-http/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,7 @@ impl<const N: usize> Default for Headers<'_, N> {
pub enum ConnectionType {
KeepAlive,
Close,
Upgrade,
}

impl ConnectionType {
Expand Down Expand Up @@ -499,6 +500,8 @@ impl ConnectionType {
&& value.eq_ignore_ascii_case("Keep-Alive")
{
Some(Self::KeepAlive)
} else if "Connection".eq_ignore_ascii_case(name) && value.eq_ignore_ascii_case("Upgrade") {
Some(Self::Upgrade)
} else {
None
}
Expand Down Expand Up @@ -535,6 +538,7 @@ impl ConnectionType {
let connection = match self {
Self::KeepAlive => "Keep-Alive",
Self::Close => "Close",
Self::Upgrade => "Upgrade",
};

("Connection", connection.as_bytes())
Expand All @@ -546,6 +550,7 @@ impl Display for ConnectionType {
match self {
Self::KeepAlive => write!(f, "Keep-Alive"),
Self::Close => write!(f, "Close"),
Self::Upgrade => write!(f, "Upgrade"),
}
}
}
Expand Down Expand Up @@ -619,6 +624,16 @@ impl BodyType {
}
} else if matches!(connection_type, ConnectionType::Close) {
Ok(BodyType::Raw)
} else if matches!(connection_type, ConnectionType::Upgrade) {
if http11 {
debug!("Unknown body type in response but the Connection is Upgrade. Assuming Content-Length=0.");
Ok(BodyType::ContentLen(0))
} else {
warn!("Connection is set to Upgrade but the HTTP protocol version is not 1.1. This is not allowed.");
Err(HeadersMismatchError::BodyTypeError(
"Connection is set to Upgrade but the HTTP protocol version is not 1.1. This is not allowed.",
))
}
} else if chunked_if_unspecified && http11 {
// With HTTP1.1 we can safely upgrade the body to a chunked one
Ok(BodyType::Chunked)
Expand Down Expand Up @@ -1183,6 +1198,14 @@ mod test {
BodyType::resolve(None, ConnectionType::Close, true, false, false).unwrap(),
BodyType::ContentLen(0)
);
assert_eq!(
BodyType::resolve(None, ConnectionType::Upgrade, false, true, false).unwrap(),
BodyType::ContentLen(0)
);

// Receiving a response with no body type after requesting a connection upgrade with
// HTTP1.0 is no allowed.
assert!(BodyType::resolve(None, ConnectionType::Upgrade, false, false, false).is_err());

// Request or response with a chunked body type is invalid for HTTP1.0
assert!(BodyType::resolve(
Expand Down
Loading