FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Fix FetchAtomService content type handling (#9132)" (#9171) 

This reverts commit c36a4a1617.
This commit is contained in:
Eugen Rochko 2018-10-31 00:43:34 +01:00 committed by GitHub
parent 50ce347ef9
commit ce2ee68b64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/services/fetch_atom_service.rb
View File

@ -29,7 +29,7 @@ class FetchAtomService < BaseService
def perform_request(&block) def perform_request(&block)
accept = 'text/html' accept = 'text/html'
accept = 'application/activity+json, application/ld+json; profile="https://www.w3.org/ns/activitystreams", application/atom+xml, ' + accept unless @unsupported_activity accept = 'application/activity+json, application/ld+json, application/atom+xml, ' + accept unless @unsupported_activity
Request.new(:get, @url).add_headers('Accept' => accept).perform(&block) Request.new(:get, @url).add_headers('Accept' => accept).perform(&block)
end end
@ -37,11 +37,9 @@ class FetchAtomService < BaseService
def process_response(response, terminal = false) def process_response(response, terminal = false)
return nil if response.code != 200 return nil if response.code != 200
response_type = response.headers['Content-type'] if response.mime_type == 'application/atom+xml'
if response_type == 'application/atom+xml'
[@url, { prefetched_body: response.body_with_limit }, :ostatus] [@url, { prefetched_body: response.body_with_limit }, :ostatus]
elsif ['application/activity+json', 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'].include?(response_type) elsif ['application/activity+json', 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'].include?(response.mime_type)
body = response.body_with_limit body = response.body_with_limit
json = body_to_json(body) json = body_to_json(body)
if supported_context?(json) && equals_or_includes_any?(json['type'], ActivityPub::FetchRemoteAccountService::SUPPORTED_TYPES) && json['inbox'].present? if supported_context?(json) && equals_or_includes_any?(json['type'], ActivityPub::FetchRemoteAccountService::SUPPORTED_TYPES) && json['inbox'].present?
@ -57,7 +55,7 @@ class FetchAtomService < BaseService
if link_header&.find_link(%w(rel alternate)) if link_header&.find_link(%w(rel alternate))
process_link_headers(link_header) process_link_headers(link_header)
elsif response_type == 'text/html' elsif response.mime_type == 'text/html'
process_html(response) process_html(response)
end end
end end

9
spec/services/fetch_atom_service_spec.rb
View File

@ -60,20 +60,13 @@ RSpec.describe FetchAtomService, type: :service do
it { is_expected.to eq [url, { :prefetched_body => "" }, :ostatus] } it { is_expected.to eq [url, { :prefetched_body => "" }, :ostatus] }
end end
context 'content_type is activity+json' do context 'content_type is json' do
let(:content_type) { 'application/activity+json' } let(:content_type) { 'application/activity+json' }
let(:body) { json } let(:body) { json }
it { is_expected.to eq [1, { prefetched_body: body, id: true }, :activitypub] } it { is_expected.to eq [1, { prefetched_body: body, id: true }, :activitypub] }
end end
context 'content_type is ld+json with profile' do
let(:content_type) { 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"' }
let(:body) { json }
it { is_expected.to eq [1, { prefetched_body: body, id: true }, :activitypub] }
end
before do before do
WebMock.stub_request(:get, url).to_return(status: 200, body: body, headers: headers) WebMock.stub_request(:get, url).to_return(status: 200, body: body, headers: headers)
WebMock.stub_request(:get, 'http://example.com/foo').to_return(status: 200, body: json, headers: { 'Content-Type' => 'application/activity+json' }) WebMock.stub_request(:get, 'http://example.com/foo').to_return(status: 200, body: json, headers: { 'Content-Type' => 'application/activity+json' })