From 84742678227a6153120393366bca6af67f09ac25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <philipp@hoerist.com>
Date: Sun, 28 May 2023 14:47:44 +0200
Subject: fix: HTTP: Abort correctly on content overflow

---
 nbxmpp/http.py         |  7 +++++--
 test/unit/test_http.py | 24 ++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/nbxmpp/http.py b/nbxmpp/http.py
index 27cf4fa..9875651 100644
--- a/nbxmpp/http.py
+++ b/nbxmpp/http.py
@@ -373,7 +373,8 @@ class HTTPRequest(GObject.GObject):
             return
 
         self._received_size += len(bytes_)
-        self._check_content_overflow()
+        if self._check_content_overflow():
+            return
 
         if self._output_stream is None:
             self._response_body_data += bytes_
@@ -447,9 +448,11 @@ class HTTPRequest(GObject.GObject):
         self.emit('response-progress',
                   self._received_size / self._response_content_length)
 
-    def _check_content_overflow(self) -> None:
+    def _check_content_overflow(self) -> bool:
         if self._received_size > self._response_content_length:
             self._finish_read(HTTPRequestError.CONTENT_OVERFLOW)
+            return True
+        return False
 
     def _on_restarted(self, _message: Soup.Message) -> None:
         self._log.info('Restarted')
diff --git a/test/unit/test_http.py b/test/unit/test_http.py
index 6ada805..fc22624 100644
--- a/test/unit/test_http.py
+++ b/test/unit/test_http.py
@@ -236,6 +236,30 @@ class HTTP(unittest.TestCase):
         self.assertTrue(request4.is_finished())
         self.assertTrue(request4.is_complete())
 
+    def test_content_overflow(self):
+
+        mainloop = GLib.MainLoop()
+
+        session = HTTPSession()
+        request = session.create_request()
+
+
+        def _on_starting(req) -> None:
+            req._received_size = 100000000000
+
+        callback_mock = Mock()
+        request.connect('starting-response-body', _on_starting)
+        request.connect('finished', callback_mock.finished)
+        request.connect('destroy', lambda *args: mainloop.quit())
+        request.send('GET', SMALL_FILE_URL, timeout=10)
+
+        mainloop.run()
+
+        self.assertTrue(request.is_finished())
+        self.assertFalse(request.is_complete())
+        self.assertEqual(request.get_error(), HTTPRequestError.CONTENT_OVERFLOW)
+
+        callback_mock.finished.assert_called()
 
 if __name__ == '__main__':
     unittest.main()
-- 
cgit v1.2.3