diff options
| author | Erik Johnston <erik@matrix.org> | 2018-09-06 14:08:33 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-09-06 14:08:33 +0100 |
| commit | d64b24dfe6e792bb3031888f886ee871e4f41064 (patch) | |
| tree | 4ad3fecdec4e1dfd21baa7b3bec698ec43c317ea /synapse/federation/transport/server.py | |
| parent | Merge pull request #3802 from matrix-org/jcgruenhage/docker-unignore-synctl (diff) | |
| parent | prepare v0.33.3.1 (diff) | |
| download | synapse-d64b24dfe6e792bb3031888f886ee871e4f41064.tar.xz | |
Merge tag 'v0.33.3.1' into release-v0.33.4
Synapse 0.33.3.1 (2018-09-06) ============================= SECURITY FIXES -------------- - Fix an issue where event signatures were not always correctly validated ([\#3796](https://github.com/matrix-org/synapse/issues/3796)) - Fix an issue where server_acls could be circumvented for incoming events ([\#3796](https://github.com/matrix-org/synapse/issues/3796)) Internal Changes ---------------- - Unignore synctl in .dockerignore to fix docker builds ([\#3802](https://github.com/matrix-org/synapse/issues/3802))
Diffstat (limited to 'synapse/federation/transport/server.py')
| -rw-r--r-- | synapse/federation/transport/server.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py index 7a993fd1cf..3972922ff9 100644 --- a/synapse/federation/transport/server.py +++ b/synapse/federation/transport/server.py @@ -353,7 +353,7 @@ class FederationSendServlet(BaseFederationServlet): try: code, response = yield self.handler.on_incoming_transaction( - transaction_data + origin, transaction_data, ) except Exception: logger.exception("on_incoming_transaction failed") |