From 0ea4bec847f3b0ead41a0872fc7e8991f4904cf6 Mon Sep 17 00:00:00 2001
From: cg <>
Date: Wed, 15 Apr 2009 04:15:25 +0000
Subject: [PATCH] updated for db usage

git-svn-id: file:///home/svn/framework3/trunk@6485 4d416f70-5f16-0410-b530-b9f4589650da
---
 modules/auxiliary/scanner/http/options.rb | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/modules/auxiliary/scanner/http/options.rb b/modules/auxiliary/scanner/http/options.rb
index 6161165485..8ac7756033 100644
--- a/modules/auxiliary/scanner/http/options.rb
+++ b/modules/auxiliary/scanner/http/options.rb
@@ -16,11 +16,12 @@ class Metasploit3 < Msf::Auxiliary
 	include Msf::Auxiliary::WMAPScanServer
 	# Scanner mixin should be near last
 	include Msf::Auxiliary::Scanner
+	include Msf::Auxiliary::Report
 
 	def initialize
 		super(
 			'Name'        => 'HTTP Options Detection',
-			'Version'     => '$Revision$',
+			'Version'     => '$Revision:$',
 			'Description' => 'Display available HTTP options for each system',
 			'Author'       => ['CG'],
 			'License'     => MSF_LICENSE
@@ -28,7 +29,7 @@ class Metasploit3 < Msf::Auxiliary
 		
 	end
 
-	def run_host(ip)
+	def run_host(target_host)
 
 		begin
 			res = send_request_raw({
@@ -38,14 +39,22 @@ class Metasploit3 < Msf::Auxiliary
 			}, 10)
 
 			if (res and res.headers['Allow'])
-				print_status("#{ip} allows #{res.headers['Allow']} methods")
+				print_status("#{target_host} allows #{res.headers['Allow']} methods")
 
 				rep_id = wmap_base_report_id(
 					wmap_target_host,
 					wmap_target_port,
 					wmap_target_ssl
 				)
-				
+
+				report_note(
+				:host	=> target_host,
+				:proto	=> 'HTTP',
+				:port	=> rport,
+				:type	=> 'HTTP_OPTIONS',
+				:data	=> res.headers['Allow']
+			)
+
 				wmap_report(rep_id,'WEB_SERVER','OPTIONS',"#{res.headers['Allow']}",nil)
 			else
 				print_status("No options.")