mirror of
https://github.com/Yubico/yubikey-val.git
synced 2025-04-04 19:25:28 +02:00
Cosmetic changes.
This commit is contained in:
Jean Paul Galea
parent
ba160c9976
commit
23474aec31
@ -330,120 +330,123 @@ class SyncLib
|
||||
));
|
||||
}
|
||||
|
||||
public function reSync($older_than=60, $timeout)
|
||||
{
|
||||
$this->log(LOG_DEBUG, 'starting resync');
|
||||
/* Loop over all unique servers in queue */
|
||||
$queued_limit=time()-$older_than;
|
||||
$server_res=$this->db->customQuery("select distinct server from queue WHERE queued < " . $queued_limit . " or queued is null");
|
||||
public function reSync($older_than=60, $timeout)
|
||||
{
|
||||
$this->log(LOG_DEBUG, 'starting resync');
|
||||
/* Loop over all unique servers in queue */
|
||||
$queued_limit=time()-$older_than;
|
||||
$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)) {
|
||||
$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'] . "'");
|
||||
$ch = curl_init();
|
||||
while ($my_server=$this->db->fetchArray($server_res)) {
|
||||
$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'] . "'");
|
||||
$ch = curl_init();
|
||||
|
||||
while ($entry=$this->db->fetchArray($res)) {
|
||||
$this->log(LOG_INFO, "server=" . $entry['server'] . ", server_nonce=" . $entry['server_nonce'] . ", info=" . $entry['info']);
|
||||
$url=$entry['server'] .
|
||||
"?otp=" . $entry['otp'] .
|
||||
"&modified=" . $entry['modified'] .
|
||||
"&" . $this->otpPartFromInfoString($entry['info']);
|
||||
while ($entry=$this->db->fetchArray($res)) {
|
||||
$this->log(LOG_INFO, "server=" . $entry['server'] . ", server_nonce=" . $entry['server_nonce'] . ", info=" . $entry['info']);
|
||||
$url=$entry['server'] .
|
||||
"?otp=" . $entry['otp'] .
|
||||
"&modified=" . $entry['modified'] .
|
||||
"&" . $this->otpPartFromInfoString($entry['info']);
|
||||
|
||||
/* Send out sync request */
|
||||
/* Send out sync request */
|
||||
|
||||
curl_settings($this, "YK-VAL resync", $ch, $url, $timeout, $this->curlopts);
|
||||
curl_settings($this, "YK-VAL resync", $ch, $url, $timeout, $this->curlopts);
|
||||
|
||||
$response = curl_exec($ch);
|
||||
$response = curl_exec($ch);
|
||||
|
||||
if ($response==False) {
|
||||
$this->log(LOG_NOTICE, 'Timeout. Stopping queue resync for server ' . $entry['server']);
|
||||
break;
|
||||
}
|
||||
if ($response==False) {
|
||||
$this->log(LOG_NOTICE, 'Timeout. Stopping queue resync for server ' . $entry['server']);
|
||||
break;
|
||||
}
|
||||
|
||||
if (preg_match("/status=OK/", $response)) {
|
||||
$resParams=$this->parseParamsFromMultiLineString($response);
|
||||
$this->log(LOG_DEBUG, "response contains ", $resParams);
|
||||
if (preg_match("/status=OK/", $response))
|
||||
{
|
||||
$resParams=$this->parseParamsFromMultiLineString($response);
|
||||
$this->log(LOG_DEBUG, "response contains ", $resParams);
|
||||
|
||||
/* Update database counters */
|
||||
$this->updateDbCounters($resParams);
|
||||
/* Update database counters */
|
||||
$this->updateDbCounters($resParams);
|
||||
|
||||
/* Retrieve info from entry info string */
|
||||
/* Retrieve info from entry info string */
|
||||
|
||||
/* This is the counter values we had in our database *before* processing the current OTP. */
|
||||
$validationParams=$this->localParamsFromInfoString($entry['info']);
|
||||
/* This is the data from the current OTP. */
|
||||
$otpParams=$this->otpParamsFromInfoString($entry['info']);
|
||||
/* This is the counter values we had in our database *before* processing the current OTP. */
|
||||
$validationParams=$this->localParamsFromInfoString($entry['info']);
|
||||
/* This is the data from the current OTP. */
|
||||
$otpParams=$this->otpParamsFromInfoString($entry['info']);
|
||||
|
||||
/* Fetch current information from our database */
|
||||
$localParams=$this->getLocalParams($otpParams['yk_publicname']);
|
||||
/* Fetch current information from our database */
|
||||
$localParams=$this->getLocalParams($otpParams['yk_publicname']);
|
||||
|
||||
$this->log(LOG_DEBUG, "validation params: ", $validationParams);
|
||||
$this->log(LOG_DEBUG, "OTP params: ", $otpParams);
|
||||
$this->log(LOG_DEBUG, "validation params: ", $validationParams);
|
||||
$this->log(LOG_DEBUG, "OTP params: ", $otpParams);
|
||||
|
||||
/* Check for warnings */
|
||||
/* Check for warnings */
|
||||
|
||||
if ($this->countersHigherThan($validationParams, $resParams)) {
|
||||
$this->log(LOG_NOTICE, "Remote server out of sync compared to counters at validation request time. ");
|
||||
}
|
||||
if ($this->countersHigherThan($validationParams, $resParams)) {
|
||||
$this->log(LOG_NOTICE, "Remote server out of sync compared to counters at validation request time. ");
|
||||
}
|
||||
|
||||
if ($this->countersHigherThan($resParams, $validationParams)) {
|
||||
if ($this->countersEqual($resParams, $otpParams)) {
|
||||
$this->log(LOG_INFO, "Remote server had received the current counter values already. ");
|
||||
} else {
|
||||
$this->log(LOG_NOTICE, "Local server out of sync compared to counters at validation request time. ");
|
||||
}
|
||||
}
|
||||
if ($this->countersHigherThan($resParams, $validationParams)) {
|
||||
if ($this->countersEqual($resParams, $otpParams)) {
|
||||
$this->log(LOG_INFO, "Remote server had received the current counter values already. ");
|
||||
} else {
|
||||
$this->log(LOG_NOTICE, "Local server out of sync compared to counters at validation request time. ");
|
||||
}
|
||||
}
|
||||
|
||||
if ($this->countersHigherThan($localParams, $resParams)) {
|
||||
$this->log(LOG_WARNING, "Remote server out of sync compared to current local counters. ");
|
||||
}
|
||||
if ($this->countersHigherThan($localParams, $resParams)) {
|
||||
$this->log(LOG_WARNING, "Remote server out of sync compared to current local counters. ");
|
||||
}
|
||||
|
||||
if ($this->countersHigherThan($resParams, $localParams)) {
|
||||
$this->log(LOG_WARNING, "Local server out of sync compared to current local counters. Local server updated. ");
|
||||
}
|
||||
if ($this->countersHigherThan($resParams, $localParams)) {
|
||||
$this->log(LOG_WARNING, "Local server out of sync compared to current local counters. Local server updated. ");
|
||||
}
|
||||
|
||||
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. ");
|
||||
}
|
||||
elseif ($this->countersEqual($resParams, $otpParams)
|
||||
&& $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.");
|
||||
}
|
||||
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. ");
|
||||
}
|
||||
elseif ($this->countersEqual($resParams, $otpParams)
|
||||
&& $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.");
|
||||
}
|
||||
|
||||
/* Deletion */
|
||||
$this->log(LOG_DEBUG, 'deleting queue entry with modified=' . $entry['modified'] .
|
||||
' server_nonce=' . $entry['server_nonce'] .
|
||||
' server=' . $entry['server']);
|
||||
/* Deletion */
|
||||
$this->log(LOG_DEBUG, 'deleting queue entry with modified=' . $entry['modified'] .
|
||||
' server_nonce=' . $entry['server_nonce'] .
|
||||
' server=' . $entry['server']);
|
||||
|
||||
$this->db->deleteByMultiple('queue', array(
|
||||
'modified' => $entry['modified'],
|
||||
'server_nonce' => $entry['server_nonce'],
|
||||
'server' => $entry['server']
|
||||
));
|
||||
$this->db->deleteByMultiple('queue', array(
|
||||
'modified' => $entry['modified'],
|
||||
'server_nonce' => $entry['server_nonce'],
|
||||
'server' => $entry['server']
|
||||
));
|
||||
|
||||
}
|
||||
else if (preg_match("/status=BAD_OTP/", $response)) {
|
||||
$this->log(LOG_WARNING, "Remote server says BAD_OTP, pointless to try again, removing from queue.");
|
||||
$this->db->deleteByMultiple('queue', array(
|
||||
'modified' => $entry['modified'],
|
||||
'server_nonce' => $entry['server_nonce'],
|
||||
'server' => $entry['server']
|
||||
));
|
||||
}
|
||||
else {
|
||||
$this->log(LOG_ERR, "Remote server refused our sync request. Check remote server logs.");
|
||||
}
|
||||
}
|
||||
else if (preg_match("/status=BAD_OTP/", $response))
|
||||
{
|
||||
$this->log(LOG_WARNING, "Remote server says BAD_OTP, pointless to try again, removing from queue.");
|
||||
$this->db->deleteByMultiple('queue', array(
|
||||
'modified' => $entry['modified'],
|
||||
'server_nonce' => $entry['server_nonce'],
|
||||
'server' => $entry['server']
|
||||
));
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->log(LOG_ERR, "Remote server refused our sync request. Check remote server logs.");
|
||||
}
|
||||
|
||||
} /* End of loop over each queue entry for a server */
|
||||
} /* End of loop over each queue entry for a server */
|
||||
|
||||
curl_close($ch);
|
||||
$this->db->closeCursor($res);
|
||||
curl_close($ch);
|
||||
$this->db->closeCursor($res);
|
||||
|
||||
} /* End of loop over each distinct server in queue */
|
||||
} /* End of loop over each distinct server in queue */
|
||||
|
||||
$this->db->closeCursor($server_res);
|
||||
return true;
|
||||
}
|
||||
$this->db->closeCursor($server_res);
|
||||
return true;
|
||||
}
|
||||
|
||||
public function sync($ans_req, $timeout=1)
|
||||
{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user