v0.4.10

Author: its-a-feature

CHANGELOG.md

@@ -1,4 +1,11 @@
 
+## [v0.4.10] - 2024-02-13
+
+### Changed
+
+- Added access to "Secrets" in tasking, dynamic queries, new callbacks, and payload builds
+- Added `message_format` attribute for Payload Types for use later
+
 ## [v0.4.8] - 2024-01-23
 
 ### Changed

mythic_container/MythicCommandBase.py

@@ -192,7 +192,7 @@ class PTRPCDynamicQueryFunctionMessage:
         AgentCallbackID (str): Agent UUID of the callback where this function is called
         PayloadOS (str): The selected OS when the backing payload for this callback was created
         PayloadUUID (str): The UUID of the backing payload for this callback that can be used to fetch more information
-
+        Secrets (dict): User secrets based on the operator that issued this action
     Functions:
         to_json(self): return dictionary form of class
     """
@@ -206,6 +206,7 @@ def __init__(self,
                  payload_uuid: str = "",
                  agent_callback_id: str = "",
                  callback_display_id: int = 0,
+                 secrets: dict = {},
                  **kwargs
                  ):
         self.Command = command
@@ -216,6 +217,7 @@ def __init__(self,
         self.PayloadUUID = payload_uuid
         self.AgentCallbackID = agent_callback_id
         self.CallbackDisplayID = callback_display_id
+        self.Secrets = secrets
 
     def to_json(self):
         return {
@@ -226,7 +228,8 @@ def to_json(self):
             "payload_os": self.PayloadOS,
             "payload_uuid": self.PayloadUUID,
             "agent_callback_id": self.AgentCallbackID,
-            "callback_display_id": self.CallbackDisplayID
+            "callback_display_id": self.CallbackDisplayID,
+            "secrets": self.Secrets
         }
 
     def __str__(self):
@@ -1624,6 +1627,7 @@ class PTTaskMessageAllData:
         BuildParameters (list[MythicRPCPayloadConfigurationBuildParameter]): Information about the build parameters used to generate the payload for this callback
         C2Profiles (list[MythicRPCPayloadConfigurationC2Profile]): Information about the c2 profiles associated with this callback and their values
         args: The running instance of arguments for this task, this allows you to modify any arguments as necessary in your `create_go_tasking` function
+        Secrets (dict): Dictionary of secrets associated with the user for this action
 
     Functions:
         to_json(self): return dictionary form of class
@@ -1639,6 +1643,7 @@ def __init__(self,
                  c2info: list[dict] = [],
                  payload_type: str = "",
                  args: TaskArguments.__class__ = None,
+                 secrets: dict = {},
                  **kwargs):
         self.Task = PTTaskMessageTaskData(**task)
         self.Callback = PTTaskMessageCallbackData(**callback)
@@ -1647,6 +1652,7 @@ def __init__(self,
         self.PayloadType = payload_type
         self.BuildParameters = [MythicRPCPayloadConfigurationBuildParameter(**x) for x in build_parameters]
         self.C2Profiles = [MythicRPCPayloadConfigurationC2Profile(**x) for x in c2info]
+        self.Secrets = secrets
         if args is not None:
             self.args = args(command_line=task["params"],
                              tasking_location=task["tasking_location"],
@@ -1666,7 +1672,8 @@ def to_json(self):
             "commands": self.Commands,
             "payload": self.Payload.to_json(),
             "c2info": [x.to_json() for x in self.C2Profiles],
-            "payload_type": self.PayloadType
+            "payload_type": self.PayloadType,
+            "secrets": self.Secrets
         }
 
     def set_args(self, args: TaskArguments.__class__) -> None:
@@ -1690,6 +1697,7 @@ class PTOnNewCallbackAllData:
         PayloadType (str): The name of the payload type
         BuildParameters (list[MythicRPCPayloadConfigurationBuildParameter]): Information about the build parameters used to generate the payload for this callback
         C2Profiles (list[MythicRPCPayloadConfigurationC2Profile]): Information about the c2 profiles associated with this callback and their values
+        Secrets (dict): Dictionary of secrets from the user associated with this action
 
     Functions:
         to_json(self): return dictionary form of class
@@ -1702,13 +1710,15 @@ def __init__(self,
                  payload: dict = {},
                  c2info: list[dict] = [],
                  payload_type: str = "",
+                 secrets: dict = {},
                  **kwargs):
         self.Callback = PTTaskMessageCallbackData(**callback)
         self.Payload = PTTaskMessagePayloadData(**payload)
         self.Commands = commands
         self.PayloadType = payload_type
         self.BuildParameters = [MythicRPCPayloadConfigurationBuildParameter(**x) for x in build_parameters]
         self.C2Profiles = [MythicRPCPayloadConfigurationC2Profile(**x) for x in c2info]
+        self.Secrets = secrets
 
         for k, v in kwargs.items():
             logger.info(f"unknown kwarg {k} with value {v}")
@@ -1720,7 +1730,8 @@ def to_json(self):
             "commands": self.Commands,
             "payload": self.Payload.to_json(),
             "c2info": [x.to_json() for x in self.C2Profiles],
-            "payload_type": self.PayloadType
+            "payload_type": self.PayloadType,
+            "secrets": self.Secrets
         }
 
     def __str__(self):

mythic_container/MythicGoRPC/send_mythic_rpc_payload_create_from_scratch.py

@@ -3,26 +3,33 @@
 
 MYTHIC_RPC_PAYLOAD_CREATE_FROM_SCRATCH = "mythic_rpc_payload_create_from_scratch"
 
+
 class MythicRPCPayloadConfigurationC2Profile:
     def __init__(self,
                  Name: str = None,
                  Parameters: dict = None,
                  c2_profile: str = None,
+                 c2_profile_is_p2p: bool = False,
                  c2_profile_parameters: dict = None,
                  **kwargs):
         self.Name = Name
         self.Parameters = Parameters
+        self.IsP2P = c2_profile_is_p2p
         if c2_profile is not None:
             self.Name = c2_profile
         if c2_profile_parameters is not None:
             self.Parameters = c2_profile_parameters
         for k, v in kwargs.items():
             logger.info(f"Unknown kwarg {k} - {v}")
+
     def to_json(self):
         return {
             "c2_profile": self.Name,
-            "c2_profile_parameters": self.Parameters
+            "c2_profile_parameters": self.Parameters,
+            "c2_profile_is_p2p": self.IsP2P
         }
+
+
 class MythicRPCPayloadConfigurationBuildParameter:
     def __init__(self,
                  Name: str = None,
@@ -38,11 +45,14 @@ def __init__(self,
             self.Value = value
         for k, v in kwargs.items():
             logger.info(f"Unknown kwarg {k} - {v}")
+
     def to_json(self):
         return {
             "name": self.Name,
             "value": self.Value
         }
+
+
 class MythicRPCPayloadConfiguration:
     def __init__(self,
                  Description: str = None,
@@ -119,7 +129,8 @@ def __init__(self,
 
 async def SendMythicRPCPayloadCreateFromScratch(
         msg: MythicRPCPayloadCreateFromScratchMessage) -> MythicRPCPayloadCreateFromScratchMessageResponse:
-    response = await mythic_container.RabbitmqConnection.SendRPCDictMessage(queue=MYTHIC_RPC_PAYLOAD_CREATE_FROM_SCRATCH,
-                                                                            body=msg.to_json())
+    response = await mythic_container.RabbitmqConnection.SendRPCDictMessage(
+        queue=MYTHIC_RPC_PAYLOAD_CREATE_FROM_SCRATCH,
+        body=msg.to_json())
 
     return MythicRPCPayloadCreateFromScratchMessageResponse(**response)

mythic_container/PayloadBuilder.py

@@ -494,6 +494,8 @@ class PayloadType:
             The path to the folder holding your browser scripts so that they can be fetched when Syncing
         custom_rpc_functions (dict):
             Dictionary of RPC name to awaitable RPC function that other services can call
+        message_format (str):
+            Defaults to `json`, but you can optionally specify `xml` to have your messages parsed and returned as xml instead of JSON for Mythic
 
     Functions:
         build(self):
@@ -518,6 +520,7 @@ class PayloadType:
     agent_path = None
     agent_code_path = None
     agent_browserscript_path = None
+    message_format = 'json'
     custom_rpc_functions: dict[
         str, Callable[[PTOtherServiceRPCMessage], Awaitable[PTOtherServiceRPCMessageResponse]]] = {}
 
@@ -529,7 +532,8 @@ def __init__(
             selected_os: str = None,
             commands: CommandList = None,
             wrapped_payload_uuid: str = None,
-            wrapped_payload: bytes = None
+            wrapped_payload: bytes = None,
+            secrets: dict = {},
     ):
         self.uuid = uuid
         self.c2info = c2info
@@ -538,6 +542,7 @@ def __init__(
         self.filename = filename
         self.wrapped_payload = wrapped_payload
         self.wrapped_payload_uuid = wrapped_payload_uuid
+        self.secrets = secrets
         if self.agent_path is None:
             self.agent_path = pathlib.Path(".") / self.name
             logger.error(f"{self.name} has no agent_path set, setting to {self.agent_path}")
@@ -656,6 +661,7 @@ def to_json(self):
             "mythic_encrypts": self.mythic_encrypts,
             "build_steps": [x.to_json() for x in self.build_steps],
             "agent_icon": base64.b64encode(agent_bytes).decode(),
+            "message_format": self.message_format,
         }
 
     def __str__(self):

mythic_container/__init__.py

@@ -1,9 +1,9 @@
 from .rabbitmq import rabbitmqConnectionClass
 from .mythic_service import start_and_run_forever, test_command
 
-containerVersion = "v1.1.5"
+containerVersion = "v1.1.6"
 
-PyPi_version = "0.4.9"
+PyPi_version = "0.4.10"
 
 RabbitmqConnection = rabbitmqConnectionClass()
 

setup.py

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