diff options
| author | guido@google.com <guido@google.com> | 2011-03-24 10:44:17 -0700 |
|---|---|---|
| committer | guido@google.com <guido@google.com> | 2011-03-24 10:44:17 -0700 |
| commit | 2bc23b8448394e96d5562fcc7b69aa54bb2c1a38 (patch) | |
| tree | 6f149cc6725aec4b9ec8bbdd72d7c93d351c14b7 | |
| parent | 60a4a90c8dd2972eb4bb977e70835be9593cbbac (diff) | |
| download | cpython-2bc23b8448394e96d5562fcc7b69aa54bb2c1a38.tar.gz cpython-2bc23b8448394e96d5562fcc7b69aa54bb2c1a38.zip | |
Add FTP to the allowed url schemes. Add Misc/NEWS.
| -rw-r--r-- | Lib/urllib.py | 5 | ||||
| -rw-r--r-- | Lib/urllib2.py | 5 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/Lib/urllib.py b/Lib/urllib.py index 09ce8c57e84..b835f52f239 100644 --- a/Lib/urllib.py +++ b/Lib/urllib.py @@ -643,10 +643,11 @@ class FancyURLopener(URLopener): newurl = basejoin(self.type + ":" + url, newurl) # For security reasons we do not allow redirects to protocols - # other than HTTP or HTTPS. + # other than HTTP, HTTPS or FTP. newurl_lower = newurl.lower() if not (newurl_lower.startswith('http://') or - newurl_lower.startswith('https://')): + newurl_lower.startswith('https://') or + newurl_lower.startswith('ftp://')): return void = fp.read() diff --git a/Lib/urllib2.py b/Lib/urllib2.py index db7ce81845a..0bb69a01303 100644 --- a/Lib/urllib2.py +++ b/Lib/urllib2.py @@ -556,10 +556,11 @@ class HTTPRedirectHandler(BaseHandler): newurl = urlparse.urljoin(req.get_full_url(), newurl) # For security reasons we do not allow redirects to protocols - # other than HTTP or HTTPS. + # other than HTTP, HTTPS or FTP. newurl_lower = newurl.lower() if not (newurl_lower.startswith('http://') or - newurl_lower.startswith('https://')): + newurl_lower.startswith('https://') or + newurl_lower.startswith('ftp://')): return # XXX Probably want to forget about the state of the current diff --git a/Misc/NEWS b/Misc/NEWS index 3aea1f331bf..76aea178271 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -12,6 +12,9 @@ What's New in Python 2.5.6c1? Library ------- +- Issue #11662: Make urllib and urllib2 ignore redirections if the + scheme is not HTTP, HTTPS or FTP. This fixes a security hole. + - Issue #8674: Fixed a number of incorrect or undefined-behaviour-inducing overflow checks in the audioop module (CVE-2010-1634). |