Fix bug where Message-ID domain part was tied to username instead of current identity (#5385)

CHANGELOG

@@ -33,6 +33,7 @@ CHANGELOG Roundcube Webmail
 - Use SymLinksIfOwnerMatch in .htaccess instead of FollowSymLinks disabled on some hosts for security reasons (#5370)
 - Wash position:fixed style in HTML mail for better security (#5264)
 - Fix bug where memcache_debug didn't work for session operations
+- Fix bug where Message-ID domain part was tied to username instead of current identity (#5385)
 
 RELEASE 1.2.1
 -------------

program/lib/Roundcube/rcube.php

@@ -1488,15 +1488,24 @@ class rcube
     /**
      * Unique Message-ID generator.
      *
+     * @param string $sender Optional sender e-mail address
+     *
      * @return string Message-ID
      */
-    public function gen_message_id()
+    public function gen_message_id($sender = null)
     {
         $local_part  = md5(uniqid('rcube'.mt_rand(), true));
-        $domain_part = $this->user->get_username('domain');
+        $domain_part = '';
+
+        if ($sender && preg_match('/@([^\s]+\.[a-z0-9-]+)/', $sender, $m)) {
+            $domain_part = $m[1];
+        }
+        else {
+            $domain_part = $this->user->get_username('domain');
+        }
 
         // Try to find FQDN, some spamfilters doesn't like 'localhost' (#1486924)
-        if (!preg_match('/\.[a-z]+$/i', $domain_part)) {
+        if (!preg_match('/\.[a-z0-9-]+$/i', $domain_part)) {
             foreach (array($_SERVER['HTTP_HOST'], $_SERVER['SERVER_NAME']) as $host) {
                 $host = preg_replace('/:[0-9]+$/', '', $host);
                 if ($host && preg_match('/\.[a-z]+$/i', $host)) {

program/steps/mail/func.inc

@@ -1839,7 +1839,7 @@ function rcmail_send_mdn($message, &$smtp_error)
             'From'       => $sender,
             'To'         => $message->headers->mdn_to,
             'Subject'    => $RCMAIL->gettext('receiptread') . ': ' . $message->subject,
-            'Message-ID' => $RCMAIL->gen_message_id(),
+            'Message-ID' => $RCMAIL->gen_message_id($identity['email']),
             'X-Sender'   => $identity['email'],
             'References' => trim($message->headers->references . ' ' . $message->headers->messageID),
             'In-Reply-To' => $message->headers->messageID,

program/steps/mail/sendmail.inc

@@ -63,11 +63,6 @@ if (!$savedraft) {
 
 /****** compose message ********/
 
-if (empty($COMPOSE['param']['message-id'])) {
-    $COMPOSE['param']['message-id'] = $RCMAIL->gen_message_id();
-}
-$message_id = $COMPOSE['param']['message-id'];
-
 // set default charset
 $message_charset = isset($_POST['_charset']) ? $_POST['_charset'] : $OUTPUT->get_charset();
 
@@ -123,6 +118,11 @@ if (!$from_string && $from) {
     $from_string = $from;
 }
 
+if (empty($COMPOSE['param']['message-id'])) {
+    $COMPOSE['param']['message-id'] = $RCMAIL->gen_message_id($from);
+}
+$message_id = $COMPOSE['param']['message-id'];
+
 // compose headers array
 $headers = array();