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

Common: Move AgentID definition to common

This commit is contained in:
Mike Salvatore 2022-09-13 13:08:00 -04:00
parent 31f3c1a4d6
commit 80cd5a05a1
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
monkey/common/types.py
View File

@ -1,4 +1,7 @@
from uuid import UUID
from pydantic import PositiveInt from pydantic import PositiveInt
from typing_extensions import TypeAlias from typing_extensions import TypeAlias
AgentID: TypeAlias = UUID
HardwareID: TypeAlias = PositiveInt HardwareID: TypeAlias = PositiveInt

3
monkey/monkey_island/cc/models/__init__.py
View File

@ -12,4 +12,5 @@ from .user_credentials import UserCredentials
from .machine import Machine, MachineID from .machine import Machine, MachineID
from .communication_type import CommunicationType from .communication_type import CommunicationType
from .node import Node from .node import Node
from .agent import Agent, AgentID from common.types import AgentID
from .agent import Agent

6
monkey/monkey_island/cc/models/agent.py
View File

@ -1,15 +1,11 @@
from datetime import datetime from datetime import datetime
from typing import Optional from typing import Optional
from uuid import UUID
from pydantic import Field from pydantic import Field
from typing_extensions import TypeAlias
from common.base_models import MutableInfectionMonkeyBaseModel from common.base_models import MutableInfectionMonkeyBaseModel
from . import MachineID from . import AgentID, MachineID
AgentID: TypeAlias = UUID
class Agent(MutableInfectionMonkeyBaseModel): class Agent(MutableInfectionMonkeyBaseModel):