Drop explicit IPAddr to String coercion

MSP-12611

Author: mbuck-r7

Gemfile.lock

@@ -33,7 +33,7 @@ GIT
 
 GIT
   remote: git://github.com/rapid7/metasploit_data_models.git
-  revision: 28d2b7f40d9154f8a6a2005b33b9c54a74b59a08
+  revision: caa8e1a64cd145b419cbbfb5a7dad3b75090e44e
   branch: staging/rails-4.0
   specs:
     metasploit_data_models (0.24.0.pre.rails.pre.4.0)

lib/msf/core/auxiliary/report.rb

@@ -203,7 +203,7 @@ def report_auth_info(opts={})
       port         = opts[:service].port
       proto        = opts[:service].proto
       service_name = opts[:service].name
-      host         = opts[:service].host.address.to_s
+      host         = opts[:service].host.address
     else
       port         = opts.fetch(:port)
       service_name = opts.fetch(:sname, nil)

lib/msf/core/db_export.rb

@@ -482,7 +482,7 @@ def extract_web_site_info(report_file)
       end
 
       site = e
-      el = create_xml_element("host", site.service.host.address.to_s)
+      el = create_xml_element("host", site.service.host.address)
       report_file.write("      #{el}\n")
 
       el = create_xml_element("port", site.service.port)
@@ -509,7 +509,7 @@ def extract_web_info(report_file, tag, entries)
       el = create_xml_element("vhost", site.vhost)
       report_file.write("      #{el}\n")
 
-      el = create_xml_element("host", site.service.host.address.to_s)
+      el = create_xml_element("host", site.service.host.address)
       report_file.write("      #{el}\n")
 
       el = create_xml_element("port", site.service.port)

lib/msf/core/db_manager/service.rb

@@ -65,13 +65,13 @@ def report_service(opts)
 
     if addr.kind_of? ::Mdm::Host
       host = addr
-      addr = host.address.to_s
+      addr = host.address
     else
       host = report_host(hopts)
     end
 
     if opts[:port].to_i.zero?
-      dlog("Skipping port zero for service '%s' on host '%s'" % [opts[:name],host.address.to_s])
+      dlog("Skipping port zero for service '%s' on host '%s'" % [opts[:name],host.address])
       return nil
     end
 

lib/msf/core/db_manager/web.rb

@@ -242,7 +242,7 @@ def report_web_site(opts)
     host.save!
 =end
 
-    vhost ||= host.address.to_s
+    vhost ||= host.address
     site = ::Mdm::WebSite.where(vhost: vhost, service_id: serv[:id]).first_or_initialize
     site.options = opts[:options] if opts[:options]
 

lib/msf/core/rpc/v10/rpc_db.rb

@@ -128,7 +128,7 @@ def rpc_create_credential(xopts)
       opts[:last_attempted_at] = opts[:last_attempted_at].to_datetime
       login = create_credential_login(opts)
 
-      ret[:host]   = login.service.host.address.to_s,
+      ret[:host]   = login.service.host.address,
       ret[:sname]  = login.service.name
       ret[:status] = login.status
     end
@@ -157,7 +157,7 @@ def rpc_creds(xopts)
         sname = ''
         unless cred.logins.empty?
           login = cred.logins.first
-          host = login.service.host.address.to_s
+          host = login.service.host.address
           sname = login.service.name.to_s if login.service.name.present?
           port = login.service.port.to_i
           proto = login.service.proto.to_s
@@ -192,7 +192,7 @@ def rpc_hosts(xopts)
     wspace.hosts.where(conditions).offset(offset).order(:address).limit(limit).each do |h|
       host = {}
       host[:created_at] = h.created_at.to_i
-      host[:address] = h.address.to_s
+      host[:address] = h.address
       host[:mac] = h.mac.to_s
       host[:name] = h.name.to_s
       host[:state] = h.state.to_s
@@ -228,7 +228,7 @@ def rpc_services( xopts)
     wspace.services.includes(:host).where(conditions).offset(offset).limit(limit).each do |s|
       service = {}
       host = s.host
-      service[:host] = host.address.to_s || "unknown"
+      service[:host] = host.address || "unknown"
       service[:created_at] = s[:created_at].to_i
       service[:updated_at] = s[:updated_at].to_i
       service[:port] = s[:port]
@@ -267,7 +267,7 @@ def rpc_vulns(xopts)
         vuln[:proto] = nil
       end
       vuln[:time] = v.created_at.to_i
-      vuln[:host] = v.host.address.to_s || nil
+      vuln[:host] = v.host.address || nil
       vuln[:name] = v.name
       vuln[:refs] = reflist.join(',')
       ret[:vulns] << vuln
@@ -365,7 +365,7 @@ def rpc_get_host(xopts)
     if(h)
       host = {}
       host[:created_at] = h.created_at.to_i
-      host[:address] = h.address.to_s
+      host[:address] = h.address
       host[:mac] = h.mac.to_s
       host[:name] = h.name.to_s
       host[:state] = h.state.to_s
@@ -433,7 +433,7 @@ def rpc_get_service(xopts)
     services.each do |s|
       service = {}
       host = s.host
-      service[:host] = host.address.to_s || "unknown"
+      service[:host] = host.address || "unknown"
       service[:created_at] = s[:created_at].to_i
       service[:updated_at] = s[:updated_at].to_i
       service[:port] = s[:port]
@@ -482,7 +482,7 @@ def rpc_get_note(xopts)
     notes.each do |n|
       note = {}
       host = n.host
-      note[:host] = host.address.to_s || "unknown"
+      note[:host] = host.address || "unknown"
       if n.service
         note[:port] = n.service.port
         note[:proto] = n.service.proto
@@ -508,7 +508,7 @@ def rpc_get_client(xopts)
     if(c)
       client = {}
       host = c.host
-      client[:host] = host.address.to_s
+      client[:host] = host.address
       client[:created_at] = c.created_at.to_i
       client[:updated_at] = c.updated_at.to_i
       client[:ua_string] = c.ua_string.to_s
@@ -567,7 +567,7 @@ def rpc_notes(xopts)
       note[:time] = n.created_at.to_i
       note[:host] = ""
       note[:service] = ""
-      note[:host] = n.host.address.to_s if(n.host)
+      note[:host] = n.host.address if(n.host)
       note[:service] = n.service.name || n.service.port  if(n.service)
       note[:type ] = n.ntype.to_s
       note[:data] = n.data.inspect
@@ -641,7 +641,7 @@ def rpc_del_vuln(xopts)
     deleted = []
     vulns.each do |v|
       dent = {}
-      dent[:address] = v.host.address.to_s if v.host
+      dent[:address] = v.host.address if v.host
       dent[:port] = v.service.port if v.service
       dent[:proto] = v.service.proto if v.service
       dent[:name] = v.name
@@ -709,7 +709,7 @@ def rpc_del_note(xopts)
     deleted = []
     notes.each do |n|
       dent = {}
-      dent[:address] = n.host.address.to_s if n.host
+      dent[:address] = n.host.address if n.host
       dent[:port] = n.service.port if n.service
       dent[:proto] = n.service.proto if n.service
       dent[:ntype] = n.ntype
@@ -766,7 +766,7 @@ def rpc_del_service(xopts)
     deleted = []
     services.each do |s|
       dent = {}
-      dent[:address] = s.host.address.to_s
+      dent[:address] = s.host.address
       dent[:port] = s.port
       dent[:proto] = s.proto
       deleted << dent
@@ -798,7 +798,7 @@ def rpc_del_host(xopts)
     end
     deleted = []
     hosts.each do |h|
-      deleted << h.address.to_s
+      deleted << h.address
       h.destroy
     end
 
@@ -828,7 +828,7 @@ def rpc_events(xopts)
 
     wspace.events.offset(offset).limit(limit).each do |e|
       event = {}
-      event[:host] = e.host.address.to_s if(e.host)
+      event[:host] = e.host.address if(e.host)
       event[:created_at] = e.created_at.to_i
       event[:updated_at] = e.updated_at.to_i
       event[:name] = e.name
@@ -873,7 +873,7 @@ def rpc_loots(xopts)
     ret[:loots] = []
     wspace.loots.offset(offset).limit(limit).each do |l|
       loot = {}
-      loot[:host] = l.host.address.to_s if(l.host)
+      loot[:host] = l.host.address if(l.host)
       loot[:service] = l.service.name || l.service.port  if(l.service)
       loot[:ltype] = l.ltype
       loot[:ctype] = l.content_type
@@ -928,7 +928,7 @@ def rpc_get_vuln(xopts)
     vulns.each do |v|
       vuln= {}
       host= v.host
-      vuln[:host] = host.address.to_s || "unknown"
+      vuln[:host] = host.address || "unknown"
       if v.service
         vuln[:port] = v.service.port
         vuln[:proto] = v.service.proto
@@ -963,7 +963,7 @@ def rpc_clients(xopts)
 
     wspace.clients.includes(:host).where(conditions).offset(offset).limit(limit).each do |c|
       client = {}
-      client[:host] = c.host.address.to_s if c.host
+      client[:host] = c.host.address if c.host
       client[:ua_string] = c.ua_string
       client[:ua_name] = c.ua_name
       client[:ua_ver] = c.ua_ver
@@ -1007,7 +1007,7 @@ def rpc_del_client(xopts)
     deleted = []
     clients.each do |c|
       dent = {}
-      dent[:address] = c.host.address.to_s
+      dent[:address] = c.host.address
       dent[:ua_string] = c.ua_string
       deleted << dent
       c.destroy

lib/msf/ui/console/command_dispatcher/core.rb

@@ -3117,7 +3117,7 @@ def option_values_target_addrs
       hosts = {}
       framework.db.each_service(framework.db.workspace) do |service|
         if (service.port == mport)
-          hosts[ service.host.address.to_s ] = true
+          hosts[ service.host.address ] = true
         end
       end
 
@@ -3128,7 +3128,7 @@ def option_values_target_addrs
     # List all hosts in the database
     else
       framework.db.each_host(framework.db.workspace) do |host|
-        res << host.address.to_s
+        res << host.address
       end
     end
 

lib/msf/ui/console/command_dispatcher/db.rb

@@ -411,7 +411,7 @@ def cmd_hosts(*args)
       host_ranges.each do |range|
         range.each do |address|
           host = framework.db.find_or_create_host(:host => address)
-          print_status("Time: #{host.created_at} Host: host=#{host.address.to_s}")
+          print_status("Time: #{host.created_at} Host: host=#{host.address}")
         end
       end
       return
@@ -483,7 +483,7 @@ def cmd_hosts(*args)
 
         tbl << columns
         if set_rhosts
-          addr = (host.scope ? host.address.to_s + '%' + host.scope : host.address.to_s)
+          addr = (host.scope ? host.address + '%' + host.scope : host.address)
           rhosts << addr
         end
         if mode == [:delete]
@@ -634,7 +634,7 @@ def cmd_services(*args)
           info[:name]  = names.first.downcase if names and names.first
 
           svc = framework.db.find_or_create_service(info)
-          print_status("Time: #{svc.created_at} Service: host=#{svc.host.address.to_s} port=#{svc.port} proto=#{svc.proto} name=#{svc.name}")
+          print_status("Time: #{svc.created_at} Service: host=#{svc.host.address} port=#{svc.port} proto=#{svc.proto} name=#{svc.name}")
         end
       end
       return
@@ -665,10 +665,10 @@ def cmd_services(*args)
           )
         end
 
-        columns = [host.address.to_s] + col_names.map { |n| service[n].to_s || "" }
+        columns = [host.address] + col_names.map { |n| service[n].to_s || "" }
         tbl << columns
         if set_rhosts
-          addr = (host.scope ? host.address.to_s + '%' + host.scope : host.address.to_s )
+          addr = (host.scope ? host.address + '%' + host.scope : host.address )
           rhosts << addr
         end
 
@@ -789,12 +789,12 @@ def cmd_vulns(*args)
             next unless ports.empty? or ports.include? vuln.service.port
             # Same for service names
             next unless svcs.empty? or svcs.include?(vuln.service.name)
-            print_status("Time: #{vuln.created_at} Vuln: host=#{host.address.to_s} name=#{vuln.name} refs=#{reflist.join(',')} #{(show_info && vuln.info) ? "info=#{vuln.info}" : ""}")
+            print_status("Time: #{vuln.created_at} Vuln: host=#{host.address} name=#{vuln.name} refs=#{reflist.join(',')} #{(show_info && vuln.info) ? "info=#{vuln.info}" : ""}")
 
           else
             # This vuln has no service, so it can't match
             next unless ports.empty? and svcs.empty?
-            print_status("Time: #{vuln.created_at} Vuln: host=#{host.address.to_s} name=#{vuln.name} refs=#{reflist.join(',')} #{(show_info && vuln.info) ? "info=#{vuln.info}" : ""}")
+            print_status("Time: #{vuln.created_at} Vuln: host=#{host.address} name=#{vuln.name} refs=#{reflist.join(',')} #{(show_info && vuln.info) ? "info=#{vuln.info}" : ""}")
           end
           if set_rhosts
             addr = (host.scope ? host.address + '%' + host.scope : host.address)
@@ -1079,11 +1079,11 @@ def creds_search(*args)
             # the user-supplied RangeWalker, then we don't have any reason to
             # print it out. However, we treat the absence of ranges as meaning
             # all hosts.
-            if host_ranges.present? && !host_ranges.any? { |range| range.include?(login.service.host.address.to_s) }
+            if host_ranges.present? && !host_ranges.any? { |range| range.include?(login.service.host.address) }
               next
             end
-            row = [ login.service.host.address.to_s ]
-            rhosts << login.service.host.address.to_s
+            row = [ login.service.host.address ]
+            rhosts << login.service.host.address
             if login.service.name.present?
               row << "#{login.service.port}/#{login.service.proto} (#{login.service.name})"
             else
@@ -1250,7 +1250,7 @@ def cmd_notes(*args)
           break if not host
           note = framework.db.find_or_create_note(:host => host, :type => type, :data => data)
           break if not note
-          print_status("Time: #{note.created_at} Note: host=#{host.address.to_s} type=#{note.ntype} data=#{note.data}")
+          print_status("Time: #{note.created_at} Note: host=#{host.address} type=#{note.ntype} data=#{note.data}")
         }
       }
       return
@@ -1317,9 +1317,9 @@ def cmd_notes(*args)
       msg = "Time: #{note.created_at} Note:"
       if (note.host)
         host = note.host
-        msg << " host=#{note.host.address.to_s}"
+        msg << " host=#{note.host.address}"
         if set_rhosts
-          addr = (host.scope ? host.address.to_s + '%' + host.scope : host.address.to_s )
+          addr = (host.scope ? host.address + '%' + host.scope : host.address )
           rhosts << addr
         end
       end
@@ -1475,7 +1475,7 @@ def cmd_loot(*args)
           )
           end
           row = []
-          row.push( (loot.host ? loot.host.address.to_s : "") )
+          row.push( (loot.host ? loot.host.address : "") )
           if (loot.service)
             svc = (loot.service.name ? loot.service.name : "#{loot.service.port}/#{loot.service.proto}")
             row.push svc

lib/rex/parser/burp_session_nokogiri.rb

@@ -155,7 +155,7 @@ def report_web_host_info
       return unless @state[:uri].kind_of? URI::HTTP
       return unless @state[:web_site].service.host.name.to_s.empty?
       host_info = {:workspace => @args[:wspace]}
-      host_info[:address] = @state[:web_site].service.host.address.to_s
+      host_info[:address] = @state[:web_site].service.host.address
       host_info[:name] = @state[:uri].host
       report_db(:host, host_info)
     end

modules/auxiliary/analyze/jtr_oracle_fast.rb

@@ -51,7 +51,7 @@ def crack(format)
           print_error("Unable to read #{myloot.path} \n #{e}")
         end
         oracle_array.each do |row|
-          hashlist.write("#{row[0]}:#{row[1]}:#{myloot.host.address.to_s}:#{myloot.service.port}\n")
+          hashlist.write("#{row[0]}:#{row[1]}:#{myloot.host.address}:#{myloot.service.port}\n")
         end
       end
       hashlist.close