mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2024-12-24 03:43:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix uncaught domain normalization error in remote follow (#11703)

Browse source
This commit is contained in:
Eugen Rochko 2019-08-30 02:19:17 +02:00 committed by GitHub
parent 6914482d0a
commit b54b725d6b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/remote_follow_controller.rb
View file

@ -29,7 +29,7 @@ class RemoteFollowController < ApplicationController
end
def session_params
{ acct: session[:remote_follow] }
{ acct: session[:remote_follow] || current_account&.username }
end
def set_body_classes

2
app/controllers/remote_interaction_controller.rb
View file

@ -32,7 +32,7 @@ class RemoteInteractionController < ApplicationController
end
def session_params
{ acct: session[:remote_follow] }
{ acct: session[:remote_follow] || current_account&.username }
end
def set_status

6
app/models/remote_follow.rb
View file

@ -6,7 +6,7 @@ class RemoteFollow
attr_accessor :acct, :addressable_template
validates :acct, presence: true
validates :acct, presence: true, domain: { acct: true }
def initialize(attrs = {})
@acct = normalize_acct(attrs[:acct])
@ -21,7 +21,7 @@ class RemoteFollow
end
def subscribe_address_for(account)
addressable_template.expand(uri: account.local_username_and_domain).to_s
addressable_template.expand(uri: ActivityPub::TagManager.instance.uri_for(account)).to_s
end
def interact_address_for(status)
@ -44,6 +44,8 @@ class RemoteFollow
end
[username, domain].compact.join('@')
rescue Addressable::URI::InvalidURIError
value
end
def fetch_template!

12
app/validators/domain_validator.rb
View file

@ -4,14 +4,22 @@ class DomainValidator < ActiveModel::EachValidator
def validate_each(record, attribute, value)
return if value.blank?
record.errors.add(attribute, I18n.t('domain_validator.invalid_domain')) unless compliant?(value)
domain = begin
if options[:acct]
value.split('@').last
else
value
end
end
record.errors.add(attribute, I18n.t('domain_validator.invalid_domain')) unless compliant?(domain)
end
private
def compliant?(value)
Addressable::URI.new.tap { |uri| uri.host = value }
rescue Addressable::URI::InvalidURIError
rescue Addressable::URI::InvalidURIError, IDN::Idna::IdnaError
false
end
end

4
spec/controllers/remote_follow_controller_spec.rb
View file

@ -66,9 +66,7 @@ describe RemoteFollowController do
end
it 'redirects to the remote location' do
address = "http://example.com/follow_me?acct=test_user%40#{Rails.configuration.x.local_domain}"
expect(response).to redirect_to(address)
expect(response).to redirect_to("http://example.com/follow_me?acct=https%3A%2F%2F#{Rails.configuration.x.local_domain}%2Fusers%2Ftest_user")
end
end
end

2
spec/models/remote_follow_spec.rb
View file

@ -61,7 +61,7 @@ RSpec.describe RemoteFollow do
subject { remote_follow.subscribe_address_for(account) }
it 'returns subscribe address' do
is_expected.to eq 'https://quitter.no/main/ostatussub?profile=alice%40cb6e6126.ngrok.io'
is_expected.to eq 'https://quitter.no/main/ostatussub?profile=https%3A%2F%2Fcb6e6126.ngrok.io%2Fusers%2Falice'
end
end
end