Commitcaf6064

and

authored

GH-118447: Fix handling of unreadable symlinks inos.path.realpath() (#118489)

Co-authored-by: Nice Zombies <nineteendo19d0@gmail.com>

1 parent30b4e9f commitcaf6064Copy full SHA for caf6064

File tree

+32

-13

lines changed

+32

-13

lines changed

Lines changed: 13 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -471,26 +471,26 @@ def realpath(filename, *, strict=False):`
`471`	`471`	`ifnotstat.S_ISLNK(st.st_mode):`
`472`	`472`	`path=newpath`
`473`	`473`	`continue`
	`474`	`+ifnewpathinseen:`
	`475`	`+# Already seen this path`
	`476`	`+path=seen[newpath]`
	`477`	`+ifpathisnotNone:`
	`478`	`+# use cached value`
	`479`	`+continue`
	`480`	`+# The symlink is not resolved, so we must have a symlink loop.`
	`481`	`+ifstrict:`
	`482`	`+# Raise OSError(errno.ELOOP)`
	`483`	`+os.stat(newpath)`
	`484`	`+path=newpath`
	`485`	`+continue`
	`486`	`+target=os.readlink(newpath)`
`474`	`487`	`exceptOSError:`
`475`	`488`	`ifstrict:`
`476`	`489`	`raise`
`477`	`490`	`path=newpath`
`478`	`491`	`continue`
`479`	`492`	`# Resolve the symbolic link`
`480`		`-ifnewpathinseen:`
`481`		`-# Already seen this path`
`482`		`-path=seen[newpath]`
`483`		`-ifpathisnotNone:`
`484`		`-# use cached value`
`485`		`-continue`
`486`		`-# The symlink is not resolved, so we must have a symlink loop.`
`487`		`-ifstrict:`
`488`		`-# Raise OSError(errno.ELOOP)`
`489`		`-os.stat(newpath)`
`490`		`-path=newpath`
`491`		`-continue`
`492`	`493`	`seen[newpath]=None# not resolved symlink`
`493`		`-target=os.readlink(newpath)`
`494`	`494`	`iftarget.startswith(sep):`
`495`	`495`	`# Symlink target is absolute; reset resolved path.`
`496`	`496`	`path=sep`

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -660,6 +660,23 @@ def test_realpath_resolve_first(self):`
`660`	`660`	`safe_rmdir(ABSTFN+"/k")`
`661`	`661`	`safe_rmdir(ABSTFN)`
`662`	`662`
	`663`	`+@os_helper.skip_unless_symlink`
	`664`	`+@skip_if_ABSTFN_contains_backslash`
	`665`	`+@unittest.skipIf(os.chmodnotinos.supports_follow_symlinks,"Can't set symlink permissions")`
	`666`	`+deftest_realpath_unreadable_symlink(self):`
	`667`	`+try:`
	`668`	`+os.symlink(ABSTFN+"1",ABSTFN)`
	`669`	`+os.chmod(ABSTFN,0o000,follow_symlinks=False)`
	`670`	`+self.assertEqual(realpath(ABSTFN),ABSTFN)`
	`671`	`+self.assertEqual(realpath(ABSTFN+'/foo'),ABSTFN+'/foo')`
	`672`	`+self.assertEqual(realpath(ABSTFN+'/../foo'),dirname(ABSTFN)+'/foo')`
	`673`	`+self.assertEqual(realpath(ABSTFN+'/foo/..'),ABSTFN)`
	`674`	`+withself.assertRaises(PermissionError):`
	`675`	`+realpath(ABSTFN,strict=True)`
	`676`	`+finally:`
	`677`	`+os.chmod(ABSTFN,0o755,follow_symlinks=False)`
	`678`	`+os.unlink(ABSTFN)`
	`679`	`+`
`663`	`680`	`deftest_relpath(self):`
`664`	`681`	`(real_getcwd,os.getcwd)= (os.getcwd,lambda:r"/home/user/bar")`
`665`	`682`	`try:`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+:func:`os.path.realpath` now suppresses any:exc:`OSError` from
	`2`	+:func:`os.readlink` when strict mode is disabled (the default).

Comments

(0)