Skip to content

Commit f5b69f3

Browse files
authored
Merge pull request #377 from grumo35/patch-1
Set proxy settings from envars
2 parents 2a9b67a + 891d48f commit f5b69f3

1 file changed

Lines changed: 10 additions & 3 deletions

File tree

util/__init__.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import magic
2121
import zlib
2222
import lzma
23+
import os
2324
from datetime import datetime, timezone
2425
from enum import Enum
2526
from hashlib import md5, sha1, sha256, sha512
@@ -28,17 +29,23 @@
2829
from time import time
2930
from tqdm import tqdm
3031

31-
from patchman.signals import error_message, info_message, debug_message
32-
3332
from django.utils.timezone import make_aware
3433
from django.utils.dateparse import parse_datetime
3534
from django.conf import settings
3635

36+
from patchman.signals import error_message, info_message, debug_message
3737

3838
pbar = None
3939
verbose = None
4040
Checksum = Enum('Checksum', 'md5 sha sha1 sha256 sha512')
4141

42+
http_proxy = os.getenv('http_proxy')
43+
https_proxy = os.getenv('https_proxy')
44+
proxies = {
45+
'http': http_proxy,
46+
'https': https_proxy,
47+
}
48+
4249

4350
def get_verbosity():
4451
""" Get the global verbosity level
@@ -113,7 +120,7 @@ def get_url(url, headers={}, params={}):
113120
response = None
114121
try:
115122
debug_message.send(sender=None, text=f'Trying {url} headers:{headers} params:{params}')
116-
response = requests.get(url, headers=headers, params=params, stream=True, timeout=30)
123+
response = requests.get(url, headers=headers, params=params, stream=True, proxies=proxies, timeout=30)
117124
debug_message.send(sender=None, text=f'{response.status_code}: {response.headers}')
118125
if response.status_code in [403, 404]:
119126
return response

0 commit comments

Comments
 (0)