summaryrefslogtreecommitdiff
path: root/ext/websocket/server.rs
diff options
context:
space:
mode:
authorDivy Srivastava <dj.srivastava23@gmail.com>2023-04-14 22:17:39 +0530
committerGitHub <noreply@github.com>2023-04-14 22:17:39 +0530
commita4111442191fff300132259752e6d2d5613d1871 (patch)
treeea7cd7d3b897ace1ca29b1f0dd66e8e0d8b6a76a /ext/websocket/server.rs
parentd01340dab0d686c7f2d6c6922239f5fee0bc4cef (diff)
fix(ext/websocket): Avoid write deadlock that requires read_frame to complete (#18705)
Fixes https://github.com/denoland/deno/issues/18700 Timeline of the events that lead to the bug. 1. WebSocket handshake complete 2. Server on `read_frame` holding an AsyncRefCell borrow of the WebSocket stream. 3. Client sends a TXT frame after a some time 4. Server recieves the frame and goes back to `read_frame`. 5. After some time, Server starts a `write_frame` but `read_frame` is still holding a borrow! ^--- Locked. read_frame needs to complete so we can resume the write. This commit changes all writes to directly borrow the `fastwebsocket::WebSocket` resource under the assumption that it won't affect ongoing reads.
Diffstat (limited to 'ext/websocket/server.rs')
-rw-r--r--ext/websocket/server.rs43
1 files changed, 23 insertions, 20 deletions
diff --git a/ext/websocket/server.rs b/ext/websocket/server.rs
index eb8737b19..44bc07e59 100644
--- a/ext/websocket/server.rs
+++ b/ext/websocket/server.rs
@@ -28,6 +28,23 @@ pub struct ServerWebSocket {
ws: AsyncRefCell<FragmentCollector<Pin<Box<dyn Upgraded>>>>,
}
+impl ServerWebSocket {
+ #[inline]
+ pub async fn write_frame(
+ self: Rc<Self>,
+ frame: Frame,
+ ) -> Result<(), AnyError> {
+ // SAFETY: fastwebsockets only needs a mutable reference to the WebSocket
+ // to populate the write buffer. We encounter an await point when writing
+ // to the socket after the frame has already been written to the buffer.
+ let ws = unsafe { &mut *self.ws.as_ptr() };
+ ws.write_frame(frame)
+ .await
+ .map_err(|err| type_error(err.to_string()))?;
+ Ok(())
+ }
+}
+
impl Resource for ServerWebSocket {
fn name(&self) -> Cow<str> {
"serverWebSocket".into()
@@ -61,12 +78,9 @@ pub async fn op_server_ws_send_binary(
.borrow_mut()
.resource_table
.get::<ServerWebSocket>(rid)?;
-
- let mut ws = RcRef::map(&resource, |r| &r.ws).borrow_mut().await;
- ws.write_frame(Frame::new(true, OpCode::Binary, None, data.to_vec()))
+ resource
+ .write_frame(Frame::new(true, OpCode::Binary, None, data.to_vec()))
.await
- .map_err(|err| type_error(err.to_string()))?;
- Ok(())
}
#[op]
@@ -79,11 +93,9 @@ pub async fn op_server_ws_send_text(
.borrow_mut()
.resource_table
.get::<ServerWebSocket>(rid)?;
- let mut ws = RcRef::map(&resource, |r| &r.ws).borrow_mut().await;
- ws.write_frame(Frame::new(true, OpCode::Text, None, data.into_bytes()))
+ resource
+ .write_frame(Frame::new(true, OpCode::Text, None, data.into_bytes()))
.await
- .map_err(|err| type_error(err.to_string()))?;
- Ok(())
}
#[op]
@@ -107,12 +119,7 @@ pub async fn op_server_ws_send(
.borrow_mut()
.resource_table
.get::<ServerWebSocket>(rid)?;
- let mut ws = RcRef::map(&resource, |r| &r.ws).borrow_mut().await;
-
- ws.write_frame(msg)
- .await
- .map_err(|err| type_error(err.to_string()))?;
- Ok(())
+ resource.write_frame(msg).await
}
#[op(deferred)]
@@ -126,14 +133,10 @@ pub async fn op_server_ws_close(
.borrow_mut()
.resource_table
.get::<ServerWebSocket>(rid)?;
- let mut ws = RcRef::map(&resource, |r| &r.ws).borrow_mut().await;
let frame = reason
.map(|reason| Frame::close(code.unwrap_or(1005), reason.as_bytes()))
.unwrap_or_else(|| Frame::close_raw(vec![]));
- ws.write_frame(frame)
- .await
- .map_err(|err| type_error(err.to_string()))?;
- Ok(())
+ resource.write_frame(frame).await
}
#[op(deferred)]