Land rapid7#4573, Date/Subject support for SMTPDeliver

Author: wvu

lib/msf/core/exploit/smtp_deliver.rb

@@ -26,6 +26,7 @@ def initialize(info = {})
       [
         OptAddress.new("RHOST", [ true, "The SMTP server to send through" ]),
         OptPort.new("RPORT", [ true, "The SMTP server port (e.g. 25, 465, 587, 2525)", 25 ]),
+        OptString.new('DATE', [false, 'Override the DATE: field with this value', '']),
         OptString.new('MAILFROM', [ true, 'The FROM address of the e-mail', '[email protected]' ]),
         OptString.new('MAILTO', [ true, 'The TO address of the email' ]),
         OptString.new('SUBJECT', [ true, 'Subject line of the email' ]),
@@ -140,6 +141,19 @@ def send_message(data)
     raw_send_recv("MAIL FROM: <#{datastore['MAILFROM']}>\r\n", nsock)
     raw_send_recv("RCPT TO: <#{datastore['MAILTO']}>\r\n", nsock)
 
+    # If the user supplied a Date field, use that, else use the current
+    # DateTime in the proper RFC2822 format.
+    if datastore['DATE'].present?
+      raw_send_recv("Date: #{datastore['DATE']}\r\n", nsock)
+    else
+      raw_send_recv("Date: #{DateTime.now.rfc2822}\r\n", nsock)
+    end
+
+    # If the user supplied a Subject field, use that
+    if datastore['SUBJECT'].present?
+      raw_send_recv("Subject: #{datastore['SUBJECT']}\r\n", nsock)
+    end
+
     resp = raw_send_recv("DATA\r\n", nsock)
 
     # Avoid sending tons of data and killing the connection if the server