summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-09-30 15:15:10 +0100
committerMark Haines <mark.haines@matrix.org>2014-09-30 15:15:10 +0100
commitb95a178584cac07018f47e571f48993878da7284 (patch)
tree0e4aba0430e8ecca02afec92d60e52dcd6d0942c /synapse/server.py
parentSign federation transactions (diff)
downloadsynapse-b95a178584cac07018f47e571f48993878da7284.tar.xz
SYN-75 Verify signatures on server to server transactions
Diffstat (limited to 'synapse/server.py')
-rw-r--r--synapse/server.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/server.py b/synapse/server.py

index 529500d595..ed5b810d3e 100644 --- a/synapse/server.py +++ b/synapse/server.py
@@ -34,6 +34,7 @@ from synapse.util.distributor import Distributor from synapse.util.lockutils import LockManager from synapse.streams.events import EventSources from synapse.api.ratelimiting import Ratelimiter +from synapse.crypto.keyring import Keyring class BaseHomeServer(object): @@ -78,6 +79,7 @@ class BaseHomeServer(object): 'resource_for_server_key', 'event_sources', 'ratelimiter', + 'keyring', ] def __init__(self, hostname, **kwargs): @@ -201,6 +203,9 @@ class HomeServer(BaseHomeServer): def build_ratelimiter(self): return Ratelimiter() + def build_keyring(self): + return Keyring(self) + def register_servlets(self): """ Register all servlets associated with this HomeServer. """