NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-02 05:46:25 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

cleanup socks detection

Browse Source
This commit is contained in:
Arthur Hanson 2024-09-27 16:47:14 -07:00
parent 4198f77855
commit 2d46bcdd18
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
netbox/core/data_backends.py
View File

@ -79,9 +79,9 @@ class ProxyPoolManager(PoolManager):
# python_socks uses rdns param to denote remote DNS parsing and
# doesn't accept the 'h' or 'a' in the proxy URL
cleaned_proxy_url = proxy_url
if use_rdns := cleaned_proxy_url.startswith(('socks5h:', 'socks5a:')):
cleaned_proxy_url = cleaned_proxy_url.replace('socks5h:', 'socks5:')
cleaned_proxy_url = cleaned_proxy_url.replace('socks5a:', 'socks5:')
if use_rdns := urlparse(cleaned_proxy_url).scheme.lower() in ['socks4h', 'socks4a' 'socks5h', 'socks5a']:
cleaned_proxy_url = cleaned_proxy_url.replace('socks5h:', 'socks5:').replace('socks5a:', 'socks5:')
cleaned_proxy_url = cleaned_proxy_url.replace('socks4h:', 'socks4:').replace('socks4a:', 'socks4:')
connection_pool_kw['_socks_options'] = {'proxy_url': cleaned_proxy_url}
connection_pool_kw['timeout'] = timeout
@ -150,7 +150,7 @@ class GitBackend(DataBackend):
if settings.HTTP_PROXIES and self.url_scheme in ('http', 'https'):
if proxy := settings.HTTP_PROXIES.get(self.url_scheme):
config.set("http", "proxy", proxy)
if proxy.startswith('socks'):
if urlparse(proxy).scheme.lower() in ['socks4', 'socks4a', 'socks4h', 'socks5', 'socks5a', 'socks5h']:
self.use_socks = True
return config