zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 10 Releases Wiki Activity

Fix trying to fetch key from empty URI when verifying HTTP signature (#16100)

This commit is contained in:
Eugen Rochko 2021-05-01 23:18:59 +02:00 committed by GitHub
parent 422df9d670
commit f627d2eb93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/jsonld_helper.rb
View File

@ -67,7 +67,7 @@ module JsonLdHelper
unless id unless id
json = fetch_resource_without_id_validation(uri, on_behalf_of) json = fetch_resource_without_id_validation(uri, on_behalf_of)
return unless json return if !json.is_a?(Hash) || unsupported_uri_scheme?(json['id'])
uri = json['id'] uri = json['id']
end end

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

@ -5,6 +5,8 @@ class ActivityPub::FetchRemoteKeyService < BaseService
# Returns account that owns the key # Returns account that owns the key
def call(uri, id: true, prefetched_body: nil) def call(uri, id: true, prefetched_body: nil)
return if uri.blank?
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)