mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-27 03:45:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

#4489: Use dir_fd in rmdir in _rmtree_safe_fd()

Browse Source 
Now that rmdir supports dir_fd, we also use it. Attackers can't even delete
empty directories anymore.
This commit is contained in:
Hynek Schlawack 2012-06-28 15:30:47 +02:00
parent dde8cb0899
commit 9f558ccefd
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Lib/shutil.py
View File

@ -393,6 +393,10 @@ def _rmtree_safe_fd(topfd, path, onerror):
try:
if os.path.samestat(orig_st, os.fstat(dirfd)):
_rmtree_safe_fd(dirfd, fullname, onerror)
try:
os.rmdir(name, dir_fd=topfd)
except os.error:
onerror(os.rmdir, fullname, sys.exc_info())
finally:
os.close(dirfd)
else:
@ -400,10 +404,6 @@ def _rmtree_safe_fd(topfd, path, onerror):
os.unlink(name, dir_fd=topfd)
except os.error:
onerror(os.unlink, fullname, sys.exc_info())
try:
os.rmdir(path)
except os.error:
onerror(os.rmdir, path, sys.exc_info())
_use_fd_functions = (os.unlink in os.supports_dir_fd and
os.open in os.supports_dir_fd)
@ -445,6 +445,10 @@ def rmtree(path, ignore_errors=False, onerror=None):
if (stat.S_ISDIR(orig_st.st_mode) and
os.path.samestat(orig_st, os.fstat(fd))):
_rmtree_safe_fd(fd, path, onerror)
try:
os.rmdir(path)
except os.error:
onerror(os.rmdir, path, sys.exc_info())
else:
raise NotADirectoryError(20,
"Not a directory: '{}'".format(path))