Added dict merging to branches for shuffle tools

Shuffle · May 5, 2024 · 8112147 · 8112147
1 parent 655302f
commit 8112147
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/shuffle-tools/1.2.0/api.yaml b/shuffle-tools/1.2.0/api.yaml
@@ -282,7 +282,7 @@ actions:
         required: false
         multiline: false
         example: "domains,urls,email_addresses,ipv4s,ipv4_cidrs,ipv6s,md5s,sha256s,sha1s,cves"
-        value: "domains,urls,ipv4s,md5s,sha1s"
+        value: "domains,urls,ipv4s,md5s,sha1s,email_addresses"
         multiselect: true
         schema:
           type: string
@@ -1106,6 +1106,7 @@ actions:
         example: 'list'
         options:
          - list 
+         - dict
         schema:
           type: string
   - name: run_ssh_command 

diff --git a/shuffle-tools/1.2.0/src/app.py b/shuffle-tools/1.2.0/src/app.py
@@ -2642,6 +2642,15 @@ def merge_incoming_branches(self, input_type="list"):
                 #newlist.append(item)
 
             results = newlist
+        elif input_type == "dict":
+            new_dict = {}
+            for item in results:
+                if not isinstance(item, dict): 
+                    continue
+
+                new_dict = self.merge_lists(new_dict, item)
+
+            results = json.dumps(new_dict)
         else:
             return {
                 "success": False,