Optimize uri normalization (#4212)

* Add dependency on idn-ruby to speed up URI normalization

* Use normalized_host instead of normalize.host when applicable

When we are only interested in the normalized host, calling normalized_host
avoids normalizing the other components of the URI as well as creating a
new object
signup-info-prompt
ThibG 2017-07-15 17:24:35 +02:00 committed by Eugen Rochko
parent bd915d9398
commit 05cd37097c
6 changed files with 8 additions and 5 deletions

View File

@ -36,6 +36,7 @@ gem 'htmlentities', '~> 4.3'
gem 'http', '~> 2.2' gem 'http', '~> 2.2'
gem 'http_accept_language', '~> 2.1' gem 'http_accept_language', '~> 2.1'
gem 'httplog', '~> 0.99' gem 'httplog', '~> 0.99'
gem 'idn-ruby', require: 'idn'
gem 'kaminari', '~> 1.0' gem 'kaminari', '~> 1.0'
gem 'link_header', '~> 0.0' gem 'link_header', '~> 0.0'
gem 'mime-types', '~> 3.1' gem 'mime-types', '~> 3.1'

View File

@ -208,6 +208,7 @@ GEM
parser (>= 2.2.3.0) parser (>= 2.2.3.0)
rainbow (~> 2.2) rainbow (~> 2.2)
terminal-table (>= 1.5.1) terminal-table (>= 1.5.1)
idn-ruby (0.1.0)
jmespath (1.3.1) jmespath (1.3.1)
json (2.1.0) json (2.1.0)
jsonapi-renderer (0.1.2) jsonapi-renderer (0.1.2)
@ -528,6 +529,7 @@ DEPENDENCIES
http_accept_language (~> 2.1) http_accept_language (~> 2.1)
httplog (~> 0.99) httplog (~> 0.99)
i18n-tasks (~> 0.9) i18n-tasks (~> 0.9)
idn-ruby
kaminari (~> 1.0) kaminari (~> 1.0)
letter_opener (~> 1.4) letter_opener (~> 1.4)
letter_opener_web (~> 1.3) letter_opener_web (~> 1.3)

View File

@ -70,7 +70,7 @@ class TagManager
uri = Addressable::URI.new uri = Addressable::URI.new
uri.host = domain.gsub(/[\/]/, '') uri.host = domain.gsub(/[\/]/, '')
uri.normalize.host uri.normalized_host
end end
def same_acct?(canonical, needle) def same_acct?(canonical, needle)

View File

@ -14,7 +14,7 @@ module AuthorExtractor
return nil if username.blank? || uri.blank? return nil if username.blank? || uri.blank?
domain = Addressable::URI.parse(uri).normalize.host domain = Addressable::URI.parse(uri).normalized_host
acct = "#{username}@#{domain}" acct = "#{username}@#{domain}"
end end

View File

@ -24,7 +24,7 @@ class FetchRemoteStatusService < BaseService
xml.encoding = 'utf-8' xml.encoding = 'utf-8'
account = author_from_xml(xml.at_xpath('/xmlns:entry', xmlns: TagManager::XMLNS)) account = author_from_xml(xml.at_xpath('/xmlns:entry', xmlns: TagManager::XMLNS))
domain = Addressable::URI.parse(url).normalize.host domain = Addressable::URI.parse(url).normalized_host
return nil unless !account.nil? && confirmed_domain?(domain, account) return nil unless !account.nil? && confirmed_domain?(domain, account)
@ -39,6 +39,6 @@ class FetchRemoteStatusService < BaseService
end end
def confirmed_domain?(domain, account) def confirmed_domain?(domain, account)
account.domain.nil? || domain.casecmp(account.domain).zero? || domain.casecmp(Addressable::URI.parse(account.remote_url).normalize.host).zero? account.domain.nil? || domain.casecmp(account.domain).zero? || domain.casecmp(Addressable::URI.parse(account.remote_url).normalized_host).zero?
end end
end end

View File

@ -43,7 +43,7 @@ class Pubsubhubbub::DeliveryWorker
end end
def host def host
Addressable::URI.parse(subscription.callback_url).normalize.host Addressable::URI.parse(subscription.callback_url).normalized_host
end end
def headers def headers