Merge pull request #20 from mbrg/rename_machine_pwn_module

Rename machine pwn module

.github/workflows/pr_validation.yml

@@ -65,7 +65,7 @@ jobs:
  find . -name '*requirements.txt' | while read file; do pip install -r "$file"; done
  - name: Lint with mypy
  run: |
- mypy ./src/powerpwn/machinepwn/
+ mypy ./src/powerpwn/nocodemalware/
 
  do-isort:
  name: Do isort

setup.cfg

@@ -48,7 +48,7 @@ console_scripts =
 plugins = pydantic.mypy
 
 show_error_codes = true
-follow_imports = "normal"
+follow_imports = normal
 ignore_errors = false
 implicit_reexport = false
 warn_redundant_casts = true

src/powerpwn/cli/arguments.py

@@ -1,7 +1,7 @@
 import argparse
 import logging
 
-from powerpwn.machinepwn.enums.code_exec_type_enum import CodeExecTypeEnum
+from powerpwn.nocodemalware.enums.code_exec_type_enum import CodeExecTypeEnum
 from powerpwn.powerdoor.enums.action_type import BackdoorActionType
 from powerpwn.powerdump.utils.const import CACHE_PATH
 

src/powerpwn/cli/runners.py

@@ -4,9 +4,9 @@
 import shutil
 
 from powerpwn.cli.const import LOGGER_NAME
-from powerpwn.machinepwn.enums.code_exec_type_enum import CodeExecTypeEnum
-from powerpwn.machinepwn.enums.command_to_run_enum import CommandToRunEnum
-from powerpwn.machinepwn.machine_pwn import MachinePwn
+from powerpwn.nocodemalware.enums.code_exec_type_enum import CodeExecTypeEnum
+from powerpwn.nocodemalware.enums.command_to_run_enum import CommandToRunEnum
+from powerpwn.nocodemalware.malware_runner import MalwareRunner
 from powerpwn.powerdoor.backdoor_flow import BackdoorFlow
 from powerpwn.powerdoor.enums.action_type import BackdoorActionType
 from powerpwn.powerdoor.flow_factory_installer import FlowFlowInstaller
@@ -88,21 +88,21 @@ def run_backdoor_flow_command(args):
 
 
 def run_nocodemalware_command(args):
- machine_pwn = MachinePwn(args.webhook_url)
+ malware_runner = MalwareRunner(args.webhook_url)
 
  command_type = CommandToRunEnum(args.nocodemalware_subcommand)
  if command_type == CommandToRunEnum.CLEANUP:
- res = machine_pwn.cleanup()
+ res = malware_runner.cleanup()
  elif command_type == CommandToRunEnum.CODE_EXEC:
- res = machine_pwn.exec_command(args.command_to_execute, CodeExecTypeEnum(args.type))
+ res = malware_runner.exec_command(args.command_to_execute, CodeExecTypeEnum(args.type))
  elif command_type == CommandToRunEnum.EXFILTRATION:
- res = machine_pwn.exfiltrate(args.file)
+ res = malware_runner.exfiltrate(args.file)
  elif command_type == CommandToRunEnum.RANSOMWARE:
- res = machine_pwn.ransomware(args.crawl_depth, args.dirs.split(","), args.encryption_key)
+ res = malware_runner.ransomware(args.crawl_depth, args.dirs.split(","), args.encryption_key)
  elif command_type == CommandToRunEnum.STEAL_COOKIE:
- res = machine_pwn.steal_cookie(args.cookie)
+ res = malware_runner.steal_cookie(args.cookie)
  elif command_type == CommandToRunEnum.STEAL_POWER_AUTOMATE_TOKEN:
- res = machine_pwn.steal_power_automate_token()
+ res = malware_runner.steal_power_automate_token()
  print(res)
 
 

src/powerpwn/machinepwn/machine_pwn.py → src/powerpwn/nocodemalware/malware_runner.py

@@ -4,23 +4,23 @@
 import requests
 from pydantic.error_wrappers import ValidationError
 
-from powerpwn.machinepwn.enums.code_exec_type_enum import CodeExecTypeEnum
-from powerpwn.machinepwn.models.any_command_args import AnyCommandArgs
-from powerpwn.machinepwn.models.cleanup_command_args import CleanupCommandArgs
-from powerpwn.machinepwn.models.cmd_results import CommandResults
-from powerpwn.machinepwn.models.code_exec_args_properties import CodeExecArgsProperties
-from powerpwn.machinepwn.models.code_exec_command_args import CodeExecCommandArgs
-from powerpwn.machinepwn.models.command_args_properties_base_model import CommandArgsPropertiesBaseModel
-from powerpwn.machinepwn.models.exflirtate_file_args_properties import ExflirtateFileArgsProperties
-from powerpwn.machinepwn.models.exflirtate_file_command_args import ExflirtateFileCommandArgs
-from powerpwn.machinepwn.models.ransomware_args_properties import RansomwareArgsProperties
-from powerpwn.machinepwn.models.ransomware_command_args import RansomwareCommandArgs
-from powerpwn.machinepwn.models.steal_cookie_args_properties import StealCookieArgsProperties
-from powerpwn.machinepwn.models.steal_cookie_command_args import StealCookieCommandArgs
-from powerpwn.machinepwn.models.steal_power_automate_token_command_args import StealPowerAutomateTokenCommandArgs
-
-
-class MachinePwn:
+from powerpwn.nocodemalware.enums.code_exec_type_enum import CodeExecTypeEnum
+from powerpwn.nocodemalware.models.any_command_args import AnyCommandArgs
+from powerpwn.nocodemalware.models.cleanup_command_args import CleanupCommandArgs
+from powerpwn.nocodemalware.models.cmd_results import CommandResults
+from powerpwn.nocodemalware.models.code_exec_args_properties import CodeExecArgsProperties
+from powerpwn.nocodemalware.models.code_exec_command_args import CodeExecCommandArgs
+from powerpwn.nocodemalware.models.command_args_properties_base_model import CommandArgsPropertiesBaseModel
+from powerpwn.nocodemalware.models.exflirtate_file_args_properties import ExflirtateFileArgsProperties
+from powerpwn.nocodemalware.models.exflirtate_file_command_args import ExflirtateFileCommandArgs
+from powerpwn.nocodemalware.models.ransomware_args_properties import RansomwareArgsProperties
+from powerpwn.nocodemalware.models.ransomware_command_args import RansomwareCommandArgs
+from powerpwn.nocodemalware.models.steal_cookie_args_properties import StealCookieArgsProperties
+from powerpwn.nocodemalware.models.steal_cookie_command_args import StealCookieCommandArgs
+from powerpwn.nocodemalware.models.steal_power_automate_token_command_args import StealPowerAutomateTokenCommandArgs
+
+
+class MalwareRunner:
  def __init__(self, post_url: str, debug: bool = False):
  """
  Power Pwn client to run commands through Microsoft infrastructure

src/powerpwn/nocodemalware/models/any_command_args.py

@@ -0,0 +1,21 @@
+from typing import Union
+
+from pydantic import BaseModel, Field
+
+from powerpwn.nocodemalware.models.cleanup_command_args import CleanupCommandArgs
+from powerpwn.nocodemalware.models.code_exec_command_args import CodeExecCommandArgs
+from powerpwn.nocodemalware.models.exflirtate_file_command_args import ExflirtateFileCommandArgs
+from powerpwn.nocodemalware.models.ransomware_command_args import RansomwareCommandArgs
+from powerpwn.nocodemalware.models.steal_cookie_command_args import StealCookieCommandArgs
+from powerpwn.nocodemalware.models.steal_power_automate_token_command_args import StealPowerAutomateTokenCommandArgs
+
+
+class AnyCommandArgs(BaseModel):
+ __root__: Union[
+ CleanupCommandArgs,
+ CodeExecCommandArgs,
+ RansomwareCommandArgs,
+ ExflirtateFileCommandArgs,
+ StealCookieCommandArgs,
+ StealPowerAutomateTokenCommandArgs,
+ ] = Field(discriminator="command_to_run")

src/powerpwn/nocodemalware/models/cleanup_command_args.py

@@ -0,0 +1,9 @@
+from typing import Literal
+
+from powerpwn.nocodemalware.enums.command_to_run_enum import CommandToRunEnum
+from powerpwn.nocodemalware.models.cmd_arguments import CommandArguments
+from powerpwn.nocodemalware.models.command_args_properties_base_model import CommandArgsPropertiesBaseModel
+
+
+class CleanupCommandArgs(CommandArguments[CommandArgsPropertiesBaseModel]):
+ command_to_run: Literal[CommandToRunEnum.CLEANUP] = CommandToRunEnum.CLEANUP

src/powerpwn/machinepwn/models/cmd_arguments.py → src/powerpwn/nocodemalware/models/cmd_arguments.py

@@ -2,8 +2,8 @@
 
 from pydantic.generics import GenericModel
 
-from powerpwn.machinepwn.enums.command_to_run_enum import CommandToRunEnum
-from powerpwn.machinepwn.models.command_args_properties_base_model import CommandArgsPropertiesBaseModel
+from powerpwn.nocodemalware.enums.command_to_run_enum import CommandToRunEnum
+from powerpwn.nocodemalware.models.command_args_properties_base_model import CommandArgsPropertiesBaseModel
 
 _TCommandArgumentProperties = TypeVar("_TCommandArgumentProperties", bound=CommandArgsPropertiesBaseModel)
 

src/powerpwn/machinepwn/models/code_exec_args_properties.py → src/powerpwn/nocodemalware/models/code_exec_args_properties.py

@@ -1,7 +1,7 @@
 from pydantic import Field
 
-from powerpwn.machinepwn.enums.code_exec_type_enum import CodeExecTypeEnum
-from powerpwn.machinepwn.models.command_args_properties_base_model import CommandArgsPropertiesBaseModel
+from powerpwn.nocodemalware.enums.code_exec_type_enum import CodeExecTypeEnum
+from powerpwn.nocodemalware.models.command_args_properties_base_model import CommandArgsPropertiesBaseModel
 
 
 class CodeExecArgsProperties(CommandArgsPropertiesBaseModel):

src/powerpwn/nocodemalware/models/code_exec_command_args.py

@@ -0,0 +1,9 @@
+from typing import Literal
+
+from powerpwn.nocodemalware.enums.command_to_run_enum import CommandToRunEnum
+from powerpwn.nocodemalware.models.cmd_arguments import CommandArguments
+from powerpwn.nocodemalware.models.code_exec_args_properties import CodeExecArgsProperties
+
+
+class CodeExecCommandArgs(CommandArguments[CodeExecArgsProperties]):
+ command_to_run: Literal[CommandToRunEnum.CODE_EXEC] = CommandToRunEnum.CODE_EXEC

src/powerpwn/machinepwn/models/exflirtate_file_args_properties.py → src/powerpwn/nocodemalware/models/exflirtate_file_args_properties.py

@@ -1,6 +1,6 @@
 from pydantic import Field
 
-from powerpwn.machinepwn.models.command_args_properties_base_model import CommandArgsPropertiesBaseModel
+from powerpwn.nocodemalware.models.command_args_properties_base_model import CommandArgsPropertiesBaseModel
 
 
 class ExflirtateFileArgsProperties(CommandArgsPropertiesBaseModel):

src/powerpwn/nocodemalware/models/exflirtate_file_command_args.py

@@ -0,0 +1,9 @@
+from typing import Literal
+
+from powerpwn.nocodemalware.enums.command_to_run_enum import CommandToRunEnum
+from powerpwn.nocodemalware.models.cmd_arguments import CommandArguments
+from powerpwn.nocodemalware.models.exflirtate_file_args_properties import ExflirtateFileArgsProperties
+
+
+class ExflirtateFileCommandArgs(CommandArguments[ExflirtateFileArgsProperties]):
+ command_to_run: Literal[CommandToRunEnum.EXFILTRATION] = CommandToRunEnum.EXFILTRATION

src/powerpwn/machinepwn/models/ransomware_args_properties.py → src/powerpwn/nocodemalware/models/ransomware_args_properties.py

@@ -1,6 +1,6 @@
 from pydantic import Field
 
-from powerpwn.machinepwn.models.command_args_properties_base_model import CommandArgsPropertiesBaseModel
+from powerpwn.nocodemalware.models.command_args_properties_base_model import CommandArgsPropertiesBaseModel
 
 
 class RansomwareArgsProperties(CommandArgsPropertiesBaseModel):

src/powerpwn/nocodemalware/models/ransomware_command_args.py

@@ -0,0 +1,9 @@
+from typing import Literal
+
+from powerpwn.nocodemalware.enums.command_to_run_enum import CommandToRunEnum
+from powerpwn.nocodemalware.models.cmd_arguments import CommandArguments
+from powerpwn.nocodemalware.models.ransomware_args_properties import RansomwareArgsProperties
+
+
+class RansomwareCommandArgs(CommandArguments[RansomwareArgsProperties]):
+ command_to_run: Literal[CommandToRunEnum.RANSOMWARE] = CommandToRunEnum.RANSOMWARE

src/powerpwn/machinepwn/models/steal_cookie_args_properties.py → src/powerpwn/nocodemalware/models/steal_cookie_args_properties.py

@@ -1,6 +1,6 @@
 from pydantic import Field
 
-from powerpwn.machinepwn.models.command_args_properties_base_model import CommandArgsPropertiesBaseModel
+from powerpwn.nocodemalware.models.command_args_properties_base_model import CommandArgsPropertiesBaseModel
 
 
 class StealCookieArgsProperties(CommandArgsPropertiesBaseModel):

src/powerpwn/nocodemalware/models/steal_cookie_command_args.py

@@ -0,0 +1,9 @@
+from typing import Literal
+
+from powerpwn.nocodemalware.enums.command_to_run_enum import CommandToRunEnum
+from powerpwn.nocodemalware.models.cmd_arguments import CommandArguments
+from powerpwn.nocodemalware.models.steal_cookie_args_properties import StealCookieArgsProperties
+
+
+class StealCookieCommandArgs(CommandArguments[StealCookieArgsProperties]):
+ command_to_run: Literal[CommandToRunEnum.STEAL_COOKIE] = CommandToRunEnum.STEAL_COOKIE

src/powerpwn/nocodemalware/models/steal_power_automate_token_command_args.py

@@ -0,0 +1,9 @@
+from typing import Literal
+
+from powerpwn.nocodemalware.enums.command_to_run_enum import CommandToRunEnum
+from powerpwn.nocodemalware.models.cmd_arguments import CommandArguments
+from powerpwn.nocodemalware.models.command_args_properties_base_model import CommandArgsPropertiesBaseModel
+
+
+class StealPowerAutomateTokenCommandArgs(CommandArguments[CommandArgsPropertiesBaseModel]):
+ command_to_run: Literal[CommandToRunEnum.STEAL_POWER_AUTOMATE_TOKEN] = CommandToRunEnum.STEAL_POWER_AUTOMATE_TOKEN

tests/powerpwn_tests/machine_pwn_tests/machine_pwn_test.py → tests/powerpwn_tests/nocodemalware_tests/malware_runner_test.py

@@ -3,10 +3,10 @@
 
 import pytest
 
-from powerpwn.machinepwn.enums.code_exec_type_enum import CodeExecTypeEnum
-from powerpwn.machinepwn.enums.command_to_run_enum import CommandToRunEnum
-from powerpwn.machinepwn.machine_pwn import MachinePwn
-from powerpwn.machinepwn.models.cmd_results import (
+from powerpwn.nocodemalware.enums.code_exec_type_enum import CodeExecTypeEnum
+from powerpwn.nocodemalware.enums.command_to_run_enum import CommandToRunEnum
+from powerpwn.nocodemalware.malware_runner import MalwareRunner
+from powerpwn.nocodemalware.models.cmd_results import (
  AgentRunErrors,
  AgentRunType,
  CleanupOutputs,
@@ -22,7 +22,7 @@
 DEBUG = True
 
 
-class DummyPowerPwnC2(MachinePwn):
+class DummyPowerPwnC2(MalwareRunner):
  def __init__(self, post_url: str, debug: bool, command_to_run: CommandToRunEnum):
  super().__init__(post_url, debug)
  self.command_to_run = command_to_run