Fixed up reporting for DB2 and tested; also added other default usernames for db2.

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

data/wordlists/db2_default_pass.txt

@@ -1,5 +1,8 @@
 db2inst1
+dasusr1
+db2fenc1
 db2pass
 db2pw
 db2password
 admin
+

data/wordlists/db2_default_user.txt

@@ -1,2 +1,4 @@
 db2inst1
+dasusr1
+db2fenc1
 admin

data/wordlists/db2_default_userpass.txt

@@ -2,4 +2,6 @@ db2inst1 db2inst1
 db2inst1 db2pass
 db2inst1 db2pw
 db2inst1 db2password
+dasusr1 dasusr1
+db2fenc1 db2fenc1
 

modules/auxiliary/scanner/db2/db2_auth.rb

@@ -74,13 +74,24 @@ class Metasploit3 < Msf::Auxiliary
 			return :error
 		end
 			disconnect
+
+			# Report service state
+			report_service(
+				:host => rhost,
+				:port => rport,
+				:name => "db2"
+			)
+
 			if info[:db_login_success]
 				print_good("#{rhost}:#{rport} [DB2] successful login for '#{user}' : '#{pass}' against database '#{db}'")
+
+				# Report credentials
 				report_auth_info(
 					:host => rhost,
 					:proto => 'db2',
 					:user => user,
 					:pass => pass,
+					:database => db,
 					:targ_host => rhost,
 					:targ_port => rport
 				)

modules/auxiliary/scanner/db2/db2_version.rb

@@ -43,12 +43,14 @@ class Metasploit3 < Msf::Auxiliary
 			info = db2_probe(2)
 			if info[:excsatrd]
 				inst,plat,ver,pta = info[:instance_name],info[:platform],info[:version],info[:plaintext_auth]
-				report_info = "#{plat} : #{ver} : #{inst} : PlainAuth-#{pta ? "OK" : "NO"}"
+				report_info = "Platform: #{plat}, Version: #{ver}, Instance: #{inst}, Plain-Authentication: #{pta ? "OK" : "NO"}"
 				print_status("#{ip}:#{rport} [DB2] #{report_info}")
-				report_service(:host => rhost, 
+				report_service(
+					:host => rhost, 
 					:port => rport,
 					:name => "db2",
-					:info => report_info)
+					:info => report_info
+				)
 			end
 			disconnect