Nodes by their closest advert path, and how far arriving
flood packets had travelled
-
-
-
-
diff --git a/tests/test_dashboard_stats.py b/tests/test_dashboard_stats.py
index 1eca7b1..c8ff545 100644
--- a/tests/test_dashboard_stats.py
+++ b/tests/test_dashboard_stats.py
@@ -824,6 +824,28 @@ class TestHopConventions:
)
assert dict(self._hops(viewer)["nodes"]) == {48: 1}
+ def test_axis_stops_at_the_last_populated_hop(self, viewer):
+ """An axis running past the last observation spends its width on nothing."""
+ with sqlite3.connect(viewer.db_path) as conn:
+ conn.execute(
+ """
+ INSERT INTO observed_paths (public_key, from_prefix, to_prefix, path_hex,
+ path_length, bytes_per_hop, packet_type, last_seen)
+ VALUES (?, 'aa', 'bb', 'ab', 2, 1, 'advert', datetime('now','localtime'))
+ """,
+ (_pk(1),),
+ )
+ conn.execute(
+ "INSERT INTO packet_stream (timestamp, data, type, route_type_name, path_len, "
+ "bytes_per_hop) VALUES (?, '{}', 'packet', 'FLOOD', 5, 1)",
+ (time.time(),),
+ )
+ hops = self._hops(viewer)
+ assert [h for h, _ in hops["nodes"]] == [2, 3, 4, 5]
+ # Both ends of the axis carry an observation in at least one series.
+ assert hops["nodes"][0][1] or hops["flood_packets"][0][1]
+ assert hops["nodes"][-1][1] or hops["flood_packets"][-1][1]
+
def test_impossible_hop_counts_are_dropped(self, viewer):
"""Beyond 64 the path field cannot hold it, so the value is corrupt."""
with sqlite3.connect(viewer.db_path) as conn:
diff --git a/tests/test_web_viewer.py b/tests/test_web_viewer.py
index 5738a60..badfb1d 100644
--- a/tests/test_web_viewer.py
+++ b/tests/test_web_viewer.py
@@ -165,32 +165,27 @@ class TestPageRoutes:
resp = client.get("/")
assert resp.status_code == 200
- def test_index_live_activity_controls(self, client):
- """Dashboard index page contains scroll buttons and type-filter checkboxes."""
+ def test_index_loads_the_external_dashboard_script(self, client):
resp = client.get("/")
assert resp.status_code == 200
- html = resp.data.decode()
- # Scroll buttons
- assert 'id="live-scroll-top"' in html
- assert 'id="live-scroll-bottom"' in html
- # Filter checkboxes with data-type attributes
- assert 'data-type="packet"' in html
- assert 'data-type="command"' in html
- assert 'data-type="message"' in html
- assert 'live-filter-cb' in html
- # Behaviour lives in the external, nonce-free dashboard script
- assert 'js/dashboard.js' in html
+ assert 'js/dashboard.js' in resp.data.decode()
- def test_dashboard_script_wires_live_feed_controls(self):
- """The extracted dashboard script still implements the feed behaviour."""
+ def test_dashboard_does_not_subscribe_to_live_streams(self, client):
+ """The live feed moved to /realtime; the dashboard must not re-add it.
+
+ It opened three SocketIO subscriptions and re-rendered on every packet,
+ duplicating a page that already exists, so the dashboard now costs one
+ snapshot read per poll and nothing else.
+ """
+ html = client.get("/").data.decode()
script = (
Path(__file__).resolve().parents[1]
/ "modules" / "web_viewer" / "static" / "js" / "dashboard.js"
).read_text(encoding="utf-8")
- assert "applyFilters" in script
- assert "live-scroll-top" in script
- assert "live-scroll-bottom" in script
- assert "initLiveFeed" in script
+ for marker in ("live-feed", "live-filter-cb", "live-scroll-top"):
+ assert marker not in html, marker
+ for marker in ("subscribe_packets", "subscribe_commands", "subscribe_messages"):
+ assert marker not in script, marker
def test_realtime(self, client):
resp = client.get("/realtime")
diff --git a/tests/test_web_viewer_xss_hardening.py b/tests/test_web_viewer_xss_hardening.py
index 93afc71..9172e63 100644
--- a/tests/test_web_viewer_xss_hardening.py
+++ b/tests/test_web_viewer_xss_hardening.py
@@ -72,8 +72,8 @@ def test_dashboard_has_no_html_parser_sink_for_api_or_mesh_values() -> None:
# and role values all terminate in textContent-backed DOM construction.
for safe_sink in (
"node.textContent = String(value ?? '');",
- "makeTextElement('strong', label)",
- "makeTextElement('span', ' ' + String(text ?? ''), 'text-muted')",
+ "makeTextElement('div', item.name, 'neighbor-row__name')",
+ "makeTextElement('span', name, 'fw-semibold top-list-row__name')",
"label.title = String(name ?? '');",
"makeTextElement('code', item.path_string, 'small text-break')",
"idCell.appendChild(makeTextElement('code', client.client_id))",