Support AF_INET6 address family

tests/protocols/test_http.py

@@ -88,7 +88,7 @@ def get_extra_info(self, key):
             "sockname": self.sockname,
             "peername": self.peername,
             "sslcontext": self.sslcontext,
-        }[key]
+        }.get(key)
 
     def write(self, data):
         assert not self.closed

tests/protocols/test_utils.py

@@ -1,12 +1,56 @@
+import socket
 from uvicorn.protocols.utils import get_local_addr, get_remote_addr
 
 
+class MockSocket:
+    def __init__(self, family, peername=None, sockname=None):
+        self.peername = peername
+        self.sockname = sockname
+        self.family = family
+
+    def getpeername(self):
+        return self.peername
+
+    def getsockname(self):
+        return self.sockname
+
+
 class MockTransport:
     def __init__(self, info):
         self.info = info
 
     def get_extra_info(self, info_type):
-        return self.info[info_type]
+        return self.info.get(info_type)
+
+
+def test_get_local_addr_with_socket():
+    transport = MockTransport({"socket": MockSocket(family=socket.AF_IPX)})
+    assert get_local_addr(transport) == None
+
+    transport = MockTransport(
+        {"socket": MockSocket(family=socket.AF_INET6, sockname=["::1", 123])}
+    )
+    assert get_local_addr(transport) == ("::1", 123)
+
+    transport = MockTransport(
+        {"socket": MockSocket(family=socket.AF_INET, sockname=["123.45.6.7", 123])}
+    )
+    assert get_local_addr(transport) == ("123.45.6.7", 123)
+
+
+def test_get_remote_addr_with_socket():
+    transport = MockTransport({"socket": MockSocket(family=socket.AF_IPX)})
+    assert get_remote_addr(transport) == None
+
+    transport = MockTransport(
+        {"socket": MockSocket(family=socket.AF_INET6, peername=["::1", 123])}
+    )
+    assert get_remote_addr(transport) == ("::1", 123)
+
+    transport = MockTransport(
+        {"socket": MockSocket(family=socket.AF_INET, peername=["123.45.6.7", 123])}
+    )
+    assert get_remote_addr(transport) == ("123.45.6.7", 123)
 
 
 def test_get_local_addr():

uvicorn/protocols/utils.py

@@ -1,11 +1,28 @@
+import socket
+
+
 def get_remote_addr(transport):
+    socket_info = transport.get_extra_info("socket")
+    if socket_info is not None:
+        info = socket_info.getpeername()
+        family = socket_info.family
+        if family in (socket.AF_INET, socket.AF_INET6):
+            return (str(info[0]), int(info[1]))
+        return None
     info = transport.get_extra_info("peername")
     if info is not None and isinstance(info, (list, tuple)) and len(info) == 2:
         return (str(info[0]), int(info[1]))
     return None
 
 
 def get_local_addr(transport):
+    socket_info = transport.get_extra_info("socket")
+    if socket_info is not None:
+        info = socket_info.getsockname()
+        family = socket_info.family
+        if family in (socket.AF_INET, socket.AF_INET6):
+            return (str(info[0]), int(info[1]))
+        return None
     info = transport.get_extra_info("sockname")
     if info is not None and isinstance(info, (list, tuple)) and len(info) == 2:
         return (str(info[0]), int(info[1]))