upload: deel 01
This commit is contained in:
Binary file not shown.
Binary file not shown.
@@ -1,9 +1,9 @@
|
||||
from __future__ import annotations
|
||||
|
||||
from fastapi import APIRouter, Depends, Request
|
||||
from fastapi import APIRouter, Depends, File, Form, Request, UploadFile
|
||||
from fastapi.responses import StreamingResponse
|
||||
|
||||
from backend.app.api.schemas import DeleteRequest, DeleteResponse, FileInfoResponse, MkdirRequest, MkdirResponse, RenameRequest, RenameResponse, SaveRequest, SaveResponse, ViewResponse
|
||||
from backend.app.api.schemas import DeleteRequest, DeleteResponse, FileInfoResponse, MkdirRequest, MkdirResponse, RenameRequest, RenameResponse, SaveRequest, SaveResponse, UploadResponse, ViewResponse
|
||||
from backend.app.dependencies import get_file_ops_service
|
||||
from backend.app.services.file_ops_service import FileOpsService
|
||||
|
||||
@@ -34,6 +34,15 @@ async def delete(
|
||||
return service.delete(path=request.path)
|
||||
|
||||
|
||||
@router.post("/upload", response_model=UploadResponse)
|
||||
async def upload(
|
||||
target_path: str = Form(...),
|
||||
file: UploadFile = File(...),
|
||||
service: FileOpsService = Depends(get_file_ops_service),
|
||||
) -> UploadResponse:
|
||||
return service.upload(target_path=target_path, upload_file=file)
|
||||
|
||||
|
||||
@router.get("/view", response_model=ViewResponse)
|
||||
async def view(
|
||||
path: str,
|
||||
|
||||
@@ -58,6 +58,12 @@ class DeleteResponse(BaseModel):
|
||||
path: str
|
||||
|
||||
|
||||
class UploadResponse(BaseModel):
|
||||
path: str
|
||||
size: int
|
||||
modified: str
|
||||
|
||||
|
||||
class ViewResponse(BaseModel):
|
||||
path: str
|
||||
name: str
|
||||
|
||||
Binary file not shown.
@@ -7,7 +7,7 @@ from datetime import datetime, timezone
|
||||
from pathlib import Path
|
||||
|
||||
VALID_HISTORY_STATUSES = {"queued", "completed", "failed"}
|
||||
VALID_HISTORY_OPERATIONS = {"mkdir", "rename", "delete", "copy", "move"}
|
||||
VALID_HISTORY_OPERATIONS = {"mkdir", "rename", "delete", "copy", "move", "upload"}
|
||||
|
||||
|
||||
class HistoryRepository:
|
||||
|
||||
Binary file not shown.
@@ -140,6 +140,18 @@ class FilesystemAdapter:
|
||||
"modified": self.modified_iso(path),
|
||||
}
|
||||
|
||||
def write_uploaded_file(self, path: Path, file_stream, chunk_size: int = 1024 * 1024) -> dict:
|
||||
with path.open("xb") as handle:
|
||||
while True:
|
||||
chunk = file_stream.read(chunk_size)
|
||||
if not chunk:
|
||||
break
|
||||
handle.write(chunk)
|
||||
return {
|
||||
"size": int(path.stat().st_size),
|
||||
"modified": self.modified_iso(path),
|
||||
}
|
||||
|
||||
async def stream_file_range(self, path: Path, start: int, end: int, chunk_size: int = 1024 * 1024):
|
||||
with path.open("rb") as handle:
|
||||
handle.seek(start)
|
||||
|
||||
Binary file not shown.
@@ -3,7 +3,7 @@ from __future__ import annotations
|
||||
from pathlib import Path
|
||||
|
||||
from backend.app.api.errors import AppError
|
||||
from backend.app.api.schemas import DeleteResponse, FileInfoResponse, MkdirResponse, RenameResponse, SaveResponse, ViewResponse
|
||||
from backend.app.api.schemas import DeleteResponse, FileInfoResponse, MkdirResponse, RenameResponse, SaveResponse, UploadResponse, ViewResponse
|
||||
from backend.app.db.history_repository import HistoryRepository
|
||||
from backend.app.fs.filesystem_adapter import FilesystemAdapter
|
||||
from backend.app.security.path_guard import PathGuard
|
||||
@@ -204,6 +204,61 @@ class FileOpsService:
|
||||
self._record_history_error(operation="delete", path=path, error=error)
|
||||
raise error
|
||||
|
||||
def upload(self, target_path: str, upload_file) -> UploadResponse:
|
||||
destination_relative = None
|
||||
history_path = target_path
|
||||
try:
|
||||
resolved_target = self._path_guard.resolve_directory_path(target_path)
|
||||
filename = Path(upload_file.filename or "").name
|
||||
safe_name = self._path_guard.validate_name(filename, field="name")
|
||||
destination_relative = self._join_relative(resolved_target.relative, safe_name)
|
||||
history_path = destination_relative
|
||||
resolved_destination = self._path_guard.resolve_path(destination_relative)
|
||||
|
||||
if resolved_destination.absolute.exists():
|
||||
raise AppError(
|
||||
code="already_exists",
|
||||
message="Target path already exists",
|
||||
status_code=409,
|
||||
details={"path": resolved_destination.relative},
|
||||
)
|
||||
|
||||
saved = self._filesystem.write_uploaded_file(resolved_destination.absolute, upload_file.file)
|
||||
self._record_history(
|
||||
operation="upload",
|
||||
status="completed",
|
||||
destination=resolved_destination.relative,
|
||||
path=resolved_destination.relative,
|
||||
finished_at=self._now_iso(),
|
||||
)
|
||||
return UploadResponse(
|
||||
path=resolved_destination.relative,
|
||||
size=saved["size"],
|
||||
modified=saved["modified"],
|
||||
)
|
||||
except AppError as exc:
|
||||
self._record_history_error(
|
||||
operation="upload",
|
||||
destination=destination_relative,
|
||||
path=history_path,
|
||||
error=exc,
|
||||
)
|
||||
raise
|
||||
except OSError as exc:
|
||||
error = AppError(
|
||||
code="io_error",
|
||||
message="Filesystem operation failed",
|
||||
status_code=500,
|
||||
details={"reason": str(exc)},
|
||||
)
|
||||
self._record_history_error(
|
||||
operation="upload",
|
||||
destination=destination_relative,
|
||||
path=history_path,
|
||||
error=error,
|
||||
)
|
||||
raise error
|
||||
|
||||
def view(self, path: str, for_edit: bool = False) -> ViewResponse:
|
||||
resolved_target = self._path_guard.resolve_existing_path(path)
|
||||
|
||||
|
||||
Binary file not shown.
@@ -0,0 +1,186 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import asyncio
|
||||
import sys
|
||||
import tempfile
|
||||
import unittest
|
||||
from pathlib import Path
|
||||
|
||||
import httpx
|
||||
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parents[3]))
|
||||
|
||||
from backend.app.dependencies import get_file_ops_service, get_history_service
|
||||
from backend.app.db.history_repository import HistoryRepository
|
||||
from backend.app.fs.filesystem_adapter import FilesystemAdapter
|
||||
from backend.app.main import app
|
||||
from backend.app.security.path_guard import PathGuard
|
||||
from backend.app.services.file_ops_service import FileOpsService
|
||||
from backend.app.services.history_service import HistoryService
|
||||
|
||||
|
||||
class UploadApiGoldenTest(unittest.TestCase):
|
||||
def setUp(self) -> None:
|
||||
self.temp_dir = tempfile.TemporaryDirectory()
|
||||
self.root = Path(self.temp_dir.name) / "root"
|
||||
self.root.mkdir(parents=True, exist_ok=True)
|
||||
self.uploads_dir = self.root / "uploads"
|
||||
self.uploads_dir.mkdir(parents=True, exist_ok=True)
|
||||
self.db_path = str(Path(self.temp_dir.name) / "history.db")
|
||||
|
||||
history_repository = HistoryRepository(self.db_path)
|
||||
file_ops_service = FileOpsService(
|
||||
path_guard=PathGuard({"storage1": str(self.root)}),
|
||||
filesystem=FilesystemAdapter(),
|
||||
history_repository=history_repository,
|
||||
)
|
||||
history_service = HistoryService(repository=history_repository)
|
||||
|
||||
async def _override_file_ops_service() -> FileOpsService:
|
||||
return file_ops_service
|
||||
|
||||
async def _override_history_service() -> HistoryService:
|
||||
return history_service
|
||||
|
||||
app.dependency_overrides[get_file_ops_service] = _override_file_ops_service
|
||||
app.dependency_overrides[get_history_service] = _override_history_service
|
||||
|
||||
def tearDown(self) -> None:
|
||||
app.dependency_overrides.clear()
|
||||
self.temp_dir.cleanup()
|
||||
|
||||
def _upload(self, *, target_path: str, filename: str, content: bytes) -> httpx.Response:
|
||||
async def _run() -> httpx.Response:
|
||||
transport = httpx.ASGITransport(app=app)
|
||||
async with httpx.AsyncClient(transport=transport, base_url="http://testserver") as client:
|
||||
return await client.post(
|
||||
"/api/files/upload",
|
||||
data={"target_path": target_path},
|
||||
files={"file": (filename, content, "application/octet-stream")},
|
||||
)
|
||||
|
||||
return asyncio.run(_run())
|
||||
|
||||
def _get_history(self) -> list[dict]:
|
||||
async def _run() -> list[dict]:
|
||||
transport = httpx.ASGITransport(app=app)
|
||||
async with httpx.AsyncClient(transport=transport, base_url="http://testserver") as client:
|
||||
response = await client.get("/api/history")
|
||||
return response.json()["items"]
|
||||
|
||||
return asyncio.run(_run())
|
||||
|
||||
def test_upload_single_file_success(self) -> None:
|
||||
response = self._upload(target_path="storage1/uploads", filename="hello.txt", content=b"hello")
|
||||
|
||||
self.assertEqual(response.status_code, 200)
|
||||
body = response.json()
|
||||
self.assertEqual(body["path"], "storage1/uploads/hello.txt")
|
||||
self.assertEqual(body["size"], 5)
|
||||
self.assertTrue((self.uploads_dir / "hello.txt").exists())
|
||||
|
||||
history = self._get_history()
|
||||
self.assertEqual(history[0]["operation"], "upload")
|
||||
self.assertEqual(history[0]["status"], "completed")
|
||||
self.assertEqual(history[0]["destination"], "storage1/uploads/hello.txt")
|
||||
|
||||
def test_upload_target_path_not_found(self) -> None:
|
||||
response = self._upload(target_path="storage1/missing", filename="hello.txt", content=b"hello")
|
||||
|
||||
self.assertEqual(response.status_code, 404)
|
||||
self.assertEqual(
|
||||
response.json(),
|
||||
{
|
||||
"error": {
|
||||
"code": "path_not_found",
|
||||
"message": "Requested path was not found",
|
||||
"details": {"path": "storage1/missing"},
|
||||
}
|
||||
},
|
||||
)
|
||||
|
||||
def test_upload_target_path_is_file(self) -> None:
|
||||
target_file = self.root / "not_a_directory.txt"
|
||||
target_file.write_text("x", encoding="utf-8")
|
||||
|
||||
response = self._upload(target_path="storage1/not_a_directory.txt", filename="hello.txt", content=b"hello")
|
||||
|
||||
self.assertEqual(response.status_code, 409)
|
||||
self.assertEqual(
|
||||
response.json(),
|
||||
{
|
||||
"error": {
|
||||
"code": "path_type_conflict",
|
||||
"message": "Requested path is not a directory",
|
||||
"details": {"path": "storage1/not_a_directory.txt"},
|
||||
}
|
||||
},
|
||||
)
|
||||
|
||||
def test_upload_traversal_blocked(self) -> None:
|
||||
response = self._upload(target_path="storage1/../etc", filename="hello.txt", content=b"hello")
|
||||
|
||||
self.assertEqual(response.status_code, 403)
|
||||
self.assertEqual(
|
||||
response.json(),
|
||||
{
|
||||
"error": {
|
||||
"code": "path_traversal_detected",
|
||||
"message": "Path traversal is not allowed",
|
||||
"details": {"path": "storage1/../etc"},
|
||||
}
|
||||
},
|
||||
)
|
||||
|
||||
def test_upload_invalid_root_alias(self) -> None:
|
||||
response = self._upload(target_path="unknown/uploads", filename="hello.txt", content=b"hello")
|
||||
|
||||
self.assertEqual(response.status_code, 403)
|
||||
self.assertEqual(
|
||||
response.json(),
|
||||
{
|
||||
"error": {
|
||||
"code": "invalid_root_alias",
|
||||
"message": "Unknown root alias",
|
||||
"details": {"path": "unknown/uploads"},
|
||||
}
|
||||
},
|
||||
)
|
||||
|
||||
def test_upload_invalid_filename_blocked(self) -> None:
|
||||
response = self._upload(target_path="storage1/uploads", filename="..", content=b"hello")
|
||||
|
||||
self.assertEqual(response.status_code, 400)
|
||||
self.assertEqual(
|
||||
response.json(),
|
||||
{
|
||||
"error": {
|
||||
"code": "invalid_request",
|
||||
"message": "Invalid name",
|
||||
"details": {"name": ".."},
|
||||
}
|
||||
},
|
||||
)
|
||||
|
||||
def test_upload_conflict_on_existing_file(self) -> None:
|
||||
existing = self.uploads_dir / "hello.txt"
|
||||
existing.write_text("existing", encoding="utf-8")
|
||||
|
||||
response = self._upload(target_path="storage1/uploads", filename="hello.txt", content=b"hello")
|
||||
|
||||
self.assertEqual(response.status_code, 409)
|
||||
self.assertEqual(
|
||||
response.json(),
|
||||
{
|
||||
"error": {
|
||||
"code": "already_exists",
|
||||
"message": "Target path already exists",
|
||||
"details": {"path": "storage1/uploads/hello.txt"},
|
||||
}
|
||||
},
|
||||
)
|
||||
|
||||
history = self._get_history()
|
||||
self.assertEqual(history[0]["operation"], "upload")
|
||||
self.assertEqual(history[0]["status"], "failed")
|
||||
self.assertEqual(history[0]["error_code"], "already_exists")
|
||||
Reference in New Issue
Block a user