diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-08-12 17:07:22 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-08-12 17:21:14 +0100 |
| commit | 998a72d4d9ec6e73000888dcdf51437ec427fbee (patch) | |
| tree | f8fa9d5deb820b49eb3a216e194ee83e14fb9eda /synapse/handlers/auth.py | |
| parent | Bump the version of twisted needed for setup_requires to 15.2.1 (diff) | |
| parent | Merge pull request #220 from matrix-org/markjh/generate_keys (diff) | |
| download | synapse-998a72d4d9ec6e73000888dcdf51437ec427fbee.tar.xz | |
Merge branch 'develop' into markjh/twisted-15
Conflicts: synapse/http/matrixfederationclient.py
Diffstat (limited to 'synapse/handlers/auth.py')
| -rw-r--r-- | synapse/handlers/auth.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py index 63071653a3..1ecf7fef17 100644 --- a/synapse/handlers/auth.py +++ b/synapse/handlers/auth.py @@ -85,8 +85,10 @@ class AuthHandler(BaseHandler): # email auth link on there). It's probably too open to abuse # because it lets unauthenticated clients store arbitrary objects # on a home server. - # sess['clientdict'] = clientdict - # self._save_session(sess) + # Revisit: Assumimg the REST APIs do sensible validation, the data + # isn't arbintrary. + sess['clientdict'] = clientdict + self._save_session(sess) pass elif 'clientdict' in sess: clientdict = sess['clientdict'] |