vsftpd_232: Add report_note (if service down, host up)

Author: g0tmi1k

modules/auxiliary/dos/ftp/vsftpd_232.rb

@@ -51,47 +51,45 @@ def sanitize_ftp_response(str)
   def check
     # attempt to connect
     begin
-      if !connect_login
-        print_error('Connection refused')
-        return Exploit::CheckCode::Unknown('Failed to connect or authenticate via FTP')
-      end
-
-      if banner
-        vprint_status("FTP banner: #{sanitize_ftp_response(banner)}")
-
-        # Cleaned up FTP banner
-        report_service(
-          host: rhost,
-          port: rport,
-          proto: 'tcp',
-          name: 'ftp',
-          info: sanitize_ftp_response(banner)
-        )
-
-        # Raw FTP banner
-        report_note(
-          host: rhost,
-          port: rport,
-          proto: 'tcp',
-          type: 'ftp.banner',
-          data: { banner: banner.strip }
-        )
-      end
+      return Exploit::CheckCode::Unknown('Failed to connect or authenticate via FTP') unless connect_login
     rescue Rex::ConnectionRefused
-      print_error('Connection refused')
+      report_host(host: rhost)
       return Exploit::CheckCode::Unknown('Connection refused by the target')
     rescue Rex::ConnectionTimeout
-      print_error('Connection timed out')
+      report_host(host: rhost)
       return Exploit::CheckCode::Unknown('Connection timed out')
     end
 
+    if banner
+      vprint_status("FTP banner: #{@banner_version}")
+
+      # Cleaned up FTP banner
+      report_service(
+        host: rhost,
+        port: rport,
+        proto: 'tcp',
+        name: 'ftp',
+        info: @banner_version
+      )
+
+      # Raw FTP banner
+      report_note(
+        host: rhost,
+        port: rport,
+        proto: 'tcp',
+        type: 'ftp.banner',
+        data: { banner: banner.strip }
+      )
+    end
+
     s = ''
     loop do
       # get each line until our desired line shows or end line shows
       s = send_cmd(['STAT'], true)
       break if (s =~ /vsFTPd \d+\.\d+\.\d+/) || (s == "211 End of status\r\n")
     end
     disconnect
+
     # check if version was found
     if s !~ /vsFTPd \d+\.\d+\.\d+/
       print_error('Did not find FTP version in FTP session')
@@ -117,7 +115,6 @@ def run
 
     attempts = 0
     max = datastore['MAX_ATTEMPTS'].to_i
-
     loop do
       attempts += 1
       if max > 0 && attempts > max