Skip to content

Commit

Permalink
Add fix for CVE-2023-43669.
Browse files Browse the repository at this point in the history
  • Loading branch information
vldr committed Sep 26, 2023
1 parent ed4539d commit 7da84cd
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 13 deletions.
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ edition = "2021"

[dependencies]
futures-util = "0.3"
tungstenite = "0.19.0"
tungstenite = "0.20.1"
tokio = { version = "1.28.1", features = ["full"] }
tokio-tungstenite = { version = "0.19.0" }
tokio-tungstenite = { version = "0.20.1" }
serde_json = { version = "1.0" }
serde = { version = "1.0", features = ["derive"] }
uuid = { version = "1.3.2", features = ["v4"] }
12 changes: 5 additions & 7 deletions src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ mod tests {
($value:expr) => {{
$value.close(None).unwrap();
loop {
if $value.read_message().is_err() {
if $value.read().is_err() {
break;
}
}
Expand All @@ -26,23 +26,21 @@ mod tests {

macro_rules! write_binary_message {
($value:expr, $value2:expr) => {
$value.write_message(Message::Binary($value2)).unwrap()
$value.send(Message::Binary($value2)).unwrap()
};
}

macro_rules! write_message {
($value:expr, $value2:expr) => {
let packet = $value2;
let serialized_packet = serde_json::to_string(&packet).unwrap();
$value
.write_message(Message::Text(serialized_packet))
.unwrap()
$value.send(Message::Text(serialized_packet)).unwrap()
};
}

macro_rules! read_message {
($value:expr, $pattern:pat => $extracted_value:expr) => {
match serde_json::from_str(&$value.read_message().unwrap().clone().into_text().unwrap())
match serde_json::from_str(&$value.read().unwrap().clone().into_text().unwrap())
.unwrap()
{
$pattern => $extracted_value,
Expand All @@ -53,7 +51,7 @@ mod tests {

macro_rules! read_binary_message {
($value:expr) => {
$value.read_message().unwrap().clone().into_data()
$value.read().unwrap().clone().into_data()
};
}

Expand Down

0 comments on commit 7da84cd

Please sign in to comment.