修复12项安全漏洞和代码质量问题
安全修复: - 使用secrets替代random生成验证码，提升安全性 - 添加内存清理调度器，防止内存泄漏 - PIL缺失时返回503而非降级服务 - 改进会话安全配置，支持环境自动检测 - 密钥文件路径支持环境变量配置 Bug修复: - 改进异常处理，不再吞掉SystemExit/KeyboardInterrupt - 清理死代码(if False占位符) - 改进浏览器资源释放逻辑，使用try-finally确保关闭 - 重构数据库连接池归还逻辑，修复竞态条件 - 添加安全的JSON解析方法，处理损坏数据 - 日志级别默认值改为INFO - 提取魔法数字为可配置常量 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
115
app.py
115
app.py
@@ -23,6 +23,7 @@ import threading
|
||||
import time
|
||||
import json
|
||||
import os
|
||||
import secrets # 安全修复: 使用加密安全的随机数生成
|
||||
from datetime import datetime, timedelta, timezone
|
||||
from functools import wraps
|
||||
|
||||
@@ -131,9 +132,14 @@ log_cache_total_count = 0 # 全局日志总数,防止无限增长
|
||||
MAX_LOGS_PER_USER = config.MAX_LOGS_PER_USER # 每个用户最多100条
|
||||
MAX_TOTAL_LOGS = config.MAX_TOTAL_LOGS # 全局最多1000条,防止内存泄漏
|
||||
|
||||
# 安全修复: 内存清理配置
|
||||
USER_ACCOUNTS_EXPIRE_SECONDS = 3600 # 用户账号缓存1小时过期
|
||||
user_accounts_last_access = {} # {user_id: last_access_timestamp}
|
||||
|
||||
# 并发控制：每个用户同时最多运行1个账号（避免内存不足）
|
||||
# 验证码存储：{session_id: {"code": "1234", "expire_time": timestamp, "failed_attempts": 0}}
|
||||
captcha_storage = {}
|
||||
captcha_storage_lock = threading.Lock() # 安全修复: 保护captcha_storage的线程安全
|
||||
|
||||
# IP限流存储:{ip: {"attempts": count, "lock_until": timestamp, "first_attempt": timestamp}}
|
||||
ip_rate_limit = {}
|
||||
@@ -171,6 +177,90 @@ def get_screenshot_semaphore():
|
||||
return screenshot_semaphore, max_concurrent
|
||||
|
||||
|
||||
# ==================== 内存清理函数 ====================
|
||||
def cleanup_expired_data():
|
||||
"""定期清理过期数据，防止内存泄漏
|
||||
|
||||
清理内容:
|
||||
- 过期的验证码
|
||||
- 过期的IP限流记录
|
||||
- 长时间未访问的用户账号缓存
|
||||
- 完成的任务状态
|
||||
"""
|
||||
global log_cache_total_count
|
||||
current_time = time.time()
|
||||
|
||||
# 1. 清理过期验证码
|
||||
with captcha_storage_lock:
|
||||
expired_captchas = [k for k, v in captcha_storage.items() if v.get("expire_time", 0) < current_time]
|
||||
for k in expired_captchas:
|
||||
del captcha_storage[k]
|
||||
if expired_captchas:
|
||||
logger.debug(f"已清理 {len(expired_captchas)} 个过期验证码")
|
||||
|
||||
# 2. 清理过期IP限流记录
|
||||
with ip_rate_limit_lock:
|
||||
expired_ips = []
|
||||
for ip, data in ip_rate_limit.items():
|
||||
# 如果锁定已过期且首次尝试超过1小时，则清理
|
||||
lock_until = data.get("lock_until", 0)
|
||||
first_attempt = data.get("first_attempt", 0)
|
||||
if lock_until < current_time and (current_time - first_attempt) > 3600:
|
||||
expired_ips.append(ip)
|
||||
for ip in expired_ips:
|
||||
del ip_rate_limit[ip]
|
||||
if expired_ips:
|
||||
logger.debug(f"已清理 {len(expired_ips)} 个过期IP限流记录")
|
||||
|
||||
# 3. 清理长时间未访问的用户账号缓存
|
||||
with user_accounts_lock:
|
||||
expired_users = []
|
||||
for user_id, last_access in list(user_accounts_last_access.items()):
|
||||
if (current_time - last_access) > USER_ACCOUNTS_EXPIRE_SECONDS:
|
||||
# 检查该用户是否有活跃任务
|
||||
has_active_task = False
|
||||
with task_status_lock:
|
||||
for task_data in task_status.values():
|
||||
if task_data.get("user_id") == user_id:
|
||||
has_active_task = True
|
||||
break
|
||||
if not has_active_task and user_id in user_accounts:
|
||||
expired_users.append(user_id)
|
||||
for user_id in expired_users:
|
||||
del user_accounts[user_id]
|
||||
del user_accounts_last_access[user_id]
|
||||
if expired_users:
|
||||
logger.debug(f"已清理 {len(expired_users)} 个过期用户账号缓存")
|
||||
|
||||
# 4. 清理已完成任务的状态（保留最近10分钟的）
|
||||
with task_status_lock:
|
||||
completed_tasks = []
|
||||
for account_id, status_data in list(task_status.items()):
|
||||
if status_data.get("status") in ["已完成", "失败", "已停止"]:
|
||||
start_time = status_data.get("start_time", 0)
|
||||
if (current_time - start_time) > 600: # 10分钟
|
||||
completed_tasks.append(account_id)
|
||||
for account_id in completed_tasks:
|
||||
del task_status[account_id]
|
||||
if completed_tasks:
|
||||
logger.debug(f"已清理 {len(completed_tasks)} 个已完成任务状态")
|
||||
|
||||
|
||||
def start_cleanup_scheduler():
|
||||
"""启动定期清理调度器"""
|
||||
def cleanup_loop():
|
||||
while True:
|
||||
try:
|
||||
time.sleep(300) # 每5分钟执行一次清理
|
||||
cleanup_expired_data()
|
||||
except Exception as e:
|
||||
logger.error(f"清理任务执行失败: {e}")
|
||||
|
||||
cleanup_thread = threading.Thread(target=cleanup_loop, daemon=True, name="cleanup-scheduler")
|
||||
cleanup_thread.start()
|
||||
logger.info("内存清理调度器已启动")
|
||||
|
||||
|
||||
class User(UserMixin):
|
||||
"""Flask-Login 用户类"""
|
||||
def __init__(self, user_id):
|
||||
@@ -717,8 +807,8 @@ def generate_captcha():
|
||||
|
||||
session_id = str(uuid.uuid4())
|
||||
|
||||
# 生成4位随机数字
|
||||
code = "".join([str(random.randint(0, 9)) for _ in range(4)])
|
||||
# 安全修复: 使用加密安全的随机数生成验证码
|
||||
code = "".join([str(secrets.randbelow(10)) for _ in range(4)])
|
||||
|
||||
# 存储验证码，5分钟过期
|
||||
captcha_storage[session_id] = {
|
||||
@@ -777,15 +867,17 @@ def generate_captcha():
|
||||
"session_id": session_id,
|
||||
"captcha_image": f"data:image/png;base64,{img_base64}"
|
||||
})
|
||||
except ImportError:
|
||||
# 如果没有PIL，退回到简单文本（但添加混淆）
|
||||
# 安全警告：生产环境应安装PIL
|
||||
logger.warning("PIL未安装，验证码安全性降低")
|
||||
# 不直接返回验证码，返回混淆后的提示
|
||||
except ImportError as e:
|
||||
# 如果没有PIL，不再降级服务，直接返回错误
|
||||
# 安全修复：不返回任何验证码相关信息
|
||||
logger.error(f"PIL库未安装，验证码功能不可用: {e}")
|
||||
# 清理刚创建的验证码记录
|
||||
with captcha_storage_lock:
|
||||
if session_id in captcha_storage:
|
||||
del captcha_storage[session_id]
|
||||
return jsonify({
|
||||
"session_id": session_id,
|
||||
"captcha_hint": "验证码图片生成失败，请联系管理员"
|
||||
}), 500
|
||||
"error": "验证码服务暂不可用，请联系管理员安装PIL库"
|
||||
}), 503 # Service Unavailable
|
||||
|
||||
|
||||
@app.route('/api/login', methods=['POST'])
|
||||
@@ -3756,6 +3848,9 @@ if __name__ == '__main__':
|
||||
checkpoint_mgr = get_checkpoint_manager()
|
||||
print("✓ 任务断点管理器已初始化")
|
||||
|
||||
# 启动内存清理调度器
|
||||
start_cleanup_scheduler()
|
||||
|
||||
# 加载系统配置(并发设置)
|
||||
try:
|
||||
system_config = database.get_system_config()
|
||||
|
||||
Reference in New Issue
Block a user