feat: add models for physical files, policies, and user management

- Implement PhysicalFile model to manage physical file references and reference counting. - Create Policy model with associated options and group links for storage policies. - Introduce Redeem and Report models for handling redeem codes and reports. - Add Settings model for site configuration and user settings management. - Develop Share model for sharing objects with unique codes and associated metadata. - Implement SourceLink model for managing download links associated with objects. - Create StoragePack model for managing user storage packages. - Add Tag model for user-defined tags with manual and automatic types. - Implement Task model for managing background tasks with status tracking. - Develop User model with comprehensive user management features including authentication. - Introduce UserAuthn model for managing WebAuthn credentials. - Create WebDAV model for managing WebDAV accounts associated with users.
2026-02-10 16:25:49 +08:00
parent 62c671e07b
commit 209cb24ab4
92 changed files with 3640 additions and 1444 deletions
--- a/routers/api/v1/admin/init.py
+++ b/routers/api/v1/admin/init.py
@@ -5,15 +5,15 @@ from loguru import logger as l

 from middleware.auth import admin_required
 from middleware.dependencies import SessionDep
-from models import (
+from sqlmodels import (
    User, ResponseBase,
    Setting, Object, ObjectType, Share, AdminSummaryResponse, MetricsSummary, LicenseInfo, VersionInfo,
 )
-from models.base import SQLModelBase
-from models.setting import (
+from sqlmodels.base import SQLModelBase
+from sqlmodels.setting import (
    SettingItem, SettingsListResponse, SettingsUpdateRequest, SettingsUpdateResponse,
 )
-from models.setting import SettingsType
+from sqlmodels.setting import SettingsType
 from utils import http_exceptions
 from utils.conf import appmeta
 from .file import admin_file_router
--- a/routers/api/v1/admin/file/init.py
+++ b/routers/api/v1/admin/file/init.py
@@ -5,14 +5,60 @@ from uuid import UUID
 from fastapi import APIRouter, Depends, HTTPException
 from fastapi.responses import FileResponse
 from loguru import logger as l
+from sqlmodel.ext.asyncio.session import AsyncSession

 from middleware.auth import admin_required
 from middleware.dependencies import SessionDep, TableViewRequestDep
-from models import (
-    Policy, PolicyType, User, ResponseBase, ListResponse,
+from sqlmodels import (
+    Policy, PolicyType, User, ListResponse,
    Object, ObjectType, AdminFileResponse, FileBanRequest, )
 from service.storage import LocalStorageService

+async def _set_ban_recursive(
+    session: AsyncSession,
+    obj: Object,
+    ban: bool,
+    admin_id: UUID,
+    reason: str | None,
+) -> int:
+    """
+    递归设置封禁状态，返回受影响对象数量。
+
+    :param session: 数据库会话
+    :param obj: 要封禁/解禁的对象
+    :param ban: True=封禁, False=解禁
+    :param admin_id: 管理员UUID
+    :param reason: 封禁原因
+    :return: 受影响的对象数量
+    """
+    count = 0
+
+    # 如果是文件夹，先递归处理子对象
+    if obj.is_folder:
+        children = await Object.get(
+            session,
+            Object.parent_id == obj.id,
+            fetch_mode="all",
+        )
+        for child in children:
+            count += await _set_ban_recursive(session, child, ban, admin_id, reason)
+
+    # 设置当前对象
+    obj.is_banned = ban
+    if ban:
+        obj.banned_at = datetime.now()
+        obj.banned_by = admin_id
+        obj.ban_reason = reason
+    else:
+        obj.banned_at = None
+        obj.banned_by = None
+        obj.ban_reason = None
+
+    await obj.save(session)
+    count += 1
+    return count
+
+
 admin_file_router = APIRouter(
    prefix="/file",
    tags=["admin", "admin_file"],
@@ -119,15 +165,17 @@ async def router_admin_preview_file(
    summary='封禁/解禁文件',
    description='Ban the file, user can\'t open, copy, move, download or share this file if administrator ban.',
    dependencies=[Depends(admin_required)],
+    status_code=204,
 )
 async def router_admin_ban_file(
    session: SessionDep,
    file_id: UUID,
    request: FileBanRequest,
    admin: Annotated[User, Depends(admin_required)],
-) -> ResponseBase:
+) -> None:
    """
-    封禁或解禁文件。封禁后用户无法访问该文件。
+    封禁或解禁文件/文件夹。封禁后用户无法访问该文件。
+    封禁文件夹时会级联封禁所有子对象。

    :param session: 数据库会话
    :param file_id: 文件UUID
@@ -139,24 +187,10 @@ async def router_admin_ban_file(
    if not file_obj:
        raise HTTPException(status_code=404, detail="文件不存在")

-    file_obj.is_banned = request.is_banned
-    if request.is_banned:
-        file_obj.banned_at = datetime.now()
-        file_obj.banned_by = admin.id
-        file_obj.ban_reason = request.reason
-    else:
-        file_obj.banned_at = None
-        file_obj.banned_by = None
-        file_obj.ban_reason = None
+    count = await _set_ban_recursive(session, file_obj, request.ban, admin.id, request.reason)

-    file_obj = await file_obj.save(session)
-
-    action = "封禁" if request.is_banned else "解禁"
-    l.info(f"管理员{action}了文件: {file_obj.name}")
-    return ResponseBase(data={
-        "id": str(file_obj.id),
-        "is_banned": file_obj.is_banned,
-    })
+    action = "封禁" if request.ban else "解禁"
+    l.info(f"管理员{action}了对象: {file_obj.name}，共影响 {count} 个对象")


@admin_file_router.delete(
@@ -164,12 +198,13 @@ async def router_admin_ban_file(
    summary='删除文件',
    description='Delete file by ID',
    dependencies=[Depends(admin_required)],
+    status_code=204,
 )
 async def router_admin_delete_file(
    session: SessionDep,
    file_id: UUID,
    delete_physical: bool = True,
-) -> ResponseBase:
+) -> None:
    """
    删除文件。

@@ -211,5 +246,4 @@ async def router_admin_delete_file(
    # 使用条件删除
    await Object.delete(session, condition=Object.id == file_obj.id)

-    l.info(f"管理员删除了文件: {file_name}")
-    return ResponseBase(data={"deleted": True})
+    l.info(f"管理员删除了文件: {file_name}")
--- a/routers/api/v1/admin/group/init.py
+++ b/routers/api/v1/admin/group/init.py
@@ -5,12 +5,12 @@ from loguru import logger as l

 from middleware.auth import admin_required
 from middleware.dependencies import SessionDep, TableViewRequestDep
-from models import (
+from sqlmodels import (
    User, ResponseBase, UserPublic, ListResponse,
    Group, GroupOptions, )
-from models.group import (
+from sqlmodels.group import (
    GroupCreateRequest, GroupUpdateRequest, GroupDetailResponse, )
-from models.policy import GroupPolicyLink
+from sqlmodels.policy import GroupPolicyLink

 admin_group_router = APIRouter(
    prefix="/group",
@@ -113,11 +113,12 @@ async def router_admin_get_group_members(
    summary='创建用户组',
    description='Create a new user group',
    dependencies=[Depends(admin_required)],
+    status_code=204,
 )
 async def router_admin_create_group(
    session: SessionDep,
    request: GroupCreateRequest,
-) -> ResponseBase:
+) -> None:
    """
    创建新的用户组。

@@ -164,7 +165,6 @@ async def router_admin_create_group(
    await session.commit()

    l.info(f"管理员创建了用户组: {group.name}")
-    return ResponseBase(data={"id": str(group.id), "name": group.name})


@admin_group_router.patch(
@@ -172,12 +172,13 @@ async def router_admin_create_group(
    summary='更新用户组信息',
    description='Update user group information by ID',
    dependencies=[Depends(admin_required)],
+    status_code=204,
 )
 async def router_admin_update_group(
    session: SessionDep,
    group_id: UUID,
    request: GroupUpdateRequest,
-) -> ResponseBase:
+) -> None:
    """
    根据用户组ID更新用户组信息。

@@ -233,8 +234,7 @@ async def router_admin_update_group(
            session.add(link)
        await session.commit()

-    l.info(f"管理员更新了用户组: {group.name}")
-    return ResponseBase(data={"id": str(group.id)})
+    l.info(f"管理员更新了用户组: {group_id}")


@admin_group_router.delete(
@@ -242,11 +242,12 @@ async def router_admin_update_group(
    summary='删除用户组',
    description='Delete user group by ID',
    dependencies=[Depends(admin_required)],
+    status_code=204,
 )
 async def router_admin_delete_group(
    session: SessionDep,
    group_id: UUID,
-) -> ResponseBase:
+) -> None:
    """
    根据用户组ID删除用户组。

@@ -271,5 +272,4 @@ async def router_admin_delete_group(
    group_name = group.name
    await Group.delete(session, group)

-    l.info(f"管理员删除了用户组: {group_name}")
-    return ResponseBase(data={"deleted": True})
+    l.info(f"管理员删除了用户组: {group_id}")
--- a/routers/api/v1/admin/policy/init.py
+++ b/routers/api/v1/admin/policy/init.py
@@ -6,10 +6,10 @@ from sqlmodel import Field

 from middleware.auth import admin_required
 from middleware.dependencies import SessionDep, TableViewRequestDep
-from models import (
+from sqlmodels import (
    Policy, PolicyBase, PolicyType, PolicySummary, ResponseBase,
    ListResponse, Object, )
-from models.base import SQLModelBase
+from sqlmodels.base import SQLModelBase
 from service.storage import DirectoryCreationError, LocalStorageService

 admin_policy_router = APIRouter(
--- a/routers/api/v1/admin/share/init.py
+++ b/routers/api/v1/admin/share/init.py
@@ -5,7 +5,7 @@ from loguru import logger as l

 from middleware.auth import admin_required
 from middleware.dependencies import SessionDep, TableViewRequestDep
-from models import (
+from sqlmodels import (
    ResponseBase, ListResponse,
    Share, AdminShareListItem, )

@@ -80,7 +80,7 @@ async def router_admin_get_share(
        "score": share.score,
        "has_password": bool(share.password),
        "user_id": str(share.user_id),
-        "username": user.username if user else None,
+        "username": user.email if user else None,
        "object": {
            "id": str(obj.id),
            "name": obj.name,
--- a/routers/api/v1/admin/task/init.py
+++ b/routers/api/v1/admin/task/init.py
@@ -5,7 +5,7 @@ from loguru import logger as l

 from middleware.auth import admin_required
 from middleware.dependencies import SessionDep, TableViewRequestDep
-from models import (
+from sqlmodels import (
    ResponseBase, ListResponse,
    Task, TaskSummary,
 )
@@ -89,7 +89,7 @@ async def router_admin_get_task(
        "progress": task.progress,
        "error": task.error,
        "user_id": str(task.user_id),
-        "username": user.username if user else None,
+        "username": user.email if user else None,
        "props": props.model_dump() if props else None,
        "created_at": task.created_at.isoformat(),
        "updated_at": task.updated_at.isoformat(),
--- a/routers/api/v1/admin/user/init.py
+++ b/routers/api/v1/admin/user/init.py
@@ -6,11 +6,13 @@ from sqlalchemy import func

 from middleware.auth import admin_required
 from middleware.dependencies import SessionDep, TableViewRequestDep, UserFilterParamsDep
-from models import (
+from sqlmodels import (
    User, ResponseBase, UserPublic, ListResponse,
-    Group, Object, ObjectType, )
-from models.user import (
-    UserAdminUpdateRequest, UserCalibrateResponse,
+    Group, Object, ObjectType, Setting, SettingsType,
+    BatchDeleteRequest,
+)
+from sqlmodels.user import (
+    UserAdminCreateRequest, UserAdminUpdateRequest, UserCalibrateResponse,
 )
 from utils import Password, http_exceptions

@@ -26,19 +28,19 @@ admin_user_router = APIRouter(
    description='Get user information by ID',
    dependencies=[Depends(admin_required)],
 )
-async def router_admin_get_user(session: SessionDep, user_id: int) -> ResponseBase:
+async def router_admin_get_user(session: SessionDep, user_id: UUID) -> UserPublic:
    """
    根据用户ID获取用户信息，包括用户名、邮箱、注册时间等。

    Args:
        session(SessionDep): 数据库会话依赖项。
-        user_id (int): 用户ID。
+        user_id (UUID): 用户ID。

    Returns:
        ResponseBase: 包含用户信息的响应模型。
    """
    user = await User.get_exist_one(session, user_id)
-    return ResponseBase(data=user.to_public().model_dump())
+    return user.to_public()


@admin_user_router.get(
@@ -60,7 +62,7 @@ async def router_admin_get_users(
    :param filter_params: 用户筛选参数（用户组、用户名、昵称、状态）
    :return: 分页用户列表
    """
-    result = await User.get_with_count(session, filter_params=filter_params, table_view=table_view)
+    result = await User.get_with_count(session, filter_params=filter_params, table_view=table_view, load=User.group)
    return ListResponse(
        items=[user.to_public() for user in result.items],
        count=result.count,
@@ -75,22 +77,33 @@ async def router_admin_get_users(
 )
 async def router_admin_create_user(
    session: SessionDep,
-    user: User,
-) -> ResponseBase:
+    request: UserAdminCreateRequest,
+) -> UserPublic:
    """
-    创建一个新的用户，设置用户名、密码等信息。
+    创建一个新的用户，设置邮箱、密码、用户组等信息。

-    Returns:
-        ResponseBase: 包含创建结果的响应模型。
+    :param session: 数据库会话
+    :param request: 创建用户请求 DTO
+    :return: 创建结果
    """
-    existing_user = await User.get(session, User.username == user.username)
+    existing_user = await User.get(session, User.email == request.email)
    if existing_user:
-        return ResponseBase(
-            code=400,
-            msg="User with this username already exists."
-        )
+        raise HTTPException(status_code=409, detail="该邮箱已被注册")
+
+    # 验证用户组存在
+    group = await Group.get(session, Group.id == request.group_id)
+    if not group:
+        raise HTTPException(status_code=400, detail="目标用户组不存在")
+
+    user = User(
+        email=request.email,
+        password=Password.hash(request.password),
+        nickname=request.nickname,
+        group_id=request.group_id,
+        status=request.status,
+    )
    user = await user.save(session)
-    return ResponseBase(data=user.to_public().model_dump())
+    return user.to_public()


@admin_user_router.patch(
@@ -98,12 +111,13 @@ async def router_admin_create_user(
    summary='更新用户信息',
    description='Update user information by ID',
    dependencies=[Depends(admin_required)],
+    status_code=204
 )
 async def router_admin_update_user(
    session: SessionDep,
    user_id: UUID,
    request: UserAdminUpdateRequest,
-) -> ResponseBase:
+) -> None:
    """
    根据用户ID更新用户信息。

@@ -116,8 +130,15 @@ async def router_admin_update_user(
    if not user:
        raise HTTPException(status_code=404, detail="用户不存在")

-    # 默认管理员（用户名为 admin）不允许更改用户组
-    if request.group_id and user.username == "admin" and request.group_id != user.group_id:
+    # 默认管理员不允许更改用户组（通过 Setting 中的 default_admin_id 识别）
+    default_admin_setting = await Setting.get(
+        session,
+        (Setting.type == SettingsType.AUTH) & (Setting.name == "default_admin_id")
+    )
+    if (request.group_id
+            and default_admin_setting
+            and default_admin_setting.value == str(user_id)
+            and request.group_id != user.group_id):
        http_exceptions.raise_forbidden("默认管理员不允许更改用户组")

    # 如果更新用户组，验证新组存在
@@ -143,38 +164,35 @@ async def router_admin_update_user(
        setattr(user, key, value)
    user = await user.save(session)

-    l.info(f"管理员更新了用户: {user.username}")
-    return ResponseBase(data=user.to_public().model_dump())
+    l.info(f"管理员更新了用户: {request.email}")


@admin_user_router.delete(
-    path='/{user_id}',
-    summary='删除用户',
-    description='Delete user by ID',
+    path='/',
+    summary='删除用户（支持批量）',
+    description='Delete users by ID list',
    dependencies=[Depends(admin_required)],
+    status_code=204,
 )
-async def router_admin_delete_user(
+async def router_admin_delete_users(
    session: SessionDep,
-    user_id: UUID,
-) -> ResponseBase:
+    request: BatchDeleteRequest,
+) -> None:
    """
-    根据用户ID删除用户及其所有数据。
+    批量删除用户及其所有数据。

    注意: 这是一个危险操作，会级联删除用户的所有文件、分享、任务等。

    :param session: 数据库会话
-    :param user_id: 用户UUID
-    :return: 删除结果
+    :param request: 批量删除请求，包含待删除用户的 UUID 列表
+    :return: 删除结果（已删除数 / 总请求数）
    """
-    user = await User.get(session, User.id == user_id)
-    if not user:
-        raise HTTPException(status_code=404, detail="用户不存在")
-
-    username = user.username
-    await User.delete(session, user)
-
-    l.info(f"管理员删除了用户: {username}")
-    return ResponseBase(data={"deleted": True})
+    deleted = 0
+    for uid in request.ids:
+        user = await User.get(session, User.id == uid)
+        if user:
+            await User.delete(session, user)
+            l.info(f"管理员删除了用户: {user.email}")


@admin_user_router.post(
@@ -186,7 +204,7 @@ async def router_admin_delete_user(
 async def router_admin_calibrate_storage(
    session: SessionDep,
    user_id: UUID,
-) -> ResponseBase:
+) -> UserCalibrateResponse:
    """
    重新计算用户的已用存储空间。

@@ -228,5 +246,5 @@ async def router_admin_calibrate_storage(
        file_count=file_count,
    )

-    l.info(f"管理员校准了用户存储: {user.username}, 差值: {actual_storage - previous_storage}")
-    return ResponseBase(data=response.model_dump())
+    l.info(f"管理员校准了用户存储: {user.email}, 差值: {actual_storage - previous_storage}")
+    return response
--- a/routers/api/v1/admin/vas/init.py
+++ b/routers/api/v1/admin/vas/init.py
@@ -4,7 +4,7 @@ from fastapi import APIRouter, Depends, HTTPException

 from middleware.auth import admin_required
 from middleware.dependencies import SessionDep
-from models import (
+from sqlmodels import (
    ResponseBase,
 )