foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-24 08:09:08 -05:00
Code Issues Packages 1 Wiki Activity

fix(http): panic when responding to a closed conn (#12216)

Browse source 
Our oneshot receiver in `HyperService::call` would unwrap and panic, the `.await` on the oneshot receiver happens when the sender is dropped.

The sender is dropped in `op_http_response` because:
1. We take `ResponseSenderResource`
2. Then get `ConnResource` and early exit on failure (conn already closed)
3. The taken sender then gets dropped in this early exit before any response is sent over the channel

Fallbacking to returning a dummy response to hyper seems to be a fine quickfix
This commit is contained in:
Aaron O'Mullan 2021-09-25 13:22:19 +02:00 committed by GitHub
parent 16ea39ee48
commit 3c88dffd32
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 54 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
cli/tests/unit/http_test.ts
View file

@ -936,3 +936,49 @@ unitTest(
await promise;
},
);
// https://github.com/denoland/deno/pull/12216
unitTest(
{ permissions: { net: true } },
async function droppedConnSenderNoPanic() {
async function server(listener: Deno.Listener) {
const conn = await listener.accept();
const http = Deno.serveHttp(conn);
for (;;) {
const req = await http.nextRequest();
if (req == null) break;
nextloop()
.then(() => {
http.close();
return req.respondWith(new Response("boom"));
})
.catch(() => {});
}
try {
http.close();
} catch {
"nop";
}
listener.close();
}
async function client() {
const resp = await fetch("http://127.0.0.1:8000/");
await resp.body?.cancel();
}
function nextloop() {
return new Promise((resolve) => setTimeout(resolve, 0));
}
async function main() {
const listener = Deno.listen({ port: 8000 });
await Promise.all([server(listener), client()]);
}
await main();
},
);

9
ext/http/lib.rs
View file

@ -108,7 +108,14 @@ impl HyperService<Request<Body>> for Service {
response_tx: resp_tx,
});
async move { Ok(resp_rx.await.unwrap()) }.boxed_local()
async move {
resp_rx.await.or_else(|_|
// Fallback dummy response in case sender was dropped due to closed conn
Response::builder()
.status(hyper::StatusCode::INTERNAL_SERVER_ERROR)
.body(vec![].into()))
}
.boxed_local()
}
}