From 36836423d95fd7b35ff72fc09ebeacd05cee70a9 Mon Sep 17 00:00:00 2001
From: HD Moore <hd_moore@rapid7.com>
Date: Wed, 7 Apr 2010 20:51:05 +0000
Subject: [PATCH] Add a warning, cosmetic comment to asm

git-svn-id: file:///home/svn/framework3/trunk@9037 4d416f70-5f16-0410-b530-b9f4589650da
---
 .../x86/src/block/block_reverse_https.asm       |  3 +--
 lib/msf/core/db.rb                              | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/external/source/shellcode/windows/x86/src/block/block_reverse_https.asm b/external/source/shellcode/windows/x86/src/block/block_reverse_https.asm
index 0eeccda40c..a3e9f535fd 100644
--- a/external/source/shellcode/windows/x86/src/block/block_reverse_https.asm
+++ b/external/source/shellcode/windows/x86/src/block/block_reverse_https.asm
@@ -1,6 +1,6 @@
 ;-----------------------------------------------------------------------------;
 ; Author: HD Moore
-; Compatible: Confirmed Windows 7, Windows XP, Windows 2000
+; Compatible: Confirmed Windows 7, Windows 2008 Server, Windows XP SP1, Windows SP3, Windows 2000
 ; Known Bugs: Incompatible with Windows NT 4.0, buggy on Windows XP Embedded (SP1)
 ; Version: 1.0
 ;-----------------------------------------------------------------------------;
@@ -150,7 +150,6 @@ download_more:
   call ebp
 
   test eax,eax           ; download failed? (optional?)
-
   jz failure
 
   mov eax, [edi]
diff --git a/lib/msf/core/db.rb b/lib/msf/core/db.rb
index fc97e27aea..ccffd2173d 100644
--- a/lib/msf/core/db.rb
+++ b/lib/msf/core/db.rb
@@ -179,7 +179,6 @@ class DBManager
 
 		# Ensure the host field updated_at is changed on each report_host()
 		if addr.kind_of? Host
-			$stderr.puts ">> Updating host: #{addr.inspect}"
 			queue( Proc.new { addr.updated_at = addr.created_at; addr.save! } )
 			return addr
 		end
@@ -649,8 +648,11 @@ class DBManager
 				host.updated_at = host.created_at
 				host.state      = HostState::Alive
 				host.save!
+			else
+				host = report_host({:workspace => wspace, :host => opts[:host], :wait => true})
 			end
 
+
 			if data
 				vuln = host.vulns.find_or_initialize_by_name_and_data(name, data, :include => :refs)
 			else
@@ -1116,6 +1118,8 @@ class DBManager
 		firstline = data[0, di]
 		if (firstline.index("<NeXposeSimpleXML"))
 			return import_nexpose_simplexml(data, wspace)
+		elsif (firstline.index("<NexposeReport"))
+			return import_nexpose_rawxml(data, wspace)
 		elsif (firstline.index("<?xml"))
 			# it's xml, check for root tags we can handle
 			line_count = 0
@@ -1272,14 +1276,23 @@ class DBManager
 		import_nexpose_rawxml(data, wspace)
 	end
 	def import_nexpose_rawxml(data, wspace=workspace)
+
+		raise RuntimeError, "NeXpose RAW-XML is not currently supported, please use SimpleXML"
+
 		doc = REXML::Document.new(data)
 		doc.elements.each('/NexposeReport/nodes/node') do |host|
-			addr = host.attributes['address']
+			addr  = host.attributes['address']
+			xmac  = host.attributes['hardware-address']
 			xhost = addr
+
 			refs = {}
 
+			$stderr.puts host.inspect
+
 			# os based vuln
 			host.elements['tests'].elements.each('test') do |vuln|
+				$stderr.puts vuln.inspect
+
 				if vuln.attributes['status'] == 'vulnerable-exploited' or vuln.attributes['status'] == 'vulnerable-version'
 					dhost = find_or_create_host(:workspace => wspace, :host => addr)
 					next if not dhost