diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2021-01-18 10:21:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-18 10:21:42 -0500 |
| commit | 2b467d0b61ff094a305c2c92f0cec6ca04b5d16d (patch) | |
| tree | c7fe36c8f01e070432f9802f19211c129b26eae4 | |
| parent | Fix bugs in handling clientRedirectUrl, and improve OIDC tests (#9127, #9128) (diff) | |
| download | synapse-2b467d0b61ff094a305c2c92f0cec6ca04b5d16d.tar.xz | |
Properly raise an exception when the body exceeds the max size. (#9145)
...instead of just creating the exception object and doing nothing with it.
| -rw-r--r-- | changelog.d/9145.bugfix | 1 | ||||
| -rw-r--r-- | synapse/http/client.py | 2 | ||||
| -rw-r--r-- | synapse/http/matrixfederationclient.py | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/9145.bugfix b/changelog.d/9145.bugfix new file mode 100644 index 0000000000..947cf1dc25 --- /dev/null +++ b/changelog.d/9145.bugfix @@ -0,0 +1 @@ +Fix "UnboundLocalError: local variable 'length' referenced before assignment" errors when the response body exceeds the expected size. This bug was introduced in v1.25.0. diff --git a/synapse/http/client.py b/synapse/http/client.py index df498c8645..37ccf5ab98 100644 --- a/synapse/http/client.py +++ b/synapse/http/client.py @@ -724,7 +724,7 @@ class SimpleHttpClient: read_body_with_max_size(response, output_stream, max_size) ) except BodyExceededMaxSize: - SynapseError( + raise SynapseError( 502, "Requested file is too large > %r bytes" % (max_size,), Codes.TOO_LARGE, diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py index b7103d6541..19293bf673 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py @@ -996,7 +996,7 @@ class MatrixFederationHttpClient: logger.warning( "{%s} [%s] %s", request.txn_id, request.destination, msg, ) - SynapseError(502, msg, Codes.TOO_LARGE) + raise SynapseError(502, msg, Codes.TOO_LARGE) except Exception as e: logger.warning( "{%s} [%s] Error reading response: %s", |