Fix connecting to npipe://, tcp://, and unix:// urls

CHANGES/8632.bugfix.rst

@@ -0,0 +1 @@
+Fixed connecting to ``npipe://`` and ``unix://`` urls -- by :user:`bdraco`.

aiohttp/client.py

@@ -84,6 +84,7 @@
 from .cookiejar import CookieJar
 from .helpers import (
  _SENTINEL,
+ HTTP_SCHEMA_SET,
  BasicAuth,
  TimeoutHandle,
  ceil_timeout,
@@ -210,9 +211,7 @@ class ClientTimeout:
 
 # https://www.rfc-editor.org/rfc/rfc9110#section-9.2.2
 IDEMPOTENT_METHODS = frozenset({"GET", "HEAD", "OPTIONS", "TRACE", "PUT", "DELETE"})
-HTTP_SCHEMA_SET = frozenset({"http", "https", ""})
-WS_SCHEMA_SET = frozenset({"ws", "wss"})
-ALLOWED_PROTOCOL_SCHEMA_SET = HTTP_SCHEMA_SET | WS_SCHEMA_SET
+
 
 _RetType = TypeVar("_RetType")
 _CharsetResolver = Callable[[ClientResponse, bytes], str]
@@ -455,7 +454,7 @@ async def _request(
  except ValueError as e:
  raise InvalidUrlClientError(str_or_url) from e
 
- if url.scheme not in ALLOWED_PROTOCOL_SCHEMA_SET:
+ if url.scheme not in self._connector.allowed_protocol_schema_set:
  raise NonHttpUrlClientError(url)
 
  skip_headers = set(self._skip_auto_headers)

aiohttp/connector.py

@@ -7,8 +7,9 @@
 import sys
 import traceback
 import warnings
-from collections import defaultdict, deque
+from collections import defaultdict, deque, frozenset
 from contextlib import suppress
+from functools import cached_property
 from http import HTTPStatus
 from http.cookies import SimpleCookie
 from itertools import cycle, islice
@@ -50,7 +51,18 @@
 )
 from .client_proto import ResponseHandler
 from .client_reqrep import SSL_ALLOWED_TYPES, ClientRequest, Fingerprint
-from .helpers import _SENTINEL, ceil_timeout, is_ip_address, sentinel, set_result
+from .helpers import (
+ _SENTINEL,
+ ALLOWED_PROTOCOL_SCHEMA_SET,
+ HTTP_SCHEMA_SET,
+ NAMED_PIPE_PROTOCOL_SCHEMA_SET,
+ UNIX_PROTCOL_SCHEMA_SET,
+ WS_SCHEMA_SET,
+ ceil_timeout,
+ is_ip_address,
+ sentinel,
+ set_result,
+)
 from .locks import EventResultOrError
 from .resolver import DefaultResolver
 
@@ -243,6 +255,14 @@ def __init__(
  self._cleanup_closed_transports: List[Optional[asyncio.Transport]] = []
  self._cleanup_closed()
 
+ @cached_property
+ def allowed_protocol_schema_set(self) -> frozenset[str]:
+ """Return allowed protocol schema set.
+
+ By default we allow all protocols.
+ """
+ return ALLOWED_PROTOCOL_SCHEMA_SET
+
  def __del__(self, _warnings: Any = warnings) -> None:
  if self._closed:
  return
@@ -790,6 +810,11 @@ def _close_immediately(self) -> List["asyncio.Future[None]"]:
  ev.cancel()
  return super()._close_immediately()
 
+ @cached_property
+ def allowed_protocol_schema_set(self) -> frozenset[str]:
+ """Return allowed protocol schema set."""
+ return HTTP_SCHEMA_SET | WS_SCHEMA_SET
+
  @property
  def family(self) -> int:
  """Socket family like AF_INET."""
@@ -1357,6 +1382,11 @@ def __init__(
  )
  self._path = path
 
+ @cached_property
+ def allowed_protocol_schema_set(self) -> frozenset[str]:
+ """Return allowed protocol schema set."""
+ return UNIX_PROTCOL_SCHEMA_SET
+
  @property
  def path(self) -> str:
  """Path to unix socket."""
@@ -1417,6 +1447,11 @@ def __init__(
  )
  self._path = path
 
+ @cached_property
+ def allowed_protocol_schema_set(self) -> frozenset[str]:
+ """Return allowed protocol schema set."""
+ return NAMED_PIPE_PROTOCOL_SCHEMA_SET
+
  @property
  def path(self) -> str:
  """Path to the named pipe."""

aiohttp/helpers.py

@@ -107,6 +107,17 @@
 }
 TOKEN = CHAR ^ CTL ^ SEPARATORS
 
+HTTP_SCHEMA_SET = frozenset({"http", "https", ""})
+WS_SCHEMA_SET = frozenset({"ws", "wss"})
+UNIX_PROTCOL_SCHEMA_SET = frozenset({"unix"})
+NAMED_PIPE_PROTOCOL_SCHEMA_SET = frozenset({"npipe"})
+ALLOWED_PROTOCOL_SCHEMA_SET = (
+ HTTP_SCHEMA_SET
+ | WS_SCHEMA_SET
+ | UNIX_PROTCOL_SCHEMA_SET
+ | NAMED_PIPE_PROTOCOL_SCHEMA_SET
+)
+
 
 json_re = re.compile(r"(?:application/|[\w.-]+/[\w.+-]+?\+)json$", re.IGNORECASE)
 

tests/test_client_session.py

@@ -467,7 +467,7 @@ async def create_connection(req, traces, timeout):
  c.__del__()
 
 
-@pytest.mark.parametrize("protocol", ["http", "https", "ws", "wss"])
+@pytest.mark.parametrize("protocol", ["http", "https", "npipe", "ws", "wss", "unix"])
 async def test_ws_connect_allowed_protocols(
  create_session: Any,
  create_mocked_conn: Any,
@@ -482,7 +482,7 @@ async def test_ws_connect_allowed_protocols(
  hdrs.CONNECTION: "upgrade",
  hdrs.SEC_WEBSOCKET_ACCEPT: ws_key,
  }
- resp.url = URL(f"{protocol}://example.com")
+ resp.url = URL(f"{protocol}://example")
  resp.cookies = SimpleCookie()
  resp.start = mock.AsyncMock()
 
@@ -510,7 +510,7 @@ async def create_connection(req, traces, timeout):
  "aiohttp.client.os"
  ) as m_os:
  m_os.urandom.return_value = key_data
- await session.ws_connect(f"{protocol}://example.com")
+ await session.ws_connect(f"{protocol}://example")
 
  # normally called during garbage collection. triggers an exception
  # if the connection wasn't already closed