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

Silence PHP warnings.

Browse Source
This commit is contained in:
Simon Josefsson 2012-05-21 08:49:42 +02:00
parent 7c94240386
commit f2b05822ef
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ykval-munin-queuelength.php
View File

@ -26,7 +26,9 @@ if ($argc==2 && strcmp($argv[1], "config") == 0) {
} }
$sync = new SyncLib('ykval-verify:synclib'); $sync = new SyncLib('ykval-verify:synclib');
$sync->addField('ip', $_SERVER['REMOTE_ADDR']); if (isset($_SERVER['REMOTE_ADDR'])) {
$sync->addField('ip', $_SERVER['REMOTE_ADDR']);
}
$len = $sync->getQueueLength (); $len = $sync->getQueueLength ();
echo "queuelength.value $len\n"; echo "queuelength.value $len\n";

2
ykval-synclib.php
View File

@ -538,7 +538,7 @@ class SyncLib
while ($info = curl_multi_info_read($mh)) { while ($info = curl_multi_info_read($mh)) {
debug ("YK-KSM multi", $info); debug ("YK-KSM multi", $info);
if ($info['result'] == CURL_OK) { if ($info['result'] == CURLE_OK) {
$str = curl_multi_getcontent($info['handle']); $str = curl_multi_getcontent($info['handle']);
if (preg_match("/status=OK/", $str)) { if (preg_match("/status=OK/", $str)) {
$error = curl_error ($info['handle']); $error = curl_error ($info['handle']);

24
ykval-verify.php
View File

@ -39,7 +39,7 @@ $timestamp = getHttpVal('timestamp', 0);
$extra=array(); $extra=array();
if ($protocol_version>=2.0) { if ($protocol_version>=2.0) {
$extra['otp']=$otp; $extra['otp']=$otp;
} }
/* We have the OTP now, so let's add it to the logging */ /* We have the OTP now, so let's add it to the logging */
@ -59,7 +59,7 @@ if ($protocol_version>=2.0) {
sendResp(S_MISSING_PARAMETER); sendResp(S_MISSING_PARAMETER);
exit; exit;
} }
} }
/* Sanity check HTTP parameters /* Sanity check HTTP parameters
@ -75,10 +75,18 @@ if ($protocol_version>=2.0) {
*/ */
/* Change default protocol "strings" to numeric values */ /* Change default protocol "strings" to numeric values */
if (strcasecmp($sl, 'fast')==0) $sl=$baseParams['__YKVAL_SYNC_FAST_LEVEL__']; if (isset($sl) && strcasecmp($sl, 'fast')==0) {
if (strcasecmp($sl, 'secure')==0) $sl=$baseParams['__YKVAL_SYNC_SECURE_LEVEL__']; $sl=$baseParams['__YKVAL_SYNC_FAST_LEVEL__'];
if (!$sl) $sl=$baseParams['__YKVAL_SYNC_DEFAULT_LEVEL__']; }
if (!$timeout) $timeout=$baseParams['__YKVAL_SYNC_DEFAULT_TIMEOUT__']; if (isset($sl) && strcasecmp($sl, 'secure')==0) {
$sl=$baseParams['__YKVAL_SYNC_SECURE_LEVEL__'];
}
if (!isset($sl)) {
$sl=$baseParams['__YKVAL_SYNC_DEFAULT_LEVEL__'];
}
if (!isset($timeout)) {
$timeout=$baseParams['__YKVAL_SYNC_DEFAULT_TIMEOUT__'];
}
if ($otp == '') { if ($otp == '') {
$myLog->log(LOG_NOTICE, 'OTP is missing'); $myLog->log(LOG_NOTICE, 'OTP is missing');
@ -110,13 +118,13 @@ if ($timeout && preg_match("/^[0-9]+$/", $timeout)==0) {
exit; exit;
} }
if ($nonce && preg_match("/^[A-Za-z0-9]+$/", $nonce)==0) { if (isset($nonce) && preg_match("/^[A-Za-z0-9]+$/", $nonce)==0) {
$myLog->log(LOG_NOTICE, 'NONCE is provided but not correct'); $myLog->log(LOG_NOTICE, 'NONCE is provided but not correct');
sendResp(S_MISSING_PARAMETER); sendResp(S_MISSING_PARAMETER);
exit; exit;
} }
if ($nonce && (strlen($nonce) < 16 || strlen($nonce) > 40)) { if (isset($nonce) && (strlen($nonce) < 16 || strlen($nonce) > 40)) {
$myLog->log(LOG_NOTICE, 'Nonce too short or too long'); $myLog->log(LOG_NOTICE, 'Nonce too short or too long');
sendResp(S_MISSING_PARAMETER); sendResp(S_MISSING_PARAMETER);
exit; exit;