shyouhei	2011-02-18 21:18:10 +0900 (Fri, 18 Feb 2011)

  New Revision: 30910

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30910

  Log:
    merge revision(s) 30905:
    * 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_7/ChangeLog
    branches/ruby_1_8_7/lib/fileutils.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 30909)
+++ ruby_1_8_7/ChangeLog	(revision 30910)
@@ -1,3 +1,11 @@
+Fri Feb 18 21:17:22 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 19:46:46 2011  NAKAMURA Usaku  <usa@r...>
 
 	* win32/win32.c (init_stdhandle): backport mistake of r29382.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 30909)
+++ ruby_1_8_7/version.h	(revision 30910)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2011-02-18"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20110218
-#define RUBY_PATCHLEVEL 332
+#define RUBY_PATCHLEVEL 333
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/lib/fileutils.rb
===================================================================
--- ruby_1_8_7/lib/fileutils.rb	(revision 30909)
+++ ruby_1_8_7/lib/fileutils.rb	(revision 30910)
@@ -658,10 +658,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
@@ -704,6 +704,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/