* 20150212 Add %MESSAGEID% token and add Message-Id as a part of the default DATA.

jetmore · jetmore · commit 073854d9ac87 · 2015-02-12T21:10:00.000Z
diff --git a/Changes b/Changes
@@ -695,3 +695,5 @@
 * 20141202 Fixing a couple of "an [CONSONANT]" doc typos
 * 20150128 Handle the case where a server advertises XCLIENT but does not
            advertise any supported attributes.
+* 20150212 Add %MESSAGEID% token and add Message-Id as a part of the default
+           DATA.
diff --git a/doc/base.pod b/doc/base.pod
@@ -580,7 +580,7 @@ These options pertain to the contents for the DATA portion of the SMTP transacti
 
 Use argument as the entire contents of DATA, or prompt user if no argument specified.  If the argument '-' is provided the data will be read from STDIN.  If any other argument is provided and it represents the name of an open-able file, the contents of the file will be used.  Any other argument will be itself for the DATA contents.
 
-The value can be on one single line, with \n (ascii 0x5c, 0x6e) representing where line breaks should be placed.  Leading dots will be quoted.  Closing dot is not required but is allowed.  The default value for this option is "Date: %DATE%\nTo: %TO_ADDRESS%\nFrom: %FROM_ADDRESS%\nSubject: test %DATE%\nX-Mailer: swaks v$p_version jetmore.org/john/code/swaks/\n%NEW_HEADERS%\n%BODY%\n".
+The value can be on one single line, with \n (ascii 0x5c, 0x6e) representing where line breaks should be placed.  Leading dots will be quoted.  Closing dot is not required but is allowed.  The default value for this option is "Date: %DATE%\nTo: %TO_ADDRESS%\nFrom: %FROM_ADDRESS%\nSubject: test %DATE%\nMessage-Id: <%MESSAGEID%>\nX-Mailer: swaks v$p_version jetmore.org/john/code/swaks/\n%NEW_HEADERS%\n%BODY%\n".
 
 Very basic token parsing is performed on the DATA portion.  See --use-old-data-tokens for details about the single-character tokens marked as deprecated.  The following table shows the recognized tokens and their replacement values:
 
@@ -598,6 +598,10 @@ Replaced with the envelope-recipient(s).  Replaces the deprecated %T token.
 
 Replaced with the current time in a format suitable for inclusion in the Date: header.  Note this attempts to use the standard module Time::Local for timezone calculations.  If this module is unavailable the date string will be in GMT.  Replaces the deprecated %D token.
 
+=item %MESSAGEID%
+
+Replaced with the a message ID string suitable for use in a Message-Id header.  The value for this token will remain consistent for the life of the process.
+
 =item %NEW_HEADERS%
 
 Replaced with the contents of the --add-header option.  If --add-header is not specified this token is simply removed.  Replaces the deprecated %H token.
diff --git a/swaks b/swaks
@@ -1231,6 +1231,17 @@ sub interact {
 	return($response);
 }
 
+sub get_messageid {
+	if (!$G::message_id) {
+		my @time = localtime();
+		$G::message_id = sprintf("%04d%02d%02d%02d%02d%02d.%06d\@%s",
+		                         $time[5]+1900, $time[4]+1, $time[3], $time[2], $time[1], $time[0],
+		                         $$, get_hostname());
+	}
+
+	return($G::message_id);
+}
+
 sub get_hostname {
 	# in some cases hostname returns value but gethostbyname doesn't.
 	return("") if (!avail("hostname"));
@@ -2198,6 +2209,7 @@ sub process_args {
 		$n{data} = $o->{mail_data} || interact("Data: ", '^.*$');
 	}
 	$n{data} ||= 'Date: %DATE%\nTo: %TO_ADDRESS%\nFrom: %FROM_ADDRESS%\nSubject: test %DATE%\n' .
+	            "Message-Id: <%MESSAGEID%>\n" .
 	            "X-Mailer: swaks v$p_version jetmore.org/john/code/swaks/".'\n' .
 	            ($bound ? 'MIME-Version: 1.0\nContent-Type: multipart/mixed; boundary="'.$bound.'"\n' : '') .
 	            '%NEW_HEADERS%' . # newline will be added in replacement if it exists
@@ -2235,6 +2247,7 @@ sub process_args {
 		$n{data} =~ s/%FROM_ADDRESS%/$n{from}/g;
 		$n{data} =~ s/%F/$n{from}/g if ($O{use_old_data_tokens});
 		$n{data} =~ s/%TO_ADDRESS%/$n{to}/g;
+		$n{data} =~ s/%MESSAGEID%/get_messageid()/ge;
 		$n{data} =~ s/%T/$n{to}/g   if ($O{use_old_data_tokens});
 		{  # braces are to limit scope of $date_string
 			my $date_string = get_date_string();
