nakidai
/
whoogle-search
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow HTTP-exclusive proxies for all requests 

Proxies that only support HTTP were causing request timeouts due to an
invalid upgrade to HTTPS when creating the request. This update restores
the ability to have an HTTP-only proxy for all requests.

Fixes #906
main
Ben Busby 2022-12-12 16:40:15 -07:00
parent 8fbbdf2cec
commit 7a852aa876
No known key found for this signature in database
GPG Key ID: B9B7231E01D924A1
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/request.py
View File

@ -209,19 +209,13 @@ class Request:
proxy_pass = os.environ.get('WHOOGLE_PROXY_PASS', '') proxy_pass = os.environ.get('WHOOGLE_PROXY_PASS', '')
auth_str = '' auth_str = ''
if proxy_user: if proxy_user:
auth_str = proxy_user + ':' + proxy_pass auth_str = f'{proxy_user}:{proxy_pass}@'
self.proxies = {
'https': proxy_type + '://' +
((auth_str + '@') if auth_str else '') + proxy_path,
}
# Need to ensure both HTTP and HTTPS are in the proxy dict, proxy_str = f'{proxy_type}://{auth_str}{proxy_path}'
# regardless of underlying protocol self.proxies = {
if proxy_type == 'https': 'https': proxy_str,
self.proxies['http'] = self.proxies['https'].replace( 'http': proxy_str
'https', 'http') }
else:
self.proxies['http'] = self.proxies['https']
else: else:
self.proxies = { self.proxies = {
'http': 'socks5://127.0.0.1:9050', 'http': 'socks5://127.0.0.1:9050',