p34709852
/
monkey
forked from p15670423/monkey
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Common: Encapsulate AgentConfigurationSchema

This commit is contained in:
Mike Salvatore 2022-06-24 12:39:47 -04:00
parent 07d1d9c45a
commit 4c47eae70b
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
monkey/common/configuration/__init__.py
View File

@ -1,6 +1,5 @@
from .agent_configuration import (
AgentConfiguration,
AgentConfigurationSchema,
)
from .agent_sub_configurations import (
CustomPBAConfiguration,

13
monkey/tests/unit_tests/common/configuration/test_agent_configuration.py
View File

@ -25,11 +25,8 @@ from tests.common.example_agent_configuration import (
WINDOWS_FILENAME,
)
from common.configuration import (
DEFAULT_AGENT_CONFIGURATION_JSON,
AgentConfiguration,
AgentConfigurationSchema,
)
from common.configuration import DEFAULT_AGENT_CONFIGURATION_JSON, AgentConfiguration
from common.configuration.agent_configuration import AgentConfigurationSchema
from common.configuration.agent_sub_configuration_schemas import (
CustomPBAConfigurationSchema,
ExploitationConfigurationSchema,
@ -159,10 +156,8 @@ def test_propagation_configuration():
def test_agent_configuration():
schema = AgentConfigurationSchema()
config = AgentConfiguration.from_dict(AGENT_CONFIGURATION)
config_dict = schema.dump(config)
config_json = AgentConfiguration.to_json(config)
assert isinstance(config, AgentConfiguration)
assert config.keep_tunnel_open_time == 30
@ -171,7 +166,7 @@ def test_agent_configuration():
assert isinstance(config.credential_collectors[0], PluginConfiguration)
assert isinstance(config.payloads[0], PluginConfiguration)
assert isinstance(config.propagation, PropagationConfiguration)
assert config_dict == AGENT_CONFIGURATION
assert json.loads(config_json) == AGENT_CONFIGURATION
def test_default_agent_configuration():