From 234f1499fa455799e59b6fb2fb4738b189f25e59 Mon Sep 17 00:00:00 2001 From: Thomas NOEL Date: Thu, 30 Nov 2017 16:36:36 +0100 Subject: [PATCH] misc: add a REQUESTS_PROXIES settings for requests calls (#20371) --- wcs/qommon/misc.py | 3 ++- wcs/settings.py | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/wcs/qommon/misc.py b/wcs/qommon/misc.py index 0bb58551..a98c8a0c 100644 --- a/wcs/qommon/misc.py +++ b/wcs/qommon/misc.py @@ -35,6 +35,7 @@ try: except ImportError: Image = None +from django.conf import settings from django.utils import datetime_safe from quixote import get_publisher, get_response, get_request @@ -289,7 +290,7 @@ def _http_request(url, method='GET', body=None, headers={}, cert_file=None, time try: response = requests.request(method, url, headers=headers, data=body, - timeout=timeout, cert=cert_file) + timeout=timeout, cert=cert_file, proxies=settings.REQUESTS_PROXIES) except requests.Timeout: raise ConnectionError('connection timed out while fetching the page') except requests.RequestException as err: diff --git a/wcs/settings.py b/wcs/settings.py index 73f3d605..a9bc7e8d 100644 --- a/wcs/settings.py +++ b/wcs/settings.py @@ -146,6 +146,10 @@ CACHES = { WCS_LEGACY_CONFIG_FILE = None +# proxies=REQUESTS_PROXIES is used in python-requests call +# http://docs.python-requests.org/en/master/user/advanced/?highlight=proxy#proxies +REQUESTS_PROXIES = None + local_settings_file = os.environ.get('WCS_SETTINGS_FILE', os.path.join(os.path.dirname(__file__), 'local_settings.py')) if os.path.exists(local_settings_file): -- 2.15.0