support socks proxy protocol

ivanprjcts · Apr 12, 2018 · 06452fe · 06452fe
1 parent 708b0dd
commit 06452fe
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/docs/about/release-notes.rst b/docs/about/release-notes.rst
@@ -13,6 +13,11 @@ To upgrade Sdklib to the latest version, use pip:
 Sdklib 1.10.x series
 ===================
 
+Sdklib 1.10.3
+-------------
+
+- New experimental feature: support socks proxy protocol.
+
 Sdklib 1.10.2
 -------------
 

diff --git a/requirements/requirements-optionals.txt b/requirements/requirements-optionals.txt
@@ -1,2 +1,3 @@
 behave
-lxml==3.6.0
+lxml==3.6.0
+PySocks
diff --git a/sdklib/__version__.py b/sdklib/__version__.py
@@ -1 +1 @@
-release = '1.10.2'
+release = '1.10.3'
diff --git a/sdklib/http/base.py b/sdklib/http/base.py
@@ -332,7 +332,13 @@ def default_headers(self):
 
     @staticmethod
     def get_pool_manager(proxy=None):
-        if proxy is not None:
+        if proxy is not None and proxy.startswith("socks"):
+            from urllib3.contrib.socks import SOCKSProxyManager
+            pm = SOCKSProxyManager(
+                proxy,
+                num_pools=10,
+            )
+        elif proxy is not None:
             pm = urllib3.ProxyManager(
                 proxy,
                 num_pools=10,