From a092a1da1c5b6e5bedc953d0dcd5697b6d439c25 Mon Sep 17 00:00:00 2001
From: Sami Mokaddem <sami.mokaddem@circl.lu>
Date: Mon, 25 Jul 2022 15:08:17 +0200
Subject: [PATCH] chg: [workflow:zmq_module] Simplified usage

---
 app/Lib/Tools/PubSubTool.php                         | 4 ++--
 app/Model/WorkflowModules/Module_misp_module.php     | 4 ----
 app/Model/WorkflowModules/WorkflowBaseModule.php     | 4 ++--
 app/Model/WorkflowModules/action/Module_push_zmq.php | 6 +-----
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/app/Lib/Tools/PubSubTool.php b/app/Lib/Tools/PubSubTool.php
index 279808ef8..6a17a020a 100644
--- a/app/Lib/Tools/PubSubTool.php
+++ b/app/Lib/Tools/PubSubTool.php
@@ -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);
     }
 
diff --git a/app/Model/WorkflowModules/Module_misp_module.php b/app/Model/WorkflowModules/Module_misp_module.php
index 12d32d29a..296cba3a7 100644
--- a/app/Model/WorkflowModules/Module_misp_module.php
+++ b/app/Model/WorkflowModules/Module_misp_module.php
@@ -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;
     }
 
diff --git a/app/Model/WorkflowModules/WorkflowBaseModule.php b/app/Model/WorkflowModules/WorkflowBaseModule.php
index def9d1c1b..15d7539f9 100644
--- a/app/Model/WorkflowModules/WorkflowBaseModule.php
+++ b/app/Model/WorkflowModules/WorkflowBaseModule.php
@@ -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)
diff --git a/app/Model/WorkflowModules/action/Module_push_zmq.php b/app/Model/WorkflowModules/action/Module_push_zmq.php
index 630535efe..58d8d6e20 100644
--- a/app/Model/WorkflowModules/action/Module_push_zmq.php
+++ b/app/Model/WorkflowModules/action/Module_push_zmq.php
@@ -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;
     }
 }