Changelog

changelog.d/17417.bugfix

@@ -0,0 +1 @@
+Relax rate limiting behaviour on federated media downloads of unknown size.

synapse/http/matrixfederationclient.py

@@ -1488,9 +1488,11 @@ class MatrixFederationHttpClient:
         headers = dict(response.headers.getAllRawHeaders())
 
         expected_size = response.length
+        using_max_size = False
         # if we don't get an expected length then use the max length
         if expected_size == UNKNOWN_LENGTH:
             expected_size = max_size
+            using_max_size = True
             logger.debug(
                 f"File size unknown, assuming file is max allowable size: {max_size}"
             )
@@ -1550,6 +1552,20 @@ class MatrixFederationHttpClient:
                 e,
             )
             raise
+
+        # We need to refund the bucket difference if the expected size was unknown
+        # at the start of the request.
+        if using_max_size:
+            excess_bytes = max_size - length
+            logger.debug(
+                f"File size now known: {length}. Refunding {excess_bytes} back to user."
+            )
+            download_ratelimiter.record_action(
+                requester=None,
+                key=ip_address,
+                n_actions=excess_bytes * -1,  # perform a refund
+            )
+
         logger.info(
             "{%s} [%s] Completed: %d %s [%d bytes] %s %s",
             request.txn_id,
@@ -1632,9 +1648,11 @@ class MatrixFederationHttpClient:
         headers = dict(response.headers.getAllRawHeaders())
 
         expected_size = response.length
+        using_max_size = False
         # if we don't get an expected length then use the max length
         if expected_size == UNKNOWN_LENGTH:
             expected_size = max_size
+            using_max_size = True
             logger.debug(
                 f"File size unknown, assuming file is max allowable size: {max_size}"
             )
@@ -1733,6 +1751,19 @@ class MatrixFederationHttpClient:
                 str_url, output_stream, expected_size
             )
 
+        # We need to refund the bucket difference if the expected size was unknown
+        # at the start of the request.
+        if using_max_size:
+            excess_bytes = max_size - length
+            logger.debug(
+                f"File size now known: {length}. Refunding {excess_bytes} back to user."
+            )
+            download_ratelimiter.record_action(
+                requester=None,
+                key=ip_address,
+                n_actions=excess_bytes * -1,  # perform a refund
+            )
+
         logger.info(
             "{%s} [%s] Completed: %d %s [%d bytes] %s %s",
             request.txn_id,

tests/media/test_media_storage.py

@@ -1086,10 +1086,29 @@ class RemoteDownloadLimiterTestCase(unittest.HomeserverTestCase):
             )
             assert channel2.code == 200
 
-        # eleventh will hit ratelimit
-        channel3 = self.make_request(
-            "GET",
-            "/_matrix/media/v3/download/remote.org/abcdefghijklmnopqrstuvwxyx",
-            shorthand=False,
-        )
-        assert channel3.code == 429
+        # If the refund code is working correctly, there should be ~200MB of free space
+        # in the limit. This is because we're assuming each file is 50MB, but are only
+        # consuming 30MB files (per the @patch on this test). We should be able to get
+        # 6 more requests through now, before rate limiting on the 7th or 8th (we can
+        # expect that 6.667 requests will make it at 200MB / 30MB, which may be just
+        # enough for a slow test run to get an additional request through).
+        for i in range(6):
+            channel3 = self.make_request(
+                "GET",
+                f"/_matrix/media/v3/download/remote.org/abcd{i}",
+                shorthand=False,
+            )
+            assert channel3.code == 200
+
+        # Try the rate limit again, testing the eighth request fails. We discard the
+        # seventh request because it may or may not be rate limited (see above). The
+        # eighth request would *definitely* be rate limited though, so we test that.
+        for i in range(2):
+            channel4 = self.make_request(
+                "GET",
+                f"/_matrix/media/v3/download/remote.org/abcde{i}",
+                shorthand=False,
+            )
+            if i == 1:  # test for second request (which will be #8)
+                assert channel4.code == 429
+            # else, discard 7th request because it's unhelpful

tests/rest/client/test_media.py

@@ -1816,6 +1816,7 @@ class RemoteDownloadLimiterTestCase(unittest.HomeserverTestCase):
     def test_download_ratelimit_max_size_sub(self) -> None:
         """
         Test that if no content-length is provided, the default max size is applied instead
+        and the difference is refunded to the user.
         """
 
         # mock out actually sending the request
@@ -1841,14 +1842,34 @@ class RemoteDownloadLimiterTestCase(unittest.HomeserverTestCase):
             )
             assert channel2.code == 200
 
-        # eleventh will hit ratelimit
-        channel3 = self.make_request(
-            "GET",
-            "/_matrix/client/v1/media/download/remote.org/abcd",
-            shorthand=False,
-            access_token=self.tok,
-        )
-        assert channel3.code == 429
+        # If the refund code is working correctly, there should be ~200MB of free space
+        # in the limit. This is because we're assuming each file is 50MB, but are only
+        # consuming 30MB files (per the @patch on this test). We should be able to get
+        # 6 more requests through now, before rate limiting on the 7th or 8th (we can
+        # expect that 6.667 requests will make it at 200MB / 30MB, which may be just
+        # enough for a slow test run to get an additional request through).
+        for i in range(6):
+            channel3 = self.make_request(
+                "GET",
+                f"/_matrix/client/v1/media/download/remote.org/abcd{i}",
+                shorthand=False,
+                access_token=self.tok,
+            )
+            assert channel3.code == 200
+
+        # Try the rate limit again, testing the eighth request fails. We discard the
+        # seventh request because it may or may not be rate limited (see above). The
+        # eighth request would *definitely* be rate limited though, so we test that.
+        for i in range(2):
+            channel4 = self.make_request(
+                "GET",
+                f"/_matrix/client/v1/media/download/remote.org/abcde{i}",
+                shorthand=False,
+                access_token=self.tok,
+            )
+            if i == 1:  # test for second request (which will be #8)
+                assert channel4.code == 429
+            # else, discard 7th request because it's unhelpful
 
     def test_file_download(self) -> None:
         content = io.BytesIO(b"file_to_stream")