maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add rescue InvalidURIError in mastodon_url validation (#6174) [deploy]

Browse source
This commit is contained in:
Gonzalo Ricco 2020-02-24 21:13:40 -03:00 • committed by GitHub
parent 89dd843a50
commit 0b03240e5b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/user.rb
View file

@ -81,7 +81,7 @@ class User < ApplicationRecord
validates :experience_level, numericality: { less_than_or_equal_to: 10 }, allow_blank: true
validates :text_color_hex, format: /\A#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})\z/, allow_blank: true
validates :bg_color_hex, format: /\A#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})\z/, allow_blank: true
validates :website_url, :employer_url, :mastodon_url,
validates :website_url, :employer_url,
url: { allow_blank: true, no_local: true, schemes: %w[https http] }
validates :facebook_url,
format: /\A(http(s)?:\/\/)?(www.facebook.com|facebook.com)\/.*\Z/,
@ -612,6 +612,8 @@ class User < ApplicationRecord
return if uri.host&.in?(Constants::ALLOWED_MASTODON_INSTANCES)
errors.add(:mastodon_url, "is not an allowed Mastodon instance")
rescue URI::InvalidURIError
errors.add(:mastodon_url, "is not a valid url")
end
def tag_list

5
spec/models/user_spec.rb
View file

@ -187,6 +187,11 @@ RSpec.describe User, type: :model do
user.mastodon_url = "mastodon.social/@test"
expect(user).not_to be_valid
end
it "does not accept an invalid url" do
user.mastodon_url = "ben .com"
expect(user).not_to be_valid
end
end
describe "#facebook_url" do