hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change HTML validator to ignore all errors except unmatched tags (#10534)

signup-info-prompt
Eugen Rochko 2019-04-10 03:34:16 +02:00 committed by GitHub
parent 46cb36fd2c
commit 400397c0c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/form/admin_settings.rb
View File

@ -49,7 +49,8 @@ class Form::AdminSettings
attr_accessor(*KEYS) attr_accessor(*KEYS)
validates :site_short_description, :site_description, :site_extended_description, :site_terms, :closed_registrations_message, html: true validates :site_short_description, :site_description, html: { wrap_with: :p }
validates :site_extended_description, :site_terms, :closed_registrations_message, html: true
validates :registrations_mode, inclusion: { in: %w(open approved none) } validates :registrations_mode, inclusion: { in: %w(open approved none) }
validates :min_invite_role, inclusion: { in: %w(disabled user moderator admin) } validates :min_invite_role, inclusion: { in: %w(disabled user moderator admin) }
validates :site_contact_email, :site_contact_username, presence: true validates :site_contact_email, :site_contact_username, presence: true

12
app/validators/html_validator.rb
View File

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