Skip to content
This repository has been archived by the owner on Mar 25, 2024. It is now read-only.

Finish deprecation of all U2F-specific classes #36

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
Make default login response configurable
  • Loading branch information
Firehed committed Oct 27, 2021
commit 287be4345689c84db8345c3845511302e55eaac4
44 changes: 30 additions & 14 deletions tests/ServerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,6 @@ private function getDefaultRegistrationResponse(array $overrides = []): Registra
{
// This data was manually extracted from an actual key exchange. It
// does NOT correspond to the values from getDefaultLoginResponse().
$mock = self::createMock(RegistrationResponseInterface::class);
$keyHandleBinary = hex2bin(
'6d4a7a7393fa51cf24dbe035f26cacc9868a9385320a099b17062ac0ddc11fc0'.
'0cb96b1a8fffe4736b7144c508fc343af81c104ba25e086ee5c1ba71da0c7d6d'
Expand Down Expand Up @@ -724,7 +723,7 @@ private function getDefaultRegistrationResponse(array $overrides = []): Registra
);
$defaults = [
'getAttestationCertificate' => $this->getDefaultAttestationCertificate(),
'getChallenge' => 'PfsWR1Umy2V5Al1Bam2tG0yfPLeJElfwRzzAzkYPgzo', // defaultregchallenge
'getChallenge' => 'PfsWR1Umy2V5Al1Bam2tG0yfPLeJElfwRzzAzkYPgzo', // getDefaultRegistrationChallenge
'getKeyHandleBinary' => $keyHandleBinary,
'getPublicKey' => $pk,
'getRpIdHash' => hash('sha256', 'https://u2f.ericstern.com', true),
Expand All @@ -734,6 +733,7 @@ private function getDefaultRegistrationResponse(array $overrides = []): Registra

$data = array_merge($defaults, $overrides);

$mock = self::createMock(RegistrationResponseInterface::class);
foreach ($data as $method => $value) {
$mock->method($method)->willReturn($value);
}
Expand Down Expand Up @@ -786,36 +786,52 @@ private function getDefaultRegistration(array $overrides = []): RegistrationInte
;
}

private function getDefaultLoginResponse(): LoginResponseInterface
/**
* @param array{
* getChallenge?: string,
* getCounter?: int,
* getKeyHandleBinary?: string,
* getSignature?: string,
* getSignedData?: string,
* } $overrides
*/
private function getDefaultLoginResponse(array $overrides = []): LoginResponseInterface
{
// This data was manually extracted from an actual key exchange. It
// does NOT correspond to the values from
// getDefaultRegistrationResponse().
$mock = self::createMock(LoginResponseInterface::class);
$mock->method('getChallenge')
->willReturn('wt2ze8IskcTO3nIsO2D2hFjE5tVD041NpnYesLpJweg');
$mock->method('getCounter')
->willReturn(45);
$mock->method('getKeyHandleBinary')->willReturn(hex2bin(
$keyHandleBinary = hex2bin(
'2549d54d2b4f9fe576f9b0aed1196f3dbba40691d30f9322d591a094339c374b'.
'c3e39ae74c3d015dd911b7bf21b93c09eed55ac53a927ad1e3af6dad0a39982d'
));
$mock->method('getSignature')->willReturn(hex2bin(
);
$signature = hex2bin(
'304602210093f2d51bc3d560b0d57657e77057c9d5ff2b27ff5d942e7854883e'.
'281117e0f6022100c776c9af98b1ad719d517d57a2801f873d7964863cac2e47'.
'e2a696ee042ca49e'
));
);
$challengeParamaeterJson = '{"typ":"navigator.id.getAssertion","chall'.
'enge":"wt2ze8IskcTO3nIsO2D2hFjE5tVD041NpnYesLpJweg","origin":"ht'.
'tps:https://u2f.ericstern.com","cid_pubkey":""}';
$mock->method('getSignedData')->willReturn(sprintf(
$signedData = sprintf(
'%s%s%s%s',
hash('sha256', 'https://u2f.ericstern.com', true),
chr(1),
pack('N', 45),
hash('sha256', $challengeParamaeterJson, true)
));
);

$defaults = [
'getChallenge' => 'wt2ze8IskcTO3nIsO2D2hFjE5tVD041NpnYesLpJweg', // getDefaultLoginChallenge
'getCounter' => 45,
'getKeyHandleBinary' => $keyHandleBinary,
'getSignature' => $signature,
'getSignedData' => $signedData,
];
$data = array_merge($defaults, $overrides);
$mock = self::createMock(LoginResponseInterface::class);
foreach ($data as $method => $result) {
$mock->method($method)->willReturn($result);
}
return $mock;
}

Expand Down