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

Work on the sync 

- commit to update secondary test instance
pull/762/head
Iglocska 2015-04-26 13:21:51 +02:00
parent 3e28f80f66
commit ad1a15f36e
5 changed files with 108 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Controller/OrganisationsController.php
View File

@ -170,4 +170,18 @@ class OrganisationsController extends AppController {
$this->set('extend', $extend);
$this->render('ajax/sg_org_row_empty');
}
public function getUUIDs() {
if (!$this->Auth->user('Role')['perm_sync']) throw new MethodNotAllowedException('This action is restricted to sync users');
$temp = $this->Organisation->find('all', array(
'recursive' => -1,
'conditions' => array('local' => 1),
'fields' => array('Organisation.uuid')
));
$orgs = array();
foreach ($temp as $t) {
$orgs[] = $t['Organisation']['uuid'];
}
return new CakeResponse(array('body'=> json_encode($orgs)));
}
}

2
app/Controller/ServersController.php
View File

@ -770,6 +770,6 @@ class ServersController extends AppController {
}
public function checkVersionCompatibility($id) {
debug($this->Server->checkVersionCompatibility($id));
debug($this->Server->checkVersionCompatibility($id, $this->Auth->user()));
}
}

9
app/Controller/SharingGroupsController.php
View File

@ -181,14 +181,5 @@ class SharingGroupsController extends AppController {
$this->set('id', $id);
$this->set('sg', $sg);
}
public function access1() {
debug($this->SharingGroup->checkIfAuthorised($this->Auth->user(), 15));
}
public function access2() {
debug($this->SharingGroup->fetchAllAuthorised($this->Auth->user()));
}
}

55
app/Model/Event.php
View File

@ -666,7 +666,10 @@ class Event extends AppModel {
* @return bool true if success, false or error message if failed
*/
public function restfullEventToServer($event, $server, $urlPath, &$newLocation, &$newTextBody, $HttpSocket = null) {
if ($event['Event']['distribution'] < 2) { // never upload private events
$rules = $this->checkEventForPush($event, $server['Server']['id']);
debug($rules);
throw new Exception();
if ($rules === false) { // never upload private events
return 403; //"Event is private and non exportable";
}
@ -677,6 +680,19 @@ class Event extends AppModel {
$syncTool = new SyncTool();
$HttpSocket = $syncTool->setupHttpSocket($server);
}
if (is_array($result) && $result['rule'] === 'conditional') {
$request = array(
'header' => array(
'Authorization' => $authkey,
'Accept' => 'application/xml',
'Content-Type' => 'application/xml',
)
);
$uri = $server['url'] . '/organisations/getUUIDs';
$response = json_decode($HttpSocket->get($uri, '', $request));
}
$request = array(
'header' => array(
'Authorization' => $authkey,
@ -730,6 +746,8 @@ class Event extends AppModel {
}
// display the XML to the user
$xmlArray['Event'][] = $event['Event'];
debug($xmlArray);
throw new Exception();
$xmlObject = Xml::fromArray($xmlArray, array('format' => 'tags'));
$eventsXml = $xmlObject->asXML();
// do a REST POST request with the server
@ -1749,6 +1767,16 @@ class Event extends AppModel {
return false;
}
public function checkEventForPush($event, $server_id) {
$rules = array();
if ($event['Event']['distribution'] < 2) return false;
else if ($event['Event']['distribution'] == 4) $rules = $this->SharingGroup->getSGSyncRulesForServer($event['SharingGroup'], $server_id);
else return true;
return $rules;
}
/**
* Uploads this specific event to all remote servers
* TODO move this to a component
@ -1757,10 +1785,23 @@ class Event extends AppModel {
*/
public function uploadEventToServersRouter($id, $passAlong = null) {
// make sure we have all the data of the Event
$this->id = $id;
$this->recursive = 1;
$this->read();
$this->data['Event']['locked'] = 1;
$event = $this->find('first', array(
'conditions' => array('Event.id' => $id),
'recursive' => -1,
'contain' => array(
'Attribute',
'EventTag' => array('Tag'),
'Org',
'Orgc',
'SharingGroup' => array(
'SharingGroupOrg' => array('Organisation'),
'SharingGroupServer' => array('Server'),
),
),
));
if (empty($event)) return true;
$event['Event']['locked'] = 1;
// get a list of the servers
$serverModel = ClassRegistry::init('Server');
$servers = $serverModel->find('all', array(
@ -1778,7 +1819,7 @@ class Event extends AppModel {
$HttpSocket = $syncTool->setupHttpSocket($server);
//Skip servers where the event has come from.
if (($passAlong != $server)) {
$thisUploaded = $this->uploadEventToServer($this->data, $server, $HttpSocket);
$thisUploaded = $this->uploadEventToServer($event, $server, $HttpSocket);
if (!$thisUploaded) {
$uploaded = !$uploaded ? $uploaded : $thisUploaded;
$failedServers[] = $server['Server']['url'];
@ -1794,7 +1835,7 @@ class Event extends AppModel {
return true;
}
}
public function publishRouter($id, $passAlong = null, $user) {
if (Configure::read('MISP.background_jobs')) {
$job = ClassRegistry::init('Job');

45
app/Model/SharingGroup.php
View File

@ -188,4 +188,49 @@ class SharingGroup extends AppModel {
}
return $orgs;
}
public function getSGSyncRulesForServer($sg, $server_id) {
$results = array(
'rule' => false,
'orgs' => array(),
);
if (isset($sg['SharingGroupServer'])) {
foreach ($sg['SharingGroupServer'] as $server) {
if ($server['server_id'] == $server_id) {
if ($server['all_orgs']) $results['rule'] = 'full';
else $results['rule'] = 'conditional';
}
}
if ($results['rule'] === false) return false;
}
foreach ($sg['SharingGroupOrg'] as $org) {
$results['orgs'][] = $org['Organisation']['uuid'];
}
return $results;
}
public function getSGSyncRules($sg) {
$results = array(
'conditional' => array(),
'full' => array(),
'orgs' => array(),
'no_server_settings' => false
);
if (isset($sg['SharingGroupServer'])) {
foreach ($sg['SharingGroupServer'] as $server) {
if ($server['server_id'] != 0) {
if ($server['all_orgs']) $results['full'][] = $server['id'];
else $results['conditional'][] = $server['id'];
}
}
if (empty($results['full']) && empty($results['conditional'])) return false;
} else {
$results['no_server_settings'] = true;
}
foreach ($sg['SharingGroupOrg'] as $org) {
$results['orgs'][] = $org['Organisation']['uuid'];
}
return $results;
}
}