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

Common: Improve the style of filename validation

This commit is contained in:
vakarisz 2022-08-01 14:33:19 +03:00
parent 2503e83dde
commit 068a7e3b1f
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
monkey/common/agent_configuration/agent_sub_configuration_schemas.py
View File

@ -12,20 +12,15 @@ from .agent_sub_configurations import (
TCPScanConfiguration,
)
from .utils import freeze_lists
from .validators.filenames import (
valid_linux_custom_pba_filename_regex,
validate_windows_custom_pba_filename,
)
from .validators.filenames import validate_linux_filename, validate_windows_filename
from .validators.ip_ranges import validate_ip, validate_subnet_range
class CustomPBAConfigurationSchema(Schema):
linux_command = fields.Str()
linux_filename = fields.Str(
validate=validate.Regexp(regex=valid_linux_custom_pba_filename_regex)
)
linux_filename = fields.Str(validate=validate_linux_filename)
windows_command = fields.Str()
windows_filename = fields.Str(validate=validate_windows_custom_pba_filename)
windows_filename = fields.Str(validate=validate_windows_filename)
@post_load
def _make_custom_pba_configuration(self, data, **kwargs):

13
monkey/common/agent_configuration/validators/filenames.py
View File

@ -3,13 +3,18 @@ from pathlib import PureWindowsPath
from marshmallow import ValidationError
valid_windows_custom_pba_filename_regex = re.compile(r"^[^<>:\"\\\/|?*]*[^<>:\"\\\/|?* \.]+$|^$")
valid_linux_custom_pba_filename_regex = re.compile(r"^[^\0/]*$")
_valid_windows_filename_regex = re.compile(r"^[^<>:\"\\\/|?*]*[^<>:\"\\\/|?* \.]+$|^$")
_valid_linux_filename_regex = re.compile(r"^[^\0/]*$")
def validate_windows_custom_pba_filename(windows_filename: str):
def validate_linux_filename(linux_filename: str):
if not re.match(_valid_linux_filename_regex, linux_filename):
raise ValidationError(f"Invalid Unix filename {linux_filename}: illegal characters")
def validate_windows_filename(windows_filename: str):
validate_windows_filename_not_reserved(windows_filename)
if not re.match(valid_windows_custom_pba_filename_regex, windows_filename):
if not re.match(_valid_windows_filename_regex, windows_filename):
raise ValidationError(f"Invalid Windows filename {windows_filename}: illegal characters")