ftp_version: report_service if missing banner

Author: g0tmi1k

modules/auxiliary/scanner/ftp/ftp_version.rb

@@ -37,27 +37,38 @@ def sanitize_ftp_response(str)
     Rex::Text.to_hex_ascii(str.to_s.gsub(/^\d{3}[\s-]/, '').strip.gsub(/\A\(|\)\z/, ''))
   end
 
+  def report_ftp_service
+    # Cleaned up FTP banner
+    report_service(
+      host: rhost,
+      port: rport,
+      name: 'ftp',
+      proto: 'tcp',
+      info: banner ? @banner_version : nil
+    )
+
+    return unless banner
+
+    # Raw FTP banner
+    report_note(
+      host: rhost,
+      port: rport,
+      proto: 'tcp',
+      type: 'ftp.banner',
+      data: { banner: banner.strip }
+    )
+  end
+
   def run_host(_target_host)
     connect(true, false)
 
     if banner
-      banner_sanitized = sanitize_ftp_response(banner)
-      print_good("FTP Banner: #{banner_sanitized}")
-      report_service(
-        host: rhost,
-        port: rport,
-        name: 'ftp',
-        info: banner_sanitized
-      )
-      report_note(
-        host: rhost,
-        port: rport,
-        proto: 'tcp',
-        type: 'ftp.banner',
-        data: { banner: banner.strip }
-      )
+      print_good("FTP Banner: #{@banner_version}")
+    else
+      vprint_warning('No FTP banner received')
     end
 
+    report_ftp_service
   rescue ::Rex::TimeoutError, ::Rex::ConnectionError, ::EOFError, ::Errno::ECONNREFUSED => e
     vprint_error(e.message)
     report_host(host: rhost)