ftp_login: Able to be more verbose

Author: g0tmi1k

modules/auxiliary/scanner/ftp/ftp_login.rb

@@ -53,10 +53,15 @@ def initialize
     deregister_options('FTPUSER', 'FTPPASS') # Can use these, but should use 'username' and 'password'
   end
 
+  def sanitize_ftp_response(str)
+    Rex::Text.to_hex_ascii(str.to_s.gsub(/^\d{3}[\s-]/, '').strip.gsub(/\A\(|\)\z/, ''))
+  end
+
   def grab_report_banner
+    vprint_status('Getting FTP banner')
+
     begin
       connect(true, false)
-      banner_version = banner.to_s.gsub(/^\d{3}[\s-]/, '').strip.gsub(/\A\(|\)\z/, '')
     rescue ::Rex::ConnectionRefused
       report_host(host: rhost)
       return
@@ -78,7 +83,7 @@ def grab_report_banner
       port: rport,
       proto: 'tcp',
       name: 'ftp',
-      info: banner_version
+      info: @banner_version
     )
 
     # Raw FTP banner
@@ -92,10 +97,10 @@ def grab_report_banner
   end
 
   def run_host(ip)
-    print_status('Starting FTP login sweep')
-
     grab_report_banner
 
+    print_status('Starting FTP login sweep')
+
     cred_collection = build_credential_collection(
       username: datastore['USERNAME'],
       password: datastore['PASSWORD'],
@@ -138,10 +143,15 @@ def run_host(ip)
         workspace_id: myworkspace_id
       )
       if result.success?
+        msg = "Login Successful: #{result.credential}"
+        msg << " (#{access_level})" if access_level
+        print_good(msg)
+
         credential_data[:private_type] = :password
         credential_core = create_credential(credential_data)
         credential_data[:core] = credential_core
 
+        vprint_status('Checking read/write access') if datastore['CHECK_ACCESS']
         access_level = test_ftp_access(result.credential.public, result.credential.private) if datastore['CHECK_ACCESS']
         credential_data[:access_level] = access_level if access_level
 
@@ -155,15 +165,12 @@ def run_host(ip)
         )
 
         create_credential_login(credential_data)
-
-        msg = "Login Successful: #{result.credential}"
-        msg << " (#{access_level})" if access_level
-        print_good(msg)
       else
-        invalidate_login(credential_data)
         proof = result.proof.to_s.strip
         proof_str = proof.empty? ? result.status.to_s : "#{result.status}: #{proof}"
         vprint_error("Login Failed: #{result.credential} (#{proof_str})")
+
+        invalidate_login(credential_data)
       end
     end
   end