补齐任务取消权限闭环
增加项目任务取消权限校验和回归测试,并记录本轮开发进度。
This commit is contained in:
1 parent
7718ecf789
commit
3504dcab7a
6 files changed
+90
-4
No files matched your search
@@ -273,6 +273,9 @@ func (s *Server) cancelTask(c *gin.Context) {
|
||||
c.JSON(http.StatusConflict, gin.H{"error": "管理证书任务由续期调度控制,不能单独修改取消状态", "task": item})
|
||||
return
|
||||
}
|
||||
if !s.authorizeProjectPermissions(c, item.ProjectID, domain.PermissionTaskCancel) {
|
||||
return
|
||||
}
|
||||
finished := time.Now().UTC()
|
||||
if err := reader.CancelVisibleTask(c.Request.Context(), c.GetString(authenticatedActorKey), taskID, "任务已由用户取消", &finished); err != nil {
|
||||
if errors.Is(err, repository.ErrProjectAccessDenied) || errors.Is(err, sql.ErrNoRows) {
|
||||
|
||||
@@ -369,6 +369,45 @@ func TestTaskAPIReturnsNotImplementedWhenTaskDependenciesAreMissing(t *testing.T
|
||||
}
|
||||
}
|
||||
|
||||
type taskPermissionProjectMemberRepository struct {
|
||||
repository.ProjectMemberRepository
|
||||
authorize func(context.Context, string, string, domain.ProjectPermission) error
|
||||
}
|
||||
|
||||
func (r taskPermissionProjectMemberRepository) AuthorizeProject(ctx context.Context, actorID, projectID string, permission domain.ProjectPermission) error {
|
||||
if r.authorize != nil {
|
||||
return r.authorize(ctx, actorID, projectID, permission)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func TestTaskAPIDeniesCancelWithoutProjectPermission(t *testing.T) {
|
||||
server, tasks, _, closeDB := newTaskAPITestServer(t, nil)
|
||||
defer closeDB()
|
||||
server.projectMembers = taskPermissionProjectMemberRepository{
|
||||
ProjectMemberRepository: server.projectMembers,
|
||||
authorize: func(_ context.Context, _ string, _ string, permission domain.ProjectPermission) error {
|
||||
if permission == domain.PermissionTaskCancel {
|
||||
return repository.ErrProjectAccessDenied
|
||||
}
|
||||
return nil
|
||||
},
|
||||
}
|
||||
item := repository.Task{
|
||||
HistoryScope: repository.HistoryScope{ScopeType: repository.ScopeProject, ProjectID: domain.DefaultProjectID},
|
||||
ID: "cancel-permission-task", DomainID: "domain-1", TaskType: "certificate_issue", Status: "running", Stage: "certificate_issue",
|
||||
}
|
||||
if err := tasks.CreateTask(t.Context(), item); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
response := httptest.NewRecorder()
|
||||
serveAdminHTTP(server, response, httptest.NewRequest(http.MethodDelete, "/api/v1/tasks/"+item.ID, nil))
|
||||
stored, err := tasks.GetTask(t.Context(), item.ID)
|
||||
if response.Code != http.StatusForbidden || err != nil || stored.Status != "running" {
|
||||
t.Fatalf("cancel permission denial changed task: %d %+v %v", response.Code, stored, err)
|
||||
}
|
||||
}
|
||||
func TestIssueDomainSanitizesDeploymentReportWithoutTaskRepository(t *testing.T) {
|
||||
cfg := readyTestConfig(t.TempDir())
|
||||
server := New(Dependencies{
|
||||
|
||||
Reference in new issue
Block a user