From 555c4e11baf58401c1bdd915e4ecef679e6ae514 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 23 Mar 2019 14:07:04 +0100
Subject: Add validations to admin settings (#10348)

* Add validations to admin settings

- Validate correct HTML markup
- Validate presence of contact username & e-mail
- Validate that all usernames are valid
- Validate that enums have expected values

* Fix code style issue

* Fix tests
---
 app/validators/existing_username_validator.rb | 20 ++++++++++++++++++++
 app/validators/html_validator.rb              | 14 ++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 app/validators/existing_username_validator.rb
 create mode 100644 app/validators/html_validator.rb

(limited to 'app/validators')

diff --git a/app/validators/existing_username_validator.rb b/app/validators/existing_username_validator.rb
new file mode 100644
index 000000000..4388a0c98
--- /dev/null
+++ b/app/validators/existing_username_validator.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class ExistingUsernameValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    return if value.blank?
+
+    if options[:multiple]
+      missing_usernames = value.split(',').map { |username| username unless Account.find_local(username) }.compact
+      record.errors.add(attribute, I18n.t('existing_username_validator.not_found_multiple', usernames: missing_usernames.join(', '))) if missing_usernames.any?
+    else
+      record.errors.add(attribute, I18n.t('existing_username_validator.not_found')) unless Account.find_local(value)
+    end
+  end
+
+  private
+
+  def valid_html?(str)
+    Nokogiri::HTML.fragment(str).to_s == str
+  end
+end
diff --git a/app/validators/html_validator.rb b/app/validators/html_validator.rb
new file mode 100644
index 000000000..882c35d41
--- /dev/null
+++ b/app/validators/html_validator.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class HtmlValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    return if value.blank?
+    record.errors.add(attribute, I18n.t('html_validator.invalid_markup')) unless valid_html?(value)
+  end
+
+  private
+
+  def valid_html?(str)
+    Nokogiri::HTML.fragment(str).to_s == str
+  end
+end
-- 
cgit 


From 0c46bd11aa3dd5613ba49dfeed6971dc92587956 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Tue, 26 Mar 2019 17:33:26 +0100
Subject: Fix HTML validation (#10354)

* Fix HTML validation

* Report first HTML error instead on validation error
---
 app/validators/html_validator.rb | 10 +++++++---
 config/locales/en.yml            |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'app/validators')

diff --git a/app/validators/html_validator.rb b/app/validators/html_validator.rb
index 882c35d41..b7caee5a9 100644
--- a/app/validators/html_validator.rb
+++ b/app/validators/html_validator.rb
@@ -3,12 +3,16 @@
 class HtmlValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     return if value.blank?
-    record.errors.add(attribute, I18n.t('html_validator.invalid_markup')) unless valid_html?(value)
+    errors = html_errors(value)
+    unless errors.empty?
+      record.errors.add(attribute, I18n.t('html_validator.invalid_markup', error: errors.first.to_s))
+    end
   end
 
   private
 
-  def valid_html?(str)
-    Nokogiri::HTML.fragment(str).to_s == str
+  def html_errors(str)
+    fragment = Nokogiri::HTML.fragment(str)
+    fragment.errors
   end
 end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ad1332fd2..42ba4e35e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -638,7 +638,7 @@ en:
       one: Something isn't quite right yet! Please review the error below
       other: Something isn't quite right yet! Please review %{count} errors below
   html_validator:
-    invalid_markup: contains invalid HTML markup
+    invalid_markup: 'contains invalid HTML markup: %{error}'
   identity_proofs:
     active: Active
     authorize: Yes, authorize
-- 
cgit