Skip to content

armgit / moli

Public Imported from GitHub
0

Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust

fix(wpt): serve empty Location redirect fixtures

ldm03e2d2251b5da
diff --git a/moli-benchmark/moli_benchmark/wpt_cross/case_set.py b/moli-benchmark/moli_benchmark/wpt_cross/case_set.py
index 8b8f5162a..b6fd56f7a 100644
--- a/moli-benchmark/moli_benchmark/wpt_cross/case_set.py
+++ b/moli-benchmark/moli_benchmark/wpt_cross/case_set.py
@@ -746,10 +746,42 @@ def _json_module_handler_reference_patterns(directory: str) -> tuple[re.Pattern[
)
+@lru_cache(maxsize=None)
+def _empty_location_handler_reference_patterns(directory: str) -> tuple[re.Pattern[str], ...]:
+ names = ("redirect-empty-location.py",)
+ references = []
+ for name in names:
+ resource = "fetch/api/resources/" + name
+ relative = posixpath.relpath(resource, directory)
+ references.extend(("/" + resource, relative, "./" + relative))
+ patterns = [
+ re.compile(
+ rf"(?<![A-Za-z0-9_./-]){re.escape(reference)}"
+ rf"{WPTSERVE_HANDLER_TRAILING_BOUNDARY}"
+ )
+ for reference in references
+ ]
+ # The Fetch API's shared utils.js defines RESOURCES_DIR. Keep the
+ # concatenation intact in this match; a bare filename is not sufficient.
+ patterns.append(re.compile(
+ r"(?<![\w$.])RESOURCES_DIR\s*\+\s*['\"](?:"
+ + "|".join(re.escape(name) for name in names)
+ + rf"){WPTSERVE_HANDLER_TRAILING_BOUNDARY}"
+ ))
+ patterns.append(re.compile(
+ r"`\$\{\s*RESOURCES_DIR\s*\}(?:"
+ + "|".join(re.escape(name) for name in names)
+ + rf"){WPTSERVE_HANDLER_TRAILING_BOUNDARY}"
+ ))
+ return tuple(patterns)
+
+
def _supported_wptserve_handler_references(
rel: str | None,
) -> tuple[re.Pattern[str], ...]:
supported: tuple[re.Pattern[str], ...] = ()
+ if rel is not None and rel.startswith("fetch/api/"):
+ supported += _empty_location_handler_reference_patterns(posixpath.dirname(rel))
if rel is not None:
supported += _json_module_handler_reference_patterns(posixpath.dirname(rel) or ".")
if rel is not None:
diff --git a/moli-benchmark/moli_benchmark/wpt_cross/server.py b/moli-benchmark/moli_benchmark/wpt_cross/server.py
index ee90b8222..9e1c9d5ec 100644
--- a/moli-benchmark/moli_benchmark/wpt_cross/server.py
+++ b/moli-benchmark/moli_benchmark/wpt_cross/server.py
@@ -79,6 +79,7 @@ XHR_RESPONSE_RESOURCE_PATHS = {
"/xhr/resources/status.py",
"/xhr/resources/last-modified.py",
}
+FETCH_EMPTY_LOCATION_PATH = "/fetch/api/resources/redirect-empty-location.py"
FETCH_ABORT_RESOURCE_PATHS = {
"/fetch/api/resources/stash-put.py",
"/fetch/api/resources/stash-take.py",
@@ -1656,6 +1657,8 @@ def _make_handler(
self._serve(emit_body=False)
def do_OPTIONS(self) -> None: # noqa: N802
+ if self._serve_empty_location_resource(emit_body=self.command != "HEAD"):
+ return
if self._serve_xhr_response_resource():
return
parsed = urlparse(self.path)
@@ -1683,6 +1686,8 @@ def _make_handler(
self.send_error(404)
def do_POST(self) -> None: # noqa: N802
+ if self._serve_empty_location_resource(emit_body=self.command != "HEAD"):
+ return
if self._serve_xhr_response_resource():
return
parsed = urlparse(self.path)
@@ -1731,6 +1736,8 @@ def _make_handler(
self.end_headers()
def _serve_fetch_resource_method(self) -> None:
+ if self._serve_empty_location_resource(emit_body=self.command != "HEAD"):
+ return
if self._serve_xhr_response_resource():
return
parsed = urlparse(self.path)
@@ -1753,6 +1760,8 @@ def _make_handler(
do_DELETE = _serve_fetch_resource_method
def do_YO(self) -> None: # noqa: N802 (WPT custom method)
+ if self._serve_empty_location_resource(emit_body=self.command != "HEAD"):
+ return
if unquote(urlparse(self.path).path) in {
"/xhr/resources/inspect-headers.py", "/xhr/resources/echo-headers.py",
}:
@@ -1884,6 +1893,8 @@ def _make_handler(
return
def _serve(self, *, emit_body: bool) -> None:
+ if self._serve_empty_location_resource(emit_body=emit_body):
+ return
if self._serve_xhr_response_resource(emit_body=emit_body):
return
parsed = urlparse(self.path)
@@ -2422,6 +2433,8 @@ def _make_handler(
)
def __getattr__(self, name: str):
+ if name.startswith("do_") and unquote(urlparse(self.path).path) == FETCH_EMPTY_LOCATION_PATH:
+ return self._serve_empty_location_resource
if name.startswith("do_") and unquote(urlparse(self.path).path) in XHR_RESPONSE_RESOURCE_PATHS:
return self._serve_xhr_response_resource
raise AttributeError(name)
@@ -2487,6 +2500,19 @@ def _make_handler(
self._send_bytes(None, body, emit_body=emit_body, extra_headers=headers,
status_code=status, status_text=reason)
+ def _serve_empty_location_resource(self, *, emit_body: bool = True) -> bool:
+ if unquote(urlparse(self.path).path) != FETCH_EMPTY_LOCATION_PATH:
+ return False
+ # The upstream handler ignores request data and responds immediately.
+ # Close the connection so an unfinished upload is never another request.
+ self.close_connection = True
+ self._send_bytes(
+ None, b"", emit_body=emit_body, status_code=302,
+ extra_headers=[("Connection", "close"), ("Location", "")],
+ cache_control=None,
+ )
+ return True
+
def _serve_xhr_response_resource(self, *, emit_body: bool = True) -> bool:
parsed = urlparse(self.path)
path = unquote(parsed.path)
diff --git a/moli-benchmark/tests/test_wpt_empty_location_server.py b/moli-benchmark/tests/test_wpt_empty_location_server.py
new file mode 100644
index 000000000..d303b7614
--- /dev/null
+++ b/moli-benchmark/tests/test_wpt_empty_location_server.py
@@ -0,0 +1,93 @@
+from __future__ import annotations
+
+import tempfile
+import unittest
+from contextlib import ExitStack
+from http.client import HTTPConnection
+from pathlib import Path
+from unittest.mock import patch
+
+from moli_benchmark.wpt_cross.case_set import enumerate_cases
+from moli_benchmark.wpt_cross.server import WptFixtureServer
+
+EMPTY_LOCATION = "/fetch/api/resources/redirect-empty-location.py"
+
+
+class EmptyLocationFixtureTests(unittest.TestCase):
+ def setUp(self):
+ self.stack = ExitStack()
+ self.addCleanup(self.stack.close)
+ self.root = Path(self.stack.enter_context(tempfile.TemporaryDirectory()))
+ (self.root / "resources").mkdir()
+ (self.root / "resources/testharness.js").write_text("// testharness")
+ self.stack.enter_context(patch(
+ "moli_benchmark.wpt_cross.server._global_ipv6_address", return_value=None
+ ))
+ self.server = self.stack.enter_context(WptFixtureServer(self.root))
+
+
+ def request(self, query="", *, method="GET", headers=None, body=None, port=None, path=EMPTY_LOCATION):
+ connection = HTTPConnection("127.0.0.1", port or self.server.port, timeout=2)
+ try:
+ connection.request(method, path + "?" + query, body, headers or {})
+ response = connection.getresponse()
+ return response.status, response.headers, response.read()
+ finally:
+ connection.close()
+
+
+ def test_empty_location_is_present_for_every_method_without_cors_grants(self):
+ for method in ("GET", "HEAD", "OPTIONS", "POST", "PUT", "PATCH", "DELETE", "YO", "chicken"):
+ with self.subTest(method=method):
+ status, headers, body = self.request(
+ "redirect_status=307&location=/ignored", path=EMPTY_LOCATION,
+ method=method, headers={"Origin": "https://caller.test"}, body=b"upload",
+ )
+ self.assertEqual((status, body), (302, b""))
+ self.assertEqual(headers.get_all("Location"), [""])
+ self.assertEqual(headers["Content-Length"], "0")
+ for name in ("Content-Type", "Cache-Control", "Access-Control-Allow-Origin"):
+ self.assertIsNone(headers[name], name)
+ for path in (EMPTY_LOCATION + "2", "/wrong" + EMPTY_LOCATION):
+ with self.subTest(path=path):
+ self.assertEqual(self.request(path=path)[0], 404)
+
+
+ def test_empty_location_responds_before_unused_uploads_finish(self):
+ for method in ("POST", "PUT", "OPTIONS"):
+ for framing in (("Content-Length", "1000000"), ("Transfer-Encoding", "chunked")):
+ with self.subTest(method=method, framing=framing):
+ connection = HTTPConnection("127.0.0.1", self.server.port, timeout=2)
+ try:
+ connection.putrequest(method, EMPTY_LOCATION)
+ connection.putheader(*framing)
+ connection.endheaders()
+ response = connection.getresponse()
+ self.assertEqual((response.status, response.read()), (302, b""))
+ self.assertEqual(response.headers.get_all("Location"), [""])
+ self.assertEqual(response.headers["Connection"], "close")
+ finally:
+ connection.close()
+
+
+ def test_case_selection_recognizes_empty_location_references(self):
+ sources = {
+ "absolute": f"fetch('{EMPTY_LOCATION}');",
+ "concat": 'fetch(RESOURCES_DIR + "redirect-empty-location.py");',
+ "relative": "fetch('../resources/redirect-empty-location.py');",
+ "template": "fetch(`${RESOURCES_DIR}redirect-empty-location.py?ignored=1`);",
+ "bare": "fetch('redirect-empty-location.py');",
+ "prefix": f"fetch('/wrong{EMPTY_LOCATION}');",
+ "suffix": "fetch('../resources/redirect-empty-location.py2');",
+ "unknown": f"fetch('{EMPTY_LOCATION}'); fetch('../resources/unknown.py');",
+ }
+ for name, source in sources.items():
+ path = self.root / f"fetch/api/redirect/{name}.any.js"
+ path.parent.mkdir(parents=True, exist_ok=True)
+ path.write_text("// META: global=window,worker\n" + source)
+ selected = enumerate_cases(self.root, dir_prefixes=("fetch",), any_js_global="both")
+ self.assertEqual([case.case_path for case in selected], [
+ f"fetch/api/redirect/{name}.any.js?moli-wpt-any={realm}"
+ for name in ("absolute", "concat", "relative", "template")
+ for realm in ("dedicatedworker", "window")
+ ])