* fix(ops): 修复运维监控系统的关键安全和稳定性问题
## 修复内容
### P0 严重问题
1. **DNS Rebinding防护** (ops_alert_service.go)
- 实现IP钉住机制防止验证后的DNS rebinding攻击
- 自定义Transport.DialContext强制只允许拨号到验证过的公网IP
- 扩展IP黑名单,包括云metadata地址(169.254.169.254)
- 添加完整的单元测试覆盖
2. **OpsAlertService生命周期管理** (wire.go)
- 在ProvideOpsMetricsCollector中添加opsAlertService.Start()调用
- 确保stopCtx正确初始化,避免nil指针问题
- 实现防御式启动,保证服务启动顺序
3. **数据库查询排序** (ops_repo.go)
- 在ListRecentSystemMetrics中添加显式ORDER BY updated_at DESC, id DESC
- 在GetLatestSystemMetric中添加排序保证
- 避免数据库返回顺序不确定导致告警误判
### P1 重要问题
4. **并发安全** (ops_metrics_collector.go)
- 为lastGCPauseTotal字段添加sync.Mutex保护
- 防止数据竞争
5. **Goroutine泄漏** (ops_error_logger.go)
- 实现worker pool模式限制并发goroutine数量
- 使用256容量缓冲队列和10个固定worker
- 非阻塞投递,队列满时丢弃任务
6. **生命周期控制** (ops_alert_service.go)
- 添加Start/Stop方法实现优雅关闭
- 使用context控制goroutine生命周期
- 实现WaitGroup等待后台任务完成
7. **Webhook URL验证** (ops_alert_service.go)
- 防止SSRF攻击:验证scheme、禁止内网IP
- DNS解析验证,拒绝解析到私有IP的域名
- 添加8个单元测试覆盖各种攻击场景
8. **资源泄漏** (ops_repo.go)
- 修复多处defer rows.Close()问题
- 简化冗余的defer func()包装
9. **HTTP超时控制** (ops_alert_service.go)
- 创建带10秒超时的http.Client
- 添加buildWebhookHTTPClient辅助函数
- 防止HTTP请求无限期挂起
10. **数据库查询优化** (ops_repo.go)
- 将GetWindowStats的4次独立查询合并为1次CTE查询
- 减少网络往返和表扫描次数
- 显著提升性能
11. **重试机制** (ops_alert_service.go)
- 实现邮件发送重试:最多3次,指数退避(1s/2s/4s)
- 添加webhook备用通道
- 实现完整的错误处理和日志记录
12. **魔法数字** (ops_repo.go, ops_metrics_collector.go)
- 提取硬编码数字为有意义的常量
- 提高代码可读性和可维护性
## 测试验证
- ✅ go test ./internal/service -tags opsalert_unit 通过
- ✅ 所有webhook验证测试通过
- ✅ 重试机制测试通过
## 影响范围
- 运维监控系统安全性显著提升
- 系统稳定性和性能优化
- 无破坏性变更,向后兼容
* feat(ops): 运维监控系统V2 - 完整实现
## 核心功能
- 运维监控仪表盘V2(实时监控、历史趋势、告警管理)
- WebSocket实时QPS/TPS监控(30s心跳,自动重连)
- 系统指标采集(CPU、内存、延迟、错误率等)
- 多维度统计分析(按provider、model、user等维度)
- 告警规则管理(阈值配置、通知渠道)
- 错误日志追踪(详细错误信息、堆栈跟踪)
## 数据库Schema (Migration 025)
### 扩展现有表
- ops_system_metrics: 新增RED指标、错误分类、延迟指标、资源指标、业务指标
- ops_alert_rules: 新增JSONB字段(dimension_filters, notify_channels, notify_config)
### 新增表
- ops_dimension_stats: 多维度统计数据
- ops_data_retention_config: 数据保留策略配置
### 新增视图和函数
- ops_latest_metrics: 最新1分钟窗口指标(已修复字段名和window过滤)
- ops_active_alerts: 当前活跃告警(已修复字段名和状态值)
- calculate_health_score: 健康分数计算函数
## 一致性修复(98/100分)
### P0级别(阻塞Migration)
- ✅ 修复ops_latest_metrics视图字段名(latency_p99→p99_latency_ms, cpu_usage→cpu_usage_percent)
- ✅ 修复ops_active_alerts视图字段名(metric→metric_type, triggered_at→fired_at, trigger_value→metric_value, threshold→threshold_value)
- ✅ 统一告警历史表名(删除ops_alert_history,使用ops_alert_events)
- ✅ 统一API参数限制(ListMetricsHistory和ListErrorLogs的limit改为5000)
### P1级别(功能完整性)
- ✅ 修复ops_latest_metrics视图未过滤window_minutes(添加WHERE m.window_minutes = 1)
- ✅ 修复数据回填UPDATE逻辑(QPS计算改为request_count/(window_minutes*60.0))
- ✅ 添加ops_alert_rules JSONB字段后端支持(Go结构体+序列化)
### P2级别(优化)
- ✅ 前端WebSocket自动重连(指数退避1s→2s→4s→8s→16s,最大5次)
- ✅ 后端WebSocket心跳检测(30s ping,60s pong超时)
## 技术实现
### 后端 (Go)
- Handler层: ops_handler.go(REST API), ops_ws_handler.go(WebSocket)
- Service层: ops_service.go(核心逻辑), ops_cache.go(缓存), ops_alerts.go(告警)
- Repository层: ops_repo.go(数据访问), ops.go(模型定义)
- 路由: admin.go(新增ops相关路由)
- 依赖注入: wire_gen.go(自动生成)
### 前端 (Vue3 + TypeScript)
- 组件: OpsDashboardV2.vue(仪表盘主组件)
- API: ops.ts(REST API + WebSocket封装)
- 路由: index.ts(新增/admin/ops路由)
- 国际化: en.ts, zh.ts(中英文支持)
## 测试验证
- ✅ 所有Go测试通过
- ✅ Migration可正常执行
- ✅ WebSocket连接稳定
- ✅ 前后端数据结构对齐
* refactor: 代码清理和测试优化
## 测试文件优化
- 简化integration test fixtures和断言
- 优化test helper函数
- 统一测试数据格式
## 代码清理
- 移除未使用的代码和注释
- 简化concurrency_cache实现
- 优化middleware错误处理
## 小修复
- 修复gateway_handler和openai_gateway_handler的小问题
- 统一代码风格和格式
变更统计: 27个文件,292行新增,322行删除(净减少30行)
* fix(ops): 运维监控系统安全加固和功能优化
## 安全增强
- feat(security): WebSocket日志脱敏机制,防止token/api_key泄露
- feat(security): X-Forwarded-Host白名单验证,防止CSRF绕过
- feat(security): Origin策略配置化,支持strict/permissive模式
- feat(auth): WebSocket认证支持query参数传递token
## 配置优化
- feat(config): 支持环境变量配置代理信任和Origin策略
- OPS_WS_TRUST_PROXY
- OPS_WS_TRUSTED_PROXIES
- OPS_WS_ORIGIN_POLICY
- fix(ops): 错误日志查询限流从5000降至500,优化内存使用
## 架构改进
- refactor(ops): 告警服务解耦,独立运行评估定时器
- refactor(ops): OpsDashboard统一版本,移除V2分离
## 测试和文档
- test(ops): 添加WebSocket安全验证单元测试(8个测试用例)
- test(ops): 添加告警服务集成测试
- docs(api): 更新API文档,标注限流变更
- docs: 添加CHANGELOG记录breaking changes
## 修复文件
Backend:
- backend/internal/server/middleware/logger.go
- backend/internal/handler/admin/ops_handler.go
- backend/internal/handler/admin/ops_ws_handler.go
- backend/internal/server/middleware/admin_auth.go
- backend/internal/service/ops_alert_service.go
- backend/internal/service/ops_metrics_collector.go
- backend/internal/service/wire.go
Frontend:
- frontend/src/views/admin/ops/OpsDashboard.vue
- frontend/src/router/index.ts
- frontend/src/api/admin/ops.ts
Tests:
- backend/internal/handler/admin/ops_ws_handler_test.go (新增)
- backend/internal/service/ops_alert_service_integration_test.go (新增)
Docs:
- CHANGELOG.md (新增)
- docs/API-运维监控中心2.0.md (更新)
* fix(migrations): 修复calculate_health_score函数类型匹配问题
在ops_latest_metrics视图中添加显式类型转换,确保参数类型与函数签名匹配
* fix(lint): 修复golangci-lint检查发现的所有问题
- 将Redis依赖从service层移到repository层
- 添加错误检查(WebSocket连接和读取超时)
- 运行gofmt格式化代码
- 添加nil指针检查
- 删除未使用的alertService字段
修复问题:
- depguard: 3个(service层不应直接import redis)
- errcheck: 3个(未检查错误返回值)
- gofmt: 2个(代码格式问题)
- staticcheck: 4个(nil指针解引用)
- unused: 1个(未使用字段)
代码统计:
- 修改文件:11个
- 删除代码:490行
- 新增代码:105行
- 净减少:385行
364 lines
10 KiB
Go
364 lines
10 KiB
Go
package repository
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"errors"
|
|
|
|
dbent "github.com/Wei-Shaw/sub2api/ent"
|
|
"github.com/Wei-Shaw/sub2api/ent/apikey"
|
|
"github.com/Wei-Shaw/sub2api/ent/group"
|
|
"github.com/Wei-Shaw/sub2api/internal/pkg/pagination"
|
|
"github.com/Wei-Shaw/sub2api/internal/service"
|
|
"github.com/lib/pq"
|
|
)
|
|
|
|
type sqlExecutor interface {
|
|
ExecContext(ctx context.Context, query string, args ...any) (sql.Result, error)
|
|
QueryContext(ctx context.Context, query string, args ...any) (*sql.Rows, error)
|
|
}
|
|
|
|
type groupRepository struct {
|
|
client *dbent.Client
|
|
sql sqlExecutor
|
|
}
|
|
|
|
func NewGroupRepository(client *dbent.Client, sqlDB *sql.DB) service.GroupRepository {
|
|
return newGroupRepositoryWithSQL(client, sqlDB)
|
|
}
|
|
|
|
func newGroupRepositoryWithSQL(client *dbent.Client, sqlq sqlExecutor) *groupRepository {
|
|
return &groupRepository{client: client, sql: sqlq}
|
|
}
|
|
|
|
func (r *groupRepository) Create(ctx context.Context, groupIn *service.Group) error {
|
|
builder := r.client.Group.Create().
|
|
SetName(groupIn.Name).
|
|
SetDescription(groupIn.Description).
|
|
SetPlatform(groupIn.Platform).
|
|
SetRateMultiplier(groupIn.RateMultiplier).
|
|
SetIsExclusive(groupIn.IsExclusive).
|
|
SetStatus(groupIn.Status).
|
|
SetSubscriptionType(groupIn.SubscriptionType).
|
|
SetNillableDailyLimitUsd(groupIn.DailyLimitUSD).
|
|
SetNillableWeeklyLimitUsd(groupIn.WeeklyLimitUSD).
|
|
SetNillableMonthlyLimitUsd(groupIn.MonthlyLimitUSD).
|
|
SetDefaultValidityDays(groupIn.DefaultValidityDays)
|
|
|
|
created, err := builder.Save(ctx)
|
|
if err == nil {
|
|
groupIn.ID = created.ID
|
|
groupIn.CreatedAt = created.CreatedAt
|
|
groupIn.UpdatedAt = created.UpdatedAt
|
|
}
|
|
return translatePersistenceError(err, nil, service.ErrGroupExists)
|
|
}
|
|
|
|
func (r *groupRepository) GetByID(ctx context.Context, id int64) (*service.Group, error) {
|
|
m, err := r.client.Group.Query().
|
|
Where(group.IDEQ(id)).
|
|
Only(ctx)
|
|
if err != nil {
|
|
return nil, translatePersistenceError(err, service.ErrGroupNotFound, nil)
|
|
}
|
|
|
|
out := groupEntityToService(m)
|
|
count, _ := r.GetAccountCount(ctx, out.ID)
|
|
out.AccountCount = count
|
|
return out, nil
|
|
}
|
|
|
|
func (r *groupRepository) Update(ctx context.Context, groupIn *service.Group) error {
|
|
updated, err := r.client.Group.UpdateOneID(groupIn.ID).
|
|
SetName(groupIn.Name).
|
|
SetDescription(groupIn.Description).
|
|
SetPlatform(groupIn.Platform).
|
|
SetRateMultiplier(groupIn.RateMultiplier).
|
|
SetIsExclusive(groupIn.IsExclusive).
|
|
SetStatus(groupIn.Status).
|
|
SetSubscriptionType(groupIn.SubscriptionType).
|
|
SetNillableDailyLimitUsd(groupIn.DailyLimitUSD).
|
|
SetNillableWeeklyLimitUsd(groupIn.WeeklyLimitUSD).
|
|
SetNillableMonthlyLimitUsd(groupIn.MonthlyLimitUSD).
|
|
SetDefaultValidityDays(groupIn.DefaultValidityDays).
|
|
Save(ctx)
|
|
if err != nil {
|
|
return translatePersistenceError(err, service.ErrGroupNotFound, service.ErrGroupExists)
|
|
}
|
|
groupIn.UpdatedAt = updated.UpdatedAt
|
|
return nil
|
|
}
|
|
|
|
func (r *groupRepository) Delete(ctx context.Context, id int64) error {
|
|
_, err := r.client.Group.Delete().Where(group.IDEQ(id)).Exec(ctx)
|
|
return translatePersistenceError(err, service.ErrGroupNotFound, nil)
|
|
}
|
|
|
|
func (r *groupRepository) List(ctx context.Context, params pagination.PaginationParams) ([]service.Group, *pagination.PaginationResult, error) {
|
|
return r.ListWithFilters(ctx, params, "", "", nil)
|
|
}
|
|
|
|
func (r *groupRepository) ListWithFilters(ctx context.Context, params pagination.PaginationParams, platform, status string, isExclusive *bool) ([]service.Group, *pagination.PaginationResult, error) {
|
|
q := r.client.Group.Query()
|
|
|
|
if platform != "" {
|
|
q = q.Where(group.PlatformEQ(platform))
|
|
}
|
|
if status != "" {
|
|
q = q.Where(group.StatusEQ(status))
|
|
}
|
|
if isExclusive != nil {
|
|
q = q.Where(group.IsExclusiveEQ(*isExclusive))
|
|
}
|
|
|
|
total, err := q.Count(ctx)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
groups, err := q.
|
|
Offset(params.Offset()).
|
|
Limit(params.Limit()).
|
|
Order(dbent.Asc(group.FieldID)).
|
|
All(ctx)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
groupIDs := make([]int64, 0, len(groups))
|
|
outGroups := make([]service.Group, 0, len(groups))
|
|
for i := range groups {
|
|
g := groupEntityToService(groups[i])
|
|
outGroups = append(outGroups, *g)
|
|
groupIDs = append(groupIDs, g.ID)
|
|
}
|
|
|
|
counts, err := r.loadAccountCounts(ctx, groupIDs)
|
|
if err == nil {
|
|
for i := range outGroups {
|
|
outGroups[i].AccountCount = counts[outGroups[i].ID]
|
|
}
|
|
}
|
|
|
|
return outGroups, paginationResultFromTotal(int64(total), params), nil
|
|
}
|
|
|
|
func (r *groupRepository) ListActive(ctx context.Context) ([]service.Group, error) {
|
|
groups, err := r.client.Group.Query().
|
|
Where(group.StatusEQ(service.StatusActive)).
|
|
Order(dbent.Asc(group.FieldID)).
|
|
All(ctx)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
groupIDs := make([]int64, 0, len(groups))
|
|
outGroups := make([]service.Group, 0, len(groups))
|
|
for i := range groups {
|
|
g := groupEntityToService(groups[i])
|
|
outGroups = append(outGroups, *g)
|
|
groupIDs = append(groupIDs, g.ID)
|
|
}
|
|
|
|
counts, err := r.loadAccountCounts(ctx, groupIDs)
|
|
if err == nil {
|
|
for i := range outGroups {
|
|
outGroups[i].AccountCount = counts[outGroups[i].ID]
|
|
}
|
|
}
|
|
|
|
return outGroups, nil
|
|
}
|
|
|
|
func (r *groupRepository) ListActiveByPlatform(ctx context.Context, platform string) ([]service.Group, error) {
|
|
groups, err := r.client.Group.Query().
|
|
Where(group.StatusEQ(service.StatusActive), group.PlatformEQ(platform)).
|
|
Order(dbent.Asc(group.FieldID)).
|
|
All(ctx)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
groupIDs := make([]int64, 0, len(groups))
|
|
outGroups := make([]service.Group, 0, len(groups))
|
|
for i := range groups {
|
|
g := groupEntityToService(groups[i])
|
|
outGroups = append(outGroups, *g)
|
|
groupIDs = append(groupIDs, g.ID)
|
|
}
|
|
|
|
counts, err := r.loadAccountCounts(ctx, groupIDs)
|
|
if err == nil {
|
|
for i := range outGroups {
|
|
outGroups[i].AccountCount = counts[outGroups[i].ID]
|
|
}
|
|
}
|
|
|
|
return outGroups, nil
|
|
}
|
|
|
|
func (r *groupRepository) ExistsByName(ctx context.Context, name string) (bool, error) {
|
|
return r.client.Group.Query().Where(group.NameEQ(name)).Exist(ctx)
|
|
}
|
|
|
|
func (r *groupRepository) GetAccountCount(ctx context.Context, groupID int64) (int64, error) {
|
|
var count int64
|
|
if err := scanSingleRow(ctx, r.sql, "SELECT COUNT(*) FROM account_groups WHERE group_id = $1", []any{groupID}, &count); err != nil {
|
|
return 0, err
|
|
}
|
|
return count, nil
|
|
}
|
|
|
|
func (r *groupRepository) DeleteAccountGroupsByGroupID(ctx context.Context, groupID int64) (int64, error) {
|
|
res, err := r.sql.ExecContext(ctx, "DELETE FROM account_groups WHERE group_id = $1", groupID)
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
affected, _ := res.RowsAffected()
|
|
return affected, nil
|
|
}
|
|
|
|
func (r *groupRepository) DeleteCascade(ctx context.Context, id int64) ([]int64, error) {
|
|
g, err := r.client.Group.Query().Where(group.IDEQ(id)).Only(ctx)
|
|
if err != nil {
|
|
return nil, translatePersistenceError(err, service.ErrGroupNotFound, nil)
|
|
}
|
|
groupSvc := groupEntityToService(g)
|
|
|
|
// 使用 ent 事务统一包裹:避免手工基于 *sql.Tx 构造 ent client 带来的驱动断言问题,
|
|
// 同时保证级联删除的原子性。
|
|
tx, err := r.client.Tx(ctx)
|
|
if err != nil && !errors.Is(err, dbent.ErrTxStarted) {
|
|
return nil, err
|
|
}
|
|
exec := r.client
|
|
txClient := r.client
|
|
if err == nil {
|
|
defer func() { _ = tx.Rollback() }()
|
|
exec = tx.Client()
|
|
txClient = exec
|
|
}
|
|
// err 为 dbent.ErrTxStarted 时,复用当前 client 参与同一事务。
|
|
|
|
// Lock the group row to avoid concurrent writes while we cascade.
|
|
// 这里使用 exec.QueryContext 手动扫描,确保同一事务内加锁并能区分"未找到"与其他错误。
|
|
rows, err := exec.QueryContext(ctx, "SELECT id FROM groups WHERE id = $1 AND deleted_at IS NULL FOR UPDATE", id)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
var lockedID int64
|
|
if rows.Next() {
|
|
if err := rows.Scan(&lockedID); err != nil {
|
|
_ = rows.Close()
|
|
return nil, err
|
|
}
|
|
}
|
|
if err := rows.Close(); err != nil {
|
|
return nil, err
|
|
}
|
|
if err := rows.Err(); err != nil {
|
|
return nil, err
|
|
}
|
|
if lockedID == 0 {
|
|
return nil, service.ErrGroupNotFound
|
|
}
|
|
|
|
var affectedUserIDs []int64
|
|
if groupSvc.IsSubscriptionType() {
|
|
// 只查询未软删除的订阅,避免通知已取消订阅的用户
|
|
rows, err := exec.QueryContext(ctx, "SELECT user_id FROM user_subscriptions WHERE group_id = $1 AND deleted_at IS NULL", id)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
for rows.Next() {
|
|
var userID int64
|
|
if scanErr := rows.Scan(&userID); scanErr != nil {
|
|
_ = rows.Close()
|
|
return nil, scanErr
|
|
}
|
|
affectedUserIDs = append(affectedUserIDs, userID)
|
|
}
|
|
if err := rows.Close(); err != nil {
|
|
return nil, err
|
|
}
|
|
if err := rows.Err(); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// 软删除订阅:设置 deleted_at 而非硬删除
|
|
if _, err := exec.ExecContext(ctx, "UPDATE user_subscriptions SET deleted_at = NOW() WHERE group_id = $1 AND deleted_at IS NULL", id); err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
|
|
// 2. Clear group_id for api keys bound to this group.
|
|
// 仅更新未软删除的记录,避免修改已删除数据,保证审计与历史回溯一致性。
|
|
// 与 APIKeyRepository 的软删除语义保持一致,减少跨模块行为差异。
|
|
if _, err := txClient.APIKey.Update().
|
|
Where(apikey.GroupIDEQ(id), apikey.DeletedAtIsNil()).
|
|
ClearGroupID().
|
|
Save(ctx); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// 3. Remove the group id from user_allowed_groups join table.
|
|
// Legacy users.allowed_groups 列已弃用,不再同步。
|
|
if _, err := exec.ExecContext(ctx, "DELETE FROM user_allowed_groups WHERE group_id = $1", id); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// 4. Delete account_groups join rows.
|
|
if _, err := exec.ExecContext(ctx, "DELETE FROM account_groups WHERE group_id = $1", id); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// 5. Soft-delete group itself.
|
|
if _, err := txClient.Group.Delete().Where(group.IDEQ(id)).Exec(ctx); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if tx != nil {
|
|
if err := tx.Commit(); err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
|
|
return affectedUserIDs, nil
|
|
}
|
|
|
|
func (r *groupRepository) loadAccountCounts(ctx context.Context, groupIDs []int64) (counts map[int64]int64, err error) {
|
|
counts = make(map[int64]int64, len(groupIDs))
|
|
if len(groupIDs) == 0 {
|
|
return counts, nil
|
|
}
|
|
|
|
rows, err := r.sql.QueryContext(
|
|
ctx,
|
|
"SELECT group_id, COUNT(*) FROM account_groups WHERE group_id = ANY($1) GROUP BY group_id",
|
|
pq.Array(groupIDs),
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer func() {
|
|
if closeErr := rows.Close(); closeErr != nil && err == nil {
|
|
err = closeErr
|
|
counts = nil
|
|
}
|
|
}()
|
|
|
|
for rows.Next() {
|
|
var groupID int64
|
|
var count int64
|
|
if err = rows.Scan(&groupID, &count); err != nil {
|
|
return nil, err
|
|
}
|
|
counts[groupID] = count
|
|
}
|
|
if err = rows.Err(); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return counts, nil
|
|
}
|