chore: 忽略离线部署包,提交安全加固、数据库初始化与文档
- .gitignore: 忽略 docker/offline 离线部署包(镜像/运行时等大文件) - 安全加固: 新增 compute/api/security.py 及各端安全测试,补充 docs/security-hardening.md - 数据库: 新增完整初始化 SQL 与 docs/database-config.md - 数据转换与评测: 修复类型检查、增强校验并补充测试 - Docker 配置与环境变量更新 Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
42
compute/tests/test_eval_runner.py
Normal file
42
compute/tests/test_eval_runner.py
Normal file
@@ -0,0 +1,42 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
|
||||
from compute.engines.llama_factory.eval_runner import _load_dataset
|
||||
|
||||
|
||||
def _write(tmp_path, name: str, text: str) -> str:
|
||||
path = tmp_path / name
|
||||
path.write_text(text, encoding="utf-8")
|
||||
return str(path)
|
||||
|
||||
|
||||
def test_load_jsonl_multiline(tmp_path) -> None:
|
||||
path = _write(
|
||||
tmp_path,
|
||||
"eval.jsonl",
|
||||
'{"question": "q1", "answer": "a1"}\n{"question": "q2", "answer": "a2"}\n',
|
||||
)
|
||||
assert _load_dataset(path) == [
|
||||
{"question": "q1", "answer": "a1"},
|
||||
{"question": "q2", "answer": "a2"},
|
||||
]
|
||||
|
||||
|
||||
def test_load_json_array(tmp_path) -> None:
|
||||
path = _write(
|
||||
tmp_path,
|
||||
"eval.json",
|
||||
json.dumps([{"question": "x", "answer": "y"}]),
|
||||
)
|
||||
assert _load_dataset(path) == [{"question": "x", "answer": "y"}]
|
||||
|
||||
|
||||
def test_load_jsonl_with_bom_and_embedded_array(tmp_path) -> None:
|
||||
"""jsonl 带 BOM 且单行内嵌 JSON 数组,都应正常加载。"""
|
||||
path = _write(
|
||||
tmp_path,
|
||||
"eval.jsonl",
|
||||
"" + json.dumps([{"question": "a", "answer": "b"}, {"question": "c", "answer": "d"}]),
|
||||
)
|
||||
assert len(_load_dataset(path)) == 2
|
||||
63
compute/tests/test_file_download_security.py
Normal file
63
compute/tests/test_file_download_security.py
Normal file
@@ -0,0 +1,63 @@
|
||||
"""compute ``download_file`` 端点安全回归测试。
|
||||
|
||||
修复前 ``file_id`` 直接拼进 glob 模式且不校验路径包含关系,可通过 ``../``
|
||||
穿越出 upload 目录,并在 Linux 上跟随符号链接读取任意文件。
|
||||
修复后:file_id 仅允许字母/数字/下划线/连字符,返回前对解析后的路径
|
||||
做 upload 根目录包含性校验。
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
from fastapi.testclient import TestClient
|
||||
|
||||
|
||||
def _make_client(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> TestClient:
|
||||
monkeypatch.setenv("TRAINING_LOG_ROOT", str(tmp_path / "logs"))
|
||||
monkeypatch.setenv("YG_FT_DATA_ROOT", str(tmp_path / "data"))
|
||||
monkeypatch.setenv("COMPUTE_EXECUTION_MODE", "simulator")
|
||||
monkeypatch.setenv("COMPUTE_AUTH_ENABLED", "false")
|
||||
monkeypatch.delenv("ENABLE_DOCS", raising=False)
|
||||
from compute.api.main import create_app
|
||||
|
||||
return TestClient(create_app())
|
||||
|
||||
|
||||
def _upload_root(tmp_path: Path) -> Path:
|
||||
root = tmp_path / "data" / "uploads"
|
||||
root.mkdir(parents=True, exist_ok=True)
|
||||
return root
|
||||
|
||||
|
||||
def test_download_legit_file(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
|
||||
client = _make_client(tmp_path, monkeypatch)
|
||||
(_upload_root(tmp_path) / "file_123456_hello.txt").write_text("HELLO-DOWNLOAD", encoding="utf-8")
|
||||
response = client.get("/modelTF/compute/files/file_123456/download")
|
||||
assert response.status_code == 200
|
||||
assert response.content == b"HELLO-DOWNLOAD"
|
||||
|
||||
|
||||
def test_download_rejects_traversal_file_id(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
|
||||
client = _make_client(tmp_path, monkeypatch)
|
||||
outside = tmp_path / "secret" / "passwd_1.txt"
|
||||
outside.parent.mkdir(parents=True, exist_ok=True)
|
||||
outside.write_text("TOP-SECRET", encoding="utf-8")
|
||||
for file_id in ["..", "file.123", "..%2F..%2Fsecret%2Fpasswd", "file%20name"]:
|
||||
response = client.get(f"/modelTF/compute/files/{file_id}/download")
|
||||
assert response.status_code in (400, 404), f"file_id={file_id!r} -> {response.status_code}"
|
||||
assert b"TOP-SECRET" not in response.content
|
||||
|
||||
|
||||
def test_download_blocks_symlink_escape(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
|
||||
client = _make_client(tmp_path, monkeypatch)
|
||||
upload_root = _upload_root(tmp_path)
|
||||
outside = tmp_path / "secret.txt"
|
||||
outside.write_text("TOP-SECRET", encoding="utf-8")
|
||||
try:
|
||||
(upload_root / "file_999999_link.txt").symlink_to(outside)
|
||||
except OSError:
|
||||
pytest.skip("symlink creation not permitted on this platform")
|
||||
response = client.get("/modelTF/compute/files/file_999999/download")
|
||||
assert response.status_code == 404
|
||||
assert b"TOP-SECRET" not in response.content
|
||||
@@ -1,6 +1,8 @@
|
||||
from __future__ import annotations
|
||||
|
||||
from compute.engines.llama_factory.adapter import build_command
|
||||
import json
|
||||
|
||||
from compute.engines.llama_factory.adapter import _validate_dataset_columns, build_command
|
||||
|
||||
|
||||
def test_build_command_uses_explicit_validation_dataset_without_resplitting() -> None:
|
||||
@@ -21,3 +23,70 @@ def test_build_command_uses_explicit_validation_dataset_without_resplitting() ->
|
||||
)
|
||||
assert "--do_eval" in result.command
|
||||
assert "--val_size" not in result.command
|
||||
|
||||
|
||||
def _write(tmp_path, name: str, lines: list[dict]) -> object:
|
||||
path = tmp_path / name
|
||||
path.write_text(
|
||||
"".join(json.dumps(line, ensure_ascii=False) + "\n" for line in lines),
|
||||
encoding="utf-8",
|
||||
)
|
||||
return path
|
||||
|
||||
|
||||
def test_jsonl_alpaca_without_input_column_passes_validation(tmp_path) -> None:
|
||||
"""纯 jsonl Alpaca 数据缺省 input 字段(常见),不应被校验拦截。"""
|
||||
_write(tmp_path, "train.jsonl", [{"instruction": "hi", "output": "hello"}])
|
||||
errors = _validate_dataset_columns(
|
||||
{
|
||||
"dataset_dir": str(tmp_path),
|
||||
"dataset_info": {
|
||||
"ygft_a": {
|
||||
"file_name": "train.jsonl",
|
||||
"formatting": "alpaca",
|
||||
"columns": {"prompt": "instruction", "query": "input", "response": "output"},
|
||||
}
|
||||
},
|
||||
}
|
||||
)
|
||||
assert errors == []
|
||||
|
||||
|
||||
def test_jsonl_sharegpt_passes_validation(tmp_path) -> None:
|
||||
"""ShareGPT 格式 jsonl(messages)应通过校验。"""
|
||||
_write(
|
||||
tmp_path,
|
||||
"msg.jsonl",
|
||||
[{"messages": [{"role": "user", "content": "hi"}, {"role": "assistant", "content": "hello"}]}],
|
||||
)
|
||||
errors = _validate_dataset_columns(
|
||||
{
|
||||
"dataset_dir": str(tmp_path),
|
||||
"dataset_info": {
|
||||
"ygft_m": {
|
||||
"file_name": "msg.jsonl",
|
||||
"formatting": "sharegpt",
|
||||
"columns": {"messages": "messages"},
|
||||
}
|
||||
},
|
||||
}
|
||||
)
|
||||
assert errors == []
|
||||
|
||||
|
||||
def test_jsonl_missing_response_still_rejected(tmp_path) -> None:
|
||||
"""缺 output(response)仍应报错——没有答案无法做有监督微调。"""
|
||||
_write(tmp_path, "train.jsonl", [{"instruction": "hi"}])
|
||||
errors = _validate_dataset_columns(
|
||||
{
|
||||
"dataset_dir": str(tmp_path),
|
||||
"dataset_info": {
|
||||
"ygft_a": {
|
||||
"file_name": "train.jsonl",
|
||||
"formatting": "alpaca",
|
||||
"columns": {"prompt": "instruction", "query": "input", "response": "output"},
|
||||
}
|
||||
},
|
||||
}
|
||||
)
|
||||
assert errors and "output" in errors[0]
|
||||
|
||||
40
compute/tests/test_security.py
Normal file
40
compute/tests/test_security.py
Normal file
@@ -0,0 +1,40 @@
|
||||
"""计算节点文档路由(/docs、/redoc、/openapi.json)安全开关测试。
|
||||
|
||||
生产默认(COMPUTE_AUTH_ENABLED=true)关闭文档路由,避免未授权泄露 API 结构;
|
||||
显式配置 ENABLE_DOCS 可覆盖默认行为。
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
from compute.api.security import docs_enabled, docs_kwargs
|
||||
|
||||
|
||||
def test_docs_disabled_when_auth_enabled(monkeypatch) -> None:
|
||||
monkeypatch.delenv("ENABLE_DOCS", raising=False)
|
||||
monkeypatch.setenv("COMPUTE_AUTH_ENABLED", "true")
|
||||
assert docs_enabled() is False
|
||||
assert docs_kwargs() == {"docs_url": None, "redoc_url": None, "openapi_url": None}
|
||||
|
||||
|
||||
def test_docs_enabled_when_auth_disabled(monkeypatch) -> None:
|
||||
monkeypatch.delenv("ENABLE_DOCS", raising=False)
|
||||
monkeypatch.setenv("COMPUTE_AUTH_ENABLED", "false")
|
||||
assert docs_enabled() is True
|
||||
assert docs_kwargs() == {}
|
||||
|
||||
|
||||
def test_docs_env_override_enables_with_auth(monkeypatch) -> None:
|
||||
monkeypatch.setenv("ENABLE_DOCS", "true")
|
||||
monkeypatch.setenv("COMPUTE_AUTH_ENABLED", "true")
|
||||
assert docs_enabled() is True
|
||||
|
||||
|
||||
def test_docs_env_override_disables_without_auth(monkeypatch) -> None:
|
||||
monkeypatch.setenv("ENABLE_DOCS", "false")
|
||||
monkeypatch.setenv("COMPUTE_AUTH_ENABLED", "false")
|
||||
assert docs_enabled() is False
|
||||
|
||||
|
||||
def test_docs_default_when_auth_env_missing(monkeypatch) -> None:
|
||||
monkeypatch.delenv("ENABLE_DOCS", raising=False)
|
||||
monkeypatch.delenv("COMPUTE_AUTH_ENABLED", raising=False)
|
||||
assert docs_enabled() is False
|
||||
Reference in New Issue
Block a user