Add support for Socks5 proxy. (python-telegram-bot#518)

daimajia · tsnoam · commit e39afad3213d · 2017-02-25T20:47:56.000+02:00
diff --git a/setup.py b/setup.py
@@ -36,6 +36,7 @@ def requirements():
           install_requires=requirements(),
           extras_require={
               'json': 'ujson',
+              'socks': 'PySocks'
           },
           include_package_data=True,
           classifiers=[
diff --git a/telegram/utils/request.py b/telegram/utils/request.py
@@ -30,6 +30,10 @@
 import urllib3
 from urllib3.connection import HTTPConnection
 from urllib3.util.timeout import Timeout
+try:
+    from urllib3.contrib.socks import SOCKSProxyManager
+except ImportError:
+    SOCKSProxyManager = None
 
 from telegram import (InputFile, TelegramError)
 from telegram.error import (Unauthorized, NetworkError, TimedOut, BadRequest, ChatMigrated,
@@ -92,11 +96,16 @@ def __init__(self,
             mgr = urllib3.PoolManager(**kwargs)
         else:
             kwargs.update(urllib3_proxy_kwargs)
-            mgr = urllib3.proxy_from_url(proxy_url, **kwargs)
-            if mgr.proxy.auth:
-                # TODO: what about other auth types?
-                auth_hdrs = urllib3.make_headers(proxy_basic_auth=mgr.proxy.auth)
-                mgr.proxy_headers.update(auth_hdrs)
+            if proxy_url.startswith('socks'):
+                if not SOCKSProxyManager:
+                    raise RuntimeError('PySocks is missing')
+                mgr = SOCKSProxyManager(proxy_url, **kwargs)
+            else:
+                mgr = urllib3.proxy_from_url(proxy_url, **kwargs)
+                if mgr.proxy.auth:
+                    # TODO: what about other auth types?
+                    auth_hdrs = urllib3.make_headers(proxy_basic_auth=mgr.proxy.auth)
+                    mgr.proxy_headers.update(auth_hdrs)
 
         self._con_pool = mgr
 
