[Security/Http] fix parsing X509 emailAddress

Author: nicolas-grekas

Firewall/X509AuthenticationListener.php

@@ -46,7 +46,7 @@ protected function getPreAuthenticatedData(Request $request)
             $user = $request->server->get($this->userKey);
         } elseif (
             $request->server->has($this->credentialKey)
-            && preg_match('#emailAddress=(.+\@.+\.[^,/]+)($|,|/)#', $request->server->get($this->credentialKey), $matches)
+            && preg_match('#emailAddress=([^,/@]++@[^,/]++)#', $request->server->get($this->credentialKey), $matches)
         ) {
             $user = $matches[1];
         }

Tests/Firewall/X509AuthenticationListenerTest.php

@@ -81,6 +81,7 @@ public static function dataProviderGetPreAuthenticatedDataNoUser()
         yield ['cert+something@example.com', 'CN=Sample certificate DN,emailAddress=cert+something@example.com'];
         yield ['cert+something@example.com', 'emailAddress=cert+something@example.com,CN=Sample certificate DN'];
         yield ['cert+something@example.com', 'emailAddress=cert+something@example.com'];
+        yield ['firstname.lastname@mycompany.co.uk', 'emailAddress=firstname.lastname@mycompany.co.uk,CN=Firstname.Lastname,OU=london,OU=company design and engineering,OU=Issuer London,OU=Roaming,OU=Interactive,OU=Users,OU=Standard,OU=Business,DC=england,DC=core,DC=company,DC=co,DC=uk'];
     }
 
     public function testGetPreAuthenticatedDataNoData()