Fix the way results are returned so they are handled properly when saved

worker/trid/trid/trid.py

@@ -59,7 +59,7 @@ def scan(self, payload, **kwargs):
         :param **kwargs kwargs: Additional parameters (unused)
 
         :returns: Results from scan
-        :rtype: dict or None
+        :rtype: list or None
 
         """
 
@@ -110,6 +110,6 @@ def scan(self, payload, **kwargs):
             self.log.warn("Unable to delete temp file {}".format(path))
 
         if results:
-            return results
+            return [results]
         else:
             return None

worker/trid/trid/trid.stoq

@@ -23,6 +23,9 @@ Website = https://github.com/PUNCH-Cyber/stoq-plugins-public
 Description = Identify file types from their TrID signature
 
 [options]
+# Minimum version of stoQ required to work
+min_stoq_version = 0.18.0
+
 hashpayload = True
 saveresults = True
 bin = /usr/local/bin/trid

worker/xorsearch/xorsearch/xorsearch.py

@@ -62,7 +62,7 @@ def scan(self, payload, **kwargs):
         :param **kwargs kwargs: Additional parameters (unused)
 
         :returns: Results from scan
-        :rtype: dict or None
+        :rtype: list or None
 
         """
 
@@ -96,7 +96,7 @@ def scan(self, payload, **kwargs):
 
         # Time to cleanup if we wrote a temp file to disk
         try:
-            if os.isfile(path):
+            if os.path.isfile(path):
                 os.remove(path)
         except:
             pass
@@ -105,6 +105,6 @@ def scan(self, payload, **kwargs):
 
         # Return our results
         if results:
-            return results
+            return [results]
         else:
             return None

worker/xorsearch/xorsearch/xorsearch.stoq

@@ -23,6 +23,9 @@ Website = https://github.com/PUNCH-Cyber/stoq-plugins-public
 Description = Search a payload for XOR'd strings
 
 [options]
+# Minimum version of stoQ required to work
+min_stoq_version = 0.18.0
+
 hashpayload = True
 saveresults = True
 bin = /usr/local/bin/xorsearch