Land rapid7#7214, print_brute ip:rport fix

Author: wvu

lib/msf/core/auxiliary/auth_brute.rb

@@ -594,7 +594,12 @@ def build_brute_message(host_ip,host_port,proto,msg,legacy)
       msg_regex = /(#{ip})(:#{port})?(\s*-?\s*)(#{proto.to_s})?(\s*-?\s*)(.*)/ni
       if old_msg.match(msg_regex) and !old_msg.match(msg_regex)[6].to_s.strip.empty?
         complete_message = ''
-        complete_message << (old_msg.match(msg_regex)[4] || proto).to_s
+        unless ip.blank? && port.blank?
+          complete_message << "#{ip}:#{rport}"
+        else
+          complete_message << (old_msg.match(msg_regex)[4] || proto).to_s
+        end
+
         complete_message << " - "
         progress = tried_over_total(ip,port)
         complete_message << progress if progress

modules/auxiliary/scanner/http/tomcat_mgr_login.rb

@@ -128,7 +128,11 @@ def run_host(ip)
         print_good "#{ip}:#{rport} - LOGIN SUCCESSFUL: #{result.credential}"
       else
         invalidate_login(credential_data)
-        vprint_error "#{ip}:#{rport} - LOGIN FAILED: #{result.credential} (#{result.status}: #{result.proof})"
+        if result.proof
+          vprint_error "#{ip}:#{rport} - LOGIN FAILED: #{result.credential} (#{result.status}: #{result.proof})"
+        else
+          vprint_error "#{ip}:#{rport} - LOGIN FAILED: #{result.credential} (#{result.status})"
+        end
       end
     end
   end