Allow long email addresses per rfc 5322

zendframework · Jun 10, 2015 · 154dc03 · 154dc03
1 parent a001a9f
commit 154dc03
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/EmailAddress.php b/src/EmailAddress.php
@@ -500,7 +500,8 @@ public function isValid($value)
 
         $this->hostname = $this->idnToUtf8($this->hostname);
 
-        if ((strlen($this->localPart) > 64) || (strlen($this->hostname) > 255)) {
+        // https://tools.ietf.org/html/rfc5322#section-2.1.1
+        if ((strlen($this->localPart) + strlen($this->hostname)) > 994) {
             $length = false;
             $this->error(self::LENGTH_EXCEEDED);
         }

diff --git a/test/EmailAddressTest.php b/test/EmailAddressTest.php
@@ -286,7 +286,13 @@ public function testComplexLocalValid()
             '/Bob.Jones@domain.com',
             '#Bob.Jones@domain.com',
             'Bob.Jones?@domain.com',
-            'Bob~Jones@domain.com'
+            'Bob~Jones@domain.com',
+            // RFC 5321 does mention a limit of 64 for the username,
+            // but it also states "To the maximum extent possible,
+            // implementation techniques that impose no limits on the
+            // length of these objects should be used.".
+            // http://tools.ietf.org/html/rfc5321#section-4.5.3.1
+            str_repeat('BobJones', 120).'@domain.com'
             ];
         foreach ($emailAddresses as $input) {
             $this->assertTrue($this->validator->isValid($input));
@@ -451,7 +457,9 @@ public function testHostnameValidatorMessagesShouldBeTranslated()
     public function testEmailsExceedingLength()
     {
         $emailAddresses = [
-            'thislocalpathoftheemailadressislongerthantheallowedsizeof64characters@domain.com',
+            // RFC 5322 mentions a limit of 998 per header line.
+            // https://tools.ietf.org/html/rfc5322#section-2.1.1
+            str_repeat('bob', 330) . '@i.com',
             'bob@verylongdomainsupercalifragilisticexpialidociousspoonfulofsugarverylongdomainsupercalifragilisticexpialidociousspoonfulofsugarverylongdomainsupercalifragilisticexpialidociousspoonfulofsugarverylongdomainsupercalifragilisticexpialidociousspoonfulofsugarexpialidociousspoonfulofsugar.com',
             ];
         foreach ($emailAddresses as $input) {