mirror of https://github.com/mastodon/mastodon
Change HTML validator to ignore all errors except unmatched tags (#10534)
parent
46cb36fd2c
commit
400397c0c7
@ -1,18 +1,20 @@
|
|||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
class HtmlValidator < ActiveModel::EachValidator
|
class HtmlValidator < ActiveModel::EachValidator
|
||||||
|
ERROR_RE = /Opening and ending tag mismatch|Unexpected end tag/
|
||||||
|
|
||||||
def validate_each(record, attribute, value)
|
def validate_each(record, attribute, value)
|
||||||
return if value.blank?
|
return if value.blank?
|
||||||
|
|
||||||
errors = html_errors(value)
|
errors = html_errors(value)
|
||||||
unless errors.empty?
|
|
||||||
record.errors.add(attribute, I18n.t('html_validator.invalid_markup', error: errors.first.to_s))
|
record.errors.add(attribute, I18n.t('html_validator.invalid_markup', error: errors.first.to_s)) unless errors.empty?
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def html_errors(str)
|
def html_errors(str)
|
||||||
fragment = Nokogiri::HTML.fragment(str)
|
fragment = Nokogiri::HTML.fragment(options[:wrap_with] ? "<#{options[:wrap_with]}>#{str}</#{options[:wrap_with]}>" : str)
|
||||||
fragment.errors
|
fragment.errors.select { |error| ERROR_RE =~ error.message }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue