Skip to content

Commit

Permalink
pythonGH-126766: url2pathname(): handle empty authority section. (p…
Browse files Browse the repository at this point in the history
…ythonGH-126767)

Discard two leading slashes from the beginning of a `file:` URI if they
introduce an empty authority section. As a result, file URIs like
`///etc/hosts` are correctly parsed as `/etc/hosts`.
(cherry picked from commit cae9d9d)

Co-authored-by: Barney Gale <barney.gale@gmail.com>
  • Loading branch information
barneygale authored and miss-islington committed Nov 14, 2024
1 parent d79acd9 commit 935fab1
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 9 deletions.
7 changes: 3 additions & 4 deletions Lib/nturl2path.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@ def url2pathname(url):
url = url.replace(':', '|')
if not '|' in url:
# No drive specifier, just convert slashes
if url[:4] == '////':
# path is something like ////host/path/on/remote/host
# convert this to \\host\path\on\remote\host
# (notice halving of slashes at the start of the path)
if url[:3] == '///':
# URL has an empty authority section, so the path begins on the
# third character.
url = url[2:]
# make sure not to convert quoted slashes :-)
return urllib.parse.unquote(url.replace('/', '\\'))
Expand Down
10 changes: 5 additions & 5 deletions Lib/test/test_urllib.py
Original file line number Diff line number Diff line change
Expand Up @@ -1558,7 +1558,7 @@ def test_pathname2url_win(self):
self.assertEqual(fn('//?/unc/server/share/dir'), '//server/share/dir')
# Round-tripping
urls = ['///C:',
'///folder/test/',
'/folder/test/',
'///C:/foo/bar/spam.foo']
for url in urls:
self.assertEqual(fn(urllib.request.url2pathname(url)), url)
Expand All @@ -1582,7 +1582,7 @@ def test_url2pathname_win(self):
self.assertEqual(fn('/C|//'), 'C:\\\\')
self.assertEqual(fn('///C|/path'), 'C:\\path')
# No DOS drive
self.assertEqual(fn("///C/test/"), '\\\\\\C\\test\\')
self.assertEqual(fn("///C/test/"), '\\C\\test\\')
self.assertEqual(fn("////C/test/"), '\\\\C\\test\\')
# DOS drive paths
self.assertEqual(fn('C:/path/to/file'), 'C:\\path\\to\\file')
Expand All @@ -1606,7 +1606,7 @@ def test_url2pathname_win(self):
self.assertEqual(fn('//server/share/foo%2fbar'), '\\\\server\\share\\foo/bar')
# Round-tripping
paths = ['C:',
r'\\\C\test\\',
r'\C\test\\',
r'C:\foo\bar\spam.foo']
for path in paths:
self.assertEqual(fn(urllib.request.pathname2url(path)), path)
Expand All @@ -1617,8 +1617,8 @@ def test_url2pathname_posix(self):
fn = urllib.request.url2pathname
self.assertEqual(fn('/foo/bar'), '/foo/bar')
self.assertEqual(fn('//foo/bar'), '//foo/bar')
self.assertEqual(fn('///foo/bar'), '///foo/bar')
self.assertEqual(fn('////foo/bar'), '////foo/bar')
self.assertEqual(fn('///foo/bar'), '/foo/bar')
self.assertEqual(fn('////foo/bar'), '//foo/bar')
self.assertEqual(fn('//localhost/foo/bar'), '//localhost/foo/bar')

class Utility_Tests(unittest.TestCase):
Expand Down
4 changes: 4 additions & 0 deletions Lib/urllib/request.py
Original file line number Diff line number Diff line change
Expand Up @@ -1681,6 +1681,10 @@ def data_open(self, req):
def url2pathname(pathname):
"""OS-specific conversion from a relative URL of the 'file' scheme
to a file system path; not recommended for general use."""
if pathname[:3] == '///':
# URL has an empty authority section, so the path begins on the
# third character.
pathname = pathname[2:]
return unquote(pathname)

def pathname2url(pathname):
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix issue where :func:`urllib.request.url2pathname` failed to discard two
leading slashes introducing an empty authority section.

0 comments on commit 935fab1

Please sign in to comment.