diff options
| -rw-r--r-- | Lib/test/test_urllib.py | 3 | ||||
| -rw-r--r-- | Lib/test/test_urllib2net.py | 2 | ||||
| -rw-r--r-- | Lib/urllib/request.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
4 files changed, 8 insertions, 2 deletions
diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py index 4cb4682..e403bbf 100644 --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -160,6 +160,9 @@ class urlopen_FileTests(unittest.TestCase): for line in self.returned_obj: self.assertEqual(line, self.text) + def test_relativelocalfile(self): + self.assertRaises(ValueError,urllib.request.urlopen,'./' + self.pathname) + class ProxyTests(unittest.TestCase): def setUp(self): diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py index 54f4e0c..5fcb4cb 100644 --- a/Lib/test/test_urllib2net.py +++ b/Lib/test/test_urllib2net.py @@ -125,6 +125,8 @@ class OtherNetworkTests(unittest.TestCase): finally: os.remove(TESTFN) + self.assertRaises(ValueError, urllib.request.urlopen,'./relative_path/to/file') + # XXX Following test depends on machine configurations that are internal # to CNRI. Need to set up a public server with the right authentication # configuration for test purposes. diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py index c9f2c1d..90dfcff 100644 --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -1813,6 +1813,8 @@ class URLopener: urlfile = file if file[:1] == '/': urlfile = 'file://' + file + elif file[:2] == './': + raise ValueError("local file url may start with / or file:. Unknown url of type: %s" % url) return addinfourl(open(localname, 'rb'), headers, urlfile) raise URLError('local file error', 'not on local host') @@ -453,8 +453,7 @@ Core and Builtins Library ------- -- Issue #2134: A new attribute that specifies the exact type of token.OP - tokens has been added to tokenize.TokenInfo. +- Issue #6631: Disallow relative file paths in urllib urlopen methods. - Issue #13722: Avoid silencing ImportErrors when initializing the codecs registry. |