url: fix url spec compliance issues

Co-authored-by: Daniel Lemire <[email protected]> PR-URL: #46547 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Filip Skokan <[email protected]> Reviewed-By: Tiancheng "Timothy" Gu <[email protected]> Reviewed-By: Rich Trott <[email protected]>
nodejs · Mar 13, 2023 · 9d55a5e · 9d55a5e
1 parent 95bbd0f
commit 9d55a5e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/lib/internal/url.js b/lib/internal/url.js
@@ -864,6 +864,19 @@ function update(url, params) {
     ctx.search = '?' + serializedParams;
   } else {
     ctx.search = '';
+
+    // Potentially strip trailing spaces from an opaque path
+    if (ctx.hasOpaquePath && ctx.hash.length === 0) {
+      let length = ctx.pathname.length;
+      while (length > 0 && ctx.pathname.charCodeAt(length - 1) === 32) {
+        length--;
+      }
+
+      // No need to copy the whole string if there is no space at the end
+      if (length !== ctx.pathname.length) {
+        ctx.pathname = ctx.pathname.slice(0, length);
+      }
+    }
   }
   ctx.href = constructHref(ctx);
 }

diff --git a/test/wpt/status/url.json b/test/wpt/status/url.json
@@ -7,7 +7,13 @@
     "skip": "TODO: port from .window.js"
   },
   "historical.any.js": {
-    "requires": ["small-icu"]
+    "requires": ["small-icu"],
+    "fail": {
+      "expected": [
+        "URL: no structured serialize/deserialize support",
+        "URLSearchParams: no structured serialize/deserialize support"
+      ]
+    }
   },
   "urlencoded-parser.any.js": {
     "requires": ["small-icu"]

diff --git a/test/wpt/test-url.js b/test/wpt/test-url.js
@@ -15,6 +15,6 @@ runner.setScriptModifier((obj) => {
 });
 runner.pretendGlobalThisAs('Window');
 runner.setInitScript(`
-  globalThis.location = {};
+  globalThis.location ||= {};
 `);
 runner.runJsTests();