- 新增图像生成接口,支持试用、积分和自定义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): 添加示例系统日志文件 - 记录用户请求、验证码发送成功与失败的日志信息
157 lines
4.4 KiB
Python
157 lines
4.4 KiB
Python
# This file is dual licensed under the terms of the Apache License, Version
|
|
# 2.0, and the BSD License. See the LICENSE file in the root of this repository
|
|
# for complete details.
|
|
|
|
from __future__ import annotations
|
|
|
|
import typing
|
|
|
|
from cryptography import x509
|
|
from cryptography.hazmat.bindings._rust import pkcs12 as rust_pkcs12
|
|
from cryptography.hazmat.primitives import serialization
|
|
from cryptography.hazmat.primitives._serialization import PBES as PBES
|
|
from cryptography.hazmat.primitives.asymmetric import (
|
|
dsa,
|
|
ec,
|
|
ed448,
|
|
ed25519,
|
|
rsa,
|
|
)
|
|
from cryptography.hazmat.primitives.asymmetric.types import PrivateKeyTypes
|
|
|
|
__all__ = [
|
|
"PBES",
|
|
"PKCS12Certificate",
|
|
"PKCS12KeyAndCertificates",
|
|
"PKCS12PrivateKeyTypes",
|
|
"load_key_and_certificates",
|
|
"load_pkcs12",
|
|
"serialize_key_and_certificates",
|
|
]
|
|
|
|
PKCS12PrivateKeyTypes = typing.Union[
|
|
rsa.RSAPrivateKey,
|
|
dsa.DSAPrivateKey,
|
|
ec.EllipticCurvePrivateKey,
|
|
ed25519.Ed25519PrivateKey,
|
|
ed448.Ed448PrivateKey,
|
|
]
|
|
|
|
|
|
PKCS12Certificate = rust_pkcs12.PKCS12Certificate
|
|
|
|
|
|
class PKCS12KeyAndCertificates:
|
|
def __init__(
|
|
self,
|
|
key: PrivateKeyTypes | None,
|
|
cert: PKCS12Certificate | None,
|
|
additional_certs: list[PKCS12Certificate],
|
|
):
|
|
if key is not None and not isinstance(
|
|
key,
|
|
(
|
|
rsa.RSAPrivateKey,
|
|
dsa.DSAPrivateKey,
|
|
ec.EllipticCurvePrivateKey,
|
|
ed25519.Ed25519PrivateKey,
|
|
ed448.Ed448PrivateKey,
|
|
),
|
|
):
|
|
raise TypeError(
|
|
"Key must be RSA, DSA, EllipticCurve, ED25519, or ED448"
|
|
" private key, or None."
|
|
)
|
|
if cert is not None and not isinstance(cert, PKCS12Certificate):
|
|
raise TypeError("cert must be a PKCS12Certificate object or None")
|
|
if not all(
|
|
isinstance(add_cert, PKCS12Certificate)
|
|
for add_cert in additional_certs
|
|
):
|
|
raise TypeError(
|
|
"all values in additional_certs must be PKCS12Certificate"
|
|
" objects"
|
|
)
|
|
self._key = key
|
|
self._cert = cert
|
|
self._additional_certs = additional_certs
|
|
|
|
@property
|
|
def key(self) -> PrivateKeyTypes | None:
|
|
return self._key
|
|
|
|
@property
|
|
def cert(self) -> PKCS12Certificate | None:
|
|
return self._cert
|
|
|
|
@property
|
|
def additional_certs(self) -> list[PKCS12Certificate]:
|
|
return self._additional_certs
|
|
|
|
def __eq__(self, other: object) -> bool:
|
|
if not isinstance(other, PKCS12KeyAndCertificates):
|
|
return NotImplemented
|
|
|
|
return (
|
|
self.key == other.key
|
|
and self.cert == other.cert
|
|
and self.additional_certs == other.additional_certs
|
|
)
|
|
|
|
def __hash__(self) -> int:
|
|
return hash((self.key, self.cert, tuple(self.additional_certs)))
|
|
|
|
def __repr__(self) -> str:
|
|
fmt = (
|
|
"<PKCS12KeyAndCertificates(key={}, cert={}, additional_certs={})>"
|
|
)
|
|
return fmt.format(self.key, self.cert, self.additional_certs)
|
|
|
|
|
|
load_key_and_certificates = rust_pkcs12.load_key_and_certificates
|
|
load_pkcs12 = rust_pkcs12.load_pkcs12
|
|
|
|
|
|
_PKCS12CATypes = typing.Union[
|
|
x509.Certificate,
|
|
PKCS12Certificate,
|
|
]
|
|
|
|
|
|
def serialize_key_and_certificates(
|
|
name: bytes | None,
|
|
key: PKCS12PrivateKeyTypes | None,
|
|
cert: x509.Certificate | None,
|
|
cas: typing.Iterable[_PKCS12CATypes] | None,
|
|
encryption_algorithm: serialization.KeySerializationEncryption,
|
|
) -> bytes:
|
|
if key is not None and not isinstance(
|
|
key,
|
|
(
|
|
rsa.RSAPrivateKey,
|
|
dsa.DSAPrivateKey,
|
|
ec.EllipticCurvePrivateKey,
|
|
ed25519.Ed25519PrivateKey,
|
|
ed448.Ed448PrivateKey,
|
|
),
|
|
):
|
|
raise TypeError(
|
|
"Key must be RSA, DSA, EllipticCurve, ED25519, or ED448"
|
|
" private key, or None."
|
|
)
|
|
|
|
if not isinstance(
|
|
encryption_algorithm, serialization.KeySerializationEncryption
|
|
):
|
|
raise TypeError(
|
|
"Key encryption algorithm must be a "
|
|
"KeySerializationEncryption instance"
|
|
)
|
|
|
|
if key is None and cert is None and not cas:
|
|
raise ValueError("You must supply at least one of key, cert, or cas")
|
|
|
|
return rust_pkcs12.serialize_key_and_certificates(
|
|
name, key, cert, cas, encryption_algorithm
|
|
)
|