diff options
| author | Erik Johnston <erik@matrix.org> | 2016-11-22 10:31:48 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-11-22 10:31:48 +0000 |
| commit | baf9e74a73fd1064a6767b6f82cb7f355630b1e6 (patch) | |
| tree | 3e7980c20526f41de5973b57c098e5c99b77baac /synapse | |
| parent | Merge pull request #1636 from matrix-org/kegan/filter-error-msg (diff) | |
| parent | Merge branch 'release-v0.18.4' of github.com:matrix-org/synapse (diff) | |
| download | synapse-baf9e74a73fd1064a6767b6f82cb7f355630b1e6.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/rest/client/v2_alpha/register.py | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index d366b69dab..432567a110 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a Matrix home server. """ -__version__ = "0.18.3" +__version__ = "0.18.4" 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: |