rooty/yubikey-val
1
0
Fork 0
mirror of https://github.com/Yubico/yubikey-val.git synced 2025-03-15 18:29:17 +01:00
Code Issues Projects Releases Wiki Activity

Avoid ambiguity with client id.

Browse Source 
- getHttpVal always returns a string,
	so always treat $client as a string in other checks.
This commit is contained in:
Jean Paul Galea 2016-04-18 16:10:42 +02:00
parent 28c64e64fb
commit 714d6c9117
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ykval-verify.php
View File

@ -99,7 +99,7 @@ $myLog->log(LOG_DEBUG, "found protocol version $protocol_version");
* Extract values from HTTP request * Extract values from HTTP request
*/ */
$h = getHttpVal('h', ''); $h = getHttpVal('h', '');
$client = getHttpVal('id', 0); $client = getHttpVal('id', '0');
$timestamp = getHttpVal('timestamp', 0); $timestamp = getHttpVal('timestamp', 0);
$otp = getHttpVal('otp', ''); $otp = getHttpVal('otp', '');
@ -113,7 +113,7 @@ if (preg_match('/^[jxe.uidchtnbpygk]+$/', $otp))
} }
$myLog->request->set('signed', ($h === '' ? '-' : 'signed')); $myLog->request->set('signed', ($h === '' ? '-' : 'signed'));
$myLog->request->set('client', ($client === 0 ? NULL : $client)); $myLog->request->set('client', ($client === '0' ? '-' : $client));
$myLog->request->set('otp', $otp); $myLog->request->set('otp', $otp);
@ -214,7 +214,7 @@ if (preg_match("/^[0-9]+$/", $client) == 0)
$myLog->log(LOG_NOTICE, 'id provided in request must be an integer'); $myLog->log(LOG_NOTICE, 'id provided in request must be an integer');
sendResp(S_MISSING_PARAMETER, $myLog); sendResp(S_MISSING_PARAMETER, $myLog);
} }
if ($client <= 0) if ($client === '0')
{ {
$myLog->log(LOG_NOTICE, 'Client ID is missing'); $myLog->log(LOG_NOTICE, 'Client ID is missing');
sendResp(S_MISSING_PARAMETER, $myLog); sendResp(S_MISSING_PARAMETER, $myLog);