* 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行
349 lines
10 KiB
Go
349 lines
10 KiB
Go
package service
|
|
|
|
import (
|
|
"context"
|
|
"crypto/rand"
|
|
"crypto/tls"
|
|
"fmt"
|
|
"math/big"
|
|
"net/smtp"
|
|
"strconv"
|
|
"time"
|
|
|
|
infraerrors "github.com/Wei-Shaw/sub2api/internal/pkg/errors"
|
|
)
|
|
|
|
var (
|
|
ErrEmailNotConfigured = infraerrors.ServiceUnavailable("EMAIL_NOT_CONFIGURED", "email service not configured")
|
|
ErrInvalidVerifyCode = infraerrors.BadRequest("INVALID_VERIFY_CODE", "invalid or expired verification code")
|
|
ErrVerifyCodeTooFrequent = infraerrors.TooManyRequests("VERIFY_CODE_TOO_FREQUENT", "please wait before requesting a new code")
|
|
ErrVerifyCodeMaxAttempts = infraerrors.TooManyRequests("VERIFY_CODE_MAX_ATTEMPTS", "too many failed attempts, please request a new code")
|
|
)
|
|
|
|
// EmailCache defines cache operations for email service
|
|
type EmailCache interface {
|
|
GetVerificationCode(ctx context.Context, email string) (*VerificationCodeData, error)
|
|
SetVerificationCode(ctx context.Context, email string, data *VerificationCodeData, ttl time.Duration) error
|
|
DeleteVerificationCode(ctx context.Context, email string) error
|
|
}
|
|
|
|
// VerificationCodeData represents verification code data
|
|
type VerificationCodeData struct {
|
|
Code string
|
|
Attempts int
|
|
CreatedAt time.Time
|
|
}
|
|
|
|
const (
|
|
verifyCodeTTL = 15 * time.Minute
|
|
verifyCodeCooldown = 1 * time.Minute
|
|
maxVerifyCodeAttempts = 5
|
|
)
|
|
|
|
// SMTPConfig SMTP配置
|
|
type SMTPConfig struct {
|
|
Host string
|
|
Port int
|
|
Username string
|
|
Password string
|
|
From string
|
|
FromName string
|
|
UseTLS bool
|
|
}
|
|
|
|
// EmailService 邮件服务
|
|
type EmailService struct {
|
|
settingRepo SettingRepository
|
|
cache EmailCache
|
|
}
|
|
|
|
// NewEmailService 创建邮件服务实例
|
|
func NewEmailService(settingRepo SettingRepository, cache EmailCache) *EmailService {
|
|
return &EmailService{
|
|
settingRepo: settingRepo,
|
|
cache: cache,
|
|
}
|
|
}
|
|
|
|
// GetSMTPConfig 从数据库获取SMTP配置
|
|
func (s *EmailService) GetSMTPConfig(ctx context.Context) (*SMTPConfig, error) {
|
|
keys := []string{
|
|
SettingKeySMTPHost,
|
|
SettingKeySMTPPort,
|
|
SettingKeySMTPUsername,
|
|
SettingKeySMTPPassword,
|
|
SettingKeySMTPFrom,
|
|
SettingKeySMTPFromName,
|
|
SettingKeySMTPUseTLS,
|
|
}
|
|
|
|
settings, err := s.settingRepo.GetMultiple(ctx, keys)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("get smtp settings: %w", err)
|
|
}
|
|
|
|
host := settings[SettingKeySMTPHost]
|
|
if host == "" {
|
|
return nil, ErrEmailNotConfigured
|
|
}
|
|
|
|
port := 587 // 默认端口
|
|
if portStr := settings[SettingKeySMTPPort]; portStr != "" {
|
|
if p, err := strconv.Atoi(portStr); err == nil {
|
|
port = p
|
|
}
|
|
}
|
|
|
|
useTLS := settings[SettingKeySMTPUseTLS] == "true"
|
|
|
|
return &SMTPConfig{
|
|
Host: host,
|
|
Port: port,
|
|
Username: settings[SettingKeySMTPUsername],
|
|
Password: settings[SettingKeySMTPPassword],
|
|
From: settings[SettingKeySMTPFrom],
|
|
FromName: settings[SettingKeySMTPFromName],
|
|
UseTLS: useTLS,
|
|
}, nil
|
|
}
|
|
|
|
// SendEmail 发送邮件(使用数据库中保存的配置)
|
|
func (s *EmailService) SendEmail(ctx context.Context, to, subject, body string) error {
|
|
config, err := s.GetSMTPConfig(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return s.SendEmailWithConfig(config, to, subject, body)
|
|
}
|
|
|
|
// SendEmailWithConfig 使用指定配置发送邮件
|
|
func (s *EmailService) SendEmailWithConfig(config *SMTPConfig, to, subject, body string) error {
|
|
from := config.From
|
|
if config.FromName != "" {
|
|
from = fmt.Sprintf("%s <%s>", config.FromName, config.From)
|
|
}
|
|
|
|
msg := fmt.Sprintf("From: %s\r\nTo: %s\r\nSubject: %s\r\nMIME-Version: 1.0\r\nContent-Type: text/html; charset=UTF-8\r\n\r\n%s",
|
|
from, to, subject, body)
|
|
|
|
addr := fmt.Sprintf("%s:%d", config.Host, config.Port)
|
|
auth := smtp.PlainAuth("", config.Username, config.Password, config.Host)
|
|
|
|
if config.UseTLS {
|
|
return s.sendMailTLS(addr, auth, config.From, to, []byte(msg), config.Host)
|
|
}
|
|
|
|
return smtp.SendMail(addr, auth, config.From, []string{to}, []byte(msg))
|
|
}
|
|
|
|
// sendMailTLS 使用TLS发送邮件
|
|
func (s *EmailService) sendMailTLS(addr string, auth smtp.Auth, from, to string, msg []byte, host string) error {
|
|
tlsConfig := &tls.Config{
|
|
ServerName: host,
|
|
}
|
|
|
|
conn, err := tls.Dial("tcp", addr, tlsConfig)
|
|
if err != nil {
|
|
return fmt.Errorf("tls dial: %w", err)
|
|
}
|
|
defer func() { _ = conn.Close() }()
|
|
|
|
client, err := smtp.NewClient(conn, host)
|
|
if err != nil {
|
|
return fmt.Errorf("new smtp client: %w", err)
|
|
}
|
|
defer func() { _ = client.Close() }()
|
|
|
|
if err = client.Auth(auth); err != nil {
|
|
return fmt.Errorf("smtp auth: %w", err)
|
|
}
|
|
|
|
if err = client.Mail(from); err != nil {
|
|
return fmt.Errorf("smtp mail: %w", err)
|
|
}
|
|
|
|
if err = client.Rcpt(to); err != nil {
|
|
return fmt.Errorf("smtp rcpt: %w", err)
|
|
}
|
|
|
|
w, err := client.Data()
|
|
if err != nil {
|
|
return fmt.Errorf("smtp data: %w", err)
|
|
}
|
|
|
|
_, err = w.Write(msg)
|
|
if err != nil {
|
|
return fmt.Errorf("write msg: %w", err)
|
|
}
|
|
|
|
err = w.Close()
|
|
if err != nil {
|
|
return fmt.Errorf("close writer: %w", err)
|
|
}
|
|
|
|
// Email is sent successfully after w.Close(), ignore Quit errors
|
|
// Some SMTP servers return non-standard responses on QUIT
|
|
_ = client.Quit()
|
|
return nil
|
|
}
|
|
|
|
// GenerateVerifyCode 生成6位数字验证码
|
|
func (s *EmailService) GenerateVerifyCode() (string, error) {
|
|
const digits = "0123456789"
|
|
code := make([]byte, 6)
|
|
for i := range code {
|
|
num, err := rand.Int(rand.Reader, big.NewInt(int64(len(digits))))
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
code[i] = digits[num.Int64()]
|
|
}
|
|
return string(code), nil
|
|
}
|
|
|
|
// SendVerifyCode 发送验证码邮件
|
|
func (s *EmailService) SendVerifyCode(ctx context.Context, email, siteName string) error {
|
|
// 检查是否在冷却期内
|
|
existing, err := s.cache.GetVerificationCode(ctx, email)
|
|
if err == nil && existing != nil {
|
|
if time.Since(existing.CreatedAt) < verifyCodeCooldown {
|
|
return ErrVerifyCodeTooFrequent
|
|
}
|
|
}
|
|
|
|
// 生成验证码
|
|
code, err := s.GenerateVerifyCode()
|
|
if err != nil {
|
|
return fmt.Errorf("generate code: %w", err)
|
|
}
|
|
|
|
// 保存验证码到 Redis
|
|
data := &VerificationCodeData{
|
|
Code: code,
|
|
Attempts: 0,
|
|
CreatedAt: time.Now(),
|
|
}
|
|
if err := s.cache.SetVerificationCode(ctx, email, data, verifyCodeTTL); err != nil {
|
|
return fmt.Errorf("save verify code: %w", err)
|
|
}
|
|
|
|
// 构建邮件内容
|
|
subject := fmt.Sprintf("[%s] Email Verification Code", siteName)
|
|
body := s.buildVerifyCodeEmailBody(code, siteName)
|
|
|
|
// 发送邮件
|
|
if err := s.SendEmail(ctx, email, subject, body); err != nil {
|
|
return fmt.Errorf("send email: %w", err)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// VerifyCode 验证验证码
|
|
func (s *EmailService) VerifyCode(ctx context.Context, email, code string) error {
|
|
data, err := s.cache.GetVerificationCode(ctx, email)
|
|
if err != nil || data == nil {
|
|
return ErrInvalidVerifyCode
|
|
}
|
|
|
|
// 检查是否已达到最大尝试次数
|
|
if data.Attempts >= maxVerifyCodeAttempts {
|
|
return ErrVerifyCodeMaxAttempts
|
|
}
|
|
|
|
// 验证码不匹配
|
|
if data.Code != code {
|
|
data.Attempts++
|
|
_ = s.cache.SetVerificationCode(ctx, email, data, verifyCodeTTL)
|
|
if data.Attempts >= maxVerifyCodeAttempts {
|
|
return ErrVerifyCodeMaxAttempts
|
|
}
|
|
return ErrInvalidVerifyCode
|
|
}
|
|
|
|
// 验证成功,删除验证码
|
|
_ = s.cache.DeleteVerificationCode(ctx, email)
|
|
return nil
|
|
}
|
|
|
|
// buildVerifyCodeEmailBody 构建验证码邮件HTML内容
|
|
func (s *EmailService) buildVerifyCodeEmailBody(code, siteName string) string {
|
|
return fmt.Sprintf(`
|
|
<!DOCTYPE html>
|
|
<html>
|
|
<head>
|
|
<meta charset="UTF-8">
|
|
<style>
|
|
body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, sans-serif; background-color: #f5f5f5; margin: 0; padding: 20px; }
|
|
.container { max-width: 600px; margin: 0 auto; background-color: #ffffff; border-radius: 8px; overflow: hidden; box-shadow: 0 2px 8px rgba(0,0,0,0.1); }
|
|
.header { background: linear-gradient(135deg, #667eea 0%%, #764ba2 100%%); color: white; padding: 30px; text-align: center; }
|
|
.header h1 { margin: 0; font-size: 24px; }
|
|
.content { padding: 40px 30px; text-align: center; }
|
|
.code { font-size: 36px; font-weight: bold; letter-spacing: 8px; color: #333; background-color: #f8f9fa; padding: 20px 30px; border-radius: 8px; display: inline-block; margin: 20px 0; font-family: monospace; }
|
|
.info { color: #666; font-size: 14px; line-height: 1.6; margin-top: 20px; }
|
|
.footer { background-color: #f8f9fa; padding: 20px; text-align: center; color: #999; font-size: 12px; }
|
|
</style>
|
|
</head>
|
|
<body>
|
|
<div class="container">
|
|
<div class="header">
|
|
<h1>%s</h1>
|
|
</div>
|
|
<div class="content">
|
|
<p style="font-size: 18px; color: #333;">Your verification code is:</p>
|
|
<div class="code">%s</div>
|
|
<div class="info">
|
|
<p>This code will expire in <strong>15 minutes</strong>.</p>
|
|
<p>If you did not request this code, please ignore this email.</p>
|
|
</div>
|
|
</div>
|
|
<div class="footer">
|
|
<p>This is an automated message, please do not reply.</p>
|
|
</div>
|
|
</div>
|
|
</body>
|
|
</html>
|
|
`, siteName, code)
|
|
}
|
|
|
|
// TestSMTPConnectionWithConfig 使用指定配置测试SMTP连接
|
|
func (s *EmailService) TestSMTPConnectionWithConfig(config *SMTPConfig) error {
|
|
addr := fmt.Sprintf("%s:%d", config.Host, config.Port)
|
|
|
|
if config.UseTLS {
|
|
tlsConfig := &tls.Config{ServerName: config.Host}
|
|
conn, err := tls.Dial("tcp", addr, tlsConfig)
|
|
if err != nil {
|
|
return fmt.Errorf("tls connection failed: %w", err)
|
|
}
|
|
defer func() { _ = conn.Close() }()
|
|
|
|
client, err := smtp.NewClient(conn, config.Host)
|
|
if err != nil {
|
|
return fmt.Errorf("smtp client creation failed: %w", err)
|
|
}
|
|
defer func() { _ = client.Close() }()
|
|
|
|
auth := smtp.PlainAuth("", config.Username, config.Password, config.Host)
|
|
if err = client.Auth(auth); err != nil {
|
|
return fmt.Errorf("smtp authentication failed: %w", err)
|
|
}
|
|
|
|
return client.Quit()
|
|
}
|
|
|
|
// 非TLS连接测试
|
|
client, err := smtp.Dial(addr)
|
|
if err != nil {
|
|
return fmt.Errorf("smtp connection failed: %w", err)
|
|
}
|
|
defer func() { _ = client.Close() }()
|
|
|
|
auth := smtp.PlainAuth("", config.Username, config.Password, config.Host)
|
|
if err = client.Auth(auth); err != nil {
|
|
return fmt.Errorf("smtp authentication failed: %w", err)
|
|
}
|
|
|
|
return client.Quit()
|
|
}
|