From 7009748cf5b09da3f6dcf2ee9eba2cdb4bc53cdd Mon Sep 17 00:00:00 2001
From: sinn3r <wei_chen@rapid7.com>
Date: Tue, 25 Jun 2013 22:09:45 -0500
Subject: [PATCH] Fix module

---
 modules/auxiliary/scanner/smtp/smtp_relay.rb | 54 ++++++++++++++------
 1 file changed, 37 insertions(+), 17 deletions(-)

diff --git a/modules/auxiliary/scanner/smtp/smtp_relay.rb b/modules/auxiliary/scanner/smtp/smtp_relay.rb
index fa7b9c1ab1..5ea15ca907 100644
--- a/modules/auxiliary/scanner/smtp/smtp_relay.rb
+++ b/modules/auxiliary/scanner/smtp/smtp_relay.rb
@@ -2,8 +2,9 @@
 # This file is part of the Metasploit Framework and may be subject to
 # redistribution and commercial restrictions. Please see the Metasploit
 # web site for more information on licensing and terms of use.
-# http://metasploit.com/
+#   http://metasploit.com/
 ##
+
 require 'msf/core'
 
 class Metasploit3 < Msf::Auxiliary
@@ -18,32 +19,51 @@ class Metasploit3 < Msf::Auxiliary
 			'Description' => 'SMTP Open Relay Detection',
 			'References'  =>
 				[
-			['URL', 'http://www.ietf.org/rfc/rfc2821.txt'],
+					['URL', 'http://www.ietf.org/rfc/rfc2821.txt'],
 				],
 			'Author'      => 'Campbell Murray',
 			'License'     => MSF_LICENSE
 		)
 	end
 
+	def peer
+		"#{rhost}:#{rport}"
+	end
+
 	def run_host(ip)
-		connect
+		begin
+			connect
+		rescue
+			print_error("#{peer} - Unable to establish an SMTP session")
+			return
+		end
+
 		banner_sanitized = Rex::Text.to_hex_ascii(banner.to_s)
-		print_status("#{ip}:#{rport} SMTP #{banner_sanitized}")
+		print_status("#{peer} - SMTP #{banner_sanitized}")
 		report_service(:host => rhost, :port => rport, :name => "smtp", :info => banner)
-		do_test_relay()
-	end	
+		do_test_relay
+	end
 
 	def do_test_relay
-		raw_send_recv("EHLO X\r\n")
-		raw_send_recv("MAIL FROM: #{datastore['MAILFROM']}\r\n") 
-		raw_send_recv("RCPT TO: #{datastore['MAILTO']}\r\n") 
-		raw_send_recv("DATA\r\n") 
-		raw_send_recv("Metasploit testing for open relay\r\n") 
-		res=raw_send_recv(".\r\n") 
-		  if res =~ /250/ 
-		    print_good "Potential open SMTP relay detected at #{rhost.to_s}"
-		  else
-		    print_status "Not vulnerable"
-		  end
+		res = raw_send_recv("EHLO X\r\n")
+		vprint_status("#{peer} - #{res.inspect}")
+
+		res = raw_send_recv("MAIL FROM: #{datastore['MAILFROM']}\r\n")
+		vprint_status("#{peer} - #{res.inspect}")
+
+		res = raw_send_recv("RCPT TO: #{datastore['MAILTO']}\r\n")
+		vprint_status("#{peer} - #{res.inspect}")
+
+		res = raw_send_recv("DATA\r\n")
+		vprint_status("#{peer} - #{res.inspect}")
+
+		res = raw_send_recv("#{Rex::Text.rand_text_alpha(rand(10)+5)}\r\n.\r\n")
+		vprint_status("#{peer} - #{res.inspect}")
+
+		if res =~ /250/
+			print_good("#{peer} - Potential open SMTP relay detected")
+		else
+			print_status "#{peer} - No relay detected"
+		end
 	end
 end
\ No newline at end of file