diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Security/Http] fix parsing X509 emailAddress

Browse Source
This commit is contained in:
Nicolas Grekas 2019-09-30 14:24:32 +02:00
parent 03f2adcb4e
commit fceb86bde6
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Security/Http/Firewall/X509AuthenticationListener.php
View File

@ -46,7 +46,7 @@ class X509AuthenticationListener extends AbstractPreAuthenticatedListener
$user = $request->server->get($this->userKey); $user = $request->server->get($this->userKey);
} elseif ( } elseif (
$request->server->has($this->credentialKey) $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]; $user = $matches[1];
} }

1
src/Symfony/Component/Security/Http/Tests/Firewall/X509AuthenticationListenerTest.php
View File

@ -81,6 +81,7 @@ class X509AuthenticationListenerTest extends TestCase
yield ['cert+something@example.com', 'CN=Sample certificate DN,emailAddress=cert+something@example.com']; 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,CN=Sample certificate DN'];
yield ['cert+something@example.com', 'emailAddress=cert+something@example.com']; 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() public function testGetPreAuthenticatedDataNoData()