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

number validator accepts hex numbers

Browse Source
This commit is contained in:
Maxim Devaev 2025-05-31 04:51:07 +03:00
parent 56d0d3aa8a
commit 97ea7de7d3
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kvmd/validators/basic.py
View File

@ -70,7 +70,13 @@ def valid_number(
arg = valid_stripped_string_not_empty(arg, name)
try:
arg = type(arg)
if type == int:
if arg.startswith(("0x", "0X")):
arg = int(arg[2:], 16)
else:
arg = int(arg)
else:
arg = type(arg)
except Exception:
raise_error(arg, name)

29
testenv/tests/validators/test_basic.py
View File

@ -34,6 +34,13 @@ from kvmd.validators.basic import valid_float_f01
from kvmd.validators.basic import valid_string_list
# =====
def _to_int(arg: Any) -> int:
if isinstance(arg, str) and arg.strip().startswith(("0x", "0X")):
arg = int(arg.strip()[2:], 16)
return int(str(arg).strip())
# =====
@pytest.mark.parametrize("arg, retval", [
("1", True),
@ -60,34 +67,34 @@ def test_fail__valid_bool(arg: Any) -> None:
# =====
@pytest.mark.parametrize("arg", ["1 ", "-1", 1, -1, 0, 100500])
@pytest.mark.parametrize("arg", ["1 ", "-1", 1, -1, 0, 100500, " 0xff"])
def test_ok__valid_number(arg: Any) -> None:
assert valid_number(arg) == int(str(arg).strip())
assert valid_number(arg) == _to_int(arg)
@pytest.mark.parametrize("arg", ["test", "", None, "1x", 100500.0])
@pytest.mark.parametrize("arg", ["test", "", None, "1x", 100500.0, "ff"])
def test_fail__valid_number(arg: Any) -> None:
with pytest.raises(ValidatorError):
print(valid_number(arg))
@pytest.mark.parametrize("arg", [-5, 0, 5, "-5 ", "0 ", "5 "])
@pytest.mark.parametrize("arg", [-5, 0, 5, "-5 ", "0 ", "5 ", " 0x05"])
def test_ok__valid_number__min_max(arg: Any) -> None:
assert valid_number(arg, -5, 5) == int(str(arg).strip())
assert valid_number(arg, -5, 5) == _to_int(arg)
@pytest.mark.parametrize("arg", ["test", "", None, -6, 6, "-6 ", "6 "])
@pytest.mark.parametrize("arg", ["test", "", None, -6, 6, "-6 ", "6 ", "0x06"])
def test_fail__valid_number__min_max(arg: Any) -> None: # pylint: disable=invalid-name
with pytest.raises(ValidatorError):
print(valid_number(arg, -5, 5))
# =====
@pytest.mark.parametrize("arg", [0, 1, 5, "5 "])
@pytest.mark.parametrize("arg", [0, 1, 5, "5 ", " 0x05"])
def test_ok__valid_int_f0(arg: Any) -> None:
value = valid_int_f0(arg)
assert type(value) is int # pylint: disable=unidiomatic-typecheck
assert value == int(str(arg).strip())
assert value == _to_int(arg)
@pytest.mark.parametrize("arg", ["test", "", None, -6, "-6 ", "5.0"])
@ -97,14 +104,14 @@ def test_fail__valid_int_f0(arg: Any) -> None:
# =====
@pytest.mark.parametrize("arg", [1, 5, "5 "])
@pytest.mark.parametrize("arg", [1, 5, "5 ", " 0x05"])
def test_ok__valid_int_f1(arg: Any) -> None:
value = valid_int_f1(arg)
assert type(value) is int # pylint: disable=unidiomatic-typecheck
assert value == int(str(arg).strip())
assert value == _to_int(arg)
@pytest.mark.parametrize("arg", ["test", "", None, -6, "-6 ", 0, "0 ", "5.0"])
@pytest.mark.parametrize("arg", ["test", "", None, -6, "-6 ", 0, "0 ", "5.0", "0x0"])
def test_fail__valid_int_f1(arg: Any) -> None:
with pytest.raises(ValidatorError):
print(valid_int_f1(arg))