00

Author: francescobianco

Makefile

@@ -82,4 +82,4 @@ test-polyfill:
 	@docker-compose run --rm phpunit tests --filter PolyfillTest
 
 test-special:
-	@docker-compose run --rm phpunit tests --filter ErrorsTest::testWrongImapResourceAsInput
+	@docker-compose run --rm phpunit tests --filter HeaderInfoTest::testSanitizeAddress

README.md

@@ -116,3 +116,5 @@
 ## Reference
 
 - <https://www.atmail.com/blog/imap-commands/>
+- <https://developers.google.com/gmail/imap/xoauth2-protocol>
+- 

src/HeaderInfo.php

@@ -16,7 +16,7 @@ class HeaderInfo
 
     public static function fromMessage($message, $defaultHost)
     {
-        #file_put_contents('t3.json', json_encode($message, JSON_PRETTY_PRINT));
+        file_put_contents('t3.json', json_encode($message, JSON_PRETTY_PRINT));
 
         $replyTo = $message->replyto ?: $message->from;
 
@@ -26,13 +26,13 @@ public static function fromMessage($message, $defaultHost)
             'subject' => $message->subject,
             'Subject' => $message->subject,
             'message_id' => $message->envelope[9],
-            'toaddress' => $message->to,
+            'toaddress' => self::sanitizeAddress($message->to, $defaultHost),
             'to' => self::parseAddressList($message->to, $defaultHost),
-            'fromaddress' => $message->from,
+            'fromaddress' => self::sanitizeAddress($message->from, $defaultHost),
             'from' => self::parseAddressList($message->from, $defaultHost),
-            'reply_toaddress' => $replyTo ,
+            'reply_toaddress' => self::sanitizeAddress($replyTo, $defaultHost),
             'reply_to' => self::parseAddressList($replyTo, $defaultHost),
-            'senderaddress' => $message->from,
+            'senderaddress' => self::sanitizeAddress($message->from, $defaultHost),
             'sender' => self::parseAddressList($message->from, $defaultHost),
             'Recent' => ' ',
             'Unseen' => ' ',
@@ -68,5 +68,17 @@ protected static function parseAddressList($address, $defaultHost)
 
         return $customAddressList;
     }
+
+    public static function sanitizeAddress($address, $defaultHost)
+    {
+        $addressList = imap_rfc822_parse_adrlist($address, $defaultHost);
+
+        $sanitizedAddress = [];
+        foreach ($addressList as $addressEntry) {
+            $sanitizedAddress[] = imap_rfc822_write_address($addressEntry->mailbox, $addressEntry->host, $addressEntry->personal);
+        }
+
+        return implode(', ', $sanitizedAddress);
+    }
 }
 

tests/CompatibilityTest.php

@@ -464,8 +464,9 @@ public function testHeaderInfo()
         foreach ($messageNums as $messageNum) {
             $headerInfo1 = imap_headerinfo($imap1, $messageNum);
             $headerInfo2 = imap2_headerinfo($imap2, $messageNum);
-            file_put_contents('t1.json', json_encode($headerInfo1, JSON_PRETTY_PRINT));
-            file_put_contents('t2.json', json_encode($headerInfo2, JSON_PRETTY_PRINT));
+            #file_put_contents('t1.json', json_encode($headerInfo1, JSON_PRETTY_PRINT));
+            #file_put_contents('t2.json', json_encode($headerInfo2, JSON_PRETTY_PRINT));
+            #die();
             $this->assertEquals($headerInfo1, $headerInfo2);
         }
 

tests/HeaderInfoTest.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Javanile\Imap2\Tests;
+
+use Javanile\Imap2\Connection;
+use Javanile\Imap2\HeaderInfo;
+use PHPUnit\Framework\Error\Warning;
+
+class HeaderInfoTest extends ImapTestCase
+{
+    public function testSanitizeAddress()
+    {
+        $inputs = [
+            '"TeamViewer Sign In Confirmation" <[email protected]>' => 'TeamViewer Sign In Confirmation <[email protected]>',
+            '"Aruba.it" <[email protected]>' => '"Aruba.it" <[email protected]>',
+        ];
+
+        foreach ($inputs as $input => $output) {
+            $this->assertEquals($output, HeaderInfo::sanitizeAddress($input, 'localhost'));
+        }
+    }
+}