librex 0.0.65 → 0.0.66

data/lib/rex/parser/appscan_nokogiri.rb

@@ -1,17 +1,18 @@
-require File.join(File.expand_path(File.dirname(__FILE__)),"nokogiri_doc_mixin")
+# -*- coding: binary -*-
+require "rex/parser/nokogiri_doc_mixin"
 
 module Rex
 	module Parser
 
-		# If Nokogiri is available, define AppScan document class. 
+		# If Nokogiri is available, define AppScan document class.
 		load_nokogiri && class AppscanDocument < Nokogiri::XML::SAX::Document
 
 		include NokogiriDocMixin
 
 		# The resolver prefers your local /etc/hosts (or windows equiv), but will
-		# fall back to regular DNS. It retains a cache for the import to avoid 
+		# fall back to regular DNS. It retains a cache for the import to avoid
 		# spamming your network with DNS requests.
-		attr_reader :resolv_cache 
+		attr_reader :resolv_cache
 
 		# If name resolution of the host fails out completely, you will not be
 		# able to import that Scan task. Other scan tasks in the same report
@@ -43,7 +44,7 @@ module Rex
 			when "Issue" # Wrap it up
 				record_issue
 				# Reset the state once we close an issue
-				@state = @state.select do 
+				@state = @state.select do
 					|k| [:current_tag, :web_sites].include? k
 				end
 			when "Url" # Populates @state[:web_site]
@@ -59,7 +60,7 @@ module Rex
 			when "OriginalHttpTraffic" # Request and response
 				@state[:has_text] = false
 				record_request_and_response
-				report_service_info 
+				report_service_info
 				page_info = report_web_page(&block)
 				if page_info
 					form_info = report_web_form(page_info,&block)
@@ -80,11 +81,11 @@ module Rex
 			return unless @state[:issue]["Noise"].to_s.downcase == "false"
 			return unless @state[:issue][:vuln_param]
 			web_vuln_info = {}
-			web_vuln_info[:web_site] = form_info[:web_site] 
-			web_vuln_info[:path] = form_info[:path] 
-			web_vuln_info[:query] = form_info[:query] 
-			web_vuln_info[:method] = form_info[:method] 
-			web_vuln_info[:params] = form_info[:params] 
+			web_vuln_info[:web_site] = form_info[:web_site]
+			web_vuln_info[:path] = form_info[:path]
+			web_vuln_info[:query] = form_info[:query]
+			web_vuln_info[:method] = form_info[:method]
+			web_vuln_info[:params] = form_info[:params]
 			web_vuln_info[:pname] = @state[:issue][:vuln_param]
 			web_vuln_info[:proof] = "" # TODO: pick this up from <Difference> maybe?
 			web_vuln_info[:risk] = @state[:issue][:risk]
@@ -150,9 +151,9 @@ module Rex
 			web_page_info[:query] = @state[:uri].query
 			code = @state[:response_headers].cmd_string.split(/\s+/)[1]
 			return unless code
-			web_page_info[:code] = code 
+			web_page_info[:code] = code
 			parsed_headers = {}
-		 	@state[:response_headers].each do |k,v| 
+			@state[:response_headers].each do |k,v|
 				parsed_headers[k.to_s.downcase] ||= []
 				parsed_headers[k.to_s.downcase] << v
 			end
@@ -181,7 +182,7 @@ module Rex
 				:proto => service.proto,
 				:info => banner
 			}
-			db_report(:service, service_info) 
+			db_report(:service, service_info)
 		end
 
 		def record_request_and_response
@@ -200,7 +201,7 @@ module Rex
 				request_body_text = nil
 			end
 			response_headers_text = split_traffic[1].to_s[content_length,split_traffic[1].to_s.size].lstrip
-			request = request_headers_text 
+			request = request_headers_text
 			return unless(request && response_headers_text)
 			response_body_text = split_traffic[2]
 			req_header = Rex::Proto::Http::Packet::Header.new
@@ -318,7 +319,7 @@ module Rex
 			return address
 		end
 
-		# Alias this 
+		# Alias this
 		def resolve_issue_url_address(uri)
 			if uri.host
 				address = resolve_address(uri.host)

data/lib/rex/parser/arguments.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'shellwords'
 
 module Rex
@@ -28,7 +29,7 @@ class Arguments
 		self.fmt = fmt
 		# I think reduce is a better name for this method, but it doesn't exist
 		# before 1.8.7, so use the stupid inject instead.
-		self.longest = fmt.keys.inject(0) { |max, str| 
+		self.longest = fmt.keys.inject(0) { |max, str|
 			max = ((max > str.length) ? max : str.length)
 		}
 	end

data/lib/rex/parser/arguments.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..'))
 
@@ -64,4 +65,4 @@ class Rex::Parser::Arguments::UnitTest < Test::Unit::TestCase
 		assert_equal(args[9], "yup")
 	end
 
-end
+end

data/lib/rex/parser/burp_session_nokogiri.rb

@@ -1,9 +1,10 @@
-require File.join(File.expand_path(File.dirname(__FILE__)),"nokogiri_doc_mixin")
+# -*- coding: binary -*-
+require "rex/parser/nokogiri_doc_mixin"
 
 module Rex
 	module Parser
 
-		# If Nokogiri is available, define Burp Session document class. 
+		# If Nokogiri is available, define Burp Session document class.
 		#
 		# Burp Session XML files actually provide a lot, but since it also
 		# provides the originating url, we can pull most of the detail from
@@ -13,9 +14,9 @@ module Rex
 		include NokogiriDocMixin
 
 		# The resolver prefers your local /etc/hosts (or windows equiv), but will
-		# fall back to regular DNS. It retains a cache for the import to avoid 
+		# fall back to regular DNS. It retains a cache for the import to avoid
 		# spamming your network with DNS requests.
-		attr_reader :resolv_cache 
+		attr_reader :resolv_cache
 
 		# Since we try to resolve every time we hit a new web page, need to
 		# hang on to our misses. Presume that it's a permanent enough failure
@@ -51,7 +52,7 @@ module Rex
 		def end_element(name=nil)
 			block = @block
 			case name
-			when "item" # Wrap up this item, but keep resolved web sites 
+			when "item" # Wrap up this item, but keep resolved web sites
 				collect_uri
 				report_web_site(&block)
 				handle_parse_warnings(&block)
@@ -247,7 +248,7 @@ module Rex
 			return unless block
 			@parse_warnings.each_with_index do |pwarn,i|
 				unless @parse_warned.include? i
-					db.emit(:warning, pwarn, &block) 
+					db.emit(:warning, pwarn, &block)
 					@parse_warned << i
 				end
 			end
@@ -267,7 +268,7 @@ module Rex
 			return address
 		end
 
-		# Alias this 
+		# Alias this
 		def resolve_vhost_address(uri)
 			if uri.host
 				address = resolve_address(uri.host)

data/lib/rex/parser/ci_nokogiri.rb

@@ -1,4 +1,5 @@
-require File.join(File.expand_path(File.dirname(__FILE__)),"nokogiri_doc_mixin")
+# -*- coding: binary -*-
+require "rex/parser/nokogiri_doc_mixin"
 
 require 'msf/core'
 
@@ -120,7 +121,7 @@ module Rex
 		end
 
 		def report_services(host_object)
-			return unless host_object.kind_of? ::Msf::DBManager::Host
+			return unless host_object.kind_of? ::Mdm::Host
 
 			snames = {}
 			( @state[:root]["services"] || {} ).each_pair do |sname, sinfo|
@@ -170,7 +171,7 @@ module Rex
 		def report_vulns(host_object)
 			vuln_count = 0
 			block = @block
-			return unless host_object.kind_of? Msf::DBManager::Host
+			return unless host_object.kind_of? ::Mdm::Host
 			return unless @state[:root]["Vulnerabilities"]
 			@state[:root]["Vulnerabilities"].each_pair do |cve, vinfo|
 				vinfo.each_pair do |vname, vdesc|

data/lib/rex/parser/foundstone_nokogiri.rb

@@ -1,9 +1,10 @@
-require File.join(File.expand_path(File.dirname(__FILE__)),"nokogiri_doc_mixin")
+# -*- coding: binary -*-
+require "rex/parser/nokogiri_doc_mixin"
 
 module Rex
 	module Parser
 
-		# If Nokogiri is available, define Template document class. 
+		# If Nokogiri is available, define Template document class.
 		load_nokogiri && class FoundstoneDocument < Nokogiri::XML::SAX::Document
 
 		include NokogiriDocMixin
@@ -25,7 +26,7 @@ module Rex
 				check_for_correct_report_type(attrs,&block)
 			when "Host"
 				record_host(attrs)
-			when "Service" 
+			when "Service"
 				record_service(attrs)
 			when "Port", "Protocol", "Banner"
 				@state[:has_text] = true
@@ -54,7 +55,7 @@ module Rex
 				end
 				# Reset the state once we close a host
 				@state.delete_if {|k| k != :current_tag}
-			when "Port" 
+			when "Port"
 				@state[:has_text] = false
 				collect_port
 			when "Protocol"
@@ -77,10 +78,10 @@ module Rex
 			@state[:current_tag].delete name
 		end
 
-		# Nothing technically stopping us from parsing this as well, 
+		# Nothing technically stopping us from parsing this as well,
 		# but saving this for later
 		def check_for_correct_report_type(attrs,&block)
-			report_type = attr_hash(attrs)["ReportType"] 
+			report_type = attr_hash(attrs)["ReportType"]
 			if report_type == "Network Inventory"
 				@report_type_ok = true
 			else
@@ -139,7 +140,7 @@ module Rex
 			return unless in_tag("HostData")
 			return unless in_tag("Host")
 			@state[:vulns] ||= []
-			
+
 			@state[:vuln] = attr_hash(attrs) # id and VulnName
 		end
 
@@ -183,7 +184,7 @@ module Rex
 			return unless in_tag("ServicesFound")
 			return unless in_tag("Host")
 			return unless @state[:service][:port]
-			@report_data[:ports] ||= [] 
+			@report_data[:ports] ||= []
 			port_hash = {}
 		 	port_hash[:port] = @state[:service][:port]
 		 	port_hash[:proto] = @state[:service][:proto]
@@ -232,7 +233,7 @@ module Rex
 
 		def report_services(host_object)
 			return unless in_tag("HostData")
-			return unless host_object.kind_of? Msf::DBManager::Host
+			return unless host_object.kind_of? ::Mdm::Host
 			return unless @report_data[:ports]
 			return if @report_data[:ports].empty?
 			@report_data[:ports].each do |svc|
@@ -242,7 +243,7 @@ module Rex
 
 		def report_vulns(host_object)
 			return unless in_tag("HostData")
-			return unless host_object.kind_of? Msf::DBManager::Host
+			return unless host_object.kind_of? ::Mdm::Host
 			return unless @report_data[:vulns]
 			return if @report_data[:vulns].empty?
 			@report_data[:vulns].each do |vuln|
@@ -268,7 +269,7 @@ module Rex
 		# Services where we only care about the first
 		# line of the banner tag.
 		def first_line_only?(service)
-			svcs = %w{ 
+			svcs = %w{
 				vnc ftp ftps smtp oracle-tns nntp ssh ntp
 			}
 			9.times {|i| svcs << "vnc-#{i}"}
@@ -276,11 +277,11 @@ module Rex
 		end
 
 		# Services where we need to do more processing
-		# before handing the banner back. 
+		# before handing the banner back.
 		def needs_more_processing?(service)
-			svcs = %w{ 
+			svcs = %w{
 				microsoft-ds loc-srv http https sunrpc netbios-ns
-		 	}
+			}
 			svcs.include? service
 		end
 
@@ -288,7 +289,7 @@ module Rex
 			str.split("\n").first.to_s.strip
 		end
 
-		# XXX: Actually implement more of these 
+		# XXX: Actually implement more of these
 		def process_service(service,banner)
 			meth = "process_service_#{service.gsub("-","_")}"
 			if self.respond_to? meth
@@ -310,9 +311,9 @@ module Rex
 		def process_service_microsoft_ds(banner)
 			lm_regex = /Native LAN Manager/
 			lm_banner = nil
-			banner.each_line { |line| 
+			banner.each_line { |line|
 				if line[lm_regex]
-					lm_banner = line 
+					lm_banner = line
 					break
 				end
 			}

data/lib/rex/parser/fusionvm_nokogiri.rb

@@ -0,0 +1,109 @@
+# -*- coding: binary -*-
+require "rex/parser/nokogiri_doc_mixin"
+
+module Rex
+module Parser
+
+	# If Nokogiri is available, define  document class.
+	load_nokogiri && class FusionVMDocument < Nokogiri::XML::SAX::Document
+
+
+	include NokogiriDocMixin	
+
+	def start_element(name=nil,attrs=[])
+		return nil if in_tag("JobOrder")
+		attrs = normalize_attrs(attrs)
+		attrs = attr_hash(attrs)
+		@state[:current_tag][name] = true
+		case name
+		when "IPAddress"
+			thost={}
+			return nil unless attrs["IPAddress"] and attrs["HostName"]
+			thost = {
+				:host      => attrs["IPAddress"],
+				:name      => attrs["HostName"],
+				:workspace => @args[:wspace]
+			}
+			thost[:host] = attrs["IPAddress"]
+			thost[:name] = attrs["HostName"]
+			@host = db_report(:host, thost) 
+		when "OS"
+			@state[:has_text] = true
+		when "Port"
+			@service = {
+				:host   => @host,
+				:port   => attrs["Number"],
+				:state  => "open"
+			}
+		when "Service"
+			@state[:has_text] = true
+		when "Protocol"
+			@state[:has_text] = true
+		when "Exposure"
+			@vuln = {
+				:host => @host,
+				:refs => []
+			}
+		when "Title"
+			@state[:has_text] = true
+		when "Description"
+			@state[:has_text] = true	
+		when "CVE"
+			@state[:has_text] = true
+		when "References"
+			@state[:has_text] = true
+		end
+	end
+
+	def end_element(name=nil)
+		unless in_tag("JobOrder")
+			case name
+			when "OS"
+				unless @host.nil? or @text.blank?
+					tnote = {
+						:type       => "host.os.fusionvm_fingerprint",
+						:data       => { :os => @text.strip },
+						:host       => @host,
+						:workspace  => @args[:wspace]
+					}
+					db_report(:note, tnote)
+					@host.normalize_os
+				end
+			when  "IPAdress"
+				@host = nil
+			when "Service"
+				@service[:name] = @text.strip
+			when "Protocol"
+				@service[:proto] = @text.strip.downcase
+			when "Port"
+				db_report(:service, @service)
+			when "Exposure"
+				db_report(:vuln, @vuln)
+			when "Title"
+				@vuln[:name] = @text.strip
+			when "Description"
+				@vuln[:info] = @text.strip
+			when "CVE"
+				@vuln[:refs] << "CVE-#{@text.strip}"
+			when "References"
+				unless @text.blank? 
+					@text.split(' ').each do |ref|
+						next unless ref.start_with? "http"
+						if ref =~ /MS\d{2}-\d{3}/
+							@vuln[:refs] << "MSB-#{$&}"
+						else 
+							@vuln[:refs] << "URL-#{ref.strip}" 
+						end
+					end
+				end
+			end
+		end
+		@text = nil
+		@state[:current_tag].delete name
+	end
+
+
+
+end
+end
+end

data/lib/rex/parser/ini.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 module Rex
 module Parser
 

data/lib/rex/parser/ini.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..'))
 
@@ -26,4 +27,4 @@ END
 		assert_equal(TestIni + "\n", ini.to_s)
 	end
 	
-end
+end

data/lib/rex/parser/ip360_aspl_xml.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rexml/document'
 require 'rex/ui'