Move normaliize_host to a library method

This method was in Msf::DbManager class but doesn't actually use the DB.
This required you to have a DB connection just to do the check.
Moved it out to a helper library so we have access to it without forcing
a DB connection.

Author: jbarnett-r7

lib/msf/core/auxiliary/report.rb

@@ -389,7 +389,7 @@ def store_loot(ltype, ctype, host, data, filename=nil, info=nil, service=nil)
       ext = "txt"
     end
     # This method is available even if there is no database, don't bother checking
-    host = framework.db.normalize_host(host)
+    host = Msf::Util::Host.normalize_host(host)
 
     ws = (db ? myworkspace.name[0,16] : 'default')
     name =

lib/msf/core/db_manager/host.rb

@@ -107,7 +107,7 @@ def get_host(opts)
       wspace = find_workspace(wspace)
     end
 
-    address = normalize_host(address)
+    address = Msf::Util::Host.normalize_host(address)
     return wspace.hosts.find_by_address(address)
   }
   end
@@ -135,60 +135,6 @@ def hosts(opts)
   }
   end
 
-  #
-  # Returns something suitable for the +:host+ parameter to the various report_* methods
-  #
-  # Takes a Host object, a Session object, an Msf::Session object or a String
-  # address
-  #
-  def normalize_host(host)
-    return host if defined?(::Mdm) && host.kind_of?(::Mdm::Host)
-    norm_host = nil
-
-    if (host.kind_of? String)
-
-      if Rex::Socket.is_ipv4?(host)
-        # If it's an IPv4 addr with a port on the end, strip the port
-        if host =~ /((\d{1,3}\.){3}\d{1,3}):\d+/
-          norm_host = $1
-        else
-          norm_host = host
-        end
-      elsif Rex::Socket.is_ipv6?(host)
-        # If it's an IPv6 addr, drop the scope
-        address, scope = host.split('%', 2)
-        norm_host = address
-      else
-        norm_host = Rex::Socket.getaddress(host, true)
-      end
-    elsif defined?(::Mdm) && host.kind_of?(::Mdm::Session)
-      norm_host = host.host
-    elsif host.respond_to?(:session_host)
-      # Then it's an Msf::Session object
-      norm_host = host.session_host
-    end
-
-    # If we got here and don't have a norm_host yet, it could be a
-    # Msf::Session object with an empty or nil tunnel_host and tunnel_peer;
-    # see if it has a socket and use its peerhost if so.
-    if (
-        norm_host.nil? &&
-        host.respond_to?(:sock) &&
-        host.sock.respond_to?(:peerhost) &&
-        host.sock.peerhost.to_s.length > 0
-      )
-      norm_host = session.sock.peerhost
-    end
-    # If We got here and still don't have a real host, there's nothing left
-    # to try, just log it and return what we were given
-    if !norm_host
-      dlog("Host could not be normalized: #{host.inspect}")
-      norm_host = host
-    end
-
-    norm_host
-  end
-
   #
   # Report a host's attributes such as operating system and service pack
   #
@@ -225,7 +171,7 @@ def report_host(opts)
     ret = { }
 
     if !addr.kind_of? ::Mdm::Host
-      addr = normalize_host(addr)
+      addr = Msf::Util::Host.normalize_host(addr)
 
       unless ipv46_validator(addr)
         raise ::ArgumentError, "Invalid IP address in report_host(): #{addr}"
@@ -331,7 +277,7 @@ def update_host_via_sysinfo(opts)
     end
 
     if !addr.kind_of? ::Mdm::Host
-      addr = normalize_host(addr)
+      addr = Msf::Util::Host.normalize_host(addr)
       addr, scope = addr.split('%', 2)
       opts[:scope] = scope if scope
 

lib/msf/core/db_manager/loot.rb

@@ -54,7 +54,7 @@ def report_loot(opts)
         host = opts[:host]
       else
         host = report_host({:workspace => wspace, :host => opts[:host]})
-        addr = normalize_host(opts[:host])
+        addr = Msf::Util::Host.normalize_host(opts[:host])
       end
     end
 

lib/msf/core/db_manager/note.rb

@@ -68,7 +68,7 @@ def report_note(opts)
       if opts[:host].kind_of? ::Mdm::Host
         host = opts[:host]
       else
-        addr = normalize_host(opts[:host])
+        addr = Msf::Util::Host.normalize_host(opts[:host])
         host = report_host({:workspace => wspace, :host => addr})
       end
       # Do the same for a service if that's also included.

lib/msf/core/db_manager/session.rb

@@ -50,7 +50,7 @@ def get_session(opts)
   #     created, but the Mdm::Host will have been.   (There is no transaction
   #       to rollback the Mdm::Host creation.)
   #   @see #find_or_create_host
-  #   @see #normalize_host
+  #   @see #Msf::Util::Host.normalize_host
   #   @see #report_exploit_success
   #   @see #report_vuln
   #
@@ -234,7 +234,7 @@ def create_mdm_session_from_session(opts)
 
       wspace = opts[:workspace] || find_workspace(session.workspace)
       h_opts = { }
-      h_opts[:host]      = normalize_host(session)
+      h_opts[:host]      = Msf::Util::Host.normalize_host(session)
       h_opts[:arch]      = session.arch if session.respond_to?(:arch) and session.arch
       h_opts[:workspace] = wspace
       host = find_or_create_host(h_opts)

lib/msf/core/db_manager/vuln.rb

@@ -118,7 +118,7 @@ def report_vuln(opts)
       host = opts[:host]
     else
       host = report_host({:workspace => wspace, :host => opts[:host]})
-      addr = normalize_host(opts[:host])
+      addr = Msf::Util::Host.normalize_host(opts[:host])
     end
 
     ret = {}

lib/msf/util.rb

@@ -22,3 +22,6 @@ module Util
 # Executable generation and encoding
 require 'msf/util/exe'
 require 'msf/util/helper'
+
+# Host helpers
+require 'msf/util/host'

spec/support/shared/examples/msf/db_manager/session.rb

@@ -175,7 +175,7 @@
               it 'should pass normalized host from session as :host to #find_or_create_host' do
                 normalized_host = double('Normalized Host')
                 expect(db_manager).to receive(:normalize_host).with(session).and_return(normalized_host)
-                # stub report_vuln so its use of find_or_create_host and normalize_host doesn't interfere.
+                # stub report_vuln so its use of find_or_create_host and Msf::Util::Host.normalize_host doesn't interfere.
                 expect(db_manager).to receive(:report_vuln)
 
                 expect(db_manager).to receive(:find_or_create_host).with(
@@ -518,7 +518,7 @@
               it 'should pass normalized host from session as :host to #find_or_create_host' do
                 normalized_host = double('Normalized Host')
                 allow(db_manager).to receive(:normalize_host).with(session).and_return(normalized_host)
-                # stub report_vuln so its use of find_or_create_host and normalize_host doesn't interfere.
+                # stub report_vuln so its use of find_or_create_host and Msf::Util::Host.normalize_host doesn't interfere.
                 allow(db_manager).to receive(:report_vuln)
 
                 expect(db_manager).to receive(:find_or_create_host).with(