#1669: don't allow shutil.rmtree() to be called on a symlink.

This commit is contained in:
Georg Brandl 2008-01-20 14:17:42 +00:00
parent 56112895d6
commit 5235398323
4 changed files with 42 additions and 11 deletions

View file

@ -156,6 +156,14 @@ def rmtree(path, ignore_errors=False, onerror=None):
elif onerror is None:
def onerror(*args):
raise
try:
if os.path.islink(path):
# symlinks to directories are forbidden, see bug #1669
raise OSError("Cannot call rmtree on a symbolic link")
except OSError:
onerror(os.path.islink, path, sys.exc_info())
# can't continue even if onerror hook returns
return
names = []
try:
names = os.listdir(path)

View file

@ -149,6 +149,20 @@ class TestShutil(unittest.TestCase):
except OSError:
pass
def test_rmtree_on_symlink(self):
# bug 1669.
os.mkdir(TESTFN)
try:
src = os.path.join(TESTFN, 'cheese')
dst = os.path.join(TESTFN, 'shop')
os.mkdir(src)
os.symlink(src, dst)
self.assertRaises(OSError, shutil.rmtree, dst)
finally:
shutil.rmtree(TESTFN, ignore_errors=True)
def test_main():
test_support.run_unittest(TestShutil)