refactoring

6 files changed, 47 insertions, 93 deletions

diff --git a/kvmd/apps/__init__.py b/kvmd/apps/__init__.py
index 7d9b7425..c1e9f958 100644
--- a/kvmd/apps/__init__.py
+++ b/kvmd/apps/__init__.py
@@ -311,10 +311,10 @@ def _get_config_scheme() -> Dict:
             },
 
             "kvmd": {
-                "host":    Option("localhost", type=valid_ip_or_host, unpack_as="kvmd_host"),
-                "port":    Option(0,   type=valid_port, unpack_as="kvmd_port"),
-                "unix":    Option("",  type=valid_abs_path, only_if="!port", unpack_as="kvmd_unix_path"),
-                "timeout": Option(5.0, type=valid_float_f01, unpack_as="kvmd_timeout"),
+                "host":    Option("localhost", type=valid_ip_or_host),
+                "port":    Option(0,   type=valid_port),
+                "unix":    Option("",  type=valid_abs_path, only_if="!port", unpack_as="unix_path"),
+                "timeout": Option(5.0, type=valid_float_f01),
             },
 
             "auth": {
diff --git a/kvmd/apps/ipmi/__init__.py b/kvmd/apps/ipmi/__init__.py
index 03235f10..54e15513 100644
--- a/kvmd/apps/ipmi/__init__.py
+++ b/kvmd/apps/ipmi/__init__.py
@@ -23,6 +23,10 @@
 from typing import List
 from typing import Optional
 
+from ...clients.kvmd import KvmdClient
+
+from ... import make_user_agent
+
 from .. import init
 
 from .auth import IpmiAuthManager
@@ -40,8 +44,9 @@ def main(argv: Optional[List[str]]=None) -> None:
     # pylint: disable=protected-access
     IpmiServer(
         auth_manager=IpmiAuthManager(**config.auth._unpack()),
-        **{  # Dirty mypy hack
-            **config.server._unpack(),
+        kvmd=KvmdClient(
+            user_agent=make_user_agent("KVMD-IPMI"),
             **config.kvmd._unpack(),
-        },
-    ).run()  # type: ignore
+        ),
+        **config.server._unpack(),
+    ).run()
diff --git a/kvmd/apps/ipmi/server.py b/kvmd/apps/ipmi/server.py
index c53d3ddc..5f1a47dd 100644
--- a/kvmd/apps/ipmi/server.py
+++ b/kvmd/apps/ipmi/server.py
@@ -20,13 +20,10 @@
 # ========================================================================== #
 
 
-import sys
 import asyncio
-import threading
 
-from typing import Tuple
 from typing import Dict
-from typing import Optional
+from typing import Callable
 
 import aiohttp
 
@@ -36,7 +33,9 @@ from pyghmi.ipmi.private.serversession import ServerSession as IpmiServerSession
 
 from ...logging import get_logger
 
-from ... import make_user_agent
+from ...clients.kvmd import KvmdClient
+
+from ... import aiotools
 
 from .auth import IpmiAuthManager
 
@@ -49,30 +48,22 @@ class IpmiServer(BaseIpmiServer):  # pylint: disable=too-many-instance-attribute
     def __init__(
         self,
         auth_manager: IpmiAuthManager,
+        kvmd: KvmdClient,
 
         host: str,
         port: str,
         timeout: float,
-
-        kvmd_host: str,
-        kvmd_port: int,
-        kvmd_unix_path: str,
-        kvmd_timeout: float,
     ) -> None:
 
         super().__init__(authdata=auth_manager, address=host, port=port)
 
         self.__auth_manager = auth_manager
+        self.__kvmd = kvmd
 
         self.__host = host
         self.__port = port
         self.__timeout = timeout
 
-        self.__kvmd_host = kvmd_host
-        self.__kvmd_port = kvmd_port
-        self.__kvmd_unix_path = kvmd_unix_path
-        self.__kvmd_timeout = kvmd_timeout
-
     def run(self) -> None:
         logger = get_logger(0)
         logger.info("Listening IPMI on UPD [%s]:%d ...", self.__host, self.__port)
@@ -104,19 +95,19 @@ class IpmiServer(BaseIpmiServer):  # pylint: disable=too-many-instance-attribute
             session.send_ipmi_response(code=0xC1)
 
     def __get_chassis_status_handler(self, _: Dict, session: IpmiServerSession) -> None:
-        result = self.__make_request("GET", "/atx", session)[1]
+        result = self.__make_request(session, "atx.get_state()", self.__kvmd.atx.get_state)
         data = [int(result["leds"]["power"]), 0, 0]
         session.send_ipmi_response(data=data)
 
     def __chassis_control_handler(self, request: Dict, session: IpmiServerSession) -> None:
-        handle = {
-            0: "/atx/power?action=off_hard",
-            1: "/atx/power?action=on",
-            3: "/atx/power?action=reset_hard",
-            5: "/atx/power?action=off",
+        action = {
+            0: "off_hard",
+            1: "on",
+            3: "reset_hard",
+            5: "off",
         }.get(request["data"][0], "")
-        if handle:
-            if self.__make_request("POST", handle, session)[0] == 409:
+        if action:
+            if not self.__make_request(session, f"atx.switch_power({action})", self.__kvmd.atx.switch_power, action=action):
                 code = 0xC0  # Try again later
             else:
                 code = 0
@@ -126,65 +117,19 @@ class IpmiServer(BaseIpmiServer):  # pylint: disable=too-many-instance-attribute
 
     # =====
 
-    def __make_request(self, method: str, handle: str, ipmi_session: IpmiServerSession) -> Tuple[int, Dict]:
-        result: Optional[Tuple[int, Dict]] = None
-        exc_info = None
-
-        def make_request() -> None:
-            nonlocal result
-            nonlocal exc_info
-
-            loop = asyncio.new_event_loop()
+    def __make_request(self, session: IpmiServerSession, name: str, method: Callable, **kwargs):  # type: ignore
+        async def runner():  # type: ignore
+            logger = get_logger(0)
+            credentials = self.__auth_manager.get_credentials(session.username.decode())
+            logger.info("Performing request %s from user %r (IPMI) as %r (KVMD)",
+                        name, credentials.ipmi_user, credentials.kvmd_user)
             try:
-                result = loop.run_until_complete(self.__make_request_async(method, handle, ipmi_session))
-            except:  # noqa: E722  # pylint: disable=bare-except
-                exc_info = sys.exc_info()
-            finally:
-                loop.close()
-
-        thread = threading.Thread(target=make_request, daemon=True)
-        thread.start()
-        thread.join()
-        if exc_info is not None:
-            raise exc_info[1].with_traceback(exc_info[2])  # type: ignore  # pylint: disable=unsubscriptable-object
-        assert result is not None
-        # Dirty pylint hack
-        return (result[0], result[1])  # pylint: disable=unsubscriptable-object
-
-    async def __make_request_async(self, method: str, handle: str, ipmi_session: IpmiServerSession) -> Tuple[int, Dict]:
-        logger = get_logger(0)
-
-        assert handle.startswith("/")
-        url = f"http://{self.__kvmd_host}:{self.__kvmd_port}{handle}"
-
-        credentials = self.__auth_manager.get_credentials(ipmi_session.username.decode())
-        logger.info("Performing %r request to %r from user %r (IPMI) as %r (KVMD)",
-                    method, url, credentials.ipmi_user, credentials.kvmd_user)
-
-        async with self.__make_http_session_async() as http_session:
-            try:
-                async with http_session.request(
-                    method=method,
-                    url=url,
-                    headers={
-                        "X-KVMD-User": credentials.kvmd_user,
-                        "X-KVMD-Passwd": credentials.kvmd_passwd,
-                        "User-Agent": make_user_agent("KVMD-IPMI"),
-                    },
-                    timeout=self.__kvmd_timeout,
-                ) as response:
-                    if response.status != 409:
-                        response.raise_for_status()
-                    return (response.status, (await response.json())["result"])
+                return (await method(credentials.kvmd_user, credentials.kvmd_passwd, **kwargs))
             except (aiohttp.ClientError, asyncio.TimeoutError) as err:
-                logger.error("Can't perform %r request to %r: %s: %s", method, url, type(err).__name__, str(err))
+                logger.error("Can't perform request %s: %s", name, str(err))
                 raise
             except Exception:
-                logger.exception("Unexpected exception while performing %r request to %r", method, url)
+                logger.exception("Unexpected exception while performing request %s", name)
                 raise
 
-    def __make_http_session_async(self) -> aiohttp.ClientSession:
-        if self.__kvmd_unix_path:
-            return aiohttp.ClientSession(connector=aiohttp.UnixConnector(path=self.__kvmd_unix_path))
-        else:
-            return aiohttp.ClientSession()
+        return aiotools.run_sync(runner())
diff --git a/kvmd/apps/kvmd/streamer.py b/kvmd/apps/kvmd/streamer.py
index b31f369f..98b5ae0c 100644
--- a/kvmd/apps/kvmd/streamer.py
+++ b/kvmd/apps/kvmd/streamer.py
@@ -183,7 +183,7 @@ class Streamer:  # pylint: disable=too-many-instance-attributes
                     headers={"User-Agent": make_user_agent("KVMD")},
                     timeout=self.__timeout,
                 ) as response:
-                    response.raise_for_status()
+                    aiotools.raise_not_200(response)
                     state = (await response.json())["result"]
             except (aiohttp.ClientConnectionError, aiohttp.ServerConnectionError):
                 pass
diff --git a/kvmd/apps/vnc/__init__.py b/kvmd/apps/vnc/__init__.py
index 9bcc9d27..ef0f0c03 100644
--- a/kvmd/apps/vnc/__init__.py
+++ b/kvmd/apps/vnc/__init__.py
@@ -43,6 +43,8 @@ def main(argv: Optional[List[str]]=None) -> None:
         argv=argv,
     )[2].vnc
 
+    user_agent = make_user_agent("KVMD-VNC")
+
     # pylint: disable=protected-access
     VncServer(
         host=config.server.host,
@@ -55,9 +57,12 @@ def main(argv: Optional[List[str]]=None) -> None:
         desired_fps=config.desired_fps,
         symmap=build_symmap(config.keymap),
 
-        kvmd=KvmdClient(**config.kvmd._unpack()),
+        kvmd=KvmdClient(
+            user_agent=user_agent,
+            **config.kvmd._unpack(),
+        ),
         streamer=StreamerClient(
-            user_agent=make_user_agent("KVMD-VNC"),
+            user_agent=user_agent,
             **config.streamer._unpack(),
         ),
         vnc_auth_manager=VncAuthManager(**config.auth.vncauth._unpack()),
diff --git a/kvmd/apps/vnc/server.py b/kvmd/apps/vnc/server.py
index 12baeb20..15eb2402 100644
--- a/kvmd/apps/vnc/server.py
+++ b/kvmd/apps/vnc/server.py
@@ -34,7 +34,6 @@ import aiohttp
 
 from ...logging import get_logger
 
-from ...clients.kvmd import KvmdError
 from ...clients.kvmd import KvmdClient
 
 from ...clients.streamer import StreamerError
@@ -327,8 +326,8 @@ class VncServer:  # pylint: disable=too-many-instance-attributes
             try:
                 try:
                     none_auth_only = await kvmd.auth.check("", "")
-                except KvmdError as err:
-                    logger.error("Client %s: Can't check KVMD auth mode: %s", remote, err)
+                except (aiohttp.ClientError, asyncio.TimeoutError) as err:
+                    logger.error("Client %s: Can't check KVMD auth mode: %s: %s", remote, type(err).__name__, err)
                     return
 
                 await _Client(