feat: redesign metadata as KV store, add custom properties and WOPI Discovery
Some checks failed
Test / test (push) Failing after 2m32s
Some checks failed
Test / test (push) Failing after 2m32s
Replace one-to-one FileMetadata table with flexible ObjectMetadata KV pairs, add custom property definitions, WOPI Discovery auto-configuration, and per-extension action URL support. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -1,16 +1,18 @@
|
||||
"""
|
||||
管理员文件应用管理端点
|
||||
|
||||
提供文件查看器应用的 CRUD、扩展名管理和用户组权限管理。
|
||||
提供文件查看器应用的 CRUD、扩展名管理、用户组权限管理和 WOPI Discovery。
|
||||
"""
|
||||
from uuid import UUID
|
||||
|
||||
import aiohttp
|
||||
from fastapi import APIRouter, Depends, status
|
||||
from loguru import logger as l
|
||||
from sqlalchemy import select
|
||||
|
||||
from middleware.auth import admin_required
|
||||
from middleware.dependencies import SessionDep, TableViewRequestDep
|
||||
from service.wopi import parse_wopi_discovery_xml
|
||||
from sqlmodels import (
|
||||
FileApp,
|
||||
FileAppCreateRequest,
|
||||
@@ -21,7 +23,10 @@ from sqlmodels import (
|
||||
FileAppUpdateRequest,
|
||||
ExtensionUpdateRequest,
|
||||
GroupAccessUpdateRequest,
|
||||
WopiDiscoveredExtension,
|
||||
WopiDiscoveryResponse,
|
||||
)
|
||||
from sqlmodels.file_app import FileAppType
|
||||
from utils import http_exceptions
|
||||
|
||||
admin_file_app_router = APIRouter(
|
||||
@@ -123,6 +128,7 @@ async def create_file_app(
|
||||
group_links.append(link)
|
||||
if group_links:
|
||||
await session.commit()
|
||||
await session.refresh(app)
|
||||
|
||||
l.info(f"创建文件应用: {app.name} ({app.app_key})")
|
||||
|
||||
@@ -261,16 +267,22 @@ async def update_extensions(
|
||||
if not app:
|
||||
http_exceptions.raise_not_found("应用不存在")
|
||||
|
||||
# 删除旧的扩展名
|
||||
# 保留旧扩展名的 wopi_action_url(Discovery 填充的值)
|
||||
old_extensions: list[FileAppExtension] = await FileAppExtension.get(
|
||||
session,
|
||||
FileAppExtension.app_id == app_id,
|
||||
fetch_mode="all",
|
||||
)
|
||||
old_url_map: dict[str, str] = {
|
||||
ext.extension: ext.wopi_action_url
|
||||
for ext in old_extensions
|
||||
if ext.wopi_action_url
|
||||
}
|
||||
for old_ext in old_extensions:
|
||||
await FileAppExtension.delete(session, old_ext, commit=False)
|
||||
await session.flush()
|
||||
|
||||
# 创建新的扩展名
|
||||
# 创建新的扩展名(保留已有的 wopi_action_url)
|
||||
new_extensions: list[FileAppExtension] = []
|
||||
for i, ext in enumerate(request.extensions):
|
||||
normalized = ext.lower().strip().lstrip('.')
|
||||
@@ -278,12 +290,14 @@ async def update_extensions(
|
||||
app_id=app_id,
|
||||
extension=normalized,
|
||||
priority=i,
|
||||
wopi_action_url=old_url_map.get(normalized),
|
||||
)
|
||||
session.add(ext_record)
|
||||
new_extensions.append(ext_record)
|
||||
|
||||
await session.commit()
|
||||
# refresh 新创建的记录
|
||||
# refresh commit 后过期的对象
|
||||
await session.refresh(app)
|
||||
for ext_record in new_extensions:
|
||||
await session.refresh(ext_record)
|
||||
|
||||
@@ -336,6 +350,7 @@ async def update_group_access(
|
||||
new_links.append(link)
|
||||
|
||||
await session.commit()
|
||||
await session.refresh(app)
|
||||
|
||||
extensions = await FileAppExtension.get(
|
||||
session,
|
||||
@@ -346,3 +361,102 @@ async def update_group_access(
|
||||
l.info(f"更新文件应用 {app.app_key} 的用户组权限: {request.group_ids}")
|
||||
|
||||
return FileAppResponse.from_app(app, extensions, new_links)
|
||||
|
||||
|
||||
@admin_file_app_router.post(
|
||||
path='/{app_id}/discover',
|
||||
summary='执行 WOPI Discovery',
|
||||
)
|
||||
async def discover_wopi(
|
||||
session: SessionDep,
|
||||
app_id: UUID,
|
||||
) -> WopiDiscoveryResponse:
|
||||
"""
|
||||
从 WOPI 服务端获取 Discovery XML 并自动配置扩展名和 URL 模板。
|
||||
|
||||
流程:
|
||||
1. 验证 FileApp 存在且为 WOPI 类型
|
||||
2. 使用 FileApp.wopi_discovery_url 获取 Discovery XML
|
||||
3. 解析 XML,提取扩展名和动作 URL
|
||||
4. 全量替换 FileAppExtension 记录(带 wopi_action_url)
|
||||
|
||||
认证:管理员权限
|
||||
|
||||
错误处理:
|
||||
- 404: 应用不存在
|
||||
- 400: 非 WOPI 类型 / discovery URL 未配置 / XML 解析失败
|
||||
- 502: WOPI 服务端不可达或返回无效响应
|
||||
"""
|
||||
app: FileApp | None = await FileApp.get(session, FileApp.id == app_id)
|
||||
if not app:
|
||||
http_exceptions.raise_not_found("应用不存在")
|
||||
|
||||
if app.type != FileAppType.WOPI:
|
||||
http_exceptions.raise_bad_request("仅 WOPI 类型应用支持自动发现")
|
||||
|
||||
if not app.wopi_discovery_url:
|
||||
http_exceptions.raise_bad_request("未配置 WOPI Discovery URL")
|
||||
|
||||
# commit 后对象会过期,先保存需要的值
|
||||
discovery_url = app.wopi_discovery_url
|
||||
app_key = app.app_key
|
||||
|
||||
# 获取 Discovery XML
|
||||
try:
|
||||
async with aiohttp.ClientSession() as client:
|
||||
async with client.get(
|
||||
discovery_url,
|
||||
timeout=aiohttp.ClientTimeout(total=15),
|
||||
) as resp:
|
||||
if resp.status != 200:
|
||||
http_exceptions.raise_bad_gateway(
|
||||
f"WOPI 服务端返回 HTTP {resp.status}"
|
||||
)
|
||||
xml_content = await resp.text()
|
||||
except aiohttp.ClientError as e:
|
||||
http_exceptions.raise_bad_gateway(f"无法连接 WOPI 服务端: {e}")
|
||||
|
||||
# 解析 XML
|
||||
try:
|
||||
action_urls, app_names = parse_wopi_discovery_xml(xml_content)
|
||||
except ValueError as e:
|
||||
http_exceptions.raise_bad_request(str(e))
|
||||
|
||||
if not action_urls:
|
||||
return WopiDiscoveryResponse(app_names=app_names)
|
||||
|
||||
# 全量替换扩展名
|
||||
old_extensions: list[FileAppExtension] = await FileAppExtension.get(
|
||||
session,
|
||||
FileAppExtension.app_id == app_id,
|
||||
fetch_mode="all",
|
||||
)
|
||||
for old_ext in old_extensions:
|
||||
await FileAppExtension.delete(session, old_ext, commit=False)
|
||||
await session.flush()
|
||||
|
||||
new_extensions: list[FileAppExtension] = []
|
||||
discovered: list[WopiDiscoveredExtension] = []
|
||||
for i, (ext, action_url) in enumerate(sorted(action_urls.items())):
|
||||
ext_record = FileAppExtension(
|
||||
app_id=app_id,
|
||||
extension=ext,
|
||||
priority=i,
|
||||
wopi_action_url=action_url,
|
||||
)
|
||||
session.add(ext_record)
|
||||
new_extensions.append(ext_record)
|
||||
discovered.append(WopiDiscoveredExtension(extension=ext, action_url=action_url))
|
||||
|
||||
await session.commit()
|
||||
|
||||
l.info(
|
||||
f"WOPI Discovery 完成: 应用 {app_key}, "
|
||||
f"发现 {len(discovered)} 个扩展名"
|
||||
)
|
||||
|
||||
return WopiDiscoveryResponse(
|
||||
discovered_extensions=discovered,
|
||||
app_names=app_names,
|
||||
applied_count=len(discovered),
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user