alex
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash in FetchRemoteKeyService (#19225) 

Fix regression from #19212
rebase/4.0.0rc1
Claire 2022-09-24 07:41:01 +02:00 committed by GitHub
parent 0c99c6c3df
commit 85890bc80f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/services/activitypub/fetch_remote_key_service.rb
View File

@ -12,7 +12,7 @@ class ActivityPub::FetchRemoteKeyService < BaseService
if prefetched_body.nil? if prefetched_body.nil?
if id if id
@json = fetch_resource_without_id_validation(uri) @json = fetch_resource_without_id_validation(uri)
if person? if actor_type?
@json = fetch_resource(@json['id'], true) @json = fetch_resource(@json['id'], true)
elsif uri != @json['id'] elsif uri != @json['id']
raise Error, "Fetched URI #{uri} has wrong id #{@json['id']}" raise Error, "Fetched URI #{uri} has wrong id #{@json['id']}"
@ -27,7 +27,7 @@ class ActivityPub::FetchRemoteKeyService < BaseService
raise Error, "Unable to fetch key JSON at #{uri}" if @json.nil? raise Error, "Unable to fetch key JSON at #{uri}" if @json.nil?
raise Error, "Unsupported JSON-LD context for document #{uri}" unless supported_context?(@json) raise Error, "Unsupported JSON-LD context for document #{uri}" unless supported_context?(@json)
raise Error, "Unexpected object type for key #{uri}" unless expected_type? raise Error, "Unexpected object type for key #{uri}" unless expected_type?
return find_actor(@json['id'], @json, suppress_errors) if person? return find_actor(@json['id'], @json, suppress_errors) if actor_type?
@owner = fetch_resource(owner_uri, true) @owner = fetch_resource(owner_uri, true)
@ -51,10 +51,10 @@ class ActivityPub::FetchRemoteKeyService < BaseService
end end
def expected_type? def expected_type?
actor? || public_key? actor_type? || public_key?
end end
def actor? def actor_type?
equals_or_includes_any?(@json['type'], ActivityPub::FetchRemoteActorService::SUPPORTED_TYPES) equals_or_includes_any?(@json['type'], ActivityPub::FetchRemoteActorService::SUPPORTED_TYPES)
end end