diff options
| author | Erik Johnston <erik@matrix.org> | 2019-01-24 18:31:23 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-01-24 18:31:23 +0000 |
| commit | d148c43050f7a85523a743ff6069683c644a517d (patch) | |
| tree | 4a87175747cbca6b310e5ad83b8ee18d7dbd7700 | |
| parent | Newsfile (diff) | |
| download | synapse-d148c43050f7a85523a743ff6069683c644a517d.tar.xz | |
Review comments
| -rw-r--r-- | synapse/federation/federation_client.py | 3 | ||||
| -rw-r--r-- | synapse/handlers/federation.py | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py index 4e171f9b56..7fb5736142 100644 --- a/synapse/federation/federation_client.py +++ b/synapse/federation/federation_client.py @@ -674,7 +674,8 @@ class FederationClient(FederationBase): break if room_version is None: - # We use this error has that is what + # If the state doesn't have a create event then the room is + # invalid, and it would fail auth checks anyway. raise SynapseError(400, "No create event in state") valid_pdus = yield self._check_sigs_and_hash_and_fetch( diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index a9dc4a4e4e..5280d88a50 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -1664,6 +1664,11 @@ class FederationHandler(BaseHandler): create_event = e break + if create_event is None: + # If the state doesn't have a create event then the room is + # invalid, and it would fail auth checks anyway. + raise SynapseError(400, "No create event in state") + room_version = create_event.content.get("room_version", RoomVersions.V1) missing_auth_events = set() |