chore: 优化代码

This commit is contained in:
lerdb 2024-10-08 22:22:36 +08:00
parent b13c7d77ab
commit f58d1b2069
No known key found for this signature in database
GPG Key ID: FBBF3738C577282C

20
main.py
View File

@ -20,7 +20,7 @@ from io import TextIOWrapper
import sys import sys
import os import os
if ((sys.version_info.major == 3 and sys.version_info.minor < 6) or sys.version_info.major == 2): if sys.version_info < (3, 6):
print('Python版本过低请使用Python 3.6+ ') print('Python版本过低请使用Python 3.6+ ')
sys.exit(1) sys.exit(1)
@ -52,7 +52,7 @@ logger = log.log("main")
aiologger = log.log('aiohttp_web') aiologger = log.log('aiohttp_web')
stopEvent = None stopEvent = None
if (sys.version_info.minor < 8 and sys.version_info.major == 3): if sys.version_info < (3, 8):
logger.warning('您使用的Python版本已经停止更新不建议继续使用') logger.warning('您使用的Python版本已经停止更新不建议继续使用')
import concurrent import concurrent
stopEvent = concurrent.futures._base.CancelledError stopEvent = concurrent.futures._base.CancelledError
@ -69,16 +69,12 @@ def start_checkcn_thread() -> None:
async def handle_before_request(app, handler): async def handle_before_request(app, handler):
async def handle_request(request): async def handle_request(request):
try: try:
if (config.read_config('common.reverse_proxy.allow_proxy')): if config.read_config("common.reverse_proxy.allow_proxy") and request.headers.get(
if (request.headers.get(config.read_config('common.reverse_proxy.real_ip_header'))): config.read_config("common.reverse_proxy.real_ip_header")):
# proxy header if not config.read_config("common.reverse_proxy.allow_public_ip") or utils.is_local_ip(request.remote):
if (config.read_config('common.reverse_proxy.allow_public_ip') or utils.is_local_ip(request.remote)): return handleResult({"code": 1, "msg": "不允许的公网ip转发", "data": None}, 403)
request.remote_addr = request.headers.get( # proxy header
config.read_config('common.reverse_proxy.real_ip_header')) request.remote_addr = request.headers.get(config.read_config("common.reverse_proxy.real_ip_header"))
else:
return handleResult({"code": 1, "msg": "不允许的公网ip转发", "data": None}, 403)
else:
request.remote_addr = request.remote
else: else:
request.remote_addr = request.remote request.remote_addr = request.remote
# check ip # check ip