diff options
| author | Senthil Kumaran <senthil@uthcode.com> | 2016-07-31 06:51:13 (GMT) |
|---|---|---|
| committer | Senthil Kumaran <senthil@uthcode.com> | 2016-07-31 06:51:13 (GMT) |
| commit | cde03fa0381fcb7f7d3ba0dff4e784eade1f3031 (patch) | |
| tree | e5958851d32ee2b1d8296c33324fd80d6177e8df /Lib/urllib/request.py | |
| parent | bf5868d2c5a9bc742b69172820a34ea88bfe2591 (diff) | |
| parent | 7bfbd1d3c56b2a5281edeb7a8e21598618b7c1a3 (diff) | |
| download | cpython-cde03fa0381fcb7f7d3ba0dff4e784eade1f3031.zip cpython-cde03fa0381fcb7f7d3ba0dff4e784eade1f3031.tar.gz cpython-cde03fa0381fcb7f7d3ba0dff4e784eade1f3031.tar.bz2 | |
[merge from 3.5] - Prevent HTTPoxy attack (CVE-2016-1000110)
Ignore the HTTP_PROXY variable when REQUEST_METHOD environment is set, which
indicates that the script is in CGI mode.
Issue #27568 Reported and patch contributed by Rémi Rampin.
Diffstat (limited to 'Lib/urllib/request.py')
| -rw-r--r-- | Lib/urllib/request.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py index 67e73f9..dc436bc 100644 --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -2477,6 +2477,12 @@ def getproxies_environment(): name = name.lower() if value and name[-6:] == '_proxy': proxies[name[:-6]] = value + # CVE-2016-1000110 - If we are running as CGI script, forget HTTP_PROXY + # (non-all-lowercase) as it may be set from the web server by a "Proxy:" + # header from the client + # If "proxy" is lowercase, it will still be used thanks to the next block + if 'REQUEST_METHOD' in os.environ: + proxies.pop('http', None) for name, value in os.environ.items(): if name[-6:] == '_proxy': name = name.lower() |