explicitly throw error for socks5 proxy since is not supported supported currently and will be implied disconnected if connect to (aio-libs#10147)

Author: NewUserHa

aiohttp/client.py

@@ -82,18 +82,13 @@
     ClientWebSocketResponse,
     ClientWSTimeout,
 )
-from .connector import (
-    HTTP_AND_EMPTY_SCHEMA_SET,
-    BaseConnector,
-    NamedPipeConnector,
-    TCPConnector,
-    UnixConnector,
-)
+from .connector import BaseConnector, NamedPipeConnector, TCPConnector, UnixConnector
 from .cookiejar import CookieJar
 from .helpers import (
     _SENTINEL,
     DEFAULT_CHUNK_SIZE,
     EMPTY_BODY_METHODS,
+    HTTP_AND_EMPTY_SCHEMA_SET,
     TimeoutHandle,
     _auth_header_from_netrc,
     frozen_dataclass_decorator,

aiohttp/client_reqrep.py

@@ -36,6 +36,7 @@
 from .formdata import FormData
 from .helpers import (
     _SENTINEL,
+    HTTP_AND_EMPTY_SCHEMA_SET,
     BaseTimerContext,
     HeadersDictProxy,
     HeadersMixin,
@@ -1295,6 +1296,13 @@ def _update_proxy(
             self.proxy = None
             self.proxy_headers = None
             return
+
+        if proxy.scheme not in HTTP_AND_EMPTY_SCHEMA_SET:
+            raise ValueError(
+                f"aiohttp only supports http(s) proxies (got: {proxy.scheme!r}).\n"
+                "See third-party libraries for other proxy schemes."
+            )
+
         # URL-embedded credentials on the proxy map to Proxy-Authorization.
         if proxy.raw_user or proxy.raw_password:
             auth_header = encode_basic_auth(proxy.user or "", proxy.password or "")

aiohttp/connector.py

@@ -43,6 +43,7 @@
 )
 from .helpers import (
     _SENTINEL,
+    HIGH_LEVEL_SCHEMA_SET,
     ceil_timeout,
     is_canonical_ipv4_address,
     is_ip_address,
@@ -66,13 +67,6 @@
     ssl = None  # type: ignore[assignment]
     SSLContext = object  # type: ignore[misc,assignment]
 
-EMPTY_SCHEMA_SET = frozenset({""})
-HTTP_SCHEMA_SET = frozenset({"http", "https"})
-WS_SCHEMA_SET = frozenset({"ws", "wss"})
-
-HTTP_AND_EMPTY_SCHEMA_SET = HTTP_SCHEMA_SET | EMPTY_SCHEMA_SET
-HIGH_LEVEL_SCHEMA_SET = HTTP_AND_EMPTY_SCHEMA_SET | WS_SCHEMA_SET
-
 NEEDS_CLEANUP_CLOSED = (3, 13, 0) <= sys.version_info < (
     3,
     13,

aiohttp/helpers.py

@@ -119,6 +119,13 @@
 )
 
 
+EMPTY_SCHEMA_SET = frozenset({""})
+HTTP_SCHEMA_SET = frozenset({"http", "https"})
+WS_SCHEMA_SET = frozenset({"ws", "wss"})
+HTTP_AND_EMPTY_SCHEMA_SET = HTTP_SCHEMA_SET | EMPTY_SCHEMA_SET
+HIGH_LEVEL_SCHEMA_SET = HTTP_AND_EMPTY_SCHEMA_SET | WS_SCHEMA_SET
+
+
 CHAR = {chr(i) for i in range(0, 128)}
 CTL = {chr(i) for i in range(0, 32)} | {
     chr(127),

tests/test_client_request.py

@@ -242,6 +242,16 @@ async def test_hostname_err(make_client_request: _RequestMaker) -> None:
         make_client_request("get", URL("http://:8080/"))
 
 
+@pytest.mark.parametrize("scheme", ("socks5", "socks5h"))
+async def test_proxy_scheme_err(
+    make_client_request: _RequestMaker, scheme: str
+) -> None:
+    with pytest.raises(ValueError, match=f"'{scheme}'"):
+        make_client_request(
+            "get", URL("http://py.org/"), proxy=URL(f"{scheme}://127.0.0.1:80")
+        )
+
+
 async def test_host_header_host_first(make_client_request: _RequestMaker) -> None:
     req = make_client_request("get", URL("http://python.org/"))
     assert list(req.headers)[0] == hdrs.HOST