mirror of
https://github.com/mastodon/mastodon.git
synced 2024-08-20 21:08:15 -07:00
Fix unneeded requests to blocked domains when receiving relayed signed activities from them
This commit is contained in:
parent
693d9b03ed
commit
c64f2ae5a5
1 changed files with 4 additions and 0 deletions
|
@ -2,6 +2,7 @@
|
|||
|
||||
class ActivityPub::ProcessCollectionService < BaseService
|
||||
include JsonLdHelper
|
||||
include DomainControlHelper
|
||||
|
||||
def call(body, actor, **options)
|
||||
@account = actor
|
||||
|
@ -69,6 +70,9 @@ class ActivityPub::ProcessCollectionService < BaseService
|
|||
end
|
||||
|
||||
def verify_account!
|
||||
return unless @json['signature'].is_a?(Hash)
|
||||
return if domain_not_allowed?(@json['signature']['creator'])
|
||||
|
||||
@options[:relayed_through_actor] = @account
|
||||
@account = ActivityPub::LinkedDataSignature.new(@json).verify_actor!
|
||||
@account = nil unless @account.is_a?(Account)
|
||||
|
|
Loading…
Reference in a new issue