python-socks 2.5.0__tar.gz → 2.5.2__tar.gz

{python_socks-2.5.0/python_socks.egg-info → python_socks-2.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-socks
-Version: 2.5.0
+Version: 2.5.2
 Summary: Core proxy (SOCKS4, SOCKS5, HTTP tunneling) functionality for Python
 Home-page: https://github.com/romis2012/python-socks
 Author: Roman Snegirev
@@ -10,7 +10,7 @@ Keywords: socks socks5 socks4 http proxy asyncio trio curio anyio
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Provides-Extra: asyncio
-Requires-Dist: async-timeout>=3.0.1; extra == "asyncio"
+Requires-Dist: async-timeout>=3.0.1; python_version < "3.11" and extra == "asyncio"
 Provides-Extra: trio
 Requires-Dist: trio>=0.16.0; extra == "trio"
 Provides-Extra: curio

{python_socks-2.5.0 → python_socks-2.5.2}/python_socks/_connectors/socks5_async.py

@@ -3,7 +3,6 @@ import socket
 from .._abc import AsyncSocketStream, AsyncResolver
 from .abc import AsyncConnector
 
-from .._protocols.errors import ReplyError
 from .._protocols import socks5
 from .._helpers import is_ip_address
 
@@ -66,15 +65,28 @@ class Socks5AsyncConnector(AsyncConnector):
         data = conn.send(request)
         await stream.write_all(data)
 
+        data = await self._read_reply(stream)
+        reply: socks5.ConnectReply = conn.receive(data)
+        return reply
+
+    # noinspection PyMethodMayBeStatic
+    async def _read_reply(self, stream: AsyncSocketStream) -> bytes:
         data = await stream.read_exact(4)
-        if data[3] == socks5.AddressType.IPV4:
+        if data[0] != socks5.SOCKS_VER:
+            return data
+        if data[1] != socks5.ReplyCode.SUCCEEDED:
+            return data
+        if data[2] != socks5.RSV:
+            return data
+
+        addr_type = data[3]
+
+        if addr_type == socks5.AddressType.IPV4:
             data += await stream.read_exact(6)
-        elif data[3] == socks5.AddressType.IPV6:
+        elif addr_type == socks5.AddressType.IPV6:
             data += await stream.read_exact(18)
-        elif data[3] == socks5.AddressType.DOMAIN:
-            data += await stream.read_exact(int.from_bytes(await stream.read_exact(1)) + 2)
-        else:  # pragma: no cover
-            raise ReplyError(f'Invalid address type: {data[3]:#02X}')
+        elif addr_type == socks5.AddressType.DOMAIN:
+            host_len, *_ = await stream.read_exact(1)
+            data += await stream.read_exact(host_len + 2)
 
-        reply: socks5.ConnectReply = conn.receive(data)
-        return reply
+        return data

{python_socks-2.5.0 → python_socks-2.5.2}/python_socks/_connectors/socks5_sync.py

@@ -3,7 +3,6 @@ import socket
 from .._abc import SyncSocketStream, SyncResolver
 from .abc import SyncConnector
 
-from .._protocols.errors import ReplyError
 from .._protocols import socks5
 from .._helpers import is_ip_address
 
@@ -57,15 +56,28 @@ class Socks5SyncConnector(SyncConnector):
         data = conn.send(request)
         stream.write_all(data)
 
+        data = self._read_reply(stream)
+        reply: socks5.ConnectReply = conn.receive(data)
+        return reply
+
+    # noinspection PyMethodMayBeStatic
+    def _read_reply(self, stream: SyncSocketStream) -> bytes:
         data = stream.read_exact(4)
-        if data[3] == socks5.AddressType.IPV4:
+        if data[0] != socks5.SOCKS_VER:
+            return data
+        if data[1] != socks5.ReplyCode.SUCCEEDED:
+            return data
+        if data[2] != socks5.RSV:
+            return data
+
+        addr_type = data[3]
+
+        if addr_type == socks5.AddressType.IPV4:
             data += stream.read_exact(6)
-        elif data[3] == socks5.AddressType.IPV6:
+        elif addr_type == socks5.AddressType.IPV6:
             data += stream.read_exact(18)
-        elif data[3] == socks5.AddressType.DOMAIN:
-            data += stream.read_exact(int.from_bytes(stream.read_exact(1)) + 2)
-        else:  # pragma: no cover
-            raise ReplyError(f'Invalid address type: {data[3]:#02X}')
+        elif addr_type == socks5.AddressType.DOMAIN:
+            host_len, *_ = stream.read_exact(1)
+            data += stream.read_exact(host_len + 2)
 
-        reply: socks5.ConnectReply = conn.receive(data)
-        return reply
+        return data

{python_socks-2.5.0 → python_socks-2.5.2}/python_socks/_version.py

@@ -1,2 +1,2 @@
 __title__ = 'python-socks'
-__version__ = '2.5.0'
+__version__ = '2.5.2'

{python_socks-2.5.0 → python_socks-2.5.2}/python_socks/async_/asyncio/_proxy.py

@@ -2,7 +2,10 @@ import asyncio
 import socket
 import sys
 
-import async_timeout
+if sys.version_info >= (3, 11):
+    import asyncio as async_timeout
+else:
+    import async_timeout
 
 from ..._types import ProxyType
 from ..._helpers import parse_proxy_url

{python_socks-2.5.0 → python_socks-2.5.2}/python_socks/async_/asyncio/v2/_proxy.py

@@ -1,8 +1,13 @@
 import asyncio
 import ssl
 import warnings
+import sys
 
-import async_timeout
+
+if sys.version_info >= (3, 11):
+    import asyncio as async_timeout
+else:
+    import async_timeout
 
 from ...._types import ProxyType
 from ...._helpers import parse_proxy_url

{python_socks-2.5.0 → python_socks-2.5.2/python_socks.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-socks
-Version: 2.5.0
+Version: 2.5.2
 Summary: Core proxy (SOCKS4, SOCKS5, HTTP tunneling) functionality for Python
 Home-page: https://github.com/romis2012/python-socks
 Author: Roman Snegirev
@@ -10,7 +10,7 @@ Keywords: socks socks5 socks4 http proxy asyncio trio curio anyio
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Provides-Extra: asyncio
-Requires-Dist: async-timeout>=3.0.1; extra == "asyncio"
+Requires-Dist: async-timeout>=3.0.1; python_version < "3.11" and extra == "asyncio"
 Provides-Extra: trio
 Requires-Dist: trio>=0.16.0; extra == "trio"
 Provides-Extra: curio

{python_socks-2.5.0 → python_socks-2.5.2}/python_socks.egg-info/requires.txt

@@ -3,6 +3,8 @@
 anyio<5.0.0,>=3.3.4
 
 [asyncio]
+
+[asyncio:python_version < "3.11"]
 async-timeout>=3.0.1
 
 [curio]

{python_socks-2.5.0 → python_socks-2.5.2}/setup.py

@@ -50,7 +50,7 @@ setup(
     ],
     keywords='socks socks5 socks4 http proxy asyncio trio curio anyio',
     extras_require={
-        'asyncio': ['async-timeout>=3.0.1'],
+        'asyncio': ['async-timeout>=3.0.1; python_version < "3.11"'],
         'trio': ['trio>=0.16.0'],
         'curio': ['curio>=1.4'],
         'anyio': ['anyio>=3.3.4,<5.0.0'],