wooo/awoooi
1
1
Fork 0
Code Issues 2 Pull Requests 1 Actions 4 Packages Projects Releases Wiki Activity

fix(security): 體健修復 — 7項 Critical/Major 安全問題全修
Some checks failed
CD Pipeline / build-and-deploy (push) Failing after 35s
Details

Browse Source 
## Critical 修復 (C1-C5)
- C1: git rm --cached 03-secrets.yaml（CHANGE_ME 模板不再追蹤）
- C2: git rm --cached awoooi.db + .gitignore 加 *.db（SQLite HARD_RULES 違規）
- C3: sentry-tunnel SENTRY_HOST 改為 process.env fallback
- C4: config.py DATABASE_URL 移除 changeme default，改為必填
- C5: run_migration.py 改為 os.environ["DATABASE_URL"]

## Major 修復 (M1-M4)
- M1: auto_repair /execute 加 CSRF 保護 + AutoRepairPanel.tsx 同步
- M2: drift /rollback /adopt 加 CSRF 保護（/internal/scan 保持無 CSRF）
- M3: terminal /intent 加 CSRF 保護 + terminal.store.ts 同步
- M4: live-dashboard HOST_IPS + host-grid VIP 改為 env var

## 其他
- 新增 apps/web/.env.example（6 個 env var 說明）
- K8s deployment-web 補入 3 個新 env var
- 整合測試：新增 aider_event_repository + ai_router_feedback 真實 DB 測試
- test_terminal.py CSRF dependency override 修復

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Your Name
2026-04-22 01:27:39 +08:00
parent 3dbb3d70b4
commit d0591c54b0
21 changed files with 428 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
apps/api/awoooi.db
View File

Binary file not shown.

6
apps/api/scripts/run_migration.py
View File

@@ -9,12 +9,14 @@ Phase 18 AuditLog Migration Script
"""
import asyncio
import os
from sqlalchemy import text
from sqlalchemy.ext.asyncio import create_async_engine
# 數據庫連接
DATABASE_URL = "postgresql+asyncpg://awoooi:changeme@192.168.0.188:5432/awoooi_prod"
# 2026-04-22 ogt: 移除硬碼 changeme，改為讀取環境變數（強制要求設定）。
# 執行前: export DATABASE_URL="postgresql+asyncpg://awoooi:<password>@192.168.0.188:5432/awoooi_prod"
DATABASE_URL = os.environ["DATABASE_URL"]
MIGRATION_SQLS = [
# 1. authorization_channel

4
apps/api/src/api/v1/auto_repair.py
View File

@@ -16,6 +16,8 @@ Phase 8.2: API Router 實作
from fastapi import APIRouter, HTTPException, Query
from pydantic import BaseModel, Field
from src.core.csrf import CSRFToken # Phase 20: CSRF Protection
from src.services.auto_repair_service import (
get_auto_repair_service,
)
@@ -106,7 +108,7 @@ async def evaluate_auto_repair(incident_id: str) -> EvaluateResponse:
@router.post("/execute", response_model=ExecuteResponse)
async def execute_auto_repair(request: ExecuteRequest) -> ExecuteResponse:
async def execute_auto_repair(request: ExecuteRequest, _csrf_token: CSRFToken) -> ExecuteResponse: # Phase 20: CSRF Protection (驗證用，不需要使用值)
"""
執行自動修復

6
apps/api/src/api/v1/drift.py
View File

@@ -15,6 +15,8 @@ leWOOOgo 積木化原則:
from fastapi import APIRouter, BackgroundTasks, HTTPException
from src.core.csrf import CSRFToken # Phase 20: CSRF Protection
from src.models.drift import (
DriftListResponse,
DriftReport,
@@ -95,7 +97,7 @@ async def list_drift_reports() -> DriftListResponse:
@router.post("/reports/{report_id}/rollback", summary="覆蓋回 Git 狀態")
async def rollback_drift(report_id: str) -> dict:
async def rollback_drift(report_id: str, _csrf_token: CSRFToken) -> dict: # Phase 20: CSRF Protection (驗證用，不需要使用值)
"""
將 K8s 狀態覆蓋回 Git YAML（kubectl apply）
@@ -112,7 +114,7 @@ async def rollback_drift(report_id: str) -> dict:
@router.post("/reports/{report_id}/adopt", summary="承認變更並建立 Git PR")
async def adopt_drift(report_id: str) -> dict:
async def adopt_drift(report_id: str, _csrf_token: CSRFToken) -> dict: # Phase 20: CSRF Protection (驗證用，不需要使用值)
"""
承認 K8s 漂移，透過 Gitea PR API 將漂移寫回 Git

2
apps/api/src/api/v1/terminal.py
View File

@@ -34,6 +34,7 @@ from src.models.terminal import (
TerminalIntentResponse,
TerminalStatusResponse,
)
from src.core.csrf import CSRFToken # Phase 20: CSRF Protection
from src.services.terminal_service import TerminalService, get_terminal_service
# Type alias for dependency injection
@@ -58,6 +59,7 @@ logger = get_logger("awoooi.terminal.router")
async def submit_intent(
request: TerminalIntentRequest,
service: TerminalServiceDep,
_csrf_token: CSRFToken, # Phase 20: CSRF Protection (驗證用，不需要使用值)
) -> TerminalIntentResponse:
"""
提交意圖請求

5
apps/api/src/core/config.py
View File

@@ -168,9 +168,10 @@ class Settings(BaseSettings):
# ==========================================================================
# Database (PostgreSQL on 192.168.0.188)
# ==========================================================================
# 2026-04-22 ogt: 移除含 changeme 的 default，改為必填。
# 來源: K8s Secret awoooi-secrets → DATABASE_URL
DATABASE_URL: str = Field(
default="postgresql+asyncpg://awoooi:changeme@192.168.0.188:5432/awoooi_prod",
description="PostgreSQL connection URL",
description="PostgreSQL connection URL (必填，從 K8s Secret awoooi-secrets → DATABASE_URL 取得)",
)
# ==========================================================================

15
apps/api/tests/integration/setup_test_schema.sql
View File

@@ -104,3 +104,18 @@ CREATE TABLE IF NOT EXISTS rag_chunks (
metadata JSONB DEFAULT '{}',
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
);
-- adr091: aider_events schema (2026-04-22 @ Asia/Taipei, 補入 integration test schema)
CREATE TABLE IF NOT EXISTS aider_events (
id BIGSERIAL PRIMARY KEY,
session_id TEXT NOT NULL,
ts TIMESTAMPTZ NOT NULL,
type TEXT NOT NULL,
host TEXT DEFAULT 'ogt-mac',
payload JSONB NOT NULL,
incident_id TEXT,
created_at TIMESTAMPTZ NOT NULL DEFAULT now()
);
CREATE INDEX IF NOT EXISTS aider_events_session_idx ON aider_events(session_id);
CREATE INDEX IF NOT EXISTS aider_events_type_ts_idx ON aider_events(type, ts DESC);
CREATE INDEX IF NOT EXISTS aider_events_ts_idx ON aider_events(ts DESC);

149
apps/api/tests/integration/test_ai_router_feedback_integration.py Normal file
View File

@@ -0,0 +1,149 @@
# tests/integration/test_ai_router_feedback_integration.py | 2026-04-22 @ Asia/Taipei
"""AIRouter.feedback_from_aider_events() 整合測試 — 使用真實 awoooi_dev PostgreSQL
替換 tests/test_ai_router_feedback.py 中違反 feedback_no_mock_testing.md 的
FakeRepo / FakeSession mock。
AIRouter.feedback_from_aider_events() 本質是聚合查詢 — 直接用真實 DB 驗證
比 mock DB 更準確，且能抓到 SQL 語法錯誤。
規則: 每個測試後 rollback（由 integration/conftest.py db_session fixture 保證）
禁止 Mock Repository / Session — 直接使用真實 DB 連線。
"""
from __future__ import annotations
from datetime import datetime, timezone, timedelta
import pytest
from sqlalchemy import text
from src.repositories.aider_event_repository import AiderEventRepository
TAIPEI = timezone(timedelta(hours=8))
def _ts(offset_days: int = 0) -> datetime:
return datetime.now(TAIPEI) - timedelta(days=offset_days)
async def _insert_session(db_session, session_id: str, model: str,
repo_cwd: str, has_error: bool = False) -> None:
"""插入一組 session_start + (可選) error event。"""
repo = AiderEventRepository(db_session)
await repo.insert(
session_id=session_id,
ts=_ts(),
type_="session_start",
host="ogt-mac",
payload={"cwd": repo_cwd, "model": model,
"aider_args": [], "aider_pid": 1, "cli_version": "0.86"},
)
if has_error:
await repo.insert(
session_id=session_id,
ts=_ts(),
type_="error",
host="ogt-mac",
payload={"cwd": repo_cwd, "model": model,
"kind": "api_rate_limit", "message": "429",
"context_50chars": ""},
)
# =============================================================================
# model_stats_since() 聚合正確性
# =============================================================================
class TestModelStatsAggregation:
@pytest.mark.asyncio
async def test_empty_db_returns_empty_list(self, db_session):
"""無資料時 model_stats_since 應回傳空 list（不崩潰）。"""
repo = AiderEventRepository(db_session)
result = await repo.model_stats_since(days=1)
# 可能有其他 session 留存（dev DB），但至少型別正確
assert isinstance(result, list)
@pytest.mark.asyncio
async def test_inserted_sessions_appear_in_stats(self, db_session):
"""插入 2 筆 session（1 成功 1 失敗），stats 應正確回傳。"""
await _insert_session(db_session, "s-ok-001", "elephant-alpha",
"/awoooi", has_error=False)
await _insert_session(db_session, "s-err-001", "elephant-alpha",
"/awoooi", has_error=True)
await db_session.flush()
repo = AiderEventRepository(db_session)
result = await repo.model_stats_since(days=1)
# 找出我們插入的 model
elephant_rows = [r for r in result
if r.get("model") == "elephant-alpha"
and r.get("repo") is not None
and "/awoooi" in (r.get("repo") or "")]
assert len(elephant_rows) >= 1
row = elephant_rows[0]
assert row["total"] >= 2
assert 0.0 <= float(row["success_rate"]) <= 1.0
@pytest.mark.asyncio
async def test_success_rate_field_is_float(self, db_session):
"""success_rate 欄位必須可轉換為 float（AIRouter 依賴此保證）。"""
await _insert_session(db_session, "s-float-001", "gemini-pro",
"/clawbot", has_error=False)
await db_session.flush()
repo = AiderEventRepository(db_session)
result = await repo.model_stats_since(days=1)
for row in result:
# 不應 raise
_ = float(row.get("success_rate") or 0)
@pytest.mark.asyncio
async def test_repo_filter_works(self, db_session):
"""插入兩個不同 cwd 的 session，手動 filter by repo 應只回傳對應資料。"""
await _insert_session(db_session, "s-awoooi-001", "elephant-alpha",
"/awoooi", has_error=False)
await _insert_session(db_session, "s-other-001", "elephant-alpha",
"/other-repo", has_error=True)
await db_session.flush()
repo = AiderEventRepository(db_session)
all_stats = await repo.model_stats_since(days=1)
# 手動過濾（模擬 AIRouter.feedback_from_aider_events(repo="awoooi")）
awoooi_rows = [r for r in all_stats if "/awoooi" in (r.get("repo") or "")]
other_rows = [r for r in all_stats if "/other-repo" in (r.get("repo") or "")]
# 若兩筆都有資料，它們的 success_rate 應該不同（一個 1.0，一個 0.0）
# 這裡只確認 filter 邏輯本身不混淆
for row in awoooi_rows:
assert "/other-repo" not in (row.get("repo") or "")
for row in other_rows:
assert "/awoooi" not in (row.get("repo") or "")
# =============================================================================
# AIRouter.feedback_from_aider_events() error handling（不 mock Session）
# =============================================================================
class TestAIRouterFeedbackDBBehavior:
"""驗證 feedback_from_aider_events() 不崩潰即可（透過 model_stats_since 間接測試）。"""
@pytest.mark.asyncio
async def test_model_stats_since_does_not_raise_on_empty(self, db_session):
"""空 DB 時聚合查詢不應拋例外。"""
repo = AiderEventRepository(db_session)
try:
result = await repo.model_stats_since(days=7)
assert isinstance(result, list)
except Exception as e:
pytest.fail(f"model_stats_since raised unexpectedly: {e}")
@pytest.mark.asyncio
async def test_daily_pattern_candidates_no_error(self, db_session):
"""daily_pattern_candidates() 不應崩潰。"""
repo = AiderEventRepository(db_session)
result = await repo.daily_pattern_candidates(days=1)
assert isinstance(result, list)

165
apps/api/tests/integration/test_aider_event_repository.py Normal file
View File

@@ -0,0 +1,165 @@
# tests/integration/test_aider_event_repository.py | 2026-04-22 @ Asia/Taipei
"""AiderEventRepository 整合測試 — 使用真實 awoooi_dev PostgreSQL
替換 tests/test_aider_event_processor.py 中違反 feedback_no_mock_testing.md 的
FakeRepo / FakeSession mock。
原測試 (test_aider_event_processor.py) 驗證的是 AiderEventProcessor._process_one()
的整體流程（parse → incident → DB write → ACK），其中：
- FakeRepo / FakeSession → 此整合測試改用真實 DB 驗證 insert 行為
- fake_r.xack (Redis) → Redis 屬外部 broker，仍可在 unit test 中 mock（符合「外部 API」例外）
- fake_engine (IncidentEngine) → AI 推斷服務，屬外部呼叫，仍可 mock
此檔案: 只測「DB 層」— AiderEventRepository.insert() + model_stats_since()
其餘路由邏輯已在 test_aider_event_processor.py 的 parser/ACK 部份覆蓋。
規則: 每個測試後 rollback（由 integration/conftest.py db_session fixture 保證）
禁止 Mock — 直接使用真實 DB 連線。
"""
from __future__ import annotations
from datetime import datetime, timezone, timedelta
import pytest
from src.repositories.aider_event_repository import AiderEventRepository
TAIPEI = timezone(timedelta(hours=8))
def _ts() -> datetime:
return datetime.now(TAIPEI)
# =============================================================================
# insert() 基本寫入
# =============================================================================
class TestAiderEventRepositoryInsert:
"""驗證 insert() 正確寫入 aider_events 表。"""
@pytest.mark.asyncio
async def test_insert_error_event_returns_id(self, db_session):
"""error event 插入後應回傳有效 BIGSERIAL id。"""
repo = AiderEventRepository(db_session)
row_id = await repo.insert(
session_id="s-test-001",
ts=_ts(),
type_="error",
host="ogt-mac",
payload={"cwd": "/r", "model": "elephant-alpha",
"kind": "api_rate_limit", "message": "429",
"context_50chars": ""},
)
assert isinstance(row_id, int)
assert row_id > 0
@pytest.mark.asyncio
async def test_insert_session_start_with_incident_id(self, db_session):
"""insert 可附帶 incident_id（nullable FK）。"""
repo = AiderEventRepository(db_session)
row_id = await repo.insert(
session_id="s-test-002",
ts=_ts(),
type_="session_start",
host="ogt-mac",
payload={"cwd": "/r", "model": "elephant-alpha",
"aider_args": [], "aider_pid": 1, "cli_version": "0.86"},
incident_id="INC-20260422-0001",
)
assert row_id > 0
@pytest.mark.asyncio
async def test_insert_without_incident_id(self, db_session):
"""incident_id 可為 None（常見情境）。"""
repo = AiderEventRepository(db_session)
row_id = await repo.insert(
session_id="s-test-003",
ts=_ts(),
type_="commit",
host="ogt-mac",
payload={"cwd": "/r", "model": "gemini-pro",
"commit_hash": "abc123", "message": "fix: something"},
)
assert row_id > 0
# =============================================================================
# count_by_session()
# =============================================================================
class TestAiderEventRepositoryCount:
@pytest.mark.asyncio
async def test_count_returns_correct_value(self, db_session):
"""插入 3 筆相同 session_id，count 應回傳 3。"""
repo = AiderEventRepository(db_session)
sid = "s-count-test-001"
for i in range(3):
await repo.insert(
session_id=sid,
ts=_ts(),
type_="error",
host="ogt-mac",
payload={"kind": "test", "message": f"err-{i}",
"model": "m", "cwd": "/r", "context_50chars": ""},
)
count = await repo.count_by_session(sid)
assert count == 3
@pytest.mark.asyncio
async def test_count_unknown_session_is_zero(self, db_session):
"""不存在的 session_id 應回傳 0。"""
repo = AiderEventRepository(db_session)
count = await repo.count_by_session("nonexistent-session-xyz")
assert count == 0
# =============================================================================
# model_stats_since() — AI Router feedback 聚合查詢
# =============================================================================
class TestAiderEventRepositoryModelStats:
@pytest.mark.asyncio
async def test_model_stats_returns_list(self, db_session):
"""model_stats_since() 應回傳 list（即使空）。"""
repo = AiderEventRepository(db_session)
result = await repo.model_stats_since(days=1)
assert isinstance(result, list)
@pytest.mark.asyncio
async def test_model_stats_aggregates_correctly(self, db_session):
"""插入 session_start + error，stats 應正確統計 error_rate。
注意：model_stats_since 聚合邏輯依賴 session_start/session_end payload.model 欄位，
且需要多筆 session 才能統計。此測試驗證：不崩潰、回傳正確型別。
"""
repo = AiderEventRepository(db_session)
ts_now = _ts()
# 插入一個 session 含 session_start（提供 model 資訊）+ 一筆 error
sid = "s-stats-test-001"
await repo.insert(
session_id=sid, ts=ts_now,
type_="session_start", host="ogt-mac",
payload={"cwd": "/awoooi", "model": "elephant-alpha",
"aider_args": [], "aider_pid": 1, "cli_version": "0.86"},
)
await repo.insert(
session_id=sid, ts=ts_now,
type_="error", host="ogt-mac",
payload={"cwd": "/awoooi", "model": "elephant-alpha",
"kind": "api_rate_limit", "message": "429",
"context_50chars": ""},
)
await db_session.flush() # flush 使 SQL CTE 能看到資料（不 commit）
result = await repo.model_stats_since(days=1)
assert isinstance(result, list)
# 若有回傳結果，驗證欄位格式正確
for row in result:
assert "model" in row
assert "total" in row
assert "errors" in row
assert "success_rate" in row

8
apps/api/tests/test_ai_router_feedback.py
View File

@@ -1,5 +1,11 @@
# apps/api/tests/test_ai_router_feedback.py | 2026-04-20 @ Asia/Taipei
"""Task A8: AIRouter.feedback_from_aider_events read-only aggregation test."""
# 2026-04-22 @ Asia/Taipei: FakeRepo / FakeSession 違反 feedback_no_mock_testing.md
# → DB 聚合查詢測試已遷移至 integration/test_ai_router_feedback_integration.py（真實 DB）
# 此檔案保留的測試驗證「DB 不可用時的降級行為」（fail_sf） — 此為錯誤路徑邏輯，
# 非正常 DB 查詢，可留作 unit 層覆蓋。
# FakeRepo 測試（test_feedback_aggregates_by_model 等）已被 integration test 取代，
# 下方保留作參考，但實際 DB 行為請以 integration test 為準。
"""Task A8: AIRouter.feedback_from_aider_events — 降級行為 + 邊界條件測試。"""
import pytest
from unittest.mock import AsyncMock, MagicMock
from src.services.ai_router import AIRouter

8
apps/api/tests/test_aider_event_processor.py
View File

@@ -1,5 +1,11 @@
# test_aider_event_processor | 2026-04-20 @ Asia/Taipei
"""Unit tests for AiderEventProcessor."""
# 2026-04-22 @ Asia/Taipei: DB/Redis mock 違反 feedback_no_mock_testing.md
# - FakeRepo / FakeSession → 已遷移至 integration/test_aider_event_repository.py（真實 DB）
# - fake_r (Redis xack) → 屬外部 broker，保留 mock 符合「外部 API 例外」
# - fake_engine (IncidentEngine) → 屬外部 AI 呼叫，保留 mock 符合「外部 API 例外」
# 此檔案保留 _process_one 的 parse / ACK / incident routing 邏輯測試，
# DB 寫入行為已由 integration test 覆蓋。
"""Unit tests for AiderEventProcessor — parse/ACK/incident routing 邏輯。"""
import pytest
import json
from datetime import datetime, timezone, timedelta

2
apps/api/tests/test_terminal.py
View File

@@ -27,6 +27,7 @@ from fastapi import FastAPI
from httpx import ASGITransport, AsyncClient
from src.api.v1.terminal import router
from src.core.csrf import verify_csrf_token
from src.models.terminal import TerminalSessionStatus
from src.services.terminal_service import TerminalService, get_terminal_service
@@ -50,6 +51,7 @@ async def _get_test_service() -> TerminalService:
_test_app = FastAPI()
_test_app.include_router(router, prefix="/api/v1")
_test_app.dependency_overrides[get_terminal_service] = _get_test_service
_test_app.dependency_overrides[verify_csrf_token] = lambda: "test-bypass" # tests have no browser session
@pytest.fixture(autouse=True)