[Python-checkins] bpo-42627: Fix incorrect parsing of Windows registry proxy settings (GH-26307)
zooba
webhook-mailer at python.org
Wed May 11 14:17:46 EDT 2022
https://github.com/python/cpython/commit/b69297ea23c0ab9866ae8bd26a347a9b5df567a6
commit: b69297ea23c0ab9866ae8bd26a347a9b5df567a6
branch: main
author: 狂男风 <CrazyBoyFeng at Live.com>
committer: zooba <steve.dower at microsoft.com>
date: 2022-05-11T19:17:17+01:00
summary:
bpo-42627: Fix incorrect parsing of Windows registry proxy settings (GH-26307)
files:
A Misc/NEWS.d/next/Library/2021-05-22-07-58-59.bpo-42627.EejtD0.rst
M Lib/urllib/request.py
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
index 84997f268c930..6d580a434a7be 100644
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -2679,22 +2679,26 @@ def getproxies_registry():
# Returned as Unicode but problems if not converted to ASCII
proxyServer = str(winreg.QueryValueEx(internetSettings,
'ProxyServer')[0])
- if '=' in proxyServer:
- # Per-protocol settings
- for p in proxyServer.split(';'):
- protocol, address = p.split('=', 1)
- # See if address has a type:// prefix
- if not re.match('(?:[^/:]+)://', address):
- address = '%s://%s' % (protocol, address)
- proxies[protocol] = address
- else:
- # Use one setting for all protocols
- if proxyServer[:5] == 'http:':
- proxies['http'] = proxyServer
- else:
- proxies['http'] = 'http://%s' % proxyServer
- proxies['https'] = 'https://%s' % proxyServer
- proxies['ftp'] = 'ftp://%s' % proxyServer
+ if '=' not in proxyServer and ';' not in proxyServer:
+ # Use one setting for all protocols.
+ proxyServer = 'http={0};https={0};ftp={0}'.format(proxyServer)
+ for p in proxyServer.split(';'):
+ protocol, address = p.split('=', 1)
+ # See if address has a type:// prefix
+ if not re.match('(?:[^/:]+)://', address):
+ # Add type:// prefix to address without specifying type
+ if protocol in ('http', 'https', 'ftp'):
+ # The default proxy type of Windows is HTTP
+ address = 'http://' + address
+ elif protocol == 'socks':
+ address = 'socks://' + address
+ proxies[protocol] = address
+ # Use SOCKS proxy for HTTP(S) protocols
+ if proxies.get('socks'):
+ # The default SOCKS proxy type of Windows is SOCKS4
+ address = re.sub(r'^socks://', 'socks4://', proxies['socks'])
+ proxies['http'] = proxies.get('http') or address
+ proxies['https'] = proxies.get('https') or address
internetSettings.Close()
except (OSError, ValueError, TypeError):
# Either registry key not found etc, or the value in an
diff --git a/Misc/NEWS.d/next/Library/2021-05-22-07-58-59.bpo-42627.EejtD0.rst b/Misc/NEWS.d/next/Library/2021-05-22-07-58-59.bpo-42627.EejtD0.rst
new file mode 100644
index 0000000000000..f165b9ced05d9
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-05-22-07-58-59.bpo-42627.EejtD0.rst
@@ -0,0 +1 @@
+Fix incorrect parsing of Windows registry proxy settings
More information about the Python-checkins
mailing list