Land #7930, Fix CVE-2017-5228

2017-02-07 19:21:56 -06:00 · 2017-02-07 19:21:56 -06:00 · db36cf5755
parent d0f6d4ef45 56cf6b129d
commit db36cf5755
1 changed files with 5 additions and 1 deletions
--- a/lib/rex/post/meterpreter/extensions/stdapi/fs/dir.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/fs/dir.rb
@ -222,7 +222,11 @@ class Dir < Rex::Post::Dir
    end

    dir_files.each { |src_sub|
-      dst_item = dst + ::File::SEPARATOR + client.unicode_filter_encode(src_sub)
+      dst_sub = src_sub.dup
+      dst_sub.gsub!(::File::SEPARATOR, '_')                                   # '/' on all systems
+      dst_sub.gsub!(::File::ALT_SEPARATOR, '_') if ::File::ALT_SEPARATOR      # nil on Linux, '\' on Windows
+
+      dst_item = ::File.join(dst, client.unicode_filter_encode(dst_sub))
      src_item = src + client.fs.file.separator + client.unicode_filter_encode(src_sub)

      if (src_sub == '.' or src_sub == '..')