[mms] More thorough job trying to parse addresses that contain an @ b…

…ut no domain information.
horde · Jan 21, 2014 · 505f50f · 505f50f
1 parent d5a84d4
commit 505f50f
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 21 deletions.
diff --git a/framework/Mail/lib/Horde/Mail/Rfc822.php b/framework/Mail/lib/Horde/Mail/Rfc822.php
@@ -394,9 +394,15 @@ protected function _parseAddrSpec()
         $ob->mailbox = $this->_parseLocalPart();
 
         if ($this->_curr() == '@') {
-            $this->_rfc822ParseDomain($host);
-            if (strlen($host)) {
-                $ob->host = $host;
+            try {
+                $this->_rfc822ParseDomain($host);
+                if (strlen($host)) {
+                    $ob->host = $host;
+                }
+            } catch (Horde_Mail_Exception $e) {
+                if (!empty($this->_params['validate'])) {
+                    throw $e;
+                }
             }
         }
 

diff --git a/framework/Mail/package.xml b/framework/Mail/package.xml
@@ -21,7 +21,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/bsd">BSD-2-Clause</license>
  <notes>
-* 
+* [mms] More thorough job trying to parse addresses that contain an @ but no domain information.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -536,7 +536,7 @@
    <date>2014-01-17</date>
    <license uri="http://www.horde.org/licenses/bsd">BSD-2-Clause</license>
    <notes>
-* 
+* [mms] More thorough job trying to parse addresses that contain an @ but no domain information.
    </notes>
   </release>
  </changelog>

diff --git a/framework/Mail/test/Horde/Mail/ParseTest.php b/framework/Mail/test/Horde/Mail/ParseTest.php
@@ -554,27 +554,36 @@ public function testDefaultDomain()
         );
     }
 
-    public function testBareMailboxWithoutDefaultDomainWhenValidating()
+    public function testBareMailboxWithoutDefaultDomainWithoutValidating()
     {
-        $address = 'foo';
+        $addresses = array('foo', 'foo@');
 
-        try {
-            $this->rfc822->parseAddressList($address, array(
-                'default_domain' => null,
-                'validate' => true
+        foreach ($addresses as $val) {
+            $res = $this->rfc822->parseAddressList($val, array(
+                'default_domain' => null
             ));
-            $this->fail('An expected exception was not raised.');
-        } catch (Horde_Mail_Exception $e) {}
 
-        $address2 = 'foo@';
+            $this->assertEquals(
+                'foo',
+                $res[0]->mailbox
+            );
+            $this->assertNull($res[0]->host);
+        }
+    }
 
-        try {
-            $this->rfc822->parseAddressList($address2, array(
-                'default_domain' => null,
-                'validate' => true
-            ));
-            $this->fail('An expected exception was not raised.');
-        } catch (Horde_Mail_Exception $e) {}
+    public function testBareMailboxWithoutDefaultDomainWhenValidating()
+    {
+        $addresses = array('foo', 'foo@');
+
+        foreach ($addresses as $val) {
+            try {
+                $this->rfc822->parseAddressList($val, array(
+                    'default_domain' => null,
+                    'validate' => true
+                ));
+                $this->fail('An expected exception was not raised.');
+            } catch (Horde_Mail_Exception $e) {}
+        }
     }
 
 }