diff options
| author | Erik Johnston <erik@matrix.org> | 2016-11-22 10:18:30 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-11-22 10:18:30 +0000 |
| commit | 2bbc4cab604aa649cc114fac0ebdbfa42b35a674 (patch) | |
| tree | 2def351407d8973c52e30863f404e7c62287d4d4 | |
| parent | Bump changelog and version (diff) | |
| parent | Fix flake8 (diff) | |
| download | synapse-2bbc4cab604aa649cc114fac0ebdbfa42b35a674.tar.xz | |
Merge branch 'dbkr/work_around_devicename_bug' of github.com:matrix-org/synapse into release-v0.18.4
| -rw-r--r-- | synapse/rest/client/v2_alpha/register.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py index 68d18a9b82..6cfb20866b 100644 --- a/synapse/rest/client/v2_alpha/register.py +++ b/synapse/rest/client/v2_alpha/register.py @@ -169,6 +169,17 @@ class RegisterRestServlet(RestServlet): guest_access_token = body.get("guest_access_token", None) + if ( + 'initial_device_display_name' in body and + 'password' not in body + ): + # ignore 'initial_device_display_name' if sent without + # a password to work around a client bug where it sent + # the 'initial_device_display_name' param alone, wiping out + # the original registration params + logger.warn("Ignoring initial_device_display_name without password") + del body['initial_device_display_name'] + session_id = self.auth_handler.get_session_id(body) registered_user_id = None if session_id: |