techhub/mastodon
2
0
Fork 0
Code Activity

Fix unneeded requests to blocked domains when receiving relayed signed activities from them (#31161)

Browse Source
This commit is contained in:
Claire
2024-10-01 14:52:13 +02:00
committed by GitHub
parent c5f0da98e4
commit 7b92cf3b47
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/services/activitypub/process_collection_service.rb
View File

@@ -2,6 +2,7 @@
class ActivityPub::ProcessCollectionService < BaseService class ActivityPub::ProcessCollectionService < BaseService
include JsonLdHelper include JsonLdHelper
include DomainControlHelper
def call(body, actor, **options) def call(body, actor, **options)
@account = actor @account = actor
@@ -69,6 +70,9 @@ class ActivityPub::ProcessCollectionService < BaseService
end end
def verify_account! def verify_account!
return unless @json['signature'].is_a?(Hash)
return if domain_not_allowed?(@json['signature']['creator'])
@options[:relayed_through_actor] = @account @options[:relayed_through_actor] = @account
@account = ActivityPub::LinkedDataSignature.new(@json).verify_actor! @account = ActivityPub::LinkedDataSignature.new(@json).verify_actor!
@account = nil unless @account.is_a?(Account) @account = nil unless @account.is_a?(Account)