Fix removing allowed domains being done synchronously (#14302)
* Fix removing allowed domains being done synchronously * Add tests
This commit is contained in:
		
							
								
								
									
										9
									
								
								app/services/after_unallow_domain_service.rb
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								app/services/after_unallow_domain_service.rb
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,9 @@
 | 
			
		||||
# frozen_string_literal: true
 | 
			
		||||
 | 
			
		||||
class AfterUnallowDomainService < BaseService
 | 
			
		||||
  def call(domain)
 | 
			
		||||
    Account.where(domain: domain).find_each do |account|
 | 
			
		||||
      SuspendAccountService.new.call(account, reserve_username: false)
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
@ -12,8 +12,7 @@ class UnallowDomainService < BaseService
 | 
			
		||||
  private
 | 
			
		||||
 | 
			
		||||
  def suspend_accounts!(domain)
 | 
			
		||||
    Account.where(domain: domain).find_each do |account|
 | 
			
		||||
      SuspendAccountService.new.call(account, reserve_username: false)
 | 
			
		||||
    end
 | 
			
		||||
    Account.where(domain: domain).in_batches.update_all(suspended_at: Time.now.utc)
 | 
			
		||||
    AfterUnallowDomainWorker.perform_async(domain)
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										9
									
								
								app/workers/after_unallow_domain_worker.rb
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								app/workers/after_unallow_domain_worker.rb
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,9 @@
 | 
			
		||||
# frozen_string_literal: true
 | 
			
		||||
 | 
			
		||||
class AfterUnallowDomainWorker
 | 
			
		||||
  include Sidekiq::Worker
 | 
			
		||||
 | 
			
		||||
  def perform(domain)
 | 
			
		||||
    AfterUnallowDomainService.new.call(domain)
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
							
								
								
									
										64
									
								
								spec/services/unallow_domain_service_spec.rb
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										64
									
								
								spec/services/unallow_domain_service_spec.rb
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,64 @@
 | 
			
		||||
require 'rails_helper'
 | 
			
		||||
 | 
			
		||||
RSpec.describe UnallowDomainService, type: :service do
 | 
			
		||||
  let!(:bad_account) { Fabricate(:account, username: 'badguy666', domain: 'evil.org') }
 | 
			
		||||
  let!(:bad_status1) { Fabricate(:status, account: bad_account, text: 'You suck') }
 | 
			
		||||
  let!(:bad_status2) { Fabricate(:status, account: bad_account, text: 'Hahaha') }
 | 
			
		||||
  let!(:bad_attachment) { Fabricate(:media_attachment, account: bad_account, status: bad_status2, file: attachment_fixture('attachment.jpg')) }
 | 
			
		||||
  let!(:already_banned_account) { Fabricate(:account, username: 'badguy', domain: 'evil.org', suspended: true, silenced: true) }
 | 
			
		||||
  let!(:domain_allow) { Fabricate(:domain_allow, domain: 'evil.org') }
 | 
			
		||||
 | 
			
		||||
  subject { UnallowDomainService.new }
 | 
			
		||||
 | 
			
		||||
  context 'in limited federation mode' do
 | 
			
		||||
    before do
 | 
			
		||||
      allow(subject).to receive(:whitelist_mode?).and_return(true)
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    describe '#call' do
 | 
			
		||||
      before do
 | 
			
		||||
        subject.call(domain_allow)
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      it 'removes the allowed domain' do
 | 
			
		||||
        expect(DomainAllow.allowed?('evil.org')).to be false
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      it 'removes remote accounts from that domain' do
 | 
			
		||||
        expect(Account.where(domain: 'evil.org').exists?).to be false
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      it 'removes the remote accounts\'s statuses and media attachments' do
 | 
			
		||||
        expect { bad_status1.reload }.to raise_exception ActiveRecord::RecordNotFound
 | 
			
		||||
        expect { bad_status2.reload }.to raise_exception ActiveRecord::RecordNotFound
 | 
			
		||||
        expect { bad_attachment.reload }.to raise_exception ActiveRecord::RecordNotFound
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  context 'without limited federation mode' do
 | 
			
		||||
    before do
 | 
			
		||||
      allow(subject).to receive(:whitelist_mode?).and_return(false)
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    describe '#call' do
 | 
			
		||||
      before do
 | 
			
		||||
        subject.call(domain_allow)
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      it 'removes the allowed domain' do
 | 
			
		||||
        expect(DomainAllow.allowed?('evil.org')).to be false
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      it 'does not remove accounts from that domain' do
 | 
			
		||||
        expect(Account.where(domain: 'evil.org').exists?).to be true
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      it 'removes the remote accounts\'s statuses and media attachments' do
 | 
			
		||||
        expect { bad_status1.reload }.to_not raise_exception ActiveRecord::RecordNotFound
 | 
			
		||||
        expect { bad_status2.reload }.to_not raise_exception ActiveRecord::RecordNotFound
 | 
			
		||||
        expect { bad_attachment.reload }.to_not raise_exception ActiveRecord::RecordNotFound
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
		Reference in New Issue
	
	Block a user