* Allow import/export of instance-level domain blocks/allows (#1754) * Allow import/export of instance-level domain blocks/allows. Fixes #15095 * Pacify circleci * Address simple code review feedback * Add headers to exported CSV * Extract common import/export functionality to AdminExportControllerConcern * Add additional fields to instance-blocked domain export * Address review feedback * Split instance domain block/allow import/export into separate pages/controllers * Address code review feedback * Pacify DeepSource * Work around Paperclip::HasAttachmentFile for Rails 6 * Fix deprecated API warning in export tests * Remove after_commit workaround (cherry picked from commit 94e98864e39c010635e839fea984f2b4893bef1a) * Add confirmation page when importing blocked domains (#1773) * Move glitch-soc-specific strings to glitch-soc-specific locale files * Add confirmation page when importing blocked domains (cherry picked from commit b91196f4b73fff91997b8077619ae25b6d04a59e) * Fix authorization check in domain blocks controller (cherry picked from commit 75279377583c6e2aa04cc8d7380c593979630b38) * Fix error strings for domain blocks and email-domain blocks Corrected issue with non-error message used for Mastodon:NotPermittedError in Domain Blocks Corrected issue Domain Blocks using the Email Domain Blocks message on ActionContoller::ParameterMissing Corrected issue with Email Domain Blocks using the not_permitted string from "custom emojii's" * Ran i18n-tasks normalize to address test failure * Removed unused admin.export_domain_blocks.not_permitted string Removing unused string as indicated by Check i18n * Fix tests (cherry picked from commit 9094c2f52c24e1c00b594e7c11cd00e4a07eb431) * Fix domain block export not exporting blocks with only media rejection (cherry picked from commit 26ff48ee48a5c03a2a4b0bd03fd322529e6bd960) * Fix various issues with domain block import - stop using Paperclip for processing domain allow/block imports - stop leaving temporary files - better error handling - assume CSV files are UTF-8-encoded (cherry picked from commit cad824d8f501b95377e4f0a957e5a00d517a1902) Co-authored-by: Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>
		
			
				
	
	
		
			89 lines
		
	
	
	
		
			2.7 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			89 lines
		
	
	
	
		
			2.7 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
| # frozen_string_literal: true
 | |
| 
 | |
| module Admin
 | |
|   class EmailDomainBlocksController < BaseController
 | |
|     before_action :set_email_domain_block, only: [:show, :destroy]
 | |
| 
 | |
|     def index
 | |
|       authorize :email_domain_block, :index?
 | |
| 
 | |
|       @email_domain_blocks = EmailDomainBlock.where(parent_id: nil).includes(:children).order(id: :desc).page(params[:page])
 | |
|       @form                = Form::EmailDomainBlockBatch.new
 | |
|     end
 | |
| 
 | |
|     def batch
 | |
|       authorize :email_domain_block, :index?
 | |
| 
 | |
|       @form = Form::EmailDomainBlockBatch.new(form_email_domain_block_batch_params.merge(current_account: current_account, action: action_from_button))
 | |
|       @form.save
 | |
|     rescue ActionController::ParameterMissing
 | |
|       flash[:alert] = I18n.t('admin.email_domain_blocks.no_email_domain_block_selected')
 | |
|     rescue Mastodon::NotPermittedError
 | |
|       flash[:alert] = I18n.t('admin.email_domain_blocks.not_permitted')
 | |
|     ensure
 | |
|       redirect_to admin_email_domain_blocks_path
 | |
|     end
 | |
| 
 | |
|     def new
 | |
|       authorize :email_domain_block, :create?
 | |
|       @email_domain_block = EmailDomainBlock.new(domain: params[:_domain])
 | |
|     end
 | |
| 
 | |
|     def create
 | |
|       authorize :email_domain_block, :create?
 | |
| 
 | |
|       @email_domain_block = EmailDomainBlock.new(resource_params)
 | |
| 
 | |
|       if action_from_button == 'save'
 | |
|         EmailDomainBlock.transaction do
 | |
|           @email_domain_block.save!
 | |
|           log_action :create, @email_domain_block
 | |
| 
 | |
|           (@email_domain_block.other_domains || []).uniq.each do |domain|
 | |
|             next if EmailDomainBlock.where(domain: domain).exists?
 | |
| 
 | |
|             other_email_domain_block = EmailDomainBlock.create!(domain: domain, parent: @email_domain_block)
 | |
|             log_action :create, other_email_domain_block
 | |
|           end
 | |
|         end
 | |
| 
 | |
|         redirect_to admin_email_domain_blocks_path, notice: I18n.t('admin.email_domain_blocks.created_msg')
 | |
|       else
 | |
|         set_resolved_records
 | |
|         render :new
 | |
|       end
 | |
|     rescue ActiveRecord::RecordInvalid
 | |
|       set_resolved_records
 | |
|       render :new
 | |
|     end
 | |
| 
 | |
|     private
 | |
| 
 | |
|     def set_email_domain_block
 | |
|       @email_domain_block = EmailDomainBlock.find(params[:id])
 | |
|     end
 | |
| 
 | |
|     def set_resolved_records
 | |
|       Resolv::DNS.open do |dns|
 | |
|         dns.timeouts = 5
 | |
|         @resolved_records = dns.getresources(@email_domain_block.domain, Resolv::DNS::Resource::IN::MX).to_a
 | |
|       end
 | |
|     end
 | |
| 
 | |
|     def resource_params
 | |
|       params.require(:email_domain_block).permit(:domain, other_domains: [])
 | |
|     end
 | |
| 
 | |
|     def form_email_domain_block_batch_params
 | |
|       params.require(:form_email_domain_block_batch).permit(email_domain_block_ids: [])
 | |
|     end
 | |
| 
 | |
|     def action_from_button
 | |
|       if params[:delete]
 | |
|         'delete'
 | |
|       elsif params[:save]
 | |
|         'save'
 | |
|       end
 | |
|     end
 | |
|   end
 | |
| end
 |