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

chg: [workflow:zmq_module] Simplified usage

pull/8530/head
Sami Mokaddem 2022-07-25 15:08:17 +02:00
parent 5fc2e3561f
commit a092a1da1c
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
4 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Lib/Tools/PubSubTool.php
View File

@ -147,9 +147,9 @@ class PubSubTool
return $this->pushToRedis('data:misp_json_warninglist', $warninglist);
}
public function workflow_push(array $data, $namespace='')
public function workflow_push(array $data)
{
$topic = 'data:misp_json_workflow' . (!empty($namespace) ? "_$namespace" : '');
$topic = 'data:misp_json_workflow';
return $this->pushToRedis($topic, $data);
}

4
app/Model/WorkflowModules/Module_misp_module.php
View File

@ -87,10 +87,6 @@ class Module_misp_module extends WorkflowBaseActionModule
$errors[] = $query['error'];
return false;
}
$message = [
"module:$this->name" => JsonTool::encode($query['data'])
];
$this->push_zmq($message);
return true;
}

4
app/Model/WorkflowModules/WorkflowBaseModule.php
View File

@ -92,7 +92,7 @@ class WorkflowBaseModule
return true;
}
protected function push_zmq($message, $namespace='')
protected function push_zmq($message)
{
if (!self::$loadedPubSubTool) {
App::uses('PubSubTool', 'Tools');
@ -101,7 +101,7 @@ class WorkflowBaseModule
self::$loadedPubSubTool = $pubSubTool;
}
$pubSubTool = self::$loadedPubSubTool;
$pubSubTool->workflow_push($message, $namespace);
$pubSubTool->workflow_push($message);
}
protected function logError($message)

6
app/Model/WorkflowModules/action/Module_push_zmq.php
View File

@ -48,11 +48,7 @@ class Module_push_zmq extends WorkflowBaseActionModule
$errors[] = __('Error while trying to extract data with path `%s`', $path);
return false;
}
$this->push_zmq([
'namespace' => $params['Namespace']['value'],
'content' => $params['Content']['value'],
'extracted' => JsonTool::encode($extracted),
]);
$this->push_zmq(JsonTool::encode($extracted));
return true;
}
}