ruby-changes:18880
From: shyouhei <ko1@a...>
Date: Fri, 18 Feb 2011 20:48:12 +0900 (JST)
Subject: [ruby-changes:18880] Ruby:r30905 (ruby_1_8): merge revision(s) 30896:
shyouhei 2011-02-18 20:48:02 +0900 (Fri, 18 Feb 2011) New Revision: 30905 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30905 Log: merge revision(s) 30896: * 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 <nicholas at pythonic.com.au> Modified files: branches/ruby_1_8/ChangeLog branches/ruby_1_8/lib/fileutils.rb Index: ruby_1_8/ChangeLog =================================================================== --- ruby_1_8/ChangeLog (revision 30904) +++ ruby_1_8/ChangeLog (revision 30905) @@ -1,3 +1,11 @@ +Fri Feb 18 20:46:55 2011 Shugo Maeda <shugo@r...> + + * 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 <nicholas at pythonic.com.au> + Fri Feb 18 20:02:29 2011 Shugo Maeda <shugo@r...> * test/ruby/test_exception.rb (TestException::test_to_s_taintness_propagation): Index: ruby_1_8/lib/fileutils.rb =================================================================== --- ruby_1_8/lib/fileutils.rb (revision 30904) +++ ruby_1_8/lib/fileutils.rb (revision 30905) @@ -668,10 +668,10 @@ # 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 @@ -714,6 +714,11 @@ 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) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/