* 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行
311 lines
8.3 KiB
Go
311 lines
8.3 KiB
Go
// Package dto provides mapping utilities for converting between service layer and HTTP handler DTOs.
|
|
package dto
|
|
|
|
import "github.com/Wei-Shaw/sub2api/internal/service"
|
|
|
|
func UserFromServiceShallow(u *service.User) *User {
|
|
if u == nil {
|
|
return nil
|
|
}
|
|
return &User{
|
|
ID: u.ID,
|
|
Email: u.Email,
|
|
Username: u.Username,
|
|
Notes: u.Notes,
|
|
Role: u.Role,
|
|
Balance: u.Balance,
|
|
Concurrency: u.Concurrency,
|
|
Status: u.Status,
|
|
AllowedGroups: u.AllowedGroups,
|
|
CreatedAt: u.CreatedAt,
|
|
UpdatedAt: u.UpdatedAt,
|
|
}
|
|
}
|
|
|
|
func UserFromService(u *service.User) *User {
|
|
if u == nil {
|
|
return nil
|
|
}
|
|
out := UserFromServiceShallow(u)
|
|
if len(u.APIKeys) > 0 {
|
|
out.APIKeys = make([]APIKey, 0, len(u.APIKeys))
|
|
for i := range u.APIKeys {
|
|
k := u.APIKeys[i]
|
|
out.APIKeys = append(out.APIKeys, *APIKeyFromService(&k))
|
|
}
|
|
}
|
|
if len(u.Subscriptions) > 0 {
|
|
out.Subscriptions = make([]UserSubscription, 0, len(u.Subscriptions))
|
|
for i := range u.Subscriptions {
|
|
s := u.Subscriptions[i]
|
|
out.Subscriptions = append(out.Subscriptions, *UserSubscriptionFromService(&s))
|
|
}
|
|
}
|
|
return out
|
|
}
|
|
|
|
func APIKeyFromService(k *service.APIKey) *APIKey {
|
|
if k == nil {
|
|
return nil
|
|
}
|
|
return &APIKey{
|
|
ID: k.ID,
|
|
UserID: k.UserID,
|
|
Key: k.Key,
|
|
Name: k.Name,
|
|
GroupID: k.GroupID,
|
|
Status: k.Status,
|
|
CreatedAt: k.CreatedAt,
|
|
UpdatedAt: k.UpdatedAt,
|
|
User: UserFromServiceShallow(k.User),
|
|
Group: GroupFromServiceShallow(k.Group),
|
|
}
|
|
}
|
|
|
|
func GroupFromServiceShallow(g *service.Group) *Group {
|
|
if g == nil {
|
|
return nil
|
|
}
|
|
return &Group{
|
|
ID: g.ID,
|
|
Name: g.Name,
|
|
Description: g.Description,
|
|
Platform: g.Platform,
|
|
RateMultiplier: g.RateMultiplier,
|
|
IsExclusive: g.IsExclusive,
|
|
Status: g.Status,
|
|
SubscriptionType: g.SubscriptionType,
|
|
DailyLimitUSD: g.DailyLimitUSD,
|
|
WeeklyLimitUSD: g.WeeklyLimitUSD,
|
|
MonthlyLimitUSD: g.MonthlyLimitUSD,
|
|
CreatedAt: g.CreatedAt,
|
|
UpdatedAt: g.UpdatedAt,
|
|
AccountCount: g.AccountCount,
|
|
}
|
|
}
|
|
|
|
func GroupFromService(g *service.Group) *Group {
|
|
if g == nil {
|
|
return nil
|
|
}
|
|
out := GroupFromServiceShallow(g)
|
|
if len(g.AccountGroups) > 0 {
|
|
out.AccountGroups = make([]AccountGroup, 0, len(g.AccountGroups))
|
|
for i := range g.AccountGroups {
|
|
ag := g.AccountGroups[i]
|
|
out.AccountGroups = append(out.AccountGroups, *AccountGroupFromService(&ag))
|
|
}
|
|
}
|
|
return out
|
|
}
|
|
|
|
func AccountFromServiceShallow(a *service.Account) *Account {
|
|
if a == nil {
|
|
return nil
|
|
}
|
|
return &Account{
|
|
ID: a.ID,
|
|
Name: a.Name,
|
|
Platform: a.Platform,
|
|
Type: a.Type,
|
|
Credentials: a.Credentials,
|
|
Extra: a.Extra,
|
|
ProxyID: a.ProxyID,
|
|
Concurrency: a.Concurrency,
|
|
Priority: a.Priority,
|
|
Status: a.Status,
|
|
ErrorMessage: a.ErrorMessage,
|
|
LastUsedAt: a.LastUsedAt,
|
|
CreatedAt: a.CreatedAt,
|
|
UpdatedAt: a.UpdatedAt,
|
|
Schedulable: a.Schedulable,
|
|
RateLimitedAt: a.RateLimitedAt,
|
|
RateLimitResetAt: a.RateLimitResetAt,
|
|
OverloadUntil: a.OverloadUntil,
|
|
SessionWindowStart: a.SessionWindowStart,
|
|
SessionWindowEnd: a.SessionWindowEnd,
|
|
SessionWindowStatus: a.SessionWindowStatus,
|
|
GroupIDs: a.GroupIDs,
|
|
}
|
|
}
|
|
|
|
func AccountFromService(a *service.Account) *Account {
|
|
if a == nil {
|
|
return nil
|
|
}
|
|
out := AccountFromServiceShallow(a)
|
|
out.Proxy = ProxyFromService(a.Proxy)
|
|
if len(a.AccountGroups) > 0 {
|
|
out.AccountGroups = make([]AccountGroup, 0, len(a.AccountGroups))
|
|
for i := range a.AccountGroups {
|
|
ag := a.AccountGroups[i]
|
|
out.AccountGroups = append(out.AccountGroups, *AccountGroupFromService(&ag))
|
|
}
|
|
}
|
|
if len(a.Groups) > 0 {
|
|
out.Groups = make([]*Group, 0, len(a.Groups))
|
|
for _, g := range a.Groups {
|
|
out.Groups = append(out.Groups, GroupFromServiceShallow(g))
|
|
}
|
|
}
|
|
return out
|
|
}
|
|
|
|
func AccountGroupFromService(ag *service.AccountGroup) *AccountGroup {
|
|
if ag == nil {
|
|
return nil
|
|
}
|
|
return &AccountGroup{
|
|
AccountID: ag.AccountID,
|
|
GroupID: ag.GroupID,
|
|
Priority: ag.Priority,
|
|
CreatedAt: ag.CreatedAt,
|
|
Account: AccountFromServiceShallow(ag.Account),
|
|
Group: GroupFromServiceShallow(ag.Group),
|
|
}
|
|
}
|
|
|
|
func ProxyFromService(p *service.Proxy) *Proxy {
|
|
if p == nil {
|
|
return nil
|
|
}
|
|
return &Proxy{
|
|
ID: p.ID,
|
|
Name: p.Name,
|
|
Protocol: p.Protocol,
|
|
Host: p.Host,
|
|
Port: p.Port,
|
|
Username: p.Username,
|
|
Password: p.Password,
|
|
Status: p.Status,
|
|
CreatedAt: p.CreatedAt,
|
|
UpdatedAt: p.UpdatedAt,
|
|
}
|
|
}
|
|
|
|
func ProxyWithAccountCountFromService(p *service.ProxyWithAccountCount) *ProxyWithAccountCount {
|
|
if p == nil {
|
|
return nil
|
|
}
|
|
return &ProxyWithAccountCount{
|
|
Proxy: *ProxyFromService(&p.Proxy),
|
|
AccountCount: p.AccountCount,
|
|
}
|
|
}
|
|
|
|
func RedeemCodeFromService(rc *service.RedeemCode) *RedeemCode {
|
|
if rc == nil {
|
|
return nil
|
|
}
|
|
return &RedeemCode{
|
|
ID: rc.ID,
|
|
Code: rc.Code,
|
|
Type: rc.Type,
|
|
Value: rc.Value,
|
|
Status: rc.Status,
|
|
UsedBy: rc.UsedBy,
|
|
UsedAt: rc.UsedAt,
|
|
Notes: rc.Notes,
|
|
CreatedAt: rc.CreatedAt,
|
|
GroupID: rc.GroupID,
|
|
ValidityDays: rc.ValidityDays,
|
|
User: UserFromServiceShallow(rc.User),
|
|
Group: GroupFromServiceShallow(rc.Group),
|
|
}
|
|
}
|
|
|
|
func UsageLogFromService(l *service.UsageLog) *UsageLog {
|
|
if l == nil {
|
|
return nil
|
|
}
|
|
return &UsageLog{
|
|
ID: l.ID,
|
|
UserID: l.UserID,
|
|
APIKeyID: l.APIKeyID,
|
|
AccountID: l.AccountID,
|
|
RequestID: l.RequestID,
|
|
Model: l.Model,
|
|
GroupID: l.GroupID,
|
|
SubscriptionID: l.SubscriptionID,
|
|
InputTokens: l.InputTokens,
|
|
OutputTokens: l.OutputTokens,
|
|
CacheCreationTokens: l.CacheCreationTokens,
|
|
CacheReadTokens: l.CacheReadTokens,
|
|
CacheCreation5mTokens: l.CacheCreation5mTokens,
|
|
CacheCreation1hTokens: l.CacheCreation1hTokens,
|
|
InputCost: l.InputCost,
|
|
OutputCost: l.OutputCost,
|
|
CacheCreationCost: l.CacheCreationCost,
|
|
CacheReadCost: l.CacheReadCost,
|
|
TotalCost: l.TotalCost,
|
|
ActualCost: l.ActualCost,
|
|
RateMultiplier: l.RateMultiplier,
|
|
BillingType: l.BillingType,
|
|
Stream: l.Stream,
|
|
DurationMs: l.DurationMs,
|
|
FirstTokenMs: l.FirstTokenMs,
|
|
CreatedAt: l.CreatedAt,
|
|
User: UserFromServiceShallow(l.User),
|
|
APIKey: APIKeyFromService(l.APIKey),
|
|
Account: AccountFromService(l.Account),
|
|
Group: GroupFromServiceShallow(l.Group),
|
|
Subscription: UserSubscriptionFromService(l.Subscription),
|
|
}
|
|
}
|
|
|
|
func SettingFromService(s *service.Setting) *Setting {
|
|
if s == nil {
|
|
return nil
|
|
}
|
|
return &Setting{
|
|
ID: s.ID,
|
|
Key: s.Key,
|
|
Value: s.Value,
|
|
UpdatedAt: s.UpdatedAt,
|
|
}
|
|
}
|
|
|
|
func UserSubscriptionFromService(sub *service.UserSubscription) *UserSubscription {
|
|
if sub == nil {
|
|
return nil
|
|
}
|
|
return &UserSubscription{
|
|
ID: sub.ID,
|
|
UserID: sub.UserID,
|
|
GroupID: sub.GroupID,
|
|
StartsAt: sub.StartsAt,
|
|
ExpiresAt: sub.ExpiresAt,
|
|
Status: sub.Status,
|
|
DailyWindowStart: sub.DailyWindowStart,
|
|
WeeklyWindowStart: sub.WeeklyWindowStart,
|
|
MonthlyWindowStart: sub.MonthlyWindowStart,
|
|
DailyUsageUSD: sub.DailyUsageUSD,
|
|
WeeklyUsageUSD: sub.WeeklyUsageUSD,
|
|
MonthlyUsageUSD: sub.MonthlyUsageUSD,
|
|
AssignedBy: sub.AssignedBy,
|
|
AssignedAt: sub.AssignedAt,
|
|
Notes: sub.Notes,
|
|
CreatedAt: sub.CreatedAt,
|
|
UpdatedAt: sub.UpdatedAt,
|
|
User: UserFromServiceShallow(sub.User),
|
|
Group: GroupFromServiceShallow(sub.Group),
|
|
AssignedByUser: UserFromServiceShallow(sub.AssignedByUser),
|
|
}
|
|
}
|
|
|
|
func BulkAssignResultFromService(r *service.BulkAssignResult) *BulkAssignResult {
|
|
if r == nil {
|
|
return nil
|
|
}
|
|
subs := make([]UserSubscription, 0, len(r.Subscriptions))
|
|
for i := range r.Subscriptions {
|
|
subs = append(subs, *UserSubscriptionFromService(&r.Subscriptions[i]))
|
|
}
|
|
return &BulkAssignResult{
|
|
SuccessCount: r.SuccessCount,
|
|
FailedCount: r.FailedCount,
|
|
Subscriptions: subs,
|
|
Errors: r.Errors,
|
|
}
|
|
}
|