Browse Source

Change domain block behaviour to prevent creation of accounts from suspended domains (#11219)

master
Eugen Rochko 5 years ago
committed by GitHub
parent
commit
2cfa427ea7
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
  1. +3
    -1
      app/services/activitypub/process_account_service.rb
  2. +1
    -1
      app/services/resolve_account_service.rb

+ 3
- 1
app/services/activitypub/process_account_service.rb View File

@ -15,6 +15,8 @@ class ActivityPub::ProcessAccountService < BaseService
@domain = domain @domain = domain
@collections = {} @collections = {}
return if auto_suspend?
RedisLock.acquire(lock_options) do |lock| RedisLock.acquire(lock_options) do |lock|
if lock.acquired? if lock.acquired?
@account = Account.find_remote(@username, @domain) @account = Account.find_remote(@username, @domain)
@ -55,7 +57,7 @@ class ActivityPub::ProcessAccountService < BaseService
@account.domain = @domain @account.domain = @domain
@account.private_key = nil @account.private_key = nil
@account.suspended_at = domain_block.created_at if auto_suspend? @account.suspended_at = domain_block.created_at if auto_suspend?
@account.silenced_at = domain_block.created_at if auto_silence?
@account.silenced_at = domain_block.created_at if auto_silence?
end end
def update_account def update_account

+ 1
- 1
app/services/resolve_account_service.rb View File

@ -48,7 +48,7 @@ class ResolveAccountService < BaseService
return return
end end
return if links_missing?
return if links_missing? || auto_suspend?
return Account.find_local(@username) if TagManager.instance.local_domain?(@domain) return Account.find_local(@username) if TagManager.instance.local_domain?(@domain)
RedisLock.acquire(lock_options) do |lock| RedisLock.acquire(lock_options) do |lock|

Loading…
Cancel
Save