add scanner functionality to oracle_version.rb and removed some comments from options.rb

git-svn-id: file:///home/svn/framework3/trunk@6088 4d416f70-5f16-0410-b530-b9f4589650da

modules/auxiliary/scanner/http/options.rb

@@ -22,13 +22,12 @@ class Metasploit3 < Msf::Auxiliary
 			'Name'        => 'HTTP Options Detection',
 			'Version'     => '$Revision: $',
 			'Description' => 'Display available HTTP options for each system',
-			'Author'      => 'CG |at| carnal0wnage |dot| com',
+			'Author'       => ['CG'],
 			'License'     => MSF_LICENSE
 		)
 		
 	end
 
-	# Fingerprint a single host
 	def run_host(ip)
 
 		self.target_port = datastore['RPORT']	
@@ -48,7 +47,7 @@ class Metasploit3 < Msf::Auxiliary
 						wmap_target_port,
 						wmap_target_ssl
 				)
-				#not sure about this one, can you add columns in the db on the fly?
+				
 				wmap_report(rep_id,'WEB_SERVER','OPTIONS',"#{res.headers['Allow']}",nil)
 			else
 				print_status("No options.")

modules/auxiliary/scanner/oracle/oracle_version.rb

@@ -10,14 +10,15 @@ require 'msf/core'
 class Metasploit3 < Msf::Auxiliary
 
 	include Msf::Exploit::Remote::TNS
+	include Msf::Auxiliary::Scanner
 
 	def initialize(info = {})
 		super(update_info(info,
 			'Name'           => 'Oracle Version Enumeration.',
 			'Description'    => %q{
-				This module simply queries the TNS listner for the Oracle build..
+				This module simply queries the TNS listner for the Oracle build.
 			},
-			'Author'         => [ 'CG'],
+			'Author'         => ['CG'],
 			'License'        => MSF_LICENSE,
 			'Version'        => '$Revision$',
 			'DisclosureDate' => 'Jan 7 2009'))
@@ -29,7 +30,7 @@ class Metasploit3 < Msf::Auxiliary
 
 	end
 
-	def run
+def run_host(ip)
 
 		connect_data = "(CONNECT_DATA=(COMMAND=VERSION))"
 
@@ -49,12 +50,12 @@ class Metasploit3 < Msf::Auxiliary
 		data = sock.get_once
 
 		if ( data and data =~ /\\*.TNSLSNR for (.*)/ )
-			return print_status("Host #{rhost} is running: " + $1)
+			return print_status("Host #{ip} is running: " + $1)
 		else
-			return print_error("Unable to determine version info for #{rhost}...")
+			return print_error("Unable to determine version info for #{ip}...")
 
 		disconnect
-
+		
 		end
 	end
 end