#2912 - Remove some debugging print statements and apply pre-commit lint changes

This commit is contained in:
Charlie Crane
2024-11-19 18:58:51 +00:00
parent b4bc59f633
commit d3c52d0d72
7 changed files with 18 additions and 15 deletions

View File

@@ -8,6 +8,7 @@ from pydantic import BaseModel, ConfigDict
from primaite.interface.request import RequestFormat
class AbstractAction(BaseModel):
"""Base class for actions."""
@@ -37,6 +38,4 @@ class AbstractAction(BaseModel):
"""Create an action component from a config dictionary."""
if not config.get("type"):
config.update({"type": cls.__name__})
print("oooh")
print(config)
return cls(config=cls.ConfigSchema(**config))

View File

@@ -129,7 +129,6 @@ class FirewallACLAddRuleAction(ACLAbstractAction, identifier="firewall_acl_add_r
if config.src_port == 0:
return ["do_nothing"] # invalid configuration.
return [
"network",
"node",

View File

@@ -38,7 +38,15 @@ class ConfigureRansomwareScriptAction(AbstractAction, identifier="c2_server_rans
"""Return the action formatted as a request that can be ingested by the simulation."""
if config.node_name is None:
return ["do_nothing"]
return ["network", "node", config.node_name, "application", "RansomwareScript", "configure", config.model_config]
return [
"network",
"node",
config.node_name,
"application",
"RansomwareScript",
"configure",
config.model_config,
]
class ConfigureDoSBotAction(AbstractAction, identifier="configure_dos_bot"):
@@ -207,10 +215,7 @@ class ExfiltrationC2ServerAction(AbstractAction, identifier="c2_server_data_exfi
exfiltration_folder_name: Optional[str]
@classmethod
def form_request(
cls,
config: ConfigSchema
) -> RequestFormat:
def form_request(cls, config: ConfigSchema) -> RequestFormat:
"""Return the action formatted as a request that can be ingested by the simulation."""
if config.node_name is None:
return ["do_nothing"]

View File

@@ -1,5 +1,6 @@
# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
from typing import ClassVar
from primaite.game.agent.actions.manager import AbstractAction
from primaite.interface.request import RequestFormat

View File

@@ -31,7 +31,6 @@ class DoNothingAction(AbstractAction, identifier="do_nothing"):
class ConfigSchema(AbstractAction.ConfigSchema):
"""Configuration Schema for DoNothingAction."""
# type: Literal["do_nothing"] = "do_nothing"
type: str = "do_nothing"
@classmethod