add socks proxy support (#253)

* add socks proxy support * add socks proxy to mustache template Co-authored-by: Philipp Brandl <[email protected]>
Chaffelson · Jan 28, 2021 · 5480af8 · 5480af8
1 parent 0687dbc
commit 5480af8
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/nipyapi/nifi/rest.py b/nipyapi/nifi/rest.py
@@ -92,7 +92,7 @@ def __init__(self, pools_size=4, maxsize=4):
         proxy = Configuration().proxy
 
         # https pool manager
-        if proxy:
+        if proxy and "socks" not in str(proxy):
             self.pool_manager = urllib3.ProxyManager(
                 num_pools=pools_size,
                 maxsize=maxsize,
@@ -103,6 +103,17 @@ def __init__(self, pools_size=4, maxsize=4):
                 ssl_context=ssl_context,
                 proxy_url=proxy
             )
+        elif proxy and "socks" in str(proxy):
+            self.pool_manager = urllib3.contrib.socks.SOCKSProxyManager(
+                num_pools=pools_size,
+                maxsize=maxsize,
+                cert_reqs=cert_reqs,
+                ca_certs=ca_certs,
+                cert_file=cert_file,
+                key_file=key_file,
+                ssl_context=ssl_context,
+                proxy_url=proxy
+            )
         else:
             self.pool_manager = urllib3.PoolManager(
                 num_pools=pools_size,

diff --git a/requirements.txt b/requirements.txt
@@ -15,6 +15,9 @@ lxml>=4.6.2
 requests[security]>=2.18
 # urllib3, cryptography are handled by requests
 
+# Socks Proxy
+pysocks>=1.7.1
+
 # Import Export and Utils implementation
 ruamel.yaml==0.16.12
 

diff --git a/resources/client_gen/swagger_templates/rest.mustache b/resources/client_gen/swagger_templates/rest.mustache
@@ -83,7 +83,7 @@ class RESTClientObject(object):
         proxy = Configuration().proxy
 
         # https pool manager
-        if proxy:
+        if proxy and "socks" not in str(proxy):
             self.pool_manager = urllib3.ProxyManager(
                 num_pools=pools_size,
                 maxsize=maxsize,
@@ -94,6 +94,17 @@ class RESTClientObject(object):
                 ssl_context=ssl_context,
                 proxy_url=proxy
             )
+        elif proxy and "socks" in str(proxy):
+            self.pool_manager = urllib3.contrib.socks.SOCKSProxyManager(
+                num_pools=pools_size,
+                maxsize=maxsize,
+                cert_reqs=cert_reqs,
+                ca_certs=ca_certs,
+                cert_file=cert_file,
+                key_file=key_file,
+                ssl_context=ssl_context,
+                proxy_url=proxy
+            )
         else:
             self.pool_manager = urllib3.PoolManager(
                 num_pools=pools_size,