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

Authorization header should only be rebuild when Basic Auth scheme is used

Browse Source
This commit is contained in:
Miha Vrhovnik 2012-06-11 15:58:15 +02:00
parent 27100ba4eb
commit 5d88255d4e
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/HttpFoundation/ServerBag.php
View File

@ -56,8 +56,8 @@ class ServerBag extends ParameterBag
$authorizationHeader = $this->parameters['REDIRECT_HTTP_AUTHORIZATION']; $authorizationHeader = $this->parameters['REDIRECT_HTTP_AUTHORIZATION'];
} }
// Decode AUTHORIZATION header into PHP_AUTH_USER and PHP_AUTH_PW // Decode AUTHORIZATION header into PHP_AUTH_USER and PHP_AUTH_PW when authorization header is basic
if (null !== $authorizationHeader) { if ((null !== $authorizationHeader) && (0 === stripos($authorizationHeader, 'basic'))) {
$exploded = explode(':', base64_decode(substr($authorizationHeader, 6))); $exploded = explode(':', base64_decode(substr($authorizationHeader, 6)));
if (count($exploded) == 2) { if (count($exploded) == 2) {
list($headers['PHP_AUTH_USER'], $headers['PHP_AUTH_PW']) = $exploded; list($headers['PHP_AUTH_USER'], $headers['PHP_AUTH_PW']) = $exploded;

10
tests/Symfony/Tests/Component/HttpFoundation/ServerBagTest.php
View File

@ -88,4 +88,14 @@ class ServerBagTest extends \PHPUnit_Framework_TestCase
'PHP_AUTH_PW' => '' 'PHP_AUTH_PW' => ''
), $bag->getHeaders()); ), $bag->getHeaders());
} }
public function testOAuthBearerAuth()
{
$headerContent = 'Bearer L-yLEOr9zhmUYRkzN1jwwxwQ-PBNiKDc8dgfB4hTfvo';
$bag = new ServerBag(array('HTTP_AUTHORIZATION' => $headerContent));
$this->assertEquals(array(
'AUTHORIZATION' => $headerContent,
), $bag->getHeaders());
}
} }