GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2026-01-29 00:51:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

improved validation

Browse Source
This commit is contained in:
Devaev Maxim
2019-10-24 03:09:06 +03:00
parent c124e63d6d
commit b4ef91838e
4 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
kvmd/validators/os.py
View File

@@ -27,10 +27,10 @@ from typing import List
from typing import Any
from . import raise_error
from . import check_not_none_string
from .basic import valid_number
from .basic import valid_string_list
from .basic import valid_stripped_string_not_empty
# =====
@@ -51,9 +51,7 @@ def valid_abs_path(arg: Any, type: str="", name: str="") -> str: # pylint: disa
if not name:
name = "absolute path"
if len(str(arg).strip()) == 0:
arg = None
arg = os.path.abspath(check_not_none_string(arg, name))
arg = os.path.abspath(valid_stripped_string_not_empty(arg, name))
if type:
try:
@@ -79,9 +77,7 @@ def valid_printable_filename(arg: Any, name: str="") -> str:
if not name:
name = "printable filename"
if len(str(arg).strip()) == 0:
arg = None
arg = check_not_none_string(arg, name)
arg = valid_stripped_string_not_empty(arg, name)
if "/" in arg or "\0" in arg or arg in [".", ".."]:
raise_error(arg, name)