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

Merge pull request #7622 from JakubOnderka/fix-fetching-version 

fix: [sync] Fetching remote server version
pull/7624/head
Jakub Onderka 2021-08-03 16:22:43 +02:00 committed by GitHub
parent 158fb40861 ed6ea29a17
commit 9ccd157d3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/Model/Server.php
View File

@ -504,7 +504,7 @@ class Server extends AppModel
$serverSync = new ServerSyncTool($server, $this->setupSyncRequest($server));
try {
$server['Server']['version'] = $serverSync->info();
$server['Server']['version'] = $serverSync->info()['version'];
} catch (HttpSocketHttpException $e) {
// ignore for now
}
@ -3691,21 +3691,6 @@ class Server extends AppModel
));
}
private function getRemoteVersion(array $server)
{
$HttpSocket = $this->setupHttpSocket($server);
$request = $this->setupSyncRequest($server);
$response = $HttpSocket->get($server['Server']['url'] . '/servers/getVersion', $data = '', $request);
if ($response->code == 200) {
$data = $this->jsonDecode($response->body);
if (isset($data['version']) && !empty($data['version'])) {
return $data['version'];
} else {
throw new Exception("Invalid response from remote server: version field missing");
}
}
}
/**
* Returns an array with the events
* @param array $server