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

refactoring

Browse Source
This commit is contained in:
Devaev Maxim
2019-04-16 00:28:13 +03:00
parent b1e2d5967a
commit da46733840
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,9 +47,9 @@ def main(argv: Optional[List[str]]=None) -> None:
Server(
auth_manager=AuthManager(
internal_type=config.auth.internal_type,
internal=config.auth.internal._unpack(),
internal_kwargs=config.auth.internal._unpack(),
external_type=config.auth.external_type,
external=(config.auth.external._unpack() if config.auth.external_type else {}),
external_kwargs=(config.auth.external._unpack() if config.auth.external_type else {}),
internal_users=config.auth.internal_users,
),
info_manager=InfoManager(**config.info._unpack()),

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

@@ -38,20 +38,20 @@ class AuthManager:
self,
internal_type: str,
internal: Dict,
internal_kwargs: Dict,
external_type: str,
external: Dict,
external_kwargs: Dict,
internal_users: List[str],
) -> None:
self.__internal_service = get_auth_service_class(internal_type)(**internal)
self.__internal_service = get_auth_service_class(internal_type)(**internal_kwargs)
get_logger().info("Using internal login service %r", self.__internal_service.PLUGIN_NAME)
self.__external_service: Optional[BaseAuthService] = None
if external_type:
self.__external_service = get_auth_service_class(external_type)(**external)
self.__external_service = get_auth_service_class(external_type)(**external_kwargs)
get_logger().info("Using external login service %r", self.__external_service.PLUGIN_NAME)
self.__internal_users = internal_users