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

improved some logging

Browse Source
This commit is contained in:
Devaev Maxim
2020-05-25 01:39:12 +03:00
parent eeece34312
commit 499cbb0cc5
3 changed files with 40 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
kvmd/apps/ipmi/auth.py
View File

@@ -28,8 +28,8 @@ from typing import Dict
# =====
class IpmiPasswdError(Exception):
def __init__(self, msg: str) -> None:
super().__init__("Incorrect IPMI passwd file: " + msg)
def __init__(self, path: str, number: int, msg: str) -> None:
super().__init__(f"Syntax error at {path}:{number}: {msg}")
@dataclasses.dataclass(frozen=True)
@@ -42,6 +42,7 @@ class IpmiUserCredentials:
class IpmiAuthManager:
def __init__(self, path: str) -> None:
self.__path = path
with open(path) as passwd_file:
self.__credentials = self.__parse_passwd_file(passwd_file.read().split("\n"))
@@ -61,25 +62,25 @@ class IpmiAuthManager:
continue
if " -> " not in line:
raise IpmiPasswdError(f"Missing ' -> ' operator at line #{number}")
raise IpmiPasswdError(self.__path, number, "Missing ' -> ' operator")
(left, right) = map(str.lstrip, line.split(" -> ", 1))
for (name, pair) in [("left", left), ("right", right)]:
if ":" not in pair:
raise IpmiPasswdError(f"Missing ':' operator in {name} credentials at line #{number}")
raise IpmiPasswdError(self.__path, number, f"Missing ':' operator in {name} credentials")
(ipmi_user, ipmi_passwd) = left.split(":")
ipmi_user = ipmi_user.strip()
if len(ipmi_user) == 0:
raise IpmiPasswdError(f"Empty IPMI user (left) at line #{number}")
raise IpmiPasswdError(self.__path, number, "Empty IPMI user (left)")
(kvmd_user, kvmd_passwd) = right.split(":")
kvmd_user = kvmd_user.strip()
if len(kvmd_user) == 0:
raise IpmiPasswdError(f"Empty KVMD user (left) at line #{number}")
raise IpmiPasswdError(self.__path, number, "Empty KVMD user (left)")
if ipmi_user in credentials:
raise IpmiPasswdError(f"Found duplicating user {ipmi_user!r} (left) at line #{number}")
raise IpmiPasswdError(self.__path, number, f"Found duplicating user {ipmi_user!r} (left)")
credentials[ipmi_user] = IpmiUserCredentials(
ipmi_user=ipmi_user,

12
kvmd/apps/vnc/vncauth.py
View File

@@ -32,8 +32,8 @@ from ...logging import get_logger
# =====
class VncAuthError(Exception):
def __init__(self, msg: str) -> None:
super().__init__(f"Incorrect VNCAuth passwd file: {msg}")
def __init__(self, path: str, number: int, msg: str) -> None:
super().__init__(f"Syntax error at {path}:{number}: {msg}")
# =====
@@ -73,19 +73,19 @@ class VncAuthManager:
continue
if " -> " not in line:
raise VncAuthError(f"Missing ' -> ' operator at line #{number}")
raise VncAuthError(self.__path, number, "Missing ' -> ' operator")
(vnc_passwd, kvmd_userpass) = map(str.lstrip, line.split(" -> ", 1))
if ":" not in kvmd_userpass:
raise VncAuthError(f"Missing ':' operator in KVMD credentials (right part) at line #{number}")
raise VncAuthError(self.__path, number, "Missing ':' operator in KVMD credentials (right part)")
(kvmd_user, kvmd_passwd) = kvmd_userpass.split(":")
kvmd_user = kvmd_user.strip()
if len(kvmd_user) == 0:
raise VncAuthError(f"Empty KVMD user (right part) at line #{number}")
raise VncAuthError(self.__path, number, "Empty KVMD user (right part)")
if vnc_passwd in credentials:
raise VncAuthError(f"Found duplicating VNC password (left part) at line #{number}")
raise VncAuthError(self.__path, number, "Duplicating VNC password (left part)")
credentials[vnc_passwd] = VncAuthKvmdCredentials(kvmd_user, kvmd_passwd)
return credentials