Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597)
* 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 commit94e98864e3) * 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 commitb91196f4b7) * Fix authorization check in domain blocks controller (cherry picked from commit7527937758) * 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 commit9094c2f52c) * Fix domain block export not exporting blocks with only media rejection (cherry picked from commit26ff48ee48) * 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>
This commit is contained in:
		@@ -4,6 +4,18 @@ module Admin
 | 
			
		||||
  class DomainBlocksController < BaseController
 | 
			
		||||
    before_action :set_domain_block, only: [:show, :destroy, :edit, :update]
 | 
			
		||||
 | 
			
		||||
    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.save
 | 
			
		||||
    rescue ActionController::ParameterMissing
 | 
			
		||||
      flash[:alert] = I18n.t('admin.domain_blocks.no_domain_block_selected')
 | 
			
		||||
    rescue Mastodon::NotPermittedError
 | 
			
		||||
      flash[:alert] = I18n.t('admin.domain_blocks.not_permitted')
 | 
			
		||||
    else
 | 
			
		||||
      redirect_to admin_instances_path(limited: '1'), notice: I18n.t('admin.domain_blocks.created_msg')
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def new
 | 
			
		||||
      authorize :domain_block, :create?
 | 
			
		||||
      @domain_block = DomainBlock.new(domain: params[:_domain])
 | 
			
		||||
@@ -76,5 +88,15 @@ module Admin
 | 
			
		||||
    def resource_params
 | 
			
		||||
      params.require(:domain_block).permit(:domain, :severity, :reject_media, :reject_reports, :private_comment, :public_comment, :obfuscate)
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def form_domain_block_batch_params
 | 
			
		||||
      params.require(:form_domain_block_batch).permit(domain_blocks_attributes: [:enabled, :domain, :severity, :reject_media, :reject_reports, :private_comment, :public_comment, :obfuscate])
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def action_from_button
 | 
			
		||||
      if params[:save]
 | 
			
		||||
        'save'
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
 
 | 
			
		||||
@@ -19,7 +19,7 @@ module Admin
 | 
			
		||||
    rescue ActionController::ParameterMissing
 | 
			
		||||
      flash[:alert] = I18n.t('admin.email_domain_blocks.no_email_domain_block_selected')
 | 
			
		||||
    rescue Mastodon::NotPermittedError
 | 
			
		||||
      flash[:alert] = I18n.t('admin.custom_emojis.not_permitted')
 | 
			
		||||
      flash[:alert] = I18n.t('admin.email_domain_blocks.not_permitted')
 | 
			
		||||
    ensure
 | 
			
		||||
      redirect_to admin_email_domain_blocks_path
 | 
			
		||||
    end
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										60
									
								
								app/controllers/admin/export_domain_allows_controller.rb
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										60
									
								
								app/controllers/admin/export_domain_allows_controller.rb
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,60 @@
 | 
			
		||||
# frozen_string_literal: true
 | 
			
		||||
 | 
			
		||||
require 'csv'
 | 
			
		||||
 | 
			
		||||
module Admin
 | 
			
		||||
  class ExportDomainAllowsController < BaseController
 | 
			
		||||
    include AdminExportControllerConcern
 | 
			
		||||
 | 
			
		||||
    before_action :set_dummy_import!, only: [:new]
 | 
			
		||||
 | 
			
		||||
    def new
 | 
			
		||||
      authorize :domain_allow, :create?
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def export
 | 
			
		||||
      authorize :instance, :index?
 | 
			
		||||
      send_export_file
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def import
 | 
			
		||||
      authorize :domain_allow, :create?
 | 
			
		||||
      begin
 | 
			
		||||
        @import = Admin::Import.new(import_params)
 | 
			
		||||
        return render :new unless @import.validate
 | 
			
		||||
 | 
			
		||||
        parse_import_data!(export_headers)
 | 
			
		||||
 | 
			
		||||
        @data.take(Admin::Import::ROWS_PROCESSING_LIMIT).each do |row|
 | 
			
		||||
          domain = row['#domain'].strip
 | 
			
		||||
          next if DomainAllow.allowed?(domain)
 | 
			
		||||
 | 
			
		||||
          domain_allow = DomainAllow.new(domain: domain)
 | 
			
		||||
          log_action :create, domain_allow if domain_allow.save
 | 
			
		||||
        end
 | 
			
		||||
        flash[:notice] = I18n.t('admin.domain_allows.created_msg')
 | 
			
		||||
      rescue ActionController::ParameterMissing
 | 
			
		||||
        flash[:error] = I18n.t('admin.export_domain_allows.no_file')
 | 
			
		||||
      end
 | 
			
		||||
      redirect_to admin_instances_path
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    private
 | 
			
		||||
 | 
			
		||||
    def export_filename
 | 
			
		||||
      'domain_allows.csv'
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def export_headers
 | 
			
		||||
      %w(#domain)
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def export_data
 | 
			
		||||
      CSV.generate(headers: export_headers, write_headers: true) do |content|
 | 
			
		||||
        DomainAllow.allowed_domains.each do |instance|
 | 
			
		||||
          content << [instance.domain]
 | 
			
		||||
        end
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
							
								
								
									
										71
									
								
								app/controllers/admin/export_domain_blocks_controller.rb
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										71
									
								
								app/controllers/admin/export_domain_blocks_controller.rb
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,71 @@
 | 
			
		||||
# frozen_string_literal: true
 | 
			
		||||
 | 
			
		||||
require 'csv'
 | 
			
		||||
 | 
			
		||||
module Admin
 | 
			
		||||
  class ExportDomainBlocksController < BaseController
 | 
			
		||||
    include AdminExportControllerConcern
 | 
			
		||||
 | 
			
		||||
    before_action :set_dummy_import!, only: [:new]
 | 
			
		||||
 | 
			
		||||
    def new
 | 
			
		||||
      authorize :domain_block, :create?
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def export
 | 
			
		||||
      authorize :instance, :index?
 | 
			
		||||
      send_export_file
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def import
 | 
			
		||||
      authorize :domain_block, :create?
 | 
			
		||||
 | 
			
		||||
      @import = Admin::Import.new(import_params)
 | 
			
		||||
      return render :new unless @import.validate
 | 
			
		||||
 | 
			
		||||
      parse_import_data!(export_headers)
 | 
			
		||||
 | 
			
		||||
      @global_private_comment = I18n.t('admin.export_domain_blocks.import.private_comment_template', source: @import.data_file_name, date: I18n.l(Time.now.utc))
 | 
			
		||||
 | 
			
		||||
      @form = Form::DomainBlockBatch.new
 | 
			
		||||
      @domain_blocks = @data.take(Admin::Import::ROWS_PROCESSING_LIMIT).filter_map do |row|
 | 
			
		||||
        domain = row['#domain'].strip
 | 
			
		||||
        next if DomainBlock.rule_for(domain).present?
 | 
			
		||||
 | 
			
		||||
        domain_block = DomainBlock.new(domain: domain,
 | 
			
		||||
                                       severity: row['#severity'].strip,
 | 
			
		||||
                                       reject_media: row['#reject_media'].strip,
 | 
			
		||||
                                       reject_reports: row['#reject_reports'].strip,
 | 
			
		||||
                                       private_comment: @global_private_comment,
 | 
			
		||||
                                       public_comment: row['#public_comment']&.strip,
 | 
			
		||||
                                       obfuscate: row['#obfuscate'].strip)
 | 
			
		||||
 | 
			
		||||
        domain_block if domain_block.valid?
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      @warning_domains = Instance.where(domain: @domain_blocks.map(&:domain)).where('EXISTS (SELECT 1 FROM follows JOIN accounts ON follows.account_id = accounts.id OR follows.target_account_id = accounts.id WHERE accounts.domain = instances.domain)').pluck(:domain)
 | 
			
		||||
    rescue ActionController::ParameterMissing
 | 
			
		||||
      flash.now[:alert] = I18n.t('admin.export_domain_blocks.no_file')
 | 
			
		||||
      set_dummy_import!
 | 
			
		||||
      render :new
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    private
 | 
			
		||||
 | 
			
		||||
    def export_filename
 | 
			
		||||
      'domain_blocks.csv'
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def export_headers
 | 
			
		||||
      %w(#domain #severity #reject_media #reject_reports #public_comment #obfuscate)
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def export_data
 | 
			
		||||
      CSV.generate(headers: export_headers, write_headers: true) do |content|
 | 
			
		||||
        DomainBlock.with_limitations.each do |instance|
 | 
			
		||||
          content << [instance.domain, instance.severity, instance.reject_media, instance.reject_reports, instance.public_comment, instance.obfuscate]
 | 
			
		||||
        end
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
							
								
								
									
										39
									
								
								app/controllers/concerns/admin_export_controller_concern.rb
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										39
									
								
								app/controllers/concerns/admin_export_controller_concern.rb
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,39 @@
 | 
			
		||||
# frozen_string_literal: true
 | 
			
		||||
 | 
			
		||||
module AdminExportControllerConcern
 | 
			
		||||
  extend ActiveSupport::Concern
 | 
			
		||||
 | 
			
		||||
  private
 | 
			
		||||
 | 
			
		||||
  def send_export_file
 | 
			
		||||
    respond_to do |format|
 | 
			
		||||
      format.csv { send_data export_data, filename: export_filename }
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def export_data
 | 
			
		||||
    raise 'Override in controller'
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def export_filename
 | 
			
		||||
    raise 'Override in controller'
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def set_dummy_import!
 | 
			
		||||
    @import = Admin::Import.new
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def import_params
 | 
			
		||||
    params.require(:admin_import).permit(:data)
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def import_data_path
 | 
			
		||||
    params[:admin_import][:data].path
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def parse_import_data!(default_headers)
 | 
			
		||||
    data = CSV.read(import_data_path, headers: true, encoding: 'UTF-8')
 | 
			
		||||
    data = CSV.read(import_data_path, headers: default_headers, encoding: 'UTF-8') unless data.headers&.first&.strip&.include?(default_headers[0])
 | 
			
		||||
    @data = data.reject(&:blank?)
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
		Reference in New Issue
	
	Block a user