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

Merge pull request #6 from OlegGirko/python-3.7

Browse Source 
Make KVMD compatible with Python 3.7
This commit is contained in:
Maxim Devaev
2020-09-05 01:56:36 +03:00
committed by GitHub
parent fc53759b3e dd2ff1ec83
commit 1257408183
10 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kvmd/apps/kvmd/api/auth.py
View File

@@ -45,7 +45,8 @@ _COOKIE_AUTH_TOKEN = "auth_token"
async def check_request_auth(auth_manager: AuthManager, exposed: HttpExposed, request: Request) -> None:
if exposed.auth_required and auth_manager.is_auth_enabled():
if (user := request.headers.get("X-KVMD-User", "")):
user = request.headers.get("X-KVMD-User", "")
if user:
user = valid_user(user)
passwd = request.headers.get("X-KVMD-Passwd", "")
set_request_auth_info(request, f"{user} (xhdr)")
@@ -53,7 +54,8 @@ async def check_request_auth(auth_manager: AuthManager, exposed: HttpExposed, re
raise ForbiddenError()
return
elif (token := request.cookies.get(_COOKIE_AUTH_TOKEN, "")):
token = request.cookies.get(_COOKIE_AUTH_TOKEN, "")
if token:
user = auth_manager.check(valid_auth_token(token))
if not user:
set_request_auth_info(request, "- (token)")
@@ -61,7 +63,8 @@ async def check_request_auth(auth_manager: AuthManager, exposed: HttpExposed, re
set_request_auth_info(request, f"{user} (token)")
return
elif (basic_auth := request.headers.get("Authorization", "")):
basic_auth = request.headers.get("Authorization", "")
if basic_auth:
if basic_auth[:6].lower() == "basic ":
try:
(user, passwd) = base64.b64decode(basic_auth[6:]).decode("utf-8").split(":")

5
kvmd/apps/kvmd/api/streamer.py
View File

@@ -56,11 +56,12 @@ class StreamerApi:
@exposed_http("GET", "/streamer/snapshot")
async def __take_snapshot_handler(self, request: Request) -> Response:
if (snapshot := await self.__streamer.take_snapshot(
snapshot = await self.__streamer.take_snapshot(
save=valid_bool(request.query.get("save", "false")),
load=valid_bool(request.query.get("load", "false")),
allow_offline=valid_bool(request.query.get("allow_offline", "false")),
)):
)
if snapshot:
if valid_bool(request.query.get("preview", "false")):
data = await self.__make_preview(
snapshot=snapshot,