erik/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00
Code Issues Projects Releases Wiki Activity

Improve redirect handling in FetchAtomService

Browse source
This commit is contained in:
Eugen Rochko 2016-09-26 17:04:05 +02:00
parent c6b0311b86
commit 210362e665
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/services/fetch_atom_service.rb
View file

@ -8,7 +8,7 @@ class FetchAtomService < BaseService
if response.mime_type == 'application/atom+xml' if response.mime_type == 'application/atom+xml'
return [url, fetch(url)] return [url, fetch(url)]
elsif !response['Link'].blank? elsif !response['Link'].blank?
return process_headers(response) return process_headers(url, response)
else else
return process_html(fetch(url)) return process_html(fetch(url))
end end
@ -26,13 +26,13 @@ class FetchAtomService < BaseService
return [alternate_link['href'], fetch(alternate_link['href'])] return [alternate_link['href'], fetch(alternate_link['href'])]
end end
def process_headers(response) def process_headers(url, response)
Rails.logger.debug "Processing link header" Rails.logger.debug "Processing link header"
link_header = LinkHeader.parse(response['Link']) link_header = LinkHeader.parse(response['Link'])
alternate_link = link_header.find_link(['rel', 'alternate'], ['type', 'application/atom+xml']) alternate_link = link_header.find_link(['rel', 'alternate'], ['type', 'application/atom+xml'])
return nil if alternate_link.nil? return process_html(fetch(url)) if alternate_link.nil?
return [alternate_link.href, fetch(alternate_link.href)] return [alternate_link.href, fetch(alternate_link.href)]
end end
@ -41,6 +41,6 @@ class FetchAtomService < BaseService
end end
def http_client def http_client
HTTP.timeout(:per_operation, write: 20, connect: 20, read: 50) HTTP.timeout(:per_operation, write: 20, connect: 20, read: 50).follow
end end
end end

1
app/services/fetch_remote_account_service.rb
View file

@ -9,6 +9,7 @@ class FetchRemoteAccountService < BaseService
private private
def process_atom(url, body) def process_atom(url, body)
xml = Nokogiri::XML(body)
url_parts = Addressable::URI.parse(url) url_parts = Addressable::URI.parse(url)
username = xml.at_xpath('//xmlns:author/xmlns:name').try(:content) username = xml.at_xpath('//xmlns:author/xmlns:name').try(:content)
domain = url_parts.host domain = url_parts.host