file.c: preserve encoding

* file.c (rb_find_file_safe): preserve encoding of path in
  SecurityError messages.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58996 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 22 insertions, 0 deletions

diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb
index 8dacd1ea12..dad7630e50 100644
--- a/test/ruby/test_require.rb
+++ b/test/ruby/test_require.rb
@@ -87,6 +87,17 @@ class TestRequire < Test::Unit::TestCase
     end
   end
 
+  SECURITY_WARNING =
+    if /mswin|mingw/ =~ RUBY_PLATFORM
+      nil
+    else
+      proc do |require_path|
+        File.chmod(0777, File.dirname(require_path))
+        $SAFE = 1
+        require(require_path)
+      end
+    end
+
   def assert_require_nonascii_path(encoding, bug)
     Dir.mktmpdir {|tmp|
       dir = "\u3042" * 5
@@ -109,6 +120,17 @@ class TestRequire < Test::Unit::TestCase
           assert_equal(self.class.ospath_encoding(require_path), $:.last.encoding, '[Bug #8753]')
           assert(!require(require_path), bug)
         }
+        $:.replace(load_path)
+        $".replace(features)
+        if SECURITY_WARNING
+          require_path.untaint
+          ospath = require_path.encode(self.class.ospath_encoding(require_path))
+          assert_warn(/Insecure world writable dir/) do
+            assert_raise_with_message(SecurityError, "loading from unsafe path #{ospath}") do
+              SECURITY_WARNING.call(require_path)
+            end
+          end
+        end
       ensure
         $:.replace(load_path)
         $".replace(features)