url: add ws: and wss: to slashedProtocol set

Fix cases where the pathname is incorrectly parsed as `null`. PR-URL: #26941 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Yongsheng Zhang <[email protected]> Signed-off-by: Beth Griggs <[email protected]>
nodejs · Apr 8, 2019 · 8798db3 · 8798db3
1 parent 28efecc
commit 8798db3
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/lib/url.js b/lib/url.js
@@ -95,7 +95,11 @@ const slashedProtocol = new SafeSet([
   'gopher',
   'gopher:',
   'file',
-  'file:'
+  'file:',
+  'ws',
+  'ws:',
+  'wss',
+  'wss:'
 ]);
 const {
   CHAR_SPACE,

diff --git a/test/parallel/test-url-parse-format.js b/test/parallel/test-url-parse-format.js
@@ -923,6 +923,26 @@ const parseTests = {
     pathname: "alert(1);a='@white-listed.com'",
     path: "alert(1);a='@white-listed.com'",
     href: "javascript:alert(1);a='@white-listed.com'"
+  },
+
+  'ws://www.example.com': {
+    protocol: 'ws:',
+    slashes: true,
+    hostname: 'www.example.com',
+    host: 'www.example.com',
+    pathname: '/',
+    path: '/',
+    href: 'ws://www.example.com/'
+  },
+
+  'wss://www.example.com': {
+    protocol: 'wss:',
+    slashes: true,
+    hostname: 'www.example.com',
+    host: 'www.example.com',
+    pathname: '/',
+    path: '/',
+    href: 'wss://www.example.com/'
   }
 };