Skip to content

Add HTTP proxy support via environment variables #968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kevinchiu wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −1
Open

Add HTTP proxy support via environment variables #968

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion massive/rest/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import certifi
import json
import os
import urllib3
import inspect
from urllib3.util.retry import Retry
Expand Down Expand Up @@ -73,7 +74,7 @@ def __init__(

# https://urllib3.readthedocs.io/en/stable/reference/urllib3.poolmanager.html
# https://urllib3.readthedocs.io/en/stable/reference/urllib3.connectionpool.html#urllib3.HTTPConnectionPool
self.client = urllib3.PoolManager(
pool_kwargs = dict(
num_pools=num_pools,
headers=self.headers, # default headers sent with each request.
ca_certs=certifi.where(),
Expand All @@ -82,6 +83,14 @@ def __init__(
timeout=self.timeout, # set timeout for each request
)

# Check for proxy environment variables (HTTPS_PROXY or HTTP_PROXY)
proxy_url = os.environ.get("HTTPS_PROXY") or os.environ.get("https_proxy") \
or os.environ.get("HTTP_PROXY") or os.environ.get("http_proxy")
if proxy_url:
self.client = urllib3.ProxyManager(proxy_url, **pool_kwargs)
else:
self.client = urllib3.PoolManager(**pool_kwargs)

if verbose:
logger.setLevel(logging.DEBUG)
self.trace = trace
Expand Down