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

changed config hierarchy

Browse Source
This commit is contained in:
Devaev Maxim
2019-09-11 19:11:19 +03:00
parent e17889ba42
commit 2535892723
13 changed files with 46 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
kvmd/apps/kvmd/__init__.py
View File

@@ -53,16 +53,16 @@ def main(argv: Optional[List[str]]=None) -> None:
# pylint: disable=protected-access
Server(
auth_manager=AuthManager(
internal_type=config.auth.internal_type,
internal_kwargs=config.auth.internal._unpack(),
external_type=config.auth.external_type,
external_kwargs=(config.auth.external._unpack() if config.auth.external_type else {}),
internal_users=config.auth.internal_users,
internal_type=config.auth.internal.type,
internal_kwargs=config.auth.internal._unpack(ignore=["type", "force_users"]),
external_type=config.auth.external.type,
external_kwargs=(config.auth.external._unpack(ignore=["type"]) if config.auth.external.type else {}),
force_internal_users=config.auth.internal.force_users,
),
info_manager=InfoManager(**config.info._unpack()),
log_reader=LogReader(),
hid=get_hid_class(config.hid.type)(**config.hid.params._unpack()),
hid=get_hid_class(config.hid.type)(**config.hid._unpack(ignore=["type"])),
atx=Atx(**config.atx._unpack()),
msd=MassStorageDevice(**config.msd._unpack()),
streamer=Streamer(**config.streamer._unpack()),

6
kvmd/apps/kvmd/auth.py
View File

@@ -45,7 +45,7 @@ class AuthManager:
external_type: str,
external_kwargs: Dict,
internal_users: List[str],
force_internal_users: List[str],
) -> None:
self.__internal_service = get_auth_service_class(internal_type)(**internal_kwargs)
@@ -56,12 +56,12 @@ class AuthManager:
self.__external_service = get_auth_service_class(external_type)(**external_kwargs)
get_logger().info("Using external auth service %r", self.__external_service.get_plugin_name())
self.__internal_users = internal_users
self.__force_internal_users = force_internal_users
self.__tokens: Dict[str, str] = {} # {token: user}
async def authorize(self, user: str, passwd: str) -> bool:
if user not in self.__internal_users and self.__external_service:
if user not in self.__force_internal_users and self.__external_service:
service = self.__external_service
else:
service = self.__internal_service