ElyBy-Mirror/oauth2-server
1
0
Fork 0
mirror of https://github.com/elyby/oauth2-server.git synced 2025-01-03 18:51:53 +05:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #370 from michaelhogg/fix-bug-hmac-encoding

Browse Source 
Fix bug: hash_hmac() should output raw binary data, not hexits
This commit is contained in:
Alex Bilbie 2015-09-04 08:36:33 +01:00
commit c3457107ee
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/TokenType/MAC.php
View File

@ -118,7 +118,14 @@ class MAC extends AbstractTokenType implements TokenTypeInterface
$calculatedSignatureParts[] = $params->get('ext'); $calculatedSignatureParts[] = $params->get('ext');
} }
$calculatedSignature = base64_encode(hash_hmac('sha256', implode("\n", $calculatedSignatureParts), $macKey)); $calculatedSignature = base64_encode(
hash_hmac(
'sha256',
implode("\n", $calculatedSignatureParts),
$macKey,
true // raw_output: outputs raw binary data
)
);
// Return the access token if the signature matches // Return the access token if the signature matches
return ($this->hash_equals($calculatedSignature, $signature)) ? $accessToken : null; return ($this->hash_equals($calculatedSignature, $signature)) ? $accessToken : null;

2
tests/unit/TokenType/MacTest.php
View File

@ -57,7 +57,7 @@ class MacTest extends \PHPUnit_Framework_TestCase
$request->getPort(), $request->getPort(),
'ext' 'ext'
]; ];
$calculatedSignature = base64_encode(hash_hmac('sha256', implode("\n", $calculatedSignatureParts), 'abcdef')); $calculatedSignature = base64_encode(hash_hmac('sha256', implode("\n", $calculatedSignatureParts), 'abcdef', true));
$request->headers->set('Authorization', sprintf('MAC id="foo", nonce="foo", ts="%s", mac="%s", ext="ext"', $ts, $calculatedSignature)); $request->headers->set('Authorization', sprintf('MAC id="foo", nonce="foo", ts="%s", mac="%s", ext="ext"', $ts, $calculatedSignature));