检查点:保存成员接口分页与失败审计专项通过候选
This commit is contained in:
1 parent
66422bbac0
commit
3857dac5c8
12 files changed
+822
-2
No files matched your search
@@ -3,13 +3,18 @@ package repository
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"errors"
|
||||
"fmt"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/go-sql-driver/mysql"
|
||||
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/domain"
|
||||
)
|
||||
|
||||
var ErrProjectMemberConflict = errors.New("项目成员角色已存在")
|
||||
|
||||
// 成员写入仍在单条语句内检查权限;审计与变更共用事务,任何一步失败都不留下成功变更。
|
||||
func (r *SQLProjectMemberRepository) changeProjectRole(ctx context.Context, actorID, projectID, userID string, role domain.ProjectRole, grant bool) error {
|
||||
if err := r.ensureDB(); err != nil {
|
||||
@@ -86,7 +91,24 @@ func (r *SQLProjectMemberRepository) writeProjectRole(ctx context.Context, tx *s
|
||||
}
|
||||
result, err := tx.ExecContext(ctx, Rebind(r.driver, query), args...)
|
||||
if err != nil {
|
||||
if grant && projectMemberUniqueViolation(err) {
|
||||
return ErrProjectMemberConflict
|
||||
}
|
||||
return fmt.Errorf("变更项目角色失败:%w", err)
|
||||
}
|
||||
return projectMemberWriteResult(result)
|
||||
}
|
||||
|
||||
// 只将成员写入的确定唯一键错误映射为冲突;审计触发器或其他约束失败不能伪装成重复授权。
|
||||
func projectMemberUniqueViolation(err error) bool {
|
||||
var sqliteCode interface{ Code() int }
|
||||
if errors.As(err, &sqliteCode) {
|
||||
return sqliteCode.Code() == 1555 || sqliteCode.Code() == 2067
|
||||
}
|
||||
var mysqlError *mysql.MySQLError
|
||||
if errors.As(err, &mysqlError) {
|
||||
return mysqlError.Number == 1062
|
||||
}
|
||||
var sqlState interface{ SQLState() string }
|
||||
return errors.As(err, &sqlState) && sqlState.SQLState() == "23505"
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
package repository
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"time"
|
||||
)
|
||||
|
||||
// ProjectMemberFailure 的操作者必须来自已验证会话快照;未登录时留空,不能从请求体读取。
|
||||
type ProjectMemberFailure struct {
|
||||
ActorID string
|
||||
ProjectID string
|
||||
UserID string
|
||||
Action string
|
||||
StatusCode int
|
||||
RequestID string
|
||||
}
|
||||
|
||||
// 失败事件独立于已回滚的变更事务,范围由实际项目解析,不将不存在的项目伪装为系统范围。
|
||||
func (r *SQLProjectMemberRepository) RecordProjectMemberFailure(ctx context.Context, failure ProjectMemberFailure) error {
|
||||
if err := r.ensureDB(); err != nil {
|
||||
return err
|
||||
}
|
||||
if failure.Action != "project_member.list" && failure.Action != "project_member.grant" && failure.Action != "project_member.revoke" {
|
||||
return errors.New("项目成员失败审计动作无效")
|
||||
}
|
||||
if failure.StatusCode < 400 || failure.StatusCode > 599 || len(failure.ActorID) > 128 || len(failure.UserID) > 128 || len(failure.ProjectID) > 128 || len(failure.RequestID) > 128 {
|
||||
return errors.New("项目成员失败审计参数无效")
|
||||
}
|
||||
message := fmt.Sprintf("请求被拒绝或执行失败:HTTP %d;请求编号:%s", failure.StatusCode, failure.RequestID)
|
||||
result, err := r.db.ExecContext(ctx, Rebind(r.driver, `INSERT INTO audit_logs
|
||||
(action, resource_type, resource_id, status, message, created_at, scope_type, project_id, task_id, operator_id)
|
||||
SELECT ?, 'project_member', ?, 'failed', ?, ?,
|
||||
CASE WHEN p.id IS NULL THEN 'unknown' ELSE 'project' END, COALESCE(p.id, ''), '', ?
|
||||
FROM (SELECT 1 AS marker) audit_event LEFT JOIN projects p ON p.id = ?`),
|
||||
failure.Action, failure.UserID, message, time.Now().UTC(), failure.ActorID, failure.ProjectID)
|
||||
if err != nil {
|
||||
return fmt.Errorf("保存项目成员失败审计失败:%w", err)
|
||||
}
|
||||
count, err := result.RowsAffected()
|
||||
if err != nil || count != 1 {
|
||||
return errors.New("项目成员失败审计未完整写入")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@@ -0,0 +1,100 @@
|
||||
package repository
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"errors"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/domain"
|
||||
)
|
||||
|
||||
// ProjectMemberRepository 不接受客户端声明的操作者角色,所有操作均重新核对实际账户与成员关系。
|
||||
type ProjectMemberRepository interface {
|
||||
ListProjectMembers(context.Context, string, string, string, int) (ProjectMemberPage, error)
|
||||
GrantProjectRole(context.Context, string, string, string, domain.ProjectRole) error
|
||||
RevokeProjectRole(context.Context, string, string, string, domain.ProjectRole) error
|
||||
RecordProjectMemberFailure(context.Context, ProjectMemberFailure) error
|
||||
}
|
||||
|
||||
var _ ProjectMemberRepository = (*SQLProjectMemberRepository)(nil)
|
||||
|
||||
type ProjectMember struct {
|
||||
UserID string `json:"user_id"`
|
||||
Username string `json:"username"`
|
||||
Status string `json:"status"`
|
||||
Roles []domain.ProjectRole `json:"roles"`
|
||||
}
|
||||
|
||||
type ProjectMemberPage struct {
|
||||
Items []ProjectMember `json:"items"`
|
||||
PageSize int `json:"page_size"`
|
||||
HasMore bool `json:"has_more"`
|
||||
NextCursor string `json:"next_cursor"`
|
||||
}
|
||||
|
||||
// ListProjectMembers 使用成员账户而非角色关系分页,同一账户的角色不会被拆到不同页。
|
||||
// 授权门与分页读取共用一条 SQL,空列表仍返回授权门行,未授权或项目不存在则没有行。
|
||||
func (r *SQLProjectMemberRepository) ListProjectMembers(ctx context.Context, actorID, projectID, after string, limit int) (ProjectMemberPage, error) {
|
||||
page := ProjectMemberPage{Items: make([]ProjectMember, 0), PageSize: limit}
|
||||
if err := r.ensureDB(); err != nil {
|
||||
return page, err
|
||||
}
|
||||
if limit < 1 || limit > 100 || len(after) > 128 {
|
||||
return page, errors.New("项目成员分页参数无效")
|
||||
}
|
||||
if strings.TrimSpace(actorID) == "" || strings.TrimSpace(projectID) == "" {
|
||||
return page, ErrProjectAccessDenied
|
||||
}
|
||||
rows, err := r.db.QueryContext(ctx, Rebind(r.driver, `SELECT p.id, member_page.id, member_page.username, member_page.status, roles.role
|
||||
FROM projects p
|
||||
LEFT JOIN (
|
||||
SELECT u.id, u.username, u.status FROM users u
|
||||
WHERE u.id > ? AND EXISTS (SELECT 1 FROM project_members selected
|
||||
WHERE selected.project_id = ? AND selected.user_id = u.id)
|
||||
ORDER BY u.id LIMIT ?
|
||||
) member_page ON 1 = 1
|
||||
LEFT JOIN project_members roles ON roles.project_id = p.id AND roles.user_id = member_page.id
|
||||
WHERE p.id = ? AND `+projectManagerPredicate+`
|
||||
ORDER BY member_page.id, roles.role`), after, projectID, limit+1, projectID, actorID, projectID)
|
||||
if err != nil {
|
||||
return page, fmt.Errorf("查询项目成员失败:%w", err)
|
||||
}
|
||||
defer rows.Close()
|
||||
allowed := false
|
||||
for rows.Next() {
|
||||
var actualProject string
|
||||
var id, username, status, role sql.NullString
|
||||
if err := rows.Scan(&actualProject, &id, &username, &status, &role); err != nil {
|
||||
return page, fmt.Errorf("读取项目成员失败:%w", err)
|
||||
}
|
||||
allowed = true
|
||||
if !id.Valid {
|
||||
continue
|
||||
}
|
||||
if !role.Valid || !domain.ProjectRole(role.String).Valid() {
|
||||
return ProjectMemberPage{}, errors.New("项目成员角色数据无效")
|
||||
}
|
||||
if len(page.Items) == 0 || page.Items[len(page.Items)-1].UserID != id.String {
|
||||
page.Items = append(page.Items, ProjectMember{
|
||||
UserID: id.String, Username: username.String, Status: status.String,
|
||||
Roles: make([]domain.ProjectRole, 0, 6),
|
||||
})
|
||||
}
|
||||
last := &page.Items[len(page.Items)-1]
|
||||
last.Roles = append(last.Roles, domain.ProjectRole(role.String))
|
||||
}
|
||||
if err := rows.Err(); err != nil {
|
||||
return ProjectMemberPage{}, fmt.Errorf("读取项目成员结果失败:%w", err)
|
||||
}
|
||||
if !allowed {
|
||||
return page, ErrProjectAccessDenied
|
||||
}
|
||||
if len(page.Items) > limit {
|
||||
page.HasMore = true
|
||||
page.Items = page.Items[:limit]
|
||||
page.NextCursor = page.Items[limit-1].UserID
|
||||
}
|
||||
return page, nil
|
||||
}
|
||||
@@ -0,0 +1,161 @@
|
||||
package repository
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"errors"
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/config"
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/database"
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/domain"
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/testsupport/mysqltest"
|
||||
)
|
||||
|
||||
func TestProjectMemberListingSQLite(t *testing.T) {
|
||||
checkProjectMemberListing(t, config.Default(t.TempDir()).Database)
|
||||
}
|
||||
|
||||
func TestProjectMemberListingMySQLReal(t *testing.T) {
|
||||
server := mysqltest.New(t)
|
||||
checkProjectMemberListing(t, server.Database(t))
|
||||
}
|
||||
|
||||
func checkProjectMemberListing(t *testing.T, cfg config.DatabaseConfig) {
|
||||
t.Helper()
|
||||
db, err := database.Open(t.Context(), cfg)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
t.Cleanup(func() { _ = db.Close() })
|
||||
if err := database.Migrate(t.Context(), db.DB, cfg.Driver); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
projects := NewSQLProjectRepository(db.DB, cfg.Driver)
|
||||
for _, id := range []string{"page-project", "empty-project"} {
|
||||
if err := projects.CreateProject(t.Context(), domain.Project{ID: id, Name: id}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
for _, user := range []struct{ id, role string }{
|
||||
{"root", UserRoleSuperAdmin}, {"manager", UserRoleUser}, {"global-admin", UserRoleAdmin},
|
||||
} {
|
||||
_, 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)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
repo := NewSQLProjectMemberRepository(db.DB, cfg.Driver)
|
||||
if err := repo.GrantProjectRole(t.Context(), "root", "page-project", "manager", domain.ProjectRoleAdmin); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for i := 0; i < 12; i++ {
|
||||
id := fmt.Sprintf("user-%02d", i)
|
||||
if _, err := db.DB.ExecContext(t.Context(), Rebind(cfg.Driver, `INSERT INTO users (id, username, password_hash, role, status)
|
||||
VALUES (?, ?, 'test-only-no-login', 'user', 'active')`), id, id); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for _, role := range []domain.ProjectRole{domain.ProjectRoleReadOnly, domain.ProjectRoleDNSAdmin} {
|
||||
if err := repo.GrantProjectRole(t.Context(), "root", "page-project", id, role); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
}
|
||||
t.Run("pagination_keeps_roles_together", func(t *testing.T) {
|
||||
for _, size := range []int{1, 5, 10, 15, 30} {
|
||||
after := ""
|
||||
seen := make(map[string]bool)
|
||||
for pages := 0; ; pages++ {
|
||||
if pages > 13 {
|
||||
t.Fatal("分页游标未前进")
|
||||
}
|
||||
page, err := repo.ListProjectMembers(t.Context(), "manager", "page-project", after, size)
|
||||
if err != nil || page.Items == nil || len(page.Items) > size || page.PageSize != size {
|
||||
t.Fatalf("成员分页错误:%+v,%v", page, err)
|
||||
}
|
||||
for _, member := range page.Items {
|
||||
if seen[member.UserID] || member.Username != member.UserID || member.Status != UserStatusActive {
|
||||
t.Fatalf("成员重复或身份字段错误:%+v", member)
|
||||
}
|
||||
seen[member.UserID] = true
|
||||
if member.UserID != "manager" && (len(member.Roles) != 2 || member.Roles[0] != domain.ProjectRoleDNSAdmin || member.Roles[1] != domain.ProjectRoleReadOnly) {
|
||||
t.Fatalf("多角色被拆分或顺序不稳定:%+v", member)
|
||||
}
|
||||
}
|
||||
if !page.HasMore {
|
||||
if page.NextCursor != "" || len(seen) != 13 {
|
||||
t.Fatalf("末页游标或累计人数错误:%+v,%d", page, len(seen))
|
||||
}
|
||||
break
|
||||
}
|
||||
if len(page.Items) != size || page.NextCursor != page.Items[size-1].UserID {
|
||||
t.Fatalf("下一页游标错误:%+v", page)
|
||||
}
|
||||
after = page.NextCursor
|
||||
}
|
||||
}
|
||||
})
|
||||
t.Run("empty_and_forbidden", func(t *testing.T) {
|
||||
for _, tc := range []struct{ actor, project string }{
|
||||
{"global-admin", "page-project"}, {"user-00", "page-project"}, {"manager", "empty-project"}, {"root", "missing-project"}, {"missing-actor", "page-project"},
|
||||
} {
|
||||
page, err := repo.ListProjectMembers(t.Context(), tc.actor, tc.project, "", 5)
|
||||
if !errors.Is(err, ErrProjectAccessDenied) || len(page.Items) != 0 {
|
||||
t.Fatalf("未授权列表泄露:%+v,%+v,%v", tc, page, err)
|
||||
}
|
||||
}
|
||||
for _, tc := range []struct{ project, after string }{{"empty-project", ""}, {"page-project", "zzzz"}} {
|
||||
page, err := repo.ListProjectMembers(t.Context(), "root", tc.project, tc.after, 5)
|
||||
if err != nil || page.Items == nil || len(page.Items) != 0 || page.HasMore || page.NextCursor != "" {
|
||||
t.Fatalf("有效空页被误拒绝:%+v,%v", page, err)
|
||||
}
|
||||
}
|
||||
})
|
||||
t.Run("disabled_and_revoked", func(t *testing.T) {
|
||||
if _, err := db.DB.ExecContext(t.Context(), "UPDATE users SET status='disabled' WHERE id='manager'"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := repo.ListProjectMembers(t.Context(), "manager", "page-project", "", 5); !errors.Is(err, ErrProjectAccessDenied) {
|
||||
t.Fatalf("停用账户仍能读取成员:%v", err)
|
||||
}
|
||||
if _, err := db.DB.ExecContext(t.Context(), "UPDATE users SET status='active' WHERE id='manager'"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := repo.RevokeProjectRole(t.Context(), "manager", "page-project", "manager", domain.ProjectRoleAdmin); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := repo.ListProjectMembers(t.Context(), "manager", "page-project", "", 5); !errors.Is(err, ErrProjectAccessDenied) {
|
||||
t.Fatalf("自我撤权后仍能读取成员:%v", err)
|
||||
}
|
||||
})
|
||||
t.Run("failure_scope_and_identity", func(t *testing.T) {
|
||||
checkProjectMemberFailureRecords(t, db.DB, repo, cfg.Driver)
|
||||
})
|
||||
}
|
||||
|
||||
func checkProjectMemberFailureRecords(t *testing.T, db *sql.DB, repo *SQLProjectMemberRepository, driver string) {
|
||||
t.Helper()
|
||||
for _, project := range []string{"page-project", "missing-project"} {
|
||||
for _, actor := range []string{"manager", ""} {
|
||||
failure := ProjectMemberFailure{ActorID: actor, ProjectID: project, UserID: "user-00", Action: "project_member.grant", StatusCode: 403, RequestID: "request-test"}
|
||||
if err := repo.RecordProjectMemberFailure(t.Context(), failure); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
var gotActor, scope, gotProject, message, status string
|
||||
if err := db.QueryRowContext(t.Context(), "SELECT operator_id, scope_type, project_id, message, status FROM audit_logs ORDER BY id DESC LIMIT 1").Scan(&gotActor, &scope, &gotProject, &message, &status); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
wantScope, wantProject := ScopeProject, project
|
||||
if project == "missing-project" {
|
||||
wantScope, wantProject = ScopeUnknown, ""
|
||||
}
|
||||
if gotActor != actor || scope != wantScope || gotProject != wantProject || status != "failed" || message != "请求被拒绝或执行失败:HTTP 403;请求编号:request-test" {
|
||||
t.Fatalf("失败审计范围或身份错误:%s %s %s %s %s", gotActor, scope, gotProject, status, message)
|
||||
}
|
||||
}
|
||||
}
|
||||
if err := repo.RecordProjectMemberFailure(t.Context(), ProjectMemberFailure{Action: "project_member.grant", StatusCode: 200}); err == nil {
|
||||
t.Fatal("失败审计不应接受成功状态")
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user