mirror of
https://github.com/mofeng-git/One-KVM.git
synced 2026-01-29 00:51:53 +08:00
test for auth manager
This commit is contained in:
@@ -153,11 +153,11 @@ def _get_config_scheme() -> Dict:
|
||||
},
|
||||
|
||||
"auth": {
|
||||
"internal_users": Option([], type=valid_users_list),
|
||||
"internal_type": Option("htpasswd"),
|
||||
"external_type": Option(""),
|
||||
# "internal": {},
|
||||
"external_type": Option(""),
|
||||
# "external": {},
|
||||
"internal_users": Option([], type=valid_users_list),
|
||||
},
|
||||
|
||||
"info": {
|
||||
|
||||
@@ -46,11 +46,11 @@ def main(argv: Optional[List[str]]=None) -> None:
|
||||
# pylint: disable=protected-access
|
||||
Server(
|
||||
auth_manager=AuthManager(
|
||||
internal_users=config.auth.internal_users,
|
||||
internal_type=config.auth.internal_type,
|
||||
external_type=config.auth.external_type,
|
||||
internal=config.auth.internal._unpack(),
|
||||
external_type=config.auth.external_type,
|
||||
external=(config.auth.external._unpack() if config.auth.external_type else {}),
|
||||
internal_users=config.auth.internal_users,
|
||||
),
|
||||
info_manager=InfoManager(**config.info._unpack()),
|
||||
log_reader=LogReader(),
|
||||
|
||||
@@ -36,16 +36,16 @@ from ...plugins.auth import get_auth_service_class
|
||||
class AuthManager:
|
||||
def __init__(
|
||||
self,
|
||||
internal_users: List[str],
|
||||
|
||||
internal_type: str,
|
||||
external_type: str,
|
||||
|
||||
internal: Dict,
|
||||
|
||||
external_type: str,
|
||||
external: Dict,
|
||||
|
||||
internal_users: List[str],
|
||||
) -> None:
|
||||
|
||||
self.__internal_users = internal_users
|
||||
self.__internal_service = get_auth_service_class(internal_type)(**internal)
|
||||
get_logger().info("Using internal login service %r", self.__internal_service.PLUGIN_NAME)
|
||||
|
||||
@@ -54,6 +54,8 @@ class AuthManager:
|
||||
self.__external_service = get_auth_service_class(external_type)(**external)
|
||||
get_logger().info("Using external login service %r", self.__external_service.PLUGIN_NAME)
|
||||
|
||||
self.__internal_users = internal_users
|
||||
|
||||
self.__tokens: Dict[str, str] = {} # {token: user}
|
||||
|
||||
async def login(self, user: str, passwd: str) -> Optional[str]:
|
||||
|
||||
Reference in New Issue
Block a user