From d9bd7daed69873f97a001fb2b24ae6e57cfe8ecc Mon Sep 17 00:00:00 2001
From: David Rude <bannedit0@gmail.com>
Date: Fri, 12 Aug 2011 02:14:30 +0000
Subject: [PATCH] Add Wills Email PII module

git-svn-id: file:///home/svn/framework3/trunk@13540 4d416f70-5f16-0410-b530-b9f4589650da
---
 modules/auxiliary/vsploit/pii/email_pii.rb | 55 ++++++++++++++++++++++
 modules/auxiliary/vsploit/pii/web_pii.rb   |  1 -
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 modules/auxiliary/vsploit/pii/email_pii.rb

diff --git a/modules/auxiliary/vsploit/pii/email_pii.rb b/modules/auxiliary/vsploit/pii/email_pii.rb
new file mode 100644
index 0000000000..c40777613a
--- /dev/null
+++ b/modules/auxiliary/vsploit/pii/email_pii.rb
@@ -0,0 +1,55 @@
+##
+# $Id$
+##
+
+##
+# This file is part of the Metasploit Framework and may be subject to
+# redistribution and commercial restrictions. Please see the Metasploit
+# Framework web site for more information on licensing and terms of use.
+# http://metasploit.com/framework/
+##
+
+require 'msf/core'
+
+class Metasploit3 < Msf::Auxiliary
+
+	#
+	# This module sends pii via an attacker smtp machine
+	#
+	include Msf::Exploit::Remote::SMTPDeliver
+	include Msf::Auxiliary::PII
+
+	def initialize(info = {})
+		super(update_info(info,
+			'Name'           => 'Email PII Tester',
+			'Description'    => %q{
+					This auxiliary reads from a file and sends data which
+			should be flagged via an internal or external smtp server.
+			},
+			'License'        => MSF_LICENSE,
+			'Author'         =>  ['willis'],
+			'Version'        => '$Revision$'
+		))
+			register_options(
+				[
+					OptString.new('RHOST', [true, "SMTP server address",'127.0.0.1']),
+					OptString.new('RPORT', [true, "SMTP server port",'25'])
+				], self.class)
+	end
+
+	def run
+
+		msg = Rex::MIME::Message.new
+		msg.mime_defaults
+		msg.subject = datastore['SUBJECT']
+		msg.to = datastore['MAILTO']
+		msg.from = datastore['MAILFROM']
+
+		data = create_pii
+
+		msg.add_part(data, "text/plain")
+		msg.add_part_attachment(data, rand_text_english(10))
+
+		resp = send_message(msg.to_s)
+	end
+end
\ No newline at end of file
diff --git a/modules/auxiliary/vsploit/pii/web_pii.rb b/modules/auxiliary/vsploit/pii/web_pii.rb
index 0296ea326d..1835c67ca3 100644
--- a/modules/auxiliary/vsploit/pii/web_pii.rb
+++ b/modules/auxiliary/vsploit/pii/web_pii.rb
@@ -13,7 +13,6 @@ class Metasploit3 < Msf::Auxiliary
 	# This module acts as an compromised webserver distributing PII Data
 	#
 	include Msf::Exploit::Remote::HttpServer::HTML
-	#p "Loading vSploit PII Webserver"
 	include Msf::Auxiliary::PII
 	
 	def initialize(info = {})