后端
- asset_service: delete_asset 先清 subdomains/site_certs 子表(SQLite 不强制
FK 且 assets.id 无 AUTOINCREMENT,删最大 id 后新建会复用 rowid 导致孤儿误挂);
metrics.db 清理改 best-effort,不再让已成功的删除返回 500
- provider_service: slug 唯一约束竞态补 IntegrityError 兜底(与 account_service 一致)
- account_service/sync_service: raise HTTPException 补 from e,保留原始异常链
- sync_service: 删死代码 _load_config;新增 BalanceUnsupported,平台无余额接口时
计入 skipped 而不是静默当作失败;到期日写库前归一
- ai: 删掉 OpenAI 早已下线的 billing 余额接口实现,能力探测如实报「不支持」
- adapters/base: _overridden 改走 MRO,中间层基类实现的能力不再被误判为未实现
- core/timeutils: 删死代码 utcnow_iso(注释声称 Z 后缀,实际输出 +00:00)
- main: lifespan 退出时 await 被 cancel 的清理任务,避免 pending task 被销毁
- ssl_service: 写 site_certs/subdomains 前校验 asset_id 存在,杜绝悬空引用;
到期阈值贯穿 _judge_status/_apply_probe/check_one/check_all_site_certs
- routers/credentials、accounts: 明文密码 GET 补 Cache-Control: no-store
- routers/stats: /stats/expiring 的 Query 描述与实际语义对齐(不设下界,含已过期)
Agent
- collector: 解析 sshd_config 的 Include(含 sshd_config.d/*.conf,按 sshd 语义
「首次出现的值生效」),未显式配置的关键字按编译默认值判定,消除假 pass;
防火墙检测改用 iptables -S 统计 -A 规则行并读 INPUT 策略(-L -n 恒有链头输出)
- reporter: 4xx(除 429)不再重试直接退出,429 优先按 Retry-After 退避
安全与部署
- core/security: require_agent_key 改为对外 fail-closed——tailnet/本机放行,
外部来源未配 AGENT_KEY 时一律 401(此前全放行,而服务默认监听 0.0.0.0,
公网上任何人可伪造监控指标与安全检查结果)
- main: 启动时把「未配 API_KEY/AGENT_KEY 则外部来源不可用」打进日志
- run.sh: HOST/PORT 可用环境变量覆盖,并说明默认 0.0.0.0 的权衡
- deploy/setup.sh: 新装时自动生成随机 API_KEY/AGENT_KEY 并提示同步到各 VPS;
注册 vps-cert-check.timer
- deploy/vps-cert-check.{service,timer}: 新增每日 09:30 的站点证书到期探测
(此前 check_site_certs.py 没有任何 unit,证书提醒不会自动跑)
- deploy/update.sh: sync_units 对 timer 用 enable --now(新增 timer 只 restart
不会建开机自启软链),主服务 unit 变更后额外 restart;pip 安装失败不再被吞
- scripts/check_site_certs.py: threshold 参数真正生效并打印
- scripts/make_migration_bundle.py: 缺 assets.db 直接 abort;umask 077 + chmod 600
(包内含 .env 的 MASTER_KEY 与 escrow,不能默认 644 落在 /tmp)
- scripts/restore_migration_bundle.py: 校验之外补必备文件预检,缺文件在触碰
目标机状态之前就 abort
前端
- store: 拆分列表口径 assets 与统计口径 allAssets(无筛选时同源,不重复请求);
删除已无消费者的 expiring/loadExpiring(每次 loadAll 白发一个请求)
- dashboard/monitor/providers/subscriptions/modals: 统计与计数改用 allAssets,
资产页的筛选(含统计卡片点击跳转带的筛选)不再让其他视图的数字缩水
- modals: 账号同步后补 loadOverview;settings: 导入后改 loadAll
- api: countdownText 支持 unit/empty 选项,monitor/domains 各自的实现改为委托,
assets/domains/subscriptions 的到期列不再直出「(-3天)」
- servers: cpu/mem/disk 百分比统一判空,采样缺项不再渲染「null%」
- assets: 同步 AI 余额的结果提示区分 skipped(平台无余额接口)与 failed
- modals: 修正凭据库头注释——2FA 动态码是选填 + 可事后补验,与实现一致
测试
- 新增 tests/test_agent_collector.py(8 条)、tests/test_security.py(11 条)
- 全量 113 passed;改动 JS 均通过 node --check,deploy 脚本通过 bash -n
- 浏览器实测:筛选态下总览/监控中心/平台页/付费资产的统计仍为全量口径,
到期文案与 null 百分比渲染正确,console 零报错
132 lines
4.6 KiB
Python
132 lines
4.6 KiB
Python
"""登录凭据(密码库)CRUD 路由
|
||
|
||
统一入口 /api/credentials,写操作(POST/PUT/DELETE)受 API Key 保护
|
||
(Tailscale 内网/本机放行,外部来源必须携带 X-API-Key)。
|
||
|
||
- 明文密码经 /{id}/password 专用接口解密返回(与账号 reveal 语义一致)
|
||
- 2FA 动态码由服务端生成(secret 永不出库),/{id}/otp 响应 no-store 防缓存残留
|
||
- 录入 secret 与校验它解耦:拿不到当前码可先存(标记未验证),后续 /{id}/otp/verify 补验
|
||
"""
|
||
|
||
from typing import List, Optional
|
||
|
||
from fastapi import APIRouter, Depends, Query, Response
|
||
from sqlmodel import Session
|
||
|
||
from app.core.security import require_api_key
|
||
from app.database import get_session
|
||
from app.schemas.credential import (
|
||
CredentialCreate,
|
||
CredentialRead,
|
||
CredentialUpdate,
|
||
OtpBindRequest,
|
||
OtpVerifyRequest,
|
||
)
|
||
from app.services import credential_service
|
||
|
||
router = APIRouter(prefix="/api/credentials", tags=["credentials"])
|
||
|
||
|
||
@router.get("", response_model=List[CredentialRead], summary="凭据列表(密码库,支持搜索/过滤)")
|
||
def list_credentials(
|
||
q: Optional[str] = Query(default=None, description="搜索站点/用户名/备注"),
|
||
login_type: Optional[str] = Query(default=None, description="登录方式:password/oauth/other"),
|
||
has_otp: Optional[bool] = Query(default=None, description="是否已绑定 2FA"),
|
||
session: Session = Depends(get_session),
|
||
):
|
||
return credential_service.list_credentials(
|
||
session, q=q, login_type=login_type, has_otp=has_otp
|
||
)
|
||
|
||
|
||
@router.post(
|
||
"",
|
||
response_model=CredentialRead,
|
||
status_code=201,
|
||
summary="创建凭据(可同时录入 2FA,动态码可选校验)",
|
||
dependencies=[Depends(require_api_key)],
|
||
)
|
||
def create_credential(data: CredentialCreate, session: Session = Depends(get_session)):
|
||
return credential_service.create_credential(session, data)
|
||
|
||
|
||
@router.put(
|
||
"/{credential_id}",
|
||
response_model=CredentialRead,
|
||
summary="更新凭据(密码:留空不改,空串清除)",
|
||
dependencies=[Depends(require_api_key)],
|
||
)
|
||
def update_credential(
|
||
credential_id: int, data: CredentialUpdate, session: Session = Depends(get_session)
|
||
):
|
||
return credential_service.update_credential(session, credential_id, data)
|
||
|
||
|
||
@router.delete(
|
||
"/{credential_id}",
|
||
summary="删除凭据(账号/资产不受影响,仅解除关联)",
|
||
dependencies=[Depends(require_api_key)],
|
||
)
|
||
def delete_credential(credential_id: int, session: Session = Depends(get_session)) -> dict:
|
||
return credential_service.delete_credential(session, credential_id)
|
||
|
||
|
||
@router.get(
|
||
"/{credential_id}/password",
|
||
summary="查看凭据密码明文(解密返回)",
|
||
dependencies=[Depends(require_api_key)],
|
||
)
|
||
def reveal_password(
|
||
credential_id: int, response: Response, session: Session = Depends(get_session)
|
||
) -> dict:
|
||
# 明文密码禁止缓存(与 /otp 保持一致),避免浏览器/代理缓存或历史残留
|
||
response.headers["Cache-Control"] = "no-store"
|
||
return credential_service.reveal_password(session, credential_id)
|
||
|
||
|
||
@router.get(
|
||
"/{credential_id}/otp",
|
||
summary="获取当前 2FA 动态码(服务端生成,secret 不出库)",
|
||
dependencies=[Depends(require_api_key)],
|
||
)
|
||
def current_otp(
|
||
credential_id: int, response: Response, session: Session = Depends(get_session)
|
||
) -> dict:
|
||
# 动态码禁止缓存(浏览器/代理),避免有效期内残留
|
||
response.headers["Cache-Control"] = "no-store"
|
||
return credential_service.current_otp(session, credential_id)
|
||
|
||
|
||
@router.put(
|
||
"/{credential_id}/otp",
|
||
response_model=CredentialRead,
|
||
summary="绑定/更换 2FA(动态码可选:提供则校验通过才落库,留空存为未验证)",
|
||
dependencies=[Depends(require_api_key)],
|
||
)
|
||
def bind_otp(
|
||
credential_id: int, data: OtpBindRequest, session: Session = Depends(get_session)
|
||
):
|
||
return credential_service.bind_otp(session, credential_id, data)
|
||
|
||
|
||
@router.post(
|
||
"/{credential_id}/otp/verify",
|
||
response_model=CredentialRead,
|
||
summary="补验证 2FA(提交当前动态码,通过后解除「未验证」标记)",
|
||
dependencies=[Depends(require_api_key)],
|
||
)
|
||
def verify_otp(
|
||
credential_id: int, data: OtpVerifyRequest, session: Session = Depends(get_session)
|
||
):
|
||
return credential_service.verify_otp(session, credential_id, data)
|
||
|
||
|
||
@router.delete(
|
||
"/{credential_id}/otp",
|
||
response_model=CredentialRead,
|
||
summary="解绑 2FA",
|
||
dependencies=[Depends(require_api_key)],
|
||
)
|
||
def unbind_otp(credential_id: int, session: Session = Depends(get_session)):
|
||
return credential_service.unbind_otp(session, credential_id)
|