Skip to content

Commit 1c53ebf

Browse files
Merge pull request #6704 from devtron-labs/fix-job-rbac-ci-trigger
fix: job rbac ci trigger
2 parents c9cab70 + 671b675 commit 1c53ebf

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

api/restHandler/app/pipeline/configure/BuildPipelineRestHandler.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -625,8 +625,10 @@ func (handler *PipelineConfigRestHandlerImpl) validateCiTriggerRBAC(token string
625625
appObject := handler.enforcerUtil.GetAppRBACNameByAppId(ciPipeline.AppId)
626626
workflowObject := handler.enforcerUtil.GetWorkflowRBACByCiPipelineId(ciPipelineId, workflowName)
627627
triggerObject := handler.enforcerUtil.GetTeamEnvRBACNameByCiPipelineIdAndEnvIdOrName(ciPipelineId, triggerEnvironmentId, envName)
628-
appRbacOk := handler.enforcer.Enforce(token, casbin.ResourceApplications, casbin.ActionTrigger, appObject)
629-
if !appRbacOk {
628+
var appRbacOk bool
629+
if ciPipeline.App.AppType == helper.CustomApp {
630+
appRbacOk = handler.enforcer.Enforce(token, casbin.ResourceApplications, casbin.ActionTrigger, appObject)
631+
} else if ciPipeline.App.AppType == helper.Job {
630632
appRbacOk = handler.enforcer.Enforce(token, casbin.ResourceJobs, casbin.ActionTrigger, appObject) && handler.enforcer.Enforce(token, casbin.ResourceWorkflow, casbin.ActionTrigger, workflowObject) && handler.enforcer.Enforce(token, casbin.ResourceJobsEnv, casbin.ActionTrigger, triggerObject)
631633
}
632634

0 commit comments

Comments
 (0)