artists: validate that urls are well-formed (fix #2346).

This commit is contained in:
evazion
2017-07-29 01:37:30 -05:00
parent 10614d2152
commit 624444d51d
2 changed files with 15 additions and 0 deletions

View File

@@ -2,6 +2,7 @@ class ArtistUrl < ApplicationRecord
before_save :initialize_normalized_url, on: [ :create ]
before_save :normalize
validates_presence_of :url
validate :validate_url_format
belongs_to :artist, :touch => true
attr_accessible :url, :artist_id, :normalized_url
@@ -65,4 +66,11 @@ class ArtistUrl < ApplicationRecord
def to_s
url
end
def validate_url_format
uri = Addressable::URI.parse(url)
errors[:base] << "'#{url}' must begin with http:// or https://" if !uri.scheme.in?(%w[http https])
rescue Addressable::URI::InvalidURIError => error
errors[:base] << "'#{url}' is malformed: #{error}"
end
end

View File

@@ -134,6 +134,13 @@ class ArtistTest < ActiveSupport::TestCase
assert_equal(["http://aaa.com", "http://rembrandt.com/test.jpg"], artist.urls.map(&:to_s).sort)
end
should "not allow invalid urls" do
artist = FactoryGirl.build(:artist, :url_string => "blah")
assert_equal(false, artist.valid?)
assert_equal(["'blah' must begin with http:// or https://"], artist.errors[:url])
end
should "make sure old urls are deleted" do
artist = FactoryGirl.create(:artist, :name => "rembrandt", :url_string => "http://rembrandt.com/test.jpg")
artist.url_string = "http://not.rembrandt.com/test.jpg"