v0.4.4

CHANGELOG.md

@@ -1,4 +1,13 @@
 
+## [v0.4.4] - 2024-01-13
+
+### Changed
+
+- Updated the typedarray_parse_function to be called after parse_dictionary or parse_arguments is called
+  - Parsing dictionary and arguments should simply make sure that there's data in the typed array parameter
+  - The `typedarray_parse_function` will be called if the value after parse_dictionary or parse_arguments is `[ ["", "string"], ["", "value" ]]` or `[ "value", "value" ]` formats.
+    - The first format with the empty first value is how Mythic's UI parsing will interpret the arrays
+
 ## [v0.4.3] - 2024-01-13
 
 ### Changed

mythic_container/MythicCommandBase.py

@@ -317,7 +317,7 @@ class PTRPCTypedArrayParseFunctionMessageResponse:
     def __init__(self,
                  Success: bool = False,
                  Error: str = None,
-                 TypedArray: list[tuple] = []):
+                 TypedArray: list[list] = []):
         self.Success = Success
         self.Error = Error
         self.TypedArray = TypedArray
@@ -586,7 +586,7 @@ def validateCredentialJSON(self, val):
         if isinstance(val, dict):
             return val
         else:
-            raise ValueError("value ins't a dictionary")
+            raise ValueError("value isn't a dictionary")
 
     def validatePass(self, val):
         return val
@@ -605,9 +605,10 @@ def validateAgentConnect(self, val):
             return val
         else:
             raise ValueError("Not instance of dictionary")
+
     def validateTypedArray(self, val):
         if isinstance(val, list):
-            if len(val) > 0 and not isinstance(val[0], tuple):
+            if len(val) > 0 and (not isinstance(val[0], tuple) and not isinstance(val[0], list)):
                 raise ValueError("Value isn't a list of tuples")
             return val
         else:
@@ -791,6 +792,7 @@ def load_args_from_json_string(self, command_line: str, add_unknown_args: bool =
                     else:
                         self.add_arg(key=k, value=v, type=ParameterType.String)
         except Exception as e:
+            logger.error(e)
             logger.error("Tried parsing command line as JSON when it's not")
             return
 

mythic_container/__init__.py

@@ -3,7 +3,7 @@
 
 containerVersion = "v1.1.4"
 
-PyPi_version = "0.4.3"
+PyPi_version = "0.4.4"
 
 RabbitmqConnection = rabbitmqConnectionClass()
 

mythic_container/agent_utils.py

@@ -152,6 +152,31 @@ async def initialize_task(
                 task.args.load_args_from_dictionary(dictionary, add_unknown_args=True)
             except Exception as loadException:
                 pass
+        for arg in task.args.args:
+            if arg.type == MythicCommandBase.ParameterType.TypedArray and callable(arg.typedarray_parse_function):
+                if len(arg.value) > 0 and arg.value[0][0] == "":
+                    resp = await arg.typedarray_parse_function(MythicCommandBase.PTRPCTypedArrayParseFunctionMessage(
+                        command=command_class.cmd,
+                        parameter_name=arg.name,
+                        payload_type="",
+                        callback=message_json["callback"]["id"],
+                        input_array=arg.value
+                    ))
+                    if not resp.Success:
+                        raise Exception(resp.Error)
+                    arg.value = resp.TypedArray
+            elif len(arg.value) > 0 and isinstance(arg.value[0], str):
+                resp = await arg.typedarray_parse_function(MythicCommandBase.PTRPCTypedArrayParseFunctionMessage(
+                    command=command_class.cmd,
+                    parameter_name=arg.name,
+                    payload_type="",
+                    callback=message_json["callback"]["id"],
+                    input_array=arg.value
+                ))
+                if not resp.Success:
+                    raise Exception(resp.Error)
+                task.args.set_arg(arg.name, resp.TypedArray)
+
     except Exception as pa:
         message = {
             "task_id": message_json["task"]["id"],
@@ -204,6 +229,32 @@ async def verifyTaskArgs(
             except Exception as loadException:
                 # must be looking at a task that doesn't have JSON-based parameters
                 pass
+        for arg in task.args.args:
+            if arg.type == MythicCommandBase.ParameterType.TypedArray and callable(arg.typedarray_parse_function):
+                if len(arg.value) > 0 and arg.value[0][0] == "":
+                    inputArray = [x[1] for x in arg.value]
+                    resp = await arg.typedarray_parse_function(MythicCommandBase.PTRPCTypedArrayParseFunctionMessage(
+                        command=task.Task.CommandName,
+                        parameter_name=arg.name,
+                        payload_type=task.PayloadType,
+                        callback=task.Callback.ID,
+                        input_array=inputArray
+                    ))
+                    if not resp.Success:
+                        raise Exception(resp.Error)
+                    task.args.set_arg(arg.name, resp.TypedArray)
+                elif len(arg.value) > 0 and isinstance(arg.value[0], str):
+                    resp = await arg.typedarray_parse_function(MythicCommandBase.PTRPCTypedArrayParseFunctionMessage(
+                        command=task.Task.CommandName,
+                        parameter_name=arg.name,
+                        payload_type=task.PayloadType,
+                        callback=task.Callback.ID,
+                        input_array=arg.value
+                    ))
+                    if not resp.Success:
+                        raise Exception(resp.Error)
+                    task.args.set_arg(arg.name, resp.TypedArray)
+
     except Exception as pa:
         message = {
             "task_id": task.Task.ID,

setup.py

@@ -10,7 +10,7 @@
 # This call to setup() does all the work
 setup(
     name="mythic_container",
-    version="0.4.3",
+    version="0.4.4",
     description="Functionality for Mythic Services",
     long_description=README,
     long_description_content_type="text/markdown",