diff options
author | Leo K <crowlkats@toaxl.com> | 2021-08-13 20:52:13 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-13 20:52:13 +0200 |
commit | 0c9d6cbb2adc4a0903b18e3c290e9b2c8c8b4e91 (patch) | |
tree | 31eb4ad0475d600280518379cf8684c5dd44c4fd /cli/tests | |
parent | c6e3f93ebb716c2df310e4ca4fd1f4c8290feed1 (diff) |
fix(http/ws): support multiple options in connection header (#11675)
Co-authored-by: Luca Casonato <hello@lcas.dev>
Diffstat (limited to 'cli/tests')
-rw-r--r-- | cli/tests/integration/mod.rs | 35 | ||||
-rw-r--r-- | cli/tests/testdata/websocket_server_multi_field_connection_header_test.ts | 17 |
2 files changed, 52 insertions, 0 deletions
diff --git a/cli/tests/integration/mod.rs b/cli/tests/integration/mod.rs index 8448e77e1..7d13c7831 100644 --- a/cli/tests/integration/mod.rs +++ b/cli/tests/integration/mod.rs @@ -684,6 +684,41 @@ fn websocketstream() { assert!(status.success()); } +#[test] +fn websocket_server_multi_field_connection_header() { + let script = util::testdata_path() + .join("websocket_server_multi_field_connection_header_test.ts"); + let root_ca = util::testdata_path().join("tls/RootCA.pem"); + let mut child = util::deno_cmd() + .arg("run") + .arg("--unstable") + .arg("--allow-net") + .arg("--cert") + .arg(root_ca) + .arg(script) + .stdout(std::process::Stdio::piped()) + .spawn() + .unwrap(); + + let stdout = child.stdout.as_mut().unwrap(); + let mut buffer = [0; 5]; + let read = stdout.read(&mut buffer).unwrap(); + assert_eq!(read, 5); + let msg = std::str::from_utf8(&buffer).unwrap(); + assert_eq!(msg, "READY"); + + let req = http::request::Builder::new() + .header(http::header::CONNECTION, "keep-alive, Upgrade") + .uri("ws://localhost:4319") + .body(()) + .unwrap(); + assert!( + deno_runtime::deno_websocket::tokio_tungstenite::tungstenite::connect(req) + .is_ok() + ); + assert!(child.wait().unwrap().success()); +} + #[cfg(not(windows))] #[test] fn set_raw_should_not_panic_on_no_tty() { diff --git a/cli/tests/testdata/websocket_server_multi_field_connection_header_test.ts b/cli/tests/testdata/websocket_server_multi_field_connection_header_test.ts new file mode 100644 index 000000000..a662ce9ef --- /dev/null +++ b/cli/tests/testdata/websocket_server_multi_field_connection_header_test.ts @@ -0,0 +1,17 @@ +import { deferred } from "../unit/test_util.ts"; + +const promise = deferred(); +const listener = Deno.listen({ port: 4319 }); +console.log("READY"); +const conn = await listener.accept(); +const httpConn = Deno.serveHttp(conn); +const { request, respondWith } = (await httpConn.nextRequest())!; +const { + response, + socket, +} = Deno.upgradeWebSocket(request); +socket.onerror = () => Deno.exit(1); +socket.onopen = () => socket.close(); +socket.onclose = () => promise.resolve(); +await respondWith(response); +await promise; |