ws: make acceptable() more robust (denoland/deno_std#404)

Original: denoland/deno_std@9e8e6f9
ry · May 14, 2019 · 9f877cd · 9f877cd
1 parent 2cf289d
commit 9f877cd
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/ws/mod.ts b/ws/mod.ts
@@ -341,9 +341,12 @@ class WebSocketImpl implements WebSocket {
 
 /** Return whether given headers is acceptable for websocket */
 export function acceptable(req: { headers: Headers }): boolean {
+ const upgrade = req.headers.get("upgrade");
+ if (!upgrade || upgrade.toLowerCase() !== "websocket") {
+ return false;
+ }
  const secKey = req.headers.get("sec-websocket-key");
  return (
- req.headers.get("upgrade") === "websocket" &&
  req.headers.has("sec-websocket-key") &&
  typeof secKey === "string" &&
  secKey.length > 0

diff --git a/ws/test.ts b/ws/test.ts
@@ -146,6 +146,22 @@ test(function wsAcceptable(): void {
  })
  });
  assertEquals(ret, true);
+
+ assert(
+ acceptable({
+ headers: new Headers([
+ ["connection", "Upgrade"],
+ ["host", "127.0.0.1:9229"],
+ [
+ "sec-websocket-extensions",
+ "permessage-deflate; client_max_window_bits"
+ ],
+ ["sec-websocket-key", "dGhlIHNhbXBsZSBub25jZQ=="],
+ ["sec-websocket-version", "13"],
+ ["upgrade", "WebSocket"]
+ ])
+ })
+ );
 });
 
 const invalidHeaders = [