tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix 500 error when trying to migrate to an invalid address (#21462)

Browse Source 
* Fix 500 error when trying to migrate to an invalid address

* Add tests
This commit is contained in:
Claire
2022-12-07 02:35:39 +01:00
committed by GitHub
parent 21b208afcb
commit b59fb28e90
3 changed files with 45 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/account_migration.rb
View File

@@ -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

2
app/models/form/redirect.rb
View File

@@ -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