rex 1.0.2 → 2.0.2

data/lib/rex/parser/netsparker_xml.rb

@@ -0,0 +1,109 @@
+# -*- coding: binary -*-
+module Rex
+module Parser
+
+
+class NetSparkerXMLStreamParser
+
+  attr_accessor :on_found_vuln
+
+  def initialize(on_found_vuln = nil)
+    self.on_found_vuln = on_found_vuln if on_found_vuln
+    reset_state
+  end
+
+  def reset_state
+    @state = :generic_state
+    @vuln  = {'info' => []}
+    @attr  = {}
+  end
+
+  def tag_start(name, attributes)
+    @state = "in_#{name.downcase}".intern
+    @attr  = attributes
+
+    case name
+    when "vulnerability"
+      @vuln = { 'info' => [] }
+      @vuln['confirmed'] = attributes['confirmed']
+    end
+  end
+
+  def text(str)
+    case @state
+    when :in_url
+      @vuln['url'] ||= ""
+      @vuln['url']  += str
+    when :in_type
+      @vuln['type'] ||= ""
+      @vuln['type']  += str
+    when :in_severity
+      @vuln['severity'] ||= ""
+      @vuln['severity']  += str
+    when :in_vulnerableparametertype
+      @vuln["vparam_type"] ||= ""
+      @vuln["vparam_type"]  += str
+    when :in_vulnerableparameter
+      @vuln["vparam_name"] ||= ""
+      @vuln["vparam_name"]  += str
+    when :in_vulnerableparametervalue
+      @vuln["vparam_value"] ||= ""
+      @vuln["vparam_value"]  += str
+    when :in_rawrequest
+      @vuln["request"] ||= ""
+      @vuln["request"]  += str
+    when :in_rawresponse
+      @vuln["response"] ||= ""
+      @vuln["response"]  += str
+    when :in_info
+      # <info name="Identified Internal Path(s)">C:\AppServ\www\test-apps\dokeos\main\inc\banner.inc.php</info>
+      if not str.to_s.strip.empty?
+        @vuln['info'] << [@attr['name'] || "Information", str]
+      end
+    when :in_netsparker
+    when :in_target
+    when :in_scantime
+    when :generic_state
+    when :in_vulnerability
+    when :in_extrainformation
+    else
+      # $stderr.puts "unknown state: #{@state}"
+    end
+  end
+
+  def tag_end(name)
+    case name
+    when "vulnerability"
+      @vuln.keys.each do |k|
+        @vuln[k] = @vuln[k].strip if @vuln[k].kind_of?(::String)
+      end
+      on_found_vuln.call(@vuln) if on_found_vuln
+      reset_state
+    end
+  end
+
+  # We don't need these methods, but they're necessary to keep REXML happy
+  def xmldecl(version, encoding, standalone); end
+  def cdata(data)
+    puts "cdata for #{@state} (#{data.length})"
+    case @state
+    when :in_rawresponse
+      @vuln["response"] = data
+    when :in_rawrequest
+      @vuln["request"] = data
+    when :in_info
+      if not data.to_s.strip.empty?
+        @vuln['info'] << [@attr['name'] || "Information", data]
+      end
+    end
+  end
+
+  def comment(str); end
+  def instruction(name, instruction); end
+  def attlist; end
+end
+end
+end
+
+__END__
+

data/lib/rex/parser/nexpose_raw_nokogiri.rb

@@ -0,0 +1,686 @@
+# -*- coding: binary -*-
+require "rex/parser/nokogiri_doc_mixin"
+require "date"
+
+module Rex
+  module Parser
+
+    # If Nokogiri is available, define Template document class.
+    load_nokogiri && class NexposeRawDocument < Nokogiri::XML::SAX::Document
+
+    include NokogiriDocMixin
+
+    attr_reader :tests
+
+    NEXPOSE_HOST_DETAIL_FIELDS = %W{ nx_device_id nx_site_name nx_site_importance nx_scan_template nx_risk_score }
+    NEXPOSE_VULN_DETAIL_FIELDS = %W{
+      nx_scan_id
+      nx_vulnerable_since
+      nx_pci_compliance_status
+    }
+
+    # Triggered every time a new element is encountered. We keep state
+    # ourselves with the @state variable, turning things on when we
+    # get here (and turning things off when we exit in end_element()).
+    def start_element(name=nil,attrs=[])
+      attrs = normalize_attrs(attrs)
+      block = @block
+      @state[:current_tag][name] = true
+      case name
+      when "nodes" # There are two main sections, nodes and VulnerabilityDefinitions
+        @tests = {}
+      when "node"
+        record_host(attrs)
+      when "name"
+        @state[:has_text] = true
+      when "endpoint"
+        @state.delete(:cached_service_object)
+        record_service(attrs)
+      when "service"
+        record_service_info(attrs)
+      when "fingerprint"
+        record_service_fingerprint(attrs)
+      when "os"
+        record_os_fingerprint(attrs)
+      when "test" # All the vulns tested for
+        @state[:has_text] = true
+        record_host_test(attrs)
+        record_service_test(attrs)
+      when "vulnerability"
+        record_vuln(attrs)
+      when "reference"
+        @state[:has_text] = true
+        record_reference(attrs)
+      when "description"
+        @state[:has_text] = true
+        record_vuln_description(attrs)
+      when "solution"
+        @state[:has_text] = true
+        record_vuln_solution(attrs)
+      when "tag"
+        @state[:has_text] = true
+      when "tags"
+        @state[:tags] = []
+      #
+      # These are markup tags only present within description/solutions
+      #
+      when "ContainerBlockElement",  # Overall container, no formatting
+         "Paragraph",              # <Paragraph preformat="true">
+         "UnorderedList",          # List container (bulleted)
+         "ListItem",               # List item
+         "URLLink"                 # <URLLink LinkURL="http://support.microsoft.com/kb/887429" LinkTitle="http://support.microsoft.com/kb/887429" href="http://support.microsoft.com/kb/887429">KB 887429</URLLink>
+
+        record_formatted_content(name, attrs)
+
+      end
+    end
+
+    # When we exit a tag, this is triggered.
+    def end_element(name=nil)
+      block = @block
+      case name
+      when "node" # Wrap it up
+        collect_host_data
+        host_object = report_host &block
+        report_services(host_object)
+        report_fingerprint(host_object)
+        # Reset the state once we close a host
+        @state.delete_if {|k| k.to_s !~ /^(current_tag|in_nodes)$/}
+        @report_data = {:wspace => @args[:wspace]}
+      when "name"
+        collect_hostname
+        @state[:has_text] = false
+        @text = nil
+      when "endpoint"
+        collect_service_data
+        @state.delete(:cached_service_object)
+      when "os"
+        collect_os_fingerprints
+      when "test"
+        report_test(&block)
+        @state[:has_text] = false
+        @text = nil
+      when "vulnerability"
+        collect_vuln_info
+        report_vuln(&block)
+        @state.delete_if {|k| k.to_s !~ /^(current_tag|in_vulndefs)$/}
+      when "reference"
+        @state[:has_text] = false
+        collect_reference
+        @text = nil
+      when "description"
+        @state[:has_text] = false
+        collect_vuln_description
+        @text = nil
+      when "solution"
+        @state[:has_text] = false
+        collect_vuln_solution
+        @text = nil
+      when "tag"
+        @state[:has_text] = false
+        collect_tag
+        @text = nil
+      when "tags"
+        @report_data[:vuln_tags] = @state[:tags]
+        @state.delete(:tags)
+        #
+        # These are markup tags only present within description/solutions
+        #
+      when "ContainerBlockElement",  # Overall container, no formatting
+         "Paragraph",              # <Paragraph preformat="true">
+         "UnorderedList",          # List container (bulleted)
+         "ListItem",               # List item
+         "URLLink"                 # <URLLink LinkURL="http://support.microsoft.com/kb/887429" LinkTitle="http://support.microsoft.com/kb/887429" href="http://support.microsoft.com/kb/887429">KB 887429</URLLink>
+
+        collect_formatted_content(name)
+      end
+      @state[:current_tag].delete name
+    end
+
+    def collect_reference
+      return unless in_tag("references")
+      return unless in_tag("vulnerability")
+      return unless @state[:vuln]
+      @state[:ref][:value] = @text.to_s.strip
+      @report_data[:refs] ||= []
+      @report_data[:refs] << @state[:ref]
+      @state[:ref] = nil
+    end
+
+    def collect_vuln_description
+      return unless in_tag("description")
+      return unless in_tag("vulnerability")
+      return unless @state[:vuln]
+      @report_data[:vuln_description] = clean_formatted_text( @report_data[:vuln_description_stack].join.strip )
+    end
+
+    def collect_vuln_solution
+      return unless in_tag("solution")
+      return unless in_tag("vulnerability")
+      return unless @state[:vuln]
+      @report_data[:vuln_solution] = clean_formatted_text( @report_data[:vuln_solution_stack].join.strip )
+    end
+
+    def collect_tag
+      return unless in_tag("tag")
+      return unless in_tag("tags")
+      return unless in_tag("vulnerability")
+      return unless @state[:vuln]
+      @state[:tags] ||= []
+      @state[:tags] << @text.to_s.strip
+    end
+
+    def collect_vuln_info
+      return unless in_tag("VulnerabilityDefinitions")
+      return unless in_tag("vulnerability")
+      return unless @state[:vuln]
+      vuln = @state[:vuln]
+      vuln[:refs] = @report_data[:refs]
+      @report_data[:vuln] = vuln
+      @state[:vuln] = nil
+      @report_data[:refs] = nil
+    end
+
+    def report_vuln(&block)
+      return unless in_tag("VulnerabilityDefinitions")
+      return unless @report_data[:vuln]
+      return unless @report_data[:vuln][:matches].kind_of? Array
+
+      ::ActiveRecord::Base.connection_pool.with_connection {
+
+      refs = normalize_references(@report_data[:vuln][:refs])
+      refs << "NEXPOSE-#{report_data[:vuln]["id"]}"
+      vuln_instances = @report_data[:vuln][:matches].size
+      db.emit(:vuln, [refs.last,vuln_instances], &block) if block
+
+      vuln_ids = @report_data[:vuln][:matches].map{ |v| v[0] }
+      vdet_ids = @report_data[:vuln][:matches].map{ |v| v[1] }
+
+      refs = refs.uniq.map{|x| db.find_or_create_ref(:name => x) }
+
+      # Assign title and references to all vuln_ids
+      # Mass update fails due to the join table || ::Mdm::Vuln.where(:id => vuln_ids).update_all({ :name => @report_data[:vuln]["title"], :refs => refs } )
+      vuln_ids.each do |vid|
+        vuln = ::Mdm::Vuln.find(vid)
+        next unless vuln
+        vuln.name = @report_data[:vuln]["title"]
+
+        if refs.length > 0
+          vuln.refs += refs
+        end
+
+        if vuln.changed?
+          vuln.save!
+        end
+      end
+
+      # Mass update vulnerability details across the database based on conditions
+      vdet_info = { :title => @report_data[:vuln]["title"] }
+      vdet_info[:description]     = @report_data[:vuln_description]      unless @report_data[:vuln_description].to_s.empty?
+      vdet_info[:solution]        = @report_data[:vuln_solution]         unless @report_data[:vuln_solution].to_s.empty?
+      vdet_info[:nx_tags]         = @report_data[:vuln_tags].sort.uniq.join(", ") if ( @report_data[:vuln_tags].kind_of?(::Array) and @report_data[:vuln_tags].length > 0 )
+      vdet_info[:nx_severity]     = @report_data[:vuln]["severity"].to_f          if @report_data[:vuln]["severity"]
+      vdet_info[:nx_pci_severity] = @report_data[:vuln]["pciSeverity"].to_f       if @report_data[:vuln]["pciSeverity"]
+      vdet_info[:cvss_score]      = @report_data[:vuln]["cvssScore"].to_f         if @report_data[:vuln]["cvssScore"]
+      vdet_info[:cvss_vector]     = @report_data[:vuln]["cvssVector"]             if @report_data[:vuln]["cvssVector"]
+
+      %W{ published added modified }.each do |tf|
+        next if not @report_data[:vuln][tf]
+        ts = DateTime.parse(@report_data[:vuln][tf]) rescue nil
+        next if not ts
+        vdet_info[ "nx_#{tf}".to_sym ] = ts
+      end
+
+      ::Mdm::VulnDetail.where(:id => vdet_ids).update_all(vdet_info)
+
+      @report_data[:vuln] = nil
+
+      }
+    end
+
+    def record_reference(attrs)
+      return unless in_tag("VulnerabilityDefinitions")
+      return unless in_tag("vulnerability")
+      @state[:ref] = attr_hash(attrs)
+    end
+
+    def record_vuln(attrs)
+      return unless in_tag("VulnerabilityDefinitions")
+      vuln = attr_hash(attrs)
+      matching_tests = @tests[ vuln["id"].downcase ]
+      return unless matching_tests
+      return if matching_tests.empty?
+      @state[:vuln] = vuln
+      @state[:vuln][:matches] = matching_tests
+    end
+
+    def record_vuln_description(attrs)
+      @report_data[:vuln_description_stack] = []
+    end
+
+    def record_vuln_solution(attrs)
+      @report_data[:vuln_solution_stack] = []
+    end
+
+
+    def record_formatted_content(name, eattrs)
+      attrs  = attr_hash(eattrs)
+      stack  = nil
+
+      if in_tag("solution")
+        stack = @report_data[:vuln_solution_stack]
+      end
+
+      if in_tag("description")
+        stack = @report_data[:vuln_description_stack]
+      end
+
+      if in_tag("test")
+        stack = @report_data[:vuln_proof_stack]
+      end
+
+      return if not stack
+
+      @report_data[:formatted_indent] ||= 0
+
+      data = @text.to_s.strip.split(/\n+/).map{|t| t.strip}.join(" ")
+      @text = ""
+
+      case name
+      when 'ListItem'
+        @report_data[:formatted_indent] = 1
+        # data = "\n* " + data
+      when 'URLLink'
+        @report_data[:formatted_link] = attrs["LinkURL"]
+      else
+
+        if @report_data[:formatted_indent] > 1
+          data = (" " * (@report_data[:formatted_indent])) + data
+        end
+
+        if @report_data[:formatted_indent] == 1
+          @report_data[:formatted_indent] = 6
+        end
+      end
+
+      if data.length > 0
+        stack << data
+      end
+    end
+
+    def collect_formatted_content(name)
+      stack  = nil
+      prefix = ""
+
+      if in_tag("solution")
+        stack = @report_data[:vuln_solution_stack]
+      end
+
+      if in_tag("description")
+        stack = @report_data[:vuln_description_stack]
+      end
+
+      if in_tag("test")
+        stack = @report_data[:vuln_proof_stack]
+      end
+
+      return if not stack
+
+      data = @text.to_s.strip.split(/\n+/).map{|t| t.strip}.join(" ")
+      @text = ""
+
+      case name
+      when 'URLLink'
+        if @report_data[:formatted_link]
+          if data != @report_data[:formatted_link]
+            if data.empty?
+              data << (" " + @report_data[:formatted_link])
+            else
+              data = " " + data + " ( " + @report_data[:formatted_link] + " )"
+            end
+          end
+        end
+      when 'Paragraph'
+        data << "\n\n"
+      when 'ListItem'
+        @report_data[:formatted_indent] = 0
+        data << "\n"
+      end
+
+      if data.length > 0
+        stack << data
+      end
+    end
+
+    # XML Export 2.0 includes additional test keys:
+    # <test id="unix-unowned-files-or-dirs" status="vulnerable-exploited" scan-id="6381" vulnerable-since="20120322T124352665" pci-compliance-status="pass">
+
+    def report_test
+      return unless in_tag("nodes")
+      return unless in_tag("node")
+      return unless @state[:test]
+
+      vuln_info = {
+        :workspace => @args[:wspace],
+        # This name will be overwritten during the vuln definition
+        # parsing via mass-update.
+        :name => "NEXPOSE-" + @state[:test][:id].downcase,
+        :host => @state[:cached_host_object] || @state[:address]
+      }
+
+      if in_tag("endpoint") and @state[:test][:port]
+        # Verify this port actually has some relation to our tracked state
+        # since it may not due to greedy vulnerability matching
+        if @state[:cached_service_object] and @state[:cached_service_object].port.to_i == @state[:test][:port].to_i
+          vuln_info[:service] = @state[:cached_service_object]
+        else
+          vuln_info[:port]  = @state[:test][:port]
+          vuln_info[:proto] = @state[:test][:protocol] if @state[:test][:protocol]
+        end
+      end
+
+      # This hash feeds a vuln_details row for this vulnerability
+      vdet = { :src => 'nexpose', :nx_vuln_id => @state[:test][:id] }
+
+      # This hash defines the matching criteria to overwrite an existing entry
+      vkey = { :src => 'nexpose', :nx_vuln_id => @state[:test][:id] }
+
+      if @state[:nx_device_id]
+        vdet[:nx_device_id] = @state[:nx_device_id]
+        vkey[:nx_device_id] = @state[:nx_device_id]
+      end
+
+      if @state[:test][:key]
+        vdet[:nx_proof_key] = @state[:test][:key]
+        vkey[:nx_proof_key] = @state[:test][:key]
+      end
+
+      vdet[:nx_console_id]  = @nx_console_id if @nx_console_id
+      vdet[:nx_vuln_status] = @state[:test][:status] if @state[:test][:status]
+
+      vdet[:nx_scan_id] = @state[:test][:nx_scan_id] if @state[:test][:nx_scan_id]
+      vdet[:nx_pci_compliance_status] = @state[:test][:nx_pci_compliance_status] if @state[:test][:nx_pci_compliance_status]
+
+      if @state[:test][:nx_vulnerable_since]
+        ts = ::DateTime.parse(@state[:test][:nx_vulnerable_since]) rescue nil
+        vdet[:nx_vulnerable_since] = ts if ts
+      end
+
+      proof = clean_formatted_text(@report_data[:vuln_proof_stack].join.strip)
+      @report_data[:vuln_proof_stack] = []
+
+      vuln_info[:info] = proof
+      vdet[:proof]     = proof
+
+      # Configure the find key for vuln_details
+      vdet[:key] = vkey
+
+      # Pass this key to the vuln hash to find existing entries
+      # that may have been renamed (re-import nexpose vulns)
+      vuln_info[:details_match] = vkey
+
+      ::ActiveRecord::Base.connection_pool.with_connection {
+
+      # Report the vulnerability
+      vuln = db.report_vuln(vuln_info)
+
+      if vuln
+        # Report the vulnerability details
+        detail = db.report_vuln_details(vuln, vdet)
+
+        # Cache returned host and service objects if necessary
+        @state[:cached_host_object] ||= vuln.host
+
+        # The vuln.service may be found via greedy matching
+        if in_tag("endpoint") and vuln.service
+          @state[:cached_service_object] ||= vuln.service
+        end
+
+        # Record the ID of this vuln for a future mass update that
+        # brings in title, risk, description, solution, etc
+        @tests[ @state[:test][:id].downcase ] ||= []
+        @tests[ @state[:test][:id].downcase ] << [ vuln.id, detail.id ]
+      end
+
+      }
+      @state[:test] = nil
+    end
+
+    def record_os_fingerprint(attrs)
+      return unless in_tag("nodes")
+      return unless in_tag("fingerprints")
+      return unless in_tag("node")
+      return if in_tag("service")
+      @state[:os] = attr_hash(attrs)
+    end
+
+    # Just keep the highest scoring, which is usually the most vague. :(
+    def collect_os_fingerprints
+      @report_data[:os] ||= {}
+      return unless @state[:os]["certainty"].to_f > 0
+      return if @report_data[:os]["os_certainty"].to_f > @state[:os]["certainty"].to_f
+      @report_data[:os] = {} # Zero it out if we're replacing it.
+      @report_data[:os]["os_certainty"] = @state[:os]["certainty"]
+      @report_data[:os]["os_vendor"] = @state[:os]["vendor"]
+      @report_data[:os]["os_family"] = @state[:os]["family"]
+      @report_data[:os]["os_product"] = @state[:os]["product"]
+      @report_data[:os]["os_version"] = @state[:os]["version"]
+      @report_data[:os]["os_arch"] = @state[:os]["arch"]
+    end
+
+    # Just taking the first one.
+    def collect_hostname
+      if in_tag("node")
+        @state[:hostname] ||= @text.to_s.strip if @text
+        @text = nil
+      end
+    end
+
+    def record_service_fingerprint(attrs)
+      return unless in_tag("nodes")
+      return unless in_tag("node")
+      return unless in_tag("service")
+      return unless in_tag("fingerprint")
+      @state[:service_fingerprint] = attr_hash(attrs)
+    end
+
+    def record_service_info(attrs)
+      return unless in_tag("nodes")
+      return unless in_tag("node")
+      return unless in_tag("service")
+      @state[:service].merge! attr_hash(attrs)
+    end
+
+    def report_fingerprint(host_object)
+      return unless host_object.kind_of? ::Mdm::Host
+      return unless @report_data[:os].kind_of? Hash
+      note = {
+        :workspace => host_object.workspace,
+        :host => host_object,
+        :type => "host.os.nexpose_fingerprint",
+        :data => {
+          :family => @report_data[:os]["os_family"],
+          :certainty => @report_data[:os]["os_certainty"]
+        }
+      }
+      note[:data][:vendor] = @report_data[:os]["os_vendor"] if @report_data[:os]["os_vendor"]
+      note[:data][:product] = @report_data[:os]["os_product"] if @report_data[:os]["os_prduct"]
+      note[:data][:version] = @report_data[:os]["os_version"] if @report_data[:os]["os_version"]
+      note[:data][:arch] = @report_data[:os]["os_arch"] if @report_data[:os]["os_arch"]
+      db_report(:note, note)
+    end
+
+    def report_services(host_object)
+      return unless host_object.kind_of? ::Mdm::Host
+      return unless @report_data[:ports]
+      return if @report_data[:ports].empty?
+      reported = []
+      @report_data[:ports].each do |svc|
+        reported << db_report(:service, svc.merge(:host => host_object))
+      end
+      reported
+    end
+
+    def record_service(attrs)
+      return unless in_tag("nodes")
+      return unless in_tag("node")
+      return unless in_tag("endpoint")
+      @state[:service] = attr_hash(attrs)
+    end
+
+    def collect_service_data
+      return unless in_tag("node")
+      return unless in_tag("endpoint")
+      port_hash = {}
+      @report_data[:ports] ||= []
+      @state[:service].each do |k,v|
+        case k
+        when "protocol"
+          port_hash[:proto] = v
+        when "port"
+          port_hash[:port] = v
+        when "status"
+          port_hash[:status] = (v == "open" ? Msf::ServiceState::Open : Msf::ServiceState::Closed)
+        end
+      end
+      if @state[:service]
+        if state[:service]["name"] == "<unknown>"
+          sname = nil
+        else
+          sname = db.service_name_map(@state[:service]["name"])
+        end
+        port_hash[:name] = sname
+      end
+      if @state[:service_fingerprint]
+        info = []
+        info << @state[:service_fingerprint]["product"] if @state[:service_fingerprint]["product"]
+        info << @state[:service_fingerprint]["version"] if @state[:service_fingerprint]["version"]
+        port_hash[:info] = info.join(" ") if info[0]
+      end
+      @report_data[:ports] << port_hash.clone
+      @state.delete :service_fingerprint
+      @state.delete :service
+      @report_data[:ports]
+    end
+
+    def actually_vulnerable(test)
+      return false unless test.has_key? "status"
+      return false unless test.has_key? "id"
+      ['vulnerable-exploited', 'vulnerable-version', 'potential'].include? test["status"]
+    end
+
+    def record_host_test(attrs)
+      return unless in_tag("nodes")
+      return unless in_tag("node")
+      return if in_tag("service")
+      return unless in_tag("tests")
+
+      test = attr_hash(attrs)
+      return unless actually_vulnerable(test)
+      @state[:test] = {:id => test["id"].downcase}
+      @state[:test][:key] = test["key"] if test["key"]
+      @state[:test][:nx_scan_id] = test["scan-id"] if test["scan-id"]
+      @state[:test][:nx_vulnerable_since] = test["vulnerable-since"] if test["vulnerable-since"]
+      @state[:test][:nx_pci_compliance_status] = test["pci-compliance-status"] if test["pci-compliance-status"]
+
+      @report_data[:vuln_proof_stack] = []
+    end
+
+    def record_service_test(attrs)
+      return unless in_tag("nodes")
+      return unless in_tag("node")
+      return unless in_tag("service")
+      return unless in_tag("tests")
+      test = attr_hash(attrs)
+      return unless actually_vulnerable(test)
+      @state[:test] = {
+        :id => test["id"].downcase,
+        :port => @state[:service]["port"],
+        :protocol => @state[:service]["protocol"],
+      }
+      @state[:test][:key] = test["key"] if test["key"]
+      @state[:test][:status] = test["status"] if test["status"]
+      @state[:test][:nx_scan_id] = test["scan-id"] if test["scan-id"]
+      @state[:test][:nx_vulnerable_since] = test["vulnerable-since"] if test["vulnerable-since"]
+      @state[:test][:nx_pci_compliance_status] = test["pci-compliance-status"] if test["pci-compliance-status"]
+      @report_data[:vuln_proof_stack] = []
+    end
+
+    def record_host(attrs)
+      return unless in_tag("nodes")
+      host_attrs = attr_hash(attrs)
+      if host_attrs["status"] == "alive"
+        @state[:host_is_alive] = true
+        @state[:address] = host_attrs["address"]
+        @state[:mac] = host_attrs["hardware-address"] if host_attrs["hardware-address"]
+
+        NEXPOSE_HOST_DETAIL_FIELDS.each do |f|
+          fs = f.to_sym
+          fk = f.sub(/^nx_/, '').gsub('_', '-')
+          if host_attrs[fk]
+            @state[fs] = host_attrs[fk]
+          end
+        end
+      end
+    end
+
+    def collect_host_data
+      return unless in_tag("node")
+      @report_data[:host] = @state[:address]
+      @report_data[:state] = Msf::HostState::Alive
+      @report_data[:name] = @state[:hostname] if @state[:hostname]
+      if @state[:mac]
+        if @state[:mac] =~ /[0-9a-fA-f]{12}/
+          @report_data[:mac] = @state[:mac].scan(/.{2}/).join(":")
+        else
+          @report_data[:mac] = @state[:mac]
+        end
+      end
+
+      NEXPOSE_HOST_DETAIL_FIELDS.each do |f|
+        v = @state[f.to_sym]
+        @report_data[f.to_sym] = v if v
+      end
+    end
+
+    def report_host(&block)
+      if host_is_okay
+        db.emit(:address,@report_data[:host],&block) if block
+        device_id   = @report_data[:nx_device_id]
+
+        host_object = db_report(:host, @report_data.merge(:workspace => @args[:wspace] ) )
+        if host_object
+          db.report_import_note(host_object.workspace, host_object)
+          if device_id
+            detail = {
+              :key => { :src => 'nexpose' },
+              :src => 'nexpose',
+              :nx_device_id => device_id
+            }
+            detail[:nx_console_id] = @nx_console_id if @nx_console_id
+
+            NEXPOSE_HOST_DETAIL_FIELDS.each do |f|
+              v = @report_data.delete(f.to_sym)
+              detail[f.to_sym] = v if v
+            end
+
+
+            db.report_host_details(host_object, detail)
+          end
+        end
+        host_object
+      end
+    end
+
+    def clean_formatted_text(txt)
+      txt.split(/\n/).map{ |t|
+        t.sub(/^\s+$/, '').
+          sub(/^(\s{6,20})/, '      ')
+      }.join("\n").gsub(/\n{4,10}/, "\n\n\n")
+    end
+
+  end
+
+end
+end
+