Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Punycode URI normalization (#2370)

Browse source 
* Fix #2119 - Whenever about to send a HTTP request, normalize the URI

* Add test for IDN request in FetchLinkCardService

* Perform IDN normalization on domains before they are stored in the DB
This commit is contained in:
Eugen 2017-04-25 02:47:31 +02:00 • committed by GitHub
parent bb04a9be52
commit 17c591ffba
17 changed files with 546 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/services/process_feed_service.rb
View file

@ -174,7 +174,7 @@ class ProcessFeedService < BaseService
end
def account_from_href(href)
url = Addressable::URI.parse(href)
url = Addressable::URI.parse(href).normalize
if TagManager.instance.web_domain?(url.host)
Account.find_local(url.path.gsub('/users/', ''))
@ -195,7 +195,7 @@ class ProcessFeedService < BaseService
next unless link['href']
media = MediaAttachment.where(status: parent, remote_url: link['href']).first_or_initialize(account: parent.account, status: parent, remote_url: link['href'])
parsed_url = URI.parse(link['href'])
parsed_url = Addressable::URI.parse(link['href']).normalize
next if !%w[http https].include?(parsed_url.scheme) || parsed_url.host.empty?
@ -271,7 +271,7 @@ class ProcessFeedService < BaseService
def acct(xml = @xml)
username = xml.at_xpath('./xmlns:author/xmlns:name', xmlns: TagManager::XMLNS).content
url = xml.at_xpath('./xmlns:author/xmlns:uri', xmlns: TagManager::XMLNS).content
domain = Addressable::URI.parse(url).host
domain = Addressable::URI.parse(url).normalize.host
"#{username}@#{domain}"
end