infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixup some leftover debug and whitespace issues

bug/bundler_fix
Brent Cook 2016-09-15 18:38:47 -05:00
parent efdf7c4c00
commit 6686e91ffe
No known key found for this signature in database
GPG Key ID: 1FFAA0B24B708F96
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/clipboard.rb
View File

@ -377,7 +377,6 @@ private
if stat.directory? if stat.directory?
client.fs.dir.download( dest, source, {"recursive" => true}, true ) { |step, src, dst| client.fs.dir.download( dest, source, {"recursive" => true}, true ) { |step, src, dst|
# client.fs.dir.download( dest, source, true, true ) { |step, src, dst|
print_line( "#{step.ljust(11)} : #{src} -> #{dst}" ) print_line( "#{step.ljust(11)} : #{src} -> #{dst}" )
client.framework.events.on_session_download( client, src, dest ) if msf_loaded? client.framework.events.on_session_download( client, src, dest ) if msf_loaded?
} }

9
lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/fs.rb
View File

@ -25,7 +25,7 @@ class Console::CommandDispatcher::Stdapi::Fs
@@download_opts = Rex::Parser::Arguments.new( @@download_opts = Rex::Parser::Arguments.new(
"-h" => [ false, "Help banner." ], "-h" => [ false, "Help banner." ],
"-c" => [ false, "Resume getting a partially-downloaded file." ], "-c" => [ false, "Resume getting a partially-downloaded file." ],
"-l" => [ true, "Set the limit of retries (0 unlimits)." ], "-l" => [ true, "Set the limit of retries (0 unlimits)." ],
"-r" => [ false, "Download recursively." ], "-r" => [ false, "Download recursively." ],
"-t" => [ false, "Timestamp downloaded files." ]) "-t" => [ false, "Timestamp downloaded files." ])
# #
@ -39,7 +39,7 @@ class Console::CommandDispatcher::Stdapi::Fs
# #
@@ls_opts = Rex::Parser::Arguments.new( @@ls_opts = Rex::Parser::Arguments.new(
"-h" => [ false, "Help banner." ], "-h" => [ false, "Help banner." ],
"-S" => [ true, "Search string." ], "-S" => [ true, "Search string." ],
"-t" => [ false, "Sort by time" ], "-t" => [ false, "Sort by time" ],
"-s" => [ false, "Sort by size" ], "-s" => [ false, "Sort by size" ],
"-r" => [ false, "Reverse sort order" ], "-r" => [ false, "Reverse sort order" ],
@ -66,7 +66,7 @@ class Console::CommandDispatcher::Stdapi::Fs
'mkdir' => 'Make directory', 'mkdir' => 'Make directory',
'pwd' => 'Print working directory', 'pwd' => 'Print working directory',
'rm' => 'Delete the specified file', 'rm' => 'Delete the specified file',
'mv' => 'Move source to destination', 'mv' => 'Move source to destination',
'rmdir' => 'Remove directory', 'rmdir' => 'Remove directory',
'search' => 'Search for files', 'search' => 'Search for files',
'upload' => 'Upload a file or directory', 'upload' => 'Upload a file or directory',
@ -341,7 +341,7 @@ class Console::CommandDispatcher::Stdapi::Fs
continue = false continue = false
tries = false tries = false
tries_no = 0 tries_no = 0
opts = {} opts = {}
@@download_opts.parse(args) { |opt, idx, val| @@download_opts.parse(args) { |opt, idx, val|
case opt case opt
@ -408,7 +408,6 @@ class Console::CommandDispatcher::Stdapi::Fs
dest_path = src_path.tr(src_separator, ::File::SEPARATOR) dest_path = src_path.tr(src_separator, ::File::SEPARATOR)
client.fs.file.download(dest_path, src_path, opts) do |step, src, dst| client.fs.file.download(dest_path, src_path, opts) do |step, src, dst|
puts step
print_status("#{step.ljust(11)}: #{src} -> #{dst}") print_status("#{step.ljust(11)}: #{src} -> #{dst}")
client.framework.events.on_session_download(client, src, dest) if msf_loaded? client.framework.events.on_session_download(client, src, dest) if msf_loaded?
end end