dnrops
/
metasploit-framework
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reenable UTF filtering support where needed 

revert d22231bdc8
This commit is contained in:
Brent Cook 2015-03-19 16:02:21 -05:00
parent d53ccb32a0
commit 24ce0118b8
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/rex/post/meterpreter/extensions/stdapi/fs/dir.rb
View File

@ -61,7 +61,7 @@ class Dir < Rex::Post::Dir
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 @@ class Dir < Rex::Post::Dir
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 @@ class Dir < Rex::Post::Dir
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 @@ class Dir < Rex::Post::Dir
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 @@ class Dir < Rex::Post::Dir
#
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

8
lib/rex/post/meterpreter/extensions/stdapi/fs/file.rb
View File

@ -91,9 +91,9 @@ class File < Rex::Post::Meterpreter::Extensions::Stdapi::Fs::IO
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 @@ class File < Rex::Post::Meterpreter::Extensions::Stdapi::Fs::IO
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