kikobar/mastodon
1
0
Fork 0
mirror of https://github.com/kikobar/mastodon.git synced 2024-11-17 12:42:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix error when invalid domain name is submitted (#19474)

Browse source 
Fix #19175
This commit is contained in:
Eugen Rochko 2022-11-14 08:07:14 +01:00 committed by GitHub
parent 523e106cbf
commit 552d69ad96
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/concerns/domain_normalizable.rb
View file

@ -11,5 +11,7 @@ module DomainNormalizable
def normalize_domain def normalize_domain
self.domain = TagManager.instance.normalize_domain(domain&.strip) self.domain = TagManager.instance.normalize_domain(domain&.strip)
rescue Addressable::URI::InvalidURIError
errors.add(:domain, :invalid)
end end
end end

12
spec/controllers/api/v1/admin/domain_allows_controller_spec.rb
View file

@ -94,6 +94,7 @@ RSpec.describe Api::V1::Admin::DomainAllowsController, type: :controller do
describe 'POST #create' do describe 'POST #create' do
let!(:domain_allow) { Fabricate(:domain_allow, domain: 'example.com') } let!(:domain_allow) { Fabricate(:domain_allow, domain: 'example.com') }
context do
before do before do
post :create, params: { domain: 'foo.bar.com' } post :create, params: { domain: 'foo.bar.com' }
end end
@ -115,4 +116,15 @@ RSpec.describe Api::V1::Admin::DomainAllowsController, type: :controller do
expect(DomainAllow.find_by(domain: 'foo.bar.com')).to_not be_nil expect(DomainAllow.find_by(domain: 'foo.bar.com')).to_not be_nil
end end
end end
context 'with invalid domain name' do
before do
post :create, params: { domain: 'foo bar' }
end
it 'returns http unprocessable entity' do
expect(response).to have_http_status(422)
end
end
end
end end