Land rapid7#4959 - @hmoore-r7 - disable unicode filter by default on !windows

Author: Brent Cook

lib/msf/base/sessions/meterpreter_options.rb

@@ -15,7 +15,7 @@ def initialize(info = {})
         OptString.new('InitialAutoRunScript', [false, "An initial script to run on session creation (before AutoRunScript)", '']),
         OptString.new('AutoRunScript', [false, "A script to run automatically on session creation.", '']),
         OptBool.new('AutoSystemInfo', [true, "Automatically capture system information on initialization.", true]),
-        OptBool.new('EnableUnicodeEncoding', [true, "Automatically encode UTF-8 strings as hexadecimal", true]),
+        OptBool.new('EnableUnicodeEncoding', [true, "Automatically encode UTF-8 strings as hexadecimal", Rex::Compat.is_windows]),
         OptPath.new('HandlerSSLCert', [false, "Path to a SSL certificate in unified PEM format, ignored for HTTP transports"])
       ], self.class)
   end

lib/rex/post/meterpreter/extensions/stdapi/fs/dir.rb

@@ -61,7 +61,7 @@ def Dir.entries(name = getwd)
     response = client.send_request(request)
 
     response.each(TLV_TYPE_FILE_NAME) { |file_name|
-      files << file_name.value
+      files << client.unicode_filter_encode(file_name.value)
     }
 
     return files
@@ -97,8 +97,8 @@ def Dir.entries_with_info(name = getwd)
 
       files <<
         {
-          'FileName' => file_name.value,
-          'FilePath' => fpath[idx].value,
+          'FileName' => client.unicode_filter_encode(file_name.value),
+          'FilePath' => client.unicode_filter_encode(fpath[idx].value),
           'FileShortName' => fsname[idx] ? fsname[idx].value : nil,
           'StatBuf'  => st,
         }
@@ -147,7 +147,7 @@ def Dir.pwd
 
     response = client.send_request(request)
 
-    return response.get_tlv(TLV_TYPE_DIRECTORY_PATH).value
+    return client.unicode_filter_encode(response.get_tlv(TLV_TYPE_DIRECTORY_PATH).value)
   end
 
   #
@@ -197,8 +197,8 @@ def Dir.unlink(path)
   def Dir.download(dst, src, recursive = false, force = true, &stat)
 
     self.entries(src).each { |src_sub|
-      dst_item = dst + ::File::SEPARATOR + src_sub
-      src_item = src + client.fs.file.separator + src_sub
+      dst_item = dst + ::File::SEPARATOR + client.unicode_filter_encode(src_sub)
+      src_item = src + client.fs.file.separator + client.unicode_filter_encode(src_sub)
 
       if (src_sub == '.' or src_sub == '..')
         next
@@ -242,8 +242,8 @@ def Dir.download(dst, src, recursive = false, force = true, &stat)
   #
   def Dir.upload(dst, src, recursive = false, &stat)
     ::Dir.entries(src).each { |src_sub|
-      dst_item = dst + client.fs.file.separator + src_sub
-      src_item = src + ::File::SEPARATOR + src_sub
+      dst_item = dst + client.fs.file.separator + client.unicode_filter_encode(src_sub)
+      src_item = src + ::File::SEPARATOR + client.unicode_filter_encode(src_sub)
 
       if (src_sub == '.' or src_sub == '..')
         next

lib/rex/post/meterpreter/extensions/stdapi/fs/file.rb

@@ -91,9 +91,9 @@ def File.search( root=nil, glob="*.*", recurse=true, timeout=-1 )
     if( response.result == 0 )
       response.each( TLV_TYPE_SEARCH_RESULTS ) do | results |
         files << {
-          'path' => results.get_tlv_value( TLV_TYPE_FILE_PATH ).chomp( '\\' ),
-          'name' => results.get_tlv_value( TLV_TYPE_FILE_NAME ),
-          'size' => results.get_tlv_value( TLV_TYPE_FILE_SIZE )
+          'path' => client.unicode_filter_encode(results.get_tlv_value(TLV_TYPE_FILE_PATH).chomp( '\\' )),
+          'name' => client.unicode_filter_encode(results.get_tlv_value(TLV_TYPE_FILE_NAME)),
+          'size' => results.get_tlv_value(TLV_TYPE_FILE_SIZE)
         }
       end
     end
@@ -138,7 +138,7 @@ def File.expand_path(path)
 
     response = client.send_request(request)
 
-    return response.get_tlv_value(TLV_TYPE_FILE_PATH)
+    return client.unicode_filter_encode(response.get_tlv_value(TLV_TYPE_FILE_PATH))
   end