mirror of
https://github.com/certbot/certbot.git
synced 2026-07-28 08:45:22 +02:00
Fix getsockname usage with IPv6
This commit is contained in:
@@ -55,7 +55,8 @@ class ACMEServerMixin: # pylint: disable=old-style-class
|
||||
|
||||
def serve_forever2(self):
|
||||
"""Serve forever, until other thread calls `shutdown2`."""
|
||||
logger.debug("Starting server at %s:%d...", *self.socket.getsockname())
|
||||
logger.debug("Starting server at %s:%d...",
|
||||
*self.socket.getsockname()[:2])
|
||||
while not self._stopped:
|
||||
self.handle_request()
|
||||
|
||||
|
||||
@@ -101,8 +101,8 @@ class DVSNIServerTest(unittest.TestCase):
|
||||
self.assertFalse(self.server._stopped)
|
||||
|
||||
def test_dvsni(self):
|
||||
cert = crypto_util.probe_sni(
|
||||
b'localhost', *self.server.socket.getsockname())
|
||||
host, port = self.server.socket.getsockname()[:2]
|
||||
cert = crypto_util.probe_sni(b'localhost', host=host, port=port)
|
||||
self.assertEqual(jose.ComparableX509(cert),
|
||||
jose.ComparableX509(self.certs[b'localhost'][1]))
|
||||
|
||||
|
||||
@@ -77,7 +77,7 @@ class ServerManager(object):
|
||||
|
||||
# if port == 0, then random free port on OS is taken
|
||||
# pylint: disable=no-member
|
||||
_, real_port = server.socket.getsockname()
|
||||
real_port = server.socket.getsockname()[1]
|
||||
self._instances[real_port] = self._Instance(server, thread)
|
||||
return server
|
||||
|
||||
@@ -89,7 +89,7 @@ class ServerManager(object):
|
||||
"""
|
||||
instance = self._instances[port]
|
||||
logger.debug("Stopping server at %s:%d...",
|
||||
*instance.server.socket.getsockname())
|
||||
*instance.server.socket.getsockname()[:2])
|
||||
instance.server.shutdown2()
|
||||
instance.thread.join()
|
||||
del self._instances[port]
|
||||
|
||||
Reference in New Issue
Block a user