- 新增图像生成接口,支持试用、积分和自定义API Key模式 - 实现生成图片结果异步上传至MinIO存储,带重试机制 - 优化积分预扣除和异常退还逻辑,保障用户积分准确 - 添加获取生成历史记录接口,支持时间范围和分页 - 提供本地字典配置接口,支持模型、比例、提示模板和尺寸 - 实现图片批量上传接口,支持S3兼容对象存储 feat(admin): 增加管理员角色管理与权限分配接口 - 实现角色列表查询、角色创建、更新及删除功能 - 增加权限列表查询接口 - 实现用户角色分配接口,便于统一管理用户权限 - 增加系统字典增删查改接口,支持分类过滤和排序 - 权限控制全面覆盖管理接口,保证安全访问 feat(auth): 完善用户登录注册及权限相关接口与页面 - 实现手机号验证码发送及校验功能,保障注册安全 - 支持手机号注册、登录及退出接口,集成日志记录 - 增加修改密码功能,验证原密码后更新 - 提供动态导航菜单接口,基于权限展示不同菜单 - 实现管理界面路由及日志、角色、字典管理页面访问权限控制 - 添加系统日志查询接口,支持关键词和等级筛选 feat(app): 初始化Flask应用并配置蓝图与数据库 - 创建应用程序工厂,加载配置,初始化数据库和Redis客户端 - 注册认证、API及管理员蓝图,整合路由 - 根路由渲染主页模板 - 应用上下文中自动创建数据库表,保证运行环境准备完毕 feat(database): 提供数据库创建与迁移支持脚本 - 新增数据库创建脚本,支持自动检测是否已存在 - 添加数据库表初始化脚本,支持创建和删除所有表 - 实现RBAC权限初始化,包含基础权限和角色创建 - 新增字段手动修复脚本,添加用户API Key和积分字段 - 强制迁移脚本支持清理连接和修复表结构,初始化默认数据及角色分配 feat(config): 新增系统配置参数 - 配置数据库、Redis、Session和MinIO相关参数 - 添加AI接口地址及试用Key配置 - 集成阿里云短信服务配置及开发模式相关参数 feat(extensions): 初始化数据库、Redis和MinIO客户端 - 创建全局SQLAlchemy数据库实例和Redis客户端 - 配置基于boto3的MinIO兼容S3客户端 chore(logs): 添加示例系统日志文件 - 记录用户请求、验证码发送成功与失败的日志信息
275 lines
9.8 KiB
Python
275 lines
9.8 KiB
Python
import asyncio
|
|
import socket
|
|
import weakref
|
|
from typing import Any, Dict, Final, List, Optional, Tuple, Type, Union
|
|
|
|
from .abc import AbstractResolver, ResolveResult
|
|
|
|
__all__ = ("ThreadedResolver", "AsyncResolver", "DefaultResolver")
|
|
|
|
|
|
try:
|
|
import aiodns
|
|
|
|
aiodns_default = hasattr(aiodns.DNSResolver, "getaddrinfo")
|
|
except ImportError: # pragma: no cover
|
|
aiodns = None # type: ignore[assignment]
|
|
aiodns_default = False
|
|
|
|
|
|
_NUMERIC_SOCKET_FLAGS = socket.AI_NUMERICHOST | socket.AI_NUMERICSERV
|
|
_NAME_SOCKET_FLAGS = socket.NI_NUMERICHOST | socket.NI_NUMERICSERV
|
|
_AI_ADDRCONFIG = socket.AI_ADDRCONFIG
|
|
if hasattr(socket, "AI_MASK"):
|
|
_AI_ADDRCONFIG &= socket.AI_MASK
|
|
|
|
|
|
class ThreadedResolver(AbstractResolver):
|
|
"""Threaded resolver.
|
|
|
|
Uses an Executor for synchronous getaddrinfo() calls.
|
|
concurrent.futures.ThreadPoolExecutor is used by default.
|
|
"""
|
|
|
|
def __init__(self, loop: Optional[asyncio.AbstractEventLoop] = None) -> None:
|
|
self._loop = loop or asyncio.get_running_loop()
|
|
|
|
async def resolve(
|
|
self, host: str, port: int = 0, family: socket.AddressFamily = socket.AF_INET
|
|
) -> List[ResolveResult]:
|
|
infos = await self._loop.getaddrinfo(
|
|
host,
|
|
port,
|
|
type=socket.SOCK_STREAM,
|
|
family=family,
|
|
flags=_AI_ADDRCONFIG,
|
|
)
|
|
|
|
hosts: List[ResolveResult] = []
|
|
for family, _, proto, _, address in infos:
|
|
if family == socket.AF_INET6:
|
|
if len(address) < 3:
|
|
# IPv6 is not supported by Python build,
|
|
# or IPv6 is not enabled in the host
|
|
continue
|
|
if address[3]:
|
|
# This is essential for link-local IPv6 addresses.
|
|
# LL IPv6 is a VERY rare case. Strictly speaking, we should use
|
|
# getnameinfo() unconditionally, but performance makes sense.
|
|
resolved_host, _port = await self._loop.getnameinfo(
|
|
address, _NAME_SOCKET_FLAGS
|
|
)
|
|
port = int(_port)
|
|
else:
|
|
resolved_host, port = address[:2]
|
|
else: # IPv4
|
|
assert family == socket.AF_INET
|
|
resolved_host, port = address # type: ignore[misc]
|
|
hosts.append(
|
|
ResolveResult(
|
|
hostname=host,
|
|
host=resolved_host,
|
|
port=port,
|
|
family=family,
|
|
proto=proto,
|
|
flags=_NUMERIC_SOCKET_FLAGS,
|
|
)
|
|
)
|
|
|
|
return hosts
|
|
|
|
async def close(self) -> None:
|
|
pass
|
|
|
|
|
|
class AsyncResolver(AbstractResolver):
|
|
"""Use the `aiodns` package to make asynchronous DNS lookups"""
|
|
|
|
def __init__(
|
|
self,
|
|
loop: Optional[asyncio.AbstractEventLoop] = None,
|
|
*args: Any,
|
|
**kwargs: Any,
|
|
) -> None:
|
|
if aiodns is None:
|
|
raise RuntimeError("Resolver requires aiodns library")
|
|
|
|
self._loop = loop or asyncio.get_running_loop()
|
|
self._manager: Optional[_DNSResolverManager] = None
|
|
# If custom args are provided, create a dedicated resolver instance
|
|
# This means each AsyncResolver with custom args gets its own
|
|
# aiodns.DNSResolver instance
|
|
if args or kwargs:
|
|
self._resolver = aiodns.DNSResolver(*args, **kwargs)
|
|
return
|
|
# Use the shared resolver from the manager for default arguments
|
|
self._manager = _DNSResolverManager()
|
|
self._resolver = self._manager.get_resolver(self, self._loop)
|
|
|
|
if not hasattr(self._resolver, "gethostbyname"):
|
|
# aiodns 1.1 is not available, fallback to DNSResolver.query
|
|
self.resolve = self._resolve_with_query # type: ignore
|
|
|
|
async def resolve(
|
|
self, host: str, port: int = 0, family: socket.AddressFamily = socket.AF_INET
|
|
) -> List[ResolveResult]:
|
|
try:
|
|
resp = await self._resolver.getaddrinfo(
|
|
host,
|
|
port=port,
|
|
type=socket.SOCK_STREAM,
|
|
family=family,
|
|
flags=_AI_ADDRCONFIG,
|
|
)
|
|
except aiodns.error.DNSError as exc:
|
|
msg = exc.args[1] if len(exc.args) >= 1 else "DNS lookup failed"
|
|
raise OSError(None, msg) from exc
|
|
hosts: List[ResolveResult] = []
|
|
for node in resp.nodes:
|
|
address: Union[Tuple[bytes, int], Tuple[bytes, int, int, int]] = node.addr
|
|
family = node.family
|
|
if family == socket.AF_INET6:
|
|
if len(address) > 3 and address[3]:
|
|
# This is essential for link-local IPv6 addresses.
|
|
# LL IPv6 is a VERY rare case. Strictly speaking, we should use
|
|
# getnameinfo() unconditionally, but performance makes sense.
|
|
result = await self._resolver.getnameinfo(
|
|
(address[0].decode("ascii"), *address[1:]),
|
|
_NAME_SOCKET_FLAGS,
|
|
)
|
|
resolved_host = result.node
|
|
else:
|
|
resolved_host = address[0].decode("ascii")
|
|
port = address[1]
|
|
else: # IPv4
|
|
assert family == socket.AF_INET
|
|
resolved_host = address[0].decode("ascii")
|
|
port = address[1]
|
|
hosts.append(
|
|
ResolveResult(
|
|
hostname=host,
|
|
host=resolved_host,
|
|
port=port,
|
|
family=family,
|
|
proto=0,
|
|
flags=_NUMERIC_SOCKET_FLAGS,
|
|
)
|
|
)
|
|
|
|
if not hosts:
|
|
raise OSError(None, "DNS lookup failed")
|
|
|
|
return hosts
|
|
|
|
async def _resolve_with_query(
|
|
self, host: str, port: int = 0, family: int = socket.AF_INET
|
|
) -> List[Dict[str, Any]]:
|
|
qtype: Final = "AAAA" if family == socket.AF_INET6 else "A"
|
|
|
|
try:
|
|
resp = await self._resolver.query(host, qtype)
|
|
except aiodns.error.DNSError as exc:
|
|
msg = exc.args[1] if len(exc.args) >= 1 else "DNS lookup failed"
|
|
raise OSError(None, msg) from exc
|
|
|
|
hosts = []
|
|
for rr in resp:
|
|
hosts.append(
|
|
{
|
|
"hostname": host,
|
|
"host": rr.host,
|
|
"port": port,
|
|
"family": family,
|
|
"proto": 0,
|
|
"flags": socket.AI_NUMERICHOST,
|
|
}
|
|
)
|
|
|
|
if not hosts:
|
|
raise OSError(None, "DNS lookup failed")
|
|
|
|
return hosts
|
|
|
|
async def close(self) -> None:
|
|
if self._manager:
|
|
# Release the resolver from the manager if using the shared resolver
|
|
self._manager.release_resolver(self, self._loop)
|
|
self._manager = None # Clear reference to manager
|
|
self._resolver = None # type: ignore[assignment] # Clear reference to resolver
|
|
return
|
|
# Otherwise cancel our dedicated resolver
|
|
if self._resolver is not None:
|
|
self._resolver.cancel()
|
|
self._resolver = None # type: ignore[assignment] # Clear reference
|
|
|
|
|
|
class _DNSResolverManager:
|
|
"""Manager for aiodns.DNSResolver objects.
|
|
|
|
This class manages shared aiodns.DNSResolver instances
|
|
with no custom arguments across different event loops.
|
|
"""
|
|
|
|
_instance: Optional["_DNSResolverManager"] = None
|
|
|
|
def __new__(cls) -> "_DNSResolverManager":
|
|
if cls._instance is None:
|
|
cls._instance = super().__new__(cls)
|
|
cls._instance._init()
|
|
return cls._instance
|
|
|
|
def _init(self) -> None:
|
|
# Use WeakKeyDictionary to allow event loops to be garbage collected
|
|
self._loop_data: weakref.WeakKeyDictionary[
|
|
asyncio.AbstractEventLoop,
|
|
tuple["aiodns.DNSResolver", weakref.WeakSet["AsyncResolver"]],
|
|
] = weakref.WeakKeyDictionary()
|
|
|
|
def get_resolver(
|
|
self, client: "AsyncResolver", loop: asyncio.AbstractEventLoop
|
|
) -> "aiodns.DNSResolver":
|
|
"""Get or create the shared aiodns.DNSResolver instance for a specific event loop.
|
|
|
|
Args:
|
|
client: The AsyncResolver instance requesting the resolver.
|
|
This is required to track resolver usage.
|
|
loop: The event loop to use for the resolver.
|
|
"""
|
|
# Create a new resolver and client set for this loop if it doesn't exist
|
|
if loop not in self._loop_data:
|
|
resolver = aiodns.DNSResolver(loop=loop)
|
|
client_set: weakref.WeakSet["AsyncResolver"] = weakref.WeakSet()
|
|
self._loop_data[loop] = (resolver, client_set)
|
|
else:
|
|
# Get the existing resolver and client set
|
|
resolver, client_set = self._loop_data[loop]
|
|
|
|
# Register this client with the loop
|
|
client_set.add(client)
|
|
return resolver
|
|
|
|
def release_resolver(
|
|
self, client: "AsyncResolver", loop: asyncio.AbstractEventLoop
|
|
) -> None:
|
|
"""Release the resolver for an AsyncResolver client when it's closed.
|
|
|
|
Args:
|
|
client: The AsyncResolver instance to release.
|
|
loop: The event loop the resolver was using.
|
|
"""
|
|
# Remove client from its loop's tracking
|
|
current_loop_data = self._loop_data.get(loop)
|
|
if current_loop_data is None:
|
|
return
|
|
resolver, client_set = current_loop_data
|
|
client_set.discard(client)
|
|
# If no more clients for this loop, cancel and remove its resolver
|
|
if not client_set:
|
|
if resolver is not None:
|
|
resolver.cancel()
|
|
del self._loop_data[loop]
|
|
|
|
|
|
_DefaultType = Type[Union[AsyncResolver, ThreadedResolver]]
|
|
DefaultResolver: _DefaultType = AsyncResolver if aiodns_default else ThreadedResolver
|