Fix error when linkrot checking with an ID that does not exist in the…

… webring
le717 · Jun 8, 2024 · 5c38281 · 5c38281
1 parent 33f4b81
commit 5c38281
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -8,6 +8,7 @@ _Released TDB_
 - Add ability to control showing rotted and same-origin results for root entrypoint and simple embed
 - Add readme sections to explain new filtering and embed features
 - Ensure the `date_added` field is expressed in UTC
+- Fix error when linkrot checking with an ID that does not exist in the webring
 - Replace `requests` with `python-httpx`
 - Update OpenAPI spec version
 - Update minimum Python version to 3.11

diff --git a/src/core/database/linkrot.py b/src/core/database/linkrot.py
@@ -77,10 +77,13 @@ def check_all() -> list[RotResult]:
     return [check_one(link.id) for link in weblink.get_all()]
 
 
-def check_one(uuid: str) -> RotResult:
+def check_one(uuid: str) -> RotResult | None:
     """Check a single link for rotting."""
+    # The uuid doesn't exist in the db, we can't do anything
+    if (link := weblink.get(uuid)) is None:
+        return None
+
     # The site could be pinged, so we all good
-    link = weblink.get(uuid)
     if __ping_url(link.url):
         result = RotResult(
             id=link.id,

diff --git a/src/views/linkrot.py b/src/views/linkrot.py
@@ -1,6 +1,7 @@
 from typing import Any
 
 from flask.views import MethodView
+from flask_smorest import abort
 
 from src.blueprints import linkrot
 from src.core import models
@@ -22,7 +23,10 @@ class LinkRotSingleCheck(MethodView):
     @linkrot.arguments(models.AuthKey, location="query", as_kwargs=True)
     @linkrot.arguments(models.WebLinkId, location="path", as_kwargs=True)
     @linkrot.response(200, models.RotResult)
+    @linkrot.alt_response(404, schema=models.HttpError)
     def post(self, **kwargs: Any) -> models.RotResult:
         """Check a single link in the ring for link rot."""
         del kwargs["auth_key"]
-        return db.check_one(str(kwargs["id"]))
+        if (result := db.check_one(str(kwargs["id"]))) is None:
+            abort(404, message="That ID does not exist in the webring.")
+        return result