Handle users passing us bad email IDs (#15831)

* Add a failing test * Handle users passing us bad email IDs
pypi · Apr 22, 2024 · 1e35a5d · 1e35a5d
1 parent b09edd1
commit 1e35a5d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/tests/unit/manage/test_views.py b/tests/unit/manage/test_views.py
@@ -691,12 +691,13 @@ def test_reverify_email_ratelimit_exceeded(self, monkeypatch):
         assert send_email.calls == []
         assert email.user.record_event.calls == []
 
-    def test_reverify_email_not_found(self, monkeypatch):
+    @pytest.mark.parametrize("reverify_email_id", ["9999", "wutang"])
+    def test_reverify_email_not_found(self, monkeypatch, reverify_email_id):
         def raise_no_result():
             raise NoResultFound
 
         request = pretend.stub(
-            POST={"reverify_email_id": "9999"},
+            POST={"reverify_email_id": reverify_email_id},
             db=pretend.stub(
                 query=lambda *a: pretend.stub(
                     filter=lambda *a: pretend.stub(one=raise_no_result)

diff --git a/warehouse/manage/views/__init__.py b/warehouse/manage/views/__init__.py
@@ -160,7 +160,7 @@ def reverify_email(self):
                 )
                 .one()
             )
-        except NoResultFound:
+        except (NoResultFound, ValueError):
             self.request.session.flash("Email address not found", queue="error")
             return self.default_response