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

Publishing now also pushes proposals 

This is especially important to push deleted proposals once a proposal has been accepted
pull/304/merge
iglocska 2014-08-13 14:29:39 +02:00
parent 295e3d2655
commit 77971d97db
2 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Model/Event.php
View File

@ -624,7 +624,7 @@ class Event extends AppModel {
unset($attribute['id']);
}
}
// Distribution, correct All to Community in Event
if ($event['Event']['distribution'] == 2) {
$event['Event']['distribution'] = 1;
@ -1509,10 +1509,9 @@ class Event extends AppModel {
$this->recursive = 1;
$this->read();
$this->data['Event']['locked'] = 1;
// get a list of the servers
$server = ClassRegistry::init('Server');
$servers = $server->find('all', array(
$serverModel = ClassRegistry::init('Server');
$servers = $serverModel->find('all', array(
'conditions' => array('Server.push' => true)
));
// iterate over the servers and upload the event
@ -1532,6 +1531,9 @@ class Event extends AppModel {
$uploaded = !$uploaded ? $uploaded : $thisUploaded;
$failedServers[] = $server['Server']['url'];
}
if (isset($this->data['ShadowAttribute'])) {
$serverModel->syncProposals($HttpSocket, $server, null, $id, $this);
}
}
}
if (!$uploaded) {

33
app/Model/Server.php
View File

@ -382,7 +382,7 @@ class Server extends AppModel {
$this->save($this->data);
}
}
$this->syncProposals($HttpSocket, $this->data, null, $eventIds, $eventModel);
if (!isset($successes)) $successes = null;
@ -435,7 +435,7 @@ class Server extends AppModel {
return $uuidList;
}
public function syncProposals($HttpSocket, $server, $sa_id = null, $eventIds = null, $eventModel){
public function syncProposals($HttpSocket, $server, $sa_id = null, $event_id = null, $eventModel){
$saModel = ClassRegistry::init('ShadowAttribute');
if (null == $HttpSocket) {
App::uses('SyncTool', 'Tools');
@ -443,16 +443,24 @@ class Server extends AppModel {
$HttpSocket = $syncTool->setupHttpSocket($server);
}
if ($sa_id == null) {
$ids = $eventModel->getEventIdsFromServer($server, true, $HttpSocket);
$conditions = array('uuid' => $ids);
if ($event_id == null) {
// event_id is null when we are doing a push
$ids = $eventModel->getEventIdsFromServer($server, true, $HttpSocket);
$conditions = array('uuid' => $ids);
} else {
$conditions = array('id' => $event_id);
// event_id is not null when we are doing a publish
}
$events = $eventModel->find('all', array(
'conditions' => $conditions,
'recursive' => 1,
'contain' => 'ShadowAttribute',
'fields' => array('Event.uuid')
));
$fails = 0;
$success = 0;
$error_message = "";
$unchanged = array();
foreach ($events as $k => &$event) {
if (!empty($event['ShadowAttribute'])) {
@ -480,7 +488,8 @@ class Server extends AppModel {
$success += intval($result->counter);
} else {
$fails++;
if ($error_message == "") $result->message;
else $error_message += " --- " . $result->message;
}
} else {
$fails++;
@ -489,7 +498,6 @@ class Server extends AppModel {
}
} else {
// connect to checkuuid($uuid)
$request = array(
'header' => array(
'Authorization' => $server['Server']['authkey'],
@ -505,18 +513,5 @@ class Server extends AppModel {
return false;
}
}
/*
$proposals = $saModel->find('all', array(
'conditions' => $conditions,
'recursive' => -1,
));
foreach ($proposals as &$proposal) {
$proposal['ShadowAttribute']['data'] = $saModel->base64EncodeAttachment($proposal['ShadowAttribute']);
unset ($proposal['ShadowAttribute']['event_id']);
}
$data = json_encode($proposals);
*/
}
}