- 新增图像生成接口,支持试用、积分和自定义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): 添加示例系统日志文件 - 记录用户请求、验证码发送成功与失败的日志信息
160 lines
5.7 KiB
Python
160 lines
5.7 KiB
Python
"""The match_hostname() function from Python 3.5, essential when using SSL."""
|
|
|
|
# Note: This file is under the PSF license as the code comes from the python
|
|
# stdlib. http://docs.python.org/3/license.html
|
|
# It is modified to remove commonName support.
|
|
|
|
from __future__ import annotations
|
|
|
|
import ipaddress
|
|
import re
|
|
import typing
|
|
from ipaddress import IPv4Address, IPv6Address
|
|
|
|
if typing.TYPE_CHECKING:
|
|
from .ssl_ import _TYPE_PEER_CERT_RET_DICT
|
|
|
|
__version__ = "3.5.0.1"
|
|
|
|
|
|
class CertificateError(ValueError):
|
|
pass
|
|
|
|
|
|
def _dnsname_match(
|
|
dn: typing.Any, hostname: str, max_wildcards: int = 1
|
|
) -> typing.Match[str] | None | bool:
|
|
"""Matching according to RFC 6125, section 6.4.3
|
|
|
|
http://tools.ietf.org/html/rfc6125#section-6.4.3
|
|
"""
|
|
pats = []
|
|
if not dn:
|
|
return False
|
|
|
|
# Ported from python3-syntax:
|
|
# leftmost, *remainder = dn.split(r'.')
|
|
parts = dn.split(r".")
|
|
leftmost = parts[0]
|
|
remainder = parts[1:]
|
|
|
|
wildcards = leftmost.count("*")
|
|
if wildcards > max_wildcards:
|
|
# Issue #17980: avoid denials of service by refusing more
|
|
# than one wildcard per fragment. A survey of established
|
|
# policy among SSL implementations showed it to be a
|
|
# reasonable choice.
|
|
raise CertificateError(
|
|
"too many wildcards in certificate DNS name: " + repr(dn)
|
|
)
|
|
|
|
# speed up common case w/o wildcards
|
|
if not wildcards:
|
|
return bool(dn.lower() == hostname.lower())
|
|
|
|
# RFC 6125, section 6.4.3, subitem 1.
|
|
# The client SHOULD NOT attempt to match a presented identifier in which
|
|
# the wildcard character comprises a label other than the left-most label.
|
|
if leftmost == "*":
|
|
# When '*' is a fragment by itself, it matches a non-empty dotless
|
|
# fragment.
|
|
pats.append("[^.]+")
|
|
elif leftmost.startswith("xn--") or hostname.startswith("xn--"):
|
|
# RFC 6125, section 6.4.3, subitem 3.
|
|
# The client SHOULD NOT attempt to match a presented identifier
|
|
# where the wildcard character is embedded within an A-label or
|
|
# U-label of an internationalized domain name.
|
|
pats.append(re.escape(leftmost))
|
|
else:
|
|
# Otherwise, '*' matches any dotless string, e.g. www*
|
|
pats.append(re.escape(leftmost).replace(r"\*", "[^.]*"))
|
|
|
|
# add the remaining fragments, ignore any wildcards
|
|
for frag in remainder:
|
|
pats.append(re.escape(frag))
|
|
|
|
pat = re.compile(r"\A" + r"\.".join(pats) + r"\Z", re.IGNORECASE)
|
|
return pat.match(hostname)
|
|
|
|
|
|
def _ipaddress_match(ipname: str, host_ip: IPv4Address | IPv6Address) -> bool:
|
|
"""Exact matching of IP addresses.
|
|
|
|
RFC 9110 section 4.3.5: "A reference identity of IP-ID contains the decoded
|
|
bytes of the IP address. An IP version 4 address is 4 octets, and an IP
|
|
version 6 address is 16 octets. [...] A reference identity of type IP-ID
|
|
matches if the address is identical to an iPAddress value of the
|
|
subjectAltName extension of the certificate."
|
|
"""
|
|
# OpenSSL may add a trailing newline to a subjectAltName's IP address
|
|
# Divergence from upstream: ipaddress can't handle byte str
|
|
ip = ipaddress.ip_address(ipname.rstrip())
|
|
return bool(ip.packed == host_ip.packed)
|
|
|
|
|
|
def match_hostname(
|
|
cert: _TYPE_PEER_CERT_RET_DICT | None,
|
|
hostname: str,
|
|
hostname_checks_common_name: bool = False,
|
|
) -> None:
|
|
"""Verify that *cert* (in decoded format as returned by
|
|
SSLSocket.getpeercert()) matches the *hostname*. RFC 2818 and RFC 6125
|
|
rules are followed, but IP addresses are not accepted for *hostname*.
|
|
|
|
CertificateError is raised on failure. On success, the function
|
|
returns nothing.
|
|
"""
|
|
if not cert:
|
|
raise ValueError(
|
|
"empty or no certificate, match_hostname needs a "
|
|
"SSL socket or SSL context with either "
|
|
"CERT_OPTIONAL or CERT_REQUIRED"
|
|
)
|
|
try:
|
|
# Divergence from upstream: ipaddress can't handle byte str
|
|
#
|
|
# The ipaddress module shipped with Python < 3.9 does not support
|
|
# scoped IPv6 addresses so we unconditionally strip the Zone IDs for
|
|
# now. Once we drop support for Python 3.9 we can remove this branch.
|
|
if "%" in hostname:
|
|
host_ip = ipaddress.ip_address(hostname[: hostname.rfind("%")])
|
|
else:
|
|
host_ip = ipaddress.ip_address(hostname)
|
|
|
|
except ValueError:
|
|
# Not an IP address (common case)
|
|
host_ip = None
|
|
dnsnames = []
|
|
san: tuple[tuple[str, str], ...] = cert.get("subjectAltName", ())
|
|
key: str
|
|
value: str
|
|
for key, value in san:
|
|
if key == "DNS":
|
|
if host_ip is None and _dnsname_match(value, hostname):
|
|
return
|
|
dnsnames.append(value)
|
|
elif key == "IP Address":
|
|
if host_ip is not None and _ipaddress_match(value, host_ip):
|
|
return
|
|
dnsnames.append(value)
|
|
|
|
# We only check 'commonName' if it's enabled and we're not verifying
|
|
# an IP address. IP addresses aren't valid within 'commonName'.
|
|
if hostname_checks_common_name and host_ip is None and not dnsnames:
|
|
for sub in cert.get("subject", ()):
|
|
for key, value in sub:
|
|
if key == "commonName":
|
|
if _dnsname_match(value, hostname):
|
|
return
|
|
dnsnames.append(value) # Defensive: for Python < 3.9.3
|
|
|
|
if len(dnsnames) > 1:
|
|
raise CertificateError(
|
|
"hostname %r "
|
|
"doesn't match either of %s" % (hostname, ", ".join(map(repr, dnsnames)))
|
|
)
|
|
elif len(dnsnames) == 1:
|
|
raise CertificateError(f"hostname {hostname!r} doesn't match {dnsnames[0]!r}")
|
|
else:
|
|
raise CertificateError("no appropriate subjectAltName fields were found")
|