权限整改:增加项目任务实时判权
新增任务列表、详情、尝试和取消的项目范围权限仓储,任务取消在授权事务内执行,并将证书任务入口接入项目资源权限校验。当前 HTTP 路由与测试夹具仍待同步修复。
This commit is contained in:
1 parent
8d78edca47
commit
17101da46b
3 files changed
+233
-31
No files matched your search
@@ -0,0 +1,177 @@
|
||||
package repository
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"errors"
|
||||
"fmt"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/domain"
|
||||
)
|
||||
|
||||
// ProjectTaskReader 只返回当前账户有权查看的任务和任务尝试。
|
||||
type ProjectTaskReader interface {
|
||||
ListVisibleTasks(context.Context, string, string, int) ([]Task, error)
|
||||
GetVisibleTask(context.Context, string, string) (Task, error)
|
||||
ListVisibleTaskAttempts(context.Context, string, string) ([]TaskAttempt, error)
|
||||
CancelVisibleTask(context.Context, string, string, string, *time.Time) error
|
||||
}
|
||||
|
||||
var _ ProjectTaskReader = (*SQLTaskRepository)(nil)
|
||||
|
||||
func taskVisibilityPredicate(alias string) (string, []any) {
|
||||
roles := []domain.ProjectRole{
|
||||
domain.ProjectRoleAdmin,
|
||||
domain.ProjectRoleAuditViewer,
|
||||
domain.ProjectRoleReadOnly,
|
||||
}
|
||||
placeholders := make([]string, 0, len(roles))
|
||||
args := []any{""}
|
||||
for _, role := range roles {
|
||||
placeholders = append(placeholders, "?")
|
||||
args = append(args, string(role))
|
||||
}
|
||||
return `EXISTS (
|
||||
SELECT 1 FROM users task_actor
|
||||
WHERE task_actor.id = ? AND task_actor.status = 'active'
|
||||
AND (task_actor.role IN ('super_admin', 'admin') OR (
|
||||
task_actor.role = 'user' AND ` + alias + `.scope_type = 'project'
|
||||
AND EXISTS (SELECT 1 FROM project_members task_member
|
||||
WHERE task_member.project_id = ` + alias + `.project_id
|
||||
AND task_member.user_id = task_actor.id
|
||||
AND task_member.role IN (` + strings.Join(placeholders, ", ") + `))))
|
||||
)`, args
|
||||
}
|
||||
|
||||
func (r *SQLTaskRepository) ListVisibleTasks(ctx context.Context, actorID, domainID string, limit int) ([]Task, error) {
|
||||
if r == nil || r.db == nil {
|
||||
return nil, errors.New("数据库连接不能为空")
|
||||
}
|
||||
if strings.TrimSpace(actorID) == "" {
|
||||
return nil, ErrProjectAccessDenied
|
||||
}
|
||||
if limit <= 0 || limit > 200 {
|
||||
limit = 50
|
||||
}
|
||||
predicate, args := taskVisibilityPredicate("tasks")
|
||||
args[0] = strings.TrimSpace(actorID)
|
||||
query := taskSelect + ` WHERE ` + predicate
|
||||
if domainID = strings.TrimSpace(domainID); domainID != "" {
|
||||
query += " AND tasks.domain_id = ?"
|
||||
args = append(args, domainID)
|
||||
}
|
||||
query += fmt.Sprintf(" ORDER BY tasks.created_at DESC, tasks.id DESC LIMIT %d", limit)
|
||||
rows, err := r.db.QueryContext(ctx, r.query(query), args...)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("查询可见任务失败:%w", err)
|
||||
}
|
||||
defer rows.Close()
|
||||
items := make([]Task, 0)
|
||||
for rows.Next() {
|
||||
item, err := scanTask(rows)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
items = append(items, item)
|
||||
}
|
||||
if err := rows.Err(); err != nil {
|
||||
return nil, fmt.Errorf("读取可见任务失败:%w", err)
|
||||
}
|
||||
return items, nil
|
||||
}
|
||||
|
||||
func (r *SQLTaskRepository) GetVisibleTask(ctx context.Context, actorID, taskID string) (Task, error) {
|
||||
if r == nil || r.db == nil {
|
||||
return Task{}, errors.New("数据库连接不能为空")
|
||||
}
|
||||
predicate, args := taskVisibilityPredicate("tasks")
|
||||
args[0] = strings.TrimSpace(actorID)
|
||||
args = append(args, strings.TrimSpace(taskID))
|
||||
return scanTask(r.db.QueryRowContext(ctx, r.query(taskSelect+` WHERE `+predicate+` AND tasks.id = ?`), args...))
|
||||
}
|
||||
|
||||
func (r *SQLTaskRepository) ListVisibleTaskAttempts(ctx context.Context, actorID, taskID string) ([]TaskAttempt, error) {
|
||||
if r == nil || r.db == nil {
|
||||
return nil, errors.New("数据库连接不能为空")
|
||||
}
|
||||
predicate, args := taskVisibilityPredicate("tasks")
|
||||
args[0] = strings.TrimSpace(actorID)
|
||||
args = append(args, strings.TrimSpace(taskID))
|
||||
rows, err := r.db.QueryContext(ctx, r.query(`SELECT attempts.id, attempts.task_id, attempts.attempt_number,
|
||||
attempts.stage, attempts.status, attempts.message, attempts.started_at, attempts.finished_at,
|
||||
attempts.created_at, COALESCE(tasks.scope_type, 'unknown'), COALESCE(tasks.project_id, '')
|
||||
FROM task_attempts attempts JOIN tasks ON tasks.id = attempts.task_id
|
||||
WHERE `+predicate+` AND attempts.task_id = ? ORDER BY attempts.attempt_number`), args...)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("查询可见任务尝试失败:%w", err)
|
||||
}
|
||||
defer rows.Close()
|
||||
items := make([]TaskAttempt, 0)
|
||||
for rows.Next() {
|
||||
item, err := scanAttempt(rows)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
items = append(items, item)
|
||||
}
|
||||
if err := rows.Err(); err != nil {
|
||||
return nil, fmt.Errorf("读取可见任务尝试失败:%w", err)
|
||||
}
|
||||
return items, nil
|
||||
}
|
||||
|
||||
func (r *SQLTaskRepository) CancelVisibleTask(ctx context.Context, actorID, taskID, message string, finishedAt *time.Time) error {
|
||||
if r == nil || r.db == nil {
|
||||
return errors.New("数据库连接不能为空")
|
||||
}
|
||||
tx, err := r.db.BeginTx(ctx, nil)
|
||||
if err != nil {
|
||||
return fmt.Errorf("开始取消任务事务失败:%w", err)
|
||||
}
|
||||
rollback := func() { _ = tx.Rollback() }
|
||||
predicate, predicateArgs := taskVisibilityPredicate("tasks")
|
||||
predicateArgs[0] = strings.TrimSpace(actorID)
|
||||
args := []any{message, nullableTime(finishedAt), time.Now().UTC(), strings.TrimSpace(taskID)}
|
||||
args = append(args, predicateArgs...)
|
||||
result, err := tx.ExecContext(ctx, r.query(`UPDATE tasks SET status = 'cancelled', message = ?, finished_at = ?, updated_at = ?
|
||||
WHERE id = ? AND status IN ('queued', 'running') AND `+predicate), args...)
|
||||
if err != nil {
|
||||
rollback()
|
||||
return fmt.Errorf("取消任务失败:%w", err)
|
||||
}
|
||||
count, err := result.RowsAffected()
|
||||
if err != nil {
|
||||
rollback()
|
||||
return fmt.Errorf("读取任务取消结果失败:%w", err)
|
||||
}
|
||||
if count == 0 {
|
||||
item, getErr := scanTask(tx.QueryRowContext(ctx, r.query(taskSelect+` WHERE id = ?`), strings.TrimSpace(taskID)))
|
||||
if errors.Is(getErr, sql.ErrNoRows) {
|
||||
rollback()
|
||||
return sql.ErrNoRows
|
||||
}
|
||||
if getErr != nil {
|
||||
rollback()
|
||||
return getErr
|
||||
}
|
||||
if item.Status == "cancelled" {
|
||||
if err := tx.Commit(); err != nil {
|
||||
return fmt.Errorf("提交重复取消任务事务失败:%w", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
rollback()
|
||||
return ErrProjectAccessDenied
|
||||
}
|
||||
if _, err := tx.ExecContext(ctx, r.query(`UPDATE task_attempts SET status = 'cancelled', message = ?, finished_at = ?
|
||||
WHERE task_id = ? AND status IN ('queued', 'running')`), message, nullableTime(finishedAt), strings.TrimSpace(taskID)); err != nil {
|
||||
rollback()
|
||||
return fmt.Errorf("取消任务尝试失败:%w", err)
|
||||
}
|
||||
if err := tx.Commit(); err != nil {
|
||||
return fmt.Errorf("提交取消任务事务失败:%w", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
Reference in new issue
Block a user