Commit ba148a20 authored by Pedro Pombeiro's avatar Pedro Pombeiro

Use new rules instead of admin_group in controller

parent 2ca4981a
...@@ -37,6 +37,18 @@ class Groups::ApplicationController < ApplicationController ...@@ -37,6 +37,18 @@ class Groups::ApplicationController < ApplicationController
end end
end end
def authorize_admin_group_runners!
unless can?(current_user, :admin_group_runners, group)
render_404
end
end
def authorize_read_group_runners!
unless can?(current_user, :read_group_runners, group)
render_404
end
end
def authorize_create_deploy_token! def authorize_create_deploy_token!
unless can?(current_user, :create_deploy_token, group) unless can?(current_user, :create_deploy_token, group)
render_404 render_404
......
# frozen_string_literal: true # frozen_string_literal: true
class Groups::RunnersController < Groups::ApplicationController class Groups::RunnersController < Groups::ApplicationController
# TODO Proper policies, such as `read_group_runners, should be implemented per before_action :authorize_read_group_runners!, only: [:index, :show]
# https://gitlab.com/gitlab-org/gitlab/-/issues/334802 before_action :authorize_admin_group_runners!, only: [:edit, :update, :destroy, :pause, :resume]
before_action :authorize_admin_group!
before_action :runner_list_group_view_vue_ui_enabled, only: [:index] before_action :runner_list_group_view_vue_ui_enabled, only: [:index]
before_action :runner, only: [:edit, :update, :destroy, :pause, :resume, :show] before_action :runner, only: [:edit, :update, :destroy, :pause, :resume, :show]
...@@ -17,7 +16,7 @@ class Groups::RunnersController < Groups::ApplicationController ...@@ -17,7 +16,7 @@ class Groups::RunnersController < Groups::ApplicationController
end end
def runner_list_group_view_vue_ui_enabled def runner_list_group_view_vue_ui_enabled
return render_404 unless Feature.enabled?(:runner_list_group_view_vue_ui, group, default_enabled: :yaml) render_404 unless Feature.enabled?(:runner_list_group_view_vue_ui, group, default_enabled: :yaml)
end end
def show def show
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment