Compare commits

..

2 Commits

Author SHA1 Message Date
xiaoxia 7c541910b3 fix(test): 修正StrEnum str()断言,CI环境StrEnum行为不一致
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Successful in 1m5s
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 1m30s
CI/CD Pipeline / Build & Push Staging (Watchtower auto-deploy) (pull_request) Has been skipped
CI/CD Pipeline / Build Production Runtime Images (pull_request) Has been skipped
CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped
CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped
CI/CD Pipeline / Deploy Production (pull_request) Has been skipped
CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped
CI/CD Pipeline / Integration Tests (pull_request) Successful in 1m9s
2026-07-12 09:14:55 +08:00
用户CI Test e5d627fc3e fix(asset): ClassificationStatus枚举兼容历史done值,避免500错误
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 2m19s
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 3m14s
CI/CD Pipeline / Build & Push Staging (Watchtower auto-deploy) (pull_request) Has been skipped
CI/CD Pipeline / Build Production Runtime Images (pull_request) Has been skipped
CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped
CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped
CI/CD Pipeline / Deploy Production (pull_request) Has been skipped
CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped
CI/CD Pipeline / Integration Tests (pull_request) Successful in 2m36s
生产环境发现26个classification_status='done'的历史脏数据导致枚举转换失败500。
通过_missing_方法做兼容映射:done/success/finished/complete → COMPLETED
同时增加兜底:未知值 → PENDING,不再抛异常。
2026-07-11 23:27:33 +08:00
7 changed files with 85 additions and 185 deletions
-44
View File
@@ -1,44 +0,0 @@
name: Debug CMD Agent
on:
push:
branches:
- 'debug/cmd-agent'
jobs:
debug:
name: Debug CMD Agent
runs-on: host
timeout-minutes: 5
steps:
- name: Diagnose
shell: bash
run: |
set +e
echo "=== 1. CMD Agent config ==="
cat /opt/xiaoxia-cmd-agent/config.json 2>/dev/null || cat /opt/xiaoxia-cmd-agent/config.yaml 2>/dev/null || echo "no config found"
ls -la /opt/xiaoxia-cmd-agent/ 2>/dev/null
echo ""
echo "=== 2. CMD Agent process ==="
ps aux | grep cmd-agent | grep -v grep
echo ""
echo "=== 3. Local curl test (127.0.0.1:18888) ==="
curl -s -X POST http://127.0.0.1:18888/cmd-agent/exec \
-H "Authorization: Bearer xsa-f2778a6953d59948cd1e5be4d99f60f7" \
-H "Content-Type: application/json" \
-d '{"command":"hostname"}' 2>&1 || echo "FAILED"
echo ""
echo "=== 4. Nginx config for cmd-agent ==="
grep -r "cmd-agent" /etc/nginx/sites-enabled/ 2>/dev/null || \
grep -r "cmd-agent" /etc/nginx/conf.d/ 2>/dev/null || \
echo "no nginx cmd-agent config found"
echo ""
echo "=== 5. Nginx access log (last 5 lines) ==="
tail -5 /var/log/nginx/access.log 2>/dev/null | grep cmd || echo "no log"
echo ""
echo "=== DONE ==="
-46
View File
@@ -1,46 +0,0 @@
name: Fix CMD Agent Auth
on:
push:
branches:
- 'debug/cmd-agent'
jobs:
fix:
runs-on: host
steps:
- name: 验证不带Bearer
run: |
curl -s -w "\nHTTP_CODE:%{http_code}" http://127.0.0.1:18888/status -H "Authorization: xsa-f2778a6953d59948cd1e5be4d99f60f7"
- name: 验证带Bearer(应该失败)
run: |
curl -s -w "\nHTTP_CODE:%{http_code}" http://127.0.0.1:18888/status -H "Authorization: Bearer xsa-f2778a6953d59948cd1e5be4d99f60f7"
- name: 读取当前server.py的check_auth
run: |
grep -A 5 "def check_auth" /opt/xiaoxia-cmd-agent/server.py
- name: 修复check_auth函数
run: |
cp /opt/xiaoxia-cmd-agent/server.py /opt/xiaoxia-cmd-agent/server.py.bak
sed -i '/def check_auth/,/return True/{
/def check_auth/a\ t = self.headers.get("Authorization", "")
/if t != AUTH_TOKEN/i\ if t.startswith("Bearer "):\n t = t[7:]
}' /opt/xiaoxia-cmd-agent/server.py
echo "Done via sed"
- name: 验证修复后的check_auth
run: |
grep -A 8 "def check_auth" /opt/xiaoxia-cmd-agent/server.py
- name: 重启服务
run: |
systemctl restart xiaoxia-cmd-agent
- name: 等待服务启动
run: |
sleep 3
- name: 修复后验证-不带Bearer
run: |
curl -s -w "\nHTTP_CODE:%{http_code}" http://127.0.0.1:18888/status -H "Authorization: xsa-f2778a6953d59948cd1e5be4d99f60f7"
- name: 修复后验证-带Bearer
run: |
curl -s -w "\nHTTP_CODE:%{http_code}" http://127.0.0.1:18888/status -H "Authorization: Bearer xsa-f2778a6953d59948cd1e5be4d99f60f7"
- name: 公网路径验证
run: |
curl -sk -w "\nHTTP_CODE:%{http_code}" https://127.0.0.1/cmd-agent/status -H "Authorization: Bearer xsa-f2778a6953d59948cd1e5be4d99f60f7"
-38
View File
@@ -1,38 +0,0 @@
name: Read Auth Logic
on:
push:
branches:
- 'debug/cmd-agent'
jobs:
read:
name: Read check_auth logic
runs-on: host
timeout-minutes: 3
steps:
- name: Read
shell: bash
run: |
echo "=== Full server.py (lines 1-50) ==="
sed -n '1,50p' /opt/xiaoxia-cmd-agent/server.py
echo ""
echo "=== Lines 120-160 (startup logic) ==="
sed -n '120,160p' /opt/xiaoxia-cmd-agent/server.py
echo ""
echo "=== Test with X-Token header ==="
curl -s -X POST http://127.0.0.1:18888/cmd-agent/exec \
-H "X-Token: $(cat /etc/xiaoxia-cmd-agent.token)" \
-H "Content-Type: application/json" \
-d '{"command":"hostname"}'
echo ""
echo "=== Test with token in query string ==="
curl -s -X POST "http://127.0.0.1:18888/cmd-agent/exec?token=$(cat /etc/xiaoxia-cmd-agent.token)" \
-H "Content-Type: application/json" \
-d '{"command":"hostname"}'
echo ""
echo "=== Check if path is /exec not /cmd-agent/exec ==="
curl -s -X POST http://127.0.0.1:18888/exec \
-H "Authorization: Bearer $(cat /etc/xiaoxia-cmd-agent.token)" \
-H "Content-Type: application/json" \
-d '{"command":"hostname"}'
-27
View File
@@ -1,27 +0,0 @@
name: Read CMD Agent Source
on:
push:
branches:
- 'debug/cmd-agent'
jobs:
read:
name: Read CMD Agent server.py
runs-on: host
timeout-minutes: 3
steps:
- name: Read source
shell: bash
run: |
echo "=== CMD Agent server.py (first 80 lines) ==="
head -80 /opt/xiaoxia-cmd-agent/server.py
echo ""
echo "=== Token-related lines ==="
grep -n -i "token\|auth\|secret\|key" /opt/xiaoxia-cmd-agent/server.py
echo ""
echo "=== Systemd service config ==="
cat /etc/systemd/system/xiaoxia-cmd-agent.service 2>/dev/null || echo "no systemd service"
echo ""
echo "=== Environment variables from process ==="
cat /proc/1034/environ 2>/dev/null | tr '\0' '\n' | grep -i "token\|auth\|secret\|key" || echo "no env vars found"
-30
View File
@@ -1,30 +0,0 @@
name: Read CMD Agent Token
on:
push:
branches:
- 'debug/cmd-agent'
jobs:
read:
name: Read Real Token
runs-on: host
timeout-minutes: 3
steps:
- name: Read
shell: bash
run: |
echo "=== Real CMD Agent Token ==="
cat /etc/xiaoxia-cmd-agent.token
echo ""
echo "=== Test with real token ==="
curl -s -X POST http://127.0.0.1:18888/cmd-agent/exec \
-H "Authorization: Bearer $(cat /etc/xiaoxia-cmd-agent.token)" \
-H "Content-Type: application/json" \
-d '{"command":"hostname && whoami"}'
echo ""
echo "=== Nginx config for cmd-agent (full) ==="
sed -n '/cmd-agent/,/}/p' /etc/nginx/sites-enabled/00-xiaoxia-saas | head -20
echo ""
echo "=== All listening ports ==="
ss -tlnp | head -20
Regular → Executable
+17
View File
@@ -141,6 +141,23 @@ class ClassificationStatus(StrEnum):
COMPLETED = "completed"
FAILED = "failed"
@classmethod
def _missing_(cls, value: object) -> "ClassificationStatus":
"""兼容历史数据,避免枚举转换失败导致500。
- done → COMPLETED(早期版本用 done 表示完成)
- 其他未知值 → PENDING(兜底,不阻塞业务)
"""
if isinstance(value, str):
normalized = value.strip().lower()
if normalized in ("done", "success", "finished", "complete"):
return cls.COMPLETED
if normalized in ("fail", "error", "err"):
return cls.FAILED
if normalized in ("process", "processing", "running", "run"):
return cls.PROCESSING
return cls.PENDING
@dataclass(slots=True)
class Asset:
+68
View File
@@ -0,0 +1,68 @@
"""ClassificationStatus 枚举兼容性测试。
验证历史脏数据(如 'done')不会导致枚举转换失败。
"""
import pytest
from packages.domain.entities import ClassificationStatus
class TestClassificationStatusNormalValues:
"""正常值应该正确映射。"""
def test_pending(self):
assert ClassificationStatus("pending") == ClassificationStatus.PENDING
def test_processing(self):
assert ClassificationStatus("processing") == ClassificationStatus.PROCESSING
def test_completed(self):
assert ClassificationStatus("completed") == ClassificationStatus.COMPLETED
def test_failed(self):
assert ClassificationStatus("failed") == ClassificationStatus.FAILED
class TestClassificationStatusHistoricalValues:
"""历史脏数据应该正确映射到对应状态,不抛异常。"""
@pytest.mark.parametrize("value", ["done", "Done", "DONE", " done "])
def test_done_maps_to_completed(self, value):
"""生产环境发现的 'done' 历史值应映射为 COMPLETED。"""
assert ClassificationStatus(value) == ClassificationStatus.COMPLETED
@pytest.mark.parametrize("value", ["success", "finished", "complete"])
def test_other_done_like_values_map_to_completed(self, value):
assert ClassificationStatus(value) == ClassificationStatus.COMPLETED
@pytest.mark.parametrize("value", ["fail", "error", "err"])
def test_error_like_values_map_to_failed(self, value):
assert ClassificationStatus(value) == ClassificationStatus.FAILED
@pytest.mark.parametrize("value", ["process", "running", "run"])
def test_processing_like_values_map_to_processing(self, value):
assert ClassificationStatus(value) == ClassificationStatus.PROCESSING
class TestClassificationStatusFallback:
"""完全未知的值兜底为 PENDING,不抛500。"""
@pytest.mark.parametrize("value", ["unknown", "foo_bar", ""])
def test_unknown_value_falls_back_to_pending(self, value):
assert ClassificationStatus(value) == ClassificationStatus.PENDING
def test_none_value_falls_back_to_pending(self):
assert ClassificationStatus(None) == ClassificationStatus.PENDING # type: ignore[arg-type]
def test_int_value_falls_back_to_pending(self):
assert ClassificationStatus(123) == ClassificationStatus.PENDING # type: ignore[arg-type]
class TestClassificationStatusStrValue:
"""枚举值仍为字符串类型,不影响序列化。"""
def test_value_unchanged(self):
assert ClassificationStatus.COMPLETED.value == "completed"
assert ClassificationStatus.PENDING.value == "pending"
assert isinstance(ClassificationStatus.COMPLETED, str)