Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust
Rust ai-agentsai-toolsbrowserbrowser-automationcloud-browserheadlessheadless-browserkitesurfplaywrightpuppeteerrustservoweb-crawlerweb-crawlingweb-scraperweb-scraping
fix(wpt): serve charset inheritance handler responses
ldm0ef25ac681f5c
diff --git a/moli-benchmark/moli_benchmark/wpt_cross/case_set.py b/moli-benchmark/moli_benchmark/wpt_cross/case_set.pyindex a15c3ad86..5942ea9ea 100644--- a/moli-benchmark/moli_benchmark/wpt_cross/case_set.py+++ b/moli-benchmark/moli_benchmark/wpt_cross/case_set.py@@ -846,6 +846,7 @@ def _supported_wptserve_handler_references(supported += _common_echo_handler_reference_patterns(posixpath.dirname(rel) or ".")supported += _remote_context_handler_reference_patterns(posixpath.dirname(rel) or ".")supported += _fetch_content_type_handler_reference_patterns(posixpath.dirname(rel) or ".")+ supported += _document_charset_handler_reference_patterns(posixpath.dirname(rel) or ".")supported += _navigation_handler_reference_patterns(posixpath.dirname(rel) or ".")supported += _json_module_handler_reference_patterns(posixpath.dirname(rel) or ".")if rel is not None:@@ -1702,3 +1703,20 @@ def _fetch_content_type_handler_reference_patterns(directory: str) -> tuple[re.Pfor reference in ("/" + resource, relative, "./" + relative))+++@lru_cache(maxsize=None)+def _document_charset_handler_reference_patterns(directory: str) -> tuple[re.Pattern[str], ...]:+ references = []+ for name in ("bogus-charset-http.py", "bogus-charset-http-valid-meta.py"):+ resource = f"html/syntax/charset/resources/{name}"+ relative = posixpath.relpath(resource, directory)+ references.extend(("/" + resource, relative, "./" + relative))+ return tuple(+ re.compile(+ rf"(?<![A-Za-z0-9_./-]){re.escape(reference)}"+ rf"{WPTSERVE_HANDLER_TRAILING_BOUNDARY}"+ )+ for reference in references+ )+diff --git a/moli-benchmark/moli_benchmark/wpt_cross/server.py b/moli-benchmark/moli_benchmark/wpt_cross/server.pyindex ac08ecbbf..57b441bfa 100644--- a/moli-benchmark/moli_benchmark/wpt_cross/server.py+++ b/moli-benchmark/moli_benchmark/wpt_cross/server.py@@ -120,6 +120,11 @@ REMOTE_CONTEXT_EXECUTOR_PATH = (REMOTE_CONTEXT_RESOURCE_PATHS = {DISPATCHER_PATH, REMOTE_CONTEXT_EXECUTOR_PATH}FETCH_CONTENT_TYPE_PATH = "/fetch/content-type/resources/content-type.py"+DOCUMENT_CHARSET_FIXTURES = {+ "/html/syntax/charset/resources/bogus-charset-http.py": b"\xa2\n",+ "/html/syntax/charset/resources/bogus-charset-http-valid-meta.py":+ b"<meta charset=windows-1251>\xa2\n",+}COMMON_ECHO_PATH = "/common/echo.py"COMMON_REDIRECT_PATH = "/common/redirect.py"@@ -1998,6 +2003,16 @@ requestExecutor("{executor_uuid}", {start_on_js});self.wfile.write(output)except (BrokenPipeError, ConnectionResetError):pass+ def _serve_document_charset_resource(self) -> bool:+ path = unquote(urlsplit(self.path).path)+ if path not in DOCUMENT_CHARSET_FIXTURES:+ return False+ # These upstream handlers assign response.content and return None,+ # so wptserve does not apply the query's response pipes.+ self._send_bytes(+ "text/html;charset=this-is-not-a-charset", DOCUMENT_CHARSET_FIXTURES[path],+ emit_body=self.command != "HEAD", cache_control=None,+ )return Truedef do_GET(self) -> None: # noqa: N802 (BaseHTTPRequestHandler API)@@ -2014,6 +2029,8 @@ requestExecutor("{executor_uuid}", {start_on_js});returnif self._serve_content_type_resource():return+ if self._serve_document_charset_resource():+ returnif self._serve_common_echo_resource():returnif self._serve_common_redirect_resource():@@ -2063,6 +2080,8 @@ requestExecutor("{executor_uuid}", {start_on_js});returnif self._serve_content_type_resource():return+ if self._serve_document_charset_resource():+ returnif self._serve_common_echo_resource():returnif self._serve_common_redirect_resource():@@ -2144,6 +2163,8 @@ requestExecutor("{executor_uuid}", {start_on_js});returnif self._serve_content_type_resource():return+ if self._serve_document_charset_resource():+ returnif self._serve_common_echo_resource():returnif self._serve_common_redirect_resource():@@ -2192,6 +2213,8 @@ requestExecutor("{executor_uuid}", {start_on_js});returnif self._serve_content_type_resource():return+ if self._serve_document_charset_resource():+ returnif self._serve_common_echo_resource():returnif self._serve_common_redirect_resource():@@ -2422,6 +2445,8 @@ requestExecutor("{executor_uuid}", {start_on_js});returnif self._serve_content_type_resource():return+ if self._serve_document_charset_resource():+ returntry:self._serve_response(emit_body=emit_body)except WptPipeError:@@ -3231,6 +3256,8 @@ requestExecutor("{executor_uuid}", {start_on_js});return self._serve_remote_context_resourceif name.startswith("do_") and unquote(urlsplit(self.path).path) == FETCH_CONTENT_TYPE_PATH:return self._serve_content_type_resource+ if name.startswith("do_") and unquote(urlsplit(self.path).path) in DOCUMENT_CHARSET_FIXTURES:+ return self._serve_document_charset_resourceif name.startswith("do_") and unquote(urlsplit(self.path).path) == COMMON_ECHO_PATH:return self._serve_common_echo_resourceif name.startswith("do_") and unquote(urlsplit(self.path).path) == COMMON_REDIRECT_PATH:diff --git a/moli-benchmark/tests/test_wpt_document_charset_server.py b/moli-benchmark/tests/test_wpt_document_charset_server.pynew file mode 100644index 000000000..6eaf97c3d--- /dev/null+++ b/moli-benchmark/tests/test_wpt_document_charset_server.py@@ -0,0 +1,79 @@+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+++RESOURCE = "/html/syntax/charset/resources/bogus-charset-http.py"+META_RESOURCE = "/html/syntax/charset/resources/bogus-charset-http-valid-meta.py"+++class DocumentCharsetFixtureTests(unittest.TestCase):+ def setUp(self) -> None:+ stack = ExitStack()+ self.addCleanup(stack.close)+ self.root = Path(stack.enter_context(tempfile.TemporaryDirectory()))+ (self.root / "resources").mkdir()+ (self.root / "resources/testharness.js").write_text("// testharness")+ stack.enter_context(patch(+ "moli_benchmark.wpt_cross.server._global_ipv6_address", return_value=None+ ))+ self.server = stack.enter_context(WptFixtureServer(self.root))++ def request(self, path: str, method: str = "GET"):+ connection = HTTPConnection("127.0.0.1", self.server.port, timeout=2)+ try:+ connection.request(method, path)+ response = connection.getresponse()+ return response.status, response.headers, response.read()+ finally:+ connection.close()++ def test_serves_exact_bytes_and_invalid_charset_without_applying_pipes(self) -> None:+ for path, expected in [(RESOURCE, b"\xa2\n"),+ (META_RESOURCE, b"<meta charset=windows-1251>\xa2\n")]:+ for method in ("GET", "HEAD", "POST", "OPTIONS", "PUT", "YO", "CUSTOM"):+ with self.subTest(path=path, method=method):+ status, headers, body = self.request(+ path + "?pipe=status(404)|header(Content-Type,text/plain)", method+ )+ self.assertEqual(status, 200)+ self.assertEqual(headers.get_all("Content-Type"),+ ["text/html;charset=this-is-not-a-charset"])+ self.assertEqual(headers["Content-Length"], str(len(expected)))+ self.assertEqual(body, b"" if method == "HEAD" else expected)+ self.assertNotIn("Cache-Control", headers)++ def test_only_canonical_paths_are_handled(self) -> None:+ for path in (RESOURCE + "2", RESOURCE + ".js", "/wrong" + RESOURCE):+ with self.subTest(path=path):+ self.assertEqual(self.request(path)[0], 404)++ def test_case_selection_accepts_only_supported_resource_references(self) -> None:+ sources = {+ "html/syntax/charset/direct.html": "fetch('resources/bogus-charset-http.py');",+ "html/syntax/charset/nested/meta.html": "fetch('../resources/bogus-charset-http-valid-meta.py');",+ "other/absolute.html": f"fetch('{RESOURCE}');",+ "other/wrong-relative.html": "fetch('resources/bogus-charset-http.py');",+ "other/suffix.html": f"fetch('{RESOURCE}2');",+ "other/unknown.html": f"fetch('{RESOURCE}'); fetch('unknown.py');",+ }+ for path, source in sources.items():+ file = self.root / path+ file.parent.mkdir(parents=True, exist_ok=True)+ file.write_text('<script src="/resources/testharness.js"></script>' + source)+ self.assertEqual(+ [case.case_path for case in enumerate_cases(self.root, dir_prefixes=("html/syntax/charset", "other"))],+ ["html/syntax/charset/direct.html", "html/syntax/charset/nested/meta.html", "other/absolute.html"],+ )+++if __name__ == "__main__":+ unittest.main()