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

Cosmetic changes.

Browse Source
This commit is contained in:
Jean Paul Galea 2015-07-17 23:59:26 +02:00
parent 23474aec31
commit 39ce50b772
1 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ykval-synclib.php
View File

@ -333,17 +333,23 @@ class SyncLib
public function reSync($older_than=60, $timeout) public function reSync($older_than=60, $timeout)
{ {
$this->log(LOG_DEBUG, 'starting resync'); $this->log(LOG_DEBUG, 'starting resync');
/* Loop over all unique servers in queue */ /* Loop over all unique servers in queue */
$queued_limit = time()-$older_than; $queued_limit = time()-$older_than;
$server_res = $this->db->customQuery("select distinct server from queue WHERE queued < " . $queued_limit . " or queued is null"); $server_res = $this->db->customQuery("select distinct server from queue WHERE queued < " . $queued_limit . " or queued is null");
while ($my_server=$this->db->fetchArray($server_res)) { while ($my_server=$this->db->fetchArray($server_res))
{
$this->log(LOG_DEBUG, "Processing queue for server " . $my_server['server']); $this->log(LOG_DEBUG, "Processing queue for server " . $my_server['server']);
$res = $this->db->customQuery("select * from queue WHERE (queued < " . $queued_limit . " or queued is null) and server='" . $my_server['server'] . "'"); $res = $this->db->customQuery("select * from queue WHERE (queued < " . $queued_limit . " or queued is null) and server='" . $my_server['server'] . "'");
$ch = curl_init(); $ch = curl_init();
while ($entry=$this->db->fetchArray($res)) { while ($entry=$this->db->fetchArray($res))
{
$this->log(LOG_INFO, "server=" . $entry['server'] . ", server_nonce=" . $entry['server_nonce'] . ", info=" . $entry['info']); $this->log(LOG_INFO, "server=" . $entry['server'] . ", server_nonce=" . $entry['server_nonce'] . ", info=" . $entry['info']);
$url = $entry['server'] . $url = $entry['server'] .
"?otp=" . $entry['otp'] . "?otp=" . $entry['otp'] .
"&modified=" . $entry['modified'] . "&modified=" . $entry['modified'] .
@ -355,7 +361,8 @@ class SyncLib
$response = curl_exec($ch); $response = curl_exec($ch);
if ($response==False) { if ($response == False)
{
$this->log(LOG_NOTICE, 'Timeout. Stopping queue resync for server ' . $entry['server']); $this->log(LOG_NOTICE, 'Timeout. Stopping queue resync for server ' . $entry['server']);
break; break;
} }
@ -372,6 +379,7 @@ class SyncLib
/* This is the counter values we had in our database *before* processing the current OTP. */ /* This is the counter values we had in our database *before* processing the current OTP. */
$validationParams = $this->localParamsFromInfoString($entry['info']); $validationParams = $this->localParamsFromInfoString($entry['info']);
/* This is the data from the current OTP. */ /* This is the data from the current OTP. */
$otpParams = $this->otpParamsFromInfoString($entry['info']); $otpParams = $this->otpParamsFromInfoString($entry['info']);
@ -383,31 +391,39 @@ class SyncLib
/* Check for warnings */ /* Check for warnings */
if ($this->countersHigherThan($validationParams, $resParams)) { if ($this->countersHigherThan($validationParams, $resParams))
{
$this->log(LOG_NOTICE, "Remote server out of sync compared to counters at validation request time. "); $this->log(LOG_NOTICE, "Remote server out of sync compared to counters at validation request time. ");
} }
if ($this->countersHigherThan($resParams, $validationParams)) { if ($this->countersHigherThan($resParams, $validationParams))
if ($this->countersEqual($resParams, $otpParams)) { {
if ($this->countersEqual($resParams, $otpParams))
{
$this->log(LOG_INFO, "Remote server had received the current counter values already. "); $this->log(LOG_INFO, "Remote server had received the current counter values already. ");
} else { }
else
{
$this->log(LOG_NOTICE, "Local server out of sync compared to counters at validation request time. "); $this->log(LOG_NOTICE, "Local server out of sync compared to counters at validation request time. ");
} }
} }
if ($this->countersHigherThan($localParams, $resParams)) { if ($this->countersHigherThan($localParams, $resParams))
{
$this->log(LOG_WARNING, "Remote server out of sync compared to current local counters. "); $this->log(LOG_WARNING, "Remote server out of sync compared to current local counters. ");
} }
if ($this->countersHigherThan($resParams, $localParams)) { if ($this->countersHigherThan($resParams, $localParams))
{
$this->log(LOG_WARNING, "Local server out of sync compared to current local counters. Local server updated. "); $this->log(LOG_WARNING, "Local server out of sync compared to current local counters. Local server updated. ");
} }
if ($this->countersHigherThan($resParams, $otpParams)) { if ($this->countersHigherThan($resParams, $otpParams))
{
$this->log(LOG_ERR, "Remote server has higher counters than OTP. This response would have marked the OTP as invalid. "); $this->log(LOG_ERR, "Remote server has higher counters than OTP. This response would have marked the OTP as invalid. ");
} }
elseif ($this->countersEqual($resParams, $otpParams) elseif ($this->countersEqual($resParams, $otpParams) && $resParams['nonce']!=$otpParams['nonce'])
&& $resParams['nonce']!=$otpParams['nonce']) { {
$this->log(LOG_ERR, "Remote server has equal counters as OTP and nonce differs. This response would have marked the OTP as invalid."); $this->log(LOG_ERR, "Remote server has equal counters as OTP and nonce differs. This response would have marked the OTP as invalid.");
} }