From 736bf120d93931042c61dac2bdf2499f06201ed3 Mon Sep 17 00:00:00 2001
From: KarnGaneshen <KarnGaneshen@gmail.com>
Date: Wed, 12 Jun 2013 00:25:50 +0530
Subject: [PATCH] added sname in report data, corrected :host to rhost, :port
 to rport. msftidy check. module load check. upping it.

---
 .../scanner/http/rfcode_reader_enum.rb        | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/modules/auxiliary/scanner/http/rfcode_reader_enum.rb b/modules/auxiliary/scanner/http/rfcode_reader_enum.rb
index dd6ca1abc8..34fbb06845 100644
--- a/modules/auxiliary/scanner/http/rfcode_reader_enum.rb
+++ b/modules/auxiliary/scanner/http/rfcode_reader_enum.rb
@@ -132,8 +132,8 @@ class Metasploit3 < Msf::Auxiliary
 				collect_info(user, pass)
 
 				report_hash = {
-					:host   => datastore['RHOST'],
-					:port   => datastore['RPORT'],
+					:host   => rhost,
+					:port   => rport,
 					:sname  => 'RFCode Reader',
 					:user   => user,
 					:pass   => pass,
@@ -172,12 +172,13 @@ class Metasploit3 < Msf::Auxiliary
 			product_name = JSON.parse(res.body)["product"]
 
 			vprint_status("Collecting device platform info...")
-			print_good("Release version: '#{release_ver}', Product Name: '#{product_name}'")
+			print_good("#{rhost}:#{rport} -> Release version: '#{release_ver}', Product Name: '#{product_name}'")
 
 			report_note(
-				:host   => datastore['RHOST'],
+				:host   => rhost,
 				:proto  => 'tcp',
-				:port   => datastore['RPORT'],
+				:port   => rport,
+				:sname  => "RFCode Reader",
 				:data   => 'Release Version: #{release_ver}, Product: #{product_name}'
 			)
 
@@ -194,12 +195,13 @@ class Metasploit3 < Msf::Auxiliary
 
 			userlist = JSON.parse(res.body)
 			vprint_status("Collecting user list...")
-			print_good("User list & role: #{userlist}")
+			print_good("#{rhost}:#{rport} -> User list & role: #{userlist}")
 
 			report_note(
-				:host   => datastore['RHOST'],
+				:host   => rhost,
 				:proto  => 'tcp',
-				:port   => datastore['RPORT'],
+				:port   => rport,
+				:sname	=> "RFCode Reader",
 				:data   => 'User List & Roles: #{userlist}'
 			)
 
@@ -220,10 +222,11 @@ class Metasploit3 < Msf::Auxiliary
 			print_good("Interface eth0 info: #{eth0_info}")
 
 			report_note(
-				:host	=> datastore['RHOST'],
+				:host	=> rhost,
 				:proto	=> 'tcp',
-				:port	=> datastore['RPORT'],
-				:data	=> 'Interface eth0: #{eth0_info}'
+				:port	=> rport,
+				:sname	=> "RFCode Reader",
+				:data	=> '#{rhost}:#{rport} -> Interface eth0: #{eth0_info}'
 			)
 
 			return