diff --git a/synapse/server.py b/synapse/server.py
index cdea49e6ab..a4d2d4aba5 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):
@@ -75,8 +76,10 @@ class BaseHomeServer(object):
'resource_for_federation',
'resource_for_web_client',
'resource_for_content_repo',
+ 'resource_for_server_key',
'event_sources',
'ratelimiter',
+ 'keyring',
]
def __init__(self, hostname, **kwargs):
@@ -143,6 +146,18 @@ class BaseHomeServer(object):
def serialize_event(self, e):
return serialize_event(self, e)
+ def get_ip_from_request(self, request):
+ # May be an X-Forwarding-For header depending on config
+ ip_addr = request.getClientIP()
+ if self.config.captcha_ip_origin_is_x_forwarded:
+ # use the header
+ if request.requestHeaders.hasHeader("X-Forwarded-For"):
+ ip_addr = request.requestHeaders.getRawHeaders(
+ "X-Forwarded-For"
+ )[0]
+
+ return ip_addr
+
# Build magic accessors for every dependency
for depname in BaseHomeServer.DEPENDENCIES:
BaseHomeServer._make_dependency_method(depname)
@@ -200,6 +215,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.
"""
|
