@@ -117,7 +117,7 @@ |
||
117 | 117 | } |
118 | 118 | |
119 | 119 | if (!is_array($config)) { |
120 | - throw new \Exception('Invalid configuration for consent store option: '.var_export($config, true)); |
|
120 | + throw new \Exception('Invalid configuration for consent store option: ' . var_export($config, true)); |
|
121 | 121 | } |
122 | 122 | |
123 | 123 | if (!array_key_exists(0, $config)) { |
@@ -20,18 +20,18 @@ |
||
20 | 20 | throw new Exception("Attempt to access the token management page unauthenticated."); |
21 | 21 | } |
22 | 22 | switch ($_POST['submit']) { |
23 | - case "NEVERMIND": |
|
24 | - \SimpleSAML\Auth\ProcessingChain::resumeProcessing($state); |
|
25 | - break; |
|
26 | - case "DELETE": |
|
27 | - if ($state['FIDO2AuthSuccessful'] == $_POST['credId']) { |
|
28 | - throw new Exception("Attempt to delete the currently used credential despite UI preventing this."); |
|
29 | - } |
|
30 | - $store = $state['webauthn:store']; |
|
31 | - $store->deleteTokenData($_POST['credId']); |
|
32 | - \SimpleSAML\Auth\ProcessingChain::resumeProcessing($state); |
|
33 | - break; |
|
34 | - default: |
|
35 | - throw new Exception("Unknown submit button state."); |
|
23 | + case "NEVERMIND": |
|
24 | + \SimpleSAML\Auth\ProcessingChain::resumeProcessing($state); |
|
25 | + break; |
|
26 | + case "DELETE": |
|
27 | + if ($state['FIDO2AuthSuccessful'] == $_POST['credId']) { |
|
28 | + throw new Exception("Attempt to delete the currently used credential despite UI preventing this."); |
|
29 | + } |
|
30 | + $store = $state['webauthn:store']; |
|
31 | + $store->deleteTokenData($_POST['credId']); |
|
32 | + \SimpleSAML\Auth\ProcessingChain::resumeProcessing($state); |
|
33 | + break; |
|
34 | + default: |
|
35 | + throw new Exception("Unknown submit button state."); |
|
36 | 36 | } |
37 | 37 |
@@ -170,16 +170,16 @@ |
||
170 | 170 | */ |
171 | 171 | $certProps = openssl_x509_parse($this->der2pem($stmtDecoded['x5c'][0])); |
172 | 172 | $this->debugBuffer .= "Attestation Certificate:" . print_r($certProps, true) . "<br/>"; |
173 | - if ($certProps['version'] != 2 || /** §8.2.1 Bullet 1 */ |
|
174 | - $certProps['subject']['OU'] != "Authenticator Attestation" || /** §8.2.1 Bullet 2 [Subject-OU] */ |
|
175 | - !isset($certProps['subject']['CN']) || /** §8.2.1 Bullet 2 [Subject-CN] */ |
|
173 | + if ($certProps['version'] != 2 || /** §8.2.1 Bullet 1 */ |
|
174 | + $certProps['subject']['OU'] != "Authenticator Attestation" || /** §8.2.1 Bullet 2 [Subject-OU] */ |
|
175 | + !isset($certProps['subject']['CN']) || /** §8.2.1 Bullet 2 [Subject-CN] */ |
|
176 | 176 | !isset($certProps['extensions']['basicConstraints']) || |
177 | 177 | strstr("CA:FALSE", $certProps['extensions']['basicConstraints']) === false /** §8.2.1 Bullet 4 */ |
178 | 178 | ) { |
179 | 179 | $this->fail("Attestation certificate properties are no good."); |
180 | 180 | } |
181 | 181 | if (isset(AAGUID::AAGUID_DICTIONARY[strtolower($this->AAGUID)])) { |
182 | - if ($certProps['subject']['O'] != AAGUID::AAGUID_DICTIONARY[strtolower($this->AAGUID)]['O'] || /** §8.2.1 Bullet 2 [Subject-O] */ |
|
182 | + if ($certProps['subject']['O'] != AAGUID::AAGUID_DICTIONARY[strtolower($this->AAGUID)]['O'] || /** §8.2.1 Bullet 2 [Subject-O] */ |
|
183 | 183 | $certProps['subject']['C'] != AAGUID::AAGUID_DICTIONARY[strtolower($this->AAGUID)]['C']) { /** §8.2.1 Bullet 2 [Subject-C] */ |
184 | 184 | $this->fail("AAGUID does not match vendor data."); |
185 | 185 | } |
@@ -73,10 +73,10 @@ |
||
73 | 73 | if ($debugEnabled) { |
74 | 74 | echo $authObject->debugBuffer; |
75 | 75 | echo $authObject->validateBuffer; |
76 | - echo "Debug mode, not continuing to ". ($state['FIDO2WantsRegister'] ? "credential registration page." : "destination."); |
|
76 | + echo "Debug mode, not continuing to " . ($state['FIDO2WantsRegister'] ? "credential registration page." : "destination."); |
|
77 | 77 | } else { |
78 | 78 | if ($state['FIDO2WantsRegister']) { |
79 | - header("Location: ".\SimpleSAML\Module::getModuleURL('webauthn/webauthn.php?StateId='.urlencode($id))); |
|
79 | + header("Location: " . \SimpleSAML\Module::getModuleURL('webauthn/webauthn.php?StateId=' . urlencode($id))); |
|
80 | 80 | } else { |
81 | 81 | \SimpleSAML\Auth\ProcessingChain::resumeProcessing($state); |
82 | 82 | } |