From 07c59485fcef43a8a3dc122d05c7352a3da8aa15 Mon Sep 17 00:00:00 2001 From: Devaev Maxim Date: Wed, 10 Apr 2019 21:40:34 +0300 Subject: moar validators --- kvmd/apps/__init__.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'kvmd/apps') diff --git a/kvmd/apps/__init__.py b/kvmd/apps/__init__.py index 77a9644b..3a653d11 100644 --- a/kvmd/apps/__init__.py +++ b/kvmd/apps/__init__.py @@ -51,9 +51,12 @@ from ..validators.basic import valid_number from ..validators.basic import valid_int_f1 from ..validators.basic import valid_float_f01 +from ..validators.auth import valid_users_list + from ..validators.fs import valid_abs_path from ..validators.fs import valid_abs_path_exists from ..validators.fs import valid_unix_mode +from ..validators.fs import valid_command from ..validators.net import valid_ip_or_host from ..validators.net import valid_port @@ -150,7 +153,7 @@ def _get_config_scheme() -> Dict: }, "auth": { - "internal_users": Option([]), + "internal_users": Option([], type=valid_users_list), "internal_type": Option("htpasswd"), "external_type": Option(""), # "internal": {}, @@ -222,7 +225,7 @@ def _get_config_scheme() -> Dict: "unix": Option("", type=valid_abs_path, only_if="!port", unpack_as="unix_path"), "timeout": Option(2.0, type=valid_float_f01), - "cmd": Option(["/bin/true"]), # TODO: Validator + "cmd": Option(["/bin/true"], type=valid_command), }, }, -- cgit v1.2.3