summary refs log tree commit diff
path: root/synapse/federation/federation_server.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-05-05 13:42:44 +0100
committerMark Haines <mark.haines@matrix.org>2016-05-05 13:42:44 +0100
commit9c272da05fcf51534aaa877647bc3b82bf841cf3 (patch)
treeb4ad76ff6acd5d5e38907208065689fb37c42e4c /synapse/federation/federation_server.py
parentMerge pull request #762 from matrix-org/erikj/report_event (diff)
downloadsynapse-9c272da05fcf51534aaa877647bc3b82bf841cf3.tar.xz
Add an openidish mechanism for proving to third parties that you own a given user_id
Diffstat (limited to 'synapse/federation/federation_server.py')
-rw-r--r--synapse/federation/federation_server.py5
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.