From 400397c0c790d7d401d14cea6a0f4c1643af45bc Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 10 Apr 2019 03:34:16 +0200
Subject: [PATCH] Change HTML validator to ignore all errors except unmatched
tags (#10534)
---
app/models/form/admin_settings.rb | 3 ++-
app/validators/html_validator.rb | 12 +++++++-----
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb
index d3af8c30f5..86a86ec666 100644
--- a/app/models/form/admin_settings.rb
+++ b/app/models/form/admin_settings.rb
@@ -49,7 +49,8 @@ class Form::AdminSettings
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 :min_invite_role, inclusion: { in: %w(disabled user moderator admin) }
validates :site_contact_email, :site_contact_username, presence: true
diff --git a/app/validators/html_validator.rb b/app/validators/html_validator.rb
index b7caee5a9e..1c9cd303cf 100644
--- a/app/validators/html_validator.rb
+++ b/app/validators/html_validator.rb
@@ -1,18 +1,20 @@
# frozen_string_literal: true
class HtmlValidator < ActiveModel::EachValidator
+ ERROR_RE = /Opening and ending tag mismatch|Unexpected end tag/
+
def validate_each(record, attribute, value)
return if value.blank?
+
errors = html_errors(value)
- unless errors.empty?
- record.errors.add(attribute, I18n.t('html_validator.invalid_markup', error: errors.first.to_s))
- end
+
+ record.errors.add(attribute, I18n.t('html_validator.invalid_markup', error: errors.first.to_s)) unless errors.empty?
end
private
def html_errors(str)
- fragment = Nokogiri::HTML.fragment(str)
- fragment.errors
+ fragment = Nokogiri::HTML.fragment(options[:wrap_with] ? "<#{options[:wrap_with]}>#{str}</#{options[:wrap_with]}>" : str)
+ fragment.errors.select { |error| ERROR_RE =~ error.message }
end
end