mirror of
https://github.com/Such-Software/adaptive-multi-protocol-gateway.git
synced 2026-10-17 07:31:32 +02:00
jwinterm
4767b7965a
render_micron was a one-line alias to the Gemtext renderer, so every .mu file AMPG produced was Gemtext. A Nomad Network browser renders those markers as raw punctuation. Micron is a different markup: headings are > by depth, links are inline as `[label`url] rather than standalone lines, emphasis is a toggle pair, and literal blocks are fenced with `=. Content is now escaped as well. Micron's control character is the backtick, and >, <, #, and - are structural at column zero, so a vendor named ">Free Beer" would have become a section heading on the published page. The line-start check applies to the emitted line rather than each text chunk, since whether a character is structural depends on it landing at column zero. Separately, torrc and tunnels.conf are line-oriented with no quoting or escape mechanism, so a newline in an interpolated value injects an arbitrary directive: a tunnel_name of "web\nhost = attacker.example" silently repoints the tunnel. tunnel_name and keys_file are now validated at the point of interpolation. _validate_site_id covers the init path only, so a config loaded from disk never passed through it. There is nothing to escape with here, so these reject rather than sanitize. Generated systemd units had no User= and no hardening, so an operator following the install steps as root got a root-run daemon. Units now carry User=/Group= when a service account is configured, a visible warning when not, and a baseline of hardening directives chosen to not break a daemon whose state directory may live anywhere. Two tests asserted Gemtext markers inside a .mu file and so had encoded the bug.
130 lines
4.5 KiB
Python
130 lines
4.5 KiB
Python
import tempfile
|
|
import unittest
|
|
from pathlib import Path
|
|
|
|
from ampg.build import build_gateway
|
|
from ampg.config import load_config
|
|
from ampg.plan import plan_gateway, write_plan_artifacts
|
|
|
|
|
|
class GeminiBuildTest(unittest.TestCase):
|
|
def test_existing_html_source_can_build_only_gemini(self):
|
|
with tempfile.TemporaryDirectory() as tmp:
|
|
root = Path(tmp)
|
|
source = root / "source"
|
|
source.mkdir()
|
|
(source / "index.html").write_text(
|
|
'<h1>Home</h1><p><a href="about.html">About</a></p><script>bad()</script>',
|
|
encoding="utf-8",
|
|
)
|
|
(source / "about.html").write_text("<h1>About</h1>", encoding="utf-8")
|
|
(source / "app.js").write_text("bad()", encoding="utf-8")
|
|
config_path = root / "gateway.toml"
|
|
config_path.write_text(
|
|
"""
|
|
[[site]]
|
|
id = "gemini_only"
|
|
domain = "example.test"
|
|
|
|
[site.source]
|
|
kind = "static-html"
|
|
path = "./source"
|
|
|
|
[site.outputs]
|
|
root = "./out"
|
|
plan_root = "./plan"
|
|
|
|
[site.protocols.gemini]
|
|
enabled = true
|
|
renderer = "gemtext"
|
|
daemon = "agate"
|
|
daemon_policy = "auto"
|
|
port = 1965
|
|
max_asset_bytes = 1024
|
|
""",
|
|
encoding="utf-8",
|
|
)
|
|
|
|
config = load_config(config_path)
|
|
plan = plan_gateway(config)
|
|
artifacts = write_plan_artifacts(config)
|
|
results = build_gateway(config)
|
|
|
|
self.assertEqual([line.protocol for line in plan], ["gemini"])
|
|
self.assertEqual([result.protocol for result in results], ["gemini"])
|
|
self.assertEqual(len(artifacts), 1)
|
|
self.assertTrue((root / "out/gemini/index.gmi").exists())
|
|
self.assertTrue((root / "out/gemini/about.gmi").exists())
|
|
self.assertFalse((root / "out/gemini/app.js").exists())
|
|
self.assertFalse((root / "out/clearnet").exists())
|
|
gemtext = (root / "out/gemini/index.gmi").read_text(encoding="utf-8")
|
|
self.assertIn("# Home", gemtext)
|
|
self.assertIn("=> about.gmi About", gemtext)
|
|
self.assertNotIn("bad", gemtext)
|
|
agate_plan = (root / "plan/gemini_only/gemini/agate-plan.txt").read_text()
|
|
self.assertIn("daemon = agate", agate_plan)
|
|
self.assertIn("content_root =", agate_plan)
|
|
|
|
def test_existing_html_source_can_build_only_reticulum(self):
|
|
with tempfile.TemporaryDirectory() as tmp:
|
|
root = Path(tmp)
|
|
source = root / "source"
|
|
source.mkdir()
|
|
(source / "index.html").write_text(
|
|
'<h1>Home</h1><p><a href="about.html">About</a></p><script>bad()</script>',
|
|
encoding="utf-8",
|
|
)
|
|
(source / "about.html").write_text("<h1>About</h1>", encoding="utf-8")
|
|
(source / "app.js").write_text("bad()", encoding="utf-8")
|
|
(source / "styles.css").write_text("body {}", encoding="utf-8")
|
|
config_path = root / "gateway.toml"
|
|
config_path.write_text(
|
|
"""
|
|
[[site]]
|
|
id = "reticulum_only"
|
|
domain = "example.test"
|
|
|
|
[site.source]
|
|
kind = "static-html"
|
|
path = "./source"
|
|
|
|
[site.outputs]
|
|
root = "./out"
|
|
plan_root = "./plan"
|
|
|
|
[site.protocols.reticulum]
|
|
enabled = true
|
|
renderer = "micron"
|
|
daemon = "rnsd"
|
|
daemon_policy = "auto"
|
|
aspect = "web"
|
|
max_asset_bytes = 1024
|
|
""",
|
|
encoding="utf-8",
|
|
)
|
|
|
|
config = load_config(config_path)
|
|
plan = plan_gateway(config)
|
|
artifacts = write_plan_artifacts(config)
|
|
results = build_gateway(config)
|
|
|
|
self.assertEqual([line.protocol for line in plan], ["reticulum"])
|
|
self.assertEqual([result.protocol for result in results], ["reticulum"])
|
|
self.assertEqual(len(artifacts), 0)
|
|
self.assertTrue((root / "out/reticulum/index.mu").exists())
|
|
self.assertTrue((root / "out/reticulum/about.mu").exists())
|
|
self.assertFalse((root / "out/reticulum/app.js").exists())
|
|
self.assertFalse((root / "out/reticulum/styles.css").exists())
|
|
micron = (root / "out/reticulum/index.mu").read_text(encoding="utf-8")
|
|
# A .mu file must contain micron, not Gemtext. Nomad Network renders
|
|
# Gemtext markers as raw punctuation.
|
|
self.assertIn(">Home", micron)
|
|
self.assertNotIn("# Home", micron)
|
|
self.assertIn("`[About`about.mu]", micron)
|
|
self.assertNotIn("=> about.mu", micron)
|
|
self.assertNotIn("bad", micron)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|