[Validator] - Bugfix for 18146 - EmailValidator cannot extract hostname if email contains multiple @ symbols

natechicago · natechicago · commit aed64862df79 · 2016-03-16T21:43:28.000-05:00
diff --git a/src/Symfony/Component/Validator/Constraints/EmailValidator.php b/src/Symfony/Component/Validator/Constraints/EmailValidator.php
@@ -93,7 +93,7 @@ public function validate($value, Constraint $constraint)
             return;
         }
 
-        $host = substr($value, strpos($value, '@') + 1);
+        $host = substr(strrchr($value, '@'), 1);
 
         // Check for host DNS resource records
         if ($constraint->checkMX) {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
@@ -69,6 +69,7 @@ public function getValidEmails()
             array('fabien@symfony.com'),
             array('example@example.co.uk'),
             array('fabien_potencier@example.fr'),
+            array('"very@uncommon"@example.com'),
         );
     }
 
@@ -143,4 +144,19 @@ public function getDnsChecks()
             array('AAAA', Email::HOST_CHECK_FAILED_ERROR),
         );
     }
+
+    public function testHostnameIsProperlyParsed()
+    {
+        DnsMock::withMockedHosts(array(
+            'baz.com' => array(array('type' => 'MX')),
+            '@bar"@baz.com' => array(array('type' => false)),
+        ));
+
+        $this->validator->validate(
+            '"foo@bar"@baz.com',
+            new Email(array('checkMX' => true))
+        );
+
+        $this->assertNoViolation();
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public function validate($value, Constraint $constraint)`
`93`	`93`	`return;`
`94`	`94`	`}`
`95`	`95`
`96`		`- $host = substr($value, strpos($value, '@') + 1);`
	`96`	`+ $host = substr(strrchr($value, '@'), 1);`
`97`	`97`
`98`	`98`	`// Check for host DNS resource records`
`99`	`99`	`if ($constraint->checkMX) {`