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

strict file validation

Browse Source
This commit is contained in:
Devaev Maxim
2019-10-24 01:21:34 +03:00
parent 372bf2a4af
commit 97e2d9128c
6 changed files with 52 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
kvmd/apps/__init__.py
View File

@@ -58,7 +58,8 @@ from ..validators.auth import valid_user
from ..validators.auth import valid_users_list
from ..validators.os import valid_abs_path
from ..validators.os import valid_abs_path_exists
from ..validators.os import valid_abs_file
from ..validators.os import valid_abs_dir
from ..validators.os import valid_unix_mode
from ..validators.os import valid_command
@@ -87,7 +88,7 @@ def init(
args_parser = argparse.ArgumentParser(prog=(prog or argv[0]), description=description, add_help=add_help)
args_parser.add_argument("-c", "--config", dest="config_path", default="/etc/kvmd/main.yaml", metavar="<file>",
type=valid_abs_path_exists, help="Set config file path")
type=valid_abs_file, help="Set config file path")
args_parser.add_argument("-o", "--set-options", dest="set_options", default=[], nargs="+",
help="Override config options list (like sec/sub/opt=value)")
args_parser.add_argument("-m", "--dump-config", dest="dump_config", action="store_true",
@@ -205,8 +206,8 @@ def _get_config_scheme() -> Dict:
},
"info": {
"meta": Option("/etc/kvmd/meta.yaml", type=valid_abs_path_exists, unpack_as="meta_path"),
"extras": Option("/usr/share/kvmd/extras", type=valid_abs_path_exists, unpack_as="extras_path"),
"meta": Option("/etc/kvmd/meta.yaml", type=valid_abs_file, unpack_as="meta_path"),
"extras": Option("/usr/share/kvmd/extras", type=valid_abs_dir, unpack_as="extras_path"),
},
"hid": {
@@ -303,7 +304,7 @@ def _get_config_scheme() -> Dict:
},
"auth": {
"file": Option("/etc/kvmd/ipmipasswd", type=valid_abs_path_exists, unpack_as="path"),
"file": Option("/etc/kvmd/ipmipasswd", type=valid_abs_file, unpack_as="path"),
},
},
}

4
kvmd/apps/otgmsd/__init__.py
View File

@@ -33,7 +33,7 @@ import psutil
from ...validators.basic import valid_bool
from ...validators.basic import valid_number
from ...validators.os import valid_abs_path_exists
from ...validators.os import valid_abs_file
from .. import init
@@ -98,7 +98,7 @@ def main(argv: Optional[List[str]]=None) -> None:
metavar="<1|0|yes|no>", help="Set CD-ROM flag")
parser.add_argument("--set-rw", default=None, type=valid_bool,
metavar="<1|0|yes|no>", help="Set RW flag")
parser.add_argument("--set-image", default=None, type=valid_abs_path_exists,
parser.add_argument("--set-image", default=None, type=valid_abs_file,
metavar="<path>", help="Set the image file")
parser.add_argument("--eject", action="store_true",
help="Eject the image")