Adapt the default config to bind on both IPv4 and IPv6 on all platforms #2435

silkeh · 2017-09-02T15:48:01Z

This pull requests extends #2232 with the suggestions from @ara4n:

Listen on both :: and 0.0.0.0, but ignore bind errors for 0.0.0.0 when :: was specified.
This ensures that the default configuration supports all platforms.

matrixbot · 2017-09-02T15:48:03Z

Can one of the admins verify this patch?

matrixbot · 2017-09-02T15:48:03Z

Can one of the admins verify this patch?

matrixbot · 2017-09-02T15:48:04Z

Can one of the admins verify this patch?

richvdh · 2017-09-05T17:25:51Z

synapse/app/homeserver.py

@@ -259,6 +273,13 @@ def quit_with_error(error_string):
    sys.exit(1)


+def check_bind_error(e, address, bind_addresses):
+    if address == '0.0.0.0' and '::' in bind_addresses:
+        logger.warn('Failed to listen on 0.0.0.0, continuing because listening on [::]')


could you add a comment about why this is a sensible thing to do (ie, explaining some of the problems discussed in #2232 ) ?

richvdh · 2017-09-05T17:30:07Z

matrixbot: ok to test

richvdh · 2017-09-05T17:34:46Z

synapse/app/homeserver.py

+                            interface=address
+                        )
+                    except error.CannotListenError as e:
+                        check_bind_error(e, address, bind_addresses)


I'm not sure it makes sense to apply the same logic to the rabbithole or replication listeners, not least because if you're binding them to the wildcard addresses, you're probably doing it wrong.

richvdh

I think if we're going to do this we should probably be consistent, so this needs updating in all the other synapse/app/*.py workers.

richvdh · 2017-09-05T17:36:09Z

generally this looks like a good idea to me. @erikjohnston do you have any thoughts?

silkeh · 2017-09-06T15:53:12Z

I think if we're going to do this we should probably be consistent, so this needs updating in all the other synapse/app/*.py workers.

I have committed an attempt to abstract this in _base. Depending on feedback I will do the same for all other synapse/app/*.py workers.

richvdh · 2017-09-20T10:09:23Z

synapse/app/homeserver.py

@@ -258,7 +263,6 @@ def quit_with_error(error_string):
    sys.stderr.write("*" * line_length + '\n')
    sys.exit(1)

-


this is a PEP8 failure

richvdh · 2017-09-20T10:09:47Z

synapse/app/homeserver.py

+                            "before", "shutdown", server_listener.stopListening,
+                        )
+                    except error.CannotListenError as e:
+                        _base.check_bind_error(logger, e, address, bind_addresses)


I don't think we need to do this for the replication listener

richvdh · 2017-09-20T10:12:24Z

synapse/app/_base.py

@@ -97,3 +97,58 @@ def run():
        daemon.start()
    else:
        run()
+
+
+def listen_tcp(logger, bind_addresses, port, factory, backlog=50):


it'd probably be better to create a new logger in this file than to pass around the logger from another file.

Most deployments are on Linux (or Mac OS), so this would actually bind on both IPv4 and IPv6. Resolves matrix-org#1886. Signed-off-by: Willem Mulder <willemmaster@hotmail.com>

Binding on 0.0.0.0 when :: is specified in the bind_addresses is now allowed. This causes a warning explaining the behaviour. Configuration changed to match. See matrix-org#2232 Signed-off-by: Silke Hofstra <silke@slxh.eu>

Add listen_tcp and listen_ssl which implement Twisted's reactor.listenTCP and reactor.listenSSL for multiple addresses. Signed-off-by: Silke Hofstra <silke@slxh.eu>

silkeh · 2017-12-17T12:29:31Z

The requested changes have been applied and I have rebased on develop.
I still need to update the other synapse/app/*.py workers.

Edit: they have been updated.

richvdh

looks good otherwise

richvdh · 2017-12-18T16:43:50Z

synapse/app/_base.py

-from twisted.internet import reactor
+from twisted.internet import error, reactor
+
+logger = logging.getLogger("synapse.app.client_reader")


This is used outside the client reader. logging.getLogger(__name__), please.

Indeed. Fixed.

Signed-off-by: Silke <silke@slxh.eu>

richvdh · 2017-12-18T22:34:57Z

thanks!

richvdh reviewed Sep 5, 2017

View reviewed changes

richvdh suggested changes Sep 20, 2017

View reviewed changes

14mRh4X0r and others added 3 commits December 17, 2017 13:07

Adapt the default config to bind on IPv6.

3e59143

Most deployments are on Linux (or Mac OS), so this would actually bind on both IPv4 and IPv6. Resolves matrix-org#1886. Signed-off-by: Willem Mulder <willemmaster@hotmail.com>

Allow binds to both :: and 0.0.0.0

37d1a90

Binding on 0.0.0.0 when :: is specified in the bind_addresses is now allowed. This causes a warning explaining the behaviour. Configuration changed to match. See matrix-org#2232 Signed-off-by: Silke Hofstra <silke@slxh.eu>

Add methods for listening on multiple addresses

ed48ecc

Add listen_tcp and listen_ssl which implement Twisted's reactor.listenTCP and reactor.listenSSL for multiple addresses. Signed-off-by: Silke Hofstra <silke@slxh.eu>

silkeh force-pushed the listen-ipv6-default branch 2 times, most recently from 7ce6531 to 8ad120b Compare December 17, 2017 12:27

silkeh force-pushed the listen-ipv6-default branch from 8ad120b to 70b20f8 Compare December 17, 2017 12:32

richvdh suggested changes Dec 18, 2017

View reviewed changes

silkeh added 2 commits December 18, 2017 20:00

Remove logger argument and do not catch replication listener

26cd3f5

Signed-off-by: Silke <silke@slxh.eu>

Implement listen_tcp method in remaining workers

df0f602

Signed-off-by: Silke <silke@slxh.eu>

silkeh force-pushed the listen-ipv6-default branch from 3311c6b to df0f602 Compare December 18, 2017 19:00

richvdh approved these changes Dec 18, 2017

View reviewed changes

richvdh merged commit 48fa4e1 into matrix-org:develop Dec 18, 2017

This was referenced Dec 18, 2017

Adapt the default config to bind on IPv6. #2232

Closed

Doesn't listen on IPv6 address #1886

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adapt the default config to bind on both IPv4 and IPv6 on all platforms #2435

Adapt the default config to bind on both IPv4 and IPv6 on all platforms #2435

silkeh commented Sep 2, 2017

matrixbot commented Sep 2, 2017

matrixbot commented Sep 2, 2017

matrixbot commented Sep 2, 2017

richvdh Sep 5, 2017

richvdh commented Sep 5, 2017

richvdh Sep 5, 2017

richvdh left a comment

richvdh commented Sep 5, 2017

silkeh commented Sep 6, 2017

richvdh Sep 20, 2017

richvdh Sep 20, 2017

richvdh Sep 20, 2017

silkeh commented Dec 17, 2017 •

edited

Loading

richvdh left a comment

richvdh Dec 18, 2017

silkeh Dec 18, 2017

richvdh commented Dec 18, 2017

		@@ -258,7 +263,6 @@ def quit_with_error(error_string):
		sys.stderr.write("" line_length + '\n')
		sys.exit(1)

Adapt the default config to bind on both IPv4 and IPv6 on all platforms #2435

Adapt the default config to bind on both IPv4 and IPv6 on all platforms #2435

Conversation

silkeh commented Sep 2, 2017

matrixbot commented Sep 2, 2017

matrixbot commented Sep 2, 2017

matrixbot commented Sep 2, 2017

richvdh Sep 5, 2017

Choose a reason for hiding this comment

richvdh commented Sep 5, 2017

richvdh Sep 5, 2017

Choose a reason for hiding this comment

richvdh left a comment

Choose a reason for hiding this comment

richvdh commented Sep 5, 2017

silkeh commented Sep 6, 2017

richvdh Sep 20, 2017

Choose a reason for hiding this comment

richvdh Sep 20, 2017

Choose a reason for hiding this comment

richvdh Sep 20, 2017

Choose a reason for hiding this comment

silkeh commented Dec 17, 2017 • edited Loading

richvdh left a comment

Choose a reason for hiding this comment

richvdh Dec 18, 2017

Choose a reason for hiding this comment

silkeh Dec 18, 2017

Choose a reason for hiding this comment

richvdh commented Dec 18, 2017

silkeh commented Dec 17, 2017 •

edited

Loading