Model.verify: add error message for non-2xx redirects

for #337
snarfed · Dec 7, 2022 · f72b3ab · f72b3ab
1 parent 6c1736f
commit f72b3ab
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/models.py b/models.py
@@ -174,6 +174,11 @@ def verify(self):
                 elif resp.url:
                     diff = '\n'.join(difflib.Differ().compare([resp.url], [expected[0]]))
                     self.redirects_error = f'Current vs expected:<pre>{diff}</pre>'
+            else:
+                lines = [url, f'  returned HTTP {resp.status_code}']
+                if resp.url != url:
+                    lines[1:1] = ['  redirected to:', resp.url]
+                self.redirects_error = '\n'.join(lines)
         except requests.RequestException:
             pass
 

diff --git a/tests/test_models.py b/tests/test_models.py
@@ -103,6 +103,17 @@ def test_verify_multiple_redirects(self, mock_get):
         mock_get.side_effect = [two_redirs, no_hcard]
         self._test_verify(True, False, None)
 
+    @mock.patch('requests.get')
+    def test_verify_redirect_404(self, mock_get):
+        redir_404 = requests_response(status=404, redirected_url='http://this/404s')
+        no_hcard = requests_response('<html><body></body></html>')
+        mock_get.side_effect = [redir_404, no_hcard]
+        self._test_verify(False, False, None, """\
+https://y.z/.well-known/webfinger?resource=acct:y.z@y.z
+  redirected to:
+http://this/404s
+  returned HTTP 404""")
+
     @mock.patch('requests.get')
     def test_verify_non_representative_hcard(self, mock_get):
         full_redir = requests_response(