Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Gargron merged 1 commit into from
Oct 30, 2018
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions app/services/fetch_atom_service.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,17 @@ def process(url, terminal = false)

def perform_request(&block)
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)
end

def process_response(response, terminal = false)
return nil if response.code != 200

response_type = response.headers['Content-type']

if response_type == 'application/atom+xml'
if response.mime_type == 'application/atom+xml'
[@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
json = body_to_json(body)
if supported_context?(json) && equals_or_includes_any?(json['type'], ActivityPub::FetchRemoteAccountService::SUPPORTED_TYPES) && json['inbox'].present?
Expand All @@ -57,7 +55,7 @@ def process_response(response, terminal = false)

if link_header&.find_link(%w(rel alternate))
process_link_headers(link_header)
elsif response_type == 'text/html'
elsif response.mime_type == 'text/html'
process_html(response)
end
end
Expand Down
9 changes: 1 addition & 8 deletions spec/services/fetch_atom_service_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,20 +60,13 @@
it { is_expected.to eq [url, { :prefetched_body => "" }, :ostatus] }
end

context 'content_type is activity+json' do
context 'content_type is json' do
let(:content_type) { 'application/activity+json' }
let(:body) { json }

it { is_expected.to eq [1, { prefetched_body: body, id: true }, :activitypub] }
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
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' })
Expand Down
⚡