gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-09-08 18:59:11 +00:00
Code Issues Actions 20 Packages Projects Releases Wiki Activity

Move authorize to before action

Browse Source
This commit is contained in:
Matt Jankowski 2025-07-20 12:07:35 -04:00
parent 25f1a515f8
commit 523e7ee2cd
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/admin/domain_blocks_controller.rb
View File

@ -4,6 +4,8 @@ module Admin
class DomainBlocksController < BaseController class DomainBlocksController < BaseController
before_action :set_domain_block, only: [:destroy, :edit, :update] before_action :set_domain_block, only: [:destroy, :edit, :update]
before_action :authorize_domain_block_create, only: [:batch, :new, :create]
PERMITTED_PARAMS = %i( PERMITTED_PARAMS = %i(
domain domain
obfuscate obfuscate
@ -17,7 +19,6 @@ module Admin
PERMITTED_UPDATE_PARAMS = PERMITTED_PARAMS.without(:domain).freeze PERMITTED_UPDATE_PARAMS = PERMITTED_PARAMS.without(:domain).freeze
def batch def batch
authorize :domain_block, :create?
@form = Form::DomainBlockBatch.new(form_domain_block_batch_params.merge(current_account: current_account, action: action_from_button)) @form = Form::DomainBlockBatch.new(form_domain_block_batch_params.merge(current_account: current_account, action: action_from_button))
@form.save @form.save
rescue ActionController::ParameterMissing rescue ActionController::ParameterMissing
@ -31,7 +32,6 @@ module Admin
end end
def new def new
authorize :domain_block, :create?
@domain_block = DomainBlock.new(domain: params[:_domain]) @domain_block = DomainBlock.new(domain: params[:_domain])
end end
@ -40,8 +40,6 @@ module Admin
end end
def create def create
authorize :domain_block, :create?
@domain_block = DomainBlock.new(resource_params) @domain_block = DomainBlock.new(resource_params)
existing_domain_block = resource_params[:domain].present? ? DomainBlock.rule_for(resource_params[:domain]) : nil existing_domain_block = resource_params[:domain].present? ? DomainBlock.rule_for(resource_params[:domain]) : nil
@ -97,6 +95,10 @@ module Admin
private private
def authorize_domain_block_create
authorize :domain_block, :create?
end
def set_domain_block def set_domain_block
@domain_block = DomainBlock.find(params[:id]) @domain_block = DomainBlock.find(params[:id])
end end