fix: allow ip hosts and hostnames (#275)

Author: magnasilvar

pytest_socket.py

@@ -227,22 +227,24 @@ def socket_allow_hosts(allowed=None, allow_unix_socket=False):
     if not isinstance(allowed, list):
         return
 
-    allowed_hosts_by_host = normalize_allowed_hosts(allowed)
-    allowed_hosts = set(itertools.chain(*allowed_hosts_by_host.values()))
+    allowed_ip_hosts_by_host = normalize_allowed_hosts(allowed)
+    allowed_ip_hosts_and_hostnames = set(
+        itertools.chain(*allowed_ip_hosts_by_host.values())
+    ) | set(allowed_ip_hosts_by_host.keys())
     allowed_list = sorted(
         [
             (
                 host
                 if len(normalized) == 1 and next(iter(normalized)) == host
                 else f"{host} ({','.join(sorted(normalized))})"
             )
-            for host, normalized in allowed_hosts_by_host.items()
+            for host, normalized in allowed_ip_hosts_by_host.items()
         ]
     )
 
     def guarded_connect(inst, *args):
         host = host_from_connect_args(args)
-        if host in allowed_hosts or (
+        if host in allowed_ip_hosts_and_hostnames or (
             _is_unix_socket(inst.family) and allow_unix_socket
         ):
             return _true_connect(inst, *args)

tests/test_restrict_hosts.py

@@ -123,6 +123,14 @@ def test_single_cli_arg_connect_enabled_localhost_resolved(assert_connect):
     assert_connect(True, cli_arg="localhost")
 
 
+def test_single_cli_arg_127_0_0_1_hostname_localhost_connect_disabled(assert_connect):
+    assert_connect(False, cli_arg=localhost, host="localhost")
+
+
+def test_single_cli_arg_localhost_hostname_localhost_connect_enabled(assert_connect):
+    assert_connect(True, cli_arg="localhost", host="localhost")
+
+
 def test_single_cli_arg_connect_disabled_hostname_resolved(assert_connect):
     result = assert_connect(
         False,