python-socks 2.2.0__tar.gz → 2.3.0__tar.gz

{python-socks-2.2.0/python_socks.egg-info → python-socks-2.3.0}/PKG-INFO

@@ -1,12 +1,13 @@
 Metadata-Version: 2.1
 Name: python-socks
-Version: 2.2.0
+Version: 2.3.0
 Summary: Core proxy (SOCKS4, SOCKS5, HTTP tunneling) functionality for Python
 Home-page: https://github.com/romis2012/python-socks
 Author: Roman Snegirev
 Author-email: snegiryev@gmail.com
 License: Apache 2
 Keywords: socks socks5 socks4 http proxy asyncio trio curio anyio
+Platform: UNKNOWN
 Description-Content-Type: text/markdown
 Provides-Extra: asyncio
 Provides-Extra: trio
@@ -267,3 +268,5 @@ manager = ProxyPoolManager('socks5://user:password@127.0.0.1:1080')
 response = manager.request('GET', 'https://check-host.net/ip')
 print(response.data)
 ```
+
+

{python-socks-2.2.0 → python-socks-2.3.0}/python_socks/_version.py

@@ -1,2 +1,2 @@
 __title__ = 'python-socks'
-__version__ = '2.2.0'
+__version__ = '2.3.0'

{python-socks-2.2.0 → python-socks-2.3.0}/python_socks/async_/anyio/v2/_proxy.py

@@ -114,11 +114,13 @@ class Socks5Proxy(AnyioProxy):
         password=None,
         rdns=None,
         proxy_ssl=None,
+        forward: 'AnyioProxy' = None,
     ):
         super().__init__(
             proxy_host=proxy_host,
             proxy_port=proxy_port,
             proxy_ssl=proxy_ssl,
+            forward=forward,
         )
         self._username = username
         self._password = password
@@ -150,11 +152,13 @@ class Socks4Proxy(AnyioProxy):
         user_id=None,
         rdns=None,
         proxy_ssl=None,
+        forward: 'AnyioProxy' = None,
     ):
         super().__init__(
             proxy_host=proxy_host,
             proxy_port=proxy_port,
             proxy_ssl=proxy_ssl,
+            forward=forward,
         )
         self._user_id = user_id
         self._rdns = rdns
@@ -184,11 +188,13 @@ class HttpProxy(AnyioProxy):
         username=None,
         password=None,
         proxy_ssl=None,
+        forward: 'AnyioProxy' = None,
     ):
         super().__init__(
             proxy_host=proxy_host,
             proxy_port=proxy_port,
             proxy_ssl=proxy_ssl,
+            forward=forward,
         )
         self._username = username
         self._password = password

{python-socks-2.2.0 → python-socks-2.3.0}/python_socks/async_/asyncio/v2/_proxy.py

@@ -132,12 +132,14 @@ class Socks5Proxy(AsyncioProxy):
         password=None,
         rdns=None,
         proxy_ssl=None,
+        forward: 'AsyncioProxy' = None,
         loop: asyncio.AbstractEventLoop = None,
     ):
         super().__init__(
             proxy_host=proxy_host,
             proxy_port=proxy_port,
             proxy_ssl=proxy_ssl,
+            forward=forward,
             loop=loop,
         )
         self._username = username
@@ -170,12 +172,14 @@ class Socks4Proxy(AsyncioProxy):
         user_id=None,
         rdns=None,
         proxy_ssl=None,
+        forward: 'AsyncioProxy' = None,
         loop: asyncio.AbstractEventLoop = None,
     ):
         super().__init__(
             proxy_host=proxy_host,
             proxy_port=proxy_port,
             proxy_ssl=proxy_ssl,
+            forward=forward,
             loop=loop,
         )
         self._user_id = user_id
@@ -206,12 +210,14 @@ class HttpProxy(AsyncioProxy):
         username=None,
         password=None,
         proxy_ssl=None,
+        forward: 'AsyncioProxy' = None,
         loop: asyncio.AbstractEventLoop = None,
     ):
         super().__init__(
             proxy_host=proxy_host,
             proxy_port=proxy_port,
             proxy_ssl=proxy_ssl,
+            forward=forward,
             loop=loop,
         )
         self._username = username

{python-socks-2.2.0 → python-socks-2.3.0}/python_socks/async_/trio/v2/_proxy.py

@@ -114,11 +114,13 @@ class Socks5Proxy(TrioProxy):
         password=None,
         rdns=None,
         proxy_ssl=None,
+        forward: 'TrioProxy' = None,
     ):
         super().__init__(
             proxy_host=proxy_host,
             proxy_port=proxy_port,
             proxy_ssl=proxy_ssl,
+            forward=forward,
         )
         self._username = username
         self._password = password
@@ -150,11 +152,13 @@ class Socks4Proxy(TrioProxy):
         user_id=None,
         rdns=None,
         proxy_ssl=None,
+        forward: 'TrioProxy' = None,
     ):
         super().__init__(
             proxy_host=proxy_host,
             proxy_port=proxy_port,
             proxy_ssl=proxy_ssl,
+            forward=forward,
         )
         self._user_id = user_id
         self._rdns = rdns
@@ -184,11 +188,13 @@ class HttpProxy(TrioProxy):
         username=None,
         password=None,
         proxy_ssl=None,
+        forward: 'TrioProxy' = None,
     ):
         super().__init__(
             proxy_host=proxy_host,
             proxy_port=proxy_port,
             proxy_ssl=proxy_ssl,
+            forward=forward,
         )
         self._username = username
         self._password = password

{python-socks-2.2.0/python_socks/async_/anyio → python-socks-2.3.0/python_socks/sync}/v2/__init__.py

@@ -5,4 +5,4 @@ from ._chain import ProxyChain
 __all__ = (
     'Proxy',
     'ProxyChain',
-)
+)

python-socks-2.3.0/python_socks/sync/v2/_chain.py

@@ -0,0 +1,26 @@
+from typing import Iterable
+from ._proxy import SyncProxy
+
+
+class ProxyChain:
+    def __init__(self, proxies: Iterable[SyncProxy]):
+        self._proxies = proxies
+
+    def connect(
+        self,
+        dest_host,
+        dest_port,
+        dest_ssl=None,
+        timeout=None,
+    ):
+        forward = None
+        for proxy in self._proxies:
+            proxy._forward = forward
+            forward = proxy
+
+        return forward.connect(
+            dest_host=dest_host,
+            dest_port=dest_port,
+            dest_ssl=dest_ssl,
+            timeout=timeout,
+        )

python-socks-2.3.0/python_socks/sync/v2/_connect.py

@@ -0,0 +1,19 @@
+import socket
+from typing import Optional, Tuple
+from ._stream import SyncSocketStream
+
+
+def connect_tcp(
+    host: str,
+    port: int,
+    timeout: float = None,
+    local_addr: Optional[Tuple[str, int]] = None,
+) -> SyncSocketStream:
+    address = (host, port)
+    sock = socket.create_connection(
+        address,
+        timeout,
+        source_address=local_addr,
+    )
+
+    return SyncSocketStream(sock)

{python-socks-2.2.0 → python-socks-2.3.0}/python_socks/sync/v2/_proxy.py

@@ -1,9 +1,8 @@
 import socket
 import ssl
-from typing import Optional
 
+from ._connect import connect_tcp
 from ._stream import SyncSocketStream
-from .._connect import connect_tcp
 from .._resolver import SyncResolver
 from ... import _abc as abc
 from ..._errors import ProxyConnectionError, ProxyTimeoutError
@@ -15,24 +14,18 @@ DEFAULT_TIMEOUT = 60
 
 
 class SyncProxy(abc.SyncProxy):
-    _stream: Optional[SyncSocketStream]
-
     def __init__(
         self,
         proxy_host: str,
         proxy_port: int,
         proxy_ssl: ssl.SSLContext = None,
+        forward: 'SyncProxy' = None,
     ):
         self._proxy_host = proxy_host
         self._proxy_port = proxy_port
         self._proxy_ssl = proxy_ssl
+        self._forward = forward
 
-        self._dest_host = None
-        self._dest_port = None
-        self._dest_ssl = None
-        self._timeout = None
-
-        self._stream = None
         self._resolver = SyncResolver()
 
     def connect(
@@ -41,74 +34,67 @@ class SyncProxy(abc.SyncProxy):
         dest_port: int,
         dest_ssl: ssl.SSLContext = None,
         timeout: float = None,
-        _stream: SyncSocketStream = None,
     ) -> SyncSocketStream:
-
         if timeout is None:
             timeout = DEFAULT_TIMEOUT
 
-        self._dest_host = dest_host
-        self._dest_port = dest_port
-        self._dest_ssl = dest_ssl
-        self._timeout = timeout
-
         try:
-            if _stream is None:
-                sock = connect_tcp(
+            if self._forward is None:
+                stream = connect_tcp(
                     host=self._proxy_host,
                     port=self._proxy_port,
                     timeout=timeout,
                 )
-                self._stream = SyncSocketStream(sock)
             else:
-                self._stream = _stream
+                stream = self._forward.connect(
+                    dest_host=self._proxy_host,
+                    dest_port=self._proxy_port,
+                    timeout=timeout,
+                )
+        except OSError as e:
+            msg = 'Could not connect to proxy {}:{} [{}]'.format(
+                self._proxy_host,
+                self._proxy_port,
+                e.strerror,
+            )
+            raise ProxyConnectionError(e.errno, msg) from e
 
+        try:
             if self._proxy_ssl is not None:
-                self._stream = self._stream.start_tls(
+                stream = stream.start_tls(
                     hostname=self._proxy_host,
                     ssl_context=self._proxy_ssl,
                 )
 
-            self._negotiate()
+            self._negotiate(
+                stream=stream,
+                dest_host=dest_host,
+                dest_port=dest_port,
+            )
 
-            if self._dest_ssl is not None:
-                self._stream = self._stream.start_tls(
-                    hostname=self._dest_host,
-                    ssl_context=self._dest_ssl,
+            if dest_ssl is not None:
+                stream = stream.start_tls(
+                    hostname=dest_host,
+                    ssl_context=dest_ssl,
                 )
 
-            return self._stream
+            return stream
 
         except socket.timeout as e:
-            self._close()
-            raise ProxyTimeoutError('Proxy connection timed out: {}'.format(self._timeout)) from e
-        except OSError as e:
-            self._close()
-            msg = 'Could not connect to proxy {}:{} [{}]'.format(
-                self._proxy_host,
-                self._proxy_port,
-                e.strerror,
-            )
-            raise ProxyConnectionError(e.errno, msg) from e
+            stream.close()
+            raise ProxyTimeoutError('Proxy connection timed out: {}'.format(timeout)) from e
         except Exception:
-            self._close()
+            stream.close()
             raise
 
-    def _negotiate(self):
+    def _negotiate(
+        self,
+        stream: SyncSocketStream,
+        dest_host: str,
+        dest_port: int,
+    ):
         raise NotImplementedError
 
-    def _close(self):
-        if self._stream is not None:
-            self._stream.close()
-
-    @property
-    def proxy_host(self):
-        return self._proxy_host
-
-    @property
-    def proxy_port(self):
-        return self._proxy_port
-
 
 class Socks5Proxy(SyncProxy):
     def __init__(
@@ -119,22 +105,29 @@ class Socks5Proxy(SyncProxy):
         password=None,
         rdns=None,
         proxy_ssl=None,
+        forward: 'SyncProxy' = None,
     ):
         super().__init__(
             proxy_host=proxy_host,
             proxy_port=proxy_port,
             proxy_ssl=proxy_ssl,
+            forward=forward,
         )
         self._username = username
         self._password = password
         self._rdns = rdns
 
-    def _negotiate(self):
+    def _negotiate(
+        self,
+        stream: SyncSocketStream,
+        dest_host: str,
+        dest_port: int,
+    ):
         proto = Socks5Proto(
-            stream=self._stream,
+            stream=stream,
             resolver=self._resolver,
-            dest_host=self._dest_host,
-            dest_port=self._dest_port,
+            dest_host=dest_host,
+            dest_port=dest_port,
             username=self._username,
             password=self._password,
             rdns=self._rdns,
@@ -150,21 +143,28 @@ class Socks4Proxy(SyncProxy):
         user_id=None,
         rdns=None,
         proxy_ssl=None,
+        forward: 'SyncProxy' = None,
     ):
         super().__init__(
             proxy_host=proxy_host,
             proxy_port=proxy_port,
             proxy_ssl=proxy_ssl,
+            forward=forward,
         )
         self._user_id = user_id
         self._rdns = rdns
 
-    def _negotiate(self):
+    def _negotiate(
+        self,
+        stream: SyncSocketStream,
+        dest_host: str,
+        dest_port: int,
+    ):
         proto = Socks4Proto(
-            stream=self._stream,
+            stream=stream,
             resolver=self._resolver,
-            dest_host=self._dest_host,
-            dest_port=self._dest_port,
+            dest_host=dest_host,
+            dest_port=dest_port,
             user_id=self._user_id,
             rdns=self._rdns,
         )
@@ -179,20 +179,27 @@ class HttpProxy(SyncProxy):
         username=None,
         password=None,
         proxy_ssl=None,
+        forward: 'SyncProxy' = None,
     ):
         super().__init__(
             proxy_host=proxy_host,
             proxy_port=proxy_port,
             proxy_ssl=proxy_ssl,
+            forward=forward,
         )
         self._username = username
         self._password = password
 
-    def _negotiate(self):
+    def _negotiate(
+        self,
+        stream: SyncSocketStream,
+        dest_host: str,
+        dest_port: int,
+    ):
         proto = HttpProto(
-            stream=self._stream,
-            dest_host=self._dest_host,
-            dest_port=self._dest_port,
+            stream=stream,
+            dest_host=dest_host,
+            dest_port=dest_port,
             username=self._username,
             password=self._password,
         )

{python-socks-2.2.0 → python-socks-2.3.0/python_socks.egg-info}/PKG-INFO

@@ -1,12 +1,13 @@
 Metadata-Version: 2.1
 Name: python-socks
-Version: 2.2.0
+Version: 2.3.0
 Summary: Core proxy (SOCKS4, SOCKS5, HTTP tunneling) functionality for Python
 Home-page: https://github.com/romis2012/python-socks
 Author: Roman Snegirev
 Author-email: snegiryev@gmail.com
 License: Apache 2
 Keywords: socks socks5 socks4 http proxy asyncio trio curio anyio
+Platform: UNKNOWN
 Description-Content-Type: text/markdown
 Provides-Extra: asyncio
 Provides-Extra: trio
@@ -267,3 +268,5 @@ manager = ProxyPoolManager('socks5://user:password@127.0.0.1:1080')
 response = manager.request('GET', 'https://check-host.net/ip')
 print(response.data)
 ```
+
+

{python-socks-2.2.0 → python-socks-2.3.0}/python_socks.egg-info/SOURCES.txt

@@ -76,18 +76,8 @@ python_socks/sync/_resolver.py
 python_socks/sync/_stream.py
 python_socks/sync/v2/__init__.py
 python_socks/sync/v2/_chain.py
+python_socks/sync/v2/_connect.py
 python_socks/sync/v2/_factory.py
 python_socks/sync/v2/_proxy.py
 python_socks/sync/v2/_ssl_transport.py
-python_socks/sync/v2/_stream.py
-tests/test_misc.py
-tests/test_proxy_async_aio.py
-tests/test_proxy_async_aio_v2.py
-tests/test_proxy_async_anyio.py
-tests/test_proxy_async_anyio_v2.py
-tests/test_proxy_async_curio.py
-tests/test_proxy_async_trio.py
-tests/test_proxy_async_trio_v2.py
-tests/test_proxy_sync.py
-tests/test_proxy_sync_v2.py
-tests/test_resolvers.py
+python_socks/sync/v2/_stream.py

python-socks-2.2.0/python_socks/sync/v2/_chain.py

@@ -1,36 +0,0 @@
-from typing import Iterable
-from ._proxy import SyncProxy
-
-
-class ProxyChain:
-    def __init__(self, proxies: Iterable[SyncProxy]):
-        self._proxies = proxies
-
-    def connect(
-        self,
-        dest_host,
-        dest_port,
-        dest_ssl=None,
-        timeout=None,
-    ):
-        stream = None
-        proxies = list(self._proxies)
-
-        length = len(proxies) - 1
-        for i in range(length):
-            stream = proxies[i].connect(
-                dest_host=proxies[i + 1].proxy_host,
-                dest_port=proxies[i + 1].proxy_port,
-                timeout=timeout,
-                _stream=stream,
-            )
-
-        stream = proxies[length].connect(
-            dest_host=dest_host,
-            dest_port=dest_port,
-            dest_ssl=dest_ssl,
-            timeout=timeout,
-            _stream=stream,
-        )
-
-        return stream

python-socks-2.2.0/tests/test_misc.py

@@ -1,21 +0,0 @@
-# noinspection PyPackageRequirements
-import pytest
-
-from python_socks._helpers import is_ip_address  # noqa
-from python_socks._basic_auth import BasicAuth  # noqa
-
-
-@pytest.mark.parametrize('address', ('::1', b'::1', '127.0.0.1', b'127.0.0.1'))
-def test_is_ip_address(address):
-    assert is_ip_address(address)
-
-
-def test_basic_auth():
-    login = 'login'
-    password = 'password'
-
-    auth1 = BasicAuth(login=login, password=password)
-    auth2 = BasicAuth.decode(auth1.encode())
-
-    assert auth2.login == login
-    assert auth2.password == password