tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add HTTP signatures to all outgoing ActivityPub GET requests (#11284)

Browse Source
This commit is contained in:
Eugen Rochko
2019-07-11 14:49:55 +02:00
committed by GitHub
parent a6dc6a242f
commit 4e8dcc5dbb
6 changed files with 45 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/helpers/jsonld_helper.rb
View File

@ -77,19 +77,12 @@ module JsonLdHelper
end
def fetch_resource_without_id_validation(uri, on_behalf_of = nil, raise_on_temporary_error = false)
on_behalf_of ||= Account.representative
build_request(uri, on_behalf_of).perform do |response|
raise Mastodon::UnexpectedResponseError, response unless response_successful?(response) || response_error_unsalvageable?(response) || !raise_on_temporary_error
return body_to_json(response.body_with_limit) if response.code == 200
end
# If request failed, retry without doing it on behalf of a user
return if on_behalf_of.nil?
build_request(uri).perform do |response|
raise Mastodon::UnexpectedResponseError, response unless response_successful?(response) || response_error_unsalvageable?(response) || !raise_on_temporary_error
response.code == 200 ? body_to_json(response.body_with_limit) : nil
body_to_json(response.body_with_limit) if response.code == 200
end
end