GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-12 09:10:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

improved net validators

Browse Source
This commit is contained in:
Devaev Maxim 2020-10-02 07:03:46 +03:00
parent 729dc977c8
commit b2a377233d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kvmd/validators/net.py
View File

@ -37,7 +37,7 @@ from .basic import valid_stripped_string_not_empty
# ===== # =====
def valid_ip_or_host(arg: Any) -> str: def valid_ip_or_host(arg: Any) -> str:
name = "IP address or RFC-1123 hostname" name = "IPv4/6 address or RFC-1123 hostname"
return check_any( return check_any(
arg=valid_stripped_string_not_empty(arg, name), arg=valid_stripped_string_not_empty(arg, name),
name=name, name=name,
@ -51,11 +51,14 @@ def valid_ip_or_host(arg: Any) -> str:
def valid_ip(arg: Any, v4: bool=True, v6: bool=True) -> str: def valid_ip(arg: Any, v4: bool=True, v6: bool=True) -> str:
assert v4 or v6 assert v4 or v6
validators: List[Callable] = [] validators: List[Callable] = []
versions: List[str] = []
if v4: if v4:
validators.append(lambda arg: str(ipaddress.IPv4Address(arg))) validators.append(lambda arg: str(ipaddress.IPv4Address(arg)))
versions.append("4")
if v6: if v6:
validators.append(lambda arg: str(ipaddress.IPv6Address(arg))) validators.append(lambda arg: str(ipaddress.IPv6Address(arg)))
name = "IP address" versions.append("6")
name = f"IPv{'/'.join(versions)} address"
return check_any( return check_any(
arg=valid_stripped_string_not_empty(arg, name), arg=valid_stripped_string_not_empty(arg, name),
name=name, name=name,
@ -71,7 +74,7 @@ def valid_rfc_host(arg: Any) -> str:
def valid_port(arg: Any) -> int: def valid_port(arg: Any) -> int:
return int(valid_number(arg, min=0, max=65535, name="TCP/UDP port")) return int(valid_number(arg, min=0, max=65535, name="network port"))
def valid_mac(arg: Any) -> str: def valid_mac(arg: Any) -> str: