@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | use SimpleSAML\Logger; |
14 | 14 | use SimpleSAML\Module; |
15 | 15 | use SimpleSAML\Utils; |
16 | -use SimpleSAML\XHTML\Template;; |
|
16 | +use SimpleSAML\XHTML\Template; ; |
|
17 | 17 | use Webmozart\Assert\Assert; |
18 | 18 | |
19 | 19 | $globalConfig = Configuration::getInstance(); |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | $frontendData = []; |
62 | 62 | $frontendData['challengeEncoded'] = $challengeEncoded; |
63 | 63 | $frontendData['state'] = []; |
64 | -foreach (['Source','FIDO2Scope','FIDO2Username','FIDO2Displayname','requestTokenModel'] as $stateItem) { |
|
64 | +foreach (['Source', 'FIDO2Scope', 'FIDO2Username', 'FIDO2Displayname', 'requestTokenModel'] as $stateItem) { |
|
65 | 65 | Assert::isArray($state[$stateItem]); |
66 | 66 | $frontendData['state'][$stateItem] = $state[$stateItem]; |
67 | 67 | } |
@@ -162,7 +162,7 @@ |
||
162 | 162 | { |
163 | 163 | $st = $this->db->write( |
164 | 164 | 'INSERT INTO credentials ' . |
165 | - '(user_id, credentialId, credential, signCounter, friendlyName) VALUES (:userId,:credentialId,'. |
|
165 | + '(user_id, credentialId, credential, signCounter, friendlyName) VALUES (:userId,:credentialId,' . |
|
166 | 166 | ':credential,:signCounter,:friendlyName)', |
167 | 167 | [ |
168 | 168 | 'userId' => $userId, |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -require_once(dirname(dirname(dirname(__DIR__))).'/vendor/autoload.php'); |
|
3 | +require_once(dirname(dirname(dirname(__DIR__))) . '/vendor/autoload.php'); |
|
4 | 4 | |
5 | 5 | use Lcobucci\JWT\Parser; |
6 | 6 | use SimpleSAML\Utils\Config as SSPConfig; |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | ); |
14 | 14 | } |
15 | 15 | |
16 | -$toc = file_get_contents('https://mds2.fidoalliance.org/?token='.$argv[1]); |
|
16 | +$toc = file_get_contents('https://mds2.fidoalliance.org/?token=' . $argv[1]); |
|
17 | 17 | |
18 | 18 | const YUBICO_CA = "MIIDHjCCAgagAwIBAgIEG0BT9zANBgkqhkiG9w0BAQsFADAuMSwwKgYDVQQDEyNZdWJpY28gVTJGIFJvb3QgQ0EgU2VyaWFsIDQ1NzIwMDYzMTAgFw0xNDA4MDEwMDAwMDBaGA8yMDUwMDkwNDAwMDAwMFowLjEsMCoGA1UEAxMjWXViaWNvIFUyRiBSb290IENBIFNlcmlhbCA0NTcyMDA2MzEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/jwYuhBVlqaiYWEMsrWFisgJ+PtM91eSrpI4TK7U53mwCIawSDHy8vUmk5N2KAj9abvT9NP5SMS1hQi3usxoYGonXQgfO6ZXyUA9a+KAkqdFnBnlyugSeCOep8EdZFfsaRFtMjkwz5Gcz2Py4vIYvCdMHPtwaz0bVuzneueIEz6TnQjE63Rdt2zbwnebwTG5ZybeWSwbzy+BJ34ZHcUhPAY89yJQXuE0IzMZFcEBbPNRbWECRKgjq//qT9nmDOFVlSRCt2wiqPSzluwn+v+suQEBsUjTGMEd25tKXXTkNW21wIWbxeSyUoTXwLvGS6xlwQSgNpk2qXYwf8iXg7VWZAgMBAAGjQjBAMB0GA1UdDgQWBBQgIvz0bNGJhjgpToksyKpP9xv9oDAPBgNVHRMECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAjvjuOMDSa+JXFCLyBKsycXtBVZsJ4Ue3LbaEsPY4MYN/hIQ5ZM5p7EjfcnMG4CtYkNsfNHc0AhBLdq45rnT87q/6O3vUEtNMafbhU6kthX7Y+9XFN9NpmYxr+ekVY5xOxi8h9JDIgoMP4VB1uS0aunL1IGqrNooL9mmFnL2kLVVee6/VR6C5+KSTCMCWppMuJIZII2v9o4dkoZ8Y7QRjQlLfYzd3qGtKbw7xaF1UsG/5xUb/Btwb2X2g4InpiB/yt/3CpQXpiWX/K4mBvUKiGn05ZsqeY1gx4g0xLBqcU9psmyPzK+Vsgw2jeRQ5JlKDyqE0hebfC1tvFu0CCrJFcw=="; |
19 | 19 | |
@@ -21,13 +21,13 @@ discard block |
||
21 | 21 | |
22 | 22 | $res = []; |
23 | 23 | foreach ($token->getClaim('entries') as $oneEntryObject) { |
24 | - $thisUrl = $oneEntryObject->url."?token=".$argv[1]; |
|
24 | + $thisUrl = $oneEntryObject->url . "?token=" . $argv[1]; |
|
25 | 25 | $mdB64 = file_get_contents($thisUrl); |
26 | 26 | $mdArray = json_decode(base64_decode($mdB64), true); |
27 | 27 | if (isset($mdArray['aaguid']) && isset($mdArray['attestationRootCertificates'][0])) { |
28 | 28 | $compressedAaguid = strtolower(str_replace('-', '', $mdArray['aaguid'])); |
29 | 29 | // we need C and O values for the attestation certificates. Extract those from the first root |
30 | - $x509 = openssl_x509_parse("-----BEGIN CERTIFICATE-----\n".$mdArray['attestationRootCertificates'][0]."\n-----END CERTIFICATE-----"); |
|
30 | + $x509 = openssl_x509_parse("-----BEGIN CERTIFICATE-----\n" . $mdArray['attestationRootCertificates'][0] . "\n-----END CERTIFICATE-----"); |
|
31 | 31 | // print_r($x509); |
32 | 32 | if (isset($x509['subject']['C']) && isset($x509['subject']['O'])) { |
33 | 33 | $res[$compressedAaguid] = [ |
@@ -92,6 +92,6 @@ discard block |
||
92 | 92 | ]; |
93 | 93 | |
94 | 94 | file_put_contents( |
95 | - SSPConfig::getConfigDir().'/'.AAGUID::AAGUID_CONFIG_FILE, |
|
95 | + SSPConfig::getConfigDir() . '/' . AAGUID::AAGUID_CONFIG_FILE, |
|
96 | 96 | json_encode($res, JSON_PRETTY_PRINT) |
97 | 97 | ); |