生产部署整改阶段检查点
This commit is contained in:
1 parent
f3348cf95d
commit
92d4b3d398
56 files changed
+4178
-240
No files matched your search
@@ -52,3 +52,21 @@ func (r *SQLAuditRepository) CreateAuditLog(ctx context.Context, item AuditLog)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (r *SQLAuditRepository) PruneExpiredAuditLogs(ctx context.Context, before time.Time) (int64, error) {
|
||||
if r == nil || r.db == nil {
|
||||
return 0, errors.New("数据库连接不能为空")
|
||||
}
|
||||
if before.IsZero() {
|
||||
return 0, errors.New("审计日志清理时间不能为空")
|
||||
}
|
||||
result, err := r.db.ExecContext(ctx, `DELETE FROM audit_logs WHERE created_at < ?`, before.UTC())
|
||||
if err != nil {
|
||||
return 0, fmt.Errorf("清理过期审计日志失败:%w", err)
|
||||
}
|
||||
count, err := result.RowsAffected()
|
||||
if err != nil {
|
||||
return 0, fmt.Errorf("读取审计日志清理数量失败:%w", err)
|
||||
}
|
||||
return count, nil
|
||||
}
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"context"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/config"
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/database"
|
||||
@@ -33,3 +34,53 @@ func TestSQLAuditRepositoryCreatesLog(t *testing.T) {
|
||||
t.Fatalf("审计日志数量不正确:%d", count)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSQLAuditRepositoryPrunesOnlyExpiredLogs(t *testing.T) {
|
||||
dir := t.TempDir()
|
||||
dbConfig := config.Default(dir).Database
|
||||
dbConfig.DSN = filepath.Join(dir, "data", "audit-prune.db")
|
||||
db, err := database.Open(context.Background(), dbConfig)
|
||||
if err != nil {
|
||||
t.Fatalf("打开数据库失败:%v", err)
|
||||
}
|
||||
defer db.Close()
|
||||
if err := database.Migrate(context.Background(), db.DB, "sqlite"); err != nil {
|
||||
t.Fatalf("迁移数据库失败:%v", err)
|
||||
}
|
||||
|
||||
repo := NewSQLAuditRepository(db.DB)
|
||||
cutoff := time.Date(2026, 8, 1, 0, 0, 0, 0, time.UTC)
|
||||
items := []AuditLog{
|
||||
{Action: "expired", ResourceType: "test", Status: "success", CreatedAt: cutoff.Add(-time.Second)},
|
||||
{Action: "boundary", ResourceType: "test", Status: "success", CreatedAt: cutoff},
|
||||
{Action: "retained", ResourceType: "test", Status: "success", CreatedAt: cutoff.Add(time.Second)},
|
||||
}
|
||||
for _, item := range items {
|
||||
if err := repo.CreateAuditLog(context.Background(), item); err != nil {
|
||||
t.Fatalf("写入审计日志失败:%v", err)
|
||||
}
|
||||
}
|
||||
|
||||
deleted, err := repo.PruneExpiredAuditLogs(context.Background(), cutoff)
|
||||
if err != nil {
|
||||
t.Fatalf("清理过期审计日志失败:%v", err)
|
||||
}
|
||||
if deleted != 1 {
|
||||
t.Fatalf("清理数量不正确:%d", deleted)
|
||||
}
|
||||
var count int
|
||||
if err := db.DB.QueryRow(`SELECT COUNT(*) FROM audit_logs`).Scan(&count); err != nil {
|
||||
t.Fatalf("统计保留日志失败:%v", err)
|
||||
}
|
||||
if count != 2 {
|
||||
t.Fatalf("保留日志数量不正确:%d", count)
|
||||
}
|
||||
for _, action := range []string{"boundary", "retained"} {
|
||||
if err := db.DB.QueryRow(`SELECT COUNT(*) FROM audit_logs WHERE action = ?`, action).Scan(&count); err != nil {
|
||||
t.Fatalf("检查保留日志失败:%v", err)
|
||||
}
|
||||
if count != 1 {
|
||||
t.Fatalf("应保留审计日志 %s", action)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -40,6 +40,10 @@ func (r *SQLServerRepository) CreateServer(ctx context.Context, server deploymen
|
||||
if err != nil {
|
||||
return fmt.Errorf("编码 reload 命令失败:%w", err)
|
||||
}
|
||||
validationCommand, err := json.Marshal(server.ValidationCommand)
|
||||
if err != nil {
|
||||
return fmt.Errorf("编码配置校验命令失败:%w", err)
|
||||
}
|
||||
createdAt := server.CreatedAt
|
||||
if createdAt.IsZero() {
|
||||
createdAt = time.Now().UTC()
|
||||
@@ -49,9 +53,9 @@ func (r *SQLServerRepository) CreateServer(ctx context.Context, server deploymen
|
||||
updatedAt = createdAt
|
||||
}
|
||||
_, err = r.db.ExecContext(ctx, `INSERT INTO servers
|
||||
(id, name, address, port, username, private_key_ref, host_key_fingerprint, certificate_path, private_key_path, certificate_chain_path, web_server, reload_command_json, created_at, updated_at)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, server.ID, server.Name, server.Address, server.Port, server.Username, server.PrivateKeyRef,
|
||||
server.HostKeyFingerprint, server.CertificatePath, server.PrivateKeyPath, server.CertificateChainPath, server.WebServer, string(command), createdAt, updatedAt)
|
||||
(id, name, address, port, username, private_key_ref, host_key_fingerprint, certificate_path, private_key_path, certificate_chain_path, web_server, validation_command_json, reload_command_json, created_at, updated_at)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, server.ID, server.Name, server.Address, server.Port, server.Username, server.PrivateKeyRef,
|
||||
server.HostKeyFingerprint, server.CertificatePath, server.PrivateKeyPath, server.CertificateChainPath, server.WebServer, string(validationCommand), string(command), createdAt, updatedAt)
|
||||
if err != nil {
|
||||
return fmt.Errorf("保存服务器失败:%w", err)
|
||||
}
|
||||
@@ -67,8 +71,16 @@ func (r *SQLServerRepository) UpdateServer(ctx context.Context, server deploymen
|
||||
if err != nil {
|
||||
return fmt.Errorf("编码 reload 命令失败:%w", err)
|
||||
}
|
||||
result, err := r.db.ExecContext(ctx, `UPDATE servers SET name = ?, address = ?, port = ?, username = ?, private_key_ref = ?, host_key_fingerprint = ?, certificate_path = ?, private_key_path = ?, certificate_chain_path = ?, web_server = ?, reload_command_json = ?, updated_at = ? WHERE id = ?`,
|
||||
server.Name, server.Address, server.Port, server.Username, server.PrivateKeyRef, server.HostKeyFingerprint, server.CertificatePath, server.PrivateKeyPath, server.CertificateChainPath, server.WebServer, string(command), time.Now().UTC(), server.ID)
|
||||
validationCommand, err := json.Marshal(server.ValidationCommand)
|
||||
if err != nil {
|
||||
return fmt.Errorf("编码配置校验命令失败:%w", err)
|
||||
}
|
||||
updatedAt := server.UpdatedAt
|
||||
if updatedAt.IsZero() {
|
||||
updatedAt = time.Now().UTC()
|
||||
}
|
||||
result, err := r.db.ExecContext(ctx, `UPDATE servers SET name = ?, address = ?, port = ?, username = ?, private_key_ref = ?, host_key_fingerprint = ?, certificate_path = ?, private_key_path = ?, certificate_chain_path = ?, web_server = ?, validation_command_json = ?, reload_command_json = ?, updated_at = ? WHERE id = ?`,
|
||||
server.Name, server.Address, server.Port, server.Username, server.PrivateKeyRef, server.HostKeyFingerprint, server.CertificatePath, server.PrivateKeyPath, server.CertificateChainPath, server.WebServer, string(validationCommand), string(command), updatedAt, server.ID)
|
||||
if err != nil {
|
||||
return fmt.Errorf("更新服务器失败:%w", err)
|
||||
}
|
||||
@@ -218,8 +230,8 @@ func (r *SQLServerRepository) ReplaceDomainServers(ctx context.Context, domainID
|
||||
return nil
|
||||
}
|
||||
|
||||
const serverSelect = `SELECT id, name, address, port, username, private_key_ref, host_key_fingerprint, certificate_path, private_key_path, certificate_chain_path, web_server, reload_command_json, created_at, updated_at FROM servers`
|
||||
const serverSelectQualified = `SELECT servers.id, servers.name, servers.address, servers.port, servers.username, servers.private_key_ref, servers.host_key_fingerprint, servers.certificate_path, servers.private_key_path, servers.certificate_chain_path, servers.web_server, servers.reload_command_json, servers.created_at, servers.updated_at FROM servers`
|
||||
const serverSelect = `SELECT id, name, address, port, username, private_key_ref, host_key_fingerprint, certificate_path, private_key_path, certificate_chain_path, web_server, validation_command_json, reload_command_json, created_at, updated_at FROM servers`
|
||||
const serverSelectQualified = `SELECT servers.id, servers.name, servers.address, servers.port, servers.username, servers.private_key_ref, servers.host_key_fingerprint, servers.certificate_path, servers.private_key_path, servers.certificate_chain_path, servers.web_server, servers.validation_command_json, servers.reload_command_json, servers.created_at, servers.updated_at FROM servers`
|
||||
|
||||
type rowScanner interface {
|
||||
Scan(dest ...any) error
|
||||
@@ -228,14 +240,18 @@ type rowScanner interface {
|
||||
func scanServer(row rowScanner) (deployment.Server, error) {
|
||||
var server deployment.Server
|
||||
var webServer string
|
||||
var validationCommandJSON string
|
||||
var commandJSON string
|
||||
if err := row.Scan(&server.ID, &server.Name, &server.Address, &server.Port, &server.Username, &server.PrivateKeyRef, &server.HostKeyFingerprint, &server.CertificatePath, &server.PrivateKeyPath, &server.CertificateChainPath, &webServer, &commandJSON, &server.CreatedAt, &server.UpdatedAt); err != nil {
|
||||
if err := row.Scan(&server.ID, &server.Name, &server.Address, &server.Port, &server.Username, &server.PrivateKeyRef, &server.HostKeyFingerprint, &server.CertificatePath, &server.PrivateKeyPath, &server.CertificateChainPath, &webServer, &validationCommandJSON, &commandJSON, &server.CreatedAt, &server.UpdatedAt); err != nil {
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
return deployment.Server{}, sql.ErrNoRows
|
||||
}
|
||||
return deployment.Server{}, fmt.Errorf("读取服务器失败:%w", err)
|
||||
}
|
||||
server.WebServer = deployment.WebServer(webServer)
|
||||
if err := json.Unmarshal([]byte(validationCommandJSON), &server.ValidationCommand); err != nil {
|
||||
return deployment.Server{}, fmt.Errorf("解析配置校验命令失败:%w", err)
|
||||
}
|
||||
if err := json.Unmarshal([]byte(commandJSON), &server.ReloadCommand); err != nil {
|
||||
return deployment.Server{}, fmt.Errorf("解析 reload 命令失败:%w", err)
|
||||
}
|
||||
|
||||
@@ -36,7 +36,7 @@ func TestServerRepositoryCRUDAndDomainAssociations(t *testing.T) {
|
||||
if err != nil {
|
||||
t.Fatalf("读取服务器失败:%v", err)
|
||||
}
|
||||
if loaded.Name != server.Name || loaded.ReloadCommand[0] != "nginx" || loaded.CreatedAt.IsZero() {
|
||||
if loaded.Name != server.Name || loaded.ValidationCommand[0] != "nginx" || loaded.ValidationCommand[1] != "-t" || loaded.ReloadCommand[0] != "nginx" || loaded.CreatedAt.IsZero() {
|
||||
t.Fatalf("服务器内容错误:%+v", loaded)
|
||||
}
|
||||
server.Name = "生产服务器-更新"
|
||||
@@ -45,6 +45,13 @@ func TestServerRepositoryCRUDAndDomainAssociations(t *testing.T) {
|
||||
if err := repo.UpdateServer(context.Background(), server); err != nil {
|
||||
t.Fatalf("更新服务器失败:%v", err)
|
||||
}
|
||||
updated, err := repo.GetServerByID(context.Background(), server.ID)
|
||||
if err != nil {
|
||||
t.Fatalf("load updated server: %v", err)
|
||||
}
|
||||
if updated.CreatedAt.IsZero() || updated.UpdatedAt.IsZero() || updated.UpdatedAt.Before(updated.CreatedAt) {
|
||||
t.Fatalf("updated server timestamps are invalid: %+v", updated)
|
||||
}
|
||||
if err := repo.ReplaceDomainServers(context.Background(), "domain-1", []string{server.ID, server.ID}); err != nil {
|
||||
t.Fatalf("保存域名服务器关联失败:%v", err)
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user