p15670423
/
monkey
1
0
Fork 5
Code Issues Pull Requests 3 Projects Releases Wiki Activity

Common: Use NetworkPort in TCPScanConfiguration

This commit is contained in:
Mike Salvatore 2022-09-30 09:14:22 -04:00
parent 5fc4d52d9f
commit 1a01b7c5dc
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
monkey/common/agent_configuration/agent_sub_configurations.py
View File

@ -3,6 +3,7 @@ from typing import Dict, Tuple
from pydantic import PositiveFloat, conint, validator from pydantic import PositiveFloat, conint, validator
from common.base_models import MutableInfectionMonkeyBaseModel from common.base_models import MutableInfectionMonkeyBaseModel
from common.types import NetworkPort
from .validators import ( from .validators import (
validate_ip, validate_ip,
@ -128,7 +129,7 @@ class TCPScanConfiguration(MutableInfectionMonkeyBaseModel):
""" """
timeout: PositiveFloat timeout: PositiveFloat
ports: Tuple[conint(ge=0, le=65535), ...] ports: Tuple[NetworkPort, ...]
class NetworkScanConfiguration(MutableInfectionMonkeyBaseModel): class NetworkScanConfiguration(MutableInfectionMonkeyBaseModel):

2
monkey/tests/common/example_agent_configuration.py
View File

@ -27,7 +27,7 @@ SCAN_TARGET_CONFIGURATION = {
TIMEOUT = 2.525 TIMEOUT = 2.525
ICMP_CONFIGURATION = {"timeout": TIMEOUT} ICMP_CONFIGURATION = {"timeout": TIMEOUT}
PORTS = [8080, 443] PORTS = [0, 8080, 443]
TCP_SCAN_CONFIGURATION = {"timeout": TIMEOUT, "ports": PORTS} TCP_SCAN_CONFIGURATION = {"timeout": TIMEOUT, "ports": PORTS}
FINGERPRINTERS = [{"name": "mssql", "options": {}}] FINGERPRINTERS = [{"name": "mssql", "options": {}}]