diff --git a/docs/site/research.html b/docs/site/research.html index 02bb83181..8dc2b08f2 100644 --- a/docs/site/research.html +++ b/docs/site/research.html @@ -2,7 +2,7 @@ - + Research ยท Universal Law diff --git a/tests/test_current_site_build.py b/tests/test_current_site_build.py index f01431198..721a07254 100644 --- a/tests/test_current_site_build.py +++ b/tests/test_current_site_build.py @@ -83,13 +83,14 @@ def prepare(self, root, data=None): for name in ("index.html", "research.html", "dependencies.html"): prefix = '' if name == "research.html": - prefix += '' + prefix += '' (site / name).write_bytes((prefix + "\n

Frozen cut 2026-09-25 & identity.

\n" + START + "old panel" + END + "\n
Historical evidence stays exact.\r\n
").encode()) (site / "historic.json").write_bytes(b'{"date":"2026-09-25","exact":"17/31"}\r\n') for name in ("brand.css", "style.css", "current.css"): (site / name).write_text("body { color: navy; }\n") + (site / "current.mjs").write_text("// Shared loader fixture; these Python tests do not execute JavaScript.\n") payload = root / "payload.json" payload.write_bytes(json.dumps(data or fixture(), ensure_ascii=False, indent=2).encode() + b"\n") return site, payload @@ -233,7 +234,7 @@ def test_source_links_only_resolve_the_exact_math_inventory_and_external_links_s self.assertFalse(any("javascript:" in href or "secret" in href or "missing/PROOF" in href for href in page.links)) - def test_hostile_metadata_is_inert_and_research_keeps_its_script_free_contract(self): + def test_hostile_metadata_is_inert_and_research_uses_only_the_shared_loader(self): # Inserting raw labels into markup rather than escaped text would add a script tag. with TemporaryDirectory() as tmp: data = fixture() @@ -245,8 +246,20 @@ def test_hostile_metadata_is_inert_and_research_keeps_its_script_free_contract(s self.assertFalse(any(tag in ("script", "img", "iframe") for tag, attrs in alpha.tags)) self.assertIn("", " ".join(alpha.text)) research = Page((site / "research.html").read_text()) - self.assertFalse(any(tag == "script" or attrs.get("class") == "current-search" for tag, attrs in research.tags)) - self.assertTrue(any(attrs.get("content") == "script-src 'none'" for tag, attrs in research.tags)) + scripts = [attrs for tag, attrs in research.tags if tag == "script"] + self.assertEqual(len(scripts), 1) + self.assertEqual(scripts[0].get("type"), "module") + source = urlsplit(scripts[0].get("src", "")) + self.assertEqual((source.scheme, source.netloc, source.path), ("", "", "current.mjs")) + self.assertFalse(any(set(attrs.get("class", "").split()) & + {"current-search", "current-results", "current-more"} + for tag, attrs in research.tags)) + self.assertTrue(any(attrs.get("content") == "script-src 'self'" for tag, attrs in research.tags)) + section = [attrs for tag, attrs in research.tags if attrs.get("id") == "current-research"] + self.assertEqual(len(section), 1) + self.assertEqual(section[0]["data-current-digest"], hashlib.sha256(payload.read_bytes()).hexdigest()) + self.assertEqual(int(section[0]["data-current-bytes"]), len(payload.read_bytes())) + self.assertTrue(any(attrs.get("class") == "current-state" for tag, attrs in research.tags)) home = Page((site / "index.html").read_text()) section = [attrs for tag, attrs in home.tags if attrs.get("id") == "current-research"][0] self.assertEqual(section["data-current-digest"], hashlib.sha256(payload.read_bytes()).hexdigest()) @@ -255,6 +268,42 @@ def test_hostile_metadata_is_inert_and_research_keeps_its_script_free_contract(s for reference in ("STATUS.md", "docs/RESEARCH_INDEX.md", "PROOF_INDEX.md"): self.assertTrue(any(href.endswith("/" + reference) for href in research.links)) + def test_research_template_allows_the_same_origin_current_module(self): + research = Page((ROOT / "docs/site/research.html").read_text()) + policies = [attrs["content"] for tag, attrs in research.tags if tag == "meta" + and attrs.get("http-equiv", "").lower() == "content-security-policy"] + self.assertEqual(len(policies), 1) + directives = {parts[0]: parts[1:] for directive in policies[0].split(";") + if (parts := directive.split())} + effective = directives.get("script-src-elem", directives.get("script-src", directives.get("default-src", []))) + self.assertEqual(effective, ["'self'"]) + self.assertEqual(directives.get("script-src"), ["'self'"]) + + def test_formal_remains_script_free_when_research_has_age_updates(self): + with TemporaryDirectory() as tmp: + site, payload = self.prepare(Path(tmp)) + formal = (site / "research.html").read_bytes().replace(b"script-src 'self'", b"script-src 'none'") + (site / "formal.html").write_bytes(formal) + result = self.run_build(site, payload) + self.assertEqual(result.returncode, 0, result.stderr) + parsed = Page((site / "formal.html").read_text()) + self.assertFalse(any(tag == "script" or attrs.get("class") == "current-search" for tag, attrs in parsed.tags)) + self.assertTrue(any(attrs.get("content") == "script-src 'none'" for tag, attrs in parsed.tags)) + built = (site / "formal.html").read_bytes() + self.assertTrue(built.startswith(formal.split(START.encode())[0] + START.encode())) + self.assertTrue(built.endswith(END.encode() + formal.split(END.encode())[1])) + + def test_script_blocked_research_refuses_before_any_site_write(self): + with TemporaryDirectory() as tmp: + site, payload = self.prepare(Path(tmp)) + research = site / "research.html" + research.write_bytes(research.read_bytes().replace(b"script-src 'self'", b"script-src 'none'")) + before = self.snapshot(site) + result = self.run_build(site, payload) + self.assertNotEqual(result.returncode, 0) + self.assertIn("current freshness loader requires a script-enabled CSP", result.stderr) + self.assertEqual(before, self.snapshot(site)) + def test_invalid_payload_or_missing_marker_fails_before_any_site_write(self): # Admission must finish before mutations, preserving the last deployable tree on refusal. mutations = [lambda d: d["repositories"][0].update(commit="main"), diff --git a/tools/current_site_build.py b/tools/current_site_build.py index 425f2d0a9..676da4a6b 100644 --- a/tools/current_site_build.py +++ b/tools/current_site_build.py @@ -437,9 +437,16 @@ def build(site, payload): raise ValueError(f"{page.name}: exactly one ordered CURRENT-SITE marker pair is required") start = original.index(START) + len(START) end = original.index(END) - script_free = page.name in ("research.html", "formal.html") or bool(re.search( + script_blocked = bool(re.search( rb"script-src\s+(?:'|'|')none(?:'|'|')", original)) - section = current_section(data, meta, search=not script_free, acquisition=acquisition).replace("\n", "\n" + capacity_html + "\n").encode("utf-8") + search_enabled = page.name not in ("research.html", "formal.html") and not script_blocked + section = current_section(data, meta, search=search_enabled, acquisition=acquisition).replace("\n", "\n" + capacity_html + "\n").encode("utf-8") + if page.name == "research.html": + if script_blocked: + raise ValueError("research.html: current freshness loader requires a script-enabled CSP") + section = section.replace( + b"\n", + b'\n\n') outputs[page.name] = original[:start] + b"\n" + section + b"\n" + original[end:] archive_relative = f'snapshots/{archive_id}' archive_outputs = ({f"{archive_relative}/{name}": content for name, content in archive.items()} if archive else {})