权限整改:完成项目审计日志读取隔离

完成项目审计日志读取权限隔离、路由调整、测试及整改清单进度同步。
This commit is contained in:
xuans committed 2026-09-29 17:51:33 +08:00
1 parent 1bc823d8de
commit 408bd5f8ab
10 files changed
+225 -3

No files matched your search

@@ -12,6 +12,7 @@ import (
func (s *Server) registerProjectResourceRoutes() {
api := s.router.Group("/api/v1", privateProjectResponse, s.requireAuthenticated)
api.GET("/domains", s.listDomains)
api.GET("/audit-logs", s.listAuditLogs)
api.GET("/servers", s.listServers)
api.GET("/servers/:id", s.getServer)
api.GET("/domains/:id/servers", s.listDomainServers)
+1 -1
View File
@@ -217,7 +217,7 @@ func (s *Server) registerRoutes() {
adminAPI.GET("/tasks/:id", s.getTask)
adminAPI.DELETE("/tasks/:id", s.cancelTask)
adminAPI.GET("/tasks/:id/attempts", s.listTaskAttempts)
adminAPI.GET("/audit-logs", s.listAuditLogs)
adminAPI.GET("/settings", s.getSettings)
adminAPI.PUT("/settings", s.updateSettings)
adminAPI.GET("/dns/providers", s.listAdminDNSProviders)
+5 -2
View File
@@ -302,13 +302,16 @@ func (s *Server) listTaskAttempts(c *gin.Context) {
}
func (s *Server) listAuditLogs(c *gin.Context) {
reader, ok := s.audit.(repository.AuditReader)
if !s.requireProjectResourceReader(c) {
return
}
reader, ok := s.projectResources.(repository.ProjectAuditReader)
if !ok {
s.writeError(c, http.StatusNotImplemented, "审计日志查询接口尚未配置", errors.New("审计日志读取服务未配置"))
return
}
limit, _ := strconv.Atoi(c.DefaultQuery("limit", "50"))
items, err := reader.ListAuditLogs(c.Request.Context(), limit)
items, err := reader.ListVisibleAuditLogs(c.Request.Context(), c.GetString(authenticatedActorKey), limit)
if err != nil {
s.writeError(c, http.StatusInternalServerError, "查询审计日志失败", err)
return
@@ -28,6 +28,11 @@ func newTaskAPITestServer(t *testing.T, issue func(context.Context, string) (cer
db.Close()
t.Fatalf("迁移测试数据库失败:%v", err)
}
if _, err := db.DB.ExecContext(context.Background(), repository.Rebind(cfg.Database.Driver, `INSERT INTO users
(id, username, password_hash, role, status) VALUES ('test-admin', 'test-admin', 'test-only-no-login', 'admin', 'active')`)); err != nil {
db.Close()
t.Fatalf("创建测试管理员失败:%v", err)
}
domainRepo := repository.NewSQLDomainRepository(db.DB)
taskRepo := repository.NewSQLTaskRepository(db.DB)
auditRepo := repository.NewSQLAuditRepository(db.DB)
@@ -47,6 +52,7 @@ func newTaskAPITestServer(t *testing.T, issue func(context.Context, string) (cer
IssueCertificate: issue,
Tasks: taskRepo,
Audit: auditRepo,
ProjectResources: repository.NewSQLProjectMemberRepository(db.DB, cfg.Database.Driver),
Users: repository.NewSQLUserRepository(db.DB, cfg.Database.Driver),
})
return server, taskRepo, auditRepo, func() { _ = db.Close() }
@@ -0,0 +1,55 @@
package repository
import (
"context"
"fmt"
"git.pcux.cn/xuans/Scert/backend/internal/domain"
)
// ProjectAuditReader 只返回当前账户有权查看的项目审计记录。
type ProjectAuditReader interface {
ListVisibleAuditLogs(context.Context, string, int) ([]AuditLog, error)
}
var _ ProjectAuditReader = (*SQLProjectMemberRepository)(nil)
func (r *SQLProjectMemberRepository) ListVisibleAuditLogs(ctx context.Context, actorID string, limit int) ([]AuditLog, error) {
if err := r.resourceReaderReady(actorID); err != nil {
return nil, err
}
if limit <= 0 || limit > 200 {
limit = 50
}
rows, err := r.db.QueryContext(ctx, Rebind(r.driver, `SELECT logs.id, logs.action,
logs.resource_type, logs.resource_id, logs.status, logs.message, logs.created_at,
logs.scope_type, logs.project_id, logs.task_id, logs.operator_id
FROM audit_logs logs WHERE EXISTS (
SELECT 1 FROM users actor WHERE actor.id = ? AND actor.status = 'active'
AND (actor.role IN ('super_admin', 'admin') OR (actor.role = 'user'
AND logs.scope_type = 'project' AND EXISTS (
SELECT 1 FROM project_members member
WHERE member.project_id = logs.project_id AND member.user_id = actor.id
AND member.role IN (?, ?)))))
ORDER BY logs.created_at DESC, logs.id DESC LIMIT ?`),
actorID, string(domain.ProjectRoleAdmin), string(domain.ProjectRoleAuditViewer), limit)
if err != nil {
return nil, fmt.Errorf("查询项目审计日志失败:%w", err)
}
defer rows.Close()
items := make([]AuditLog, 0)
for rows.Next() {
var item AuditLog
if err := rows.Scan(&item.ID, &item.Action, &item.ResourceType, &item.ResourceID,
&item.Status, &item.Message, &item.CreatedAt, &item.ScopeType, &item.ProjectID,
&item.TaskID, &item.OperatorID); err != nil {
return nil, fmt.Errorf("读取项目审计日志失败:%w", err)
}
item.CreatedAt = item.CreatedAt.UTC()
items = append(items, item)
}
if err := rows.Err(); err != nil {
return nil, fmt.Errorf("读取项目审计日志列表失败:%w", err)
}
return items, nil
}
@@ -0,0 +1,97 @@
package repository
import (
"testing"
"time"
"git.pcux.cn/xuans/Scert/backend/internal/config"
"git.pcux.cn/xuans/Scert/backend/internal/database"
"git.pcux.cn/xuans/Scert/backend/internal/domain"
)
func TestProjectAuditReaderScopesLogsAndHonorsRevocation(t *testing.T) {
cfg := config.Default(t.TempDir()).Database
db, err := database.Open(t.Context(), cfg)
if err != nil {
t.Fatal(err)
}
defer db.Close()
if err := database.Migrate(t.Context(), db.DB, cfg.Driver); err != nil {
t.Fatal(err)
}
for _, user := range []struct {
id string
role string
}{
{"root", UserRoleSuperAdmin},
{"global-admin", UserRoleAdmin},
{"viewer", UserRoleUser},
} {
if _, err := db.DB.ExecContext(t.Context(), Rebind(cfg.Driver, `INSERT INTO users
(id, username, password_hash, role, status) VALUES (?, ?, 'test-only-no-login', ?, 'active')`),
user.id, user.id, user.role); err != nil {
t.Fatal(err)
}
}
projects := NewSQLProjectRepository(db.DB, cfg.Driver)
for _, id := range []string{"project-a", "project-b"} {
if err := projects.CreateProject(t.Context(), domain.Project{ID: id, Name: id}); err != nil {
t.Fatal(err)
}
}
domains := NewSQLDomainRepository(db.DB, cfg.Driver)
for _, item := range []struct {
id string
projectID string
name string
}{{"domain-a", "project-a", "a.example.test"}, {"domain-b", "project-b", "b.example.test"}} {
domainItem, err := domain.NewDomain(item.name, domain.CertificateSingle, nil)
if err != nil {
t.Fatal(err)
}
domainItem.ID, domainItem.ProjectID = item.id, item.projectID
if err := domains.Create(t.Context(), domainItem); err != nil {
t.Fatal(err)
}
}
members := NewSQLProjectMemberRepository(db.DB, cfg.Driver)
if err := members.GrantProjectRole(t.Context(), "root", "project-a", "viewer", domain.ProjectRoleAuditViewer); err != nil {
t.Fatal(err)
}
audit := NewSQLAuditRepository(db.DB, cfg.Driver)
createdAt := time.Date(2026, 9, 29, 0, 0, 0, 0, time.UTC)
for _, item := range []AuditLog{
{HistoryScope: HistoryScope{ScopeType: ScopeProject, ProjectID: "project-a"}, Action: "project-a", ResourceType: "domain", ResourceID: "domain-a", Status: "success", Message: "a", CreatedAt: createdAt},
{HistoryScope: HistoryScope{ScopeType: ScopeProject, ProjectID: "project-b"}, Action: "project-b", ResourceType: "domain", ResourceID: "domain-b", Status: "success", Message: "b", CreatedAt: createdAt.Add(time.Minute)},
{HistoryScope: HistoryScope{ScopeType: ScopeSystem}, Action: "system", ResourceType: "auth", ResourceID: "login", Status: "success", Message: "system", CreatedAt: createdAt.Add(2 * time.Minute)},
} {
if err := audit.CreateAuditLog(t.Context(), item); err != nil {
t.Fatal(err)
}
}
reader := ProjectAuditReader(members)
items, err := reader.ListVisibleAuditLogs(t.Context(), "viewer", 50)
if err != nil {
t.Fatal(err)
}
if len(items) != 2 {
t.Fatalf("项目审计范围错误:%+v", items)
}
items, err = reader.ListVisibleAuditLogs(t.Context(), "global-admin", 50)
if err != nil {
t.Fatal(err)
}
if len(items) != 4 {
t.Fatalf("系统管理员审计范围错误:%+v", items)
}
if err := members.RevokeProjectRole(t.Context(), "root", "project-a", "viewer", domain.ProjectRoleAuditViewer); err != nil {
t.Fatal(err)
}
items, err = reader.ListVisibleAuditLogs(t.Context(), "viewer", 50)
if err != nil {
t.Fatal(err)
}
if len(items) != 0 {
t.Fatalf("撤权后仍返回审计日志:%+v", items)
}
}