Max email length is 254 chars, Fixes #4011

kohana · Jul 12, 2011 · 986fb47 · 986fb47
1 parent 8f07118
commit 986fb47
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/classes/kohana/valid.php b/classes/kohana/valid.php
@@ -109,6 +109,11 @@ public static function equals($value, $required)
 	 */
 	public static function email($email, $strict = FALSE)
 	{
+		if (utf8::strlen($email) > 254)
+		{
+			return false;
+		}
+
 		if ($strict === TRUE)
 		{
 			$qtext = '[^\\x0d\\x22\\x5c\\x80-\\xff]';

diff --git a/tests/kohana/ValidTest.php b/tests/kohana/ValidTest.php
@@ -400,6 +400,8 @@ public function provider_email()
 			array('foo@bar.sub.com', FALSE, TRUE),
 			array('foo+asd@bar.sub.com', FALSE, TRUE),
 			array('foo.asd@bar.sub.com', FALSE, TRUE),
+			// RFC says 254 length max #4011
+			array(text::random(NULL, 200).'@'.text::random(NULL, 50).'.com', FALSE, FALSE),
 			// Empty test
 			array('', TRUE, FALSE),
 			array(NULL, TRUE, FALSE),