Add error logging and fix tests

Author: MythicManiac

django/thunderstore/frontend/services/thumbnail.py

@@ -4,6 +4,8 @@
 from django.conf import settings
 from easy_thumbnails.files import get_thumbnailer
 
+from thunderstore.core.utils import capture_exception
+
 
 @dataclass
 class Thumbnail:
@@ -30,5 +32,6 @@ def get_or_create_thumbnail(
         else:
             thumbnail = thumbnailer.get_thumbnail(thumbnail_options, generate=True)
             return Thumbnail(storage_path=thumbnail.name, url=thumbnail.url)
-    except Exception:
+    except Exception as e:
+        capture_exception(e)
         return None

django/thunderstore/frontend/tests/test_views.py

@@ -134,77 +134,14 @@ def test_views_disabled_for_auth_exclusive_host(
     assert response.status_code == 302
 
 
-@pytest.mark.django_db
-def test_thumbnail_redirect_success(dummy_cover_image, client, community_site):
-    community = community_site.community
-    community.cover_image = dummy_cover_image
-    community.save()
-
-    url = reverse("cdn_thumb_redirect", kwargs={"path": community.cover_image.name})
-    params = {"width": 100, "height": 100}
-
-    response = client.get(url, params, HTTP_HOST=community_site.site.domain)
-
-    assert response.status_code == 302
-    assert response["Location"].endswith(".jpg")
-    assert "Cache-Control" in response
-    assert "max-age=86400" in response["Cache-Control"]
-
-
-@pytest.mark.django_db
-def test_thumbnail_redirect_exception(dummy_cover_image, community_site, client):
-    community = community_site.community
-    community.cover_image = dummy_cover_image
-    community.save()
-
-    url = reverse("cdn_thumb_redirect", kwargs={"path": community.cover_image.name})
-    params = {"width": 100, "height": 100}
-
-    path = "thunderstore.frontend.views.get_or_create_thumbnail"
-    with patch(path) as mock_get_thumbnail:
-        mock_get_thumbnail.return_value = None
-        response = client.get(url, params, HTTP_HOST=community_site.site.domain)
-
-    assert response.status_code == 404
-    assert "Cache-Control" in response
-    assert "max-age=300" in response["Cache-Control"]
-
-
-@pytest.mark.django_db
-@pytest.mark.parametrize(
-    "params",
-    [
-        {"width": "abc", "height": "100"},
-        {"width": "100", "height": "abc"},
-        {"width": "0", "height": "100"},
-        {"width": "100", "height": "0"},
-        {"width": "-1", "height": "100"},
-        {},
-    ],
-)
-def test_thumbnail_redirect_invalid_params_returns_fallback(
-    params, dummy_cover_image, client, community_site
-):
-    community = community_site.community
-    community.cover_image = dummy_cover_image
-    community.save()
-
-    url = reverse("cdn_thumb_redirect", kwargs={"path": community.cover_image.name})
-    response = client.get(url, params, HTTP_HOST=community_site.site.domain)
-
-    assert response.status_code == 404
-    assert "Cache-Control" in response
-    assert "max-age=300" in response["Cache-Control"]
-
-
 @pytest.mark.django_db
 def test_thumbnail_serve_success(dummy_cover_image, client, community_site):
     community = community_site.community
     community.cover_image = dummy_cover_image
     community.save()
 
     url = reverse("cdn_thumb_serve", kwargs={"path": community.cover_image.name})
-    params = {"width": 100, "height": 100}
+    params = {"width": 64, "height": 64}
 
     response = client.get(url, params, HTTP_HOST=community_site.site.domain)
     assert response.status_code == 200
@@ -235,7 +172,7 @@ def test_thumbnail_serve_exception(params, dummy_cover_image, client, community_
     url = reverse("cdn_thumb_serve", kwargs={"path": community.cover_image.name})
 
     response = client.get(url, params, HTTP_HOST=community_site.site.domain)
-    assert response.status_code == 404
+    assert response.status_code == 403
     assert response.get("Cache-Control") == "max-age=300, public"
 
 
@@ -246,7 +183,7 @@ def test_thumbnail_serve_invalid(client, community_site):
     community.save()
 
     url = reverse("cdn_thumb_serve", kwargs={"path": community.cover_image.name})
-    params = {"width": 100, "height": 100}
+    params = {"width": 64, "height": 64}
 
     response = client.get(url, params, HTTP_HOST=community_site.site.domain)
     assert response.status_code == 404

django/thunderstore/frontend/views.py

@@ -12,6 +12,7 @@
 from django.views.decorators.csrf import ensure_csrf_cookie
 from django.views.generic import RedirectView, TemplateView, View
 
+from thunderstore.core.utils import capture_exception
 from thunderstore.frontend.services.thumbnail import get_or_create_thumbnail
 from thunderstore.plugins.registry import plugin_registry
 
@@ -78,8 +79,8 @@ def get(self, request, *args, **kwargs):
 
         max_age = 300  # 5 minutes
 
-        if not asset_path or width <= 0 or height <= 0:
-            response = HttpResponseNotFound("Invalid request parameters.")
+        if not asset_path:
+            response = HttpResponseNotFound("Thumbnail not found.")
         else:
             thumbnail = get_or_create_thumbnail(asset_path, width, height)
             thumbnail_path = thumbnail.storage_path if thumbnail else None
@@ -90,7 +91,8 @@ def get(self, request, *args, **kwargs):
                     file = default_storage.open(thumbnail_path, "rb")
                     response = FileResponse(file, content_type=mime_type)
                     max_age = 86400  # 24h
-                except FileNotFoundError:
+                except FileNotFoundError as e:
+                    capture_exception(e)
                     response = HttpResponseNotFound("Thumbnail not found.")
             else:
                 response = HttpResponseNotFound("Invalid request.")