ruby-changes:18882
From: yugui <ko1@a...>
Date: Fri, 18 Feb 2011 21:03:05 +0900 (JST)
Subject: [ruby-changes:18882] Ruby:r30907 (ruby_1_9_2): merges r30896 from trunk into ruby_1_9_2.
yugui 2011-02-18 21:02:52 +0900 (Fri, 18 Feb 2011) New Revision: 30907 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30907 Log: 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 <nicholas at pythonic.com.au> Modified files: branches/ruby_1_9_2/ChangeLog branches/ruby_1_9_2/lib/fileutils.rb branches/ruby_1_9_2/version.h Index: ruby_1_9_2/ChangeLog =================================================================== --- ruby_1_9_2/ChangeLog (revision 30906) +++ ruby_1_9_2/ChangeLog (revision 30907) @@ -1,3 +1,11 @@ +Fri Feb 18 19:31:31 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> + Sat Jan 29 22:16:26 2011 NARUSE, Yui <naruse@r...> * array.c (rb_ary_join): [].join.encoding must be US-ASCII. Index: ruby_1_9_2/lib/fileutils.rb =================================================================== --- ruby_1_9_2/lib/fileutils.rb (revision 30906) +++ ruby_1_9_2/lib/fileutils.rb (revision 30907) @@ -667,10 +667,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 @@ -713,6 +713,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) Index: ruby_1_9_2/version.h =================================================================== --- ruby_1_9_2/version.h (revision 30906) +++ ruby_1_9_2/version.h (revision 30907) @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 179 +#define RUBY_PATCHLEVEL 180 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/