python-socks 2.8.1__py3-none-any.whl → 2.8.2__py3-none-any.whl

python_socks/_protocols/http.py

@@ -6,6 +6,7 @@ from collections import namedtuple
 from typing import Optional
 
 from .._version import __title__, __version__
+from .._helpers import is_ipv6_address
 
 from .errors import ReplyError
 
@@ -94,8 +95,17 @@ class ConnectRequest:
 
     def dumps(self) -> bytes:
         buff = _Buffer()
-        buff.append_line(f'CONNECT {self.host}:{self.port} HTTP/1.1')
-        buff.append_line(f'Host: {self.host}:{self.port}')
+        # RFC 3986 § 3.2.2 / RFC 7230 § 5.4: a literal IPv6 address in an
+        # authority component must be enclosed in square brackets so the
+        # `:` between literal and port is unambiguous. Without brackets,
+        # `2001:db8::1:443` could be parsed as either the address
+        # `2001:db8::1` with port `443` or the address `2001:db8::1:443`
+        # with no port — proxies disagree, and several misroute the
+        # unbracketed form (typically returning `200 Connection
+        # established` against a connection that was never actually made).
+        host = f'[{self.host}]' if is_ipv6_address(self.host) else self.host
+        buff.append_line(f'CONNECT {host}:{self.port} HTTP/1.1')
+        buff.append_line(f'Host: {host}:{self.port}')
         buff.append_line(f'User-Agent: {DEFAULT_USER_AGENT}')
 
         if self.username and self.password:

python_socks/_protocols/socks5.py

@@ -1,13 +1,13 @@
 import enum
+from functools import singledispatchmethod
 import ipaddress
 import socket
-from typing import Optional, Union
+from typing import Optional, Type, Union
 from dataclasses import dataclass, field
 
 from .errors import ReplyError
 from .._helpers import is_ip_address
 
-
 RSV = NULL = AUTH_GRANTED = 0x00
 SOCKS_VER = 0x05
 
@@ -302,34 +302,38 @@ ConnectionState = Union[
 
 
 class Connection:
-    _state: ConnectionState
-
     def __init__(self):
         self._state = StateServerWaitingForAuthMethods()
 
+    @singledispatchmethod
     def send(self, request: Request) -> bytes:
-        if type(request) is AuthMethodsRequest:
-            if type(self._state) is not StateServerWaitingForAuthMethods:
-                raise RuntimeError('Server is not currently waiting for auth methods')
-            self._state = StateClientSentAuthMethods(request)
-            return request.dumps()
-
-        if type(request) is AuthRequest:
-            if type(self._state) is not StateServerWaitingForAuth:
-                raise RuntimeError('Server is not currently waiting for authentication')
-            self._state = StateClientSentAuthRequest(request)
-            return request.dumps()
-
-        if type(request) is ConnectRequest:
-            if type(self._state) is not StateClientAuthenticated:
-                raise RuntimeError('Client is not authenticated')
-            self._state = StateClientSentConnectRequest(request)
-            return request.dumps()
-
-        raise RuntimeError(f'Invalid request type: {type(request)}')
+        raise RuntimeError(f'Invalid request type: {request.__class__}')
+
+    @send.register
+    def _send_auth_methods(self, request: AuthMethodsRequest) -> bytes:
+        if not self._state_is(StateServerWaitingForAuthMethods):
+            raise RuntimeError('Server is not currently waiting for auth methods')
+        self._state = StateClientSentAuthMethods(request)
+        return request.dumps()
+
+    @send.register
+    def _send_auth(self, request: AuthRequest) -> bytes:
+        if not self._state_is(StateServerWaitingForAuth):
+            raise RuntimeError('Server is not currently waiting for authentication')
+        self._state = StateClientSentAuthRequest(request)
+        return request.dumps()
+
+    @send.register
+    def _send_connect(self, request: ConnectRequest) -> bytes:
+        if not self._state_is(StateClientAuthenticated):
+            raise RuntimeError('Client is not authenticated')
+        self._state = StateClientSentConnectRequest(request)
+        return request.dumps()
 
     def receive(self, data: bytes) -> Reply:
-        if type(self._state) is StateClientSentAuthMethods:
+        reply: Reply
+
+        if self._state_is(StateClientSentAuthMethods):
             reply = AuthMethodReply.loads(data)
             reply.validate(self._state.data)
             if reply.method == AuthMethod.USERNAME_PASSWORD:
@@ -338,18 +342,21 @@ class Connection:
                 self._state = StateClientAuthenticated()
             return reply
 
-        if type(self._state) is StateClientSentAuthRequest:
+        if self._state_is(StateClientSentAuthRequest):
             reply = AuthReply.loads(data)
             self._state = StateClientAuthenticated(data=reply)
             return reply
 
-        if type(self._state) is StateClientSentConnectRequest:
+        if self._state_is(StateClientSentConnectRequest):
             reply = ConnectReply.loads(data)
             self._state = StateServerConnected(data=reply)
             return reply
 
         raise RuntimeError(f'Invalid connection state: {self._state}')
 
+    def _state_is(self, state_cls: Type[ConnectionState]):
+        return self.state.__class__ is state_cls
+
     @property
     def state(self):
         return self._state

python_socks/_version.py

@@ -1,2 +1,2 @@
 __title__ = 'python-socks'
-__version__ = '2.8.1'
+__version__ = '2.8.2'

{python_socks-2.8.1.dist-info → python_socks-2.8.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-socks
-Version: 2.8.1
+Version: 2.8.2
 Summary: Proxy (SOCKS4, SOCKS5, HTTP CONNECT) client for Python
 Author-email: Roman Snegirev <snegiryev@gmail.com>
 License: Apache-2.0

{python_socks-2.8.1.dist-info → python_socks-2.8.2.dist-info}/RECORD

@@ -3,7 +3,7 @@ python_socks/_abc.py,sha256=_juTZE0iqoTChE53IHjBKEYFO-fxYZfPhdUc6EgFlwE,909
 python_socks/_errors.py,sha256=M2KkgCrFy_ebEqw7JoxCWMjIIQ5Zu_B7YlXYhsLo-gk,329
 python_socks/_helpers.py,sha256=UacO07M9i8G8CfqzBYWnehgCTFbZTlwJWAsFoXR3mVk,2708
 python_socks/_types.py,sha256=dgQifNf2mIwdKoX7YmI91H_lUsW9-Y0ZkZGlIV6_NNw,90
-python_socks/_version.py,sha256=e7j6da3GYTfq-hRQ9-hzCSija3gACzgMjjpG6A56uGs,49
+python_socks/_version.py,sha256=60qSCLD6nICI7tW_gU87eg-E18vmyw7k12UWh4OVy7g,49
 python_socks/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 python_socks/_connectors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 python_socks/_connectors/abc.py,sha256=1fgjPiv64UAMiJDsJXYr-GofPGhuHTwTzaodQfrzf7Q,397
@@ -17,9 +17,9 @@ python_socks/_connectors/socks5_async.py,sha256=qniozb0P8gtXF_vK3b7kjRmoGNMHmYAb
 python_socks/_connectors/socks5_sync.py,sha256=G_FW1XsiaMDbzR7vcBMtRpD3R9LpO5V5zu9pltpo7xI,2602
 python_socks/_protocols/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 python_socks/_protocols/errors.py,sha256=4XqU4AqgrWaedmUVGMjd6TvQKXv3mV0H76s5lf8aazY,150
-python_socks/_protocols/http.py,sha256=QhLHqBgc6DfsvC8AIhylN1tjfk7QzxgwemrK1LuL3vk,4499
+python_socks/_protocols/http.py,sha256=T8hxXJnxApF2dxMC89jajeE66v7rtjmHcnrHICKTY0s,5175
 python_socks/_protocols/socks4.py,sha256=j1Psqi3PDiKAF19g_Mh3sf_RwXu7o-8X7BqWOaoTbKE,3061
-python_socks/_protocols/socks5.py,sha256=1PEr1s4JxmpST9OYEeVgbidnV_d4Vb85JZHmWqK-r9c,9713
+python_socks/_protocols/socks5.py,sha256=7AhzpKYM6ZBdGEoTD5ynKdApTKz4Q1l7LcHxhHfgRVw,9931
 python_socks/async_/__init__.py,sha256=TeBn5oirLy6aPoWcTc3OW9OxXh5Uv5LADwF_Y7f7HjY,64
 python_socks/async_/_proxy_chain.py,sha256=TiG1Uu45anONWi2ZFj11w4-LrNbja8SbG27bWCX9Et4,987
 python_socks/async_/anyio/__init__.py,sha256=pZnrND4Qd-pIGg7KI1ML41kZNkWHmkd3vrvwZZIJyk4,106
@@ -70,8 +70,8 @@ python_socks/sync/v2/_connect.py,sha256=QrZ1CZimYCUMUuaD8JdUblwlqlzIbqFrbsPwMzox
 python_socks/sync/v2/_proxy.py,sha256=7FuO6wML0DkEonoGAprhTlVd8fazOgNeNrJyxABmP1Q,3621
 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.8.1.dist-info/licenses/LICENSE.txt,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-python_socks-2.8.1.dist-info/METADATA,sha256=jDS83DnufjrnQhuWQBgKuXA7h0KMUNre3G83vwrOXC4,8151
-python_socks-2.8.1.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
-python_socks-2.8.1.dist-info/top_level.txt,sha256=7qyDAVwjTZ0sIYG1iatFbE-SLpWhONjaoMQ0Ib2DX0Q,13
-python_socks-2.8.1.dist-info/RECORD,,
+python_socks-2.8.2.dist-info/licenses/LICENSE.txt,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+python_socks-2.8.2.dist-info/METADATA,sha256=QZw-g2v-tBl8fXCKS9nO_wsICjCR5TJG53-hzdFODpU,8151
+python_socks-2.8.2.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+python_socks-2.8.2.dist-info/top_level.txt,sha256=7qyDAVwjTZ0sIYG1iatFbE-SLpWhONjaoMQ0Ib2DX0Q,13
+python_socks-2.8.2.dist-info/RECORD,,

{python_socks-2.8.1.dist-info → python_socks-2.8.2.dist-info}/WHEEL

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