diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-05-05 19:26:30 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2016-05-05 19:26:30 +0100 |
| commit | 1f590f3e9abf25c70078055ba68a99cd5970a4d2 (patch) | |
| tree | fe56d6d34f0d57a707e65a7327b587e81265a951 /synapse/federation/federation_server.py | |
| parent | Merge pull request #762 from matrix-org/erikj/report_event (diff) | |
| parent | Rename openid/token to openid/request_token (diff) | |
| download | synapse-1f590f3e9abf25c70078055ba68a99cd5970a4d2.tar.xz | |
Merge pull request #765 from matrix-org/markjh/open_id
Add an openidish mechanism for proving that you own a given user_id
Diffstat (limited to 'synapse/federation/federation_server.py')
| -rw-r--r-- | synapse/federation/federation_server.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index 429ab6ddec..f1d231b9d8 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -388,6 +388,11 @@ class FederationServer(FederationBase): }) @log_function + def on_openid_userinfo(self, token): + ts_now_ms = self._clock.time_msec() + return self.store.get_user_id_for_open_id_token(token, ts_now_ms) + + @log_function def _get_persisted_pdu(self, origin, event_id, do_auth=True): """ Get a PDU from the database with given origin and id. |