mirror of
https://github.com/vastsa/FileCodeBox.git
synced 2026-11-20 13:29:56 +08:00
* fix: constant-time comparison for download tokens (security item 5) Replace the set-membership key check in /share/download with hmac.compare_digest over the two valid window tokens; add negative-path tests (wrong key 403, both windows accepted, foreign-code token 403). * fix: single source for attachment headers + guard tests (security item 2) All six Content-Disposition construction sites across the five storage backends now go through build_attachment_headers; the header is what neutralizes stored XSS on the same-origin download path. Guard tests assert every get_file_response uses the builder and no hand-built disposition reappears. * fix: reject internal-network endpoints for storage config (security item 7) s3_endpoint_url/s3_hostname/webdav_url are fetched server-side; with APP_ENV=production the write entry now enforces http(s) schemes and a loopback/private/link-local/metadata host blacklist. Development env stays open for local minio/webdav. Already-stored values are never re-validated, so existing deployments are unaffected. * fix: JSON 404 for handler-raised 404s; negative-path test batch Starlette status-code handlers take precedence over the HTTPException class handler, so registering the theme index as the 404 handler turned every HTTPException(404) app-wide into a 200 HTML page (found by the new negative-path tests). The new not_found_handler serves the theme page only to browsers (Accept: text/html) and JSON 404 to API clients. Negative-path batch: download count exhaustion, missing chunk session 404s, expired presign session deletion, admin update_file uniqueness/ existence. * fix: run container as non-root app user with compat volume chown (security item 3) Entrypoint starts as root only to fix the data-dir ownership (skipped when nothing needs changing or when the deployer sets an explicit user), then drops to uid 10001 via gosu. Verified in-container: uvicorn runs as app (uid 10001), setup and share round-trip work against a root-owned volume. * fix: compare download tokens as bytes (non-ASCII key caused 500) * test: lock changed-only semantics for endpoint config saves Integration regression for the background lesson: a stored internal endpoint must not block unrelated settings saves in production mode; changing to an internal endpoint (URL or bare-hostname form) is 400. * fix: resolve-based SSRF check — deny IP shorthands, hex/decimal IPs, DNS maps Probe found the static blacklist bypassed by glibc shorthands (127.1, 10.1), decimal (2130706433) and hex IP forms, *.localhost, and loopback-mapping DNS services. Both validators now resolve the host and re-check every resolved address; hostname tier extracts the host part correctly for [v6]/host:port/bare-v6 forms. 44 tests. * test: pin 404 handler dual-branch behavior (browser theme page vs API JSON) * fix: write back normalized endpoint values; hostname dev-gate test * test: header-injection negative paths for attachment disposition * fix: S3 merge buffers parts to >=5MiB; missing object 404 upfront - S3 multipart rejects parts <5MiB (EntityTooSmall) except the last; chunk size is client-controlled (commonly 2-4MB) so multi-chunk merges always failed with 500. Merge now buffers chunks into >=5MiB parts (memory bound: 5MB + one chunk). - get_file_response: a 404 head_object now raises StorageError(404) upfront instead of signing a doomed presigned URL and failing mid-stream (aligns with local backend semantics from the M2 behavior unification). * test: S3 backend coverage via in-process moto server (13 cases) mock_aws cannot intercept aioboto3's aiohttp stack, so tests run against a real in-process ThreadedMotoServer endpoint. Covers roundtrips, missing object 404, merge failure modes (missing chunk / hash mismatch -> abort, no leftover object), cleanup scoping, presign shapes, proxy dispatch. Also adds moto[s3,server] to the dev group and CI. * fix: WebDAV missing object 404 upfront; connection errors map to 503 HEAD 404 was silently swallowed (signed a 200 bad stream that failed mid-download, same family as the S3 bug), and HEAD connection errors were also swallowed so the 503 mapping never fired. Both now surface properly; the aiohttp session is reclaimed on pre-stream exception paths. * test: WebDAV backend coverage via in-process WebDAV server (9 cases) Real HTTP (HEAD/GET/PUT/DELETE/MKCOL/PROPFIND) against a minimal aiohttp WebDAV server over a temp dir: roundtrips, missing object 404, connection error 503, delete with empty-parent cleanup, merge failure modes, chunk cleanup scoping. * fix: OneDrive missing object maps to 404 upfront; OpenDAL behavior pinned OneDrive get_file_response translated graph itemNotFound into the outer 503 catch-all; now raises StorageError(404) like local/S3/WebDAV. OpenDAL already mapped missing objects to 404 via its outer catch — pinned with fake-operator tests (SDK not in runtime deps, instances built via __new__). Also tightens the S3 presign URL assertion. * test: admin write-path coverage (batch/single delete, batch update, policy actions) 13 negative-path cases for the previously untested data-modifying admin endpoints: mixed-id aggregation with duplicates and missing records, empty-list rejections, clear_expired_at permanence semantics, policy action boundaries (zero limit 400, unknown action 400, missing 404), and the DoesNotExist->404 mapping pinned for single delete. * test: admin read-path and view-preset CRUD coverage (22 cases) Detail/metadata/preview/admin-download/activities/local-lists+delete/ verify: missing-record 404s, note/tag truncation limits, preview max_chars truncation, activity filtering and the 80-event clamp, local path traversal rejection. Presets: update-vs-create by id, name truncation, filter normalization clamps, 24-preset cap, delete-missing 404. * refactor: move auth primitives to apps/base/auth, kill base->admin dep JWT create/verify, bearer extraction and the share-upload gate move to apps.base.auth (consumed by both surfaces); admin.dependencies keeps admin session gating and service providers, re-exporting the primitives for import-path compatibility. base.views no longer imports from apps.admin — the last cross-app reverse dependency is gone. * refactor: split admin services god-module (ConfigService/LocalFile out) apps/admin/services.py (1697 lines) becomes FileService (~1200 lines) + a compatibility facade re-exporting ConfigService, LocalFileService, LocalFileClass and keyvalue_write_lock from their new homes (config_service.py holds the D5 KeyValue lock; one-way imports, no cycle). test_admin_security patch targets follow ConfigService to its new module. Behavior unchanged; 247 tests green. * fix: size-less uploads no longer crash (upstream seek bug) validate_file_size's size-None branch called UploadFile.seek(0, 2), which raises TypeError (UploadFile.seek takes one arg); the underlying SpooledTemporaryFile.seek is sync, so awaiting it also fails. Use the underlying file object with sync seek(0, SEEK_END). Surface discovered by the mypy pilot run; regression test covers the size-None branch. * chore: bump direct deps (patch/minor) fastapi 0.139.2->0.141.1, pydantic 2.12.5->2.13.5, uvicorn 0.51.0->0.53.0, aiohttp 3.14.2->3.14.3; lockfile regenerated. tortoise-orm 0.x->1.x major deliberately deferred pending API-change review. * ci: gradual mypy adoption via baseline ratchet scripts/mypy_ratchet.py compares mypy output against scripts/mypy-baseline.txt (line numbers stripped for edit stability): new type errors fail CI, fixes are folded back via --regenerate. Baseline starts at 30 known errors; the seek bug found in the pilot was fixed before baselining. mypy joins the dev group and CI. * fix: migrate WebDAV auth off aiohttp.BasicAuth (deprecated in 4.0) Dependency-upgrade probe on aiohttp 3.14.3 surfaced the BasicAuth deprecation; switch to aiohttp.encode_basic_auth() headers so the aiohttp 4.0 upgrade does not break the WebDAV backend. * chore: drop dead code (WebDAV _instance stub, unused LocalFileClass.write) * test: file-validation negative paths (13 cases) Magic-bytes spoofing (text-as-png, exe-as-pdf, mp4/webp box detection), whitelist rule semantics (star/image-wildcard/content mismatch), chunk-0 header validation parity, and end-to-end UploadFile rejection. * test: migration runner coverage (5 cases) Full chain executes 001-007 in filename order and registers; rerun is idempotent; pre-registered entries are skipped (DDL not re-executed); the resulting schema matches deployment; a failing migration propagates and is not registered. Uses a fresh :memory: DB without generate_schemas so the migrations themselves build the schema (the real deployment path). * refactor: split core/storage.py into a package (per-backend modules) core/storage.py (1400+ lines, six backends) becomes core/storage/ with _base.py (data contracts, interface, shared header builder), and local/s3/onedrive/opendal/webdav modules. The package __init__ re-exports the full historical public surface; test patch targets move to the precise backend modules (core.storage.local.data_root etc.) and the attachment guard scans the package. Import-only change; 264 tests green. Storage-layer DI deferred: current tests construct instances against patched settings, so the added surface isn't justified yet. * refactor: TypedDict for IPRateLimit records The rate-limit ledger mixed int and datetime under a loose Union typing, producing 5 mypy noise errors. A TypedDict gives precise per-key types; setdefault replaces the get-then-assign pattern. One mypy baseline error family resolved; 264 tests green. * chore: tighten mypy baseline after IPRateLimit TypedDict * refactor: resolve all 26 baseline mypy errors; precise test assertions Per-error treatment (no bulk script): honest annotations for StoredDownload (Path/bytes/Callable), KeyValue.value (Any for JSONField), dict[str, Any] for form/config dicts; signature split in create_token; str() normalization in config int(); platform/type-ignore only where the checker cannot follow (msvcrt, FastAPI Request injection). Baseline file and ratchet compare now redundant at zero errors but kept as the guard against regressions. Tests: assertions tightened to status_code == 403 with HTTPException raises; _create_share explicit parameters replace **extra passthrough; seek-fix pointer-reset assertion persisted.
340 lines
13 KiB
Python
340 lines
13 KiB
Python
import hashlib
|
|
import os
|
|
import tempfile
|
|
from core.logger import logger
|
|
from typing import BinaryIO, Optional
|
|
|
|
import aiofiles
|
|
import aiohttp
|
|
import asyncio
|
|
from pathlib import Path
|
|
import datetime
|
|
import re
|
|
from core.errors import StorageError
|
|
from core.settings import settings
|
|
from core.utils import get_file_url, sanitize_filename
|
|
from starlette.background import BackgroundTask
|
|
|
|
from core.storage._base import (
|
|
FileStorageInterface,
|
|
StoredDownload,
|
|
StoredFile,
|
|
build_attachment_headers,
|
|
)
|
|
|
|
|
|
class OneDriveFileStorage(FileStorageInterface):
|
|
def __init__(self):
|
|
try:
|
|
import msal
|
|
from office365.graph_client import GraphClient
|
|
from office365.runtime.client_request_exception import (
|
|
ClientRequestException,
|
|
)
|
|
except ImportError:
|
|
raise ImportError("请先安装`msal`和`Office365-REST-Python-Client`")
|
|
self.msal = msal
|
|
self.domain = settings.onedrive_domain
|
|
self.client_id = settings.onedrive_client_id
|
|
self.username = settings.onedrive_username
|
|
self.password = settings.onedrive_password
|
|
self.proxy = settings.onedrive_proxy
|
|
self._ClientRequestException = ClientRequestException
|
|
|
|
try:
|
|
client = GraphClient(self.acquire_token_pwd)
|
|
self.root_path = (
|
|
client.me.drive.root.get_by_path(settings.onedrive_root_path)
|
|
.get()
|
|
.execute_query()
|
|
)
|
|
except ClientRequestException as e:
|
|
if e.code == "itemNotFound":
|
|
client.me.drive.root.create_folder(settings.onedrive_root_path)
|
|
self.root_path = (
|
|
client.me.drive.root.get_by_path(
|
|
settings.onedrive_root_path)
|
|
.get()
|
|
.execute_query()
|
|
)
|
|
else:
|
|
raise e
|
|
except Exception as e:
|
|
raise Exception("OneDrive验证失败,请检查配置是否正确\n" + str(e))
|
|
|
|
def acquire_token_pwd(self):
|
|
authority_url = f"https://login.microsoftonline.com/{self.domain}"
|
|
app = self.msal.PublicClientApplication(
|
|
authority=authority_url, client_id=self.client_id
|
|
)
|
|
result = app.acquire_token_by_username_password(
|
|
username=self.username,
|
|
password=self.password,
|
|
scopes=["https://graph.microsoft.com/.default"],
|
|
)
|
|
return result
|
|
|
|
def _get_path_str(self, path):
|
|
if isinstance(path, str):
|
|
path = path.replace("\\", "/").replace("//", "/").split("/")
|
|
elif isinstance(path, Path):
|
|
path = str(path).replace("\\", "/").replace("//", "/").split("/")
|
|
else:
|
|
raise TypeError("path must be str or Path")
|
|
path[-1] = path[-1].split(".")[0]
|
|
return "/".join(path)
|
|
|
|
async def save_file(
|
|
self, stream: BinaryIO, save_path: str, content_type: Optional[str] = None
|
|
):
|
|
"""保存文件(自动创建目录;修复旧实现把 save_path 字符串当函数调用的崩溃)"""
|
|
content = await asyncio.to_thread(stream.read)
|
|
normalized = str(save_path).replace("\\", "/")
|
|
name = await sanitize_filename(Path(normalized).name)
|
|
dir_path = "/".join(normalized.split("/")[:-1])
|
|
|
|
current_folder = self.root_path
|
|
for part in dir_path.split("/"):
|
|
if not part:
|
|
continue
|
|
try:
|
|
current_folder = current_folder.get_by_path(part).get().execute_query()
|
|
except self._ClientRequestException as e:
|
|
if e.code == "itemNotFound":
|
|
current_folder = current_folder.create_folder(part).execute_query()
|
|
else:
|
|
raise e
|
|
|
|
await asyncio.to_thread(
|
|
lambda: current_folder.get_by_path(name)
|
|
.upload(name, content)
|
|
.execute_query()
|
|
)
|
|
|
|
def _delete(self, save_path):
|
|
path = self._get_path_str(save_path)
|
|
try:
|
|
self.root_path.get_by_path(path).delete_object().execute_query()
|
|
except self._ClientRequestException as e:
|
|
if e.code == "itemNotFound":
|
|
pass
|
|
else:
|
|
raise e
|
|
|
|
async def delete_file(self, file_code: StoredFile):
|
|
await asyncio.to_thread(self._delete, file_code.get_file_path())
|
|
|
|
def _convert_link_to_download_link(self, link):
|
|
p1 = re.search(r"https://(.+)\.sharepoint\.com", link).group(1)
|
|
p2 = re.search(r"personal/(.+)/", link).group(1)
|
|
p3 = re.search(rf"{p2}/(.+)", link).group(1)
|
|
return f"https://{p1}.sharepoint.com/personal/{p2}/_layouts/52/download.aspx?share={p3}"
|
|
|
|
def _get_file_url(self, save_path, name):
|
|
path = self._get_path_str(save_path)
|
|
remote_file = self.root_path.get_by_path(path + "/" + name)
|
|
expiration_datetime = datetime.datetime.now(
|
|
tz=datetime.timezone.utc
|
|
) + datetime.timedelta(hours=1)
|
|
expiration_datetime = expiration_datetime.strftime(
|
|
"%Y-%m-%dT%H:%M:%SZ")
|
|
permission = remote_file.create_link(
|
|
"view", "anonymous", expiration_datetime=expiration_datetime
|
|
).execute_query()
|
|
return self._convert_link_to_download_link(permission.link.webUrl)
|
|
|
|
async def get_file_response(self, file_code: StoredFile):
|
|
try:
|
|
filename = file_code.prefix + file_code.suffix
|
|
try:
|
|
link = await asyncio.to_thread(
|
|
self._get_file_url, file_code.get_file_path(), filename
|
|
)
|
|
except self._ClientRequestException as e:
|
|
# 对象不存在时前置 404(与 local/S3/WebDAV 语义对齐),
|
|
# 不再落入外层兜底的 503
|
|
if str(getattr(e, "code", "")).lower() in {"itemnotfound", "404"}:
|
|
raise StorageError(
|
|
status_code=404, detail="文件已过期删除"
|
|
) from e
|
|
raise
|
|
|
|
content_length = None # 初始化为 None,表示未知大小
|
|
|
|
# 创建ClientSession并复用
|
|
session = aiohttp.ClientSession()
|
|
|
|
# 尝试发送HEAD请求获取Content-Length
|
|
try:
|
|
async with session.head(link) as resp:
|
|
if resp.status == 200 and 'Content-Length' in resp.headers:
|
|
content_length = int(resp.headers['Content-Length'])
|
|
except Exception:
|
|
# 如果HEAD请求失败,则不提供 Content-Length
|
|
pass
|
|
|
|
async def stream_generator():
|
|
try:
|
|
async with session.get(link) as resp:
|
|
if resp.status != 200:
|
|
raise StorageError(
|
|
status_code=resp.status,
|
|
detail=f"从OneDrive获取文件失败: {resp.status}"
|
|
)
|
|
chunk_size = 65536
|
|
while True:
|
|
chunk = await resp.content.read(chunk_size)
|
|
if not chunk:
|
|
break
|
|
yield chunk
|
|
finally:
|
|
await session.close()
|
|
|
|
headers = build_attachment_headers(filename, content_length)
|
|
return StoredDownload(
|
|
filename=filename,
|
|
headers=headers,
|
|
stream_factory=stream_generator,
|
|
# 兜底关闭会话:客户端中断时与 generator finally 双保险
|
|
background=BackgroundTask(session.close),
|
|
)
|
|
except StorageError:
|
|
raise
|
|
except Exception:
|
|
raise StorageError(status_code=503, detail="服务代理下载异常,请稍后再试")
|
|
|
|
async def get_file_url(self, file_code: StoredFile):
|
|
if self.proxy:
|
|
return await get_file_url(file_code.code)
|
|
else:
|
|
return await asyncio.to_thread(
|
|
self._get_file_url,
|
|
file_code.get_file_path(),
|
|
f"{file_code.prefix}{file_code.suffix}",
|
|
)
|
|
|
|
def _save_chunk(self, chunk_path: str, chunk_data: bytes):
|
|
"""同步保存分片到 OneDrive"""
|
|
path_parts = chunk_path.replace("\\", "/").split("/")
|
|
filename = path_parts[-1]
|
|
dir_path = "/".join(path_parts[:-1])
|
|
|
|
# 确保目录存在
|
|
current_folder = self.root_path
|
|
for part in dir_path.split("/"):
|
|
if part:
|
|
try:
|
|
current_folder = current_folder.get_by_path(part).get().execute_query()
|
|
except self._ClientRequestException as e:
|
|
if e.code == "itemNotFound":
|
|
current_folder = current_folder.create_folder(part).execute_query()
|
|
else:
|
|
raise e
|
|
|
|
# 上传分片
|
|
current_folder.upload(filename, chunk_data).execute_query()
|
|
|
|
async def save_chunk(self, upload_id: str, chunk_index: int, chunk_data: bytes, chunk_hash: str, save_path: str):
|
|
"""保存分片到 OneDrive"""
|
|
chunk_path = str(Path(save_path).parent / "chunks" / upload_id / f"{chunk_index}.part")
|
|
await asyncio.to_thread(self._save_chunk, chunk_path, chunk_data)
|
|
|
|
def _read_chunk(self, chunk_path: str) -> bytes:
|
|
"""同步读取分片"""
|
|
path = self._get_path_str(chunk_path)
|
|
file_obj = self.root_path.get_by_path(path).get().execute_query()
|
|
return file_obj.get_content().execute_query().value
|
|
|
|
def _upload_merged(self, save_path: str, data: bytes):
|
|
"""同步上传合并后的文件"""
|
|
path_parts = save_path.replace("\\", "/").split("/")
|
|
filename = path_parts[-1]
|
|
dir_path = "/".join(path_parts[:-1])
|
|
|
|
# 确保目录存在
|
|
current_folder = self.root_path
|
|
for part in dir_path.split("/"):
|
|
if part:
|
|
try:
|
|
current_folder = current_folder.get_by_path(part).get().execute_query()
|
|
except self._ClientRequestException as e:
|
|
if e.code == "itemNotFound":
|
|
current_folder = current_folder.create_folder(part).execute_query()
|
|
else:
|
|
raise e
|
|
|
|
current_folder.upload(filename, data).execute_query()
|
|
|
|
async def merge_chunks(self, upload_id: str, total_chunks: int, chunk_size: int, save_path: str, chunk_records: dict) -> tuple[str, str]:
|
|
"""合并 OneDrive 上的分片文件,使用临时文件避免内存问题"""
|
|
file_sha256 = hashlib.sha256()
|
|
chunk_dir = str(Path(save_path).parent / "chunks" / upload_id)
|
|
|
|
# 使用临时文件存储合并数据
|
|
with tempfile.NamedTemporaryFile(delete=False) as temp_file:
|
|
temp_path = temp_file.name
|
|
|
|
try:
|
|
async with aiofiles.open(temp_path, 'wb') as out_file:
|
|
for i in range(total_chunks):
|
|
chunk_path = f"{chunk_dir}/{i}.part"
|
|
chunk_record = self._get_chunk_record(chunk_records, i)
|
|
|
|
try:
|
|
chunk_data = await asyncio.to_thread(self._read_chunk, chunk_path)
|
|
except Exception as e:
|
|
raise ValueError(f"分片{i}文件不存在: {e}")
|
|
|
|
self._verify_and_hash_chunk(i, chunk_record, chunk_data, file_sha256)
|
|
await out_file.write(chunk_data)
|
|
del chunk_data # 释放内存
|
|
|
|
# 读取临时文件并上传
|
|
async with aiofiles.open(temp_path, 'rb') as f:
|
|
merged_content = await f.read()
|
|
await asyncio.to_thread(self._upload_merged, save_path, merged_content)
|
|
finally:
|
|
# 清理临时文件
|
|
if os.path.exists(temp_path):
|
|
os.unlink(temp_path)
|
|
|
|
return save_path, file_sha256.hexdigest()
|
|
|
|
def _delete_chunk_dir(self, chunk_dir: str):
|
|
"""同步删除分片目录"""
|
|
try:
|
|
path = self._get_path_str(chunk_dir)
|
|
self.root_path.get_by_path(path).delete_object().execute_query()
|
|
except self._ClientRequestException as e:
|
|
if e.code != "itemNotFound":
|
|
raise e
|
|
|
|
async def clean_chunks(self, upload_id: str, save_path: str):
|
|
"""清理 OneDrive 上的临时分片文件"""
|
|
chunk_dir = str(Path(save_path).parent / "chunks" / upload_id)
|
|
try:
|
|
await asyncio.to_thread(self._delete_chunk_dir, chunk_dir)
|
|
except Exception as e:
|
|
logger.warning(f"清理 OneDrive 分片时出错: {e}")
|
|
|
|
def _file_exists(self, save_path: str) -> bool:
|
|
"""同步检查文件是否存在"""
|
|
try:
|
|
path = self._get_path_str(save_path)
|
|
self.root_path.get_by_path(path).get().execute_query()
|
|
return True
|
|
except self._ClientRequestException as e:
|
|
if e.code == "itemNotFound":
|
|
return False
|
|
raise e
|
|
|
|
async def file_exists(self, save_path: str) -> bool:
|
|
"""
|
|
检查文件是否存在于OneDrive
|
|
:param save_path: 文件路径
|
|
:return: 文件是否存在
|
|
"""
|
|
return await asyncio.to_thread(self._file_exists, save_path)
|
|
|
|
|