From b593b831d3caee7620ce028a0171cc0c7280d861 Mon Sep 17 00:00:00 2001 From: yugui Date: Fri, 18 Feb 2011 12:02:52 +0000 Subject: merges r30896 from trunk into ruby_1_9_2. -- * lib/fileutils.rb (FileUtils::remove_entry_secure): there is a race condition in the case where the given path is a directory, and some other user can move that directory, and create a symlink while this method is executing. Reported by: Nicholas Jefferson git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30907 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/fileutils.rb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'lib/fileutils.rb') diff --git a/lib/fileutils.rb b/lib/fileutils.rb index 73e2bfe3c3..7cc223c17e 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -667,10 +667,10 @@ module FileUtils # removing directories. This requires the current process is the # owner of the removing whole directory tree, or is the super user (root). # - # WARNING: You must ensure that *ALL* parent directories are not - # world writable. Otherwise this method does not work. - # Only exception is temporary directory like /tmp and /var/tmp, - # whose permission is 1777. + # WARNING: You must ensure that *ALL* parent directories cannot be + # moved by other untrusted users. For example, parent directories + # should not be owned by untrusted users, and should not be world + # writable except when the sticky bit set. # # WARNING: Only the owner of the removing directory tree, or Unix super # user (root) should invoke this method. Otherwise this method does not @@ -713,6 +713,11 @@ module FileUtils end f.chown euid, -1 f.chmod 0700 + unless fu_stat_identical_entry?(st, File.lstat(fullpath)) + # TOC-to-TOU attack? + File.unlink fullpath + return + end } # ---- tree root is frozen ---- root = Entry_.new(path) -- cgit v1.2.3