Merge branch 'smb_cap' of github.com:Meatballs1/metasploit-framework into Meatballs1-smb_cap

Author: sinn3r

modules/auxiliary/server/capture/smb.rb

@@ -334,7 +334,7 @@ def smb_cmd_session_setup(c, buff, esn)
 				begin
 					smb_get_hash(smb,arg,true)
 				rescue ::Exception => e
-					print_status("SMB Capture - Error processing Hash from #{smb[:name]} - #{smb[:ip]} : #{e.class} #{e} #{e.backtrace}")
+					print_error("SMB Capture - Error processing Hash from #{smb[:name]} - #{smb[:ip]} : #{e.class} #{e} #{e.backtrace}")
 				end
 
 				smb_error(CONST::SMB_COM_SESSION_SETUP_ANDX, c, CONST::SMB_STATUS_LOGON_FAILURE, true)
@@ -396,7 +396,7 @@ def smb_cmd_session_setup(c, buff, esn)
 				smb_get_hash(smb,arg,false)
 
 			rescue ::Exception => e
-				print_status("SMB Capture - Error processing Hash from #{smb[:name]} : #{e.class} #{e} #{e.backtrace}")
+				print_error("SMB Capture - Error processing Hash from #{smb[:name]} : #{e.class} #{e} #{e.backtrace}")
 			end
 
 			smb_error(CONST::SMB_COM_SESSION_SETUP_ANDX, c, CONST::SMB_STATUS_LOGON_FAILURE, true)
@@ -522,17 +522,17 @@ def smb_get_hash(smb, arg = {}, esn=true)
 			end
 
 			print_status(capturelogmessage)
+			lm_text = (lm_hash + lm_cli_challenge.to_s).empty? ? "00" * 24 : lm_hash + lm_cli_challenge.to_s
+			nt_text = (nt_hash + nt_cli_challenge.to_s).empty? ? "00" * 24 : nt_hash + nt_cli_challenge.to_s
+			pass = "#{smb[:domain]}:#{lm_text}:#{nt_text}:#{datastore['CHALLENGE'].to_s}"
 
 			# DB reporting
 			report_auth_info(
 				:host  => smb[:ip],
 				:port => datastore['SRVPORT'],
 				:sname => 'smb_challenge',
 				:user => smb[:username],
-				:pass => smb[:domain] + ":" +
-					( lm_hash + lm_cli_challenge.to_s ? lm_hash + lm_cli_challenge.to_s : "00" * 24 ) + ":" +
-					( nt_hash + nt_cli_challenge.to_s ? nt_hash + nt_cli_challenge.to_s :  "00" * 24 ) + ":" +
-					datastore['CHALLENGE'].to_s,
+				:pass => pass,
 				:type => smb_db_type_hash,
 				:proof => "NAME=#{smb[:nbsrc]} DOMAIN=#{smb[:domain]} OS=#{smb[:peer_os]}",
 				:source_type => "captured",
@@ -570,8 +570,8 @@ def smb_get_hash(smb, arg = {}, esn=true)
 							smb[:username],
 							smb[:domain] ? smb[:domain] : "NULL",
 							@challenge.unpack("H*")[0],
-							lm_hash ? lm_hash : "0" * 48,
-							nt_hash ? nt_hash : "0" * 48
+							lm_hash.empty? ? "0" * 48 : lm_hash,
+							nt_hash.empty? ? "0" * 48 : nt_hash
 						].join(":").gsub(/\n/, "\\n")
 					)
 					fd.close
@@ -587,8 +587,8 @@ def smb_get_hash(smb, arg = {}, esn=true)
 						[
 							smb[:username],"",
 							smb[:domain] ? smb[:domain] : "NULL",
-							lm_hash ? lm_hash : "0" * 48,
-							nt_hash ? nt_hash : "0" * 48,
+							lm_hash.empty? ? "0" * 48 : lm_hash,
+							nt_hash.empty? ? "0" * 48 : nt_hash,
 							@challenge.unpack("H*")[0]
 						].join(":").gsub(/\n/, "\\n")
 					)
@@ -601,8 +601,8 @@ def smb_get_hash(smb, arg = {}, esn=true)
 							smb[:username],"",
 							smb[:domain] ? smb[:domain] : "NULL",
 							@challenge.unpack("H*")[0],
-							lm_hash ? lm_hash : "0" * 32,
-							lm_cli_challenge ? lm_cli_challenge : "0" * 16
+							lm_hash.empty? ? "0" * 32 : lm_hash,
+							lm_cli_challenge.empty? ? "0" * 16 : lm_cli_challenge
 						].join(":").gsub(/\n/, "\\n")
 					)
 					fd.close
@@ -613,8 +613,8 @@ def smb_get_hash(smb, arg = {}, esn=true)
 							smb[:username],"",
 							smb[:domain] ? smb[:domain] : "NULL",
 							@challenge.unpack("H*")[0],
-							nt_hash ? nt_hash : "0" * 32,
-							nt_cli_challenge ? nt_cli_challenge : "0" * 160
+							nt_hash.empty? ? "0" * 32 : nt_hash,
+							nt_cli_challenge ? "0" * 160 : nt_cli_challenge
 						].join(":").gsub(/\n/, "\\n")
 					)
 					fd.close