From b59fb28e90bc21d6fd1a6bafd13cfbd81ab5be54 Mon Sep 17 00:00:00 2001 From: Claire Date: Wed, 7 Dec 2022 02:35:39 +0100 Subject: [PATCH] Fix 500 error when trying to migrate to an invalid address (#21462) * Fix 500 error when trying to migrate to an invalid address * Add tests --- app/models/account_migration.rb | 2 +- app/models/form/redirect.rb | 2 +- spec/models/account_migration_spec.rb | 43 +++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/app/models/account_migration.rb b/app/models/account_migration.rb index 16276158d7..fa8cb6013c 100644 --- a/app/models/account_migration.rb +++ b/app/models/account_migration.rb @@ -59,7 +59,7 @@ class AccountMigration < ApplicationRecord def set_target_account self.target_account = ResolveAccountService.new.call(acct, skip_cache: true) - rescue Webfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::Error + rescue Webfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::Error, Addressable::URI::InvalidURIError # Validation will take care of it end diff --git a/app/models/form/redirect.rb b/app/models/form/redirect.rb index 795fdd057b..3cd5731e6d 100644 --- a/app/models/form/redirect.rb +++ b/app/models/form/redirect.rb @@ -32,7 +32,7 @@ class Form::Redirect def set_target_account @target_account = ResolveAccountService.new.call(acct, skip_cache: true) - rescue Webfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::Error + rescue Webfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::Error, Addressable::URI::InvalidURIError # Validation will take care of it end diff --git a/spec/models/account_migration_spec.rb b/spec/models/account_migration_spec.rb index 8461b4b28e..5f66fe8da3 100644 --- a/spec/models/account_migration_spec.rb +++ b/spec/models/account_migration_spec.rb @@ -1,5 +1,48 @@ require 'rails_helper' RSpec.describe AccountMigration, type: :model do + describe 'validations' do + let(:source_account) { Fabricate(:account) } + let(:target_acct) { target_account.acct } + let(:subject) { AccountMigration.new(account: source_account, acct: target_acct) } + + context 'with valid properties' do + let(:target_account) { Fabricate(:account, username: 'target', domain: 'remote.org') } + + before do + target_account.aliases.create!(acct: source_account.acct) + + service_double = double + allow(ResolveAccountService).to receive(:new).and_return(service_double) + allow(service_double).to receive(:call).with(target_acct, anything).and_return(target_account) + end + + it 'passes validations' do + expect(subject).to be_valid + end + end + + context 'with unresolveable account' do + let(:target_acct) { 'target@remote' } + + before do + service_double = double + allow(ResolveAccountService).to receive(:new).and_return(service_double) + allow(service_double).to receive(:call).with(target_acct, anything).and_return(nil) + end + + it 'has errors on acct field' do + expect(subject).to model_have_error_on_field(:acct) + end + end + + context 'with a space in the domain part' do + let(:target_acct) { 'target@remote. org' } + + it 'has errors on acct field' do + expect(subject).to model_have_error_on_field(:acct) + end + end + end end