diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-04-25 02:47:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-25 02:47:31 +0200 |
| commit | 17c591ffba59bda512fe43a09c06c40324acc472 (patch) | |
| tree | c03ba1c23b0adf46230b3b97b62efb018c26ded5 /app/controllers | |
| parent | bb04a9be52e005fb8bbeef22e5b8d30f0d202903 (diff) | |
Punycode URI normalization (#2370)
* 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
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/api/push_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/authorize_follow_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/api/push_controller.rb b/app/controllers/api/push_controller.rb index f2ddfd969..bc547d653 100644 --- a/app/controllers/api/push_controller.rb +++ b/app/controllers/api/push_controller.rb @@ -26,7 +26,7 @@ class Api::PushController < ApiController def topic_to_account(topic_url) return if topic_url.blank? - uri = Addressable::URI.parse(topic_url) + uri = Addressable::URI.parse(topic_url).normalize params = Rails.application.routes.recognize_path(uri.path) domain = uri.host + (uri.port ? ":#{uri.port}" : '') diff --git a/app/controllers/authorize_follow_controller.rb b/app/controllers/authorize_follow_controller.rb index c98a5f45f..9b28a9455 100644 --- a/app/controllers/authorize_follow_controller.rb +++ b/app/controllers/authorize_follow_controller.rb @@ -6,7 +6,7 @@ class AuthorizeFollowController < ApplicationController before_action :authenticate_user! def new - uri = Addressable::URI.parse(acct_param) + uri = Addressable::URI.parse(acct_param).normalize if uri.path && %w(http https).include?(uri.scheme) set_account_from_url |