mstdn.y-zu.org/mastodon
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hook up URL-based resource look-up to ActivityPub (#4589)

Browse Source
This commit is contained in:
Eugen Rochko
2017-08-14 02:29:36 +02:00
committed by GitHub
parent a2aeacbfee
commit 4e75f0d889
8 changed files with 95 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/helpers/jsonld_helper.rb
View File

@@ -16,7 +16,11 @@ module JsonLdHelper
def fetch_resource(uri) def fetch_resource(uri)
response = build_request(uri).perform response = build_request(uri).perform
return if response.code != 200 return if response.code != 200
Oj.load(response.to_s, mode: :strict) body_to_json(response.to_s)
end
def body_to_json(body)
body.nil? ? nil : Oj.load(body, mode: :strict)
rescue Oj::ParseError rescue Oj::ParseError
nil nil
end end
@@ -25,7 +29,7 @@ module JsonLdHelper
def build_request(uri) def build_request(uri)
request = Request.new(:get, uri) request = Request.new(:get, uri)
request.add_headers('Accept' => 'application/activity+json') request.add_headers('Accept' => 'application/activity+json, application/ld+json')
request request
end end
end end

4
app/services/activitypub/fetch_remote_account_service.rb
View File

@@ -5,8 +5,8 @@ class ActivityPub::FetchRemoteAccountService < BaseService
# Should be called when uri has already been checked for locality # Should be called when uri has already been checked for locality
# Does a WebFinger roundtrip on each call # Does a WebFinger roundtrip on each call
def call(uri) def call(uri, prefetched_json = nil)
@json = fetch_resource(uri) @json = body_to_json(prefetched_json) || fetch_resource(uri)
return unless supported_context? && expected_type? return unless supported_context? && expected_type?

4
app/services/activitypub/fetch_remote_status_service.rb
View File

@@ -4,8 +4,8 @@ class ActivityPub::FetchRemoteStatusService < BaseService
include JsonLdHelper include JsonLdHelper
# Should be called when uri has already been checked for locality # Should be called when uri has already been checked for locality
def call(uri) def call(uri, prefetched_json = nil)
@json = fetch_resource(uri) @json = body_to_json(prefetched_json) || fetch_resource(uri)
return unless supported_context? && expected_type? return unless supported_context? && expected_type?

82
app/services/fetch_atom_service.rb
View File

@@ -4,18 +4,10 @@ class FetchAtomService < BaseService
def call(url) def call(url)
return if url.blank? return if url.blank?
response = Request.new(:head, url).perform @url = url
Rails.logger.debug "Remote status HEAD request returned code #{response.code}" perform_request
process_response
response = Request.new(:get, url).perform if response.code == 405
Rails.logger.debug "Remote status GET request returned code #{response.code}"
return nil if response.code != 200
return [url, fetch(url)] if response.mime_type == 'application/atom+xml'
return process_headers(url, response) if response['Link'].present?
process_html(fetch(url))
rescue OpenSSL::SSL::SSLError => e rescue OpenSSL::SSL::SSLError => e
Rails.logger.debug "SSL error: #{e}" Rails.logger.debug "SSL error: #{e}"
nil nil
@@ -26,27 +18,57 @@ class FetchAtomService < BaseService
private private
def process_html(body) def perform_request
Rails.logger.debug 'Processing HTML' @response = Request.new(:get, @url)
.add_headers('Accept' => 'application/activity+json, application/ld+json, application/atom+xml, text/html')
page = Nokogiri::HTML(body) .perform
alternate_link = page.xpath('//link[@rel="alternate"]').find { |link| link['type'] == 'application/atom+xml' }
return nil if alternate_link.nil?
[alternate_link['href'], fetch(alternate_link['href'])]
end end
def process_headers(url, response) def process_response(terminal = false)
Rails.logger.debug 'Processing link header' return nil if @response.code != 200
link_header = LinkHeader.parse(response['Link'].is_a?(Array) ? response['Link'].first : response['Link']) if @response.mime_type == 'application/atom+xml'
alternate_link = link_header.find_link(%w(rel alternate), %w(type application/atom+xml)) [@url, @response.to_s, :ostatus]
elsif ['application/activity+json', 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'].include?(@response.mime_type)
return process_html(fetch(url)) if alternate_link.nil? [@url, @response.to_s, :activitypub]
[alternate_link.href, fetch(alternate_link.href)] elsif @response['Link'] && !terminal
end process_headers
elsif @response.mime_type == 'text/html' && !terminal
def fetch(url) process_html
Request.new(:get, url).perform.to_s end
end
def process_html
page = Nokogiri::HTML(@response.to_s)
json_link = page.xpath('//link[@rel="alternate"]').find { |link| ['application/activity+json', 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'].include?(link['type']) }
atom_link = page.xpath('//link[@rel="alternate"]').find { |link| link['type'] == 'application/atom+xml' }
if !json_link.nil?
@url = json_link['href']
perform_request
process_response(true)
elsif !atom_link.nil?
@url = atom_link['href']
perform_request
process_response(true)
end
end
def process_headers
link_header = LinkHeader.parse(@response['Link'].is_a?(Array) ? @response['Link'].first : @response['Link'])
json_link = link_header.find_link(%w(rel alternate), %w(type application/activity+json)) || link_header.find_link(%w(rel alternate), ['type', 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'])
atom_link = link_header.find_link(%w(rel alternate), %w(type application/atom+xml))
if !json_link.nil?
@url = json_link.href
perform_request
process_response(true)
elsif !atom_link.nil?
@url = atom_link.href
perform_request
process_response(true)
end
end end
end end

13
app/services/fetch_remote_account_service.rb
View File

@@ -5,14 +5,19 @@ class FetchRemoteAccountService < BaseService
def call(url, prefetched_body = nil) def call(url, prefetched_body = nil)
if prefetched_body.nil? if prefetched_body.nil?
atom_url, body = FetchAtomService.new.call(url) resource_url, body, protocol = FetchAtomService.new.call(url)
else else
atom_url = url resource_url = url
body = prefetched_body body = prefetched_body
protocol = :ostatus
end end
return nil if atom_url.nil? case protocol
process_atom(atom_url, body) when :ostatus
process_atom(resource_url, body)
when :activitypub
ActivityPub::FetchRemoteAccountService.new.call(resource_url, body)
end
end end
private private

13
app/services/fetch_remote_status_service.rb
View File

@@ -5,14 +5,19 @@ class FetchRemoteStatusService < BaseService
def call(url, prefetched_body = nil) def call(url, prefetched_body = nil)
if prefetched_body.nil? if prefetched_body.nil?
atom_url, body = FetchAtomService.new.call(url) resource_url, body, protocol = FetchAtomService.new.call(url)
else else
atom_url = url resource_url = url
body = prefetched_body body = prefetched_body
protocol = :ostatus
end end
return nil if atom_url.nil? case protocol
process_atom(atom_url, body) when :ostatus
process_atom(resource_url, body)
when :activitypub
ActivityPub::FetchRemoteStatusService.new.call(resource_url, body)
end
end end
private private

26
spec/controllers/api/subscriptions_controller_spec.rb
View File

@@ -38,19 +38,19 @@ RSpec.describe Api::SubscriptionsController, type: :controller do
before do before do
stub_request(:post, "https://quitter.no/main/push/hub").to_return(:status => 200, :body => "", :headers => {}) stub_request(:post, "https://quitter.no/main/push/hub").to_return(:status => 200, :body => "", :headers => {})
stub_request(:get, "https://quitter.no/avatar/7477-300-20160211190340.png").to_return(request_fixture('avatar.txt')) stub_request(:get, "https://quitter.no/avatar/7477-300-20160211190340.png").to_return(request_fixture('avatar.txt'))
stub_request(:head, "https://quitter.no/notice/1269244").to_return(status: 404) stub_request(:get, "https://quitter.no/notice/1269244").to_return(status: 404)
stub_request(:head, "https://quitter.no/notice/1265331").to_return(status: 404) stub_request(:get, "https://quitter.no/notice/1265331").to_return(status: 404)
stub_request(:head, "https://community.highlandarrow.com/notice/54411").to_return(status: 404) stub_request(:get, "https://community.highlandarrow.com/notice/54411").to_return(status: 404)
stub_request(:head, "https://community.highlandarrow.com/notice/53857").to_return(status: 404) stub_request(:get, "https://community.highlandarrow.com/notice/53857").to_return(status: 404)
stub_request(:head, "https://community.highlandarrow.com/notice/51852").to_return(status: 404) stub_request(:get, "https://community.highlandarrow.com/notice/51852").to_return(status: 404)
stub_request(:head, "https://social.umeahackerspace.se/notice/424348").to_return(status: 404) stub_request(:get, "https://social.umeahackerspace.se/notice/424348").to_return(status: 404)
stub_request(:head, "https://community.highlandarrow.com/notice/50467").to_return(status: 404) stub_request(:get, "https://community.highlandarrow.com/notice/50467").to_return(status: 404)
stub_request(:head, "https://quitter.no/notice/1243309").to_return(status: 404) stub_request(:get, "https://quitter.no/notice/1243309").to_return(status: 404)
stub_request(:head, "https://quitter.no/user/7477").to_return(status: 404) stub_request(:get, "https://quitter.no/user/7477").to_return(status: 404)
stub_request(:head, "https://community.highlandarrow.com/user/1").to_return(status: 404) stub_request(:any, "https://community.highlandarrow.com/user/1").to_return(status: 404)
stub_request(:head, "https://social.umeahackerspace.se/user/2").to_return(status: 404) stub_request(:any, "https://social.umeahackerspace.se/user/2").to_return(status: 404)
stub_request(:head, "https://gs.kawa-kun.com/user/2").to_return(status: 404) stub_request(:any, "https://gs.kawa-kun.com/user/2").to_return(status: 404)
stub_request(:head, "https://mastodon.social/users/Gargron").to_return(status: 404) stub_request(:any, "https://mastodon.social/users/Gargron").to_return(status: 404)
request.env['HTTP_X_HUB_SIGNATURE'] = "sha1=#{OpenSSL::HMAC.hexdigest('sha1', 'abc', feed)}" request.env['HTTP_X_HUB_SIGNATURE'] = "sha1=#{OpenSSL::HMAC.hexdigest('sha1', 'abc', feed)}"
request.env['RAW_POST_DATA'] = feed request.env['RAW_POST_DATA'] = feed

5
spec/services/process_feed_service_spec.rb
View File

@@ -124,8 +124,7 @@ RSpec.describe ProcessFeedService do
</entry> </entry>
XML XML
stub_request(:head, 'https://overwatch.com/users/tracer/updates/1').to_return(status: 200, headers: { 'Content-Type' => 'application/atom+xml' }) stub_request(:get, 'https://overwatch.com/users/tracer/updates/1').to_return(status: 200, body: real_body, headers: { 'Content-Type' => 'application/atom+xml' })
stub_request(:get, 'https://overwatch.com/users/tracer/updates/1').to_return(status: 200, body: real_body)
bad_actor = Fabricate(:account, username: 'sombra', domain: 'talon.xyz') bad_actor = Fabricate(:account, username: 'sombra', domain: 'talon.xyz')
@@ -168,7 +167,7 @@ XML
end end
it 'ignores reblogs if it failed to retreive reblogged statuses' do it 'ignores reblogs if it failed to retreive reblogged statuses' do
stub_request(:head, 'https://overwatch.com/users/tracer/updates/1').to_return(status: 404) stub_request(:get, 'https://overwatch.com/users/tracer/updates/1').to_return(status: 404)
actor = Fabricate(:account, username: 'tracer', domain: 'overwatch.com') actor = Fabricate(:account, username: 'tracer', domain: 'overwatch.com')