mirror of https://github.com/MISP/MISP
new: [internal] Use pubToZmq to check if publish to ZMQ
parent
9ab3998b9d
commit
ab1e79646e
|
@ -480,7 +480,7 @@ class Attribute extends AppModel
|
|||
$result = $this->saveAttachment($attribute);
|
||||
}
|
||||
}
|
||||
$pubToZmq = Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_attribute_notifications_enable');
|
||||
$pubToZmq = $this->pubToZmq('attribute');
|
||||
$kafkaTopic = $this->kafkaTopic('attribute');
|
||||
if ($pubToZmq || $kafkaTopic) {
|
||||
$attributeForPublish = $this->fetchAttribute($this->id);
|
||||
|
@ -532,7 +532,7 @@ class Attribute extends AppModel
|
|||
// update correlation..
|
||||
$this->Correlation->beforeSaveCorrelation($this->data['Attribute']);
|
||||
if (!empty($this->data['Attribute']['id'])) {
|
||||
if (Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_attribute_notifications_enable')) {
|
||||
if ($this->pubToZmq('attribute')) {
|
||||
$pubSubTool = $this->getPubSubTool();
|
||||
$pubSubTool->attribute_save($this->data, 'delete');
|
||||
}
|
||||
|
|
|
@ -396,7 +396,7 @@ class Event extends AppModel
|
|||
}
|
||||
|
||||
if (!empty($this->data['Event']['id'])) {
|
||||
if (Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_event_notifications_enable')) {
|
||||
if ($this->pubToZmq('event')) {
|
||||
$pubSubTool = $this->getPubSubTool();
|
||||
$pubSubTool->event_save(array('Event' => $this->data['Event']), 'delete');
|
||||
}
|
||||
|
@ -523,7 +523,7 @@ class Event extends AppModel
|
|||
$this->Attribute->Correlation->updateAll($updateCorrelation, ['Correlation.event_id' => (int)$event['id']]);
|
||||
}
|
||||
}
|
||||
if (empty($event['unpublishAction']) && empty($event['skip_zmq']) && Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_event_notifications_enable')) {
|
||||
if (empty($event['unpublishAction']) && empty($event['skip_zmq']) && $this->pubToZmq('event')) {
|
||||
$pubSubTool = $this->getPubSubTool();
|
||||
$eventForZmq = $this->quickFetchEvent($event['id']);
|
||||
if (!empty($event)) {
|
||||
|
|
|
@ -300,9 +300,7 @@ class MispObject extends AppModel
|
|||
|
||||
public function afterSave($created, $options = array())
|
||||
{
|
||||
$pubToZmq = Configure::read('Plugin.ZeroMQ_enable') &&
|
||||
Configure::read('Plugin.ZeroMQ_object_notifications_enable') &&
|
||||
empty($this->data['Object']['skip_zmq']);
|
||||
$pubToZmq = $this->pubToZmq('object') && empty($this->data['Object']['skip_zmq']);
|
||||
$kafkaTopic = $this->kafkaTopic('object');
|
||||
$pubToKafka = $kafkaTopic && empty($this->data['Object']['skip_kafka']);
|
||||
if ($pubToZmq || $pubToKafka) {
|
||||
|
@ -329,10 +327,9 @@ class MispObject extends AppModel
|
|||
public function beforeDelete($cascade = true)
|
||||
{
|
||||
if (!empty($this->data['Object']['id'])) {
|
||||
$pubToZmq = Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_object_notifications_enable');
|
||||
$kafkaTopic = Configure::read('Plugin.Kafka_object_notifications_topic');
|
||||
$pubToKafka = Configure::read('Plugin.Kafka_enable') && Configure::read('Plugin.Kafka_object_notifications_enable') && !empty($kafkaTopic);
|
||||
if ($pubToZmq || $pubToKafka) {
|
||||
$pubToZmq = $this->pubToZmq('object');
|
||||
$kafkaTopic = $this->kafkaTopic('object');
|
||||
if ($pubToZmq || $kafkaTopic) {
|
||||
$object = $this->find('first', array(
|
||||
'recursive' => -1,
|
||||
'conditions' => array('Object.id' => $this->data['Object']['id'])
|
||||
|
@ -341,7 +338,7 @@ class MispObject extends AppModel
|
|||
$pubSubTool = $this->getPubSubTool();
|
||||
$pubSubTool->object_save($object, 'delete');
|
||||
}
|
||||
if ($pubToKafka) {
|
||||
if ($kafkaTopic) {
|
||||
$kafkaPubTool = $this->getKafkaPubTool();
|
||||
$kafkaPubTool->publishJson($kafkaTopic, $object, 'delete');
|
||||
}
|
||||
|
|
|
@ -150,7 +150,7 @@ class Organisation extends AppModel
|
|||
|
||||
public function afterSave($created, $options = array())
|
||||
{
|
||||
if (Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_organisation_notifications_enable')) {
|
||||
if ($this->pubToZmq('organisation')) {
|
||||
$pubSubTool = $this->getPubSubTool();
|
||||
$pubSubTool->modified($this->data, 'organisation');
|
||||
}
|
||||
|
|
|
@ -276,7 +276,7 @@ class User extends AppModel
|
|||
|
||||
public function afterSave($created, $options = array())
|
||||
{
|
||||
$pubToZmq = Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_user_notifications_enable');
|
||||
$pubToZmq = $this->pubToZmq('user');
|
||||
$kafkaTopic = $this->kafkaTopic('user');
|
||||
if ($pubToZmq || $kafkaTopic) {
|
||||
if (!empty($this->data)) {
|
||||
|
|
Loading…
Reference in New Issue