summaryrefslogtreecommitdiffstats
path: root/Lib/urllib
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2016-07-31 06:24:16 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2016-07-31 06:24:16 (GMT)
commit4cbb23f8f278fd1f71dcd5968aa0b3f0b4f3bd5d (patch)
tree6b9afcfb2dbbcaba109a7b00785f711af576c538 /Lib/urllib
parentd27a7c1f22b263a3eef5d380c7058c993bd3a451 (diff)
downloadcpython-4cbb23f8f278fd1f71dcd5968aa0b3f0b4f3bd5d.zip
cpython-4cbb23f8f278fd1f71dcd5968aa0b3f0b4f3bd5d.tar.gz
cpython-4cbb23f8f278fd1f71dcd5968aa0b3f0b4f3bd5d.tar.bz2
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')
-rw-r--r--Lib/urllib/request.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
index ef62acc..537b765 100644
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -2366,6 +2366,13 @@ 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 'REQUEST_METHOD' in os.environ:
+ proxies.pop('http', None)
+
return proxies
def proxy_bypass_environment(host):