diff --git a/tests/test_node_status_refresh.py b/tests/test_node_status_refresh.py index 4303fa615..e0b394920 100644 --- a/tests/test_node_status_refresh.py +++ b/tests/test_node_status_refresh.py @@ -213,6 +213,33 @@ def test_pinned_sha_accepted_and_other_rev_forms_unknown(self): }] self.assertEqual(nsr.refresh_record(upper, offline_fetch, NOW)["status"], "unknown") + def test_pinned_url_trailing_newline_is_not_pinned(self): + sha = "b" * 40 + url = "https://github.com/d6g8k5htny-coder/main/blob/" + sha + "/a.md" + seen = [] + + def fetch(got): + seen.append(got) + return sha + + good = load("fresh.json") + good["sources"] = [{"url": url, "rev": sha}] + out = nsr.refresh_record(good, fetch, NOW) + self.assertEqual(nsr._classify(url)[0], "sha") + self.assertEqual(out["status"], "fresh") + self.assertEqual(out["source_rev"], sha) + self.assertEqual(seen, [url]) + + seen.clear() + newline = url + "\n" + self.assertIsNone(nsr._classify(newline)[0]) + bad = load("fresh.json") + bad["sources"] = [{"url": newline, "rev": sha}] + rejected = nsr.refresh_record(bad, fetch, NOW) + self.assertEqual(rejected["status"], "unknown") + self.assertIn("not a pinned", rejected["refresh_error"]) + self.assertEqual(seen, []) + def test_discussion_updated_at_newer_is_stale_and_unfetched_is_unknown(self): issue = nsr.refresh_record(load("issue.json"), offline_fetch, NOW) self.assertEqual(issue["status"], "stale") diff --git a/tools/node_status_refresh.py b/tools/node_status_refresh.py index 4fa5945b1..abf679351 100644 --- a/tools/node_status_refresh.py +++ b/tools/node_status_refresh.py @@ -51,7 +51,7 @@ _UTC = re.compile(r"^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z$") _PINNED = re.compile( r"^https://github\.com/d6g8k5htny-coder/(main|Math-)/(blob|tree)/" - r"([0-9a-f]{40})/([A-Za-z0-9_./-]+)$") + r"([0-9a-f]{40})/([A-Za-z0-9_./-]+)") _DISCUSSION = re.compile( r"^https://github\.com/d6g8k5htny-coder/(main|Math-)/(issues|pull)/" r"([1-9][0-9]*)(?:#issuecomment-([1-9][0-9]*))?$") @@ -96,7 +96,7 @@ def _api_get(path: str) -> object: def _classify(url: object) -> tuple[str, re.Match[str]] | tuple[None, None]: if not isinstance(url, str): return None, None - pinned = _PINNED.match(url) + pinned = _PINNED.fullmatch(url) if pinned: return "sha", pinned discussion = _DISCUSSION.fullmatch(url)