python-socks 2.5.0__py3-none-any.whl → 2.5.2__py3-none-any.whl

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/_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/_version.py

@@ -1,2 +1,2 @@
 __title__ = 'python-socks'
-__version__ = '2.5.0'
+__version__ = '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/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.dist-info → python_socks-2.5.2.dist-info}/METADATA

@@ -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,13 +10,13 @@ Keywords: socks socks5 socks4 http proxy asyncio trio curio anyio
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Provides-Extra: anyio
-Requires-Dist: anyio <5.0.0,>=3.3.4 ; extra == 'anyio'
+Requires-Dist: anyio<5.0.0,>=3.3.4; extra == "anyio"
 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: curio
-Requires-Dist: curio >=1.4 ; extra == 'curio'
+Requires-Dist: curio>=1.4; extra == "curio"
 Provides-Extra: trio
-Requires-Dist: trio >=0.16.0 ; extra == 'trio'
+Requires-Dist: trio>=0.16.0; extra == "trio"
 
 ## python-socks
 

{python_socks-2.5.0.dist-info → python_socks-2.5.2.dist-info}/RECORD

@@ -3,7 +3,7 @@ python_socks/_abc.py,sha256=_kK5iWNYpHuWRxhK-e6GQdVgRYxcioKIGnSYy2QzAK8,1422
 python_socks/_errors.py,sha256=l2j03Zna_EJhNqF3yApTYuQ147BcY0k74pkT4HAlRp4,245
 python_socks/_helpers.py,sha256=WTqOACKhJ80bCLWqeoXHPKp6YWCg66vLtai5AM7HJNY,2517
 python_socks/_types.py,sha256=dgQifNf2mIwdKoX7YmI91H_lUsW9-Y0ZkZGlIV6_NNw,90
-python_socks/_version.py,sha256=3BvpvFG4zPWrLEEv8Ldtw2rIXRnWsseKynCtjZBLORw,49
+python_socks/_version.py,sha256=JkzJVCbfeNU1o7WHtrsZv6U5tL5lzTbwZM3uruyhsSc,49
 python_socks/_connectors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 python_socks/_connectors/abc.py,sha256=1fgjPiv64UAMiJDsJXYr-GofPGhuHTwTzaodQfrzf7Q,397
 python_socks/_connectors/factory_async.py,sha256=y9JGVk-ub9FMuQlIp2s5y95F7JMvA2fEdWGRKLUpRXc,997
@@ -12,8 +12,8 @@ python_socks/_connectors/http_async.py,sha256=sCkEporEkm5yr5S08JjzX9VHtXjEsIqrfI
 python_socks/_connectors/http_sync.py,sha256=BecdB5J8fIAMkNCgTgJqrdF82uIwBVjzoZmefKear34,878
 python_socks/_connectors/socks4_async.py,sha256=dlQ-AwJ9gNBWMth-E4PxxfW17oWBF2Blxp71HeO80gM,1131
 python_socks/_connectors/socks4_sync.py,sha256=m0KixzO5jQ6qHHtA5Muq7HcPjTdYPLM4AlTmWZr3SmY,1100
-python_socks/_connectors/socks5_async.py,sha256=XufGdX5NRQridwOmUyMHwL0eNIygG8WHa583SMilFX4,2423
-python_socks/_connectors/socks5_sync.py,sha256=r3Q-u8VjEoxWj0QuW7wuNQjyQzRc0Rcungs-6JcRlM8,2215
+python_socks/_connectors/socks5_async.py,sha256=A4ZXY-znAaVGpeKNyRdbiW0V3-EgHODNMneDJ-LlEKI,2703
+python_socks/_connectors/socks5_sync.py,sha256=kxT4bQgbsY32BnlnAJFhHtqRz7LnC2ncG7W_Py1pfQo,2482
 python_socks/_protocols/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 python_socks/_protocols/errors.py,sha256=4XqU4AqgrWaedmUVGMjd6TvQKXv3mV0H76s5lf8aazY,150
 python_socks/_protocols/http.py,sha256=h6uLgiNbqrd8HUk-nX5lOnCoYRjrZWaQ2CjbOB6QDHI,4451
@@ -34,13 +34,13 @@ python_socks/async_/anyio/v2/_proxy.py,sha256=3qElDSprsJZOsFikn_i7clcKQe7XGg3EiK
 python_socks/async_/anyio/v2/_stream.py,sha256=40D3Pmb0rryk9gaQlmjpAMdiJi5H5O0xbBseblGG1FY,1616
 python_socks/async_/asyncio/__init__.py,sha256=0WAM07vy0YvI8IhKGmaUA0GaNLHaG3l-4mnJVbfoqHE,65
 python_socks/async_/asyncio/_connect.py,sha256=niNKiz2o1kfeIPVR3kXW7YHZ2sTK_Uehgq9tmFwbp7w,1014
-python_socks/async_/asyncio/_proxy.py,sha256=l_opVG1HA8ilQyRZ00lRXjTpGlKn4vGi6RQB4WaINcA,4283
+python_socks/async_/asyncio/_proxy.py,sha256=sA3RqbjQU1HFAM6q42wBeQzgT3z8zOtpwz-U8MVMQrQ,4361
 python_socks/async_/asyncio/_resolver.py,sha256=ROqOncuIub87J9_nMdvRTG_5zYOh8uafk265z0s2ORQ,681
 python_socks/async_/asyncio/_stream.py,sha256=RP7BIP9iFFy5nLRf9kHH7s1h_zPfo0yoEVKNpExqFcI,1021
 python_socks/async_/asyncio/v2/__init__.py,sha256=v9eJQeZ2yGJHeBQ0FYqNmIMCRrB547QqoAANHVBitxY,108
 python_socks/async_/asyncio/v2/_chain.py,sha256=Yle3F3TKEpCo9Snd-T5hRnmfn9iWj2VNLb3UHz6yNiU,607
 python_socks/async_/asyncio/v2/_connect.py,sha256=b3kQBR7L6wp-yvWVwtcdb4JUdQV04JW-DXF1g1P3gxI,587
-python_socks/async_/asyncio/v2/_proxy.py,sha256=wUAiY502lCkFRdQ6cC0qAPEKufy4V6d_O93dSaeyn5g,4207
+python_socks/async_/asyncio/v2/_proxy.py,sha256=wneFY5qU1sC7lknYu7Xhd506GLlVRMZHWTqp8dK2kSE,4297
 python_socks/async_/asyncio/v2/_stream.py,sha256=dOvZPMLd0lHeZwlJIL-bK-PQN9sjM6urA5AyFXxdaas,3834
 python_socks/async_/curio/__init__.py,sha256=1OyhLhvLJ23iDROgyxGqQACice66SrIYCMqmwjw_dqY,63
 python_socks/async_/curio/_connect.py,sha256=u1HRJ8n3OZbux-wETO9HuqZv9By2LGhhSsM78gnxr_0,328
@@ -69,8 +69,8 @@ python_socks/sync/v2/_connect.py,sha256=eqMKsH2wVnGZhV24_t9QfsNhjbnKtnipj7wzSNct
 python_socks/sync/v2/_proxy.py,sha256=-38o3QxE_FfJjQ88SK2YqBlWQgeNQQfYkGsFtYHWq94,3400
 python_socks/sync/v2/_ssl_transport.py,sha256=MURwzvKu-S2-MI7o8KaZTvvBFOiiKIu5R0ERVIMvERE,6088
 python_socks/sync/v2/_stream.py,sha256=Jq89x1xmIX3L_v-WyS1nRTItjTnYTcDcfDblsANxfJI,1544
-python_socks-2.5.0.dist-info/LICENSE.txt,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-python_socks-2.5.0.dist-info/METADATA,sha256=mDM73fWuSRo_6HX2Cl0WLdUPOpOAI7gSJ_tyPW1WeCY,7018
-python_socks-2.5.0.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
-python_socks-2.5.0.dist-info/top_level.txt,sha256=7qyDAVwjTZ0sIYG1iatFbE-SLpWhONjaoMQ0Ib2DX0Q,13
-python_socks-2.5.0.dist-info/RECORD,,
+python_socks-2.5.2.dist-info/LICENSE.txt,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+python_socks-2.5.2.dist-info/METADATA,sha256=Cy8SjUtrdBH1NX4ZibdLVnyePvLYUB4i0oXSSqzyQFM,7038
+python_socks-2.5.2.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+python_socks-2.5.2.dist-info/top_level.txt,sha256=7qyDAVwjTZ0sIYG1iatFbE-SLpWhONjaoMQ0Ib2DX0Q,13
+python_socks-2.5.2.dist-info/RECORD,,

{python_socks-2.5.0.dist-info → python_socks-2.5.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.1.1)
+Generator: setuptools (75.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any