diff --git a/modules/auxiliary/admin/misc/sercomm_dump_config.rb b/modules/auxiliary/admin/misc/sercomm_dump_config.rb index 36e668af8f..8aeb0a3395 100644 --- a/modules/auxiliary/admin/misc/sercomm_dump_config.rb +++ b/modules/auxiliary/admin/misc/sercomm_dump_config.rb @@ -221,7 +221,7 @@ class MetasploitModule < Msf::Auxiliary @credentials.each do |k,v| next unless v[:user] and v[:password] - print_status("#{k}: User: #{v[:user]} Pass: #{v[:password]}") + print_good("#{k}: User: #{v[:user]} Pass: #{v[:password]}") report_cred( ip: rhost, port: rport, diff --git a/modules/auxiliary/admin/mysql/mysql_enum.rb b/modules/auxiliary/admin/mysql/mysql_enum.rb index d2802d46ce..16e3ebfe27 100644 --- a/modules/auxiliary/admin/mysql/mysql_enum.rb +++ b/modules/auxiliary/admin/mysql/mysql_enum.rb @@ -110,7 +110,7 @@ class MetasploitModule < Msf::Auxiliary if res and res.size > 0 print_status("\tList of Accounts with Password Hashes:") res.each do |row| - print_status("\t\tUser: #{row[0]} Host: #{row[1]} Password Hash: #{row[2]}") + print_good("\t\tUser: #{row[0]} Host: #{row[1]} Password Hash: #{row[2]}") report_cred( ip: rhost, port: rport, diff --git a/modules/auxiliary/admin/scada/modicon_password_recovery.rb b/modules/auxiliary/admin/scada/modicon_password_recovery.rb index 0663776f04..e2b521c22d 100644 --- a/modules/auxiliary/admin/scada/modicon_password_recovery.rb +++ b/modules/auxiliary/admin/scada/modicon_password_recovery.rb @@ -119,7 +119,7 @@ class MetasploitModule < Msf::Auxiliary vprint_status "#{ip}:#{rport} - FTP - Connecting" conn = connect_login if conn - print_status("#{ip}:#{rport} - FTP - Login succeeded") + print_good("#{ip}:#{rport} - FTP - Login succeeded") report_cred( ip: ip, port: rport, diff --git a/modules/auxiliary/scanner/backdoor/energizer_duo_detect.rb b/modules/auxiliary/scanner/backdoor/energizer_duo_detect.rb index d0d069d51a..75230e0ff7 100644 --- a/modules/auxiliary/scanner/backdoor/energizer_duo_detect.rb +++ b/modules/auxiliary/scanner/backdoor/energizer_duo_detect.rb @@ -95,7 +95,7 @@ class MetasploitModule < Msf::Auxiliary # Required to prevent the server from spinning a loop sock.put(trojan_command(:nop)) - print_status("#{ip}:#{rport} FOUND: #{files.inspect}") + print_good("#{ip}:#{rport} FOUND: #{files.inspect}") # Add Vulnerability and Report report_vuln({ :host => ip, diff --git a/modules/auxiliary/scanner/dect/call_scanner.rb b/modules/auxiliary/scanner/dect/call_scanner.rb index 63adfc802c..67b05e1959 100644 --- a/modules/auxiliary/scanner/dect/call_scanner.rb +++ b/modules/auxiliary/scanner/dect/call_scanner.rb @@ -54,7 +54,7 @@ class MetasploitModule < Msf::Auxiliary if (data) parsed_data = parse_call(data) parsed_data['time'] = Time.now - print_status("Found active call on: #{parsed_data['rfpi']}") + print_good("Found active call on: #{parsed_data['rfpi']}") @calls[parsed_data['time']] = parsed_data end diff --git a/modules/auxiliary/scanner/dect/station_scanner.rb b/modules/auxiliary/scanner/dect/station_scanner.rb index 7c8cf2f78e..8a728c39ca 100644 --- a/modules/auxiliary/scanner/dect/station_scanner.rb +++ b/modules/auxiliary/scanner/dect/station_scanner.rb @@ -45,7 +45,7 @@ class MetasploitModule < Msf::Auxiliary if (data) parsed_data = parse_station(data) if (not @base_stations.key?(parsed_data['rfpi'])) - print_status("Found New RFPI: #{parsed_data['rfpi']}") + print_good("Found New RFPI: #{parsed_data['rfpi']}") @base_stations[parsed_data['rfpi']] = parsed_data end end diff --git a/modules/auxiliary/scanner/discovery/arp_sweep.rb b/modules/auxiliary/scanner/discovery/arp_sweep.rb index f16e9a7945..70f6a4d65a 100644 --- a/modules/auxiliary/scanner/discovery/arp_sweep.rb +++ b/modules/auxiliary/scanner/discovery/arp_sweep.rb @@ -63,7 +63,7 @@ class MetasploitModule < Msf::Auxiliary while(reply = getreply()) next unless reply.is_arp? company = OUI_LIST::lookup_oui_company_name(reply.arp_saddr_mac) - print_status("#{reply.arp_saddr_ip} appears to be up (#{company}).") + print_good("#{reply.arp_saddr_ip} appears to be up (#{company}).") report_host(:host => reply.arp_saddr_ip, :mac=>reply.arp_saddr_mac) report_note(:host => reply.arp_saddr_ip, :type => "mac_oui", :data => company) end @@ -76,7 +76,7 @@ class MetasploitModule < Msf::Auxiliary while(reply = getreply()) next unless reply.is_arp? company = OUI_LIST::lookup_oui_company_name(reply.arp_saddr_mac) - print_status("#{reply.arp_saddr_ip} appears to be up (#{company}).") + print_good("#{reply.arp_saddr_ip} appears to be up (#{company}).") report_host(:host => reply.arp_saddr_ip, :mac=>reply.arp_saddr_mac) report_note(:host => reply.arp_saddr_ip, :type => "mac_oui", :data => company) end diff --git a/modules/auxiliary/scanner/discovery/ipv6_neighbor.rb b/modules/auxiliary/scanner/discovery/ipv6_neighbor.rb index b0e68413be..1be049d6cc 100644 --- a/modules/auxiliary/scanner/discovery/ipv6_neighbor.rb +++ b/modules/auxiliary/scanner/discovery/ipv6_neighbor.rb @@ -67,7 +67,7 @@ class MetasploitModule < Msf::Auxiliary while(reply = getreply()) next unless reply.is_arp? if not found[reply.arp_saddr_ip] - print_status(sprintf(" %16s ALIVE",reply.arp_saddr_ip)) + print_good(sprintf(" %16s ALIVE",reply.arp_saddr_ip)) addrs << [reply.arp_saddr_ip, reply.arp_saddr_mac] report_host(:host => reply.arp_saddr_ip, :mac=>reply.arp_saddr_mac) found[reply.arp_saddr_ip] = true @@ -81,7 +81,7 @@ class MetasploitModule < Msf::Auxiliary while(reply = getreply()) next unless reply.is_arp? if not found[reply.arp_saddr_ip] - print_status(sprintf(" %16s ALIVE",reply.arp_saddr_ip)) + print_good(sprintf(" %16s ALIVE",reply.arp_saddr_ip)) addrs << [reply.arp_saddr_ip, reply.arp_saddr_mac] report_host(:host => reply.arp_saddr_ip, :mac=>reply.arp_saddr_mac) found[reply.arp_saddr_ip] = true diff --git a/modules/auxiliary/scanner/emc/alphastor_devicemanager.rb b/modules/auxiliary/scanner/emc/alphastor_devicemanager.rb index d37a86d717..b02a9965e4 100644 --- a/modules/auxiliary/scanner/emc/alphastor_devicemanager.rb +++ b/modules/auxiliary/scanner/emc/alphastor_devicemanager.rb @@ -36,7 +36,7 @@ class MetasploitModule < Msf::Auxiliary data = sock.get_once if ( data and data =~ /rrobotd:rrobotd/ ) - print_status("Host #{ip} is running the EMC AlphaStor Device Manager.") + print_good("Host #{ip} is running the EMC AlphaStor Device Manager.") report_service(:host => rhost, :port => rport, :name => "emc-manager", :info => data) else print_error("Host #{ip} is not running the service...") diff --git a/modules/auxiliary/scanner/emc/alphastor_librarymanager.rb b/modules/auxiliary/scanner/emc/alphastor_librarymanager.rb index 71b4f8c0a6..cd2a2b0b4a 100644 --- a/modules/auxiliary/scanner/emc/alphastor_librarymanager.rb +++ b/modules/auxiliary/scanner/emc/alphastor_librarymanager.rb @@ -36,7 +36,7 @@ class MetasploitModule < Msf::Auxiliary data = sock.get_once if ( data and data =~ /robotd~robotd~CLIENT/ ) - print_status("Host #{ip} is running the EMC AlphaStor Library Manager.") + print_good("Host #{ip} is running the EMC AlphaStor Library Manager.") report_service(:host => rhost, :port => rport, :name => "emc-library", :info => data) else print_error("Host #{ip} is not running the service...") diff --git a/modules/auxiliary/scanner/ftp/ftp_version.rb b/modules/auxiliary/scanner/ftp/ftp_version.rb index 14e1933d73..92d03bf984 100644 --- a/modules/auxiliary/scanner/ftp/ftp_version.rb +++ b/modules/auxiliary/scanner/ftp/ftp_version.rb @@ -31,7 +31,7 @@ class MetasploitModule < Msf::Auxiliary if(banner) banner_sanitized = Rex::Text.to_hex_ascii(self.banner.to_s) - print_status("FTP Banner: '#{banner_sanitized}'") + print_good("FTP Banner: '#{banner_sanitized}'") report_service(:host => rhost, :port => rport, :name => "ftp", :info => banner_sanitized) end diff --git a/modules/auxiliary/scanner/h323/h323_version.rb b/modules/auxiliary/scanner/h323/h323_version.rb index fd2b94ad7a..b3e616f34f 100644 --- a/modules/auxiliary/scanner/h323/h323_version.rb +++ b/modules/auxiliary/scanner/h323/h323_version.rb @@ -134,7 +134,7 @@ class MetasploitModule < Msf::Auxiliary banner << "DisplayName: #{ remote_display }" end - print_status("#{rhost}:#{rport} #{banner}") + print_good("#{rhost}:#{rport} #{banner}") report_service(:host => rhost, :port => rport, :name => "h323", :info => banner) end diff --git a/modules/auxiliary/scanner/http/backup_file.rb b/modules/auxiliary/scanner/http/backup_file.rb index 4ba5872a3f..7970ff98ce 100644 --- a/modules/auxiliary/scanner/http/backup_file.rb +++ b/modules/auxiliary/scanner/http/backup_file.rb @@ -61,7 +61,7 @@ class MetasploitModule < Msf::Auxiliary }, 20) if (res and res.code >= 200 and res.code < 300) - print_status("Found #{wmap_base_url}#{file}") + print_good("Found #{wmap_base_url}#{file}") report_web_vuln( :host => ip, diff --git a/modules/auxiliary/scanner/http/brute_dirs.rb b/modules/auxiliary/scanner/http/brute_dirs.rb index 4617dab796..3dc2f41c4f 100644 --- a/modules/auxiliary/scanner/http/brute_dirs.rb +++ b/modules/auxiliary/scanner/http/brute_dirs.rb @@ -160,7 +160,7 @@ class MetasploitModule < Msf::Auxiliary if res.code.to_i == 400 and ecode != 400 print_error("Server returned an error code. #{wmap_base_url}#{teststr} #{res.code.to_i}") else - print_status("Found #{wmap_base_url}#{teststr} #{res.code.to_i}") + print_good("Found #{wmap_base_url}#{teststr} #{res.code.to_i}") report_web_vuln( :host => ip, diff --git a/modules/auxiliary/scanner/http/copy_of_file.rb b/modules/auxiliary/scanner/http/copy_of_file.rb index 1fd22afb5f..5cb2fb0e61 100644 --- a/modules/auxiliary/scanner/http/copy_of_file.rb +++ b/modules/auxiliary/scanner/http/copy_of_file.rb @@ -132,7 +132,7 @@ class MetasploitModule < Msf::Auxiliary if ecode != 400 and res.code.to_i == 400 print_error("[#{wmap_target_host}] Server returned a 400 error on #{wmap_base_url}#{filec} [#{res.code.to_i}]") else - print_status("[#{wmap_target_host}] Found #{wmap_base_url}#{filec} [#{res.code.to_i}]") + print_good("[#{wmap_target_host}] Found #{wmap_base_url}#{filec} [#{res.code.to_i}]") report_web_vuln( :host => ip, diff --git a/modules/auxiliary/scanner/http/dir_listing.rb b/modules/auxiliary/scanner/http/dir_listing.rb index aac31ec4bb..321e48dd0e 100644 --- a/modules/auxiliary/scanner/http/dir_listing.rb +++ b/modules/auxiliary/scanner/http/dir_listing.rb @@ -45,7 +45,7 @@ class MetasploitModule < Msf::Auxiliary if (res and res.code >= 200 and res.code < 300) if res.to_s.include? "Index of /" and res.to_s.include? "<h1>Index of /" - print_status("Found Directory Listing #{wmap_base_url}#{tpath}") + print_good("Found Directory Listing #{wmap_base_url}#{tpath}") report_web_vuln( :host => ip, @@ -66,7 +66,7 @@ class MetasploitModule < Msf::Auxiliary end if res.to_s.include? "[To Parent Directory]</A>" and res.to_s.include? "#{tpath}</H1><hr>" - print_status("Found Directory Listing #{wmap_base_url}#{tpath}") + print_good("Found Directory Listing #{wmap_base_url}#{tpath}") report_web_vuln( :host => ip, diff --git a/modules/auxiliary/scanner/http/dir_scanner.rb b/modules/auxiliary/scanner/http/dir_scanner.rb index 72b27424fd..3195d23fed 100644 --- a/modules/auxiliary/scanner/http/dir_scanner.rb +++ b/modules/auxiliary/scanner/http/dir_scanner.rb @@ -156,7 +156,7 @@ class MetasploitModule < Msf::Auxiliary :name => 'directory' ) - print_status("Found #{wmap_base_url}#{tpath}#{testfdir} #{res.code} (#{wmap_target_host})") + print_good("Found #{wmap_base_url}#{tpath}#{testfdir} #{res.code} (#{wmap_target_host})") if res.code.to_i == 401 print_status("#{wmap_base_url}#{tpath}#{testfdir} requires authentication: #{res.headers['WWW-Authenticate']}") diff --git a/modules/auxiliary/scanner/http/dir_webdav_unicode_bypass.rb b/modules/auxiliary/scanner/http/dir_webdav_unicode_bypass.rb index 1d3fee0860..5bbc8e805d 100644 --- a/modules/auxiliary/scanner/http/dir_webdav_unicode_bypass.rb +++ b/modules/auxiliary/scanner/http/dir_webdav_unicode_bypass.rb @@ -161,7 +161,7 @@ class MetasploitModule < Msf::Auxiliary }, 20) if (res and res.code.to_i == 207) - print_status("\tFound vulnerable WebDAV Unicode bypass target #{wmap_base_url}#{tpath}%c0%af#{testfdir} #{res.code} (#{wmap_target_host})") + print_good("\tFound vulnerable WebDAV Unicode bypass target #{wmap_base_url}#{tpath}%c0%af#{testfdir} #{res.code} (#{wmap_target_host})") # Unable to use report_web_vuln as method is PROPFIND and is not part of allowed # list in db.rb diff --git a/modules/auxiliary/scanner/http/file_same_name_dir.rb b/modules/auxiliary/scanner/http/file_same_name_dir.rb index e0ce51e87e..0751dab594 100644 --- a/modules/auxiliary/scanner/http/file_same_name_dir.rb +++ b/modules/auxiliary/scanner/http/file_same_name_dir.rb @@ -87,7 +87,7 @@ class MetasploitModule < Msf::Auxiliary }, 20) if (res and res.code >= 200 and res.code < 300) - print_status("Found #{wmap_base_url}#{tpath}#{testfext}") + print_good("Found #{wmap_base_url}#{tpath}#{testfext}") report_web_vuln( :host => ip, diff --git a/modules/auxiliary/scanner/http/files_dir.rb b/modules/auxiliary/scanner/http/files_dir.rb index 12b81c4fef..ce49f2bea9 100644 --- a/modules/auxiliary/scanner/http/files_dir.rb +++ b/modules/auxiliary/scanner/http/files_dir.rb @@ -161,7 +161,7 @@ class MetasploitModule < Msf::Auxiliary if res.code.to_i == 400 and ecode != 400 print_error("Server returned an error code. #{wmap_base_url}#{tpath}#{testfext} #{res.code.to_i}") else - print_status("Found #{wmap_base_url}#{tpath}#{testfext} #{res.code.to_i}") + print_good("Found #{wmap_base_url}#{tpath}#{testfext} #{res.code.to_i}") report_web_vuln( :host => ip, diff --git a/modules/auxiliary/scanner/http/frontpage_login.rb b/modules/auxiliary/scanner/http/frontpage_login.rb index 1950f51889..6b8ed007a8 100644 --- a/modules/auxiliary/scanner/http/frontpage_login.rb +++ b/modules/auxiliary/scanner/http/frontpage_login.rb @@ -117,7 +117,7 @@ class MetasploitModule < Msf::Auxiliary case retcode when /^200/ - print_status("#{info} FrontPage ACCESS ALLOWED [#{retcode}]") + print_good("#{info} FrontPage ACCESS ALLOWED [#{retcode}]") # Report a note or vulnerability or something # Not really this one, but close report_vuln( diff --git a/modules/auxiliary/scanner/http/hp_sys_mgmt_login.rb b/modules/auxiliary/scanner/http/hp_sys_mgmt_login.rb index c324d06777..7284307e2d 100644 --- a/modules/auxiliary/scanner/http/hp_sys_mgmt_login.rb +++ b/modules/auxiliary/scanner/http/hp_sys_mgmt_login.rb @@ -182,7 +182,7 @@ class MetasploitModule < Msf::Auxiliary sys_name = get_system_name(res) unless sys_name.blank? - print_status("System name detected: #{sys_name}") + print_good("System name detected: #{sys_name}") report_note( :host => ip, :type => "system.name", diff --git a/modules/auxiliary/scanner/http/http_header.rb b/modules/auxiliary/scanner/http/http_header.rb index d3c83b1fb4..732cc50733 100644 --- a/modules/auxiliary/scanner/http/http_header.rb +++ b/modules/auxiliary/scanner/http/http_header.rb @@ -72,7 +72,7 @@ class MetasploitModule < Msf::Auxiliary counter = 0; headers_uppercase.each do |h| header_string = "#{h[0]}: #{h[1]}" - print_status "#{peer}: #{header_string}" + print_good "#{peer}: #{header_string}" report_note( :type => "http.header.#{rport}.#{counter}", diff --git a/modules/auxiliary/scanner/http/http_version.rb b/modules/auxiliary/scanner/http/http_version.rb index 5f095adfac..0929c752ea 100644 --- a/modules/auxiliary/scanner/http/http_version.rb +++ b/modules/auxiliary/scanner/http/http_version.rb @@ -33,7 +33,7 @@ class MetasploitModule < Msf::Auxiliary connect res = send_request_raw({ 'uri' => '/', 'method' => 'GET' }) fp = http_fingerprint(:response => res) - print_status("#{ip}:#{rport} #{fp}") if fp + print_good("#{ip}:#{rport} #{fp}") if fp report_service(:host => rhost, :port => rport, :sname => (ssl ? 'https' : 'http'), :info => fp) rescue ::Timeout::Error, ::Errno::EPIPE ensure diff --git a/modules/auxiliary/scanner/http/jenkins_enum.rb b/modules/auxiliary/scanner/http/jenkins_enum.rb index fb3aa20483..5a6536c2e6 100644 --- a/modules/auxiliary/scanner/http/jenkins_enum.rb +++ b/modules/auxiliary/scanner/http/jenkins_enum.rb @@ -52,7 +52,7 @@ class MetasploitModule < Msf::Auxiliary end version = res.headers['X-Jenkins'] - print_status("Jenkins Version - #{version}") + print_good("Jenkins Version - #{version}") report_service( :host => rhost, :port => rport, diff --git a/modules/auxiliary/scanner/http/joomla_version.rb b/modules/auxiliary/scanner/http/joomla_version.rb index 9edc2f9a31..e33ba97fb5 100644 --- a/modules/auxiliary/scanner/http/joomla_version.rb +++ b/modules/auxiliary/scanner/http/joomla_version.rb @@ -54,7 +54,7 @@ class MetasploitModule < Msf::Auxiliary end if version - print_status("Joomla version: #{version}") + print_good("Joomla version: #{version}") report_note( host: ip, port: datastore['RPORT'], diff --git a/modules/auxiliary/scanner/http/manageengine_deviceexpert_user_creds.rb b/modules/auxiliary/scanner/http/manageengine_deviceexpert_user_creds.rb index f0a8c3c8ad..19be1ffd24 100644 --- a/modules/auxiliary/scanner/http/manageengine_deviceexpert_user_creds.rb +++ b/modules/auxiliary/scanner/http/manageengine_deviceexpert_user_creds.rb @@ -120,7 +120,7 @@ class MetasploitModule < Msf::Auxiliary cred_table << [user, pass, hash, role, mail, salt] if pass - print_status("Found weak credentials (#{user}:#{pass})") + print_good("Found weak credentials (#{user}:#{pass})") credential_data = { origin_type: :service, module_fullname: self.fullname, diff --git a/modules/auxiliary/scanner/http/ms09_020_webdav_unicode_bypass.rb b/modules/auxiliary/scanner/http/ms09_020_webdav_unicode_bypass.rb index d0c3fdd7e3..01e6426caf 100644 --- a/modules/auxiliary/scanner/http/ms09_020_webdav_unicode_bypass.rb +++ b/modules/auxiliary/scanner/http/ms09_020_webdav_unicode_bypass.rb @@ -90,7 +90,7 @@ class MetasploitModule < Msf::Auxiliary }, 20) if (res.code.to_i == 207) - print_status("#{rhost}:#{rport} \tFound vulnerable WebDAV Unicode bypass. #{wmap_base_url}#{tpath}#{bogus}/ #{res.code} (#{wmap_target_host})") + print_good("#{rhost}:#{rport} \tFound vulnerable WebDAV Unicode bypass. #{wmap_base_url}#{tpath}#{bogus}/ #{res.code} (#{wmap_target_host})") report_vuln( diff --git a/modules/auxiliary/scanner/http/options.rb b/modules/auxiliary/scanner/http/options.rb index 36226a2d4a..1ad70c4a01 100644 --- a/modules/auxiliary/scanner/http/options.rb +++ b/modules/auxiliary/scanner/http/options.rb @@ -40,7 +40,7 @@ class MetasploitModule < Msf::Auxiliary }, 10) if (res and res.headers['Allow']) - print_status("#{target_host} allows #{res.headers['Allow']} methods") + print_good("#{target_host} allows #{res.headers['Allow']} methods") report_note( :host => target_host, @@ -52,7 +52,7 @@ class MetasploitModule < Msf::Auxiliary ) if(res.headers['Allow'].index('TRACE')) - print_status "#{target_host}:#{rport} - TRACE method allowed." + print_good "#{target_host}:#{rport} - TRACE method allowed." report_vuln( :host => target_host, :port => rport, diff --git a/modules/auxiliary/scanner/http/prev_dir_same_name_file.rb b/modules/auxiliary/scanner/http/prev_dir_same_name_file.rb index b140664457..a02cb76743 100644 --- a/modules/auxiliary/scanner/http/prev_dir_same_name_file.rb +++ b/modules/auxiliary/scanner/http/prev_dir_same_name_file.rb @@ -83,7 +83,7 @@ class MetasploitModule < Msf::Auxiliary }, 20) if (res and res.code >= 200 and res.code < 300) - print_status("Found #{wmap_base_url}#{testf}") + print_good("Found #{wmap_base_url}#{testf}") report_web_vuln( :host => ip, diff --git a/modules/auxiliary/scanner/http/replace_ext.rb b/modules/auxiliary/scanner/http/replace_ext.rb index 634a58f24d..a5da2e33b5 100644 --- a/modules/auxiliary/scanner/http/replace_ext.rb +++ b/modules/auxiliary/scanner/http/replace_ext.rb @@ -150,7 +150,7 @@ class MetasploitModule < Msf::Auxiliary if res.code.to_i == 400 and ecode != 400 print_error("Server returned an error code. #{wmap_base_url}#{tpath} #{res.code.to_i}") else - print_status("Found #{wmap_base_url}#{tpath}") + print_good("Found #{wmap_base_url}#{tpath}") report_web_vuln( :host => ip, diff --git a/modules/auxiliary/scanner/http/scraper.rb b/modules/auxiliary/scanner/http/scraper.rb index 67da134ee7..c1dc75e394 100644 --- a/modules/auxiliary/scanner/http/scraper.rb +++ b/modules/auxiliary/scanner/http/scraper.rb @@ -56,7 +56,7 @@ class MetasploitModule < Msf::Auxiliary result = res.body.scan(datastore['PATTERN']).flatten.map{ |s| s.strip }.uniq result.each do |u| - print_status("[#{target_host}] #{tpath} [#{u}]") + print_good("[#{target_host}] #{tpath} [#{u}]") report_note( :host => target_host, diff --git a/modules/auxiliary/scanner/http/soap_xml.rb b/modules/auxiliary/scanner/http/soap_xml.rb index 9495fdd629..89d4e5edcf 100644 --- a/modules/auxiliary/scanner/http/soap_xml.rb +++ b/modules/auxiliary/scanner/http/soap_xml.rb @@ -172,7 +172,7 @@ class MetasploitModule < Msf::Auxiliary print_status("Server #{wmap_target_host}:#{datastore['RPORT']} returned HTTP 404 for #{datastore['PATH']}. Use a different one.") return false else - print_status("Server #{wmap_target_host}:#{datastore['RPORT']} responded to SOAPAction: #{v}#{n} with HTTP: #{res.code} #{res.message}.") + print_good("Server #{wmap_target_host}:#{datastore['RPORT']} responded to SOAPAction: #{v}#{n} with HTTP: #{res.code} #{res.message}.") # Add Report report_note( host: ip, diff --git a/modules/auxiliary/scanner/http/trace_axd.rb b/modules/auxiliary/scanner/http/trace_axd.rb index 3ae32c9a5b..8136ac3eaf 100644 --- a/modules/auxiliary/scanner/http/trace_axd.rb +++ b/modules/auxiliary/scanner/http/trace_axd.rb @@ -49,7 +49,7 @@ class MetasploitModule < Msf::Auxiliary if res and res.body.include?("<td><h1>Application Trace</h1></td>") - print_status("[#{target_host}] #{tpath}trace.axd FOUND.") + print_good("[#{target_host}] #{tpath}trace.axd FOUND.") report_note( :host => target_host, diff --git a/modules/auxiliary/scanner/http/vhost_scanner.rb b/modules/auxiliary/scanner/http/vhost_scanner.rb index 174a8c4052..759acac8c5 100644 --- a/modules/auxiliary/scanner/http/vhost_scanner.rb +++ b/modules/auxiliary/scanner/http/vhost_scanner.rb @@ -118,7 +118,7 @@ require 'cgi' if res and noexistsres if res.body != noexistsres.body - print_status("[#{ip}] Vhost found #{thost} ") + print_good("[#{ip}] Vhost found #{thost} ") report_note( :host => ip, diff --git a/modules/auxiliary/scanner/http/web_vulndb.rb b/modules/auxiliary/scanner/http/web_vulndb.rb index ce7e3f1503..76d62c71ea 100644 --- a/modules/auxiliary/scanner/http/web_vulndb.rb +++ b/modules/auxiliary/scanner/http/web_vulndb.rb @@ -146,7 +146,7 @@ class MetasploitModule < Msf::Auxiliary if res.code.to_i == 400 and ecode != 400 print_error("Server returned an error code. #{wmap_base_url}#{tpath}#{testfvuln} #{res.code.to_i}") else - print_status("FOUND #{wmap_base_url}#{tpath}#{testfvuln} [#{res.code.to_i}] #{testnote}") + print_good("FOUND #{wmap_base_url}#{tpath}#{testfvuln} [#{res.code.to_i}] #{testnote}") report_note( :host => ip, @@ -160,7 +160,7 @@ class MetasploitModule < Msf::Auxiliary end else if res and res.body.include?(testmesg) - print_status("FOUND #{wmap_base_url}#{tpath}#{testfvuln} [#{res.code.to_i}] #{testnote}") + print_good("FOUND #{wmap_base_url}#{tpath}#{testfvuln} [#{res.code.to_i}] #{testnote}") report_note( :host => ip, diff --git a/modules/auxiliary/scanner/http/webdav_internal_ip.rb b/modules/auxiliary/scanner/http/webdav_internal_ip.rb index 2e50d0a2eb..2df4bf7d30 100644 --- a/modules/auxiliary/scanner/http/webdav_internal_ip.rb +++ b/modules/auxiliary/scanner/http/webdav_internal_ip.rb @@ -51,7 +51,7 @@ class MetasploitModule < Msf::Auxiliary result.each do |addr| - print_status("Found internal IP in WebDAV response (#{target_host}) #{addr}") + print_good("Found internal IP in WebDAV response (#{target_host}) #{addr}") report_note( :host => target_host, diff --git a/modules/auxiliary/scanner/http/webdav_website_content.rb b/modules/auxiliary/scanner/http/webdav_website_content.rb index ca58030772..e7834af17c 100644 --- a/modules/auxiliary/scanner/http/webdav_website_content.rb +++ b/modules/auxiliary/scanner/http/webdav_website_content.rb @@ -50,7 +50,7 @@ class MetasploitModule < Msf::Auxiliary result = res.body.scan(urlregex).uniq result.each do |u| - print_status("Found file or directory in WebDAV response (#{target_host}) #{u}") + print_good("Found file or directory in WebDAV response (#{target_host}) #{u}") report_note( :host => target_host, diff --git a/modules/auxiliary/scanner/http/wordpress_multicall_creds.rb b/modules/auxiliary/scanner/http/wordpress_multicall_creds.rb index b966029946..7a53c9299a 100644 --- a/modules/auxiliary/scanner/http/wordpress_multicall_creds.rb +++ b/modules/auxiliary/scanner/http/wordpress_multicall_creds.rb @@ -69,7 +69,7 @@ class MetasploitModule < Msf::Auxiliary def check_setup version = wordpress_version - vprint_status("Found Wordpress version: #{version}") + vprint_good("Found Wordpress version: #{version}") if !wordpress_and_online? print_error("#{peer}:#{rport}#{target_uri} does not appear to be running Wordpress or you got blocked! (Do Manual Check)") diff --git a/modules/auxiliary/scanner/http/wordpress_scanner.rb b/modules/auxiliary/scanner/http/wordpress_scanner.rb index f59686c7d0..c72a696aad 100644 --- a/modules/auxiliary/scanner/http/wordpress_scanner.rb +++ b/modules/auxiliary/scanner/http/wordpress_scanner.rb @@ -18,7 +18,7 @@ class MetasploitModule < Msf::Auxiliary end def run_host(target_host) - print_status("Trying ip #{target_host}") + print_status("Trying #{target_host}") if wordpress_and_online? version = wordpress_version version_string = version ? version : '(no version detected)' diff --git a/modules/auxiliary/scanner/imap/imap_version.rb b/modules/auxiliary/scanner/imap/imap_version.rb index 2ef9865c24..116ef72ebb 100644 --- a/modules/auxiliary/scanner/imap/imap_version.rb +++ b/modules/auxiliary/scanner/imap/imap_version.rb @@ -22,7 +22,7 @@ class MetasploitModule < Msf::Auxiliary begin connect banner_sanitized = Rex::Text.to_hex_ascii(banner.to_s) - print_status("#{ip}:#{rport} IMAP #{banner_sanitized}") + print_good("#{ip}:#{rport} IMAP #{banner_sanitized}") report_service(:host => rhost, :port => rport, :name => "imap", :info => banner) rescue ::Rex::ConnectionError rescue ::EOFError diff --git a/modules/auxiliary/scanner/jenkins/jenkins_udp_broadcast_enum.rb b/modules/auxiliary/scanner/jenkins/jenkins_udp_broadcast_enum.rb index 1348f03eff..f2bd11cac0 100644 --- a/modules/auxiliary/scanner/jenkins/jenkins_udp_broadcast_enum.rb +++ b/modules/auxiliary/scanner/jenkins/jenkins_udp_broadcast_enum.rb @@ -49,7 +49,7 @@ class MetasploitModule < Msf::Auxiliary # if a version was identified, then out and store to DB if ver - print_status("#{pkt[1]} - Found Jenkins Server #{ver} Version") + print_good("#{pkt[1]} - Found Jenkins Server #{ver} Version") report_host( host: pkt[1], info: "Jenkins v.#{ver} (port typically 8080)" diff --git a/modules/auxiliary/scanner/lotus/lotus_domino_version.rb b/modules/auxiliary/scanner/lotus/lotus_domino_version.rb index 4b9e235a9a..061e852811 100644 --- a/modules/auxiliary/scanner/lotus/lotus_domino_version.rb +++ b/modules/auxiliary/scanner/lotus/lotus_domino_version.rb @@ -91,7 +91,7 @@ class MetasploitModule < Msf::Auxiliary if currentversion.length == 0 then '' else - print_status("#{ip}:#{rport} Lotus Domino Current Version: #{currentversion}") + print_good("#{ip}:#{rport} Lotus Domino Current Version: #{currentversion}") end check2.each do | check | @@ -107,7 +107,7 @@ class MetasploitModule < Msf::Auxiliary # string we are regexing: <title>IBM Lotus Notes/Domino 6.5.6 Release Notes if match = res.body.match(/\(.*)Lotus Notes\/Domino (.*) Release Notes\<\/title\>/); server2 = $2 - print_status("#{ip}:#{rport} Lotus Domino Release Notes Version: " + $2) + print_good("#{ip}:#{rport} Lotus Domino Release Notes Version: " + $2) report_note( :host => ip, :proto => 'tcp', @@ -175,7 +175,7 @@ class MetasploitModule < Msf::Auxiliary if baseversion.length == 0 then '' else - print_status("#{ip}:#{rport} Lotus Domino Base Install Version: #{baseversion}") + print_good("#{ip}:#{rport} Lotus Domino Base Install Version: #{baseversion}") end end rescue ::Rex::ConnectionRefused, ::Rex::HostUnreachable, ::Rex::ConnectionTimeout diff --git a/modules/auxiliary/scanner/misc/cctv_dvr_login.rb b/modules/auxiliary/scanner/misc/cctv_dvr_login.rb index e5ba5fb864..49eaeae9d5 100644 --- a/modules/auxiliary/scanner/misc/cctv_dvr_login.rb +++ b/modules/auxiliary/scanner/misc/cctv_dvr_login.rb @@ -107,7 +107,7 @@ class MetasploitModule < Msf::Auxiliary end uri = "http://#{rhost}:#{datastore['HTTP_PORT']}" - print_status("Confirmed IE ActiveX HTTP interface (#{v}): #{uri}") + print_good("Confirmed IE ActiveX HTTP interface (#{v}): #{uri}") report_service( :host => rhost, diff --git a/modules/auxiliary/scanner/misc/java_rmi_server.rb b/modules/auxiliary/scanner/misc/java_rmi_server.rb index 883f03732f..1712e54f97 100644 --- a/modules/auxiliary/scanner/misc/java_rmi_server.rb +++ b/modules/auxiliary/scanner/misc/java_rmi_server.rb @@ -80,7 +80,7 @@ class MetasploitModule < Msf::Auxiliary return_value = recv_return if return_value.nil? - print_error("Failed to send RMI Call, anyway JAVA RMI Endpoint detected") + print_good("Failed to send RMI Call, anyway JAVA RMI Endpoint detected") report_service(:host => rhost, :port => rport, :name => "java-rmi", :info => "") return end diff --git a/modules/auxiliary/scanner/misc/rosewill_rxs3211_passwords.rb b/modules/auxiliary/scanner/misc/rosewill_rxs3211_passwords.rb index dc7fa8dad4..ee6d08c629 100644 --- a/modules/auxiliary/scanner/misc/rosewill_rxs3211_passwords.rb +++ b/modules/auxiliary/scanner/misc/rosewill_rxs3211_passwords.rb @@ -71,7 +71,7 @@ class MetasploitModule < Msf::Auxiliary #Store the password if the parser returns something if password - print_status("Password retrieved: #{password.to_s}") + print_good("Password retrieved: #{password.to_s}") report_cred( ip: rhost, port: rport, diff --git a/modules/auxiliary/scanner/mysql/mysql_version.rb b/modules/auxiliary/scanner/mysql/mysql_version.rb index baf18433be..9b6d43b856 100644 --- a/modules/auxiliary/scanner/mysql/mysql_version.rb +++ b/modules/auxiliary/scanner/mysql/mysql_version.rb @@ -68,7 +68,7 @@ class MetasploitModule < Msf::Auxiliary else offset += 1 version = data[offset..-1].unpack('Z*')[0] - print_status("#{rhost}:#{rport} is running MySQL #{version} (protocol #{proto})") + print_good("#{rhost}:#{rport} is running MySQL #{version} (protocol #{proto})") report_service( :host => rhost, :port => rport, diff --git a/modules/auxiliary/scanner/netbios/nbname.rb b/modules/auxiliary/scanner/netbios/nbname.rb index 0d8991c280..7e8cb38877 100644 --- a/modules/auxiliary/scanner/netbios/nbname.rb +++ b/modules/auxiliary/scanner/netbios/nbname.rb @@ -126,7 +126,7 @@ class MetasploitModule < Msf::Auxiliary end end - print_status("#{ip} [#{host[:name]}] OS:#{os}#{user}#{names} #{addrs} Mac:#{host[:mac]} #{extra}") + print_good("#{ip} [#{host[:name]}] OS:#{os}#{user}#{names} #{addrs} Mac:#{host[:mac]} #{extra}") end end diff --git a/modules/auxiliary/scanner/oracle/oracle_login.rb b/modules/auxiliary/scanner/oracle/oracle_login.rb index c39f800de9..30c689f97b 100644 --- a/modules/auxiliary/scanner/oracle/oracle_login.rb +++ b/modules/auxiliary/scanner/oracle/oracle_login.rb @@ -195,7 +195,7 @@ class MetasploitModule < Msf::Auxiliary @oracle_reported = true end user = extract_creds(oline)[0] - print_status "#{msg} Locked: #{user} (SID: #{sid}) -- account valid but locked" + print_good "#{msg} Locked: #{user} (SID: #{sid}) -- account valid but locked" report_cred( ip: addr, port: port, diff --git a/modules/auxiliary/scanner/pop3/pop3_version.rb b/modules/auxiliary/scanner/pop3/pop3_version.rb index 00d054b1c8..f8c5f633cc 100644 --- a/modules/auxiliary/scanner/pop3/pop3_version.rb +++ b/modules/auxiliary/scanner/pop3/pop3_version.rb @@ -26,7 +26,7 @@ class MetasploitModule < Msf::Auxiliary connect banner = sock.get_once(-1, 30) banner_sanitized = Rex::Text.to_hex_ascii(banner.to_s) - print_status("#{ip}:#{rport} POP3 #{banner_sanitized}") + print_good("#{ip}:#{rport} POP3 #{banner_sanitized}") report_service(:host => rhost, :port => rport, :name => "pop3", :info => banner) rescue ::Rex::ConnectionError rescue ::EOFError diff --git a/modules/auxiliary/scanner/portscan/ftpbounce.rb b/modules/auxiliary/scanner/portscan/ftpbounce.rb index b6412714db..6894e79b33 100644 --- a/modules/auxiliary/scanner/portscan/ftpbounce.rb +++ b/modules/auxiliary/scanner/portscan/ftpbounce.rb @@ -90,7 +90,7 @@ class MetasploitModule < Msf::Auxiliary resp = send_cmd(["LIST"]) if resp =~ /^[12]/ - print_status(" TCP OPEN #{ip}:#{port}") + print_good(" TCP OPEN #{ip}:#{port}") report_service(:host => ip, :port => port) end rescue ::Exception diff --git a/modules/auxiliary/scanner/portscan/syn.rb b/modules/auxiliary/scanner/portscan/syn.rb index 435e9c1bb2..8587ab1b67 100644 --- a/modules/auxiliary/scanner/portscan/syn.rb +++ b/modules/auxiliary/scanner/portscan/syn.rb @@ -86,7 +86,7 @@ class MetasploitModule < Msf::Auxiliary next if not reply if (reply.is_tcp? and reply.tcp_flags.syn == 1 and reply.tcp_flags.ack == 1) - print_status(" TCP OPEN #{dhost}:#{dport}") + print_good(" TCP OPEN #{dhost}:#{dport}") report_service(:host => dhost, :port => dport) end rescue ::Exception diff --git a/modules/auxiliary/scanner/postgres/postgres_version.rb b/modules/auxiliary/scanner/postgres/postgres_version.rb index 92ac561ab0..6bd92b018b 100644 --- a/modules/auxiliary/scanner/postgres/postgres_version.rb +++ b/modules/auxiliary/scanner/postgres/postgres_version.rb @@ -88,7 +88,7 @@ class MetasploitModule < Msf::Auxiliary vprint_good "#{rhost}:#{rport} Postgres - Logged in to '#{database}' with '#{user}':'#{password}'" print_status "#{rhost}:#{rport} Postgres - Version #{result[:auth]} (Post-Auth)" elsif result[:preauth] - print_status "#{rhost}:#{rport} Postgres - Version #{result[:preauth]} (Pre-Auth)" + print_good "#{rhost}:#{rport} Postgres - Version #{result[:preauth]} (Pre-Auth)" else # It's something we don't know yet vprint_status "#{rhost}:#{rport} Postgres - Authentication Error Fingerprint: #{result[:unknown]}" print_status "#{rhost}:#{rport} Postgres - Version Unknown (Pre-Auth)" diff --git a/modules/auxiliary/scanner/scada/digi_addp_version.rb b/modules/auxiliary/scanner/scada/digi_addp_version.rb index 77f0671d0c..22a669841b 100644 --- a/modules/auxiliary/scanner/scada/digi_addp_version.rb +++ b/modules/auxiliary/scanner/scada/digi_addp_version.rb @@ -48,7 +48,7 @@ class MetasploitModule < Msf::Auxiliary res[:banner] = Rex::Proto::ADDP.reply_to_string( res ) unless @results[shost] - print_status("#{shost}:#{datastore['RPORT']} ADDP #{res[:banner]}") + print_good("#{shost}:#{datastore['RPORT']} ADDP #{res[:banner]}") report_service( :host => shost, :mac => res[:mac], diff --git a/modules/auxiliary/scanner/scada/digi_realport_serialport_scan.rb b/modules/auxiliary/scanner/scada/digi_realport_serialport_scan.rb index 28da351499..03ebd96614 100644 --- a/modules/auxiliary/scanner/scada/digi_realport_serialport_scan.rb +++ b/modules/auxiliary/scanner/scada/digi_realport_serialport_scan.rb @@ -50,7 +50,7 @@ class MetasploitModule < Msf::Auxiliary return unless realport_connect info = "#{@realport_name} ( ports: #{@realport_port_count} )" - vprint_status("#{target_host}:#{rport} is running #{info}") + vprint_good("#{target_host}:#{rport} is running #{info}") report_service(:host => rhost, :port => rport, :name => "realport", :info => info) 1.upto(@realport_port_count) do |pnum| diff --git a/modules/auxiliary/scanner/scada/digi_realport_version.rb b/modules/auxiliary/scanner/scada/digi_realport_version.rb index e2c9c14373..30b5897f30 100644 --- a/modules/auxiliary/scanner/scada/digi_realport_version.rb +++ b/modules/auxiliary/scanner/scada/digi_realport_version.rb @@ -29,7 +29,7 @@ class MetasploitModule < Msf::Auxiliary def run_host(target_host) if realport_connect info = "#{@realport_name} ( ports: #{@realport_port_count} )" - print_status("#{target_host}:#{rport} #{info}") + print_good("#{target_host}:#{rport} #{info}") report_service(:host => rhost, :port => rport, :name => "realport", :info => info) end realport_disconnect diff --git a/modules/auxiliary/scanner/sip/enumerator.rb b/modules/auxiliary/scanner/sip/enumerator.rb index 290db0d7fb..fbe00125f3 100644 --- a/modules/auxiliary/scanner/sip/enumerator.rb +++ b/modules/auxiliary/scanner/sip/enumerator.rb @@ -130,7 +130,7 @@ class MetasploitModule < Msf::Auxiliary case resp.to_i when 401 - print_status("Found user: #{testn} [Auth]") + print_good("Found user: #{testn} [Auth]") # Add Report report_note( :host => rhost, @@ -141,7 +141,7 @@ class MetasploitModule < Msf::Auxiliary :data => "Found user: #{testn} [Auth]" ) when 200 - print_status("Found user: #{testn} [Open]") + print_good("Found user: #{testn} [Open]") #Add Report report_note( :host => rhost, diff --git a/modules/auxiliary/scanner/sip/enumerator_tcp.rb b/modules/auxiliary/scanner/sip/enumerator_tcp.rb index 0552708f4f..7b7b25f49f 100644 --- a/modules/auxiliary/scanner/sip/enumerator_tcp.rb +++ b/modules/auxiliary/scanner/sip/enumerator_tcp.rb @@ -84,7 +84,7 @@ class MetasploitModule < Msf::Auxiliary case resp when /^401/ - print_status("Found user: #{testn} [Auth]") + print_good("Found user: #{testn} [Auth]") # Add Report report_note( :host => rhost, @@ -94,7 +94,7 @@ class MetasploitModule < Msf::Auxiliary :data => "Found user: #{testn} [Auth]" ) when /^200/ - print_status("Found user: #{testn} [Open]") + print_good("Found user: #{testn} [Open]") # Add Report report_note( :host => rhost, diff --git a/modules/auxiliary/scanner/smb/smb2.rb b/modules/auxiliary/scanner/smb/smb2.rb index 6e48952e73..52d624eef6 100644 --- a/modules/auxiliary/scanner/smb/smb2.rb +++ b/modules/auxiliary/scanner/smb/smb2.rb @@ -57,7 +57,7 @@ class MetasploitModule < Msf::Auxiliary ctime = Rex::Proto::SMB::Utils.time_smb_to_unix(*(res[108,8].unpack("VV").reverse)) btime = Rex::Proto::SMB::Utils.time_smb_to_unix(*(res[116,8].unpack("VV").reverse)) utime = ctime - btime - print_status("#{ip} supports SMB 2 [dialect #{vers}] and has been online for #{utime/3600} hours") + print_good("#{ip} supports SMB 2 [dialect #{vers}] and has been online for #{utime/3600} hours") # Add Report report_note( :host => ip, @@ -68,7 +68,7 @@ class MetasploitModule < Msf::Auxiliary :data => "supports SMB 2 [dialect #{vers}] and has been online for #{utime/3600} hours" ) else - print_status("#{ip} supports SMB 2.0") + print_good("#{ip} supports SMB 2.0") # Add Report report_note( :host => ip, diff --git a/modules/auxiliary/scanner/smb/smb_version.rb b/modules/auxiliary/scanner/smb/smb_version.rb index 6ae437fe3c..829a33c842 100644 --- a/modules/auxiliary/scanner/smb/smb_version.rb +++ b/modules/auxiliary/scanner/smb/smb_version.rb @@ -128,7 +128,7 @@ class MetasploitModule < Msf::Auxiliary match_conf['host.domain'] = conf[:SMBDomain] end - print_status("Host is running #{desc}") + print_good("Host is running #{desc}") # Report the service with a friendly banner report_service( diff --git a/modules/auxiliary/scanner/smtp/smtp_relay.rb b/modules/auxiliary/scanner/smtp/smtp_relay.rb index fbb78fe329..16a1838362 100644 --- a/modules/auxiliary/scanner/smtp/smtp_relay.rb +++ b/modules/auxiliary/scanner/smtp/smtp_relay.rb @@ -40,7 +40,7 @@ class MetasploitModule < Msf::Auxiliary begin connect banner_sanitized = Rex::Text.to_hex_ascii(banner.to_s) - print_status("SMTP #{banner_sanitized}") + print_good("SMTP #{banner_sanitized}") report_service(:host => rhost, :port => rport, :name => "smtp", :info => banner) if datastore['EXTENDED'] diff --git a/modules/auxiliary/scanner/smtp/smtp_version.rb b/modules/auxiliary/scanner/smtp/smtp_version.rb index 381559ce0c..a439285dc5 100644 --- a/modules/auxiliary/scanner/smtp/smtp_version.rb +++ b/modules/auxiliary/scanner/smtp/smtp_version.rb @@ -26,7 +26,7 @@ class MetasploitModule < Msf::Auxiliary def run_host(ip) res = connect banner_sanitized = Rex::Text.to_hex_ascii(banner.to_s) - print_status("#{ip}:#{rport} SMTP #{banner_sanitized}") + print_good("#{ip}:#{rport} SMTP #{banner_sanitized}") report_service(:host => rhost, :port => rport, :name => "smtp", :info => banner) end diff --git a/modules/auxiliary/scanner/ssh/cerberus_sftp_enumusers.rb b/modules/auxiliary/scanner/ssh/cerberus_sftp_enumusers.rb index cd127bff23..98b2262615 100644 --- a/modules/auxiliary/scanner/ssh/cerberus_sftp_enumusers.rb +++ b/modules/auxiliary/scanner/ssh/cerberus_sftp_enumusers.rb @@ -84,7 +84,7 @@ class MetasploitModule < Msf::Auxiliary auth = Net::SSH::Authentication::Session.new(transport, opt_hash) auth.authenticate("ssh-connection", Rex::Text.rand_text_alphanumeric(8), Rex::Text.rand_text_alphanumeric(8)) auth_method = auth.allowed_auth_methods.join('|') - print_status "#{peer(ip)} Server Version: #{auth.transport.server_version.version}" + print_good "#{peer(ip)} Server Version: #{auth.transport.server_version.version}" report_service( host: ip, port: rport, diff --git a/modules/auxiliary/scanner/ssh/ssh_version.rb b/modules/auxiliary/scanner/ssh/ssh_version.rb index 32c211e531..bbc7461119 100644 --- a/modules/auxiliary/scanner/ssh/ssh_version.rb +++ b/modules/auxiliary/scanner/ssh/ssh_version.rb @@ -84,7 +84,7 @@ class MetasploitModule < Msf::Auxiliary end end - print_status("SSH server version: #{ident}#{info}") + print_good("SSH server version: #{ident}#{info}") report_service(host: rhost, port: rport, name: 'ssh', proto: 'tcp', info: ident) end rescue Timeout::Error diff --git a/modules/auxiliary/scanner/telnet/lantronix_telnet_version.rb b/modules/auxiliary/scanner/telnet/lantronix_telnet_version.rb index 2047041f4d..75412325f3 100644 --- a/modules/auxiliary/scanner/telnet/lantronix_telnet_version.rb +++ b/modules/auxiliary/scanner/telnet/lantronix_telnet_version.rb @@ -35,7 +35,7 @@ class MetasploitModule < Msf::Auxiliary ::Timeout.timeout(to) do res = connect if banner.start_with? "MAC address" - print_status("#{ip}:#{rport} TELNET: #{banner}") + print_good("#{ip}:#{rport} TELNET: #{banner}") version = banner.match(/Software version [\w\.]+ \(\d+\) \w*$/)[0] report_service(:host => rhost, :port => rport, :name => "telnet", :info => "Lantronix Version: #{version}" ) end diff --git a/modules/auxiliary/scanner/telnet/telnet_version.rb b/modules/auxiliary/scanner/telnet/telnet_version.rb index 53a3dfbc12..95fd09fd1a 100644 --- a/modules/auxiliary/scanner/telnet/telnet_version.rb +++ b/modules/auxiliary/scanner/telnet/telnet_version.rb @@ -34,7 +34,7 @@ class MetasploitModule < Msf::Auxiliary res = connect # This makes db_services look a lot nicer. banner_santized = Rex::Text.to_hex_ascii(banner.to_s) - print_status("#{ip}:#{rport} TELNET #{banner_santized}") + print_good("#{ip}:#{rport} TELNET #{banner_santized}") report_service(:host => rhost, :port => rport, :name => "telnet", :info => banner_santized) end rescue ::Rex::ConnectionError, ::Errno::ECONNRESET => e diff --git a/modules/auxiliary/scanner/tftp/tftpbrute.rb b/modules/auxiliary/scanner/tftp/tftpbrute.rb index c3c0e681b9..a15c458daa 100644 --- a/modules/auxiliary/scanner/tftp/tftpbrute.rb +++ b/modules/auxiliary/scanner/tftp/tftpbrute.rb @@ -50,7 +50,7 @@ class MetasploitModule < Msf::Auxiliary udp_sock.sendto(pkt, ip, datastore['RPORT']) resp = udp_sock.get(3) if resp and resp.length >= 2 and resp[0, 2] == "\x00\x03" - print_status("Found #{filename} on #{ip}") + print_good("Found #{filename} on #{ip}") #Add Report report_note( :host => ip, diff --git a/modules/auxiliary/scanner/vmware/vmauthd_version.rb b/modules/auxiliary/scanner/vmware/vmauthd_version.rb index abf0cd7665..e2d11728d8 100644 --- a/modules/auxiliary/scanner/vmware/vmauthd_version.rb +++ b/modules/auxiliary/scanner/vmware/vmauthd_version.rb @@ -63,7 +63,7 @@ class MetasploitModule < Msf::Auxiliary banner << " Certificate:#{cert.subject.to_s}" end - print_status "#{rhost}:#{rport} Banner: #{banner}" + print_good "#{rhost}:#{rport} Banner: #{banner}" report_service( :host => rhost, diff --git a/modules/auxiliary/scanner/vmware/vmware_server_dir_trav.rb b/modules/auxiliary/scanner/vmware/vmware_server_dir_trav.rb index 61f7f55fc1..22fd3ba737 100644 --- a/modules/auxiliary/scanner/vmware/vmware_server_dir_trav.rb +++ b/modules/auxiliary/scanner/vmware/vmware_server_dir_trav.rb @@ -57,7 +57,7 @@ class MetasploitModule < Msf::Auxiliary if res.code == 200 #print_status("Output Of Requested File:\n#{res.body}") - print_status("#{target_host}:#{rport} appears vulnerable to VMWare Directory Traversal Vulnerability") + print_good("#{target_host}:#{rport} appears vulnerable to VMWare Directory Traversal Vulnerability") report_vuln( { :host => target_host, diff --git a/modules/auxiliary/scanner/vnc/vnc_none_auth.rb b/modules/auxiliary/scanner/vnc/vnc_none_auth.rb index d91d18e1d3..1aeb295cc7 100644 --- a/modules/auxiliary/scanner/vnc/vnc_none_auth.rb +++ b/modules/auxiliary/scanner/vnc/vnc_none_auth.rb @@ -45,7 +45,7 @@ class MetasploitModule < Msf::Auxiliary end ver = "#{vnc.majver}.#{vnc.minver}" - print_status("#{target_host}:#{rport} - VNC server protocol version: #{ver}") + print_good("#{target_host}:#{rport} - VNC server protocol version: #{ver}") svc = report_service( :host => rhost, :port => rport, diff --git a/modules/auxiliary/scanner/vxworks/wdbrpc_bootline.rb b/modules/auxiliary/scanner/vxworks/wdbrpc_bootline.rb index 613031387b..5cb826581b 100644 --- a/modules/auxiliary/scanner/vxworks/wdbrpc_bootline.rb +++ b/modules/auxiliary/scanner/vxworks/wdbrpc_bootline.rb @@ -135,7 +135,7 @@ class MetasploitModule < Msf::Auxiliary if data[48,64] =~ /^.{1,16}\(\d+,\d+\)/ buff = data[48, data.length-48] boot,left = buff.split("\x00", 2) - print_status("#{pkt[1]}: BOOT> #{boot}") + print_good("#{pkt[1]}: BOOT> #{boot}") report_note( :host => pkt[1], :port => datastore['RPORT'], @@ -150,7 +150,7 @@ class MetasploitModule < Msf::Auxiliary res = wdbrpc_parse_connect_reply(data) if res[:rt_membase] - print_status("#{pkt[1]}: #{res[:rt_vers]} #{res[:rt_bsp_name]} #{res[:rt_bootline]}") + print_good("#{pkt[1]}: #{res[:rt_vers]} #{res[:rt_bsp_name]} #{res[:rt_bootline]}") report_note( :host => pkt[1], diff --git a/modules/auxiliary/scanner/vxworks/wdbrpc_version.rb b/modules/auxiliary/scanner/vxworks/wdbrpc_version.rb index 043bccf6e7..0b694438c7 100644 --- a/modules/auxiliary/scanner/vxworks/wdbrpc_version.rb +++ b/modules/auxiliary/scanner/vxworks/wdbrpc_version.rb @@ -130,7 +130,7 @@ class MetasploitModule < Msf::Auxiliary end res = wdbrpc_parse_connect_reply(data) - print_status("#{pkt[1]}: #{res[:rt_vers]} #{res[:rt_bsp_name]} #{res[:rt_bootline]}") + print_good("#{pkt[1]}: #{res[:rt_vers]} #{res[:rt_bsp_name]} #{res[:rt_bootline]}") report_note( :host => pkt[1], diff --git a/modules/auxiliary/server/capture/drda.rb b/modules/auxiliary/server/capture/drda.rb index 9e44fc5338..68134c99ac 100644 --- a/modules/auxiliary/server/capture/drda.rb +++ b/modules/auxiliary/server/capture/drda.rb @@ -213,7 +213,7 @@ class MetasploitModule < Msf::Auxiliary end if @state[c][:user] and @state[c][:pass] - print_status("DRDA LOGIN #{@state[c][:name]} Database: #{@state[c][:database]}; #{@state[c][:user]} / #{@state[c][:pass]}") + print_good("DRDA LOGIN #{@state[c][:name]} Database: #{@state[c][:database]}; #{@state[c][:user]} / #{@state[c][:pass]}") report_cred( ip: @state[c][:ip], port: datastore['SRVPORT'], diff --git a/modules/auxiliary/server/capture/sip.rb b/modules/auxiliary/server/capture/sip.rb index 1d68f9de3e..2b2b5d48d6 100644 --- a/modules/auxiliary/server/capture/sip.rb +++ b/modules/auxiliary/server/capture/sip.rb @@ -164,7 +164,7 @@ class MetasploitModule < Msf::Auxiliary algorithm= ( auth_tokens['algorithm'] ? auth_tokens['algorithm'] : "MD5" ) username = auth_tokens['username'] proof = "client: #{client_ip}; username: #{username}; nonce: #{datastore['NONCE']}; response: #{response}; algorithm: #{algorithm}" - print_status("SIP LOGIN: #{proof}") + print_good("SIP LOGIN: #{proof}") report_cred( ip: @requestor[:ip], diff --git a/modules/auxiliary/server/capture/telnet.rb b/modules/auxiliary/server/capture/telnet.rb index 4d67a1bef0..8a0bcc8e3a 100644 --- a/modules/auxiliary/server/capture/telnet.rb +++ b/modules/auxiliary/server/capture/telnet.rb @@ -123,7 +123,7 @@ class MetasploitModule < Msf::Auxiliary c.put "\x00\r\n" end - print_status("TELNET LOGIN #{@state[c][:name]} #{@state[c][:user]} / #{@state[c][:pass]}") + print_good("TELNET LOGIN #{@state[c][:name]} #{@state[c][:user]} / #{@state[c][:pass]}") c.put "\r\nLogin failed\r\n\r\n" report_cred( ip: @state[c][:ip], diff --git a/modules/auxiliary/server/capture/vnc.rb b/modules/auxiliary/server/capture/vnc.rb index 1b9240abaa..1e124685b4 100644 --- a/modules/auxiliary/server/capture/vnc.rb +++ b/modules/auxiliary/server/capture/vnc.rb @@ -113,7 +113,7 @@ class MetasploitModule < Msf::Auxiliary elsif @state[c][:chall] c.put [0x00000001].pack("N") c.close - print_status("#{peer} - Challenge: #{@challenge.unpack('H*')[0]}; Response: #{data.unpack('H*')[0]}") + print_good("#{peer} - Challenge: #{@challenge.unpack('H*')[0]}; Response: #{data.unpack('H*')[0]}") hash_line = "$vnc$*#{@state[c][:chall].unpack("H*")[0]}*#{data.unpack('H*')[0]}" report_cred( ip: c.peerhost, diff --git a/modules/auxiliary/spoof/arp/arp_poisoning.rb b/modules/auxiliary/spoof/arp/arp_poisoning.rb index 08d50f7f8a..bf6305a389 100644 --- a/modules/auxiliary/spoof/arp/arp_poisoning.rb +++ b/modules/auxiliary/spoof/arp/arp_poisoning.rb @@ -180,7 +180,7 @@ class MetasploitModule < Msf::Auxiliary next if not reply.is_arp? # Without this check any arp request would be added to the cache if @dhosts.include? reply.arp_saddr_ip - print_status("#{reply.arp_saddr_ip} appears to be up.") + print_good("#{reply.arp_saddr_ip} appears to be up.") report_host(:host => reply.arp_saddr_ip, :mac=>reply.arp_saddr_mac) @dsthosts_cache[reply.arp_saddr_ip] = reply.arp_saddr_mac end @@ -193,7 +193,7 @@ class MetasploitModule < Msf::Auxiliary while(reply = getreply()) next if not reply.is_arp? if @dhosts.include? reply.arp_saddr_ip - print_status("#{reply.arp_saddr_ip} appears to be up.") + print_good("#{reply.arp_saddr_ip} appears to be up.") report_host(:host => reply.arp_saddr_ip, :mac=>reply.arp_saddr_mac) @dsthosts_cache[reply.arp_saddr_ip] = reply.arp_saddr_mac end @@ -217,7 +217,7 @@ class MetasploitModule < Msf::Auxiliary while(reply = getreply()) next if not reply.is_arp? if @shosts.include? reply.arp_saddr_ip - print_status("#{reply.arp_saddr_ip} appears to be up.") + print_good("#{reply.arp_saddr_ip} appears to be up.") report_host(:host => reply.arp_saddr_ip, :mac=>reply.arp_saddr_mac) @srchosts_cache[reply.arp_saddr_ip] = reply.arp_saddr_mac end @@ -230,7 +230,7 @@ class MetasploitModule < Msf::Auxiliary while(reply = getreply()) next if not reply.is_arp? if @shosts.include? reply.arp_saddr_ip - print_status("#{reply.arp_saddr_ip} appears to be up.") + print_good("#{reply.arp_saddr_ip} appears to be up.") report_host(:host => reply.arp_saddr_ip, :mac=>reply.arp_saddr_mac) @srchosts_cache[reply.arp_saddr_ip] = reply.arp_saddr_mac end