diff options
| author | Erik Johnston <erikj@jki.re> | 2018-03-02 11:31:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-02 11:31:50 +0000 |
| commit | 6619f047ade036b2cce343dad20b6d58a32a2323 (patch) | |
| tree | 7018d5e23e68c31f8923954a9cc6038d5e9421bc | |
| parent | Merge pull request #2928 from matrix-org/erikj/read_marker_caches (diff) | |
| parent | Add missing yield during 3pid signature checks (diff) | |
| download | synapse-6619f047ade036b2cce343dad20b6d58a32a2323.tar.xz | |
Merge pull request #2933 from matrix-org/erikj/3pid_yield
Add missing yield during 3pid signature checks
| -rw-r--r-- | synapse/handlers/room_member.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index 7ecdf87246..ed3b97730d 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -573,7 +573,7 @@ class RoomMemberHandler(object): if "mxid" in data: if "signatures" not in data: raise AuthError(401, "No signatures on 3pid binding") - self.verify_any_signature(data, id_server) + yield self.verify_any_signature(data, id_server) defer.returnValue(data["mxid"]) except IOError as e: |