Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Add support for specifying multiple bind addresses #1709

Merged
merged 4 commits into from Dec 19, 2016
Merged

Add support for specifying multiple bind addresses #1709

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7dfd70f
Add support for specifying multiple bind addresses
kyrias Dec 18, 2016
c95e9ff
Make default homeserver config use bind_addresses
kyrias Dec 18, 2016
1859af9
Update README to use `bind_addresses`
kyrias Dec 18, 2016
f5cd5eb
Add IPv6 comment to default config
kyrias Dec 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.rst
View file
Open in desktop
Expand Up @@ -658,7 +658,7 @@ configuration might look like::
}
}

You will also want to set ``bind_address: 127.0.0.1`` and ``x_forwarded: true``
You will also want to set ``bind_addresses: ['127.0.0.1']`` and ``x_forwarded: true``
for port 8008 in ``homeserver.yaml`` to ensure that client IP addresses are
recorded correctly.

Expand Down
54 changes: 34 additions & 20 deletions synapse/app/appservice.py
View file
Open in desktop
Expand Up @@ -76,7 +76,8 @@ def setup(self):

def _listen_http(self, listener_config):
port = listener_config["port"]
bind_address = listener_config.get("bind_address", "")
bind_address = listener_config.get("bind_address", None)
bind_addresses = listener_config.get("bind_addresses", [])
site_tag = listener_config.get("tag", port)
resources = {}
for res in listener_config["resources"]:
Expand All @@ -85,32 +86,45 @@ def _listen_http(self, listener_config):
resources[METRICS_PREFIX] = MetricsResource(self)

root_resource = create_resource_tree(resources, Resource())
reactor.listenTCP(
port,
SynapseSite(
"synapse.access.http.%s" % (site_tag,),
site_tag,
listener_config,
root_resource,
),
interface=bind_address
)

if bind_address:
bind_addresses.append(bind_address)

for address in bind_addresses:
reactor.listenTCP(
port,
SynapseSite(
"synapse.access.http.%s" % (site_tag,),
site_tag,
listener_config,
root_resource,
),
interface=address
)

logger.info("Synapse appservice now listening on port %d", port)

def start_listening(self, listeners):
for listener in listeners:
if listener["type"] == "http":
self._listen_http(listener)
elif listener["type"] == "manhole":
reactor.listenTCP(
listener["port"],
manhole(
username="matrix",
password="rabbithole",
globals={"hs": self},
),
interface=listener.get("bind_address", '127.0.0.1')
)
bind_address = listener.get("bind_address", None)
bind_addresses = listener.get("bind_addresses", [])

if bind_address:
bind_addresses.append(bind_address)

for address in bind_addresses:
reactor.listenTCP(
listener["port"],
manhole(
username="matrix",
password="rabbithole",
globals={"hs": self},
),
interface=address
)
else:
logger.warn("Unrecognized listener type: %s", listener["type"])

Expand Down
54 changes: 34 additions & 20 deletions synapse/app/client_reader.py
View file
Open in desktop
Expand Up @@ -90,7 +90,8 @@ def setup(self):

def _listen_http(self, listener_config):
port = listener_config["port"]
bind_address = listener_config.get("bind_address", "")
bind_address = listener_config.get("bind_address", None)
bind_addresses = listener_config.get("bind_addresses", [])
site_tag = listener_config.get("tag", port)
resources = {}
for res in listener_config["resources"]:
Expand All @@ -108,32 +109,45 @@ def _listen_http(self, listener_config):
})

root_resource = create_resource_tree(resources, Resource())
reactor.listenTCP(
port,
SynapseSite(
"synapse.access.http.%s" % (site_tag,),
site_tag,
listener_config,
root_resource,
),
interface=bind_address
)

if bind_address:
bind_addresses.append(bind_address)

for address in bind_addresses:
reactor.listenTCP(
port,
SynapseSite(
"synapse.access.http.%s" % (site_tag,),
site_tag,
listener_config,
root_resource,
),
interface=address
)

logger.info("Synapse client reader now listening on port %d", port)

def start_listening(self, listeners):
for listener in listeners:
if listener["type"] == "http":
self._listen_http(listener)
elif listener["type"] == "manhole":
reactor.listenTCP(
listener["port"],
manhole(
username="matrix",
password="rabbithole",
globals={"hs": self},
),
interface=listener.get("bind_address", '127.0.0.1')
)
bind_address = listener.get("bind_address", None)
bind_addresses = listener.get("bind_addresses", [])

if bind_address:
bind_addresses.append(bind_address)

for address in bind_addresses:
reactor.listenTCP(
listener["port"],
manhole(
username="matrix",
password="rabbithole",
globals={"hs": self},
),
interface=address
)
else:
logger.warn("Unrecognized listener type: %s", listener["type"])

Expand Down
54 changes: 34 additions & 20 deletions synapse/app/federation_reader.py
View file
Open in desktop
Expand Up @@ -86,7 +86,8 @@ def setup(self):

def _listen_http(self, listener_config):
port = listener_config["port"]
bind_address = listener_config.get("bind_address", "")
bind_address = listener_config.get("bind_address", None)
bind_addresses = listener_config.get("bind_addresses", [])
site_tag = listener_config.get("tag", port)
resources = {}
for res in listener_config["resources"]:
Expand All @@ -99,32 +100,45 @@ def _listen_http(self, listener_config):
})

root_resource = create_resource_tree(resources, Resource())
reactor.listenTCP(
port,
SynapseSite(
"synapse.access.http.%s" % (site_tag,),
site_tag,
listener_config,
root_resource,
),
interface=bind_address
)

if bind_address:
bind_addresses.append(bind_address)

for address in bind_addresses:
reactor.listenTCP(
port,
SynapseSite(
"synapse.access.http.%s" % (site_tag,),
site_tag,
listener_config,
root_resource,
),
interface=address
)

logger.info("Synapse federation reader now listening on port %d", port)

def start_listening(self, listeners):
for listener in listeners:
if listener["type"] == "http":
self._listen_http(listener)
elif listener["type"] == "manhole":
reactor.listenTCP(
listener["port"],
manhole(
username="matrix",
password="rabbithole",
globals={"hs": self},
),
interface=listener.get("bind_address", '127.0.0.1')
)
bind_address = listener.get("bind_address", None)
bind_addresses = listener.get("bind_addresses", [])

if bind_address:
bind_addresses.append(bind_address)

for address in bind_addresses:
reactor.listenTCP(
listener["port"],
manhole(
username="matrix",
password="rabbithole",
globals={"hs": self},
),
interface=address
)
else:
logger.warn("Unrecognized listener type: %s", listener["type"])

Expand Down
54 changes: 34 additions & 20 deletions synapse/app/federation_sender.py
View file
Open in desktop
Expand Up @@ -82,7 +82,8 @@ def setup(self):

def _listen_http(self, listener_config):
port = listener_config["port"]
bind_address = listener_config.get("bind_address", "")
bind_address = listener_config.get("bind_address", None)
bind_addresses = listener_config.get("bind_addresses", [])
site_tag = listener_config.get("tag", port)
resources = {}
for res in listener_config["resources"]:
Expand All @@ -91,32 +92,45 @@ def _listen_http(self, listener_config):
resources[METRICS_PREFIX] = MetricsResource(self)

root_resource = create_resource_tree(resources, Resource())
reactor.listenTCP(
port,
SynapseSite(
"synapse.access.http.%s" % (site_tag,),
site_tag,
listener_config,
root_resource,
),
interface=bind_address
)

if bind_address:
bind_addresses.append(bind_address)

for address in bind_addresses:
reactor.listenTCP(
port,
SynapseSite(
"synapse.access.http.%s" % (site_tag,),
site_tag,
listener_config,
root_resource,
),
interface=address
)

logger.info("Synapse federation_sender now listening on port %d", port)

def start_listening(self, listeners):
for listener in listeners:
if listener["type"] == "http":
self._listen_http(listener)
elif listener["type"] == "manhole":
reactor.listenTCP(
listener["port"],
manhole(
username="matrix",
password="rabbithole",
globals={"hs": self},
),
interface=listener.get("bind_address", '127.0.0.1')
)
bind_address = listener.get("bind_address", None)
bind_addresses = listener.get("bind_addresses", [])

if bind_address:
bind_addresses.append(bind_address)

for address in bind_addresses:
reactor.listenTCP(
listener["port"],
manhole(
username="matrix",
password="rabbithole",
globals={"hs": self},
),
interface=address
)
else:
logger.warn("Unrecognized listener type: %s", listener["type"])

Expand Down