-
-
Notifications
You must be signed in to change notification settings - Fork 61
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
7 changed files
with
203 additions
and
173 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace Webauthn; | ||
|
|
||
| use CBOR\ByteStringObject; | ||
| use CBOR\Decoder; | ||
| use CBOR\ListObject; | ||
| use CBOR\MapObject; | ||
| use CBOR\NegativeIntegerObject; | ||
| use CBOR\TextStringObject; | ||
| use CBOR\UnsignedIntegerObject; | ||
| use function chr; | ||
| use function ord; | ||
| use Symfony\Component\Uid\Uuid; | ||
| use Webauthn\AuthenticationExtensions\AuthenticationExtensionsClientOutputsLoader; | ||
| use Webauthn\Exception\InvalidDataException; | ||
|
|
||
| final class AuthenticatorDataLoader | ||
| { | ||
| private readonly Decoder $decoder; | ||
|
|
||
| private function __construct() | ||
| { | ||
| $this->decoder = Decoder::create(); | ||
| } | ||
|
|
||
| public static function create(): self | ||
| { | ||
| return new self(); | ||
| } | ||
|
|
||
| public function load(string $authData): AuthenticatorData | ||
| { | ||
| $authData = $this->fixIncorrectEdDSAKey($authData); | ||
| $authDataStream = new StringStream($authData); | ||
| $rp_id_hash = $authDataStream->read(32); | ||
| $flags = $authDataStream->read(1); | ||
| $signCount = $authDataStream->read(4); | ||
| $signCount = unpack('N', $signCount); | ||
|
|
||
| $attestedCredentialData = null; | ||
| if (0 !== (ord($flags) & AuthenticatorData::FLAG_AT)) { | ||
| $aaguid = Uuid::fromBinary($authDataStream->read(16)); | ||
| $credentialLength = $authDataStream->read(2); | ||
| $credentialLength = unpack('n', $credentialLength); | ||
| $credentialId = $authDataStream->read($credentialLength[1]); | ||
| $credentialPublicKey = $this->decoder->decode($authDataStream); | ||
| $credentialPublicKey instanceof MapObject || throw InvalidDataException::create( | ||
| $authData, | ||
| 'The data does not contain a valid credential public key.' | ||
| ); | ||
| $attestedCredentialData = new AttestedCredentialData( | ||
| $aaguid, | ||
| $credentialId, | ||
| (string) $credentialPublicKey | ||
| ); | ||
| } | ||
|
|
||
| $extension = null; | ||
| if (0 !== (ord($flags) & AuthenticatorData::FLAG_ED)) { | ||
| $extension = $this->decoder->decode($authDataStream); | ||
| $extension = AuthenticationExtensionsClientOutputsLoader::load($extension); | ||
| } | ||
| $authDataStream->isEOF() || throw InvalidDataException::create( | ||
| $authData, | ||
| 'Invalid authentication data. Presence of extra bytes.' | ||
| ); | ||
| $authDataStream->close(); | ||
|
|
||
| return new AuthenticatorData( | ||
| $authData, | ||
| $rp_id_hash, | ||
| $flags, | ||
| $signCount[1], | ||
| $attestedCredentialData, | ||
| $extension | ||
| ); | ||
| } | ||
|
|
||
| private function fixIncorrectEdDSAKey(string $data): string | ||
| { | ||
| $needle = hex2bin('a301634f4b500327206745643235353139'); | ||
| $correct = hex2bin('a401634f4b500327206745643235353139'); | ||
| $position = mb_strpos($data, $needle, 0, '8bit'); | ||
| if ($position === false) { | ||
| return $data; | ||
| } | ||
|
|
||
| $begin = mb_substr($data, 0, $position, '8bit'); | ||
| $end = mb_substr($data, $position, null, '8bit'); | ||
| $end = str_replace($needle, $correct, $end); | ||
| $cbor = new StringStream($end); | ||
| $badKey = $this->decoder->decode($cbor); | ||
|
|
||
| ($badKey instanceof MapObject && $cbor->isEOF()) || throw InvalidDataException::create( | ||
| $end, | ||
| 'Invalid authentication data. Presence of extra bytes.' | ||
| ); | ||
| $badX = $badKey->get(-2); | ||
| $badX instanceof ListObject || throw InvalidDataException::create($end, 'Invalid authentication data.'); | ||
| $keyBytes = array_reduce( | ||
| $badX->normalize(), | ||
| static fn (string $carry, string $item): string => $carry . chr((int) $item), | ||
| '' | ||
| ); | ||
| $correctX = ByteStringObject::create($keyBytes); | ||
| $correctKey = MapObject::create() | ||
| ->add(UnsignedIntegerObject::create(1), ByteStringObject::create('OKP')) | ||
| ->add(UnsignedIntegerObject::create(3), NegativeIntegerObject::create(-8)) | ||
| ->add(NegativeIntegerObject::create(-1), TextStringObject::create('Ed25519')) | ||
| ->add(NegativeIntegerObject::create(-2), $correctX); | ||
|
|
||
| return $begin . $correctKey; | ||
| } | ||
| } |
Oops, something went wrong.