MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

chg: [internal] Server sync debug message when pushing events

pull/9685/head
Jakub Onderka 2024-04-15 18:30:21 +02:00
parent 8934982ff2
commit 3fbffba3f0
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Lib/Tools/ServerSyncTool.php
View File

@ -62,7 +62,7 @@ class ServerSyncTool
$url = $this->server['Server']['url'] . '/events/view/' . $event['Event']['uuid'];
$start = microtime(true);
$exists = $this->socket->head($url, [], $this->request);
$this->log($start, 'HEAD', $url, $exists);
$this->requestLog($start, 'HEAD', $url, $exists);
if ($exists->code == '404') {
return false;
}
@ -152,13 +152,14 @@ class ServerSyncTool
*/
public function createEvent(array $event)
{
$this->debug("Pushing new event #{$event['Event']['id']} to remote server");
$logMessage = "Pushing Event #{$event['Event']['id']} to Server #{$this->serverId()}";
return $this->post("/events/add/metadata:1", $event, $logMessage);
}
/**
* @param array $event
* @param int|string|null Event ID or UUID that should be updated. If not provieded, UUID from $event will be used
* @param int|string|null $eventId Event ID or UUID that should be updated. If not provided, UUID from $event will be used
* @return HttpSocketResponseExtended
* @throws HttpSocketHttpException
* @throws HttpSocketJsonException
@ -168,6 +169,7 @@ class ServerSyncTool
if ($eventId === null) {
$eventId = $event['Event']['uuid'];
}
$this->debug("Pushing updated event #{$event['Event']['id']} to remote server");
$logMessage = "Pushing Event #{$event['Event']['id']} to Server #{$this->serverId()}";
return $this->post("/events/edit/$eventId/metadata:1", $event, $logMessage);
}
@ -526,7 +528,7 @@ class ServerSyncTool
$url = $this->server['Server']['url'] . $url;
$start = microtime(true);
$response = $this->socket->get($url, [], $this->request);
$this->log($start, 'GET', $url, $response);
$this->requestLog($start, 'GET', $url, $response);
if (!$response->isOk()) {
throw new HttpSocketHttpException($response, $url);
}
@ -587,7 +589,7 @@ class ServerSyncTool
$url = $this->server['Server']['url'] . $url;
$start = microtime(true);
$response = $this->socket->post($url, $data, $request);
$this->log($start, 'POST', $url, $response);
$this->requestLog($start, 'POST', $url, $response);
if ($etag && $response->isNotModified()) {
return $response; // if etag was provided and response code is 304, it is valid response
}
@ -653,7 +655,7 @@ class ServerSyncTool
* @param string $url
* @param HttpSocketResponse $response
*/
private function log($start, $method, $url, HttpSocketResponse $response)
private function requestLog($start, $method, $url, HttpSocketResponse $response)
{
$duration = round(microtime(true) - $start, 3);
$responseSize = strlen($response->body);

3
app/Model/Event.php
View File

@ -928,7 +928,8 @@ class Event extends AppModel
throw new Exception("This should never happen.");
}
$serverSync->pushEvent($event)->json();
$response = $serverSync->pushEvent($event)->json();
$serverSync->debug("Pushed event '{$event['Event']['uuid']}' to remote server as event with remote ID {$response['Event']['id']}");
} catch (Crypt_GPG_KeyNotFoundException $e) {
$errorMessage = sprintf(
'Could not push event %s to remote server #%s. Reason: %s',