gearheads/mastodon
Archived
2
0
Fork 0
Code Releases 4 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

31
app/models/account.rb
View file

@ -182,22 +182,22 @@ class Account < ApplicationRecord
end
def avatar_remote_url=(url)
parsed_url = URI.parse(url)
parsed_url = Addressable::URI.parse(url).normalize
return if !%w(http https).include?(parsed_url.scheme) || parsed_url.host.empty? || self[:avatar_remote_url] == url
self.avatar = parsed_url
self.avatar = URI.parse(parsed_url.to_s)
self[:avatar_remote_url] = url
rescue OpenURI::HTTPError => e
Rails.logger.debug "Error fetching remote avatar: #{e}"
end
def header_remote_url=(url)
parsed_url = URI.parse(url)
parsed_url = Addressable::URI.parse(url).normalize
return if !%w(http https).include?(parsed_url.scheme) || parsed_url.host.empty? || self[:header_remote_url] == url
self.header = parsed_url
self.header = URI.parse(parsed_url.to_s)
self[:header_remote_url] = url
rescue OpenURI::HTTPError => e
Rails.logger.debug "Error fetching remote header: #{e}"
@ -331,16 +331,25 @@ class Account < ApplicationRecord
end
end
before_create do
if local?
keypair = OpenSSL::PKey::RSA.new(Rails.env.test? ? 1024 : 2048)
self.private_key = keypair.to_pem
self.public_key = keypair.public_key.to_pem
end
end
before_create :generate_keys
before_validation :normalize_domain
private
def generate_keys
return unless local?
keypair = OpenSSL::PKey::RSA.new(Rails.env.test? ? 1024 : 2048)
self.private_key = keypair.to_pem
self.public_key = keypair.public_key.to_pem
end
def normalize_domain
return if local?
self.domain = TagManager.instance.normalize_domain(domain)
end
def set_file_extensions
unless avatar.blank?
extension = Paperclip::Interpolations.content_type_extension(avatar, :original)