From 2bc23b8448394e96d5562fcc7b69aa54bb2c1a38 Mon Sep 17 00:00:00 2001 From: "guido@google.com" Date: Thu, 24 Mar 2011 10:44:17 -0700 Subject: Add FTP to the allowed url schemes. Add Misc/NEWS. --- Lib/urllib.py | 5 +++-- Lib/urllib2.py | 5 +++-- Misc/NEWS | 3 +++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Lib/urllib.py b/Lib/urllib.py index 09ce8c5..b835f52 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 db7ce81..0bb69a0 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 3aea1f3..76aea17 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). -- cgit v0.12